From d3af4b582fa8e3820c3a370214c86bc5b6d5990e Mon Sep 17 00:00:00 2001
From: Fayzal Ghantiwala <114010985+fayzal-g@users.noreply.github.com>
Date: Wed, 6 Aug 2025 22:05:22 +0100
Subject: [PATCH 001/243] Alerting: Fix flaky tests (#109205)

* Make sure random orgID isn't 0

* Retrigger CI
---
 pkg/services/ngalert/store/alert_rule_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/services/ngalert/store/alert_rule_test.go b/pkg/services/ngalert/store/alert_rule_test.go
index a512b5949b4..e83dae824b6 100644
--- a/pkg/services/ngalert/store/alert_rule_test.go
+++ b/pkg/services/ngalert/store/alert_rule_test.go
@@ -565,7 +565,7 @@ func TestIntegration_DeleteAlertRulesByUID(t *testing.T) {
 	})
 
 	t.Run("should remove all version and insert one with empty rule_uid when DeletedRuleRetention is set", func(t *testing.T) {
-		orgID := int64(rand.IntN(1000))
+		orgID := int64(rand.IntN(1000)) + 1
 		gen = gen.With(gen.WithOrgID(orgID))
 		// Create a new store to pass the custom bus to check the signal
 		b := &fakeBus{}
@@ -632,7 +632,7 @@ func TestIntegration_DeleteAlertRulesByUID(t *testing.T) {
 	})
 
 	t.Run("should remove all versions and not keep history if DeletedRuleRetention = 0", func(t *testing.T) {
-		orgID := int64(rand.IntN(1000))
+		orgID := int64(rand.IntN(1000)) + 1
 		gen = gen.With(gen.WithOrgID(orgID))
 		// Create a new store to pass the custom bus to check the signal
 		b := &fakeBus{}
@@ -685,7 +685,7 @@ func TestIntegration_DeleteAlertRulesByUID(t *testing.T) {
 	})
 
 	t.Run("should remove all versions and not keep history if permanently is true", func(t *testing.T) {
-		orgID := int64(rand.IntN(1000))
+		orgID := int64(rand.IntN(1000)) + 1
 		gen = gen.With(gen.WithOrgID(orgID))
 		// Create a new store to pass the custom bus to check the signal
 		b := &fakeBus{}
@@ -2071,7 +2071,7 @@ func TestIntegration_CleanUpDeletedAlertRules(t *testing.T) {
 	store.FeatureToggles = featuremgmt.WithFeatures(featuremgmt.FlagAlertRuleRestore)
 
 	gen := models.RuleGen
-	orgID := int64(rand.IntN(1000))
+	orgID := int64(rand.IntN(1000)) + 1
 
 	gen = gen.With(gen.WithOrgID(orgID))
 

From c066254e67c1ba14af199b4aaed037819df346e5 Mon Sep 17 00:00:00 2001
From: Nathan Marrs <nathanielmarrs@gmail.com>
Date: Wed, 6 Aug 2025 14:15:55 -0700
Subject: [PATCH 002/243] Invite User: Clean up previous experiment (#109214)

* remove invite user button from quick add menu as redundant with top nav invite user button

* clean up final invite user experiment

* remove invite user button from megamenu, clean up and consolidate usage of util functions across top nav and command palette

* add some basic tests to util functions

* fix tests / jest mock conflicts

* address PR feedback
---
 .github/CODEOWNERS                            |   1 -
 .../AppChrome/MegaMenu/MegaMenu.tsx           |  13 --
 .../AppChrome/QuickAdd/QuickAdd.tsx           |  38 +-----
 .../TopBar/InviteUserButton.test.tsx          |   3 +
 .../AppChrome/TopBar/InviteUserButton.tsx     |  45 +++----
 .../TopBar/InviteUserButtonUtils.test.tsx     | 122 ++++++++++++++++++
 .../TopBar/InviteUserButtonUtils.tsx}         |   7 +-
 .../AppChrome/TopBar/SingleTopBar.tsx         |   2 +-
 .../InviteUserButton/InviteUserButton.tsx     |  21 ---
 .../commandPalette/actions/staticActions.ts   |   9 +-
 public/locales/en-US/grafana.json             |   2 +-
 11 files changed, 162 insertions(+), 101 deletions(-)
 create mode 100644 public/app/core/components/AppChrome/TopBar/InviteUserButtonUtils.test.tsx
 rename public/app/core/components/{InviteUserButton/utils.ts => AppChrome/TopBar/InviteUserButtonUtils.tsx} (72%)
 delete mode 100644 public/app/core/components/InviteUserButton/InviteUserButton.tsx

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 350790df440..d9429f2f1d6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -737,7 +737,6 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
 /public/app/core/components/GraphNG/ @grafana/dataviz-squad
 /public/app/core/components/help/ @grafana/grafana-search-navigate-organise
 /public/app/core/components/Indent/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/InviteUserButton/ @grafana/sharing-squad
 /public/app/core/components/Layers/ @grafana/dataviz-squad
 /public/app/core/components/Login/ @grafana/grafana-search-navigate-organise
 /public/app/core/components/NativeScrollbar.tsx @grafana/grafana-search-navigate-organise
diff --git a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
index 1c8b3959230..36955e8d405 100644
--- a/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenu.tsx
@@ -13,9 +13,6 @@ import { setBookmark } from 'app/core/reducers/navBarTree';
 import { usePatchUserPreferencesMutation } from 'app/features/preferences/api/index';
 import { useDispatch, useSelector } from 'app/types/store';
 
-import { InviteUserButton } from '../../InviteUserButton/InviteUserButton';
-import { shouldRenderInviteUserButton } from '../../InviteUserButton/utils';
-
 import { MegaMenuHeader } from './MegaMenuHeader';
 import { MegaMenuItem } from './MegaMenuItem';
 import { usePinnedItems } from './hooks';
@@ -128,11 +125,6 @@ export const MegaMenu = memo(
               ))}
             </ul>
           </ScrollContainer>
-          {shouldRenderInviteUserButton && (
-            <div className={styles.inviteNewMemberButton}>
-              <InviteUserButton />
-            </div>
-          )}
         </nav>
       </div>
     );
@@ -170,11 +162,6 @@ const getStyles = (theme: GrafanaTheme2) => {
         width: MENU_WIDTH,
       },
     }),
-    inviteNewMemberButton: css({
-      display: 'flex',
-      padding: theme.spacing(1.5, 1, 1.5, 1),
-      borderTop: `1px solid ${theme.colors.border.weak}`,
-    }),
     dockMenuButton: css({
       display: 'none',
       position: 'relative',
diff --git a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
index 0a9a48ac6ed..3d38c543105 100644
--- a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
+++ b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
@@ -3,10 +3,8 @@ import { useMemo, useState } from 'react';
 import { t } from '@grafana/i18n';
 import { reportInteraction } from '@grafana/runtime';
 import { Menu, Dropdown, ToolbarButton } from '@grafana/ui';
-import { getExternalUserMngLinkUrl } from 'app/features/users/utils';
 import { useSelector } from 'app/types/store';
 
-import { performInviteUserClick, shouldRenderInviteUserButton } from '../../InviteUserButton/utils';
 import { NavToolbarSeparator } from '../NavToolbar/NavToolbarSeparator';
 
 import { findCreateActions } from './utils';
@@ -17,23 +15,7 @@ export const QuickAdd = ({}: Props) => {
   const navBarTree = useSelector((state) => state.navBarTree);
   const [isOpen, setIsOpen] = useState(false);
 
-  const createActions = useMemo(() => {
-    const actions = findCreateActions(navBarTree);
-
-    if (shouldRenderInviteUserButton) {
-      actions.push({
-        text: t('navigation.invite-user.invite-new-member-button', 'Invite new member'),
-        url: getExternalUserMngLinkUrl('invite-user-top-bar'),
-        target: '_blank',
-        isCreateAction: true,
-        onClick: () => {
-          performInviteUserClick('quick_add_button', 'invite-user-quick-add-button');
-        },
-      });
-    }
-
-    return actions;
-  }, [navBarTree]);
+  const createActions = useMemo(() => findCreateActions(navBarTree), [navBarTree]);
   const showQuickAdd = createActions.length > 0;
 
   if (!showQuickAdd) {
@@ -44,18 +26,12 @@ export const QuickAdd = ({}: Props) => {
     return (
       <Menu>
         {createActions.map((createAction, index) => (
-          <div key={index}>
-            {shouldRenderInviteUserButton && index === createActions.length - 1 && <Menu.Divider />}
-            <Menu.Item
-              url={createAction.url}
-              label={createAction.text}
-              target={createAction.target}
-              onClick={() => {
-                reportInteraction('grafana_menu_item_clicked', { url: createAction.url, from: 'quickadd' });
-                createAction.onClick?.();
-              }}
-            />
-          </div>
+          <Menu.Item
+            key={index}
+            url={createAction.url}
+            label={createAction.text}
+            onClick={() => reportInteraction('grafana_menu_item_clicked', { url: createAction.url, from: 'quickadd' })}
+          />
         ))}
       </Menu>
     );
diff --git a/public/app/core/components/AppChrome/TopBar/InviteUserButton.test.tsx b/public/app/core/components/AppChrome/TopBar/InviteUserButton.test.tsx
index d867c17488b..de2921b3915 100644
--- a/public/app/core/components/AppChrome/TopBar/InviteUserButton.test.tsx
+++ b/public/app/core/components/AppChrome/TopBar/InviteUserButton.test.tsx
@@ -11,6 +11,9 @@ import { InviteUserButton } from './InviteUserButton';
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   config: {
+    featureToggles: {
+      inviteUserExperimental: true,
+    },
     externalUserMngLinkUrl: 'https://example.com/invite',
   },
   reportInteraction: jest.fn(),
diff --git a/public/app/core/components/AppChrome/TopBar/InviteUserButton.tsx b/public/app/core/components/AppChrome/TopBar/InviteUserButton.tsx
index deec044c42e..9c86223b026 100644
--- a/public/app/core/components/AppChrome/TopBar/InviteUserButton.tsx
+++ b/public/app/core/components/AppChrome/TopBar/InviteUserButton.tsx
@@ -1,43 +1,36 @@
 import { t } from '@grafana/i18n';
-import { config, reportInteraction } from '@grafana/runtime';
 import { ToolbarButton } from '@grafana/ui';
-import { contextSrv } from 'app/core/core';
 import { useMediaQueryMinWidth } from 'app/core/hooks/useMediaQueryMinWidth';
-import { getExternalUserMngLinkUrl } from 'app/features/users/utils';
-import { AccessControlAction } from 'app/types/accessControl';
 
 import { NavToolbarSeparator } from '../NavToolbar/NavToolbarSeparator';
 
+import { performInviteUserClick, shouldRenderInviteUserButton } from './InviteUserButtonUtils';
+
 export function InviteUserButton() {
   const isLargeScreen = useMediaQueryMinWidth('lg');
 
   const handleClick = () => {
     try {
-      reportInteraction('invite_user_button_clicked', {
-        placement: 'top_bar_right',
-      });
-
-      const url = getExternalUserMngLinkUrl('invite-user-top-bar');
-      window.open(url.toString(), '_blank');
+      performInviteUserClick('top_bar_right', 'invite-user-top-bar');
     } catch (error) {
       console.error('Failed to handle invite user click:', error);
     }
   };
 
-  const shouldRender = config.externalUserMngLinkUrl && contextSrv.hasPermission(AccessControlAction.OrgUsersAdd);
-
-  return shouldRender ? (
-    <>
-      <ToolbarButton
-        icon="add-user"
-        iconOnly={!isLargeScreen}
-        onClick={handleClick}
-        tooltip={t('navigation.invite-user.invite-tooltip', 'Invite user')}
-        aria-label={t('navigation.invite-user.invite-tooltip', 'Invite user')}
-      >
-        {isLargeScreen ? t('navigation.invite-user.invite-button', 'Invite') : undefined}
-      </ToolbarButton>
-      <NavToolbarSeparator />
-    </>
-  ) : null;
+  return (
+    shouldRenderInviteUserButton() && (
+      <>
+        <ToolbarButton
+          icon="add-user"
+          iconOnly={!isLargeScreen}
+          onClick={handleClick}
+          tooltip={t('navigation.invite-user.invite-tooltip', 'Invite user')}
+          aria-label={t('navigation.invite-user.invite-tooltip', 'Invite user')}
+        >
+          {isLargeScreen ? t('navigation.invite-user.invite-button', 'Invite') : undefined}
+        </ToolbarButton>
+        <NavToolbarSeparator />
+      </>
+    )
+  );
 }
diff --git a/public/app/core/components/AppChrome/TopBar/InviteUserButtonUtils.test.tsx b/public/app/core/components/AppChrome/TopBar/InviteUserButtonUtils.test.tsx
new file mode 100644
index 00000000000..b5ac54be8c9
--- /dev/null
+++ b/public/app/core/components/AppChrome/TopBar/InviteUserButtonUtils.test.tsx
@@ -0,0 +1,122 @@
+import type { FeatureToggles } from '@grafana/data';
+import { reportInteraction, config } from '@grafana/runtime';
+import { contextSrv } from 'app/core/core';
+import { getExternalUserMngLinkUrl } from 'app/features/users/utils';
+import { AccessControlAction } from 'app/types/accessControl';
+
+import { performInviteUserClick, shouldRenderInviteUserButton } from './InviteUserButtonUtils';
+
+// Mock dependencies
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  reportInteraction: jest.fn(),
+  config: {
+    featureToggles: {} as Partial<FeatureToggles>,
+    externalUserMngLinkUrl: '',
+  },
+}));
+
+jest.mock('app/core/core', () => ({
+  contextSrv: {
+    hasPermission: jest.fn(),
+  },
+}));
+
+jest.mock('app/features/users/utils', () => ({
+  getExternalUserMngLinkUrl: jest.fn(),
+}));
+
+const mockReportInteraction = jest.mocked(reportInteraction);
+const mockConfig = jest.mocked(config);
+const mockContextSrv = jest.mocked(contextSrv);
+const mockGetExternalUserMngLinkUrl = jest.mocked(getExternalUserMngLinkUrl);
+
+// Type assertion to make mockConfig.featureToggles assignable
+const mockFeatureToggles = mockConfig.featureToggles as Partial<FeatureToggles>;
+
+// Mock window.open
+const mockWindowOpen = jest.fn();
+Object.defineProperty(window, 'open', {
+  value: mockWindowOpen,
+  writable: true,
+});
+
+describe('InviteUserButtonUtils', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    // Set up default mocks
+    mockFeatureToggles.inviteUserExperimental = true;
+    mockConfig.externalUserMngLinkUrl = 'https://example.com/invite';
+    mockContextSrv.hasPermission.mockReturnValue(true);
+
+    // Dynamic mock that returns URL with the actual cnt parameter
+    mockGetExternalUserMngLinkUrl.mockImplementation((cnt: string) => `https://example.com/invite?cnt=${cnt}`);
+  });
+
+  describe('shouldRenderInviteUserButton', () => {
+    it('should return true when all conditions are met', () => {
+      expect(shouldRenderInviteUserButton()).toBe(true);
+      expect(mockContextSrv.hasPermission).toHaveBeenCalledWith(AccessControlAction.OrgUsersAdd);
+    });
+
+    it('should return false when feature toggle is disabled', () => {
+      mockFeatureToggles.inviteUserExperimental = false;
+
+      expect(shouldRenderInviteUserButton()).toBe(false);
+    });
+
+    it('should return false when URL is not configured', () => {
+      mockConfig.externalUserMngLinkUrl = '';
+
+      expect(shouldRenderInviteUserButton()).toBeFalsy();
+    });
+
+    it('should return false when user lacks permission', () => {
+      mockContextSrv.hasPermission.mockReturnValue(false);
+
+      expect(shouldRenderInviteUserButton()).toBe(false);
+    });
+  });
+
+  describe('performInviteUserClick', () => {
+    it('should report interaction, get URL, and open window with correct cnt parameter', () => {
+      const placement = 'top_bar_right';
+      const cnt = 'invite-user-test';
+
+      performInviteUserClick(placement, cnt);
+
+      expect(mockReportInteraction).toHaveBeenCalledWith('invite_user_button_clicked', {
+        placement,
+      });
+      expect(mockGetExternalUserMngLinkUrl).toHaveBeenCalledWith(cnt);
+      expect(mockWindowOpen).toHaveBeenCalledWith(`https://example.com/invite?cnt=${cnt}`, '_blank');
+    });
+
+    it('should work with different cnt values', () => {
+      const placement = 'top_bar_right';
+      const cnt = 'dashboard-header';
+
+      performInviteUserClick(placement, cnt);
+
+      expect(mockReportInteraction).toHaveBeenCalledWith('invite_user_button_clicked', {
+        placement,
+      });
+      expect(mockGetExternalUserMngLinkUrl).toHaveBeenCalledWith(cnt);
+      expect(mockWindowOpen).toHaveBeenCalledWith(`https://example.com/invite?cnt=${cnt}`, '_blank');
+    });
+
+    it('should handle special characters in cnt parameter', () => {
+      const placement = 'menu-item';
+      const cnt = 'admin-panel_users-section';
+
+      performInviteUserClick(placement, cnt);
+
+      expect(mockReportInteraction).toHaveBeenCalledWith('invite_user_button_clicked', {
+        placement,
+      });
+      expect(mockGetExternalUserMngLinkUrl).toHaveBeenCalledWith(cnt);
+      expect(mockWindowOpen).toHaveBeenCalledWith(`https://example.com/invite?cnt=${cnt}`, '_blank');
+    });
+  });
+});
diff --git a/public/app/core/components/InviteUserButton/utils.ts b/public/app/core/components/AppChrome/TopBar/InviteUserButtonUtils.tsx
similarity index 72%
rename from public/app/core/components/InviteUserButton/utils.ts
rename to public/app/core/components/AppChrome/TopBar/InviteUserButtonUtils.tsx
index 6fb774a059b..1e931c90e54 100644
--- a/public/app/core/components/InviteUserButton/utils.ts
+++ b/public/app/core/components/AppChrome/TopBar/InviteUserButtonUtils.tsx
@@ -1,10 +1,9 @@
-import { reportInteraction } from '@grafana/runtime';
-import { config } from 'app/core/config';
-import { contextSrv } from 'app/core/services/context_srv';
+import { reportInteraction, config } from '@grafana/runtime';
+import { contextSrv } from 'app/core/core';
 import { getExternalUserMngLinkUrl } from 'app/features/users/utils';
 import { AccessControlAction } from 'app/types/accessControl';
 
-export const shouldRenderInviteUserButton =
+export const shouldRenderInviteUserButton = () =>
   config.featureToggles.inviteUserExperimental &&
   config.externalUserMngLinkUrl &&
   contextSrv.hasPermission(AccessControlAction.OrgUsersAdd);
diff --git a/public/app/core/components/AppChrome/TopBar/SingleTopBar.tsx b/public/app/core/components/AppChrome/TopBar/SingleTopBar.tsx
index e5033c75c1c..f2b02f35bd9 100644
--- a/public/app/core/components/AppChrome/TopBar/SingleTopBar.tsx
+++ b/public/app/core/components/AppChrome/TopBar/SingleTopBar.tsx
@@ -107,7 +107,7 @@ export const SingleTopBar = memo(function SingleTopBar({
           {config.featureToggles.extensionSidebar && !isSmallScreen && <ExtensionToolbarItem />}
           {!showToolbarLevel && actions}
           {!contextSrv.user.isSignedIn && <SignInLink />}
-          {config.featureToggles.inviteUserExperimental && <InviteUserButton />}
+          <InviteUserButton />
           {profileNode && <ProfileButton profileNode={profileNode} onToggleKioskMode={onToggleKioskMode} />}
         </Stack>
       </div>
diff --git a/public/app/core/components/InviteUserButton/InviteUserButton.tsx b/public/app/core/components/InviteUserButton/InviteUserButton.tsx
deleted file mode 100644
index 6d6b5b620fd..00000000000
--- a/public/app/core/components/InviteUserButton/InviteUserButton.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { t } from '@grafana/i18n';
-import { Button } from '@grafana/ui';
-
-import { performInviteUserClick } from './utils';
-
-export function InviteUserButton() {
-  return (
-    <Button
-      icon="add-user"
-      size="sm"
-      variant="secondary"
-      fill="solid"
-      fullWidth
-      onClick={() => {
-        performInviteUserClick('bottom_mega_menu', 'invite-user-bottom-mega-menu');
-      }}
-    >
-      {t('navigation.invite-user.invite-new-member-button', 'Invite new member')}
-    </Button>
-  );
-}
diff --git a/public/app/features/commandPalette/actions/staticActions.ts b/public/app/features/commandPalette/actions/staticActions.ts
index e7e8c8d6734..b70c5ee4f1c 100644
--- a/public/app/features/commandPalette/actions/staticActions.ts
+++ b/public/app/features/commandPalette/actions/staticActions.ts
@@ -3,7 +3,10 @@ import { useMemo } from 'react';
 import { NavModelItem } from '@grafana/data';
 import { t } from '@grafana/i18n';
 import { enrichHelpItem } from 'app/core/components/AppChrome/MegaMenu/utils';
-import { performInviteUserClick, shouldRenderInviteUserButton } from 'app/core/components/InviteUserButton/utils';
+import {
+  shouldRenderInviteUserButton,
+  performInviteUserClick,
+} from 'app/core/components/AppChrome/TopBar/InviteUserButtonUtils';
 import { changeTheme } from 'app/core/services/theme';
 import { currentMockApiState, toggleMockApiAndReload, togglePseudoLocale } from 'app/dev-utils';
 import { useSelector } from 'app/types/store';
@@ -139,10 +142,10 @@ export function useStaticActions(): CommandPaletteAction[] {
   return useMemo(() => {
     const navBarActions = navTreeToActions(navBarTree);
 
-    if (shouldRenderInviteUserButton) {
+    if (shouldRenderInviteUserButton()) {
       navBarActions.push({
         id: 'invite-user',
-        name: t('navigation.invite-user.invite-new-member-button', 'Invite new member'),
+        name: t('navigation.invite-user.invite-new-user-button', 'Invite new user'),
         section: t('command-palette.section.actions', 'Actions'),
         priority: ACTIONS_PRIORITY,
         perform: () => {
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index fb7dfd15732..2c040613239 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -10315,7 +10315,7 @@
     },
     "invite-user": {
       "invite-button": "Invite",
-      "invite-new-member-button": "Invite new member",
+      "invite-new-user-button": "Invite new user",
       "invite-tooltip": "Invite user"
     },
     "item": {

From 62a1f6c0b84d52e8d7028424f096a2587e9c3052 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Wed, 6 Aug 2025 16:21:36 -0500
Subject: [PATCH 003/243] PanelModel: Use `shouldMigrate` when migrating
 (#108998)

---
 .../grafana-data/src/panel/PanelPlugin.ts     |  8 +--
 .../dashboard/state/PanelModel.test.ts        | 56 +++++++++++++++++++
 .../features/dashboard/state/PanelModel.ts    |  2 +-
 3 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/packages/grafana-data/src/panel/PanelPlugin.ts b/packages/grafana-data/src/panel/PanelPlugin.ts
index b879066b469..61985074be9 100644
--- a/packages/grafana-data/src/panel/PanelPlugin.ts
+++ b/packages/grafana-data/src/panel/PanelPlugin.ts
@@ -3,6 +3,7 @@ import { ComponentClass, ComponentType } from 'react';
 
 import { FieldConfigOptionsRegistry } from '../field/FieldConfigOptionsRegistry';
 import { StandardEditorContext } from '../field/standardFieldConfigEditorRegistry';
+import { PanelModel } from '../types/dashboard';
 import { FieldConfigProperty, FieldConfigSource } from '../types/fieldOverrides';
 import {
   PanelPluginMeta,
@@ -113,7 +114,7 @@ export class PanelPlugin<
   panel: ComponentType<PanelProps<TOptions>> | null;
   editor?: ComponentClass<PanelEditorProps<TOptions>>;
   onPanelMigration?: PanelMigrationHandler<TOptions>;
-  shouldMigrate?: (panel: ComponentType<PanelProps<TOptions>> | null) => boolean;
+  shouldMigrate?: (panel: PanelModel) => boolean;
   onPanelTypeChanged?: PanelTypeChangedHandler<TOptions>;
   noPadding?: boolean;
   dataSupport: PanelPluginDataSupport = {
@@ -208,10 +209,7 @@ export class PanelPlugin<
    *
    * This is a good place to support any changes to the options model
    */
-  setMigrationHandler(
-    handler: PanelMigrationHandler<TOptions>,
-    shouldMigrate?: (panel: ComponentType<PanelProps<TOptions>> | null) => boolean
-  ) {
+  setMigrationHandler(handler: PanelMigrationHandler<TOptions>, shouldMigrate?: (panel: PanelModel) => boolean) {
     this.onPanelMigration = handler;
     this.shouldMigrate = shouldMigrate;
     return this;
diff --git a/public/app/features/dashboard/state/PanelModel.test.ts b/public/app/features/dashboard/state/PanelModel.test.ts
index 053b8b3aaaf..b8d11c01258 100644
--- a/public/app/features/dashboard/state/PanelModel.test.ts
+++ b/public/app/features/dashboard/state/PanelModel.test.ts
@@ -146,12 +146,16 @@ describe('PanelModel', () => {
 
     describe('migrations', () => {
       let initialMigrator: PanelMigrationHandler<(typeof model)['options']> | undefined = undefined;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      let initialShouldMigrate: ((panel: any) => boolean) | undefined = undefined;
 
       beforeEach(() => {
         initialMigrator = tablePlugin.onPanelMigration;
+        initialShouldMigrate = tablePlugin.shouldMigrate;
       });
       afterEach(() => {
         tablePlugin.onPanelMigration = initialMigrator;
+        tablePlugin.shouldMigrate = initialShouldMigrate;
       });
 
       it('should run sync migrations', async () => {
@@ -179,6 +183,58 @@ describe('PanelModel', () => {
         await model.pluginLoaded(tablePlugin);
         expect(model.options).toMatchObject({ valueToMigrate: 'new-version' });
       });
+
+      it('should run migration when shouldMigrate=true and same version', async () => {
+        model.options.valueToMigrate = 'old-legacy';
+        model.pluginVersion = '1.0.0';
+
+        tablePlugin.meta.info.version = '1.0.0';
+        tablePlugin.onPanelMigration = (p) => ({ ...p.options, valueToMigrate: 'migrated-by-shouldMigrate' });
+        tablePlugin.shouldMigrate = () => true;
+
+        await model.pluginLoaded(tablePlugin);
+
+        expect(model.options).toMatchObject({ valueToMigrate: 'migrated-by-shouldMigrate' });
+      });
+
+      it('should run migration when shouldMigrate=false and versions are different', async () => {
+        model.options.valueToMigrate = 'old-legacy';
+        model.pluginVersion = '1.0.0';
+
+        tablePlugin.meta.info.version = '2.0.0';
+        tablePlugin.onPanelMigration = (p) => ({ ...p.options, valueToMigrate: 'migrated-by-version' });
+        tablePlugin.shouldMigrate = () => false;
+
+        await model.pluginLoaded(tablePlugin);
+
+        expect(model.options).toMatchObject({ valueToMigrate: 'migrated-by-version' });
+      });
+
+      it('should fallback to version comparison when shouldMigrate is false', async () => {
+        model.options.valueToMigrate = 'old-legacy';
+        model.pluginVersion = '1.0.0';
+
+        tablePlugin.meta.info.version = '1.0.0';
+        tablePlugin.onPanelMigration = (p) => ({ ...p.options, valueToMigrate: 'should-not-migrate' });
+        tablePlugin.shouldMigrate = () => false;
+
+        await model.pluginLoaded(tablePlugin);
+
+        expect(model.options).toMatchObject({ valueToMigrate: 'old-legacy' });
+      });
+
+      it('should fallback to version comparison when shouldMigrate is not defined', async () => {
+        model.options.valueToMigrate = 'old-legacy';
+        model.pluginVersion = '1.0.0';
+
+        tablePlugin.meta.info.version = '2.0.0';
+        tablePlugin.onPanelMigration = (p) => ({ ...p.options, valueToMigrate: 'migrated-by-version' });
+        tablePlugin.shouldMigrate = undefined;
+
+        await model.pluginLoaded(tablePlugin);
+
+        expect(model.options).toMatchObject({ valueToMigrate: 'migrated-by-version' });
+      });
     });
 
     it('should apply defaults', () => {
diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index 8556006879d..a13208e15e1 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -458,7 +458,7 @@ export class PanelModel implements DataConfigSource, IPanelModel {
     }
 
     if (plugin.onPanelMigration) {
-      if (version !== this.pluginVersion) {
+      if (version !== this.pluginVersion || plugin.shouldMigrate?.(this)) {
         const newPanelOptions = plugin.onPanelMigration(this);
         this.options = await newPanelOptions;
         this.pluginVersion = version;

From d2f151b896fa1b2518af4824dc83424c93f5ad69 Mon Sep 17 00:00:00 2001
From: Jeff Levin <jeff.levin@grafana.com>
Date: Wed, 6 Aug 2025 13:35:56 -0800
Subject: [PATCH 004/243] update tracing guidelines for tracing (#109299)

Update contributor guidelines for tracing
---
 contribute/backend/instrumentation.md | 130 +++++++++++++++++++++++---
 1 file changed, 115 insertions(+), 15 deletions(-)

diff --git a/contribute/backend/instrumentation.md b/contribute/backend/instrumentation.md
index b2cd4d64869..18d0071e75d 100644
--- a/contribute/backend/instrumentation.md
+++ b/contribute/backend/instrumentation.md
@@ -156,9 +156,120 @@ A distributed trace is data that tracks an application request as it flows throu
 
 ### Usage
 
-Grafana uses [OpenTelemetry](https://opentelemetry.io/) for distributed tracing. There's an interface `Tracer` in the `pkg/infra/tracing` package that implements the [OpenTelemetry Tracer interface](https://pkg.go.dev/go.opentelemetry.io/otel/trace), which you can use to create traces and spans. To access `Tracer` you need to get it injected as a dependency of your service. Refer to [Services](services.md) for more details. For more information, you may also refer to [The OpenTelemetry documentation](https://opentelemetry.io/docs/instrumentation/go/manual/).
+Grafana uses [OpenTelemetry](https://opentelemetry.io/) for distributed tracing. For more information, you may also refer to [The OpenTelemetry documentation](https://opentelemetry.io/docs/instrumentation/go/manual/).
 
-For example:
+1. Import the otel package
+
+   ```Go
+   "go.opentelemetry.io/otel"
+   ```
+
+2. Initialize a package level tracer
+
+   We don't want to change the provider signature for every service across Grafana, especially in a testing scenario. otel.Tracer gets the global tracer configured in `pkg/infra/tracing` and handles whether or not we use a noop when otel is disabled.
+
+   Using the package location as the provided name allows us to determine where the trace is coming from in the event of a naming collision.
+
+   ```Go
+   var tracer = otel.Tracer("github.com/grafana/grafana/pkg/services/dashboards")
+   ```
+
+   For enterprise, refer to the enterprise repo
+
+   ```Go
+   var tracer = otel.Tracer("github.com/grafana/grafana-enterprise/src/pkg/extensions/accesscontrol")
+   ```
+
+3. Create a span
+
+   Spans are connected via the context.Context named ctx by convention. Name your span according to `<package>.<function>`. In some cases, there is a folder inside a package with a name commonly used throughout the codebase. In that case use the form `<package>.<folder>.<function>`.
+
+   It is important to match casing for each of these as it's common convention to have an internal and external functions with the same name.
+
+   Be sure to always terminate your spans.
+
+   ```Go
+   ctx, span := tracer.Start(ctx, "dashboards.store.GetDashboardByUID")
+   defer span.End()
+   ```
+
+4. Ensure spans are connected
+
+   Grafana's api package uses `*contextmodel.ReqContext` to pass between api functions with context.Context as a field on the request.
+
+   Given `func (hs *HTTPServer) isDashboardStarredByUser(c *contextmodel.ReqContext)`
+
+   you can fetch the context via `c.Req.Context()`
+
+   If you create a span, you need to ensure the new context is set on `ReqContext`
+
+   ```Go
+   ctx, span := tracer.Start(c.Req.Context(), "api.isDashboardStarredByUser")
+   defer span.End()
+   c.Req = c.Req.WithContext(ctx)
+   ```
+
+   If the function does not pass a `*contextmodel.ReqContext` to another function, do not set the `ctx`.
+
+5. Spans with no children
+   Often in the context of cpu bound work you want a context, but won't pass the child down. In this case use a blank identifier like any other variable and we will get appropriate timing from the span.
+
+   ```Go
+   _, span := tracer.Start(c.Req.Context(), "api.isDashboardStarredByUser")
+   defer span.End()
+   ```
+
+6. Deciding when to create a span
+
+   Only instrument functions that perform IO bound work like database calls or quantifiable cpu bound work. Simple wrappers in the service layer that make a call to the database should not be instrumented as they're just creating more data without giving us more insights.
+
+   For example, the following function is performing business logic, but not doing a meaningful amount of work. In this case, ensure ctx is passed to the child function and perform the tracing in `pd.store.FindByAccessToken`
+
+   ```Go
+   func (pd *PublicDashboardServiceImpl) FindByAccessToken(ctx context.Context, accessToken string) (*PublicDashboard, error) {
+     ctx, span := tracer.Start(ctx, "publicdashboards.FindByAccessToken")
+     defer span.End()
+
+     pubdash, err := pd.store.FindByAccessToken(ctx, accessToken)
+     if err != nil {
+         return nil, ErrInternalServerError.Errorf("FindByAccessToken: failed to find a public dashboard: %w", err)
+       }
+     if pubdash == nil {
+         return nil, ErrPublicDashboardNotFound.Errorf("FindByAccessToken: Public dashboard not found accessToken: %s", accessToken)
+       }
+     return pubdash, nil
+   }
+   ```
+
+7. Adding attributes for investigation
+
+   It's often helpful understand the context of a span. To help with debugging we can add attributes to a span that tell us more about the state of the function. This is very helpful for cpu bound function. In the following example we're performing a cpu bound operation and adding an attribute to the span telling us the number of permissions that were passed into the function.
+
+   Import the otel attributes and trace packages.
+
+   ```Go
+    "go.opentelemetry.io/otel/attribute"
+    "go.opentelemetry.io/otel/trace"
+   ```
+
+   Add your attributes when creating the span.
+
+   ```Go
+   func GroupScopesByActionContext(ctx context.Context, permissions []Permission) map[string][]string {
+     _, span := tracer.Start(ctx, "accesscontrol.GroupScopesByActionContext", trace.WithAttributes(
+       attribute.Int("permissions_count", len(permissions)),
+     ))
+     defer span.End()
+
+     m := make(map[string][]string)
+     for i := range permissions {
+       m[permissions[i].Action] = append(m[permissions[i].Action], permissions[i].Scope)
+     }
+      return m
+   }
+   ```
+
+Complete example
 
 ```go
 import (
@@ -169,23 +280,12 @@ import (
    "go.opentelemetry.io/otel/trace"
 )
 
-type MyService struct {
-   tracer tracing.Tracer
-}
-
-func ProvideService(tracer tracing.Tracer) *MyService {
-   return &MyService{
-      tracer: tracer,
-   }
-}
+var tracer = otel.Tracer("github.com/grafana/grafana/pkg/services/myservice")
 
 func (s *MyService) Hello(ctx context.Context, name string) (string, error) {
    ctx, span := s.tracer.Start(ctx, "MyService.Hello", trace.WithAttributes(
       attribute.String("my_attribute", "val"),
    ))
-   // make sure the span is marked as finished when this
-   // method ends to allow the span to be flushed and sent to
-   // storage backend.
    defer span.End()
 
    // Add some event to show Events usage
@@ -215,7 +315,7 @@ func (s *MyService) Hello(ctx context.Context, name string) (string, error) {
 
 ```
 
-### Naming conventions
+### Naming conventions for spans
 
 Span names should follow the [guidelines from OpenTelemetry](https://opentelemetry.io/docs/reference/specification/trace/api/#span).
 

From 4263b3a982ec7e7e83b03afc038e5a68891e4788 Mon Sep 17 00:00:00 2001
From: Alyssa Joyner <58453566+alyssajoyner@users.noreply.github.com>
Date: Wed, 6 Aug 2025 16:13:01 -0600
Subject: [PATCH 005/243] [InfluxDB]: Fix max series bug (#109291)

---
 .../config-v2/AdvancedDBConnectionSettings.tsx    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx
index cb5c7617372..d3254abbdcb 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx
@@ -5,6 +5,7 @@ import {
   onUpdateDatasourceJsonDataOption,
   onUpdateDatasourceJsonDataOptionChecked,
   onUpdateDatasourceJsonDataOptionSelect,
+  updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
 import { InlineFieldRow, InlineField, Combobox, InlineSwitch, Input, Space, useStyles2 } from '@grafana/ui';
 
@@ -24,11 +25,18 @@ import { Props } from './types';
 export const AdvancedDbConnectionSettings = (props: Props) => {
   const { options } = props;
   const styles = useStyles2(getInlineLabelStyles);
+  const [maxSeriesValue, setMaxSeriesValue] = useState(options.jsonData.maxSeries?.toString() || '');
 
   const [advancedDbConnectionSettingsIsOpen, setAdvancedDbConnectionSettingsIsOpen] = useState(
-    () => !!options.jsonData.timeInterval || !!options.jsonData.insecureGrpc
+    () => !!options.jsonData.timeInterval || !!options.jsonData.insecureGrpc || !!options.jsonData.maxSeries
   );
 
+  const onMaxSeriesChange = (e: { currentTarget: { value: string } }) => {
+    setMaxSeriesValue(e.currentTarget.value);
+    const val = parseInt(e.currentTarget.value, 10);
+    updateDatasourcePluginJsonDataOption(props, 'maxSeries', Number.isFinite(val) ? val : undefined);
+  };
+
   return (
     <>
       <Space v={2} />
@@ -125,9 +133,10 @@ export const AdvancedDbConnectionSettings = (props: Props) => {
                 className="width-15"
                 data-testid="influxdb-v2-config-max-series"
                 onBlur={trackInfluxDBConfigV2AdvancedDbConnectionSettingsMaxSeriesClicked}
-                onChange={onUpdateDatasourceJsonDataOption(props, 'maxSeries')}
+                onChange={onMaxSeriesChange}
                 placeholder="1000"
-                value={options.jsonData.maxSeries || ''}
+                value={maxSeriesValue}
+                type="number"
               />
             </InlineField>
           </InlineFieldRow>

From e36402a121ed83557edf3f815961137785ae8859 Mon Sep 17 00:00:00 2001
From: "grafana-pr-automation[bot]"
 <140550294+grafana-pr-automation[bot]@users.noreply.github.com>
Date: Thu, 7 Aug 2025 00:43:13 +0000
Subject: [PATCH 006/243] I18n: Download translations from Crowdin (#109307)

New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 .../grafana-azure-monitor-datasource.json     |  6 ++--
 public/locales/cs-CZ/grafana.json             | 35 ++++++++++++++++---
 public/locales/de-DE/grafana.json             | 35 ++++++++++++++++---
 public/locales/es-ES/grafana.json             | 35 ++++++++++++++++---
 public/locales/fr-FR/grafana.json             | 35 ++++++++++++++++---
 public/locales/hu-HU/grafana.json             | 35 ++++++++++++++++---
 public/locales/id-ID/grafana.json             | 35 ++++++++++++++++---
 public/locales/it-IT/grafana.json             | 35 ++++++++++++++++---
 public/locales/ja-JP/grafana.json             | 35 ++++++++++++++++---
 public/locales/ko-KR/grafana.json             | 35 ++++++++++++++++---
 public/locales/nl-NL/grafana.json             | 35 ++++++++++++++++---
 public/locales/pl-PL/grafana.json             | 35 ++++++++++++++++---
 public/locales/pt-BR/grafana.json             | 35 ++++++++++++++++---
 public/locales/pt-PT/grafana.json             | 35 ++++++++++++++++---
 public/locales/ru-RU/grafana.json             | 35 ++++++++++++++++---
 public/locales/sv-SE/grafana.json             | 35 ++++++++++++++++---
 public/locales/tr-TR/grafana.json             | 35 ++++++++++++++++---
 public/locales/zh-Hans/grafana.json           | 35 ++++++++++++++++---
 public/locales/zh-Hant/grafana.json           | 35 ++++++++++++++++---
 36 files changed, 594 insertions(+), 144 deletions(-)

diff --git a/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json
index 5cc1a2b2a2f..ed2e1fd18d2 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Povolit základní protokoly"
     },
     "config-editor": {
-      "description-additional-settings": "Další nastavení jsou volitelná nastavení, která lze nakonfigurovat pro větší kontrolu nad zdrojem dat. To zahrnuje zabezpečený proxy server Socks.",
-      "description-request-timeout": "Nastavte časový limit požadavku v sekundách. Výchozí hodnota je 30 sekund.",
-      "title-additional-settings": "Další nastavení",
-      "title-request-timeout": "Vypršení časového limitu požadavku"
+      "description-additional-settings": "",
+      "title-additional-settings": "Další nastavení"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Záložní přihlašovací údaje byly zakázány. Vzhledem k tomu, že ověření uživatele samo o sobě podporuje pouze požadavky s uživatelem v rozsahu, funkce, jako je upozorňování, zaznamenané dotazy nebo vykazování, nebudou fungovat podle očekávání. Další podrobnosti najdete v <2>dokumentaci</2>.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json
index 35e9b918ffe..7bd9f8ad1ff 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Basis-Logs aktivieren"
     },
     "config-editor": {
-      "description-additional-settings": "Zusätzliche Einstellungen sind optionale Einstellungen, die für mehr Kontrolle über Ihre Datenquelle konfiguriert werden können. Dazu gehört auch der sichere SOCKS-Proxy.",
-      "description-request-timeout": "Legen Sie das Anfrage-Timeout in Sekunden fest. Der Standardwert ist 30 Sekunden.",
-      "title-additional-settings": "Zusätzliche Einstellungen",
-      "title-request-timeout": "Anfrage-Timeout"
+      "description-additional-settings": "",
+      "title-additional-settings": "Zusätzliche Einstellungen"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Fallback-Anmeldedaten wurden deaktiviert. Da die nutzerbasierte Authentifizierung grundsätzlich nur Anfragen mit einem Nutzer im Geltungsbereich unterstützt, funktionieren Funktionen wie Warnungen, aufgezeichnete Abfragen oder die Berichtserstellung nicht wie erwartet. Weitere Informationen finden Sie in der <2>Dokumentation</2>.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json
index 0598f21581e..79719488e92 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Habilitar logs básicos"
     },
     "config-editor": {
-      "description-additional-settings": "Los ajustes adicionales son ajustes opcionales que se pueden configurar para tener un mayor control sobre su fuente de datos. Esto incluye el proxy SOCKS seguro.",
-      "description-request-timeout": "Establezca el tiempo de espera de la solicitud en segundos. El valor predeterminado es 30 segundos.",
-      "title-additional-settings": "Configuraciones adicionales",
-      "title-request-timeout": "Tiempo de espera de solicitud agotado"
+      "description-additional-settings": "",
+      "title-additional-settings": "Configuraciones adicionales"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Las credenciales de reserva se han desactivado. Puesto que la autenticación basada en el usuario solo puede admitir solicitudes con un usuario en alcance, las funciones como las alertas, las consultas registradas o los informes no funcionarán como se espera. Revise la <2>documentación</2> para obtener más información.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json
index 2016ca6e93c..427f2535fe4 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Activer les journaux de base"
     },
     "config-editor": {
-      "description-additional-settings": "Les paramètres supplémentaires sont des paramètres facultatifs qui peuvent être configurés pour un meilleur contrôle de votre source de données. Cela inclut le proxy Socks sécurisé.",
-      "description-request-timeout": "Définissez le délai d’expiration de la demande en secondes. La valeur par défaut est de 30 secondes.",
-      "title-additional-settings": "Paramètres supplémentaires",
-      "title-request-timeout": "Délai d’expiration de la demande"
+      "description-additional-settings": "",
+      "title-additional-settings": "Paramètres supplémentaires"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Les identifiants de secours ont été désactivés. Étant donné que l’authentification basée sur l’utilisateur ne prend en charge que les demandes avec un utilisateur dans la portée, les fonctionnalités telles que les alertes, les requêtes enregistrées ou les rapports ne fonctionneront pas comme prévu. Veuillez consulter la <2>documentation</2> pour en savoir plus.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json
index c98cfef6f88..f2ebab0cfa7 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Alapvető naplók engedélyezése"
     },
     "config-editor": {
-      "description-additional-settings": "A további beállítások olyan opcionális beállítások, amelyek konfigurálhatók az adatforrás nagyobb mértékű ellenőrzése érdekében. Ez magában foglalja a Secure Socks Proxyt.",
-      "description-request-timeout": "Állítsa be a kérelem időtúllépési időtartamát másodpercben. Az alapértelmezés a 30 másodperc.",
-      "title-additional-settings": "További beállítások",
-      "title-request-timeout": "Kérelem időtúllépése"
+      "description-additional-settings": "",
+      "title-additional-settings": "További beállítások"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Az alapértelmezett hitelesítő adatok le lettek tiltva. Mivel a felhasználóalapú hitelesítés eredendően csak a hatókörben felhasználót tartalmazó kéréseket támogatja, az olyan funkciók, mint a riasztás, a rögzített lekérdezések vagy a jelentéskészítés, nem fognak az elvárt módon működni. További részletekért tekintse át a <2>dokumentációt</2>.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json
index 97a602eddb5..ee9028509bc 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Aktifkan Log Dasar"
     },
     "config-editor": {
-      "description-additional-settings": "Pengaturan tambahan adalah pengaturan opsional yang dapat dikonfigurasi agar memiliki kendali lebih besar atas sumber data Anda. Ini mencakup Secure Socks Proxy.",
-      "description-request-timeout": "Atur batas waktu permintaan dalam hitungan detik. Default-nya 30 detik.",
-      "title-additional-settings": "Pengaturan tambahan",
-      "title-request-timeout": "Batas Waktu Permintaan"
+      "description-additional-settings": "",
+      "title-additional-settings": "Pengaturan tambahan"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Kredensial fallback telah dinonaktifkan. Karena autentikasi berbasis pengguna hanya mendukung permintaan dengan pengguna dalam cakupannya, fitur seperti peringatan, kueri yang direkam, atau pelaporan tidak akan berfungsi seperti yang diharapkan. Silakan tinjau <2>dokumentasi</2> untuk detail selengkapnya.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json
index d80842144d7..cea4008d964 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Abilita registri di base"
     },
     "config-editor": {
-      "description-additional-settings": "Le impostazioni aggiuntive sono impostazioni facoltative che possono essere configurate per un maggiore controllo sull'origine dei dati. Ciò include il proxy Secure Socks.",
-      "description-request-timeout": "Imposta il timeout della richiesta in secondi. Il valore predefinito è 30 secondi.",
-      "title-additional-settings": "Impostazioni aggiuntive",
-      "title-request-timeout": "Timeout della richiesta"
+      "description-additional-settings": "",
+      "title-additional-settings": "Impostazioni aggiuntive"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Le credenziali di fallback sono state disabilitate. Poiché l'autenticazione basata sull'utente supporta solo richieste con un utente nell'ambito, funzionalità come avvisi, query registrate o report non funzioneranno come previsto. Consulta la <2>documentazione</2> per ulteriori dettagli.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json
index 0371d58341e..c005a2e6c4a 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "基本ログを有効にする"
     },
     "config-editor": {
-      "description-additional-settings": "追加設定は、データソースをよりきめ細かく制御するために設定できるオプション設定です。これには、Socket Secureプロキシ（SOCKS）が含まれます。",
-      "description-request-timeout": "リクエストタイムアウトを秒単位で設定します。デフォルトは30秒です。",
-      "title-additional-settings": "追加設定",
-      "title-request-timeout": "リクエストタイムアウト"
+      "description-additional-settings": "",
+      "title-additional-settings": "追加設定"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "フォールバック認証情報が無効になっています。ユーザーベース認証は、本質的にスコープ内のユーザーのリクエストのみをサポートするため、アラート、記録クエリ、レポートなどの機能は想定どおりに機能しません。詳細については、<2>ドキュメント</2>をご覧ください。",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json
index 05f9c345b61..1c5f2a6a834 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "기본 로그 활성화"
     },
     "config-editor": {
-      "description-additional-settings": "추가 설정은 데이터 소스를 보다 세부적으로 제어하기 위해 구성할 수 있는 선택적 설정입니다. 여기에는 보안 SOCKS 프록시가 포함됩니다.",
-      "description-request-timeout": "요청 타임아웃을 초 단위로 설정합니다. 기본값은 30초입니다.",
-      "title-additional-settings": "추가 설정",
-      "title-request-timeout": "요청 타임아웃"
+      "description-additional-settings": "",
+      "title-additional-settings": "추가 설정"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "예비 자격 증명이 비활성화되었습니다. 사용자 기반 인증은 본질적으로 적용 범위 내의 사용자가 있는 요청만 지원하므로 알림, 기록된 쿼리 또는 보고와 같은 기능은 예상대로 작동하지 않습니다. 자세한 내용은 <2>문서</2>를 참고하세요.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json
index b4dfec3ba2d..930c043a9b9 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Basislogboeken inschakelen"
     },
     "config-editor": {
-      "description-additional-settings": "Aanvullende instellingen zijn optionele instellingen die kunnen worden geconfigureerd voor meer controle over je gegevensbron. Dit omvat Secure Socks Proxy.",
-      "description-request-timeout": "Stel de time-out van het verzoek in seconden in. Standaard is 30 seconden.",
-      "title-additional-settings": "Aanvullende instellingen",
-      "title-request-timeout": "Time-out verzoek"
+      "description-additional-settings": "",
+      "title-additional-settings": "Aanvullende instellingen"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Fallback-inloggegevens zijn uitgeschakeld. Omdat op gebruikers gebaseerde authenticatie alleen inherent verzoeken met een gebruiker in het bereik ondersteunt, werken functies zoals waarschuwingen, opgenomen query's of rapportage niet zoals verwacht. Bekijk de <2>documentatie</2> voor meer informatie.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json
index 35a898d5ea5..136aee9a605 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Włącz podstawowe dzienniki"
     },
     "config-editor": {
-      "description-additional-settings": "Dodatkowe ustawienia to opcje, które można skonfigurować, aby uzyskać większą kontrolę nad źródłem danych. Obejmuje to bezpieczny serwer proxy SOCKS.",
-      "description-request-timeout": "Ustaw limit czasu żądania w sekundach. Domyślnie jest to 30 sekund.",
-      "title-additional-settings": "Ustawienia dodatkowe",
-      "title-request-timeout": "Limit czasu żądania"
+      "description-additional-settings": "",
+      "title-additional-settings": "Ustawienia dodatkowe"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Zastępcze dane uwierzytelniające zostały wyłączone. Ponieważ uwierzytelnianie oparte na użytkowniku z natury rzeczy obsługuje tylko żądania z użytkownikiem w zakresie, funkcje takie jak alerty, zarejestrowane zapytania lub raportowanie nie będą działać zgodnie z oczekiwaniami. Więcej szczegółów znajdziesz w <2>dokumentacji</2>.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json
index 579b5e3de9b..c58be15b5ab 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Ativar logs básicos"
     },
     "config-editor": {
-      "description-additional-settings": "As configurações adicionais são opcionais, e você pode defini-las para ter mais controle sobre sua fonte de dados. Isso inclui o proxy SOCKS seguro.",
-      "description-request-timeout": "Defina o tempo limite de solicitação em segundos. O tempo limite padrão é de 30 segundos.",
-      "title-additional-settings": "Configurações adicionais",
-      "title-request-timeout": "Tempo limite de solicitação"
+      "description-additional-settings": "",
+      "title-additional-settings": "Configurações adicionais"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "As credenciais de fallback foram desativadas. Como a autenticação baseada no usuário é compatível apenas com solicitações que apresentem um usuário no escopo, recursos como alertas, consultas gravadas ou relatórios não funcionarão como esperado. Consulte a <2>documentação</2> para saber mais.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json
index a8b21afb9bf..ad6c46ddfa6 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Ativar registos básicos"
     },
     "config-editor": {
-      "description-additional-settings": "As definições adicionais são definições opcionais que podem ser configuradas para obter mais controlo sobre a sua fonte de dados. Isto inclui um proxy Socks seguro.",
-      "description-request-timeout": "Defina o tempo limite do pedido em segundos. A predefinição é de 30 segundos.",
-      "title-additional-settings": "Definições adicionais",
-      "title-request-timeout": "Tempo limite do pedido"
+      "description-additional-settings": "",
+      "title-additional-settings": "Definições adicionais"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "As credenciais alternativas foram desativadas. Uma vez que a autenticação baseada no utilizador suporta apenas inerentemente pedidos que incluam um utilizador, funcionalidades como alertas, consultas gravadas ou relatórios não funcionarão conforme o esperado. Consulte a <2>documentação</2> para obter mais detalhes.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json
index 86b74a5a63e..626eea08ed4 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Включить базовые журналы"
     },
     "config-editor": {
-      "description-additional-settings": "Дополнительные параметры — это необязательные параметры, которые можно настроить для получения большего контроля над источником данных. Сюда входит безопасный Socks-прокси.",
-      "description-request-timeout": "Установите время ожидания запроса (в секундах). Настройка по умолчанию — 30 секунд.",
-      "title-additional-settings": "Дополнительные параметры",
-      "title-request-timeout": "Превышено время ожидания запроса"
+      "description-additional-settings": "",
+      "title-additional-settings": "Дополнительные параметры"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Резервные учетные данные отключены. Поскольку аутентификация на основе пользователей по своей сути поддерживает только запросы, в область действия которых входит пользователь, то такие функции, как оповещение, записанные запросы или создание отчетов, не будут работать должным образом. Подробнее — в <2>документации</2>.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json
index 2bb3e9af54d..8000fd88592 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Aktivera basloggar"
     },
     "config-editor": {
-      "description-additional-settings": "Ytterligare inställningar är valfria inställningar som kan konfigureras för ökad kontroll över din datakälla. Detta inkluderar Säker SOCKS-proxy.",
-      "description-request-timeout": "Ställ in timeout för begäran i sekunder. Standard är 30 sekunder.",
-      "title-additional-settings": "Ytterligare inställningar",
-      "title-request-timeout": "Timeout för begäran"
+      "description-additional-settings": "",
+      "title-additional-settings": "Ytterligare inställningar"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Reservautentiseringsuppgifter har inaktiverats. Eftersom användarbaserad autentisering i grunden endast stöder förfrågningar som är kopplade till en enskild användare kommer funktioner som aviseringar, registrerade frågor eller rapportering inte att fungera som förväntat. Läs <2>dokumentationen</2> för mer information.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json
index 23634d0e331..12fe56fed24 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "Temel Günlükleri Etkinleştir"
     },
     "config-editor": {
-      "description-additional-settings": "Ek ayarlar, veri kaynağınız üzerinde daha fazla kontrol sağlamak için yapılandırılabilen isteğe bağlı ayarlardır. Buna Güvenli Socks Proxy de dâhildir.",
-      "description-request-timeout": "İstek zaman aşımı süresini saniye cinsinden ayarlayın. Varsayılan 30 saniye.",
-      "title-additional-settings": "Ek ayarlar",
-      "title-request-timeout": "İstek Zaman Aşımı"
+      "description-additional-settings": "",
+      "title-additional-settings": "Ek ayarlar"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "Yedek kimlik bilgileri devre dışı bırakıldı. Kullanıcı tabanlı kimlik doğrulama doğası gereği yalnızca bir kullanıcının dâhil olduğu istekleri desteklediğinden uyarı, kayıtlı sorgular veya raporlama gibi özellikler beklendiği gibi çalışmayabilir. Daha fazla ayrıntı için lütfen <2>belgeleri</2> inceleyin.",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json
index dac8dadbaf6..610b1e8f659 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "启用基本日志"
     },
     "config-editor": {
-      "description-additional-settings": "附加设置是可选设置，可通过配置对数据源进行更多控制。其中包括安全 Socks 代理。",
-      "description-request-timeout": "以秒为单位设置请求超时。默认为 30 秒。",
-      "title-additional-settings": "附加设置",
-      "title-request-timeout": "请求超时"
+      "description-additional-settings": "",
+      "title-additional-settings": "附加设置"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "后备凭证已禁用。由于基于用户的身份验证本质上只支持用户范围内的请求，因此提醒、记录查询或报告等功能将无法按预期运行。请查看<2>文档</2>，了解更多详情。",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json
index bcf652b0350..a4adbd76c1c 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json
@@ -72,10 +72,8 @@
       "label-enable-basic-logs": "啟用基本紀錄"
     },
     "config-editor": {
-      "description-additional-settings": "附加設定為可選設定，可進行設定以便更妥善掌控您的資料來源，其中包括安全 Socks 代理。",
-      "description-request-timeout": "設定請求逾時時間（秒）。預設為 30 秒。",
-      "title-additional-settings": "附加設定",
-      "title-request-timeout": "請求逾時"
+      "description-additional-settings": "",
+      "title-additional-settings": "附加設定"
     },
     "current-user-fallback-credentials": {
       "alert-fallback-credentials-disabled": "備用憑證已停用。由於使用者型驗證本質上僅支援範圍內的使用者請求，因此警報、已記錄查詢或報告等功能將無法按預期運作。請查看<2>文件</2>，了解更多詳細資訊。",
diff --git a/public/locales/cs-CZ/grafana.json b/public/locales/cs-CZ/grafana.json
index 5b4ee2e4bcb..4c7efd32324 100644
--- a/public/locales/cs-CZ/grafana.json
+++ b/public/locales/cs-CZ/grafana.json
@@ -3515,7 +3515,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Zrušit",
-      "cannot-move-folders": "Složky nelze přesunout",
       "confirmation-text": "Odstranit",
       "delete-button": "Odstranit",
       "delete-modal-invalid-text": "Jedna nebo více složek obsahuje panely knihovny nebo pravidla výstrah. Chcete-li pokračovat, nejprve je odstraňte.",
@@ -3626,6 +3625,7 @@
     },
     "folder-actions-button": {
       "delete": "Odstranit",
+      "delete-folder-error": "",
       "folder-actions": "Akce složky",
       "manage-permissions": "Spravovat oprávnění",
       "move": "Přesunout"
@@ -4356,7 +4356,7 @@
       "source-label": "Zdroj",
       "sub-text": "<0>Definujte, jaký zdroj dat bude zobrazovat korelaci a jaká data nahradí dříve definované proměnné.</0>"
     },
-    "sub-title": "Definujte, jak spolu souvisí data uložená v různých zdrojích dat. Další informace najdete v <2>dokumentaci<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Toto pole je povinné.",
       "sub-text": "<0>Definujte, na co bude korelace odkazovat. S typem dotazu se dotaz spustí po kliknutí na korelaci. U externího typu se kliknutím na korelaci otevře adresa URL.</0>",
@@ -4759,7 +4759,7 @@
       "add-visualization-body": "Vyberte zdroj dat a poté se dotazujte a vizualizujte data pomocí grafů, statistik a tabulek nebo vytvářejte seznamy, přehledy a další widgety.",
       "add-visualization-button": "Přidat vizualizaci",
       "add-visualization-header": "Začněte novou nástěnku přidáním vizualizace",
-      "import-a-dashboard-body": "Importujte nástěnky ze souborů nebo z <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Importovat nástěnku",
       "import-dashboard-button": "Importovat nástěnku"
     },
@@ -7540,6 +7540,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10372,7 +10375,7 @@
     },
     "invite-user": {
       "invite-button": "Pozvat",
-      "invite-new-member-button": "Pozvat nového člena",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11160,6 +11163,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11379,6 +11390,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11585,6 +11604,14 @@
     },
     "token-permissions-info": {
       "and-click": "a klikněte",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Přejít na",
       "make-sure": "Nezapomeňte zahrnout tato oprávnění"
     },
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index bdc7fabddfa..a92807cbf5f 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -3489,7 +3489,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Abbrechen",
-      "cannot-move-folders": "Ordner können nicht verschoben werden",
       "confirmation-text": "Löschen",
       "delete-button": "Löschen",
       "delete-modal-invalid-text": "Ein oder mehrere Ordner enthalten Bibliotheksfenster oder Alarmierungsregeln. Löschen Sie diese zuerst, um fortzufahren.",
@@ -3588,6 +3587,7 @@
     },
     "folder-actions-button": {
       "delete": "Löschen",
+      "delete-folder-error": "",
       "folder-actions": "Ordneraktionen",
       "manage-permissions": "Berechtigungen verwalten",
       "move": "Verschieben"
@@ -4318,7 +4318,7 @@
       "source-label": "Quelle",
       "sub-text": "<0>Definieren, welche Datenquelle die Korrelation anzeigt und welche Daten die zuvor definierten Variablen ersetzen sollen. </0>"
     },
-    "sub-title": "Definieren, wie sich Daten in verschiedenen Datenquellen miteinander verbinden. Lesen Sie mehr in der <2>Dokumentation<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Dieses Feld ist erforderlich.",
       "sub-text": "<0>Definiere, wohin die Korrelation verlinken soll. Mit dem Typ „Abfrage“ wird eine Abfrage ausgeführt, wenn auf die Korrelation geklickt wird. Beim Typ „Extern“ wird durch Klicken auf die Korrelation eine URL geöffnet.</0>",
@@ -4721,7 +4721,7 @@
       "add-visualization-body": "Wählen Sie eine Datenquelle aus und visualisieren und fragen Sie dann Ihre Daten mit Diagrammen, Statistiken und Tabellen ab oder erstellen Sie Listen, Markierungen und andere Widgets.",
       "add-visualization-button": "Visualisierung hinzufügen",
       "add-visualization-header": "Starten Sie Ihr neues Dashboard, indem Sie eine Visualisierung hinzufügen",
-      "import-a-dashboard-body": "Importiere Dashboards aus Dateien oder von <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Dashboard importieren",
       "import-dashboard-button": "Dashboard importieren"
     },
@@ -7496,6 +7496,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10312,7 +10315,7 @@
     },
     "invite-user": {
       "invite-button": "",
-      "invite-new-member-button": "Neues Mitglied einladen",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11094,6 +11097,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11307,6 +11318,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11513,6 +11532,14 @@
     },
     "token-permissions-info": {
       "and-click": "und klicken",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Weiter zu",
       "make-sure": "Achten Sie darauf, dass diese Berechtigungen berücksichtigt werden"
     },
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index a60b53ee43a..dcd55fa22b4 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -3489,7 +3489,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Cancelar",
-      "cannot-move-folders": "Las carpetas no se pueden mover",
       "confirmation-text": "Eliminar",
       "delete-button": "Eliminar",
       "delete-modal-invalid-text": "Una o más carpetas contienen paneles de biblioteca o reglas de alerta. Para continuar, primero elimínelas.",
@@ -3588,6 +3587,7 @@
     },
     "folder-actions-button": {
       "delete": "Eliminar",
+      "delete-folder-error": "",
       "folder-actions": "Acciones de la carpeta",
       "manage-permissions": "Gestionar permisos",
       "move": "Mover"
@@ -4318,7 +4318,7 @@
       "source-label": "Fuente",
       "sub-text": "<0>Defina qué fuente de datos mostrará la correlación y qué datos reemplazarán a las variables previamente definidas.</0>"
     },
-    "sub-title": "Defina cómo se relacionan los datos que se encuentran en diferentes fuentes de datos. Más información en la <2>documentación<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Este campo es obligatorio.",
       "sub-text": "<0>Define a qué elemento se vinculará la correlación. Con el tipo de consulta, se ejecutará una consulta cuando se haga clic en la correlación. Con el tipo externo, al hacer clic en la correlación se abrirá una URL.</0>",
@@ -4721,7 +4721,7 @@
       "add-visualization-body": "Selecciona una fuente de datos y luego consulta y visualiza tus datos con gráficos, estadísticas y tablas o cree listas, anotaciones y otros widgets.",
       "add-visualization-button": "Añadir visualización",
       "add-visualization-header": "Comienza tu nuevo panel de control añadiendo una visualización",
-      "import-a-dashboard-body": "Importa paneles de control desde archivos o <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Importar un tablero",
       "import-dashboard-button": "Importar panel de control"
     },
@@ -7496,6 +7496,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10312,7 +10315,7 @@
     },
     "invite-user": {
       "invite-button": "",
-      "invite-new-member-button": "Invitar a un nuevo miembro",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11094,6 +11097,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11307,6 +11318,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11513,6 +11532,14 @@
     },
     "token-permissions-info": {
       "and-click": "y haz clic en",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Ir a",
       "make-sure": "Asegúrate de incluir estos permisos"
     },
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 9e7ce283780..ceb7c46da8b 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -3489,7 +3489,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Annuler",
-      "cannot-move-folders": "Les dossiers ne peuvent pas être déplacés",
       "confirmation-text": "Supprimer",
       "delete-button": "Supprimer",
       "delete-modal-invalid-text": "Un ou plusieurs dossiers contiennent des panneaux Bibliothèque ou des règles d'alerte. Vous devez d'abord les supprimer.",
@@ -3588,6 +3587,7 @@
     },
     "folder-actions-button": {
       "delete": "Supprimer",
+      "delete-folder-error": "",
       "folder-actions": "Actions sur le dossier",
       "manage-permissions": "Gérer les autorisations",
       "move": "Déplacer"
@@ -4318,7 +4318,7 @@
       "source-label": "Source",
       "sub-text": "<0>Définissez quelle source de données affichera la corrélation et quelles données remplaceront les variables précédemment définies.</0>"
     },
-    "sub-title": "Définissez comment les données provenant de différentes sources de données se rapportent l’une à l’autre. En savoir plus dans la <2>documentation<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Ce champ est obligatoire.",
       "sub-text": "<0>Définissez l'objet de la corrélation. Avec le type requête, une requête sera exécutée lorsque vous cliquerez sur la corrélation. Avec le type externe, un clic sur la corrélation ouvrira une URL.</0>",
@@ -4721,7 +4721,7 @@
       "add-visualization-body": "Sélectionnez une source de données, puis examinez et visualisez vos données avec des graphiques, des statistiques et des tableaux ou créez des listes, des markdowns et d'autres widgets.",
       "add-visualization-button": "Ajouter une visualisation",
       "add-visualization-header": "Commencez votre nouveau tableau de bord en ajoutant une visualisation",
-      "import-a-dashboard-body": "Importez des tableaux de bord à partir de fichiers ou de <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Importer un tableau de bord",
       "import-dashboard-button": "Importer un tableau de bord"
     },
@@ -7496,6 +7496,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10312,7 +10315,7 @@
     },
     "invite-user": {
       "invite-button": "Inviter",
-      "invite-new-member-button": "Inviter un nouveau membre",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11094,6 +11097,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11307,6 +11318,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11513,6 +11532,14 @@
     },
     "token-permissions-info": {
       "and-click": "et cliquez",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Accéder à",
       "make-sure": "Assurez-vous d’inclure ces autorisations"
     },
diff --git a/public/locales/hu-HU/grafana.json b/public/locales/hu-HU/grafana.json
index 509496f1867..7e6afb9f14f 100644
--- a/public/locales/hu-HU/grafana.json
+++ b/public/locales/hu-HU/grafana.json
@@ -3489,7 +3489,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Mégse",
-      "cannot-move-folders": "A mappák nem helyezhetők át",
       "confirmation-text": "Törlés",
       "delete-button": "Törlés",
       "delete-modal-invalid-text": "Egy vagy több mappa könyvtárpaneleket vagy riasztási szabályokat tartalmaz. A folytatáshoz először törölje ezeket.",
@@ -3588,6 +3587,7 @@
     },
     "folder-actions-button": {
       "delete": "Törlés",
+      "delete-folder-error": "",
       "folder-actions": "Mappaműveletek",
       "manage-permissions": "Engedélyek kezelése",
       "move": "Áthelyezés"
@@ -4318,7 +4318,7 @@
       "source-label": "Forrás",
       "sub-text": "<0>Határozza meg, hogy melyik adatforrás jeleníti meg a korrelációt, és mely adatok helyettesítik a korábban meghatározott változókat.</0>"
     },
-    "sub-title": "Határozza meg, hogy a különböző adatforrásokban élő adatok hogyan kapcsolódnak egymáshoz. További információ a <2>dokumentációban<1></1></2> található",
+    "sub-title": "",
     "target-form": {
       "control-rules": "A mező kitöltése kötelező.",
       "sub-text": "<0>Határozza meg, hogy mihez kapcsolódik a korreláció. A lekérdezéstípusnál egy lekérdezés akkor fut le, amikor a korrelációra kattintanak. A külső típusnál a korrelációra kattintva megnyílik egy URL-cím.</0>",
@@ -4721,7 +4721,7 @@
       "add-visualization-body": "Válasszon ki egy adatforrást, majd kérdezze le és jelenítse meg az adatait diagramokkal, statisztikákkal és táblázatokkal, vagy hozzon létre listákat, Markdown-elemeket és egyéb widgeteket.",
       "add-visualization-button": "Vizualizáció hozzáadása",
       "add-visualization-header": "Indítsa el az új irányítópultot vizualizáció hozzáadásával",
-      "import-a-dashboard-body": "Irányítópultok importálása fájlokból vagy a <1>grafana.com</1> webhelyről.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Irányítópult importálása",
       "import-dashboard-button": "Irányítópult importálása"
     },
@@ -7496,6 +7496,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10312,7 +10315,7 @@
     },
     "invite-user": {
       "invite-button": "Meghívás",
-      "invite-new-member-button": "Új tag meghívása",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11094,6 +11097,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11307,6 +11318,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11513,6 +11532,14 @@
     },
     "token-permissions-info": {
       "and-click": "és kattintson erre:",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Tovább ide:",
       "make-sure": "Mindenképpen foglalja bele ezeket az engedélyeket"
     },
diff --git a/public/locales/id-ID/grafana.json b/public/locales/id-ID/grafana.json
index f6f53b79b16..a57dac22e90 100644
--- a/public/locales/id-ID/grafana.json
+++ b/public/locales/id-ID/grafana.json
@@ -3476,7 +3476,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Batalkan",
-      "cannot-move-folders": "Folder tidak dapat dipindahkan",
       "confirmation-text": "Hapus",
       "delete-button": "Hapus",
       "delete-modal-invalid-text": "Satu atau beberapa folder berisi panel pustaka atau aturan peringatan. Hapus ini terlebih dahulu untuk melanjutkan.",
@@ -3569,6 +3568,7 @@
     },
     "folder-actions-button": {
       "delete": "Hapus",
+      "delete-folder-error": "",
       "folder-actions": "Tindakan folder",
       "manage-permissions": "Kelola izin",
       "move": "Pindahkan"
@@ -4299,7 +4299,7 @@
       "source-label": "Sumber",
       "sub-text": "<0>Tentukan sumber data apa yang akan menampilkan korelasi, dan data yang akan menggantikan variabel yang ditentukan sebelumnya.</0>"
     },
-    "sub-title": "Tentukan cara data yang berada di sumber data yang berbeda saling berhubungan. Baca selengkapnya di <2>dokumentasi<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Bidang ini wajib diisi.",
       "sub-text": "<0>Tentukan korelasi yang akan ditautkan. Dengan jenis kueri, kueri akan berjalan saat korelasi diklik. Dengan jenis eksternal, mengklik korelasi akan membuka URL.</0>",
@@ -4702,7 +4702,7 @@
       "add-visualization-body": "Pilih sumber data, kemudian kueri dan visualisasikan data Anda dengan bagan, statistik, dan tabel atau buat daftar, markdown, dan widget lainnya.",
       "add-visualization-button": "Tambahkan visualisasi",
       "add-visualization-header": "Mulai dasbor baru Anda dengan menambahkan visualisasi",
-      "import-a-dashboard-body": "Impor dasbor dari file atau <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Impor dasbor",
       "import-dashboard-button": "Impor dasbor"
     },
@@ -7474,6 +7474,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10282,7 +10285,7 @@
     },
     "invite-user": {
       "invite-button": "Undang",
-      "invite-new-member-button": "Undang anggota baru",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11061,6 +11064,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11271,6 +11282,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11477,6 +11496,14 @@
     },
     "token-permissions-info": {
       "and-click": "dan klik",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Buka",
       "make-sure": "Pastikan Anda menyertakan izin ini"
     },
diff --git a/public/locales/it-IT/grafana.json b/public/locales/it-IT/grafana.json
index bc36062bb75..5a5ffed422a 100644
--- a/public/locales/it-IT/grafana.json
+++ b/public/locales/it-IT/grafana.json
@@ -3489,7 +3489,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Annulla",
-      "cannot-move-folders": "Non è possibile spostare le cartelle",
       "confirmation-text": "Elimina",
       "delete-button": "Elimina",
       "delete-modal-invalid-text": "Una o più cartelle contengono pannelli della libreria o regole di avviso. Eliminarli prima di procedere.",
@@ -3588,6 +3587,7 @@
     },
     "folder-actions-button": {
       "delete": "Elimina",
+      "delete-folder-error": "",
       "folder-actions": "Azioni cartella",
       "manage-permissions": "Gestisci autorizzazioni",
       "move": "Sposta"
@@ -4318,7 +4318,7 @@
       "source-label": "Origine",
       "sub-text": "<0>Definisci quale origine dati visualizzerà la correlazione e quali dati sostituiranno le variabili precedentemente definite.</0>"
     },
-    "sub-title": "Definisci il modo in cui i dati che risiedono in diverse origini dati sono correlati tra loro. Scopri di più nella <2>documentazione<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Questo campo è obbligatorio.",
       "sub-text": "<0>Definisci a cosa si collegherà la correlazione. Con il tipo di query, quando si fa clic sulla correlazione verrà eseguita una query. Con il tipo esterno, facendo clic sulla correlazione si aprirà un URL.</0>",
@@ -4721,7 +4721,7 @@
       "add-visualization-body": "Seleziona un'origine dati, quindi esegui query e visualizza i dati con grafici, statistiche e tabelle o crea elenchi, markdown e altri widget.",
       "add-visualization-button": "Aggiungi visualizzazione",
       "add-visualization-header": "Avvia il tuo nuovo dashboard aggiungendo una visualizzazione",
-      "import-a-dashboard-body": "Importa dashboard da file o <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Importa un dashboard",
       "import-dashboard-button": "Importa dashboard"
     },
@@ -7496,6 +7496,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10312,7 +10315,7 @@
     },
     "invite-user": {
       "invite-button": "Invito",
-      "invite-new-member-button": "Invita un nuovo membro",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11094,6 +11097,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11307,6 +11318,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11513,6 +11532,14 @@
     },
     "token-permissions-info": {
       "and-click": "e fare clic",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Vai a",
       "make-sure": "Assicurati di includere queste autorizzazioni"
     },
diff --git a/public/locales/ja-JP/grafana.json b/public/locales/ja-JP/grafana.json
index bf03154829d..454b3716d91 100644
--- a/public/locales/ja-JP/grafana.json
+++ b/public/locales/ja-JP/grafana.json
@@ -3476,7 +3476,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "キャンセル",
-      "cannot-move-folders": "フォルダは移動できません",
       "confirmation-text": "削除",
       "delete-button": "削除",
       "delete-modal-invalid-text": "1つ以上のフォルダにライブラリパネルまたはアラートルールが含まれています。続行するには、まずこれらを削除してください。",
@@ -3569,6 +3568,7 @@
     },
     "folder-actions-button": {
       "delete": "削除",
+      "delete-folder-error": "",
       "folder-actions": "フォルダの操作",
       "manage-permissions": "権限を管理する",
       "move": "移動"
@@ -4299,7 +4299,7 @@
       "source-label": "送信元",
       "sub-text": "<0>どのデータソースが相関を表示するか、どのデータが以前に定義された変数を置き換えるかを定義します。</0>"
     },
-    "sub-title": "異なるデータソースに存在するデータがどのように相互に関連しているかを定義します。詳細については、<2>ドキュメント<1></1></2>をご覧ください",
+    "sub-title": "",
     "target-form": {
       "control-rules": "このフィールドは必須です。",
       "sub-text": "<0>相関がリンクするものを定義します。クエリタイプを使用すると、相関がクリックされたときにクエリが実行されます。外部タイプでは、相関をクリックするとURLが開きます。</0>",
@@ -4702,7 +4702,7 @@
       "add-visualization-body": "データソースを選択し、グラフ、統計、テーブルを使用してデータをクエリおよび視覚化するか、リスト、マークダウン、その他のウィジェットを作成します。",
       "add-visualization-button": "視覚化を追加",
       "add-visualization-header": "視覚化を追加して新しいダッシュボードを開始します",
-      "import-a-dashboard-body": "ファイルまたは<1>grafana.com</1>からダッシュボードをインポートします。",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "ダッシュボードをインポートする",
       "import-dashboard-button": "ダッシュボードをインポート"
     },
@@ -7474,6 +7474,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10282,7 +10285,7 @@
     },
     "invite-user": {
       "invite-button": "招待",
-      "invite-new-member-button": "新しいメンバーの招待",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11061,6 +11064,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11271,6 +11282,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11477,6 +11496,14 @@
     },
     "token-permissions-info": {
       "and-click": "そしてクリック",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "進む",
       "make-sure": "これらの権限を必ず含めてください"
     },
diff --git a/public/locales/ko-KR/grafana.json b/public/locales/ko-KR/grafana.json
index d330399ad09..d1dd13457bf 100644
--- a/public/locales/ko-KR/grafana.json
+++ b/public/locales/ko-KR/grafana.json
@@ -3476,7 +3476,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "취소",
-      "cannot-move-folders": "폴더는 이동할 수 없습니다.",
       "confirmation-text": "삭제",
       "delete-button": "삭제",
       "delete-modal-invalid-text": "하나 이상의 폴더에 라이브러리 패널 또는 경고 규칙이 포함되어 있습니다. 계속하려면 먼저 이 항목들을 삭제하세요.",
@@ -3569,6 +3568,7 @@
     },
     "folder-actions-button": {
       "delete": "삭제",
+      "delete-folder-error": "",
       "folder-actions": "폴더 작업",
       "manage-permissions": "권한 관리",
       "move": "이동"
@@ -4299,7 +4299,7 @@
       "source-label": "소스",
       "sub-text": "<0>상관 관계를 표시할 데이터 소스와 이전에 정의된 변수를 대체할 데이터를 정의합니다.</0>"
     },
-    "sub-title": "다른 데이터 소스에 있는 데이터가 서로 어떻게 관련되는지 정의합니다. <2>문서<1></1></2>에서 더 자세히 알아보기",
+    "sub-title": "",
     "target-form": {
       "control-rules": "이 필드는 필수 입력 항목입니다.",
       "sub-text": "<0>상관 관계가 연결될 대상을 정의합니다. 쿼리 유형을 사용하면 상관 관계가 클릭될 때 쿼리가 실행됩니다. 외부 유형의 경우 상관 관계를 클릭하면 URL이 열립니다.</0>",
@@ -4702,7 +4702,7 @@
       "add-visualization-body": "데이터 소스를 선택한 다음 차트, 통계, 표를 사용하여 데이터를 쿼리하고 시각화하거나 목록, 마크다운 및 기타 위젯을 생성합니다.",
       "add-visualization-button": "시각화 추가",
       "add-visualization-header": "시각화 추가하여 새 대시보드 시작하기",
-      "import-a-dashboard-body": "파일 또는 <1>grafana.com</1>에서 대시보드를 가져옵니다.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "대시보드 가져오기",
       "import-dashboard-button": "대시보드 가져오기"
     },
@@ -7474,6 +7474,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10282,7 +10285,7 @@
     },
     "invite-user": {
       "invite-button": "초대",
-      "invite-new-member-button": "새 멤버 초대",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11061,6 +11064,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11271,6 +11282,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11477,6 +11496,14 @@
     },
     "token-permissions-info": {
       "and-click": "및 클릭",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "다음으로 이동",
       "make-sure": "반드시 이러한 권한을 포함하세요"
     },
diff --git a/public/locales/nl-NL/grafana.json b/public/locales/nl-NL/grafana.json
index 8a4327b37e4..ece87a5dfd2 100644
--- a/public/locales/nl-NL/grafana.json
+++ b/public/locales/nl-NL/grafana.json
@@ -3489,7 +3489,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Annuleren",
-      "cannot-move-folders": "Mappen kunnen niet worden verplaatst",
       "confirmation-text": "Verwijderen",
       "delete-button": "Verwijderen",
       "delete-modal-invalid-text": "Een of meer mappen bevatten bibliotheekpanelen of waarschuwingsregels. Verwijder deze eerst om verder te gaan.",
@@ -3588,6 +3587,7 @@
     },
     "folder-actions-button": {
       "delete": "Verwijderen",
+      "delete-folder-error": "",
       "folder-actions": "Mapacties",
       "manage-permissions": "Toestemmingen beheren",
       "move": "Verplaatsen"
@@ -4318,7 +4318,7 @@
       "source-label": "Bron",
       "sub-text": "<0>Definieer welke gegevensbron de correlatie weergeeft en welke gegevens eerder gedefinieerde variabelen vervangen.</0>"
     },
-    "sub-title": "Definieer hoe gegevens die zich in verschillende gegevensbronnen bevinden zich tot elkaar verhouden. Lees meer in de <2>documentatie<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Dit veld is verplicht.",
       "sub-text": "<0>Definieer waaraan de correlatie wordt gekoppeld. Bij het querytype wordt een query uitgevoerd wanneer op de correlatie wordt geklikt. Met het externe type open je een URL door op de correlatie te klikken.</0>",
@@ -4721,7 +4721,7 @@
       "add-visualization-body": "Selecteer een gegevensbron en zoek en visualiseer je gegevens met grafieken, statistieken en tabellen of maak lijsten, prijsverlagingen en andere widgets.",
       "add-visualization-button": "Visualisatie toevoegen",
       "add-visualization-header": "Begin je nieuwe dashboard door een visualisatie toe te voegen",
-      "import-a-dashboard-body": "Importeer dashboards uit bestanden of <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Dashboard importeren",
       "import-dashboard-button": "Dashboard importeren"
     },
@@ -7496,6 +7496,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10312,7 +10315,7 @@
     },
     "invite-user": {
       "invite-button": "Uitnodigen",
-      "invite-new-member-button": "Nieuw lid uitnodigen",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11094,6 +11097,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11307,6 +11318,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11513,6 +11532,14 @@
     },
     "token-permissions-info": {
       "and-click": "en klik",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Ga naar",
       "make-sure": "Zorg ervoor dat je deze toestemmingen opneemt"
     },
diff --git a/public/locales/pl-PL/grafana.json b/public/locales/pl-PL/grafana.json
index 856fa7a5d58..de0626be4a8 100644
--- a/public/locales/pl-PL/grafana.json
+++ b/public/locales/pl-PL/grafana.json
@@ -3515,7 +3515,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Anuluj",
-      "cannot-move-folders": "Nie można przenosić folderów",
       "confirmation-text": "Usuń",
       "delete-button": "Usuń",
       "delete-modal-invalid-text": "Co najmniej jeden folder zawiera panele bibliotek lub reguły alertów. Usuń je, aby kontynuować.",
@@ -3626,6 +3625,7 @@
     },
     "folder-actions-button": {
       "delete": "Usuń",
+      "delete-folder-error": "",
       "folder-actions": "Działania w obrębie folderu",
       "manage-permissions": "Zarządzaj uprawnieniami",
       "move": "Przenieś"
@@ -4356,7 +4356,7 @@
       "source-label": "Źródło",
       "sub-text": "<0>Zdefiniuj, które źródło danych wyświetli korelację i które dane zastąpią wcześniej zdefiniowane zmienne.</0>"
     },
-    "sub-title": "Zdefiniuj zależności między danymi z różnych źródeł. Więcej informacji znajdziesz w <2>dokumentacji<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "To pole jest wymagane.",
       "sub-text": "<0>Zdefiniuj, z czym będzie się łączyć korelacja. W przypadku typu zapytania zapytanie zostanie uruchomione po kliknięciu korelacji. W przypadku typu zewnętrznego kliknięcie korelacji otworzy adres URL.</0>",
@@ -4759,7 +4759,7 @@
       "add-visualization-body": "Wybierz źródło danych, a następnie wyszukaj i zwizualizuj dane na wykresach, w statystykach i tabelach lub utwórz listy, korzystaj ze znaczników markdown i innych widżetów.",
       "add-visualization-button": "Dodaj wizualizację",
       "add-visualization-header": "Dodaj wizualizację, aby rozpocząć tworzenie nowego pulpitu",
-      "import-a-dashboard-body": "Importuj pulpity z plików lub witryny <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Importuj pulpit",
       "import-dashboard-button": "Importuj pulpit"
     },
@@ -7540,6 +7540,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10372,7 +10375,7 @@
     },
     "invite-user": {
       "invite-button": "Zaproś",
-      "invite-new-member-button": "Zaproś nowego członka",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11160,6 +11163,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11379,6 +11390,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11585,6 +11604,14 @@
     },
     "token-permissions-info": {
       "and-click": "i kliknij",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Przejdź do",
       "make-sure": "Pamiętaj, aby uwzględnić te uprawnienia"
     },
diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json
index 9830a5cb6d6..45111832e14 100644
--- a/public/locales/pt-BR/grafana.json
+++ b/public/locales/pt-BR/grafana.json
@@ -3489,7 +3489,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Cancelar",
-      "cannot-move-folders": "As pastas não podem ser movidas",
       "confirmation-text": "Excluir",
       "delete-button": "Excluir",
       "delete-modal-invalid-text": "Uma ou mais pastas contêm painéis de biblioteca, ou regras de alerta. Exclua-as primeiro para prosseguir.",
@@ -3588,6 +3587,7 @@
     },
     "folder-actions-button": {
       "delete": "Excluir",
+      "delete-folder-error": "",
       "folder-actions": "Ações da pasta",
       "manage-permissions": "Gerenciar permissões",
       "move": "Mover"
@@ -4318,7 +4318,7 @@
       "source-label": "Fonte",
       "sub-text": "<0>Defina qual fonte de dados exibirá a correlação e quais dados substituirão variáveis predefinidas. </0>"
     },
-    "sub-title": "Defina como os dados que vivem em fontes de dados diferentes se relacionam entre si. Leia mais na <2>documentação<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Este campo é obrigatório.",
       "sub-text": "<0>Defina a que a correlação estará vinculada. Com o tipo de consulta, uma consulta será executada ao clicar na correlação. Com o tipo externo, uma URL será aberta ao clicar na correlação.</0>",
@@ -4721,7 +4721,7 @@
       "add-visualization-body": "Selecione uma fonte de dados e consulte e visualize seus dados com gráficos, estatísticas e tabelas ou crie listas, markdowns e outros widgets.",
       "add-visualization-button": "Adicionar visualização",
       "add-visualization-header": "Comece seu novo painel de controle adicionando uma visualização",
-      "import-a-dashboard-body": "Importe painéis de controle de arquivos ou do <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Importar um painel de controle",
       "import-dashboard-button": "Importar painel de controle"
     },
@@ -7496,6 +7496,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10312,7 +10315,7 @@
     },
     "invite-user": {
       "invite-button": "",
-      "invite-new-member-button": "Convidar um novo membro",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11094,6 +11097,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11307,6 +11318,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11513,6 +11532,14 @@
     },
     "token-permissions-info": {
       "and-click": "e clique",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Ir para",
       "make-sure": "Certifique-se de incluir essas permissões"
     },
diff --git a/public/locales/pt-PT/grafana.json b/public/locales/pt-PT/grafana.json
index 5122bd8fa54..d6dc3217967 100644
--- a/public/locales/pt-PT/grafana.json
+++ b/public/locales/pt-PT/grafana.json
@@ -3489,7 +3489,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Cancelar",
-      "cannot-move-folders": "Não é possível mover as pastas",
       "confirmation-text": "Eliminar",
       "delete-button": "Eliminar",
       "delete-modal-invalid-text": "Uma ou mais pastas contêm painéis de biblioteca ou regras de alerta. Elimine-as primeiro para continuar.",
@@ -3588,6 +3587,7 @@
     },
     "folder-actions-button": {
       "delete": "Eliminar",
+      "delete-folder-error": "",
       "folder-actions": "Ações da pasta",
       "manage-permissions": "Gerir permissões",
       "move": "Mover"
@@ -4318,7 +4318,7 @@
       "source-label": "Origem",
       "sub-text": "<0>Defina qual a origem dos dados que exibirá a correlação e quais os dados que substituirão as variáveis definidas anteriormente.</0>"
     },
-    "sub-title": "Defina como os dados existentes em diferentes origens de dados se relacionam entre si. Leia mais na <2>documentação<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Este campo é obrigatório.",
       "sub-text": "<0>Defina aquilo a que a correlação será ligada. Com o tipo de consulta, será executada uma consulta quando se clicar na correlação. Com o tipo externo, clicar na correlação abrirá um URL.</0>",
@@ -4721,7 +4721,7 @@
       "add-visualization-body": "Selecione uma origem de dados e, em seguida, consulte e visualize os seus dados com gráficos, estatísticas e tabelas ou crie listas, remarcações e outros widgets.",
       "add-visualization-button": "Adicionar visualização",
       "add-visualization-header": "Inicie o seu novo painel de controlo ao adicionar uma visualização",
-      "import-a-dashboard-body": "Importe painéis de controlo de ficheiros ou de <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Importar um painel de controlo",
       "import-dashboard-button": "Importar painel de controlo"
     },
@@ -7496,6 +7496,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10312,7 +10315,7 @@
     },
     "invite-user": {
       "invite-button": "Convidar",
-      "invite-new-member-button": "Convidar um novo membro",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11094,6 +11097,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11307,6 +11318,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11513,6 +11532,14 @@
     },
     "token-permissions-info": {
       "and-click": "e clique em",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Aceda a",
       "make-sure": "Certifique-se de incluir estas permissões"
     },
diff --git a/public/locales/ru-RU/grafana.json b/public/locales/ru-RU/grafana.json
index 4b834843dc8..808d9de6423 100644
--- a/public/locales/ru-RU/grafana.json
+++ b/public/locales/ru-RU/grafana.json
@@ -3515,7 +3515,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Отмена",
-      "cannot-move-folders": "Папки нельзя перемещать",
       "confirmation-text": "Удалить",
       "delete-button": "Удалить",
       "delete-modal-invalid-text": "Одна или несколько папок содержат панели библиотеки или правила оповещения. Чтобы продолжить, сначала удалите их.",
@@ -3626,6 +3625,7 @@
     },
     "folder-actions-button": {
       "delete": "Удалить",
+      "delete-folder-error": "",
       "folder-actions": "Действия с папками",
       "manage-permissions": "Управление разрешениями",
       "move": "Переместить"
@@ -4356,7 +4356,7 @@
       "source-label": "Источник",
       "sub-text": "<0>Определите, какой источник данных будет отображать корреляцию и какие данные заменят ранее заданные переменные.</0>"
     },
-    "sub-title": "Определение соотношения данных, хранящихся в разных источниках Подробнее в <2>документации<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Поле является обязательным.",
       "sub-text": "<0>Задайте, к чему будет привязана корреляция. Если выбран тип запроса, при нажатии на корреляцию будет выполняться запрос. Если выбрать внешний тип, при нажатии на корреляцию откроется URL-адрес.</0>",
@@ -4759,7 +4759,7 @@
       "add-visualization-body": "Выберите источник данных, а затем запрашивайте и визуализируйте свои данные с помощью диаграмм, статистики и таблиц или создавайте списки, разметки и другие виджеты.",
       "add-visualization-button": "Добавить визуализацию",
       "add-visualization-header": "Создание нового дашборда с добавлением визуализации",
-      "import-a-dashboard-body": "Импортируйте дашборды из файлов или с <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Импорт дашборда",
       "import-dashboard-button": "Импорт дашборда"
     },
@@ -7540,6 +7540,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10372,7 +10375,7 @@
     },
     "invite-user": {
       "invite-button": "Пригласить",
-      "invite-new-member-button": "Пригласить нового члена",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11160,6 +11163,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11379,6 +11390,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11585,6 +11604,14 @@
     },
     "token-permissions-info": {
       "and-click": "и нажать",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Перейти к",
       "make-sure": "Обязательно включите эти разрешения"
     },
diff --git a/public/locales/sv-SE/grafana.json b/public/locales/sv-SE/grafana.json
index c9ae7a7953b..56d0626f09a 100644
--- a/public/locales/sv-SE/grafana.json
+++ b/public/locales/sv-SE/grafana.json
@@ -3489,7 +3489,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "Avbryt",
-      "cannot-move-folders": "Mapparna kan inte flyttas",
       "confirmation-text": "Ta bort",
       "delete-button": "Ta bort",
       "delete-modal-invalid-text": "En eller flera mappar innehåller bibliotekspaneler eller varningsregler. Ta först bort dessa innan du fortsätter.",
@@ -3588,6 +3587,7 @@
     },
     "folder-actions-button": {
       "delete": "Ta bort",
+      "delete-folder-error": "",
       "folder-actions": "Mappåtgärder",
       "manage-permissions": "Hantera behörigheter",
       "move": "Flytta"
@@ -4318,7 +4318,7 @@
       "source-label": "Källa",
       "sub-text": "<0>Definiera vilken datakälla som visar korrelationen och vilka data som ersätter tidigare definierade variabler.</0>"
     },
-    "sub-title": "Definiera hur data som finns i olika datakällor relaterar till varandra. Läs mer i <2>dokumentationen<1></1></2>",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Detta fält är obligatoriskt.",
       "sub-text": "<0>Definiera vad korrelationen länkar till. Med frågetypen körs en fråga när korrelationen klickas. Med den externa typen öppnas en URL genom att klicka på korrelationen.</0>",
@@ -4721,7 +4721,7 @@
       "add-visualization-body": "Välj en datakälla och sedan en fråga och visualisera dina data med diagram, statistik och tabeller eller skapa listor, markdown-dokument och andra widgetar.",
       "add-visualization-button": "Lägg till visualisering",
       "add-visualization-header": "Starta din nya instrumentpanel genom att lägga till en visualisering",
-      "import-a-dashboard-body": "Importera instrumentpaneler från filer på <1>grafana.com</1>.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Importera en instrumentpanel",
       "import-dashboard-button": "Importera instrumentpanel"
     },
@@ -7496,6 +7496,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10312,7 +10315,7 @@
     },
     "invite-user": {
       "invite-button": "Bjud in",
-      "invite-new-member-button": "Bjud in ny medlem",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11094,6 +11097,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11307,6 +11318,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11513,6 +11532,14 @@
     },
     "token-permissions-info": {
       "and-click": "och klicka på",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Gå till",
       "make-sure": "Se till att inkludera dessa behörigheter"
     },
diff --git a/public/locales/tr-TR/grafana.json b/public/locales/tr-TR/grafana.json
index 7b15443abca..839e279e7d3 100644
--- a/public/locales/tr-TR/grafana.json
+++ b/public/locales/tr-TR/grafana.json
@@ -3489,7 +3489,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "İptal",
-      "cannot-move-folders": "Klasörler taşınamaz",
       "confirmation-text": "Sil",
       "delete-button": "Sil",
       "delete-modal-invalid-text": "Bir veya daha fazla klasör, kütüphane panelleri veya uyarı kuralları içeriyor. Devam etmek için öncelikle bunları silin.",
@@ -3588,6 +3587,7 @@
     },
     "folder-actions-button": {
       "delete": "Sil",
+      "delete-folder-error": "",
       "folder-actions": "Klasör işlemleri",
       "manage-permissions": "İzinleri yönet",
       "move": "Taşı"
@@ -4318,7 +4318,7 @@
       "source-label": "Kaynak",
       "sub-text": "<0>Korelasyonun hangi veri kaynağında görüntüleneceğini ve hangi verilerin önceden tanımlanmış değişkenlerin yerini alacağını tanımlayın.</0>"
     },
-    "sub-title": "Farklı veri kaynaklarındaki verilerin birbiriyle ilişkisini tanımlayın. Daha fazla bilgi için <2>belgelere<1></1></2> bakın.",
+    "sub-title": "",
     "target-form": {
       "control-rules": "Bu alan gereklidir.",
       "sub-text": "<0>Korelasyonun neyle bağlantı kuracağını tanımlayın. Sorgu türü ile korelasyona tıklandığında bir sorgu çalıştırılır. Haricî tür ile korelasyona tıklandığında bir URL açılır.</0>",
@@ -4721,7 +4721,7 @@
       "add-visualization-body": "Bir veri kaynağı seçin ve ardından grafikler, istatistikler ve tablolarla verilerinizi sorgulayın ve görselleştirin veya listeler, markdown'lar ve diğer widget'lar oluşturun.",
       "add-visualization-button": "Görselleştirme ekle",
       "add-visualization-header": "Bir görselleştirme ekleyerek yeni panonuzu başlatın",
-      "import-a-dashboard-body": "Panoları dosyalardan veya <1>grafana.com </1>'dan içe aktarın.",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "Bir panoyu içe aktar",
       "import-dashboard-button": "Panoyu içe aktar"
     },
@@ -7496,6 +7496,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10312,7 +10315,7 @@
     },
     "invite-user": {
       "invite-button": "Davet et",
-      "invite-new-member-button": "Yeni üye davet edin",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11094,6 +11097,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11307,6 +11318,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11513,6 +11532,14 @@
     },
     "token-permissions-info": {
       "and-click": "ve şuna tıklayın:",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "Şuraya git:",
       "make-sure": "Bu izinleri eklediğinizden emin olun"
     },
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 2c6e930f098..8016dd7c9ad 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -3476,7 +3476,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "取消",
-      "cannot-move-folders": "文件夹无法移动",
       "confirmation-text": "删除",
       "delete-button": "删除",
       "delete-modal-invalid-text": "一个或多个文件夹包含库面板或警报规则。请首先删除这些以便继续。",
@@ -3569,6 +3568,7 @@
     },
     "folder-actions-button": {
       "delete": "删除",
+      "delete-folder-error": "",
       "folder-actions": "文件夹操作",
       "manage-permissions": "管理权限",
       "move": "移动"
@@ -4299,7 +4299,7 @@
       "source-label": "源",
       "sub-text": "<0>定义哪些数据源将显示关联，以及哪些数据将取代先前定义的变量。</0>"
     },
-    "sub-title": "定义不同数据源中存在的数据如何相互关联。详细信息请参阅<2>文档<1></1></2>。",
+    "sub-title": "",
     "target-form": {
       "control-rules": "此字段是必填字段。",
       "sub-text": "<0>定义相关性将链接到什么内容。使用查询类型时，点击相关性将运行查询。使用外部类型时，点击相关性将打开一个 URL。</0>",
@@ -4702,7 +4702,7 @@
       "add-visualization-body": "选择一个数据源，然后用图表、统计信息和表格查询您的数据以及将其可视化，或创建列表、Markdown 和其他小部件。",
       "add-visualization-button": "添加可视化",
       "add-visualization-header": "通过添加可视化开始您的新仪表板",
-      "import-a-dashboard-body": "从文件或 <1>grafana.com</1> 导入数据面板。",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "导入仪表板",
       "import-dashboard-button": "导入仪表板"
     },
@@ -7474,6 +7474,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10282,7 +10285,7 @@
     },
     "invite-user": {
       "invite-button": "",
-      "invite-new-member-button": "邀请新成员",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11061,6 +11064,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11271,6 +11282,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11477,6 +11496,14 @@
     },
     "token-permissions-info": {
       "and-click": "并点击",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "前往",
       "make-sure": "务必包含以下权限"
     },
diff --git a/public/locales/zh-Hant/grafana.json b/public/locales/zh-Hant/grafana.json
index 42ea63dd231..eec074eef2a 100644
--- a/public/locales/zh-Hant/grafana.json
+++ b/public/locales/zh-Hant/grafana.json
@@ -3476,7 +3476,6 @@
       "bulk-delete-provisioned-resources": "",
       "bulk-move-provisioned-resources": "",
       "cancel-button": "取消",
-      "cannot-move-folders": "資料夾無法移動",
       "confirmation-text": "刪除",
       "delete-button": "刪除",
       "delete-modal-invalid-text": "一個或多個資料夾包含資料庫面板或警報規則。請先刪除這些資料，然後再繼續。",
@@ -3569,6 +3568,7 @@
     },
     "folder-actions-button": {
       "delete": "刪除",
+      "delete-folder-error": "",
       "folder-actions": "資料夾動作",
       "manage-permissions": "管理權限",
       "move": "移動"
@@ -4299,7 +4299,7 @@
       "source-label": "來源",
       "sub-text": "<0>定義哪個資料來源將顯示相關性，以及哪些資料將取代先前定義的變數。</0>"
     },
-    "sub-title": "定義位於不同資料來源中的資料彼此之間的關係。請至<2>文件</1></1></2>中閱讀更多資訊",
+    "sub-title": "",
     "target-form": {
       "control-rules": "此為必填欄位。",
       "sub-text": "<0>定義相關性將連結的目標。使用查詢類型，點選相關性時將執行查詢。使用外部類型時，點選相關性將開啟一個網址。</0>",
@@ -4702,7 +4702,7 @@
       "add-visualization-body": "選取資料來源，然後使用圖表、統計資料及表格查詢並將資料可視化，或建立清單、標記及其他小工具。",
       "add-visualization-button": "新增可視化",
       "add-visualization-header": "透過新增可視化來啟動您的新儀表板",
-      "import-a-dashboard-body": "從檔案或 <1>grafana.com</1> 匯入儀表板。",
+      "import-a-dashboard-body": "",
       "import-a-dashboard-header": "匯入儀表板",
       "import-dashboard-button": "匯入儀表板"
     },
@@ -7474,6 +7474,9 @@
     "badge-tooltip": ""
   },
   "folders": {
+    "api": {
+      "folder-deleted-success": ""
+    },
     "get-loading-nav": {
       "main": {
         "title": {
@@ -10282,7 +10285,7 @@
     },
     "invite-user": {
       "invite-button": "邀請",
-      "invite-new-member-button": "邀請新成員",
+      "invite-new-user-button": "",
       "invite-tooltip": ""
     },
     "item": {
@@ -11061,6 +11064,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "pull-requests-label": "",
+        "pull-requests-read-write": "",
+        "repository-label": "",
+        "repository-read-write-admin": "",
+        "webhooks-label": "",
+        "webhooks-read-write": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11271,6 +11282,14 @@
       "branch-required": "",
       "path-description": "",
       "path-label": "",
+      "permissions": {
+        "api": "",
+        "api-read-write": "",
+        "repository-label": "",
+        "repository-read-write": "",
+        "user-label": "",
+        "user-read": ""
+      },
       "pr-workflow-description": "",
       "pr-workflow-label": "",
       "token-description": "",
@@ -11477,6 +11496,14 @@
     },
     "token-permissions-info": {
       "and-click": "然後按一下",
+      "bitbucket": {
+        "create-token-button": "",
+        "token-text": ""
+      },
+      "gitlab": {
+        "create-token-button": "",
+        "token-text": ""
+      },
       "go-to": "前往",
       "make-sure": "請務必包含以下權限"
     },

From 16f8359d35b0884c7b796e1b8e2d024e6718cf16 Mon Sep 17 00:00:00 2001
From: Moustafa Baiou <moustafa.baiou@grafana.com>
Date: Wed, 6 Aug 2025 21:45:48 -0400
Subject: [PATCH 007/243] Alerting: Update Alert Rule to use int64 for
 MissingSeriesEvalsToResolve (#109306)

---
 .../ngalert/api/api_provisioning_test.go      | 10 +++----
 .../api/tooling/definitions/cortex-ruler.go   |  4 +--
 .../definitions/provisioning_alert_rules.go   |  4 +--
 .../api/validation/api_ruler_validation.go    |  4 +--
 pkg/services/ngalert/models/alert_rule.go     |  4 +--
 .../ngalert/models/alert_rule_test.go         | 16 +++++-----
 pkg/services/ngalert/models/testing.go        |  6 ++--
 pkg/services/ngalert/prom/convert.go          |  2 +-
 pkg/services/ngalert/prom/convert_test.go     |  2 +-
 .../ngalert/schedule/registry_test.go         |  4 +--
 pkg/services/ngalert/state/manager.go         |  4 +--
 .../ngalert/state/manager_private_test.go     |  2 +-
 pkg/services/ngalert/store/models.go          |  4 +--
 .../api/alerting/api_provisioning_test.go     |  4 +--
 pkg/tests/api/alerting/api_ruler_test.go      | 30 +++++++++----------
 15 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/pkg/services/ngalert/api/api_provisioning_test.go b/pkg/services/ngalert/api/api_provisioning_test.go
index e21f949e4f7..926f3ebcc5b 100644
--- a/pkg/services/ngalert/api/api_provisioning_test.go
+++ b/pkg/services/ngalert/api/api_provisioning_test.go
@@ -403,7 +403,7 @@ func TestIntegrationProvisioningApi(t *testing.T) {
 			})
 
 			t.Run("PUT without MissingSeriesEvalsToResolve clears the field", func(t *testing.T) {
-				oldValue := util.Pointer(5)
+				oldValue := util.Pointer[int64](5)
 				sut := createProvisioningSrvSut(t)
 				rc := createTestRequestCtx()
 				rule := createTestAlertRule("rule", 1)
@@ -420,8 +420,8 @@ func TestIntegrationProvisioningApi(t *testing.T) {
 			})
 
 			t.Run("PUT with MissingSeriesEvalsToResolve updates the value", func(t *testing.T) {
-				oldValue := util.Pointer(5)
-				newValue := util.Pointer(10)
+				oldValue := util.Pointer[int64](5)
+				newValue := util.Pointer[int64](10)
 				sut := createProvisioningSrvSut(t)
 				rc := createTestRequestCtx()
 				rule := createTestAlertRule("rule", 1)
@@ -657,12 +657,12 @@ func TestIntegrationProvisioningApi(t *testing.T) {
 				require.Nil(t, updated.Rules[0].MissingSeriesEvalsToResolve)
 
 				// Put the same group with a new value
-				group.Rules[0].MissingSeriesEvalsToResolve = util.Pointer(5)
+				group.Rules[0].MissingSeriesEvalsToResolve = util.Pointer[int64](5)
 				response = sut.RoutePutAlertRuleGroup(&rc, group, "folder-uid", group.Title)
 				require.Equal(t, 200, response.Status())
 				updated = deserializeRuleGroup(t, response.Body())
 				require.NotNil(t, updated.Rules[0].MissingSeriesEvalsToResolve)
-				require.Equal(t, 5, *updated.Rules[0].MissingSeriesEvalsToResolve)
+				require.Equal(t, int64(5), *updated.Rules[0].MissingSeriesEvalsToResolve)
 
 				// Reset the value again
 				group.Rules[0].MissingSeriesEvalsToResolve = nil
diff --git a/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go b/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go
index 0bb57a9de82..21e6b438ac2 100644
--- a/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go
+++ b/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go
@@ -593,7 +593,7 @@ type PostableGrafanaRule struct {
 	// If set to 0, the value is reset to the default.
 	// required: false
 	// example: 3
-	MissingSeriesEvalsToResolve *int `json:"missing_series_evals_to_resolve,omitempty" yaml:"missing_series_evals_to_resolve,omitempty"`
+	MissingSeriesEvalsToResolve *int64 `json:"missing_series_evals_to_resolve,omitempty" yaml:"missing_series_evals_to_resolve,omitempty"`
 }
 
 // swagger:model
@@ -616,7 +616,7 @@ type GettableGrafanaRule struct {
 	Record                      *Record                        `json:"record,omitempty" yaml:"record,omitempty"`
 	Metadata                    *AlertRuleMetadata             `json:"metadata,omitempty" yaml:"metadata,omitempty"`
 	GUID                        string                         `json:"guid" yaml:"guid"`
-	MissingSeriesEvalsToResolve *int                           `json:"missing_series_evals_to_resolve,omitempty" yaml:"missing_series_evals_to_resolve,omitempty"`
+	MissingSeriesEvalsToResolve *int64                         `json:"missing_series_evals_to_resolve,omitempty" yaml:"missing_series_evals_to_resolve,omitempty"`
 }
 
 // UserInfo represents user-related information, including a unique identifier and a name.
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
index 5aeb919b4ad..23e036b0b9a 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
@@ -174,7 +174,7 @@ type ProvisionedAlertRule struct {
 	// example: {"metric":"grafana_alerts_ratio", "from":"A"}
 	Record *Record `json:"record"`
 	// example: 2
-	MissingSeriesEvalsToResolve *int `json:"missingSeriesEvalsToResolve,omitempty"`
+	MissingSeriesEvalsToResolve *int64 `json:"missingSeriesEvalsToResolve,omitempty"`
 }
 
 // swagger:route GET /v1/provisioning/folder/{FolderUID}/rule-groups/{Group} provisioning stable RouteGetAlertRuleGroup
@@ -284,7 +284,7 @@ type AlertRuleExport struct {
 	IsPaused                    bool                                 `json:"isPaused" yaml:"isPaused" hcl:"is_paused"`
 	NotificationSettings        *AlertRuleNotificationSettingsExport `json:"notification_settings,omitempty" yaml:"notification_settings,omitempty" hcl:"notification_settings,block"`
 	Record                      *AlertRuleRecordExport               `json:"record,omitempty" yaml:"record,omitempty" hcl:"record,block"`
-	MissingSeriesEvalsToResolve *int                                 `json:"missing_series_evals_to_resolve,omitempty" yaml:"missing_series_evals_to_resolve,omitempty" hcl:"missing_series_evals_to_resolve"`
+	MissingSeriesEvalsToResolve *int64                               `json:"missing_series_evals_to_resolve,omitempty" yaml:"missing_series_evals_to_resolve,omitempty" hcl:"missing_series_evals_to_resolve"`
 }
 
 // AlertQueryExport is the provisioned export of models.AlertQuery.
diff --git a/pkg/services/ngalert/api/validation/api_ruler_validation.go b/pkg/services/ngalert/api/validation/api_ruler_validation.go
index 01d0b430cef..1dffe249bdd 100644
--- a/pkg/services/ngalert/api/validation/api_ruler_validation.go
+++ b/pkg/services/ngalert/api/validation/api_ruler_validation.go
@@ -299,10 +299,10 @@ func validateKeepFiringForInterval(ruleNode *apimodels.PostableExtendedRuleNode)
 //   - == 0, returns nil (reset to default)
 //   - == nil && UID == "", returns nil (new rule)
 //   - == nil && UID != "", returns -1 (existing rule)
-func validateMissingSeriesEvalsToResolve(ruleNode *apimodels.PostableExtendedRuleNode) (*int, error) {
+func validateMissingSeriesEvalsToResolve(ruleNode *apimodels.PostableExtendedRuleNode) (*int64, error) {
 	if ruleNode.GrafanaManagedAlert.MissingSeriesEvalsToResolve == nil {
 		if ruleNode.GrafanaManagedAlert.UID != "" {
-			return util.Pointer(-1), nil // will be patched later with the real value of the current version of the rule
+			return util.Pointer[int64](-1), nil // will be patched later with the real value of the current version of the rule
 		}
 		return nil, nil // if it's a new rule, use nil as the default
 	}
diff --git a/pkg/services/ngalert/models/alert_rule.go b/pkg/services/ngalert/models/alert_rule.go
index b1f415f929d..803bc65ba4f 100644
--- a/pkg/services/ngalert/models/alert_rule.go
+++ b/pkg/services/ngalert/models/alert_rule.go
@@ -304,7 +304,7 @@ type AlertRule struct {
 	// required before resolving an alert state (a dimension) when data is missing.
 	// If nil, alerts resolve after 2 missing evaluation intervals
 	// (i.e., resolution occurs during the second evaluation where data is absent).
-	MissingSeriesEvalsToResolve *int
+	MissingSeriesEvalsToResolve *int64
 }
 
 type AlertRuleMetadata struct {
@@ -598,7 +598,7 @@ func (alertRule *AlertRule) GetGroupKey() AlertRuleGroupKey {
 // to wait before resolving an alert rule instance when its data is missing.
 // If not configured, it returns the default value (2), which means the alert
 // resolves after missing for two evaluation intervals.
-func (alertRule *AlertRule) GetMissingSeriesEvalsToResolve() int {
+func (alertRule *AlertRule) GetMissingSeriesEvalsToResolve() int64 {
 	if alertRule.MissingSeriesEvalsToResolve == nil {
 		return 2 // default value
 	}
diff --git a/pkg/services/ngalert/models/alert_rule_test.go b/pkg/services/ngalert/models/alert_rule_test.go
index 329e979ea03..326bd40cb4a 100644
--- a/pkg/services/ngalert/models/alert_rule_test.go
+++ b/pkg/services/ngalert/models/alert_rule_test.go
@@ -554,8 +554,8 @@ func TestDiff(t *testing.T) {
 		if rule1.MissingSeriesEvalsToResolve != rule2.MissingSeriesEvalsToResolve {
 			diff := diffs.GetDiffsForField("MissingSeriesEvalsToResolve")
 			assert.Len(t, diff, 1)
-			assert.Equal(t, *rule1.MissingSeriesEvalsToResolve, int(diff[0].Left.Int()))
-			assert.Equal(t, *rule2.MissingSeriesEvalsToResolve, int(diff[0].Right.Int()))
+			assert.Equal(t, *rule1.MissingSeriesEvalsToResolve, diff[0].Left.Int())
+			assert.Equal(t, *rule2.MissingSeriesEvalsToResolve, diff[0].Right.Int())
 			difCnt++
 		}
 
@@ -1001,14 +1001,14 @@ func TestAlertRuleGetMissingSeriesEvalsToResolve(t *testing.T) {
 	t.Run("should return the default 2 if MissingSeriesEvalsToResolve is nil", func(t *testing.T) {
 		rule := RuleGen.GenerateRef()
 		rule.MissingSeriesEvalsToResolve = nil
-		require.Equal(t, 2, rule.GetMissingSeriesEvalsToResolve())
+		require.Equal(t, int64(2), rule.GetMissingSeriesEvalsToResolve())
 	})
 
 	t.Run("should return the correct value", func(t *testing.T) {
 		rule := RuleGen.With(
 			RuleMuts.WithMissingSeriesEvalsToResolve(3),
 		).GenerateRef()
-		require.Equal(t, 3, rule.GetMissingSeriesEvalsToResolve())
+		require.Equal(t, int64(3), rule.GetMissingSeriesEvalsToResolve())
 	})
 }
 
@@ -1113,7 +1113,7 @@ func TestValidateAlertRule(t *testing.T) {
 	t.Run("missingSeriesEvalsToResolve", func(t *testing.T) {
 		testCases := []struct {
 			name                        string
-			missingSeriesEvalsToResolve *int
+			missingSeriesEvalsToResolve *int64
 			expectedErrorContains       string
 		}{
 			{
@@ -1122,17 +1122,17 @@ func TestValidateAlertRule(t *testing.T) {
 			},
 			{
 				name:                        "should reject negative value",
-				missingSeriesEvalsToResolve: util.Pointer(-1),
+				missingSeriesEvalsToResolve: util.Pointer[int64](-1),
 				expectedErrorContains:       "field `missing_series_evals_to_resolve` must be greater than 0",
 			},
 			{
 				name:                        "should reject 0",
-				missingSeriesEvalsToResolve: util.Pointer(0),
+				missingSeriesEvalsToResolve: util.Pointer[int64](0),
 				expectedErrorContains:       "field `missing_series_evals_to_resolve` must be greater than 0",
 			},
 			{
 				name:                        "should accept positive value",
-				missingSeriesEvalsToResolve: util.Pointer(2),
+				missingSeriesEvalsToResolve: util.Pointer[int64](2),
 			},
 		}
 
diff --git a/pkg/services/ngalert/models/testing.go b/pkg/services/ngalert/models/testing.go
index aa8e7c8f32d..c9ba4b91348 100644
--- a/pkg/services/ngalert/models/testing.go
+++ b/pkg/services/ngalert/models/testing.go
@@ -128,7 +128,7 @@ func (g *AlertRuleGenerator) Generate() AlertRule {
 		Labels:                      labels,
 		NotificationSettings:        ns,
 		Metadata:                    GenerateMetadata(),
-		MissingSeriesEvalsToResolve: util.Pointer(2),
+		MissingSeriesEvalsToResolve: util.Pointer[int64](2),
 	}
 
 	for _, mutator := range g.mutators {
@@ -514,12 +514,12 @@ func (a *AlertRuleMutators) WithSameGroup() AlertRuleMutator {
 	}
 }
 
-func (a *AlertRuleMutators) WithMissingSeriesEvalsToResolve(timesOfInterval int) AlertRuleMutator {
+func (a *AlertRuleMutators) WithMissingSeriesEvalsToResolve(timesOfInterval int64) AlertRuleMutator {
 	return func(rule *AlertRule) {
 		if timesOfInterval <= 0 {
 			panic("timesOfInterval must be greater than 0")
 		}
-		rule.MissingSeriesEvalsToResolve = util.Pointer(timesOfInterval)
+		rule.MissingSeriesEvalsToResolve = util.Pointer[int64](timesOfInterval)
 	}
 }
 
diff --git a/pkg/services/ngalert/prom/convert.go b/pkg/services/ngalert/prom/convert.go
index 4b8137f347b..485b62dc857 100644
--- a/pkg/services/ngalert/prom/convert.go
+++ b/pkg/services/ngalert/prom/convert.go
@@ -275,7 +275,7 @@ func (p *Converter) convertRule(orgID int64, namespaceUID string, promGroup Prom
 		// Prometheus resolves alerts as soon as the series disappears.
 		// By setting this value to 1 we ensure that the alert is resolved on the first evaluation
 		// that doesn't have the series.
-		MissingSeriesEvalsToResolve: util.Pointer(1),
+		MissingSeriesEvalsToResolve: util.Pointer[int64](1),
 	}
 
 	if !isRecordingRule {
diff --git a/pkg/services/ngalert/prom/convert_test.go b/pkg/services/ngalert/prom/convert_test.go
index 5d7b9470d00..4a5d4346b14 100644
--- a/pkg/services/ngalert/prom/convert_test.go
+++ b/pkg/services/ngalert/prom/convert_test.go
@@ -358,7 +358,7 @@ func TestPrometheusRulesToGrafana(t *testing.T) {
 
 				require.Equal(t, models.Duration(evalOffset), grafanaRule.Data[0].RelativeTimeRange.To)
 				require.Equal(t, models.Duration(10*time.Minute+evalOffset), grafanaRule.Data[0].RelativeTimeRange.From)
-				require.Equal(t, util.Pointer(1), grafanaRule.MissingSeriesEvalsToResolve)
+				require.Equal(t, util.Pointer(int64(1)), grafanaRule.MissingSeriesEvalsToResolve)
 
 				require.Equal(t, models.OkErrState, grafanaRule.ExecErrState)
 				require.Equal(t, models.OK, grafanaRule.NoDataState)
diff --git a/pkg/services/ngalert/schedule/registry_test.go b/pkg/services/ngalert/schedule/registry_test.go
index 9d838556ed7..b747830a18c 100644
--- a/pkg/services/ngalert/schedule/registry_test.go
+++ b/pkg/services/ngalert/schedule/registry_test.go
@@ -214,7 +214,7 @@ func TestRuleWithFolderFingerprint(t *testing.T) {
 					SimplifiedNotificationsSection:       false,
 				},
 			},
-			MissingSeriesEvalsToResolve: util.Pointer(2),
+			MissingSeriesEvalsToResolve: util.Pointer[int64](2),
 		}
 		r2 := &models.AlertRule{
 			ID:        2,
@@ -260,7 +260,7 @@ func TestRuleWithFolderFingerprint(t *testing.T) {
 					SimplifiedQueryAndExpressionsSection: true,
 				},
 			},
-			MissingSeriesEvalsToResolve: util.Pointer(1),
+			MissingSeriesEvalsToResolve: util.Pointer[int64](1),
 		}
 
 		excludedFields := map[string]struct{}{
diff --git a/pkg/services/ngalert/state/manager.go b/pkg/services/ngalert/state/manager.go
index a228f2bc151..571a5cd1aa7 100644
--- a/pkg/services/ngalert/state/manager.go
+++ b/pkg/services/ngalert/state/manager.go
@@ -587,13 +587,13 @@ func (st *Manager) processMissingSeriesStates(logger log.Logger, evaluatedAt tim
 
 // stateIsStale determines whether the evaluation state is considered stale.
 // A state is considered stale if the data has been missing for at least missingSeriesEvalsToResolve evaluation intervals.
-func stateIsStale(evaluatedAt time.Time, lastEval time.Time, intervalSeconds int64, missingSeriesEvalsToResolve int) bool {
+func stateIsStale(evaluatedAt time.Time, lastEval time.Time, intervalSeconds int64, missingSeriesEvalsToResolve int64) bool {
 	// If the last evaluation time equals the current evaluation time, the state is not stale.
 	if evaluatedAt.Equal(lastEval) {
 		return false
 	}
 
-	resolveIfMissingDuration := time.Duration(int64(missingSeriesEvalsToResolve)*intervalSeconds) * time.Second
+	resolveIfMissingDuration := time.Duration(missingSeriesEvalsToResolve*intervalSeconds) * time.Second
 
 	// timeSinceLastEval >= resolveIfMissingDuration
 	return evaluatedAt.Sub(lastEval) >= resolveIfMissingDuration
diff --git a/pkg/services/ngalert/state/manager_private_test.go b/pkg/services/ngalert/state/manager_private_test.go
index 471e747d88e..081f4843538 100644
--- a/pkg/services/ngalert/state/manager_private_test.go
+++ b/pkg/services/ngalert/state/manager_private_test.go
@@ -39,7 +39,7 @@ func TestStateIsStale(t *testing.T) {
 		name                        string
 		lastEvaluation              time.Time
 		expectedResult              bool
-		missingSeriesEvalsToResolve int
+		missingSeriesEvalsToResolve int64
 	}{
 		{
 			name:                        "false if last evaluation is now",
diff --git a/pkg/services/ngalert/store/models.go b/pkg/services/ngalert/store/models.go
index 7cbea0c0f86..7f40ccd30ac 100644
--- a/pkg/services/ngalert/store/models.go
+++ b/pkg/services/ngalert/store/models.go
@@ -30,7 +30,7 @@ type alertRule struct {
 	IsPaused                    bool
 	NotificationSettings        string `xorm:"notification_settings"`
 	Metadata                    string `xorm:"metadata"`
-	MissingSeriesEvalsToResolve *int   `xorm:"missing_series_evals_to_resolve"`
+	MissingSeriesEvalsToResolve *int64 `xorm:"missing_series_evals_to_resolve"`
 }
 
 func (a alertRule) TableName() string {
@@ -68,7 +68,7 @@ type alertRuleVersion struct {
 	IsPaused                    bool
 	NotificationSettings        string `xorm:"notification_settings"`
 	Metadata                    string `xorm:"metadata"`
-	MissingSeriesEvalsToResolve *int   `xorm:"missing_series_evals_to_resolve"`
+	MissingSeriesEvalsToResolve *int64 `xorm:"missing_series_evals_to_resolve"`
 }
 
 // EqualSpec compares two alertRuleVersion objects for equality based on their specifications and returns true if they match.
diff --git a/pkg/tests/api/alerting/api_provisioning_test.go b/pkg/tests/api/alerting/api_provisioning_test.go
index 54b3e71b61e..15ec7028e04 100644
--- a/pkg/tests/api/alerting/api_provisioning_test.go
+++ b/pkg/tests/api/alerting/api_provisioning_test.go
@@ -661,7 +661,7 @@ func TestIntegrationProvisioningRules(t *testing.T) {
 							Model:         json.RawMessage([]byte(`{"type":"math","expression":"2 + 3 \u003e 1"}`)),
 						},
 					},
-					MissingSeriesEvalsToResolve: util.Pointer(3),
+					MissingSeriesEvalsToResolve: util.Pointer[int64](3),
 				},
 			},
 		}
@@ -676,7 +676,7 @@ func TestIntegrationProvisioningRules(t *testing.T) {
 			for _, rule := range result.Rules {
 				require.NotEmpty(t, rule.UID)
 				if rule.UID == "rule3" {
-					require.Equal(t, 3, *rule.MissingSeriesEvalsToResolve)
+					require.Equal(t, int64(3), *rule.MissingSeriesEvalsToResolve)
 				}
 			}
 		})
diff --git a/pkg/tests/api/alerting/api_ruler_test.go b/pkg/tests/api/alerting/api_ruler_test.go
index da9f0c3441b..e6d022edf6f 100644
--- a/pkg/tests/api/alerting/api_ruler_test.go
+++ b/pkg/tests/api/alerting/api_ruler_test.go
@@ -1761,42 +1761,42 @@ func TestIntegrationRuleUpdate(t *testing.T) {
 	t.Run("missing_series_evals_to_resolve", func(t *testing.T) {
 		testCases := []struct {
 			name           string
-			initialValue   *int
-			updatedValue   *int
-			expectedValue  *int
+			initialValue   *int64
+			updatedValue   *int64
+			expectedValue  *int64
 			expectedStatus int
 		}{
 			{
 				name:           "should be able to set missing_series_evals_to_resolve to 5",
 				initialValue:   nil,
-				updatedValue:   util.Pointer(5),
-				expectedValue:  util.Pointer(5),
+				updatedValue:   util.Pointer[int64](5),
+				expectedValue:  util.Pointer[int64](5),
 				expectedStatus: http.StatusAccepted,
 			},
 			{
 				name:           "should be able to update missing_series_evals_to_resolve",
-				initialValue:   util.Pointer(1),
-				updatedValue:   util.Pointer(2),
-				expectedValue:  util.Pointer(2),
+				initialValue:   util.Pointer[int64](1),
+				updatedValue:   util.Pointer[int64](2),
+				expectedValue:  util.Pointer[int64](2),
 				expectedStatus: http.StatusAccepted,
 			},
 			{
 				name:           "should preserve missing_series_evals_to_resolve when it's set nil",
-				initialValue:   util.Pointer(5),
+				initialValue:   util.Pointer[int64](5),
 				updatedValue:   nil,
-				expectedValue:  util.Pointer(5),
+				expectedValue:  util.Pointer[int64](5),
 				expectedStatus: http.StatusAccepted,
 			},
 			{
 				name:           "should reject missing_series_evals_to_resolve < 0",
-				initialValue:   util.Pointer(1),
-				updatedValue:   util.Pointer(-1),
+				initialValue:   util.Pointer[int64](1),
+				updatedValue:   util.Pointer[int64](-1),
 				expectedStatus: http.StatusBadRequest,
 			},
 			{
 				name:           "should be able to reset missing_series_evals_to_resolve by setting it to 0",
-				initialValue:   util.Pointer(1),
-				updatedValue:   util.Pointer(0),
+				initialValue:   util.Pointer[int64](1),
+				updatedValue:   util.Pointer[int64](0),
 				expectedValue:  nil,
 				expectedStatus: http.StatusAccepted,
 			},
@@ -3474,7 +3474,7 @@ func TestIntegrationAlertRuleCRUD(t *testing.T) {
 						},
 						NoDataState:                 apimodels.NoDataState(ngmodels.Alerting),
 						ExecErrState:                apimodels.ExecutionErrorState(ngmodels.AlertingErrState),
-						MissingSeriesEvalsToResolve: util.Pointer(2), // If UID is specified, this field is required
+						MissingSeriesEvalsToResolve: util.Pointer[int64](2), // If UID is specified, this field is required
 					},
 				},
 			},

From 28024c74f84ba8feb5b3e4afd682ab828ba73669 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <mariell.hoversholm@grafana.com>
Date: Thu, 7 Aug 2025 10:27:01 +0200
Subject: [PATCH 008/243] Go: Update to 1.24.6 (#109313)

Co-authored-by: joshhunt <josh.hunt@grafana.com>
---
 .drone.yml                                    | 35 +++++++++++--------
 .github/workflows/backend-code-checks.yml     |  8 ++---
 Dockerfile                                    |  2 +-
 Makefile                                      |  2 +-
 apps/advisor/go.mod                           |  2 +-
 apps/alerting/notifications/go.mod            |  2 +-
 apps/dashboard/go.mod                         |  2 +-
 apps/folder/go.mod                            |  2 +-
 apps/iam/go.mod                               |  2 +-
 apps/investigations/go.mod                    |  2 +-
 apps/playlist/go.mod                          |  2 +-
 apps/preferences/go.mod                       |  2 +-
 apps/provisioning/go.mod                      |  2 +-
 apps/secret/go.mod                            |  2 +-
 apps/shorturl/go.mod                          |  2 +-
 .../docker/blocks/prometheus_high_card/go.mod |  2 +-
 devenv/docker/blocks/prometheus_utf8/go.mod   |  2 +-
 .../docker/blocks/stateful_webhook/Dockerfile |  2 +-
 .../foundation-sdk/dashboard-automation.md    |  4 +--
 .../dashboard-time-zone.spec.ts               |  2 +-
 go.mod                                        |  2 +-
 go.work                                       |  2 +-
 hack/go.mod                                   |  2 +-
 pkg/aggregator/go.mod                         |  2 +-
 pkg/apimachinery/go.mod                       |  2 +-
 pkg/apiserver/go.mod                          |  2 +-
 pkg/build/go.mod                              |  2 +-
 pkg/build/wire/go.mod                         |  2 +-
 pkg/codegen/go.mod                            |  2 +-
 pkg/plugins/codegen/go.mod                    |  2 +-
 pkg/promlib/go.mod                            |  2 +-
 pkg/semconv/go.mod                            |  2 +-
 scripts/drone/variables.star                  |  2 +-
 scripts/go-workspace/go.mod                   |  2 +-
 scripts/modowners/go.mod                      |  2 +-
 35 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 52bdd9dc125..bbd3e820619 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -50,7 +50,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: verify-gen-cue
 trigger:
   branch: main
@@ -117,7 +117,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -127,7 +127,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -136,7 +136,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: verify-gen-jsonnet
 - commands:
   - yarn install --immutable || yarn install --immutable
@@ -186,7 +186,7 @@ steps:
   environment:
     _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
       from_secret: dagger_token
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: rgm-package
   pull: always
   volumes:
@@ -664,7 +664,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition oss
@@ -794,7 +794,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition oss
@@ -935,7 +935,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket
@@ -1027,7 +1027,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: compile-build-cmd
 - commands:
   - yarn install --immutable || yarn install --immutable
@@ -1127,7 +1127,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: compile-build-cmd
 - depends_on:
   - compile-build-cmd
@@ -1224,7 +1224,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: compile-build-cmd
 - commands:
   - ./bin/build publish grafana-com --edition oss ${DRONE_TAG}
@@ -1298,7 +1298,7 @@ steps:
     STORYBOOK_DESTINATION:
       from_secret: rgm_storybook_destination
     UBUNTU_BASE: ubuntu:22.04
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: rgm-build
   pull: always
   volumes:
@@ -1375,7 +1375,7 @@ steps:
     STORYBOOK_DESTINATION:
       from_secret: rgm_storybook_destination
     UBUNTU_BASE: ubuntu:22.04
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: rgm-build
   pull: always
   volumes:
@@ -1494,7 +1494,7 @@ steps:
     STORYBOOK_DESTINATION:
       from_secret: rgm_storybook_destination
     UBUNTU_BASE: ubuntu:22.04
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: rgm-build
   pull: always
   volumes:
@@ -1619,7 +1619,7 @@ steps:
     STORYBOOK_DESTINATION:
       from_secret: rgm_storybook_destination
     UBUNTU_BASE: ubuntu:22.04
-  image: golang:1.24.5-alpine
+  image: golang:1.24.6-alpine
   name: rgm-build
   pull: always
   volumes:
@@ -1873,3 +1873,8 @@ get:
   path: secret/data/common/gcr
 kind: secret
 name: gcr_credentials
+---
+kind: signature
+hmac: 70171a24c7e9ab7af105bd39d02f9aa6d28a4505963dfc9140f53cdfe4965ef8
+
+...
diff --git a/.github/workflows/backend-code-checks.yml b/.github/workflows/backend-code-checks.yml
index bf7252a95f5..32fd3ed3940 100644
--- a/.github/workflows/backend-code-checks.yml
+++ b/.github/workflows/backend-code-checks.yml
@@ -39,7 +39,7 @@ jobs:
         run: |
           CODEGEN_VERIFY=1 make gen-cue
           CODEGEN_VERIFY=1 make gen-jsonnet
-      
+
       - name: Validate go.mod
         run: go run scripts/modowners/modowners.go check go.mod
 
@@ -48,7 +48,7 @@ jobs:
       - name: Setup Grafana Enterprise
         if: github.event.pull_request.head.repo.fork == false
         uses: ./.github/actions/setup-enterprise
-        
+
       - name: Generate and Validate OpenAPI Specs
         run: |
           # For PRs from forks, we'll just run the basic swagger-gen without validation
@@ -57,10 +57,10 @@ jobs:
             make swagger-gen
             exit 0
           fi
-          
+
           # Clean and regenerate OpenAPI specs
           make swagger-clean && make openapi3-gen
-          
+
           # Check if the generated specs differ from what's in the repository
           for f in public/api-merged.json public/openapi3.json; do git add $f; done
           if [ -z "$(git diff --name-only --cached)" ]; then
diff --git a/Dockerfile b/Dockerfile
index b059c1c1a47..82e0053f42c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ ARG JS_SRC=js-builder
 # By using FROM instructions we can delegate dependency updates to dependabot
 FROM alpine:3.21.3 AS alpine-base
 FROM ubuntu:22.04 AS ubuntu-base
-FROM golang:1.24.5-alpine AS go-builder-base
+FROM golang:1.24.6-alpine AS go-builder-base
 FROM --platform=${JS_PLATFORM} node:22-alpine AS js-builder-base
 
 # Javascript build stage
diff --git a/Makefile b/Makefile
index 11bf0062277..28595926660 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ include .bingo/Variables.mk
 include .citools/Variables.mk
 
 GO = go
-GO_VERSION = 1.24.5
+GO_VERSION = 1.24.6
 GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh)
 GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh)
 SH_FILES ?= $(shell find ./scripts -name *.sh)
diff --git a/apps/advisor/go.mod b/apps/advisor/go.mod
index b6f7f8b800c..06c0acfa3a7 100644
--- a/apps/advisor/go.mod
+++ b/apps/advisor/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/advisor
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
diff --git a/apps/alerting/notifications/go.mod b/apps/alerting/notifications/go.mod
index 17d35151499..9a620ce12ad 100644
--- a/apps/alerting/notifications/go.mod
+++ b/apps/alerting/notifications/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/alerting/notifications
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/grafana/grafana-app-sdk v0.40.3
diff --git a/apps/dashboard/go.mod b/apps/dashboard/go.mod
index 4cf0617f40b..30fd80214d5 100644
--- a/apps/dashboard/go.mod
+++ b/apps/dashboard/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/dashboard
 
-go 1.24.5
+go 1.24.6
 
 require (
 	cuelang.org/go v0.11.1
diff --git a/apps/folder/go.mod b/apps/folder/go.mod
index 713d1da9cda..30bcc4d5a99 100644
--- a/apps/folder/go.mod
+++ b/apps/folder/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/folder
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/grafana/grafana-app-sdk v0.40.3
diff --git a/apps/iam/go.mod b/apps/iam/go.mod
index 2c9d80d827b..13c5115aff5 100644
--- a/apps/iam/go.mod
+++ b/apps/iam/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/iam
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/grafana/grafana-app-sdk v0.40.3
diff --git a/apps/investigations/go.mod b/apps/investigations/go.mod
index d1a3a5f3b6f..0f5c5c227df 100644
--- a/apps/investigations/go.mod
+++ b/apps/investigations/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/investigations
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/grafana/grafana v0.0.0-00010101000000-000000000000
diff --git a/apps/playlist/go.mod b/apps/playlist/go.mod
index e4a0e59576c..8e1ae857041 100644
--- a/apps/playlist/go.mod
+++ b/apps/playlist/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/playlist
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/grafana/grafana-app-sdk v0.40.3
diff --git a/apps/preferences/go.mod b/apps/preferences/go.mod
index 1fc0f8a0c2f..fa02d31a234 100644
--- a/apps/preferences/go.mod
+++ b/apps/preferences/go.mod
@@ -1,3 +1,3 @@
 module github.com/grafana/grafana/apps/preferences
 
-go 1.24.5
+go 1.24.6
diff --git a/apps/provisioning/go.mod b/apps/provisioning/go.mod
index e568b4c36c4..58b0f331981 100644
--- a/apps/provisioning/go.mod
+++ b/apps/provisioning/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/provisioning
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/grafana/grafana-app-sdk v0.40.3
diff --git a/apps/secret/go.mod b/apps/secret/go.mod
index e9ee004cd8e..f153f3be5a5 100644
--- a/apps/secret/go.mod
+++ b/apps/secret/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/secret
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/grafana/grafana-app-sdk v0.40.3
diff --git a/apps/shorturl/go.mod b/apps/shorturl/go.mod
index 954eff80397..d3f050f910c 100644
--- a/apps/shorturl/go.mod
+++ b/apps/shorturl/go.mod
@@ -2,7 +2,7 @@ module github.com/grafana/grafana/apps/shorturl
 
 go 1.24.0
 
-toolchain go1.24.5
+toolchain go1.24.6
 
 require (
 	github.com/grafana/grafana-app-sdk v0.40.3
diff --git a/devenv/docker/blocks/prometheus_high_card/go.mod b/devenv/docker/blocks/prometheus_high_card/go.mod
index 53cd8058c27..a6d2b78e072 100644
--- a/devenv/docker/blocks/prometheus_high_card/go.mod
+++ b/devenv/docker/blocks/prometheus_high_card/go.mod
@@ -1,6 +1,6 @@
 module high-card
 
-go 1.24.5
+go 1.24.6
 
 require github.com/prometheus/client_golang v1.22.0
 
diff --git a/devenv/docker/blocks/prometheus_utf8/go.mod b/devenv/docker/blocks/prometheus_utf8/go.mod
index 77bc82d2b2d..7f7bb1f3b44 100644
--- a/devenv/docker/blocks/prometheus_utf8/go.mod
+++ b/devenv/docker/blocks/prometheus_utf8/go.mod
@@ -1,6 +1,6 @@
 module utf8-support
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/prometheus/client_golang v1.22.0
diff --git a/devenv/docker/blocks/stateful_webhook/Dockerfile b/devenv/docker/blocks/stateful_webhook/Dockerfile
index e6527450805..258eec3d891 100644
--- a/devenv/docker/blocks/stateful_webhook/Dockerfile
+++ b/devenv/docker/blocks/stateful_webhook/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.24.5
+FROM golang:1.24.6
 
 ADD main.go /go/src/webhook/main.go
 
diff --git a/docs/sources/observability-as-code/foundation-sdk/dashboard-automation.md b/docs/sources/observability-as-code/foundation-sdk/dashboard-automation.md
index d4b98f46c80..16149c71d2c 100644
--- a/docs/sources/observability-as-code/foundation-sdk/dashboard-automation.md
+++ b/docs/sources/observability-as-code/foundation-sdk/dashboard-automation.md
@@ -171,7 +171,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.24.5
+          go-version: 1.24.6
 
       - name: Verify Go version
         run: go version
@@ -212,7 +212,7 @@ This GitHub Action automates the deployment of a Grafana dashboard using the Fou
 The first few steps:
 
 - Check out the repository to access the project code.
-- Install Go 1.24.5 using the `actions/setup-go` action.
+- Install Go 1.24.6 using the `actions/setup-go` action.
 - Verify Go is properly installed.
 
 ### 2. Download and install `grafanactl`
diff --git a/e2e-playwright/dashboards-suite/dashboard-time-zone.spec.ts b/e2e-playwright/dashboards-suite/dashboard-time-zone.spec.ts
index 2d21b0b6af5..3dc86271227 100644
--- a/e2e-playwright/dashboards-suite/dashboard-time-zone.spec.ts
+++ b/e2e-playwright/dashboards-suite/dashboard-time-zone.spec.ts
@@ -17,7 +17,7 @@ test.describe(
     tag: ['@dashboards'],
   },
   () => {
-    test('Tests dashboard time zone scenarios', async ({ page, gotoDashboardPage, selectors }) => {
+    test.fixme('Tests dashboard time zone scenarios', async ({ page, gotoDashboardPage, selectors }) => {
       const dashboardPage = await gotoDashboardPage({ uid: TIMEZONE_DASHBOARD_UID });
 
       const fromTimeZone = 'UTC';
diff --git a/go.mod b/go.mod
index 8de5333353b..aedd1d3871f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana
 
-go 1.24.5
+go 1.24.6
 
 require (
 	buf.build/gen/go/parca-dev/parca/connectrpc/go v1.18.1-20250703125925-3f0fcf4bff96.1 // @grafana/observability-traces-and-profiling
diff --git a/go.work b/go.work
index 50347ae04ba..737d3363e91 100644
--- a/go.work
+++ b/go.work
@@ -1,4 +1,4 @@
-go 1.24.5
+go 1.24.6
 
 // The `skip:golangci-lint` comment tag is used to exclude the package from the `golangci-lint` GitHub Action.
 // The module at the root of the repo (`.`) is excluded because ./pkg/... is included manually in the `golangci-lint` configuration.
diff --git a/hack/go.mod b/hack/go.mod
index b1685be7028..3ec36848618 100644
--- a/hack/go.mod
+++ b/hack/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/hack
 
-go 1.24.5
+go 1.24.6
 
 require k8s.io/code-generator v0.33.1
 
diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod
index d639d68f749..c6da7f2336d 100644
--- a/pkg/aggregator/go.mod
+++ b/pkg/aggregator/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/pkg/aggregator
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/emicklei/go-restful/v3 v3.12.1
diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod
index d1fa3b6f5e0..78854c60506 100644
--- a/pkg/apimachinery/go.mod
+++ b/pkg/apimachinery/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/pkg/apimachinery
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/go-jose/go-jose/v3 v3.0.4 // @grafana/identity-access-team
diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod
index af1b7887789..41f81051b82 100644
--- a/pkg/apiserver/go.mod
+++ b/pkg/apiserver/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/pkg/apiserver
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/google/go-cmp v0.7.0
diff --git a/pkg/build/go.mod b/pkg/build/go.mod
index 012923fe3c1..909811de4a1 100644
--- a/pkg/build/go.mod
+++ b/pkg/build/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/pkg/build
 
-go 1.24.5
+go 1.24.6
 
 // Override docker/docker to avoid:
 // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires
diff --git a/pkg/build/wire/go.mod b/pkg/build/wire/go.mod
index 5d0be4a4925..a26d501eb78 100644
--- a/pkg/build/wire/go.mod
+++ b/pkg/build/wire/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/pkg/build/wire
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/google/go-cmp v0.7.0
diff --git a/pkg/codegen/go.mod b/pkg/codegen/go.mod
index c35ceba70d0..c215182743a 100644
--- a/pkg/codegen/go.mod
+++ b/pkg/codegen/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/pkg/codegen
 
-go 1.24.5
+go 1.24.6
 
 require (
 	cuelang.org/go v0.11.1
diff --git a/pkg/plugins/codegen/go.mod b/pkg/plugins/codegen/go.mod
index 538918b3076..088304f6522 100644
--- a/pkg/plugins/codegen/go.mod
+++ b/pkg/plugins/codegen/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/pkg/plugins/codegen
 
-go 1.24.5
+go 1.24.6
 
 replace github.com/grafana/grafana/pkg/codegen => ../../codegen
 
diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod
index 786a6515c90..ac034b92ba2 100644
--- a/pkg/promlib/go.mod
+++ b/pkg/promlib/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/pkg/promlib
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/grafana/dskit v0.0.0-20250611075409-46f51e1ce914
diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod
index 4e7a041137c..782ae759d51 100644
--- a/pkg/semconv/go.mod
+++ b/pkg/semconv/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/pkg/semconv
 
-go 1.24.5
+go 1.24.6
 
 require go.opentelemetry.io/otel v1.37.0
 
diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star
index c14e87833fd..7c45f17b75f 100644
--- a/scripts/drone/variables.star
+++ b/scripts/drone/variables.star
@@ -3,7 +3,7 @@ global variables
 """
 
 grabpl_version = "v3.1.2"
-golang_version = "1.24.5"
+golang_version = "1.24.6"
 
 # nodejs_version should match what's in ".nvmrc", but without the v prefix.
 nodejs_version = "22.16.0"
diff --git a/scripts/go-workspace/go.mod b/scripts/go-workspace/go.mod
index 61239d308b3..de53d21c261 100644
--- a/scripts/go-workspace/go.mod
+++ b/scripts/go-workspace/go.mod
@@ -1,5 +1,5 @@
 module github.com/grafana/grafana/scripts/go-workspace
 
-go 1.24.5
+go 1.24.6
 
 require golang.org/x/mod v0.24.0
diff --git a/scripts/modowners/go.mod b/scripts/modowners/go.mod
index d6dcd567649..42d4536abb0 100644
--- a/scripts/modowners/go.mod
+++ b/scripts/modowners/go.mod
@@ -1,5 +1,5 @@
 module github.com/grafana/grafana/scripts/modowners
 
-go 1.24.5
+go 1.24.6
 
 require golang.org/x/mod v0.24.0

From 9579bf33fbd722049017f075503071be11e20d2d Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Thu, 7 Aug 2025 11:04:46 +0200
Subject: [PATCH 009/243] LBAC for datasources: Remove ft
 `teamHttpHeadersMimir` (#109240)

chore: remove ft for mimir
---
 .../configure-grafana/feature-toggles/index.md           | 1 -
 packages/grafana-data/src/types/featureToggles.gen.ts    | 5 -----
 pkg/services/featuremgmt/registry.go                     | 9 ---------
 pkg/services/featuremgmt/toggles_gen.csv                 | 1 -
 pkg/services/featuremgmt/toggles_gen.go                  | 4 ----
 pkg/services/featuremgmt/toggles_gen.json                | 3 ++-
 6 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 49062997533..e66178703ff 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -73,7 +73,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `alertingNotificationsStepMode`        | Enables simplified step mode in the notifications section                                                                                                     | Yes                |
 | `lokiLabelNamesQueryApi`               | Defaults to using the Loki `/labels` API instead of `/series`                                                                                                 | Yes                |
 | `improvedExternalSessionHandlingSAML`  | Enables improved support for SAML external sessions. Ensure the NameID format is correctly configured in Grafana for SAML Single Logout to function properly. | Yes                |
-| `teamHttpHeadersMimir`                 | Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams                                           | Yes                |
 | `alertingMigrationUI`                  | Enables the alerting migration UI, to migrate data source-managed rules to Grafana-managed rules                                                              | Yes                |
 | `alertingImportYAMLUI`                 | Enables a UI feature for importing rules from a Prometheus file to Grafana-managed rules                                                                      | Yes                |
 | `unifiedNavbars`                       | Enables unified navbars                                                                                                                                       |                    |
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index cb400b4e5fa..6d2b6c7d02c 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -815,11 +815,6 @@ export interface FeatureToggles {
   */
   improvedExternalSessionHandlingSAML?: boolean;
   /**
-  * Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams
-  * @default true
-  */
-  teamHttpHeadersMimir?: boolean;
-  /**
   * Enables LBAC for datasources for Tempo to apply LBAC filtering of traces to the client requests for users in teams
   */
   teamHttpHeadersTempo?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index ed5d527799e..68daf7665a7 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -1395,15 +1395,6 @@ var (
 			Owner:          identityAccessTeam,
 			AllowSelfServe: true,
 		},
-		{
-			Name:           "teamHttpHeadersMimir",
-			Description:    "Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams",
-			Stage:          FeatureStageGeneralAvailability,
-			FrontendOnly:   false,
-			AllowSelfServe: true,
-			Owner:          identityAccessTeam,
-			Expression:     "true",
-		},
 		{
 			Name:         "teamHttpHeadersTempo",
 			Description:  "Enables LBAC for datasources for Tempo to apply LBAC filtering of traces to the client requests for users in teams",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 8af78162673..62d51933df7 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -182,7 +182,6 @@ investigationsBackend,experimental,@grafana/grafana-app-platform-squad,false,fal
 k8SFolderCounts,experimental,@grafana/search-and-storage,false,false,false
 k8SFolderMove,experimental,@grafana/search-and-storage,false,false,false
 improvedExternalSessionHandlingSAML,GA,@grafana/identity-access-team,false,false,false
-teamHttpHeadersMimir,GA,@grafana/identity-access-team,false,false,false
 teamHttpHeadersTempo,experimental,@grafana/identity-access-team,false,false,false
 templateVariablesUsesCombobox,experimental,@grafana/grafana-frontend-platform,false,false,true
 grafanaAdvisor,privatePreview,@grafana/plugins-platform-backend,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 3a745490f8d..e1638343dcc 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -739,10 +739,6 @@ const (
 	// Enables improved support for SAML external sessions. Ensure the NameID format is correctly configured in Grafana for SAML Single Logout to function properly.
 	FlagImprovedExternalSessionHandlingSAML = "improvedExternalSessionHandlingSAML"
 
-	// FlagTeamHttpHeadersMimir
-	// Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams
-	FlagTeamHttpHeadersMimir = "teamHttpHeadersMimir"
-
 	// FlagTeamHttpHeadersTempo
 	// Enables LBAC for datasources for Tempo to apply LBAC filtering of traces to the client requests for users in teams
 	FlagTeamHttpHeadersTempo = "teamHttpHeadersTempo"
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 68fc984f930..10d99a492ed 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -3014,7 +3014,8 @@
       "metadata": {
         "name": "teamHttpHeadersMimir",
         "resourceVersion": "1753448760331",
-        "creationTimestamp": "2025-01-13T10:42:47Z"
+        "creationTimestamp": "2025-01-13T10:42:47Z",
+        "deletionTimestamp": "2025-08-06T08:19:47Z"
       },
       "spec": {
         "description": "Enables LBAC for datasources for Mimir to apply LBAC filtering of metrics to the client requests for users in teams",

From 9b0480460b90f80e0a02d289b4dd1579c0512bf2 Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matias.chomicki@grafana.com>
Date: Thu, 7 Aug 2025 11:39:01 +0200
Subject: [PATCH 010/243] Log Line Details header: add more space between icons
 (#109283)

LogLineDetailsHeader: add more space between icons
---
 .../features/logs/components/panel/LogLineDetailsHeader.tsx    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/logs/components/panel/LogLineDetailsHeader.tsx b/public/app/features/logs/components/panel/LogLineDetailsHeader.tsx
index b29fb06f086..4fff3d9d89f 100644
--- a/public/app/features/logs/components/panel/LogLineDetailsHeader.tsx
+++ b/public/app/features/logs/components/panel/LogLineDetailsHeader.tsx
@@ -279,7 +279,8 @@ const getStyles = (theme: GrafanaTheme2, mode: LogLineDetailsMode, wrapLogMessag
   }),
   icons: css({
     display: 'flex',
-    gap: theme.spacing(0.75),
+    gap: theme.spacing(1),
+    paddingLeft: theme.spacing(1),
   }),
   copyLogButton: css({
     padding: 0,

From ee99433c65ee958875928e4f3d947503cdb569af Mon Sep 17 00:00:00 2001
From: Dana Axinte <53751979+dana-axinte@users.noreply.github.com>
Date: Thu, 7 Aug 2025 10:41:19 +0100
Subject: [PATCH 011/243] CloudMigrations: Report on prem event with grafana
 version (#104515)

* grafana version in on prem event report

* store grafana version in cloud migration service
---
 .../cloudmigrationimpl/cloudmigration.go              | 11 ++++++++---
 pkg/services/cloudmigration/gmsclient/dtos.go         |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go
index 163fcfbcb1b..1dadac3bcb9 100644
--- a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go
@@ -81,6 +81,8 @@ type Service struct {
 	api     *api.CloudMigrationAPI
 	tracer  tracing.Tracer
 	metrics *Metrics
+
+	grafanaVersion string
 }
 
 var LogPrefix = "cloudmigration.service"
@@ -191,6 +193,8 @@ func ProvideService(
 		}
 	}
 
+	s.grafanaVersion = cfg.BuildVersion
+
 	return s, nil
 }
 
@@ -856,9 +860,10 @@ func (s *Service) report(
 	}
 
 	e := gmsclient.EventRequestDTO{
-		Event:   t,
-		LocalID: id,
-		UserUID: userUID,
+		Event:          t,
+		LocalID:        id,
+		UserUID:        userUID,
+		GrafanaVersion: s.grafanaVersion,
 	}
 
 	if d != 0 {
diff --git a/pkg/services/cloudmigration/gmsclient/dtos.go b/pkg/services/cloudmigration/gmsclient/dtos.go
index 299e6a29edf..54332422fcd 100644
--- a/pkg/services/cloudmigration/gmsclient/dtos.go
+++ b/pkg/services/cloudmigration/gmsclient/dtos.go
@@ -51,6 +51,7 @@ type EventRequestDTO struct {
 	Error              string         `json:"error"`
 	DurationIfFinished time.Duration  `json:"duration"`
 	UserUID            string         `json:"userUid"`
+	GrafanaVersion     string         `json:"grafanaVersion"`
 }
 
 type LocalEventType string

From da93f58921bca6da6a0a00e644d1c5010a227493 Mon Sep 17 00:00:00 2001
From: linoman <2051016+linoman@users.noreply.github.com>
Date: Thu, 7 Aug 2025 11:46:12 +0200
Subject: [PATCH 012/243] SAML: graph api documentation (#109272)

* minor fixes

* Add Graph API troubleshooting guide

* Improve writing

* address PR comments
---
 .../configure-authentication/azuread/index.md |  7 +--
 .../configure-saml-with-azuread/_index.md     |  4 +-
 .../saml/troubleshoot-saml/_index.md          | 47 +++++++++++++++++++
 3 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md
index f3d2c5bea74..f1d507bd526 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md
@@ -462,7 +462,7 @@ You can make Grafana always get group information from the Microsoft Graph API b
 1. Under the **GroupMember** section, select **GroupMember.Read.All**.
 1. Click **Add permissions**.
 1. Select **Microsoft Graph** from the list of APIs.
-1. Select **Delegated permissions**..
+1. Select **Delegated permissions**.
 1. In the **Select permissions** pane, under the **User** section, select **User.Read**.
 1. Click the **Add permissions** button at the bottom of the page.
 
@@ -472,9 +472,10 @@ Admin consent may be required for this permission.
 
 ### Force fetching groups from Microsoft Graph API
 
-To force fetching groups from Microsoft Graph API instead of the `id_token`. You can use the `force_use_graph_api` config option.
+To force fetching groups from Microsoft Graph API instead of the `id_token`, you can use the `force_use_graph_api` configuration option.
 
-```
+```ini
+[auth.azuread]
 force_use_graph_api = true
 ```
 
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/configure-saml-with-azuread/_index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/configure-saml-with-azuread/_index.md
index 97942f0341a..ee2784c3aba 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/configure-saml-with-azuread/_index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/configure-saml-with-azuread/_index.md
@@ -124,7 +124,7 @@ This app registration will be used as a Service Account to retrieve more informa
 1. In the **Request API permissions** pane, select **Microsoft Graph**, and click **Delegated permissions**.
 1. In the **Select permissions** pane, under the **User** section, select **User.Read**.
 1. Click the **Add permissions** button at the bottom of the page.
-1. In the **API permissions** section, select **Grant admin consent for <your-organization>**.
+1. In the **API permissions** section, select **Grant admin consent for `<directory-name>`**.
 
 The following table shows what the permissions look like from the Entra ID portal:
 
@@ -135,3 +135,5 @@ The following table shows what the permissions look like from the Entra ID porta
 | `User.Read.All`  | Application | Yes                    | Granted |
 
 {{< figure src="/media/docs/grafana/saml/graph-api-app-permissions.png" caption="Screen shot of the permissions listed in Entra ID for the App registration" >}}
+
+To test that Graph API has the correct permissions, refer to the [Troubleshoot Graph API calls](../troubleshoot-saml/#troubleshoot-graph-api-calls) section.
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/troubleshoot-saml/_index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/troubleshoot-saml/_index.md
index 326d480ca1b..cd11cbf81b3 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/troubleshoot-saml/_index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/troubleshoot-saml/_index.md
@@ -107,3 +107,50 @@ cookie_secure = true
 ```
 
 Ensure `cookie_secure` is set to true to ensure that cookies are only sent over HTTPS.
+
+### Troubleshoot Graph API calls
+
+When setting up SAML authentication with Azure AD, you may encounter issues with Graph API calls. This can happen if the Azure AD application is not properly configured to allow Graph API access.
+
+To help in the troubleshooting process, test the Graph API calls using the following commands:
+
+```bash
+curl -X POST "{token_url}" \
+  -H "Content-Type: application/x-www-form-urlencoded" \
+  -d "grant_type=client_credentials&client_id={client_id}&client_secret={client_secret}&scope=https://graph.microsoft.com/.default"
+```
+
+Where the following values come from your [SAML configuration](../saml-configuration-options/_index.md#saml-configuration-options):
+
+- `token_url`: The token URL of your Azure AD application.
+- `client_id`: The client ID of your Azure AD application.
+- `client_secret`: The client secret of your Azure AD application.
+
+The response should look like:
+
+```json
+{
+  "access_token": "...ACCESS_TOKEN...",
+  "token_type": "Bearer",
+  "expires_in": 3600
+}
+```
+
+Use the `access_token` to test the Graph API calls.
+
+```bash
+curl -X GET "https://graph.microsoft.com/v1.0/groups" \
+  -H "Authorization: Bearer ${access_token}" \
+  -H "Content-Type: application/json"
+```
+
+The response should look like:
+
+```json
+{
+  "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#Collection(Edm.String)",
+  "value": ["29f2e7c8-9b9d-443c-bc62-7d8cdcfcfe59", "f0224e82-0eb8-4eda-8979-0c36e98deb00"]
+}
+```
+
+If the second call fails due to 401 or 403, you may need to check the Azure AD application settings to ensure that Graph API access is enabled.

From 81531dcd7b6ebf09f76153779dd8545a8999e21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Thu, 7 Aug 2025 11:46:43 +0200
Subject: [PATCH 013/243] datasources: strict local-time-range parsing
 (#109180)

* datasources: strict local-time-range parsing

* fixed unit test
---
 pkg/services/query/query.go      | 27 ++++++++----
 pkg/services/query/query_test.go | 74 ++++++++++++++++++++++++--------
 2 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/pkg/services/query/query.go b/pkg/services/query/query.go
index 7aaafdea105..55fdb542c4f 100644
--- a/pkg/services/query/query.go
+++ b/pkg/services/query/query.go
@@ -311,16 +311,21 @@ func (s *ServiceImpl) handleQuerySingleDatasource(ctx context.Context, user iden
 	}
 }
 
-func getTimeRange(query *simplejson.Json, globalFrom string, globalTo string) gtime.TimeRange {
-	from := query.Get("timeRange").Get("from").MustString("")
-	to := query.Get("timeRange").Get("to").MustString("")
-
-	if (from == "") && (to == "") {
-		from = globalFrom
-		to = globalTo
+func getTimeRange(query *simplejson.Json, globalFrom string, globalTo string) (string, string, error) {
+	tr, ok := query.CheckGet("timeRange")
+	if !ok { // timeRange json node does not exist, use global from/to
+		return globalFrom, globalTo, nil
+	}
+	from, err := tr.Get("from").String()
+	if err != nil {
+		return "", "", errors.New("time range: field 'from' is missing or invalid")
+	}
+	to, err := tr.Get("to").String()
+	if err != nil {
+		return "", "", errors.New("time range: field 'to' is missing or invalid")
 	}
 
-	return gtime.NewTimeRange(from, to)
+	return from, to, nil
 }
 
 // parseRequest parses a request into parsed queries grouped by datasource uid
@@ -359,7 +364,11 @@ func (s *ServiceImpl) parseMetricRequest(ctx context.Context, user identity.Requ
 
 		var timeRange gtime.TimeRange
 		if supportLocalTimeRange {
-			timeRange = getTimeRange(query, reqDTO.From, reqDTO.To)
+			from, to, err := getTimeRange(query, reqDTO.From, reqDTO.To)
+			if err != nil {
+				return nil, err
+			}
+			timeRange = gtime.NewTimeRange(from, to)
 		} else {
 			timeRange = gtime.NewTimeRange(reqDTO.From, reqDTO.To)
 		}
diff --git a/pkg/services/query/query_test.go b/pkg/services/query/query_test.go
index 7187312da50..bf2737eab39 100644
--- a/pkg/services/query/query_test.go
+++ b/pkg/services/query/query_test.go
@@ -391,7 +391,7 @@ func TestIntegrationParseMetricRequest(t *testing.T) {
 		verifyTimestamps(parsedReq2, int64(0), int64(0), int64(0), int64(0))
 	})
 
-	t.Run("Test a datasource query with malformed local time range", func(t *testing.T) {
+	t.Run("Test a datasource query with local time range, malformed to-value", func(t *testing.T) {
 		tc := setup(t, false, nil)
 		mr := metricRequestWithQueries(t, `{
 			"refId": "A",
@@ -401,31 +401,69 @@ func TestIntegrationParseMetricRequest(t *testing.T) {
 			},
 			"timeRange": {
 				"from": "1753944618000",
-				"not_to": "1753944619000"
+				"to": 1753944619000
 			}
-		}`, `{
-			"refId": "B",
+		}`)
+		mr.From = ""
+		mr.To = ""
+		_, err := tc.queryService.parseMetricRequest(context.Background(), tc.signedInUser, true, mr, true)
+		require.Error(t, err)
+		require.ErrorContains(t, err, "'to'")
+	})
+	t.Run("Test a datasource query with local time range, missing to-value", func(t *testing.T) {
+		tc := setup(t, false, nil)
+		mr := metricRequestWithQueries(t, `{
+			"refId": "A",
 			"datasource": {
 				"uid": "gIEkMvIVz",
 				"type": "postgres"
 			},
-			"timeRange": 42
+			"timeRange": {
+				"from": "1753944618000"
+			}
 		}`)
 		mr.From = ""
 		mr.To = ""
-		parsedReq, err := tc.queryService.parseMetricRequest(context.Background(), tc.signedInUser, true, mr, true)
-		require.NoError(t, err)
-		require.NotNil(t, parsedReq)
-		assert.Len(t, parsedReq.parsedQueries, 1)
-		assert.Contains(t, parsedReq.parsedQueries, "gIEkMvIVz")
-		queries := parsedReq.getFlattenedQueries()
-		assert.Len(t, queries, 2)
-
-		assert.Equal(t, int64(1753944618000), queries[0].query.TimeRange.From.UnixMilli())
-		assert.Equal(t, int64(0), queries[0].query.TimeRange.To.UnixMilli())
-
-		assert.Equal(t, int64(0), queries[1].query.TimeRange.From.UnixMilli())
-		assert.Equal(t, int64(0), queries[1].query.TimeRange.To.UnixMilli())
+		_, err := tc.queryService.parseMetricRequest(context.Background(), tc.signedInUser, true, mr, true)
+		require.Error(t, err)
+		require.ErrorContains(t, err, "'to'")
+	})
+	t.Run("Test a datasource query with local time range, malformed from-value", func(t *testing.T) {
+		tc := setup(t, false, nil)
+		mr := metricRequestWithQueries(t, `{
+			"refId": "A",
+			"datasource": {
+				"uid": "gIEkMvIVz",
+				"type": "postgres"
+			},
+			"timeRange": {
+				"from": 1753944618000,
+				"to": "1753944619000"
+			}
+		}`)
+		mr.From = ""
+		mr.To = ""
+		_, err := tc.queryService.parseMetricRequest(context.Background(), tc.signedInUser, true, mr, true)
+		require.Error(t, err)
+		require.ErrorContains(t, err, "'from'")
+	})
+	t.Run("Test a datasource query with local time range, missing from-value", func(t *testing.T) {
+		tc := setup(t, false, nil)
+		mr := metricRequestWithQueries(t, `{
+			"refId": "A",
+			"datasource": {
+				"uid": "gIEkMvIVz",
+				"type": "postgres"
+			},
+			"timeRange": {
+				"to": "1753944619000"
+			}
+		}`)
+		mr.From = ""
+		mr.To = ""
+		_, err := tc.queryService.parseMetricRequest(context.Background(), tc.signedInUser, true, mr, true)
+		require.Error(t, err)
+		require.ErrorContains(t, err, "'from'")
 	})
 }
 

From c82d2af86795ad3c553c3dec90bb6347d0787aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Thu, 7 Aug 2025 11:51:29 +0200
Subject: [PATCH 014/243] Provisioning: introduce jobs controller (#109252)

* Add basic job controller
* Replace the existing in-memory channel
---
 .../apis/provisioning/controller/job.go       | 58 +++++++++++++
 .../apis/provisioning/controller/job_test.go  | 85 +++++++++++++++++++
 .../provisioning/jobs/concurrent_driver.go    |  4 +
 pkg/registry/apis/provisioning/jobs/driver.go | 11 +--
 .../apis/provisioning/jobs/persistentstore.go | 27 +-----
 .../apis/provisioning/jobs/store_mock.go      | 49 +----------
 pkg/registry/apis/provisioning/register.go    |  9 ++
 7 files changed, 166 insertions(+), 77 deletions(-)
 create mode 100644 pkg/registry/apis/provisioning/controller/job.go
 create mode 100644 pkg/registry/apis/provisioning/controller/job_test.go

diff --git a/pkg/registry/apis/provisioning/controller/job.go b/pkg/registry/apis/provisioning/controller/job.go
new file mode 100644
index 00000000000..c3af398d2c1
--- /dev/null
+++ b/pkg/registry/apis/provisioning/controller/job.go
@@ -0,0 +1,58 @@
+package controller
+
+import (
+	"k8s.io/client-go/tools/cache"
+
+	"github.com/grafana/grafana-app-sdk/logging"
+	informer "github.com/grafana/grafana/apps/provisioning/pkg/generated/informers/externalversions/provisioning/v0alpha1"
+)
+
+const (
+	jobControllerLoggerName = "provisioning-job-controller"
+)
+
+// JobController manages job create notifications.
+type JobController struct {
+	jobSynced cache.InformerSynced
+	logger    logging.Logger
+
+	// notification channel for job create events (replaces InsertNotifications)
+	notifications chan struct{}
+}
+
+// NewJobController creates a new JobController.
+func NewJobController(
+	jobInformer informer.JobInformer,
+) (*JobController, error) {
+	jc := &JobController{
+		jobSynced:     jobInformer.Informer().HasSynced,
+		logger:        logging.DefaultLogger.With("logger", jobControllerLoggerName),
+		notifications: make(chan struct{}, 1),
+	}
+
+	_, err := jobInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+		AddFunc: func(obj interface{}) {
+			// Send notification for job create events (replaces InsertNotifications)
+			jc.sendNotification()
+		},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return jc, nil
+}
+
+// InsertNotifications returns a channel that receives notifications when jobs are created.
+// This replaces the InsertNotifications method from persistentstore.go.
+func (jc *JobController) InsertNotifications() chan struct{} {
+	return jc.notifications
+}
+
+func (jc *JobController) sendNotification() {
+	select {
+	case jc.notifications <- struct{}{}:
+	default:
+		// Don't block if there's already a notification waiting
+	}
+}
diff --git a/pkg/registry/apis/provisioning/controller/job_test.go b/pkg/registry/apis/provisioning/controller/job_test.go
new file mode 100644
index 00000000000..8c84abefb0f
--- /dev/null
+++ b/pkg/registry/apis/provisioning/controller/job_test.go
@@ -0,0 +1,85 @@
+package controller
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	provisioningfake "github.com/grafana/grafana/apps/provisioning/pkg/generated/clientset/versioned/fake"
+	provisioninginformers "github.com/grafana/grafana/apps/provisioning/pkg/generated/informers/externalversions"
+)
+
+func TestJobController_New(t *testing.T) {
+	client := provisioningfake.NewSimpleClientset()
+	informerFactory := provisioninginformers.NewSharedInformerFactory(client, time.Second)
+	jobInformer := informerFactory.Provisioning().V0alpha1().Jobs()
+
+	controller, err := NewJobController(jobInformer)
+
+	require.NoError(t, err)
+	assert.NotNil(t, controller)
+	assert.NotNil(t, controller.notifications)
+}
+
+func TestJobController_InsertNotifications(t *testing.T) {
+	client := provisioningfake.NewSimpleClientset()
+	informerFactory := provisioninginformers.NewSharedInformerFactory(client, time.Second)
+	jobInformer := informerFactory.Provisioning().V0alpha1().Jobs()
+
+	controller, err := NewJobController(jobInformer)
+	require.NoError(t, err)
+
+	notifications := controller.InsertNotifications()
+	assert.NotNil(t, notifications)
+
+	// Test that notification is sent
+	controller.sendNotification()
+
+	select {
+	case <-notifications:
+		// Success - notification received
+	case <-time.After(time.Second):
+		t.Fatal("Expected notification but didn't receive one")
+	}
+}
+
+func TestJobController_NotificationOnJobCreate(t *testing.T) {
+	client := provisioningfake.NewSimpleClientset()
+	informerFactory := provisioninginformers.NewSharedInformerFactory(client, time.Second)
+	jobInformer := informerFactory.Provisioning().V0alpha1().Jobs()
+
+	controller, err := NewJobController(jobInformer)
+	require.NoError(t, err)
+
+	// Start informer and wait for cache sync
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	defer cancel()
+
+	informerFactory.Start(ctx.Done())
+	informerFactory.WaitForCacheSync(ctx.Done())
+
+	// Get notifications channel
+	notifications := controller.InsertNotifications()
+
+	// Create a job - this should trigger a notification
+	_, err = client.ProvisioningV0alpha1().Jobs("default").Create(ctx, &provisioning.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-job",
+			Namespace: "default",
+		},
+	}, metav1.CreateOptions{})
+	require.NoError(t, err)
+
+	// Wait for notification
+	select {
+	case <-notifications:
+		// Success - notification received
+	case <-time.After(time.Second * 2):
+		t.Fatal("Expected notification but didn't receive one")
+	}
+}
diff --git a/pkg/registry/apis/provisioning/jobs/concurrent_driver.go b/pkg/registry/apis/provisioning/jobs/concurrent_driver.go
index 23935113a36..4f508c25a8d 100644
--- a/pkg/registry/apis/provisioning/jobs/concurrent_driver.go
+++ b/pkg/registry/apis/provisioning/jobs/concurrent_driver.go
@@ -20,6 +20,7 @@ type ConcurrentJobDriver struct {
 	repoGetter           RepoGetter
 	historicJobs         History
 	workers              []Worker
+	notifications        chan struct{}
 }
 
 // NewConcurrentJobDriver creates a new concurrent job driver that spawns multiple job drivers.
@@ -29,6 +30,7 @@ func NewConcurrentJobDriver(
 	store Store,
 	repoGetter RepoGetter,
 	historicJobs History,
+	notifications chan struct{},
 	workers ...Worker,
 ) (*ConcurrentJobDriver, error) {
 	if numDrivers <= 0 {
@@ -63,6 +65,7 @@ func NewConcurrentJobDriver(
 		repoGetter:           repoGetter,
 		historicJobs:         historicJobs,
 		workers:              workers,
+		notifications:        notifications,
 	}, nil
 }
 
@@ -117,6 +120,7 @@ func (c *ConcurrentJobDriver) Run(ctx context.Context) error {
 				c.store,
 				c.repoGetter,
 				c.historicJobs,
+				c.notifications,
 				c.workers...,
 			)
 			if err != nil {
diff --git a/pkg/registry/apis/provisioning/jobs/driver.go b/pkg/registry/apis/provisioning/jobs/driver.go
index a348d9988b0..f64eebe3528 100644
--- a/pkg/registry/apis/provisioning/jobs/driver.go
+++ b/pkg/registry/apis/provisioning/jobs/driver.go
@@ -36,10 +36,6 @@ type Store interface {
 	// An abandoned job is one that has been claimed by a worker, but the worker has not updated the job in a while.
 	Cleanup(ctx context.Context) error
 
-	// InsertNotifications returns a channel that will have a value sent to it when a new job is inserted.
-	// This is used to wake up the job driver when a new job is inserted.
-	InsertNotifications() chan struct{}
-
 	// Update saves the job back to the store.
 	Update(ctx context.Context, job *provisioning.Job) (*provisioning.Job, error)
 
@@ -77,6 +73,9 @@ type jobDriver struct {
 	// Workers process the job.
 	// Only the first worker who supports the job will process it; the rest are ignored.
 	workers []Worker
+
+	// notifications channel for job create events
+	notifications chan struct{}
 }
 
 func NewJobDriver(
@@ -84,6 +83,7 @@ func NewJobDriver(
 	store Store,
 	repoGetter RepoGetter,
 	historicJobs History,
+	notifications chan struct{},
 	workers ...Worker,
 ) (*jobDriver, error) {
 	return &jobDriver{
@@ -94,6 +94,7 @@ func NewJobDriver(
 		repoGetter:           repoGetter,
 		historicJobs:         historicJobs,
 		workers:              workers,
+		notifications:        notifications,
 	}, nil
 }
 
@@ -120,7 +121,7 @@ func (d *jobDriver) Run(ctx context.Context) error {
 			return ctx.Err()
 		case <-jobTicker.C:
 			d.processJobsUntilDoneOrError(ctx)
-		case <-d.store.InsertNotifications():
+		case <-d.notifications:
 			d.processJobsUntilDoneOrError(ctx)
 		}
 	}
diff --git a/pkg/registry/apis/provisioning/jobs/persistentstore.go b/pkg/registry/apis/provisioning/jobs/persistentstore.go
index 2dfcf216b6b..b25fdff68e2 100644
--- a/pkg/registry/apis/provisioning/jobs/persistentstore.go
+++ b/pkg/registry/apis/provisioning/jobs/persistentstore.go
@@ -87,28 +87,17 @@ type persistentStore struct {
 	// expiry is the time after which a job is considered abandoned.
 	// If a job is abandoned, it will have its claim cleaned up periodically.
 	expiry time.Duration
-
-	// notifications has a signal sent to it when a new job is inserted. If a value already exists, nothing is sent.
-	//
-	// This is very similar to the concept of a Waker in Rust: <https://doc.rust-lang.org/std/task/struct.Waker.html>
-	notifications chan struct{}
 }
 
-func NewJobStore(
-	jobStore jobStorage,
-	expiry time.Duration,
-) (*persistentStore, error) {
+func NewJobStore(jobStore jobStorage, expiry time.Duration) (*persistentStore, error) {
 	if expiry <= 0 {
 		expiry = time.Second * 30
 	}
 
 	return &persistentStore{
 		jobStore: jobStore,
-
-		clock:  time.Now,
-		expiry: expiry,
-
-		notifications: make(chan struct{}, 1),
+		clock:    time.Now,
+		expiry:   expiry,
 	}, nil
 }
 
@@ -446,19 +435,9 @@ func (s *persistentStore) Insert(ctx context.Context, namespace string, spec pro
 		return nil, apifmt.Errorf("unexpected object type %T", obj)
 	}
 
-	select {
-	case s.notifications <- struct{}{}:
-	default:
-		// We don't want to block if there is already a notification waiting.
-	}
-
 	return created, nil
 }
 
-func (s *persistentStore) InsertNotifications() chan struct{} {
-	return s.notifications
-}
-
 // generateJobName creates and updates the job's name to one that fits it.
 func (s *persistentStore) generateJobName(job *provisioning.Job) {
 	switch job.Spec.Action {
diff --git a/pkg/registry/apis/provisioning/jobs/store_mock.go b/pkg/registry/apis/provisioning/jobs/store_mock.go
index 114a621561e..79d91719605 100644
--- a/pkg/registry/apis/provisioning/jobs/store_mock.go
+++ b/pkg/registry/apis/provisioning/jobs/store_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.4. DO NOT EDIT.
+// Code generated by mockery v2.52.4. DO NOT EDIT.
 
 package jobs
 
@@ -182,53 +182,6 @@ func (_c *MockStore_Complete_Call) RunAndReturn(run func(context.Context, *v0alp
 	return _c
 }
 
-// InsertNotifications provides a mock function with no fields
-func (_m *MockStore) InsertNotifications() chan struct{} {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for InsertNotifications")
-	}
-
-	var r0 chan struct{}
-	if rf, ok := ret.Get(0).(func() chan struct{}); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(chan struct{})
-		}
-	}
-
-	return r0
-}
-
-// MockStore_InsertNotifications_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'InsertNotifications'
-type MockStore_InsertNotifications_Call struct {
-	*mock.Call
-}
-
-// InsertNotifications is a helper method to define mock.On call
-func (_e *MockStore_Expecter) InsertNotifications() *MockStore_InsertNotifications_Call {
-	return &MockStore_InsertNotifications_Call{Call: _e.mock.On("InsertNotifications")}
-}
-
-func (_c *MockStore_InsertNotifications_Call) Run(run func()) *MockStore_InsertNotifications_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *MockStore_InsertNotifications_Call) Return(_a0 chan struct{}) *MockStore_InsertNotifications_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *MockStore_InsertNotifications_Call) RunAndReturn(run func() chan struct{}) *MockStore_InsertNotifications_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
 // Update provides a mock function with given fields: ctx, job
 func (_m *MockStore) Update(ctx context.Context, job *v0alpha1.Job) (*v0alpha1.Job, error) {
 	ret := _m.Called(ctx, job)
diff --git a/pkg/registry/apis/provisioning/register.go b/pkg/registry/apis/provisioning/register.go
index 4ad94af2687..ee8ad2dd02e 100644
--- a/pkg/registry/apis/provisioning/register.go
+++ b/pkg/registry/apis/provisioning/register.go
@@ -603,7 +603,9 @@ func (b *APIBuilder) GetPostStartHooks() (map[string]genericapiserver.PostStartH
 			// Informer with resync interval used for health check and reconciliation
 			sharedInformerFactory := informers.NewSharedInformerFactory(c, 60*time.Second)
 			repoInformer := sharedInformerFactory.Provisioning().V0alpha1().Repositories()
+			jobInformer := sharedInformerFactory.Provisioning().V0alpha1().Jobs()
 			go repoInformer.Informer().Run(postStartHookCtx.Done())
+			go jobInformer.Informer().Run(postStartHookCtx.Done())
 
 			b.client = c.ProvisioningV0alpha1()
 
@@ -675,6 +677,12 @@ func (b *APIBuilder) GetPostStartHooks() (map[string]genericapiserver.PostStartH
 				syncWorker,
 			}
 
+			// Create JobController to handle job create notifications
+			jobController, err := controller.NewJobController(jobInformer)
+			if err != nil {
+				return err
+			}
+
 			// Add any extra workers
 			for _, extra := range b.extras {
 				workers = append(workers, extra.GetJobWorkers()...)
@@ -688,6 +696,7 @@ func (b *APIBuilder) GetPostStartHooks() (map[string]genericapiserver.PostStartH
 				30*time.Second, // Periodically look for new jobs
 				30*time.Second, // Lease renewal interval
 				b.jobs, b, b.jobHistory,
+				jobController.InsertNotifications(),
 				workers...,
 			)
 			if err != nil {

From ace670c6d07e8740d062e3474631e0f87679e385 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 7 Aug 2025 12:54:24 +0300
Subject: [PATCH 015/243] Secrets: Support variadic args in decrypt service
 (#109280)

---
 .../apis/provisioning/secrets/secret.go       |  8 +--
 .../apis/provisioning/secrets/secret_mock.go  |  2 +-
 .../apis/provisioning/secrets/secret_test.go  | 68 +++++++++----------
 .../secrets/secure_value_client_mock.go       |  2 +-
 pkg/registry/apis/secret/contracts/decrypt.go |  2 +-
 .../apis/secret/decrypt/grpc_client.go        | 20 ++++--
 .../apis/secret/decrypt/local_client.go       |  6 +-
 .../apis/secret/decrypt/service_test.go       | 12 ++--
 pkg/registry/apis/secret/decrypt_client.go    |  2 +
 .../decrypt_client_mock.go}                   | 49 ++++++++-----
 .../secret/inline/inline_secure_value_test.go | 24 +++++--
 .../secret/metadata/secure_value_test.go      | 13 ++--
 12 files changed, 128 insertions(+), 80 deletions(-)
 rename pkg/registry/apis/{provisioning/secrets/mocks/decrypt_service_mock.go => secret/decrypt_client_mock.go} (66%)

diff --git a/pkg/registry/apis/provisioning/secrets/secret.go b/pkg/registry/apis/provisioning/secrets/secret.go
index 7b1de7fee32..9c58a1f39ae 100644
--- a/pkg/registry/apis/provisioning/secrets/secret.go
+++ b/pkg/registry/apis/provisioning/secrets/secret.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"errors"
 
-	"github.com/grafana/grafana/pkg/registry/apis/secret"
-	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
-	"github.com/grafana/grafana/pkg/setting"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
 	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	"github.com/grafana/grafana/pkg/registry/apis/secret"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 const svcName = provisioning.GROUP
@@ -109,7 +109,7 @@ func (s *secretsService) Encrypt(ctx context.Context, namespace, name string, da
 }
 
 func (s *secretsService) Decrypt(ctx context.Context, namespace string, name string) ([]byte, error) {
-	results, err := s.decryptSvc.Decrypt(ctx, svcName, namespace, []string{name})
+	results, err := s.decryptSvc.Decrypt(ctx, svcName, namespace, name)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/registry/apis/provisioning/secrets/secret_mock.go b/pkg/registry/apis/provisioning/secrets/secret_mock.go
index 29c9c04f364..3366e8e1255 100644
--- a/pkg/registry/apis/provisioning/secrets/secret_mock.go
+++ b/pkg/registry/apis/provisioning/secrets/secret_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.4. DO NOT EDIT.
+// Code generated by mockery v2.53.4. DO NOT EDIT.
 
 package secrets
 
diff --git a/pkg/registry/apis/provisioning/secrets/secret_test.go b/pkg/registry/apis/provisioning/secrets/secret_test.go
index d7097975f43..744b9ccbd41 100644
--- a/pkg/registry/apis/provisioning/secrets/secret_test.go
+++ b/pkg/registry/apis/provisioning/secrets/secret_test.go
@@ -5,11 +5,6 @@ import (
 	"errors"
 	"testing"
 
-	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
-	"github.com/grafana/grafana/pkg/registry/apis/provisioning/secrets/mocks"
-	"github.com/grafana/grafana/pkg/registry/apis/secret"
-	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -17,6 +12,11 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic"
+
+	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
+	"github.com/grafana/grafana/pkg/registry/apis/secret"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 // mockDynamicInterface implements a simplified version of the dynamic.ResourceInterface
@@ -49,7 +49,7 @@ func (m *mockDynamicInterface) Delete(ctx context.Context, name string, options
 
 func TestNewSecretsService(t *testing.T) {
 	mockSecretsSvc := NewMockSecureValueClient(t)
-	mockDecryptSvc := &mocks.MockDecryptService{}
+	mockDecryptSvc := &secret.MockDecryptService{}
 
 	svc := NewSecretsService(mockSecretsSvc, mockDecryptSvc, &setting.Cfg{})
 
@@ -64,7 +64,7 @@ func TestSecretsService_Encrypt(t *testing.T) {
 		namespace     string
 		secretName    string
 		data          string
-		setupMocks    func(*MockSecureValueClient, *mocks.MockDecryptService, *mockDynamicInterface)
+		setupMocks    func(*MockSecureValueClient, *secret.MockDecryptService, *mockDynamicInterface)
 		expectedName  string
 		expectedError string
 	}{
@@ -73,7 +73,7 @@ func TestSecretsService_Encrypt(t *testing.T) {
 			namespace:  "test-namespace",
 			secretName: "test-secret",
 			data:       "secret-data",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
 				// Setup client to return the mock resource interface
 				mockSecretsSvc.EXPECT().Client(mock.Anything, "test-namespace").Return(mockResourceInterface, nil)
 
@@ -99,7 +99,7 @@ func TestSecretsService_Encrypt(t *testing.T) {
 			namespace:  "test-namespace",
 			secretName: "existing-secret",
 			data:       "new-secret-data",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
 				existingSecret := &unstructured.Unstructured{
 					Object: map[string]interface{}{
 						"metadata": map[string]interface{}{
@@ -138,7 +138,7 @@ func TestSecretsService_Encrypt(t *testing.T) {
 			namespace:  "test-namespace",
 			secretName: "test-secret",
 			data:       "secret-data",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
 				// Setup client to return the mock resource interface
 				mockSecretsSvc.EXPECT().Client(mock.Anything, "test-namespace").Return(mockResourceInterface, nil)
 
@@ -153,7 +153,7 @@ func TestSecretsService_Encrypt(t *testing.T) {
 			namespace:  "test-namespace",
 			secretName: "test-secret",
 			data:       "secret-data",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
 				// Setup client to return the mock resource interface
 				mockSecretsSvc.EXPECT().Client(mock.Anything, "test-namespace").Return(mockResourceInterface, nil)
 
@@ -172,7 +172,7 @@ func TestSecretsService_Encrypt(t *testing.T) {
 			namespace:  "test-namespace",
 			secretName: "existing-secret",
 			data:       "new-secret-data",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
 				existingSecret := &unstructured.Unstructured{
 					Object: map[string]interface{}{
 						"metadata": map[string]interface{}{
@@ -204,7 +204,7 @@ func TestSecretsService_Encrypt(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mockSecretsSvc := NewMockSecureValueClient(t)
-			mockDecryptSvc := &mocks.MockDecryptService{}
+			mockDecryptSvc := &secret.MockDecryptService{}
 			mockResourceInterface := &mockDynamicInterface{}
 
 			tt.setupMocks(mockSecretsSvc, mockDecryptSvc, mockResourceInterface)
@@ -228,7 +228,7 @@ func TestSecretsService_Encrypt(t *testing.T) {
 
 func TestSecretsService_Encrypt_ClientError(t *testing.T) {
 	mockSecretsSvc := NewMockSecureValueClient(t)
-	mockDecryptSvc := &mocks.MockDecryptService{}
+	mockDecryptSvc := &secret.MockDecryptService{}
 
 	// Setup client to return error
 	mockSecretsSvc.EXPECT().Client(mock.Anything, "test-namespace").Return(nil, errors.New("client error"))
@@ -249,7 +249,7 @@ func TestSecretsService_Decrypt(t *testing.T) {
 		name           string
 		namespace      string
 		secretName     string
-		setupMocks     func(*MockSecureValueClient, *mocks.MockDecryptService)
+		setupMocks     func(*MockSecureValueClient, *secret.MockDecryptService)
 		expectedResult []byte
 		expectedError  string
 	}{
@@ -257,7 +257,7 @@ func TestSecretsService_Decrypt(t *testing.T) {
 			name:       "successfully decrypt secret",
 			namespace:  "test-namespace",
 			secretName: "test-secret",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService) {
 				exposedValue := secretv1beta1.NewExposedSecureValue("decrypted-data")
 				mockResult := secret.NewDecryptResultValue(&exposedValue)
 
@@ -268,7 +268,7 @@ func TestSecretsService_Decrypt(t *testing.T) {
 					}),
 					svcName,
 					"test-namespace",
-					[]string{"test-secret"},
+					"test-secret",
 				).Return(map[string]secret.DecryptResult{
 					"test-secret": mockResult,
 				}, nil)
@@ -279,14 +279,14 @@ func TestSecretsService_Decrypt(t *testing.T) {
 			name:       "decrypt service error",
 			namespace:  "test-namespace",
 			secretName: "test-secret",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService) {
 				mockDecryptSvc.EXPECT().Decrypt(
 					mock.MatchedBy(func(ctx context.Context) bool {
 						return ctx != nil
 					}),
 					svcName,
 					"test-namespace",
-					[]string{"test-secret"},
+					"test-secret",
 				).Return(nil, errors.New("decrypt service error"))
 			},
 			expectedError: "decrypt service error",
@@ -295,14 +295,14 @@ func TestSecretsService_Decrypt(t *testing.T) {
 			name:       "secret not found in results",
 			namespace:  "test-namespace",
 			secretName: "test-secret",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService) {
 				mockDecryptSvc.EXPECT().Decrypt(
 					mock.MatchedBy(func(ctx context.Context) bool {
 						return ctx != nil
 					}),
 					svcName,
 					"test-namespace",
-					[]string{"test-secret"},
+					"test-secret",
 				).Return(map[string]secret.DecryptResult{}, nil)
 			},
 			expectedError: secret.ErrDecryptNotFound.Error(),
@@ -311,7 +311,7 @@ func TestSecretsService_Decrypt(t *testing.T) {
 			name:       "decrypt result has error",
 			namespace:  "test-namespace",
 			secretName: "test-secret",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService) {
 				mockResult := secret.NewDecryptResultErr(errors.New("decryption failed"))
 
 				mockDecryptSvc.EXPECT().Decrypt(
@@ -320,7 +320,7 @@ func TestSecretsService_Decrypt(t *testing.T) {
 					}),
 					svcName,
 					"test-namespace",
-					[]string{"test-secret"},
+					"test-secret",
 				).Return(map[string]secret.DecryptResult{
 					"test-secret": mockResult,
 				}, nil)
@@ -332,7 +332,7 @@ func TestSecretsService_Decrypt(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mockSecretsSvc := NewMockSecureValueClient(t)
-			mockDecryptSvc := &mocks.MockDecryptService{}
+			mockDecryptSvc := &secret.MockDecryptService{}
 
 			tt.setupMocks(mockSecretsSvc, mockDecryptSvc)
 
@@ -356,7 +356,7 @@ func TestSecretsService_Decrypt(t *testing.T) {
 // Test to verify that the Decrypt method creates the correct service identity context
 func TestSecretsService_Decrypt_ServiceIdentityContext(t *testing.T) {
 	mockSecretsSvc := NewMockSecureValueClient(t)
-	mockDecryptSvc := &mocks.MockDecryptService{}
+	mockDecryptSvc := &secret.MockDecryptService{}
 
 	exposedValue := secretv1beta1.NewExposedSecureValue("test-data")
 	mockResult := secret.NewDecryptResultValue(&exposedValue)
@@ -369,7 +369,7 @@ func TestSecretsService_Decrypt_ServiceIdentityContext(t *testing.T) {
 		}),
 		svcName,
 		"test-namespace",
-		[]string{"test-secret"},
+		"test-secret",
 	).Return(map[string]secret.DecryptResult{
 		"test-secret": mockResult,
 	}, nil)
@@ -388,14 +388,14 @@ func TestSecretsService_Delete(t *testing.T) {
 		name          string
 		namespace     string
 		secretName    string
-		setupMocks    func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService, mockResourceInterface *mockDynamicInterface)
+		setupMocks    func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService, mockResourceInterface *mockDynamicInterface)
 		expectedError string
 	}{
 		{
 			name:       "delete success",
 			namespace:  "test-namespace",
 			secretName: "test-secret",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
 				// Setup client to return the mock resource interface
 				mockSecretsSvc.EXPECT().Client(mock.Anything, "test-namespace").Return(mockResourceInterface, nil)
 
@@ -407,7 +407,7 @@ func TestSecretsService_Delete(t *testing.T) {
 			name:       "delete returns error",
 			namespace:  "test-namespace",
 			secretName: "test-secret",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
 				// Setup client to return the mock resource interface
 				mockSecretsSvc.EXPECT().Client(mock.Anything, "test-namespace").Return(mockResourceInterface, nil)
 
@@ -420,7 +420,7 @@ func TestSecretsService_Delete(t *testing.T) {
 			name:       "client error",
 			namespace:  "test-namespace",
 			secretName: "test-secret",
-			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *mocks.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
+			setupMocks: func(mockSecretsSvc *MockSecureValueClient, mockDecryptSvc *secret.MockDecryptService, mockResourceInterface *mockDynamicInterface) {
 				// Setup client to return error
 				mockSecretsSvc.EXPECT().Client(mock.Anything, "test-namespace").Return(nil, errors.New("client error"))
 			},
@@ -431,7 +431,7 @@ func TestSecretsService_Delete(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mockSecretsSvc := NewMockSecureValueClient(t)
-			mockDecryptSvc := &mocks.MockDecryptService{}
+			mockDecryptSvc := &secret.MockDecryptService{}
 			mockResourceInterface := &mockDynamicInterface{}
 
 			tt.setupMocks(mockSecretsSvc, mockDecryptSvc, mockResourceInterface)
@@ -499,7 +499,7 @@ func TestIsNotFoundError(t *testing.T) {
 
 func TestSecretsService_Encrypt_WithK8sNotFoundError(t *testing.T) {
 	mockSecretsSvc := NewMockSecureValueClient(t)
-	mockDecryptSvc := &mocks.MockDecryptService{}
+	mockDecryptSvc := &secret.MockDecryptService{}
 	mockResourceInterface := &mockDynamicInterface{}
 
 	// Setup client to return the mock resource interface
@@ -532,7 +532,7 @@ func TestSecretsService_Encrypt_WithK8sNotFoundError(t *testing.T) {
 
 func TestSecretsService_Delete_WithK8sNotFoundError(t *testing.T) {
 	mockSecretsSvc := NewMockSecureValueClient(t)
-	mockDecryptSvc := &mocks.MockDecryptService{}
+	mockDecryptSvc := &secret.MockDecryptService{}
 	mockResourceInterface := &mockDynamicInterface{}
 
 	// Setup client to return the mock resource interface
@@ -554,7 +554,7 @@ func TestSecretsService_Delete_WithK8sNotFoundError(t *testing.T) {
 
 func TestSecretsService_Delete_WithGrafanaNotFoundError(t *testing.T) {
 	mockSecretsSvc := NewMockSecureValueClient(t)
-	mockDecryptSvc := &mocks.MockDecryptService{}
+	mockDecryptSvc := &secret.MockDecryptService{}
 	mockResourceInterface := &mockDynamicInterface{}
 
 	// Setup client to return the mock resource interface
diff --git a/pkg/registry/apis/provisioning/secrets/secure_value_client_mock.go b/pkg/registry/apis/provisioning/secrets/secure_value_client_mock.go
index e00d66395ef..25b9a4ca3b8 100644
--- a/pkg/registry/apis/provisioning/secrets/secure_value_client_mock.go
+++ b/pkg/registry/apis/provisioning/secrets/secure_value_client_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.4. DO NOT EDIT.
+// Code generated by mockery v2.53.4. DO NOT EDIT.
 
 package secrets
 
diff --git a/pkg/registry/apis/secret/contracts/decrypt.go b/pkg/registry/apis/secret/contracts/decrypt.go
index 2a630420315..83e6fc72185 100644
--- a/pkg/registry/apis/secret/contracts/decrypt.go
+++ b/pkg/registry/apis/secret/contracts/decrypt.go
@@ -29,7 +29,7 @@ type DecryptAuthorizer interface {
 
 // DecryptService is the interface for the decrypt service.
 type DecryptService interface {
-	Decrypt(ctx context.Context, serviceName string, namespace string, names []string) (map[string]DecryptResult, error)
+	Decrypt(ctx context.Context, serviceName string, namespace string, names ...string) (map[string]DecryptResult, error)
 }
 
 // DecryptResult is the (union) result of a decryption operation.
diff --git a/pkg/registry/apis/secret/decrypt/grpc_client.go b/pkg/registry/apis/secret/decrypt/grpc_client.go
index 356a04f9ccf..9919ec67f9b 100644
--- a/pkg/registry/apis/secret/decrypt/grpc_client.go
+++ b/pkg/registry/apis/secret/decrypt/grpc_client.go
@@ -6,17 +6,19 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
+	"maps"
 	"os"
+	"slices"
 
 	"github.com/fullstorydev/grpchan"
-	authnlib "github.com/grafana/authlib/authn"
-	"github.com/grafana/authlib/types"
 	"go.opentelemetry.io/otel/trace"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/metadata"
 
+	authnlib "github.com/grafana/authlib/authn"
+	"github.com/grafana/authlib/types"
 	decryptv1beta1 "github.com/grafana/grafana/apps/secret/decrypt/v1beta1"
 	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
@@ -109,12 +111,22 @@ func createTLSCredentials(config TLSConfig) (credentials.TransportCredentials, e
 }
 
 // Decrypt a set of secure value names in a given namespace for a specific service name.
-func (g *GRPCDecryptClient) Decrypt(ctx context.Context, serviceName string, namespace string, names []string) (map[string]contracts.DecryptResult, error) {
+func (g *GRPCDecryptClient) Decrypt(ctx context.Context, serviceName string, namespace string, names ...string) (map[string]contracts.DecryptResult, error) {
 	_, err := types.ParseNamespace(namespace)
 	if err != nil {
 		return nil, err
 	}
 
+	unique := make(map[string]bool, len(names))
+	for _, v := range names {
+		if v != "" {
+			unique[v] = true
+		}
+	}
+	if len(unique) < 1 {
+		return map[string]contracts.DecryptResult{}, nil
+	}
+
 	tokenExchangerInterceptor := authnlib.NewGrpcClientInterceptor(
 		g.tokenExchanger,
 		authnlib.WithClientInterceptorTracer(g.tracer),
@@ -132,7 +144,7 @@ func (g *GRPCDecryptClient) Decrypt(ctx context.Context, serviceName string, nam
 
 	req := &decryptv1beta1.SecureValueDecryptRequest{
 		Namespace: namespace,
-		Names:     names,
+		Names:     slices.Collect(maps.Keys(unique)),
 	}
 
 	// Decryption will still use the service identity from the auth token,
diff --git a/pkg/registry/apis/secret/decrypt/local_client.go b/pkg/registry/apis/secret/decrypt/local_client.go
index e9fc5daa618..a565fcc06f9 100644
--- a/pkg/registry/apis/secret/decrypt/local_client.go
+++ b/pkg/registry/apis/secret/decrypt/local_client.go
@@ -21,7 +21,7 @@ func NewLocalDecryptClient(decryptStorage contracts.DecryptStorage) (*LocalDecry
 	}, nil
 }
 
-func (c *LocalDecryptClient) Decrypt(ctx context.Context, serviceName, namespace string, names []string) (map[string]contracts.DecryptResult, error) {
+func (c *LocalDecryptClient) Decrypt(ctx context.Context, serviceName, namespace string, names ...string) (map[string]contracts.DecryptResult, error) {
 	ns, err := types.ParseNamespace(namespace)
 	if err != nil {
 		return nil, err
@@ -32,6 +32,10 @@ func (c *LocalDecryptClient) Decrypt(ctx context.Context, serviceName, namespace
 	results := make(map[string]contracts.DecryptResult, len(names))
 
 	for _, name := range names {
+		_, found := results[name]
+		if found || name == "" {
+			continue // no need to decrypt
+		}
 		exposedSecureValue, err := c.decryptStorage.Decrypt(ctx, xkube.Namespace(namespace), name)
 		if err != nil {
 			results[name] = contracts.NewDecryptResultErr(err)
diff --git a/pkg/registry/apis/secret/decrypt/service_test.go b/pkg/registry/apis/secret/decrypt/service_test.go
index 66013f8408d..e1fd85a6fe3 100644
--- a/pkg/registry/apis/secret/decrypt/service_test.go
+++ b/pkg/registry/apis/secret/decrypt/service_test.go
@@ -9,8 +9,6 @@ import (
 	"strings"
 	"testing"
 
-	decryptv1beta1 "github.com/grafana/grafana/apps/secret/decrypt/v1beta1"
-	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/trace/noop"
@@ -19,6 +17,8 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/metadata"
 
+	decryptv1beta1 "github.com/grafana/grafana/apps/secret/decrypt/v1beta1"
+	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/decrypt"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/testutils"
@@ -48,7 +48,7 @@ func TestDecryptService(t *testing.T) {
 		decryptService, err := decrypt.ProvideDecryptService(cfg, tracer, mockStorage)
 		require.NoError(t, err)
 
-		resp, err := decryptService.Decrypt(ctx, "svc-name", "default", []string{"secure-value-1"})
+		resp, err := decryptService.Decrypt(ctx, "svc-name", "default", "secure-value-1")
 		require.NotNil(t, resp)
 		require.NoError(t, err)
 		require.EqualValues(t, decryptedValuesResp, resp)
@@ -76,7 +76,7 @@ func TestDecryptService(t *testing.T) {
 		decryptService, err := decrypt.ProvideDecryptService(cfg, tracer, mockStorage)
 		require.NoError(t, err)
 
-		resp, err := decryptService.Decrypt(ctx, "svc-name", "default", []string{"secure-value-1", "secure-value-2"})
+		resp, err := decryptService.Decrypt(ctx, "svc-name", "default", "secure-value-1", "secure-value-2")
 		require.NotNil(t, resp)
 		require.NoError(t, err)
 		require.EqualValues(t, decryptedValuesResp, resp)
@@ -104,7 +104,7 @@ func TestDecryptService(t *testing.T) {
 		decryptService, err := decrypt.ProvideDecryptService(cfg, tracer, mockStorage)
 		require.NoError(t, err)
 
-		resp, err := decryptService.Decrypt(ctx, "svc-name", "default", []string{"secure-value-1", "secure-value-2"})
+		resp, err := decryptService.Decrypt(ctx, "svc-name", "default", "secure-value-1", "secure-value-2")
 		require.NotNil(t, resp)
 		require.NoError(t, err)
 		require.EqualValues(t, decryptedValuesResp, resp)
@@ -221,7 +221,7 @@ func TestDecryptService(t *testing.T) {
 
 		svcIdentity := "provsysoning-test"
 
-		result, err := decryptService.Decrypt(t.Context(), svcIdentity, namespace, []string{"secure-value-1"})
+		result, err := decryptService.Decrypt(t.Context(), svcIdentity, namespace, "secure-value-1")
 		require.NoError(t, err)
 		require.NotNil(t, result)
 		require.Len(t, result, 1)
diff --git a/pkg/registry/apis/secret/decrypt_client.go b/pkg/registry/apis/secret/decrypt_client.go
index 0ed0d3b31a7..41d9ae9aa2d 100644
--- a/pkg/registry/apis/secret/decrypt_client.go
+++ b/pkg/registry/apis/secret/decrypt_client.go
@@ -6,6 +6,8 @@ import (
 )
 
 // DecryptService is a decrypt client for secure value secrets.
+//
+//go:generate mockery --name DecryptService --structname MockDecryptService --inpackage --filename decrypt_client_mock.go --with-expecter
 type DecryptService = contracts.DecryptService
 
 var (
diff --git a/pkg/registry/apis/provisioning/secrets/mocks/decrypt_service_mock.go b/pkg/registry/apis/secret/decrypt_client_mock.go
similarity index 66%
rename from pkg/registry/apis/provisioning/secrets/mocks/decrypt_service_mock.go
rename to pkg/registry/apis/secret/decrypt_client_mock.go
index dd3c37804ef..445941a5b39 100644
--- a/pkg/registry/apis/provisioning/secrets/mocks/decrypt_service_mock.go
+++ b/pkg/registry/apis/secret/decrypt_client_mock.go
@@ -1,12 +1,13 @@
-// Code generated by mockery v2.52.4. DO NOT EDIT.
+// Code generated by mockery v2.53.4. DO NOT EDIT.
 
-package mocks
+package secret
 
 import (
 	context "context"
 
-	contracts "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	mock "github.com/stretchr/testify/mock"
+
+	contracts "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 )
 
 // MockDecryptService is an autogenerated mock type for the DecryptService type
@@ -23,8 +24,15 @@ func (_m *MockDecryptService) EXPECT() *MockDecryptService_Expecter {
 }
 
 // Decrypt provides a mock function with given fields: ctx, serviceName, namespace, names
-func (_m *MockDecryptService) Decrypt(ctx context.Context, serviceName string, namespace string, names []string) (map[string]contracts.DecryptResult, error) {
-	ret := _m.Called(ctx, serviceName, namespace, names)
+func (_m *MockDecryptService) Decrypt(ctx context.Context, serviceName string, namespace string, names ...string) (map[string]contracts.DecryptResult, error) {
+	_va := make([]interface{}, len(names))
+	for _i := range names {
+		_va[_i] = names[_i]
+	}
+	var _ca []interface{}
+	_ca = append(_ca, ctx, serviceName, namespace)
+	_ca = append(_ca, _va...)
+	ret := _m.Called(_ca...)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Decrypt")
@@ -32,19 +40,19 @@ func (_m *MockDecryptService) Decrypt(ctx context.Context, serviceName string, n
 
 	var r0 map[string]contracts.DecryptResult
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, string, string, []string) (map[string]contracts.DecryptResult, error)); ok {
-		return rf(ctx, serviceName, namespace, names)
+	if rf, ok := ret.Get(0).(func(context.Context, string, string, ...string) (map[string]contracts.DecryptResult, error)); ok {
+		return rf(ctx, serviceName, namespace, names...)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, string, string, []string) map[string]contracts.DecryptResult); ok {
-		r0 = rf(ctx, serviceName, namespace, names)
+	if rf, ok := ret.Get(0).(func(context.Context, string, string, ...string) map[string]contracts.DecryptResult); ok {
+		r0 = rf(ctx, serviceName, namespace, names...)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(map[string]contracts.DecryptResult)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, string, string, []string) error); ok {
-		r1 = rf(ctx, serviceName, namespace, names)
+	if rf, ok := ret.Get(1).(func(context.Context, string, string, ...string) error); ok {
+		r1 = rf(ctx, serviceName, namespace, names...)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -61,14 +69,21 @@ type MockDecryptService_Decrypt_Call struct {
 //   - ctx context.Context
 //   - serviceName string
 //   - namespace string
-//   - names []string
-func (_e *MockDecryptService_Expecter) Decrypt(ctx interface{}, serviceName interface{}, namespace interface{}, names interface{}) *MockDecryptService_Decrypt_Call {
-	return &MockDecryptService_Decrypt_Call{Call: _e.mock.On("Decrypt", ctx, serviceName, namespace, names)}
+//   - names ...string
+func (_e *MockDecryptService_Expecter) Decrypt(ctx interface{}, serviceName interface{}, namespace interface{}, names ...interface{}) *MockDecryptService_Decrypt_Call {
+	return &MockDecryptService_Decrypt_Call{Call: _e.mock.On("Decrypt",
+		append([]interface{}{ctx, serviceName, namespace}, names...)...)}
 }
 
-func (_c *MockDecryptService_Decrypt_Call) Run(run func(ctx context.Context, serviceName string, namespace string, names []string)) *MockDecryptService_Decrypt_Call {
+func (_c *MockDecryptService_Decrypt_Call) Run(run func(ctx context.Context, serviceName string, namespace string, names ...string)) *MockDecryptService_Decrypt_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].([]string))
+		variadicArgs := make([]string, len(args)-3)
+		for i, a := range args[3:] {
+			if a != nil {
+				variadicArgs[i] = a.(string)
+			}
+		}
+		run(args[0].(context.Context), args[1].(string), args[2].(string), variadicArgs...)
 	})
 	return _c
 }
@@ -78,7 +93,7 @@ func (_c *MockDecryptService_Decrypt_Call) Return(_a0 map[string]contracts.Decry
 	return _c
 }
 
-func (_c *MockDecryptService_Decrypt_Call) RunAndReturn(run func(context.Context, string, string, []string) (map[string]contracts.DecryptResult, error)) *MockDecryptService_Decrypt_Call {
+func (_c *MockDecryptService_Decrypt_Call) RunAndReturn(run func(context.Context, string, string, ...string) (map[string]contracts.DecryptResult, error)) *MockDecryptService_Decrypt_Call {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/pkg/registry/apis/secret/inline/inline_secure_value_test.go b/pkg/registry/apis/secret/inline/inline_secure_value_test.go
index 707d4f16711..2de9d0e570b 100644
--- a/pkg/registry/apis/secret/inline/inline_secure_value_test.go
+++ b/pkg/registry/apis/secret/inline/inline_secure_value_test.go
@@ -3,15 +3,16 @@ package inline_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/otel/trace/noop"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/inline"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/testutils"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/xkube"
-	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel/trace/noop"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestIntegration_InlineSecureValue_CanReference(t *testing.T) {
@@ -255,7 +256,7 @@ func TestIntegration_InlineSecureValue_CreateInline(t *testing.T) {
 		require.NoError(t, err)
 		require.NotEmpty(t, createdName)
 
-		decryptedValues, err := tu.DecryptService.Decrypt(t.Context(), serviceIdentity, owner.Namespace, []string{createdName})
+		decryptedValues, err := tu.DecryptService.Decrypt(t.Context(), serviceIdentity, owner.Namespace, createdName)
 		require.NoError(t, err)
 
 		decryptedResult, ok := decryptedValues[createdName]
@@ -263,12 +264,25 @@ func TestIntegration_InlineSecureValue_CreateInline(t *testing.T) {
 		require.Equal(t, decryptedResult.Value().DangerouslyExposeAndConsumeValue(), rawSecret)
 
 		// can also decrypt with the owner.APIGroup as a decrypter
-		decryptedValues, err = tu.DecryptService.Decrypt(t.Context(), owner.APIGroup, owner.Namespace, []string{createdName})
+		decryptedValues, err = tu.DecryptService.Decrypt(t.Context(), owner.APIGroup, owner.Namespace, createdName)
 		require.NoError(t, err)
 
 		decryptedResult, ok = decryptedValues[createdName]
 		require.True(t, ok)
 		require.Equal(t, decryptedResult.Value().DangerouslyExposeAndConsumeValue(), rawSecret)
+
+		// Ignores empty values and duplicates
+		decryptedValues, err = tu.DecryptService.Decrypt(t.Context(), owner.APIGroup, owner.Namespace,
+			"", createdName, "", createdName, "") // Empty and duplicate requested names
+		require.NoError(t, err)
+		require.Len(t, decryptedValues, 1)
+		_, ok = decryptedValues[createdName]
+		require.True(t, ok)
+
+		// empty request
+		decryptedValues, err = tu.DecryptService.Decrypt(t.Context(), owner.APIGroup, owner.Namespace, "")
+		require.NoError(t, err)
+		require.Len(t, decryptedValues, 0) // << empty
 	})
 
 	t.Run("when the auth info is missing it returns an error", func(t *testing.T) {
diff --git a/pkg/storage/secret/metadata/secure_value_test.go b/pkg/storage/secret/metadata/secure_value_test.go
index 7f387847848..7747751753d 100644
--- a/pkg/storage/secret/metadata/secure_value_test.go
+++ b/pkg/storage/secret/metadata/secure_value_test.go
@@ -5,15 +5,16 @@ import (
 	"slices"
 	"testing"
 
-	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
-	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
-	"github.com/grafana/grafana/pkg/registry/apis/secret/testutils"
-	"github.com/grafana/grafana/pkg/registry/apis/secret/xkube"
 	"github.com/mitchellh/copystructure"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
 	"pgregory.net/rapid"
+
+	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/testutils"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/xkube"
 )
 
 type modelSecureValue struct {
@@ -404,7 +405,7 @@ func TestStateMachine(t *testing.T) {
 			"decrypt": func(t *rapid.T) {
 				input := decryptGen.Draw(t, "decryptInput")
 				modelResult, modelErr := model.decrypt(input.decrypter, input.namespace, input.name)
-				result, err := sut.DecryptService.Decrypt(t.Context(), input.decrypter, input.namespace, []string{input.name})
+				result, err := sut.DecryptService.Decrypt(t.Context(), input.decrypter, input.namespace, input.name)
 				if err != nil || modelErr != nil {
 					require.ErrorIs(t, err, modelErr)
 					return
@@ -439,7 +440,7 @@ func TestSecureValueServiceExampleBased(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, sv.Status.Version, deletedSv.Status.Version)
 
-		result, err := sut.DecryptService.Decrypt(t.Context(), sv.Spec.Decrypters[0], sv.Namespace, []string{sv.Name})
+		result, err := sut.DecryptService.Decrypt(t.Context(), sv.Spec.Decrypters[0], sv.Namespace, sv.Name)
 		require.NoError(t, err)
 		require.Equal(t, 1, len(result))
 		require.ErrorIs(t, result[sv.Name].Error(), contracts.ErrDecryptNotFound)

From 2b15fa0492a556ecb1c4149f34bc83906874d0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Thu, 7 Aug 2025 12:00:31 +0200
Subject: [PATCH 016/243] Provisioning: Fix missing ref in staging options
 (#109311)

Fix missing ref in staging options
---
 pkg/registry/apis/provisioning/jobs/delete/worker.go      | 1 +
 pkg/registry/apis/provisioning/jobs/delete/worker_test.go | 1 +
 pkg/registry/apis/provisioning/jobs/move/worker.go        | 1 +
 pkg/registry/apis/provisioning/jobs/move/worker_test.go   | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/registry/apis/provisioning/jobs/delete/worker.go b/pkg/registry/apis/provisioning/jobs/delete/worker.go
index 63db00ef224..3b82d51a8d5 100644
--- a/pkg/registry/apis/provisioning/jobs/delete/worker.go
+++ b/pkg/registry/apis/provisioning/jobs/delete/worker.go
@@ -70,6 +70,7 @@ func (w *Worker) Process(ctx context.Context, repo repository.Repository, job pr
 		CommitOnlyOnceMessage: msg,
 		PushOnWrites:          false,
 		Timeout:               10 * time.Minute,
+		Ref:                   opts.Ref,
 	}
 
 	err := w.wrapFn(ctx, repo, stageOptions, fn)
diff --git a/pkg/registry/apis/provisioning/jobs/delete/worker_test.go b/pkg/registry/apis/provisioning/jobs/delete/worker_test.go
index 7f2fa3c22bb..1da3656f6ce 100644
--- a/pkg/registry/apis/provisioning/jobs/delete/worker_test.go
+++ b/pkg/registry/apis/provisioning/jobs/delete/worker_test.go
@@ -164,6 +164,7 @@ func TestDeleteWorker_ProcessDeleteFilesSuccess(t *testing.T) {
 		return !opts.PushOnWrites &&
 			opts.Timeout == 10*time.Minute &&
 			opts.Mode == repository.StageModeCommitOnlyOnce &&
+			opts.Ref == "main" &&
 			opts.CommitOnlyOnceMessage == "Delete from Grafana "+job.Name
 	}), mock.Anything).Return(func(ctx context.Context, repo repository.Repository, stageOptions repository.StageOptions, fn func(repository.Repository, bool) error) error {
 		return fn(mockRepo, false)
diff --git a/pkg/registry/apis/provisioning/jobs/move/worker.go b/pkg/registry/apis/provisioning/jobs/move/worker.go
index b2ff1912bd5..194c85cccb0 100644
--- a/pkg/registry/apis/provisioning/jobs/move/worker.go
+++ b/pkg/registry/apis/provisioning/jobs/move/worker.go
@@ -81,6 +81,7 @@ func (w *Worker) Process(ctx context.Context, repo repository.Repository, job pr
 		CommitOnlyOnceMessage: msg,
 		PushOnWrites:          false,
 		Timeout:               10 * time.Minute,
+		Ref:                   opts.Ref,
 	}
 
 	err := w.wrapFn(ctx, repo, stageOptions, fn)
diff --git a/pkg/registry/apis/provisioning/jobs/move/worker_test.go b/pkg/registry/apis/provisioning/jobs/move/worker_test.go
index c398cedc830..c2e57a3552b 100644
--- a/pkg/registry/apis/provisioning/jobs/move/worker_test.go
+++ b/pkg/registry/apis/provisioning/jobs/move/worker_test.go
@@ -202,7 +202,7 @@ func TestMoveWorker_ProcessMoveFilesSuccess(t *testing.T) {
 	mockWrapFn.On("Execute", mock.Anything, mockRepo, mock.MatchedBy(func(opts repository.StageOptions) bool {
 		return !opts.PushOnWrites && opts.Timeout == 10*time.Minute &&
 			opts.Mode == repository.StageModeCommitOnlyOnce &&
-			opts.CommitOnlyOnceMessage != ""
+			opts.CommitOnlyOnceMessage != "" && opts.Ref == "main"
 	}), mock.Anything).Return(func(ctx context.Context, repo repository.Repository, stageOptions repository.StageOptions, fn func(repository.Repository, bool) error) error {
 		return fn(mockRepo, false)
 	})

From 2ac68e53856e4fd967600a2418d113adfb8cc8a9 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Thu, 7 Aug 2025 13:33:27 +0200
Subject: [PATCH 017/243] Bump @grafana/scenes to 6.29.5 for network profiling
 fix (#109319)

* Bump @grafana/scenes to 6.29.5 for network profiling fix

* Bump to stable
---
 package.json                                  |  4 ++--
 .../dashboard-render-performance-profiling.md |  1 +
 yarn.lock                                     | 22 +++++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 90c32b62b0e..997095b4a40 100644
--- a/package.json
+++ b/package.json
@@ -289,8 +289,8 @@
     "@grafana/plugin-ui": "0.10.8",
     "@grafana/prometheus": "workspace:*",
     "@grafana/runtime": "workspace:*",
-    "@grafana/scenes": "6.29.3",
-    "@grafana/scenes-react": "6.29.3",
+    "@grafana/scenes": "6.29.5",
+    "@grafana/scenes-react": "6.29.5",
     "@grafana/schema": "workspace:*",
     "@grafana/sql": "workspace:*",
     "@grafana/ui": "workspace:*",
diff --git a/public/app/features/dashboard/services/dashboard-render-performance-profiling.md b/public/app/features/dashboard/services/dashboard-render-performance-profiling.md
index 6d1d292f691..c31f8d0933e 100644
--- a/public/app/features/dashboard/services/dashboard-render-performance-profiling.md
+++ b/public/app/features/dashboard/services/dashboard-render-performance-profiling.md
@@ -230,3 +230,4 @@ This fallback catches cases where visibility events might be missed and prevents
 - [PR #1198 - Make SceneRenderProfiler optional and injectable](https://github.com/grafana/scenes/pull/1198)
 - [PR #1199 - SceneRenderProfiler: add start and end timestamps to profile events](https://github.com/grafana/scenes/pull/1199)
 - [PR #1205 - SceneRenderProfiler: Handle tab inactivity](https://github.com/grafana/scenes/pull/1205)
+- [PR #1209 - SceneRenderProfiler: Only capture network requests within measurement window](https://github.com/grafana/scenes/pull/1209)
diff --git a/yarn.lock b/yarn.lock
index 89afc33178b..a5e9d5b4734 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3584,11 +3584,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/scenes-react@npm:6.29.3":
-  version: 6.29.3
-  resolution: "@grafana/scenes-react@npm:6.29.3"
+"@grafana/scenes-react@npm:6.29.5":
+  version: 6.29.5
+  resolution: "@grafana/scenes-react@npm:6.29.5"
   dependencies:
-    "@grafana/scenes": "npm:6.29.3"
+    "@grafana/scenes": "npm:6.29.5"
     lru-cache: "npm:^10.2.2"
     react-use: "npm:^17.4.0"
   peerDependencies:
@@ -3600,13 +3600,13 @@ __metadata:
     react: ^18.0.0
     react-dom: ^18.0.0
     react-router-dom: ^6.28.0
-  checksum: 10/7122262d54eaded6434791f2cd079306785db0af1eaf169039c51ef918b7fb906364653331625beaec480e70885c6ad90a2a5a3fc7d1c83a177d44706b319a5a
+  checksum: 10/fd09f6614b4efcca8febbafb05054f5b05d8c064e078314325ddad80028e5ff52171c7f0bf6cd92137d78f2c476ee8b97c98c433c433e97eada04c496b57a2e3
   languageName: node
   linkType: hard
 
-"@grafana/scenes@npm:6.29.3":
-  version: 6.29.3
-  resolution: "@grafana/scenes@npm:6.29.3"
+"@grafana/scenes@npm:6.29.5":
+  version: 6.29.5
+  resolution: "@grafana/scenes@npm:6.29.5"
   dependencies:
     "@floating-ui/react": "npm:^0.26.16"
     "@leeoniya/ufuzzy": "npm:^1.0.16"
@@ -3626,7 +3626,7 @@ __metadata:
     react: ^18.0.0
     react-dom: ^18.0.0
     react-router-dom: ^6.28.0
-  checksum: 10/88fbc682acbaa0d416271184f502a969af5f11eda2334892062ec31572f3c7da1d05a4c0285d66cb146e5b2f6f3f033ee5555fa74144a57b005df69dc9f3b4e2
+  checksum: 10/f96500bc31bc3fc06c618e498016290d8cf1c43f69733fe6d351f3ce060db9b4487bfe7f3d352384b2612ab2931754b87778015c934ac9d67649d3f840752b19
   languageName: node
   linkType: hard
 
@@ -18218,8 +18218,8 @@ __metadata:
     "@grafana/plugin-ui": "npm:0.10.8"
     "@grafana/prometheus": "workspace:*"
     "@grafana/runtime": "workspace:*"
-    "@grafana/scenes": "npm:6.29.3"
-    "@grafana/scenes-react": "npm:6.29.3"
+    "@grafana/scenes": "npm:6.29.5"
+    "@grafana/scenes-react": "npm:6.29.5"
     "@grafana/schema": "workspace:*"
     "@grafana/sql": "workspace:*"
     "@grafana/test-utils": "workspace:*"

From 2a0944a92a6ddd7d397eaf9429888d8e6f988b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Thu, 7 Aug 2025 14:26:22 +0200
Subject: [PATCH 018/243] Provisioning: Miscellanous Fixes For Flaky
 Integration Tests (#109330)

* Enhance error messages individual files errors

* Split integration tests into multiple files

* Fix missing import

* Rename file to repository test

q

* Wrap worker errors with more context

* Fixed tests

* Add nolint

* Wait for specific job in multiple spots
---
 .../apis/provisioning/jobs/delete/worker.go   |    4 +-
 .../apis/provisioning/jobs/export/folders.go  |    5 +-
 .../provisioning/jobs/export/folders_test.go  |    2 +-
 .../provisioning/jobs/export/resources.go     |    4 +-
 .../jobs/export/resources_test.go             |    8 +-
 .../apis/provisioning/jobs/migrate/clean.go   |    2 +-
 .../provisioning/jobs/migrate/clean_test.go   |    2 +-
 .../jobs/migrate/legacy_resources.go          |    5 +-
 .../jobs/migrate/legacy_resources_test.go     |    2 +-
 .../apis/provisioning/jobs/move/worker.go     |    4 +-
 .../apis/provisioning/jobs/progress.go        |    3 +-
 .../apis/provisioning/jobs/sync/full.go       |   14 +-
 .../apis/provisioning/jobs/sync/full_test.go  |  110 +-
 .../provisioning/jobs/sync/incremental.go     |    6 +-
 .../jobs/sync/incremental_test.go             |   34 +-
 pkg/tests/apis/provisioning/deletejob_test.go |  444 ++++
 pkg/tests/apis/provisioning/exportjob_test.go |  256 ++
 pkg/tests/apis/provisioning/files_test.go     |  458 ++++
 pkg/tests/apis/provisioning/helper_test.go    |   88 +
 pkg/tests/apis/provisioning/movejob_test.go   |  427 +++
 .../apis/provisioning/provisioning_test.go    | 2304 -----------------
 .../apis/provisioning/repository_test.go      |  593 +++++
 22 files changed, 2380 insertions(+), 2395 deletions(-)
 create mode 100644 pkg/tests/apis/provisioning/deletejob_test.go
 create mode 100644 pkg/tests/apis/provisioning/exportjob_test.go
 create mode 100644 pkg/tests/apis/provisioning/files_test.go
 create mode 100644 pkg/tests/apis/provisioning/movejob_test.go
 delete mode 100644 pkg/tests/apis/provisioning/provisioning_test.go
 create mode 100644 pkg/tests/apis/provisioning/repository_test.go

diff --git a/pkg/registry/apis/provisioning/jobs/delete/worker.go b/pkg/registry/apis/provisioning/jobs/delete/worker.go
index 3b82d51a8d5..d55f6300abd 100644
--- a/pkg/registry/apis/provisioning/jobs/delete/worker.go
+++ b/pkg/registry/apis/provisioning/jobs/delete/worker.go
@@ -107,7 +107,9 @@ func (w *Worker) deleteFiles(ctx context.Context, rw repository.ReaderWriter, pr
 		}
 
 		progress.SetMessage(ctx, "Deleting "+path)
-		result.Error = rw.Delete(ctx, path, opts.Ref, "Delete "+path)
+		if err := rw.Delete(ctx, path, opts.Ref, "Delete "+path); err != nil {
+			result.Error = fmt.Errorf("deleting file %s: %w", path, err)
+		}
 		progress.Record(ctx, result)
 		if err := progress.TooManyErrors(); err != nil {
 			return err
diff --git a/pkg/registry/apis/provisioning/jobs/export/folders.go b/pkg/registry/apis/provisioning/jobs/export/folders.go
index 48a4f7839ae..794a419adc6 100644
--- a/pkg/registry/apis/provisioning/jobs/export/folders.go
+++ b/pkg/registry/apis/provisioning/jobs/export/folders.go
@@ -50,7 +50,10 @@ func ExportFolders(ctx context.Context, repoName string, options provisioning.Ex
 			Resource: resources.FolderResource.Resource,
 			Group:    resources.FolderResource.Group,
 			Path:     folder.Path,
-			Error:    err,
+		}
+
+		if err != nil {
+			result.Error = fmt.Errorf("creating folder %s at path %s: %w", folder.ID, folder.Path, err)
 		}
 
 		if !created {
diff --git a/pkg/registry/apis/provisioning/jobs/export/folders_test.go b/pkg/registry/apis/provisioning/jobs/export/folders_test.go
index 2eaeeabd373..d68e6ff33bb 100644
--- a/pkg/registry/apis/provisioning/jobs/export/folders_test.go
+++ b/pkg/registry/apis/provisioning/jobs/export/folders_test.go
@@ -189,7 +189,7 @@ func TestExportFolders(t *testing.T) {
 				progress.On("SetMessage", mock.Anything, "read folder tree from API server").Return()
 				progress.On("SetMessage", mock.Anything, "write folders to repository").Return()
 				progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
-					return result.Name == "folder-1-uid" && result.Action == repository.FileActionIgnored && result.Error != nil && result.Error.Error() == "didn't work"
+					return result.Name == "folder-1-uid" && result.Action == repository.FileActionIgnored && result.Error != nil && result.Error.Error() == "creating folder folder-1-uid at path grafana/folder-1: didn't work"
 				})).Return()
 				progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
 					return result.Name == "folder-2-uid" && result.Action == repository.FileActionCreated
diff --git a/pkg/registry/apis/provisioning/jobs/export/resources.go b/pkg/registry/apis/provisioning/jobs/export/resources.go
index 8b1baff08ca..e9c253fea44 100644
--- a/pkg/registry/apis/provisioning/jobs/export/resources.go
+++ b/pkg/registry/apis/provisioning/jobs/export/resources.go
@@ -108,7 +108,7 @@ func exportResource(ctx context.Context,
 		meta, err := utils.MetaAccessor(item)
 		if err != nil {
 			result.Action = repository.FileActionIgnored
-			result.Error = fmt.Errorf("extract meta accessor: %w", err)
+			result.Error = fmt.Errorf("extracting meta accessor for resource %s: %w", result.Name, err)
 			progress.Record(ctx, result)
 			return nil
 		}
@@ -136,7 +136,7 @@ func exportResource(ctx context.Context,
 			result.Action = repository.FileActionIgnored
 		} else if err != nil {
 			result.Action = repository.FileActionIgnored
-			result.Error = err
+			result.Error = fmt.Errorf("writing resource file for %s: %w", result.Name, err)
 		}
 
 		progress.Record(ctx, result)
diff --git a/pkg/registry/apis/provisioning/jobs/export/resources_test.go b/pkg/registry/apis/provisioning/jobs/export/resources_test.go
index 8be32cebed9..0aa591a4493 100644
--- a/pkg/registry/apis/provisioning/jobs/export/resources_test.go
+++ b/pkg/registry/apis/provisioning/jobs/export/resources_test.go
@@ -141,7 +141,7 @@ func TestExportResources_Dashboards_WithErrors(t *testing.T) {
 		progress.On("SetMessage", mock.Anything, "start resource export").Return()
 		progress.On("SetMessage", mock.Anything, "export dashboards").Return()
 		progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
-			return result.Name == "dashboard-1" && result.Action == repository.FileActionIgnored && result.Error != nil && result.Error.Error() == "failed to export dashboard"
+			return result.Name == "dashboard-1" && result.Action == repository.FileActionIgnored && result.Error != nil && result.Error.Error() == "writing resource file for dashboard-1: failed to export dashboard"
 		})).Return()
 		progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
 			return result.Name == "dashboard-2" && result.Action == repository.FileActionCreated
@@ -179,7 +179,7 @@ func TestExportResources_Dashboards_TooManyErrors(t *testing.T) {
 		progress.On("SetMessage", mock.Anything, "start resource export").Return()
 		progress.On("SetMessage", mock.Anything, "export dashboards").Return()
 		progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
-			return result.Name == "dashboard-1" && result.Action == repository.FileActionIgnored && result.Error != nil && result.Error.Error() == "failed to export dashboard"
+			return result.Name == "dashboard-1" && result.Action == repository.FileActionIgnored && result.Error != nil && result.Error.Error() == "writing resource file for dashboard-1: failed to export dashboard"
 		})).Return()
 		progress.On("TooManyErrors").Return(fmt.Errorf("too many errors encountered"))
 	}
@@ -417,7 +417,7 @@ func TestExportResources_Dashboards_V2Alpha1_ClientError(t *testing.T) {
 				return false
 			}
 
-			if result.Error.Error() != "v2 client error" {
+			if result.Error.Error() != "writing resource file for v2-dashboard-error: v2 client error" {
 				return false
 			}
 
@@ -516,7 +516,7 @@ func TestExportResources_Dashboards_V2beta1_ClientError(t *testing.T) {
 				return false
 			}
 
-			if result.Error.Error() != "v2 client error" {
+			if result.Error.Error() != "writing resource file for v2-dashboard-error: v2 client error" {
 				return false
 			}
 
diff --git a/pkg/registry/apis/provisioning/jobs/migrate/clean.go b/pkg/registry/apis/provisioning/jobs/migrate/clean.go
index 8d1b951fa11..da1037d2b18 100644
--- a/pkg/registry/apis/provisioning/jobs/migrate/clean.go
+++ b/pkg/registry/apis/provisioning/jobs/migrate/clean.go
@@ -46,7 +46,7 @@ func (c *namespaceCleaner) Clean(ctx context.Context, namespace string, progress
 			}
 
 			if err := client.Delete(ctx, item.GetName(), metav1.DeleteOptions{}); err != nil {
-				result.Error = err
+				result.Error = fmt.Errorf("deleting resource %s/%s %s: %w", result.Group, result.Resource, result.Name, err)
 				progress.Record(ctx, result)
 				return fmt.Errorf("delete resource: %w", err)
 			}
diff --git a/pkg/registry/apis/provisioning/jobs/migrate/clean_test.go b/pkg/registry/apis/provisioning/jobs/migrate/clean_test.go
index 72eff3eb090..69a7fb5be6b 100644
--- a/pkg/registry/apis/provisioning/jobs/migrate/clean_test.go
+++ b/pkg/registry/apis/provisioning/jobs/migrate/clean_test.go
@@ -127,7 +127,7 @@ func TestNamespaceCleaner_Clean(t *testing.T) {
 			return result.Action == repository.FileActionDeleted &&
 				result.Name == "test-folder" &&
 				result.Error != nil &&
-				result.Error.Error() == "delete failed"
+				result.Error.Error() == "deleting resource folder.grafana.app/Folder test-folder: delete failed"
 		})).Return()
 
 		err := cleaner.Clean(context.Background(), "test-namespace", progress)
diff --git a/pkg/registry/apis/provisioning/jobs/migrate/legacy_resources.go b/pkg/registry/apis/provisioning/jobs/migrate/legacy_resources.go
index 03711c485d6..0d50d70aaad 100644
--- a/pkg/registry/apis/provisioning/jobs/migrate/legacy_resources.go
+++ b/pkg/registry/apis/provisioning/jobs/migrate/legacy_resources.go
@@ -208,10 +208,13 @@ func (r *legacyResourceResourceMigrator) Write(ctx context.Context, key *resourc
 		Resource: r.kind.Resource,
 		Group:    r.kind.Group,
 		Action:   repository.FileActionCreated,
-		Error:    err,
 		Path:     fileName,
 	}
 
+	if err != nil {
+		result.Error = fmt.Errorf("writing resource %s/%s %s to file %s: %w", r.kind.Group, r.kind.Resource, parsed.Meta.GetName(), fileName, err)
+	}
+
 	r.progress.Record(ctx, result)
 	if err := r.progress.TooManyErrors(); err != nil {
 		return err
diff --git a/pkg/registry/apis/provisioning/jobs/migrate/legacy_resources_test.go b/pkg/registry/apis/provisioning/jobs/migrate/legacy_resources_test.go
index 88e60341f6b..15c0339775c 100644
--- a/pkg/registry/apis/provisioning/jobs/migrate/legacy_resources_test.go
+++ b/pkg/registry/apis/provisioning/jobs/migrate/legacy_resources_test.go
@@ -424,7 +424,7 @@ func TestLegacyResourceResourceMigrator_Write(t *testing.T) {
 			return result.Action == repository.FileActionCreated &&
 				result.Name == "test" &&
 				result.Error != nil &&
-				result.Error.Error() == "create file error"
+				result.Error.Error() == "writing resource test.grafana.app/tests test to file : create file error"
 		})).Return()
 		progress.On("TooManyErrors").Return(nil)
 
diff --git a/pkg/registry/apis/provisioning/jobs/move/worker.go b/pkg/registry/apis/provisioning/jobs/move/worker.go
index 194c85cccb0..f0b53c8d404 100644
--- a/pkg/registry/apis/provisioning/jobs/move/worker.go
+++ b/pkg/registry/apis/provisioning/jobs/move/worker.go
@@ -121,7 +121,9 @@ func (w *Worker) moveFiles(ctx context.Context, rw repository.ReaderWriter, prog
 		targetPath := w.constructTargetPath(opts.TargetPath, path)
 
 		progress.SetMessage(ctx, "Moving "+path+" to "+targetPath)
-		result.Error = rw.Move(ctx, path, targetPath, opts.Ref, "Move "+path+" to "+targetPath)
+		if err := rw.Move(ctx, path, targetPath, opts.Ref, "Move "+path+" to "+targetPath); err != nil {
+			result.Error = fmt.Errorf("moving file %s to %s: %w", path, targetPath, err)
+		}
 		progress.Record(ctx, result)
 		if err := progress.TooManyErrors(); err != nil {
 			return err
diff --git a/pkg/registry/apis/provisioning/jobs/progress.go b/pkg/registry/apis/provisioning/jobs/progress.go
index 4f7bb2ad53d..f0266471837 100644
--- a/pkg/registry/apis/provisioning/jobs/progress.go
+++ b/pkg/registry/apis/provisioning/jobs/progress.go
@@ -171,7 +171,8 @@ func (r *jobProgressRecorder) updateSummary(result JobResourceResult) {
 	}
 
 	if result.Error != nil {
-		summary.Errors = append(summary.Errors, result.Error.Error())
+		errorMsg := fmt.Sprintf("%s (file: %s, name: %s, action: %s)", result.Error.Error(), result.Path, result.Name, result.Action)
+		summary.Errors = append(summary.Errors, errorMsg)
 		summary.Error++
 	} else {
 		switch result.Action {
diff --git a/pkg/registry/apis/provisioning/jobs/sync/full.go b/pkg/registry/apis/provisioning/jobs/sync/full.go
index cfd8ac3cee8..4912abe2606 100644
--- a/pkg/registry/apis/provisioning/jobs/sync/full.go
+++ b/pkg/registry/apis/provisioning/jobs/sync/full.go
@@ -2,7 +2,6 @@ package sync
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs"
@@ -68,7 +67,7 @@ func applyChanges(ctx context.Context, changes []ResourceFileChange, clients res
 			}
 
 			if change.Existing == nil || change.Existing.Name == "" {
-				result.Error = errors.New("missing existing reference")
+				result.Error = fmt.Errorf("processing deletion for file %s: missing existing reference", change.Path)
 				progress.Record(ctx, result)
 				continue
 			}
@@ -90,7 +89,9 @@ func applyChanges(ctx context.Context, changes []ResourceFileChange, clients res
 				continue
 			}
 
-			result.Error = client.Delete(ctx, change.Existing.Name, metav1.DeleteOptions{})
+			if err := client.Delete(ctx, change.Existing.Name, metav1.DeleteOptions{}); err != nil {
+				result.Error = fmt.Errorf("deleting resource %s/%s %s: %w", change.Existing.Group, change.Existing.Resource, change.Existing.Name, err)
+			}
 			progress.Record(ctx, result)
 			continue
 		}
@@ -106,7 +107,7 @@ func applyChanges(ctx context.Context, changes []ResourceFileChange, clients res
 
 			folder, err := repositoryResources.EnsureFolderPathExist(ctx, change.Path)
 			if err != nil {
-				result.Error = err
+				result.Error = fmt.Errorf("ensuring folder exists at path %s: %w", change.Path, err)
 				progress.Record(ctx, result)
 				continue
 			}
@@ -122,10 +123,13 @@ func applyChanges(ctx context.Context, changes []ResourceFileChange, clients res
 			Path:     change.Path,
 			Action:   change.Action,
 			Name:     name,
-			Error:    err,
 			Resource: gvk.Kind,
 			Group:    gvk.Group,
 		}
+
+		if err != nil {
+			result.Error = fmt.Errorf("writing resource from file %s: %w", change.Path, err)
+		}
 		progress.Record(ctx, result)
 	}
 
diff --git a/pkg/registry/apis/provisioning/jobs/sync/full_test.go b/pkg/registry/apis/provisioning/jobs/sync/full_test.go
index 3885700b331..08081ca90f0 100644
--- a/pkg/registry/apis/provisioning/jobs/sync/full_test.go
+++ b/pkg/registry/apis/provisioning/jobs/sync/full_test.go
@@ -174,7 +174,7 @@ func TestFullSync_FolderCreationFailedWithInstanceTarget(t *testing.T) {
 	require.Contains(t, err.Error(), "compare changes: compare error")
 }
 
-func TestFullSync_ApplyChanges(t *testing.T) {
+func TestFullSync_ApplyChanges(t *testing.T) { //nolint:gocyclo
 	tests := []struct {
 		name          string
 		setupMocks    func(*repository.MockRepository, *resources.MockRepositoryResources, *resources.MockResourceClients, *jobs.MockJobProgressRecorder, *MockCompareFn)
@@ -256,14 +256,15 @@ func TestFullSync_ApplyChanges(t *testing.T) {
 				repoResources.On("WriteResourceFromFile", mock.Anything, "dashboards/test.json", "").
 					Return("test-dashboard", schema.GroupVersionKind{Kind: "Dashboard", Group: "dashboards"}, fmt.Errorf("write error"))
 
-				progress.On("Record", mock.Anything, jobs.JobResourceResult{
-					Action:   repository.FileActionCreated,
-					Path:     "dashboards/test.json",
-					Name:     "test-dashboard",
-					Resource: "Dashboard",
-					Group:    "dashboards",
-					Error:    fmt.Errorf("write error"),
-				}).Return()
+				progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+					return result.Action == repository.FileActionCreated &&
+						result.Path == "dashboards/test.json" &&
+						result.Name == "test-dashboard" &&
+						result.Resource == "Dashboard" &&
+						result.Group == "dashboards" &&
+						result.Error != nil &&
+						result.Error.Error() == "writing resource from file dashboards/test.json: write error"
+				})).Return()
 			},
 		},
 		{
@@ -305,14 +306,15 @@ func TestFullSync_ApplyChanges(t *testing.T) {
 				repoResources.On("WriteResourceFromFile", mock.Anything, "dashboards/test.json", "").
 					Return("test-dashboard", schema.GroupVersionKind{Kind: "Dashboard", Group: "dashboards"}, fmt.Errorf("write error"))
 
-				progress.On("Record", mock.Anything, jobs.JobResourceResult{
-					Action:   repository.FileActionUpdated,
-					Path:     "dashboards/test.json",
-					Name:     "test-dashboard",
-					Resource: "Dashboard",
-					Group:    "dashboards",
-					Error:    fmt.Errorf("write error"),
-				}).Return()
+				progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+					return result.Action == repository.FileActionUpdated &&
+						result.Path == "dashboards/test.json" &&
+						result.Name == "test-dashboard" &&
+						result.Resource == "Dashboard" &&
+						result.Group == "dashboards" &&
+						result.Error != nil &&
+						result.Error.Error() == "writing resource from file dashboards/test.json: write error"
+				})).Return()
 			},
 		},
 		{
@@ -355,15 +357,15 @@ func TestFullSync_ApplyChanges(t *testing.T) {
 					mock.Anything,
 					"one/two/three/",
 				).Return("some-folder", errors.New("folder creation error"))
-				progress.On("Record", mock.Anything, jobs.JobResourceResult{
-					Action: repository.FileActionCreated,
-					Path:   "one/two/three/",
-					Name:   "",
-					// FIXME: this is probably inconsistent across the codebase
-					Resource: "folders",
-					Group:    "folder.grafana.app",
-					Error:    errors.New("folder creation error"),
-				}).Return()
+				progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+					return result.Action == repository.FileActionCreated &&
+						result.Path == "one/two/three/" &&
+						result.Name == "" &&
+						result.Resource == "folders" &&
+						result.Group == "folder.grafana.app" &&
+						result.Error != nil &&
+						result.Error.Error() == "ensuring folder exists at path one/two/three/: folder creation error"
+				})).Return()
 			},
 		},
 		{
@@ -474,14 +476,15 @@ func TestFullSync_ApplyChanges(t *testing.T) {
 					Version: "v1",
 				}, nil)
 
-				progress.On("Record", mock.Anything, jobs.JobResourceResult{
-					Action:   repository.FileActionDeleted,
-					Path:     "dashboards/test.json",
-					Name:     "test-dashboard",
-					Resource: "Dashboard",
-					Group:    "dashboards",
-					Error:    fmt.Errorf("delete failed"),
-				}).Return()
+				progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+					return result.Action == repository.FileActionDeleted &&
+						result.Path == "dashboards/test.json" &&
+						result.Name == "test-dashboard" &&
+						result.Resource == "Dashboard" &&
+						result.Group == "dashboards" &&
+						result.Error != nil &&
+						result.Error.Error() == "deleting resource dashboards/Dashboard test-dashboard: delete failed"
+				})).Return()
 			},
 		},
 		{
@@ -496,11 +499,12 @@ func TestFullSync_ApplyChanges(t *testing.T) {
 			},
 			setupMocks: func(repo *repository.MockRepository, repoResources *resources.MockRepositoryResources, clients *resources.MockResourceClients, progress *jobs.MockJobProgressRecorder, compareFn *MockCompareFn) {
 				progress.On("TooManyErrors").Return(nil)
-				progress.On("Record", mock.Anything, jobs.JobResourceResult{
-					Action: repository.FileActionDeleted,
-					Path:   "dashboards/test.json",
-					Error:  fmt.Errorf("missing existing reference"),
-				}).Return()
+				progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+					return result.Action == repository.FileActionDeleted &&
+						result.Path == "dashboards/test.json" &&
+						result.Error != nil &&
+						result.Error.Error() == "processing deletion for file dashboards/test.json: missing existing reference"
+				})).Return()
 			},
 		},
 		{
@@ -515,11 +519,12 @@ func TestFullSync_ApplyChanges(t *testing.T) {
 			},
 			setupMocks: func(repo *repository.MockRepository, repoResources *resources.MockRepositoryResources, clients *resources.MockResourceClients, progress *jobs.MockJobProgressRecorder, compareFn *MockCompareFn) {
 				progress.On("TooManyErrors").Return(nil)
-				progress.On("Record", mock.Anything, jobs.JobResourceResult{
-					Action: repository.FileActionDeleted,
-					Path:   "dashboards/test.json",
-					Error:  fmt.Errorf("missing existing reference"),
-				}).Return()
+				progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+					return result.Action == repository.FileActionDeleted &&
+						result.Path == "dashboards/test.json" &&
+						result.Error != nil &&
+						result.Error.Error() == "processing deletion for file dashboards/test.json: missing existing reference"
+				})).Return()
 			},
 		},
 		{
@@ -662,14 +667,15 @@ func TestFullSync_ApplyChanges(t *testing.T) {
 					Version: "v1",
 				}, nil)
 
-				progress.On("Record", mock.Anything, jobs.JobResourceResult{
-					Action:   repository.FileActionDeleted,
-					Path:     "to-be-deleted/",
-					Name:     "test-folder",
-					Resource: "Folder",
-					Group:    "folders",
-					Error:    fmt.Errorf("delete failed"),
-				}).Return()
+				progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+					return result.Action == repository.FileActionDeleted &&
+						result.Path == "to-be-deleted/" &&
+						result.Name == "test-folder" &&
+						result.Resource == "Folder" &&
+						result.Group == "folders" &&
+						result.Error != nil &&
+						result.Error.Error() == "deleting resource folders/Folder test-folder: delete failed"
+				})).Return()
 			},
 		},
 	}
diff --git a/pkg/registry/apis/provisioning/jobs/sync/incremental.go b/pkg/registry/apis/provisioning/jobs/sync/incremental.go
index 9bbfdb43921..fcd3023a7da 100644
--- a/pkg/registry/apis/provisioning/jobs/sync/incremental.go
+++ b/pkg/registry/apis/provisioning/jobs/sync/incremental.go
@@ -78,7 +78,7 @@ func IncrementalSync(ctx context.Context, repo repository.Versioned, previousRef
 		case repository.FileActionCreated, repository.FileActionUpdated:
 			name, gvk, err := repositoryResources.WriteResourceFromFile(ctx, change.Path, change.Ref)
 			if err != nil {
-				result.Error = err
+				result.Error = fmt.Errorf("writing resource from file %s: %w", change.Path, err)
 			}
 			result.Name = name
 			result.Resource = gvk.Kind
@@ -86,7 +86,7 @@ func IncrementalSync(ctx context.Context, repo repository.Versioned, previousRef
 		case repository.FileActionDeleted:
 			name, gvk, err := repositoryResources.RemoveResourceFromFile(ctx, change.Path, change.PreviousRef)
 			if err != nil {
-				result.Error = err
+				result.Error = fmt.Errorf("removing resource from file %s: %w", change.Path, err)
 			}
 			result.Name = name
 			result.Resource = gvk.Kind
@@ -94,7 +94,7 @@ func IncrementalSync(ctx context.Context, repo repository.Versioned, previousRef
 		case repository.FileActionRenamed:
 			name, gvk, err := repositoryResources.RenameResourceFile(ctx, change.PreviousPath, change.PreviousRef, change.Path, change.Ref)
 			if err != nil {
-				result.Error = err
+				result.Error = fmt.Errorf("renaming resource file from %s to %s: %w", change.PreviousPath, change.Path, err)
 			}
 			result.Name = name
 			result.Resource = gvk.Kind
diff --git a/pkg/registry/apis/provisioning/jobs/sync/incremental_test.go b/pkg/registry/apis/provisioning/jobs/sync/incremental_test.go
index 8cf8906470b..671c788d38a 100644
--- a/pkg/registry/apis/provisioning/jobs/sync/incremental_test.go
+++ b/pkg/registry/apis/provisioning/jobs/sync/incremental_test.go
@@ -305,14 +305,15 @@ func TestIncrementalSync(t *testing.T) {
 					Return("test-dashboard", schema.GroupVersionKind{Kind: "Dashboard", Group: "dashboards"}, fmt.Errorf("write failed"))
 
 				// Mock progress recording with error
-				progress.On("Record", mock.Anything, jobs.JobResourceResult{
-					Action:   repository.FileActionCreated,
-					Path:     "dashboards/test.json",
-					Name:     "test-dashboard",
-					Resource: "Dashboard",
-					Group:    "dashboards",
-					Error:    fmt.Errorf("write failed"),
-				}).Return()
+				progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+					return result.Action == repository.FileActionCreated &&
+						result.Path == "dashboards/test.json" &&
+						result.Name == "test-dashboard" &&
+						result.Resource == "Dashboard" &&
+						result.Group == "dashboards" &&
+						result.Error != nil &&
+						result.Error.Error() == "writing resource from file dashboards/test.json: write failed"
+				})).Return()
 
 				progress.On("TooManyErrors").Return(nil)
 			},
@@ -340,14 +341,15 @@ func TestIncrementalSync(t *testing.T) {
 					Return("old-dashboard", schema.GroupVersionKind{Kind: "Dashboard", Group: "dashboards"}, fmt.Errorf("delete failed"))
 
 				// Mock progress recording with error
-				progress.On("Record", mock.Anything, jobs.JobResourceResult{
-					Action:   repository.FileActionDeleted,
-					Path:     "dashboards/old.json",
-					Name:     "old-dashboard",
-					Resource: "Dashboard",
-					Group:    "dashboards",
-					Error:    fmt.Errorf("delete failed"),
-				}).Return()
+				progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+					return result.Action == repository.FileActionDeleted &&
+						result.Path == "dashboards/old.json" &&
+						result.Name == "old-dashboard" &&
+						result.Resource == "Dashboard" &&
+						result.Group == "dashboards" &&
+						result.Error != nil &&
+						result.Error.Error() == "removing resource from file dashboards/old.json: delete failed"
+				})).Return()
 				progress.On("TooManyErrors").Return(nil)
 			},
 			previousRef:   "old-ref",
diff --git a/pkg/tests/apis/provisioning/deletejob_test.go b/pkg/tests/apis/provisioning/deletejob_test.go
new file mode 100644
index 00000000000..5a55c75c4cc
--- /dev/null
+++ b/pkg/tests/apis/provisioning/deletejob_test.go
@@ -0,0 +1,444 @@
+package provisioning
+
+import (
+	"context"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+)
+
+func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	const repo = "delete-job-test-repo"
+	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+		"Name":        repo,
+		"SyncEnabled": true,
+		"SyncTarget":  "instance",
+	})
+	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
+	require.NoError(t, err)
+	// Copy multiple test files to the repository
+	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", "dashboard1.json")
+	helper.CopyToProvisioningPath(t, "testdata/text-options.json", "dashboard2.json")
+	helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", "folder/dashboard3.json")
+
+	// Trigger and wait for initial sync to populate resources
+	helper.SyncAndWait(t, repo, nil)
+
+	// Verify initial state - should have 3 dashboards and 1 folder
+	dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	require.Equal(t, 3, len(dashboards.Items), "should have 3 dashboards after sync")
+
+	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	require.Equal(t, 1, len(folders.Items), "should have 1 folder after sync")
+
+	t.Run("delete single file", func(t *testing.T) {
+		spec := provisioning.JobSpec{
+			Action: provisioning.JobActionDelete,
+			Delete: &provisioning.DeleteJobOptions{
+				Paths: []string{"dashboard1.json"},
+			},
+		}
+		// Create delete job for single file
+		helper.TriggerJobAndWait(t, repo, spec)
+
+		// Verify file is deleted from repository
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard1.json")
+		require.Error(t, err, "file should be deleted from repository")
+		require.True(t, apierrors.IsNotFound(err), "should be not found error")
+
+		// Verify dashboard is removed from Grafana after sync
+		dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+		require.NoError(t, err)
+		require.Equal(t, 2, len(dashboards.Items), "should have 2 dashboards after delete")
+
+		// Verify other files still exist
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard2.json")
+		require.NoError(t, err, "other files should still exist")
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "dashboard3.json")
+		require.NoError(t, err, "nested files should still exist")
+	})
+
+	t.Run("delete multiple files", func(t *testing.T) {
+		spec := provisioning.JobSpec{
+			Action: provisioning.JobActionDelete,
+			Delete: &provisioning.DeleteJobOptions{
+				Paths: []string{"dashboard2.json", "folder/dashboard3.json"},
+			},
+		}
+		helper.TriggerJobAndWait(t, repo, spec)
+
+		// Verify files are deleted from repository
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard2.json")
+		require.Error(t, err, "dashboard2.json should be deleted")
+		require.True(t, apierrors.IsNotFound(err))
+
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "dashboard3.json")
+		require.Error(t, err, "folder/dashboard3.json should be deleted")
+		require.True(t, apierrors.IsNotFound(err))
+
+		// Verify all dashboards are removed from Grafana after sync
+		dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+		require.NoError(t, err)
+		require.Equal(t, 0, len(dashboards.Items), "should have 0 dashboards after deleting all")
+	})
+
+	t.Run("delete by resource reference", func(t *testing.T) {
+		// Create modified test files with unique UIDs for ResourceRef testing
+		// Read and modify the testdata files to have unique UIDs that don't conflict with existing resources
+		allPanelsContent := helper.LoadFile("testdata/all-panels.json")
+		textOptionsContent := helper.LoadFile("testdata/text-options.json")
+		timelineDemoContent := helper.LoadFile("testdata/timeline-demo.json")
+
+		// Modify UIDs to be unique for ResourceRef tests
+		allPanelsModified := strings.Replace(string(allPanelsContent), `"uid": "n1jR8vnnz"`, `"uid": "resourceref1"`, 1)
+		textOptionsModified := strings.Replace(string(textOptionsContent), `"uid": "WZ7AhQiVz"`, `"uid": "resourceref2"`, 1)
+		timelineDemoModified := strings.Replace(string(timelineDemoContent), `"uid": "mIJjFy8Kz"`, `"uid": "resourceref3"`, 1)
+
+		// Create temporary files and copy them to the provisioning path
+		tmpDir := t.TempDir()
+		tmpFile1 := filepath.Join(tmpDir, "resource-test-1.json")
+		tmpFile2 := filepath.Join(tmpDir, "resource-test-2.json")
+		tmpFile3 := filepath.Join(tmpDir, "resource-test-3.json")
+
+		require.NoError(t, os.WriteFile(tmpFile1, []byte(allPanelsModified), 0644))
+		require.NoError(t, os.WriteFile(tmpFile2, []byte(textOptionsModified), 0644))
+		require.NoError(t, os.WriteFile(tmpFile3, []byte(timelineDemoModified), 0644))
+
+		// Copy the temporary files to the provisioning path
+		helper.CopyToProvisioningPath(t, tmpFile1, "resource-test-1.json")        // UID: resourceref1
+		helper.CopyToProvisioningPath(t, tmpFile2, "resource-test-2.json")        // UID: resourceref2
+		helper.CopyToProvisioningPath(t, tmpFile3, "nested/resource-test-3.json") // UID: resourceref3
+
+		// Trigger sync to populate the new resources
+		helper.SyncAndWait(t, repo, nil)
+
+		// Verify the new resources are created
+		dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+		require.NoError(t, err)
+		require.GreaterOrEqual(t, len(dashboards.Items), 3, "should have at least 3 dashboards after adding test resources")
+
+		// Debug: print the actual dashboard names/UIDs to verify they match our expectations
+		for i, dashboard := range dashboards.Items {
+			t.Logf("Dashboard %d: name=%s, UID=%s", i+1, dashboard.GetName(), dashboard.GetUID())
+		}
+
+		t.Run("delete single dashboard by resource reference", func(t *testing.T) {
+			spec := provisioning.JobSpec{
+				Action: provisioning.JobActionDelete,
+				Delete: &provisioning.DeleteJobOptions{
+					Resources: []provisioning.ResourceRef{
+						{
+							Name:  "resourceref1", // UID from modified all-panels.json
+							Kind:  "Dashboard",
+							Group: "dashboard.grafana.app",
+						},
+					},
+				},
+			}
+
+			helper.TriggerJobAndWait(t, repo, spec)
+
+			// Verify corresponding file is deleted from repository
+			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "resource-test-1.json")
+			require.Error(t, err, "file should be deleted from repository")
+			require.True(t, apierrors.IsNotFound(err), "should be not found error")
+
+			// Verify dashboard is removed from Grafana (check count like other successful tests)
+			dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+			require.NoError(t, err)
+			require.Equal(t, 2, len(dashboards.Items), "should have 2 dashboards after deleting 1 from 3")
+
+			// Verify other resources still exist
+			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "resource-test-2.json")
+			require.NoError(t, err, "other files should still exist")
+			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "nested", "resource-test-3.json")
+			require.NoError(t, err, "nested files should still exist")
+		})
+
+		t.Run("delete multiple resources by reference", func(t *testing.T) {
+			spec := provisioning.JobSpec{
+				Action: provisioning.JobActionDelete,
+				Delete: &provisioning.DeleteJobOptions{
+					Resources: []provisioning.ResourceRef{
+						{
+							Name:  "resourceref2", // UID from modified text-options.json
+							Kind:  "Dashboard",
+							Group: "dashboard.grafana.app",
+						},
+						{
+							Name:  "resourceref3", // UID from modified timeline-demo.json
+							Kind:  "Dashboard",
+							Group: "dashboard.grafana.app",
+						},
+					},
+				},
+			}
+			helper.TriggerJobAndWait(t, repo, spec)
+
+			// Verify both dashboards are removed from Grafana
+			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref2", metav1.GetOptions{})
+			require.Error(t, err, "text-options dashboard should be deleted")
+			require.True(t, apierrors.IsNotFound(err))
+
+			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref3", metav1.GetOptions{})
+			require.Error(t, err, "timeline-demo dashboard should be deleted")
+			require.True(t, apierrors.IsNotFound(err))
+
+			// Verify corresponding files are deleted from repository
+			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "resource-test-2.json")
+			require.Error(t, err, "resource-test-2.json should be deleted")
+
+			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "nested", "resource-test-3.json")
+			require.Error(t, err, "nested/resource-test-3.json should be deleted")
+
+			// Verify specific dashboards are removed from Grafana
+			dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+			require.NoError(t, err)
+			require.Equal(t, 0, len(dashboards.Items), "should have 0 dashboards after deleting 2 more (2 -> 0)")
+		})
+
+		t.Run("mixed deletion - paths and resources", func(t *testing.T) {
+			// Setup fresh resources for mixed test - reuse the modified content with unique UIDs
+			tmpMixed1 := filepath.Join(tmpDir, "mixed-test-1.json")
+			tmpMixed2 := filepath.Join(tmpDir, "mixed-test-2.json")
+			tmpMixed3 := filepath.Join(tmpDir, "mixed-test-3.json")
+
+			require.NoError(t, os.WriteFile(tmpMixed1, []byte(allPanelsModified), 0644))
+			require.NoError(t, os.WriteFile(tmpMixed2, []byte(textOptionsModified), 0644))
+			require.NoError(t, os.WriteFile(tmpMixed3, []byte(timelineDemoModified), 0644))
+
+			helper.CopyToProvisioningPath(t, tmpMixed1, "mixed-test-1.json") // UID: resourceref1
+			helper.CopyToProvisioningPath(t, tmpMixed2, "mixed-test-2.json") // UID: resourceref2
+			helper.CopyToProvisioningPath(t, tmpMixed3, "mixed-test-3.json") // UID: resourceref3
+
+			helper.SyncAndWait(t, repo, nil)
+
+			spec := provisioning.JobSpec{
+				Action: provisioning.JobActionDelete,
+				Delete: &provisioning.DeleteJobOptions{
+					Paths: []string{"mixed-test-1.json"}, // Delete by path
+					Resources: []provisioning.ResourceRef{
+						{
+							Name:  "resourceref2", // Delete by resource reference
+							Kind:  "Dashboard",
+							Group: "dashboard.grafana.app",
+						},
+					},
+				},
+			}
+
+			helper.TriggerJobAndWait(t, repo, spec)
+
+			// Verify both targeted resources are deleted from Grafana
+			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref1", metav1.GetOptions{})
+			require.Error(t, err, "dashboard deleted by path should be removed")
+
+			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref2", metav1.GetOptions{})
+			require.Error(t, err, "dashboard deleted by resource ref should be removed")
+
+			// Verify the untargeted resource still exists
+			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref3", metav1.GetOptions{})
+			require.NoError(t, err, "untargeted dashboard should still exist")
+
+			// Verify files are properly deleted/preserved in repository
+			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "mixed-test-1.json")
+			require.Error(t, err, "file deleted by path should be removed")
+
+			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "mixed-test-2.json")
+			require.Error(t, err, "file for resource deleted by ref should be removed")
+
+			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "mixed-test-3.json")
+			require.NoError(t, err, "untargeted file should still exist")
+		})
+
+		t.Run("delete folder by resource reference", func(t *testing.T) {
+			// Create a dashboard inside a folder to automatically create the folder structure
+			// This follows the same pattern as other tests in this file
+			testDashboard := strings.Replace(string(allPanelsContent), `"uid": "n1jR8vnnz"`, `"uid": "folder-dash"`, 1)
+
+			// Write the modified dashboard to a temporary file first
+			tmpFolderDash := filepath.Join(tmpDir, "folder-dashboard.json")
+			require.NoError(t, os.WriteFile(tmpFolderDash, []byte(testDashboard), 0644))
+
+			// Copy it to the folder structure using the helper
+			helper.CopyToProvisioningPath(t, tmpFolderDash, "test-folder/dashboard-in-folder.json")
+
+			// Sync to create the folder and its contents
+			helper.SyncAndWait(t, repo, nil)
+
+			// Verify folder was created in Grafana as a Folder resource
+			folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
+			require.NoError(t, err)
+
+			var testFolder *unstructured.Unstructured
+			for _, folder := range folders.Items {
+				// Folder names are generated with suffixes, so check if it starts with "test-folder"
+				if strings.HasPrefix(folder.GetName(), "test-folder") {
+					testFolder = &folder
+					break
+				}
+			}
+			require.NotNil(t, testFolder, "test-folder should exist as a Folder resource")
+			testFolderName := testFolder.GetName()
+
+			// Verify dashboard inside the folder exists
+			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "test-folder", "dashboard-in-folder.json")
+			require.NoError(t, err, "dashboard inside folder should exist")
+
+			spec := provisioning.JobSpec{
+				Action: provisioning.JobActionDelete,
+				Delete: &provisioning.DeleteJobOptions{
+					Resources: []provisioning.ResourceRef{
+						{
+							Name:  testFolderName, // Use the actual generated folder name
+							Kind:  "Folder",
+							Group: "folder.grafana.app",
+						},
+					},
+				},
+			}
+			helper.TriggerJobAndWait(t, repo, spec)
+
+			// Verify folder is deleted from Grafana
+			_, err = helper.Folders.Resource.Get(ctx, testFolderName, metav1.GetOptions{})
+			require.Error(t, err, "folder should be deleted from Grafana")
+			require.True(t, apierrors.IsNotFound(err), "should be not found error")
+
+			// Verify folder contents are also deleted from repository
+			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "test-folder", "dashboard-in-folder.json")
+			require.Error(t, err, "dashboard inside deleted folder should also be deleted")
+			require.True(t, apierrors.IsNotFound(err), "should be not found error")
+		})
+
+		t.Run("delete non-existent resource by reference", func(t *testing.T) {
+			// Create delete job for non-existent resource
+			result := helper.AdminREST.Post().
+				Namespace("default").
+				Resource("repositories").
+				Name(repo).
+				SubResource("jobs").
+				Body(asJSON(&provisioning.JobSpec{
+					Action: provisioning.JobActionDelete,
+					Delete: &provisioning.DeleteJobOptions{
+						Resources: []provisioning.ResourceRef{
+							{
+								Name:  "non-existent-uid",
+								Kind:  "Dashboard",
+								Group: "dashboard.grafana.app",
+							},
+						},
+					},
+				})).
+				SetHeader("Content-Type", "application/json").
+				Do(ctx)
+			require.NoError(t, result.Error(), "should be able to create delete job")
+
+			// TODO: Simply all this
+			// Wait for job to complete - should record error but continue
+			require.EventuallyWithT(t, func(collect *assert.CollectT) {
+				list := &unstructured.UnstructuredList{}
+				err := helper.AdminREST.Get().
+					Namespace("default").
+					Resource("repositories").
+					Name(repo).
+					SubResource("jobs").
+					Do(ctx).Into(list)
+				assert.NoError(collect, err, "should be able to list jobs")
+				assert.NotEmpty(collect, list.Items, "expect at least one job")
+
+				// Find the most recent delete job
+				var deleteJob *unstructured.Unstructured
+				for _, elem := range list.Items {
+					assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
+
+					action := mustNestedString(elem.Object, "spec", "action")
+					if action == "delete" {
+						// Get the most recent one (they should be ordered by creation time)
+						deleteJob = &elem
+					}
+				}
+				if !assert.NotNil(collect, deleteJob, "should find a delete job") {
+					return
+				}
+
+				state := mustNestedString(deleteJob.Object, "status", "state")
+				// The job should complete but record errors for individual resource resolution failures
+				if state == "error" || state == "completed" || state == "success" {
+					// Any of these states is acceptable - the key is that resource resolution errors are recorded
+					// and don't fail the entire job due to error-tolerant implementation
+					return
+				}
+				assert.Fail(collect, "job should complete or error, but got state: %s", state)
+			}, time.Second*10, time.Millisecond*100, "Expected delete job to handle non-existent resource")
+		})
+
+		// Repository cleanup is handled by the main test function
+	})
+
+	t.Run("delete non-existent file", func(t *testing.T) {
+		// Create delete job for non-existent file
+		result := helper.AdminREST.Post().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("jobs").
+			Body(asJSON(&provisioning.JobSpec{
+				Action: provisioning.JobActionDelete,
+				Delete: &provisioning.DeleteJobOptions{
+					Paths: []string{"non-existent.json"},
+				},
+			})).
+			SetHeader("Content-Type", "application/json").
+			Do(ctx)
+		require.NoError(t, result.Error(), "should be able to create delete job")
+
+		// TODO: Simplify this
+		// Wait for job to complete - should fail due to strict error handling
+		require.EventuallyWithT(t, func(collect *assert.CollectT) {
+			list := &unstructured.UnstructuredList{}
+			err := helper.AdminREST.Get().
+				Namespace("default").
+				Resource("repositories").
+				Name(repo).
+				SubResource("jobs").
+				Do(ctx).Into(list)
+			assert.NoError(collect, err, "should be able to list jobs")
+			assert.NotEmpty(collect, list.Items, "expect at least one job")
+
+			// Find the delete job specifically
+			var deleteJob *unstructured.Unstructured
+			for _, elem := range list.Items {
+				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
+
+				action := mustNestedString(elem.Object, "spec", "action")
+				if action == "delete" {
+					deleteJob = &elem
+					break
+				}
+			}
+			assert.NotNil(collect, deleteJob, "should find a delete job")
+
+			state := mustNestedString(deleteJob.Object, "status", "state")
+			assert.Equal(collect, "error", state, "delete job should have failed due to non-existent file")
+		}, time.Second*10, time.Millisecond*100, "Expected delete job to fail with error state")
+	})
+}
diff --git a/pkg/tests/apis/provisioning/exportjob_test.go b/pkg/tests/apis/provisioning/exportjob_test.go
new file mode 100644
index 00000000000..16988740b1b
--- /dev/null
+++ b/pkg/tests/apis/provisioning/exportjob_test.go
@@ -0,0 +1,256 @@
+package provisioning
+
+import (
+	"context"
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
+)
+
+func TestProvisioning_ExportUnifiedToRepository(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	// Write dashboards at
+	dashboard := helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v0.yaml")
+	_, err := helper.DashboardsV0.Resource.Create(ctx, dashboard, metav1.CreateOptions{})
+	require.NoError(t, err, "should be able to create v0 dashboard")
+
+	dashboard = helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v1.yaml")
+	_, err = helper.DashboardsV1.Resource.Create(ctx, dashboard, metav1.CreateOptions{})
+	require.NoError(t, err, "should be able to create v1 dashboard")
+
+	dashboard = helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v2alpha1.yaml")
+	_, err = helper.DashboardsV2alpha1.Resource.Create(ctx, dashboard, metav1.CreateOptions{})
+	require.NoError(t, err, "should be able to create v2alpha1 dashboard")
+
+	dashboard = helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v2beta1.yaml")
+	_, err = helper.DashboardsV2beta1.Resource.Create(ctx, dashboard, metav1.CreateOptions{})
+	require.NoError(t, err, "should be able to create v2beta1 dashboard")
+
+	// Now for the repository.
+	const repo = "local-repository"
+	createBody := helper.RenderObject(t, "exportunifiedtorepository/repository.json.tmpl", map[string]any{"Name": repo})
+	_, err = helper.Repositories.Resource.Create(ctx, createBody, metav1.CreateOptions{})
+	require.NoError(t, err, "should be able to create repository")
+
+	// Now export
+	spec := provisioning.JobSpec{
+		Push: &provisioning.ExportJobOptions{
+			Folder: "", // export entire instance
+			Path:   "", // no prefix necessary for testing
+		},
+	}
+	helper.TriggerJobAndWait(t, repo, spec)
+
+	type props struct {
+		title      string
+		apiVersion string
+		name       string
+		fileName   string
+	}
+
+	printFileTree(t, helper.ProvisioningPath)
+
+	// Check that each file was exported with its stored version
+	for _, test := range []props{
+		{title: "Test dashboard. Created at v0", apiVersion: "dashboard.grafana.app/v0alpha1", name: "test-v0", fileName: "test-dashboard-created-at-v0.json"},
+		{title: "Test dashboard. Created at v1", apiVersion: "dashboard.grafana.app/v1beta1", name: "test-v1", fileName: "test-dashboard-created-at-v1.json"},
+		{title: "Test dashboard. Created at v2alpha1", apiVersion: "dashboard.grafana.app/v2alpha1", name: "test-v2alpha1", fileName: "test-dashboard-created-at-v2alpha1.json"},
+		{title: "Test dashboard. Created at v2beta1", apiVersion: "dashboard.grafana.app/v2beta1", name: "test-v2beta1", fileName: "test-dashboard-created-at-v2beta1.json"},
+	} {
+		fpath := filepath.Join(helper.ProvisioningPath, test.fileName)
+		//nolint:gosec // we are ok with reading files in testdata
+		body, err := os.ReadFile(fpath)
+		require.NoError(t, err, "exported file was not created at path %s", fpath)
+		obj := map[string]any{}
+		err = json.Unmarshal(body, &obj)
+		require.NoError(t, err, "exported file not json %s", fpath)
+
+		val, _, err := unstructured.NestedString(obj, "apiVersion")
+		require.NoError(t, err)
+		require.Equal(t, test.apiVersion, val)
+
+		val, _, err = unstructured.NestedString(obj, "spec", "title")
+		require.NoError(t, err)
+		require.Equal(t, test.title, val)
+
+		val, _, err = unstructured.NestedString(obj, "metadata", "name")
+		require.NoError(t, err)
+		require.Equal(t, test.name, val)
+
+		require.Nil(t, obj["status"], "should not have a status element")
+	}
+}
+
+func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	// Create some unmanaged dashboards directly in Grafana first
+	dashboard1 := helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v1.yaml")
+	dashboard1Obj, err := helper.DashboardsV1.Resource.Create(ctx, dashboard1, metav1.CreateOptions{})
+	require.NoError(t, err, "should be able to create first dashboard")
+	dashboard1Name := dashboard1Obj.GetName()
+
+	dashboard2 := helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v2beta1.yaml")
+	dashboard2Obj, err := helper.DashboardsV2beta1.Resource.Create(ctx, dashboard2, metav1.CreateOptions{})
+	require.NoError(t, err, "should be able to create second dashboard")
+	dashboard2Name := dashboard2Obj.GetName()
+
+	// Create the first repository with sync enabled
+	const repo1 = "first-repository"
+	repo1Path := filepath.Join(helper.ProvisioningPath, repo1)
+	err = os.MkdirAll(repo1Path, 0750)
+	require.NoError(t, err, "should be able to create repository path")
+
+	createBody1 := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+		"Name":        repo1,
+		"SyncEnabled": true,
+		"SyncTarget":  "folder",
+		"Path":        repo1Path,
+	})
+	_, err = helper.Repositories.Resource.Create(ctx, createBody1, metav1.CreateOptions{})
+	require.NoError(t, err, "should be able to create first repository")
+
+	// Print file tree before export
+	printFileTree(t, helper.ProvisioningPath)
+
+	// Initial export
+	spec := provisioning.JobSpec{
+		Push: &provisioning.ExportJobOptions{
+			Folder: "", // export entire instance
+			Path:   "", // no prefix necessary for testing
+		},
+	}
+
+	helper.TriggerJobAndWait(t, repo1, spec)
+	helper.SyncAndWait(t, repo1, nil)
+
+	printFileTree(t, helper.ProvisioningPath)
+	// Verify that the first repository has claimed ownership of the dashboards
+	managedDash1, err := helper.DashboardsV1.Resource.Get(ctx, dashboard1Name, metav1.GetOptions{})
+	require.NoError(t, err)
+	require.Equal(t, repo1, managedDash1.GetAnnotations()[utils.AnnoKeyManagerIdentity], "dashboard1 should be managed by first repo")
+
+	managedDash2, err := helper.DashboardsV2beta1.Resource.Get(ctx, dashboard2Name, metav1.GetOptions{})
+	require.NoError(t, err)
+	require.Equal(t, repo1, managedDash2.GetAnnotations()[utils.AnnoKeyManagerIdentity], "dashboard2 should be managed by first repo")
+
+	// Create second repository - enable sync and set different target
+
+	const repo2 = "second-repository"
+	repo2Path := filepath.Join(helper.ProvisioningPath, repo2)
+	err = os.MkdirAll(repo2Path, 0750)
+	require.NoError(t, err, "should be able to create seconrd repository path")
+
+	printFileTree(t, helper.ProvisioningPath)
+
+	createBody2 := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+		"Name":        repo2,
+		"SyncEnabled": true,
+		"SyncTarget":  "folder",
+		"Path":        repo2Path,
+	})
+
+	_, err = helper.Repositories.Resource.Create(ctx, createBody2, metav1.CreateOptions{})
+	require.NoError(t, err, "should be able to create second repository")
+
+	// Wait for second repository to sync
+	helper.SyncAndWait(t, repo2, nil)
+
+	// Validate that folders for both repositories exist
+	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
+	require.NoError(t, err, "should be able to list folders")
+
+	var repo1FolderFound, repo2FolderFound bool
+	for _, folder := range folders.Items {
+		if folder.GetName() == repo1 {
+			repo1FolderFound = true
+		}
+		if folder.GetName() == repo2 {
+			repo2FolderFound = true
+		}
+	}
+	require.True(t, repo1FolderFound, "folder for first repository %s should exist after sync", repo1)
+	require.True(t, repo2FolderFound, "folder for second repository %s should exist after sync", repo2)
+
+	// Create a third dashboard that won't be claimed by the first repo
+	dashboard3 := helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v0.yaml")
+	dashboard3Obj, err := helper.DashboardsV0.Resource.Create(ctx, dashboard3, metav1.CreateOptions{})
+	require.NoError(t, err, "should be able to create third dashboard")
+	dashboard3Name := dashboard3Obj.GetName()
+
+	// Verify dashboard3 is not managed by anyone initially
+	unmanagedDash3, err := helper.DashboardsV0.Resource.Get(ctx, dashboard3Name, metav1.GetOptions{})
+	require.NoError(t, err)
+	manager, found := unmanagedDash3.GetAnnotations()[utils.AnnoKeyManagerIdentity]
+	require.True(t, !found || manager == "", "dashboard3 should not be managed initially")
+
+	printFileTree(t, helper.ProvisioningPath)
+	// Count files in first repo before second export
+	files1Before, err := countFilesInDir(repo1Path)
+	require.NoError(t, err)
+
+	// Export from second repository - this should only export the unmanaged dashboard3
+	spec = provisioning.JobSpec{
+		Push: &provisioning.ExportJobOptions{
+			Folder: "", // export entire instance
+			Path:   "", // no prefix necessary for testing
+		},
+	}
+	helper.TriggerJobAndWait(t, repo2, spec)
+
+	// Wait for both repositories to sync
+	helper.SyncAndWait(t, repo1, nil)
+	helper.SyncAndWait(t, repo2, nil)
+
+	printFileTree(t, helper.ProvisioningPath)
+	files1After, err := countFilesInDir(repo1Path)
+	require.NoError(t, err)
+
+	actualNewFiles := files1After - files1Before
+	require.Equal(t, 0, actualNewFiles,
+		"second repository should skip managed dashboards and had folder issues with unmanaged dashboard (expected %d new files, got %d)",
+		0, actualNewFiles)
+
+	// Verify files in the second repository
+	files2After, err := countFilesInDir(repo2Path)
+	require.NoError(t, err)
+	require.Equal(t, 1, files2After,
+		"second repository should only export the unmanaged dashboard (expected %d new files, got %d)",
+		1, files2After)
+
+	// Verify dashboard1 and dashboard2 are still managed by repo1 (unchanged)
+	stillManagedDash1, err := helper.DashboardsV1.Resource.Get(ctx, dashboard1Name, metav1.GetOptions{})
+	require.NoError(t, err)
+	require.Equal(t, repo1, stillManagedDash1.GetAnnotations()[utils.AnnoKeyManagerIdentity],
+		"dashboard1 should still be managed by first repo")
+
+	stillManagedDash2, err := helper.DashboardsV2beta1.Resource.Get(ctx, dashboard2Name, metav1.GetOptions{})
+	require.NoError(t, err)
+	require.Equal(t, repo1, stillManagedDash2.GetAnnotations()[utils.AnnoKeyManagerIdentity],
+		"dashboard2 should still be managed by first repo")
+
+	// Verify dashboard3 is now managed by repo2
+	stillManagedDash3, err := helper.DashboardsV0.Resource.Get(ctx, dashboard3Name, metav1.GetOptions{})
+	require.NoError(t, err)
+	require.Equal(t, repo2, stillManagedDash3.GetAnnotations()[utils.AnnoKeyManagerIdentity],
+		"dashboard3 should now be managed by second repo")
+}
diff --git a/pkg/tests/apis/provisioning/files_test.go b/pkg/tests/apis/provisioning/files_test.go
new file mode 100644
index 00000000000..d50fde289f1
--- /dev/null
+++ b/pkg/tests/apis/provisioning/files_test.go
@@ -0,0 +1,458 @@
+package provisioning
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+)
+
+func TestIntegrationProvisioning_DeleteResources(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	const repo = "delete-test-repo"
+	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+		"Name":        repo,
+		"SyncEnabled": true,
+		"SyncTarget":  "instance",
+	})
+	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
+	require.NoError(t, err)
+
+	// Copy the dashboards to the repository path
+	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", "dashboard1.json")
+	helper.CopyToProvisioningPath(t, "testdata/text-options.json", "folder/dashboard2.json")
+	helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", "folder/nested/dashboard3.json")
+	// make sure we don't fail when there is a .keep file in a folder
+	helper.CopyToProvisioningPath(t, "testdata/.keep", "folder/nested/.keep")
+
+	// Trigger and wait for a sync job to finish
+	helper.SyncAndWait(t, repo, nil)
+
+	dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	require.Equal(t, 3, len(dashboards.Items))
+
+	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	require.Equal(t, 2, len(folders.Items))
+
+	t.Run("delete individual dashboard file, should delete from repo and grafana", func(t *testing.T) {
+		result := helper.AdminREST.Delete().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("files", "dashboard1.json").
+			Do(ctx)
+		require.NoError(t, result.Error())
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard1.json")
+		require.Error(t, err)
+		dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+		require.NoError(t, err)
+		require.Equal(t, 2, len(dashboards.Items))
+	})
+
+	t.Run("delete folder, should delete from repo and grafana all nested resources too", func(t *testing.T) {
+		// need to delete directly through the url, because the k8s client doesn't support `/` in a subresource
+		// but that is needed by gitsync to know that it is a folder
+		addr := helper.GetEnv().Server.HTTPServer.Listener.Addr().String()
+		url := fmt.Sprintf("http://admin:admin@%s/apis/provisioning.grafana.app/v0alpha1/namespaces/default/repositories/%s/files/folder/", addr, repo)
+		req, err := http.NewRequest(http.MethodDelete, url, nil)
+		require.NoError(t, err)
+		resp, err := http.DefaultClient.Do(req)
+		require.NoError(t, err)
+		// nolint:errcheck
+		defer resp.Body.Close()
+		require.Equal(t, http.StatusOK, resp.StatusCode)
+
+		// should be deleted from the repo
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder")
+		require.Error(t, err)
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "dashboard2.json")
+		require.Error(t, err)
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "nested")
+		require.Error(t, err)
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "nested", "dashboard3.json")
+		require.Error(t, err)
+
+		// all should be deleted from grafana
+		for _, d := range dashboards.Items {
+			_, err = helper.DashboardsV1.Resource.Get(ctx, d.GetName(), metav1.GetOptions{})
+			require.Error(t, err)
+		}
+		for _, f := range folders.Items {
+			_, err = helper.Folders.Resource.Get(ctx, f.GetName(), metav1.GetOptions{})
+			require.Error(t, err)
+		}
+	})
+
+	t.Run("deleting a non-existent file should fail", func(t *testing.T) {
+		result := helper.AdminREST.Delete().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("files", "non-existent.json").
+			Do(ctx)
+		require.Error(t, result.Error())
+	})
+}
+
+func TestIntegrationProvisioning_MoveResources(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+	const repo = "move-test-repo"
+	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+		"Name":        repo,
+		"SyncEnabled": true,
+		"SyncTarget":  "instance",
+	})
+	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
+	require.NoError(t, err)
+
+	// Copy test dashboards to the repository path for initial setup
+	const originalDashboard = "all-panels.json"
+	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", originalDashboard)
+
+	// Wait for sync to ensure the dashboard is created in Grafana
+	helper.SyncAndWait(t, repo, nil)
+
+	// Verify the original dashboard exists in Grafana (using the UID from all-panels.json)
+	const allPanelsUID = "n1jR8vnnz" // This is the UID from the all-panels.json file
+	obj, err := helper.DashboardsV1.Resource.Get(ctx, allPanelsUID, metav1.GetOptions{})
+	require.NoError(t, err, "original dashboard should exist in Grafana")
+	require.Equal(t, repo, obj.GetAnnotations()[utils.AnnoKeyManagerIdentity])
+
+	t.Run("move file without content change", func(t *testing.T) {
+		const targetPath = "moved/simple-move.json"
+
+		// Perform the move operation using helper function
+		resp := helper.postFilesRequest(t, repo, filesPostOptions{
+			targetPath:   targetPath,
+			originalPath: originalDashboard,
+			message:      "move file without content change",
+		})
+		// nolint:errcheck
+		defer resp.Body.Close()
+		require.Equal(t, http.StatusOK, resp.StatusCode, "move operation should succeed")
+
+		// Verify the file moved in the repository
+		movedObj, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved", "simple-move.json")
+		require.NoError(t, err, "moved file should exist in repository")
+
+		// Check the content is preserved (verify it's still the all-panels dashboard)
+		resource, _, err := unstructured.NestedMap(movedObj.Object, "resource")
+		require.NoError(t, err)
+		dryRun, _, err := unstructured.NestedMap(resource, "dryRun")
+		require.NoError(t, err)
+		title, _, err := unstructured.NestedString(dryRun, "spec", "title")
+		require.NoError(t, err)
+		require.Equal(t, "Panel tests - All panels", title, "content should be preserved")
+
+		// Verify original file no longer exists
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", originalDashboard)
+		require.Error(t, err, "original file should no longer exist")
+
+		// Verify dashboard still exists in Grafana with same content but may have updated path references
+		helper.SyncAndWait(t, repo, nil)
+		_, err = helper.DashboardsV1.Resource.Get(ctx, allPanelsUID, metav1.GetOptions{})
+		require.NoError(t, err, "dashboard should still exist in Grafana after move")
+	})
+
+	t.Run("move file to nested path without ref", func(t *testing.T) {
+		// Test a different scenario: Move a file that was never synced to Grafana
+		// This might reveal the issue if dashboard creation fails during move
+		const sourceFile = "never-synced.json"
+		helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", sourceFile)
+
+		// DO NOT sync - move the file immediately without it ever being in Grafana
+		const targetPath = "deep/nested/timeline.json"
+
+		// Perform the move operation without the file ever being synced to Grafana
+		resp := helper.postFilesRequest(t, repo, filesPostOptions{
+			targetPath:   targetPath,
+			originalPath: sourceFile,
+			message:      "move never-synced file to nested path",
+		})
+		// nolint:errcheck
+		defer resp.Body.Close()
+		require.Equal(t, http.StatusOK, resp.StatusCode, "move operation should succeed")
+
+		// Check folders were created and validate hierarchy
+		folderList, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
+		require.NoError(t, err, "should be able to list folders")
+
+		// Build a map of folder names to their objects for easier lookup
+		folders := make(map[string]*unstructured.Unstructured)
+		for _, folder := range folderList.Items {
+			title, _, _ := unstructured.NestedString(folder.Object, "spec", "title")
+			folders[title] = &folder
+			parent, _, _ := unstructured.NestedString(folder.Object, "metadata", "annotations", "grafana.app/folder")
+			t.Logf("  - %s: %s (parent: %s)", folder.GetName(), title, parent)
+		}
+
+		// Validate expected folders exist with proper hierarchy
+		// Expected structure: deep -> deep/nested
+		deepFolderTitle := "deep"
+		nestedFolderTitle := "nested"
+
+		// Validate "deep" folder exists and has no parent (is top-level)
+		require.Contains(t, folders, deepFolderTitle, "deep folder should exist")
+		f := folders[deepFolderTitle]
+		deepFolderName := f.GetName()
+		title, _, _ := unstructured.NestedString(f.Object, "spec", "title")
+		require.Equal(t, deepFolderTitle, title, "deep folder should have correct title")
+		parent, found, _ := unstructured.NestedString(f.Object, "metadata", "annotations", "grafana.app/folder")
+		require.True(t, !found || parent == "", "deep folder should be top-level (no parent)")
+
+		// Validate "deep/nested" folder exists and has "deep" as parent
+		require.Contains(t, folders, nestedFolderTitle, "nested folder should exist")
+		f = folders[nestedFolderTitle]
+		nestedFolderName := f.GetName()
+		title, _, _ = unstructured.NestedString(f.Object, "spec", "title")
+		require.Equal(t, nestedFolderTitle, title, "nested folder should have correct title")
+		parent, _, _ = unstructured.NestedString(f.Object, "metadata", "annotations", "grafana.app/folder")
+		require.Equal(t, deepFolderName, parent, "nested folder should have deep folder as parent")
+
+		// The key test: Check if dashboard was created in Grafana during move
+		const timelineUID = "mIJjFy8Kz"
+		dashboard, err := helper.DashboardsV1.Resource.Get(ctx, timelineUID, metav1.GetOptions{})
+		require.NoError(t, err, "dashboard should exist in Grafana after moving never-synced file")
+		dashboardFolder, _, _ := unstructured.NestedString(dashboard.Object, "metadata", "annotations", "grafana.app/folder")
+
+		// Validate dashboard is in the correct nested folder
+		require.Equal(t, nestedFolderName, dashboardFolder, "dashboard should be in the nested folder")
+
+		// Verify the file moved in the repository
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "deep", "nested", "timeline.json")
+		require.NoError(t, err, "moved file should exist in nested repository path")
+
+		// Verify the original file no longer exists in the repository
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", sourceFile)
+		require.Error(t, err, "original file should no longer exist in repository")
+	})
+
+	t.Run("move file with content update", func(t *testing.T) {
+		const sourcePath = "moved/simple-move.json" // Use the file from previous test
+		const targetPath = "updated/content-updated.json"
+
+		// Use text-options.json content for the update
+		updatedContent := helper.LoadFile("testdata/text-options.json")
+
+		// Perform move with content update using helper function
+		resp := helper.postFilesRequest(t, repo, filesPostOptions{
+			targetPath:   targetPath,
+			originalPath: sourcePath,
+			message:      "move file with content update",
+			body:         string(updatedContent),
+		})
+		// nolint:errcheck
+		defer resp.Body.Close()
+		require.Equal(t, http.StatusOK, resp.StatusCode, "move with content update should succeed")
+
+		// Verify the moved file has updated content (should now be text-options dashboard)
+		movedObj, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "updated", "content-updated.json")
+		require.NoError(t, err, "moved file should exist in repository")
+
+		resource, _, err := unstructured.NestedMap(movedObj.Object, "resource")
+		require.NoError(t, err)
+		dryRun, _, err := unstructured.NestedMap(resource, "dryRun")
+		require.NoError(t, err)
+		title, _, err := unstructured.NestedString(dryRun, "spec", "title")
+		require.NoError(t, err)
+		require.Equal(t, "Text options", title, "content should be updated to text-options dashboard")
+
+		// Check it has the expected UID from text-options.json
+		name, _, err := unstructured.NestedString(dryRun, "metadata", "name")
+		require.NoError(t, err)
+		require.Equal(t, "WZ7AhQiVz", name, "should have the UID from text-options.json")
+
+		// Verify source file no longer exists
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved", "simple-move.json")
+		require.Error(t, err, "source file should no longer exist")
+
+		// Sync and verify the updated dashboard exists in Grafana
+		helper.SyncAndWait(t, repo, nil)
+		const textOptionsUID = "WZ7AhQiVz" // UID from text-options.json
+		updatedDashboard, err := helper.DashboardsV1.Resource.Get(ctx, textOptionsUID, metav1.GetOptions{})
+		require.NoError(t, err, "updated dashboard should exist in Grafana")
+
+		// Verify the original dashboard was deleted from Grafana
+		_, err = helper.DashboardsV1.Resource.Get(ctx, allPanelsUID, metav1.GetOptions{})
+		require.Error(t, err, "original dashboard should be deleted from Grafana")
+		require.True(t, apierrors.IsNotFound(err))
+
+		// Verify the new dashboard has the updated content
+		updatedTitle, _, err := unstructured.NestedString(updatedDashboard.Object, "spec", "title")
+		require.NoError(t, err)
+		require.Equal(t, "Text options", updatedTitle)
+	})
+
+	t.Run("move directory", func(t *testing.T) {
+		// Create some files in a directory first using existing testdata files
+		helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", "source-dir/timeline-demo.json")
+		helper.CopyToProvisioningPath(t, "testdata/text-options.json", "source-dir/text-options.json")
+
+		// Sync to ensure files are recognized
+		helper.SyncAndWait(t, repo, nil)
+
+		const sourceDir = "source-dir/"
+		const targetDir = "moved-dir/"
+
+		// Move directory using helper function
+		resp := helper.postFilesRequest(t, repo, filesPostOptions{
+			targetPath:   targetDir,
+			originalPath: sourceDir,
+			message:      "move directory",
+		})
+		// nolint:errcheck
+		defer resp.Body.Close()
+		require.Equal(t, http.StatusOK, resp.StatusCode, "directory move should succeed")
+
+		// Verify source directory no longer exists
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "source-dir")
+		require.Error(t, err, "source directory should no longer exist")
+
+		// Verify target directory and files exist
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved-dir", "timeline-demo.json")
+		require.NoError(t, err, "moved timeline-demo.json should exist")
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved-dir", "text-options.json")
+		require.NoError(t, err, "moved text-options.json should exist")
+	})
+
+	t.Run("error cases", func(t *testing.T) {
+		t.Run("missing originalPath parameter", func(t *testing.T) {
+			result := helper.AdminREST.Post().
+				Namespace("default").
+				Resource("repositories").
+				Name(repo).
+				SubResource("files", "target.json").
+				Body([]byte(`{"test": "content"}`)).
+				SetHeader("Content-Type", "application/json").
+				Do(ctx)
+			require.Error(t, result.Error(), "should fail without originalPath")
+		})
+
+		t.Run("file to directory type mismatch", func(t *testing.T) {
+			// First create a simple test file without slashes in the path
+			result := helper.AdminREST.Post().
+				Namespace("default").
+				Resource("repositories").
+				Name(repo).
+				SubResource("files", "simple-test.json").
+				Body(helper.LoadFile("testdata/all-panels.json")).
+				SetHeader("Content-Type", "application/json").
+				Do(ctx)
+			require.NoError(t, result.Error(), "should create test file")
+
+			// Now try to move this file to a directory path using helper function
+			resp := helper.postFilesRequest(t, repo, filesPostOptions{
+				targetPath:   "target-dir/",
+				originalPath: "simple-test.json",
+				message:      "test move",
+			})
+			// nolint:errcheck
+			defer resp.Body.Close()
+			// Read response body to check error message
+			body, err := io.ReadAll(resp.Body)
+			require.NoError(t, err)
+
+			require.NotEqual(t, http.StatusOK, resp.StatusCode, "should fail when moving file to directory")
+			require.Contains(t, string(body), "cannot move between file and directory types")
+		})
+
+		t.Run("non-existent source file", func(t *testing.T) {
+			result := helper.AdminREST.Post().
+				Namespace("default").
+				Resource("repositories").
+				Name(repo).
+				SubResource("files", "target.json").
+				Param("originalPath", "non-existent.json").
+				Body([]byte("")).
+				SetHeader("Content-Type", "application/json").
+				Do(ctx)
+			require.Error(t, result.Error(), "should fail when source file doesn't exist")
+		})
+	})
+
+	t.Run("move non-existent resource by reference", func(t *testing.T) {
+		// Create move job for non-existent resource
+		result := helper.AdminREST.Post().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("jobs").
+			Body(asJSON(&provisioning.JobSpec{
+				Action: provisioning.JobActionMove,
+				Move: &provisioning.MoveJobOptions{
+					TargetPath: "moved-nonexistent/",
+					Resources: []provisioning.ResourceRef{
+						{
+							Name:  "non-existent-move-uid",
+							Kind:  "Dashboard",
+							Group: "dashboard.grafana.app",
+						},
+					},
+				},
+			})).
+			SetHeader("Content-Type", "application/json").
+			Do(ctx)
+		require.NoError(t, result.Error(), "should be able to create move job")
+
+		// Wait for job to complete - should record error but continue
+		require.EventuallyWithT(t, func(collect *assert.CollectT) {
+			list := &unstructured.UnstructuredList{}
+			err := helper.AdminREST.Get().
+				Namespace("default").
+				Resource("repositories").
+				Name(repo).
+				SubResource("jobs").
+				Do(ctx).Into(list)
+			assert.NoError(collect, err, "should be able to list jobs")
+			assert.NotEmpty(collect, list.Items, "expect at least one job")
+
+			// Find the most recent move job
+			var moveJob *unstructured.Unstructured
+			for _, elem := range list.Items {
+				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
+
+				action := mustNestedString(elem.Object, "spec", "action")
+				if action == "move" {
+					// Get the most recent one (they should be ordered by creation time)
+					moveJob = &elem
+				}
+			}
+			if !assert.NotNil(collect, moveJob, "should find a move job") {
+				return
+			}
+
+			state := mustNestedString(moveJob.Object, "status", "state")
+			// The job should complete but record errors for individual resource resolution failures
+			if state == "error" || state == "completed" || state == "success" {
+				// Any of these states is acceptable - the key is that resource resolution errors are recorded
+				// and don't fail the entire job due to error-tolerant implementation
+				return
+			}
+			assert.Fail(collect, "job should complete or error, but got state: %s", state)
+		}, time.Second*10, time.Millisecond*100, "Expected move job to handle non-existent resource")
+	})
+}
diff --git a/pkg/tests/apis/provisioning/helper_test.go b/pkg/tests/apis/provisioning/helper_test.go
index f1252af3662..b2c4636d87e 100644
--- a/pkg/tests/apis/provisioning/helper_test.go
+++ b/pkg/tests/apis/provisioning/helper_test.go
@@ -4,10 +4,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io/fs"
 	"net/http"
 	"net/url"
 	"os"
 	"path"
+	"path/filepath"
 	"strings"
 	"testing"
 	"text/template"
@@ -94,11 +96,42 @@ func (h *provisioningTestHelper) SyncAndWait(t *testing.T, repo string, options
 	h.AwaitJobSuccess(t, t.Context(), unstruct)
 }
 
+func (h *provisioningTestHelper) TriggerJobAndWait(t *testing.T, repo string, spec provisioning.JobSpec) {
+	t.Helper()
+
+	body := asJSON(spec)
+	result := h.AdminREST.Post().
+		Namespace("default").
+		Resource("repositories").
+		Name(repo).
+		SubResource("jobs").
+		Body(body).
+		SetHeader("Content-Type", "application/json").
+		Do(t.Context())
+
+	if apierrors.IsAlreadyExists(result.Error()) {
+		// Wait for all jobs to finish as we don't have the name.
+		h.AwaitJobs(t, repo)
+		return
+	}
+
+	obj, err := result.Get()
+	require.NoError(t, err, "expecting to be able to sync repository")
+
+	unstruct, ok := obj.(*unstructured.Unstructured)
+	require.True(t, ok, "expecting unstructured object, but got %T", obj)
+
+	name := unstruct.GetName()
+	require.NotEmpty(t, name, "expecting name to be set")
+	h.AwaitJobSuccess(t, t.Context(), unstruct)
+}
+
 func (h *provisioningTestHelper) AwaitJobSuccess(t *testing.T, ctx context.Context, job *unstructured.Unstructured) {
 	t.Helper()
 
 	repo := job.GetLabels()[jobs.LabelRepository]
 	require.NotEmpty(t, repo)
+	// TODO: simply this
 	if !assert.EventuallyWithT(t, func(collect *assert.CollectT) {
 		result, err := h.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{},
 			"jobs", string(job.GetUID()))
@@ -433,3 +466,58 @@ func (h *provisioningTestHelper) postFilesRequest(t *testing.T, repo string, opt
 
 	return resp
 }
+
+// printFileTree prints the directory structure as a tree for debugging purposes
+func printFileTree(t *testing.T, rootPath string) {
+	t.Helper()
+	t.Logf("File tree for %s:", rootPath)
+
+	err := filepath.WalkDir(rootPath, func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+
+		relPath, err := filepath.Rel(rootPath, path)
+		if err != nil {
+			return err
+		}
+
+		if relPath == "." {
+			return nil
+		}
+
+		depth := strings.Count(relPath, string(filepath.Separator))
+		indent := strings.Repeat("  ", depth)
+
+		if d.IsDir() {
+			t.Logf("%s├── %s/", indent, d.Name())
+		} else {
+			info, err := d.Info()
+			if err != nil {
+				t.Logf("%s├── %s (error reading info)", indent, d.Name())
+			} else {
+				t.Logf("%s├── %s (%d bytes)", indent, d.Name(), info.Size())
+			}
+		}
+
+		return nil
+	})
+	if err != nil {
+		t.Logf("Error walking directory: %v", err)
+	}
+}
+
+// Helper function to count files in a directory recursively
+func countFilesInDir(rootPath string) (int, error) {
+	count := 0
+	err := filepath.WalkDir(rootPath, func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+		if !d.IsDir() {
+			count++
+		}
+		return nil
+	})
+	return count, err
+}
diff --git a/pkg/tests/apis/provisioning/movejob_test.go b/pkg/tests/apis/provisioning/movejob_test.go
new file mode 100644
index 00000000000..a7d44f89fef
--- /dev/null
+++ b/pkg/tests/apis/provisioning/movejob_test.go
@@ -0,0 +1,427 @@
+package provisioning
+
+import (
+	"context"
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+)
+
+func TestIntegrationProvisioning_MoveJob(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+	const repo = "move-test-repo"
+	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+		"Name":        repo,
+		"SyncEnabled": true,
+		"SyncTarget":  "instance",
+	})
+	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
+	require.NoError(t, err)
+	// Copy multiple test files to the repository
+	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", "dashboard1.json")
+	helper.CopyToProvisioningPath(t, "testdata/text-options.json", "dashboard2.json")
+	helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", "folder/dashboard3.json")
+	// Trigger and wait for initial sync to populate resources
+	helper.SyncAndWait(t, repo, nil)
+	// Verify initial state - should have 3 dashboards and 1 folder
+	dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	require.Equal(t, 3, len(dashboards.Items), "should have 3 dashboards after sync")
+	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
+	require.NoError(t, err)
+	require.Equal(t, 1, len(folders.Items), "should have 1 folder after sync")
+
+	t.Run("move single file", func(t *testing.T) {
+		spec := provisioning.JobSpec{
+			Action: provisioning.JobActionMove,
+			Move: &provisioning.MoveJobOptions{
+				Paths:      []string{"dashboard1.json"},
+				TargetPath: "moved/",
+			},
+		}
+		helper.TriggerJobAndWait(t, repo, spec)
+
+		// TODO: This additional sync should not be necessary - the move job should handle sync properly
+		helper.SyncAndWait(t, repo, nil)
+
+		// Verify file is moved in repository
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved", "dashboard1.json")
+		require.NoError(t, err, "file should exist at new location in repository")
+
+		// Verify original file is gone from repository
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard1.json")
+		require.Error(t, err, "original file should be gone from repository")
+		require.True(t, apierrors.IsNotFound(err), "should be not found error")
+
+		// Verify other files still exist at original locations
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard2.json")
+		require.NoError(t, err, "other files should still exist")
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "dashboard3.json")
+		require.NoError(t, err, "nested files should still exist")
+
+		// Verify dashboard still exists in Grafana after sync
+		// Use eventually to let unified storage reflect the changes in dashboards.
+		// FIXME: investigate this
+		require.EventuallyWithT(t, func(collect *assert.CollectT) {
+			dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+			assert.NoError(collect, err)
+			assert.Len(collect, dashboards.Items, 3, "should still have 3 dashboards after move")
+			// Verify that dashboards have the correct source paths
+			foundPaths := make(map[string]bool)
+			for _, dashboard := range dashboards.Items {
+				sourcePath := dashboard.GetAnnotations()["grafana.app/sourcePath"]
+				foundPaths[sourcePath] = true
+			}
+
+			assert.True(t, foundPaths["moved/dashboard1.json"], "should have dashboard with moved source path")
+			assert.True(t, foundPaths["dashboard2.json"], "should have dashboard2 in original location")
+			assert.True(t, foundPaths["folder/dashboard3.json"], "should have dashboard3 in original nested location")
+		}, time.Second*10, time.Millisecond*100, "Expected to eventually have 3 dashboards after move")
+	})
+
+	t.Run("move multiple files and folder", func(t *testing.T) {
+		// Create move job for multiple files including a folder
+		result := helper.AdminREST.Post().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("jobs").
+			Body(asJSON(&provisioning.JobSpec{
+				Action: provisioning.JobActionMove,
+				Move: &provisioning.MoveJobOptions{
+					Paths:      []string{"dashboard2.json", "folder/"},
+					TargetPath: "archived/",
+				},
+			})).
+			SetHeader("Content-Type", "application/json").
+			Do(ctx)
+		require.NoError(t, result.Error(), "should be able to create move job")
+
+		raw, err := result.Raw()
+		require.NoError(t, err)
+		obj := &unstructured.Unstructured{}
+		err = json.Unmarshal(raw, obj)
+		require.NoError(t, err)
+
+		// Wait for job to complete
+		helper.AwaitJobSuccess(t, ctx, obj)
+
+		// TODO: This additional sync should not be necessary - the move job should handle sync properly
+		helper.SyncAndWait(t, repo, nil)
+
+		// Verify files are moved in repository
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "archived", "dashboard2.json")
+		require.NoError(t, err, "dashboard2.json should exist at new location")
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "archived", "folder", "dashboard3.json")
+		require.NoError(t, err, "folder/dashboard3.json should exist at new nested location")
+
+		// Verify original files are gone from repository
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard2.json")
+		require.Error(t, err, "dashboard2.json should be gone from original location")
+		require.True(t, apierrors.IsNotFound(err))
+
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "dashboard3.json")
+		require.Error(t, err, "folder should be gone from original location")
+		require.True(t, apierrors.IsNotFound(err), err.Error())
+
+		// Verify dashboards still exist in Grafana after sync
+		// Note: Since dashboard1.json was moved in the previous test, we now expect all 3 dashboards
+		// to be accessible from their moved locations (dashboard1 from moved/, dashboard2 and dashboard3 from archived/)
+		dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+		require.NoError(t, err)
+		require.Len(t, dashboards.Items, 3, "should still have 3 dashboards after move")
+
+		// Verify that dashboards have the correct source paths after cumulative moves
+		foundPaths := make(map[string]bool)
+		for _, dashboard := range dashboards.Items {
+			sourcePath := dashboard.GetAnnotations()["grafana.app/sourcePath"]
+			foundPaths[sourcePath] = true
+		}
+
+		require.True(t, foundPaths["moved/dashboard1.json"], "should have dashboard1 from first move")
+		require.True(t, foundPaths["archived/dashboard2.json"], "should have dashboard2 in archived location")
+		require.True(t, foundPaths["archived/folder/dashboard3.json"], "should have dashboard3 in archived nested location")
+	})
+
+	t.Run("move non-existent file", func(t *testing.T) {
+		// Create move job for non-existent file
+		result := helper.AdminREST.Post().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("jobs").
+			Body(asJSON(&provisioning.JobSpec{
+				Action: provisioning.JobActionMove,
+				Move: &provisioning.MoveJobOptions{
+					Paths:      []string{"non-existent.json"},
+					TargetPath: "moved/",
+				},
+			})).
+			SetHeader("Content-Type", "application/json").
+			Do(ctx)
+		require.NoError(t, result.Error(), "should be able to create move job")
+
+		// Wait for job to complete - should fail due to strict error handling
+		require.EventuallyWithT(t, func(collect *assert.CollectT) {
+			list := &unstructured.UnstructuredList{}
+			err := helper.AdminREST.Get().
+				Namespace("default").
+				Resource("repositories").
+				Name(repo).
+				SubResource("jobs").
+				Do(ctx).Into(list)
+			assert.NoError(collect, err, "should be able to list jobs")
+			assert.NotEmpty(collect, list.Items, "expect at least one job")
+
+			// Find the move job specifically
+			var moveJob *unstructured.Unstructured
+			for _, elem := range list.Items {
+				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
+
+				action := mustNestedString(elem.Object, "spec", "action")
+				if action == "move" {
+					// Check if this is the specific job we're looking for
+					paths, found, err := unstructured.NestedStringSlice(elem.Object, "spec", "move", "paths")
+					if err == nil && found && len(paths) > 0 && paths[0] == "non-existent.json" {
+						moveJob = &elem
+						break
+					}
+				}
+			}
+			assert.NotNil(collect, moveJob, "should find a move job for non-existent file")
+
+			state := mustNestedString(moveJob.Object, "status", "state")
+			assert.Equal(collect, "error", state, "move job should have failed due to non-existent file")
+		}, time.Second*10, time.Millisecond*100, "Expected move job to fail with error state")
+	})
+
+	t.Run("move without target path", func(t *testing.T) {
+		// Create move job without target path (should fail)
+		result := helper.AdminREST.Post().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("jobs").
+			Body(asJSON(&provisioning.JobSpec{
+				Action: provisioning.JobActionMove,
+				Move: &provisioning.MoveJobOptions{
+					Paths: []string{"moved/dashboard1.json"},
+					// TargetPath intentionally omitted
+				},
+			})).
+			SetHeader("Content-Type", "application/json").
+			Do(ctx)
+		require.NoError(t, result.Error(), "should be able to create move job")
+
+		// Wait for job to complete - should fail due to missing target path
+		require.EventuallyWithT(t, func(collect *assert.CollectT) {
+			list := &unstructured.UnstructuredList{}
+			err := helper.AdminREST.Get().
+				Namespace("default").
+				Resource("repositories").
+				Name(repo).
+				SubResource("jobs").
+				Do(ctx).Into(list)
+			assert.NoError(collect, err, "should be able to list jobs")
+			assert.NotEmpty(collect, list.Items, "expect at least one job")
+
+			// Find the move job specifically
+			var moveJob *unstructured.Unstructured
+			for _, elem := range list.Items {
+				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
+
+				action := mustNestedString(elem.Object, "spec", "action")
+				if action == "move" {
+					// Check if this is the job without target path
+					targetPath, found, _ := unstructured.NestedString(elem.Object, "spec", "move", "targetPath")
+					if !found || targetPath == "" {
+						moveJob = &elem
+						break
+					}
+				}
+			}
+			assert.NotNil(collect, moveJob, "should find a move job without target path")
+
+			state := mustNestedString(moveJob.Object, "status", "state")
+			assert.Equal(collect, "error", state, "move job should have failed due to missing target path")
+		}, time.Second*10, time.Millisecond*100, "Expected move job to fail with error state")
+	})
+
+	t.Run("move by resource reference", func(t *testing.T) {
+		// Create a unique repository for resource reference testing to avoid contamination
+		const refRepo = "move-ref-test-repo"
+		localRefTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+			"Name":        refRepo,
+			"SyncEnabled": true,
+			"SyncTarget":  "folder",
+		})
+		_, err := helper.Repositories.Resource.Create(ctx, localRefTmp, metav1.CreateOptions{})
+		require.NoError(t, err)
+
+		// Create modified test files with unique UIDs for ResourceRef testing
+		allPanelsContent := helper.LoadFile("testdata/all-panels.json")
+		textOptionsContent := helper.LoadFile("testdata/text-options.json")
+		timelineDemoContent := helper.LoadFile("testdata/timeline-demo.json")
+
+		// Modify UIDs to be unique for ResourceRef tests
+		allPanelsModified := strings.Replace(string(allPanelsContent), `"uid": "n1jR8vnnz"`, `"uid": "moveref1"`, 1)
+		textOptionsModified := strings.Replace(string(textOptionsContent), `"uid": "WZ7AhQiVz"`, `"uid": "moveref2"`, 1)
+		timelineDemoModified := strings.Replace(string(timelineDemoContent), `"uid": "mIJjFy8Kz"`, `"uid": "moveref3"`, 1)
+
+		// Create temporary files and copy them to the provisioning path
+		tmpDir := t.TempDir()
+		tmpFile1 := filepath.Join(tmpDir, "move-ref-test-1.json")
+		tmpFile2 := filepath.Join(tmpDir, "move-ref-test-2.json")
+		tmpFile3 := filepath.Join(tmpDir, "move-ref-test-3.json")
+
+		require.NoError(t, os.WriteFile(tmpFile1, []byte(allPanelsModified), 0644))
+		require.NoError(t, os.WriteFile(tmpFile2, []byte(textOptionsModified), 0644))
+		require.NoError(t, os.WriteFile(tmpFile3, []byte(timelineDemoModified), 0644))
+
+		// Copy files to provisioning path to set up test - use refRepo's path
+		helper.CopyToProvisioningPath(t, tmpFile1, "move-source-1.json")
+		helper.CopyToProvisioningPath(t, tmpFile2, "move-source-2.json")
+		helper.CopyToProvisioningPath(t, tmpFile3, "move-source-3.json")
+
+		// Sync to populate resources in Grafana
+		helper.SyncAndWait(t, refRepo, nil)
+
+		t.Run("move single dashboard by resource reference", func(t *testing.T) {
+			spec := provisioning.JobSpec{
+				Action: provisioning.JobActionMove,
+				Move: &provisioning.MoveJobOptions{
+					TargetPath: "moved-by-ref/",
+					Resources: []provisioning.ResourceRef{
+						{
+							Name:  "moveref1", // UID from modified all-panels.json
+							Kind:  "Dashboard",
+							Group: "dashboard.grafana.app",
+						},
+					},
+				},
+			}
+
+			helper.TriggerJobAndWait(t, refRepo, spec)
+			// Verify corresponding file is moved in repository
+			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "moved-by-ref", "move-source-1.json")
+			require.NoError(t, err, "file should be moved to new location in repository")
+
+			// Verify original file is deleted from repository
+			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "move-source-1.json")
+			require.Error(t, err, "original file should be deleted from repository")
+			require.True(t, apierrors.IsNotFound(err), "should be not found error")
+
+			// Verify dashboard still exists in Grafana (should be updated after sync)
+			helper.SyncAndWait(t, refRepo, nil)
+			_, err = helper.DashboardsV1.Resource.Get(ctx, "moveref1", metav1.GetOptions{})
+			require.NoError(t, err, "dashboard should still exist in Grafana after move")
+
+			// Verify other resource still exists in original location
+			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "move-source-2.json")
+			require.NoError(t, err, "other files should still exist in original location")
+		})
+
+		t.Run("move multiple resources by reference", func(t *testing.T) {
+			spec := provisioning.JobSpec{
+				Action: provisioning.JobActionMove,
+				Move: &provisioning.MoveJobOptions{
+					TargetPath: "archived-by-ref/",
+					Resources: []provisioning.ResourceRef{
+						{
+							Name:  "moveref2", // UID from modified text-options.json
+							Kind:  "Dashboard",
+							Group: "dashboard.grafana.app",
+						},
+					},
+				},
+			}
+			helper.TriggerJobAndWait(t, refRepo, spec)
+
+			// Verify file is moved in repository
+			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "archived-by-ref", "move-source-2.json")
+			require.NoError(t, err, "file should be moved to new location")
+
+			// Verify original file is deleted from repository
+			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "move-source-2.json")
+			require.Error(t, err, "original file should be deleted from repository")
+			require.True(t, apierrors.IsNotFound(err), "should be not found error")
+
+			// Verify dashboard still exists in Grafana after sync
+			helper.SyncAndWait(t, refRepo, nil)
+			_, err = helper.DashboardsV1.Resource.Get(ctx, "moveref2", metav1.GetOptions{})
+			require.NoError(t, err, "dashboard should still exist in Grafana after move")
+		})
+
+		t.Run("mixed move - paths and resources", func(t *testing.T) {
+			// Setup fresh resources for mixed test
+			tmpMixed1 := filepath.Join(tmpDir, "mixed-move-1.json")
+			tmpMixed2 := filepath.Join(tmpDir, "mixed-move-2.json")
+
+			allPanelsMixed := strings.Replace(string(allPanelsContent), `"uid": "n1jR8vnnz"`, `"uid": "mixedmove1"`, 1)
+			textOptionsMixed := strings.Replace(string(textOptionsContent), `"uid": "WZ7AhQiVz"`, `"uid": "mixedmove2"`, 1)
+
+			require.NoError(t, os.WriteFile(tmpMixed1, []byte(allPanelsMixed), 0644))
+			require.NoError(t, os.WriteFile(tmpMixed2, []byte(textOptionsMixed), 0644))
+
+			helper.CopyToProvisioningPath(t, tmpMixed1, "mixed-move-1.json") // UID: mixedmove1
+			helper.CopyToProvisioningPath(t, tmpMixed2, "mixed-move-2.json") // UID: mixedmove2
+
+			helper.SyncAndWait(t, refRepo, nil)
+
+			// Create move job that combines both paths and resource references
+			spec := provisioning.JobSpec{
+				Action: provisioning.JobActionMove,
+				Move: &provisioning.MoveJobOptions{
+					TargetPath: "mixed-target/",
+					Paths:      []string{"mixed-move-1.json"}, // Move by path
+					Resources: []provisioning.ResourceRef{
+						{
+							Name:  "mixedmove2", // Move by resource reference
+							Kind:  "Dashboard",
+							Group: "dashboard.grafana.app",
+						},
+					},
+				},
+			}
+			helper.TriggerJobAndWait(t, refRepo, spec)
+
+			// Verify both targeted resources are moved in repository
+			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "mixed-target", "mixed-move-1.json")
+			require.NoError(t, err, "file moved by path should exist at new location")
+
+			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "mixed-target", "mixed-move-2.json")
+			require.NoError(t, err, "file moved by resource ref should exist at new location")
+
+			// Verify files are deleted from original locations
+			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "mixed-move-1.json")
+			require.Error(t, err, "file moved by path should be deleted from original location")
+
+			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "mixed-move-2.json")
+			require.Error(t, err, "file moved by resource ref should be deleted from original location")
+
+			// Verify dashboards still exist in Grafana after sync
+			helper.SyncAndWait(t, refRepo, nil)
+			_, err = helper.DashboardsV1.Resource.Get(ctx, "mixedmove1", metav1.GetOptions{})
+			require.NoError(t, err, "dashboard moved by path should still exist in Grafana")
+
+			_, err = helper.DashboardsV1.Resource.Get(ctx, "mixedmove2", metav1.GetOptions{})
+			require.NoError(t, err, "dashboard moved by resource ref should still exist in Grafana")
+		})
+	})
+}
diff --git a/pkg/tests/apis/provisioning/provisioning_test.go b/pkg/tests/apis/provisioning/provisioning_test.go
deleted file mode 100644
index b7b845e233f..00000000000
--- a/pkg/tests/apis/provisioning/provisioning_test.go
+++ /dev/null
@@ -1,2304 +0,0 @@
-package provisioning
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/fs"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
-	"github.com/grafana/grafana/pkg/apimachinery/utils"
-	"github.com/grafana/grafana/pkg/extensions"
-	"github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/tests/apis"
-)
-
-// printFileTree prints the directory structure as a tree for debugging purposes
-func printFileTree(t *testing.T, rootPath string) {
-	t.Helper()
-	t.Logf("File tree for %s:", rootPath)
-
-	err := filepath.WalkDir(rootPath, func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
-
-		relPath, err := filepath.Rel(rootPath, path)
-		if err != nil {
-			return err
-		}
-
-		if relPath == "." {
-			return nil
-		}
-
-		depth := strings.Count(relPath, string(filepath.Separator))
-		indent := strings.Repeat("  ", depth)
-
-		if d.IsDir() {
-			t.Logf("%s├── %s/", indent, d.Name())
-		} else {
-			info, err := d.Info()
-			if err != nil {
-				t.Logf("%s├── %s (error reading info)", indent, d.Name())
-			} else {
-				t.Logf("%s├── %s (%d bytes)", indent, d.Name(), info.Size())
-			}
-		}
-
-		return nil
-	})
-	if err != nil {
-		t.Logf("Error walking directory: %v", err)
-	}
-}
-
-func TestIntegrationProvisioning_CreatingAndGetting(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	helper := runGrafana(t)
-	createOptions := metav1.CreateOptions{FieldValidation: "Strict"}
-	ctx := context.Background()
-
-	inputFiles := []string{
-		"testdata/github-readonly.json.tmpl",
-		"testdata/local-readonly.json.tmpl",
-	}
-
-	for _, inputFilePath := range inputFiles {
-		t.Run(inputFilePath, func(t *testing.T) {
-			input := helper.RenderObject(t, inputFilePath, nil)
-
-			_, err := helper.Repositories.Resource.Create(ctx, input, createOptions)
-			require.NoError(t, err, "failed to create resource")
-
-			name := mustNestedString(input.Object, "metadata", "name")
-			output, err := helper.Repositories.Resource.Get(ctx, name, metav1.GetOptions{})
-			require.NoError(t, err, "failed to read back resource")
-
-			// Move encrypted token mutation
-			token, found, err := unstructured.NestedString(output.Object, "spec", "github", "encryptedToken")
-			require.NoError(t, err, "encryptedToken is not a string")
-			if found {
-				unstructured.RemoveNestedField(input.Object, "spec", "github", "token")
-				err = unstructured.SetNestedField(input.Object, token, "spec", "github", "encryptedToken")
-				require.NoError(t, err, "unable to copy encrypted token")
-			}
-
-			// Marshal as real objects to ",omitempty" values are tested properly
-			expectedRepo := unstructuredToRepository(t, input)
-			returnedRepo := unstructuredToRepository(t, output)
-			require.Equal(t, expectedRepo.Spec, returnedRepo.Spec)
-
-			// A viewer should not be able to see the same thing
-			var statusCode int
-			rsp := helper.ViewerREST.Get().
-				Namespace("default").
-				Resource("repositories").
-				Name(name).
-				Do(context.Background())
-			require.Error(t, rsp.Error())
-			rsp.StatusCode(&statusCode)
-			require.Equal(t, http.StatusForbidden, statusCode)
-
-			// Viewer can see file listing
-			rsp = helper.AdminREST.Get().
-				Namespace("default").
-				Resource("repositories").
-				Name(name).
-				Suffix("files/").
-				Do(context.Background())
-			require.NoError(t, rsp.Error())
-
-			// Verify that we can list refs
-			rsp = helper.AdminREST.Get().
-				Namespace("default").
-				Resource("repositories").
-				Name(name).
-				Suffix("refs").
-				Do(context.Background())
-
-			if expectedRepo.Spec.Type == provisioning.LocalRepositoryType {
-				require.ErrorContains(t, rsp.Error(), "does not support versioned operations")
-			} else {
-				require.NoError(t, rsp.Error())
-				refs := &provisioning.RefList{}
-				err = rsp.Into(refs)
-				require.NoError(t, err)
-				require.True(t, len(refs.Items) >= 1, "should have at least one ref")
-
-				var foundBranch bool
-				for _, ref := range refs.Items {
-					// FIXME: this assertion should be improved for all git types and take things from config
-					if ref.Name == "integration-test" {
-						require.Equal(t, "0f3370c212b04b9704e00f6926ef339bf91c7a1b", ref.Hash)
-						require.Equal(t, "https://github.com/grafana/grafana-git-sync-demo/tree/integration-test", ref.RefURL)
-						foundBranch = true
-					}
-				}
-
-				require.True(t, foundBranch, "branch should be found")
-			}
-		})
-	}
-
-	// Viewer can see settings listing
-	t.Run("viewer has access to list", func(t *testing.T) {
-		settings := &provisioning.RepositoryViewList{}
-		rsp := helper.ViewerREST.Get().
-			Namespace("default").
-			Suffix("settings").
-			Do(context.Background())
-		require.NoError(t, rsp.Error())
-		err := rsp.Into(settings)
-		require.NoError(t, err)
-		require.Len(t, settings.Items, len(inputFiles))
-
-		// FIXME: this should be an enterprise integration test
-		if extensions.IsEnterprise {
-			require.ElementsMatch(t, []provisioning.RepositoryType{
-				provisioning.LocalRepositoryType,
-				provisioning.GitHubRepositoryType,
-				provisioning.GitRepositoryType,
-				provisioning.BitbucketRepositoryType,
-				provisioning.GitLabRepositoryType,
-			}, settings.AvailableRepositoryTypes)
-		} else {
-			require.ElementsMatch(t, []provisioning.RepositoryType{
-				provisioning.LocalRepositoryType,
-				provisioning.GitHubRepositoryType,
-			}, settings.AvailableRepositoryTypes)
-		}
-	})
-
-	t.Run("Repositories are reported in stats", func(t *testing.T) {
-		report := apis.DoRequest(helper.K8sTestHelper, apis.RequestParams{
-			Method: http.MethodGet,
-			Path:   "/api/admin/usage-report-preview",
-			User:   helper.Org1.Admin,
-		}, &usagestats.Report{})
-
-		stats := map[string]any{}
-		for k, v := range report.Result.Metrics {
-			if strings.HasPrefix(k, "stats.repository.") {
-				stats[k] = v
-			}
-		}
-		require.Equal(t, map[string]any{
-			"stats.repository.github.count": 1.0,
-			"stats.repository.local.count":  1.0,
-		}, stats)
-	})
-}
-
-func TestIntegrationProvisioning_FailInvalidSchema(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	t.Skip("Reenable this test once we enforce schema validation for provisioning")
-
-	helper := runGrafana(t)
-	ctx := context.Background()
-
-	const repo = "invalid-schema-tmp"
-	// Set up the repository and the file to import.
-	helper.CopyToProvisioningPath(t, "testdata/invalid-dashboard-schema.json", "invalid-dashboard-schema.json")
-
-	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo,
-		"SyncEnabled": true,
-	})
-	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
-	require.NoError(t, err)
-
-	// Make sure the repo can read and validate the file
-	_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "invalid-dashboard-schema.json")
-	status := helper.RequireApiErrorStatus(err, metav1.StatusReasonBadRequest, http.StatusBadRequest)
-	require.Equal(t, status.Message, "Dry run failed: Dashboard.dashboard.grafana.app \"invalid-schema-uid\" is invalid: [spec.panels.0.repeatDirection: Invalid value: conflicting values \"h\" and \"this is not an allowed value\", spec.panels.0.repeatDirection: Invalid value: conflicting values \"v\" and \"this is not an allowed value\"]")
-
-	const invalidSchemaUid = "invalid-schema-uid"
-	_, err = helper.DashboardsV1.Resource.Get(ctx, invalidSchemaUid, metav1.GetOptions{})
-	require.Error(t, err, "invalid dashboard shouldn't exist")
-	require.True(t, apierrors.IsNotFound(err))
-
-	var jobObj *unstructured.Unstructured
-	require.EventuallyWithT(t, func(collect *assert.CollectT) {
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionPull,
-				Pull:   &provisioning.SyncJobOptions{},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(t.Context())
-		require.NoError(collect, result.Error())
-		job, err := result.Get()
-		require.NoError(collect, err)
-		var ok bool
-		jobObj, ok = job.(*unstructured.Unstructured)
-		assert.True(collect, ok, "expecting unstructured object, but got %T", job)
-	}, time.Second*10, time.Millisecond*10, "Expected to be able to start a sync job")
-
-	require.EventuallyWithT(t, func(collect *assert.CollectT) {
-		// helper.TriggerJobProcessing(t)
-		result, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{},
-			"jobs", string(jobObj.GetUID()))
-
-		if apierrors.IsNotFound(err) {
-			assert.Fail(collect, "job '%s' not found yet yet", jobObj.GetName())
-			return // continue trying
-		}
-
-		// Can fail fast here -- the jobs are immutable
-		require.NoError(t, err)
-		require.NotNil(t, result)
-
-		job := &provisioning.Job{}
-		err = runtime.DefaultUnstructuredConverter.FromUnstructured(result.Object, job)
-		require.NoError(t, err, "should convert to Job object")
-
-		assert.Equal(t, provisioning.JobStateError, job.Status.State)
-		assert.Equal(t, job.Status.Message, "completed with errors")
-		assert.Equal(t, job.Status.Errors[0], "Dashboard.dashboard.grafana.app \"invalid-schema-uid\" is invalid: [spec.panels.0.repeatDirection: Invalid value: conflicting values \"h\" and \"this is not an allowed value\", spec.panels.0.repeatDirection: Invalid value: conflicting values \"v\" and \"this is not an allowed value\"]")
-	}, time.Second*10, time.Millisecond*10, "Expected provisioning job to conclude with the status failed")
-
-	_, err = helper.DashboardsV1.Resource.Get(ctx, invalidSchemaUid, metav1.GetOptions{})
-	require.Error(t, err, "invalid dashboard shouldn't have been created")
-	require.True(t, apierrors.IsNotFound(err))
-
-	err = helper.Repositories.Resource.Delete(ctx, repo, metav1.DeleteOptions{}, "files", "invalid-dashboard-schema.json")
-	require.NoError(t, err, "should delete the resource file")
-}
-
-func TestIntegrationProvisioning_CreatingGitHubRepository(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	helper := runGrafana(t)
-	ctx := context.Background()
-
-	// FIXME: instead of using an existing GitHub repository, we should create a new one for the tests and a branch
-	// This was the previous structure
-	// ghmock.WithRequestMatchHandler(ghmock.GetReposGitTreesByOwnerByRepoByTreeSha,
-	// 	ghHandleTree(t, map[string][]*gh.TreeEntry{
-	// 		"deadbeef": {
-	// 			treeEntryDir("grafana", "subtree"),
-	// 		},
-	// 		"subtree": {
-	// 			treeEntry("dashboard.json", helper.LoadFile("testdata/all-panels.json")),
-	// 			treeEntryDir("subdir", "subtree2"),
-	// 			treeEntry("subdir/dashboard2.yaml", helper.LoadFile("testdata/text-options.json")),
-	// 		},
-	// 	})),
-
-	// FIXME: uncomment these to implement webhook integration tests.
-	// helper.GetEnv().GitHubFactory.Client = ghmock.NewMockedHTTPClient(
-	// 	ghmock.WithRequestMatchHandler(ghmock.GetReposHooksByOwnerByRepo, ghAlwaysWrite(t, []*gh.Hook{})),
-	// 	ghmock.WithRequestMatchHandler(ghmock.PostReposHooksByOwnerByRepo, ghAlwaysWrite(t, &gh.Hook{ID: gh.Ptr(int64(123))})),
-	// )
-
-	const repo = "github-create-test"
-	_, err := helper.Repositories.Resource.Create(ctx,
-		helper.RenderObject(t, "testdata/github-readonly.json.tmpl", map[string]any{
-			"Name":        repo,
-			"SyncEnabled": true,
-			"SyncTarget":  "instance",
-			"Path":        "grafana/",
-		}),
-		metav1.CreateOptions{},
-	)
-	require.NoError(t, err)
-
-	helper.SyncAndWait(t, repo, nil)
-
-	// By now, we should have synced, meaning we have data to read in the local Grafana instance!
-
-	found, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err, "can list values")
-
-	names := []string{}
-	for _, v := range found.Items {
-		names = append(names, v.GetName())
-	}
-	require.Len(t, names, 3, "should have three dashboards")
-	assert.Contains(t, names, "adg5vbj", "should contain dashboard.json's contents")
-	assert.Contains(t, names, "admfz74", "should contain dashboard2.yaml's contents")
-	assert.Contains(t, names, "adn5mxb", "should contain dashboard2.yaml's contents")
-
-	err = helper.Repositories.Resource.Delete(ctx, repo, metav1.DeleteOptions{})
-	require.NoError(t, err, "should delete values")
-
-	require.EventuallyWithT(t, func(collect *assert.CollectT) {
-		found, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-		assert.NoError(t, err, "can list values")
-		assert.Equal(collect, 0, len(found.Items), "expected dashboards to be deleted")
-	}, time.Second*20, time.Millisecond*10, "Expected dashboards to be deleted")
-
-	t.Run("github url cleanup", func(t *testing.T) {
-		tests := []struct {
-			name   string
-			input  string
-			output string
-		}{
-			{
-				name:   "simple-url",
-				input:  "https://github.com/dprokop/grafana-git-sync-test",
-				output: "https://github.com/dprokop/grafana-git-sync-test",
-			},
-			{
-				name:   "trim-dot-git",
-				input:  "https://github.com/dprokop/grafana-git-sync-test.git",
-				output: "https://github.com/dprokop/grafana-git-sync-test",
-			},
-			{
-				name:   "trim-slash",
-				input:  "https://github.com/dprokop/grafana-git-sync-test/",
-				output: "https://github.com/dprokop/grafana-git-sync-test",
-			},
-		}
-
-		for _, test := range tests {
-			t.Run(test.name, func(t *testing.T) {
-				input := helper.RenderObject(t, "testdata/github-readonly.json.tmpl", map[string]any{
-					"Name": test.name,
-					"URL":  test.input,
-				})
-
-				_, err := helper.Repositories.Resource.Create(ctx, input, metav1.CreateOptions{})
-				require.NoError(t, err, "failed to create resource")
-
-				obj, err := helper.Repositories.Resource.Get(ctx, test.name, metav1.GetOptions{})
-				require.NoError(t, err, "failed to read back resource")
-
-				url, _, err := unstructured.NestedString(obj.Object, "spec", "github", "url")
-				require.NoError(t, err, "failed to read URL")
-				require.Equal(t, test.output, url)
-
-				err = helper.Repositories.Resource.Delete(ctx, test.name, metav1.DeleteOptions{})
-				require.NoError(t, err, "failed to delete")
-			})
-		}
-	})
-}
-
-func TestIntegrationProvisioning_RunLocalRepository(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	helper := runGrafana(t)
-	ctx := context.Background()
-
-	const allPanels = "n1jR8vnnz"
-	const repo = "local-local-examples"
-	const targetPath = "all-panels.json"
-
-	// Set up the repository.
-	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{"Name": repo})
-	obj, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
-	require.NoError(t, err)
-	name, _, _ := unstructured.NestedString(obj.Object, "metadata", "name")
-	require.Equal(t, repo, name, "wrote the expected name")
-
-	// Write a file -- this will create it *both* in the local file system, and in grafana
-	t.Run("write all panels", func(t *testing.T) {
-		code := 0
-
-		// Check that we can not (yet) UPDATE the target path
-		result := helper.AdminREST.Put().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("files", targetPath).
-			Body(helper.LoadFile("testdata/all-panels.json")).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx).StatusCode(&code)
-		require.Equal(t, http.StatusNotFound, code)
-		require.True(t, apierrors.IsNotFound(result.Error()))
-
-		// Now try again with POST (as an editor)
-		result = helper.EditorREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("files", targetPath).
-			Body(helper.LoadFile("testdata/all-panels.json")).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx).StatusCode(&code)
-		require.NoError(t, result.Error(), "expecting to be able to create file")
-		wrapper := &provisioning.ResourceWrapper{}
-		raw, err := result.Raw()
-		require.NoError(t, err)
-		err = json.Unmarshal(raw, wrapper)
-		require.NoError(t, err)
-		require.Equal(t, 200, code, "expected 200 response")
-		require.Equal(t, provisioning.ClassicDashboard, wrapper.Resource.Type.Classic)
-		name, _, _ := unstructured.NestedString(wrapper.Resource.File.Object, "metadata", "name")
-		require.Equal(t, allPanels, name, "name from classic UID")
-		name, _, _ = unstructured.NestedString(wrapper.Resource.Upsert.Object, "metadata", "name")
-		require.Equal(t, allPanels, name, "save the name from the request")
-
-		// Get the file from the grafana database
-		obj, err := helper.DashboardsV1.Resource.Get(ctx, allPanels, metav1.GetOptions{})
-		require.NoError(t, err, "the value should be saved in grafana")
-		val, _, _ := unstructured.NestedString(obj.Object, "metadata", "annotations", utils.AnnoKeyManagerKind)
-		require.Equal(t, string(utils.ManagerKindRepo), val, "should have repo annotations")
-		val, _, _ = unstructured.NestedString(obj.Object, "metadata", "annotations", utils.AnnoKeyManagerIdentity)
-		require.Equal(t, repo, val, "should have repo annotations")
-
-		// Read the file we wrote
-		wrapObj, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", targetPath)
-		require.NoError(t, err, "read value")
-
-		wrap := &unstructured.Unstructured{}
-		wrap.Object, _, err = unstructured.NestedMap(wrapObj.Object, "resource", "dryRun")
-		require.NoError(t, err)
-		meta, err := utils.MetaAccessor(wrap)
-		require.NoError(t, err)
-		require.Equal(t, allPanels, meta.GetName(), "read the name out of the saved file")
-
-		// Check that an admin can update
-		meta.SetAnnotation("test", "from-provisioning")
-		body, err := json.Marshal(wrap.Object)
-		require.NoError(t, err)
-		result = helper.AdminREST.Put().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("files", targetPath).
-			Body(body).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx).StatusCode(&code)
-		require.Equal(t, 200, code)
-		require.NoError(t, result.Error(), "update as admin value")
-		raw, err = result.Raw()
-		require.NoError(t, err)
-		err = json.Unmarshal(raw, wrapper)
-		require.NoError(t, err)
-		anno, _, _ := unstructured.NestedString(wrapper.Resource.File.Object, "metadata", "annotations", "test")
-		require.Equal(t, "from-provisioning", anno, "should set the annotation")
-
-		// But a viewer can not
-		result = helper.ViewerREST.Put().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("files", targetPath).
-			Body(body).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx).StatusCode(&code)
-		require.Equal(t, 403, code)
-		require.True(t, apierrors.IsForbidden(result.Error()), code)
-	})
-
-	t.Run("fail using invalid paths", func(t *testing.T) {
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("files", "test", "..", "..", "all-panels.json"). // UNSAFE PATH
-			Body(helper.LoadFile("testdata/all-panels.json")).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.Error(t, result.Error(), "invalid path should return error")
-
-		// Read a file with a bad path
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "../../all-panels.json")
-		require.Error(t, err, "invalid path should error")
-	})
-
-	t.Run("require name or generateName", func(t *testing.T) {
-		code := 0
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("files", "example.json").
-			Body([]byte(`apiVersion: dashboard.grafana.app/v0alpha1
-kind: Dashboard
-spec:
-  title: Test dashboard
-`)).Do(ctx).StatusCode(&code)
-		require.Error(t, result.Error(), "missing name")
-
-		result = helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("files", "example.json").
-			Body([]byte(`apiVersion: dashboard.grafana.app/v0alpha1
-kind: Dashboard
-metadata:
-  generateName: prefix-
-spec:
-  title: Test dashboard
-`)).Do(ctx).StatusCode(&code)
-		require.NoError(t, result.Error(), "should create name")
-		require.Equal(t, 200, code, "expect OK result")
-
-		raw, err := result.Raw()
-		require.NoError(t, err)
-
-		obj := &unstructured.Unstructured{}
-		err = json.Unmarshal(raw, obj)
-		require.NoError(t, err)
-
-		name, _, _ = unstructured.NestedString(obj.Object, "resource", "upsert", "metadata", "name")
-		require.True(t, strings.HasPrefix(name, "prefix-"), "should generate name")
-	})
-}
-
-func TestIntegrationProvisioning_ImportAllPanelsFromLocalRepository(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	helper := runGrafana(t)
-	ctx := context.Background()
-
-	// The dashboard shouldn't exist yet
-	const allPanels = "n1jR8vnnz"
-	_, err := helper.DashboardsV1.Resource.Get(ctx, allPanels, metav1.GetOptions{})
-	require.Error(t, err, "no all-panels dashboard should exist")
-	require.True(t, apierrors.IsNotFound(err))
-
-	const repo = "local-tmp"
-	// Set up the repository and the file to import.
-	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", "all-panels.json")
-	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo,
-		"SyncEnabled": true,
-	})
-
-	// We create the repository
-	_, err = helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
-	require.NoError(t, err)
-
-	// Now, we import it, such that it may exist
-	// The sync may not be necessary as the sync may have happened automatically at this point
-	helper.SyncAndWait(t, repo, nil)
-
-	// Make sure the repo can read and validate the file
-	obj, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "all-panels.json")
-	require.NoError(t, err, "valid path should be fine")
-
-	resource, _, err := unstructured.NestedMap(obj.Object, "resource")
-	require.NoError(t, err, "missing resource")
-	require.NoError(t, err, "invalid action")
-	require.NotNil(t, resource["file"], "the raw file")
-	require.NotNil(t, resource["dryRun"], "dryRun result")
-
-	action, _, err := unstructured.NestedString(resource, "action")
-	require.NoError(t, err, "invalid action")
-	// FIXME: there is no point in in returning action for a read / get request.
-	require.Equal(t, "update", action)
-
-	_, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err, "can list values")
-
-	obj, err = helper.DashboardsV1.Resource.Get(ctx, allPanels, metav1.GetOptions{})
-	require.NoError(t, err, "all-panels dashboard should exist")
-	require.Equal(t, repo, obj.GetAnnotations()[utils.AnnoKeyManagerIdentity])
-
-	// Try writing the value directly
-	err = unstructured.SetNestedField(obj.Object, []any{"aaa", "bbb"}, "spec", "tags")
-	require.NoError(t, err, "set tags")
-	obj, err = helper.DashboardsV1.Resource.Update(ctx, obj, metav1.UpdateOptions{})
-	require.NoError(t, err)
-	v, _, _ := unstructured.NestedString(obj.Object, "metadata", "annotations", utils.AnnoKeyUpdatedBy)
-	require.Equal(t, "access-policy:provisioning", v)
-
-	// Should not be able to directly delete the managed resource
-	err = helper.DashboardsV1.Resource.Delete(ctx, allPanels, metav1.DeleteOptions{})
-	require.NoError(t, err, "user can delete")
-
-	_, err = helper.DashboardsV1.Resource.Get(ctx, allPanels, metav1.GetOptions{})
-	require.Error(t, err, "should delete the internal resource")
-	require.True(t, apierrors.IsNotFound(err))
-}
-
-func TestProvisioning_ExportUnifiedToRepository(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	helper := runGrafana(t)
-	ctx := context.Background()
-
-	// Write dashboards at
-	dashboard := helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v0.yaml")
-	_, err := helper.DashboardsV0.Resource.Create(ctx, dashboard, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create v0 dashboard")
-
-	dashboard = helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v1.yaml")
-	_, err = helper.DashboardsV1.Resource.Create(ctx, dashboard, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create v1 dashboard")
-
-	dashboard = helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v2alpha1.yaml")
-	_, err = helper.DashboardsV2alpha1.Resource.Create(ctx, dashboard, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create v2alpha1 dashboard")
-
-	dashboard = helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v2beta1.yaml")
-	_, err = helper.DashboardsV2beta1.Resource.Create(ctx, dashboard, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create v2beta1 dashboard")
-
-	// Now for the repository.
-	const repo = "local-repository"
-	createBody := helper.RenderObject(t, "exportunifiedtorepository/repository.json.tmpl", map[string]any{"Name": repo})
-	_, err = helper.Repositories.Resource.Create(ctx, createBody, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create repository")
-
-	// Now export...
-	result := helper.AdminREST.Post().
-		Namespace("default").
-		Resource("repositories").
-		Name(repo).
-		SubResource("jobs").
-		SetHeader("Content-Type", "application/json").
-		Body(asJSON(&provisioning.JobSpec{
-			Push: &provisioning.ExportJobOptions{
-				Folder: "", // export entire instance
-				Path:   "", // no prefix necessary for testing
-			},
-		})).
-		Do(ctx)
-	require.NoError(t, result.Error())
-
-	// And time to assert.
-	helper.AwaitJobs(t, repo)
-
-	type props struct {
-		title      string
-		apiVersion string
-		name       string
-		fileName   string
-	}
-
-	printFileTree(t, helper.ProvisioningPath)
-
-	// Check that each file was exported with its stored version
-	for _, test := range []props{
-		{title: "Test dashboard. Created at v0", apiVersion: "dashboard.grafana.app/v0alpha1", name: "test-v0", fileName: "test-dashboard-created-at-v0.json"},
-		{title: "Test dashboard. Created at v1", apiVersion: "dashboard.grafana.app/v1beta1", name: "test-v1", fileName: "test-dashboard-created-at-v1.json"},
-		{title: "Test dashboard. Created at v2alpha1", apiVersion: "dashboard.grafana.app/v2alpha1", name: "test-v2alpha1", fileName: "test-dashboard-created-at-v2alpha1.json"},
-		{title: "Test dashboard. Created at v2beta1", apiVersion: "dashboard.grafana.app/v2beta1", name: "test-v2beta1", fileName: "test-dashboard-created-at-v2beta1.json"},
-	} {
-		fpath := filepath.Join(helper.ProvisioningPath, test.fileName)
-		//nolint:gosec // we are ok with reading files in testdata
-		body, err := os.ReadFile(fpath)
-		require.NoError(t, err, "exported file was not created at path %s", fpath)
-		obj := map[string]any{}
-		err = json.Unmarshal(body, &obj)
-		require.NoError(t, err, "exported file not json %s", fpath)
-
-		val, _, err := unstructured.NestedString(obj, "apiVersion")
-		require.NoError(t, err)
-		require.Equal(t, test.apiVersion, val)
-
-		val, _, err = unstructured.NestedString(obj, "spec", "title")
-		require.NoError(t, err)
-		require.Equal(t, test.title, val)
-
-		val, _, err = unstructured.NestedString(obj, "metadata", "name")
-		require.NoError(t, err)
-		require.Equal(t, test.name, val)
-
-		require.Nil(t, obj["status"], "should not have a status element")
-	}
-}
-
-func TestIntegrationProvisioning_DeleteResources(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	helper := runGrafana(t)
-	ctx := context.Background()
-
-	const repo = "delete-test-repo"
-	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo,
-		"SyncEnabled": true,
-		"SyncTarget":  "instance",
-	})
-	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
-	require.NoError(t, err)
-
-	// Copy the dashboards to the repository path
-	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", "dashboard1.json")
-	helper.CopyToProvisioningPath(t, "testdata/text-options.json", "folder/dashboard2.json")
-	helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", "folder/nested/dashboard3.json")
-	// make sure we don't fail when there is a .keep file in a folder
-	helper.CopyToProvisioningPath(t, "testdata/.keep", "folder/nested/.keep")
-
-	// Trigger and wait for a sync job to finish
-	helper.SyncAndWait(t, repo, nil)
-
-	dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
-	require.Equal(t, 3, len(dashboards.Items))
-
-	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
-	require.Equal(t, 2, len(folders.Items))
-
-	t.Run("delete individual dashboard file, should delete from repo and grafana", func(t *testing.T) {
-		result := helper.AdminREST.Delete().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("files", "dashboard1.json").
-			Do(ctx)
-		require.NoError(t, result.Error())
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard1.json")
-		require.Error(t, err)
-		dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-		require.NoError(t, err)
-		require.Equal(t, 2, len(dashboards.Items))
-	})
-
-	t.Run("delete folder, should delete from repo and grafana all nested resources too", func(t *testing.T) {
-		// need to delete directly through the url, because the k8s client doesn't support `/` in a subresource
-		// but that is needed by gitsync to know that it is a folder
-		addr := helper.GetEnv().Server.HTTPServer.Listener.Addr().String()
-		url := fmt.Sprintf("http://admin:admin@%s/apis/provisioning.grafana.app/v0alpha1/namespaces/default/repositories/%s/files/folder/", addr, repo)
-		req, err := http.NewRequest(http.MethodDelete, url, nil)
-		require.NoError(t, err)
-		resp, err := http.DefaultClient.Do(req)
-		require.NoError(t, err)
-		// nolint:errcheck
-		defer resp.Body.Close()
-		require.Equal(t, http.StatusOK, resp.StatusCode)
-
-		// should be deleted from the repo
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder")
-		require.Error(t, err)
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "dashboard2.json")
-		require.Error(t, err)
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "nested")
-		require.Error(t, err)
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "nested", "dashboard3.json")
-		require.Error(t, err)
-
-		// all should be deleted from grafana
-		for _, d := range dashboards.Items {
-			_, err = helper.DashboardsV1.Resource.Get(ctx, d.GetName(), metav1.GetOptions{})
-			require.Error(t, err)
-		}
-		for _, f := range folders.Items {
-			_, err = helper.Folders.Resource.Get(ctx, f.GetName(), metav1.GetOptions{})
-			require.Error(t, err)
-		}
-	})
-
-	t.Run("deleting a non-existent file should fail", func(t *testing.T) {
-		result := helper.AdminREST.Delete().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("files", "non-existent.json").
-			Do(ctx)
-		require.Error(t, result.Error())
-	})
-}
-
-func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	helper := runGrafana(t)
-	ctx := context.Background()
-
-	const repo = "delete-job-test-repo"
-	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo,
-		"SyncEnabled": true,
-		"SyncTarget":  "instance",
-	})
-	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
-	require.NoError(t, err)
-	// Copy multiple test files to the repository
-	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", "dashboard1.json")
-	helper.CopyToProvisioningPath(t, "testdata/text-options.json", "dashboard2.json")
-	helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", "folder/dashboard3.json")
-
-	// Trigger and wait for initial sync to populate resources
-	helper.SyncAndWait(t, repo, nil)
-
-	// Verify initial state - should have 3 dashboards and 1 folder
-	dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
-	require.Equal(t, 3, len(dashboards.Items), "should have 3 dashboards after sync")
-
-	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
-	require.Equal(t, 1, len(folders.Items), "should have 1 folder after sync")
-
-	t.Run("delete single file", func(t *testing.T) {
-		// Create delete job for single file
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionDelete,
-				Delete: &provisioning.DeleteJobOptions{
-					Paths: []string{"dashboard1.json"},
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create delete job")
-
-		// Wait for job to complete
-		helper.AwaitJobs(t, repo)
-
-		// Verify file is deleted from repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard1.json")
-		require.Error(t, err, "file should be deleted from repository")
-		require.True(t, apierrors.IsNotFound(err), "should be not found error")
-
-		// Verify dashboard is removed from Grafana after sync
-		dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-		require.NoError(t, err)
-		require.Equal(t, 2, len(dashboards.Items), "should have 2 dashboards after delete")
-
-		// Verify other files still exist
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard2.json")
-		require.NoError(t, err, "other files should still exist")
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "dashboard3.json")
-		require.NoError(t, err, "nested files should still exist")
-	})
-
-	t.Run("delete multiple files", func(t *testing.T) {
-		// Create delete job for multiple files
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionDelete,
-				Delete: &provisioning.DeleteJobOptions{
-					Paths: []string{"dashboard2.json", "folder/dashboard3.json"},
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create delete job")
-
-		// Wait for job to complete
-		helper.AwaitJobs(t, repo)
-
-		// Verify files are deleted from repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard2.json")
-		require.Error(t, err, "dashboard2.json should be deleted")
-		require.True(t, apierrors.IsNotFound(err))
-
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "dashboard3.json")
-		require.Error(t, err, "folder/dashboard3.json should be deleted")
-		require.True(t, apierrors.IsNotFound(err))
-
-		// Verify all dashboards are removed from Grafana after sync
-		dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-		require.NoError(t, err)
-		require.Equal(t, 0, len(dashboards.Items), "should have 0 dashboards after deleting all")
-	})
-
-	t.Run("delete by resource reference", func(t *testing.T) {
-		// Create modified test files with unique UIDs for ResourceRef testing
-		// Read and modify the testdata files to have unique UIDs that don't conflict with existing resources
-		allPanelsContent := helper.LoadFile("testdata/all-panels.json")
-		textOptionsContent := helper.LoadFile("testdata/text-options.json")
-		timelineDemoContent := helper.LoadFile("testdata/timeline-demo.json")
-
-		// Modify UIDs to be unique for ResourceRef tests
-		allPanelsModified := strings.Replace(string(allPanelsContent), `"uid": "n1jR8vnnz"`, `"uid": "resourceref1"`, 1)
-		textOptionsModified := strings.Replace(string(textOptionsContent), `"uid": "WZ7AhQiVz"`, `"uid": "resourceref2"`, 1)
-		timelineDemoModified := strings.Replace(string(timelineDemoContent), `"uid": "mIJjFy8Kz"`, `"uid": "resourceref3"`, 1)
-
-		// Create temporary files and copy them to the provisioning path
-		tmpDir := t.TempDir()
-		tmpFile1 := filepath.Join(tmpDir, "resource-test-1.json")
-		tmpFile2 := filepath.Join(tmpDir, "resource-test-2.json")
-		tmpFile3 := filepath.Join(tmpDir, "resource-test-3.json")
-
-		require.NoError(t, os.WriteFile(tmpFile1, []byte(allPanelsModified), 0644))
-		require.NoError(t, os.WriteFile(tmpFile2, []byte(textOptionsModified), 0644))
-		require.NoError(t, os.WriteFile(tmpFile3, []byte(timelineDemoModified), 0644))
-
-		// Copy the temporary files to the provisioning path
-		helper.CopyToProvisioningPath(t, tmpFile1, "resource-test-1.json")        // UID: resourceref1
-		helper.CopyToProvisioningPath(t, tmpFile2, "resource-test-2.json")        // UID: resourceref2
-		helper.CopyToProvisioningPath(t, tmpFile3, "nested/resource-test-3.json") // UID: resourceref3
-
-		// Trigger sync to populate the new resources
-		helper.SyncAndWait(t, repo, nil)
-
-		// Verify the new resources are created
-		dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-		require.NoError(t, err)
-		require.GreaterOrEqual(t, len(dashboards.Items), 3, "should have at least 3 dashboards after adding test resources")
-
-		// Debug: print the actual dashboard names/UIDs to verify they match our expectations
-		for i, dashboard := range dashboards.Items {
-			t.Logf("Dashboard %d: name=%s, UID=%s", i+1, dashboard.GetName(), dashboard.GetUID())
-		}
-
-		t.Run("delete single dashboard by resource reference", func(t *testing.T) {
-			// Create delete job for single dashboard using ResourceRef
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Body(asJSON(&provisioning.JobSpec{
-					Action: provisioning.JobActionDelete,
-					Delete: &provisioning.DeleteJobOptions{
-						Resources: []provisioning.ResourceRef{
-							{
-								Name:  "resourceref1", // UID from modified all-panels.json
-								Kind:  "Dashboard",
-								Group: "dashboard.grafana.app",
-							},
-						},
-					},
-				})).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.NoError(t, result.Error(), "should be able to create delete job with ResourceRef")
-
-			// Wait for job to complete
-			helper.AwaitJobs(t, repo)
-
-			// Verify corresponding file is deleted from repository
-			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "resource-test-1.json")
-			require.Error(t, err, "file should be deleted from repository")
-			require.True(t, apierrors.IsNotFound(err), "should be not found error")
-
-			// Verify dashboard is removed from Grafana (check count like other successful tests)
-			dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-			require.NoError(t, err)
-			require.Equal(t, 2, len(dashboards.Items), "should have 2 dashboards after deleting 1 from 3")
-
-			// Verify other resources still exist
-			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "resource-test-2.json")
-			require.NoError(t, err, "other files should still exist")
-			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "nested", "resource-test-3.json")
-			require.NoError(t, err, "nested files should still exist")
-		})
-
-		t.Run("delete multiple resources by reference", func(t *testing.T) {
-			// Create delete job for multiple resources using ResourceRef
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Body(asJSON(&provisioning.JobSpec{
-					Action: provisioning.JobActionDelete,
-					Delete: &provisioning.DeleteJobOptions{
-						Resources: []provisioning.ResourceRef{
-							{
-								Name:  "resourceref2", // UID from modified text-options.json
-								Kind:  "Dashboard",
-								Group: "dashboard.grafana.app",
-							},
-							{
-								Name:  "resourceref3", // UID from modified timeline-demo.json
-								Kind:  "Dashboard",
-								Group: "dashboard.grafana.app",
-							},
-						},
-					},
-				})).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.NoError(t, result.Error(), "should be able to create delete job with multiple ResourceRefs")
-
-			// Wait for job to complete
-			helper.AwaitJobs(t, repo)
-
-			// Verify both dashboards are removed from Grafana
-			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref2", metav1.GetOptions{})
-			require.Error(t, err, "text-options dashboard should be deleted")
-			require.True(t, apierrors.IsNotFound(err))
-
-			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref3", metav1.GetOptions{})
-			require.Error(t, err, "timeline-demo dashboard should be deleted")
-			require.True(t, apierrors.IsNotFound(err))
-
-			// Verify corresponding files are deleted from repository
-			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "resource-test-2.json")
-			require.Error(t, err, "resource-test-2.json should be deleted")
-
-			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "nested", "resource-test-3.json")
-			require.Error(t, err, "nested/resource-test-3.json should be deleted")
-
-			// Verify specific dashboards are removed from Grafana
-			dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-			require.NoError(t, err)
-			require.Equal(t, 0, len(dashboards.Items), "should have 0 dashboards after deleting 2 more (2 -> 0)")
-		})
-
-		t.Run("mixed deletion - paths and resources", func(t *testing.T) {
-			// Setup fresh resources for mixed test - reuse the modified content with unique UIDs
-			tmpMixed1 := filepath.Join(tmpDir, "mixed-test-1.json")
-			tmpMixed2 := filepath.Join(tmpDir, "mixed-test-2.json")
-			tmpMixed3 := filepath.Join(tmpDir, "mixed-test-3.json")
-
-			require.NoError(t, os.WriteFile(tmpMixed1, []byte(allPanelsModified), 0644))
-			require.NoError(t, os.WriteFile(tmpMixed2, []byte(textOptionsModified), 0644))
-			require.NoError(t, os.WriteFile(tmpMixed3, []byte(timelineDemoModified), 0644))
-
-			helper.CopyToProvisioningPath(t, tmpMixed1, "mixed-test-1.json") // UID: resourceref1
-			helper.CopyToProvisioningPath(t, tmpMixed2, "mixed-test-2.json") // UID: resourceref2
-			helper.CopyToProvisioningPath(t, tmpMixed3, "mixed-test-3.json") // UID: resourceref3
-
-			helper.SyncAndWait(t, repo, nil)
-
-			// Create delete job that combines both paths and resource references
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Body(asJSON(&provisioning.JobSpec{
-					Action: provisioning.JobActionDelete,
-					Delete: &provisioning.DeleteJobOptions{
-						Paths: []string{"mixed-test-1.json"}, // Delete by path
-						Resources: []provisioning.ResourceRef{
-							{
-								Name:  "resourceref2", // Delete by resource reference
-								Kind:  "Dashboard",
-								Group: "dashboard.grafana.app",
-							},
-						},
-					},
-				})).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.NoError(t, result.Error(), "should be able to create mixed delete job")
-
-			// Wait for job to complete
-			helper.AwaitJobs(t, repo)
-
-			// Verify both targeted resources are deleted from Grafana
-			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref1", metav1.GetOptions{})
-			require.Error(t, err, "dashboard deleted by path should be removed")
-
-			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref2", metav1.GetOptions{})
-			require.Error(t, err, "dashboard deleted by resource ref should be removed")
-
-			// Verify the untargeted resource still exists
-			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref3", metav1.GetOptions{})
-			require.NoError(t, err, "untargeted dashboard should still exist")
-
-			// Verify files are properly deleted/preserved in repository
-			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "mixed-test-1.json")
-			require.Error(t, err, "file deleted by path should be removed")
-
-			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "mixed-test-2.json")
-			require.Error(t, err, "file for resource deleted by ref should be removed")
-
-			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "mixed-test-3.json")
-			require.NoError(t, err, "untargeted file should still exist")
-		})
-
-		t.Run("delete folder by resource reference", func(t *testing.T) {
-			// Create a dashboard inside a folder to automatically create the folder structure
-			// This follows the same pattern as other tests in this file
-			testDashboard := strings.Replace(string(allPanelsContent), `"uid": "n1jR8vnnz"`, `"uid": "folder-dash"`, 1)
-
-			// Write the modified dashboard to a temporary file first
-			tmpFolderDash := filepath.Join(tmpDir, "folder-dashboard.json")
-			require.NoError(t, os.WriteFile(tmpFolderDash, []byte(testDashboard), 0644))
-
-			// Copy it to the folder structure using the helper
-			helper.CopyToProvisioningPath(t, tmpFolderDash, "test-folder/dashboard-in-folder.json")
-
-			// Sync to create the folder and its contents
-			helper.SyncAndWait(t, repo, nil)
-
-			// Verify folder was created in Grafana as a Folder resource
-			folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
-			require.NoError(t, err)
-
-			var testFolder *unstructured.Unstructured
-			for _, folder := range folders.Items {
-				// Folder names are generated with suffixes, so check if it starts with "test-folder"
-				if strings.HasPrefix(folder.GetName(), "test-folder") {
-					testFolder = &folder
-					break
-				}
-			}
-			require.NotNil(t, testFolder, "test-folder should exist as a Folder resource")
-			testFolderName := testFolder.GetName()
-
-			// Verify dashboard inside the folder exists
-			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "test-folder", "dashboard-in-folder.json")
-			require.NoError(t, err, "dashboard inside folder should exist")
-
-			// Create delete job for the folder using ResourceRef (use the actual generated name)
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Body(asJSON(&provisioning.JobSpec{
-					Action: provisioning.JobActionDelete,
-					Delete: &provisioning.DeleteJobOptions{
-						Resources: []provisioning.ResourceRef{
-							{
-								Name:  testFolderName, // Use the actual generated folder name
-								Kind:  "Folder",
-								Group: "folder.grafana.app",
-							},
-						},
-					},
-				})).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.NoError(t, result.Error(), "should be able to create delete job for folder")
-
-			// Wait for job to complete
-			helper.AwaitJobs(t, repo)
-
-			// Verify folder is deleted from Grafana
-			_, err = helper.Folders.Resource.Get(ctx, testFolderName, metav1.GetOptions{})
-			require.Error(t, err, "folder should be deleted from Grafana")
-			require.True(t, apierrors.IsNotFound(err), "should be not found error")
-
-			// Verify folder contents are also deleted from repository
-			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "test-folder", "dashboard-in-folder.json")
-			require.Error(t, err, "dashboard inside deleted folder should also be deleted")
-			require.True(t, apierrors.IsNotFound(err), "should be not found error")
-		})
-
-		t.Run("delete non-existent resource by reference", func(t *testing.T) {
-			// Create delete job for non-existent resource
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Body(asJSON(&provisioning.JobSpec{
-					Action: provisioning.JobActionDelete,
-					Delete: &provisioning.DeleteJobOptions{
-						Resources: []provisioning.ResourceRef{
-							{
-								Name:  "non-existent-uid",
-								Kind:  "Dashboard",
-								Group: "dashboard.grafana.app",
-							},
-						},
-					},
-				})).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.NoError(t, result.Error(), "should be able to create delete job")
-
-			// Wait for job to complete - should record error but continue
-			require.EventuallyWithT(t, func(collect *assert.CollectT) {
-				list := &unstructured.UnstructuredList{}
-				err := helper.AdminREST.Get().
-					Namespace("default").
-					Resource("repositories").
-					Name(repo).
-					SubResource("jobs").
-					Do(ctx).Into(list)
-				assert.NoError(collect, err, "should be able to list jobs")
-				assert.NotEmpty(collect, list.Items, "expect at least one job")
-
-				// Find the most recent delete job
-				var deleteJob *unstructured.Unstructured
-				for _, elem := range list.Items {
-					assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
-
-					action := mustNestedString(elem.Object, "spec", "action")
-					if action == "delete" {
-						// Get the most recent one (they should be ordered by creation time)
-						deleteJob = &elem
-					}
-				}
-				if !assert.NotNil(collect, deleteJob, "should find a delete job") {
-					return
-				}
-
-				state := mustNestedString(deleteJob.Object, "status", "state")
-				// The job should complete but record errors for individual resource resolution failures
-				if state == "error" || state == "completed" || state == "success" {
-					// Any of these states is acceptable - the key is that resource resolution errors are recorded
-					// and don't fail the entire job due to error-tolerant implementation
-					return
-				}
-				assert.Fail(collect, "job should complete or error, but got state: %s", state)
-			}, time.Second*10, time.Millisecond*100, "Expected delete job to handle non-existent resource")
-		})
-
-		// Repository cleanup is handled by the main test function
-	})
-
-	t.Run("delete non-existent file", func(t *testing.T) {
-		// Create delete job for non-existent file
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionDelete,
-				Delete: &provisioning.DeleteJobOptions{
-					Paths: []string{"non-existent.json"},
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create delete job")
-
-		// Wait for job to complete - should fail due to strict error handling
-		require.EventuallyWithT(t, func(collect *assert.CollectT) {
-			list := &unstructured.UnstructuredList{}
-			err := helper.AdminREST.Get().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Do(ctx).Into(list)
-			assert.NoError(collect, err, "should be able to list jobs")
-			assert.NotEmpty(collect, list.Items, "expect at least one job")
-
-			// Find the delete job specifically
-			var deleteJob *unstructured.Unstructured
-			for _, elem := range list.Items {
-				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
-
-				action := mustNestedString(elem.Object, "spec", "action")
-				if action == "delete" {
-					deleteJob = &elem
-					break
-				}
-			}
-			assert.NotNil(collect, deleteJob, "should find a delete job")
-
-			state := mustNestedString(deleteJob.Object, "status", "state")
-			assert.Equal(collect, "error", state, "delete job should have failed due to non-existent file")
-		}, time.Second*10, time.Millisecond*100, "Expected delete job to fail with error state")
-	})
-}
-
-func TestIntegrationProvisioning_MoveJob(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	helper := runGrafana(t)
-	ctx := context.Background()
-	const repo = "move-test-repo"
-	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo,
-		"SyncEnabled": true,
-		"SyncTarget":  "instance",
-	})
-	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
-	require.NoError(t, err)
-	// Copy multiple test files to the repository
-	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", "dashboard1.json")
-	helper.CopyToProvisioningPath(t, "testdata/text-options.json", "dashboard2.json")
-	helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", "folder/dashboard3.json")
-	// Trigger and wait for initial sync to populate resources
-	helper.SyncAndWait(t, repo, nil)
-	// Verify initial state - should have 3 dashboards and 1 folder
-	dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
-	require.Equal(t, 3, len(dashboards.Items), "should have 3 dashboards after sync")
-	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
-	require.Equal(t, 1, len(folders.Items), "should have 1 folder after sync")
-
-	t.Run("move single file", func(t *testing.T) {
-		// Create move job for single file
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionMove,
-				Move: &provisioning.MoveJobOptions{
-					Paths:      []string{"dashboard1.json"},
-					TargetPath: "moved/",
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create move job")
-
-		raw, err := result.Raw()
-		require.NoError(t, err)
-
-		obj := &unstructured.Unstructured{}
-		err = json.Unmarshal(raw, obj)
-		require.NoError(t, err)
-
-		// Wait for job to complete
-		helper.AwaitJobSuccess(t, ctx, obj)
-
-		// TODO: This additional sync should not be necessary - the move job should handle sync properly
-		helper.SyncAndWait(t, repo, nil)
-
-		// Verify file is moved in repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved", "dashboard1.json")
-		require.NoError(t, err, "file should exist at new location in repository")
-
-		// Verify original file is gone from repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard1.json")
-		require.Error(t, err, "original file should be gone from repository")
-		require.True(t, apierrors.IsNotFound(err), "should be not found error")
-
-		// Verify other files still exist at original locations
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard2.json")
-		require.NoError(t, err, "other files should still exist")
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "dashboard3.json")
-		require.NoError(t, err, "nested files should still exist")
-
-		// Verify dashboard still exists in Grafana after sync
-		// Use eventually to let unified storage reflect the changes in dashboards.
-		require.EventuallyWithT(t, func(collect *assert.CollectT) {
-			dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-			assert.NoError(collect, err)
-			assert.Len(collect, dashboards.Items, 3, "should still have 3 dashboards after move")
-			// Verify that dashboards have the correct source paths
-			foundPaths := make(map[string]bool)
-			for _, dashboard := range dashboards.Items {
-				sourcePath := dashboard.GetAnnotations()["grafana.app/sourcePath"]
-				foundPaths[sourcePath] = true
-			}
-
-			assert.True(t, foundPaths["moved/dashboard1.json"], "should have dashboard with moved source path")
-			assert.True(t, foundPaths["dashboard2.json"], "should have dashboard2 in original location")
-			assert.True(t, foundPaths["folder/dashboard3.json"], "should have dashboard3 in original nested location")
-		}, time.Second*10, time.Millisecond*100, "Expected to eventually have 3 dashboards after move")
-	})
-
-	t.Run("move multiple files and folder", func(t *testing.T) {
-		// Create move job for multiple files including a folder
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionMove,
-				Move: &provisioning.MoveJobOptions{
-					Paths:      []string{"dashboard2.json", "folder/"},
-					TargetPath: "archived/",
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create move job")
-
-		raw, err := result.Raw()
-		require.NoError(t, err)
-		obj := &unstructured.Unstructured{}
-		err = json.Unmarshal(raw, obj)
-		require.NoError(t, err)
-
-		// Wait for job to complete
-		helper.AwaitJobSuccess(t, ctx, obj)
-
-		// TODO: This additional sync should not be necessary - the move job should handle sync properly
-		helper.SyncAndWait(t, repo, nil)
-
-		// Verify files are moved in repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "archived", "dashboard2.json")
-		require.NoError(t, err, "dashboard2.json should exist at new location")
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "archived", "folder", "dashboard3.json")
-		require.NoError(t, err, "folder/dashboard3.json should exist at new nested location")
-
-		// Verify original files are gone from repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard2.json")
-		require.Error(t, err, "dashboard2.json should be gone from original location")
-		require.True(t, apierrors.IsNotFound(err))
-
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "dashboard3.json")
-		require.Error(t, err, "folder should be gone from original location")
-		require.True(t, apierrors.IsNotFound(err), err.Error())
-
-		// Verify dashboards still exist in Grafana after sync
-		// Note: Since dashboard1.json was moved in the previous test, we now expect all 3 dashboards
-		// to be accessible from their moved locations (dashboard1 from moved/, dashboard2 and dashboard3 from archived/)
-		dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-		require.NoError(t, err)
-		require.Len(t, dashboards.Items, 3, "should still have 3 dashboards after move")
-
-		// Verify that dashboards have the correct source paths after cumulative moves
-		foundPaths := make(map[string]bool)
-		for _, dashboard := range dashboards.Items {
-			sourcePath := dashboard.GetAnnotations()["grafana.app/sourcePath"]
-			foundPaths[sourcePath] = true
-		}
-
-		require.True(t, foundPaths["moved/dashboard1.json"], "should have dashboard1 from first move")
-		require.True(t, foundPaths["archived/dashboard2.json"], "should have dashboard2 in archived location")
-		require.True(t, foundPaths["archived/folder/dashboard3.json"], "should have dashboard3 in archived nested location")
-	})
-
-	t.Run("move non-existent file", func(t *testing.T) {
-		// Create move job for non-existent file
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionMove,
-				Move: &provisioning.MoveJobOptions{
-					Paths:      []string{"non-existent.json"},
-					TargetPath: "moved/",
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create move job")
-
-		// Wait for job to complete - should fail due to strict error handling
-		require.EventuallyWithT(t, func(collect *assert.CollectT) {
-			list := &unstructured.UnstructuredList{}
-			err := helper.AdminREST.Get().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Do(ctx).Into(list)
-			assert.NoError(collect, err, "should be able to list jobs")
-			assert.NotEmpty(collect, list.Items, "expect at least one job")
-
-			// Find the move job specifically
-			var moveJob *unstructured.Unstructured
-			for _, elem := range list.Items {
-				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
-
-				action := mustNestedString(elem.Object, "spec", "action")
-				if action == "move" {
-					// Check if this is the specific job we're looking for
-					paths, found, err := unstructured.NestedStringSlice(elem.Object, "spec", "move", "paths")
-					if err == nil && found && len(paths) > 0 && paths[0] == "non-existent.json" {
-						moveJob = &elem
-						break
-					}
-				}
-			}
-			assert.NotNil(collect, moveJob, "should find a move job for non-existent file")
-
-			state := mustNestedString(moveJob.Object, "status", "state")
-			assert.Equal(collect, "error", state, "move job should have failed due to non-existent file")
-		}, time.Second*10, time.Millisecond*100, "Expected move job to fail with error state")
-	})
-
-	t.Run("move without target path", func(t *testing.T) {
-		// Create move job without target path (should fail)
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionMove,
-				Move: &provisioning.MoveJobOptions{
-					Paths: []string{"moved/dashboard1.json"},
-					// TargetPath intentionally omitted
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create move job")
-
-		// Wait for job to complete - should fail due to missing target path
-		require.EventuallyWithT(t, func(collect *assert.CollectT) {
-			list := &unstructured.UnstructuredList{}
-			err := helper.AdminREST.Get().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Do(ctx).Into(list)
-			assert.NoError(collect, err, "should be able to list jobs")
-			assert.NotEmpty(collect, list.Items, "expect at least one job")
-
-			// Find the move job specifically
-			var moveJob *unstructured.Unstructured
-			for _, elem := range list.Items {
-				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
-
-				action := mustNestedString(elem.Object, "spec", "action")
-				if action == "move" {
-					// Check if this is the job without target path
-					targetPath, found, _ := unstructured.NestedString(elem.Object, "spec", "move", "targetPath")
-					if !found || targetPath == "" {
-						moveJob = &elem
-						break
-					}
-				}
-			}
-			assert.NotNil(collect, moveJob, "should find a move job without target path")
-
-			state := mustNestedString(moveJob.Object, "status", "state")
-			assert.Equal(collect, "error", state, "move job should have failed due to missing target path")
-		}, time.Second*10, time.Millisecond*100, "Expected move job to fail with error state")
-	})
-
-	t.Run("move by resource reference", func(t *testing.T) {
-		// Create a unique repository for resource reference testing to avoid contamination
-		const refRepo = "move-ref-test-repo"
-		localRefTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-			"Name":        refRepo,
-			"SyncEnabled": true,
-			"SyncTarget":  "folder",
-		})
-		_, err := helper.Repositories.Resource.Create(ctx, localRefTmp, metav1.CreateOptions{})
-		require.NoError(t, err)
-
-		// Create modified test files with unique UIDs for ResourceRef testing
-		allPanelsContent := helper.LoadFile("testdata/all-panels.json")
-		textOptionsContent := helper.LoadFile("testdata/text-options.json")
-		timelineDemoContent := helper.LoadFile("testdata/timeline-demo.json")
-
-		// Modify UIDs to be unique for ResourceRef tests
-		allPanelsModified := strings.Replace(string(allPanelsContent), `"uid": "n1jR8vnnz"`, `"uid": "moveref1"`, 1)
-		textOptionsModified := strings.Replace(string(textOptionsContent), `"uid": "WZ7AhQiVz"`, `"uid": "moveref2"`, 1)
-		timelineDemoModified := strings.Replace(string(timelineDemoContent), `"uid": "mIJjFy8Kz"`, `"uid": "moveref3"`, 1)
-
-		// Create temporary files and copy them to the provisioning path
-		tmpDir := t.TempDir()
-		tmpFile1 := filepath.Join(tmpDir, "move-ref-test-1.json")
-		tmpFile2 := filepath.Join(tmpDir, "move-ref-test-2.json")
-		tmpFile3 := filepath.Join(tmpDir, "move-ref-test-3.json")
-
-		require.NoError(t, os.WriteFile(tmpFile1, []byte(allPanelsModified), 0644))
-		require.NoError(t, os.WriteFile(tmpFile2, []byte(textOptionsModified), 0644))
-		require.NoError(t, os.WriteFile(tmpFile3, []byte(timelineDemoModified), 0644))
-
-		// Copy files to provisioning path to set up test - use refRepo's path
-		helper.CopyToProvisioningPath(t, tmpFile1, "move-source-1.json")
-		helper.CopyToProvisioningPath(t, tmpFile2, "move-source-2.json")
-		helper.CopyToProvisioningPath(t, tmpFile3, "move-source-3.json")
-
-		// Sync to populate resources in Grafana
-		helper.SyncAndWait(t, refRepo, nil)
-
-		t.Run("move single dashboard by resource reference", func(t *testing.T) {
-			// Create move job for single dashboard using ResourceRef
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(refRepo).
-				SubResource("jobs").
-				Body(asJSON(&provisioning.JobSpec{
-					Action: provisioning.JobActionMove,
-					Move: &provisioning.MoveJobOptions{
-						TargetPath: "moved-by-ref/",
-						Resources: []provisioning.ResourceRef{
-							{
-								Name:  "moveref1", // UID from modified all-panels.json
-								Kind:  "Dashboard",
-								Group: "dashboard.grafana.app",
-							},
-						},
-					},
-				})).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.NoError(t, result.Error(), "should be able to create move job with ResourceRef")
-
-			// Wait for job to complete
-			helper.AwaitJobs(t, refRepo)
-
-			// Verify corresponding file is moved in repository
-			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "moved-by-ref", "move-source-1.json")
-			require.NoError(t, err, "file should be moved to new location in repository")
-
-			// Verify original file is deleted from repository
-			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "move-source-1.json")
-			require.Error(t, err, "original file should be deleted from repository")
-			require.True(t, apierrors.IsNotFound(err), "should be not found error")
-
-			// Verify dashboard still exists in Grafana (should be updated after sync)
-			helper.SyncAndWait(t, refRepo, nil)
-			_, err = helper.DashboardsV1.Resource.Get(ctx, "moveref1", metav1.GetOptions{})
-			require.NoError(t, err, "dashboard should still exist in Grafana after move")
-
-			// Verify other resource still exists in original location
-			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "move-source-2.json")
-			require.NoError(t, err, "other files should still exist in original location")
-		})
-
-		t.Run("move multiple resources by reference", func(t *testing.T) {
-			// Create move job for remaining resource using ResourceRef
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(refRepo).
-				SubResource("jobs").
-				Body(asJSON(&provisioning.JobSpec{
-					Action: provisioning.JobActionMove,
-					Move: &provisioning.MoveJobOptions{
-						TargetPath: "archived-by-ref/",
-						Resources: []provisioning.ResourceRef{
-							{
-								Name:  "moveref2", // UID from modified text-options.json
-								Kind:  "Dashboard",
-								Group: "dashboard.grafana.app",
-							},
-						},
-					},
-				})).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.NoError(t, result.Error(), "should be able to create move job with ResourceRef")
-
-			// Wait for job to complete
-			helper.AwaitJobs(t, refRepo)
-
-			// Verify file is moved in repository
-			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "archived-by-ref", "move-source-2.json")
-			require.NoError(t, err, "file should be moved to new location")
-
-			// Verify original file is deleted from repository
-			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "move-source-2.json")
-			require.Error(t, err, "original file should be deleted from repository")
-			require.True(t, apierrors.IsNotFound(err), "should be not found error")
-
-			// Verify dashboard still exists in Grafana after sync
-			helper.SyncAndWait(t, refRepo, nil)
-			_, err = helper.DashboardsV1.Resource.Get(ctx, "moveref2", metav1.GetOptions{})
-			require.NoError(t, err, "dashboard should still exist in Grafana after move")
-		})
-
-		t.Run("mixed move - paths and resources", func(t *testing.T) {
-			// Setup fresh resources for mixed test
-			tmpMixed1 := filepath.Join(tmpDir, "mixed-move-1.json")
-			tmpMixed2 := filepath.Join(tmpDir, "mixed-move-2.json")
-
-			allPanelsMixed := strings.Replace(string(allPanelsContent), `"uid": "n1jR8vnnz"`, `"uid": "mixedmove1"`, 1)
-			textOptionsMixed := strings.Replace(string(textOptionsContent), `"uid": "WZ7AhQiVz"`, `"uid": "mixedmove2"`, 1)
-
-			require.NoError(t, os.WriteFile(tmpMixed1, []byte(allPanelsMixed), 0644))
-			require.NoError(t, os.WriteFile(tmpMixed2, []byte(textOptionsMixed), 0644))
-
-			helper.CopyToProvisioningPath(t, tmpMixed1, "mixed-move-1.json") // UID: mixedmove1
-			helper.CopyToProvisioningPath(t, tmpMixed2, "mixed-move-2.json") // UID: mixedmove2
-
-			helper.SyncAndWait(t, refRepo, nil)
-
-			// Create move job that combines both paths and resource references
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(refRepo).
-				SubResource("jobs").
-				Body(asJSON(&provisioning.JobSpec{
-					Action: provisioning.JobActionMove,
-					Move: &provisioning.MoveJobOptions{
-						TargetPath: "mixed-target/",
-						Paths:      []string{"mixed-move-1.json"}, // Move by path
-						Resources: []provisioning.ResourceRef{
-							{
-								Name:  "mixedmove2", // Move by resource reference
-								Kind:  "Dashboard",
-								Group: "dashboard.grafana.app",
-							},
-						},
-					},
-				})).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.NoError(t, result.Error(), "should be able to create mixed move job")
-
-			// Wait for job to complete
-			helper.AwaitJobs(t, refRepo)
-
-			// Verify both targeted resources are moved in repository
-			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "mixed-target", "mixed-move-1.json")
-			require.NoError(t, err, "file moved by path should exist at new location")
-
-			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "mixed-target", "mixed-move-2.json")
-			require.NoError(t, err, "file moved by resource ref should exist at new location")
-
-			// Verify files are deleted from original locations
-			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "mixed-move-1.json")
-			require.Error(t, err, "file moved by path should be deleted from original location")
-
-			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "mixed-move-2.json")
-			require.Error(t, err, "file moved by resource ref should be deleted from original location")
-
-			// Verify dashboards still exist in Grafana after sync
-			helper.SyncAndWait(t, refRepo, nil)
-			_, err = helper.DashboardsV1.Resource.Get(ctx, "mixedmove1", metav1.GetOptions{})
-			require.NoError(t, err, "dashboard moved by path should still exist in Grafana")
-
-			_, err = helper.DashboardsV1.Resource.Get(ctx, "mixedmove2", metav1.GetOptions{})
-			require.NoError(t, err, "dashboard moved by resource ref should still exist in Grafana")
-		})
-	})
-}
-
-func TestIntegrationProvisioning_MoveResources(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	helper := runGrafana(t)
-	ctx := context.Background()
-	const repo = "move-test-repo"
-	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo,
-		"SyncEnabled": true,
-		"SyncTarget":  "instance",
-	})
-	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
-	require.NoError(t, err)
-
-	// Copy test dashboards to the repository path for initial setup
-	const originalDashboard = "all-panels.json"
-	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", originalDashboard)
-
-	// Wait for sync to ensure the dashboard is created in Grafana
-	helper.SyncAndWait(t, repo, nil)
-
-	// Verify the original dashboard exists in Grafana (using the UID from all-panels.json)
-	const allPanelsUID = "n1jR8vnnz" // This is the UID from the all-panels.json file
-	obj, err := helper.DashboardsV1.Resource.Get(ctx, allPanelsUID, metav1.GetOptions{})
-	require.NoError(t, err, "original dashboard should exist in Grafana")
-	require.Equal(t, repo, obj.GetAnnotations()[utils.AnnoKeyManagerIdentity])
-
-	t.Run("move file without content change", func(t *testing.T) {
-		const targetPath = "moved/simple-move.json"
-
-		// Perform the move operation using helper function
-		resp := helper.postFilesRequest(t, repo, filesPostOptions{
-			targetPath:   targetPath,
-			originalPath: originalDashboard,
-			message:      "move file without content change",
-		})
-		// nolint:errcheck
-		defer resp.Body.Close()
-		require.Equal(t, http.StatusOK, resp.StatusCode, "move operation should succeed")
-
-		// Verify the file moved in the repository
-		movedObj, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved", "simple-move.json")
-		require.NoError(t, err, "moved file should exist in repository")
-
-		// Check the content is preserved (verify it's still the all-panels dashboard)
-		resource, _, err := unstructured.NestedMap(movedObj.Object, "resource")
-		require.NoError(t, err)
-		dryRun, _, err := unstructured.NestedMap(resource, "dryRun")
-		require.NoError(t, err)
-		title, _, err := unstructured.NestedString(dryRun, "spec", "title")
-		require.NoError(t, err)
-		require.Equal(t, "Panel tests - All panels", title, "content should be preserved")
-
-		// Verify original file no longer exists
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", originalDashboard)
-		require.Error(t, err, "original file should no longer exist")
-
-		// Verify dashboard still exists in Grafana with same content but may have updated path references
-		helper.SyncAndWait(t, repo, nil)
-		_, err = helper.DashboardsV1.Resource.Get(ctx, allPanelsUID, metav1.GetOptions{})
-		require.NoError(t, err, "dashboard should still exist in Grafana after move")
-	})
-
-	t.Run("move file to nested path without ref", func(t *testing.T) {
-		// Test a different scenario: Move a file that was never synced to Grafana
-		// This might reveal the issue if dashboard creation fails during move
-		const sourceFile = "never-synced.json"
-		helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", sourceFile)
-
-		// DO NOT sync - move the file immediately without it ever being in Grafana
-		const targetPath = "deep/nested/timeline.json"
-
-		// Perform the move operation without the file ever being synced to Grafana
-		resp := helper.postFilesRequest(t, repo, filesPostOptions{
-			targetPath:   targetPath,
-			originalPath: sourceFile,
-			message:      "move never-synced file to nested path",
-		})
-		// nolint:errcheck
-		defer resp.Body.Close()
-		require.Equal(t, http.StatusOK, resp.StatusCode, "move operation should succeed")
-
-		// Check folders were created and validate hierarchy
-		folderList, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
-		require.NoError(t, err, "should be able to list folders")
-
-		// Build a map of folder names to their objects for easier lookup
-		folders := make(map[string]*unstructured.Unstructured)
-		for _, folder := range folderList.Items {
-			title, _, _ := unstructured.NestedString(folder.Object, "spec", "title")
-			folders[title] = &folder
-			parent, _, _ := unstructured.NestedString(folder.Object, "metadata", "annotations", "grafana.app/folder")
-			t.Logf("  - %s: %s (parent: %s)", folder.GetName(), title, parent)
-		}
-
-		// Validate expected folders exist with proper hierarchy
-		// Expected structure: deep -> deep/nested
-		deepFolderTitle := "deep"
-		nestedFolderTitle := "nested"
-
-		// Validate "deep" folder exists and has no parent (is top-level)
-		require.Contains(t, folders, deepFolderTitle, "deep folder should exist")
-		f := folders[deepFolderTitle]
-		deepFolderName := f.GetName()
-		title, _, _ := unstructured.NestedString(f.Object, "spec", "title")
-		require.Equal(t, deepFolderTitle, title, "deep folder should have correct title")
-		parent, found, _ := unstructured.NestedString(f.Object, "metadata", "annotations", "grafana.app/folder")
-		require.True(t, !found || parent == "", "deep folder should be top-level (no parent)")
-
-		// Validate "deep/nested" folder exists and has "deep" as parent
-		require.Contains(t, folders, nestedFolderTitle, "nested folder should exist")
-		f = folders[nestedFolderTitle]
-		nestedFolderName := f.GetName()
-		title, _, _ = unstructured.NestedString(f.Object, "spec", "title")
-		require.Equal(t, nestedFolderTitle, title, "nested folder should have correct title")
-		parent, _, _ = unstructured.NestedString(f.Object, "metadata", "annotations", "grafana.app/folder")
-		require.Equal(t, deepFolderName, parent, "nested folder should have deep folder as parent")
-
-		// The key test: Check if dashboard was created in Grafana during move
-		const timelineUID = "mIJjFy8Kz"
-		dashboard, err := helper.DashboardsV1.Resource.Get(ctx, timelineUID, metav1.GetOptions{})
-		require.NoError(t, err, "dashboard should exist in Grafana after moving never-synced file")
-		dashboardFolder, _, _ := unstructured.NestedString(dashboard.Object, "metadata", "annotations", "grafana.app/folder")
-
-		// Validate dashboard is in the correct nested folder
-		require.Equal(t, nestedFolderName, dashboardFolder, "dashboard should be in the nested folder")
-
-		// Verify the file moved in the repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "deep", "nested", "timeline.json")
-		require.NoError(t, err, "moved file should exist in nested repository path")
-
-		// Verify the original file no longer exists in the repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", sourceFile)
-		require.Error(t, err, "original file should no longer exist in repository")
-	})
-
-	t.Run("move file with content update", func(t *testing.T) {
-		const sourcePath = "moved/simple-move.json" // Use the file from previous test
-		const targetPath = "updated/content-updated.json"
-
-		// Use text-options.json content for the update
-		updatedContent := helper.LoadFile("testdata/text-options.json")
-
-		// Perform move with content update using helper function
-		resp := helper.postFilesRequest(t, repo, filesPostOptions{
-			targetPath:   targetPath,
-			originalPath: sourcePath,
-			message:      "move file with content update",
-			body:         string(updatedContent),
-		})
-		// nolint:errcheck
-		defer resp.Body.Close()
-		require.Equal(t, http.StatusOK, resp.StatusCode, "move with content update should succeed")
-
-		// Verify the moved file has updated content (should now be text-options dashboard)
-		movedObj, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "updated", "content-updated.json")
-		require.NoError(t, err, "moved file should exist in repository")
-
-		resource, _, err := unstructured.NestedMap(movedObj.Object, "resource")
-		require.NoError(t, err)
-		dryRun, _, err := unstructured.NestedMap(resource, "dryRun")
-		require.NoError(t, err)
-		title, _, err := unstructured.NestedString(dryRun, "spec", "title")
-		require.NoError(t, err)
-		require.Equal(t, "Text options", title, "content should be updated to text-options dashboard")
-
-		// Check it has the expected UID from text-options.json
-		name, _, err := unstructured.NestedString(dryRun, "metadata", "name")
-		require.NoError(t, err)
-		require.Equal(t, "WZ7AhQiVz", name, "should have the UID from text-options.json")
-
-		// Verify source file no longer exists
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved", "simple-move.json")
-		require.Error(t, err, "source file should no longer exist")
-
-		// Sync and verify the updated dashboard exists in Grafana
-		helper.SyncAndWait(t, repo, nil)
-		const textOptionsUID = "WZ7AhQiVz" // UID from text-options.json
-		updatedDashboard, err := helper.DashboardsV1.Resource.Get(ctx, textOptionsUID, metav1.GetOptions{})
-		require.NoError(t, err, "updated dashboard should exist in Grafana")
-
-		// Verify the original dashboard was deleted from Grafana
-		_, err = helper.DashboardsV1.Resource.Get(ctx, allPanelsUID, metav1.GetOptions{})
-		require.Error(t, err, "original dashboard should be deleted from Grafana")
-		require.True(t, apierrors.IsNotFound(err))
-
-		// Verify the new dashboard has the updated content
-		updatedTitle, _, err := unstructured.NestedString(updatedDashboard.Object, "spec", "title")
-		require.NoError(t, err)
-		require.Equal(t, "Text options", updatedTitle)
-	})
-
-	t.Run("move directory", func(t *testing.T) {
-		// Create some files in a directory first using existing testdata files
-		helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", "source-dir/timeline-demo.json")
-		helper.CopyToProvisioningPath(t, "testdata/text-options.json", "source-dir/text-options.json")
-
-		// Sync to ensure files are recognized
-		helper.SyncAndWait(t, repo, nil)
-
-		const sourceDir = "source-dir/"
-		const targetDir = "moved-dir/"
-
-		// Move directory using helper function
-		resp := helper.postFilesRequest(t, repo, filesPostOptions{
-			targetPath:   targetDir,
-			originalPath: sourceDir,
-			message:      "move directory",
-		})
-		// nolint:errcheck
-		defer resp.Body.Close()
-		require.Equal(t, http.StatusOK, resp.StatusCode, "directory move should succeed")
-
-		// Verify source directory no longer exists
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "source-dir")
-		require.Error(t, err, "source directory should no longer exist")
-
-		// Verify target directory and files exist
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved-dir", "timeline-demo.json")
-		require.NoError(t, err, "moved timeline-demo.json should exist")
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved-dir", "text-options.json")
-		require.NoError(t, err, "moved text-options.json should exist")
-	})
-
-	t.Run("error cases", func(t *testing.T) {
-		t.Run("missing originalPath parameter", func(t *testing.T) {
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("files", "target.json").
-				Body([]byte(`{"test": "content"}`)).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.Error(t, result.Error(), "should fail without originalPath")
-		})
-
-		t.Run("file to directory type mismatch", func(t *testing.T) {
-			// First create a simple test file without slashes in the path
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("files", "simple-test.json").
-				Body(helper.LoadFile("testdata/all-panels.json")).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.NoError(t, result.Error(), "should create test file")
-
-			// Now try to move this file to a directory path using helper function
-			resp := helper.postFilesRequest(t, repo, filesPostOptions{
-				targetPath:   "target-dir/",
-				originalPath: "simple-test.json",
-				message:      "test move",
-			})
-			// nolint:errcheck
-			defer resp.Body.Close()
-			// Read response body to check error message
-			body, err := io.ReadAll(resp.Body)
-			require.NoError(t, err)
-
-			require.NotEqual(t, http.StatusOK, resp.StatusCode, "should fail when moving file to directory")
-			require.Contains(t, string(body), "cannot move between file and directory types")
-		})
-
-		t.Run("non-existent source file", func(t *testing.T) {
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("files", "target.json").
-				Param("originalPath", "non-existent.json").
-				Body([]byte("")).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.Error(t, result.Error(), "should fail when source file doesn't exist")
-		})
-	})
-
-	t.Run("move non-existent resource by reference", func(t *testing.T) {
-		// Create move job for non-existent resource
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionMove,
-				Move: &provisioning.MoveJobOptions{
-					TargetPath: "moved-nonexistent/",
-					Resources: []provisioning.ResourceRef{
-						{
-							Name:  "non-existent-move-uid",
-							Kind:  "Dashboard",
-							Group: "dashboard.grafana.app",
-						},
-					},
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create move job")
-
-		// Wait for job to complete - should record error but continue
-		require.EventuallyWithT(t, func(collect *assert.CollectT) {
-			list := &unstructured.UnstructuredList{}
-			err := helper.AdminREST.Get().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Do(ctx).Into(list)
-			assert.NoError(collect, err, "should be able to list jobs")
-			assert.NotEmpty(collect, list.Items, "expect at least one job")
-
-			// Find the most recent move job
-			var moveJob *unstructured.Unstructured
-			for _, elem := range list.Items {
-				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
-
-				action := mustNestedString(elem.Object, "spec", "action")
-				if action == "move" {
-					// Get the most recent one (they should be ordered by creation time)
-					moveJob = &elem
-				}
-			}
-			if !assert.NotNil(collect, moveJob, "should find a move job") {
-				return
-			}
-
-			state := mustNestedString(moveJob.Object, "status", "state")
-			// The job should complete but record errors for individual resource resolution failures
-			if state == "error" || state == "completed" || state == "success" {
-				// Any of these states is acceptable - the key is that resource resolution errors are recorded
-				// and don't fail the entire job due to error-tolerant implementation
-				return
-			}
-			assert.Fail(collect, "job should complete or error, but got state: %s", state)
-		}, time.Second*10, time.Millisecond*100, "Expected move job to handle non-existent resource")
-	})
-}
-
-func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	helper := runGrafana(t)
-	ctx := context.Background()
-
-	// Create some unmanaged dashboards directly in Grafana first
-	dashboard1 := helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v1.yaml")
-	dashboard1Obj, err := helper.DashboardsV1.Resource.Create(ctx, dashboard1, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create first dashboard")
-	dashboard1Name := dashboard1Obj.GetName()
-
-	dashboard2 := helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v2beta1.yaml")
-	dashboard2Obj, err := helper.DashboardsV2beta1.Resource.Create(ctx, dashboard2, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create second dashboard")
-	dashboard2Name := dashboard2Obj.GetName()
-
-	// Create the first repository with sync enabled
-	const repo1 = "first-repository"
-	repo1Path := filepath.Join(helper.ProvisioningPath, repo1)
-	err = os.MkdirAll(repo1Path, 0750)
-	require.NoError(t, err, "should be able to create repository path")
-
-	createBody1 := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo1,
-		"SyncEnabled": true,
-		"SyncTarget":  "folder",
-		"Path":        repo1Path,
-	})
-	_, err = helper.Repositories.Resource.Create(ctx, createBody1, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create first repository")
-
-	// Print file tree before export
-	printFileTree(t, helper.ProvisioningPath)
-
-	// Initial export
-	result := helper.AdminREST.Post().
-		Namespace("default").
-		Resource("repositories").
-		Name(repo1).
-		SubResource("jobs").
-		SetHeader("Content-Type", "application/json").
-		Body(asJSON(&provisioning.JobSpec{
-			Push: &provisioning.ExportJobOptions{
-				Folder: "", // export entire instance
-				Path:   "", // no prefix necessary for testing
-			},
-		})).
-		Do(ctx)
-	require.NoError(t, result.Error(), "should be able to create export job for first repo")
-	helper.AwaitJobsWithStates(t, repo1, []string{"success"})
-	// Wait for first repository to sync
-	helper.SyncAndWait(t, repo1, nil)
-
-	printFileTree(t, helper.ProvisioningPath)
-	// Verify that the first repository has claimed ownership of the dashboards
-	managedDash1, err := helper.DashboardsV1.Resource.Get(ctx, dashboard1Name, metav1.GetOptions{})
-	require.NoError(t, err)
-	require.Equal(t, repo1, managedDash1.GetAnnotations()[utils.AnnoKeyManagerIdentity], "dashboard1 should be managed by first repo")
-
-	managedDash2, err := helper.DashboardsV2beta1.Resource.Get(ctx, dashboard2Name, metav1.GetOptions{})
-	require.NoError(t, err)
-	require.Equal(t, repo1, managedDash2.GetAnnotations()[utils.AnnoKeyManagerIdentity], "dashboard2 should be managed by first repo")
-
-	// Create second repository - enable sync and set different target
-
-	const repo2 = "second-repository"
-	repo2Path := filepath.Join(helper.ProvisioningPath, repo2)
-	err = os.MkdirAll(repo2Path, 0750)
-	require.NoError(t, err, "should be able to create seconrd repository path")
-
-	printFileTree(t, helper.ProvisioningPath)
-
-	createBody2 := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo2,
-		"SyncEnabled": true,
-		"SyncTarget":  "folder",
-		"Path":        repo2Path,
-	})
-
-	_, err = helper.Repositories.Resource.Create(ctx, createBody2, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create second repository")
-
-	// Wait for second repository to sync
-	helper.SyncAndWait(t, repo2, nil)
-
-	// Validate that folders for both repositories exist
-	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err, "should be able to list folders")
-
-	var repo1FolderFound, repo2FolderFound bool
-	for _, folder := range folders.Items {
-		if folder.GetName() == repo1 {
-			repo1FolderFound = true
-		}
-		if folder.GetName() == repo2 {
-			repo2FolderFound = true
-		}
-	}
-	require.True(t, repo1FolderFound, "folder for first repository %s should exist after sync", repo1)
-	require.True(t, repo2FolderFound, "folder for second repository %s should exist after sync", repo2)
-
-	// Create a third dashboard that won't be claimed by the first repo
-	dashboard3 := helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v0.yaml")
-	dashboard3Obj, err := helper.DashboardsV0.Resource.Create(ctx, dashboard3, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create third dashboard")
-	dashboard3Name := dashboard3Obj.GetName()
-
-	// Verify dashboard3 is not managed by anyone initially
-	unmanagedDash3, err := helper.DashboardsV0.Resource.Get(ctx, dashboard3Name, metav1.GetOptions{})
-	require.NoError(t, err)
-	manager, found := unmanagedDash3.GetAnnotations()[utils.AnnoKeyManagerIdentity]
-	require.True(t, !found || manager == "", "dashboard3 should not be managed initially")
-
-	printFileTree(t, helper.ProvisioningPath)
-	// Count files in first repo before second export
-	files1Before, err := countFilesInDir(repo1Path)
-	require.NoError(t, err)
-
-	// Export from second repository - this should only export the unmanaged dashboard3
-	result = helper.AdminREST.Post().
-		Namespace("default").
-		Resource("repositories").
-		Name(repo2).
-		SubResource("jobs").
-		SetHeader("Content-Type", "application/json").
-		Body(asJSON(&provisioning.JobSpec{
-			Push: &provisioning.ExportJobOptions{
-				Folder: "", // export entire instance
-				Path:   "", // no prefix necessary for testing
-			},
-		})).
-		Do(ctx)
-	require.NoError(t, result.Error(), "should be able to create export job for second repo")
-
-	// Wait for second repository export to complete
-	helper.AwaitJobsWithStates(t, repo2, []string{"success"})
-
-	// Wait for second repository to sync
-	helper.SyncAndWait(t, repo1, nil)
-	helper.SyncAndWait(t, repo2, nil)
-
-	printFileTree(t, helper.ProvisioningPath)
-	files1After, err := countFilesInDir(repo1Path)
-	require.NoError(t, err)
-
-	actualNewFiles := files1After - files1Before
-	require.Equal(t, 0, actualNewFiles,
-		"second repository should skip managed dashboards and had folder issues with unmanaged dashboard (expected %d new files, got %d)",
-		0, actualNewFiles)
-
-	// Verify files in the second repository
-	files2After, err := countFilesInDir(repo2Path)
-	require.NoError(t, err)
-	require.Equal(t, 1, files2After,
-		"second repository should only export the unmanaged dashboard (expected %d new files, got %d)",
-		1, files2After)
-
-	// Verify dashboard1 and dashboard2 are still managed by repo1 (unchanged)
-	stillManagedDash1, err := helper.DashboardsV1.Resource.Get(ctx, dashboard1Name, metav1.GetOptions{})
-	require.NoError(t, err)
-	require.Equal(t, repo1, stillManagedDash1.GetAnnotations()[utils.AnnoKeyManagerIdentity],
-		"dashboard1 should still be managed by first repo")
-
-	stillManagedDash2, err := helper.DashboardsV2beta1.Resource.Get(ctx, dashboard2Name, metav1.GetOptions{})
-	require.NoError(t, err)
-	require.Equal(t, repo1, stillManagedDash2.GetAnnotations()[utils.AnnoKeyManagerIdentity],
-		"dashboard2 should still be managed by first repo")
-
-	// Verify dashboard3 is now managed by repo2
-	stillManagedDash3, err := helper.DashboardsV0.Resource.Get(ctx, dashboard3Name, metav1.GetOptions{})
-	require.NoError(t, err)
-	require.Equal(t, repo2, stillManagedDash3.GetAnnotations()[utils.AnnoKeyManagerIdentity],
-		"dashboard3 should now be managed by second repo")
-}
-
-// Helper function to count files in a directory recursively
-func countFilesInDir(rootPath string) (int, error) {
-	count := 0
-	err := filepath.WalkDir(rootPath, func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
-		if !d.IsDir() {
-			count++
-		}
-		return nil
-	})
-	return count, err
-}
diff --git a/pkg/tests/apis/provisioning/repository_test.go b/pkg/tests/apis/provisioning/repository_test.go
new file mode 100644
index 00000000000..336d33a2bb0
--- /dev/null
+++ b/pkg/tests/apis/provisioning/repository_test.go
@@ -0,0 +1,593 @@
+package provisioning
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
+	"github.com/grafana/grafana/pkg/extensions"
+	"github.com/grafana/grafana/pkg/infra/usagestats"
+	"github.com/grafana/grafana/pkg/tests/apis"
+)
+
+func TestIntegrationProvisioning_CreatingAndGetting(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	createOptions := metav1.CreateOptions{FieldValidation: "Strict"}
+	ctx := context.Background()
+
+	inputFiles := []string{
+		"testdata/github-readonly.json.tmpl",
+		"testdata/local-readonly.json.tmpl",
+	}
+
+	for _, inputFilePath := range inputFiles {
+		t.Run(inputFilePath, func(t *testing.T) {
+			input := helper.RenderObject(t, inputFilePath, nil)
+
+			_, err := helper.Repositories.Resource.Create(ctx, input, createOptions)
+			require.NoError(t, err, "failed to create resource")
+
+			name := mustNestedString(input.Object, "metadata", "name")
+			output, err := helper.Repositories.Resource.Get(ctx, name, metav1.GetOptions{})
+			require.NoError(t, err, "failed to read back resource")
+
+			// Move encrypted token mutation
+			token, found, err := unstructured.NestedString(output.Object, "spec", "github", "encryptedToken")
+			require.NoError(t, err, "encryptedToken is not a string")
+			if found {
+				unstructured.RemoveNestedField(input.Object, "spec", "github", "token")
+				err = unstructured.SetNestedField(input.Object, token, "spec", "github", "encryptedToken")
+				require.NoError(t, err, "unable to copy encrypted token")
+			}
+
+			// Marshal as real objects to ",omitempty" values are tested properly
+			expectedRepo := unstructuredToRepository(t, input)
+			returnedRepo := unstructuredToRepository(t, output)
+			require.Equal(t, expectedRepo.Spec, returnedRepo.Spec)
+
+			// A viewer should not be able to see the same thing
+			var statusCode int
+			rsp := helper.ViewerREST.Get().
+				Namespace("default").
+				Resource("repositories").
+				Name(name).
+				Do(context.Background())
+			require.Error(t, rsp.Error())
+			rsp.StatusCode(&statusCode)
+			require.Equal(t, http.StatusForbidden, statusCode)
+
+			// Viewer can see file listing
+			rsp = helper.AdminREST.Get().
+				Namespace("default").
+				Resource("repositories").
+				Name(name).
+				Suffix("files/").
+				Do(context.Background())
+			require.NoError(t, rsp.Error())
+
+			// Verify that we can list refs
+			rsp = helper.AdminREST.Get().
+				Namespace("default").
+				Resource("repositories").
+				Name(name).
+				Suffix("refs").
+				Do(context.Background())
+
+			if expectedRepo.Spec.Type == provisioning.LocalRepositoryType {
+				require.ErrorContains(t, rsp.Error(), "does not support versioned operations")
+			} else {
+				require.NoError(t, rsp.Error())
+				refs := &provisioning.RefList{}
+				err = rsp.Into(refs)
+				require.NoError(t, err)
+				require.True(t, len(refs.Items) >= 1, "should have at least one ref")
+
+				var foundBranch bool
+				for _, ref := range refs.Items {
+					// FIXME: this assertion should be improved for all git types and take things from config
+					if ref.Name == "integration-test" {
+						require.Equal(t, "0f3370c212b04b9704e00f6926ef339bf91c7a1b", ref.Hash)
+						require.Equal(t, "https://github.com/grafana/grafana-git-sync-demo/tree/integration-test", ref.RefURL)
+						foundBranch = true
+					}
+				}
+
+				require.True(t, foundBranch, "branch should be found")
+			}
+		})
+	}
+
+	// Viewer can see settings listing
+	t.Run("viewer has access to list", func(t *testing.T) {
+		settings := &provisioning.RepositoryViewList{}
+		rsp := helper.ViewerREST.Get().
+			Namespace("default").
+			Suffix("settings").
+			Do(context.Background())
+		require.NoError(t, rsp.Error())
+		err := rsp.Into(settings)
+		require.NoError(t, err)
+		require.Len(t, settings.Items, len(inputFiles))
+
+		// FIXME: this should be an enterprise integration test
+		if extensions.IsEnterprise {
+			require.ElementsMatch(t, []provisioning.RepositoryType{
+				provisioning.LocalRepositoryType,
+				provisioning.GitHubRepositoryType,
+				provisioning.GitRepositoryType,
+				provisioning.BitbucketRepositoryType,
+				provisioning.GitLabRepositoryType,
+			}, settings.AvailableRepositoryTypes)
+		} else {
+			require.ElementsMatch(t, []provisioning.RepositoryType{
+				provisioning.LocalRepositoryType,
+				provisioning.GitHubRepositoryType,
+			}, settings.AvailableRepositoryTypes)
+		}
+	})
+
+	t.Run("Repositories are reported in stats", func(t *testing.T) {
+		report := apis.DoRequest(helper.K8sTestHelper, apis.RequestParams{
+			Method: http.MethodGet,
+			Path:   "/api/admin/usage-report-preview",
+			User:   helper.Org1.Admin,
+		}, &usagestats.Report{})
+
+		stats := map[string]any{}
+		for k, v := range report.Result.Metrics {
+			if strings.HasPrefix(k, "stats.repository.") {
+				stats[k] = v
+			}
+		}
+		require.Equal(t, map[string]any{
+			"stats.repository.github.count": 1.0,
+			"stats.repository.local.count":  1.0,
+		}, stats)
+	})
+}
+
+func TestIntegrationProvisioning_FailInvalidSchema(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	t.Skip("Reenable this test once we enforce schema validation for provisioning")
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	const repo = "invalid-schema-tmp"
+	// Set up the repository and the file to import.
+	helper.CopyToProvisioningPath(t, "testdata/invalid-dashboard-schema.json", "invalid-dashboard-schema.json")
+
+	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+		"Name":        repo,
+		"SyncEnabled": true,
+	})
+	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
+	require.NoError(t, err)
+
+	// Make sure the repo can read and validate the file
+	_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "invalid-dashboard-schema.json")
+	status := helper.RequireApiErrorStatus(err, metav1.StatusReasonBadRequest, http.StatusBadRequest)
+	require.Equal(t, status.Message, "Dry run failed: Dashboard.dashboard.grafana.app \"invalid-schema-uid\" is invalid: [spec.panels.0.repeatDirection: Invalid value: conflicting values \"h\" and \"this is not an allowed value\", spec.panels.0.repeatDirection: Invalid value: conflicting values \"v\" and \"this is not an allowed value\"]")
+
+	const invalidSchemaUid = "invalid-schema-uid"
+	_, err = helper.DashboardsV1.Resource.Get(ctx, invalidSchemaUid, metav1.GetOptions{})
+	require.Error(t, err, "invalid dashboard shouldn't exist")
+	require.True(t, apierrors.IsNotFound(err))
+
+	var jobObj *unstructured.Unstructured
+	require.EventuallyWithT(t, func(collect *assert.CollectT) {
+		result := helper.AdminREST.Post().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("jobs").
+			Body(asJSON(&provisioning.JobSpec{
+				Action: provisioning.JobActionPull,
+				Pull:   &provisioning.SyncJobOptions{},
+			})).
+			SetHeader("Content-Type", "application/json").
+			Do(t.Context())
+		require.NoError(collect, result.Error())
+		job, err := result.Get()
+		require.NoError(collect, err)
+		var ok bool
+		jobObj, ok = job.(*unstructured.Unstructured)
+		assert.True(collect, ok, "expecting unstructured object, but got %T", job)
+	}, time.Second*10, time.Millisecond*10, "Expected to be able to start a sync job")
+
+	require.EventuallyWithT(t, func(collect *assert.CollectT) {
+		// helper.TriggerJobProcessing(t)
+		result, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{},
+			"jobs", string(jobObj.GetUID()))
+
+		if apierrors.IsNotFound(err) {
+			assert.Fail(collect, "job '%s' not found yet yet", jobObj.GetName())
+			return // continue trying
+		}
+
+		// Can fail fast here -- the jobs are immutable
+		require.NoError(t, err)
+		require.NotNil(t, result)
+
+		job := &provisioning.Job{}
+		err = runtime.DefaultUnstructuredConverter.FromUnstructured(result.Object, job)
+		require.NoError(t, err, "should convert to Job object")
+
+		assert.Equal(t, provisioning.JobStateError, job.Status.State)
+		assert.Equal(t, job.Status.Message, "completed with errors")
+		assert.Equal(t, job.Status.Errors[0], "Dashboard.dashboard.grafana.app \"invalid-schema-uid\" is invalid: [spec.panels.0.repeatDirection: Invalid value: conflicting values \"h\" and \"this is not an allowed value\", spec.panels.0.repeatDirection: Invalid value: conflicting values \"v\" and \"this is not an allowed value\"]")
+	}, time.Second*10, time.Millisecond*10, "Expected provisioning job to conclude with the status failed")
+
+	_, err = helper.DashboardsV1.Resource.Get(ctx, invalidSchemaUid, metav1.GetOptions{})
+	require.Error(t, err, "invalid dashboard shouldn't have been created")
+	require.True(t, apierrors.IsNotFound(err))
+
+	err = helper.Repositories.Resource.Delete(ctx, repo, metav1.DeleteOptions{}, "files", "invalid-dashboard-schema.json")
+	require.NoError(t, err, "should delete the resource file")
+}
+
+func TestIntegrationProvisioning_CreatingGitHubRepository(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	// FIXME: instead of using an existing GitHub repository, we should create a new one for the tests and a branch
+	// This was the previous structure
+	// ghmock.WithRequestMatchHandler(ghmock.GetReposGitTreesByOwnerByRepoByTreeSha,
+	// 	ghHandleTree(t, map[string][]*gh.TreeEntry{
+	// 		"deadbeef": {
+	// 			treeEntryDir("grafana", "subtree"),
+	// 		},
+	// 		"subtree": {
+	// 			treeEntry("dashboard.json", helper.LoadFile("testdata/all-panels.json")),
+	// 			treeEntryDir("subdir", "subtree2"),
+	// 			treeEntry("subdir/dashboard2.yaml", helper.LoadFile("testdata/text-options.json")),
+	// 		},
+	// 	})),
+
+	// FIXME: uncomment these to implement webhook integration tests.
+	// helper.GetEnv().GitHubFactory.Client = ghmock.NewMockedHTTPClient(
+	// 	ghmock.WithRequestMatchHandler(ghmock.GetReposHooksByOwnerByRepo, ghAlwaysWrite(t, []*gh.Hook{})),
+	// 	ghmock.WithRequestMatchHandler(ghmock.PostReposHooksByOwnerByRepo, ghAlwaysWrite(t, &gh.Hook{ID: gh.Ptr(int64(123))})),
+	// )
+
+	const repo = "github-create-test"
+	_, err := helper.Repositories.Resource.Create(ctx,
+		helper.RenderObject(t, "testdata/github-readonly.json.tmpl", map[string]any{
+			"Name":        repo,
+			"SyncEnabled": true,
+			"SyncTarget":  "instance",
+			"Path":        "grafana/",
+		}),
+		metav1.CreateOptions{},
+	)
+	require.NoError(t, err)
+
+	helper.SyncAndWait(t, repo, nil)
+
+	// By now, we should have synced, meaning we have data to read in the local Grafana instance!
+
+	found, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+	require.NoError(t, err, "can list values")
+
+	names := []string{}
+	for _, v := range found.Items {
+		names = append(names, v.GetName())
+	}
+	require.Len(t, names, 3, "should have three dashboards")
+	assert.Contains(t, names, "adg5vbj", "should contain dashboard.json's contents")
+	assert.Contains(t, names, "admfz74", "should contain dashboard2.yaml's contents")
+	assert.Contains(t, names, "adn5mxb", "should contain dashboard2.yaml's contents")
+
+	err = helper.Repositories.Resource.Delete(ctx, repo, metav1.DeleteOptions{})
+	require.NoError(t, err, "should delete values")
+
+	require.EventuallyWithT(t, func(collect *assert.CollectT) {
+		found, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+		assert.NoError(t, err, "can list values")
+		assert.Equal(collect, 0, len(found.Items), "expected dashboards to be deleted")
+	}, time.Second*20, time.Millisecond*10, "Expected dashboards to be deleted")
+
+	t.Run("github url cleanup", func(t *testing.T) {
+		tests := []struct {
+			name   string
+			input  string
+			output string
+		}{
+			{
+				name:   "simple-url",
+				input:  "https://github.com/dprokop/grafana-git-sync-test",
+				output: "https://github.com/dprokop/grafana-git-sync-test",
+			},
+			{
+				name:   "trim-dot-git",
+				input:  "https://github.com/dprokop/grafana-git-sync-test.git",
+				output: "https://github.com/dprokop/grafana-git-sync-test",
+			},
+			{
+				name:   "trim-slash",
+				input:  "https://github.com/dprokop/grafana-git-sync-test/",
+				output: "https://github.com/dprokop/grafana-git-sync-test",
+			},
+		}
+
+		for _, test := range tests {
+			t.Run(test.name, func(t *testing.T) {
+				input := helper.RenderObject(t, "testdata/github-readonly.json.tmpl", map[string]any{
+					"Name": test.name,
+					"URL":  test.input,
+				})
+
+				_, err := helper.Repositories.Resource.Create(ctx, input, metav1.CreateOptions{})
+				require.NoError(t, err, "failed to create resource")
+
+				obj, err := helper.Repositories.Resource.Get(ctx, test.name, metav1.GetOptions{})
+				require.NoError(t, err, "failed to read back resource")
+
+				url, _, err := unstructured.NestedString(obj.Object, "spec", "github", "url")
+				require.NoError(t, err, "failed to read URL")
+				require.Equal(t, test.output, url)
+
+				err = helper.Repositories.Resource.Delete(ctx, test.name, metav1.DeleteOptions{})
+				require.NoError(t, err, "failed to delete")
+			})
+		}
+	})
+}
+
+func TestIntegrationProvisioning_RunLocalRepository(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	const allPanels = "n1jR8vnnz"
+	const repo = "local-local-examples"
+	const targetPath = "all-panels.json"
+
+	// Set up the repository.
+	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{"Name": repo})
+	obj, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
+	require.NoError(t, err)
+	name, _, _ := unstructured.NestedString(obj.Object, "metadata", "name")
+	require.Equal(t, repo, name, "wrote the expected name")
+
+	// Write a file -- this will create it *both* in the local file system, and in grafana
+	t.Run("write all panels", func(t *testing.T) {
+		code := 0
+
+		// Check that we can not (yet) UPDATE the target path
+		result := helper.AdminREST.Put().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("files", targetPath).
+			Body(helper.LoadFile("testdata/all-panels.json")).
+			SetHeader("Content-Type", "application/json").
+			Do(ctx).StatusCode(&code)
+		require.Equal(t, http.StatusNotFound, code)
+		require.True(t, apierrors.IsNotFound(result.Error()))
+
+		// Now try again with POST (as an editor)
+		result = helper.EditorREST.Post().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("files", targetPath).
+			Body(helper.LoadFile("testdata/all-panels.json")).
+			SetHeader("Content-Type", "application/json").
+			Do(ctx).StatusCode(&code)
+		require.NoError(t, result.Error(), "expecting to be able to create file")
+		wrapper := &provisioning.ResourceWrapper{}
+		raw, err := result.Raw()
+		require.NoError(t, err)
+		err = json.Unmarshal(raw, wrapper)
+		require.NoError(t, err)
+		require.Equal(t, 200, code, "expected 200 response")
+		require.Equal(t, provisioning.ClassicDashboard, wrapper.Resource.Type.Classic)
+		name, _, _ := unstructured.NestedString(wrapper.Resource.File.Object, "metadata", "name")
+		require.Equal(t, allPanels, name, "name from classic UID")
+		name, _, _ = unstructured.NestedString(wrapper.Resource.Upsert.Object, "metadata", "name")
+		require.Equal(t, allPanels, name, "save the name from the request")
+
+		// Get the file from the grafana database
+		obj, err := helper.DashboardsV1.Resource.Get(ctx, allPanels, metav1.GetOptions{})
+		require.NoError(t, err, "the value should be saved in grafana")
+		val, _, _ := unstructured.NestedString(obj.Object, "metadata", "annotations", utils.AnnoKeyManagerKind)
+		require.Equal(t, string(utils.ManagerKindRepo), val, "should have repo annotations")
+		val, _, _ = unstructured.NestedString(obj.Object, "metadata", "annotations", utils.AnnoKeyManagerIdentity)
+		require.Equal(t, repo, val, "should have repo annotations")
+
+		// Read the file we wrote
+		wrapObj, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", targetPath)
+		require.NoError(t, err, "read value")
+
+		wrap := &unstructured.Unstructured{}
+		wrap.Object, _, err = unstructured.NestedMap(wrapObj.Object, "resource", "dryRun")
+		require.NoError(t, err)
+		meta, err := utils.MetaAccessor(wrap)
+		require.NoError(t, err)
+		require.Equal(t, allPanels, meta.GetName(), "read the name out of the saved file")
+
+		// Check that an admin can update
+		meta.SetAnnotation("test", "from-provisioning")
+		body, err := json.Marshal(wrap.Object)
+		require.NoError(t, err)
+		result = helper.AdminREST.Put().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("files", targetPath).
+			Body(body).
+			SetHeader("Content-Type", "application/json").
+			Do(ctx).StatusCode(&code)
+		require.Equal(t, 200, code)
+		require.NoError(t, result.Error(), "update as admin value")
+		raw, err = result.Raw()
+		require.NoError(t, err)
+		err = json.Unmarshal(raw, wrapper)
+		require.NoError(t, err)
+		anno, _, _ := unstructured.NestedString(wrapper.Resource.File.Object, "metadata", "annotations", "test")
+		require.Equal(t, "from-provisioning", anno, "should set the annotation")
+
+		// But a viewer can not
+		result = helper.ViewerREST.Put().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("files", targetPath).
+			Body(body).
+			SetHeader("Content-Type", "application/json").
+			Do(ctx).StatusCode(&code)
+		require.Equal(t, 403, code)
+		require.True(t, apierrors.IsForbidden(result.Error()), code)
+	})
+
+	t.Run("fail using invalid paths", func(t *testing.T) {
+		result := helper.AdminREST.Post().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("files", "test", "..", "..", "all-panels.json"). // UNSAFE PATH
+			Body(helper.LoadFile("testdata/all-panels.json")).
+			SetHeader("Content-Type", "application/json").
+			Do(ctx)
+		require.Error(t, result.Error(), "invalid path should return error")
+
+		// Read a file with a bad path
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "../../all-panels.json")
+		require.Error(t, err, "invalid path should error")
+	})
+
+	t.Run("require name or generateName", func(t *testing.T) {
+		code := 0
+		result := helper.AdminREST.Post().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("files", "example.json").
+			Body([]byte(`apiVersion: dashboard.grafana.app/v0alpha1
+kind: Dashboard
+spec:
+  title: Test dashboard
+`)).Do(ctx).StatusCode(&code)
+		require.Error(t, result.Error(), "missing name")
+
+		result = helper.AdminREST.Post().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo).
+			SubResource("files", "example.json").
+			Body([]byte(`apiVersion: dashboard.grafana.app/v0alpha1
+kind: Dashboard
+metadata:
+  generateName: prefix-
+spec:
+  title: Test dashboard
+`)).Do(ctx).StatusCode(&code)
+		require.NoError(t, result.Error(), "should create name")
+		require.Equal(t, 200, code, "expect OK result")
+
+		raw, err := result.Raw()
+		require.NoError(t, err)
+
+		obj := &unstructured.Unstructured{}
+		err = json.Unmarshal(raw, obj)
+		require.NoError(t, err)
+
+		name, _, _ = unstructured.NestedString(obj.Object, "resource", "upsert", "metadata", "name")
+		require.True(t, strings.HasPrefix(name, "prefix-"), "should generate name")
+	})
+}
+
+func TestIntegrationProvisioning_ImportAllPanelsFromLocalRepository(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	// The dashboard shouldn't exist yet
+	const allPanels = "n1jR8vnnz"
+	_, err := helper.DashboardsV1.Resource.Get(ctx, allPanels, metav1.GetOptions{})
+	require.Error(t, err, "no all-panels dashboard should exist")
+	require.True(t, apierrors.IsNotFound(err))
+
+	const repo = "local-tmp"
+	// Set up the repository and the file to import.
+	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", "all-panels.json")
+	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+		"Name":        repo,
+		"SyncEnabled": true,
+	})
+
+	// We create the repository
+	_, err = helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
+	require.NoError(t, err)
+
+	// Now, we import it, such that it may exist
+	// The sync may not be necessary as the sync may have happened automatically at this point
+	helper.SyncAndWait(t, repo, nil)
+
+	// Make sure the repo can read and validate the file
+	obj, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "all-panels.json")
+	require.NoError(t, err, "valid path should be fine")
+
+	resource, _, err := unstructured.NestedMap(obj.Object, "resource")
+	require.NoError(t, err, "missing resource")
+	require.NoError(t, err, "invalid action")
+	require.NotNil(t, resource["file"], "the raw file")
+	require.NotNil(t, resource["dryRun"], "dryRun result")
+
+	action, _, err := unstructured.NestedString(resource, "action")
+	require.NoError(t, err, "invalid action")
+	// FIXME: there is no point in in returning action for a read / get request.
+	require.Equal(t, "update", action)
+
+	_, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+	require.NoError(t, err, "can list values")
+
+	obj, err = helper.DashboardsV1.Resource.Get(ctx, allPanels, metav1.GetOptions{})
+	require.NoError(t, err, "all-panels dashboard should exist")
+	require.Equal(t, repo, obj.GetAnnotations()[utils.AnnoKeyManagerIdentity])
+
+	// Try writing the value directly
+	err = unstructured.SetNestedField(obj.Object, []any{"aaa", "bbb"}, "spec", "tags")
+	require.NoError(t, err, "set tags")
+	obj, err = helper.DashboardsV1.Resource.Update(ctx, obj, metav1.UpdateOptions{})
+	require.NoError(t, err)
+	v, _, _ := unstructured.NestedString(obj.Object, "metadata", "annotations", utils.AnnoKeyUpdatedBy)
+	require.Equal(t, "access-policy:provisioning", v)
+
+	// Should not be able to directly delete the managed resource
+	err = helper.DashboardsV1.Resource.Delete(ctx, allPanels, metav1.DeleteOptions{})
+	require.NoError(t, err, "user can delete")
+
+	_, err = helper.DashboardsV1.Resource.Get(ctx, allPanels, metav1.GetOptions{})
+	require.Error(t, err, "should delete the internal resource")
+	require.True(t, apierrors.IsNotFound(err))
+}

From 561d5e440356f214a4c8aa5381a59795a307f6ac Mon Sep 17 00:00:00 2001
From: Kyle Brandt <kyle@grafana.com>
Date: Thu, 7 Aug 2025 08:43:39 -0400
Subject: [PATCH 019/243] SQL Expressions: (chore) Set error on SQL Execute
 span (#109268)

---
 pkg/expr/sql_command.go      | 6 ++++--
 pkg/expr/sql_command_test.go | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg/expr/sql_command.go b/pkg/expr/sql_command.go
index 3ebf6a78d02..6c80ac717d6 100644
--- a/pkg/expr/sql_command.go
+++ b/pkg/expr/sql_command.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"go.opentelemetry.io/otel/codes"
 
 	"github.com/grafana/grafana/pkg/apimachinery/errutil"
 	"github.com/grafana/grafana/pkg/expr/mathexp"
@@ -114,13 +115,15 @@ func (gr *SQLCommand) Execute(ctx context.Context, now time.Time, vars mathexp.V
 	rsp := mathexp.Results{}
 
 	defer func() {
-		span.End()
 		duration := float64(time.Since(start).Milliseconds())
 
 		statusLabel := "ok"
 		if rsp.Error != nil {
 			statusLabel = "error"
+			span.RecordError(rsp.Error)
+			span.SetStatus(codes.Error, rsp.Error.Error())
 		}
+		span.End()
 
 		metrics.SqlCommandCount.WithLabelValues(statusLabel).Inc()
 		metrics.SqlCommandDuration.WithLabelValues(statusLabel).Observe(duration)
@@ -154,7 +157,6 @@ func (gr *SQLCommand) Execute(ctx context.Context, now time.Time, vars mathexp.V
 
 	db := sql.DB{}
 	frame, err := db.QueryFrames(ctx, tracer, gr.refID, gr.query, allFrames, sql.WithMaxOutputCells(gr.outputLimit), sql.WithTimeout(gr.timeout))
-
 	if err != nil {
 		logger.Error("Failed to query frames", "error", err.Error())
 		rsp.Error = err
diff --git a/pkg/expr/sql_command_test.go b/pkg/expr/sql_command_test.go
index 34591fdb110..c4ecdc480f6 100644
--- a/pkg/expr/sql_command_test.go
+++ b/pkg/expr/sql_command_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/expr/metrics"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
 )
 
@@ -187,3 +188,8 @@ type testSpan struct {
 
 func (ts *testSpan) End(opt ...trace.SpanEndOption) {
 }
+
+func (ts *testSpan) RecordError(err error, opt ...trace.EventOption) {
+}
+
+func (ts *testSpan) SetStatus(code codes.Code, msg string) {}

From 8add05980026475ad12fe952a27ac1896997a967 Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Thu, 7 Aug 2025 15:16:04 +0200
Subject: [PATCH 020/243] Alerting: Do not apply extra labels in the Prometheus
 conversion API to recording rules (#109312)

---
 .../api/api_convert_prometheus_test.go        | 53 ++++++++++++++-----
 pkg/services/ngalert/prom/convert.go          |  4 +-
 pkg/services/ngalert/prom/convert_test.go     |  8 ++-
 3 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/pkg/services/ngalert/api/api_convert_prometheus_test.go b/pkg/services/ngalert/api/api_convert_prometheus_test.go
index 44753418cce..7b45968ae78 100644
--- a/pkg/services/ngalert/api/api_convert_prometheus_test.go
+++ b/pkg/services/ngalert/api/api_convert_prometheus_test.go
@@ -292,7 +292,7 @@ func TestRouteConvertPrometheusPostRuleGroup(t *testing.T) {
 		}
 	})
 
-	t.Run("with extra labels header should apply labels to all rules", func(t *testing.T) {
+	t.Run("with extra labels header should apply labels only to alert rules", func(t *testing.T) {
 		srv, _, ruleStore := createConvertPrometheusSrv(t)
 		rc := createRequestCtx()
 		rc.Req.Header.Set(extraLabelsHeader, "environment=production,team=alerting")
@@ -306,17 +306,28 @@ func TestRouteConvertPrometheusPostRuleGroup(t *testing.T) {
 		require.NoError(t, err)
 		require.Len(t, rules, 2)
 
-		for _, rule := range rules {
-			require.Equal(t, "production", rule.Labels["environment"])
-			require.Equal(t, "alerting", rule.Labels["team"])
+		var alertRule, recordingRule *models.AlertRule
+		for i := range rules {
+			switch rules[i].Title {
+			case "TestAlert":
+				alertRule = rules[i]
+			case "recorded-metric":
+				recordingRule = rules[i]
+			}
 		}
 
-		// Original labels must be preserved
-		alertRule := rules[0]
-		if alertRule.Title == "recorded-metric" {
-			alertRule = rules[1]
-		}
+		require.NotNil(t, alertRule, "Alert rule should be present")
+		require.NotNil(t, recordingRule, "Recording rule should be present")
+
+		// Alert rule should have extra labels
+		require.Equal(t, "production", alertRule.Labels["environment"])
+		require.Equal(t, "alerting", alertRule.Labels["team"])
 		require.Equal(t, "critical", alertRule.Labels["severity"])
+
+		// Recording rule should not have extra labels
+		require.NotContains(t, recordingRule.Labels, "environment")
+		require.NotContains(t, recordingRule.Labels, "team")
+		require.Equal(t, "warning", recordingRule.Labels["severity"])
 	})
 
 	t.Run("with extra labels that conflict with rule labels", func(t *testing.T) {
@@ -335,10 +346,28 @@ func TestRouteConvertPrometheusPostRuleGroup(t *testing.T) {
 		require.NoError(t, err)
 		require.Len(t, rules, 2)
 
-		for _, rule := range rules {
-			require.Equal(t, "production", rule.Labels["environment"])
-			require.NotEqual(t, "low", rule.Labels["severity"])
+		var alertRule, recordingRule *models.AlertRule
+		for i := range rules {
+			switch rules[i].Title {
+			case "TestAlert":
+				alertRule = rules[i]
+			case "recorded-metric":
+				recordingRule = rules[i]
+			}
 		}
+
+		require.NotNil(t, alertRule, "Alert rule should be present")
+		require.NotNil(t, recordingRule, "Recording rule should be present")
+
+		// Alert rule should have extra labels where they don't conflict
+		require.Equal(t, "production", alertRule.Labels["environment"])
+		// Rule label should take precedence over extra label
+		require.Equal(t, "critical", alertRule.Labels["severity"])
+		require.NotEqual(t, "low", alertRule.Labels["severity"])
+
+		// Recording rule should not have extra labels
+		require.NotContains(t, recordingRule.Labels, "environment")
+		require.Equal(t, "warning", recordingRule.Labels["severity"])
 	})
 
 	t.Run("with invalid extra labels header should return 400", func(t *testing.T) {
diff --git a/pkg/services/ngalert/prom/convert.go b/pkg/services/ngalert/prom/convert.go
index 485b62dc857..82318bba1e6 100644
--- a/pkg/services/ngalert/prom/convert.go
+++ b/pkg/services/ngalert/prom/convert.go
@@ -236,7 +236,9 @@ func (p *Converter) convertRule(orgID int64, namespaceUID string, promGroup Prom
 	}
 
 	labels := make(map[string]string, len(rule.Labels)+len(promGroup.Labels)+len(p.cfg.ExtraLabels)+1)
-	maps.Copy(labels, p.cfg.ExtraLabels)
+	if !isRecordingRule {
+		maps.Copy(labels, p.cfg.ExtraLabels)
+	}
 	maps.Copy(labels, promGroup.Labels)
 	maps.Copy(labels, rule.Labels)
 
diff --git a/pkg/services/ngalert/prom/convert_test.go b/pkg/services/ngalert/prom/convert_test.go
index 4a5d4346b14..ae4cf4a73e8 100644
--- a/pkg/services/ngalert/prom/convert_test.go
+++ b/pkg/services/ngalert/prom/convert_test.go
@@ -705,7 +705,7 @@ func TestPrometheusRulesToGrafana_ExtraLabels(t *testing.T) {
 		require.Equal(t, expectedLabels, grafanaGroup.Rules[0].Labels)
 	})
 
-	t.Run("extra labels are applied to recording rules", func(t *testing.T) {
+	t.Run("extra labels are not applied to recording rules", func(t *testing.T) {
 		promGroup := PrometheusRuleGroup{
 			Name:     "test-group-2",
 			Interval: prommodel.Duration(10 * time.Second),
@@ -721,8 +721,12 @@ func TestPrometheusRulesToGrafana_ExtraLabels(t *testing.T) {
 		require.NoError(t, err)
 		require.Len(t, grafanaGroup.Rules, 1)
 
-		expectedLabels := withInternalLabel(cfg.ExtraLabels)
+		expectedLabels := withInternalLabel(make(map[string]string))
 		require.Equal(t, expectedLabels, grafanaGroup.Rules[0].Labels)
+
+		for key := range cfg.ExtraLabels {
+			require.NotContains(t, grafanaGroup.Rules[0].Labels, key)
+		}
 	})
 }
 

From b5fca60bdb0f477f2785da90cda70777e5d6b6c1 Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Thu, 7 Aug 2025 09:19:04 -0400
Subject: [PATCH 021/243] Provisioning Folder: Bugfix cancel action drawer
 should not reset selection state; Read only alert reoganize (#109087)

* Read only message on drawer, fix cancel drawer reset selection state.

* Bugfix when select provisioned sub items from root, we are missing repo info
---
 .../BrowseActions/BrowseActions.tsx           |  2 -
 .../BulkDeleteProvisionedResource.test.tsx    |  4 +-
 .../BulkDeleteProvisionedResource.tsx         |  9 ++--
 .../BulkMoveProvisionedResource.tsx           | 10 ++--
 .../BulkActions/RepoInvalidStateBanner.tsx    | 44 +++++++++++++++++
 .../BulkActions/useFolderNameFromSelection.ts | 49 +++++++++++++++++++
 .../DeleteProvisionedFolderForm.test.tsx      |  1 +
 .../DeleteProvisionedFolderForm.tsx           | 16 ++++--
 .../NewProvisionedFolderForm.test.tsx         |  9 ++--
 .../components/NewProvisionedFolderForm.tsx   | 16 ++++--
 .../hooks/useProvisionedFolderFormData.ts     |  4 +-
 .../SaveProvisionedDashboardForm.tsx          | 25 +++++-----
 .../saving/provisioned/hooks.ts               |  5 +-
 .../DeleteProvisionedDashboardForm.tsx        | 19 +++----
 .../hooks/useGetResourceRepositoryView.ts     | 13 +++--
 .../features/provisioning/utils/repository.ts | 10 ++++
 public/locales/en-US/grafana.json             | 19 +++++--
 17 files changed, 197 insertions(+), 58 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/components/BulkActions/RepoInvalidStateBanner.tsx
 create mode 100644 public/app/features/browse-dashboards/components/BulkActions/useFolderNameFromSelection.ts
 create mode 100644 public/app/features/provisioning/utils/repository.ts

diff --git a/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
index ca3952427e6..5e538d6e91b 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
+++ b/public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
@@ -148,7 +148,6 @@ export function BrowseActions({ folderDTO }: Props) {
             folderUid={folderDTO?.uid || ''}
             onDismiss={() => {
               setShowBulkDeleteProvisionedResource(false);
-              onActionComplete();
             }}
           />
         </Drawer>
@@ -166,7 +165,6 @@ export function BrowseActions({ folderDTO }: Props) {
             folderUid={folderDTO?.uid}
             onDismiss={() => {
               setShowBulkMoveProvisionedResource(false);
-              onActionComplete();
             }}
           />
         </Drawer>
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
index 045efed7e54..b4fc6013446 100644
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
+++ b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
@@ -194,8 +194,8 @@ describe('BulkDeleteProvisionedResource', () => {
   });
 
   it('returns null when repository is not available', () => {
-    const { container } = setup(null);
+    setup(null);
 
-    expect(container.firstChild).toBeNull();
+    expect(screen.getByLabelText('Repository not found')).toBeInTheDocument();
   });
 });
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx
index 14ea787fc81..8bcb95e6a2d 100644
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx
+++ b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx
@@ -25,7 +25,9 @@ import { collectSelectedItems, fetchProvisionedDashboardPath } from '../utils';
 import { MoveResultFailed } from './BulkActionFailureBanner';
 import { BulkActionPostSubmitStep } from './BulkActionPostSubmitStep';
 import { ProgressState } from './BulkActionProgress';
+import { RepoInvalidStateBanner } from './RepoInvalidStateBanner';
 import { useBulkActionRequest } from './useBulkActionRequest';
+import { useFolderNameFromSelection } from './useFolderNameFromSelection';
 import {
   BulkActionFormData,
   BulkActionProvisionResourceProps,
@@ -202,7 +204,8 @@ export function BulkDeleteProvisionedResource({
   selectedItems,
   onDismiss,
 }: BulkActionProvisionResourceProps) {
-  const { repository, folder } = useGetResourceRepositoryView({ folderName: folderUid });
+  const folderName = useFolderNameFromSelection({ folderUid, selectedItems });
+  const { repository, folder, isReadOnlyRepo } = useGetResourceRepositoryView({ folderName });
 
   const workflowOptions = getWorkflowOptions(repository);
   const folderPath = folder?.metadata?.annotations?.[AnnoKeySourcePath] || '';
@@ -214,8 +217,8 @@ export function BulkDeleteProvisionedResource({
     workflow: getDefaultWorkflow(repository),
   };
 
-  if (!repository) {
-    return null;
+  if (!repository || isReadOnlyRepo) {
+    return <RepoInvalidStateBanner noRepository={!repository} isReadOnlyRepo={isReadOnlyRepo} />;
   }
 
   return (
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx
index a45ad80eabe..883ec38c578 100644
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx
+++ b/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx
@@ -30,7 +30,9 @@ import { collectSelectedItems, fetchProvisionedDashboardPath } from '../utils';
 import { MoveResultFailed } from './BulkActionFailureBanner';
 import { BulkActionPostSubmitStep } from './BulkActionPostSubmitStep';
 import { ProgressState } from './BulkActionProgress';
+import { RepoInvalidStateBanner } from './RepoInvalidStateBanner';
 import { useBulkActionRequest } from './useBulkActionRequest';
+import { useFolderNameFromSelection } from './useFolderNameFromSelection';
 import {
   BulkActionFormData,
   BulkActionProvisionResourceProps,
@@ -39,6 +41,7 @@ import {
   getResourceTargetPath,
   MoveResultSuccessState,
 } from './utils';
+
 interface FormProps extends BulkActionProvisionResourceProps {
   initialValues: BulkActionFormData;
   repository: RepositoryView;
@@ -277,7 +280,8 @@ function FormContent({ initialValues, selectedItems, repository, workflowOptions
 }
 
 export function BulkMoveProvisionedResource({ folderUid, selectedItems, onDismiss }: BulkActionProvisionResourceProps) {
-  const { repository, folder } = useGetResourceRepositoryView({ folderName: folderUid });
+  const folderName = useFolderNameFromSelection({ folderUid, selectedItems });
+  const { repository, folder, isReadOnlyRepo } = useGetResourceRepositoryView({ folderName });
 
   const workflowOptions = getWorkflowOptions(repository);
   const folderPath = folder?.metadata?.annotations?.[AnnoKeySourcePath] || '';
@@ -289,8 +293,8 @@ export function BulkMoveProvisionedResource({ folderUid, selectedItems, onDismis
     workflow: getDefaultWorkflow(repository),
   };
 
-  if (!repository) {
-    return null;
+  if (!repository || isReadOnlyRepo) {
+    return <RepoInvalidStateBanner noRepository={!repository} isReadOnlyRepo={isReadOnlyRepo} />;
   }
 
   return (
diff --git a/public/app/features/browse-dashboards/components/BulkActions/RepoInvalidStateBanner.tsx b/public/app/features/browse-dashboards/components/BulkActions/RepoInvalidStateBanner.tsx
new file mode 100644
index 00000000000..10381234514
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BulkActions/RepoInvalidStateBanner.tsx
@@ -0,0 +1,44 @@
+import { Trans, t } from '@grafana/i18n';
+import { Alert } from '@grafana/ui';
+
+interface Props {
+  noRepository: boolean;
+  isReadOnlyRepo: boolean;
+  readOnlyMessage?: string;
+}
+
+export function RepoInvalidStateBanner({ noRepository, isReadOnlyRepo, readOnlyMessage }: Props) {
+  if (noRepository) {
+    return (
+      <Alert
+        title={t('browse-dashboards.bulk-move-resources-form.error.repository-not-found-title', 'Repository not found')}
+      >
+        <Trans i18nKey="browse-dashboards.bulk-move-resources-form.error.repository-not-found-message">
+          The repository for the selected folder could not be found. Please ensure that the folder is provisioned
+          correctly.
+        </Trans>
+      </Alert>
+    );
+  }
+
+  if (isReadOnlyRepo) {
+    return (
+      <Alert
+        title={t('browse-dashboards.bulk-move-resources-form.error.read-only-title', 'This repository is read only')}
+      >
+        {readOnlyMessage
+          ? t(
+              'browse-dashboards.bulk-move-resources-form.error.read-only-saving-message',
+              'Repository is read-only and provisioned in git. {{readOnlyMessage}}',
+              { readOnlyMessage }
+            )
+          : t(
+              'browse-dashboards.bulk-move-resources-form.error.read-only-message',
+              'If you have direct access to the target, please make modifications directly in the target repository.'
+            )}
+      </Alert>
+    );
+  }
+
+  return null;
+}
diff --git a/public/app/features/browse-dashboards/components/BulkActions/useFolderNameFromSelection.ts b/public/app/features/browse-dashboards/components/BulkActions/useFolderNameFromSelection.ts
new file mode 100644
index 00000000000..a21b74129fa
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BulkActions/useFolderNameFromSelection.ts
@@ -0,0 +1,49 @@
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+
+import { ManagerKind } from 'app/features/apiserver/types';
+
+import { rootItemsSelector, useChildrenByParentUIDState } from '../../state/hooks';
+import { findItem } from '../../state/utils';
+import { DashboardTreeSelection } from '../../types';
+
+// This hook retrieves the folder UID from the selection state. Because search endpoint currently does not return resource metadata
+// NOTE: This is a temporary workaround until the search endpoint is updated
+interface Props {
+  folderUid?: string;
+  selectedItems: Omit<DashboardTreeSelection, 'panel' | '$all'>;
+}
+export function useFolderNameFromSelection({ folderUid, selectedItems }: Props) {
+  const rootItems = useSelector(rootItemsSelector);
+  const childrenByParentUID = useChildrenByParentUIDState();
+
+  return useMemo(() => {
+    // if we already have a folderUid, return it;
+    if (folderUid) {
+      return folderUid;
+    }
+
+    // Helper to walk up tree and find provisioned folder
+    const findProvisionedParent = (itemUid: string): string | undefined => {
+      const item = findItem(rootItems?.items || [], childrenByParentUID, itemUid);
+      if (!item) {
+        return undefined;
+      }
+
+      if (item.managedBy === ManagerKind.Repo) {
+        return item.uid;
+      }
+      if (item.parentUID) {
+        return findProvisionedParent(item.parentUID);
+      }
+      return undefined;
+    };
+
+    // Try folders, then dashboards
+    const firstSelectedUid =
+      Object.keys(selectedItems.folder).find((uid) => selectedItems.folder[uid]) ||
+      Object.keys(selectedItems.dashboard).find((uid) => selectedItems.dashboard[uid]);
+
+    return firstSelectedUid ? findProvisionedParent(firstSelectedUid) : undefined;
+  }, [folderUid, selectedItems, rootItems, childrenByParentUID]);
+}
diff --git a/public/app/features/browse-dashboards/components/DeleteProvisionedFolderForm.test.tsx b/public/app/features/browse-dashboards/components/DeleteProvisionedFolderForm.test.tsx
index a3ddd150785..23108ee102c 100644
--- a/public/app/features/browse-dashboards/components/DeleteProvisionedFolderForm.test.tsx
+++ b/public/app/features/browse-dashboards/components/DeleteProvisionedFolderForm.test.tsx
@@ -134,6 +134,7 @@ const defaultHookData: ProvisionedFolderFormDataResult = {
   repository: mockRepository,
   folder: mockFolder,
   initialValues: mockFormData,
+  isReadOnlyRepo: false,
 };
 
 function setup(
diff --git a/public/app/features/browse-dashboards/components/DeleteProvisionedFolderForm.tsx b/public/app/features/browse-dashboards/components/DeleteProvisionedFolderForm.tsx
index f6fb26101f8..87f1d6bca1e 100644
--- a/public/app/features/browse-dashboards/components/DeleteProvisionedFolderForm.tsx
+++ b/public/app/features/browse-dashboards/components/DeleteProvisionedFolderForm.tsx
@@ -20,6 +20,7 @@ import { FolderDTO } from 'app/types/folders';
 import { useProvisionedFolderFormData } from '../hooks/useProvisionedFolderFormData';
 
 import { DescendantCount } from './BrowseActions/DescendantCount';
+import { RepoInvalidStateBanner } from './BulkActions/RepoInvalidStateBanner';
 import { getFolderURL } from './utils';
 
 interface FormProps extends DeleteProvisionedFolderFormProps {
@@ -150,14 +151,23 @@ function FormContent({ initialValues, parentFolder, repository, workflowOptions,
 }
 
 export function DeleteProvisionedFolderForm({ parentFolder, onDismiss }: DeleteProvisionedFolderFormProps) {
-  const { workflowOptions, repository, folder, initialValues } = useProvisionedFolderFormData({
+  const { workflowOptions, repository, folder, initialValues, isReadOnlyRepo } = useProvisionedFolderFormData({
     folderUid: parentFolder?.uid,
     action: 'delete',
     title: parentFolder?.title,
   });
 
-  if (!initialValues) {
-    return null;
+  if (isReadOnlyRepo || !initialValues) {
+    return (
+      <RepoInvalidStateBanner
+        noRepository={!initialValues}
+        isReadOnlyRepo={isReadOnlyRepo}
+        readOnlyMessage={t(
+          'browse-dashboards.delete-folder.read-only-message',
+          'To delete this folder, please remove the folder from your repository.'
+        )}
+      />
+    );
   }
 
   return (
diff --git a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx
index 2242a8965ae..9ee6d728426 100644
--- a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx
+++ b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx
@@ -131,6 +131,7 @@ const mockHookData: ProvisionedFolderFormDataResult = {
     workflows: ['write', 'branch'],
     target: 'folder',
   },
+  isReadOnlyRepo: false,
   folder: {
     metadata: {
       annotations: {
@@ -188,18 +189,18 @@ describe('NewProvisionedFolderForm', () => {
   });
 
   it('should return null when initialValues is not available', () => {
-    const { container } = setup(
+    setup(
       {},
       {
         ...mockHookData,
         initialValues: undefined,
       }
     );
-    expect(container.firstChild).toBeNull();
+    expect(screen.getByLabelText('Repository not found')).toBeInTheDocument();
   });
 
   it('should show error when repository is not found', () => {
-    const { container } = setup(
+    setup(
       {},
       {
         ...mockHookData,
@@ -207,7 +208,7 @@ describe('NewProvisionedFolderForm', () => {
         initialValues: undefined,
       }
     );
-    expect(container.firstChild).toBeNull();
+    expect(screen.getByLabelText('Repository not found')).toBeInTheDocument();
   });
 
   it('should show branch field when branch workflow is selected', async () => {
diff --git a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx
index 797f4bb98ba..bd452e3ba72 100644
--- a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx
+++ b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx
@@ -22,6 +22,7 @@ import { FolderDTO } from 'app/types/folders';
 
 import { useProvisionedFolderFormData } from '../hooks/useProvisionedFolderFormData';
 
+import { RepoInvalidStateBanner } from './BulkActions/RepoInvalidStateBanner';
 import { validateFolderName } from './NewFolderForm';
 import { formatFolderName, hasFolderNameCharactersToReplace } from './utils';
 
@@ -213,14 +214,23 @@ function FormContent({ initialValues, repository, workflowOptions, folder, onDis
 }
 
 export function NewProvisionedFolderForm({ parentFolder, onDismiss }: Props) {
-  const { workflowOptions, repository, folder, initialValues } = useProvisionedFolderFormData({
+  const { workflowOptions, repository, folder, initialValues, isReadOnlyRepo } = useProvisionedFolderFormData({
     folderUid: parentFolder?.uid,
     action: 'create',
     title: '', // Empty title for new folders
   });
 
-  if (!initialValues) {
-    return null;
+  if (isReadOnlyRepo || !initialValues) {
+    return (
+      <RepoInvalidStateBanner
+        noRepository={!initialValues}
+        isReadOnlyRepo={isReadOnlyRepo}
+        readOnlyMessage={t(
+          'browse-dashboards.new-folder.read-only-message',
+          'To create this folder, please add the resource in your repository directly.'
+        )}
+      />
+    );
   }
 
   return (
diff --git a/public/app/features/browse-dashboards/hooks/useProvisionedFolderFormData.ts b/public/app/features/browse-dashboards/hooks/useProvisionedFolderFormData.ts
index 8ea8c4835f0..342808e6520 100644
--- a/public/app/features/browse-dashboards/hooks/useProvisionedFolderFormData.ts
+++ b/public/app/features/browse-dashboards/hooks/useProvisionedFolderFormData.ts
@@ -20,6 +20,7 @@ export interface ProvisionedFolderFormDataResult {
   folder?: Folder;
   workflowOptions: Array<{ label: string; value: string }>;
   initialValues?: BaseProvisionedFormData;
+  isReadOnlyRepo: boolean;
 }
 
 /**
@@ -30,7 +31,7 @@ export function useProvisionedFolderFormData({
   action,
   title,
 }: UseProvisionedFolderFormDataProps): ProvisionedFolderFormDataResult {
-  const { repository, folder, isLoading } = useGetResourceRepositoryView({ folderName: folderUid });
+  const { repository, folder, isLoading, isReadOnlyRepo } = useGetResourceRepositoryView({ folderName: folderUid });
 
   const workflowOptions = getWorkflowOptions(repository);
   const timestamp = generateTimestamp();
@@ -56,5 +57,6 @@ export function useProvisionedFolderFormData({
     folder,
     workflowOptions,
     initialValues,
+    isReadOnlyRepo,
   };
 }
diff --git a/public/app/features/dashboard-scene/saving/provisioned/SaveProvisionedDashboardForm.tsx b/public/app/features/dashboard-scene/saving/provisioned/SaveProvisionedDashboardForm.tsx
index 260c491bb57..d69c9b6984c 100644
--- a/public/app/features/dashboard-scene/saving/provisioned/SaveProvisionedDashboardForm.tsx
+++ b/public/app/features/dashboard-scene/saving/provisioned/SaveProvisionedDashboardForm.tsx
@@ -6,11 +6,12 @@ import { AppEvents, locationUtil } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
 import { getAppEvents, locationService } from '@grafana/runtime';
 import { Dashboard } from '@grafana/schema';
-import { Alert, Button, Field, Input, Stack, TextArea } from '@grafana/ui';
+import { Button, Field, Input, Stack, TextArea } from '@grafana/ui';
 import { RepositoryView } from 'app/api/clients/provisioning/v0alpha1';
 import { FolderPicker } from 'app/core/components/Select/FolderPicker';
 import kbn from 'app/core/utils/kbn';
 import { Resource } from 'app/features/apiserver/types';
+import { RepoInvalidStateBanner } from 'app/features/browse-dashboards/components/BulkActions/RepoInvalidStateBanner';
 import { validationSrv } from 'app/features/manage-dashboards/services/ValidationSrv';
 import { PROVISIONING_URL } from 'app/features/provisioning/constants';
 import { useCreateOrUpdateRepositoryFile } from 'app/features/provisioning/hooks/useCreateOrUpdateRepositoryFile';
@@ -60,7 +61,7 @@ export function SaveProvisionedDashboardForm({
     reset(defaultValues);
   }, [defaultValues, reset]);
 
-  const onRequestError = (error: unknown, info: ProvisionedOperationInfo) => {
+  const onRequestError = (error: unknown) => {
     appEvents.publish({
       type: AppEvents.alertError.name,
       payload: [t('dashboard-scene.save-provisioned-dashboard-form.api-error', 'Error saving dashboard'), error],
@@ -80,6 +81,7 @@ export function SaveProvisionedDashboardForm({
   };
 
   const onWriteSuccess = (_: ProvisionedOperationInfo, upsert: Resource<Dashboard>) => {
+    handleDismiss();
     if (isNew && upsert?.metadata.name) {
       handleNewDashboard(upsert);
     } else {
@@ -91,6 +93,7 @@ export function SaveProvisionedDashboardForm({
   };
 
   const onBranchSuccess = (ref: string, path: string, info: ProvisionedOperationInfo, upsert: Resource<Dashboard>) => {
+    handleDismiss();
     if (isNew && upsert?.metadata?.name) {
       handleNewDashboard(upsert);
     } else {
@@ -104,7 +107,7 @@ export function SaveProvisionedDashboardForm({
     }
   };
 
-  const onDismiss = () => {
+  const handleDismiss = () => {
     dashboard.setState({ isDirty: false });
     panelEditor?.onDiscard();
     drawer.onClose();
@@ -118,7 +121,6 @@ export function SaveProvisionedDashboardForm({
       onBranchSuccess: ({ ref, path }, info, resource) => onBranchSuccess(ref, path, info, resource),
       onWriteSuccess,
       onError: onRequestError,
-      onDismiss,
     },
   });
 
@@ -157,16 +159,11 @@ export function SaveProvisionedDashboardForm({
       <form onSubmit={handleSubmit(handleFormSubmit)} name="save-provisioned-form">
         <Stack direction="column" gap={2}>
           {readOnly && (
-            <Alert
-              title={t(
-                'dashboard-scene.save-provisioned-dashboard-form.title-this-repository-is-read-only',
-                'This repository is read only'
-              )}
-            >
-              <Trans i18nKey="dashboard-scene.save-provisioned-dashboard-form.copy-json-message">
-                If you have direct access to the target, copy the JSON and paste it there.
-              </Trans>
-            </Alert>
+            <RepoInvalidStateBanner
+              noRepository={false}
+              isReadOnlyRepo={true}
+              readOnlyMessage="If you have direct access to the target, copy the JSON and paste it there."
+            />
           )}
 
           {isNew && (
diff --git a/public/app/features/dashboard-scene/saving/provisioned/hooks.ts b/public/app/features/dashboard-scene/saving/provisioned/hooks.ts
index 8edec0ec7a2..1b87fc88be3 100644
--- a/public/app/features/dashboard-scene/saving/provisioned/hooks.ts
+++ b/public/app/features/dashboard-scene/saving/provisioned/hooks.ts
@@ -4,6 +4,7 @@ import { RepositoryView } from 'app/api/clients/provisioning/v0alpha1';
 import { useUrlParams } from 'app/core/navigation/hooks';
 import { AnnoKeyManagerIdentity, AnnoKeyManagerKind, AnnoKeySourcePath } from 'app/features/apiserver/types';
 import { useGetResourceRepositoryView } from 'app/features/provisioning/hooks/useGetResourceRepositoryView';
+import { getIsReadOnlyRepo } from 'app/features/provisioning/utils/repository';
 import { DashboardMeta } from 'app/types/dashboard';
 
 import { DashboardScene } from '../../scene/DashboardScene';
@@ -110,8 +111,6 @@ export function useProvisionedDashboardData(dashboard: DashboardScene): Provisio
   const { values, isNew, repository } = defaultValuesResult;
   const workflowOptions = getWorkflowOptions(repository, loadedFromRef);
 
-  const readOnly = !repository?.workflows?.length;
-
   return {
     isReady: true,
     defaultValues: values,
@@ -119,7 +118,7 @@ export function useProvisionedDashboardData(dashboard: DashboardScene): Provisio
     loadedFromRef,
     workflowOptions,
     isNew,
-    readOnly,
+    readOnly: getIsReadOnlyRepo(repository),
     isLoading,
     setIsLoading,
   };
diff --git a/public/app/features/dashboard-scene/settings/DeleteProvisionedDashboardForm.tsx b/public/app/features/dashboard-scene/settings/DeleteProvisionedDashboardForm.tsx
index 9d101b2f8c5..05ffdaf91f6 100644
--- a/public/app/features/dashboard-scene/settings/DeleteProvisionedDashboardForm.tsx
+++ b/public/app/features/dashboard-scene/settings/DeleteProvisionedDashboardForm.tsx
@@ -4,8 +4,9 @@ import { useNavigate } from 'react-router-dom-v5-compat';
 import { AppEvents } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
 import { getAppEvents } from '@grafana/runtime';
-import { Alert, Button, Drawer, Stack } from '@grafana/ui';
+import { Button, Drawer, Stack } from '@grafana/ui';
 import { RepositoryView, useDeleteRepositoryFilesWithPathMutation } from 'app/api/clients/provisioning/v0alpha1';
+import { RepoInvalidStateBanner } from 'app/features/browse-dashboards/components/BulkActions/RepoInvalidStateBanner';
 import { PROVISIONING_URL } from 'app/features/provisioning/constants';
 
 import { ResourceEditFormSharedFields } from '../components/Provisioned/ResourceEditFormSharedFields';
@@ -118,17 +119,11 @@ export function DeleteProvisionedDashboardForm({
         <form onSubmit={handleSubmit(handleSubmitForm)}>
           <Stack direction="column" gap={2}>
             {readOnly && (
-              <Alert
-                title={t(
-                  'dashboard-scene.delete-provisioned-dashboard-form.title-this-repository-is-read-only',
-                  'This repository is read only'
-                )}
-              >
-                <Trans i18nKey="dashboard-scene.delete-provisioned-dashboard-form.delete-read-only-file-message">
-                  This dashboard cannot be deleted directly from Grafana because the repository is read-only. To delete
-                  this dashboard, please remove the file from your Git repository.
-                </Trans>
-              </Alert>
+              <RepoInvalidStateBanner
+                noRepository={false}
+                isReadOnlyRepo={true}
+                readOnlyMessage="To delete this dashboard, please remove the file from your repository."
+              />
             )}
 
             <ResourceEditFormSharedFields
diff --git a/public/app/features/provisioning/hooks/useGetResourceRepositoryView.ts b/public/app/features/provisioning/hooks/useGetResourceRepositoryView.ts
index aaa13265ae7..3054b5bdf4b 100644
--- a/public/app/features/provisioning/hooks/useGetResourceRepositoryView.ts
+++ b/public/app/features/provisioning/hooks/useGetResourceRepositoryView.ts
@@ -5,6 +5,8 @@ import { Folder, useGetFolderQuery } from 'app/api/clients/folder/v1beta1';
 import { RepositoryView, useGetFrontendSettingsQuery } from 'app/api/clients/provisioning/v0alpha1';
 import { AnnoKeyManagerIdentity } from 'app/features/apiserver/types';
 
+import { getIsReadOnlyRepo } from '../utils/repository';
+
 interface GetResourceRepositoryArgs {
   name?: string; // the repository name
   folderName?: string; // folder we are targeting
@@ -15,6 +17,7 @@ interface RepositoryViewData {
   folder?: Folder;
   isLoading?: boolean;
   isInstanceManaged: boolean;
+  isReadOnlyRepo: boolean;
 }
 
 // This is safe to call as a viewer (you do not need full access to the Repository configs)
@@ -29,17 +32,17 @@ export const useGetResourceRepositoryView = ({ name, folderName }: GetResourceRe
   );
 
   if (!provisioningEnabled) {
-    return { isLoading: false, isInstanceManaged: false };
+    return { isLoading: false, isInstanceManaged: false, isReadOnlyRepo: false };
   }
 
   if (isSettingsLoading || isFolderLoading) {
-    return { isLoading: true, isInstanceManaged: false };
+    return { isLoading: true, isInstanceManaged: false, isReadOnlyRepo: false };
   }
 
   const items = settingsData?.items ?? [];
 
   if (!items.length) {
-    return { folder, isInstanceManaged: false };
+    return { folder, isInstanceManaged: false, isReadOnlyRepo: false };
   }
 
   const instanceRepo = items.find((repo) => repo.target === 'instance');
@@ -52,6 +55,7 @@ export const useGetResourceRepositoryView = ({ name, folderName }: GetResourceRe
         repository,
         folder,
         isInstanceManaged,
+        isReadOnlyRepo: getIsReadOnlyRepo(repository),
       };
     }
   }
@@ -65,6 +69,7 @@ export const useGetResourceRepositoryView = ({ name, folderName }: GetResourceRe
         repository,
         folder,
         isInstanceManaged,
+        isReadOnlyRepo: getIsReadOnlyRepo(repository),
       };
     }
 
@@ -77,6 +82,7 @@ export const useGetResourceRepositoryView = ({ name, folderName }: GetResourceRe
           repository,
           folder,
           isInstanceManaged,
+          isReadOnlyRepo: getIsReadOnlyRepo(repository),
         };
       }
     }
@@ -86,5 +92,6 @@ export const useGetResourceRepositoryView = ({ name, folderName }: GetResourceRe
     repository: instanceRepo,
     folder,
     isInstanceManaged,
+    isReadOnlyRepo: getIsReadOnlyRepo(instanceRepo),
   };
 };
diff --git a/public/app/features/provisioning/utils/repository.ts b/public/app/features/provisioning/utils/repository.ts
new file mode 100644
index 00000000000..4e33d5e3922
--- /dev/null
+++ b/public/app/features/provisioning/utils/repository.ts
@@ -0,0 +1,10 @@
+import { RepositoryView } from 'app/api/clients/provisioning/v0alpha1';
+
+export function getIsReadOnlyRepo(repository: RepositoryView | undefined): boolean {
+  if (!repository) {
+    return false;
+  }
+
+  // Repository is consider read-only if it has no workflows defined (workflows are required for write operations)
+  return repository.workflows.length === 0;
+}
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 2c040613239..06a31f3f782 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -3539,6 +3539,13 @@
       "button-move": "Move",
       "button-moving": "Moving...",
       "deleting": "Deleting",
+      "error": {
+        "read-only-message": "If you have direct access to the target, please make modifications directly in the target repository.",
+        "read-only-saving-message": "Repository is read-only and provisioned in git. {{readOnlyMessage}}",
+        "read-only-title": "This repository is read only",
+        "repository-not-found-message": "The repository for the selected folder could not be found. Please ensure that the folder is provisioned correctly.",
+        "repository-not-found-title": "Repository not found"
+      },
       "error-file-content-not-found": "File content not found",
       "error-path-not-found": "Path not found",
       "error-target-folder-path-missing": "Target folder path is missing",
@@ -3568,6 +3575,9 @@
       "select-checkbox": "Select",
       "tags-column": "Tags"
     },
+    "delete-folder": {
+      "read-only-message": "To delete this folder, please remove the folder from your repository."
+    },
     "delete-provisioned-folder-form": {
       "api-error": "Failed to delete folder",
       "button-cancel": "Cancel",
@@ -3611,6 +3621,9 @@
     "name-cell": {
       "no-items": "No items"
     },
+    "new-folder": {
+      "read-only-message": "To create this folder, please add the resource in your repository directly."
+    },
     "new-folder-form": {
       "cancel-label": "Cancel",
       "create-label": "Create",
@@ -5691,11 +5704,9 @@
       "api-error": "Failed to delete dashboard",
       "cancel-action": "Cancel",
       "delete-action": "Delete dashboard",
-      "delete-read-only-file-message": "This dashboard cannot be deleted directly from Grafana because the repository is read-only. To delete this dashboard, please remove the file from your Git repository.",
       "deleting": "Deleting...",
       "drawer-title": "Delete Provisioned Dashboard",
-      "success-message": "Dashboard deleted successfully",
-      "title-this-repository-is-read-only": "This repository is read only"
+      "success-message": "Dashboard deleted successfully"
     },
     "description-label": {
       "description": "Description"
@@ -6067,7 +6078,6 @@
       "api-error": "Error saving dashboard",
       "cancel": "Cancel",
       "cannot-be-saved": "This dashboard cannot be saved from the Grafana UI because it has been provisioned from another source. Copy the JSON or save it to a file below, then you can update your dashboard in the provisioning source.",
-      "copy-json-message": "If you have direct access to the target, copy the JSON and paste it there.",
       "copy-json-to-clipboard": "Copy JSON to clipboard",
       "file-path": "<0>File path:</0> {{filePath}}",
       "label-description": "Description",
@@ -6079,7 +6089,6 @@
       "see-docs": "See <2>documentation</2> for more information about provisioning.",
       "title-required": "Dashboard title is required",
       "title-same-as-folder": "Dashboard name cannot be the same as the folder name",
-      "title-this-repository-is-read-only": "This repository is read only",
       "title-validation-failed": "Dashboard title validation failed."
     },
     "scenes-new-rule-from-panel-button": {

From 054e0fb2082aafd38810063d84c15dddab8cc656 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Thu, 7 Aug 2025 15:34:54 +0200
Subject: [PATCH 022/243] DatasourcePicker: Include the number of datasources
 in reported event (#109185)

---
 .../PanelDataQueriesTab.test.tsx              |  1 +
 .../components/picker/DataSourceList.tsx      | 29 ++++++++++---------
 .../picker/DataSourceModal.test.tsx           |  1 +
 .../picker/DataSourcePicker.test.tsx          |  1 +
 .../components/picker/DataSourcePicker.tsx    | 28 +++++++++++++++---
 5 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx
index 241b37165b5..d48bf63a8d8 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx
@@ -241,6 +241,7 @@ jest.mock('@grafana/runtime', () => ({
       // if datasource is not found, return default instance settings
       return instance1SettingsMock;
     },
+    getList: () => [],
   }),
   config: {
     ...jest.requireActual('@grafana/runtime').config,
diff --git a/public/app/features/datasources/components/picker/DataSourceList.tsx b/public/app/features/datasources/components/picker/DataSourceList.tsx
index 1a79cbe103c..067c64fb250 100644
--- a/public/app/features/datasources/components/picker/DataSourceList.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceList.tsx
@@ -3,7 +3,7 @@ import { useRef } from 'react';
 import * as React from 'react';
 import { Observable } from 'rxjs';
 
-import { DataSourceInstanceSettings, DataSourceRef, GrafanaTheme2 } from '@grafana/data';
+import { DataSourceInstanceSettings, DataSourceJsonData, DataSourceRef, GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans } from '@grafana/i18n';
 import { getTemplateSrv } from '@grafana/runtime';
@@ -43,6 +43,7 @@ export interface DataSourceListProps {
   onClear?: () => void;
   onClickEmptyStateCTA?: () => void;
   enableKeyboardNavigation?: boolean;
+  dataSources?: Array<DataSourceInstanceSettings<DataSourceJsonData>>;
 }
 
 export function DataSourceList(props: DataSourceListProps) {
@@ -57,18 +58,20 @@ export function DataSourceList(props: DataSourceListProps) {
   const styles = getStyles(theme, selectedItemCssSelector);
 
   const { className, current, onChange, enableKeyboardNavigation, onClickEmptyStateCTA } = props;
-  const dataSources = useDatasources({
-    alerting: props.alerting,
-    annotations: props.annotations,
-    dashboard: props.dashboard,
-    logs: props.logs,
-    metrics: props.metrics,
-    mixed: props.mixed,
-    pluginId: props.pluginId,
-    tracing: props.tracing,
-    type: props.type,
-    variables: props.variables,
-  });
+  const dataSources =
+    props.dataSources ||
+    useDatasources({
+      alerting: props.alerting,
+      annotations: props.annotations,
+      dashboard: props.dashboard,
+      logs: props.logs,
+      metrics: props.metrics,
+      mixed: props.mixed,
+      pluginId: props.pluginId,
+      tracing: props.tracing,
+      type: props.type,
+      variables: props.variables,
+    });
 
   const [recentlyUsedDataSources, pushRecentlyUsedDataSource] = useRecentlyUsedDataSources();
   const filteredDataSources = props.filter ? dataSources.filter(props.filter) : dataSources;
diff --git a/public/app/features/datasources/components/picker/DataSourceModal.test.tsx b/public/app/features/datasources/components/picker/DataSourceModal.test.tsx
index ad535127d3b..39785614bdf 100644
--- a/public/app/features/datasources/components/picker/DataSourceModal.test.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceModal.test.tsx
@@ -163,6 +163,7 @@ describe('DataSourceDropdown', () => {
         onDismiss: () => {},
         current: mockDS1.name,
         ...filters,
+        dataSources: mockDSList,
       };
 
       getListMock.mockClear();
diff --git a/public/app/features/datasources/components/picker/DataSourcePicker.test.tsx b/public/app/features/datasources/components/picker/DataSourcePicker.test.tsx
index 75b238e76d7..eeef14c9532 100644
--- a/public/app/features/datasources/components/picker/DataSourcePicker.test.tsx
+++ b/public/app/features/datasources/components/picker/DataSourcePicker.test.tsx
@@ -82,6 +82,7 @@ jest.mock('../../hooks', () => {
   return {
     ...actual,
     useRecentlyUsedDataSources: () => [[mockDS2.name], pushRecentlyUsedDataSourceMock],
+    useDatasources: () => mockDSList,
   };
 });
 
diff --git a/public/app/features/datasources/components/picker/DataSourcePicker.tsx b/public/app/features/datasources/components/picker/DataSourcePicker.tsx
index d9ef259ac4f..37bdc3079ef 100644
--- a/public/app/features/datasources/components/picker/DataSourcePicker.tsx
+++ b/public/app/features/datasources/components/picker/DataSourcePicker.tsx
@@ -12,13 +12,13 @@ import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
 import { reportInteraction } from '@grafana/runtime';
-import { DataQuery, DataSourceRef } from '@grafana/schema';
+import { DataQuery, DataSourceJsonData, DataSourceRef } from '@grafana/schema';
 import { Button, Icon, Input, ModalsController, Portal, ScrollContainer, useStyles2 } from '@grafana/ui';
 import config from 'app/core/config';
 import { useKeyNavigationListener } from 'app/features/search/hooks/useSearchKeyboardSelection';
 import { defaultFileUploadQuery, GrafanaQuery } from 'app/plugins/datasource/grafana/types';
 
-import { useDatasource } from '../../hooks';
+import { useDatasource, useDatasources } from '../../hooks';
 
 import { DataSourceList } from './DataSourceList';
 import { DataSourceLogo, DataSourceLogoPlaceHolder } from './DataSourceLogo';
@@ -102,6 +102,18 @@ export function DataSourcePicker(props: DataSourcePickerProps) {
   const currentValue = Boolean(!current && noDefault) ? undefined : currentDataSourceInstanceSettings;
   const prefixIcon =
     filterTerm && isOpen ? <DataSourceLogoPlaceHolder /> : <DataSourceLogo dataSource={currentValue} />;
+  const dataSources = useDatasources({
+    alerting: props.alerting,
+    annotations: props.annotations,
+    dashboard: props.dashboard,
+    logs: props.logs,
+    metrics: props.metrics,
+    mixed: props.mixed,
+    pluginId: props.pluginId,
+    tracing: props.tracing,
+    type: props.type,
+    variables: props.variables,
+  });
 
   // the order of middleware is important!
   const middleware = [
@@ -235,6 +247,7 @@ export function DataSourcePicker(props: DataSourcePickerProps) {
             item: INTERACTION_ITEM.OPEN_DROPDOWN,
             creator_team: 'grafana_plugins_catalog',
             schema_version: '1.0.0',
+            total_configured: dataSources.length,
           });
         }}
       >
@@ -282,13 +295,17 @@ export function DataSourcePicker(props: DataSourcePickerProps) {
                 onClose();
                 if (ds.uid !== currentValue?.uid) {
                   onChange(ds, defaultQueries);
-                  reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.SELECT_DS, ds_type: ds.type });
+                  reportInteraction(INTERACTION_EVENT_NAME, {
+                    item: INTERACTION_ITEM.SELECT_DS,
+                    ds_type: ds.type,
+                  });
                 }
               }}
               onClose={onClose}
               onClickAddCSV={onClickAddCSV}
               onDismiss={onClose}
               onNavigateOutsiteFooter={onNavigateOutsiteFooter}
+              dataSources={dataSources}
             />
           </div>
         </Portal>
@@ -325,10 +342,11 @@ export interface PickerContentProps extends DataSourcePickerProps {
   onDismiss: () => void;
   footerRef: (element: HTMLElement | null) => void;
   onNavigateOutsiteFooter: (e: React.KeyboardEvent<HTMLButtonElement>) => void;
+  dataSources: Array<DataSourceInstanceSettings<DataSourceJsonData>>;
 }
 
 const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((props, ref) => {
-  const { filterTerm, onChange, onClose, onClickAddCSV, current, filter } = props;
+  const { filterTerm, onChange, onClose, onClickAddCSV, current, filter, dataSources } = props;
 
   const changeCallback = useCallback(
     (ds: DataSourceInstanceSettings) => {
@@ -360,6 +378,7 @@ const PickerContent = React.forwardRef<HTMLDivElement, PickerContentProps>((prop
               item: INTERACTION_ITEM.CONFIG_NEW_DS_EMPTY_STATE,
             })
           }
+          dataSources={dataSources}
         ></DataSourceList>
       </ScrollContainer>
       <FocusScope>
@@ -450,6 +469,7 @@ function Footer({ onClose, onChange, onClickAddCSV, ...props }: FooterProps) {
                   onChange(ds, defaultQueries);
                   hideModal();
                 },
+                dataSources: props.dataSources,
               });
               reportInteraction(INTERACTION_EVENT_NAME, { item: INTERACTION_ITEM.OPEN_ADVANCED_DS_PICKER });
             }}

From 696b1bcc69bc2a5fa14481610b4adb7a62430472 Mon Sep 17 00:00:00 2001
From: Miguel Palau <mpalauzarza@gmail.com>
Date: Thu, 7 Aug 2025 17:19:10 +0200
Subject: [PATCH 023/243] Plugin Extensions: DataSource Configuration
 Components (#108350)

* add the plan

* feat: Add plugin extension points for DataSource configuration components

- Add DataSourceConfigActions and DataSourceConfigStatus extension points
- Add PluginExtensionDataSourceConfigActionsContext and PluginExtensionDataSourceConfigStatusContext types
- Update EditDataSourceActions.tsx with plugin extension support and allowlist filtering
- Update DataSourceTestingStatus.tsx with dual extension point support (new + backward compatible)
- Create getDataSourceExtensionConfigs.tsx with example core extensions
- Update getCoreExtensionConfigurations.ts to include datasource extensions
- Implement grafana-owned plugin allowlist for security and quality control
- Support context-aware extensions based on datasource type and testing status
- Maintain backward compatibility with existing DataSourceConfigErrorStatus extension point
- Add proper TypeScript types and export them in index.ts

This enables grafana-owned plugins to provide contextual actions and status-specific integrations
within the datasource configuration workflow while maintaining security through plugin filtering.

* docs: Update specs.md with implementation status and lessons learned

- Add comprehensive implementation status section with completed features
- Document critical lessons learned during implementation:
  * Translation limitations in extension configurations
  * Plugin security through allowlist filtering
  * Extension registration timing constraints
  * TypeScript context type patterns
- Update implementation checklist with actual completion status
- Add detailed next steps and recommendations
- Include plugin development guidelines (do's and don'ts)
- Document architectural insights and patterns discovered
- Transform specs from theoretical design to practical implementation guide

This update serves as both historical record and developer guide for future
plugin extension work in Grafana.

* Add comprehensive tests for DataSource plugin extensions

- Add EditDataSourceActions.test.tsx with 12 tests covering:
  * Core Grafana actions functionality and permissions
  * Plugin extension rendering and interaction
  * Plugin allowlist filtering and security
  * Context passing and URL generation

- Add getDataSourceExtensionConfigs.test.tsx with 14 tests covering:
  * Core extension configurations for both extension points
  * Context filtering logic (datasource type, severity)
  * Error handling and graceful failures
  * Extension structure validation and type safety

Total: 26 tests passing, providing comprehensive coverage of the
DataSourceConfigActions and DataSourceConfigStatus extension points
implemented in previous commits.

* Update specs.md to reflect completed test implementation

- Mark unit testing phase as complete (26 tests added)
- Add comprehensive Test Implementation section documenting:
  * Test file details and coverage areas
  * Testing challenges and solutions discovered
  * Performance metrics and execution strategy
  * Command examples for running tests
- Update Success Metrics with concrete testing validation
- Update Next Steps to reflect testing completion
- Document new test files in Files Modified section

The plugin extensions implementation now has complete unit test
coverage for both DataSourceConfigActions and DataSourceConfigStatus
extension points with 26 passing tests.

* rm specs file

* lint

* refactor: replace 'any' types with proper TypeScript types in datasource extension tests

* tsc

* prettier: fix

* Fix datasource extension path format to resolve CI test failure

The troubleshooting link extension was using an invalid path format
'/docs/troubleshooting/datasources' which caused console.error during
test execution. Updated to proper Grafana core extension path format
'/a/grafana/docs/troubleshooting/datasources' to comply with plugin
extension validation rules.

* fix: DataSourceTestingStatus test failures

- Fix incorrect data-testid expectations to use proper e2e selectors
- Add contextSrv mock for hasAccessToExplore() dependency
- Create proper plugin links mock handling different extension points
- Update plugin link tests to use allowed plugin IDs
- Fix test logic to match actual component behavior for status/error links
- Add test coverage for non-allowed plugin filtering

All 10 tests now pass successfully.

* lint fix

* refactor: replace any types with proper TypeScript types in DataSourceTestingStatus test

- Replace any[] with PluginExtensionLink[] for statusLinks and errorLinks parameters
- Replace any with UsePluginLinksOptions for setPluginLinksHook callback parameter
- Add proper imports for PluginExtensionLink and UsePluginLinksOptions
- Improve type safety and IntelliSense support in tests

* rm brittle tests

* DataSource: Replace individual buttons with dropdown menu in EditDataSourceActions

- Convert LinkButton components to dropdown with Menu.Item components
- Add conditional rendering: show simple button when only one action, dropdown when multiple
- Use LinkButton for navigation and Button with dropdown icon for menu trigger
- Replace Trans components with t() function calls for Menu.Item labels
- Prevent PageHeader crowding when multiple plugin extensions are registered
- Maintain all existing functionality and tracking calls

* refactor: use configure() for dynamic datasource extension URLs

- Replace onClick handler with configure() function for dynamic path generation
- Use context to build monitoring tool URL with datasource UID
- Follows extension system design patterns for declarative configuration
- Removes manual window.open() in favor of automatic path handling

* refactor: use DataSourceConfigErrorStatus extension point for troubleshooting guide

Use the specific DataSourceConfigErrorStatus extension point instead of
DataSourceConfigStatus with conditional logic in configure function.
This simplifies the code by leveraging the right abstraction level.

* extract i18n

* lint:fix

* Revert "lint:fix"

This reverts commit 23cdb39672a289e251910983747e412f641bdc16.

* lint:fix

* fix: mock plugin extensions registry in variables utils test

Fixes console.error calls during test execution caused by plugin extension
registration failures. The test was failing on CI because the extensions
registry was trying to register link extensions with invalid configurations
during module import.

Solution: Mock the entire plugin extensions registry setup to prevent
side effects from interfering with the test execution.

* fix: mock plugin extensions registry in explore query test

Fixes console.error calls during test execution caused by plugin extension
registration failures. The test was failing on CI because the extensions
registry was trying to register link extensions with invalid configurations
during module import.

This applies the same fix as the variables utils test - mocking the entire
plugin extensions registry setup to prevent side effects from interfering
with the test execution.

* better fix

* Fix EditDataSourceActions test by mocking utils and handling dropdown UI

- Add missing mock for constructDataSourceExploreUrl from ../utils
- Update tests to interact with dropdown menu structure instead of expecting direct text
- Fix test logic to match component behavior: Actions dropdown when user has explore rights

* lint:fix

* refactor: extract duplicated allowedPluginIds to single source of truth

- Add ALLOWED_DATASOURCE_EXTENSION_PLUGINS constant to constants.ts
- Remove duplicate allowedPluginIds arrays from DataSourceTestingStatus and EditDataSourceActions
- Update both components to import and use the shared constant
- Improves maintainability and ensures consistency across datasource config components

* refactor: update datasource extension link configurations

- Change title and description for the metrics drilldown link to improve clarity
- Update the path for the metrics drilldown link to reflect the new routing structure
- Remove the troubleshooting guide link configuration to streamline the extension options

* removing unused config

* better dropdown

* fix: update EditDataSourceActions tests to match component implementation

- Fixed tests to expect core actions as separate buttons instead of dropdown
- Updated plugin extension tests to use 'Extensions' dropdown instead of 'Actions'
- Added test for Extensions dropdown visibility logic
- All 12 tests now passing

* lint:fix

* remove extra check

* Update ALLOWED_DATASOURCE_EXTENSION_PLUGINS documentation to clarify plugin contributions to datasource configuration pages

* feat: Convert Explore data button to dropdown when extensions are available

- When hasActions is empty: shows normal Explore data and Build dashboard buttons
- When hasActions is not empty: converts Explore data to dropdown with angle-down icon
- First dropdown item: 'Open in Explore View'
- Following items: extension links
- Build dashboard button remains unchanged
- Maintains existing tracking functionality and internationalization

* test: Update EditDataSourceActions tests for new dropdown implementation

- Update tests to work with new Explore data dropdown that includes extensions
- Replace references to 'Extensions' button with 'Explore data' dropdown
- Add test for 'Open in Explore View' menu item in dropdown
- Verify correct behavior when extensions are present vs absent
- All 13 tests now passing

* test: Add comprehensive test coverage for dropdown explore functionality

- Add test to verify explore action href when extensions are present
- Ensure both dropdown and direct link behaviors are tested
- Complete test coverage for new dropdown implementation

* translation

* compass icon for the explore item

* feat: refactor AlertSuccessMessage to accept extension links as props

- Move extension links from inline definition to props for better reusability
- Add proper TypeScript support for PluginExtensionLink types
- Improve component architecture by separating concerns
- Add extensionLinks styling to getStyles function for consistency
- Support both real extension links and custom link rendering in success messages

This improves the component's flexibility while maintaining type safety.

* lint:fix
---
 packages/grafana-data/src/index.ts            |   2 +
 .../src/types/pluginExtensions.ts             |  26 ++
 .../DataSourceTestingStatus.test.tsx          | 125 +++++--
 .../components/DataSourceTestingStatus.tsx    |  74 +++-
 .../components/EditDataSourceActions.test.tsx | 321 ++++++++++++++++++
 .../components/EditDataSourceActions.tsx      |  86 +++--
 public/app/features/datasources/constants.ts  |  19 ++
 public/locales/en-US/grafana.json             |   6 +-
 8 files changed, 608 insertions(+), 51 deletions(-)
 create mode 100644 public/app/features/datasources/components/EditDataSourceActions.test.tsx

diff --git a/packages/grafana-data/src/index.ts b/packages/grafana-data/src/index.ts
index b767026c7a2..c530b03a6aa 100644
--- a/packages/grafana-data/src/index.ts
+++ b/packages/grafana-data/src/index.ts
@@ -567,6 +567,8 @@ export {
   type PluginExtensionPanelContext,
   type PluginExtensionQueryEditorRowAdaptiveTelemetryV1Context,
   type PluginExtensionDataSourceConfigContext,
+  type PluginExtensionDataSourceConfigActionsContext,
+  type PluginExtensionDataSourceConfigStatusContext,
   type PluginExtensionCommandPaletteContext,
   type PluginExtensionOpenModalOptions,
   type PluginExtensionExposedComponentConfig,
diff --git a/packages/grafana-data/src/types/pluginExtensions.ts b/packages/grafana-data/src/types/pluginExtensions.ts
index 3ed7de0c766..788fd7b3135 100644
--- a/packages/grafana-data/src/types/pluginExtensions.ts
+++ b/packages/grafana-data/src/types/pluginExtensions.ts
@@ -194,7 +194,9 @@ export enum PluginExtensionPoints {
   CommandPalette = 'grafana/commandpalette/action',
   DashboardPanelMenu = 'grafana/dashboard/panel/menu',
   DataSourceConfig = 'grafana/datasources/config',
+  DataSourceConfigActions = 'grafana/datasources/config/actions',
   DataSourceConfigErrorStatus = 'grafana/datasources/config/error-status',
+  DataSourceConfigStatus = 'grafana/datasources/config/status',
   ExploreToolbarAction = 'grafana/explore/toolbar/action',
   UserProfileTab = 'grafana/user/profile/tab',
   TraceViewDetails = 'grafana/traceview/details',
@@ -271,6 +273,30 @@ export type DataSourceConfigErrorStatusContext = {
   };
 };
 
+export type PluginExtensionDataSourceConfigActionsContext = {
+  dataSource: {
+    type: string;
+    uid: string;
+    name: string;
+    typeName: string;
+  };
+};
+
+export type PluginExtensionDataSourceConfigStatusContext = {
+  dataSource: {
+    type: string;
+    uid: string;
+    name: string;
+    typeName: string;
+  };
+  testingStatus?: {
+    message?: string | null;
+    status?: string | null;
+    details?: Record<string, unknown>;
+  };
+  severity: 'success' | 'error' | 'warning' | 'info';
+};
+
 type Dashboard = {
   uid: string;
   title: string;
diff --git a/public/app/features/datasources/components/DataSourceTestingStatus.test.tsx b/public/app/features/datasources/components/DataSourceTestingStatus.test.tsx
index dec9658d72f..8308d8ed84c 100644
--- a/public/app/features/datasources/components/DataSourceTestingStatus.test.tsx
+++ b/public/app/features/datasources/components/DataSourceTestingStatus.test.tsx
@@ -1,12 +1,19 @@
 import { render, screen, fireEvent } from '@testing-library/react';
 
-import { PluginExtensionTypes } from '@grafana/data';
-import { setPluginLinksHook } from '@grafana/runtime';
+import { PluginExtensionTypes, PluginExtensionLink } from '@grafana/data';
+import { setPluginLinksHook, UsePluginLinksOptions } from '@grafana/runtime';
 
 import { getMockDataSource } from '../mocks/dataSourcesMocks';
 
 import { DataSourceTestingStatus, Props } from './DataSourceTestingStatus';
 
+// Mock contextSrv
+jest.mock('../../../core/core', () => ({
+  contextSrv: {
+    hasAccessToExplore: jest.fn(() => true),
+  },
+}));
+
 setPluginLinksHook(() => ({ links: [], isLoading: false }));
 
 const getProps = (partialProps?: Partial<Props>): Props => ({
@@ -34,8 +41,8 @@ describe('<DataSourceTestingStatus />', () => {
     render(<DataSourceTestingStatus {...props} />);
 
     expect(screen.getByText('Data source is definitely working')).toBeInTheDocument();
-    expect(screen.getByTestId('data-testid Alert success')).toBeInTheDocument();
-    expect(() => screen.getByTestId('data-testid Alert error')).toThrow();
+    expect(screen.getByTestId('data-testid Data source settings page Alert')).toBeInTheDocument();
+    expect(screen.queryByTestId('data-testid Alert error')).not.toBeInTheDocument();
   });
 
   it('should render successful message when testing status is uppercase "OK"', () => {
@@ -48,8 +55,8 @@ describe('<DataSourceTestingStatus />', () => {
     render(<DataSourceTestingStatus {...props} />);
 
     expect(screen.getByText('Data source is definitely working')).toBeInTheDocument();
-    expect(screen.getByTestId('data-testid Alert success')).toBeInTheDocument();
-    expect(() => screen.getByTestId('data-testid Alert error')).toThrow();
+    expect(screen.getByTestId('data-testid Data source settings page Alert')).toBeInTheDocument();
+    expect(screen.queryByTestId('data-testid Alert error')).not.toBeInTheDocument();
   });
 
   it('should render successful message when testing status is lowercase "ok"', () => {
@@ -62,8 +69,8 @@ describe('<DataSourceTestingStatus />', () => {
     render(<DataSourceTestingStatus {...props} />);
 
     expect(screen.getByText('Data source is definitely working')).toBeInTheDocument();
-    expect(screen.getByTestId('data-testid Alert success')).toBeInTheDocument();
-    expect(() => screen.getByTestId('data-testid Alert error')).toThrow();
+    expect(screen.getByTestId('data-testid Data source settings page Alert')).toBeInTheDocument();
+    expect(screen.queryByTestId('data-testid Alert error')).not.toBeInTheDocument();
   });
 
   it('should render error message when testing status is "error"', () => {
@@ -76,8 +83,8 @@ describe('<DataSourceTestingStatus />', () => {
     render(<DataSourceTestingStatus {...props} />);
 
     expect(screen.getByText('Data source is definitely NOT working')).toBeInTheDocument();
-    expect(screen.getByTestId('data-testid Alert error')).toBeInTheDocument();
-    expect(() => screen.getByTestId('data-testid Alert success')).toThrow();
+    expect(screen.getByTestId('data-testid Data source settings page Alert')).toBeInTheDocument();
+    expect(screen.queryByTestId('data-testid Alert success')).not.toBeInTheDocument();
   });
 
   it('should render info message when testing status is unknown', () => {
@@ -90,9 +97,9 @@ describe('<DataSourceTestingStatus />', () => {
     render(<DataSourceTestingStatus {...props} />);
 
     expect(screen.getByText('Data source is working')).toBeInTheDocument();
-    expect(screen.getByTestId('data-testid Alert info')).toBeInTheDocument();
-    expect(() => screen.getByTestId('data-testid Alert success')).toThrow();
-    expect(() => screen.getByTestId('data-testid Alert error')).toThrow();
+    expect(screen.getByTestId('data-testid Data source settings page Alert')).toBeInTheDocument();
+    expect(screen.queryByTestId('data-testid Alert success')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('data-testid Alert error')).not.toBeInTheDocument();
   });
 
   describe('Plugin links', () => {
@@ -111,24 +118,50 @@ describe('<DataSourceTestingStatus />', () => {
       type: PluginExtensionTypes.link as const,
       title: 'Test Link',
       description: 'Test link description',
-      pluginId: 'test-plugin',
+      pluginId: 'grafana-monitoring-app', // Use an allowed plugin ID
       path: '/test',
       onClick: jest.fn(),
       ...overrides,
     });
 
+    // Custom mock that can handle different extension points
+    const setupPluginLinksMock = (statusLinks: PluginExtensionLink[] = [], errorLinks: PluginExtensionLink[] = []) => {
+      setPluginLinksHook((params: UsePluginLinksOptions) => {
+        // Return different links based on the extension point ID
+        if (params.extensionPointId === 'grafana/datasources/config/status') {
+          return { links: statusLinks, isLoading: false };
+        } else if (params.extensionPointId === 'grafana/datasources/config/error-status') {
+          return { links: errorLinks, isLoading: false };
+        }
+        return { links: [], isLoading: false };
+      });
+    };
+
     afterEach(() => {
       // Reset the hook to default empty state
       setPluginLinksHook(() => ({ links: [], isLoading: false }));
     });
 
     it('should render plugin links when severity is error and links exist', () => {
-      const mockLinks = [
-        createMockPluginLink({ id: 'link1', path: 'http://example.com/help', title: 'Help Documentation' }),
-        createMockPluginLink({ id: 'link2', path: 'http://example.com/troubleshoot', title: 'Troubleshooting Guide' }),
+      const statusLinks = [
+        createMockPluginLink({
+          id: 'status-link1',
+          path: 'http://example.com/help',
+          title: 'Help Documentation',
+          pluginId: 'grafana-monitoring-app',
+        }),
       ];
 
-      setPluginLinksHook(() => ({ links: mockLinks, isLoading: false }));
+      const errorLinks = [
+        createMockPluginLink({
+          id: 'error-link1',
+          path: 'http://example.com/troubleshoot',
+          title: 'Troubleshooting Guide',
+          pluginId: 'grafana-troubleshooting-app',
+        }),
+      ];
+
+      setupPluginLinksMock(statusLinks, errorLinks);
 
       const props = getProps({
         testingStatus: {
@@ -151,16 +184,17 @@ describe('<DataSourceTestingStatus />', () => {
 
     it('should call onClick handler when plugin link is clicked', () => {
       const mockOnClick = jest.fn();
-      const mockLinks = [
+      const statusLinks = [
         createMockPluginLink({
-          id: 'link1',
+          id: 'status-link1',
           path: 'http://example.com/help',
           onClick: mockOnClick,
           title: 'Help Documentation',
+          pluginId: 'grafana-monitoring-app',
         }),
       ];
 
-      setPluginLinksHook(() => ({ links: mockLinks, isLoading: false }));
+      setupPluginLinksMock(statusLinks, []);
 
       const props = getProps({
         testingStatus: {
@@ -177,12 +211,26 @@ describe('<DataSourceTestingStatus />', () => {
       expect(mockOnClick).toHaveBeenCalledTimes(1);
     });
 
-    it('should NOT render plugin links when severity is not error even if links exist', () => {
-      const mockLinks = [
-        createMockPluginLink({ id: 'link1', path: 'http://example.com/help', title: 'Help Documentation' }),
+    it('should render status plugin links for non-error severity but NOT error-specific links', () => {
+      const statusLinks = [
+        createMockPluginLink({
+          id: 'status-link1',
+          path: 'http://example.com/help',
+          title: 'Status Help Documentation',
+          pluginId: 'grafana-monitoring-app',
+        }),
       ];
 
-      setPluginLinksHook(() => ({ links: mockLinks, isLoading: false }));
+      const errorLinks = [
+        createMockPluginLink({
+          id: 'error-link1',
+          path: 'http://example.com/error-help',
+          title: 'Error Help Documentation',
+          pluginId: 'grafana-troubleshooting-app',
+        }),
+      ];
+
+      setupPluginLinksMock(statusLinks, errorLinks);
 
       const props = getProps({
         testingStatus: {
@@ -193,6 +241,33 @@ describe('<DataSourceTestingStatus />', () => {
 
       render(<DataSourceTestingStatus {...props} />);
 
+      // Should render status links for success severity
+      expect(screen.getByText('Status Help Documentation')).toBeInTheDocument();
+      // Should NOT render error-specific links for success severity
+      expect(screen.queryByText('Error Help Documentation')).not.toBeInTheDocument();
+    });
+
+    it('should NOT render plugin links from non-allowed plugins', () => {
+      const statusLinks = [
+        createMockPluginLink({
+          id: 'status-link1',
+          path: 'http://example.com/help',
+          title: 'Help Documentation',
+          pluginId: 'not-allowed-plugin', // This should be filtered out
+        }),
+      ];
+
+      setupPluginLinksMock(statusLinks, []);
+
+      const props = getProps({
+        testingStatus: {
+          status: 'error',
+          message: 'Data source connection failed',
+        },
+      });
+
+      render(<DataSourceTestingStatus {...props} />);
+
       expect(screen.queryByText('Help Documentation')).not.toBeInTheDocument();
     });
   });
diff --git a/public/app/features/datasources/components/DataSourceTestingStatus.tsx b/public/app/features/datasources/components/DataSourceTestingStatus.tsx
index 813e2e55aa8..234a49c6635 100644
--- a/public/app/features/datasources/components/DataSourceTestingStatus.tsx
+++ b/public/app/features/datasources/components/DataSourceTestingStatus.tsx
@@ -1,7 +1,12 @@
 import { css, cx } from '@emotion/css';
 import { HTMLAttributes } from 'react';
 
-import { DataSourceSettings as DataSourceSettingsType, GrafanaTheme2, PluginExtensionPoints } from '@grafana/data';
+import {
+  DataSourceSettings as DataSourceSettingsType,
+  GrafanaTheme2,
+  PluginExtensionPoints,
+  PluginExtensionLink,
+} from '@grafana/data';
 import { sanitizeUrl } from '@grafana/data/internal';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
@@ -9,6 +14,7 @@ import { TestingStatus, config, usePluginLinks } from '@grafana/runtime';
 import { AlertVariant, Alert, useTheme2, Link, useStyles2 } from '@grafana/ui';
 
 import { contextSrv } from '../../../core/core';
+import { ALLOWED_DATASOURCE_EXTENSION_PLUGINS } from '../constants';
 import { trackCreateDashboardClicked } from '../tracking';
 
 export type Props = {
@@ -23,6 +29,7 @@ interface AlertMessageProps extends HTMLAttributes<HTMLDivElement> {
   exploreUrl: string;
   dataSourceId: string;
   onDashboardLinkClicked: () => void;
+  extensionLinks?: PluginExtensionLink[];
 }
 
 const getStyles = (theme: GrafanaTheme2, hasTitle: boolean) => {
@@ -37,10 +44,21 @@ const getStyles = (theme: GrafanaTheme2, hasTitle: boolean) => {
       pointerEvents: 'none',
       color: theme.colors.text.secondary,
     }),
+    extensionLinks: css({
+      display: 'inline-flex',
+      marginTop: theme.spacing(0.5),
+      gap: theme.spacing(1),
+    }),
   };
 };
 
-const AlertSuccessMessage = ({ title, exploreUrl, dataSourceId, onDashboardLinkClicked }: AlertMessageProps) => {
+const AlertSuccessMessage = ({
+  title,
+  exploreUrl,
+  dataSourceId,
+  onDashboardLinkClicked,
+  extensionLinks = [],
+}: AlertMessageProps) => {
   const theme = useTheme2();
 
   const hasTitle = Boolean(title);
@@ -72,6 +90,26 @@ const AlertSuccessMessage = ({ title, exploreUrl, dataSourceId, onDashboardLinkC
         </Link>
         .
       </Trans>
+
+      {/* Extension links for allowed datasource extension plugins */}
+      {extensionLinks.length > 0 && (
+        <div className={styles.extensionLinks}>
+          <Trans i18nKey="data-source-testing-status-page.success-more-details-links-extensions">
+            You can also explore data with the following extensions:
+          </Trans>
+          {extensionLinks.map((link) => (
+            <Link
+              key={link.id}
+              href={link.path || '#'}
+              title={link.description}
+              className="external-link"
+              onClick={'onClick' in link ? link.onClick : undefined}
+            >
+              {link.title}
+            </Link>
+          ))}
+        </div>
+      )}
     </div>
   );
 };
@@ -148,7 +186,24 @@ export function DataSourceTestingStatus({ testingStatus, exploreUrl, dataSource
     });
   };
   const styles = useStyles2(getTestingStatusStyles);
-  const { links } = usePluginLinks({
+
+  const { links: allStatusLinks } = usePluginLinks({
+    extensionPointId: PluginExtensionPoints.DataSourceConfigStatus,
+    context: {
+      dataSource: {
+        type: dataSource.type,
+        uid: dataSource.uid,
+        name: dataSource.name,
+        typeName: dataSource.typeName,
+      },
+      testingStatus,
+      severity,
+    },
+    limitPerPlugin: 1,
+  });
+
+  // Existing error-specific extensions (backward compatibility)
+  const { links: allErrorLinks } = usePluginLinks({
     extensionPointId: PluginExtensionPoints.DataSourceConfigErrorStatus,
     context: {
       dataSource: {
@@ -161,6 +216,13 @@ export function DataSourceTestingStatus({ testingStatus, exploreUrl, dataSource
     limitPerPlugin: 3,
   });
 
+  // Filter to only allow grafana-owned plugins
+  const statusLinks = allStatusLinks.filter((link) => ALLOWED_DATASOURCE_EXTENSION_PLUGINS.includes(link.pluginId));
+  const errorLinks = allErrorLinks.filter((link) => ALLOWED_DATASOURCE_EXTENSION_PLUGINS.includes(link.pluginId));
+
+  // Combine links: show error-specific only for errors, status-general for all
+  const extensionLinks = severity === 'error' ? [...statusLinks, ...errorLinks] : statusLinks;
+
   if (message) {
     return (
       <div className={cx('gf-form-group', styles.container)}>
@@ -174,6 +236,7 @@ export function DataSourceTestingStatus({ testingStatus, exploreUrl, dataSource
                   exploreUrl={exploreUrl}
                   dataSourceId={dataSource.uid}
                   onDashboardLinkClicked={onDashboardLinkClicked}
+                  extensionLinks={extensionLinks}
                 />
               ) : null}
               {severity === 'error' && errorDetailsLink ? <ErrorDetailsLink link={String(errorDetailsLink)} /> : null}
@@ -182,15 +245,16 @@ export function DataSourceTestingStatus({ testingStatus, exploreUrl, dataSource
               ) : null}
             </>
           )}
-          {severity === 'error' && links.length > 0 && (
+          {extensionLinks.length > 0 && (
             <div className={styles.linksContainer}>
-              {links.map((link) => {
+              {extensionLinks.map((link) => {
                 return (
                   <a
                     key={link.id}
                     href={link.path ? sanitizeUrl(link.path) : undefined}
                     onClick={link.onClick}
                     className={styles.pluginLink}
+                    title={link.description}
                   >
                     {link.title}
                   </a>
diff --git a/public/app/features/datasources/components/EditDataSourceActions.test.tsx b/public/app/features/datasources/components/EditDataSourceActions.test.tsx
new file mode 100644
index 00000000000..0bd748c900e
--- /dev/null
+++ b/public/app/features/datasources/components/EditDataSourceActions.test.tsx
@@ -0,0 +1,321 @@
+import { render, screen, fireEvent } from '@testing-library/react';
+
+import { PluginExtensionTypes, IconName } from '@grafana/data';
+import { setPluginLinksHook } from '@grafana/runtime';
+import { contextSrv } from 'app/core/services/context_srv';
+
+import { getMockDataSource } from '../mocks/dataSourcesMocks';
+
+import { EditDataSourceActions } from './EditDataSourceActions';
+
+// Mock dependencies
+jest.mock('app/core/services/context_srv');
+jest.mock('../utils', () => ({
+  constructDataSourceExploreUrl: jest.fn(
+    () => '/explore?left=%7B%22datasource%22:%22Test%20Prometheus%22,%22context%22:%22explore%22%7D'
+  ),
+}));
+
+// Set default plugin links hook
+setPluginLinksHook(() => ({ links: [], isLoading: false }));
+
+// Mock contextSrv
+const mockContextSrv = contextSrv as jest.Mocked<typeof contextSrv>;
+
+// Helper function to create mock plugin link extensions with all required properties
+const createMockPluginLink = (
+  overrides: Partial<{
+    id: string;
+    path: string;
+    onClick: jest.Mock;
+    title: string;
+    description: string;
+    pluginId: string;
+    icon?: IconName;
+  }> = {}
+) => ({
+  id: 'test-link',
+  type: PluginExtensionTypes.link as const,
+  title: 'Test Action',
+  description: 'Test action description',
+  pluginId: 'grafana-lokiexplore-app',
+  path: '/test-action',
+  onClick: jest.fn(),
+  ...overrides,
+});
+
+const mockDataSource = getMockDataSource({
+  uid: 'test-uid',
+  type: 'prometheus',
+  name: 'Test Prometheus',
+  typeName: 'Prometheus',
+});
+
+// Mock useDataSource hook
+jest.mock('../state/hooks', () => ({
+  useDataSource: () => mockDataSource,
+}));
+
+describe('EditDataSourceActions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // Reset plugin links hook to default
+    setPluginLinksHook(() => ({ links: [], isLoading: false }));
+    // Default contextSrv mock - user has explore rights
+    mockContextSrv.hasAccessToExplore.mockReturnValue(true);
+  });
+
+  describe('Core Actions', () => {
+    it('should render core Grafana actions when user has explore rights', async () => {
+      mockContextSrv.hasAccessToExplore.mockReturnValue(true);
+
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      // Core actions should be rendered as separate buttons
+      expect(screen.getByText('Explore data')).toBeInTheDocument();
+      expect(screen.getByText('Build a dashboard')).toBeInTheDocument();
+    });
+
+    it('should not render explore action when user lacks explore rights', () => {
+      mockContextSrv.hasAccessToExplore.mockReturnValue(false);
+
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      // Should render just the "Build a dashboard" button
+      expect(screen.getByText('Build a dashboard')).toBeInTheDocument();
+      // Should not render explore action
+      expect(screen.queryByText('Explore data')).not.toBeInTheDocument();
+    });
+
+    it('should have correct href for explore action when no extensions', () => {
+      // No extensions, so explore should be a direct link
+      setPluginLinksHook(() => ({ links: [], isLoading: false }));
+
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      const exploreLink = screen.getByText('Explore data').closest('a');
+      // The explore URL uses the datasource name, not uid, and includes context
+      expect(exploreLink).toHaveAttribute(
+        'href',
+        '/explore?left=%7B%22datasource%22:%22Test%20Prometheus%22,%22context%22:%22explore%22%7D'
+      );
+    });
+
+    it('should have correct href for explore action when extensions are present', () => {
+      // Extensions present, so explore should be a dropdown with "Open in Explore View"
+      const mockLinks = [
+        createMockPluginLink({
+          id: 'test-extension',
+          title: 'Test Extension',
+          pluginId: 'grafana-lokiexplore-app',
+        }),
+      ];
+
+      setPluginLinksHook(() => ({ links: mockLinks, isLoading: false }));
+
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      // Click to open dropdown
+      const exploreButton = screen.getByText('Explore data');
+      fireEvent.click(exploreButton);
+
+      const exploreViewLink = screen.getByText('Open in Explore View').closest('a');
+      // The explore URL uses the datasource name, not uid, and includes context
+      expect(exploreViewLink).toHaveAttribute(
+        'href',
+        '/explore?left=%7B%22datasource%22:%22Test%20Prometheus%22,%22context%22:%22explore%22%7D'
+      );
+    });
+
+    it('should have correct href for build dashboard action', () => {
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      const dashboardLink = screen.getByText('Build a dashboard').closest('a');
+      expect(dashboardLink).toHaveAttribute('href', 'dashboard/new-with-ds/test-uid');
+    });
+  });
+
+  describe('Plugin Extension Actions', () => {
+    it('should render plugin extension links from allowed plugins', () => {
+      const mockLinks = [
+        createMockPluginLink({
+          id: 'loki-explore',
+          title: 'Explore Logs',
+          pluginId: 'grafana-lokiexplore-app',
+          path: '/a/grafana-lokiexplore-app',
+        }),
+        createMockPluginLink({
+          id: 'traces-explore',
+          title: 'Explore Traces',
+          pluginId: 'grafana-exploretraces-app',
+          path: '/a/grafana-exploretraces-app',
+        }),
+      ];
+
+      setPluginLinksHook(() => ({ links: mockLinks, isLoading: false }));
+
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      // Click the Explore data dropdown to open the menu
+      const exploreButton = screen.getByText('Explore data');
+      fireEvent.click(exploreButton);
+
+      // Should have "Open in Explore View" as first item
+      expect(screen.getByText('Open in Explore View')).toBeInTheDocument();
+      // Should have extension links
+      expect(screen.getByText('Explore Logs')).toBeInTheDocument();
+      expect(screen.getByText('Explore Traces')).toBeInTheDocument();
+    });
+
+    it('should filter out links from non-allowed plugins', () => {
+      const mockLinks = [
+        createMockPluginLink({
+          id: 'allowed-plugin',
+          title: 'Allowed Action',
+          pluginId: 'grafana-lokiexplore-app', // Allowed
+        }),
+        createMockPluginLink({
+          id: 'disallowed-plugin',
+          title: 'Disallowed Action',
+          pluginId: 'some-random-plugin', // Not allowed
+        }),
+      ];
+
+      setPluginLinksHook(() => ({ links: mockLinks, isLoading: false }));
+
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      // Click the Explore data dropdown to open the menu
+      const exploreButton = screen.getByText('Explore data');
+      fireEvent.click(exploreButton);
+
+      expect(screen.getByText('Allowed Action')).toBeInTheDocument();
+      expect(screen.queryByText('Disallowed Action')).not.toBeInTheDocument();
+    });
+
+    it('should call usePluginLinks with correct parameters', () => {
+      // This test verifies the component calls usePluginLinks correctly
+      // We can't easily test the exact parameters without more complex mocking
+      // but we can verify the component renders without errors when links are provided
+      setPluginLinksHook(() => ({ links: [], isLoading: false }));
+
+      expect(() => {
+        render(<EditDataSourceActions uid="test-uid" />);
+      }).not.toThrow();
+    });
+
+    it('should handle plugin link onClick events', () => {
+      const mockOnClick = jest.fn();
+      const mockLinks = [
+        createMockPluginLink({
+          id: 'clickable-action',
+          title: 'Clickable Action',
+          onClick: mockOnClick,
+          pluginId: 'grafana-lokiexplore-app',
+        }),
+      ];
+
+      setPluginLinksHook(() => ({ links: mockLinks, isLoading: false }));
+
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      // Click the Explore data dropdown to open the menu
+      const exploreButton = screen.getByText('Explore data');
+      fireEvent.click(exploreButton);
+
+      const actionButton = screen.getByText('Clickable Action');
+      fireEvent.click(actionButton);
+
+      expect(mockOnClick).toHaveBeenCalledTimes(1);
+    });
+
+    it('should render extension links with correct attributes', () => {
+      const mockLinks = [
+        createMockPluginLink({
+          id: 'test-action',
+          title: 'Test Action',
+          description: 'Test description',
+          path: '/test-path',
+          icon: 'external-link-alt' as IconName,
+          pluginId: 'grafana-lokiexplore-app',
+        }),
+      ];
+
+      setPluginLinksHook(() => ({ links: mockLinks, isLoading: false }));
+
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      // Click the Explore data dropdown to open the menu
+      const exploreButton = screen.getByText('Explore data');
+      fireEvent.click(exploreButton);
+
+      const actionButton = screen.getByText('Test Action');
+      const linkElement = actionButton.closest('a');
+
+      expect(linkElement).toHaveAttribute('href', '/test-path');
+      // The description is passed as tooltip, which may not appear as a title attribute
+      // This is handled by the LinkButton component internally
+    });
+
+    it('should not render extensions when isLoading is true', () => {
+      const mockLinks = [
+        createMockPluginLink({
+          title: 'Should Not Appear',
+          pluginId: 'grafana-lokiexplore-app',
+        }),
+      ];
+
+      setPluginLinksHook(() => ({ links: mockLinks, isLoading: true }));
+
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      // When isLoading is true, Explore data should be a regular link, not a dropdown
+      const exploreElement = screen.getByText('Explore data');
+      const exploreLink = exploreElement.closest('a');
+      expect(exploreLink).toBeInTheDocument();
+
+      expect(screen.queryByText('Should Not Appear')).not.toBeInTheDocument();
+      // Core actions should still be there
+      expect(screen.getByText('Build a dashboard')).toBeInTheDocument();
+      expect(screen.getByText('Explore data')).toBeInTheDocument();
+    });
+
+    it('should handle empty extension links gracefully', () => {
+      setPluginLinksHook(() => ({ links: [], isLoading: false }));
+
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      // When there are no extension links, Explore data should be a regular link
+      const exploreElement = screen.getByText('Explore data');
+      const exploreLink = exploreElement.closest('a');
+      expect(exploreLink).toBeInTheDocument();
+
+      // Should render core actions without errors
+      expect(screen.getByText('Build a dashboard')).toBeInTheDocument();
+      expect(screen.getByText('Explore data')).toBeInTheDocument();
+    });
+
+    it('should render Explore dropdown when there are plugin links', () => {
+      const mockLinks = [
+        createMockPluginLink({
+          id: 'test-extension',
+          title: 'Test Extension',
+          pluginId: 'grafana-lokiexplore-app',
+        }),
+      ];
+
+      setPluginLinksHook(() => ({ links: mockLinks, isLoading: false }));
+
+      render(<EditDataSourceActions uid="test-uid" />);
+
+      // When there are extension links, Explore data should be a dropdown button
+      const exploreElement = screen.getByText('Explore data');
+      const exploreButton = exploreElement.closest('button');
+      expect(exploreButton).toBeInTheDocument();
+
+      // Core actions should still be there
+      expect(screen.getByText('Build a dashboard')).toBeInTheDocument();
+      expect(screen.getByText('Explore data')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/public/app/features/datasources/components/EditDataSourceActions.tsx b/public/app/features/datasources/components/EditDataSourceActions.tsx
index a2d18bb11f5..bc231a4c951 100644
--- a/public/app/features/datasources/components/EditDataSourceActions.tsx
+++ b/public/app/features/datasources/components/EditDataSourceActions.tsx
@@ -1,8 +1,10 @@
-import { Trans } from '@grafana/i18n';
-import { config } from '@grafana/runtime';
-import { LinkButton } from '@grafana/ui';
+import { PluginExtensionPoints } from '@grafana/data';
+import { Trans, t } from '@grafana/i18n';
+import { config, usePluginLinks } from '@grafana/runtime';
+import { Button, Dropdown, LinkButton, Menu, Icon } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
 
+import { ALLOWED_DATASOURCE_EXTENSION_PLUGINS } from '../constants';
 import { useDataSource } from '../state/hooks';
 import { trackCreateDashboardClicked, trackDsConfigClicked, trackExploreClicked } from '../tracking';
 import { constructDataSourceExploreUrl } from '../utils';
@@ -15,25 +17,71 @@ export function EditDataSourceActions({ uid }: Props) {
   const dataSource = useDataSource(uid);
   const hasExploreRights = contextSrv.hasAccessToExplore();
 
+  // Fetch plugin extension links
+  const { links: allLinks, isLoading } = usePluginLinks({
+    extensionPointId: PluginExtensionPoints.DataSourceConfigActions,
+    context: {
+      dataSource: {
+        type: dataSource.type,
+        uid: dataSource.uid,
+        name: dataSource.name,
+        typeName: dataSource.typeName,
+      },
+    },
+    limitPerPlugin: 1,
+  });
+
+  const links = allLinks.filter((link) => ALLOWED_DATASOURCE_EXTENSION_PLUGINS.includes(link.pluginId));
+
+  // Only render dropdown if there are multiple actions to show
+  const hasActions = !isLoading && links.length > 0;
+
+  const handleExploreClick = () => {
+    trackDsConfigClicked('explore');
+    trackExploreClicked({
+      grafana_version: config.buildInfo.version,
+      datasource_uid: dataSource.uid,
+      plugin_name: dataSource.typeName,
+      path: window.location.pathname,
+    });
+  };
+
+  const exploreMenu = (
+    <Menu>
+      <Menu.Item
+        label={t('datasources.edit-data-source-actions.open-in-explore', 'Open in Explore View')}
+        url={constructDataSourceExploreUrl(dataSource)}
+        onClick={handleExploreClick}
+        icon="compass"
+      />
+      {links.map((link) => (
+        <Menu.Item key={link.id} label={link.title} url={link.path} onClick={link.onClick} icon={link.icon} />
+      ))}
+    </Menu>
+  );
+
   return (
     <>
       {hasExploreRights && (
-        <LinkButton
-          variant="secondary"
-          size="sm"
-          href={constructDataSourceExploreUrl(dataSource)}
-          onClick={() => {
-            trackDsConfigClicked('explore');
-            trackExploreClicked({
-              grafana_version: config.buildInfo.version,
-              datasource_uid: dataSource.uid,
-              plugin_name: dataSource.typeName,
-              path: window.location.pathname,
-            });
-          }}
-        >
-          <Trans i18nKey="datasources.edit-data-source-actions.explore-data">Explore data</Trans>
-        </LinkButton>
+        <>
+          {!hasActions ? (
+            <LinkButton
+              variant="secondary"
+              size="sm"
+              href={constructDataSourceExploreUrl(dataSource)}
+              onClick={handleExploreClick}
+            >
+              <Trans i18nKey="datasources.edit-data-source-actions.explore-data">Explore data</Trans>
+            </LinkButton>
+          ) : (
+            <Dropdown overlay={exploreMenu}>
+              <Button variant="secondary" size="sm">
+                <Trans i18nKey="datasources.edit-data-source-actions.explore-data">Explore data</Trans>
+                <Icon name="angle-down" />
+              </Button>
+            </Dropdown>
+          )}
+        </>
       )}
       <LinkButton
         size="sm"
diff --git a/public/app/features/datasources/constants.ts b/public/app/features/datasources/constants.ts
index 1c7d5871fd4..6bd3c7c1a6a 100644
--- a/public/app/features/datasources/constants.ts
+++ b/public/app/features/datasources/constants.ts
@@ -10,3 +10,22 @@ export const DATASOURCES_ROUTES: DataSourcesRoutes = {
   Dashboards: '/datasources/edit/:uid/dashboards',
   New: '/datasources/new',
 } as const;
+
+/**
+ * Plugin IDs that are allowed to contribute extensions to:
+ * - DataSourceConfigActions (header action buttons)
+ * - DataSourceConfigStatus (testing status links)
+ * - DataSourceConfigErrorStatus (error help links)
+ *
+ * Note: These plugins cannot contribute to the main configuration form.
+ * For form components, see useDataSourceConfigPluginExtensions
+ * allowlist from the EditDataSource component.
+ */
+export const ALLOWED_DATASOURCE_EXTENSION_PLUGINS = [
+  'grafana-lokiexplore-app',
+  'grafana-exploretraces-app',
+  'grafana-metricsdrilldown-app',
+  'grafana-pyroscope-app',
+  'grafana-monitoring-app',
+  'grafana-troubleshooting-app',
+];
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 06a31f3f782..9c0de122a5c 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -6394,7 +6394,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Click <2>here</2> to learn more about this error.",
-    "success-more-details-links": "Next, you can start to visualize data by <2>building a dashboard</2>, or by querying data in the <5>Explore view</5>."
+    "success-more-details-links": "Next, you can start to visualize data by <2>building a dashboard</2>, or by querying data in the <5>Explore view</5>.",
+    "success-more-details-links-extensions": "You can also explore data with the following extensions:"
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6533,7 +6534,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Build a dashboard",
-      "explore-data": "Explore data"
+      "explore-data": "Explore data",
+      "open-in-explore": "Open in Explore View"
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "More details about the error"

From 89d6756c674c12c9e574acb5da90e3176c081eed Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Thu, 7 Aug 2025 17:25:12 +0200
Subject: [PATCH 024/243] Alerting: Filter out private labels before writing
 recording rules (#109295)

---
 pkg/services/ngalert/models/alert_rule.go     | 31 +++++++++++
 .../ngalert/models/alert_rule_test.go         | 51 +++++++++++++++++++
 .../ngalert/schedule/recording_rule.go        |  3 +-
 .../ngalert/schedule/recording_rule_test.go   | 48 +++++++++++++++++
 4 files changed, 132 insertions(+), 1 deletion(-)

diff --git a/pkg/services/ngalert/models/alert_rule.go b/pkg/services/ngalert/models/alert_rule.go
index 803bc65ba4f..b497b101e4d 100644
--- a/pkg/services/ngalert/models/alert_rule.go
+++ b/pkg/services/ngalert/models/alert_rule.go
@@ -124,6 +124,9 @@ func (r RuleType) String() string {
 }
 
 const (
+	// When adding new constants with __*__ pattern that are labels,
+	// you need to add them to PrivateLabelsToFilter below if they should be filtered out from recording rules.
+
 	// Annotations are actually a set of labels, so technically this is the label name of an annotation.
 	DashboardUIDAnnotation = "__dashboardUid__"
 	PanelIDAnnotation      = "__panelId__"
@@ -199,6 +202,15 @@ var (
 		AutogeneratedRouteReceiverNameLabel: {},
 		AutogeneratedRouteSettingsHashLabel: {},
 	}
+
+	// PrivateLabelsToFilter are internal labels that should be filtered out from recording rules.
+	// These labels are used internally by Grafana and should not appear in the final metrics.
+	PrivateLabelsToFilter = map[string]struct{}{
+		ConvertedPrometheusRuleLabel:        {},
+		AutogeneratedRouteLabel:             {},
+		AutogeneratedRouteReceiverNameLabel: {},
+		AutogeneratedRouteSettingsHashLabel: {},
+	}
 )
 
 // AlertRuleGroup is the base model for a rule group in unified alerting.
@@ -407,6 +419,25 @@ func WithoutInternalLabels() LabelOption {
 	}
 }
 
+// WithoutPrivateLabels returns a new map without private labels.
+// It filters out labels that are in PrivateLabelsToFilter set.
+func WithoutPrivateLabels(labels map[string]string) map[string]string {
+	if labels == nil {
+		return nil
+	}
+
+	result := make(map[string]string, len(labels))
+	for k, v := range labels {
+		// Check if it's in the explicit filter list
+		if _, shouldFilter := PrivateLabelsToFilter[k]; shouldFilter {
+			continue
+		}
+
+		result[k] = v
+	}
+	return result
+}
+
 func (alertRule *AlertRule) ImportedPrometheusRule() bool {
 	_, hasConvertedPrometheusRuleLabel := alertRule.GetLabels()[ConvertedPrometheusRuleLabel]
 	return hasConvertedPrometheusRuleLabel || alertRule.HasPrometheusRuleDefinition()
diff --git a/pkg/services/ngalert/models/alert_rule_test.go b/pkg/services/ngalert/models/alert_rule_test.go
index 326bd40cb4a..f6935ececbb 100644
--- a/pkg/services/ngalert/models/alert_rule_test.go
+++ b/pkg/services/ngalert/models/alert_rule_test.go
@@ -1348,3 +1348,54 @@ func TestAlertRule_ImportedPrometheusRule(t *testing.T) {
 		})
 	}
 }
+
+func TestWithoutPrivateLabels(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    map[string]string
+		expected map[string]string
+	}{
+		{
+			name:     "nil map",
+			input:    nil,
+			expected: nil,
+		},
+		{
+			name:     "empty map",
+			input:    map[string]string{},
+			expected: map[string]string{},
+		},
+		{
+			name: "removes only specific private labels",
+			input: map[string]string{
+				ConvertedPrometheusRuleLabel:        "removed",
+				AutogeneratedRouteLabel:             "removed",
+				AutogeneratedRouteReceiverNameLabel: "removed",
+				AutogeneratedRouteSettingsHashLabel: "removed",
+				DashboardUIDAnnotation:              "kept",
+				PanelIDAnnotation:                   "kept",
+				"__custom_label__":                  "kept", // User-defined labels with __ are kept
+				"normal_label":                      "kept",
+				"another_label":                     "kept",
+			},
+			expected: map[string]string{
+				"__custom_label__":     "kept",
+				"normal_label":         "kept",
+				"another_label":        "kept",
+				DashboardUIDAnnotation: "kept",
+				PanelIDAnnotation:      "kept",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			inputCopy := maps.Clone(tt.input)
+
+			result := WithoutPrivateLabels(tt.input)
+
+			require.Equal(t, tt.expected, result)
+			require.Equal(t, inputCopy, tt.input, "input map should not be modified")
+		})
+	}
+}
diff --git a/pkg/services/ngalert/schedule/recording_rule.go b/pkg/services/ngalert/schedule/recording_rule.go
index f0992873981..d931c502327 100644
--- a/pkg/services/ngalert/schedule/recording_rule.go
+++ b/pkg/services/ngalert/schedule/recording_rule.go
@@ -272,8 +272,9 @@ func (r *recordingRule) tryEvaluation(ctx context.Context, ev *Evaluation, logge
 		return nil
 	}
 
+	filteredLabels := ngmodels.WithoutPrivateLabels(ev.rule.Labels)
 	writeStart := r.clock.Now()
-	err = r.writer.WriteDatasource(ctx, ev.rule.Record.TargetDatasourceUID, ev.rule.Record.Metric, ev.scheduledAt, frames, ev.rule.OrgID, ev.rule.Labels)
+	err = r.writer.WriteDatasource(ctx, ev.rule.Record.TargetDatasourceUID, ev.rule.Record.Metric, ev.scheduledAt, frames, ev.rule.OrgID, filteredLabels)
 	writeDur := r.clock.Now().Sub(writeStart)
 
 	if err != nil {
diff --git a/pkg/services/ngalert/schedule/recording_rule_test.go b/pkg/services/ngalert/schedule/recording_rule_test.go
index 56cdf939dca..115da2e73d6 100644
--- a/pkg/services/ngalert/schedule/recording_rule_test.go
+++ b/pkg/services/ngalert/schedule/recording_rule_test.go
@@ -750,6 +750,54 @@ func testRecordingRule_Integration(t *testing.T, writeTarget *writer.TestRemoteW
 			require.Equal(t, "error", status.Health)
 		})
 	})
+
+	t.Run("rule with private labels filtered", func(t *testing.T) {
+		writeTarget.Reset()
+		rule := gen.With(withQueryForHealth("ok")).GenerateRef()
+		rule.Record.TargetDatasourceUID = dsUID
+		rule.Labels = map[string]string{
+			"normal_label":                             "value1",
+			"another_label":                            "value2",
+			models.AutogeneratedRouteLabel:             "filtered",
+			models.AutogeneratedRouteReceiverNameLabel: "filtered",
+			"__user_custom__":                          "not_filtered",
+			"only_end__":                               "not_filtered",
+		}
+
+		ruleStore.PutRule(context.Background(), rule)
+		folderTitle := ruleStore.getNamespaceTitle(rule.NamespaceUID)
+		ruleFactory := ruleFactoryFromScheduler(sch)
+
+		process := ruleFactory.new(context.Background(), rule)
+		evalDoneChan := make(chan time.Time)
+		process.(*recordingRule).evalAppliedHook = func(_ models.AlertRuleKey, t time.Time) {
+			evalDoneChan <- t
+		}
+		now := time.Now()
+
+		go func() {
+			_ = process.Run()
+		}()
+
+		process.Eval(&Evaluation{
+			scheduledAt: now,
+			rule:        rule,
+			folderTitle: folderTitle,
+		})
+		_ = waitForTimeChannel(t, evalDoneChan)
+
+		t.Run("write was performed with filtered labels", func(t *testing.T) {
+			require.Equal(t, 1, writeTarget.RequestsCount)
+			require.NotEmpty(t, writeTarget.LastRequestBody)
+
+			// Check that the body doesn't contain the private labels
+			require.NotContains(t, writeTarget.LastRequestBody, models.AutogeneratedRouteLabel)
+			require.NotContains(t, writeTarget.LastRequestBody, models.AutogeneratedRouteReceiverNameLabel)
+
+			require.Contains(t, writeTarget.LastRequestBody, "__user_custom__")
+			require.Contains(t, writeTarget.LastRequestBody, rule.Record.Metric)
+		})
+	})
 }
 
 func withQueryForHealth(health string) models.AlertRuleMutator {

From f888f610970bc9a708e9d6120eef9953bee4c2a0 Mon Sep 17 00:00:00 2001
From: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
Date: Thu, 7 Aug 2025 12:31:28 -0500
Subject: [PATCH 025/243] CI: remove unnecessary files from tarball (#109350)

* remove npm artifacts and storybook from targz

* fix small issue with docker verification
---
 .../daggerbuild/artifacts/package_targz.go    | 27 -------------------
 pkg/build/daggerbuild/docker/verify.go        |  5 +++-
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/pkg/build/daggerbuild/artifacts/package_targz.go b/pkg/build/daggerbuild/artifacts/package_targz.go
index 56ea04030b3..bf3fe4c2073 100644
--- a/pkg/build/daggerbuild/artifacts/package_targz.go
+++ b/pkg/build/daggerbuild/artifacts/package_targz.go
@@ -55,9 +55,7 @@ type Tarball struct {
 	// Dependent artifacts
 	Backend        *pipeline.Artifact
 	Frontend       *pipeline.Artifact
-	NPMPackages    *pipeline.Artifact
 	BundledPlugins *pipeline.Artifact
-	Storybook      *pipeline.Artifact
 }
 
 func NewTarballFromString(ctx context.Context, log *slog.Logger, artifact string, state pipeline.StateHandler) (*pipeline.Artifact, error) {
@@ -174,15 +172,6 @@ func NewTarball(
 		return nil, err
 	}
 
-	npmArtifact, err := NewNPMPackages(ctx, log, artifact, src, version, cache)
-	if err != nil {
-		return nil, err
-	}
-
-	storybookArtifact, err := NewStorybook(ctx, log, artifact, src, version, cache)
-	if err != nil {
-		return nil, err
-	}
 	tarball := &Tarball{
 		Name:         name,
 		Distribution: distro,
@@ -195,9 +184,7 @@ func NewTarball(
 
 		Backend:        backendArtifact,
 		Frontend:       frontendArtifact,
-		NPMPackages:    npmArtifact,
 		BundledPlugins: bundledPluginsArtifact,
-		Storybook:      storybookArtifact,
 	}
 
 	return pipeline.ArtifactWithLogging(ctx, log, &pipeline.Artifact{
@@ -239,16 +226,6 @@ func (t *Tarball) BuildFile(ctx context.Context, b *dagger.Container, opts *pipe
 		return nil, err
 	}
 
-	npmDir, err := opts.Store.Directory(ctx, t.NPMPackages)
-	if err != nil {
-		return nil, err
-	}
-
-	storybookDir, err := opts.Store.Directory(ctx, t.Storybook)
-	if err != nil {
-		return nil, err
-	}
-
 	pluginsDir, err := opts.Store.Directory(ctx, t.BundledPlugins)
 	if err != nil {
 		return nil, err
@@ -277,8 +254,6 @@ func (t *Tarball) BuildFile(ctx context.Context, b *dagger.Container, opts *pipe
 		targz.NewMappedDir("packaging/wrappers", grafanaDir.Directory("packaging/wrappers")),
 		targz.NewMappedDir("bin", backendDir),
 		targz.NewMappedDir("public", frontendDir),
-		targz.NewMappedDir("npm-artifacts", npmDir),
-		targz.NewMappedDir("storybook", storybookDir),
 		targz.NewMappedDir("plugins-bundled", pluginsDir),
 	}
 
@@ -329,9 +304,7 @@ func (t *Tarball) Dependencies(ctx context.Context) ([]*pipeline.Artifact, error
 	return []*pipeline.Artifact{
 		t.Backend,
 		t.Frontend,
-		t.NPMPackages,
 		t.BundledPlugins,
-		t.Storybook,
 	}, nil
 }
 
diff --git a/pkg/build/daggerbuild/docker/verify.go b/pkg/build/daggerbuild/docker/verify.go
index 56e8ff3118e..d3eec68fae4 100644
--- a/pkg/build/daggerbuild/docker/verify.go
+++ b/pkg/build/daggerbuild/docker/verify.go
@@ -40,7 +40,10 @@ func Verify(
 		WithExposedPort(3000)
 
 		// TODO: Add LICENSE to containers and implement validation
-	container, err := e2e.ValidatePackage(ctx, d, service.AsService(), src, yarnCache, nodeVersion)
+	container, err := e2e.ValidatePackage(ctx, d, service.AsService(dagger.ContainerAsServiceOpts{
+		UseEntrypoint: false,
+		Args:          []string{"grafana", "server"},
+	}), src, yarnCache, nodeVersion)
 	if err != nil {
 		return err
 	}

From e667dfed290b4e77c57f04d14f9a6aedc4a0fa8e Mon Sep 17 00:00:00 2001
From: owensmallwood <owen.smallwood@grafana.com>
Date: Thu, 7 Aug 2025 11:38:24 -0600
Subject: [PATCH 026/243] Unified Storage: Update index when
 indexqueueprocessor exists (#109351)

* Update readme

* When queue processor already exists, update the index on it in case it has been closed.

* Adds regression test.
---
 pkg/storage/unified/README.md               | 14 +++++--
 pkg/storage/unified/resource/search.go      |  2 +
 pkg/storage/unified/resource/search_test.go | 45 +++++++++++++++++++++
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/pkg/storage/unified/README.md b/pkg/storage/unified/README.md
index f60b6c937db..b33d2aa3660 100644
--- a/pkg/storage/unified/README.md
+++ b/pkg/storage/unified/README.md
@@ -296,6 +296,11 @@ docker in case you don't have one:
 docker run -d --name db -e "MYSQL_DATABASE=grafana" -e "MYSQL_USER=grafana" -e "MYSQL_PASSWORD=grafana" -e "MYSQL_ROOT_PASSWORD=root" -p 3306:3306 docker.io/bitnami/mysql:8.0.31
 ```
 
+or use our mysql docker block:
+```sh
+make devenv sources=mysql
+```
+
 ### 2. Create dedicated ini files for every service
 
 Example distributor ini file:
@@ -304,7 +309,7 @@ Example distributor ini file:
 * Bind and join `memberlist` on `127.0.0.1:7946` (default memberlist port)
 
 ```ini
-target = distributor
+target = search-server-distributor
 
 [server]
 http_port = 3000
@@ -404,6 +409,7 @@ path = grafana1.db
 [grafana-apiserver]
 address = 127.0.0.1:10000
 storage_type = unified-grpc
+search_server_address = 127.0.0.1:10000
 
 [server]
 protocol = http
@@ -443,9 +449,9 @@ Repeat for the other services.
 ./bin/grafana server target --config conf/storage-api-2.ini
 ./bin/grafana server target --config conf/storage-api-3.ini
 
-./bin/grafana server target --config conf/grafana1.ini
-./bin/grafana server target --config conf/grafana2.ini
-./bin/grafana server target --config conf/grafana3.ini
+./bin/grafana server --config conf/grafana1.ini
+./bin/grafana server --config conf/grafana2.ini
+./bin/grafana server --config conf/grafana3.ini
 ```
 
 etc
diff --git a/pkg/storage/unified/resource/search.go b/pkg/storage/unified/resource/search.go
index 4752fa35cec..f605acc7e80 100644
--- a/pkg/storage/unified/resource/search.go
+++ b/pkg/storage/unified/resource/search.go
@@ -943,6 +943,8 @@ func (s *searchSupport) getOrCreateIndexQueueProcessor(index ResourceIndex, nsr
 
 	key := fmt.Sprintf("%s/%s/%s", nsr.Namespace, nsr.Group, nsr.Resource)
 	if indexQueueProcessor, ok := s.indexQueueProcessors[key]; ok {
+		// index stored on existing processor may have been closed and rebuilt, so we need to update it
+		indexQueueProcessor.index = index
 		return indexQueueProcessor, nil
 	}
 
diff --git a/pkg/storage/unified/resource/search_test.go b/pkg/storage/unified/resource/search_test.go
index 677e24b8b8b..5f614b5d9e9 100644
--- a/pkg/storage/unified/resource/search_test.go
+++ b/pkg/storage/unified/resource/search_test.go
@@ -2,6 +2,8 @@ package resource
 
 import (
 	"context"
+	"fmt"
+	"log/slog"
 	"sync"
 	"testing"
 	"time"
@@ -387,6 +389,49 @@ func TestSearchGetOrCreateIndexWithCancellation(t *testing.T) {
 	require.NoError(t, err)
 }
 
+func TestSearchWillUpdateIndexOnQueueProcessor(t *testing.T) {
+	// Regression test: Indexes were being closed when being rebuilt, but not updated on the queue processor. This was causing new events to
+	// be added to a closed index, resulting in an error and missing docs in the index.
+
+	// Create mock components
+	mockIndex1 := &MockResourceIndex{}
+	mockIndex2 := &MockResourceIndex{} // Different index to test replacement
+	mockBuilder := &MockDocumentBuilder{}
+
+	// Create searchSupport instance
+	s := &searchSupport{
+		log:                       slog.Default(),
+		indexQueueProcessors:      make(map[string]*indexQueueProcessor),
+		indexQueueProcessorsMutex: sync.Mutex{},
+		indexEventsChan:           make(chan *IndexEvent, 10),
+	}
+
+	nsr := NamespacedResource{
+		Namespace: "test-namespace",
+		Group:     "test-group",
+		Resource:  "test-resource",
+	}
+
+	// Pre-populate the processor to avoid the builders.get() call
+	key := fmt.Sprintf("%s/%s/%s", nsr.Namespace, nsr.Group, nsr.Resource)
+	processor1 := newIndexQueueProcessor(mockIndex1, nsr, 10, mockBuilder, s.indexEventsChan)
+	s.indexQueueProcessors[key] = processor1
+
+	// Verify initial state
+	require.Same(t, mockIndex1, processor1.index)
+
+	// Call getOrCreateIndexQueueProcessor with a different index
+	// This should return the existing processor but update its index
+	processor2, err := s.getOrCreateIndexQueueProcessor(mockIndex2, nsr)
+	require.NoError(t, err)
+	require.NotNil(t, processor2)
+
+	// Same processor instance, but index was replaced
+	require.Same(t, processor1, processor2, "Should return the same processor instance")
+	require.Same(t, mockIndex2, processor2.index, "Index should be replaced with mockIndex2")
+	require.Same(t, mockIndex2, processor1.index, "Original processor should have updated index")
+}
+
 type slowSearchBackendWithCache struct {
 	mockSearchBackend
 	wg sync.WaitGroup

From 3920b25aeea954782553cc3ce93b627436db6d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Philippe=20Qu=C3=A9m=C3=A9ner?=
 <JohnnyQQQQ@users.noreply.github.com>
Date: Thu, 7 Aug 2025 21:56:17 +0200
Subject: [PATCH 027/243] feat(scheduler): add metric for time spend in queue
 (#109346)

---
 pkg/util/scheduler/queue.go | 38 +++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/pkg/util/scheduler/queue.go b/pkg/util/scheduler/queue.go
index f2c1458987f..0fdb9523334 100644
--- a/pkg/util/scheduler/queue.go
+++ b/pkg/util/scheduler/queue.go
@@ -23,9 +23,17 @@ var ErrTenantQueueFull = errors.New("tenant queue full")
 var ErrNilRunnable = errors.New("cannot enqueue nil runnable")
 var ErrMissingTenantID = errors.New("item requires TenantID")
 
+// queuedItem represents a runnable task annotated with its enqueue timestamp.
+// The timestamp allows us to compute how long the task spent waiting in the queue
+// before being picked up by a worker.
+type queuedItem struct {
+	runnable   func()
+	enqueuedAt time.Time
+}
+
 type tenantQueue struct {
 	id       string
-	items    []func()
+	items    []queuedItem
 	isActive bool
 }
 
@@ -43,7 +51,7 @@ func (tq *tenantQueue) isFull(maxSize int) bool {
 	return maxSize > 0 && len(tq.items) >= maxSize
 }
 func (tq *tenantQueue) addItem(runnable func()) {
-	tq.items = append(tq.items, runnable)
+	tq.items = append(tq.items, queuedItem{runnable: runnable, enqueuedAt: time.Now()})
 }
 
 type enqueueRequest struct {
@@ -106,7 +114,7 @@ type Queue struct {
 	// Metrics
 	queueLength       *prometheus.GaugeVec
 	discardedRequests *prometheus.CounterVec
-	enqueueDuration   prometheus.Histogram
+	queueWaitDuration *prometheus.HistogramVec
 }
 
 type QueueOptions struct {
@@ -148,11 +156,13 @@ func NewQueue(opts *QueueOptions) *Queue {
 		Name: "discarded_requests_total",
 		Help: "Total number of discarded requests",
 	}, []string{"tenant", "reason"})
-	q.enqueueDuration = promauto.With(opts.Registerer).NewHistogram(prometheus.HistogramOpts{
-		Name:    "enqueue_duration_seconds",
-		Help:    "Duration of enqueue operation in seconds",
-		Buckets: prometheus.DefBuckets,
-	})
+	q.queueWaitDuration = promauto.With(opts.Registerer).NewHistogramVec(prometheus.HistogramOpts{
+		Name:                            "queue_wait_duration_seconds",
+		Help:                            "Time items spend waiting in the queue before being dequeued, in seconds",
+		NativeHistogramBucketFactor:     1.1,
+		NativeHistogramMaxBucketNumber:  160,
+		NativeHistogramMinResetDuration: time.Hour,
+	}, []string{"tenant"})
 
 	q.Service = services.NewBasicService(nil, q.dispatcherLoop, q.stopping)
 
@@ -175,8 +185,11 @@ func (q *Queue) scheduleRoundRobin() {
 		tq := tenantElem.Value.(*tenantQueue)
 
 		// Get and deliver the runnable item
-		item := tq.items[0]
-		req.respChan <- dequeueResponse{runnable: item, err: nil}
+		qi := tq.items[0]
+		req.respChan <- dequeueResponse{runnable: qi.runnable, err: nil}
+
+		// Observe how long the item spent waiting in the queue.
+		q.queueWaitDuration.WithLabelValues(tq.id).Observe(time.Since(qi.enqueuedAt).Seconds())
 
 		// Update bookkeeping
 		q.pendingDequeueRequests.Remove(reqElem)
@@ -200,7 +213,7 @@ func (q *Queue) handleEnqueueRequest(req enqueueRequest) {
 	if !exists {
 		tq = &tenantQueue{
 			id:    req.tenantID,
-			items: make([]func(), 0, 8),
+			items: make([]queuedItem, 0, 8),
 		}
 		q.tenantQueues[req.tenantID] = tq
 	}
@@ -275,8 +288,6 @@ func (q *Queue) Enqueue(ctx context.Context, tenantID string, runnable func()) e
 		return ErrQueueClosed
 	}
 
-	start := time.Now()
-
 	respChan := make(chan error, 1)
 	req := enqueueRequest{
 		tenantID: tenantID,
@@ -295,7 +306,6 @@ func (q *Queue) Enqueue(ctx context.Context, tenantID string, runnable func()) e
 		q.discardedRequests.WithLabelValues(tenantID, "context_canceled").Inc()
 		err = ctx.Err()
 	}
-	q.enqueueDuration.Observe(time.Since(start).Seconds())
 
 	return err
 }

From 6ca8c6c6da061a9395045c11dfe9f62e761b366e Mon Sep 17 00:00:00 2001
From: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com>
Date: Thu, 7 Aug 2025 14:14:39 -0600
Subject: [PATCH 028/243] Dashboard Migrations: v25 & v24; migrate angular
 table  (#108826)

* Dashboard Migrations: V31 LabelsToFields-Merge Migration

* Dashboard Migrations: V32 No-op migration

* simplify

* Refactor to reduce nesting

* Dashboard Migrations: V30 value mappings and tooltip options

* Do not automigrate since graph is migrated in v27

* Refactor to reduce nesting

* Add test case for invalid mapping

* migrate to v29

* wip

* Fix tests

* fix output

* wip

* fix min version issue

* fix wire

* ignore gauge logic as it never get's executed

* add panel migration to test

* improvements

* update

* cleanup

* address mappings inconsistencies

* cleanup

* fix lint issues

* add cfg when initializing

* v27 migration

* migrate to v26

* preallocate array

* remove logic for grafana-singlestat because it's shared with stat logic; improve error handling and testing

* fix go lint

* don't preallocate; cleanup comments

* cleanup

* wip

* run internal provider function when getting a single panel

* clean up; add tests

* add tests for panel plugin service

* remove obsolete mock for getting panel plugin

* add tests for the whole pipeline

* fix test and lint

* fix test

* Fix missing scenarios

---------

Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
---
 .betterer.results                             |    3 +
 .../schemaversion/angular_migration.go        |   89 ++
 .../pkg/migration/schemaversion/migrations.go |    4 +-
 .../pkg/migration/schemaversion/v24.go        |  631 ++++++++
 .../pkg/migration/schemaversion/v24_test.go   |  823 ++++++++++
 .../pkg/migration/schemaversion/v25.go        |   49 +
 .../pkg/migration/schemaversion/v25_test.go   |   38 +
 .../pkg/migration/schemaversion/v28.go        |   36 +
 .../pkg/migration/schemaversion/v28_test.go   |   71 +-
 .../testdata/input/v24.table-angular.json     |  345 +++++
 .../testdata/input/v25.no-op-migration.json   |   56 +
 .../testdata/output/v24.table-angular.json    | 1334 +++++++++++++++++
 .../testdata/output/v25.no-op-migration.json  |   97 ++
 .../dashboard/pkg/migration/testutil/mocks.go |    4 +
 .../state/DashboardMigratorToBackend.test.ts  |   37 +-
 public/app/plugins/panel/table/migrations.ts  |    6 +-
 16 files changed, 3615 insertions(+), 8 deletions(-)
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/angular_migration.go
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v24.go
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v24_test.go
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v25.go
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v25_test.go
 create mode 100644 apps/dashboard/pkg/migration/testdata/input/v24.table-angular.json
 create mode 100644 apps/dashboard/pkg/migration/testdata/input/v25.no-op-migration.json
 create mode 100644 apps/dashboard/pkg/migration/testdata/output/v24.table-angular.json
 create mode 100644 apps/dashboard/pkg/migration/testdata/output/v25.no-op-migration.json

diff --git a/.betterer.results b/.betterer.results
index f8eaec8ae3f..8eae87a35fa 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2153,6 +2153,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "27"]
     ],
+    "public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
     "public/app/features/dashboard/state/DashboardModel.repeat.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
diff --git a/apps/dashboard/pkg/migration/schemaversion/angular_migration.go b/apps/dashboard/pkg/migration/schemaversion/angular_migration.go
new file mode 100644
index 00000000000..7dee79d8c29
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/angular_migration.go
@@ -0,0 +1,89 @@
+package schemaversion
+
+var notPersistedProperties = []string{
+	"events",
+	"isViewing",
+	"isEditing",
+	"isInView",
+	"hasRefreshed",
+	"cachedPluginOptions",
+	"plugin",
+	"queryRunner",
+	"replaceVariables",
+	"configRev",
+	"hasSavedPanelEditChange",
+	"getDisplayTitle",
+	"dataSupport",
+	"key",
+	"isNew",
+	"refreshWhenInView",
+}
+
+var mustKeepProperties = []string{
+	"id",
+	"gridPos",
+	"type",
+	"title",
+	"scopedVars",
+	"repeat",
+	"repeatPanelId",
+	"repeatDirection",
+	"repeatedByRow",
+	"minSpan",
+	"collapsed",
+	"panels",
+	"targets",
+	"datasource",
+	"timeFrom",
+	"timeShift",
+	"hideTimeOverride",
+	"description",
+	"links",
+	"fullscreen",
+	"isEditing",
+	"isViewing",
+	"hasRefreshed",
+	"events",
+	"cacheTimeout",
+	"queryCachingTTL",
+	"cachedPluginOptions",
+	"transparent",
+	"pluginVersion",
+	"queryRunner",
+	"transformations",
+	"fieldConfig",
+	"maxDataPoints",
+	"interval",
+	"replaceVariables",
+	"libraryPanel",
+	"getDisplayTitle",
+	"configRev",
+	"key",
+}
+
+// getOptionsToRemember returns a map of panel properties that should be remembered
+// during panel type changes, excluding notPersistedProperties and mustKeepProperties
+func getOptionsToRemember(panel map[string]interface{}) map[string]interface{} {
+	// Create sets for faster lookup
+	notPersistedSet := make(map[string]bool)
+	for _, prop := range notPersistedProperties {
+		notPersistedSet[prop] = true
+	}
+
+	mustKeepSet := make(map[string]bool)
+	for _, prop := range mustKeepProperties {
+		mustKeepSet[prop] = true
+	}
+
+	// Filter the panel properties
+	result := make(map[string]interface{})
+	for key, value := range panel {
+		// Skip properties that are in notPersistedProperties or mustKeepProperties
+		if notPersistedSet[key] || mustKeepSet[key] {
+			continue
+		}
+		result[key] = value
+	}
+
+	return result
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/migrations.go b/apps/dashboard/pkg/migration/schemaversion/migrations.go
index 1863661e133..c95b4d7a8a7 100644
--- a/apps/dashboard/pkg/migration/schemaversion/migrations.go
+++ b/apps/dashboard/pkg/migration/schemaversion/migrations.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	MIN_VERSION    = 25
+	MIN_VERSION    = 23
 	LATEST_VERSION = 41
 )
 
@@ -38,6 +38,8 @@ type PanelPluginInfoProvider interface {
 
 func GetMigrations(dsInfoProvider DataSourceInfoProvider, panelProvider PanelPluginInfoProvider) map[int]SchemaVersionMigrationFunc {
 	return map[int]SchemaVersionMigrationFunc{
+		24: V24(panelProvider),
+		25: V25,
 		26: V26,
 		27: V27,
 		28: V28(panelProvider),
diff --git a/apps/dashboard/pkg/migration/schemaversion/v24.go b/apps/dashboard/pkg/migration/schemaversion/v24.go
new file mode 100644
index 00000000000..15807d54697
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v24.go
@@ -0,0 +1,631 @@
+package schemaversion
+
+import (
+	"strconv"
+)
+
+// V24 migration migrates the angular table panel to the standard table panel
+// In the frontend, this is an auto-migration meaning that this angular panel is always migrated to table panel.
+// The backend replicates the complete frontend auto-migration logic since it cannot rely on frontend auto-migration.
+//
+// This migration performs:
+// 1. Converts 'styles' array to 'fieldConfig' with 'defaults' and 'overrides'
+// 2. Migrates thresholds and colors to new threshold format
+// 3. Converts column-specific styles to field overrides
+// 4. Migrates transformations from old format to new transformation system
+// 5. Handles various style properties: unit, decimals, alignment, color modes, links, date formatting, hidden columns
+// 6. Removes deprecated properties: styles, transform, columns
+
+// Example 1: Basic table with defaults
+// Before migration:
+// {
+//     "panels": [
+//         {
+//             "id": 1,
+//             "type": "table",
+//             "title": "Basic Table",
+//             "styles": [
+//                 {
+//                     "pattern": "/.*/",
+//                     "thresholds": ["10", "20", "30"],
+//                     "colors": ["green", "yellow", "red"],
+//                     "unit": "bytes",
+//                     "decimals": 2
+//                 }
+//             ],
+//             "targets": [{ "refId": "A" }]
+//         }
+//     ]
+// }
+//
+// After migration:
+// {
+//     "panels": [
+//         {
+//             "id": 1,
+//             "type": "table",
+//             "title": "Basic Table",
+//             "fieldConfig": {
+//                 "defaults": {
+//                     "unit": "bytes",
+//                     "decimals": 2,
+//                     "custom": {},
+//                     "thresholds": {
+//                         "mode": "absolute",
+//                         "steps": [
+//                             { "color": "green", "value": null },
+//                             { "color": "green", "value": 10 },
+//                             { "color": "yellow", "value": 20 },
+//                             { "color": "red", "value": 30 }
+//                         ]
+//                     }
+//                 },
+//                 "overrides": []
+//             },
+//             "transformations": [],
+//             "targets": [{ "refId": "A" }],
+//             "pluginVersion": "1.0.0"
+//         }
+//     ]
+// }
+
+// Example 2: Complex table with overrides and transformations
+// Before migration:
+// {
+//     "panels": [
+//         {
+//             "id": 2,
+//             "type": "table",
+//             "title": "Complex Table",
+//             "styles": [
+//                 {
+//                     "pattern": "/.*/",
+//                     "unit": "percent",
+//                     "align": "center",
+//                     "colorMode": "cell"
+//                 },
+//                 {
+//                     "pattern": "Status",
+//                     "alias": "Current Status",
+//                     "colorMode": "value",
+//                     "align": "left"
+//                 },
+//                 {
+//                     "pattern": "/Error.*/",
+//                     "link": true,
+//                     "linkUrl": "http://example.com/errors",
+//                     "linkTooltip": "View errors",
+//                     "linkTargetBlank": true
+//                 },
+//                 {
+//                     "pattern": "Time",
+//                     "type": "date",
+//                     "dateFormat": "YYYY-MM-DD HH:mm:ss",
+//                     "alias": "Timestamp"
+//                 },
+//                 {
+//                     "pattern": "Hidden",
+//                     "type": "hidden"
+//                 }
+//             ],
+//             "transform": "timeseries_aggregations",
+//             "columns": [
+//                 { "value": "avg", "text": "Average" },
+//                 { "value": "max", "text": "Maximum" }
+//             ],
+//             "targets": [{ "refId": "A" }]
+//         }
+//     ]
+// }
+//
+// After migration:
+// {
+//     "panels": [
+//         {
+//             "id": 2,
+//             "type": "table",
+//             "title": "Complex Table",
+//             "fieldConfig": {
+//                 "defaults": {
+//                     "unit": "percent",
+//                     "custom": {
+//                         "align": "center",
+//                         "cellOptions": { "type": "color-background" }
+//                     }
+//                 },
+//                 "overrides": [
+//                     {
+//                         "matcher": { "id": "byName", "options": "Status" },
+//                         "properties": [
+//                             { "id": "displayName", "value": "Current Status" },
+//                             { "id": "custom.cellOptions", "value": { "type": "color-text" } },
+//                             { "id": "custom.align", "value": "left" }
+//                         ]
+//                     },
+//                     {
+//                         "matcher": { "id": "byRegexp", "options": "/Error.*/" },
+//                         "properties": [
+//                             {
+//                                 "id": "links",
+//                                 "value": [{
+//                                     "title": "View errors",
+//                                     "url": "http://example.com/errors",
+//                                     "targetBlank": true
+//                                 }]
+//                             }
+//                         ]
+//                     },
+//                     {
+//                         "matcher": { "id": "byName", "options": "Time" },
+//                         "properties": [
+//                             { "id": "displayName", "value": "Timestamp" },
+//                             { "id": "unit", "value": "time: YYYY-MM-DD HH:mm:ss" }
+//                         ]
+//                     },
+//                     {
+//                         "matcher": { "id": "byName", "options": "Hidden" },
+//                         "properties": [
+//                             { "id": "custom.hidden", "value": true }
+//                         ]
+//                     }
+//                 ]
+//             },
+//             "transformations": [
+//                 {
+//                     "id": "reduce",
+//                     "options": {
+//                         "reducers": ["mean", "max"],
+//                         "includeTimeField": false
+//                     }
+//                 }
+//             ],
+//             "targets": [{ "refId": "A" }],
+//             "pluginVersion": "1.0.0"
+//         }
+//     ]
+// }
+
+type v24Migrator struct {
+	panelProvider PanelPluginInfoProvider
+	panelPlugins  []PanelPluginInfo
+}
+
+func V24(panelProvider PanelPluginInfoProvider) SchemaVersionMigrationFunc {
+	migrator := &v24Migrator{
+		panelProvider: panelProvider,
+		panelPlugins:  panelProvider.GetPanels(),
+	}
+
+	return migrator.migrate
+}
+
+func (m *v24Migrator) migrate(dashboard map[string]interface{}) error {
+	dashboard["schemaVersion"] = 24
+
+	panels, ok := dashboard["panels"].([]interface{})
+	if !ok {
+		return nil
+	}
+
+	for _, panel := range panels {
+		panelMap, ok := panel.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		wasAngularTable := panelMap["type"] == "table"
+		wasReactTable := panelMap["table"] == "table2"
+
+		if wasAngularTable && panelMap["styles"] == nil {
+			continue
+		}
+
+		if !wasAngularTable || wasReactTable {
+			continue
+		}
+
+		// Find if the panel plugin exists
+		tablePanelPlugin := m.panelProvider.GetPanelPlugin("table")
+		if tablePanelPlugin.ID == "" {
+			return NewMigrationError("table panel plugin not found when migrating dashboard to schema version 24", 24, LATEST_VERSION)
+		}
+		panelMap["pluginVersion"] = tablePanelPlugin.Version
+		err := tablePanelChangedHandler(panelMap)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func tablePanelChangedHandler(panel map[string]interface{}) error {
+	prevOptions := getOptionsToRemember(panel)
+
+	transformations := migrateTransformations(panel, prevOptions)
+
+	prevDefaults := findDefaultStyle(prevOptions)
+	defaults := migrateDefaults(prevDefaults)
+
+	overrides := findNonDefaultStyles(prevOptions)
+
+	if len(overrides) == 0 {
+		overrides = []interface{}{}
+	}
+
+	panel["transformations"] = transformations
+	panel["fieldConfig"] = map[string]interface{}{
+		"defaults":  defaults,
+		"overrides": overrides,
+	}
+
+	// Add default table panel options to match frontend behavior
+	panel["options"] = map[string]interface{}{
+		"cellHeight": "sm",
+		"footer": map[string]interface{}{
+			"countRows": false,
+			"fields":    "",
+			"reducer":   []interface{}{"sum"},
+			"show":      false,
+		},
+		"showHeader": true,
+	}
+
+	// Remove deprecated properties
+	delete(panel, "styles")
+	delete(panel, "transform")
+	delete(panel, "columns")
+
+	return nil
+}
+
+// findDefaultStyle finds the style with pattern '/.*/' (default style)
+func findDefaultStyle(prevOptions map[string]interface{}) map[string]interface{} {
+	if styles, ok := prevOptions["styles"].([]interface{}); ok {
+		for _, style := range styles {
+			if styleMap, ok := style.(map[string]interface{}); ok {
+				if pattern, ok := styleMap["pattern"].(string); ok && pattern == "/.*/" {
+					return styleMap
+				}
+			}
+		}
+	}
+	return nil
+}
+
+// findNonDefaultStyles finds all styles that don't have pattern '/.*/'
+func findNonDefaultStyles(prevOptions map[string]interface{}) []interface{} {
+	var overrides []interface{}
+
+	if styles, ok := prevOptions["styles"].([]interface{}); ok {
+		for _, style := range styles {
+			if styleMap, ok := style.(map[string]interface{}); ok {
+				if pattern, ok := styleMap["pattern"].(string); ok && pattern != "/.*/" {
+					override := migrateTableStyleToOverride(styleMap)
+					overrides = append(overrides, override)
+				}
+			}
+		}
+	}
+	return overrides
+}
+
+// migrateTransformations converts old table transformations to new format
+func migrateTransformations(panel map[string]interface{}, oldOpts map[string]interface{}) []interface{} {
+	transformations := []interface{}{}
+	if existing, ok := panel["transformations"].([]interface{}); ok {
+		transformations = existing
+	}
+
+	// Check if oldOpts has a transform that we can map
+	if transform, ok := oldOpts["transform"].(string); ok {
+		if newTransformID, exists := transformsMap[transform]; exists {
+			opts := map[string]interface{}{
+				"reducers": []interface{}{},
+			}
+
+			// Handle timeseries_aggregations specifically
+			if transform == "timeseries_aggregations" {
+				opts["includeTimeField"] = false
+
+				// Map columns to reducers
+				if columns, ok := oldOpts["columns"].([]interface{}); ok {
+					var reducers []interface{}
+					for _, column := range columns {
+						if columnMap, ok := column.(map[string]interface{}); ok {
+							if value, ok := columnMap["value"].(string); ok {
+								if reducer, exists := columnsMap[value]; exists {
+									reducers = append(reducers, reducer)
+								}
+							}
+						}
+					}
+					opts["reducers"] = reducers
+				}
+			}
+
+			// Add the transformation
+			transformation := map[string]interface{}{
+				"id":      newTransformID,
+				"options": opts,
+			}
+			transformations = append(transformations, transformation)
+		}
+	}
+
+	return transformations
+}
+
+// transformsMap maps old transform names to new transformation IDs
+var transformsMap = map[string]string{
+	"timeseries_to_rows":      "seriesToRows",
+	"timeseries_to_columns":   "seriesToColumns",
+	"timeseries_aggregations": "reduce",
+	"table":                   "merge",
+}
+
+// columnsMap maps old column values to new reducer names
+var columnsMap = map[string]string{
+	"avg":     "mean",
+	"min":     "min",
+	"max":     "max",
+	"total":   "sum",
+	"current": "lastNotNull",
+	"count":   "count",
+}
+
+// migrateTableStyleToOverride converts a table style to a field config override
+func migrateTableStyleToOverride(style map[string]interface{}) map[string]interface{} {
+	pattern, _ := style["pattern"].(string)
+
+	// Determine field matcher ID based on pattern
+	fieldMatcherID := "byName"
+	if pattern != "" && len(pattern) >= 2 && pattern[0] == '/' && pattern[len(pattern)-1] == '/' {
+		fieldMatcherID = "byRegexp"
+	}
+
+	override := map[string]interface{}{
+		"matcher": map[string]interface{}{
+			"id":      fieldMatcherID,
+			"options": pattern,
+		},
+		"properties": []interface{}{},
+	}
+
+	properties := override["properties"].([]interface{})
+
+	// Add display name
+	if alias, ok := style["alias"].(string); ok && alias != "" {
+		properties = append(properties, map[string]interface{}{
+			"id":    "displayName",
+			"value": alias,
+		})
+	}
+
+	// Add unit
+	if unit, ok := style["unit"].(string); ok && unit != "" {
+		properties = append(properties, map[string]interface{}{
+			"id":    "unit",
+			"value": unit,
+		})
+	}
+
+	// Add decimals
+	if decimals, ok := style["decimals"].(float64); ok {
+		properties = append(properties, map[string]interface{}{
+			"id":    "decimals",
+			"value": int(decimals),
+		})
+	} else if decimals, ok := style["decimals"].(int); ok {
+		properties = append(properties, map[string]interface{}{
+			"id":    "decimals",
+			"value": decimals,
+		})
+	}
+
+	// Handle date type
+	if styleType, ok := style["type"].(string); ok && styleType == "date" {
+		if dateFormat, ok := style["dateFormat"].(string); ok {
+			properties = append(properties, map[string]interface{}{
+				"id":    "unit",
+				"value": "time: " + dateFormat,
+			})
+		}
+	}
+
+	// Handle hidden type
+	if styleType, ok := style["type"].(string); ok && styleType == "hidden" {
+		properties = append(properties, map[string]interface{}{
+			"id":    "custom.hidden",
+			"value": true,
+		})
+	}
+
+	// Handle links
+	if link, ok := style["link"].(bool); ok && link {
+		linkTooltip, _ := style["linkTooltip"].(string)
+		linkUrl, _ := style["linkUrl"].(string)
+		linkTargetBlank, _ := style["linkTargetBlank"].(bool)
+
+		properties = append(properties, map[string]interface{}{
+			"id": "links",
+			"value": []interface{}{
+				map[string]interface{}{
+					"title":       linkTooltip,
+					"url":         linkUrl,
+					"targetBlank": linkTargetBlank,
+				},
+			},
+		})
+	}
+
+	// Handle color mode
+	if colorMode, ok := style["colorMode"].(string); ok && colorMode != "" {
+		if newColorMode, exists := colorModeMap[colorMode]; exists {
+			properties = append(properties, map[string]interface{}{
+				"id": "custom.cellOptions",
+				"value": map[string]interface{}{
+					"type": newColorMode,
+				},
+			})
+		}
+	}
+
+	// Handle alignment
+	if align, ok := style["align"].(string); ok && align != "" {
+		alignValue := align
+		if align == "auto" {
+			alignValue = ""
+		}
+		properties = append(properties, map[string]interface{}{
+			"id":    "custom.align",
+			"value": alignValue,
+		})
+	}
+
+	// Handle thresholds
+	if thresholds, ok := style["thresholds"].([]interface{}); ok && len(thresholds) > 0 {
+		if colors, ok := style["colors"].([]interface{}); ok && len(colors) > 0 {
+			steps := generateThresholds(thresholds, colors)
+			properties = append(properties, map[string]interface{}{
+				"id": "thresholds",
+				"value": map[string]interface{}{
+					"mode":  "absolute",
+					"steps": steps,
+				},
+			})
+		}
+	}
+
+	override["properties"] = properties
+	return override
+}
+
+// migrateDefaults converts default table styles to field config defaults
+func migrateDefaults(prevDefaults map[string]interface{}) map[string]interface{} {
+	defaults := map[string]interface{}{
+		"custom": map[string]interface{}{
+			"align": "auto",
+			"cellOptions": map[string]interface{}{
+				"type": "auto",
+			},
+			"inspect": false,
+		},
+		"mappings": []interface{}{},
+	}
+
+	// Only add default thresholds if we have prevDefaults (meaning this is a table panel being migrated)
+	// and no specific thresholds exist in prevDefaults
+	hasThresholds := false
+	if prevDefaults != nil {
+		if thresholds, ok := prevDefaults["thresholds"].([]interface{}); ok && len(thresholds) > 0 {
+			hasThresholds = true
+		}
+
+		// Only add default thresholds for table panels (when prevDefaults exists) without existing thresholds
+		if !hasThresholds {
+			defaults["thresholds"] = map[string]interface{}{
+				"mode": "absolute",
+				"steps": []interface{}{
+					map[string]interface{}{"color": "green"},
+					map[string]interface{}{"color": "red", "value": 80},
+				},
+			}
+		}
+	}
+
+	if prevDefaults == nil {
+		return defaults
+	}
+
+	if unit, ok := prevDefaults["unit"].(string); ok && unit != "" {
+		defaults["unit"] = unit
+	}
+
+	if decimals, ok := prevDefaults["decimals"].(float64); ok {
+		defaults["decimals"] = int(decimals)
+	}
+
+	if alias, ok := prevDefaults["alias"].(string); ok && alias != "" {
+		defaults["displayName"] = alias
+	}
+
+	if align, ok := prevDefaults["align"].(string); ok && align != "" {
+		alignValue := align
+		if align == "auto" {
+			alignValue = ""
+		}
+		defaults["custom"].(map[string]interface{})["align"] = alignValue
+	}
+
+	if thresholds, ok := prevDefaults["thresholds"].([]interface{}); ok && len(thresholds) > 0 {
+		if colors, ok := prevDefaults["colors"].([]interface{}); ok && len(colors) > 0 {
+			steps := generateThresholds(thresholds, colors)
+			defaults["thresholds"] = map[string]interface{}{
+				"mode":  "absolute",
+				"steps": steps,
+			}
+		}
+	}
+
+	if colorMode, ok := prevDefaults["colorMode"].(string); ok && colorMode != "" {
+		if newColorMode, exists := colorModeMap[colorMode]; exists {
+			defaults["custom"].(map[string]interface{})["cellOptions"] = map[string]interface{}{
+				"type": newColorMode,
+			}
+		}
+	}
+
+	return defaults
+}
+
+func generateThresholds(thresholds []interface{}, colors []interface{}) []interface{} {
+	steps := []interface{}{}
+
+	// Add the base step (equivalent to -Infinity)
+	var baseColor interface{} = "red" // default fallback
+	if len(colors) > 0 && colors[0] != nil {
+		baseColor = colors[0]
+	}
+
+	steps = append(steps, map[string]interface{}{
+		"color": baseColor,
+		"value": nil,
+	})
+
+	// Add threshold steps
+	for i, threshold := range thresholds {
+		var color interface{}
+		// Use colors[i+1] for the i-th threshold (colors[0] was used for base step)
+		if i+1 < len(colors) && colors[i+1] != nil {
+			color = colors[i+1]
+		} else {
+			color = "red"
+		}
+
+		var value float64
+		switch v := threshold.(type) {
+		case string:
+			if parsed, err := strconv.ParseFloat(v, 64); err == nil {
+				value = parsed
+			}
+		case float64:
+			value = v
+		case int:
+			value = float64(v)
+		}
+
+		steps = append(steps, map[string]interface{}{
+			"color": color,
+			"value": value,
+		})
+	}
+
+	return steps
+}
+
+var colorModeMap = map[string]string{
+	"cell":  "color-background",
+	"row":   "color-background",
+	"value": "color-text",
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/v24_test.go b/apps/dashboard/pkg/migration/schemaversion/v24_test.go
new file mode 100644
index 00000000000..ec093974fdb
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v24_test.go
@@ -0,0 +1,823 @@
+package schemaversion_test
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/testutil"
+)
+
+func TestV24(t *testing.T) {
+	tests := []migrationTestCase{
+		{
+			name: "should migrate basic Angular table with defaults",
+			input: map[string]interface{}{
+				"schemaVersion": 23,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":     1,
+						"type":   "table",
+						"title":  "Basic Table",
+						"legend": true,
+						"styles": []interface{}{
+							map[string]interface{}{
+								"thresholds": []interface{}{"10", "20", "30"},
+								"colors":     []interface{}{"red", "yellow", "green"},
+								"pattern":    "/.*/",
+							},
+						},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":     1,
+						"type":   "table",
+						"title":  "Basic Table",
+						"legend": true,
+						"fieldConfig": map[string]interface{}{
+							"defaults": map[string]interface{}{
+								"custom": map[string]interface{}{
+									"align": "auto",
+									"cellOptions": map[string]interface{}{
+										"type": "auto",
+									},
+									"inspect": false,
+								},
+								"mappings": []interface{}{},
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{"value": nil, "color": "red"},
+										map[string]interface{}{"value": float64(10), "color": "yellow"},
+										map[string]interface{}{"value": float64(20), "color": "green"},
+										map[string]interface{}{"value": float64(30), "color": "red"},
+									},
+								},
+							},
+							"overrides": []interface{}{},
+						},
+						"options": map[string]interface{}{
+							"cellHeight": "sm",
+							"footer": map[string]interface{}{
+								"countRows": false,
+								"fields":    "",
+								"reducer":   []interface{}{"sum"},
+								"show":      false,
+							},
+							"showHeader": true,
+						},
+						"transformations": []interface{}{},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+						"pluginVersion": "1.0.0",
+					},
+				},
+			},
+		},
+		{
+			name: "should migrate table with complex defaults and overrides",
+			input: map[string]interface{}{
+				"schemaVersion": 23,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    2,
+						"type":  "table",
+						"title": "Complex Table",
+						"styles": []interface{}{
+							// Default style
+							map[string]interface{}{
+								"pattern":    "/.*/",
+								"unit":       "bytes",
+								"decimals":   float64(2),
+								"align":      "center",
+								"colorMode":  "cell",
+								"thresholds": []interface{}{"100", "500"},
+								"colors":     []interface{}{"green", "yellow", "red"},
+							},
+							// Column-specific override with exact name
+							map[string]interface{}{
+								"pattern":   "Status",
+								"alias":     "Current Status",
+								"unit":      "short",
+								"decimals":  float64(0),
+								"colorMode": "value",
+								"align":     "left",
+							},
+							// Column-specific override with regex pattern
+							map[string]interface{}{
+								"pattern":         "/Error.*/",
+								"link":            true,
+								"linkUrl":         "http://example.com/errors",
+								"linkTooltip":     "View error details",
+								"linkTargetBlank": true,
+								"colorMode":       "row",
+								"colors":          []interface{}{"red", "orange"},
+							},
+							// Date column
+							map[string]interface{}{
+								"pattern":    "Time",
+								"type":       "date",
+								"dateFormat": "YYYY-MM-DD HH:mm:ss",
+								"alias":      "Timestamp",
+							},
+							// Hidden column
+							map[string]interface{}{
+								"pattern": "Hidden",
+								"type":    "hidden",
+							},
+						},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    2,
+						"type":  "table",
+						"title": "Complex Table",
+						"fieldConfig": map[string]interface{}{
+							"defaults": map[string]interface{}{
+								"unit":     "bytes",
+								"decimals": 2,
+								"custom": map[string]interface{}{
+									"align": "center",
+									"cellOptions": map[string]interface{}{
+										"type": "color-background",
+									},
+									"inspect": false,
+								},
+								"mappings": []interface{}{},
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{"value": nil, "color": "green"},
+										map[string]interface{}{"value": float64(100), "color": "yellow"},
+										map[string]interface{}{"value": float64(500), "color": "red"},
+									},
+								},
+							},
+							"overrides": []interface{}{
+								map[string]interface{}{
+									"matcher": map[string]interface{}{
+										"id":      "byName",
+										"options": "Status",
+									},
+									"properties": []interface{}{
+										map[string]interface{}{"id": "displayName", "value": "Current Status"},
+										map[string]interface{}{"id": "unit", "value": "short"},
+										map[string]interface{}{"id": "decimals", "value": 0},
+										map[string]interface{}{"id": "custom.cellOptions", "value": map[string]interface{}{"type": "color-text"}},
+										map[string]interface{}{"id": "custom.align", "value": "left"},
+									},
+								},
+								map[string]interface{}{
+									"matcher": map[string]interface{}{
+										"id":      "byRegexp",
+										"options": "/Error.*/",
+									},
+									"properties": []interface{}{
+										map[string]interface{}{
+											"id": "links",
+											"value": []interface{}{
+												map[string]interface{}{
+													"title":       "View error details",
+													"url":         "http://example.com/errors",
+													"targetBlank": true,
+												},
+											},
+										},
+										map[string]interface{}{"id": "custom.cellOptions", "value": map[string]interface{}{"type": "color-background"}},
+									},
+								},
+								map[string]interface{}{
+									"matcher": map[string]interface{}{
+										"id":      "byName",
+										"options": "Time",
+									},
+									"properties": []interface{}{
+										map[string]interface{}{"id": "displayName", "value": "Timestamp"},
+										map[string]interface{}{"id": "unit", "value": "time: YYYY-MM-DD HH:mm:ss"},
+									},
+								},
+								map[string]interface{}{
+									"matcher": map[string]interface{}{
+										"id":      "byName",
+										"options": "Hidden",
+									},
+									"properties": []interface{}{
+										map[string]interface{}{"id": "custom.hidden", "value": true},
+									},
+								},
+							},
+						},
+						"options": map[string]interface{}{
+							"cellHeight": "sm",
+							"footer": map[string]interface{}{
+								"countRows": false,
+								"fields":    "",
+								"reducer":   []interface{}{"sum"},
+								"show":      false,
+							},
+							"showHeader": true,
+						},
+						"transformations": []interface{}{},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+						"pluginVersion": "1.0.0",
+					},
+				},
+			},
+		},
+		{
+			name: "should migrate table with timeseries_aggregations transform",
+			input: map[string]interface{}{
+				"schemaVersion": 23,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    3,
+						"type":  "table",
+						"title": "Table with Aggregations",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"pattern":  "/.*/",
+								"unit":     "percent",
+								"decimals": float64(1),
+							},
+						},
+						"transform": "timeseries_aggregations",
+						"columns": []interface{}{
+							map[string]interface{}{"value": "avg", "text": "Average"},
+							map[string]interface{}{"value": "max", "text": "Maximum"},
+							map[string]interface{}{"value": "min", "text": "Minimum"},
+							map[string]interface{}{"value": "total", "text": "Total"},
+							map[string]interface{}{"value": "current", "text": "Current"},
+							map[string]interface{}{"value": "count", "text": "Count"},
+						},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    3,
+						"type":  "table",
+						"title": "Table with Aggregations",
+						"fieldConfig": map[string]interface{}{
+							"defaults": map[string]interface{}{
+								"unit":     "percent",
+								"decimals": 1,
+								"custom": map[string]interface{}{
+									"align": "auto",
+									"cellOptions": map[string]interface{}{
+										"type": "auto",
+									},
+									"inspect": false,
+								},
+								"mappings": []interface{}{},
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{"color": "green"},
+										map[string]interface{}{"color": "red", "value": 80},
+									},
+								},
+							},
+							"overrides": []interface{}{},
+						},
+						"options": map[string]interface{}{
+							"cellHeight": "sm",
+							"footer": map[string]interface{}{
+								"countRows": false,
+								"fields":    "",
+								"reducer":   []interface{}{"sum"},
+								"show":      false,
+							},
+							"showHeader": true,
+						},
+						"transformations": []interface{}{
+							map[string]interface{}{
+								"id": "reduce",
+								"options": map[string]interface{}{
+									"reducers":         []interface{}{"mean", "max", "min", "sum", "lastNotNull", "count"},
+									"includeTimeField": false,
+								},
+							},
+						},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+						"pluginVersion": "1.0.0",
+					},
+				},
+			},
+		},
+		{
+			name: "should migrate table with timeseries_to_rows transform",
+			input: map[string]interface{}{
+				"schemaVersion": 23,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    4,
+						"type":  "table",
+						"title": "Table with Rows Transform",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"pattern": "/.*/",
+								"unit":    "short",
+							},
+						},
+						"transform": "timeseries_to_rows",
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    4,
+						"type":  "table",
+						"title": "Table with Rows Transform",
+						"fieldConfig": map[string]interface{}{
+							"defaults": map[string]interface{}{
+								"unit": "short",
+								"custom": map[string]interface{}{
+									"align": "auto",
+									"cellOptions": map[string]interface{}{
+										"type": "auto",
+									},
+									"inspect": false,
+								},
+								"mappings": []interface{}{},
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{"color": "green"},
+										map[string]interface{}{"color": "red", "value": 80},
+									},
+								},
+							},
+							"overrides": []interface{}{},
+						},
+						"options": map[string]interface{}{
+							"cellHeight": "sm",
+							"footer": map[string]interface{}{
+								"countRows": false,
+								"fields":    "",
+								"reducer":   []interface{}{"sum"},
+								"show":      false,
+							},
+							"showHeader": true,
+						},
+						"transformations": []interface{}{
+							map[string]interface{}{
+								"id": "seriesToRows",
+								"options": map[string]interface{}{
+									"reducers": []interface{}{},
+								},
+							},
+						},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+						"pluginVersion": "1.0.0",
+					},
+				},
+			},
+		},
+		{
+			name: "should migrate table with timeseries_to_columns transform",
+			input: map[string]interface{}{
+				"schemaVersion": 23,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    5,
+						"type":  "table",
+						"title": "Table with Columns Transform",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"pattern": "/.*/",
+								"unit":    "bytes",
+							},
+						},
+						"transform": "timeseries_to_columns",
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    5,
+						"type":  "table",
+						"title": "Table with Columns Transform",
+						"fieldConfig": map[string]interface{}{
+							"defaults": map[string]interface{}{
+								"unit": "bytes",
+								"custom": map[string]interface{}{
+									"align": "auto",
+									"cellOptions": map[string]interface{}{
+										"type": "auto",
+									},
+									"inspect": false,
+								},
+								"mappings": []interface{}{},
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{"color": "green"},
+										map[string]interface{}{"color": "red", "value": 80},
+									},
+								},
+							},
+							"overrides": []interface{}{},
+						},
+						"options": map[string]interface{}{
+							"cellHeight": "sm",
+							"footer": map[string]interface{}{
+								"countRows": false,
+								"fields":    "",
+								"reducer":   []interface{}{"sum"},
+								"show":      false,
+							},
+							"showHeader": true,
+						},
+						"transformations": []interface{}{
+							map[string]interface{}{
+								"id": "seriesToColumns",
+								"options": map[string]interface{}{
+									"reducers": []interface{}{},
+								},
+							},
+						},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+						"pluginVersion": "1.0.0",
+					},
+				},
+			},
+		},
+		{
+			name: "should migrate table with table merge transform",
+			input: map[string]interface{}{
+				"schemaVersion": 23,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    6,
+						"type":  "table",
+						"title": "Table with Merge Transform",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"pattern": "/.*/",
+								"align":   "auto",
+							},
+						},
+						"transform": "table",
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    6,
+						"type":  "table",
+						"title": "Table with Merge Transform",
+						"fieldConfig": map[string]interface{}{
+							"defaults": map[string]interface{}{
+								"custom": map[string]interface{}{
+									"align": "",
+									"cellOptions": map[string]interface{}{
+										"type": "auto",
+									},
+									"inspect": false,
+								},
+								"mappings": []interface{}{},
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{"color": "green"},
+										map[string]interface{}{"color": "red", "value": 80},
+									},
+								},
+							},
+							"overrides": []interface{}{},
+						},
+						"options": map[string]interface{}{
+							"cellHeight": "sm",
+							"footer": map[string]interface{}{
+								"countRows": false,
+								"fields":    "",
+								"reducer":   []interface{}{"sum"},
+								"show":      false,
+							},
+							"showHeader": true,
+						},
+						"transformations": []interface{}{
+							map[string]interface{}{
+								"id": "merge",
+								"options": map[string]interface{}{
+									"reducers": []interface{}{},
+								},
+							},
+						},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+						"pluginVersion": "1.0.0",
+					},
+				},
+			},
+		},
+		{
+			name: "should migrate table with existing transformations",
+			input: map[string]interface{}{
+				"schemaVersion": 23,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    7,
+						"type":  "table",
+						"title": "Table with Existing Transformations",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"pattern": "/.*/",
+								"unit":    "short",
+							},
+						},
+						"transformations": []interface{}{
+							map[string]interface{}{
+								"id": "filterFieldsByName",
+								"options": map[string]interface{}{
+									"include": map[string]interface{}{
+										"names": []interface{}{"field1", "field2"},
+									},
+								},
+							},
+						},
+						"transform": "timeseries_to_rows",
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    7,
+						"type":  "table",
+						"title": "Table with Existing Transformations",
+						"fieldConfig": map[string]interface{}{
+							"defaults": map[string]interface{}{
+								"unit": "short",
+								"custom": map[string]interface{}{
+									"align": "auto",
+									"cellOptions": map[string]interface{}{
+										"type": "auto",
+									},
+									"inspect": false,
+								},
+								"mappings": []interface{}{},
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{"color": "green"},
+										map[string]interface{}{"color": "red", "value": 80},
+									},
+								},
+							},
+							"overrides": []interface{}{},
+						},
+						"options": map[string]interface{}{
+							"cellHeight": "sm",
+							"footer": map[string]interface{}{
+								"countRows": false,
+								"fields":    "",
+								"reducer":   []interface{}{"sum"},
+								"show":      false,
+							},
+							"showHeader": true,
+						},
+						"transformations": []interface{}{
+							map[string]interface{}{
+								"id": "filterFieldsByName",
+								"options": map[string]interface{}{
+									"include": map[string]interface{}{
+										"names": []interface{}{"field1", "field2"},
+									},
+								},
+							},
+							map[string]interface{}{
+								"id": "seriesToRows",
+								"options": map[string]interface{}{
+									"reducers": []interface{}{},
+								},
+							},
+						},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+						"pluginVersion": "1.0.0",
+					},
+				},
+			},
+		},
+		{
+			name: "should not migrate angular table without styles",
+			input: map[string]interface{}{
+				"schemaVersion": 23,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    8,
+						"type":  "table",
+						"title": "Table without styles",
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    8,
+						"type":  "table",
+						"title": "Table without styles",
+					},
+				},
+			},
+		},
+		{
+			name: "should not migrate react table (table2)",
+			input: map[string]interface{}{
+				"schemaVersion": 23,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    9,
+						"type":  "table",
+						"table": "table2",
+						"title": "React table",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"pattern": "/.*/",
+								"unit":    "short",
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    9,
+						"type":  "table",
+						"table": "table2",
+						"title": "React table",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"pattern": "/.*/",
+								"unit":    "short",
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "should not migrate non-table panels",
+			input: map[string]interface{}{
+				"schemaVersion": 23,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    10,
+						"type":  "graph",
+						"title": "Graph panel",
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+					},
+					map[string]interface{}{
+						"id":    11,
+						"type":  "singlestat",
+						"title": "Singlestat panel",
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    10,
+						"type":  "graph",
+						"title": "Graph panel",
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+					},
+					map[string]interface{}{
+						"id":    11,
+						"type":  "singlestat",
+						"title": "Singlestat panel",
+					},
+				},
+			},
+		},
+		{
+			name: "should handle mixed numeric and string thresholds",
+			input: map[string]interface{}{
+				"schemaVersion": 23,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    12,
+						"type":  "table",
+						"title": "Mixed threshold types",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"pattern":    "/.*/",
+								"thresholds": []interface{}{10, "20", 30.5},
+								"colors":     []interface{}{"green", "yellow", "orange", "red"},
+							},
+						},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    12,
+						"type":  "table",
+						"title": "Mixed threshold types",
+						"fieldConfig": map[string]interface{}{
+							"defaults": map[string]interface{}{
+								"custom": map[string]interface{}{
+									"align": "auto",
+									"cellOptions": map[string]interface{}{
+										"type": "auto",
+									},
+									"inspect": false,
+								},
+								"mappings": []interface{}{},
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{"value": nil, "color": "green"},
+										map[string]interface{}{"value": float64(10), "color": "yellow"},
+										map[string]interface{}{"value": float64(20), "color": "orange"},
+										map[string]interface{}{"value": float64(30.5), "color": "red"},
+									},
+								},
+							},
+							"overrides": []interface{}{},
+						},
+						"options": map[string]interface{}{
+							"cellHeight": "sm",
+							"footer": map[string]interface{}{
+								"countRows": false,
+								"fields":    "",
+								"reducer":   []interface{}{"sum"},
+								"show":      false,
+							},
+							"showHeader": true,
+						},
+						"transformations": []interface{}{},
+						"targets": []interface{}{
+							map[string]interface{}{"refId": "A"},
+						},
+						"pluginVersion": "1.0.0",
+					},
+				},
+			},
+		},
+	}
+
+	runMigrationTests(t, tests, schemaversion.V24(testutil.GetTestPanelProvider()))
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/v25.go b/apps/dashboard/pkg/migration/schemaversion/v25.go
new file mode 100644
index 00000000000..82d9e47b63d
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v25.go
@@ -0,0 +1,49 @@
+package schemaversion
+
+// V25 migration is a no-op migration
+// It only updates the schema version to 25
+// It's created to keep the migration history consistent with frontend migrator
+// Variable tag removal is handled in v28 migration
+
+// Example before migration:
+// {
+// "templating": {
+// 	"list": [
+// 	  {
+// 		"name": "tags should not be removed",
+// 		"type": "query",
+// 		"datasource": "prometheus",
+// 		"tags": ["tags should not be removed"],
+// 		"tagsQuery": "tag should not be removed",
+// 		"tagValuesQuery": "tag should not be removed",
+// 		"useTags": true,
+// 		"options": []
+
+// 	  }
+// 	]
+//   }
+// }
+
+// Example after migration:
+// {
+// "templating": {
+// 	"list": [
+// 	  {
+// 		"name": "tags should not be removed",
+// 		"type": "query",
+// 		"datasource": "prometheus",
+// 		"tags": ["tags should not be removed"],
+// 		"tagsQuery": "tag should not be removed",
+// 		"tagValuesQuery": "tag should not be removed",
+// 		"useTags": true,
+// 		"options": []
+
+// 	  }
+// 	]
+//   }
+// }
+
+func V25(dashboard map[string]interface{}) error {
+	dashboard["schemaVersion"] = int(25)
+	return nil
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/v25_test.go b/apps/dashboard/pkg/migration/schemaversion/v25_test.go
new file mode 100644
index 00000000000..3e9cff1bc35
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v25_test.go
@@ -0,0 +1,38 @@
+package schemaversion_test
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
+)
+
+func TestV25(t *testing.T) {
+	tests := []migrationTestCase{
+		{
+			name: "v25 no-op migration, updates schema version only",
+			input: map[string]interface{}{
+				"title":         "V25 No-Op Migration Test Dashboard",
+				"schemaVersion": 24,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "timeseries",
+						"title": "Panel remains unchanged",
+						"id":    1,
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V25 No-Op Migration Test Dashboard",
+				"schemaVersion": 25,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "timeseries",
+						"title": "Panel remains unchanged",
+						"id":    1,
+					},
+				},
+			},
+		},
+	}
+	runMigrationTests(t, tests, schemaversion.V25)
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/v28.go b/apps/dashboard/pkg/migration/schemaversion/v28.go
index 9509e8a8a87..df899c86c1d 100644
--- a/apps/dashboard/pkg/migration/schemaversion/v28.go
+++ b/apps/dashboard/pkg/migration/schemaversion/v28.go
@@ -258,6 +258,24 @@ func (m *v28Migrator) migratetSinglestat(panel map[string]interface{}, defaults
 	// Migrate thresholds FIRST (consolidated: both panel types create DEFAULT_THRESHOLDS for empty strings)
 	m.migrateThresholds(angularOpts, defaults)
 
+	// If no thresholds were set from angular migration, add default stat panel thresholds
+	// This matches the behavior of frontend pluginLoaded which adds default thresholds
+	if _, hasThresholds := defaults["thresholds"]; !hasThresholds {
+		defaults["thresholds"] = map[string]interface{}{
+			"mode": "absolute",
+			"steps": []interface{}{
+				map[string]interface{}{
+					"color": "green",
+					"value": nil,
+				},
+				map[string]interface{}{
+					"color": "red",
+					"value": 80,
+				},
+			},
+		}
+	}
+
 	// Apply common angular option migrations (value mappings can now use threshold colors)
 	m.applyCommonAngularMigration(panel, defaults, options, angularOpts)
 
@@ -298,6 +316,24 @@ func (m *v28Migrator) migrateGrafanaSinglestatPanel(panel map[string]interface{}
 	// Migrate thresholds FIRST (consolidated: both panel types create DEFAULT_THRESHOLDS for empty strings)
 	m.migrateThresholds(angularOpts, defaults)
 
+	// If no thresholds were set from angular migration, add default stat panel thresholds
+	// This matches the behavior of frontend pluginLoaded which adds default thresholds
+	if _, hasThresholds := defaults["thresholds"]; !hasThresholds {
+		defaults["thresholds"] = map[string]interface{}{
+			"mode": "absolute",
+			"steps": []interface{}{
+				map[string]interface{}{
+					"color": "green",
+					"value": nil,
+				},
+				map[string]interface{}{
+					"color": "red",
+					"value": 80,
+				},
+			},
+		}
+	}
+
 	// Apply common angular option migrations (value mappings can now use threshold colors)
 	m.applyCommonAngularMigration(panel, defaults, options, angularOpts)
 
diff --git a/apps/dashboard/pkg/migration/schemaversion/v28_test.go b/apps/dashboard/pkg/migration/schemaversion/v28_test.go
index f61e332f1ac..8692fef6096 100644
--- a/apps/dashboard/pkg/migration/schemaversion/v28_test.go
+++ b/apps/dashboard/pkg/migration/schemaversion/v28_test.go
@@ -160,6 +160,19 @@ func TestV28(t *testing.T) {
 									"fixedColor": "#ff0000",
 								},
 								"mappings": []interface{}{},
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{
+											"color": "green",
+											"value": nil,
+										},
+										map[string]interface{}{
+											"color": "red",
+											"value": 80,
+										},
+									},
+								},
 							},
 							"overrides": []interface{}{},
 						},
@@ -228,6 +241,19 @@ func TestV28(t *testing.T) {
 									"fixedColor": "#ff0000",
 								},
 								"mappings": []interface{}{},
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{
+											"color": "green",
+											"value": nil,
+										},
+										map[string]interface{}{
+											"color": "red",
+											"value": 80,
+										},
+									},
+								},
 							},
 							"overrides": []interface{}{},
 						},
@@ -512,7 +538,20 @@ func TestV28(t *testing.T) {
 						},
 						"fieldConfig": map[string]interface{}{
 							"defaults": map[string]interface{}{
-								"unit":     "short",
+								"unit": "short",
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{
+											"color": "green",
+											"value": nil,
+										},
+										map[string]interface{}{
+											"color": "red",
+											"value": 80,
+										},
+									},
+								},
 								"mappings": []interface{}{},
 							},
 							"overrides": []interface{}{},
@@ -564,7 +603,20 @@ func TestV28(t *testing.T) {
 						},
 						"fieldConfig": map[string]interface{}{
 							"defaults": map[string]interface{}{
-								"unit":     "short",
+								"unit": "short",
+								"thresholds": map[string]interface{}{
+									"mode": "absolute",
+									"steps": []interface{}{
+										map[string]interface{}{
+											"color": "green",
+											"value": nil,
+										},
+										map[string]interface{}{
+											"color": "red",
+											"value": 80,
+										},
+									},
+								},
 								"mappings": []interface{}{},
 							},
 							"overrides": []interface{}{},
@@ -626,7 +678,20 @@ func TestV28(t *testing.T) {
 								},
 								"fieldConfig": map[string]interface{}{
 									"defaults": map[string]interface{}{
-										"unit":     "bytes",
+										"unit": "bytes",
+										"thresholds": map[string]interface{}{
+											"mode": "absolute",
+											"steps": []interface{}{
+												map[string]interface{}{
+													"color": "green",
+													"value": nil,
+												},
+												map[string]interface{}{
+													"color": "red",
+													"value": 80,
+												},
+											},
+										},
 										"mappings": []interface{}{},
 									},
 									"overrides": []interface{}{},
diff --git a/apps/dashboard/pkg/migration/testdata/input/v24.table-angular.json b/apps/dashboard/pkg/migration/testdata/input/v24.table-angular.json
new file mode 100644
index 00000000000..2b714bb67a2
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/input/v24.table-angular.json
@@ -0,0 +1,345 @@
+{
+    "schemaVersion": 23,
+    "panels": [
+        {
+            "id": 1,
+            "type": "table",
+            "title": "Basic Angular Table with Defaults",
+            "description": "Tests basic migration with default style pattern (/.*/) containing thresholds and colors. Should convert styles to fieldConfig.defaults with threshold steps.",
+            "legend": true, 
+            "styles": [
+                { 
+                    "thresholds": ["10", "20", "30"],
+                    "colors": ["red", "yellow", "green"],
+                    "pattern": "/.*/" 
+                }
+            ],
+            "targets": [{ "refId": "A" }, {}]
+        },
+        {
+            "id": 2,
+            "type": "table",
+            "title": "Complex Table with All Style Features",
+            "description": "Tests comprehensive migration including: default style with thresholds/colors/unit/decimals/align/colorMode, column overrides with exact name and regex patterns, date formatting, hidden columns, and links with tooltips.",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "thresholds": ["100", "500"],
+                    "colors": ["green", "yellow", "red"],
+                    "unit": "bytes",
+                    "decimals": 2,
+                    "align": "center",
+                    "colorMode": "cell"
+                },
+                {
+                    "pattern": "Status",
+                    "alias": "Current Status",
+                    "unit": "short",
+                    "decimals": 0,
+                    "colorMode": "value",
+                    "align": "left"
+                },
+                {
+                    "pattern": "/Error.*/",
+                    "link": true,
+                    "linkUrl": "http://example.com/errors",
+                    "linkTooltip": "View error details",
+                    "linkTargetBlank": true,
+                    "colorMode": "row"
+                },
+                {
+                    "pattern": "Time",
+                    "type": "date",
+                    "dateFormat": "YYYY-MM-DD HH:mm:ss",
+                    "alias": "Timestamp"
+                },
+                {
+                    "pattern": "Hidden",
+                    "type": "hidden"
+                }
+            ],
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 3,
+            "type": "table",
+            "title": "Table with Timeseries Aggregations Transform",
+            "description": "Tests migration of timeseries_aggregations transform to reduce transformation with column mappings (avg->mean, max->max, min->min, total->sum, current->lastNotNull, count->count).",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "unit": "percent",
+                    "decimals": 1
+                }
+            ],
+            "transform": "timeseries_aggregations",
+            "columns": [
+                { "value": "avg", "text": "Average" },
+                { "value": "max", "text": "Maximum" },
+                { "value": "min", "text": "Minimum" },
+                { "value": "total", "text": "Total" },
+                { "value": "current", "text": "Current" },
+                { "value": "count", "text": "Count" }
+            ],
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 4,
+            "type": "table",
+            "title": "Table with Timeseries to Rows Transform",
+            "description": "Tests migration of timeseries_to_rows transform to seriesToRows transformation.",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "unit": "short"
+                }
+            ],
+            "transform": "timeseries_to_rows",
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 5,
+            "type": "table",
+            "title": "Table with Timeseries to Columns Transform",
+            "description": "Tests migration of timeseries_to_columns transform to seriesToColumns transformation.",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "unit": "bytes"
+                }
+            ],
+            "transform": "timeseries_to_columns",
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 6,
+            "type": "table",
+            "title": "Table with Merge Transform",
+            "description": "Tests migration of table transform to merge transformation. Also tests auto alignment conversion to empty string.",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "align": "auto"
+                }
+            ],
+            "transform": "table",
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 7,
+            "type": "table",
+            "title": "Table with Existing Transformations",
+            "description": "Tests that existing transformations are preserved and new transformation from old format is appended to the list.",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "unit": "short"
+                }
+            ],
+            "transformations": [
+                {
+                    "id": "filterFieldsByName",
+                    "options": {
+                        "include": {
+                            "names": ["field1", "field2"]
+                        }
+                    }
+                }
+            ],
+            "transform": "timeseries_to_rows",
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 8,
+            "type": "table",
+            "title": "Mixed Threshold Types",
+            "description": "Tests handling of mixed numeric and string threshold values (int, string, float) with proper type conversion.",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "thresholds": [10, "20", 30.5],
+                    "colors": ["green", "yellow", "orange", "red"]
+                }
+            ],
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 9,
+            "type": "table",
+            "title": "All Color Modes Test",
+            "description": "Tests all color mode mappings: cell->color-background, row->color-background, value->color-text.",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "colorMode": "cell"
+                },
+                {
+                    "pattern": "CellColumn",
+                    "colorMode": "cell"
+                },
+                {
+                    "pattern": "RowColumn", 
+                    "colorMode": "row"
+                },
+                {
+                    "pattern": "ValueColumn",
+                    "colorMode": "value"
+                }
+            ],
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 10,
+            "type": "table",
+            "title": "All Alignment Options",
+            "description": "Tests all alignment options: left, center, right, and auto (should convert to empty string).",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "align": "center"
+                },
+                {
+                    "pattern": "LeftColumn",
+                    "align": "left"
+                },
+                {
+                    "pattern": "RightColumn",
+                    "align": "right"
+                },
+                {
+                    "pattern": "AutoColumn",
+                    "align": "auto"
+                }
+            ],
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 11,
+            "type": "table",
+            "title": "Field Matcher Types Test",
+            "description": "Tests both field matcher types: byName for exact matches and byRegexp for regex patterns.",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "unit": "short"
+                },
+                {
+                    "pattern": "ExactColumnName",
+                    "alias": "Exact Match"
+                },
+                {
+                    "pattern": "/Regex.*Pattern/",
+                    "alias": "Regex Match"
+                },
+                {
+                    "pattern": "/^Start/",
+                    "alias": "Start Pattern"
+                },
+                {
+                    "pattern": "/End$/",
+                    "alias": "End Pattern"
+                }
+            ],
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 12,
+            "type": "table",
+            "title": "Link Configuration Test",
+            "description": "Tests various link configurations: with and without tooltip, with and without target blank.",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "unit": "short"
+                },
+                {
+                    "pattern": "LinkWithTooltip",
+                    "link": true,
+                    "linkUrl": "http://example.com/with-tooltip",
+                    "linkTooltip": "Click to view details",
+                    "linkTargetBlank": true
+                },
+                {
+                    "pattern": "LinkWithoutTooltip",
+                    "link": true,
+                    "linkUrl": "http://example.com/no-tooltip",
+                    "linkTargetBlank": false
+                },
+                {
+                    "pattern": "LinkMinimal",
+                    "link": true,
+                    "linkUrl": "http://example.com/minimal"
+                }
+            ],
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 13,
+            "type": "table",
+            "title": "Date Format Variations",
+            "description": "Tests various date format patterns and aliases.",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "unit": "short"
+                },
+                {
+                    "pattern": "DateISO",
+                    "type": "date",
+                    "dateFormat": "YYYY-MM-DD",
+                    "alias": "ISO Date"
+                },
+                {
+                    "pattern": "DateTime",
+                    "type": "date", 
+                    "dateFormat": "YYYY-MM-DD HH:mm:ss",
+                    "alias": "Full DateTime"
+                },
+                {
+                    "pattern": "TimeOnly",
+                    "type": "date",
+                    "dateFormat": "HH:mm:ss",
+                    "alias": "Time Only"
+                }
+            ],
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 14,
+            "type": "table",
+            "title": "React Table - Should NOT Migrate",
+            "description": "React table (table2) should not be migrated. Properties should remain unchanged.",
+            "table": "table2",
+            "styles": [
+                {
+                    "pattern": "/.*/",
+                    "unit": "short",
+                    "thresholds": ["10", "20"],
+                    "colors": ["red", "yellow", "green"]
+                }
+            ],
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 15,
+            "type": "table",
+            "title": "Angular Table without Styles - Should NOT Migrate",
+            "description": "Angular table without styles property should not be migrated.",
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 16,
+            "type": "graph",
+            "title": "Non-Table Panel - Should NOT Migrate",
+            "description": "Non-table panels should remain completely unchanged.",
+            "targets": [{ "refId": "A" }]
+        },
+        {
+            "id": 17,
+            "type": "singlestat",
+            "title": "Singlestat Panel - Should NOT Migrate",
+            "description": "Other panel types should not be affected by table migration.",
+            "targets": [{ "refId": "A" }]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/apps/dashboard/pkg/migration/testdata/input/v25.no-op-migration.json b/apps/dashboard/pkg/migration/testdata/input/v25.no-op-migration.json
new file mode 100644
index 00000000000..39cbf10d8f4
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/input/v25.no-op-migration.json
@@ -0,0 +1,56 @@
+{
+    "title": "V25 No-Op Migration Test Dashboard",
+    "schemaVersion": 24,
+    "panels": [
+      {
+        "type": "timeseries",
+        "title": "Panel with transformations remains unchanged",
+        "id": 1,
+        "transformations": [
+        ]
+      },
+      {
+        "type": "graph", 
+        "title": "Graph",
+        "id": 2,
+        "yAxes": [
+          {
+            "show": true,
+            "min": null,
+            "max": null
+          }
+        ]
+      }
+    ],
+    "templating": {
+      "list": [
+        {
+          "name": "tags should not be removed",
+          "type": "query",
+          "datasource": "prometheus",
+          "tags": ["tags should not be removed"],
+          "tagsQuery": "tag should not be removed",
+          "tagValuesQuery": "tag should not be removed",
+          "useTags": true,
+          "options": []
+          
+        }
+      ]
+    },
+    "annotations": {
+      "list": [
+        {
+          "name": "Deployments",
+          "datasource": "grafana",
+          "enable": true
+        }
+      ]
+    },
+    "time": {
+      "from": "now-6h",
+      "to": "now"
+    },
+    "timepicker": {
+      "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+    }
+  } 
\ No newline at end of file
diff --git a/apps/dashboard/pkg/migration/testdata/output/v24.table-angular.json b/apps/dashboard/pkg/migration/testdata/output/v24.table-angular.json
new file mode 100644
index 00000000000..f9ccbcd0dc4
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/output/v24.table-angular.json
@@ -0,0 +1,1334 @@
+{
+  "panels": [
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests basic migration with default style pattern (/.*/) containing thresholds and colors. Should convert styles to fieldConfig.defaults with threshold steps.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "yellow",
+                "value": 10
+              },
+              {
+                "color": "green",
+                "value": 20
+              },
+              {
+                "color": "red",
+                "value": 30
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "id": 1,
+      "legend": true,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          }
+        }
+      ],
+      "title": "Basic Angular Table with Defaults",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests comprehensive migration including: default style with thresholds/colors/unit/decimals/align/colorMode, column overrides with exact name and regex patterns, date formatting, hidden columns, and links with tooltips.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "center",
+            "cellOptions": {
+              "type": "color-background"
+            },
+            "inspect": false
+          },
+          "decimals": 2,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "yellow",
+                "value": 100
+              },
+              {
+                "color": "red",
+                "value": 500
+              }
+            ]
+          },
+          "unit": "bytes"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Status"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Current Status"
+              },
+              {
+                "id": "unit",
+                "value": "short"
+              },
+              {
+                "id": "decimals",
+                "value": 0
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "custom.align",
+                "value": "left"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/Error.*/"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "View error details",
+                    "url": "http://example.com/errors"
+                  }
+                ]
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-background"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Time"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Timestamp"
+              },
+              {
+                "id": "unit",
+                "value": "time: YYYY-MM-DD HH:mm:ss"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Hidden"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          }
+        ]
+      },
+      "id": 2,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Complex Table with All Style Features",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests migration of timeseries_aggregations transform to reduce transformation with column mappings (avg-\u003emean, max-\u003emax, min-\u003emin, total-\u003esum, current-\u003elastNotNull, count-\u003ecount).",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "decimals": 1,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "percent"
+        },
+        "overrides": []
+      },
+      "id": 3,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Table with Timeseries Aggregations Transform",
+      "transformations": [
+        {
+          "id": "reduce",
+          "options": {
+            "includeTimeField": false,
+            "reducers": [
+              "mean",
+              "max",
+              "min",
+              "sum",
+              "lastNotNull",
+              "count"
+            ]
+          }
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests migration of timeseries_to_rows transform to seriesToRows transformation.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "id": 4,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Table with Timeseries to Rows Transform",
+      "transformations": [
+        {
+          "id": "seriesToRows",
+          "options": {
+            "reducers": []
+          }
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests migration of timeseries_to_columns transform to seriesToColumns transformation.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "bytes"
+        },
+        "overrides": []
+      },
+      "id": 5,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Table with Timeseries to Columns Transform",
+      "transformations": [
+        {
+          "id": "seriesToColumns",
+          "options": {
+            "reducers": []
+          }
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests migration of table transform to merge transformation. Also tests auto alignment conversion to empty string.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "id": 6,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Table with Merge Transform",
+      "transformations": [
+        {
+          "id": "merge",
+          "options": {
+            "reducers": []
+          }
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests that existing transformations are preserved and new transformation from old format is appended to the list.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "id": 7,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Table with Existing Transformations",
+      "transformations": [
+        {
+          "id": "filterFieldsByName",
+          "options": {
+            "include": {
+              "names": [
+                "field1",
+                "field2"
+              ]
+            }
+          }
+        },
+        {
+          "id": "seriesToRows",
+          "options": {
+            "reducers": []
+          }
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests handling of mixed numeric and string threshold values (int, string, float) with proper type conversion.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "yellow",
+                "value": 10
+              },
+              {
+                "color": "orange",
+                "value": 20
+              },
+              {
+                "color": "red",
+                "value": 30.5
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "id": 8,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Mixed Threshold Types",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests all color mode mappings: cell-\u003ecolor-background, row-\u003ecolor-background, value-\u003ecolor-text.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "color-background"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "CellColumn"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-background"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "RowColumn"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-background"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ValueColumn"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "id": 9,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "All Color Modes Test",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests all alignment options: left, center, right, and auto (should convert to empty string).",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "center",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "LeftColumn"
+            },
+            "properties": [
+              {
+                "id": "custom.align",
+                "value": "left"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "RightColumn"
+            },
+            "properties": [
+              {
+                "id": "custom.align",
+                "value": "right"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "AutoColumn"
+            },
+            "properties": [
+              {
+                "id": "custom.align",
+                "value": ""
+              }
+            ]
+          }
+        ]
+      },
+      "id": 10,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "All Alignment Options",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests both field matcher types: byName for exact matches and byRegexp for regex patterns.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ExactColumnName"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Exact Match"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/Regex.*Pattern/"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Regex Match"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/^Start/"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Start Pattern"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/End$/"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "End Pattern"
+              }
+            ]
+          }
+        ]
+      },
+      "id": 11,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Field Matcher Types Test",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests various link configurations: with and without tooltip, with and without target blank.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "LinkWithTooltip"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Click to view details",
+                    "url": "http://example.com/with-tooltip"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "LinkWithoutTooltip"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": false,
+                    "title": "",
+                    "url": "http://example.com/no-tooltip"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "LinkMinimal"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": false,
+                    "title": "",
+                    "url": "http://example.com/minimal"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "id": 12,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Link Configuration Test",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Tests various date format patterns and aliases.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "DateISO"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "ISO Date"
+              },
+              {
+                "id": "unit",
+                "value": "time: YYYY-MM-DD"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "DateTime"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Full DateTime"
+              },
+              {
+                "id": "unit",
+                "value": "time: YYYY-MM-DD HH:mm:ss"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "TimeOnly"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Time Only"
+              },
+              {
+                "id": "unit",
+                "value": "time: HH:mm:ss"
+              }
+            ]
+          }
+        ]
+      },
+      "id": 13,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Date Format Variations",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "React table (table2) should not be migrated. Properties should remain unchanged.",
+      "id": 14,
+      "styles": [
+        {
+          "colors": [
+            "red",
+            "yellow",
+            "green"
+          ],
+          "pattern": "/.*/",
+          "thresholds": [
+            "10",
+            "20"
+          ],
+          "unit": "short"
+        }
+      ],
+      "table": "table2",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "React Table - Should NOT Migrate",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Angular table without styles property should not be migrated.",
+      "id": 15,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Angular Table without Styles - Should NOT Migrate",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Non-table panels should remain completely unchanged.",
+      "id": 16,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Non-Table Panel - Should NOT Migrate",
+      "type": "graph"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "description": "Other panel types should not be affected by table migration.",
+      "fieldConfig": {
+        "defaults": {
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "id": 17,
+      "options": {
+        "colorMode": "none",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Singlestat Panel - Should NOT Migrate",
+      "type": "stat"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 41
+}
\ No newline at end of file
diff --git a/apps/dashboard/pkg/migration/testdata/output/v25.no-op-migration.json b/apps/dashboard/pkg/migration/testdata/output/v25.no-op-migration.json
new file mode 100644
index 00000000000..82b2574e3a5
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/output/v25.no-op-migration.json
@@ -0,0 +1,97 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "datasource": {
+          "uid": "grafana"
+        },
+        "enable": true,
+        "name": "Deployments"
+      }
+    ]
+  },
+  "panels": [
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 1,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with transformations remains unchanged",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 2,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Graph",
+      "type": "graph",
+      "yAxes": [
+        {
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ]
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 41,
+  "templating": {
+    "list": [
+      {
+        "datasource": {
+          "uid": "prometheus"
+        },
+        "name": "tags should not be removed",
+        "options": [],
+        "refresh": 1,
+        "type": "query"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ]
+  },
+  "title": "V25 No-Op Migration Test Dashboard"
+}
\ No newline at end of file
diff --git a/apps/dashboard/pkg/migration/testutil/mocks.go b/apps/dashboard/pkg/migration/testutil/mocks.go
index 6835d7f2fcc..16a0ce6dc44 100644
--- a/apps/dashboard/pkg/migration/testutil/mocks.go
+++ b/apps/dashboard/pkg/migration/testutil/mocks.go
@@ -78,6 +78,10 @@ func (m *TestPanelProvider) GetPanels() []schemaversion.PanelPluginInfo {
 			ID:      "stat",
 			Version: "1.0.0",
 		},
+		{
+			ID:      "table",
+			Version: "1.0.0",
+		},
 		// Note: grafana-singlestat-panel is not included to match frontend test environment
 		// This ensures both frontend and backend migrations produce the same result
 	}
diff --git a/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts b/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
index d12c423200b..73b83424328 100644
--- a/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
+++ b/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
@@ -6,6 +6,7 @@ import { mockDataSource } from 'app/features/alerting/unified/mocks';
 import { setupDataSources } from 'app/features/alerting/unified/testSetup/datasources';
 import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
 import { plugin as statPanelPlugin } from 'app/plugins/panel/stat/module';
+import { plugin as tablePanelPlugin } from 'app/plugins/panel/table/module';
 
 import { DASHBOARD_SCHEMA_VERSION } from './DashboardMigrator';
 import { DashboardModel } from './DashboardModel';
@@ -141,7 +142,7 @@ describe('Backend / Frontend result comparison', () => {
       which means that the actual migration logic is not run.
       We need to manually run the pluginLoaded logic to ensure the panels are migrated correctly.
       */
-      if (jsonInput.schemaVersion === 27) {
+      if (jsonInput.schemaVersion <= 27) {
         for (const panel of frontendModel.panels) {
           if (panel.type === 'stat') {
             // Set the plugin version if it doesn't exist
@@ -165,6 +166,28 @@ describe('Backend / Frontend result comparison', () => {
 
             await panel.pluginLoaded(statPanelPlugin);
           }
+          if (panel.type === 'table' && panel.autoMigrateFrom === 'table-old') {
+            // Set the plugin version if it doesn't exist
+            if (!tablePanelPlugin.meta.info) {
+              tablePanelPlugin.meta.info = {
+                author: {
+                  name: 'Grafana Labs',
+                  url: 'url/to/GrafanaLabs',
+                },
+                description: 'table plugin',
+                links: [{ name: 'project', url: 'one link' }],
+                logos: { small: 'small/logo', large: 'large/logo' },
+                screenshots: [],
+                updated: '2024-01-01',
+                version: '1.0.0',
+              };
+            }
+            if (!tablePanelPlugin.meta.info.version) {
+              tablePanelPlugin.meta.info.version = '1.0.0';
+            }
+
+            await panel.pluginLoaded(tablePanelPlugin as any);
+          }
         }
       }
 
@@ -176,6 +199,18 @@ describe('Backend / Frontend result comparison', () => {
       // Because Go and TS handle -Infinity differently.
       const cleanedFrontendResult = sortedDeepCloneWithoutNulls(frontendMigrationResult);
 
+      // Remove deprecated angular properties that backend shouldn't return, but DashboardModel will still set them
+      for (const panel of cleanedFrontendResult.panels ?? []) {
+        // @ts-expect-error
+        delete panel.autoMigrateFrom;
+        // @ts-expect-error
+        delete panel.styles;
+        // @ts-expect-error - Backend removes these deprecated table properties
+        delete panel.transform;
+        // @ts-expect-error - Backend removes these deprecated table properties
+        delete panel.columns;
+      }
+
       expect(backendMigrationResult).toMatchObject(cleanedFrontendResult);
     });
   });
diff --git a/public/app/plugins/panel/table/migrations.ts b/public/app/plugins/panel/table/migrations.ts
index aa4c635682c..b91afa021e7 100644
--- a/public/app/plugins/panel/table/migrations.ts
+++ b/public/app/plugins/panel/table/migrations.ts
@@ -136,7 +136,7 @@ const migrateTableStyleToOverride = (style: Style) => {
     });
   }
 
-  if (style.decimals) {
+  if (style.decimals !== undefined) {
     override.properties.push({
       id: 'decimals',
       value: style.decimals,
@@ -186,7 +186,7 @@ const migrateTableStyleToOverride = (style: Style) => {
     });
   }
 
-  if (style.thresholds?.length) {
+  if (style.thresholds?.length && style.colors?.length) {
     override.properties.push({
       id: 'thresholds',
       value: {
@@ -216,7 +216,7 @@ const migrateDefaults = (prevDefaults: Style) => {
       isNil
     );
 
-    if (prevDefaults.thresholds.length) {
+    if (prevDefaults.thresholds && prevDefaults.thresholds.length) {
       const thresholds: ThresholdsConfig = {
         mode: ThresholdsMode.Absolute,
         steps: generateThresholds(prevDefaults.thresholds, prevDefaults.colors),

From 0069d112fc16106d127826d6ce967da4a8b6b184 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Thu, 7 Aug 2025 21:30:47 +0100
Subject: [PATCH 029/243] Config: Fix date_formats options being moved to a
 different section (#109339)

* Config: Fix date_formats options being moved to a different section

* fix builder cache key
---
 .github/workflows/pr-e2e-tests.yml |  2 +-
 conf/defaults.ini                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pr-e2e-tests.yml b/.github/workflows/pr-e2e-tests.yml
index 824b621d198..03ba03b8031 100644
--- a/.github/workflows/pr-e2e-tests.yml
+++ b/.github/workflows/pr-e2e-tests.yml
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/cache@v4
         id: cache
         with:
-          key: "build-grafana-${{ runner.os }}-${{ hashFiles('yarn.lock', 'public/*',  'packages/*', 'pkg/**/*.go', '**/go.mod', '**/go.sum', '!**_test.go', '!**.test.ts', '!**.test.tsx', 'Dockerfile') }}"
+          key: "build-grafana-${{ runner.os }}-${{ hashFiles('yarn.lock', 'public/*',  'packages/*', 'conf/*', 'pkg/**/*.go', '**/go.mod', '**/go.sum', '!**_test.go', '!**.test.ts', '!**.test.tsx', 'Dockerfile') }}"
           path: |
             build-dir
 
diff --git a/conf/defaults.ini b/conf/defaults.ini
index 65cec28cfbe..081d660a5d8 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -2030,17 +2030,17 @@ provider = static
 # This is EXPERIMENTAL. Please, do not use this section
 # foo = bar
 
+[time_picker]
+# Custom quick ranges for the time picker. Each quick range has a display name, a from value, and a to value.
+# Format: [{"from":"now-5m","to":"now","display":"Last 5 minutes"},{"from":"now-15m","to":"now","display":"Last 15 minutes"}]
+quick_ranges =
+
 [date_formats]
 # For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/
 
 # Default system date format used in time range picker and other places where full time is displayed
 full_date = YYYY-MM-DD HH:mm:ss
 
-[time_picker]
-# Custom quick ranges for the time picker. Each quick range has a display name, a from value, and a to value.
-# Format: [{"from":"now-5m","to":"now","display":"Last 5 minutes"},{"from":"now-15m","to":"now","display":"Last 15 minutes"}]
-quick_ranges =
-
 # Used by graph and other places where we only show small intervals
 interval_second = HH:mm:ss
 interval_minute = HH:mm

From e6c24e07097952699252be3556ed852d33c1e3bf Mon Sep 17 00:00:00 2001
From: Larissa Wandzura <126723338+lwandz13@users.noreply.github.com>
Date: Thu, 7 Aug 2025 15:38:00 -0500
Subject: [PATCH 030/243] DOCS:  Updates to help with UI improvement work
 (#109359)

* updates to help with UI improvements

* ran prettier
---
 .../datasources/postgres/configure/_index.md  | 88 ++++++++++++-------
 .../postgres/query-editor/_index.md           |  2 +-
 2 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/docs/sources/datasources/postgres/configure/_index.md b/docs/sources/datasources/postgres/configure/_index.md
index 7b6a66c0a70..ed229013e9f 100644
--- a/docs/sources/datasources/postgres/configure/_index.md
+++ b/docs/sources/datasources/postgres/configure/_index.md
@@ -9,7 +9,7 @@ labels:
     - cloud
     - enterprise
     - oss
-menuTitle: Configure the PostgreSQL data source
+menuTitle: Configure
 title: Configure the PostgreSQL data source
 weight: 10
 refs:
@@ -51,10 +51,14 @@ This document provides instructions for configuring the PostgreSQL data source a
 
 ## Before you begin
 
-You must have the `Organization administrator` role to configure the Postgres data source.
-Organization administrators can also [configure the data source via YAML](#provision-the-data-source) with the Grafana provisioning system.
+- You must have the `Organization administrator` role to configure the Postgres data source.
+  Organization administrators can also [configure the data source via YAML](#provision-the-data-source) with the Grafana provisioning system.
 
-Grafana comes with a built-in PostgreSQL data source plugin, eliminating the need to install a plugin.
+- Grafana comes with a built-in PostgreSQL data source plugin, eliminating the need to install a plugin.
+
+- Familiarize yourself with your PostgreSQL security configuration and gather any necessary security certificates, client certificates, and client keys.
+
+- Know which version of PostgreSQL you are running. You will be prompted for this information during the configuration process.
 
 {{< admonition type="note" >}}
 When adding a data source, the database user you specify should have only `SELECT` permissions on the relevant database and tables. Grafana does not validate the safety of queries, which means they can include potentially harmful SQL statements, such as `USE otherdb;` or `DROP TABLE user;`, that could be executed. To mitigate this risk, Grafana strongly recommends creating a dedicated PostgreSQL user with restricted permissions.
@@ -84,56 +88,76 @@ You are taken to the **Settings** tab where you will configure the data source.
 
 Following is a list of PostgreSQL configuration options:
 
-- **Name** - Sets the name you use to refer to the data source in panels and queries. Examples: `PostgreSQL-DB-1`.
-- **Default** - Toggle to set this specific PostgreSQL data source as the default pre-selected data source in panels and visualizations.
+| Setting | Description                                                                                                              |
+| ------- | ------------------------------------------------------------------------------------------------------------------------ |
+| Name    | Sets the name you use to refer to the data source in panels and queries. Examples: `PostgreSQL-DB-1`.                    |
+| Default | Toggle to set this specific PostgreSQL data source as the default pre-selected data source in panels and visualizations. |
 
 **Connection section:**
 
-- **Host URL** - The IP address/hostname and optional port of your PostgreSQL instance.
-- **Database name** - The name of your PostgreSQL database.
+| Setting       | Description                                                            |
+| ------------- | ---------------------------------------------------------------------- |
+| Host URL      | The IP address/hostname and optional port of your PostgreSQL instance. |
+| Database name | The name of your PostgreSQL database.                                  |
 
 **Authentication section:**
 
-- **Username** - Enter the username used to connect to your PostgreSQL database.
-- **Password** - Enter the password used to connect to the PostgreSQL database.
-- **TLS/SSL Mode** - Determines whether or with what priority a secure SSL TCP/IP connection will be negotiated with the server. When **TLS/SSL Mode** is disabled, **TLS/SSL Method** and **TLS/SSL Auth Details** aren't visible options.
-- **TLS/SSL Method** - Determines how TLS/SSL certificates are configured.
-  - **File system path** - This option allows you to configure certificates by specifying paths to existing certificates on the local file system where Grafana is running. Ensure this file is readable by the user executing the Grafana process.
-  - **Certificate content** - This option allows you to configure certificate by specifying their content. The content is stored and encrypted in the Grafana database. When connecting to the database, the certificates are saved as files, on the local filesystem, in the Grafana data path.
+| Setting               | Description                                                                                                                                                                                                                                                        |
+| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Username              | Enter the username used to connect to your PostgreSQL database.                                                                                                                                                                                                    |
+| Password              | Enter the password used to connect to the PostgreSQL database.                                                                                                                                                                                                     |
+| TLS/SSL Mode          | Determines whether or with what priority a secure SSL TCP/IP connection will be negotiated with the server. When TLS/SSL Mode is disabled, TLS/SSL Method and TLS/SSL Auth Details aren’t visible options.                                                         |
+| TLS/SSL Method        | Determines how TLS/SSL certificates are configured.                                                                                                                                                                                                                |
+| - File system path    | This option allows you to configure certificates by specifying paths to existing certificates on the local file system where Grafana is running. Ensure this file is readable by the user executing the Grafana process.                                           |
+| - Certificate content | This option allows you to configure certificate by specifying their content. The content is stored and encrypted in the Grafana database. When connecting to the database, the certificates are saved as files, on the local filesystem, in the Grafana data path. |
 
-**TLS/SSL Auth Details**
+**TLS/SSL Auth Details:**
 
 If you select the TLS/SSL Mode options **require**, **verify-ca** or **verify-full** and **file system path** the following are required:
 
-- **TLS/SSL Root Certificate** - Specify the path to the root certificate file.
-- **TLS/SSL Client Certificate** - Specify the path to the client certificate and ensure the file is accessible to the user running the Grafana process.
-- **TLS/SSL Client Key** - Specify the path to the client key file and ensure the file is accessible to the user running the Grafana process.
+| Setting                    | Description                                                                                                           |
+| -------------------------- | --------------------------------------------------------------------------------------------------------------------- |
+| TLS/SSL Root Certificate   | Specify the path to the root certificate file.                                                                        |
+| TLS/SSL Client Certificate | Specify the path to the client certificate and ensure the file is accessible to the user running the Grafana process. |
+| TLS/SSL Client Key         | Specify the path to the client key file and ensure the file is accessible to the user running the Grafana process.    |
 
 If you select the TLS/SSL Mode option **require** and TLS/SSL Method certificate content the following are required:
 
-- **TLS/SSL Client Certificate** - Provide the client certificate.
-- **TLS/SSL Client Key** - Provide the client key.
+| Setting                    | Description                     |
+| -------------------------- | ------------------------------- |
+| TLS/SSL Client Certificate | Provide the client certificate. |
+| TLS/SSL Client Key         | Provide the client key.         |
 
 If you select the TLS/SSL Mode options **verify-ca** or **verify-full** with the TLS/SSL Method certificate content the following are required:
 
-- **TLS/SSL Client Certificate** - Provide the client certificate.
-- **TLS/SSL Root Certificate** - Provide the root certificate.
-- **TLS/SSL Client Key** - Provide the client key.
+| Setting                    | Description                     |
+| -------------------------- | ------------------------------- |
+| TLS/SSL Client Certificate | Provide the client certificate. |
+| TLS/SSL Root Certificate   | Provide the root certificate.   |
+| TLS/SSL Client Key         | Provide the client key.         |
 
 **PostgreSQL Options:**
 
-- **Version** - Determines which functions are available in the query builder. The default is the current version.
-- **Min time interval** - Defines a lower limit for the auto group by by time interval. Grafana recommends aligning this setting with the data write frequency. For example, set it to `1m` if your data is written every minute. Refer to [Min time interval](#min-time-interval) for format examples.
-- **TimescaleDB** - A time-series database built as a PostgreSQL extension. When enabled, Grafana uses `time_bucket` in the `$__timeGroup` macro to display TimescaleDB specific aggregate functions in the query builder. For more information, refer to [TimescaleDB documentation](https://docs.timescale.com/timescaledb/latest/tutorials/grafana/grafana-timescalecloud/#connect-timescaledb-and-grafana).
+| Setting           | Description                                                                                                                                                                                                                                                                                                                                                                                 |
+| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Version           | Determines which functions are available in the query builder. The default is the current version.                                                                                                                                                                                                                                                                                          |
+| Min time interval | Defines a lower limit for the auto group by time interval. Grafana recommends aligning this setting with the data write frequency. For example, set it to `1m` if your data is written every minute. Refer to [Min time interval](#min-time-interval) for format examples.                                                                                                                  |
+| TimescaleDB       | A time-series database built as a PostgreSQL extension. When enabled, Grafana uses `time_bucket` in the `$__timeGroup` macro to display TimescaleDB-specific aggregate functions in the query builder. For more information, refer to [TimescaleDB documentation](https://docs.timescale.com/timescaledb/latest/tutorials/grafana/grafana-timescalecloud/#connect-timescaledb-and-grafana). |
 
 **Connection limits:**
 
-- **Max open** - The maximum number of open connections to the database. The default `100`.
-- **Auto max idle** - Toggle to set the maximum number of idle connections to the number of maximum open connections. This setting is toggled on by default.
-- **Max idle** - The maximum number of connections in the idle connection pool. The default `100`.
-- **Max lifetime** - The maximum amount of time in seconds a connection may be reused. The default is `14400`, or 4 hours.
+| Setting       | Description                                                                                                                            |
+| ------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| Max open      | The maximum number of open connections to the database. The default is `100`.                                                          |
+| Auto max idle | Toggle to set the maximum number of idle connections to the number of maximum open connections. This setting is toggled on by default. |
+| Max idle      | The maximum number of connections in the idle connection pool. The default is `100`.                                                   |
+| Max lifetime  | The maximum amount of time in seconds a connection may be reused. The default is `14400`, or 4 hours.                                  |
 
-**Private data source connect** - _Only for Grafana Cloud users._ Private data source connect, or PDC, allows you to establish a private, secured connection between a Grafana Cloud instance, or stack, and data sources secured within a private network. Click the drop-down to locate the URL for PDC. For more information regarding Grafana PDC refer to [Private data source connect (PDC)](https://grafana.com/docs/grafana-cloud/connect-externally-hosted/private-data-source-connect/).
+**Private data source connect:**
+
+| Setting                     | Description                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| --------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Private data source connect | _Only for Grafana Cloud users._ Private data source connect, or PDC, allows you to establish a private, secured connection between a Grafana Cloud instance, or stack, and data sources secured within a private network. Click the drop-down to locate the URL for PDC. For more information, refer to [Private data source connect (PDC)](https://grafana.com/docs/grafana-cloud/connect-externally-hosted/private-data-source-connect/). |
 
 Click **Manage private data source connect** to be taken to your PDC connection page, where you’ll find your PDC configuration details.
 
@@ -191,4 +215,4 @@ datasources:
 If you encounter metric request errors or other issues:
 
 - Ensure that the parameters in your data source YAML file precisely match the example provided, including parameter names and the correct use of quotation marks.
-- Verify that the database name _isn't_ included in the URL.
+- Verify that the database name **IS NOT** included in the URL.
diff --git a/docs/sources/datasources/postgres/query-editor/_index.md b/docs/sources/datasources/postgres/query-editor/_index.md
index 5c37f7047e7..822ef681c9a 100644
--- a/docs/sources/datasources/postgres/query-editor/_index.md
+++ b/docs/sources/datasources/postgres/query-editor/_index.md
@@ -9,7 +9,7 @@ labels:
     - cloud
     - enterprise
     - oss
-menuTitle: PostgreSQL query editor
+menuTitle: Query editor
 title: PostgreSQL query editor
 weight: 20
 refs:

From a5abc6727fbc5fd6316d279cb86acc6e04e34705 Mon Sep 17 00:00:00 2001
From: maicon <maiconscosta@gmail.com>
Date: Thu, 7 Aug 2025 18:41:41 -0300
Subject: [PATCH 031/243] Unistore/dualwriter: delegate SetDefaultPermissions
 to Unified on Mode3 (#109308)

* Unistore/dualwriter: delegate SetDefaultPermissions to Unified on Mode3

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>

---------

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
---
 pkg/storage/legacysql/dualwrite/dualwriter.go | 38 ++++++++++++++-----
 .../dualwrite/dualwriter_mode3_test.go        | 30 +--------------
 2 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/pkg/storage/legacysql/dualwrite/dualwriter.go b/pkg/storage/legacysql/dualwrite/dualwriter.go
index 0cb1091b13b..afb97bb5432 100644
--- a/pkg/storage/legacysql/dualwrite/dualwriter.go
+++ b/pkg/storage/legacysql/dualwrite/dualwriter.go
@@ -39,16 +39,7 @@ type dualWriter struct {
 func (d *dualWriter) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
 	// If we read from unified, we can just do that and return.
 	if d.readUnified {
-		unifiedGet, unifiedErr := d.unified.Get(ctx, name, options)
-		if apierrors.IsNotFound(unifiedErr) {
-			// If resource is not found in unified storage, fallback to legacy.
-			// This fixes cases in where records (stored in multiple tables, including permissions)
-			// are inserted first in legacy and then on Unified.
-			log := logging.FromContext(ctx).With("method", "Get")
-			log.Error("resource not found in Unified Storage, trying to GET from legacy", "err", unifiedErr)
-			return d.legacy.Get(ctx, name, options)
-		}
-		return unifiedGet, unifiedErr
+		return d.unified.Get(ctx, name, options)
 	}
 	// If legacy is still our main store, lets first read from it.
 	legacyGet, err := d.legacy.Get(ctx, name, options)
@@ -196,6 +187,22 @@ func (d *dualWriter) Create(ctx context.Context, in runtime.Object, createValida
 		return nil, fmt.Errorf("name or generatename have to be set")
 	}
 
+	readFromUnifiedWriteToBothStorages := d.readUnified && d.legacy != nil && d.unified != nil
+
+	permissions := ""
+	if readFromUnifiedWriteToBothStorages {
+		objIn, err := utils.MetaAccessor(in)
+		if err != nil {
+			return nil, err
+		}
+
+		// keep permissions, we will set it back after the object is created
+		permissions = objIn.GetAnnotation(utils.AnnoKeyGrantPermissions)
+		if permissions != "" {
+			objIn.SetAnnotation(utils.AnnoKeyGrantPermissions, "") // remove the annotation for now
+		}
+	}
+
 	// create in legacy first, and then unistore. if unistore fails, but legacy succeeds,
 	// will try to cleanup the object in legacy.
 	createdFromLegacy, err := d.legacy.Create(ctx, in, createValidation, options)
@@ -212,6 +219,17 @@ func (d *dualWriter) Create(ctx context.Context, in runtime.Object, createValida
 	accCreated.SetResourceVersion("")
 	accCreated.SetUID("")
 
+	if readFromUnifiedWriteToBothStorages {
+		objCopy, err := utils.MetaAccessor(createdCopy)
+		if err != nil {
+			return nil, err
+		}
+		// restore the permissions annotation, as we removed it before creating in legacy
+		if permissions != "" {
+			objCopy.SetAnnotation(utils.AnnoKeyGrantPermissions, permissions)
+		}
+	}
+
 	// If unified storage is the primary storage, let's just create it in the foreground and return it.
 	if d.readUnified {
 		storageObj, errObjectSt := d.unified.Create(ctx, createdCopy, createValidation, options)
diff --git a/pkg/storage/legacysql/dualwrite/dualwriter_mode3_test.go b/pkg/storage/legacysql/dualwrite/dualwriter_mode3_test.go
index 00753d1d656..3076d8a9409 100644
--- a/pkg/storage/legacysql/dualwrite/dualwriter_mode3_test.go
+++ b/pkg/storage/legacysql/dualwrite/dualwriter_mode3_test.go
@@ -109,40 +109,12 @@ func TestMode3_Get(t *testing.T) {
 				},
 			},
 			{
-				name: "should return an error when getting an object in the unified store fails",
+				name: "should return an error when getting an object in the unified store fails, and should not go to legacy",
 				setupStorageFn: func(m *mock.Mock, name string) {
 					m.On("Get", mock.Anything, name, mock.Anything).Return(nil, errors.New("error"))
 				},
 				wantErr: true,
 			},
-			{
-				name: "should return an error when getting an object in the unified store fails with not found error, and legacy fails as well",
-				setupLegacyFn: func(m *mock.Mock, name string) {
-					m.On("Get", mock.Anything, name, mock.Anything).Return(nil, errors.New("error"))
-				},
-				setupStorageFn: func(m *mock.Mock, name string) {
-					m.On("Get", mock.Anything, name, mock.Anything).Return(nil, apierrors.NewNotFound(schema.GroupResource{Group: "dashboards.dashboard.grafana.app", Resource: "dashboard"}, "uid"))
-				},
-				wantErr: true,
-			},
-			{
-				name: "should succeed when getting an object in the UnifiedStorage fails with NotFound, but Legacy succeeds",
-				setupLegacyFn: func(m *mock.Mock, name string) {
-					m.On("Get", mock.Anything, name, mock.Anything).Return(exampleObj, nil)
-				},
-				setupStorageFn: func(m *mock.Mock, name string) {
-					m.On("Get", mock.Anything, name, mock.Anything).Return(nil, apierrors.NewNotFound(schema.GroupResource{Group: "dashboards.dashboard.grafana.app", Resource: "dashboard"}, "uid"))
-				},
-			},
-			{
-				name: "should succeed when getting an object in the LegacyStorage fails",
-				setupLegacyFn: func(m *mock.Mock, name string) {
-					m.On("Get", mock.Anything, name, mock.Anything).Return(nil, errors.New("error"))
-				},
-				setupStorageFn: func(m *mock.Mock, name string) {
-					m.On("Get", mock.Anything, name, mock.Anything).Return(exampleObj, nil)
-				},
-			},
 		}
 
 	name := "foo"

From 4b78e54304aeb060eac6a4afea2d35a8957be5c2 Mon Sep 17 00:00:00 2001
From: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com>
Date: Thu, 7 Aug 2025 16:41:42 -0600
Subject: [PATCH 032/243] Dashboard Migrations: V23 handle variable multi and
 current properties (#108937)

Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
---
 .../pkg/migration/schemaversion/migrations.go |   3 +-
 .../pkg/migration/schemaversion/v23.go        | 133 ++++++++++
 .../pkg/migration/schemaversion/v23_test.go   | 229 ++++++++++++++++++
 .../input/v23.multi_variable_alignment.json   | 129 ++++++++++
 .../output/v23.multi_variable_alignment.json  | 188 ++++++++++++++
 apps/dashboard/pkg/migration/utils/utils.go   |   9 +
 .../state/DashboardMigratorToBackend.test.ts  |   2 +-
 7 files changed, 691 insertions(+), 2 deletions(-)
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v23.go
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v23_test.go
 create mode 100644 apps/dashboard/pkg/migration/testdata/input/v23.multi_variable_alignment.json
 create mode 100644 apps/dashboard/pkg/migration/testdata/output/v23.multi_variable_alignment.json
 create mode 100644 apps/dashboard/pkg/migration/utils/utils.go

diff --git a/apps/dashboard/pkg/migration/schemaversion/migrations.go b/apps/dashboard/pkg/migration/schemaversion/migrations.go
index c95b4d7a8a7..1b34855a5a8 100644
--- a/apps/dashboard/pkg/migration/schemaversion/migrations.go
+++ b/apps/dashboard/pkg/migration/schemaversion/migrations.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	MIN_VERSION    = 23
+	MIN_VERSION    = 22
 	LATEST_VERSION = 41
 )
 
@@ -38,6 +38,7 @@ type PanelPluginInfoProvider interface {
 
 func GetMigrations(dsInfoProvider DataSourceInfoProvider, panelProvider PanelPluginInfoProvider) map[int]SchemaVersionMigrationFunc {
 	return map[int]SchemaVersionMigrationFunc{
+		23: V23,
 		24: V24(panelProvider),
 		25: V25,
 		26: V26,
diff --git a/apps/dashboard/pkg/migration/schemaversion/v23.go b/apps/dashboard/pkg/migration/schemaversion/v23.go
new file mode 100644
index 00000000000..6270a75af57
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v23.go
@@ -0,0 +1,133 @@
+package schemaversion
+
+import "github.com/grafana/grafana/apps/dashboard/pkg/migration/utils"
+
+// V23 migrates multi variables to ensure their current property is aligned with their multi property.
+// This migration ensures that variables with multi=true have current.value and current.text as arrays,
+// and variables with multi=false have current.value and current.text as single values.
+//
+// Example before migration:
+//
+//	"templating": {
+//	  "list": [
+//	    { "type": "query", "multi": true, "current": { "value": "A", "text": "A" } },
+//	    { "type": "query", "multi": false, "current": { "value": ["B"], "text": ["B"] } }
+//	  ]
+//	}
+//
+// Example after migration:
+//
+//	"templating": {
+//	  "list": [
+//	    { "type": "query", "multi": true, "current": { "value": ["A"], "text": ["A"] } },
+//	    { "type": "query", "multi": false, "current": { "value": "B", "text": "B" } }
+//	  ]
+//	}
+func V23(dashboard map[string]interface{}) error {
+	dashboard["schemaVersion"] = 23
+
+	templating, ok := dashboard["templating"].(map[string]interface{})
+	if !ok {
+		return nil
+	}
+	list, ok := templating["list"].([]interface{})
+	if !ok {
+		return nil
+	}
+
+	for _, v := range list {
+		variable, ok := v.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		if !isMulti(variable) {
+			continue
+		}
+
+		current, ok := variable["current"].(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		if isEmptyObject(current) {
+			continue
+		}
+
+		multi, ok := variable["multi"].(bool)
+		if !ok {
+			continue
+		}
+
+		variable["current"] = alignCurrentWithMulti(current, multi)
+	}
+
+	return nil
+}
+
+// isMulti checks if a variable supports multi-selection
+func isMulti(variable map[string]interface{}) bool {
+	_, hasMulti := variable["multi"]
+	return hasMulti
+}
+
+func isEmptyObject(value interface{}) bool {
+	if value == nil {
+		return true
+	}
+
+	obj, ok := value.(map[string]interface{})
+	if !ok {
+		return false
+	}
+
+	return len(obj) == 0
+}
+
+// alignCurrentWithMulti aligns the current property with the multi property
+func alignCurrentWithMulti(current map[string]interface{}, multi bool) map[string]interface{} {
+	if current == nil {
+		return current
+	}
+
+	result := make(map[string]interface{})
+	for k, v := range current {
+		result[k] = v
+	}
+
+	if multi {
+		// Convert single values to arrays
+		if value, ok := result["value"]; ok {
+			if !utils.IsArray(value) {
+				result["value"] = []interface{}{value}
+			}
+		}
+		if text, ok := result["text"]; ok {
+			if !utils.IsArray(text) {
+				result["text"] = []interface{}{text}
+			}
+		}
+	} else {
+		// Convert arrays to single values
+		if value, ok := result["value"]; ok {
+			if utils.IsArray(value) {
+				if arr, ok := value.([]interface{}); ok && len(arr) > 0 {
+					result["value"] = arr[0]
+				} else {
+					result["value"] = ""
+				}
+			}
+		}
+		if text, ok := result["text"]; ok {
+			if utils.IsArray(text) {
+				if arr, ok := text.([]interface{}); ok && len(arr) > 0 {
+					result["text"] = arr[0]
+				} else {
+					result["text"] = ""
+				}
+			}
+		}
+	}
+
+	return result
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/v23_test.go b/apps/dashboard/pkg/migration/schemaversion/v23_test.go
new file mode 100644
index 00000000000..c40fc4480fa
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v23_test.go
@@ -0,0 +1,229 @@
+package schemaversion_test
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
+)
+
+func TestV23(t *testing.T) {
+	tests := []migrationTestCase{
+		{
+			name: "multi variable with single value gets converted to array",
+			input: map[string]interface{}{
+				"title":         "V23 Multi Variable Single Value Test",
+				"schemaVersion": 22,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "multi_single_value",
+							"multi":   true,
+							"current": map[string]interface{}{"value": "A", "text": "A", "selected": true},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V23 Multi Variable Single Value Test",
+				"schemaVersion": 23,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "multi_single_value",
+							"multi":   true,
+							"current": map[string]interface{}{"value": []interface{}{"A"}, "text": []interface{}{"A"}, "selected": true},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "multi variable with array value stays as array",
+			input: map[string]interface{}{
+				"title":         "V23 Multi Variable Array Value Test",
+				"schemaVersion": 22,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "multi_array_value",
+							"multi":   true,
+							"current": map[string]interface{}{"value": []interface{}{"B", "C"}, "text": []interface{}{"B", "C"}, "selected": true},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V23 Multi Variable Array Value Test",
+				"schemaVersion": 23,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "multi_array_value",
+							"multi":   true,
+							"current": map[string]interface{}{"value": []interface{}{"B", "C"}, "text": []interface{}{"B", "C"}, "selected": true},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "non-multi variable with array value gets converted to single value",
+			input: map[string]interface{}{
+				"title":         "V23 Non-Multi Variable Array Value Test",
+				"schemaVersion": 22,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "non_multi_array_value",
+							"multi":   false,
+							"current": map[string]interface{}{"value": []interface{}{"D"}, "text": []interface{}{"D"}, "selected": true},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V23 Non-Multi Variable Array Value Test",
+				"schemaVersion": 23,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "non_multi_array_value",
+							"multi":   false,
+							"current": map[string]interface{}{"value": "D", "text": "D", "selected": true},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "non-multi variable with single value stays as single value",
+			input: map[string]interface{}{
+				"title":         "V23 Non-Multi Variable Single Value Test",
+				"schemaVersion": 22,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "non_multi_single_value",
+							"multi":   false,
+							"current": map[string]interface{}{"value": "E", "text": "E", "selected": true},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V23 Non-Multi Variable Single Value Test",
+				"schemaVersion": 23,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "non_multi_single_value",
+							"multi":   false,
+							"current": map[string]interface{}{"value": "E", "text": "E", "selected": true},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "variable without multi property is unchanged",
+			input: map[string]interface{}{
+				"title":         "V23 No Multi Property Test",
+				"schemaVersion": 22,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "no_multi_property",
+							"current": map[string]interface{}{"value": "F", "text": "F", "selected": true},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V23 No Multi Property Test",
+				"schemaVersion": 23,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "no_multi_property",
+							"current": map[string]interface{}{"value": "F", "text": "F", "selected": true},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "variable with empty current is unchanged",
+			input: map[string]interface{}{
+				"title":         "V23 Empty Current Test",
+				"schemaVersion": 22,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "empty_current",
+							"multi":   true,
+							"current": map[string]interface{}{},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V23 Empty Current Test",
+				"schemaVersion": 23,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "empty_current",
+							"multi":   true,
+							"current": map[string]interface{}{},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "variable with nil current is unchanged",
+			input: map[string]interface{}{
+				"title":         "V23 Nil Current Test",
+				"schemaVersion": 22,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "nil_current",
+							"multi":   true,
+							"current": nil,
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V23 Nil Current Test",
+				"schemaVersion": 23,
+				"templating": map[string]interface{}{
+					"list": []interface{}{
+						map[string]interface{}{
+							"type":    "query",
+							"name":    "nil_current",
+							"multi":   true,
+							"current": nil,
+						},
+					},
+				},
+			},
+		},
+	}
+
+	runMigrationTests(t, tests, schemaversion.V23)
+}
diff --git a/apps/dashboard/pkg/migration/testdata/input/v23.multi_variable_alignment.json b/apps/dashboard/pkg/migration/testdata/input/v23.multi_variable_alignment.json
new file mode 100644
index 00000000000..1b26cb9b002
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/input/v23.multi_variable_alignment.json
@@ -0,0 +1,129 @@
+{
+  "title": "V23 Multi Variables Migration Test Dashboard",
+  "schemaVersion": 22,
+  "templating": {
+    "list": [
+      {
+        "name": "multi_single_value",
+        "type": "query",
+        "datasource": "prometheus",
+        "multi": true,
+        "current": {
+          "value": "A",
+          "text": "A",
+          "selected": true
+        }
+      },
+      {
+        "name": "multi_array_value",
+        "type": "query",
+        "datasource": "prometheus",
+        "multi": true,
+        "current": {
+          "value": ["B", "C"],
+          "text": ["B", "C"],
+          "selected": true
+        }
+      },
+      {
+        "name": "non_multi_array_value",
+        "type": "query",
+        "datasource": "prometheus",
+        "multi": false,
+        "current": {
+          "value": ["D"],
+          "text": ["D"],
+          "selected": true
+        }
+      },
+      {
+        "name": "non_multi_single_value",
+        "type": "query",
+        "datasource": "prometheus",
+        "multi": false,
+        "current": {
+          "value": "E",
+          "text": "E",
+          "selected": true
+        }
+      },
+      {
+        "name": "no_multi_property",
+        "type": "query",
+        "datasource": "prometheus",
+        "current": {
+          "value": "F",
+          "text": "F",
+          "selected": true
+        }
+      },
+      {
+        "name": "empty_current",
+        "type": "query",
+        "datasource": "prometheus",
+        "multi": true,
+        "current": {}
+      },
+      {
+        "name": "nil_current",
+        "type": "query",
+        "datasource": "prometheus",
+        "multi": true,
+        "current": null
+      },
+      {
+        "name": "custom_variable",
+        "type": "custom",
+        "multi": true,
+        "current": {
+          "value": "G",
+          "text": "G",
+          "selected": true
+        }
+      },
+      {
+        "name": "textbox_variable",
+        "type": "textbox",
+        "multi": false,
+        "current": {
+          "value": "H",
+          "text": "H",
+          "selected": true
+        }
+      },
+      {
+        "name": "datasource_variable",
+        "type": "datasource",
+        "multi": true,
+        "current": {
+          "value": ["prometheus", "influxdb"],
+          "text": ["Prometheus", "InfluxDB"],
+          "selected": true
+        }
+      },
+      {
+        "name": "interval_variable",
+        "type": "interval",
+        "multi": false,
+        "current": {
+          "value": ["1m"],
+          "text": ["1m"],
+          "selected": true
+        }
+      }
+    ]
+  },
+  "panels": [
+    {
+      "id": 1,
+      "title": "Test Panel",
+      "type": "stat",
+      "targets": [
+        {
+          "refId": "A",
+          "expr": "up"
+        }
+      ]
+    }
+  ]
+} 
\ No newline at end of file
diff --git a/apps/dashboard/pkg/migration/testdata/output/v23.multi_variable_alignment.json b/apps/dashboard/pkg/migration/testdata/output/v23.multi_variable_alignment.json
new file mode 100644
index 00000000000..91a0cb50520
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/output/v23.multi_variable_alignment.json
@@ -0,0 +1,188 @@
+{
+  "panels": [
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 1,
+      "options": {
+        "justifyMode": "auto",
+        "percentChangeColorMode": "standard",
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "expr": "up",
+          "refId": "A"
+        }
+      ],
+      "title": "Test Panel",
+      "type": "stat"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 41,
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": true,
+          "text": [
+            "A"
+          ],
+          "value": [
+            "A"
+          ]
+        },
+        "datasource": {
+          "uid": "prometheus"
+        },
+        "multi": true,
+        "name": "multi_single_value",
+        "refresh": 1,
+        "type": "query"
+      },
+      {
+        "current": {
+          "selected": true,
+          "text": [
+            "B",
+            "C"
+          ],
+          "value": [
+            "B",
+            "C"
+          ]
+        },
+        "datasource": {
+          "uid": "prometheus"
+        },
+        "multi": true,
+        "name": "multi_array_value",
+        "refresh": 1,
+        "type": "query"
+      },
+      {
+        "current": {
+          "selected": true,
+          "text": "D",
+          "value": "D"
+        },
+        "datasource": {
+          "uid": "prometheus"
+        },
+        "multi": false,
+        "name": "non_multi_array_value",
+        "refresh": 1,
+        "type": "query"
+      },
+      {
+        "current": {
+          "selected": true,
+          "text": "E",
+          "value": "E"
+        },
+        "datasource": {
+          "uid": "prometheus"
+        },
+        "multi": false,
+        "name": "non_multi_single_value",
+        "refresh": 1,
+        "type": "query"
+      },
+      {
+        "current": {
+          "selected": true,
+          "text": "F",
+          "value": "F"
+        },
+        "datasource": {
+          "uid": "prometheus"
+        },
+        "name": "no_multi_property",
+        "refresh": 1,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "uid": "prometheus"
+        },
+        "multi": true,
+        "name": "empty_current",
+        "refresh": 1,
+        "type": "query"
+      },
+      {
+        "current": null,
+        "datasource": {
+          "uid": "prometheus"
+        },
+        "multi": true,
+        "name": "nil_current",
+        "refresh": 1,
+        "type": "query"
+      },
+      {
+        "current": {
+          "selected": true,
+          "text": [
+            "G"
+          ],
+          "value": [
+            "G"
+          ]
+        },
+        "multi": true,
+        "name": "custom_variable",
+        "type": "custom"
+      },
+      {
+        "current": {
+          "selected": true,
+          "text": "H",
+          "value": "H"
+        },
+        "multi": false,
+        "name": "textbox_variable",
+        "type": "textbox"
+      },
+      {
+        "current": {
+          "selected": true,
+          "text": [
+            "Prometheus",
+            "InfluxDB"
+          ],
+          "value": [
+            "prometheus",
+            "influxdb"
+          ]
+        },
+        "multi": true,
+        "name": "datasource_variable",
+        "type": "datasource"
+      },
+      {
+        "current": {
+          "selected": true,
+          "text": "1m",
+          "value": "1m"
+        },
+        "multi": false,
+        "name": "interval_variable",
+        "type": "interval"
+      }
+    ]
+  },
+  "title": "V23 Multi Variables Migration Test Dashboard"
+}
\ No newline at end of file
diff --git a/apps/dashboard/pkg/migration/utils/utils.go b/apps/dashboard/pkg/migration/utils/utils.go
new file mode 100644
index 00000000000..0f11cdc5b4c
--- /dev/null
+++ b/apps/dashboard/pkg/migration/utils/utils.go
@@ -0,0 +1,9 @@
+package utils
+
+func IsArray(value interface{}) bool {
+	if value == nil {
+		return false
+	}
+	_, ok := value.([]interface{})
+	return ok
+}
diff --git a/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts b/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
index 73b83424328..23cc35596ae 100644
--- a/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
+++ b/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
@@ -144,7 +144,7 @@ describe('Backend / Frontend result comparison', () => {
       */
       if (jsonInput.schemaVersion <= 27) {
         for (const panel of frontendModel.panels) {
-          if (panel.type === 'stat') {
+          if (panel.type === 'stat' && panel.autoMigrateFrom) {
             // Set the plugin version if it doesn't exist
             if (!statPanelPlugin.meta.info) {
               statPanelPlugin.meta.info = {

From cc64b1748324fb42f9b6154524ac8315cd9fd5d4 Mon Sep 17 00:00:00 2001
From: Paul Marbach <paul.marbach@grafana.com>
Date: Thu, 7 Aug 2025 19:53:52 -0400
Subject: [PATCH 033/243] Table: Move cell-specific styles out to their own
 methods (#108941)

* TableNG: Markdown cell, plus custom row height

* tab indentation in cue file

* fix i18n

* trying an auto height with the updated RDG

* get auto cellHeight working

* i18n updates

* hoor disable_sanitize_html flag in MarkdownCell

* update react-data-grid version to attempt to support page up and down

* removing custom height

* use the latest experimental RDG with paging up and down

* TableNG: Wrap text for DataLinks and Pills; groundwork for max wrap length

* disable editing max wrapped lines for now

* disable wrap text line limit e2e

* new i18n extract after commenting out input

* wip

* kill max wrapped lines for now

* more cleanup

* remove targeting classes added for max wrapped lines

* fix Pill test

* couple more style cleanups

* Table: Move cell-specific styles out to their own methods

* move styles into their own file

* combine renderer and style declarations to make auto cells work better, complete cleanup of internal cell elements

* fix e2es given these updates

* add a couple tests

* wip: tests

* add tests

* bump up capital letters in lorem ipsum

* fix copy-pasta mistake

* whoops, mis-merged the selector

* use a local count instead of getCellLinks

* use react-data-grid on react-18 branch

* fix linting on test

* gdev dashboard and smoketest for Markdown table

* remove cellHeightCustom

* restore bugfix from adversarial AI-generated JSON

* reorganize in light of recent and upcoming changes

* cleanup

* override the whitespace for markdown

* what are these auto imports about...

* fix cell height selector from merge

* also remove cellHeightCustom

* i18n

* avoid the important override in markdown cell styles

* revert some betterer config autoformatting

* slight code cleanup

* s/cat/grot, add color link panel to kitchen sink, fix color link/image link style issues

* update panelid for empty table panel test

* link styles outside of cell style setup

* flesh out kitchen sink examples, update ImageCell and applyToRow

* clean up some inconsistent states

* fix lint issue

* gdev update

* format JSON to satisfy linter

* shortening the text in the long text field

---------

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
---
 .betterer.eslint.config.js                    |   19 +
 .../panel-table/table_kitchen_sink.json       | 1254 ++++++++++++++++-
 .../panel-table/table_markdown.json           |    2 +-
 .../panels-suite/table-kitchenSink.spec.ts    |   33 +-
 .../grafana-schema/src/common/common.gen.ts   |   45 +-
 packages/grafana-schema/src/common/table.cue  |   12 +-
 .../Table/TableNG/Cells/ActionsCell.tsx       |   27 +-
 .../Table/TableNG/Cells/AutoCell.tsx          |   27 +-
 .../Table/TableNG/Cells/BarGaugeCell.tsx      |    9 +-
 .../Table/TableNG/Cells/DataLinksCell.tsx     |   29 +-
 .../Table/TableNG/Cells/GeoCell.tsx           |   31 +-
 .../Table/TableNG/Cells/ImageCell.tsx         |   38 +-
 .../Table/TableNG/Cells/MarkdownCell.tsx      |   30 +-
 .../Table/TableNG/Cells/PillCell.tsx          |   25 +-
 .../Table/TableNG/Cells/SparklineCell.tsx     |   42 +-
 .../Table/TableNG/Cells/renderers.test.tsx    |    7 +-
 .../Table/TableNG/Cells/renderers.tsx         |  153 +-
 .../src/components/Table/TableNG/TableNG.tsx  |  321 +----
 .../{Cells => components}/FooterCell.tsx      |    0
 .../{Cells => components}/HeaderCell.tsx      |    5 +-
 .../{Cells => components}/RowExpander.tsx     |    0
 .../TableCellActions.tsx                      |    0
 .../src/components/Table/TableNG/constants.ts |    1 -
 .../src/components/Table/TableNG/styles.ts    |  158 +++
 .../src/components/Table/TableNG/types.ts     |   16 +-
 25 files changed, 1738 insertions(+), 546 deletions(-)
 rename packages/grafana-ui/src/components/Table/TableNG/{Cells => components}/FooterCell.tsx (100%)
 rename packages/grafana-ui/src/components/Table/TableNG/{Cells => components}/HeaderCell.tsx (96%)
 rename packages/grafana-ui/src/components/Table/TableNG/{Cells => components}/RowExpander.tsx (100%)
 rename packages/grafana-ui/src/components/Table/TableNG/{Cells => components}/TableCellActions.tsx (100%)
 create mode 100644 packages/grafana-ui/src/components/Table/TableNG/styles.ts

diff --git a/.betterer.eslint.config.js b/.betterer.eslint.config.js
index c1a38731291..ae8b600826f 100644
--- a/.betterer.eslint.config.js
+++ b/.betterer.eslint.config.js
@@ -157,4 +157,23 @@ module.exports = [
       'no-barrel-files/no-barrel-files': 'error',
     },
   },
+  {
+    // custom rule for Table to avoid performance regressions
+    files: ['packages/grafana-ui/src/components/Table/TableNG/Cells/**/*.{ts,tsx}'],
+    rules: {
+      'no-restricted-imports': [
+        'error',
+        {
+          patterns: [
+            {
+              group: ['**/themes/ThemeContext'],
+              importNames: ['useStyles2', 'useTheme2'],
+              message:
+                'Do not use "useStyles2" or "useTheme2" in a cell directly. Instead, provide styles to cells via `getDefaultCellStyles` or `getCellSpecificStyles`.',
+            },
+          ],
+        },
+      ],
+    },
+  },
 ];
diff --git a/devenv/dev-dashboards/panel-table/table_kitchen_sink.json b/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
index 9c05634b066..77ba090a0df 100644
--- a/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
+++ b/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
@@ -18,7 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 138,
+  "id": 21409,
   "links": [],
   "panels": [
     {
@@ -78,6 +78,10 @@
               {
                 "id": "max",
                 "value": 100
+              },
+              {
+                "id": "custom.inspect",
+                "value": true
               }
             ]
           },
@@ -140,14 +144,14 @@
           },
           {
             "matcher": {
-              "id": "byName",
-              "options": "Image"
+              "id": "byRegexp",
+              "options": "/Image/"
             },
             "properties": [
               {
                 "id": "custom.cellOptions",
                 "value": {
-                  "alt": "${__value}",
+                  "alt": "Grafana icon",
                   "type": "image"
                 }
               }
@@ -278,7 +282,7 @@
               },
               {
                 "id": "custom.width",
-                "value": 300
+                "value": 255
               }
             ]
           },
@@ -291,7 +295,8 @@
               {
                 "id": "custom.cellOptions",
                 "value": {
-                  "type": "pill"
+                  "type": "pill",
+                  "wrapText": true
                 }
               },
               {
@@ -309,7 +314,8 @@
               {
                 "id": "custom.cellOptions",
                 "value": {
-                  "type": "data-links"
+                  "type": "data-links",
+                  "wrapText": true
                 }
               },
               {
@@ -329,7 +335,7 @@
               },
               {
                 "id": "custom.width",
-                "value": 180
+                "value": 139
               }
             ]
           },
@@ -339,12 +345,65 @@
               "options": "Gauge"
             },
             "properties": []
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Action"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "actions"
+                }
+              },
+              {
+                "id": "actions",
+                "value": [
+                  {
+                    "confirmation": "",
+                    "fetch": {
+                      "body": "{}",
+                      "headers": [["Content-Type", "application/json"]],
+                      "method": "GET",
+                      "queryParams": [],
+                      "url": "/api/health"
+                    },
+                    "title": "Get instance health",
+                    "type": "fetch"
+                  }
+                ]
+              },
+              {
+                "id": "custom.width",
+                "value": 142
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Image w/ Link"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Grafana Cloud Products",
+                    "url": "https://grafana.com/products/cloud/"
+                  }
+                ]
+              }
+            ]
           }
         ]
       },
       "gridPos": {
-        "h": 15,
-        "w": 24,
+        "h": 12,
+        "w": 16,
         "x": 0,
         "y": 0
       },
@@ -360,9 +419,14 @@
         },
         "frameIndex": 0,
         "showHeader": true,
-        "sortBy": []
+        "sortBy": [
+          {
+            "desc": false,
+            "displayName": "Long Text"
+          }
+        ]
       },
-      "pluginVersion": "12.1.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "datasource": {
@@ -372,7 +436,7 @@
           "scenarioId": "random_walk_table"
         },
         {
-          "csvContent": "Info,Image,Pills,Data Link,Long Text\ndown,https://placecats.com/millie/200/400,hello,https://grafana.com,\"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse tempus et augue et lacinia. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec eu pretium tortor. Cras venenatis sapien sed mauris gravida, ut scelerisque est fringilla. Cras lorem diam, facilisis nec malesuada in, vulputate vel enim. Etiam fringilla nisi quis felis blandit tincidunt. Cras id lacus ornare, ullamcorper nisl eget, bibendum odio. Pellentesque imperdiet, leo a imperdiet venenatis, ligula risus venenatis quam, vel euismod magna nisi sit amet leo.\"\nup,https://placecats.com/neo/200/400,\"[1,2,3,\"\"foo\"\",\"\"bar\"\"]\",https://grafana.com/solutions/kubernetes/,\"Sed imperdiet eget diam sit amet fringilla. Curabitur quis lacus blandit, mollis diam non, accumsan tortor. Aliquam ac tellus eget dui facilisis tempor eu id nulla. Maecenas ultrices turpis eu elementum imperdiet. Fusce eget rhoncus mi, et egestas lectus. Mauris facilisis auctor enim sed malesuada. Maecenas placerat ultricies metus vitae viverra. In hac habitasse platea dictumst. Mauris ipsum nisl, dictum eu aliquam eleifend, rutrum id orci. Nullam eget dui et odio eleifend porttitor.\"\nup fast,https://placecats.com/bella/200/400,\"foo,1,4,beep\",https://k6.io/,\"Proin ac libero vulputate ex vulputate pharetra ut vel lacus. Phasellus quis dolor sed leo finibus scelerisque. Ut vel finibus leo, sed viverra ipsum. Suspendisse vitae rutrum arcu. Donec sed tellus vel lectus bibendum vestibulum. Sed eu felis non velit dictum pulvinar eu et leo. Aenean et dignissim arcu. Nam luctus at neque quis efficitur. Fusce tempus at nibh a imperdiet. Nullam malesuada ac magna at facilisis. Duis pretium aliquam eros. Donec pharetra dignissim dolor non bibendum. Ut gravida mi id urna tempus, at ullamcorper felis vulputate. Duis congue augue ex, sed finibus leo ornare ut. Mauris non quam sodales, dignissim lorem eget, tincidunt mauris. Aliquam ut velit auctor, vestibulum metus sed, mollis massa.\"\ndown fast,https://placecats.com/neo_2/200/400,\"foo,bar,baz,a longer one,bim\",https://grafana.com/products/cloud/,\"Nullam in pulvinar justo. Nunc dictum arcu ac pellentesque bibendum. Sed in erat turpis. Vestibulum eu orci ac ligula lobortis tempus. Fusce consectetur feugiat magna, eu tempor nibh vestibulum ac. Aliquam erat volutpat. Vivamus sit amet viverra enim. Quisque mollis odio nulla, nec vulputate sem placerat in. Etiam dolor sapien, pulvinar in accumsan at, consequat eget nisi. Nunc condimentum neque magna, congue consectetur dui efficitur interdum. Nam lobortis fringilla maximus. Vestibulum eu dui a velit condimentum eleifend consequat nec lectus.\"",
+          "csvContent": "Info,Image,Image w/ Link,Pills,Data Link,Long Text\ndown,https://grafana.com/media/menus/products/grafana-menu-icon.svg,https://grafana.com/media/menus/products/grafana-menu-icon.svg,hello,https://grafana.com,\"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse tempus et augue et lacinia. Interdum et malesuada fames ac ante ipsum primis in faucibus.\"\nup,https://grafana.com/media/menus/products/grafana-menu-icon-logs.svg,https://grafana.com/media/menus/products/grafana-menu-icon-logs.svg,\"[1,2,3,\"\"foo\"\",\"\"bar\"\"]\",https://grafana.com/solutions/kubernetes/,\"Sed imperdiet eget diam sit amet fringilla. Curabitur quis lacus blandit, mollis diam non, accumsan tortor.\"\nup fast,https://grafana.com/media/menus/products/grafana-menu-icon-traces.svg,https://grafana.com/media/menus/products/grafana-menu-icon-traces.svg,\"foo,1,4,beep\",https://k6.io/,\"Proin ac libero vulputate ex vulputate pharetra ut vel lacus. Phasellus quis dolor sed leo finibus scelerisque. Ut vel finibus leo, sed viverra ipsum.\"\ndown fast,https://grafana.com/media/menus/products/grafana-menu-icon-metrics.svg,https://grafana.com/media/menus/products/grafana-menu-icon-metrics.svg,\"foo,bar,baz,a longer one,bim\",https://grafana.com/products/cloud/,\"Nullam in pulvinar justo. Nunc dictum arcu ac pellentesque bibendum. Sed in erat turpis. Vestibulum eu orci ac ligula lobortis tempus.\"",
           "datasource": {
             "type": "grafana-testdata-datasource"
           },
@@ -389,6 +453,30 @@
             "mode": "outerTabular"
           }
         },
+        {
+          "id": "calculateField",
+          "options": {
+            "alias": "Action",
+            "binary": {
+              "left": {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Image"
+                }
+              },
+              "right": {
+                "matcher": {
+                  "id": "byName",
+                  "options": "$Filters"
+                }
+              }
+            },
+            "mode": "index",
+            "reduce": {
+              "reducer": "sum"
+            }
+          }
+        },
         {
           "id": "organize",
           "options": {
@@ -397,14 +485,16 @@
             },
             "includeByName": {},
             "indexByName": {
-              "A": 9,
-              "Data Link": 8,
+              "A": 11,
+              "Action": 7,
+              "Data Link": 10,
               "Image": 5,
+              "Image w/ Link": 6,
               "Info": 1,
-              "Long Text": 7,
+              "Long Text": 9,
               "Max A": 3,
               "Min A": 2,
-              "Pills": 6,
+              "Pills": 8,
               "State A": 4,
               "Time A": 0
             },
@@ -426,17 +516,1082 @@
       "type": "table"
     },
     {
-      "id": 2,
-      "type": "table",
-      "title": "Empty Table Panel",
-      "gridPos": {
-        "x": 0,
-        "y": 0,
-        "h": 6,
-        "w": 24
+      "datasource": {
+        "type": "grafana-testdata-datasource"
       },
       "fieldConfig": {
         "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "color-background"
+            },
+            "filterable": true,
+            "inspect": true,
+            "wrapHeaderText": false
+          },
+          "fieldMinMax": true,
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 8,
+        "x": 16,
+        "y": 0
+      },
+      "id": 4,
+      "maxDataPoints": 100,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "enablePagination": false,
+          "fields": "",
+          "reducer": ["max"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": [
+          {
+            "desc": true,
+            "displayName": "State"
+          }
+        ]
+      },
+      "pluginVersion": "12.2.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource"
+          },
+          "refId": "A",
+          "scenarioId": "random_walk_table"
+        }
+      ],
+      "title": "Nested tables",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "A": false
+            },
+            "includeByName": {},
+            "indexByName": {
+              "A": 5,
+              "Info": 2,
+              "Max": 4,
+              "Min": 3,
+              "State": 1,
+              "Time": 0
+            },
+            "renameByName": {}
+          }
+        },
+        {
+          "id": "groupToNestedTable",
+          "options": {
+            "fields": {
+              "State": {
+                "aggregations": [],
+                "operation": "groupby"
+              }
+            },
+            "showSubframeHeaders": true
+          }
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false,
+            "minWidth": 50,
+            "wrapHeaderText": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 3
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/\\b(bg|color)\\b/"
+            },
+            "properties": [
+              {
+                "id": "mappings",
+                "value": [
+                  {
+                    "options": {
+                      "a": {
+                        "color": "dark-red",
+                        "index": 0
+                      },
+                      "b": {
+                        "color": "super-light-orange",
+                        "index": 1
+                      },
+                      "c": {
+                        "color": "green",
+                        "index": 2
+                      },
+                      "d": {
+                        "color": "super-light-blue",
+                        "index": 3
+                      }
+                    },
+                    "type": "value"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/\\bcolor\\b/"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/\\bbg\\b/"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-background"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/\\blink\\b/"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "goto foo",
+                    "url": "https://foo"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/\\blinks\\b/"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "goto foo",
+                    "url": "https://foo"
+                  },
+                  {
+                    "targetBlank": true,
+                    "title": "goto bar",
+                    "url": "https://bar"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "links-cellType"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "data-links"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 12
+      },
+      "id": 2,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "12.2.0-pre",
+      "targets": [
+        {
+          "csvContent": "auto,link,links,bg,bg-link,bg-links,color,color-link,color-links,bg-row,bg-row-link,bg-row-links,color-row,color-row-link,color-row-links,links-cellType\na,a,a,a,a,a,a,a,a,1,1,1,1,1,1,1\nb,b,b,b,b,b,b,b,b,2,2,2,2,2,2,2\nc,c,c,c,c,c,c,c,c,3,3,3,3,3,3,3\nd,d,d,d,d,d,d,d,d,4,4,4,4,4,4,4",
+          "datasource": {
+            "type": "grafana-testdata-datasource"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Colors and Links",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false,
+            "wrapHeaderText": false
+          },
+          "fieldMinMax": true,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "applyToRow": true,
+                  "mode": "basic",
+                  "type": "color-background"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "continuous-greens"
+                }
+              },
+              {
+                "id": "custom.width",
+                "value": 50
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/(Min|Max)/"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Info"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Google this term",
+                    "url": "https://google.com/search?q=${__value.raw}"
+                  }
+                ]
+              },
+              {
+                "id": "custom.width",
+                "value": 79
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Time"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 156
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "State"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 99
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 4,
+        "x": 0,
+        "y": 19
+      },
+      "id": 6,
+      "maxDataPoints": 10,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "12.2.0-pre",
+      "targets": [
+        {
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"name\": \"A\",\n      \"fields\": [\n        {\n          \"name\": \"Time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Value\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Min\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Max\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Info\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"State\",\n          \"type\": \"enum\",\n          \"typeInfo\": {\n            \"frame\": \"enum\"\n          },\n          \"config\": {\n            \"type\": {\n              \"enum\": {\n                \"text\": [\n                  \"Unknown\",\n                  \"Up\",\n                  \"Down\"\n                ]\n              }\n            }\n          }\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1754578636810,\n          1754580436810,\n          1754582236810,\n          1754584036810,\n          1754585836810,\n          1754587636810,\n          1754589436810,\n          1754591236810,\n          1754593036810,\n          1754594836810\n        ],\n        [\n          68.67815082171406,\n          68.21038738705283,\n          67.85748579518524,\n          67.48088827530566,\n          67.36362085363314,\n          67.75399477824531,\n          67.9006935145112,\n          68.2893033558627,\n          68.20547872017494,\n          67.96251158324088\n        ],\n        [\n          67.52655915076163,\n          68.03367017865995,\n          65.44308825471086,\n          66.94142900198796,\n          66.33531057489242,\n          66.97007154625013,\n          67.88134129373145,\n          65.92102089546943,\n          65.7896781452792,\n          67.77680599320166\n        ],\n        [\n          68.78026730954913,\n          68.46495903270079,\n          68.29118217530531,\n          67.90561937677037,\n          68.05316512901861,\n          70.26033810424696,\n          68.05691975265877,\n          68.76874724839202,\n          70.02772232081647,\n          70.38628221361253\n        ],\n        [\n          \"up\",\n          \"down fast\",\n          \"down\",\n          \"down\",\n          \"down\",\n          \"up\",\n          \"up\",\n          \"up\",\n          \"down\",\n          \"down\"\n        ],\n        [\n          1,\n          2,\n          2,\n          2,\n          2,\n          1,\n          1,\n          1,\n          2,\n          2\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "Apply to row - basic",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false,
+            "wrapHeaderText": false
+          },
+          "fieldMinMax": true,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "applyToRow": true,
+                  "type": "color-background"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "continuous-blues"
+                }
+              },
+              {
+                "id": "custom.width",
+                "value": 50
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/(Min|Max)/"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Info"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Google this term",
+                    "url": "https://google.com/search?q=${__value.raw}"
+                  }
+                ]
+              },
+              {
+                "id": "custom.width",
+                "value": 59
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Time"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 161
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "State"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 114
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 4,
+        "x": 4,
+        "y": 19
+      },
+      "id": 5,
+      "maxDataPoints": 10,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "12.2.0-pre",
+      "targets": [
+        {
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"name\": \"A\",\n      \"fields\": [\n        {\n          \"name\": \"Time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Value\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Min\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Max\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Info\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"State\",\n          \"type\": \"enum\",\n          \"typeInfo\": {\n            \"frame\": \"enum\"\n          },\n          \"config\": {\n            \"type\": {\n              \"enum\": {\n                \"text\": [\n                  \"Unknown\",\n                  \"Up\",\n                  \"Down\"\n                ]\n              }\n            }\n          }\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1754579008785,\n          1754580808785,\n          1754582608785,\n          1754584408785,\n          1754586208785,\n          1754588008785,\n          1754589808785,\n          1754591608785,\n          1754593408785,\n          1754595208785\n        ],\n        [\n          89.82213040422468,\n          89.53763263564208,\n          90.03103064454615,\n          90.51535567776907,\n          90.88960652895187,\n          91.30921636258488,\n          91.12427953645643,\n          91.1507153149385,\n          90.81021008780039,\n          91.11327042147582\n        ],\n        [\n          87.33191559754641,\n          88.46410173314496,\n          88.06920794235972,\n          88.98473401700574,\n          90.60349141857057,\n          90.5858441719162,\n          90.42154517148411,\n          90.32413455176213,\n          90.72055904641739,\n          88.74774424339796\n        ],\n        [\n          90.58845140604446,\n          90.08173133413374,\n          90.58230197880795,\n          92.55531809442493,\n          93.09165646181742,\n          93.38354884838586,\n          92.68544239576967,\n          92.15770413350477,\n          92.77335012158814,\n          92.52115072193222\n        ],\n        [\n          \"down\",\n          \"down\",\n          \"up fast\",\n          \"up fast\",\n          \"up\",\n          \"up fast\",\n          \"down\",\n          \"up\",\n          \"down\",\n          \"up\"\n        ],\n        [\n          2,\n          2,\n          1,\n          1,\n          1,\n          1,\n          2,\n          1,\n          2,\n          1\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "Apply to row - gradient",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false,
+            "wrapHeaderText": false
+          },
+          "fieldMinMax": true,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "applyToRow": true,
+                  "type": "color-background"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "thresholds"
+                }
+              },
+              {
+                "id": "custom.width",
+                "value": 50
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/(Min|Max)/"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Info"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Google this term",
+                    "url": "https://google.com/search?q=${__value.raw}"
+                  }
+                ]
+              },
+              {
+                "id": "custom.width",
+                "value": 79
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Time"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 158
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "State"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 97
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 4,
+        "x": 8,
+        "y": 19
+      },
+      "id": 7,
+      "maxDataPoints": 10,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "12.2.0-pre",
+      "targets": [
+        {
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"name\": \"A\",\n      \"fields\": [\n        {\n          \"name\": \"Time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Value\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Min\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Max\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Info\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"State\",\n          \"type\": \"enum\",\n          \"typeInfo\": {\n            \"frame\": \"enum\"\n          },\n          \"config\": {\n            \"type\": {\n              \"enum\": {\n                \"text\": [\n                  \"Unknown\",\n                  \"Up\",\n                  \"Down\"\n                ]\n              }\n            }\n          }\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1754579078813,\n          1754580878813,\n          1754582678813,\n          1754584478813,\n          1754586278813,\n          1754588078813,\n          1754589878813,\n          1754591678813,\n          1754593478813,\n          1754595278813\n        ],\n        [\n          77.30289281564126,\n          87.14357945690202,\n          76.67466266903213,\n          76.27969352662608,\n          95.80292639037513,\n          75.68396049965999,\n          75.76117912054544,\n          76.05073308839697,\n          75.93744737071192,\n          75.82930696129104\n        ],\n        [\n          76.58900057075734,\n          76.01493865596112,\n          75.25501274661029,\n          75.52871130918913,\n          73.53324017648568,\n          74.74670600818675,\n          73.4627470190636,\n          75.38455781635166,\n          74.04318166296315,\n          74.79620005730261\n        ],\n        [\n          77.58417866514938,\n          77.9390885538468,\n          78.37258492198521,\n          76.82242506518101,\n          75.81423643776408,\n          75.86349731305505,\n          76.79031910137064,\n          77.71934637974913,\n          76.11981207380533,\n          77.29746416618009\n        ],\n        [\n          \"down fast\",\n          \"down\",\n          \"down fast\",\n          \"down\",\n          \"down fast\",\n          \"down\",\n          \"up\",\n          \"up\",\n          \"down\",\n          \"down\"\n        ],\n        [\n          2,\n          2,\n          2,\n          2,\n          2,\n          2,\n          1,\n          1,\n          2,\n          2\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "Apply to row - thresholds",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false,
+            "wrapHeaderText": false
+          },
+          "fieldMinMax": true,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 50
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/(Min|Max)/"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Info"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Google this term",
+                    "url": "https://google.com/search?q=${__value.raw}"
+                  }
+                ]
+              },
+              {
+                "id": "custom.width",
+                "value": 79
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Time"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 158
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "State"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "applyToRow": true,
+                  "type": "color-background"
+                }
+              },
+              {
+                "id": "custom.width",
+                "value": 97
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 4,
+        "x": 12,
+        "y": 19
+      },
+      "id": 8,
+      "maxDataPoints": 10,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": [
+          {
+            "desc": false,
+            "displayName": "A"
+          }
+        ]
+      },
+      "pluginVersion": "12.2.0-pre",
+      "targets": [
+        {
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"name\": \"A\",\n      \"fields\": [\n        {\n          \"name\": \"Time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Value\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Min\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Max\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Info\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"State\",\n          \"type\": \"enum\",\n          \"typeInfo\": {\n            \"frame\": \"enum\"\n          },\n          \"config\": {\n            \"type\": {\n              \"enum\": {\n                \"text\": [\n                  \"Unknown\",\n                  \"Up\",\n                  \"Down\"\n                ]\n              }\n            }\n          }\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1754579078813,\n          1754580878813,\n          1754582678813,\n          1754584478813,\n          1754586278813,\n          1754588078813,\n          1754589878813,\n          1754591678813,\n          1754593478813,\n          1754595278813\n        ],\n        [\n          77.30289281564126,\n          87.14357945690202,\n          76.67466266903213,\n          76.27969352662608,\n          95.80292639037513,\n          75.68396049965999,\n          75.76117912054544,\n          76.05073308839697,\n          75.93744737071192,\n          75.82930696129104\n        ],\n        [\n          76.58900057075734,\n          76.01493865596112,\n          75.25501274661029,\n          75.52871130918913,\n          73.53324017648568,\n          74.74670600818675,\n          73.4627470190636,\n          75.38455781635166,\n          74.04318166296315,\n          74.79620005730261\n        ],\n        [\n          77.58417866514938,\n          77.9390885538468,\n          78.37258492198521,\n          76.82242506518101,\n          75.81423643776408,\n          75.86349731305505,\n          76.79031910137064,\n          77.71934637974913,\n          76.11981207380533,\n          77.29746416618009\n        ],\n        [\n          \"down fast\",\n          \"down\",\n          \"down fast\",\n          \"down\",\n          \"down fast\",\n          \"down\",\n          \"up\",\n          \"up\",\n          \"down\",\n          \"down\"\n        ],\n        [\n          2,\n          2,\n          2,\n          2,\n          2,\n          2,\n          1,\n          1,\n          2,\n          2\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "Apply to row - enum",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false,
+            "wrapHeaderText": false
+          },
+          "fieldMinMax": true,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "palette-classic"
+                }
+              },
+              {
+                "id": "custom.width",
+                "value": 50
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "/(Min|Max)/"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Info"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Google this term",
+                    "url": "https://google.com/search?q=${__value.raw}"
+                  }
+                ]
+              },
+              {
+                "id": "custom.width",
+                "value": 79
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Time"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 158
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A"
+            },
+            "properties": [
+              {
+                "id": "mappings",
+                "value": [
+                  {
+                    "options": {
+                      "from": 0,
+                      "result": {
+                        "color": "purple",
+                        "index": 0
+                      },
+                      "to": 76.999
+                    },
+                    "type": "range"
+                  },
+                  {
+                    "options": {
+                      "from": 77,
+                      "result": {
+                        "color": "orange",
+                        "index": 1
+                      }
+                    },
+                    "type": "range"
+                  }
+                ]
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "applyToRow": true,
+                  "type": "color-background"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "State"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 97
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 4,
+        "x": 16,
+        "y": 19
+      },
+      "id": 9,
+      "maxDataPoints": 10,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "12.2.0-pre",
+      "targets": [
+        {
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"name\": \"A\",\n      \"fields\": [\n        {\n          \"name\": \"Time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Value\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Min\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Max\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Info\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"State\",\n          \"type\": \"enum\",\n          \"typeInfo\": {\n            \"frame\": \"enum\"\n          },\n          \"config\": {\n            \"type\": {\n              \"enum\": {\n                \"text\": [\n                  \"Unknown\",\n                  \"Up\",\n                  \"Down\"\n                ]\n              }\n            }\n          }\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          1754579078813,\n          1754580878813,\n          1754582678813,\n          1754584478813,\n          1754586278813,\n          1754588078813,\n          1754589878813,\n          1754591678813,\n          1754593478813,\n          1754595278813\n        ],\n        [\n          77.30289281564126,\n          87.14357945690202,\n          76.67466266903213,\n          76.27969352662608,\n          95.80292639037513,\n          75.68396049965999,\n          75.76117912054544,\n          76.05073308839697,\n          75.93744737071192,\n          75.82930696129104\n        ],\n        [\n          76.58900057075734,\n          76.01493865596112,\n          75.25501274661029,\n          75.52871130918913,\n          73.53324017648568,\n          74.74670600818675,\n          73.4627470190636,\n          75.38455781635166,\n          74.04318166296315,\n          74.79620005730261\n        ],\n        [\n          77.58417866514938,\n          77.9390885538468,\n          78.37258492198521,\n          76.82242506518101,\n          75.81423643776408,\n          75.86349731305505,\n          76.79031910137064,\n          77.71934637974913,\n          76.11981207380533,\n          77.29746416618009\n        ],\n        [\n          \"down fast\",\n          \"down\",\n          \"down fast\",\n          \"down\",\n          \"down fast\",\n          \"down\",\n          \"up\",\n          \"up\",\n          \"down\",\n          \"down\"\n        ],\n        [\n          2,\n          2,\n          2,\n          2,\n          2,\n          2,\n          1,\n          1,\n          2,\n          2\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "Apply to row - mappings",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
           "custom": {
             "align": "auto",
             "cellOptions": {
@@ -450,42 +1605,45 @@
             "mode": "absolute",
             "steps": [
               {
-                "value": null,
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
-                "value": 80,
-                "color": "red"
+                "color": "red",
+                "value": 80
               }
             ]
-          },
-          "color": {
-            "mode": "thresholds"
           }
         },
         "overrides": []
       },
-      "pluginVersion": "12.1.0-pre",
-      "targets": [
-        {
-          "scenarioId": "csv_content",
-          "refId": "A",
-          "csvContent": "a,b,c"
-        }
-      ],
-      "datasource": {
-        "type": "grafana-testdata-datasource"
+      "gridPos": {
+        "h": 7,
+        "w": 4,
+        "x": 20,
+        "y": 19
       },
+      "id": 3,
       "options": {
-        "showHeader": true,
         "cellHeight": "sm",
         "footer": {
-          "show": false,
-          "reducer": ["sum"],
           "countRows": false,
-          "fields": ""
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "12.2.0-pre",
+      "targets": [
+        {
+          "csvContent": "a,b,c",
+          "refId": "A",
+          "scenarioId": "csv_content"
         }
-      }
+      ],
+      "title": "Empty Table Panel",
+      "type": "table"
     }
   ],
   "preload": false,
@@ -512,5 +1670,5 @@
   "timezone": "",
   "title": "Panel Tests - Table - Kitchen Sink",
   "uid": "dcb9f5e9-8066-4397-889e-864b99555dbb",
-  "version": 2
+  "version": 7
 }
diff --git a/devenv/dev-dashboards/panel-table/table_markdown.json b/devenv/dev-dashboards/panel-table/table_markdown.json
index 863edd09fed..06f3d7c310c 100644
--- a/devenv/dev-dashboards/panel-table/table_markdown.json
+++ b/devenv/dev-dashboards/panel-table/table_markdown.json
@@ -93,7 +93,7 @@
       "pluginVersion": "12.1.0-pre",
       "targets": [
         {
-          "csvContent": "id,markdown\n1,\"<dl>\n  <dt>Definition list</dt>\n  <dd>Is something people use sometimes.</dd>\n  <dt>Markdown in HTML</dt>\n  <dd>Does *not* work **very** well. Use HTML <em onclick=\"\"alert('hi');\"\">tags</em>.</dd>\n</dl>\"\n2,\"Three or more...\n\n---\n\nHyphens\n\n***\n\nAsterisks\n\n___\n\nUnderscores\"\n3,\"Here's a line for us to start with.\n\nThis line is separated from the one above by two newlines, so it will be a *separate paragraph*.\n\nThis line is also a separate paragraph, but...\nThis line is only separated by a single newline, so it's a separate line in the *same paragraph*.\"\n4,\"<span style='color:red'>red</span>, <span style='color:green'>green</span>, <span style='color:blue'>blue</span>\"\n5,\"<img src='https://placecats.com/bella/300/180'>\"\n6,\"[Link](https://grafana.com), or <a href=\"\"https://grafana.com\"\" target=\"\"_blank\"\" ref=\"\"noopener noreferrer\"\">HTML link</a>\"\n7,\"1. foo\n1. bar\n    - baz\n    * bim\n3. bip\"\n8,\"# heading 1\n## heading 2\n### heading 3\n#### heading 4\n##### heading 5\n###### heading 6\"\n9,\"Emphasis, aka italics, with *asterisks* or _underscores_.\n\nStrong emphasis, aka bold, with **asterisks** or __underscores__.\n\nCombined emphasis with **asterisks and _underscores_**.\n\nStrikethrough uses two tildes. ~~Scratch this.~~\n\n<u>underline does require an HTML element tho.</u>\"\n10,\"```javascript\nvar s = 'JavaScript syntax highlighting';\nalert(s);\n```\"\n11,\"<style>thead { border-bottom: 1px solid lightgray; }  td, th { padding: 6px; }</style>\n| Month     | Savings |\n| --------  | ------- |\n| I heard   | $250    |\n| you like  | $80     |\n| tables    | $365    |\"\n",
+          "csvContent": "id,markdown\n1,\"<dl>\n  <dt>Definition list</dt>\n  <dd>Is something people use sometimes.</dd>\n  <dt>Markdown in HTML</dt>\n  <dd>Does *not* work **very** well. Use HTML <em onclick=\"\"alert('hi');\"\">tags</em>.</dd>\n</dl>\"\n2,\"Three or more...\n\n---\n\nHyphens\n\n***\n\nAsterisks\n\n___\n\nUnderscores\"\n3,\"Here's a line for us to start with.\n\nThis line is separated from the one above by two newlines, so it will be a *separate paragraph*.\n\nThis line is also a separate paragraph, but...\nThis line is only separated by a single newline, so it's a separate line in the *same paragraph*.\"\n4,\"<span style='color:red'>red</span>, <span style='color:green'>green</span>, <span style='color:blue'>blue</span>\"\n5,\"<img src='https://grafana.com/media/golden-grot/graphic-golden-grot-awards-hero-image.png'>\"\n6,\"[Link](https://grafana.com), or <a href=\"\"https://grafana.com\"\" target=\"\"_blank\"\" ref=\"\"noopener noreferrer\"\">HTML link</a>\"\n7,\"1. foo\n1. bar\n    - baz\n    * bim\n3. bip\"\n8,\"# heading 1\n## heading 2\n### heading 3\n#### heading 4\n##### heading 5\n###### heading 6\"\n9,\"Emphasis, aka italics, with *asterisks* or _underscores_.\n\nStrong emphasis, aka bold, with **asterisks** or __underscores__.\n\nCombined emphasis with **asterisks and _underscores_**.\n\nStrikethrough uses two tildes. ~~Scratch this.~~\n\n<u>underline does require an HTML element tho.</u>\"\n10,\"```javascript\nvar s = 'JavaScript syntax highlighting';\nalert(s);\n```\"\n11,\"<style>thead { border-bottom: 1px solid lightgray; }  td, th { padding: 6px; }</style>\n| Month     | Savings |\n| --------  | ------- |\n| I heard   | $250    |\n| you like  | $80     |\n| tables    | $365    |\"\n",
           "datasource": {
             "type": "grafana-testdata-datasource",
             "uid": "gdev-testdata"
diff --git a/e2e-playwright/panels-suite/table-kitchenSink.spec.ts b/e2e-playwright/panels-suite/table-kitchenSink.spec.ts
index 8ac43ceebb1..5ddb7c4d4e4 100644
--- a/e2e-playwright/panels-suite/table-kitchenSink.spec.ts
+++ b/e2e-playwright/panels-suite/table-kitchenSink.spec.ts
@@ -1,6 +1,6 @@
 import { Page, Locator } from '@playwright/test';
 
-import { test, expect } from '@grafana/plugin-e2e';
+import { test, expect, E2ESelectorGroups } from '@grafana/plugin-e2e';
 
 const DASHBOARD_UID = 'dcb9f5e9-8066-4397-889e-864b99555dbb';
 
@@ -41,6 +41,21 @@ const getColumnIdx = async (loc: Page | Locator, columnName: string) => {
   return result;
 };
 
+const disableAllTextWrap = async (loc: Page | Locator, selectors: E2ESelectorGroups) => {
+  // disable text wrapping for all of the columns, since long text with links in them can push the links off the screen.
+  const wrapTextToggle = loc.locator(
+    `[aria-label="${selectors.components.PanelEditor.OptionsPane.fieldLabel('Wrap text')}"]`
+  );
+  const count = await wrapTextToggle.count();
+
+  for (let i = 0; i < count; i++) {
+    const toggle = wrapTextToggle.nth(i);
+    if ((await toggle.locator('//preceding-sibling::input').getAttribute('checked')) !== null) {
+      await toggle.click();
+    }
+  }
+};
+
 test.describe('Panels test: Table - Kitchen Sink', { tag: ['@panels', '@table'] }, () => {
   test('Tests word wrap, hover overflow, and cell inspect', async ({ gotoDashboardPage, selectors, page }) => {
     const dashboardPage = await gotoDashboardPage({
@@ -214,11 +229,7 @@ test.describe('Panels test: Table - Kitchen Sink', { tag: ['@panels', '@table']
     // because of text wrapping, we're guaranteed to only be showing a single row when we enable pagination.
     await expect(page.getByText(/([\d]+) - ([\d]+) of ([\d]+) rows/)).toBeVisible();
 
-    // FIXME horrible selector for the "Wrap text" toggle for the "Long text" column.
-    await page
-      .locator('[id="Override 13"]')
-      .locator(`[aria-label="${selectors.components.PanelEditor.OptionsPane.fieldLabel('Wrap text')}"]`)
-      .click();
+    await disableAllTextWrap(page, selectors);
 
     // any number of rows that is not "1" is allowed here, we don't want to police the exact number of rows that
     // are rendered since there are tons of factors which could effect this. we do want to grab this number for comparison
@@ -281,13 +292,7 @@ test.describe('Panels test: Table - Kitchen Sink', { tag: ['@panels', '@table']
       dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink'))
     ).toBeVisible();
 
-    // disable text wrapping for this test to make it easier to click the links, the long lorem ipsum
-    // can push the links off the screen.
-    // FIXME very bad selector to get the correct "wrap text" toggle here.
-    await page
-      .locator('[id="Override 13"]')
-      .locator(`[aria-label="${selectors.components.PanelEditor.OptionsPane.fieldLabel('Wrap text')}"]`)
-      .click();
+    await disableAllTextWrap(page, selectors);
 
     const infoColumnIdx = await getColumnIdx(page, 'Info');
     const pillColIdx = await getColumnIdx(page, 'Pills');
@@ -351,7 +356,7 @@ test.describe('Panels test: Table - Kitchen Sink', { tag: ['@panels', '@table']
   test('Empty Table panel', async ({ gotoDashboardPage, selectors }) => {
     const dashboardPage = await gotoDashboardPage({
       uid: DASHBOARD_UID,
-      queryParams: new URLSearchParams({ editPanel: '2' }),
+      queryParams: new URLSearchParams({ editPanel: '3' }),
     });
 
     await expect(
diff --git a/packages/grafana-schema/src/common/common.gen.ts b/packages/grafana-schema/src/common/common.gen.ts
index c256e8ed6bd..62346b070f6 100644
--- a/packages/grafana-schema/src/common/common.gen.ts
+++ b/packages/grafana-schema/src/common/common.gen.ts
@@ -704,6 +704,7 @@ export enum TableCellDisplayMode {
   Custom = 'custom',
   DataLinks = 'data-links',
   Gauge = 'gauge',
+  Geo = 'geo',
   GradientGauge = 'gradient-gauge',
   Image = 'image',
   JSONView = 'json-view',
@@ -837,27 +838,6 @@ export interface TablePillCellOptions extends TableWrapTextOptions {
   type: TableCellDisplayMode.Pill;
 }
 
-export interface TableMarkdownCellOptions {
-  dynamicHeight?: boolean;
-  type: TableCellDisplayMode.Markdown;
-}
-
-/**
- * Height of a table cell
- */
-export enum TableCellHeight {
-  Auto = 'auto',
-  Lg = 'lg',
-  Md = 'md',
-  Sm = 'sm',
-}
-
-/**
- * Table cell options. Each cell has a display mode
- * and other potential options for that display.
- */
-export type TableCellOptions = (TableAutoCellOptions | TableSparklineCellOptions | TableBarGaugeCellOptions | TableColoredBackgroundCellOptions | TableColorTextCellOptions | TableImageCellOptions | TablePillCellOptions | TableDataLinksCellOptions | TableActionsCellOptions | TableJsonViewCellOptions | TableMarkdownCellOptions);
-
 /**
  * Use UTC/GMT timezone
  */
@@ -973,6 +953,29 @@ export enum ComparisonOperation {
   NEQ = 'neq',
 }
 
+export interface TableMarkdownCellOptions {
+  dynamicHeight?: boolean;
+  type: TableCellDisplayMode.Markdown;
+}
+
+/**
+ * Height of a table cell
+ */
+export enum TableCellHeight {
+  Auto = 'auto',
+  Lg = 'lg',
+  Md = 'md',
+  Sm = 'sm',
+}
+
+/**
+ * Table cell options. Each cell has a display mode
+ * and other potential options for that display.
+ */
+export type TableCellOptions = (TableAutoCellOptions | TableSparklineCellOptions | TableBarGaugeCellOptions | TableColoredBackgroundCellOptions | TableColorTextCellOptions | TableImageCellOptions | TablePillCellOptions | TableDataLinksCellOptions | TableActionsCellOptions | TableJsonViewCellOptions | TableMarkdownCellOptions | {
+    type: TableCellDisplayMode.Geo
+  });
+
 /**
  * Field options for each field within a table (e.g 10, "The String", 64.20, etc.)
  * Generally defines alignment, filtering capabilties, display options, etc.
diff --git a/packages/grafana-schema/src/common/table.cue b/packages/grafana-schema/src/common/table.cue
index 57b7b56dc44..9fe71322a31 100644
--- a/packages/grafana-schema/src/common/table.cue
+++ b/packages/grafana-schema/src/common/table.cue
@@ -4,7 +4,7 @@ package common
 // in the table such as colored text, JSON, gauge, etc.
 // The color-background-solid, gradient-gauge, and lcd-gauge
 // modes are deprecated in favor of new cell subOptions
-TableCellDisplayMode: "auto" | "color-text" | "color-background" | "color-background-solid" | "gradient-gauge" | "lcd-gauge" | "json-view" | "basic" | "image" | "gauge" | "sparkline" | "data-links" | "custom" | "actions" | "pill" | "markdown" @cuetsy(kind="enum",memberNames="Auto|ColorText|ColorBackground|ColorBackgroundSolid|GradientGauge|LcdGauge|JSONView|BasicGauge|Image|Gauge|Sparkline|DataLinks|Custom|Actions|Pill|Markdown")
+TableCellDisplayMode: "auto" | "color-text" | "color-background" | "color-background-solid" | "gradient-gauge" | "lcd-gauge" | "json-view" | "basic" | "image" | "gauge" | "sparkline" | "data-links" | "custom" | "actions" | "pill" | "markdown" | "geo" @cuetsy(kind="enum",memberNames="Auto|ColorText|ColorBackground|ColorBackgroundSolid|GradientGauge|LcdGauge|JSONView|BasicGauge|Image|Gauge|Sparkline|DataLinks|Custom|Actions|Pill|Markdown|Geo")
 
 // Display mode to the "Colored Background" display
 // mode for table cells. Either displays a solid color (basic mode)
@@ -96,12 +96,20 @@ TableMarkdownCellOptions: {
   dynamicHeight?: bool
 } @cuetsy(kind="interface")
 
+TableMarkdownCellOptions: {
+	type: TableCellDisplayMode & "markdown"
+} @cuetsy(kind="interface")
+
+TableGeoCellOptions: {
+  type: TableCellDisplayMode & "geo"
+}
+
 // Height of a table cell
 TableCellHeight: "sm" | "md" | "lg" | "auto" @cuetsy(kind="enum")
 
 // Table cell options. Each cell has a display mode
 // and other potential options for that display.
-TableCellOptions: TableAutoCellOptions | TableSparklineCellOptions | TableBarGaugeCellOptions | TableColoredBackgroundCellOptions | TableColorTextCellOptions | TableImageCellOptions | TablePillCellOptions | TableDataLinksCellOptions | TableActionsCellOptions | TableJsonViewCellOptions | TableMarkdownCellOptions @cuetsy(kind="type")
+TableCellOptions: TableAutoCellOptions | TableSparklineCellOptions | TableBarGaugeCellOptions | TableColoredBackgroundCellOptions | TableColorTextCellOptions | TableImageCellOptions | TablePillCellOptions | TableDataLinksCellOptions | TableActionsCellOptions | TableJsonViewCellOptions | TableMarkdownCellOptions | TableGeoCellOptions @cuetsy(kind="type")
 
 // Field options for each field within a table (e.g 10, "The String", 64.20, etc.)
 // Generally defines alignment, filtering capabilties, display options, etc.
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/ActionsCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/ActionsCell.tsx
index 087efa47ecc..c8c2465a07a 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/ActionsCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/ActionsCell.tsx
@@ -1,29 +1,16 @@
 import { css } from '@emotion/css';
-import { useMemo } from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
-
-import { useStyles2 } from '../../../../themes/ThemeContext';
 import { ActionButton } from '../../../Actions/ActionButton';
-import { ActionCellProps } from '../types';
+import { ActionCellProps, TableCellStyles } from '../types';
 
 export const ActionsCell = ({ field, rowIdx, getActions }: ActionCellProps) => {
-  const styles = useStyles2(getStyles);
+  const actions = getActions(field, rowIdx);
 
-  const actions = useMemo(() => getActions(field, rowIdx), [getActions, field, rowIdx]);
+  if (actions.length === 0) {
+    return null;
+  }
 
-  return (
-    <div className={styles.buttonsGap}>
-      {actions.map((action, i) => (
-        <ActionButton key={i} action={action} variant="secondary" />
-      ))}
-    </div>
-  );
+  return actions.map((action, i) => <ActionButton key={i} action={action} variant="secondary" />);
 };
 
-const getStyles = (theme: GrafanaTheme2) => ({
-  buttonsGap: css({
-    display: 'flex',
-    gap: 6,
-  }),
-});
+export const getStyles: TableCellStyles = (theme) => css({ gap: theme.spacing(0.75) });
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/AutoCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/AutoCell.tsx
index 43de0b5bb1e..e169c756a94 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/AutoCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/AutoCell.tsx
@@ -1,9 +1,11 @@
+import { css } from '@emotion/css';
+
 import { formattedValueToString } from '@grafana/data';
 
 import { MaybeWrapWithLink } from '../MaybeWrapWithLink';
-import { AutoCellProps } from '../types';
+import { AutoCellProps, TableCellStyles } from '../types';
 
-export default function AutoCell({ value, field, rowIdx }: AutoCellProps) {
+export function AutoCell({ value, field, rowIdx }: AutoCellProps) {
   const displayValue = field.display!(value);
   const formattedValue = formattedValueToString(displayValue);
   return (
@@ -12,3 +14,24 @@ export default function AutoCell({ value, field, rowIdx }: AutoCellProps) {
     </MaybeWrapWithLink>
   );
 }
+
+export const getStyles: TableCellStyles = (_theme, { textWrap, shouldOverflow }) =>
+  css({
+    ...(textWrap && { whiteSpace: 'pre-line' }),
+    ...(shouldOverflow && {
+      '&:hover, &[aria-selected=true]': {
+        whiteSpace: 'pre-line',
+      },
+    }),
+  });
+
+export const getJsonCellStyles: TableCellStyles = (_theme, { textWrap, shouldOverflow }) =>
+  css({
+    fontFamily: 'monospace',
+    ...(textWrap && { whiteSpace: 'pre' }),
+    ...(shouldOverflow && {
+      '&:hover, &[aria-selected=true]': {
+        whiteSpace: 'pre',
+      },
+    }),
+  });
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/BarGaugeCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/BarGaugeCell.tsx
index 3f762218553..700dbf2e33e 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/BarGaugeCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/BarGaugeCell.tsx
@@ -3,8 +3,9 @@ import { BarGaugeDisplayMode, BarGaugeValueMode, TableCellDisplayMode } from '@g
 
 import { BarGauge } from '../../../BarGauge/BarGauge';
 import { MaybeWrapWithLink } from '../MaybeWrapWithLink';
+import { TABLE } from '../constants';
 import { BarGaugeCellProps } from '../types';
-import { extractPixelValue, getCellOptions, getAlignmentFactor } from '../utils';
+import { getCellOptions, getAlignmentFactor } from '../utils';
 
 const defaultScale: ThresholdsConfig = {
   mode: ThresholdsMode.Absolute,
@@ -23,7 +24,7 @@ const defaultScale: ThresholdsConfig = {
 export const BarGaugeCell = ({ value, field, theme, height, width, rowIdx }: BarGaugeCellProps) => {
   const displayValue = field.display!(value);
   const cellOptions = getCellOptions(field);
-  const heightOffset = extractPixelValue(theme.spacing(1));
+  const heightOffset = TABLE.CELL_PADDING * 2;
 
   let config = getFieldConfigWithMinMax(field, false);
   if (!config.thresholds) {
@@ -45,12 +46,14 @@ export const BarGaugeCell = ({ value, field, theme, height, width, rowIdx }: Bar
   }
 
   const alignmentFactors = getAlignmentFactor(field, displayValue, rowIdx!);
+  // clamp the height of the gauge so it isn't stretched for large rows
+  const renderedHeight = Math.min(height - heightOffset, TABLE.MAX_CELL_HEIGHT);
 
   return (
     <MaybeWrapWithLink field={field} rowIdx={rowIdx}>
       <BarGauge
         width={width}
-        height={height - heightOffset}
+        height={renderedHeight}
         field={config}
         display={field.display}
         text={{ valueSize: 14 }}
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/DataLinksCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/DataLinksCell.tsx
index 5fafb04765a..4f03afe2ea1 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/DataLinksCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/DataLinksCell.tsx
@@ -1,5 +1,7 @@
-import { DataLinksCellProps } from '../types';
-import { getCellLinks } from '../utils';
+import { css } from '@emotion/css';
+
+import { DataLinksCellProps, TableCellStyles } from '../types';
+import { getCellLinks, getJustifyContent } from '../utils';
 
 export const DataLinksCell = ({ field, rowIdx }: DataLinksCellProps) => {
   const links = getCellLinks(field, rowIdx);
@@ -14,3 +16,26 @@ export const DataLinksCell = ({ field, rowIdx }: DataLinksCellProps) => {
     </a>
   ));
 };
+
+export const getStyles: TableCellStyles = (theme, { textWrap, textAlign }) =>
+  css({
+    ...(textWrap && {
+      flexDirection: 'column',
+      justifyContent: 'center',
+      alignItems: getJustifyContent(textAlign),
+    }),
+    '> a': {
+      flexWrap: 'nowrap',
+      ...(!textWrap && {
+        paddingInline: theme.spacing(0.5),
+        borderRight: `2px solid ${theme.colors.border.medium}`,
+        '&:first-child': {
+          paddingInlineStart: 0,
+        },
+        '&:last-child': {
+          paddingInlineEnd: 0,
+          borderRight: 'none',
+        },
+      }),
+    },
+  });
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/GeoCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/GeoCell.tsx
index 33d1530f8a9..94c5498cece 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/GeoCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/GeoCell.tsx
@@ -2,13 +2,10 @@ import { css } from '@emotion/css';
 import WKT from 'ol/format/WKT';
 import { Geometry } from 'ol/geom';
 
-import { useStyles2 } from '../../../../themes/ThemeContext';
-import { GeoCellProps } from '../types';
+import { GeoCellProps, TableCellStyles } from '../types';
 
-export function GeoCell({ value, justifyContent, height }: GeoCellProps) {
-  const styles = useStyles2(getStyles);
-
-  let disp = '';
+export function GeoCell({ value }: GeoCellProps) {
+  let disp = null;
 
   if (value instanceof Geometry) {
     disp = new WKT().writeGeometry(value, {
@@ -19,25 +16,13 @@ export function GeoCell({ value, justifyContent, height }: GeoCellProps) {
     disp = `${value}`;
   }
 
-  return (
-    <div className={styles.cell} style={{ justifyContent, height }}>
-      <div className={styles.cellText} style={{ fontFamily: 'monospace' }}>
-        {disp}
-      </div>
-    </div>
-  );
+  return disp;
 }
 
-const getStyles = () => ({
-  cell: css({
-    height: '100%',
-    display: 'flex',
-    alignItems: 'center',
-    padding: '0 8px',
-  }),
-  cellText: css({
+export const getStyles: TableCellStyles = () =>
+  css({
+    fontFamily: 'monospace',
     whiteSpace: 'nowrap',
     overflow: 'hidden',
     textOverflow: 'ellipsis',
-  }),
-});
+  });
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/ImageCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/ImageCell.tsx
index a9fd4420ff3..c3b085cbb5b 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/ImageCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/ImageCell.tsx
@@ -1,36 +1,28 @@
 import { css } from '@emotion/css';
-import { Property } from 'csstype';
 
-import { GrafanaTheme2 } from '@grafana/data';
-
-import { useStyles2 } from '../../../../themes/ThemeContext';
 import { TableCellDisplayMode } from '../../types';
 import { MaybeWrapWithLink } from '../MaybeWrapWithLink';
-import { ImageCellProps } from '../types';
-
-export const ImageCell = ({ cellOptions, field, height, justifyContent, value, rowIdx }: ImageCellProps) => {
-  const styles = useStyles2(getStyles, height, justifyContent);
+import { ImageCellProps, TableCellStyles } from '../types';
 
+export const ImageCell = ({ cellOptions, field, value, rowIdx }: ImageCellProps) => {
   const { text } = field.display!(value);
   const { alt, title } =
     cellOptions.type === TableCellDisplayMode.Image ? cellOptions : { alt: undefined, title: undefined };
 
   return (
-    <div className={styles.imageContainer}>
-      <MaybeWrapWithLink field={field} rowIdx={rowIdx}>
-        <img alt={alt} src={text} className={styles.image} title={title} />
-      </MaybeWrapWithLink>
-    </div>
+    <MaybeWrapWithLink field={field} rowIdx={rowIdx}>
+      <img alt={alt} src={text} title={title} />
+    </MaybeWrapWithLink>
   );
 };
 
-const getStyles = (_theme: GrafanaTheme2, height: number, justifyContent: Property.JustifyContent) => ({
-  image: css({
-    height,
-    width: 'auto',
-  }),
-  imageContainer: css({
-    display: 'flex',
-    justifyContent,
-  }),
-});
+export const getStyles: TableCellStyles = () =>
+  css({
+    'a, img': {
+      width: '100%',
+      height: '100%',
+    },
+    img: {
+      objectFit: 'contain',
+    },
+  });
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/MarkdownCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/MarkdownCell.tsx
index 7d4922c2434..4bd252ff9d3 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/MarkdownCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/MarkdownCell.tsx
@@ -1,7 +1,9 @@
+import { css } from '@emotion/css';
+
 import { renderMarkdown } from '@grafana/data';
 
 import { MaybeWrapWithLink } from '../MaybeWrapWithLink';
-import { MarkdownCellProps } from '../types';
+import { MarkdownCellProps, TableCellStyles } from '../types';
 
 export function MarkdownCell({ field, rowIdx, disableSanitizeHtml }: MarkdownCellProps) {
   return (
@@ -15,3 +17,29 @@ export function MarkdownCell({ field, rowIdx, disableSanitizeHtml }: MarkdownCel
     </MaybeWrapWithLink>
   );
 }
+
+export const getStyles: TableCellStyles = (theme) =>
+  css({
+    '&, &:hover, &[aria-selected=true]': {
+      whiteSpace: 'normal',
+    },
+
+    '.markdown-container': {
+      width: '100%',
+    },
+
+    '& ol, & ul': {
+      paddingLeft: theme.spacing(1.5),
+    },
+    '& p': {
+      whiteSpace: 'pre-line',
+    },
+    '& a': {
+      color: theme.colors.primary.text,
+    },
+    // for elements like `p`, `h*`, etc. which have an inherent margin,
+    // we want to remove the bottom margin for the last one in the container.
+    '& > .markdown-container > *:last-child': {
+      marginBottom: 0,
+    },
+  });
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/PillCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/PillCell.tsx
index 35b759aa224..2b85560c792 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/PillCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/PillCell.tsx
@@ -1,3 +1,4 @@
+import { css } from '@emotion/css';
 import { useMemo } from 'react';
 
 import {
@@ -11,7 +12,7 @@ import {
 } from '@grafana/data';
 import { FieldColorModeId } from '@grafana/schema';
 
-import { PillCellProps, TableCellValue } from '../types';
+import { PillCellProps, TableCellStyles, TableCellValue } from '../types';
 
 export function PillCell({ rowIdx, field, theme }: PillCellProps) {
   const value = field.values[rowIdx];
@@ -102,3 +103,25 @@ function getPillColor(value: string, field: Field, theme: GrafanaTheme2): string
 
   return getColorByStringHash(colors, value);
 }
+
+export const getStyles: TableCellStyles = (theme, { textWrap, shouldOverflow }) =>
+  css({
+    display: 'inline-flex',
+    gap: theme.spacing(0.5),
+    flexWrap: textWrap ? 'wrap' : 'nowrap',
+
+    ...(shouldOverflow && {
+      '&:hover, &[aria-selected=true]': {
+        flexWrap: 'wrap',
+      },
+    }),
+
+    '> span': {
+      display: 'flex',
+      padding: theme.spacing(0.25, 0.75),
+      borderRadius: theme.shape.radius.default,
+      fontSize: theme.typography.bodySmall.fontSize,
+      lineHeight: theme.typography.bodySmall.lineHeight,
+      whiteSpace: 'nowrap',
+    },
+  });
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/SparklineCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/SparklineCell.tsx
index 4979981995b..08f8b8b6cd1 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/SparklineCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/SparklineCell.tsx
@@ -1,5 +1,4 @@
 import { css } from '@emotion/css';
-import { Property } from 'csstype';
 import * as React from 'react';
 
 import {
@@ -10,7 +9,6 @@ import {
   isDataFrame,
   Field,
   isDataFrameWithValue,
-  GrafanaTheme2,
 } from '@grafana/data';
 import { t } from '@grafana/i18n';
 import {
@@ -24,11 +22,10 @@ import {
   VisibilityMode,
 } from '@grafana/schema';
 
-import { useStyles2 } from '../../../../themes/ThemeContext';
 import { measureText } from '../../../../utils/measureText';
 import { FormattedValueDisplay } from '../../../FormattedValueDisplay/FormattedValueDisplay';
 import { Sparkline } from '../../../Sparkline/Sparkline';
-import { SparklineCellProps } from '../types';
+import { SparklineCellProps, TableCellStyles } from '../types';
 import { getAlignmentFactor, getCellOptions } from '../utils';
 
 export const defaultSparklineCellConfig: TableSparklineCellOptions = {
@@ -45,8 +42,7 @@ export const defaultSparklineCellConfig: TableSparklineCellOptions = {
 };
 
 export const SparklineCell = (props: SparklineCellProps) => {
-  const { field, value, theme, timeRange, rowIdx, justifyContent, width } = props;
-  const styles = useStyles2(getStyles, justifyContent);
+  const { field, value, theme, timeRange, rowIdx, width } = props;
   const sparkline = getSparkline(value, field);
 
   if (!sparkline) {
@@ -95,26 +91,14 @@ export const SparklineCell = (props: SparklineCellProps) => {
       measureText(`${alignmentFactor.prefix ?? ''}${alignmentFactor.text}${alignmentFactor.suffix ?? ''}`, 16).width +
       theme.spacing.gridSize;
 
-    valueElement = (
-      <FormattedValueDisplay
-        style={{
-          width: `${valueWidth - theme.spacing.gridSize}px`,
-          textAlign: 'right',
-          marginRight: theme.spacing(1),
-          marginLeft: theme.spacing(1),
-        }}
-        className={styles.valueContainer}
-        value={displayValue}
-      />
-    );
+    valueElement = <FormattedValueDisplay style={{ width: valueWidth }} value={displayValue} />;
   }
 
-  // @TODO update width, height
   return (
-    <div className={styles.cellContainer}>
+    <>
       {valueElement}
       <Sparkline width={width - valueWidth} height={25} sparkline={sparkline} config={config} theme={theme} />
-    </div>
+    </>
   );
 };
 
@@ -153,14 +137,10 @@ function getTableSparklineCellOptions(field: Field): TableSparklineCellOptions {
   throw new Error(`Expected options type ${TableCellDisplayMode.Sparkline} but got ${options.type}`);
 }
 
-const getStyles = (theme: GrafanaTheme2, justifyContent: Property.JustifyContent | undefined) => ({
-  cellContainer: css({
-    display: 'flex',
+export const getStyles: TableCellStyles = (theme, { textAlign }) =>
+  css({
     width: '100%',
-    alignItems: 'center',
-    justifyContent,
-  }),
-  valueContainer: css({
-    div: { width: 'inherit' },
-  }),
-});
+    gap: theme.spacing(1),
+    justifyContent: 'space-between',
+    ...(textAlign === 'right' && { flexDirection: 'row-reverse' }),
+  });
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.test.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.test.tsx
index 44221577315..3c4e5421c4c 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.test.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.test.tsx
@@ -89,7 +89,9 @@ describe('TableNG Cells renderers', () => {
           cellOptions,
           cellInspect: false,
           showFilters: false,
-          justifyContent: 'flex-start',
+          getActions: jest.fn(() => [
+            { title: 'Action', onClick: jest.fn(() => {}), confirmation: jest.fn(), style: {} },
+          ]),
         })
       );
 
@@ -110,7 +112,6 @@ describe('TableNG Cells renderers', () => {
             cellOptions,
             cellInspect: false,
             showFilters: false,
-            justifyContent: 'flex-start',
           })
         );
       }, iterations);
@@ -123,8 +124,8 @@ describe('TableNG Cells renderers', () => {
         { type: TableCellDisplayMode.JSONView, fieldType: FieldType.string },
         { type: TableCellDisplayMode.Image, fieldType: FieldType.string },
         { type: TableCellDisplayMode.DataLinks, fieldType: FieldType.string },
-        { type: TableCellDisplayMode.Actions, fieldType: FieldType.string },
         { type: TableCellDisplayMode.ColorText, fieldType: FieldType.string },
+        { type: TableCellDisplayMode.Actions, fieldType: FieldType.string },
         { type: TableCellDisplayMode.ColorBackground, fieldType: FieldType.string },
         { type: TableCellDisplayMode.Auto, fieldType: FieldType.string },
       ] as const)('should render $type cell into the document', ({ type, fieldType }) => {
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx
index c406d7ffc3f..74648953454 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx
@@ -1,19 +1,20 @@
+import { clsx } from 'clsx';
 import { ReactNode } from 'react';
 
-import { Field, FieldType, isDataFrame, isTimeSeriesFrame } from '@grafana/data';
+import { Field, FieldType, GrafanaTheme2, isDataFrame, isTimeSeriesFrame } from '@grafana/data';
 
 import { TableCellDisplayMode, TableCellOptions, TableCustomCellOptions } from '../../types';
-import { TableCellRendererProps } from '../types';
+import { TableCellRendererProps, TableCellStyleOptions, TableCellStyles } from '../types';
 
-import { ActionsCell } from './ActionsCell';
-import AutoCell from './AutoCell';
+import { ActionsCell, getStyles as getActionsCellStyles } from './ActionsCell';
+import { AutoCell, getStyles as getAutoCellStyles, getJsonCellStyles } from './AutoCell';
 import { BarGaugeCell } from './BarGaugeCell';
-import { DataLinksCell } from './DataLinksCell';
-import { GeoCell } from './GeoCell';
-import { ImageCell } from './ImageCell';
-import { MarkdownCell } from './MarkdownCell';
-import { PillCell } from './PillCell';
-import { SparklineCell } from './SparklineCell';
+import { DataLinksCell, getStyles as getDataLinksStyles } from './DataLinksCell';
+import { GeoCell, getStyles as getGeoCellStyles } from './GeoCell';
+import { ImageCell, getStyles as getImageStyles } from './ImageCell';
+import { MarkdownCell, getStyles as getMarkdownCellStyles } from './MarkdownCell';
+import { PillCell, getStyles as getPillStyles } from './PillCell';
+import { SparklineCell, getStyles as getSparklineCellStyles } from './SparklineCell';
 
 export type TableCellRenderer = (props: TableCellRendererProps) => ReactNode;
 
@@ -36,7 +37,6 @@ const SPARKLINE_RENDERER: TableCellRenderer = (props) => (
   <SparklineCell
     value={props.value}
     field={props.field}
-    justifyContent={props.justifyContent}
     timeRange={props.timeRange}
     rowIdx={props.rowIdx}
     theme={props.theme}
@@ -44,19 +44,10 @@ const SPARKLINE_RENDERER: TableCellRenderer = (props) => (
   />
 );
 
-const GEO_RENDERER: TableCellRenderer = (props) => (
-  <GeoCell value={props.value} justifyContent={props.justifyContent} height={props.height} />
-);
+const GEO_RENDERER: TableCellRenderer = (props) => <GeoCell value={props.value} height={props.height} />;
 
 const IMAGE_RENDERER: TableCellRenderer = (props) => (
-  <ImageCell
-    cellOptions={props.cellOptions}
-    field={props.field}
-    height={props.height}
-    justifyContent={props.justifyContent}
-    value={props.value}
-    rowIdx={props.rowIdx}
-  />
+  <ImageCell cellOptions={props.cellOptions} field={props.field} value={props.value} rowIdx={props.rowIdx} />
 );
 
 const DATA_LINKS_RENDERER: TableCellRenderer = (props) => <DataLinksCell field={props.field} rowIdx={props.rowIdx} />;
@@ -65,12 +56,23 @@ const ACTIONS_RENDERER: TableCellRenderer = ({ field, rowIdx, getActions = () =>
   <ActionsCell field={field} rowIdx={rowIdx} getActions={getActions} />
 );
 
+const MARKDOWN_RENDERER: TableCellRenderer = (props) => (
+  <MarkdownCell field={props.field} rowIdx={props.rowIdx} disableSanitizeHtml={props.disableSanitizeHtml} />
+);
+
 const PILL_RENDERER: TableCellRenderer = (props) => <PillCell {...props} />;
 
 function isCustomCellOptions(options: TableCellOptions): options is TableCustomCellOptions {
   return options.type === TableCellDisplayMode.Custom;
 }
 
+function mixinAutoCellStyles(fn: TableCellStyles): TableCellStyles {
+  return (theme, options) => {
+    const styles = fn(theme, options);
+    return clsx(styles, getAutoCellStyles(theme, options));
+  };
+}
+
 const CUSTOM_RENDERER: TableCellRenderer = (props) => {
   if (!isCustomCellOptions(props.cellOptions) || !props.cellOptions.cellComponent) {
     return null; // nonsensical case, but better to typeguard it than throw.
@@ -79,23 +81,57 @@ const CUSTOM_RENDERER: TableCellRenderer = (props) => {
   return <CustomCellComponent field={props.field} rowIndex={props.rowIdx} frame={props.frame} value={props.value} />;
 };
 
-const MARKDOWN_RENDERER: TableCellRenderer = (props) => (
-  <MarkdownCell field={props.field} rowIdx={props.rowIdx} disableSanitizeHtml={props.disableSanitizeHtml} />
-);
-
-const CELL_RENDERERS: Record<TableCellOptions['type'], TableCellRenderer> = {
-  [TableCellDisplayMode.Sparkline]: SPARKLINE_RENDERER,
-  [TableCellDisplayMode.Gauge]: GAUGE_RENDERER,
-  [TableCellDisplayMode.JSONView]: AUTO_RENDERER,
-  [TableCellDisplayMode.Image]: IMAGE_RENDERER,
-  [TableCellDisplayMode.DataLinks]: DATA_LINKS_RENDERER,
-  [TableCellDisplayMode.Actions]: ACTIONS_RENDERER,
-  [TableCellDisplayMode.Custom]: CUSTOM_RENDERER,
-  [TableCellDisplayMode.ColorText]: AUTO_RENDERER,
-  [TableCellDisplayMode.ColorBackground]: AUTO_RENDERER,
-  [TableCellDisplayMode.Auto]: AUTO_RENDERER,
-  [TableCellDisplayMode.Markdown]: MARKDOWN_RENDERER,
-  [TableCellDisplayMode.Pill]: PILL_RENDERER,
+const CELL_RENDERERS: Record<TableCellOptions['type'], { renderer: TableCellRenderer; getStyles?: TableCellStyles }> = {
+  [TableCellDisplayMode.Actions]: {
+    renderer: ACTIONS_RENDERER,
+    getStyles: getActionsCellStyles,
+  },
+  [TableCellDisplayMode.Auto]: {
+    renderer: AUTO_RENDERER,
+    getStyles: getAutoCellStyles,
+  },
+  [TableCellDisplayMode.ColorBackground]: {
+    renderer: AUTO_RENDERER,
+    getStyles: getAutoCellStyles,
+  },
+  [TableCellDisplayMode.ColorText]: {
+    renderer: AUTO_RENDERER,
+    getStyles: getAutoCellStyles,
+  },
+  [TableCellDisplayMode.Custom]: {
+    renderer: CUSTOM_RENDERER,
+  },
+  [TableCellDisplayMode.DataLinks]: {
+    renderer: DATA_LINKS_RENDERER,
+    getStyles: getDataLinksStyles,
+  },
+  [TableCellDisplayMode.Gauge]: {
+    renderer: GAUGE_RENDERER,
+  },
+  [TableCellDisplayMode.Geo]: {
+    renderer: GEO_RENDERER,
+    getStyles: getGeoCellStyles,
+  },
+  [TableCellDisplayMode.Image]: {
+    renderer: IMAGE_RENDERER,
+    getStyles: getImageStyles,
+  },
+  [TableCellDisplayMode.JSONView]: {
+    renderer: AUTO_RENDERER,
+    getStyles: mixinAutoCellStyles(getJsonCellStyles),
+  },
+  [TableCellDisplayMode.Pill]: {
+    renderer: PILL_RENDERER,
+    getStyles: getPillStyles,
+  },
+  [TableCellDisplayMode.Sparkline]: {
+    renderer: SPARKLINE_RENDERER,
+    getStyles: getSparklineCellStyles,
+  },
+  [TableCellDisplayMode.Markdown]: {
+    renderer: MARKDOWN_RENDERER,
+    getStyles: getMarkdownCellStyles,
+  },
 };
 
 // TODO: come up with a more elegant way to handle this.
@@ -108,26 +144,53 @@ const STRING_ONLY_RENDERERS = new Set<TableCellOptions['type']>([
 export function getCellRenderer(field: Field, cellOptions: TableCellOptions): TableCellRenderer {
   const cellType = cellOptions?.type ?? TableCellDisplayMode.Auto;
   if (cellType === TableCellDisplayMode.Auto) {
-    return getAutoRendererResult(field);
+    return CELL_RENDERERS[getAutoRendererDisplayMode(field)].renderer;
   }
 
   if (STRING_ONLY_RENDERERS.has(cellType) && field.type !== FieldType.string) {
     return AUTO_RENDERER;
   }
 
-  return CELL_RENDERERS[cellType] ?? AUTO_RENDERER;
+  // cautious fallback to Auto renderer in case some garbage cell type has been provided.
+  return CELL_RENDERERS[cellType]?.renderer ?? AUTO_RENDERER;
 }
 
 /** @internal */
-export function getAutoRendererResult(field: Field): TableCellRenderer {
+export function getCellSpecificStyles(
+  cellType: TableCellOptions['type'],
+  field: Field,
+  theme: GrafanaTheme2,
+  options: TableCellStyleOptions
+): string | undefined {
+  if (cellType === TableCellDisplayMode.Auto) {
+    return getAutoRendererStyles(theme, options, field);
+  }
+  return CELL_RENDERERS[cellType]?.getStyles?.(theme, options);
+}
+
+/** @internal */
+export function getAutoRendererStyles(
+  theme: GrafanaTheme2,
+  options: TableCellStyleOptions,
+  field: Field
+): string | undefined {
+  const impliedDisplayMode = getAutoRendererDisplayMode(field);
+  if (impliedDisplayMode !== TableCellDisplayMode.Auto) {
+    return CELL_RENDERERS[impliedDisplayMode]?.getStyles?.(theme, options);
+  }
+  return getAutoCellStyles(theme, options);
+}
+
+/** @internal */
+export function getAutoRendererDisplayMode(field: Field): TableCellOptions['type'] {
   if (field.type === FieldType.geo) {
-    return GEO_RENDERER;
+    return TableCellDisplayMode.Geo;
   }
   if (field.type === FieldType.frame) {
     const firstValue = field.values[0];
     if (isDataFrame(firstValue) && isTimeSeriesFrame(firstValue)) {
-      return SPARKLINE_RENDERER;
+      return TableCellDisplayMode.Sparkline;
     }
   }
-  return AUTO_RENDERER;
+  return TableCellDisplayMode.Auto;
 }
diff --git a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
index f8bf1c16491..4adbf7541c9 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
@@ -1,7 +1,6 @@
 import 'react-data-grid/lib/styles.css';
-import { css } from '@emotion/css';
+
 import { clsx } from 'clsx';
-import { Property } from 'csstype';
 import { CSSProperties, Key, ReactNode, useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import {
   Cell,
@@ -22,7 +21,6 @@ import {
   Field,
   FieldType,
   getDisplayProcessor,
-  GrafanaTheme2,
   ReducerID,
 } from '@grafana/data';
 import { t, Trans } from '@grafana/i18n';
@@ -38,10 +36,10 @@ import { TableCellInspector, TableCellInspectorMode } from '../TableCellInspecto
 import { TableCellDisplayMode } from '../types';
 import { DataLinksActionsTooltipState } from '../utils';
 
-import { HeaderCell } from './Cells/HeaderCell';
-import { RowExpander } from './Cells/RowExpander';
-import { TableCellActions } from './Cells/TableCellActions';
-import { getCellRenderer } from './Cells/renderers';
+import { getCellRenderer, getCellSpecificStyles } from './Cells/renderers';
+import { HeaderCell } from './components/HeaderCell';
+import { RowExpander } from './components/RowExpander';
+import { TableCellActions } from './components/TableCellActions';
 import { COLUMN, TABLE } from './constants';
 import {
   useColumnResize,
@@ -53,7 +51,8 @@ import {
   useScrollbarWidth,
   useSortedRows,
 } from './hooks';
-import { TableNGProps, TableRow, TableSummaryRow, TableColumn, ContextMenuProps } from './types';
+import { getDefaultCellStyles, getFooterStyles, getGridStyles, getHeaderCellStyles, getLinkStyles } from './styles';
+import { TableNGProps, TableRow, TableSummaryRow, TableColumn, ContextMenuProps, TableCellStyleOptions } from './types';
 import {
   applySort,
   computeColWidths,
@@ -74,7 +73,6 @@ import {
   isCellInspectEnabled,
   shouldTextOverflow,
   shouldTextWrap,
-  TextAlign,
   withDataLinksActionsTooltip,
 } from './utils';
 
@@ -364,37 +362,19 @@ export function TableNG(props: TableNGProps) {
           : undefined;
 
         const shouldOverflow = rowHeight !== 'auto' && shouldTextOverflow(field);
-        const shouldWrap = rowHeight === 'auto' || shouldTextWrap(field);
+        const textWrap = rowHeight === 'auto' || shouldTextWrap(field);
         const withTooltip = withDataLinksActionsTooltip(field, cellType);
         const canBeColorized =
-          cellType === TableCellDisplayMode.ColorBackground || cellType === TableCellDisplayMode.ColorText;
-        const isMonospace = cellType === TableCellDisplayMode.JSONView;
+          cellType === TableCellDisplayMode.ColorBackground ||
+          cellType === TableCellDisplayMode.ColorText ||
+          Boolean(applyToRowBgFn);
+        const cellStyleOptions: TableCellStyleOptions = { textAlign, textWrap, shouldOverflow };
 
         result.colsWithTooltip[displayName] = withTooltip;
 
-        // get static cell class based on col props
-
-        let cellClass = '';
-
-        switch (cellType) {
-          case TableCellDisplayMode.Auto:
-          case TableCellDisplayMode.ColorBackground:
-          case TableCellDisplayMode.ColorText:
-          case TableCellDisplayMode.DataLinks:
-          case TableCellDisplayMode.JSONView:
-          case TableCellDisplayMode.Pill:
-          case TableCellDisplayMode.Markdown:
-            cellClass = getCellStyles(
-              theme,
-              cellType,
-              textAlign,
-              shouldWrap,
-              shouldOverflow,
-              canBeColorized,
-              isMonospace
-            );
-            break;
-        }
+        const defaultCellStyles = getDefaultCellStyles(theme, cellStyleOptions);
+        const cellSpecificStyles = getCellSpecificStyles(cellType, field, theme, cellStyleOptions);
+        const linkStyles = getLinkStyles(theme, canBeColorized);
 
         // TODO: in future extend this to ensure a non-classic color scheme is set with AutoCell
 
@@ -433,7 +413,14 @@ export function TableNG(props: TableNGProps) {
             };
           }
 
-          return <Cell key={key} {...props} className={clsx(props.className, cellClass)} style={style} />; // TODO: remove expensive concat
+          return (
+            <Cell
+              key={key}
+              {...props}
+              className={clsx(props.className, defaultCellStyles, cellSpecificStyles, linkStyles)}
+              style={style}
+            />
+          );
         };
 
         result.cellRootRenderers[displayName] = renderCellRoot;
@@ -456,7 +443,6 @@ export function TableNG(props: TableNGProps) {
                 frame,
                 field,
                 height,
-                justifyContent,
                 rowIdx,
                 theme,
                 value,
@@ -812,264 +798,3 @@ const renderRowFactory =
 
     return <Row key={key} {...props} {...handlers} />;
   };
-
-const getGridStyles = (
-  theme: GrafanaTheme2,
-  { enablePagination, transparent }: { enablePagination?: boolean; transparent?: boolean }
-) => ({
-  grid: css({
-    '--rdg-background-color': transparent ? theme.colors.background.canvas : theme.colors.background.primary,
-    '--rdg-header-background-color': transparent ? theme.colors.background.canvas : theme.colors.background.primary,
-    '--rdg-border-color': theme.colors.border.weak,
-    '--rdg-color': theme.colors.text.primary,
-    '--rdg-summary-border-color': theme.colors.border.weak,
-    '--rdg-summary-border-width': '1px',
-
-    // note: this cannot have any transparency since default cells that
-    // overlay/overflow on hover inherit this background and need to occlude cells below
-    '--rdg-row-background-color': transparent ? theme.colors.background.canvas : theme.colors.background.primary,
-    '--rdg-row-hover-background-color': transparent
-      ? theme.colors.background.primary
-      : theme.colors.background.secondary,
-
-    // TODO: magic 32px number is unfortunate. it would be better to have the content
-    // flow using flexbox rather than hard-coding this size via a calc
-    blockSize: enablePagination ? 'calc(100% - 32px)' : '100%',
-    scrollbarWidth: 'thin',
-    scrollbarColor: theme.isDark ? '#fff5 #fff1' : '#0005 #0001',
-
-    border: 'none',
-
-    '.rdg-cell': {
-      padding: TABLE.CELL_PADDING,
-      '&:last-child': {
-        borderInlineEnd: 'none',
-      },
-    },
-
-    // add a box shadow on hover and selection for all body cells
-    '& > :not(.rdg-summary-row, .rdg-header-row) > .rdg-cell': {
-      '&:hover, &[aria-selected=true]': {
-        boxShadow: theme.shadows.z2,
-      },
-      // selected cells should appear below hovered cells.
-      '&:hover': {
-        zIndex: theme.zIndex.tooltip - 2,
-      },
-      '&[aria-selected=true]': {
-        zIndex: theme.zIndex.tooltip - 3,
-      },
-    },
-
-    '.rdg-header-row, .rdg-summary-row': {
-      '.rdg-cell': {
-        zIndex: theme.zIndex.tooltip - 1,
-      },
-    },
-  }),
-  gridNested: css({
-    height: '100%',
-    width: `calc(100% - ${COLUMN.EXPANDER_WIDTH - TABLE.CELL_PADDING * 2 - 1}px)`,
-    overflow: 'visible',
-    marginLeft: COLUMN.EXPANDER_WIDTH - TABLE.CELL_PADDING - 1,
-    marginBlock: TABLE.CELL_PADDING,
-  }),
-  cellNested: css({
-    '&[aria-selected=true]': {
-      outline: 'none',
-    },
-  }),
-  noDataNested: css({
-    height: TABLE.NESTED_NO_DATA_HEIGHT,
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    color: theme.colors.text.secondary,
-    fontSize: theme.typography.h4.fontSize,
-  }),
-  cellActions: css({
-    display: 'none',
-    position: 'absolute',
-    top: 0,
-    margin: 'auto',
-    height: '100%',
-    color: theme.colors.text.primary,
-    background: theme.isDark ? 'rgba(0, 0, 0, 0.7)' : 'rgba(255, 255, 255, 0.7)',
-    padding: theme.spacing.x0_5,
-    paddingInlineStart: theme.spacing.x1,
-  }),
-  cellActionsEnd: css({
-    left: 0,
-  }),
-  cellActionsStart: css({
-    right: 0,
-  }),
-  headerRow: css({
-    paddingBlockStart: 0,
-    fontWeight: 'normal',
-    '& .rdg-cell': {
-      height: '100%',
-      alignItems: 'flex-end',
-    },
-  }),
-  displayNone: css({
-    display: 'none',
-  }),
-  paginationContainer: css({
-    alignItems: 'center',
-    display: 'flex',
-    justifyContent: 'center',
-    marginTop: '8px',
-    width: '100%',
-  }),
-  paginationSummary: css({
-    color: theme.colors.text.secondary,
-    fontSize: theme.typography.bodySmall.fontSize,
-    display: 'flex',
-    justifyContent: 'flex-end',
-    padding: theme.spacing(0, 1, 0, 2),
-  }),
-  menuItem: css({
-    maxWidth: '200px',
-  }),
-});
-
-const getFooterStyles = (justifyContent: Property.JustifyContent) => ({
-  footerCellCountRows: css({
-    display: 'flex',
-    justifyContent: 'space-between',
-  }),
-  footerCell: css({
-    display: 'flex',
-    justifyContent: justifyContent || 'space-between',
-  }),
-});
-
-const getHeaderCellStyles = (theme: GrafanaTheme2, justifyContent: Property.JustifyContent) =>
-  css({
-    display: 'flex',
-    gap: theme.spacing(0.5),
-    zIndex: theme.zIndex.tooltip - 1,
-    paddingInline: TABLE.CELL_PADDING,
-    paddingBlockEnd: TABLE.CELL_PADDING,
-    justifyContent,
-    '&:last-child': {
-      borderInlineEnd: 'none',
-    },
-  });
-
-const getCellStyles = (
-  theme: GrafanaTheme2,
-  cellType: TableCellDisplayMode,
-  textAlign: TextAlign,
-  shouldWrap: boolean,
-  shouldOverflow: boolean,
-  isColorized: boolean,
-  isMonospace: boolean
-) => {
-  const whiteSpace: CSSProperties['whiteSpace'] = (() => {
-    if (isMonospace) {
-      return 'pre';
-    }
-    if (cellType === TableCellDisplayMode.Markdown) {
-      return 'normal';
-    }
-    return 'pre-line';
-  })();
-
-  return css({
-    display: 'flex',
-    alignItems: 'center',
-    textAlign,
-    justifyContent: getJustifyContent(textAlign),
-
-    ...(isColorized && { backgroundClip: 'padding-box !important' }),
-    ...(shouldOverflow && { minHeight: '100%' }),
-    ...(shouldWrap && { whiteSpace }),
-    ...(isMonospace && { fontFamily: 'monospace' }),
-
-    '&:hover, &[aria-selected=true]': {
-      '.table-cell-actions': {
-        display: 'flex',
-      },
-      ...(shouldOverflow && {
-        zIndex: theme.zIndex.tooltip - 2,
-        whiteSpace,
-        height: 'fit-content',
-        minWidth: 'fit-content',
-        ...(cellType === TableCellDisplayMode.Pill && {
-          flexWrap: 'wrap',
-        }),
-      }),
-    },
-
-    a: {
-      cursor: 'pointer',
-      ...(isColorized
-        ? {
-            color: 'inherit',
-            textDecoration: 'underline',
-          }
-        : {
-            color: theme.colors.text.link,
-            textDecoration: 'none',
-            '&:hover': {
-              textDecoration: 'underline',
-            },
-          }),
-    },
-
-    ...(cellType === TableCellDisplayMode.DataLinks && {
-      ...(shouldWrap && {
-        flexDirection: 'column',
-        justifyContent: 'center',
-        alignItems: getJustifyContent(textAlign),
-      }),
-      '> a': {
-        flexWrap: 'nowrap',
-        ...(!shouldWrap && {
-          paddingInline: theme.spacing(0.5),
-          borderRight: `2px solid ${theme.colors.border.medium}`,
-          '&:first-child': {
-            paddingInlineStart: 0,
-          },
-          '&:last-child': {
-            paddingInlineEnd: 0,
-            borderRight: 'none',
-          },
-        }),
-      },
-    }),
-
-    ...(cellType === TableCellDisplayMode.Pill && {
-      display: 'inline-flex',
-      gap: theme.spacing(0.5),
-      flexWrap: shouldWrap ? 'wrap' : 'nowrap',
-      '> span': {
-        display: 'flex',
-        padding: theme.spacing(0.25, 0.75),
-        borderRadius: theme.shape.radius.default,
-        fontSize: theme.typography.bodySmall.fontSize,
-        lineHeight: theme.typography.bodySmall.lineHeight,
-        whiteSpace: 'nowrap',
-      },
-    }),
-
-    ...(cellType === TableCellDisplayMode.Markdown && {
-      '& ol, & ul': {
-        paddingLeft: theme.spacing(1.5),
-      },
-      '& p': {
-        whiteSpace: 'pre-line',
-      },
-      '& a': {
-        color: theme.colors.primary.text,
-      },
-      // for elements like `p`, `h*`, etc. which have an inherent margin,
-      // we want to remove the bottom margin for the last one in the container.
-      '& > .markdown-container > *:last-child': {
-        marginBottom: 0,
-      },
-    }),
-  });
-};
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/FooterCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/components/FooterCell.tsx
similarity index 100%
rename from packages/grafana-ui/src/components/Table/TableNG/Cells/FooterCell.tsx
rename to packages/grafana-ui/src/components/Table/TableNG/components/FooterCell.tsx
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/HeaderCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/components/HeaderCell.tsx
similarity index 96%
rename from packages/grafana-ui/src/components/Table/TableNG/Cells/HeaderCell.tsx
rename to packages/grafana-ui/src/components/Table/TableNG/components/HeaderCell.tsx
index a62cbeb6beb..8ccc73a98b9 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/HeaderCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/components/HeaderCell.tsx
@@ -89,7 +89,10 @@ const getStyles = (theme: GrafanaTheme2, headerTextWrap?: boolean) => ({
     whiteSpace: headerTextWrap ? 'pre-line' : 'nowrap',
     '&:hover': {
       textDecoration: 'underline',
-      color: theme.colors.text.link,
+    },
+    '&::selection': {
+      backgroundColor: 'var(--rdg-background-color)',
+      color: theme.colors.text.secondary,
     },
   }),
   headerCellIcon: css({
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/RowExpander.tsx b/packages/grafana-ui/src/components/Table/TableNG/components/RowExpander.tsx
similarity index 100%
rename from packages/grafana-ui/src/components/Table/TableNG/Cells/RowExpander.tsx
rename to packages/grafana-ui/src/components/Table/TableNG/components/RowExpander.tsx
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/TableCellActions.tsx b/packages/grafana-ui/src/components/Table/TableNG/components/TableCellActions.tsx
similarity index 100%
rename from packages/grafana-ui/src/components/Table/TableNG/Cells/TableCellActions.tsx
rename to packages/grafana-ui/src/components/Table/TableNG/components/TableCellActions.tsx
diff --git a/packages/grafana-ui/src/components/Table/TableNG/constants.ts b/packages/grafana-ui/src/components/Table/TableNG/constants.ts
index 7638dd98804..e88f7181591 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/constants.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/constants.ts
@@ -13,7 +13,6 @@ export const TABLE = {
   PAGINATION_LIMIT: 750,
   SCROLL_BAR_WIDTH: 8,
   SCROLL_BAR_MARGIN: 2,
-  FONT_SIZE: 14,
   LINE_HEIGHT: 22,
   HEADER_HEIGHT: 28,
   NESTED_NO_DATA_HEIGHT: 60,
diff --git a/packages/grafana-ui/src/components/Table/TableNG/styles.ts b/packages/grafana-ui/src/components/Table/TableNG/styles.ts
new file mode 100644
index 00000000000..9fed490c224
--- /dev/null
+++ b/packages/grafana-ui/src/components/Table/TableNG/styles.ts
@@ -0,0 +1,158 @@
+import { css } from '@emotion/css';
+import { Property } from 'csstype';
+
+import { GrafanaTheme2 } from '@grafana/data';
+
+import { COLUMN, TABLE } from './constants';
+import { TableCellStyles } from './types';
+import { getJustifyContent } from './utils';
+
+export const getGridStyles = (
+  theme: GrafanaTheme2,
+  { enablePagination, transparent }: { enablePagination?: boolean; transparent?: boolean }
+) => ({
+  grid: css({
+    '--rdg-background-color': transparent ? theme.colors.background.canvas : theme.colors.background.primary,
+    '--rdg-header-background-color': transparent ? theme.colors.background.canvas : theme.colors.background.primary,
+    '--rdg-border-color': theme.colors.border.weak,
+    '--rdg-color': theme.colors.text.primary,
+    '--rdg-summary-border-color': theme.colors.border.weak,
+    '--rdg-summary-border-width': '1px',
+
+    // note: this cannot have any transparency since default cells that
+    // overlay/overflow on hover inherit this background and need to occlude cells below
+    '--rdg-row-background-color': transparent ? theme.colors.background.canvas : theme.colors.background.primary,
+    '--rdg-row-hover-background-color': transparent
+      ? theme.colors.background.primary
+      : theme.colors.background.secondary,
+
+    // TODO: magic 32px number is unfortunate. it would be better to have the content
+    // flow using flexbox rather than hard-coding this size via a calc
+    blockSize: enablePagination ? 'calc(100% - 32px)' : '100%',
+    scrollbarWidth: 'thin',
+    scrollbarColor: theme.isDark ? '#fff5 #fff1' : '#0005 #0001',
+
+    border: 'none',
+
+    '.rdg-cell': {
+      padding: TABLE.CELL_PADDING,
+
+      '&:last-child': {
+        borderInlineEnd: 'none',
+      },
+    },
+
+    // add a box shadow on hover and selection for all body cells
+    '& > :not(.rdg-summary-row, .rdg-header-row) > .rdg-cell': {
+      '&:hover, &[aria-selected=true]': { boxShadow: theme.shadows.z2 },
+      // selected cells should appear below hovered cells.
+      '&:hover': { zIndex: theme.zIndex.tooltip - 2 },
+      '&[aria-selected=true]': { zIndex: theme.zIndex.tooltip - 3 },
+    },
+
+    '.rdg-header-row, .rdg-summary-row': {
+      '.rdg-cell': { zIndex: theme.zIndex.tooltip - 1 },
+    },
+  }),
+  gridNested: css({
+    height: '100%',
+    width: `calc(100% - ${COLUMN.EXPANDER_WIDTH - TABLE.CELL_PADDING * 2 - 1}px)`,
+    overflow: 'visible',
+    marginLeft: COLUMN.EXPANDER_WIDTH - TABLE.CELL_PADDING - 1,
+    marginBlock: TABLE.CELL_PADDING,
+  }),
+  cellNested: css({ '&[aria-selected=true]': { outline: 'none' } }),
+  noDataNested: css({
+    height: TABLE.NESTED_NO_DATA_HEIGHT,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    color: theme.colors.text.secondary,
+    fontSize: theme.typography.h4.fontSize,
+  }),
+  cellActions: css({
+    display: 'none',
+    position: 'absolute',
+    top: 0,
+    margin: 'auto',
+    height: '100%',
+    color: theme.colors.text.primary,
+    background: theme.isDark ? 'rgba(0, 0, 0, 0.7)' : 'rgba(255, 255, 255, 0.7)',
+    padding: theme.spacing.x0_5,
+    paddingInlineStart: theme.spacing.x1,
+  }),
+  cellActionsEnd: css({ left: 0 }),
+  cellActionsStart: css({ right: 0 }),
+  headerRow: css({
+    paddingBlockStart: 0,
+    fontWeight: 'normal',
+    '& .rdg-cell': { height: '100%', alignItems: 'flex-end' },
+  }),
+  displayNone: css({ display: 'none' }),
+  paginationContainer: css({
+    alignItems: 'center',
+    display: 'flex',
+    justifyContent: 'center',
+    marginTop: '8px',
+    width: '100%',
+  }),
+  paginationSummary: css({
+    color: theme.colors.text.secondary,
+    fontSize: theme.typography.bodySmall.fontSize,
+    display: 'flex',
+    justifyContent: 'flex-end',
+    padding: theme.spacing(0, 1, 0, 2),
+  }),
+  menuItem: css({ maxWidth: '200px' }),
+});
+
+export const getFooterStyles = (justifyContent: Property.JustifyContent) => ({
+  footerCellCountRows: css({ display: 'flex', justifyContent: 'space-between' }),
+  footerCell: css({ display: 'flex', justifyContent: justifyContent || 'space-between' }),
+});
+
+export const getHeaderCellStyles = (theme: GrafanaTheme2, justifyContent: Property.JustifyContent) =>
+  css({
+    display: 'flex',
+    gap: theme.spacing(0.5),
+    zIndex: theme.zIndex.tooltip - 1,
+    paddingInline: TABLE.CELL_PADDING,
+    paddingBlockEnd: TABLE.CELL_PADDING,
+    justifyContent,
+    '&:last-child': { borderInlineEnd: 'none' },
+  });
+
+export const getDefaultCellStyles: TableCellStyles = (theme, { textAlign, shouldOverflow }) =>
+  css({
+    display: 'flex',
+    alignItems: 'center',
+    textAlign,
+    backgroundClip: 'padding-box !important', // helps when cells have a bg color
+    justifyContent: getJustifyContent(textAlign),
+    ...(shouldOverflow && { minHeight: '100%' }),
+    '&:hover, &[aria-selected=true]': {
+      '.table-cell-actions': { display: 'flex' },
+      ...(shouldOverflow && {
+        zIndex: theme.zIndex.tooltip - 2,
+        height: 'fit-content',
+        minWidth: 'fit-content',
+      }),
+    },
+  });
+
+export const getLinkStyles = (theme: GrafanaTheme2, canBeColorized: boolean) =>
+  css({
+    a: {
+      cursor: 'pointer',
+      ...(canBeColorized
+        ? {
+            color: 'inherit',
+            textDecoration: 'underline',
+          }
+        : {
+            color: theme.colors.text.link,
+            textDecoration: 'none',
+            '&:hover': { textDecoration: 'underline' },
+          }),
+    },
+  });
diff --git a/packages/grafana-ui/src/components/Table/TableNG/types.ts b/packages/grafana-ui/src/components/Table/TableNG/types.ts
index eaca19734ea..105e900189c 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/types.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/types.ts
@@ -1,4 +1,3 @@
-import { Property } from 'csstype';
 import { SyntheticEvent } from 'react';
 import { Column } from 'react-data-grid';
 
@@ -19,6 +18,8 @@ import { TableCellHeight, TableFieldOptions } from '@grafana/schema';
 import { TableCellInspectorMode } from '../TableCellInspector';
 import { TableCellOptions } from '../types';
 
+import { TextAlign } from './utils';
+
 export const FILTER_FOR_OPERATOR = '=';
 export const FILTER_OUT_OPERATOR = '!=';
 
@@ -161,7 +162,6 @@ export interface TableCellRendererProps {
   theme: GrafanaTheme2;
   cellInspect: boolean;
   showFilters: boolean;
-  justifyContent: Property.JustifyContent;
   getActions?: GetActionsFunctionLocal;
   disableSanitizeHtml?: boolean;
 }
@@ -195,7 +195,6 @@ export interface RowExpanderNGProps {
 
 export interface SparklineCellProps {
   field: Field;
-  justifyContent: Property.JustifyContent;
   rowIdx: number;
   theme: GrafanaTheme2;
   timeRange?: TimeRange;
@@ -215,8 +214,6 @@ export interface BarGaugeCellProps {
 export interface ImageCellProps {
   cellOptions: TableCellOptions;
   field: Field;
-  height: number;
-  justifyContent: Property.JustifyContent;
   value: TableCellValue;
   rowIdx: number;
 }
@@ -228,7 +225,6 @@ export interface DataLinksCellProps {
 
 export interface GeoCellProps {
   value: TableCellValue;
-  justifyContent: Property.JustifyContent;
   height: number;
 }
 
@@ -262,6 +258,14 @@ export interface PillCellProps {
   rowIdx: number;
 }
 
+export interface TableCellStyleOptions {
+  textWrap: boolean;
+  textAlign: TextAlign;
+  shouldOverflow: boolean;
+}
+
+export type TableCellStyles = (theme: GrafanaTheme2, options: TableCellStyleOptions) => string;
+
 // Comparator for sorting table values
 export type Comparator = (a: TableCellValue, b: TableCellValue) => number;
 

From d666e2bdceca00a14b2292b86718ad3f9f24c14d Mon Sep 17 00:00:00 2001
From: "grafana-pr-automation[bot]"
 <140550294+grafana-pr-automation[bot]@users.noreply.github.com>
Date: Fri, 8 Aug 2025 00:43:09 +0000
Subject: [PATCH 034/243] I18n: Download translations from Crowdin (#109372)

New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 public/locales/cs-CZ/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/de-DE/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/es-ES/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/fr-FR/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/hu-HU/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/id-ID/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/it-IT/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/ja-JP/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/ko-KR/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/nl-NL/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/pl-PL/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/pt-BR/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/pt-PT/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/ru-RU/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/sv-SE/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/tr-TR/grafana.json   | 25 ++++++++++++++++++-------
 public/locales/zh-Hans/grafana.json | 25 ++++++++++++++++++-------
 public/locales/zh-Hant/grafana.json | 25 ++++++++++++++++++-------
 18 files changed, 324 insertions(+), 126 deletions(-)

diff --git a/public/locales/cs-CZ/grafana.json b/public/locales/cs-CZ/grafana.json
index 4c7efd32324..0feca03d480 100644
--- a/public/locales/cs-CZ/grafana.json
+++ b/public/locales/cs-CZ/grafana.json
@@ -3567,6 +3567,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3606,6 +3613,9 @@
       "select-checkbox": "Vybrat",
       "tags-column": "Tagy"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "Složku se nepodařilo odstranit",
       "button-cancel": "Zrušit",
@@ -3649,6 +3659,9 @@
     "name-cell": {
       "no-items": "Žádné položky"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Zrušit",
       "create-label": "Vytvořit",
@@ -5731,11 +5744,9 @@
       "api-error": "Nástěnku se nepodařilo odstranit",
       "cancel-action": "Zrušit",
       "delete-action": "Odstranit nástěnku",
-      "delete-read-only-file-message": "Tuto nástěnku nelze odstranit přímo z Grafany, protože úložiště je pouze pro čtení. Chcete-li tuto nástěnku odstranit, odeberte soubor z úložiště Git.",
       "deleting": "Probíhá odstranění…",
       "drawer-title": "Odstranit zajištěnou nástěnku",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Toto úložiště je jen pro čtení"
+      "success-message": ""
     },
     "description-label": {
       "description": "Popis"
@@ -6111,7 +6122,6 @@
       "api-error": "Chyba při ukládání nástěnky",
       "cancel": "Zrušit",
       "cannot-be-saved": "Tuto nástěnku nelze uložit z uživatelského rozhraní Grafana, protože byla zajištěna z jiného zdroje. Zkopírujte JSON nebo ho uložte do souboru níže a následně aktualizujte nástěnku ve zdroji zajištění.",
-      "copy-json-message": "Pokud máte přímý přístup k cíli, zkopírujte JSON a vložte ho tam.",
       "copy-json-to-clipboard": "Kopírovat JSON do schránky",
       "file-path": "<0>Cesta k souboru:</0> {{filePath}}",
       "label-description": "Popis",
@@ -6123,7 +6133,6 @@
       "see-docs": "Další informace o zajištění najdete v <2>dokumentaci</2>.",
       "title-required": "Název nástěnky je povinný",
       "title-same-as-folder": "Název nástěnky nemůže být stejný jako název složky",
-      "title-this-repository-is-read-only": "Toto úložiště je jen pro čtení",
       "title-validation-failed": "Ověření názvu nástěnky selhalo."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6429,7 +6438,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Klikněte <2>tady</2> a zjistěte víc o této chybě.",
-    "success-more-details-links": "Následně můžete začít vizualizovat data <2>vytvořením nástěnky</2> nebo dotazováním na data v <5>Prozkoumat zobrazení</5>."
+    "success-more-details-links": "Následně můžete začít vizualizovat data <2>vytvořením nástěnky</2> nebo dotazováním na data v <5>Prozkoumat zobrazení</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6568,7 +6578,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Vytvořit nástěnku",
-      "explore-data": "Prozkoumat data"
+      "explore-data": "Prozkoumat data",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Další podrobnosti o chybě"
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index a92807cbf5f..ea9fe9fa559 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -3539,6 +3539,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3568,6 +3575,9 @@
       "select-checkbox": "Auswählen",
       "tags-column": "Tags"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "Ordner konnte nicht gelöscht werden",
       "button-cancel": "Abbrechen",
@@ -3611,6 +3621,9 @@
     "name-cell": {
       "no-items": "Keine Elemente"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Abbrechen",
       "create-label": "Erstellen",
@@ -5691,11 +5704,9 @@
       "api-error": "Das Dashboard konnte nicht gelöscht werden",
       "cancel-action": "Abbrechen",
       "delete-action": "Dashboard löschen",
-      "delete-read-only-file-message": "Dieses Dashboard kann nicht direkt von Grafana aus gelöscht werden, da das Repository schreibgeschützt ist. Um dieses Dashboard zu löschen, entfernen Sie bitte die Datei aus Ihrem Git-Repository.",
       "deleting": "Löschen...",
       "drawer-title": "Bereitgestelltes Dashboard löschen",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Dieses Repository ist schreibgeschützt"
+      "success-message": ""
     },
     "description-label": {
       "description": "Beschreibung"
@@ -6067,7 +6078,6 @@
       "api-error": "Fehler beim Speichern des Dashboards",
       "cancel": "Abbrechen",
       "cannot-be-saved": "Dieses Dashboard kann nicht über die Grafana-Benutzeroberfläche gespeichert werden, da es von einer anderen Quelle bereitgestellt wurde. Kopieren Sie JSON oder speichern Sie es unten in einer Datei. Anschließend können Sie Ihr Dashboard in der Bereitstellungsquelle aktualisieren.",
-      "copy-json-message": "Wenn Sie direkten Zugriff auf das Ziel haben, kopieren Sie den JSON und fügen Sie ihn dort ein.",
       "copy-json-to-clipboard": "JSON in die Zwischenablage kopieren",
       "file-path": "<0>Dateipfad:</0> {{filePath}}",
       "label-description": "Beschreibung",
@@ -6079,7 +6089,6 @@
       "see-docs": "Weitere Informationen zur Bereitstellung finden Sie in der <2>Dokumentation</2>.",
       "title-required": "Dashboard-Titel ist erforderlich",
       "title-same-as-folder": "Der Dashboard-Name darf nicht mit dem Ordnernamen identisch sein",
-      "title-this-repository-is-read-only": "Dieses Repository ist schreibgeschützt",
       "title-validation-failed": "Die Validierung des Dashboard-Titels ist fehlgeschlagen."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6385,7 +6394,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Klicken Sie <2>hier</2>, um mehr über diesen Fehler zu erfahren.",
-    "success-more-details-links": "Als Nächstes können Sie damit beginnen, Daten zu visualisieren, indem Sie <2>ein Dashboard erstellen</2> oder Daten in der <5>Explore-Ansicht</5> abfragen."
+    "success-more-details-links": "Als Nächstes können Sie damit beginnen, Daten zu visualisieren, indem Sie <2>ein Dashboard erstellen</2> oder Daten in der <5>Explore-Ansicht</5> abfragen.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6524,7 +6534,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Dashboard erstellen",
-      "explore-data": "Daten untersuchen"
+      "explore-data": "Daten untersuchen",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Weitere Details zum Fehler"
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index dcd55fa22b4..b6a8c01694f 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -3539,6 +3539,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3568,6 +3575,9 @@
       "select-checkbox": "Seleccionar",
       "tags-column": "Etiquetas"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "",
       "button-cancel": "",
@@ -3611,6 +3621,9 @@
     "name-cell": {
       "no-items": "Sin elementos "
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Cancelar",
       "create-label": "Crear",
@@ -5691,11 +5704,9 @@
       "api-error": "",
       "cancel-action": "Cancelar",
       "delete-action": "Eliminar panel de control",
-      "delete-read-only-file-message": "",
       "deleting": "Eliminando...",
       "drawer-title": "",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Este repositorio es de solo lectura"
+      "success-message": ""
     },
     "description-label": {
       "description": "Descripción"
@@ -6067,7 +6078,6 @@
       "api-error": "Error al guardar el panel de control",
       "cancel": "Cancelar",
       "cannot-be-saved": "Este dashboard no se puede guardar desde la interfaz de usuario de Grafana porque se ha aprovisionado desde otra fuente. Copia el JSON o guárdalo en un archivo a continuación; luego puedes actualizar el dashboard en la fuente de aprovisionamiento.",
-      "copy-json-message": "Si tienes acceso directo al destino, copia el JSON y pégalo allí.",
       "copy-json-to-clipboard": "Copiar JSON al portapapeles",
       "file-path": "<0>Ruta del archivo:</0> {{filePath}}",
       "label-description": "Descripción",
@@ -6079,7 +6089,6 @@
       "see-docs": "Consulta la <2>documentación</2> para obtener más información sobre el aprovisionamiento.",
       "title-required": "El título del panel de control es obligatorio",
       "title-same-as-folder": "El nombre del panel de control no puede ser el mismo que el nombre de la carpeta",
-      "title-this-repository-is-read-only": "Este repositorio es de solo lectura",
       "title-validation-failed": "Error en la validación del título del panel de control."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6385,7 +6394,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Haz clic <2>aquí</2> para obtener más información sobre este error.",
-    "success-more-details-links": "A continuación, puedes empezar a visualizar los datos <2>creando un panel de control</2> o consultando los datos en la <5>vista Explorar</5>."
+    "success-more-details-links": "A continuación, puedes empezar a visualizar los datos <2>creando un panel de control</2> o consultando los datos en la <5>vista Explorar</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6524,7 +6534,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Crear un dashboard",
-      "explore-data": "Explorar datos"
+      "explore-data": "Explorar datos",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Más detalles sobre el error"
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index ceb7c46da8b..d6fcb7569d5 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -3539,6 +3539,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3568,6 +3575,9 @@
       "select-checkbox": "Sélectionner",
       "tags-column": "Balises"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "Échec de la suppression du dossier",
       "button-cancel": "Annuler",
@@ -3611,6 +3621,9 @@
     "name-cell": {
       "no-items": "Aucun objet"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Annuler",
       "create-label": "Créer",
@@ -5691,11 +5704,9 @@
       "api-error": "Échec de la suppression du tableau de bord",
       "cancel-action": "Annuler",
       "delete-action": "Supprimer le tableau de bord",
-      "delete-read-only-file-message": "Ce tableau de bord ne peut pas être supprimé directement depuis Grafana, car le dépôt est en lecture seule. Pour le supprimer, veuillez retirer le fichier de votre dépôt Git.",
       "deleting": "Suppression…",
       "drawer-title": "Supprimer le tableau de bord provisionné",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Ce référentiel est en lecture seule"
+      "success-message": ""
     },
     "description-label": {
       "description": "Description"
@@ -6067,7 +6078,6 @@
       "api-error": "Erreur d'enregistrement du tableau de bord",
       "cancel": "Annuler",
       "cannot-be-saved": "Ce tableau de bord ne peut pas être enregistré à partir de l’interface utilisateur Grafana, car il a été mis en service à partir d’une autre source. Copiez le JSON ou enregistrez-le dans un fichier ci-dessous, puis vous pourrez mettre à jour votre tableau de bord dans la source de mise en service.",
-      "copy-json-message": "Si vous avez un accès direct à la cible, copiez le JSON et collez-le à cet endroit.",
       "copy-json-to-clipboard": "Copier JSON dans le presse-papiers",
       "file-path": "<0>Chemin du fichier :</0> {{filePath}}",
       "label-description": "Description",
@@ -6079,7 +6089,6 @@
       "see-docs": "Consultez la <2>documentation</2> pour en savoir plus sur la mise en service.",
       "title-required": "Le titre du tableau de bord est requis",
       "title-same-as-folder": "Le nom du tableau de bord ne peut pas être le même que le nom du dossier",
-      "title-this-repository-is-read-only": "Ce référentiel est en lecture seule",
       "title-validation-failed": "La validation du titre du tableau de bord a échoué."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6385,7 +6394,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Cliquez <2>ici</2> pour en savoir plus sur cette erreur.",
-    "success-more-details-links": "Ensuite, vous pouvez commencer à visualiser les données en <2>créant un tableau de bord</2> ou en interrogeant les données dans la <5>vue Explorer</5>."
+    "success-more-details-links": "Ensuite, vous pouvez commencer à visualiser les données en <2>créant un tableau de bord</2> ou en interrogeant les données dans la <5>vue Explorer</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6524,7 +6534,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Créer un tableau de bord",
-      "explore-data": "Explorer les données"
+      "explore-data": "Explorer les données",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Plus de détails sur l’erreur"
diff --git a/public/locales/hu-HU/grafana.json b/public/locales/hu-HU/grafana.json
index 7e6afb9f14f..9fed586ab03 100644
--- a/public/locales/hu-HU/grafana.json
+++ b/public/locales/hu-HU/grafana.json
@@ -3539,6 +3539,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3568,6 +3575,9 @@
       "select-checkbox": "Kijelölés",
       "tags-column": "Címkék"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "A mappa törlése nem sikerült",
       "button-cancel": "Mégse",
@@ -3611,6 +3621,9 @@
     "name-cell": {
       "no-items": "Nincsenek elemek"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Mégse",
       "create-label": "Létrehozás",
@@ -5691,11 +5704,9 @@
       "api-error": "Az irányítópult törlése nem sikerült",
       "cancel-action": "Mégse",
       "delete-action": "Irányítópult törlése",
-      "delete-read-only-file-message": "Ez az irányítópult nem törölhető közvetlenül a Grafanából, mert az adattár csak olvasható. Az irányítópult törléséhez távolítsa el a fájlt a Git-tárból.",
       "deleting": "Törlés...",
       "drawer-title": "Kiépített irányítópult törlése",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Ez az adattár csak olvasható"
+      "success-message": ""
     },
     "description-label": {
       "description": "Leírás"
@@ -6067,7 +6078,6 @@
       "api-error": "Hiba történt az irányítópult mentésekor",
       "cancel": "Mégse",
       "cannot-be-saved": "Ez az irányítópult nem menthető a Grafana kezelőfelületéből, mert egy másik forrásból van kiépítve. Másolja a JSON-t, vagy mentse fájlba az alábbiakban, majd frissítheti az irányítópultot a kiépítési forrásban.",
-      "copy-json-message": "Ha közvetlen hozzáférése van a célhoz, másolja ki a JSON-kódot, és illessze be oda.",
       "copy-json-to-clipboard": "JSON másolása a vágólapra",
       "file-path": "<0>Fájl útvonala:</0> {{filePath}}",
       "label-description": "Leírás",
@@ -6079,7 +6089,6 @@
       "see-docs": "A kiépítéssel kapcsolatos további információkért tekintse meg a <2>dokumentációt</2>.",
       "title-required": "Az irányítópult címének megadása kötelező",
       "title-same-as-folder": "Az irányítópult neve nem lehet ugyanaz, mint a mappa neve",
-      "title-this-repository-is-read-only": "Ez az adattár csak olvasható",
       "title-validation-failed": "Az irányítópult címének ellenőrzése sikertelen."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6385,7 +6394,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Ha többet szeretne megtudni erről a hibáról, kattintson <2>ide</2>.",
-    "success-more-details-links": "Ezután < 2 >létrehozhat egy irányítópultot</2>, vagy lekérdezheti az adatokat az <5>Explore nézetben</5>."
+    "success-more-details-links": "Ezután < 2 >létrehozhat egy irányítópultot</2>, vagy lekérdezheti az adatokat az <5>Explore nézetben</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6524,7 +6534,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Irányítópult létrehozása",
-      "explore-data": "Adatok felfedezése"
+      "explore-data": "Adatok felfedezése",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "További részletek a hibáról"
diff --git a/public/locales/id-ID/grafana.json b/public/locales/id-ID/grafana.json
index a57dac22e90..fb6bbc076b8 100644
--- a/public/locales/id-ID/grafana.json
+++ b/public/locales/id-ID/grafana.json
@@ -3525,6 +3525,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3549,6 +3556,9 @@
       "select-checkbox": "Pilih",
       "tags-column": "Tag"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "Gagal menghapus folder",
       "button-cancel": "Batalkan",
@@ -3592,6 +3602,9 @@
     "name-cell": {
       "no-items": "Tidak ada item"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Batalkan",
       "create-label": "Buat",
@@ -5671,11 +5684,9 @@
       "api-error": "Gagal menghapus dasbor",
       "cancel-action": "Batalkan",
       "delete-action": "Hapus dasbor",
-      "delete-read-only-file-message": "Dasbor ini tidak dapat dihapus langsung dari Grafana karena repositori bersifat hanya-baca. Untuk menghapus dasbor ini, harap hapus file dari repositori Git Anda.",
       "deleting": "Menghapus...",
       "drawer-title": "Hapus Dasbor yang Disediakan",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Repositori ini hanya dapat dibaca"
+      "success-message": ""
     },
     "description-label": {
       "description": "Deskripsi"
@@ -6045,7 +6056,6 @@
       "api-error": "Kesalahan saat menyimpan dasbor",
       "cancel": "Batalkan",
       "cannot-be-saved": "Dasbor ini tidak dapat disimpan dari UI Grafana karena telah disediakan dari sumber lain. Salin JSON atau simpan ke file di bawah ini, lalu Anda dapat memperbarui dasbor Anda di sumber penyediaan.",
-      "copy-json-message": "Jika Anda memiliki akses langsung ke target, salin JSON dan tempel di sana.",
       "copy-json-to-clipboard": "Salin JSON ke papan klip",
       "file-path": "<0>Jalur file:</0> {{filePath}}",
       "label-description": "Deskripsi",
@@ -6057,7 +6067,6 @@
       "see-docs": "Lihat <2>dokumentasi</2> untuk informasi selengkapnya tentang penyediaan.",
       "title-required": "Judul dasbor wajib diisi",
       "title-same-as-folder": "Nama dasbor tidak boleh sama dengan nama folder",
-      "title-this-repository-is-read-only": "Repositori ini hanya dapat dibaca",
       "title-validation-failed": "Validasi judul dasbor gagal."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6363,7 +6372,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Klik <2>di sini</2> untuk mempelajari selengkapnya tentang kesalahan ini.",
-    "success-more-details-links": "Selanjutnya, Anda dapat mulai memvisualisasikan data dengan <2>membuat dasbor</2>, atau dengan melakukan kueri data di <5>tampilan Explore</5>."
+    "success-more-details-links": "Selanjutnya, Anda dapat mulai memvisualisasikan data dengan <2>membuat dasbor</2>, atau dengan melakukan kueri data di <5>tampilan Explore</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6502,7 +6512,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Buat dasbor",
-      "explore-data": "Jelajahi data"
+      "explore-data": "Jelajahi data",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Detail lebih lanjut tentang kesalahan"
diff --git a/public/locales/it-IT/grafana.json b/public/locales/it-IT/grafana.json
index 5a5ffed422a..d3be0e4f180 100644
--- a/public/locales/it-IT/grafana.json
+++ b/public/locales/it-IT/grafana.json
@@ -3539,6 +3539,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3568,6 +3575,9 @@
       "select-checkbox": "Seleziona",
       "tags-column": "Tag"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "",
       "button-cancel": "",
@@ -3611,6 +3621,9 @@
     "name-cell": {
       "no-items": "Nessun elemento"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Annulla",
       "create-label": "Crea",
@@ -5691,11 +5704,9 @@
       "api-error": "",
       "cancel-action": "Annulla",
       "delete-action": "Elimina dashboard",
-      "delete-read-only-file-message": "",
       "deleting": "Eliminazione in corso...",
       "drawer-title": "",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Questo repository è di sola lettura"
+      "success-message": ""
     },
     "description-label": {
       "description": "Descrizione"
@@ -6067,7 +6078,6 @@
       "api-error": "Errore durante il salvataggio del dashboard",
       "cancel": "Annulla",
       "cannot-be-saved": "Questa dashboard non può essere salvata dall'interfaccia utente di Grafana perché è stata fornita da un'altra fonte. Copia il JSON o salvalo in un file qui sotto, dopodiché potrai aggiornare la dashboard nella fonte di provisioning.",
-      "copy-json-message": "Se hai accesso diretto alla destinazione, copia il file JSON e incollalo lì.",
       "copy-json-to-clipboard": "Copia JSON negli appunti",
       "file-path": "<0>Percorso file:</0> {{filePath}}",
       "label-description": "Descrizione",
@@ -6079,7 +6089,6 @@
       "see-docs": "Consulta la <2>documentazione</2> per ulteriori informazioni sul provisioning.",
       "title-required": "Il titolo del dashboard è obbligatorio",
       "title-same-as-folder": "Il nome del dashboard non può essere uguale al nome della cartella",
-      "title-this-repository-is-read-only": "Questo repository è di sola lettura",
       "title-validation-failed": "Convalida del titolo del dashboard non riuscita."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6385,7 +6394,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Fai clic <2>qui</2> per saperne di più su questo errore.",
-    "success-more-details-links": "Successivamente, puoi iniziare a visualizzare i dati <2>creando un dashboard</2> o eseguendo query sui dati nella <5>vista Esplora</5>."
+    "success-more-details-links": "Successivamente, puoi iniziare a visualizzare i dati <2>creando un dashboard</2> o eseguendo query sui dati nella <5>vista Esplora</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6524,7 +6534,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Crea una dashboard",
-      "explore-data": "Esplora i dati"
+      "explore-data": "Esplora i dati",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Maggiori dettagli sull'errore"
diff --git a/public/locales/ja-JP/grafana.json b/public/locales/ja-JP/grafana.json
index 454b3716d91..81fb4eeeefc 100644
--- a/public/locales/ja-JP/grafana.json
+++ b/public/locales/ja-JP/grafana.json
@@ -3525,6 +3525,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3549,6 +3556,9 @@
       "select-checkbox": "選択",
       "tags-column": "タグ"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "フォルダの削除に失敗しました",
       "button-cancel": "キャンセル",
@@ -3592,6 +3602,9 @@
     "name-cell": {
       "no-items": "項目がありません"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "キャンセル",
       "create-label": "作成",
@@ -5671,11 +5684,9 @@
       "api-error": "ダッシュボードの削除に失敗しました",
       "cancel-action": "キャンセル",
       "delete-action": "ダッシュボードを削除する",
-      "delete-read-only-file-message": "リポジトリが読み取り専用のため、このダッシュボードをGrafanaから直接削除することはできません。このダッシュボードを削除するには、Gitリポジトリからファイルを削除してください。",
       "deleting": "削除中…",
       "drawer-title": "プロビジョニングされたダッシュボードを削除",
-      "success-message": "",
-      "title-this-repository-is-read-only": "このリポジトリは読み取り専用です"
+      "success-message": ""
     },
     "description-label": {
       "description": "説明"
@@ -6045,7 +6056,6 @@
       "api-error": "ダッシュボードの保存中にエラーが発生しました",
       "cancel": "キャンセル",
       "cannot-be-saved": "このダッシュボードは別のソースからプロビジョニングされているため、Grafana UIからは保存できません。JSONをコピーするか下記のファイルに保存した上で、プロビジョニング元でダッシュボードを更新できます。",
-      "copy-json-message": "ターゲットに直接アクセスできる場合は、JSONをコピーしてそこに貼り付けます。",
       "copy-json-to-clipboard": "JSONをクリップボードにコピー",
       "file-path": "<0>ファイルパス：</0> {{filePath}}",
       "label-description": "説明",
@@ -6057,7 +6067,6 @@
       "see-docs": "プロビジョニングについての詳細は<2>ドキュメント</2>をご覧ください。",
       "title-required": "ダッシュボードのタイトルが必要です",
       "title-same-as-folder": "ダッシュボード名をフォルダ名と同じにすることはできません",
-      "title-this-repository-is-read-only": "このリポジトリは読み取り専用です",
       "title-validation-failed": "ダッシュボードのタイトルの検証に失敗しました。"
     },
     "scenes-new-rule-from-panel-button": {
@@ -6363,7 +6372,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "このエラーの詳細については、<2>こちら</2>をクリックしてください。",
-    "success-more-details-links": "次に、<2>ダッシュボードを構築</2>するか、<5>Exploreビュー</5>でデータをクエリすることで、データの視覚化を開始できます。"
+    "success-more-details-links": "次に、<2>ダッシュボードを構築</2>するか、<5>Exploreビュー</5>でデータをクエリすることで、データの視覚化を開始できます。",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6502,7 +6512,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "ダッシュボードを作成",
-      "explore-data": "データを調査"
+      "explore-data": "データを調査",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "エラーの詳細"
diff --git a/public/locales/ko-KR/grafana.json b/public/locales/ko-KR/grafana.json
index d1dd13457bf..d4bfb796944 100644
--- a/public/locales/ko-KR/grafana.json
+++ b/public/locales/ko-KR/grafana.json
@@ -3525,6 +3525,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3549,6 +3556,9 @@
       "select-checkbox": "선택",
       "tags-column": "태그"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "",
       "button-cancel": "",
@@ -3592,6 +3602,9 @@
     "name-cell": {
       "no-items": "항목 없음"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "취소",
       "create-label": "생성",
@@ -5671,11 +5684,9 @@
       "api-error": "",
       "cancel-action": "취소",
       "delete-action": "대시보드 삭제",
-      "delete-read-only-file-message": "",
       "deleting": "삭제 중…",
       "drawer-title": "",
-      "success-message": "",
-      "title-this-repository-is-read-only": "이 리포지토리는 읽기 전용입니다."
+      "success-message": ""
     },
     "description-label": {
       "description": "설명"
@@ -6045,7 +6056,6 @@
       "api-error": "대시보드 저장 중 오류 발생",
       "cancel": "취소",
       "cannot-be-saved": "이 대시보드는 다른 소스에서 프로비저닝되었으므로 Grafana UI에서 저장할 수 없습니다. JSON을 복사하거나 아래 파일에 저장하면 프로비저닝 소스에서 대시보드를 업데이트할 수 있습니다.",
-      "copy-json-message": "대상에 직접 액세스할 수 있는 경우 JSON을 복사하여 붙여넣으세요.",
       "copy-json-to-clipboard": "JSON을 클립보드로 복사",
       "file-path": "<0>파일 경로:</0> {{filePath}}",
       "label-description": "설명",
@@ -6057,7 +6067,6 @@
       "see-docs": "프로비저닝에 대한 자세한 내용은 <2>문서</2>를 참고하세요.",
       "title-required": "대시보드 제목은 필수 입력 항목입니다.",
       "title-same-as-folder": "대시보드 이름은 폴더 이름과 같을 수 없습니다.",
-      "title-this-repository-is-read-only": "이 리포지토리는 읽기 전용입니다.",
       "title-validation-failed": "대시보드 제목 검증에 실패했습니다."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6363,7 +6372,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "이 오류에 대해 자세히 알아보려면 <2>여기</2>를 클릭하세요.",
-    "success-more-details-links": "그런 다음 <2>대시보드를 구축</2>하거나 <5>탐색 보기</5>에서 데이터를 쿼리하여 데이터 시각화를 시작할 수 있습니다."
+    "success-more-details-links": "그런 다음 <2>대시보드를 구축</2>하거나 <5>탐색 보기</5>에서 데이터를 쿼리하여 데이터 시각화를 시작할 수 있습니다.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6502,7 +6512,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "대시보드 구축",
-      "explore-data": "데이터 탐색"
+      "explore-data": "데이터 탐색",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "오류에 대한 자세한 정보"
diff --git a/public/locales/nl-NL/grafana.json b/public/locales/nl-NL/grafana.json
index ece87a5dfd2..59ace6534f7 100644
--- a/public/locales/nl-NL/grafana.json
+++ b/public/locales/nl-NL/grafana.json
@@ -3539,6 +3539,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3568,6 +3575,9 @@
       "select-checkbox": "Selecteren",
       "tags-column": "Tags"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "Kan map niet verwijderen",
       "button-cancel": "Annuleren",
@@ -3611,6 +3621,9 @@
     "name-cell": {
       "no-items": "Geen items"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Annuleren",
       "create-label": "Aanmaken",
@@ -5691,11 +5704,9 @@
       "api-error": "Kan dashboard niet verwijderen",
       "cancel-action": "Annuleren",
       "delete-action": "Dashboard verwijderen",
-      "delete-read-only-file-message": "Dit dashboard kan niet rechtstreeks uit Grafana worden verwijderd omdat de repository alleen-lezen is. Verwijder het bestand uit je Git-repository om dit dashboard te verwijderen.",
       "deleting": "Bezig met verwijderen ...",
       "drawer-title": "Kan provisioned dashboard niet verwijderen",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Deze repository is alleen-lezen"
+      "success-message": ""
     },
     "description-label": {
       "description": "Beschrijving"
@@ -6067,7 +6078,6 @@
       "api-error": "Fout bij opslaan van dashboard",
       "cancel": "Annuleren",
       "cannot-be-saved": "Dit dashboard kan niet worden opgeslagen vanuit de Grafana-gebruikersinterface omdat het is geprovisioneerd vanuit een andere bron. Kopieer de JSON of sla deze op in een onderstaand bestand. Vervolgens kun je je dashboard bijwerken in de provisioningbron.",
-      "copy-json-message": "Als je directe toegang hebt tot het doel, kopieer je de JSON en plak je deze daar.",
       "copy-json-to-clipboard": "JSON kopiëren naar klembord",
       "file-path": "<0>Bestandspad:</0> {{filePath}} ",
       "label-description": "Beschrijving",
@@ -6079,7 +6089,6 @@
       "see-docs": "Bekijk de <2>documentatie</2> voor meer informatie over provisioning.",
       "title-required": "Dashboardtitel is vereist",
       "title-same-as-folder": "Dashboardnaam mag niet hetzelfde zijn als de mapnaam",
-      "title-this-repository-is-read-only": "Deze repository is alleen-lezen",
       "title-validation-failed": "Validatie dashboardtitel mislukt."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6385,7 +6394,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Klik <2>hier</2> voor meer informatie over deze fout.",
-    "success-more-details-links": "Vervolgens kun je beginnen met het visualiseren van gegevens door <2> een dashboard te bouwen </2> of door gegevens op te vragen in de <5> Verkennen-weergave</5>."
+    "success-more-details-links": "Vervolgens kun je beginnen met het visualiseren van gegevens door <2> een dashboard te bouwen </2> of door gegevens op te vragen in de <5> Verkennen-weergave</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6524,7 +6534,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Maak een dashboard",
-      "explore-data": "Gegevens verkennen"
+      "explore-data": "Gegevens verkennen",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Meer informatie over de fout"
diff --git a/public/locales/pl-PL/grafana.json b/public/locales/pl-PL/grafana.json
index de0626be4a8..03545911c0d 100644
--- a/public/locales/pl-PL/grafana.json
+++ b/public/locales/pl-PL/grafana.json
@@ -3567,6 +3567,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3606,6 +3613,9 @@
       "select-checkbox": "Wybierz",
       "tags-column": "Znaczniki"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "",
       "button-cancel": "",
@@ -3649,6 +3659,9 @@
     "name-cell": {
       "no-items": "Brak elementów"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Anuluj",
       "create-label": "Utwórz",
@@ -5731,11 +5744,9 @@
       "api-error": "",
       "cancel-action": "Anuluj",
       "delete-action": "Usuń pulpit",
-      "delete-read-only-file-message": "",
       "deleting": "Usuwanie…",
       "drawer-title": "",
-      "success-message": "",
-      "title-this-repository-is-read-only": "To repozytorium jest tylko do odczytu"
+      "success-message": ""
     },
     "description-label": {
       "description": "Opis"
@@ -6111,7 +6122,6 @@
       "api-error": "Błąd podczas zapisywania pulpitu",
       "cancel": "Anuluj",
       "cannot-be-saved": "Nie można zapisać tego pulpitu z poziomu interfejsu Grafany, ponieważ został on skonfigurowany z innego źródła. Skopiuj treść JSON lub zapisz ją w poniższym pliku, a następnie zaktualizuj pulpit w źródle aprowizacji.",
-      "copy-json-message": "Jeśli masz bezpośredni dostęp do celu, skopiuj kod JSON i wklej go tam.",
       "copy-json-to-clipboard": "Kopiuj JSON do schowka",
       "file-path": "<0>Ścieżka do pliku:</0> {{filePath}}",
       "label-description": "Opis",
@@ -6123,7 +6133,6 @@
       "see-docs": "Więcej informacji na temat konfiguracji można znaleźć w <2>dokumentacji</2>.",
       "title-required": "Wymagany tytuł pulpitu",
       "title-same-as-folder": "Nazwa pulpitu nie może być taka sama jak nazwa folderu",
-      "title-this-repository-is-read-only": "To repozytorium jest tylko do odczytu",
       "title-validation-failed": "Walidacja tytułu pulpitu się nie powiodła."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6429,7 +6438,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Kliknij <2>tutaj</2>, aby dowiedzieć się więcej o tym błędzie.",
-    "success-more-details-links": "Następnie możesz rozpocząć wizualizację danych, <2>tworząc pulpit</2> lub tworząc zapytanie dotyczące danych w widoku <5>Eksploruj</5>."
+    "success-more-details-links": "Następnie możesz rozpocząć wizualizację danych, <2>tworząc pulpit</2> lub tworząc zapytanie dotyczące danych w widoku <5>Eksploruj</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6568,7 +6578,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Utwórz pulpit",
-      "explore-data": "Przeglądaj dane"
+      "explore-data": "Przeglądaj dane",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Więcej informacji o błędzie"
diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json
index 45111832e14..ca54a66c741 100644
--- a/public/locales/pt-BR/grafana.json
+++ b/public/locales/pt-BR/grafana.json
@@ -3539,6 +3539,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3568,6 +3575,9 @@
       "select-checkbox": "Selecionar",
       "tags-column": "Tags"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "",
       "button-cancel": "",
@@ -3611,6 +3621,9 @@
     "name-cell": {
       "no-items": "Sem itens"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Cancelar",
       "create-label": "Criar",
@@ -5691,11 +5704,9 @@
       "api-error": "",
       "cancel-action": "Cancelar",
       "delete-action": "Excluir painel de controle",
-      "delete-read-only-file-message": "",
       "deleting": "Excluindo...",
       "drawer-title": "",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Este repositório é somente leitura"
+      "success-message": ""
     },
     "description-label": {
       "description": "Descrição"
@@ -6067,7 +6078,6 @@
       "api-error": "Erro ao salvar o painel de controle",
       "cancel": "Cancelar",
       "cannot-be-saved": "Este painel não pode ser salvo a partir da interface do usuário da Grafana porque foi provisionado a partir de outra fonte. Copie o JSON ou salve-o em um arquivo abaixo e você poderá atualizar seu painel na fonte de provisionamento.",
-      "copy-json-message": "Se você tiver acesso direto ao destino, copie o JSON e cole-o lá.",
       "copy-json-to-clipboard": "Copiar JSON para a área de transferência",
       "file-path": "<0>Caminho do arquivo:</0> {{filePath}}",
       "label-description": "Descrição",
@@ -6079,7 +6089,6 @@
       "see-docs": "Consulte a <2>documentação</2> para obter mais informações sobre provisionamento.",
       "title-required": "Título do painel de controle é um campo obrigatório",
       "title-same-as-folder": "O nome do painel de controle não pode ser igual ao nome da pasta",
-      "title-this-repository-is-read-only": "Este repositório é somente leitura",
       "title-validation-failed": "A validação do título do painel de controle falhou."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6385,7 +6394,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Clique <2>aqui</2> para saber mais sobre esse erro.",
-    "success-more-details-links": "Em seguida, você pode começar a visualizar os dados <2>criando um painel de controle</2> ou consultando os dados na <5>Visualização de exploração</5>."
+    "success-more-details-links": "Em seguida, você pode começar a visualizar os dados <2>criando um painel de controle</2> ou consultando os dados na <5>Visualização de exploração</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6524,7 +6534,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Criar um painel",
-      "explore-data": "Explorar dados"
+      "explore-data": "Explorar dados",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Mais detalhes sobre o erro"
diff --git a/public/locales/pt-PT/grafana.json b/public/locales/pt-PT/grafana.json
index d6dc3217967..70de3d510b4 100644
--- a/public/locales/pt-PT/grafana.json
+++ b/public/locales/pt-PT/grafana.json
@@ -3539,6 +3539,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3568,6 +3575,9 @@
       "select-checkbox": "Selecionar",
       "tags-column": "Etiquetas"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "",
       "button-cancel": "",
@@ -3611,6 +3621,9 @@
     "name-cell": {
       "no-items": "Sem artigos "
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Cancelar",
       "create-label": "Criar",
@@ -5691,11 +5704,9 @@
       "api-error": "",
       "cancel-action": "Cancelar",
       "delete-action": "Eliminar painel de controlo",
-      "delete-read-only-file-message": "",
       "deleting": "A eliminar...",
       "drawer-title": "",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Este repositório é apenas de leitura"
+      "success-message": ""
     },
     "description-label": {
       "description": "Descrição"
@@ -6067,7 +6078,6 @@
       "api-error": "Erro ao guardar o painel de controlo",
       "cancel": "Cancelar",
       "cannot-be-saved": "Este painel de controlo não pode ser guardado a partir da interface do utilizador da Grafana porque foi aprovisionado a partir de outra fonte. Copie o JSON ou guarde-o num ficheiro abaixo. Posteriormente, poderá atualizar o seu painel de controlo na fonte de aprovisionamento.",
-      "copy-json-message": "Se tiver acesso direto ao destino, copie o JSON e cole-o lá.",
       "copy-json-to-clipboard": "Copiar JSON para a área de transferência",
       "file-path": "<0>Caminho do ficheiro:</0> {{filePath}}",
       "label-description": "Descrição",
@@ -6079,7 +6089,6 @@
       "see-docs": "Consulte a <2>documentação</2> para obter mais informações sobre aprovisionamento.",
       "title-required": "O título do painel de controlo é obrigatório",
       "title-same-as-folder": "O nome do painel de controlo não pode ser igual ao nome da pasta",
-      "title-this-repository-is-read-only": "Este repositório é apenas de leitura",
       "title-validation-failed": "A validação do título do painel de controlo falhou."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6385,7 +6394,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Clique <2>aqui</2> para saber mais sobre este erro.",
-    "success-more-details-links": "Em seguida, pode começar a visualizar os dados <2>criando um painel de controlo</2> ou consultando os dados na <5>vista Explorar</5>."
+    "success-more-details-links": "Em seguida, pode começar a visualizar os dados <2>criando um painel de controlo</2> ou consultando os dados na <5>vista Explorar</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6524,7 +6534,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Criar um painel de controlo",
-      "explore-data": "Explorar dados"
+      "explore-data": "Explorar dados",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Mais detalhes sobre o erro"
diff --git a/public/locales/ru-RU/grafana.json b/public/locales/ru-RU/grafana.json
index 808d9de6423..79b65bfbaa0 100644
--- a/public/locales/ru-RU/grafana.json
+++ b/public/locales/ru-RU/grafana.json
@@ -3567,6 +3567,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3606,6 +3613,9 @@
       "select-checkbox": "Выбрать",
       "tags-column": "Теги"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "",
       "button-cancel": "",
@@ -3649,6 +3659,9 @@
     "name-cell": {
       "no-items": "Нет элементов"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Отмена",
       "create-label": "Создать",
@@ -5731,11 +5744,9 @@
       "api-error": "",
       "cancel-action": "Отмена",
       "delete-action": "Удалить дашборд",
-      "delete-read-only-file-message": "",
       "deleting": "Удаление...",
       "drawer-title": "",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Репозиторий предназначен только для чтения"
+      "success-message": ""
     },
     "description-label": {
       "description": "Описание"
@@ -6111,7 +6122,6 @@
       "api-error": "Ошибка при сохранении дашборда",
       "cancel": "Отмена",
       "cannot-be-saved": "Дашборд невозможно сохранить из пользовательского интерфейса Grafana, поскольку он подготовлен в другом источнике. Скопируйте модель JSON или сохраните ее в файл ниже. Затем можно обновить свой дашборд в источнике подготовки.",
-      "copy-json-message": "Если у вас есть прямой доступ к целевому объекту, скопируйте JSON-файл и вставьте его туда.",
       "copy-json-to-clipboard": "Копировать JSON в буфер обмена",
       "file-path": "<0>Путь к файлу:</0> {{filePath}}",
       "label-description": "Описание",
@@ -6123,7 +6133,6 @@
       "see-docs": "Подробнее о подготовке см. в <2>документации</2>.",
       "title-required": "Требуется указать название дашборда",
       "title-same-as-folder": "Имя дашборда не может совпадать с именем папки",
-      "title-this-repository-is-read-only": "Репозиторий предназначен только для чтения",
       "title-validation-failed": "Не удалось проверить название дашборда."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6429,7 +6438,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Чтобы узнать больше об этой ошибке, нажмите <2>здесь</2>.",
-    "success-more-details-links": "Затем вы можете начать визуализировать данные, <2>создав панель</2> или запросив данные в <5>представлении Explore</5>."
+    "success-more-details-links": "Затем вы можете начать визуализировать данные, <2>создав панель</2> или запросив данные в <5>представлении Explore</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6568,7 +6578,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Создать дашборд",
-      "explore-data": "Просмотреть данные"
+      "explore-data": "Просмотреть данные",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Подробнее об ошибке"
diff --git a/public/locales/sv-SE/grafana.json b/public/locales/sv-SE/grafana.json
index 56d0626f09a..96bd984aa3d 100644
--- a/public/locales/sv-SE/grafana.json
+++ b/public/locales/sv-SE/grafana.json
@@ -3539,6 +3539,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3568,6 +3575,9 @@
       "select-checkbox": "Välj",
       "tags-column": "Taggar"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "",
       "button-cancel": "",
@@ -3611,6 +3621,9 @@
     "name-cell": {
       "no-items": "Inga objekt"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "Avbryt",
       "create-label": "Skapa",
@@ -5691,11 +5704,9 @@
       "api-error": "",
       "cancel-action": "Avbryt",
       "delete-action": "Ta bort instrumentpanel",
-      "delete-read-only-file-message": "",
       "deleting": "Tar bort ...",
       "drawer-title": "",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Den här databasen är skrivskyddad"
+      "success-message": ""
     },
     "description-label": {
       "description": "Beskrivning"
@@ -6067,7 +6078,6 @@
       "api-error": "Fel när instrumentpanel skulle sparas",
       "cancel": "Avbryt",
       "cannot-be-saved": "Denna instrumentpanel kan inte sparas från Grafanas användargränssnitt eftersom det har provisionerats från en annan källa. Kopiera JSON eller spara den till en fil nedan, så du kan uppdatera instrumentpanelen i provisioneringskällan.",
-      "copy-json-message": "Om du har direkt åtkomst till målet kopierar du JSON och klistrar in den där.",
       "copy-json-to-clipboard": "Kopiera JSON till urklippet",
       "file-path": "<0>Filsökväg:</0> {{filePath}}",
       "label-description": "Beskrivning",
@@ -6079,7 +6089,6 @@
       "see-docs": "Se <2>dokumentationen</2> för mer information om provisionering.",
       "title-required": "Instrumentpanelens titel är obligatorisk",
       "title-same-as-folder": "Panelenamnet kan inte vara detsamma som mappnamnet",
-      "title-this-repository-is-read-only": "Den här databasen är skrivskyddad",
       "title-validation-failed": "Valideringen av instrumentpanelens titel misslyckades."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6385,7 +6394,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Klicka <2>här</2> för att läsa mer om detta fel.",
-    "success-more-details-links": "Därefter kan du börja visualisera data genom att <2>bygga en instrumentpanel</2> eller genom att fråga efter data i <5>Utforska vy</5>."
+    "success-more-details-links": "Därefter kan du börja visualisera data genom att <2>bygga en instrumentpanel</2> eller genom att fråga efter data i <5>Utforska vy</5>.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6524,7 +6534,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Bygg en instrumentpanel",
-      "explore-data": "Utforska data"
+      "explore-data": "Utforska data",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Mer information om felet"
diff --git a/public/locales/tr-TR/grafana.json b/public/locales/tr-TR/grafana.json
index 839e279e7d3..a5dfca6d021 100644
--- a/public/locales/tr-TR/grafana.json
+++ b/public/locales/tr-TR/grafana.json
@@ -3539,6 +3539,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3568,6 +3575,9 @@
       "select-checkbox": "Seçin",
       "tags-column": "Etiketler"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "",
       "button-cancel": "",
@@ -3611,6 +3621,9 @@
     "name-cell": {
       "no-items": "Öge yok"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "İptal",
       "create-label": "Oluştur",
@@ -5691,11 +5704,9 @@
       "api-error": "",
       "cancel-action": "İptal et",
       "delete-action": "Panoyu sil",
-      "delete-read-only-file-message": "",
       "deleting": "Siliniyor...",
       "drawer-title": "",
-      "success-message": "",
-      "title-this-repository-is-read-only": "Bu depo salt okunur"
+      "success-message": ""
     },
     "description-label": {
       "description": "Açıklama"
@@ -6067,7 +6078,6 @@
       "api-error": "Pano kaydedilirken hata oluştu",
       "cancel": "İptal",
       "cannot-be-saved": "Bu pano başka bir kaynaktan sağlandığı için Grafana kullanıcı arayüzünden kaydedilemez. JSON'u kopyalayın veya aşağıdan bir dosyaya kaydedin, ardından sağlama kaynağındaki panonuzu güncelleyebilirsiniz.",
-      "copy-json-message": "Hedefe doğrudan erişiminiz varsa JSON'u kopyalayıp oraya yapıştırın.",
       "copy-json-to-clipboard": "JSON'u panoya kopyala",
       "file-path": "<0>Dosya yolu:</0> {{filePath}} ",
       "label-description": "Açıklama",
@@ -6079,7 +6089,6 @@
       "see-docs": "Sağlama hakkında daha fazla bilgi için <2>belgelere</2> bakın. ",
       "title-required": "Pano başlığı gereklidir",
       "title-same-as-folder": "Pano adı klasör adı ile aynı olamaz",
-      "title-this-repository-is-read-only": "Bu depo salt okunur",
       "title-validation-failed": "Pano başlığı doğrulanamadı."
     },
     "scenes-new-rule-from-panel-button": {
@@ -6385,7 +6394,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "Bu hata hakkında daha fazla bilgi edinmek için <2>buraya</2> tıklayın.",
-    "success-more-details-links": "Ardından, bir <2>pano oluşturarak</2> veya <5>Keşfet görünümünde</5> verileri sorgulayarak verileri görselleştirmeye başlayabilirsiniz."
+    "success-more-details-links": "Ardından, bir <2>pano oluşturarak</2> veya <5>Keşfet görünümünde</5> verileri sorgulayarak verileri görselleştirmeye başlayabilirsiniz.",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6524,7 +6534,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "Pano oluştur",
-      "explore-data": "Verileri keşfedin"
+      "explore-data": "Verileri keşfedin",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "Hata hakkında daha fazla bilgi"
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 8016dd7c9ad..3e2faa32a22 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -3525,6 +3525,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3549,6 +3556,9 @@
       "select-checkbox": "选择",
       "tags-column": "标签"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "删除文件夹失败",
       "button-cancel": "取消",
@@ -3592,6 +3602,9 @@
     "name-cell": {
       "no-items": "无项目"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "取消",
       "create-label": "创建",
@@ -5671,11 +5684,9 @@
       "api-error": "删除数据面板失败",
       "cancel-action": "取消",
       "delete-action": "删除数据面板",
-      "delete-read-only-file-message": "此数据面板无法直接从 Grafana 删除，因为存储库是只读的。要删除此数据面板，请从 Git 存储库中移除相应文件。",
       "deleting": "正在删除...",
       "drawer-title": "删除已预置的数据面板",
-      "success-message": "",
-      "title-this-repository-is-read-only": "此存储库为只读"
+      "success-message": ""
     },
     "description-label": {
       "description": "描述"
@@ -6045,7 +6056,6 @@
       "api-error": "保存数据面板时出错",
       "cancel": "取消",
       "cannot-be-saved": "此数据面板无法从 Grafana 用户界面保存，因为它已从其他来源预配。复制 JSON 或将其保存到下面的文件中，然后您可以在预配源中更新您的数据面板。",
-      "copy-json-message": "如果您可以直接访问目标，请复制 JSON 并将其粘贴到那里。",
       "copy-json-to-clipboard": "将 JSON 复制到剪贴板",
       "file-path": "<0>文件路径：</0>{{filePath}}",
       "label-description": "描述",
@@ -6057,7 +6067,6 @@
       "see-docs": "有关预配的更多信息，请参阅<2>文档<2/>。",
       "title-required": "数据面板标题为必填项",
       "title-same-as-folder": "数据面板名称不能与文件夹名称相同",
-      "title-this-repository-is-read-only": "此存储库为只读",
       "title-validation-failed": "数据面板标题验证失败。"
     },
     "scenes-new-rule-from-panel-button": {
@@ -6363,7 +6372,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "点击<2>此处</2>了解有关此错误的更多信息。",
-    "success-more-details-links": "接下来，您可以通过<2>构建数据面板</2>或在<5>Explore 视图</5>中查询数据来开始可视化数据。"
+    "success-more-details-links": "接下来，您可以通过<2>构建数据面板</2>或在<5>Explore 视图</5>中查询数据来开始可视化数据。",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6502,7 +6512,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "构建数据面板",
-      "explore-data": "浏览数据"
+      "explore-data": "浏览数据",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "有关错误的更多详情"
diff --git a/public/locales/zh-Hant/grafana.json b/public/locales/zh-Hant/grafana.json
index eec074eef2a..27486937ac0 100644
--- a/public/locales/zh-Hant/grafana.json
+++ b/public/locales/zh-Hant/grafana.json
@@ -3525,6 +3525,13 @@
       "button-move": "",
       "button-moving": "",
       "deleting": "",
+      "error": {
+        "read-only-message": "",
+        "read-only-saving-message": "",
+        "read-only-title": "",
+        "repository-not-found-message": "",
+        "repository-not-found-title": ""
+      },
       "error-file-content-not-found": "",
       "error-path-not-found": "",
       "error-target-folder-path-missing": "",
@@ -3549,6 +3556,9 @@
       "select-checkbox": "選取",
       "tags-column": "標籤"
     },
+    "delete-folder": {
+      "read-only-message": ""
+    },
     "delete-provisioned-folder-form": {
       "api-error": "無法刪除資料夾",
       "button-cancel": "取消",
@@ -3592,6 +3602,9 @@
     "name-cell": {
       "no-items": "無項目"
     },
+    "new-folder": {
+      "read-only-message": ""
+    },
     "new-folder-form": {
       "cancel-label": "取消",
       "create-label": "建立",
@@ -5671,11 +5684,9 @@
       "api-error": "無法刪除儀表板",
       "cancel-action": "取消",
       "delete-action": "刪除儀表板",
-      "delete-read-only-file-message": "由於儲存庫為唯讀，因此無法直接從 Grafana 刪除此儀表板。若要刪除此儀表板，請從您的 Git 儲存庫中移除該檔案。",
       "deleting": "正在刪除…",
       "drawer-title": "刪除已佈建的儀表板",
-      "success-message": "",
-      "title-this-repository-is-read-only": "此存放庫為唯讀"
+      "success-message": ""
     },
     "description-label": {
       "description": "說明"
@@ -6045,7 +6056,6 @@
       "api-error": "儲存儀表板時發生錯誤",
       "cancel": "取消",
       "cannot-be-saved": "此儀表板無法從 Grafana UI 儲存，因為其已從其他來源設定。複製 JSON 或將其儲存到下方的檔案中，然後您可以在佈建來源中更新您的儀表板。",
-      "copy-json-message": "如果您可以直接存取目標，請複製 JSON 並將其貼上至該處。",
       "copy-json-to-clipboard": "複製 JSON 到剪貼簿",
       "file-path": "<0>檔案路徑：</0>{{filePath}}",
       "label-description": "說明",
@@ -6057,7 +6067,6 @@
       "see-docs": "有關佈建的更多資訊，請參閱<2>文件</2>。",
       "title-required": "儀表板標題為必填",
       "title-same-as-folder": "儀表板名稱不能與資料夾名稱相同",
-      "title-this-repository-is-read-only": "此存放庫為唯讀",
       "title-validation-failed": "儀表板標題驗證失敗。"
     },
     "scenes-new-rule-from-panel-button": {
@@ -6363,7 +6372,8 @@
   },
   "data-source-testing-status-page": {
     "error-more-details-link": "點選<2>此處</2>，了解更多關於此錯誤的資訊。",
-    "success-more-details-links": "接下來，您可以透過<2>建立儀表板</2>或在<5>瀏覽檢視</5>中查詢資料，開始將資料視覺化。"
+    "success-more-details-links": "接下來，您可以透過<2>建立儀表板</2>或在<5>瀏覽檢視</5>中查詢資料，開始將資料視覺化。",
+    "success-more-details-links-extensions": ""
   },
   "data-sources": {
     "datasource-add-button": {
@@ -6502,7 +6512,8 @@
     },
     "edit-data-source-actions": {
       "build-a-dashboard": "建立儀表板",
-      "explore-data": "探索資料"
+      "explore-data": "探索資料",
+      "open-in-explore": ""
     },
     "error-details-link": {
       "aria-label-more-details-about-the-error": "有關錯誤的更多詳細資料"

From abdf1943b9929e648efd43aad51379c6777de7c9 Mon Sep 17 00:00:00 2001
From: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com>
Date: Fri, 8 Aug 2025 02:03:02 -0600
Subject: [PATCH 035/243] Dashboard Migrations: V22 table panel styles - set
 property to 'auto' (#108949)

* Dashboard Migrations: V31 LabelsToFields-Merge Migration

* Dashboard Migrations: V32 No-op migration

* simplify

* Refactor to reduce nesting

* Dashboard Migrations: V30 value mappings and tooltip options

* Do not automigrate since graph is migrated in v27

* Refactor to reduce nesting

* Add test case for invalid mapping

* migrate to v29

* wip

* Fix tests

* fix output

* wip

* fix min version issue

* fix wire

* ignore gauge logic as it never get's executed

* add panel migration to test

* improvements

* update

* cleanup

* address mappings inconsistencies

* cleanup

* fix lint issues

* add cfg when initializing

* v27 migration

* migrate to v26

* preallocate array

* remove logic for grafana-singlestat because it's shared with stat logic; improve error handling and testing

* fix go lint

* don't preallocate; cleanup comments

* cleanup

* wip

* run internal provider function when getting a single panel

* clean up; add tests

* add tests for panel plugin service

* remove obsolete mock for getting panel plugin

* add tests for the whole pipeline

* fix test and lint

* migrate to v23

* migrate to v22

* refactor

* fix test

---------

Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
---
 .../pkg/migration/schemaversion/migrations.go |   3 +-
 .../pkg/migration/schemaversion/v22.go        |  66 ++++++++++
 .../pkg/migration/schemaversion/v22_test.go   | 123 ++++++++++++++++++
 .../testdata/input/v22.table_panel_align.json |  14 ++
 .../output/v22.table_panel_align.json         |  78 +++++++++++
 5 files changed, 283 insertions(+), 1 deletion(-)
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v22.go
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v22_test.go
 create mode 100644 apps/dashboard/pkg/migration/testdata/input/v22.table_panel_align.json
 create mode 100644 apps/dashboard/pkg/migration/testdata/output/v22.table_panel_align.json

diff --git a/apps/dashboard/pkg/migration/schemaversion/migrations.go b/apps/dashboard/pkg/migration/schemaversion/migrations.go
index 1b34855a5a8..cccd27dbc21 100644
--- a/apps/dashboard/pkg/migration/schemaversion/migrations.go
+++ b/apps/dashboard/pkg/migration/schemaversion/migrations.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	MIN_VERSION    = 22
+	MIN_VERSION    = 21
 	LATEST_VERSION = 41
 )
 
@@ -38,6 +38,7 @@ type PanelPluginInfoProvider interface {
 
 func GetMigrations(dsInfoProvider DataSourceInfoProvider, panelProvider PanelPluginInfoProvider) map[int]SchemaVersionMigrationFunc {
 	return map[int]SchemaVersionMigrationFunc{
+		22: V22,
 		23: V23,
 		24: V24(panelProvider),
 		25: V25,
diff --git a/apps/dashboard/pkg/migration/schemaversion/v22.go b/apps/dashboard/pkg/migration/schemaversion/v22.go
new file mode 100644
index 00000000000..e6e2c2f5175
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v22.go
@@ -0,0 +1,66 @@
+package schemaversion
+
+// V22 migrates table panel styles to set align property to 'auto'.
+// This migration ensures that all table panel styles have their align property
+// set to 'auto' for consistent alignment behavior.
+//
+// Example before migration:
+//
+//	"panels": [
+//	  {
+//	    "type": "table",
+//	    "styles": [
+//	      { "type": "number", "pattern": "Time", "align": "left" },
+//	      { "type": "string", "pattern": "Value", "align": "right" }
+//	    ]
+//	  }
+//	]
+//
+// Example after migration:
+//
+//	"panels": [
+//	  {
+//	    "type": "table",
+//	    "styles": [
+//	      { "type": "number", "pattern": "Time", "align": "auto" },
+//	      { "type": "string", "pattern": "Value", "align": "auto" }
+//	    ]
+//	  }
+//	]
+func V22(dashboard map[string]interface{}) error {
+	dashboard["schemaVersion"] = 22
+
+	panels, ok := dashboard["panels"].([]interface{})
+	if !ok {
+		return nil
+	}
+
+	for _, p := range panels {
+		panel, ok := p.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		// Only process table panels
+		panelType, ok := panel["type"].(string)
+		if !ok || panelType != "table" {
+			continue
+		}
+
+		styles, ok := panel["styles"].([]interface{})
+		if !ok {
+			continue
+		}
+
+		// Update each style to set align to 'auto'
+		for _, s := range styles {
+			style, ok := s.(map[string]interface{})
+			if !ok {
+				continue
+			}
+			style["align"] = "auto"
+		}
+	}
+
+	return nil
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/v22_test.go b/apps/dashboard/pkg/migration/schemaversion/v22_test.go
new file mode 100644
index 00000000000..6da11aadad1
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v22_test.go
@@ -0,0 +1,123 @@
+package schemaversion_test
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
+)
+
+func TestV22(t *testing.T) {
+	tests := []migrationTestCase{
+		{
+			name: "table panel styles align is set to auto",
+			input: map[string]interface{}{
+				"title":         "V22 Table Panel Styles Test",
+				"schemaVersion": 21,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":   1,
+						"type": "table",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"type":    "number",
+								"pattern": "Time",
+								"align":   "left",
+							},
+							map[string]interface{}{
+								"type":    "string",
+								"pattern": "Value",
+								"align":   "right",
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V22 Table Panel Styles Test",
+				"schemaVersion": 22,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":   1,
+						"type": "table",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"type":    "number",
+								"pattern": "Time",
+								"align":   "auto",
+							},
+							map[string]interface{}{
+								"type":    "string",
+								"pattern": "Value",
+								"align":   "auto",
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "non-table panel is unchanged except schemaVersion",
+			input: map[string]interface{}{
+				"title":         "V22 Non-Table Panel Test",
+				"schemaVersion": 21,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":   2,
+						"type": "graph",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"type":    "number",
+								"pattern": "Time",
+								"align":   "left",
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V22 Non-Table Panel Test",
+				"schemaVersion": 22,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":   2,
+						"type": "graph",
+						"styles": []interface{}{
+							map[string]interface{}{
+								"type":    "number",
+								"pattern": "Time",
+								"align":   "left",
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "table panel with no styles is unchanged except schemaVersion",
+			input: map[string]interface{}{
+				"title":         "V22 Table Panel No Styles Test",
+				"schemaVersion": 21,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":     3,
+						"type":   "table",
+						"styles": []interface{}{},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V22 Table Panel No Styles Test",
+				"schemaVersion": 22,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":     3,
+						"type":   "table",
+						"styles": []interface{}{},
+					},
+				},
+			},
+		},
+	}
+
+	runMigrationTests(t, tests, schemaversion.V22)
+}
diff --git a/apps/dashboard/pkg/migration/testdata/input/v22.table_panel_align.json b/apps/dashboard/pkg/migration/testdata/input/v22.table_panel_align.json
new file mode 100644
index 00000000000..c376f546ddf
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/input/v22.table_panel_align.json
@@ -0,0 +1,14 @@
+{
+  "title": "V22 Table Panel Styles Test",
+  "schemaVersion": 21,
+  "panels": [
+    {
+      "id": 1,
+      "type": "table",
+      "styles": [
+        { "type": "number", "pattern": "Time", "align": "left" },
+        { "type": "string", "pattern": "Value", "align": "right" }
+      ]
+    }
+  ]
+} 
\ No newline at end of file
diff --git a/apps/dashboard/pkg/migration/testdata/output/v22.table_panel_align.json b/apps/dashboard/pkg/migration/testdata/output/v22.table_panel_align.json
new file mode 100644
index 00000000000..cc0ffedf895
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/output/v22.table_panel_align.json
@@ -0,0 +1,78 @@
+{
+  "panels": [
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": []
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Time"
+            },
+            "properties": [
+              {
+                "id": "custom.align",
+                "value": ""
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Value"
+            },
+            "properties": [
+              {
+                "id": "custom.align",
+                "value": ""
+              }
+            ]
+          }
+        ]
+      },
+      "id": 1,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "transformations": [],
+      "type": "table"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 41,
+  "title": "V22 Table Panel Styles Test"
+}
\ No newline at end of file

From 3c00cf11cccff55d5af59bf9bae5f0dd219f6cd1 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 8 Aug 2025 11:18:43 +0300
Subject: [PATCH 036/243] Secrets: Allow any valid identity to manage inline
 secrets (#109377)

---
 .../apis/secret/inline/inline_secure_value.go | 78 +++++++++----------
 1 file changed, 37 insertions(+), 41 deletions(-)

diff --git a/pkg/registry/apis/secret/inline/inline_secure_value.go b/pkg/registry/apis/secret/inline/inline_secure_value.go
index 9a24f6ace52..4e675486f48 100644
--- a/pkg/registry/apis/secret/inline/inline_secure_value.go
+++ b/pkg/registry/apis/secret/inline/inline_secure_value.go
@@ -5,13 +5,13 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/grafana/authlib/authn"
-	authlib "github.com/grafana/authlib/types"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
+	"github.com/grafana/authlib/authn"
+	authlib "github.com/grafana/authlib/types"
 	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
 	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
@@ -158,6 +158,25 @@ func (s *LocalInlineSecureValueService) canIdentityReadSecureValue(ctx context.C
 	return nil
 }
 
+func (s *LocalInlineSecureValueService) verifyOwnerAndAuth(ctx context.Context, owner common.ObjectReference) (authlib.AuthInfo, error) {
+	// Any valid identity can create inline secure values
+	authInfo, ok := authlib.AuthInfoFrom(ctx)
+	if !ok {
+		return nil, fmt.Errorf("missing auth info in context")
+	}
+
+	// Make sure the owner matches the identity when it is not global
+	if owner.Namespace == "" || !authlib.NamespaceMatches(authInfo.GetNamespace(), owner.Namespace) {
+		return nil, fmt.Errorf("owner namespace %s does not match auth info namespace %s", owner.Namespace, authInfo.GetNamespace())
+	}
+
+	if owner.Namespace == "" || owner.APIGroup == "" || owner.APIVersion == "" || owner.Kind == "" || owner.Name == "" {
+		return nil, fmt.Errorf("owner reference must have a valid API group, API version, kind, namespace and name")
+	}
+
+	return authInfo, nil
+}
+
 func (s *LocalInlineSecureValueService) CreateInline(ctx context.Context, owner common.ObjectReference, value common.RawSecureValue) (string, error) {
 	ctx, span := s.tracer.Start(ctx, "InlineSecureValueService.CreateInline", trace.WithAttributes(
 		attribute.String("owner.namespace", owner.Namespace),
@@ -168,27 +187,9 @@ func (s *LocalInlineSecureValueService) CreateInline(ctx context.Context, owner
 	))
 	defer span.End()
 
-	authInfo, ok := authlib.AuthInfoFrom(ctx)
-	if !ok {
-		return "", fmt.Errorf("missing auth info in context")
-	}
-
-	if authInfo.GetIdentityType() != authlib.TypeUser && authInfo.GetIdentityType() != authlib.TypeServiceAccount {
-		return "", fmt.Errorf("identity type %s not allowed, expected either %s or %s", authInfo.GetIdentityType(), authlib.TypeUser, authlib.TypeServiceAccount)
-	}
-
-	serviceIdentityList, ok := authInfo.GetExtra()[authn.ServiceIdentityKey]
-	if !ok || len(serviceIdentityList) != 1 {
-		return "", fmt.Errorf("expected exactly one service identity, found %d", len(serviceIdentityList))
-	}
-	serviceIdentity := serviceIdentityList[0]
-
-	if owner.Namespace == "" || !authlib.NamespaceMatches(authInfo.GetNamespace(), owner.Namespace) {
-		return "", fmt.Errorf("owner namespace %s does not match auth info namespace %s", owner.Namespace, authInfo.GetNamespace())
-	}
-
-	if owner.APIGroup == "" || owner.APIVersion == "" || owner.Kind == "" || owner.Name == "" {
-		return "", fmt.Errorf("owner reference must have a valid API group, API version, kind and name")
+	authInfo, err := s.verifyOwnerAndAuth(ctx, owner)
+	if err != nil {
+		return "", err
 	}
 
 	if value.IsZero() {
@@ -198,14 +199,18 @@ func (s *LocalInlineSecureValueService) CreateInline(ctx context.Context, owner
 	// TODO(2025-07-31): when we migrate to using the common type, we don't need this conversion.
 	secret := secretv1beta1.ExposedSecureValue(value)
 
-	decrypters := []string{serviceIdentity}
-	if owner.APIGroup != serviceIdentity {
-		decrypters = append(decrypters, owner.APIGroup)
+	// The owner group can always decrypt
+	decrypters := []string{owner.APIGroup}
+
+	serviceIdentity, ok := authInfo.GetExtra()[authn.ServiceIdentityKey]
+	if ok && len(serviceIdentity) > 0 && serviceIdentity[0] != owner.APIGroup {
+		decrypters = append(decrypters, serviceIdentity[0])
 	}
 
-	spec := &secretv1beta1.SecureValue{
+	obj := &secretv1beta1.SecureValue{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:            "sv-" + util.GenerateShortUID(),
+			//GenerateName:    "inline-",
+			Name:            "inline-" + util.GenerateShortUID(),
 			Namespace:       owner.Namespace,
 			OwnerReferences: []metav1.OwnerReference{owner.ToOwnerReference()},
 		},
@@ -216,9 +221,9 @@ func (s *LocalInlineSecureValueService) CreateInline(ctx context.Context, owner
 		},
 	}
 
-	createdSv, err := s.secureValueService.Create(ctx, spec, authInfo.GetUID())
+	createdSv, err := s.secureValueService.Create(ctx, obj, authInfo.GetUID())
 	if err != nil {
-		return "", fmt.Errorf("error creating secure value %s for owner %v: %w", spec.Name, owner, err)
+		return "", fmt.Errorf("error creating secure value %s for owner %v: %w", obj.Name, owner, err)
 	}
 
 	return createdSv.GetName(), nil
@@ -235,17 +240,8 @@ func (s *LocalInlineSecureValueService) DeleteWhenOwnedByResource(ctx context.Co
 	))
 	defer span.End()
 
-	authInfo, ok := authlib.AuthInfoFrom(ctx)
-	if !ok {
-		return fmt.Errorf("missing auth info in context")
-	}
-
-	if owner.Namespace == "" || !authlib.NamespaceMatches(authInfo.GetNamespace(), owner.Namespace) {
-		return fmt.Errorf("owner namespace %s does not match auth info namespace %s", owner.Namespace, authInfo.GetNamespace())
-	}
-
-	if owner.APIGroup == "" || owner.APIVersion == "" || owner.Kind == "" || owner.Name == "" {
-		return fmt.Errorf("owner reference must have a valid API group, API version, kind and name")
+	if _, err := s.verifyOwnerAndAuth(ctx, owner); err != nil {
+		return err
 	}
 
 	for _, name := range names {

From 99c7cd60e62f8d68842e89cdbace16642a33dc3c Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matias.chomicki@grafana.com>
Date: Fri, 8 Aug 2025 10:45:05 +0200
Subject: [PATCH 037/243] LogLineMenu: improve options and dividers (#109191)

---
 .../logs/components/panel/LogLineMenu.tsx     | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/public/app/features/logs/components/panel/LogLineMenu.tsx b/public/app/features/logs/components/panel/LogLineMenu.tsx
index 49b55b368d1..e2ab764e3d9 100644
--- a/public/app/features/logs/components/panel/LogLineMenu.tsx
+++ b/public/app/features/logs/components/panel/LogLineMenu.tsx
@@ -83,6 +83,8 @@ export const LogLineMenu = ({ log, styles }: Props) => {
     }
   }, [log, onPinLine, onUnpinLine, pinned]);
 
+  const showFirstDivider = enableLogDetails || shouldlogSupportsContext || onPinLine || onUnpinLine;
+
   const menu = useCallback(
     () => (
       <Menu ref={menuRef}>
@@ -105,18 +107,11 @@ export const LogLineMenu = ({ log, styles }: Props) => {
         {pinned && onUnpinLine && (
           <Menu.Item onClick={togglePinning} label={t('logs.log-line-menu.unpin-from-outline', 'Unpin log')} />
         )}
-        <Menu.Divider />
+        {showFirstDivider && <Menu.Divider />}
         <Menu.Item onClick={copyLogLine} label={t('logs.log-line-menu.copy-log', 'Copy log line')} />
         {onPermalinkClick && log.rowId !== undefined && log.uid && (
           <Menu.Item onClick={copyLinkToLogLine} label={t('logs.log-line-menu.copy-link', 'Copy link to log line')} />
         )}
-        {isAssistantAvailable && (
-          <Menu.Item
-            onClick={() => openAssistantByLog?.(log)}
-            icon="ai-sparkle"
-            label={t('logs.log-line-menu.open-assistant', 'Explain this log line in Assistant')}
-          />
-        )}
         {logLineMenuCustomItems.map((item, i) => {
           if (isDivider(item)) {
             return <Menu.Divider key={i} />;
@@ -126,23 +121,34 @@ export const LogLineMenu = ({ log, styles }: Props) => {
           }
           return null;
         })}
+        {isAssistantAvailable && (
+          <>
+            <Menu.Divider />
+            <Menu.Item
+              onClick={() => openAssistantByLog?.(log)}
+              icon="ai-sparkle"
+              label={t('logs.log-line-menu.open-assistant', 'Explain this log line in Assistant')}
+            />
+          </>
+        )}
       </Menu>
     ),
     [
-      copyLinkToLogLine,
-      copyLogLine,
-      detailsDisplayed,
       enableLogDetails,
+      toggleLogDetails,
+      detailsDisplayed,
       log,
-      logLineMenuCustomItems,
-      onPermalinkClick,
-      onPinLine,
-      onUnpinLine,
-      pinned,
       shouldlogSupportsContext,
       showContext,
-      toggleLogDetails,
+      pinned,
+      onPinLine,
       togglePinning,
+      onUnpinLine,
+      showFirstDivider,
+      copyLogLine,
+      onPermalinkClick,
+      copyLinkToLogLine,
+      logLineMenuCustomItems,
       isAssistantAvailable,
       openAssistantByLog,
     ]

From 8f2d27044d783254ef8e95269c6c4901cf918337 Mon Sep 17 00:00:00 2001
From: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com>
Date: Fri, 8 Aug 2025 02:55:32 -0600
Subject: [PATCH 038/243] Dashboard Migrations: V21 data links (#108950)

---------

Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
---
 .../pkg/migration/schemaversion/migrations.go |   3 +-
 .../pkg/migration/schemaversion/v21.go        | 120 +++++++++
 .../pkg/migration/schemaversion/v21_test.go   | 232 ++++++++++++++++++
 .../input/v21.data_links_series_to_field.json |  85 +++++++
 .../v21.data_links_series_to_field.json       | 166 +++++++++++++
 5 files changed, 605 insertions(+), 1 deletion(-)
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v21.go
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v21_test.go
 create mode 100644 apps/dashboard/pkg/migration/testdata/input/v21.data_links_series_to_field.json
 create mode 100644 apps/dashboard/pkg/migration/testdata/output/v21.data_links_series_to_field.json

diff --git a/apps/dashboard/pkg/migration/schemaversion/migrations.go b/apps/dashboard/pkg/migration/schemaversion/migrations.go
index cccd27dbc21..627f15d4916 100644
--- a/apps/dashboard/pkg/migration/schemaversion/migrations.go
+++ b/apps/dashboard/pkg/migration/schemaversion/migrations.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	MIN_VERSION    = 21
+	MIN_VERSION    = 20
 	LATEST_VERSION = 41
 )
 
@@ -38,6 +38,7 @@ type PanelPluginInfoProvider interface {
 
 func GetMigrations(dsInfoProvider DataSourceInfoProvider, panelProvider PanelPluginInfoProvider) map[int]SchemaVersionMigrationFunc {
 	return map[int]SchemaVersionMigrationFunc{
+		21: V21,
 		22: V22,
 		23: V23,
 		24: V24(panelProvider),
diff --git a/apps/dashboard/pkg/migration/schemaversion/v21.go b/apps/dashboard/pkg/migration/schemaversion/v21.go
new file mode 100644
index 00000000000..a9361f8871b
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v21.go
@@ -0,0 +1,120 @@
+package schemaversion
+
+import (
+	"strings"
+
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/utils"
+)
+
+// V21 migrates data links to replace __series.labels with __field.labels.
+// This migration updates the variable syntax used in data links from the old series-based
+// syntax to the new field-based syntax.
+//
+// Example before migration:
+//
+//	"panels": [
+//	  {
+//	    "options": {
+//	      "dataLinks": [
+//	        {
+//	          "url": "http://example.com?series=${__series.labels}&${__series.labels.a}"
+//	        }
+//	      ],
+//	      "fieldOptions": {
+//	        "defaults": {
+//	          "links": [
+//	            {
+//	              "url": "http://example.com?series=${__series.labels}&${__series.labels.x}"
+//	            }
+//	          ]
+//	        }
+//	      }
+//	    }
+//	  }
+//	]
+//
+// Example after migration:
+//
+//	"panels": [
+//	  {
+//	    "options": {
+//	      "dataLinks": [
+//	        {
+//	          "url": "http://example.com?series=${__field.labels}&${__field.labels.a}"
+//	        }
+//	      ],
+//	      "fieldOptions": {
+//	        "defaults": {
+//	          "links": [
+//	            {
+//	              "url": "http://example.com?series=${__field.labels}&${__field.labels.x}"
+//	            }
+//	          ]
+//	        }
+//	      }
+//	    }
+//	  }
+//	]
+func V21(dashboard map[string]interface{}) error {
+	dashboard["schemaVersion"] = 21
+
+	panels, ok := dashboard["panels"].([]interface{})
+	if !ok {
+		return nil
+	}
+
+	for _, p := range panels {
+		panel, ok := p.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		// Update data links in panel options
+		if options, ok := panel["options"].(map[string]interface{}); ok {
+			updateDataLinks(options)
+			updateFieldOptionsLinks(options)
+		}
+	}
+
+	return nil
+}
+
+func updateDataLinks(options map[string]interface{}) {
+	dataLinks, ok := options["dataLinks"].([]interface{})
+	if !ok || !utils.IsArray(dataLinks) {
+		return
+	}
+
+	for _, link := range dataLinks {
+		if linkMap, ok := link.(map[string]interface{}); ok {
+			if url, ok := linkMap["url"].(string); ok {
+				linkMap["url"] = strings.ReplaceAll(url, "__series.labels", "__field.labels")
+			}
+		}
+	}
+}
+
+func updateFieldOptionsLinks(options map[string]interface{}) {
+	fieldOptions, ok := options["fieldOptions"].(map[string]interface{})
+	if !ok {
+		return
+	}
+
+	defaults, ok := fieldOptions["defaults"].(map[string]interface{})
+	if !ok {
+		return
+	}
+
+	links, ok := defaults["links"].([]interface{})
+	if !ok {
+		return
+	}
+
+	for _, link := range links {
+		if linkMap, ok := link.(map[string]interface{}); ok {
+			if url, ok := linkMap["url"].(string); ok {
+				linkMap["url"] = strings.ReplaceAll(url, "__series.labels", "__field.labels")
+			}
+		}
+	}
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/v21_test.go b/apps/dashboard/pkg/migration/schemaversion/v21_test.go
new file mode 100644
index 00000000000..e621c794ced
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v21_test.go
@@ -0,0 +1,232 @@
+package schemaversion_test
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
+)
+
+func TestV21(t *testing.T) {
+	tests := []migrationTestCase{
+		{
+			name: "panel with data links gets migrated",
+			input: map[string]interface{}{
+				"title":         "V21 Data Links Migration Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "timeseries",
+						"title": "Panel with data links",
+						"id":    1,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://mylink.com?series=${__series.labels}&${__series.labels.a}",
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V21 Data Links Migration Test Dashboard",
+				"schemaVersion": 21,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "timeseries",
+						"title": "Panel with data links",
+						"id":    1,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://mylink.com?series=${__field.labels}&${__field.labels.a}",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with field options links gets migrated",
+			input: map[string]interface{}{
+				"title":         "V21 Field Options Links Migration Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "stat",
+						"title": "Panel with field options links",
+						"id":    2,
+						"options": map[string]interface{}{
+							"fieldOptions": map[string]interface{}{
+								"defaults": map[string]interface{}{
+									"links": []interface{}{
+										map[string]interface{}{
+											"url": "http://mylink.com?series=${__series.labels}&${__series.labels.x}",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V21 Field Options Links Migration Test Dashboard",
+				"schemaVersion": 21,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "stat",
+						"title": "Panel with field options links",
+						"id":    2,
+						"options": map[string]interface{}{
+							"fieldOptions": map[string]interface{}{
+								"defaults": map[string]interface{}{
+									"links": []interface{}{
+										map[string]interface{}{
+											"url": "http://mylink.com?series=${__field.labels}&${__field.labels.x}",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with both data links and field options links gets migrated",
+			input: map[string]interface{}{
+				"title":         "V21 Both Links Migration Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "graph",
+						"title": "Panel with both link types",
+						"id":    3,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://mylink.com?series=${__series.labels}",
+								},
+							},
+							"fieldOptions": map[string]interface{}{
+								"defaults": map[string]interface{}{
+									"links": []interface{}{
+										map[string]interface{}{
+											"url": "http://mylink.com?field=${__series.labels}",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V21 Both Links Migration Test Dashboard",
+				"schemaVersion": 21,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "graph",
+						"title": "Panel with both link types",
+						"id":    3,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://mylink.com?series=${__field.labels}",
+								},
+							},
+							"fieldOptions": map[string]interface{}{
+								"defaults": map[string]interface{}{
+									"links": []interface{}{
+										map[string]interface{}{
+											"url": "http://mylink.com?field=${__field.labels}",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel without __series.labels is unchanged",
+			input: map[string]interface{}{
+				"title":         "V21 No Series Labels Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "timeseries",
+						"title": "Panel without series labels",
+						"id":    4,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://mylink.com?other=${__field.labels}",
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V21 No Series Labels Test Dashboard",
+				"schemaVersion": 21,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "timeseries",
+						"title": "Panel without series labels",
+						"id":    4,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://mylink.com?other=${__field.labels}",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel without options is unchanged",
+			input: map[string]interface{}{
+				"title":         "V21 No Options Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "timeseries",
+						"title": "Panel without options",
+						"id":    5,
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V21 No Options Test Dashboard",
+				"schemaVersion": 21,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "timeseries",
+						"title": "Panel without options",
+						"id":    5,
+					},
+				},
+			},
+		},
+		{
+			name: "dashboard without panels is unchanged",
+			input: map[string]interface{}{
+				"title":         "V21 No Panels Test Dashboard",
+				"schemaVersion": 20,
+			},
+			expected: map[string]interface{}{
+				"title":         "V21 No Panels Test Dashboard",
+				"schemaVersion": 21,
+			},
+		},
+	}
+
+	runMigrationTests(t, tests, schemaversion.V21)
+}
diff --git a/apps/dashboard/pkg/migration/testdata/input/v21.data_links_series_to_field.json b/apps/dashboard/pkg/migration/testdata/input/v21.data_links_series_to_field.json
new file mode 100644
index 00000000000..6a9c046137d
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/input/v21.data_links_series_to_field.json
@@ -0,0 +1,85 @@
+{
+  "title": "V21 Data Links Series to Field Migration Test Dashboard",
+  "schemaVersion": 20,
+  "panels": [
+    {
+      "type": "timeseries",
+      "title": "Panel with data links",
+      "id": 1,
+      "options": {
+        "dataLinks": [
+          {
+            "url": "http://mylink.com?series=${__series.labels}&${__series.labels.a}",
+            "title": "Data Link 1"
+          },
+          {
+            "url": "http://anotherlink.com?param=${__series.labels}",
+            "title": "Data Link 2"
+          }
+        ]
+      }
+    },
+    {
+      "type": "stat",
+      "title": "Panel with field options links",
+      "id": 2,
+      "options": {
+        "fieldOptions": {
+          "defaults": {
+            "links": [
+              {
+                "url": "http://mylink.com?series=${__series.labels}&${__series.labels.x}",
+                "title": "Field Link 1"
+              },
+              {
+                "url": "http://fieldlink.com?field=${__series.labels}",
+                "title": "Field Link 2"
+              }
+            ]
+          }
+        }
+      }
+    },
+    {
+      "type": "graph",
+      "title": "Panel with both link types",
+      "id": 3,
+      "options": {
+        "dataLinks": [
+          {
+            "url": "http://mylink.com?series=${__series.labels}",
+            "title": "Graph Data Link"
+          }
+        ],
+        "fieldOptions": {
+          "defaults": {
+            "links": [
+              {
+                "url": "http://mylink.com?field=${__series.labels}",
+                "title": "Graph Field Link"
+              }
+            ]
+          }
+        }
+      }
+    },
+    {
+      "type": "timeseries",
+      "title": "Panel without series labels",
+      "id": 4,
+      "options": {
+        "dataLinks": [
+          {
+            "url": "http://mylink.com?other=${__field.labels}",
+            "title": "No Series Labels Link"
+          }
+        ]
+      }
+    },
+    {
+      "type": "timeseries",
+      "title": "Panel without options",
+      "id": 5
+    }
+  ]
+} 
\ No newline at end of file
diff --git a/apps/dashboard/pkg/migration/testdata/output/v21.data_links_series_to_field.json b/apps/dashboard/pkg/migration/testdata/output/v21.data_links_series_to_field.json
new file mode 100644
index 00000000000..722fe7e8e0e
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/output/v21.data_links_series_to_field.json
@@ -0,0 +1,166 @@
+{
+  "panels": [
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 1,
+      "options": {
+        "dataLinks": [
+          {
+            "title": "Data Link 1",
+            "url": "http://mylink.com?series=${__field.labels}\u0026${__field.labels.a}"
+          },
+          {
+            "title": "Data Link 2",
+            "url": "http://anotherlink.com?param=${__field.labels}"
+          }
+        ]
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with data links",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 2,
+      "options": {
+        "fieldOptions": {
+          "defaults": {
+            "links": [
+              {
+                "title": "Field Link 1",
+                "url": "http://mylink.com?series=${__field.labels}\u0026${__field.labels.x}"
+              },
+              {
+                "title": "Field Link 2",
+                "url": "http://fieldlink.com?field=${__field.labels}"
+              }
+            ]
+          }
+        },
+        "justifyMode": "auto",
+        "percentChangeColorMode": "standard",
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with field options links",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 3,
+      "options": {
+        "dataLinks": [
+          {
+            "title": "Graph Data Link",
+            "url": "http://mylink.com?series=${__field.labels}"
+          }
+        ],
+        "fieldOptions": {
+          "defaults": {
+            "links": [
+              {
+                "title": "Graph Field Link",
+                "url": "http://mylink.com?field=${__field.labels}"
+              }
+            ]
+          }
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with both link types",
+      "type": "graph"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 4,
+      "options": {
+        "dataLinks": [
+          {
+            "title": "No Series Labels Link",
+            "url": "http://mylink.com?other=${__field.labels}"
+          }
+        ]
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel without series labels",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 5,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel without options",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 41,
+  "title": "V21 Data Links Series to Field Migration Test Dashboard"
+}
\ No newline at end of file

From 09d6d9753577ad64bf3a4867e939d19a2c5cdaa2 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Fri, 8 Aug 2025 11:46:34 +0200
Subject: [PATCH 039/243] Dashboard Migrations: V20 variable syntax migration
 for data links and field options (#109203)

Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
Co-authored-by: Haris Rozajac <haris.rozajac12@gmail.com>
---
 .../pkg/migration/schemaversion/migrations.go |   3 +-
 .../pkg/migration/schemaversion/v20.go        | 163 +++++++++
 .../pkg/migration/schemaversion/v20_test.go   | 322 ++++++++++++++++++
 .../input/v20.variable_syntax_links.json      | 152 +++++++++
 .../output/v20.variable_syntax_links.json     | 232 +++++++++++++
 5 files changed, 871 insertions(+), 1 deletion(-)
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v20.go
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v20_test.go
 create mode 100644 apps/dashboard/pkg/migration/testdata/input/v20.variable_syntax_links.json
 create mode 100644 apps/dashboard/pkg/migration/testdata/output/v20.variable_syntax_links.json

diff --git a/apps/dashboard/pkg/migration/schemaversion/migrations.go b/apps/dashboard/pkg/migration/schemaversion/migrations.go
index 627f15d4916..1f291cb97fb 100644
--- a/apps/dashboard/pkg/migration/schemaversion/migrations.go
+++ b/apps/dashboard/pkg/migration/schemaversion/migrations.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	MIN_VERSION    = 20
+	MIN_VERSION    = 19
 	LATEST_VERSION = 41
 )
 
@@ -38,6 +38,7 @@ type PanelPluginInfoProvider interface {
 
 func GetMigrations(dsInfoProvider DataSourceInfoProvider, panelProvider PanelPluginInfoProvider) map[int]SchemaVersionMigrationFunc {
 	return map[int]SchemaVersionMigrationFunc{
+		20: V20,
 		21: V21,
 		22: V22,
 		23: V23,
diff --git a/apps/dashboard/pkg/migration/schemaversion/v20.go b/apps/dashboard/pkg/migration/schemaversion/v20.go
new file mode 100644
index 00000000000..069bf745fc9
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v20.go
@@ -0,0 +1,163 @@
+package schemaversion
+
+import (
+	"regexp"
+
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/utils"
+)
+
+// V20 migrates legacy variable syntax in data links and field options.
+// This migration updates variable names from old syntax to new dotted syntax
+// used in data links URLs and field option titles.
+//
+// Variable syntax changes:
+//   - __series_name → __series.name
+//   - $__series_name → ${__series.name}
+//   - __value_time → __value.time
+//   - __field_name → __field.name
+//   - $__field_name → ${__field.name}
+//
+// Example before migration:
+//
+//	"panels": [
+//	  {
+//	    "options": {
+//	      "dataLinks": [
+//	        {
+//	          "url": "http://example.com?series=$__series_name&time=__value_time"
+//	        }
+//	      ],
+//	      "fieldOptions": {
+//	        "defaults": {
+//	          "title": "Field: __field_name",
+//	          "links": [
+//	            {
+//	              "url": "http://example.com?field=$__field_name"
+//	            }
+//	          ]
+//	        }
+//	      }
+//	    }
+//	  }
+//	]
+//
+// Example after migration:
+//
+//	"panels": [
+//	  {
+//	    "options": {
+//	      "dataLinks": [
+//	        {
+//	          "url": "http://example.com?series=${__series.name}&time=__value.time"
+//	        }
+//	      ],
+//	      "fieldOptions": {
+//	        "defaults": {
+//	          "title": "Field: __field.name",
+//	          "links": [
+//	            {
+//	              "url": "http://example.com?field=${__field.name}"
+//	            }
+//	          ]
+//	        }
+//	      }
+//	    }
+//	  }
+//	]
+func V20(dashboard map[string]interface{}) error {
+	dashboard["schemaVersion"] = 20
+
+	panels, ok := dashboard["panels"].([]interface{})
+	if !ok {
+		return nil
+	}
+
+	for _, p := range panels {
+		panel, ok := p.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		// Update data links and field options in panel options
+		if options, ok := panel["options"].(map[string]interface{}); ok {
+			updateDataLinksVariableSyntax(options)
+			updateFieldOptionsVariableSyntax(options)
+		}
+	}
+
+	return nil
+}
+
+// updateDataLinksVariableSyntax updates variable syntax in panel data links
+func updateDataLinksVariableSyntax(options map[string]interface{}) {
+	dataLinks, ok := options["dataLinks"].([]interface{})
+	if !ok || !utils.IsArray(dataLinks) {
+		return
+	}
+
+	for _, link := range dataLinks {
+		if linkMap, ok := link.(map[string]interface{}); ok {
+			if url, ok := linkMap["url"].(string); ok {
+				linkMap["url"] = updateVariablesSyntax(url)
+			}
+		}
+	}
+}
+
+// updateFieldOptionsVariableSyntax updates variable syntax in field options
+func updateFieldOptionsVariableSyntax(options map[string]interface{}) {
+	fieldOptions, ok := options["fieldOptions"].(map[string]interface{})
+	if !ok {
+		return
+	}
+
+	defaults, ok := fieldOptions["defaults"].(map[string]interface{})
+	if !ok {
+		return
+	}
+
+	// Update field option title
+	if title, ok := defaults["title"].(string); ok {
+		defaults["title"] = updateVariablesSyntax(title)
+	}
+
+	// Update field option links
+	links, ok := defaults["links"].([]interface{})
+	if !ok || !utils.IsArray(links) {
+		return
+	}
+
+	for _, link := range links {
+		if linkMap, ok := link.(map[string]interface{}); ok {
+			if url, ok := linkMap["url"].(string); ok {
+				linkMap["url"] = updateVariablesSyntax(url)
+			}
+		}
+	}
+}
+
+// Define the regex pattern to match legacy variable names
+// Pattern matches: __series_name, $__series_name, __value_time, __field_name, $__field_name
+// Defined here to avoid compilation for every function call
+var legacyVariableNamesRegex = regexp.MustCompile(`(__series_name)|(\$__series_name)|(__value_time)|(__field_name)|(\$__field_name)`)
+
+// updateVariablesSyntax updates legacy variable names to new dotted syntax
+// This function replicates the frontend updateVariablesSyntax behavior
+func updateVariablesSyntax(text string) string {
+	return legacyVariableNamesRegex.ReplaceAllStringFunc(text, func(match string) string {
+		switch match {
+		case "__series_name":
+			return "__series.name"
+		case "$__series_name":
+			return "${__series.name}"
+		case "__value_time":
+			return "__value.time"
+		case "__field_name":
+			return "__field.name"
+		case "$__field_name":
+			return "${__field.name}"
+		default:
+			return match
+		}
+	})
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/v20_test.go b/apps/dashboard/pkg/migration/schemaversion/v20_test.go
new file mode 100644
index 00000000000..c08048d69a0
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v20_test.go
@@ -0,0 +1,322 @@
+package schemaversion_test
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
+)
+
+func TestV20(t *testing.T) {
+	tests := []migrationTestCase{
+		{
+			name: "panel with data links gets variable syntax migrated",
+			input: map[string]interface{}{
+				"title":         "V20 Data Links Variable Syntax Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "timeseries",
+						"title": "Panel with data links",
+						"id":    1,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://mylink.com?series=$__series_name&time=__value_time&field=__field_name",
+								},
+								map[string]interface{}{
+									"url": "http://another.com?series=${__series_name}&field=${__field_name}",
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V20 Data Links Variable Syntax Migration Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "timeseries",
+						"title": "Panel with data links",
+						"id":    1,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://mylink.com?series=${__series.name}&time=__value.time&field=__field.name",
+								},
+								map[string]interface{}{
+									"url": "http://another.com?series=${__series.name}&field=${__field.name}",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with field options title gets variable syntax migrated",
+			input: map[string]interface{}{
+				"title":         "V20 Field Options Title Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "stat",
+						"title": "Panel with field options title",
+						"id":    2,
+						"options": map[string]interface{}{
+							"fieldOptions": map[string]interface{}{
+								"defaults": map[string]interface{}{
+									"title": "Series: __series_name, Field: $__field_name, Time: __value_time",
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V20 Field Options Title Migration Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "stat",
+						"title": "Panel with field options title",
+						"id":    2,
+						"options": map[string]interface{}{
+							"fieldOptions": map[string]interface{}{
+								"defaults": map[string]interface{}{
+									"title": "Series: __series.name, Field: ${__field.name}, Time: __value.time",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with field options links gets variable syntax migrated",
+			input: map[string]interface{}{
+				"title":         "V20 Field Options Links Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "gauge",
+						"title": "Panel with field options links",
+						"id":    3,
+						"options": map[string]interface{}{
+							"fieldOptions": map[string]interface{}{
+								"defaults": map[string]interface{}{
+									"links": []interface{}{
+										map[string]interface{}{
+											"url": "http://example.com?series=__series_name&field=$__field_name",
+										},
+										map[string]interface{}{
+											"url": "http://test.com?time=__value_time",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V20 Field Options Links Migration Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "gauge",
+						"title": "Panel with field options links",
+						"id":    3,
+						"options": map[string]interface{}{
+							"fieldOptions": map[string]interface{}{
+								"defaults": map[string]interface{}{
+									"links": []interface{}{
+										map[string]interface{}{
+											"url": "http://example.com?series=__series.name&field=${__field.name}",
+										},
+										map[string]interface{}{
+											"url": "http://test.com?time=__value.time",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with both data links and field options gets variable syntax migrated",
+			input: map[string]interface{}{
+				"title":         "V20 Combined Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "table",
+						"title": "Panel with both data links and field options",
+						"id":    4,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://datalink.com?series=$__series_name",
+								},
+							},
+							"fieldOptions": map[string]interface{}{
+								"defaults": map[string]interface{}{
+									"title": "Field Name: __field_name",
+									"links": []interface{}{
+										map[string]interface{}{
+											"url": "http://fieldlink.com?field=$__field_name&time=__value_time",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V20 Combined Migration Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "table",
+						"title": "Panel with both data links and field options",
+						"id":    4,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://datalink.com?series=${__series.name}",
+								},
+							},
+							"fieldOptions": map[string]interface{}{
+								"defaults": map[string]interface{}{
+									"title": "Field Name: __field.name",
+									"links": []interface{}{
+										map[string]interface{}{
+											"url": "http://fieldlink.com?field=${__field.name}&time=__value.time",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel without data links or field options remains unchanged",
+			input: map[string]interface{}{
+				"title":         "V20 No Links Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "singlestat",
+						"title": "Panel without links",
+						"id":    5,
+						"options": map[string]interface{}{
+							"someOtherOption": "value",
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V20 No Links Migration Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "singlestat",
+						"title": "Panel without links",
+						"id":    5,
+						"options": map[string]interface{}{
+							"someOtherOption": "value",
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "dashboard without panels remains unchanged",
+			input: map[string]interface{}{
+				"title":         "V20 No Panels Migration Test Dashboard",
+				"schemaVersion": 19,
+			},
+			expected: map[string]interface{}{
+				"title":         "V20 No Panels Migration Test Dashboard",
+				"schemaVersion": 20,
+			},
+		},
+		{
+			name: "panel with empty data links array remains unchanged",
+			input: map[string]interface{}{
+				"title":         "V20 Empty Data Links Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "graph",
+						"title": "Panel with empty data links",
+						"id":    6,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V20 Empty Data Links Migration Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "graph",
+						"title": "Panel with empty data links",
+						"id":    6,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with legacy variables that don't need migration",
+			input: map[string]interface{}{
+				"title":         "V20 No Legacy Variables Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "text",
+						"title": "Panel with modern variables",
+						"id":    7,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://modern.com?series=${__series.name}&field=${__field.name}",
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V20 No Legacy Variables Migration Test Dashboard",
+				"schemaVersion": 20,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"type":  "text",
+						"title": "Panel with modern variables",
+						"id":    7,
+						"options": map[string]interface{}{
+							"dataLinks": []interface{}{
+								map[string]interface{}{
+									"url": "http://modern.com?series=${__series.name}&field=${__field.name}",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	runMigrationTests(t, tests, schemaversion.V20)
+}
diff --git a/apps/dashboard/pkg/migration/testdata/input/v20.variable_syntax_links.json b/apps/dashboard/pkg/migration/testdata/input/v20.variable_syntax_links.json
new file mode 100644
index 00000000000..1b1a1e7fb9e
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/input/v20.variable_syntax_links.json
@@ -0,0 +1,152 @@
+{
+  "title": "V20 Variable Syntax Migration Test Dashboard",
+  "schemaVersion": 19,
+  "panels": [
+    {
+      "type": "timeseries",
+      "title": "Panel with data links using legacy variable syntax",
+      "id": 1,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "options": {
+        "dataLinks": [
+          {
+            "title": "Link with series name",
+            "url": "http://example.com?series=$__series_name&timestamp=__value_time",
+            "targetBlank": true
+          },
+          {
+            "title": "Link with field name",
+            "url": "http://grafana.com/dashboard?field=__field_name&series=$__series_name",
+            "targetBlank": false
+          }
+        ]
+      }
+    },
+    {
+      "type": "stat",
+      "title": "Panel with field options using legacy variable syntax",
+      "id": 2,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "options": {
+        "fieldOptions": {
+          "defaults": {
+            "title": "Series: __series_name, Field: $__field_name, Time: __value_time",
+            "links": [
+              {
+                "title": "Field link",
+                "url": "http://monitoring.com?field=$__field_name&series=__series_name",
+                "targetBlank": true
+              },
+              {
+                "title": "Time-based link",
+                "url": "http://logs.com?time=__value_time&field=__field_name",
+                "targetBlank": false
+              }
+            ]
+          }
+        }
+      }
+    },
+    {
+      "type": "gauge",
+      "title": "Panel with both data links and field options",
+      "id": 3,
+      "gridPos": {
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 8
+      },
+      "options": {
+        "dataLinks": [
+          {
+            "title": "Combined link",
+            "url": "http://combined.com?series=$__series_name&field=$__field_name&time=__value_time",
+            "targetBlank": true
+          }
+        ],
+        "fieldOptions": {
+          "defaults": {
+            "title": "Complete: __series_name / __field_name / __value_time",
+            "links": [
+              {
+                "title": "Comprehensive link",
+                "url": "http://comprehensive.com?s=$__series_name&f=__field_name&t=__value_time",
+                "targetBlank": false
+              }
+            ]
+          }
+        }
+      }
+    },
+    {
+      "type": "table",
+      "title": "Panel with no legacy variables (should remain unchanged)",
+      "id": 4,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 16
+      },
+      "options": {
+        "dataLinks": [
+          {
+            "title": "Modern link",
+            "url": "http://modern.com?series=${__series.name}&field=${__field.name}&time=${__value.time}",
+            "targetBlank": true
+          }
+        ],
+        "fieldOptions": {
+          "defaults": {
+            "title": "Modern: ${__series.name} / ${__field.name} / ${__value.time}",
+            "links": [
+              {
+                "title": "Modern field link",
+                "url": "http://modern-field.com?s=${__series.name}&f=${__field.name}",
+                "targetBlank": false
+              }
+            ]
+          }
+        }
+      }
+    },
+    {
+      "type": "text",
+      "title": "Panel with no data links or field options",
+      "id": 5,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 16
+      },
+      "options": {
+        "content": "This panel has no data links or field options to migrate."
+      }
+    }
+  ],
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "tags": [
+    "migration-test"
+  ],
+  "style": "dark",
+  "refresh": "5s",
+  "version": 0,
+  "uid": "v20-migration-test"
+}
diff --git a/apps/dashboard/pkg/migration/testdata/output/v20.variable_syntax_links.json b/apps/dashboard/pkg/migration/testdata/output/v20.variable_syntax_links.json
new file mode 100644
index 00000000000..b40cd0a66c5
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/output/v20.variable_syntax_links.json
@@ -0,0 +1,232 @@
+{
+  "panels": [
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "dataLinks": [
+          {
+            "targetBlank": true,
+            "title": "Link with series name",
+            "url": "http://example.com?series=${__series.name}\u0026timestamp=__value.time"
+          },
+          {
+            "targetBlank": false,
+            "title": "Link with field name",
+            "url": "http://grafana.com/dashboard?field=__field.name\u0026series=${__series.name}"
+          }
+        ]
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with data links using legacy variable syntax",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "fieldOptions": {
+          "defaults": {
+            "links": [
+              {
+                "targetBlank": true,
+                "title": "Field link",
+                "url": "http://monitoring.com?field=${__field.name}\u0026series=__series.name"
+              },
+              {
+                "targetBlank": false,
+                "title": "Time-based link",
+                "url": "http://logs.com?time=__value.time\u0026field=__field.name"
+              }
+            ],
+            "title": "Series: __series.name, Field: ${__field.name}, Time: __value.time"
+          }
+        },
+        "justifyMode": "auto",
+        "percentChangeColorMode": "standard",
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with field options using legacy variable syntax",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 8
+      },
+      "id": 3,
+      "options": {
+        "dataLinks": [
+          {
+            "targetBlank": true,
+            "title": "Combined link",
+            "url": "http://combined.com?series=${__series.name}\u0026field=${__field.name}\u0026time=__value.time"
+          }
+        ],
+        "fieldOptions": {
+          "defaults": {
+            "links": [
+              {
+                "targetBlank": false,
+                "title": "Comprehensive link",
+                "url": "http://comprehensive.com?s=${__series.name}\u0026f=__field.name\u0026t=__value.time"
+              }
+            ],
+            "title": "Complete: __series.name / __field.name / __value.time"
+          }
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with both data links and field options",
+      "type": "gauge"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 16
+      },
+      "id": 4,
+      "options": {
+        "dataLinks": [
+          {
+            "targetBlank": true,
+            "title": "Modern link",
+            "url": "http://modern.com?series=${__series.name}\u0026field=${__field.name}\u0026time=${__value.time}"
+          }
+        ],
+        "fieldOptions": {
+          "defaults": {
+            "links": [
+              {
+                "targetBlank": false,
+                "title": "Modern field link",
+                "url": "http://modern-field.com?s=${__series.name}\u0026f=${__field.name}"
+              }
+            ],
+            "title": "Modern: ${__series.name} / ${__field.name} / ${__value.time}"
+          }
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with no legacy variables (should remain unchanged)",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 16
+      },
+      "id": 5,
+      "options": {
+        "content": "This panel has no data links or field options to migrate."
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with no data links or field options",
+      "type": "text"
+    }
+  ],
+  "refresh": "5s",
+  "schemaVersion": 41,
+  "style": "dark",
+  "tags": [
+    "migration-test"
+  ],
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "V20 Variable Syntax Migration Test Dashboard",
+  "uid": "v20-migration-test",
+  "version": 0
+}
\ No newline at end of file

From 285a4c36e548aafe8a39377f26ee7748f98e9cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Fri, 8 Aug 2025 12:04:55 +0200
Subject: [PATCH 040/243] Provisioning: More Miscellanous Fixes For Integration
 Tests (#109340)

* More clean up around waiting for jobs

* Add comment to trigger enterprise integration tests

* Trigger integration tests

* Collect error

* Move tests in wrong spot

* Clean up test

* Remove Eventually

* Remove duplicate not nil check

* Delete comment in infra tests

* Helper to create repository

* Use helper for move
---
 pkg/tests/apis/provisioning/deletejob_test.go | 190 ++++----------
 pkg/tests/apis/provisioning/exportjob_test.go |  13 +-
 pkg/tests/apis/provisioning/files_test.go     |  66 -----
 pkg/tests/apis/provisioning/helper_test.go    | 119 +++++++--
 pkg/tests/apis/provisioning/movejob_test.go   | 242 ++++++------------
 .../apis/provisioning/repository_test.go      |  52 +---
 6 files changed, 251 insertions(+), 431 deletions(-)

diff --git a/pkg/tests/apis/provisioning/deletejob_test.go b/pkg/tests/apis/provisioning/deletejob_test.go
index 5a55c75c4cc..85f3d97da13 100644
--- a/pkg/tests/apis/provisioning/deletejob_test.go
+++ b/pkg/tests/apis/provisioning/deletejob_test.go
@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -26,31 +25,21 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 	ctx := context.Background()
 
 	const repo = "delete-job-test-repo"
-	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo,
-		"SyncEnabled": true,
-		"SyncTarget":  "instance",
-	})
-	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
-	require.NoError(t, err)
-	// Copy multiple test files to the repository
-	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", "dashboard1.json")
-	helper.CopyToProvisioningPath(t, "testdata/text-options.json", "dashboard2.json")
-	helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", "folder/dashboard3.json")
+	testRepo := TestRepo{
+		Name: repo,
+		Copies: map[string]string{
+			"testdata/all-panels.json":    "dashboard1.json",
+			"testdata/text-options.json":  "dashboard2.json",
+			"testdata/timeline-demo.json": "folder/dashboard3.json",
+		},
+		ExpectedDashboards: 3,
+		ExpectedFolders:    1,
+	}
 
-	// Trigger and wait for initial sync to populate resources
-	helper.SyncAndWait(t, repo, nil)
-
-	// Verify initial state - should have 3 dashboards and 1 folder
-	dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
-	require.Equal(t, 3, len(dashboards.Items), "should have 3 dashboards after sync")
-
-	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
-	require.Equal(t, 1, len(folders.Items), "should have 1 folder after sync")
+	helper.CreateRepo(t, testRepo)
 
 	t.Run("delete single file", func(t *testing.T) {
+		// FIXME: make the tests in a way that we can simply have a spec and some expectations per scenario.
 		spec := provisioning.JobSpec{
 			Action: provisioning.JobActionDelete,
 			Delete: &provisioning.DeleteJobOptions{
@@ -58,15 +47,18 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 			},
 		}
 		// Create delete job for single file
-		helper.TriggerJobAndWait(t, repo, spec)
+		helper.TriggerJobAndWaitForSuccess(t, repo, spec)
+
+		// FIXME: create a helper to verify repository files
 
 		// Verify file is deleted from repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard1.json")
+		_, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard1.json")
 		require.Error(t, err, "file should be deleted from repository")
 		require.True(t, apierrors.IsNotFound(err), "should be not found error")
 
+		// FIXME: create a helper to verify grafana resources
 		// Verify dashboard is removed from Grafana after sync
-		dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+		dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
 		require.NoError(t, err)
 		require.Equal(t, 2, len(dashboards.Items), "should have 2 dashboards after delete")
 
@@ -84,10 +76,11 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 				Paths: []string{"dashboard2.json", "folder/dashboard3.json"},
 			},
 		}
-		helper.TriggerJobAndWait(t, repo, spec)
+		helper.TriggerJobAndWaitForSuccess(t, repo, spec)
 
+		// FIXME: use helper
 		// Verify files are deleted from repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard2.json")
+		_, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard2.json")
 		require.Error(t, err, "dashboard2.json should be deleted")
 		require.True(t, apierrors.IsNotFound(err))
 
@@ -96,18 +89,20 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 		require.True(t, apierrors.IsNotFound(err))
 
 		// Verify all dashboards are removed from Grafana after sync
-		dashboards, err = helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+		dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
 		require.NoError(t, err)
 		require.Equal(t, 0, len(dashboards.Items), "should have 0 dashboards after deleting all")
 	})
 
 	t.Run("delete by resource reference", func(t *testing.T) {
+		// FIXME: do not create this on top of the other one. Isolate the cases
 		// Create modified test files with unique UIDs for ResourceRef testing
 		// Read and modify the testdata files to have unique UIDs that don't conflict with existing resources
 		allPanelsContent := helper.LoadFile("testdata/all-panels.json")
 		textOptionsContent := helper.LoadFile("testdata/text-options.json")
 		timelineDemoContent := helper.LoadFile("testdata/timeline-demo.json")
 
+		// FIXME: use generic objects
 		// Modify UIDs to be unique for ResourceRef tests
 		allPanelsModified := strings.Replace(string(allPanelsContent), `"uid": "n1jR8vnnz"`, `"uid": "resourceref1"`, 1)
 		textOptionsModified := strings.Replace(string(textOptionsContent), `"uid": "WZ7AhQiVz"`, `"uid": "resourceref2"`, 1)
@@ -155,8 +150,9 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 				},
 			}
 
-			helper.TriggerJobAndWait(t, repo, spec)
+			helper.TriggerJobAndWaitForSuccess(t, repo, spec)
 
+			// FIXME: use helpers
 			// Verify corresponding file is deleted from repository
 			_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "resource-test-1.json")
 			require.Error(t, err, "file should be deleted from repository")
@@ -192,8 +188,9 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 					},
 				},
 			}
-			helper.TriggerJobAndWait(t, repo, spec)
+			helper.TriggerJobAndWaitForSuccess(t, repo, spec)
 
+			// FIXME: use helpers
 			// Verify both dashboards are removed from Grafana
 			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref2", metav1.GetOptions{})
 			require.Error(t, err, "text-options dashboard should be deleted")
@@ -217,6 +214,7 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 		})
 
 		t.Run("mixed deletion - paths and resources", func(t *testing.T) {
+			// FIXME: do not build this case on top of the other one. Isolate the cases
 			// Setup fresh resources for mixed test - reuse the modified content with unique UIDs
 			tmpMixed1 := filepath.Join(tmpDir, "mixed-test-1.json")
 			tmpMixed2 := filepath.Join(tmpDir, "mixed-test-2.json")
@@ -246,8 +244,9 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 				},
 			}
 
-			helper.TriggerJobAndWait(t, repo, spec)
+			helper.TriggerJobAndWaitForSuccess(t, repo, spec)
 
+			// FIXME: use the helpers
 			// Verify both targeted resources are deleted from Grafana
 			_, err = helper.DashboardsV1.Resource.Get(ctx, "resourceref1", metav1.GetOptions{})
 			require.Error(t, err, "dashboard deleted by path should be removed")
@@ -271,6 +270,7 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 		})
 
 		t.Run("delete folder by resource reference", func(t *testing.T) {
+			// FIXME: do not build this case on top of the previous one. Isolate them
 			// Create a dashboard inside a folder to automatically create the folder structure
 			// This follows the same pattern as other tests in this file
 			testDashboard := strings.Replace(string(allPanelsContent), `"uid": "n1jR8vnnz"`, `"uid": "folder-dash"`, 1)
@@ -316,8 +316,9 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 					},
 				},
 			}
-			helper.TriggerJobAndWait(t, repo, spec)
+			helper.TriggerJobAndWaitForSuccess(t, repo, spec)
 
+			// FIXME: use helpers
 			// Verify folder is deleted from Grafana
 			_, err = helper.Folders.Resource.Get(ctx, testFolderName, metav1.GetOptions{})
 			require.Error(t, err, "folder should be deleted from Grafana")
@@ -331,114 +332,35 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 
 		t.Run("delete non-existent resource by reference", func(t *testing.T) {
 			// Create delete job for non-existent resource
-			result := helper.AdminREST.Post().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Body(asJSON(&provisioning.JobSpec{
-					Action: provisioning.JobActionDelete,
-					Delete: &provisioning.DeleteJobOptions{
-						Resources: []provisioning.ResourceRef{
-							{
-								Name:  "non-existent-uid",
-								Kind:  "Dashboard",
-								Group: "dashboard.grafana.app",
-							},
+			spec := provisioning.JobSpec{
+				Action: provisioning.JobActionDelete,
+				Delete: &provisioning.DeleteJobOptions{
+					Resources: []provisioning.ResourceRef{
+						{
+							Name:  "non-existent-uid",
+							Kind:  "Dashboard",
+							Group: "dashboard.grafana.app",
 						},
 					},
-				})).
-				SetHeader("Content-Type", "application/json").
-				Do(ctx)
-			require.NoError(t, result.Error(), "should be able to create delete job")
+				},
+			}
 
-			// TODO: Simply all this
-			// Wait for job to complete - should record error but continue
-			require.EventuallyWithT(t, func(collect *assert.CollectT) {
-				list := &unstructured.UnstructuredList{}
-				err := helper.AdminREST.Get().
-					Namespace("default").
-					Resource("repositories").
-					Name(repo).
-					SubResource("jobs").
-					Do(ctx).Into(list)
-				assert.NoError(collect, err, "should be able to list jobs")
-				assert.NotEmpty(collect, list.Items, "expect at least one job")
-
-				// Find the most recent delete job
-				var deleteJob *unstructured.Unstructured
-				for _, elem := range list.Items {
-					assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
-
-					action := mustNestedString(elem.Object, "spec", "action")
-					if action == "delete" {
-						// Get the most recent one (they should be ordered by creation time)
-						deleteJob = &elem
-					}
-				}
-				if !assert.NotNil(collect, deleteJob, "should find a delete job") {
-					return
-				}
-
-				state := mustNestedString(deleteJob.Object, "status", "state")
-				// The job should complete but record errors for individual resource resolution failures
-				if state == "error" || state == "completed" || state == "success" {
-					// Any of these states is acceptable - the key is that resource resolution errors are recorded
-					// and don't fail the entire job due to error-tolerant implementation
-					return
-				}
-				assert.Fail(collect, "job should complete or error, but got state: %s", state)
-			}, time.Second*10, time.Millisecond*100, "Expected delete job to handle non-existent resource")
+			job := helper.TriggerJobAndWaitForComplete(t, repo, spec)
+			state := mustNestedString(job.Object, "status", "state")
+			assert.Equal(t, "error", state, "delete job should have failed due to non-existent file")
 		})
-
-		// Repository cleanup is handled by the main test function
 	})
 
 	t.Run("delete non-existent file", func(t *testing.T) {
-		// Create delete job for non-existent file
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionDelete,
-				Delete: &provisioning.DeleteJobOptions{
-					Paths: []string{"non-existent.json"},
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create delete job")
+		spec := provisioning.JobSpec{
+			Action: provisioning.JobActionDelete,
+			Delete: &provisioning.DeleteJobOptions{
+				Paths: []string{"non-existent.json"},
+			},
+		}
 
-		// TODO: Simplify this
-		// Wait for job to complete - should fail due to strict error handling
-		require.EventuallyWithT(t, func(collect *assert.CollectT) {
-			list := &unstructured.UnstructuredList{}
-			err := helper.AdminREST.Get().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Do(ctx).Into(list)
-			assert.NoError(collect, err, "should be able to list jobs")
-			assert.NotEmpty(collect, list.Items, "expect at least one job")
-
-			// Find the delete job specifically
-			var deleteJob *unstructured.Unstructured
-			for _, elem := range list.Items {
-				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
-
-				action := mustNestedString(elem.Object, "spec", "action")
-				if action == "delete" {
-					deleteJob = &elem
-					break
-				}
-			}
-			assert.NotNil(collect, deleteJob, "should find a delete job")
-
-			state := mustNestedString(deleteJob.Object, "status", "state")
-			assert.Equal(collect, "error", state, "delete job should have failed due to non-existent file")
-		}, time.Second*10, time.Millisecond*100, "Expected delete job to fail with error state")
+		job := helper.TriggerJobAndWaitForComplete(t, repo, spec)
+		state := mustNestedString(job.Object, "status", "state")
+		assert.Equal(t, "error", state, "delete job should have failed due to non-existent file")
 	})
 }
diff --git a/pkg/tests/apis/provisioning/exportjob_test.go b/pkg/tests/apis/provisioning/exportjob_test.go
index 16988740b1b..25c909f6609 100644
--- a/pkg/tests/apis/provisioning/exportjob_test.go
+++ b/pkg/tests/apis/provisioning/exportjob_test.go
@@ -28,6 +28,7 @@ func TestProvisioning_ExportUnifiedToRepository(t *testing.T) {
 	_, err := helper.DashboardsV0.Resource.Create(ctx, dashboard, metav1.CreateOptions{})
 	require.NoError(t, err, "should be able to create v0 dashboard")
 
+	// FIXME: add helper and template for dashboards in different versions
 	dashboard = helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v1.yaml")
 	_, err = helper.DashboardsV1.Resource.Create(ctx, dashboard, metav1.CreateOptions{})
 	require.NoError(t, err, "should be able to create v1 dashboard")
@@ -42,6 +43,7 @@ func TestProvisioning_ExportUnifiedToRepository(t *testing.T) {
 
 	// Now for the repository.
 	const repo = "local-repository"
+	// FIXME: use the same helper to create the repository
 	createBody := helper.RenderObject(t, "exportunifiedtorepository/repository.json.tmpl", map[string]any{"Name": repo})
 	_, err = helper.Repositories.Resource.Create(ctx, createBody, metav1.CreateOptions{})
 	require.NoError(t, err, "should be able to create repository")
@@ -53,7 +55,7 @@ func TestProvisioning_ExportUnifiedToRepository(t *testing.T) {
 			Path:   "", // no prefix necessary for testing
 		},
 	}
-	helper.TriggerJobAndWait(t, repo, spec)
+	helper.TriggerJobAndWaitForSuccess(t, repo, spec)
 
 	type props struct {
 		title      string
@@ -103,6 +105,7 @@ func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *tes
 	helper := runGrafana(t)
 	ctx := context.Background()
 
+	// FIXME: helper to create dashboards.
 	// Create some unmanaged dashboards directly in Grafana first
 	dashboard1 := helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v1.yaml")
 	dashboard1Obj, err := helper.DashboardsV1.Resource.Create(ctx, dashboard1, metav1.CreateOptions{})
@@ -114,6 +117,7 @@ func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *tes
 	require.NoError(t, err, "should be able to create second dashboard")
 	dashboard2Name := dashboard2Obj.GetName()
 
+	// FIXME: use same helper to create repository
 	// Create the first repository with sync enabled
 	const repo1 = "first-repository"
 	repo1Path := filepath.Join(helper.ProvisioningPath, repo1)
@@ -140,7 +144,7 @@ func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *tes
 		},
 	}
 
-	helper.TriggerJobAndWait(t, repo1, spec)
+	helper.TriggerJobAndWaitForSuccess(t, repo1, spec)
 	helper.SyncAndWait(t, repo1, nil)
 
 	printFileTree(t, helper.ProvisioningPath)
@@ -153,8 +157,8 @@ func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *tes
 	require.NoError(t, err)
 	require.Equal(t, repo1, managedDash2.GetAnnotations()[utils.AnnoKeyManagerIdentity], "dashboard2 should be managed by first repo")
 
+	// FIXME: use helper to create repository
 	// Create second repository - enable sync and set different target
-
 	const repo2 = "second-repository"
 	repo2Path := filepath.Join(helper.ProvisioningPath, repo2)
 	err = os.MkdirAll(repo2Path, 0750)
@@ -175,6 +179,7 @@ func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *tes
 	// Wait for second repository to sync
 	helper.SyncAndWait(t, repo2, nil)
 
+	// FIXME: use helpers to check status
 	// Validate that folders for both repositories exist
 	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
 	require.NoError(t, err, "should be able to list folders")
@@ -215,7 +220,7 @@ func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *tes
 			Path:   "", // no prefix necessary for testing
 		},
 	}
-	helper.TriggerJobAndWait(t, repo2, spec)
+	helper.TriggerJobAndWaitForSuccess(t, repo2, spec)
 
 	// Wait for both repositories to sync
 	helper.SyncAndWait(t, repo1, nil)
diff --git a/pkg/tests/apis/provisioning/files_test.go b/pkg/tests/apis/provisioning/files_test.go
index d50fde289f1..0867bce6c9a 100644
--- a/pkg/tests/apis/provisioning/files_test.go
+++ b/pkg/tests/apis/provisioning/files_test.go
@@ -6,16 +6,12 @@ import (
 	"io"
 	"net/http"
 	"testing"
-	"time"
 
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-
-	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
 )
 
 func TestIntegrationProvisioning_DeleteResources(t *testing.T) {
@@ -393,66 +389,4 @@ func TestIntegrationProvisioning_MoveResources(t *testing.T) {
 			require.Error(t, result.Error(), "should fail when source file doesn't exist")
 		})
 	})
-
-	t.Run("move non-existent resource by reference", func(t *testing.T) {
-		// Create move job for non-existent resource
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionMove,
-				Move: &provisioning.MoveJobOptions{
-					TargetPath: "moved-nonexistent/",
-					Resources: []provisioning.ResourceRef{
-						{
-							Name:  "non-existent-move-uid",
-							Kind:  "Dashboard",
-							Group: "dashboard.grafana.app",
-						},
-					},
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create move job")
-
-		// Wait for job to complete - should record error but continue
-		require.EventuallyWithT(t, func(collect *assert.CollectT) {
-			list := &unstructured.UnstructuredList{}
-			err := helper.AdminREST.Get().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Do(ctx).Into(list)
-			assert.NoError(collect, err, "should be able to list jobs")
-			assert.NotEmpty(collect, list.Items, "expect at least one job")
-
-			// Find the most recent move job
-			var moveJob *unstructured.Unstructured
-			for _, elem := range list.Items {
-				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
-
-				action := mustNestedString(elem.Object, "spec", "action")
-				if action == "move" {
-					// Get the most recent one (they should be ordered by creation time)
-					moveJob = &elem
-				}
-			}
-			if !assert.NotNil(collect, moveJob, "should find a move job") {
-				return
-			}
-
-			state := mustNestedString(moveJob.Object, "status", "state")
-			// The job should complete but record errors for individual resource resolution failures
-			if state == "error" || state == "completed" || state == "success" {
-				// Any of these states is acceptable - the key is that resource resolution errors are recorded
-				// and don't fail the entire job due to error-tolerant implementation
-				return
-			}
-			assert.Fail(collect, "job should complete or error, but got state: %s", state)
-		}, time.Second*10, time.Millisecond*100, "Expected move job to handle non-existent resource")
-	})
 }
diff --git a/pkg/tests/apis/provisioning/helper_test.go b/pkg/tests/apis/provisioning/helper_test.go
index b2c4636d87e..8ca2f22325b 100644
--- a/pkg/tests/apis/provisioning/helper_test.go
+++ b/pkg/tests/apis/provisioning/helper_test.go
@@ -96,7 +96,7 @@ func (h *provisioningTestHelper) SyncAndWait(t *testing.T, repo string, options
 	h.AwaitJobSuccess(t, t.Context(), unstruct)
 }
 
-func (h *provisioningTestHelper) TriggerJobAndWait(t *testing.T, repo string, spec provisioning.JobSpec) {
+func (h *provisioningTestHelper) TriggerJobAndWaitForSuccess(t *testing.T, repo string, spec provisioning.JobSpec) {
 	t.Helper()
 
 	body := asJSON(spec)
@@ -126,40 +126,77 @@ func (h *provisioningTestHelper) TriggerJobAndWait(t *testing.T, repo string, sp
 	h.AwaitJobSuccess(t, t.Context(), unstruct)
 }
 
+func (h *provisioningTestHelper) TriggerJobAndWaitForComplete(t *testing.T, repo string, spec provisioning.JobSpec) *unstructured.Unstructured {
+	t.Helper()
+
+	body := asJSON(spec)
+	result := h.AdminREST.Post().
+		Namespace("default").
+		Resource("repositories").
+		Name(repo).
+		SubResource("jobs").
+		Body(body).
+		SetHeader("Content-Type", "application/json").
+		Do(t.Context())
+
+	if apierrors.IsAlreadyExists(result.Error()) {
+		// Wait for all jobs to finish as we don't have the name.
+		h.AwaitJobs(t, repo)
+		t.Errorf("repository %s already has a job running, but we expected a new one to be created", repo)
+		t.FailNow()
+
+		return nil
+	}
+
+	obj, err := result.Get()
+	require.NoError(t, err, "expecting to be able to sync repository")
+
+	unstruct, ok := obj.(*unstructured.Unstructured)
+	require.True(t, ok, "expecting unstructured object, but got %T", obj)
+
+	name := unstruct.GetName()
+	require.NotEmpty(t, name, "expecting name to be set")
+
+	return h.AwaitJob(t, t.Context(), unstruct)
+}
+
 func (h *provisioningTestHelper) AwaitJobSuccess(t *testing.T, ctx context.Context, job *unstructured.Unstructured) {
 	t.Helper()
+	job = h.AwaitJob(t, ctx, job)
+	lastErrors := mustNestedStringSlice(job.Object, "status", "errors")
+	require.Empty(t, lastErrors, "historic job '%s' has errors: %v", job.GetName(), lastErrors)
+	lastState := mustNestedString(job.Object, "status", "state")
+	require.Equal(t, string(provisioning.JobStateSuccess), lastState,
+		"historic job '%s' was not successful", job.GetName())
+}
+
+func (h *provisioningTestHelper) AwaitJob(t *testing.T, ctx context.Context, job *unstructured.Unstructured) *unstructured.Unstructured {
+	t.Helper()
 
 	repo := job.GetLabels()[jobs.LabelRepository]
 	require.NotEmpty(t, repo)
-	// TODO: simply this
-	if !assert.EventuallyWithT(t, func(collect *assert.CollectT) {
+
+	var lastResult *unstructured.Unstructured
+	require.EventuallyWithT(t, func(collect *assert.CollectT) {
 		result, err := h.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{},
 			"jobs", string(job.GetUID()))
 
 		if apierrors.IsNotFound(err) {
-			assert.Fail(collect, "job '%s' not found yet yet", job.GetName())
+			collect.Errorf("job '%s' not found, still waiting for it to complete", job.GetName())
 			return // continue trying
 		}
 
-		// Can fail fast here -- the jobs are immutable
-		require.NoError(t, err)
-		require.NotNil(t, result)
-
-		errors := mustNestedStringSlice(result.Object, "status", "errors")
-		require.Empty(t, errors, "historic job '%s' has errors: %v", job.GetName(), errors)
-		state := mustNestedString(result.Object, "status", "state")
-		require.Equal(t, string(provisioning.JobStateSuccess), state,
-			"historic job '%s' was not successful", job.GetName())
-	}, time.Second*10, time.Millisecond*25) {
-		// We also want to add the job details to the error when it fails.
-		job, err := h.Jobs.Resource.Get(ctx, job.GetName(), metav1.GetOptions{})
 		if err != nil {
-			t.Logf("failed to get job details for further help: %v", err)
-		} else {
-			t.Logf("job details: %+v", job.Object)
+			collect.Errorf("failed to get job '%s': %v", job.GetName(), err)
+			collect.FailNow()
+			return
 		}
-		t.FailNow()
-	}
+
+		lastResult = result
+	}, time.Second*10, time.Millisecond*25)
+	require.NotNil(t, lastResult, "expected job result to be non-nil")
+
+	return lastResult
 }
 
 func (h *provisioningTestHelper) AwaitJobs(t *testing.T, repoName string) {
@@ -275,6 +312,46 @@ func (h *provisioningTestHelper) CopyToProvisioningPath(t *testing.T, from, to s
 	require.NoError(t, err, "failed to write file to provisioning path")
 }
 
+type TestRepo struct {
+	Name               string
+	Target             string
+	Values             map[string]any
+	Copies             map[string]string
+	ExpectedDashboards int
+	ExpectedFolders    int
+}
+
+func (h *provisioningTestHelper) CreateRepo(t *testing.T, repo TestRepo) {
+	if repo.Target == "" {
+		repo.Target = "instance"
+	}
+
+	localTmp := h.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+		"Name":        repo.Name,
+		"SyncEnabled": true,
+		"SyncTarget":  repo.Target,
+	})
+
+	_, err := h.Repositories.Resource.Create(t.Context(), localTmp, metav1.CreateOptions{})
+	require.NoError(t, err)
+
+	for from, to := range repo.Copies {
+		h.CopyToProvisioningPath(t, from, to)
+	}
+
+	// Trigger and wait for initial sync to populate resources
+	h.SyncAndWait(t, repo.Name, nil)
+
+	// Verify initial state
+	dashboards, err := h.DashboardsV1.Resource.List(t.Context(), metav1.ListOptions{})
+	require.NoError(t, err)
+	require.Equal(t, repo.ExpectedDashboards, len(dashboards.Items), "should the expected dashboards after sync")
+
+	folders, err := h.Folders.Resource.List(t.Context(), metav1.ListOptions{})
+	require.NoError(t, err)
+	require.Equal(t, repo.ExpectedFolders, len(folders.Items), "should have the expected folders after sync")
+}
+
 type grafanaOption func(opts *testinfra.GrafanaOpts)
 
 // Useful for debugging a test in development.
diff --git a/pkg/tests/apis/provisioning/movejob_test.go b/pkg/tests/apis/provisioning/movejob_test.go
index a7d44f89fef..c7058e6f96e 100644
--- a/pkg/tests/apis/provisioning/movejob_test.go
+++ b/pkg/tests/apis/provisioning/movejob_test.go
@@ -2,18 +2,15 @@ package provisioning
 
 import (
 	"context"
-	"encoding/json"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
 	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
 )
@@ -26,26 +23,17 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 	helper := runGrafana(t)
 	ctx := context.Background()
 	const repo = "move-test-repo"
-	localTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo,
-		"SyncEnabled": true,
-		"SyncTarget":  "instance",
-	})
-	_, err := helper.Repositories.Resource.Create(ctx, localTmp, metav1.CreateOptions{})
-	require.NoError(t, err)
-	// Copy multiple test files to the repository
-	helper.CopyToProvisioningPath(t, "testdata/all-panels.json", "dashboard1.json")
-	helper.CopyToProvisioningPath(t, "testdata/text-options.json", "dashboard2.json")
-	helper.CopyToProvisioningPath(t, "testdata/timeline-demo.json", "folder/dashboard3.json")
-	// Trigger and wait for initial sync to populate resources
-	helper.SyncAndWait(t, repo, nil)
-	// Verify initial state - should have 3 dashboards and 1 folder
-	dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
-	require.Equal(t, 3, len(dashboards.Items), "should have 3 dashboards after sync")
-	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
-	require.NoError(t, err)
-	require.Equal(t, 1, len(folders.Items), "should have 1 folder after sync")
+	testRepo := TestRepo{
+		Name: repo,
+		Copies: map[string]string{
+			"testdata/all-panels.json":    "dashboard1.json",
+			"testdata/text-options.json":  "dashboard2.json",
+			"testdata/timeline-demo.json": "folder/dashboard3.json",
+		},
+		ExpectedDashboards: 3,
+		ExpectedFolders:    1,
+	}
+	helper.CreateRepo(t, testRepo)
 
 	t.Run("move single file", func(t *testing.T) {
 		spec := provisioning.JobSpec{
@@ -55,13 +43,13 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 				TargetPath: "moved/",
 			},
 		}
-		helper.TriggerJobAndWait(t, repo, spec)
-
+		helper.TriggerJobAndWaitForSuccess(t, repo, spec)
 		// TODO: This additional sync should not be necessary - the move job should handle sync properly
 		helper.SyncAndWait(t, repo, nil)
 
+		// FIXME: use the helpers for assertions
 		// Verify file is moved in repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved", "dashboard1.json")
+		_, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "moved", "dashboard1.json")
 		require.NoError(t, err, "file should exist at new location in repository")
 
 		// Verify original file is gone from repository
@@ -76,57 +64,36 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 		require.NoError(t, err, "nested files should still exist")
 
 		// Verify dashboard still exists in Grafana after sync
-		// Use eventually to let unified storage reflect the changes in dashboards.
-		// FIXME: investigate this
-		require.EventuallyWithT(t, func(collect *assert.CollectT) {
-			dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
-			assert.NoError(collect, err)
-			assert.Len(collect, dashboards.Items, 3, "should still have 3 dashboards after move")
-			// Verify that dashboards have the correct source paths
-			foundPaths := make(map[string]bool)
-			for _, dashboard := range dashboards.Items {
-				sourcePath := dashboard.GetAnnotations()["grafana.app/sourcePath"]
-				foundPaths[sourcePath] = true
-			}
+		dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+		require.NoError(t, err)
+		require.Len(t, dashboards.Items, 3, "should still have 3 dashboards after move")
+		// Verify that dashboards have the correct source paths
+		foundPaths := make(map[string]bool)
+		for _, dashboard := range dashboards.Items {
+			sourcePath := dashboard.GetAnnotations()["grafana.app/sourcePath"]
+			foundPaths[sourcePath] = true
+		}
 
-			assert.True(t, foundPaths["moved/dashboard1.json"], "should have dashboard with moved source path")
-			assert.True(t, foundPaths["dashboard2.json"], "should have dashboard2 in original location")
-			assert.True(t, foundPaths["folder/dashboard3.json"], "should have dashboard3 in original nested location")
-		}, time.Second*10, time.Millisecond*100, "Expected to eventually have 3 dashboards after move")
+		require.True(t, foundPaths["moved/dashboard1.json"], "should have dashboard with moved source path")
+		require.True(t, foundPaths["dashboard2.json"], "should have dashboard2 in original location")
+		require.True(t, foundPaths["folder/dashboard3.json"], "should have dashboard3 in original nested location")
 	})
 
 	t.Run("move multiple files and folder", func(t *testing.T) {
 		// Create move job for multiple files including a folder
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionMove,
-				Move: &provisioning.MoveJobOptions{
-					Paths:      []string{"dashboard2.json", "folder/"},
-					TargetPath: "archived/",
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create move job")
-
-		raw, err := result.Raw()
-		require.NoError(t, err)
-		obj := &unstructured.Unstructured{}
-		err = json.Unmarshal(raw, obj)
-		require.NoError(t, err)
-
-		// Wait for job to complete
-		helper.AwaitJobSuccess(t, ctx, obj)
-
+		spec := provisioning.JobSpec{
+			Action: provisioning.JobActionMove,
+			Move: &provisioning.MoveJobOptions{
+				Paths:      []string{"dashboard2.json", "folder/"},
+				TargetPath: "archived/",
+			},
+		}
+		helper.TriggerJobAndWaitForSuccess(t, repo, spec)
 		// TODO: This additional sync should not be necessary - the move job should handle sync properly
 		helper.SyncAndWait(t, repo, nil)
 
 		// Verify files are moved in repository
-		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "archived", "dashboard2.json")
+		_, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "archived", "dashboard2.json")
 		require.NoError(t, err, "dashboard2.json should exist at new location")
 		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "archived", "folder", "dashboard3.json")
 		require.NoError(t, err, "folder/dashboard3.json should exist at new nested location")
@@ -160,107 +127,52 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 	})
 
 	t.Run("move non-existent file", func(t *testing.T) {
-		// Create move job for non-existent file
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionMove,
-				Move: &provisioning.MoveJobOptions{
-					Paths:      []string{"non-existent.json"},
-					TargetPath: "moved/",
+		spec := provisioning.JobSpec{
+			Action: provisioning.JobActionMove,
+			Move: &provisioning.MoveJobOptions{
+				Paths:      []string{"non-existent.json"},
+				TargetPath: "moved/",
+			},
+		}
+
+		job := helper.TriggerJobAndWaitForComplete(t, repo, spec)
+		state := mustNestedString(job.Object, "status", "state")
+		require.Equal(t, "error", state, "move job should have failed due to non-existent file")
+	})
+
+	t.Run("move non-existent uid", func(t *testing.T) {
+		spec := provisioning.JobSpec{
+			Action: provisioning.JobActionMove,
+			Move: &provisioning.MoveJobOptions{
+				TargetPath: "moved-nonexistent/",
+				Resources: []provisioning.ResourceRef{
+					{
+						Name:  "non-existent-move-uid",
+						Kind:  "Dashboard",
+						Group: "dashboard.grafana.app",
+					},
 				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create move job")
+			},
+		}
 
-		// Wait for job to complete - should fail due to strict error handling
-		require.EventuallyWithT(t, func(collect *assert.CollectT) {
-			list := &unstructured.UnstructuredList{}
-			err := helper.AdminREST.Get().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Do(ctx).Into(list)
-			assert.NoError(collect, err, "should be able to list jobs")
-			assert.NotEmpty(collect, list.Items, "expect at least one job")
-
-			// Find the move job specifically
-			var moveJob *unstructured.Unstructured
-			for _, elem := range list.Items {
-				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
-
-				action := mustNestedString(elem.Object, "spec", "action")
-				if action == "move" {
-					// Check if this is the specific job we're looking for
-					paths, found, err := unstructured.NestedStringSlice(elem.Object, "spec", "move", "paths")
-					if err == nil && found && len(paths) > 0 && paths[0] == "non-existent.json" {
-						moveJob = &elem
-						break
-					}
-				}
-			}
-			assert.NotNil(collect, moveJob, "should find a move job for non-existent file")
-
-			state := mustNestedString(moveJob.Object, "status", "state")
-			assert.Equal(collect, "error", state, "move job should have failed due to non-existent file")
-		}, time.Second*10, time.Millisecond*100, "Expected move job to fail with error state")
+		job := helper.TriggerJobAndWaitForComplete(t, repo, spec)
+		state := mustNestedString(job.Object, "status", "state")
+		require.Equal(t, "error", state, "move job should have failed due to non-existent uid")
 	})
 
 	t.Run("move without target path", func(t *testing.T) {
 		// Create move job without target path (should fail)
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionMove,
-				Move: &provisioning.MoveJobOptions{
-					Paths: []string{"moved/dashboard1.json"},
-					// TargetPath intentionally omitted
-				},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(ctx)
-		require.NoError(t, result.Error(), "should be able to create move job")
+		spec := provisioning.JobSpec{
+			Action: provisioning.JobActionMove,
+			Move: &provisioning.MoveJobOptions{
+				Paths: []string{"moved/dashboard1.json"},
+				// TargetPath intentionally omitted
+			},
+		}
 
-		// Wait for job to complete - should fail due to missing target path
-		require.EventuallyWithT(t, func(collect *assert.CollectT) {
-			list := &unstructured.UnstructuredList{}
-			err := helper.AdminREST.Get().
-				Namespace("default").
-				Resource("repositories").
-				Name(repo).
-				SubResource("jobs").
-				Do(ctx).Into(list)
-			assert.NoError(collect, err, "should be able to list jobs")
-			assert.NotEmpty(collect, list.Items, "expect at least one job")
-
-			// Find the move job specifically
-			var moveJob *unstructured.Unstructured
-			for _, elem := range list.Items {
-				assert.Equal(collect, repo, elem.GetLabels()["provisioning.grafana.app/repository"], "should have repo label")
-
-				action := mustNestedString(elem.Object, "spec", "action")
-				if action == "move" {
-					// Check if this is the job without target path
-					targetPath, found, _ := unstructured.NestedString(elem.Object, "spec", "move", "targetPath")
-					if !found || targetPath == "" {
-						moveJob = &elem
-						break
-					}
-				}
-			}
-			assert.NotNil(collect, moveJob, "should find a move job without target path")
-
-			state := mustNestedString(moveJob.Object, "status", "state")
-			assert.Equal(collect, "error", state, "move job should have failed due to missing target path")
-		}, time.Second*10, time.Millisecond*100, "Expected move job to fail with error state")
+		job := helper.TriggerJobAndWaitForComplete(t, repo, spec)
+		state := mustNestedString(job.Object, "status", "state")
+		assert.Equal(t, "error", state, "move job should have failed due to missing target path")
 	})
 
 	t.Run("move by resource reference", func(t *testing.T) {
@@ -317,7 +229,7 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 				},
 			}
 
-			helper.TriggerJobAndWait(t, refRepo, spec)
+			helper.TriggerJobAndWaitForSuccess(t, refRepo, spec)
 			// Verify corresponding file is moved in repository
 			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "moved-by-ref", "move-source-1.json")
 			require.NoError(t, err, "file should be moved to new location in repository")
@@ -351,7 +263,7 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 					},
 				},
 			}
-			helper.TriggerJobAndWait(t, refRepo, spec)
+			helper.TriggerJobAndWaitForSuccess(t, refRepo, spec)
 
 			// Verify file is moved in repository
 			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "archived-by-ref", "move-source-2.json")
@@ -399,7 +311,7 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 					},
 				},
 			}
-			helper.TriggerJobAndWait(t, refRepo, spec)
+			helper.TriggerJobAndWaitForSuccess(t, refRepo, spec)
 
 			// Verify both targeted resources are moved in repository
 			_, err = helper.Repositories.Resource.Get(ctx, refRepo, metav1.GetOptions{}, "files", "mixed-target", "mixed-move-1.json")
diff --git a/pkg/tests/apis/provisioning/repository_test.go b/pkg/tests/apis/provisioning/repository_test.go
index 336d33a2bb0..fcf1b2185d2 100644
--- a/pkg/tests/apis/provisioning/repository_test.go
+++ b/pkg/tests/apis/provisioning/repository_test.go
@@ -192,49 +192,19 @@ func TestIntegrationProvisioning_FailInvalidSchema(t *testing.T) {
 	require.Error(t, err, "invalid dashboard shouldn't exist")
 	require.True(t, apierrors.IsNotFound(err))
 
-	var jobObj *unstructured.Unstructured
-	require.EventuallyWithT(t, func(collect *assert.CollectT) {
-		result := helper.AdminREST.Post().
-			Namespace("default").
-			Resource("repositories").
-			Name(repo).
-			SubResource("jobs").
-			Body(asJSON(&provisioning.JobSpec{
-				Action: provisioning.JobActionPull,
-				Pull:   &provisioning.SyncJobOptions{},
-			})).
-			SetHeader("Content-Type", "application/json").
-			Do(t.Context())
-		require.NoError(collect, result.Error())
-		job, err := result.Get()
-		require.NoError(collect, err)
-		var ok bool
-		jobObj, ok = job.(*unstructured.Unstructured)
-		assert.True(collect, ok, "expecting unstructured object, but got %T", job)
-	}, time.Second*10, time.Millisecond*10, "Expected to be able to start a sync job")
+	spec := provisioning.JobSpec{
+		Action: provisioning.JobActionPull,
+		Pull:   &provisioning.SyncJobOptions{},
+	}
 
-	require.EventuallyWithT(t, func(collect *assert.CollectT) {
-		// helper.TriggerJobProcessing(t)
-		result, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{},
-			"jobs", string(jobObj.GetUID()))
+	result := helper.TriggerJobAndWaitForComplete(t, repo, spec)
+	job := &provisioning.Job{}
+	err = runtime.DefaultUnstructuredConverter.FromUnstructured(result.Object, job)
+	require.NoError(t, err, "should convert to Job object")
 
-		if apierrors.IsNotFound(err) {
-			assert.Fail(collect, "job '%s' not found yet yet", jobObj.GetName())
-			return // continue trying
-		}
-
-		// Can fail fast here -- the jobs are immutable
-		require.NoError(t, err)
-		require.NotNil(t, result)
-
-		job := &provisioning.Job{}
-		err = runtime.DefaultUnstructuredConverter.FromUnstructured(result.Object, job)
-		require.NoError(t, err, "should convert to Job object")
-
-		assert.Equal(t, provisioning.JobStateError, job.Status.State)
-		assert.Equal(t, job.Status.Message, "completed with errors")
-		assert.Equal(t, job.Status.Errors[0], "Dashboard.dashboard.grafana.app \"invalid-schema-uid\" is invalid: [spec.panels.0.repeatDirection: Invalid value: conflicting values \"h\" and \"this is not an allowed value\", spec.panels.0.repeatDirection: Invalid value: conflicting values \"v\" and \"this is not an allowed value\"]")
-	}, time.Second*10, time.Millisecond*10, "Expected provisioning job to conclude with the status failed")
+	assert.Equal(t, provisioning.JobStateError, job.Status.State)
+	assert.Equal(t, job.Status.Message, "completed with errors")
+	assert.Equal(t, job.Status.Errors[0], "Dashboard.dashboard.grafana.app \"invalid-schema-uid\" is invalid: [spec.panels.0.repeatDirection: Invalid value: conflicting values \"h\" and \"this is not an allowed value\", spec.panels.0.repeatDirection: Invalid value: conflicting values \"v\" and \"this is not an allowed value\"]")
 
 	_, err = helper.DashboardsV1.Resource.Get(ctx, invalidSchemaUid, metav1.GetOptions{})
 	require.Error(t, err, "invalid dashboard shouldn't have been created")

From 71b61494927dc8dbabcabe3f6c5d042bc46ca3b4 Mon Sep 17 00:00:00 2001
From: Matheus Macabu <macabu@users.noreply.github.com>
Date: Fri, 8 Aug 2025 12:33:01 +0200
Subject: [PATCH 041/243] GitIgnore: Add some build files to ignore list
 (#109380)

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7457c8148b3..66a35404ee5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,6 +117,9 @@ profile.cov
 /pkg/server/wireexts_enterprise.go
 /pkg/server/enterprise_wire_gen.go
 /pkg/build/cmd/enterprise.go
+/pkg/build/cmd/artifactspage.go
+/pkg/build/cmd/artifactspage.tmpl.html
+/pkg/build/cmd/exportversion.go
 /pkg/extensions/*
 !/pkg/extensions/.keep
 !/pkg/extensions/main.go

From 01c1a6ce5b2ec7387d276c5c6c3ba66d9318d210 Mon Sep 17 00:00:00 2001
From: Matheus Macabu <macabu@users.noreply.github.com>
Date: Fri, 8 Aug 2025 13:15:23 +0200
Subject: [PATCH 042/243] SecureValues: Run mutate and validation hooks in
 service layer (#109379)

* SecureValues: Run mutate and validation hooks in service layer

* add some unit tests
---
 pkg/registry/apis/secret/contracts/mutator.go |  14 ++
 .../apis/secret/contracts/validator.go        |  19 ++
 .../apis/secret/inline/inline_secure_value.go |   6 +-
 pkg/registry/apis/secret/mutator/keeper.go    |  31 +++
 .../apis/secret/mutator/keeper_test.go        |  71 +++++++
 .../apis/secret/mutator/secure_value.go       |  37 ++++
 .../apis/secret/mutator/secure_value_test.go  | 179 ++++++++++++++++++
 .../apis/secret/service/consolidation_test.go |  10 +-
 .../apis/secret/service/secure_value.go       |  48 ++++-
 .../apis/secret/testutils/testutils.go        |   7 +-
 pkg/server/wire.go                            |   3 +
 pkg/server/wire_gen.go                        |  13 +-
 12 files changed, 418 insertions(+), 20 deletions(-)
 create mode 100644 pkg/registry/apis/secret/contracts/mutator.go
 create mode 100644 pkg/registry/apis/secret/mutator/keeper.go
 create mode 100644 pkg/registry/apis/secret/mutator/keeper_test.go
 create mode 100644 pkg/registry/apis/secret/mutator/secure_value.go
 create mode 100644 pkg/registry/apis/secret/mutator/secure_value_test.go

diff --git a/pkg/registry/apis/secret/contracts/mutator.go b/pkg/registry/apis/secret/contracts/mutator.go
new file mode 100644
index 00000000000..110b0d90ba9
--- /dev/null
+++ b/pkg/registry/apis/secret/contracts/mutator.go
@@ -0,0 +1,14 @@
+package contracts
+
+import (
+	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
+	"k8s.io/apiserver/pkg/admission"
+)
+
+type SecureValueMutator interface {
+	Mutate(sv *secretv1beta1.SecureValue, operation admission.Operation) error
+}
+
+type KeeperMutator interface {
+	Mutate(kp *secretv1beta1.Keeper, operation admission.Operation) error
+}
diff --git a/pkg/registry/apis/secret/contracts/validator.go b/pkg/registry/apis/secret/contracts/validator.go
index a0f326ab268..0e68cc874eb 100644
--- a/pkg/registry/apis/secret/contracts/validator.go
+++ b/pkg/registry/apis/secret/contracts/validator.go
@@ -5,6 +5,7 @@ import (
 	"k8s.io/apiserver/pkg/admission"
 
 	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/xkube"
 )
 
 type SecureValueValidator interface {
@@ -14,3 +15,21 @@ type SecureValueValidator interface {
 type KeeperValidator interface {
 	Validate(keeper *secretv1beta1.Keeper, oldKeeper *secretv1beta1.Keeper, operation admission.Operation) field.ErrorList
 }
+
+type ErrValidateSecureValue struct {
+	list field.ErrorList
+}
+
+var _ xkube.ErrorLister = (*ErrValidateSecureValue)(nil)
+
+func NewErrValidateSecureValue(list field.ErrorList) *ErrValidateSecureValue {
+	return &ErrValidateSecureValue{list: list}
+}
+
+func (e *ErrValidateSecureValue) Error() string {
+	return e.list.ToAggregate().Error()
+}
+
+func (e *ErrValidateSecureValue) ErrorList() field.ErrorList {
+	return e.list
+}
diff --git a/pkg/registry/apis/secret/inline/inline_secure_value.go b/pkg/registry/apis/secret/inline/inline_secure_value.go
index 4e675486f48..08ce9f3068b 100644
--- a/pkg/registry/apis/secret/inline/inline_secure_value.go
+++ b/pkg/registry/apis/secret/inline/inline_secure_value.go
@@ -17,7 +17,6 @@ import (
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/xkube"
-	"github.com/grafana/grafana/pkg/util"
 )
 
 type LocalInlineSecureValueService struct {
@@ -209,8 +208,7 @@ func (s *LocalInlineSecureValueService) CreateInline(ctx context.Context, owner
 
 	obj := &secretv1beta1.SecureValue{
 		ObjectMeta: metav1.ObjectMeta{
-			//GenerateName:    "inline-",
-			Name:            "inline-" + util.GenerateShortUID(),
+			GenerateName:    "inline-",
 			Namespace:       owner.Namespace,
 			OwnerReferences: []metav1.OwnerReference{owner.ToOwnerReference()},
 		},
@@ -223,7 +221,7 @@ func (s *LocalInlineSecureValueService) CreateInline(ctx context.Context, owner
 
 	createdSv, err := s.secureValueService.Create(ctx, obj, authInfo.GetUID())
 	if err != nil {
-		return "", fmt.Errorf("error creating secure value %s for owner %v: %w", obj.Name, owner, err)
+		return "", fmt.Errorf("error creating secure value for owner %v: %w", owner, err)
 	}
 
 	return createdSv.GetName(), nil
diff --git a/pkg/registry/apis/secret/mutator/keeper.go b/pkg/registry/apis/secret/mutator/keeper.go
new file mode 100644
index 00000000000..87ff7e9ea6a
--- /dev/null
+++ b/pkg/registry/apis/secret/mutator/keeper.go
@@ -0,0 +1,31 @@
+package mutator
+
+import (
+	"cmp"
+	"fmt"
+
+	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
+	"github.com/grafana/grafana/pkg/util"
+	"k8s.io/apiserver/pkg/admission"
+)
+
+type keeperMutator struct{}
+
+var _ contracts.KeeperMutator = &keeperMutator{}
+
+func ProvideKeeperMutator() contracts.KeeperMutator {
+	return &keeperMutator{}
+}
+
+func (*keeperMutator) Mutate(kp *secretv1beta1.Keeper, operation admission.Operation) error {
+	if kp == nil {
+		return fmt.Errorf("expected Keeper to be non-nil")
+	}
+
+	if operation == admission.Create && kp.Name == "" {
+		kp.SetName(cmp.Or(kp.GetGenerateName(), "kp-") + util.GenerateShortUID())
+	}
+
+	return nil
+}
diff --git a/pkg/registry/apis/secret/mutator/keeper_test.go b/pkg/registry/apis/secret/mutator/keeper_test.go
new file mode 100644
index 00000000000..643dfc93795
--- /dev/null
+++ b/pkg/registry/apis/secret/mutator/keeper_test.go
@@ -0,0 +1,71 @@
+package mutator
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apiserver/pkg/admission"
+
+	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
+)
+
+func TestKeeperMutator(t *testing.T) {
+	mutator := ProvideKeeperMutator()
+
+	t.Run("when keeper is nil, it returns an error", func(t *testing.T) {
+		err := mutator.Mutate(nil, admission.Create)
+		require.Error(t, err)
+		require.Equal(t, "expected Keeper to be non-nil", err.Error())
+	})
+
+	t.Run("when operation is Create and name is empty without GenerateName", func(t *testing.T) {
+		keeper := &secretv1beta1.Keeper{}
+
+		err := mutator.Mutate(keeper, admission.Create)
+		require.NoError(t, err)
+		require.NotEmpty(t, keeper.Name)
+		require.True(t, strings.HasPrefix(keeper.Name, "kp-"))
+	})
+
+	t.Run("when operation is Create and name is already set", func(t *testing.T) {
+		keeper := &secretv1beta1.Keeper{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "existing-name",
+			},
+		}
+		originalName := keeper.Name
+
+		err := mutator.Mutate(keeper, admission.Create)
+		require.NoError(t, err)
+		require.Equal(t, originalName, keeper.Name)
+	})
+
+	t.Run("when operation is Create and GenerateName is set", func(t *testing.T) {
+		keeper := &secretv1beta1.Keeper{
+			ObjectMeta: metav1.ObjectMeta{
+				GenerateName: "custom-prefix-",
+			},
+		}
+
+		err := mutator.Mutate(keeper, admission.Create)
+		require.NoError(t, err)
+		require.NotEmpty(t, keeper.Name)
+		require.True(t, strings.HasPrefix(keeper.Name, "custom-prefix-"))
+	})
+
+	t.Run("when operation is Create and both name and GenerateName are set", func(t *testing.T) {
+		keeper := &secretv1beta1.Keeper{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:         "existing-name",
+				GenerateName: "custom-prefix-",
+			},
+		}
+		originalName := keeper.Name
+
+		err := mutator.Mutate(keeper, admission.Create)
+		require.NoError(t, err)
+		require.Equal(t, originalName, keeper.Name)
+	})
+}
diff --git a/pkg/registry/apis/secret/mutator/secure_value.go b/pkg/registry/apis/secret/mutator/secure_value.go
new file mode 100644
index 00000000000..a8033127be8
--- /dev/null
+++ b/pkg/registry/apis/secret/mutator/secure_value.go
@@ -0,0 +1,37 @@
+package mutator
+
+import (
+	"cmp"
+	"fmt"
+
+	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
+	"github.com/grafana/grafana/pkg/util"
+	"k8s.io/apiserver/pkg/admission"
+)
+
+type secureValueMutator struct{}
+
+var _ contracts.SecureValueMutator = &secureValueMutator{}
+
+func ProvideSecureValueMutator() contracts.SecureValueMutator {
+	return &secureValueMutator{}
+}
+
+func (*secureValueMutator) Mutate(sv *secretv1beta1.SecureValue, operation admission.Operation) error {
+	if sv == nil {
+		return fmt.Errorf("expected SecureValue to be non-nil")
+	}
+
+	if operation == admission.Create && sv.Name == "" {
+		sv.SetName(cmp.Or(sv.GetGenerateName(), "sv-") + util.GenerateShortUID())
+	}
+
+	// On any mutation to a `SecureValue`, clear the status.
+	if operation == admission.Create || operation == admission.Update {
+		sv.Status.ExternalID = ""
+		sv.Status.Version = 0
+	}
+
+	return nil
+}
diff --git a/pkg/registry/apis/secret/mutator/secure_value_test.go b/pkg/registry/apis/secret/mutator/secure_value_test.go
new file mode 100644
index 00000000000..55a94ddf68a
--- /dev/null
+++ b/pkg/registry/apis/secret/mutator/secure_value_test.go
@@ -0,0 +1,179 @@
+package mutator
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apiserver/pkg/admission"
+
+	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
+)
+
+func TestSecureValueMutator(t *testing.T) {
+	mutator := ProvideSecureValueMutator()
+
+	populatedStatus := secretv1beta1.SecureValueStatus{
+		ExternalID: "existing-external-id",
+		Version:    1,
+	}
+
+	t.Run("when secure value is nil, it returns an error", func(t *testing.T) {
+		err := mutator.Mutate(nil, admission.Create)
+		require.Error(t, err)
+		require.Equal(t, "expected SecureValue to be non-nil", err.Error())
+	})
+
+	t.Run("when operation is Create and name is empty", func(t *testing.T) {
+		secureValue := &secretv1beta1.SecureValue{
+			Status: populatedStatus,
+		}
+
+		err := mutator.Mutate(secureValue, admission.Create)
+		require.NoError(t, err)
+		require.NotEmpty(t, secureValue.Name)
+		require.True(t, strings.HasPrefix(secureValue.Name, "sv-"))
+		require.Empty(t, secureValue.Status.ExternalID)
+		require.Equal(t, int64(0), secureValue.Status.Version)
+	})
+
+	t.Run("when operation is Create and name is already set", func(t *testing.T) {
+		secureValue := &secretv1beta1.SecureValue{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "existing-name",
+			},
+			Status: populatedStatus,
+		}
+		originalName := secureValue.Name
+
+		err := mutator.Mutate(secureValue, admission.Create)
+		require.NoError(t, err)
+		require.Equal(t, originalName, secureValue.Name)
+		require.Empty(t, secureValue.Status.ExternalID)
+		require.Equal(t, int64(0), secureValue.Status.Version)
+	})
+
+	t.Run("when operation is Create and GenerateName is set", func(t *testing.T) {
+		secureValue := &secretv1beta1.SecureValue{
+			ObjectMeta: metav1.ObjectMeta{
+				GenerateName: "custom-prefix-",
+			},
+			Status: populatedStatus,
+		}
+
+		err := mutator.Mutate(secureValue, admission.Create)
+		require.NoError(t, err)
+		require.NotEmpty(t, secureValue.Name)
+		require.True(t, strings.HasPrefix(secureValue.Name, "custom-prefix-"))
+		require.Empty(t, secureValue.Status.ExternalID)
+		require.Equal(t, int64(0), secureValue.Status.Version)
+	})
+
+	t.Run("when operation is Create and both name and GenerateName are set", func(t *testing.T) {
+		secureValue := &secretv1beta1.SecureValue{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:         "existing-name",
+				GenerateName: "custom-prefix-",
+			},
+			Status: populatedStatus,
+		}
+		originalName := secureValue.Name
+
+		err := mutator.Mutate(secureValue, admission.Create)
+		require.NoError(t, err)
+		require.Equal(t, originalName, secureValue.Name)
+		require.Empty(t, secureValue.Status.ExternalID)
+		require.Equal(t, int64(0), secureValue.Status.Version)
+	})
+
+	t.Run("when operation is Update", func(t *testing.T) {
+		secureValue := &secretv1beta1.SecureValue{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "existing-name",
+			},
+			Status: populatedStatus,
+		}
+		originalName := secureValue.Name
+
+		err := mutator.Mutate(secureValue, admission.Update)
+		require.NoError(t, err)
+		require.Equal(t, originalName, secureValue.Name)
+		require.Empty(t, secureValue.Status.ExternalID)
+		require.Equal(t, int64(0), secureValue.Status.Version)
+	})
+
+	t.Run("when operation is Update and name is empty", func(t *testing.T) {
+		secureValue := &secretv1beta1.SecureValue{
+			Status: populatedStatus,
+		}
+
+		err := mutator.Mutate(secureValue, admission.Update)
+		require.NoError(t, err)
+		require.Empty(t, secureValue.Name)
+		require.Empty(t, secureValue.Status.ExternalID)
+		require.Equal(t, int64(0), secureValue.Status.Version)
+	})
+
+	t.Run("when operation is Delete", func(t *testing.T) {
+		secureValue := &secretv1beta1.SecureValue{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "existing-name",
+			},
+			Status: populatedStatus,
+		}
+		originalName := secureValue.Name
+		originalExternalID := secureValue.Status.ExternalID
+		originalVersion := secureValue.Status.Version
+
+		err := mutator.Mutate(secureValue, admission.Delete)
+		require.NoError(t, err)
+		require.Equal(t, originalName, secureValue.Name)
+		require.Equal(t, originalExternalID, secureValue.Status.ExternalID)
+		require.Equal(t, originalVersion, secureValue.Status.Version)
+	})
+
+	t.Run("when operation is Connect", func(t *testing.T) {
+		secureValue := &secretv1beta1.SecureValue{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "existing-name",
+			},
+			Status: populatedStatus,
+		}
+		originalName := secureValue.Name
+		originalExternalID := secureValue.Status.ExternalID
+		originalVersion := secureValue.Status.Version
+
+		err := mutator.Mutate(secureValue, admission.Connect)
+		require.NoError(t, err)
+		require.Equal(t, originalName, secureValue.Name)
+		require.Equal(t, originalExternalID, secureValue.Status.ExternalID)
+		require.Equal(t, originalVersion, secureValue.Status.Version)
+	})
+
+	t.Run("when operation is Create with empty status", func(t *testing.T) {
+		secureValue := &secretv1beta1.SecureValue{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "existing-name",
+			},
+		}
+
+		err := mutator.Mutate(secureValue, admission.Create)
+		require.NoError(t, err)
+		require.Empty(t, secureValue.Status.ExternalID)
+		require.Equal(t, int64(0), secureValue.Status.Version)
+	})
+
+	t.Run("when operation is Update with empty status", func(t *testing.T) {
+		secureValue := &secretv1beta1.SecureValue{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "existing-name",
+			},
+		}
+
+		err := mutator.Mutate(secureValue, admission.Update)
+		require.NoError(t, err)
+		require.Empty(t, secureValue.Status.ExternalID)
+		require.Equal(t, int64(0), secureValue.Status.Version)
+	})
+}
diff --git a/pkg/registry/apis/secret/service/consolidation_test.go b/pkg/registry/apis/secret/service/consolidation_test.go
index 57ac94253c9..638ced19a81 100644
--- a/pkg/registry/apis/secret/service/consolidation_test.go
+++ b/pkg/registry/apis/secret/service/consolidation_test.go
@@ -81,8 +81,9 @@ func TestConsolidation(t *testing.T) {
 					Namespace: tc.namespace,
 				},
 				Spec: secretv1beta1.SecureValueSpec{
-					Value:      ptr.To(secretv1beta1.NewExposedSecureValue(tc.value)),
-					Decrypters: []string{"decrypter1"},
+					Description: "test description",
+					Value:       ptr.To(secretv1beta1.NewExposedSecureValue(tc.value)),
+					Decrypters:  []string{"decrypter1"},
 				},
 			}
 
@@ -158,8 +159,9 @@ func TestConsolidation(t *testing.T) {
 					Namespace: tc.namespace,
 				},
 				Spec: secretv1beta1.SecureValueSpec{
-					Value:      ptr.To(secretv1beta1.NewExposedSecureValue(tc.value)),
-					Decrypters: []string{"decrypter1"},
+					Description: "test description",
+					Value:       ptr.To(secretv1beta1.NewExposedSecureValue(tc.value)),
+					Decrypters:  []string{"decrypter1"},
 				},
 			}
 
diff --git a/pkg/registry/apis/secret/service/secure_value.go b/pkg/registry/apis/secret/service/secure_value.go
index fe32208562d..f8b1f91d727 100644
--- a/pkg/registry/apis/secret/service/secure_value.go
+++ b/pkg/registry/apis/secret/service/secure_value.go
@@ -9,6 +9,7 @@ import (
 	claims "github.com/grafana/authlib/types"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
+	"k8s.io/apiserver/pkg/admission"
 
 	"github.com/grafana/grafana-app-sdk/logging"
 	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
@@ -27,6 +28,8 @@ type SecureValueService struct {
 	accessClient               claims.AccessClient
 	database                   contracts.Database
 	secureValueMetadataStorage contracts.SecureValueMetadataStorage
+	secureValueValidator       contracts.SecureValueValidator
+	secureValueMutator         contracts.SecureValueMutator
 	keeperMetadataStorage      contracts.KeeperMetadataStorage
 	keeperService              contracts.KeeperService
 	metrics                    *metrics.SecureValueServiceMetrics
@@ -37,6 +40,8 @@ func ProvideSecureValueService(
 	accessClient claims.AccessClient,
 	database contracts.Database,
 	secureValueMetadataStorage contracts.SecureValueMetadataStorage,
+	secureValueValidator contracts.SecureValueValidator,
+	secureValueMutator contracts.SecureValueMutator,
 	keeperMetadataStorage contracts.KeeperMetadataStorage,
 	keeperService contracts.KeeperService,
 	reg prometheus.Registerer,
@@ -46,29 +51,34 @@ func ProvideSecureValueService(
 		accessClient:               accessClient,
 		database:                   database,
 		secureValueMetadataStorage: secureValueMetadataStorage,
+		secureValueValidator:       secureValueValidator,
+		secureValueMutator:         secureValueMutator,
 		keeperMetadataStorage:      keeperMetadataStorage,
 		keeperService:              keeperService,
 		metrics:                    metrics.NewSecureValueServiceMetrics(reg),
 	}
 }
 
-func (s *SecureValueService) Create(ctx context.Context, sv *secretv1beta1.SecureValue, actorUID string) (_ *secretv1beta1.SecureValue, createErr error) {
+func (s *SecureValueService) Create(ctx context.Context, sv *secretv1beta1.SecureValue, actorUID string) (createdSv *secretv1beta1.SecureValue, createErr error) {
 	start := time.Now()
-	name, namespace := sv.GetName(), sv.GetNamespace()
+
 	ctx, span := s.tracer.Start(ctx, "SecureValueService.Create", trace.WithAttributes(
-		attribute.String("name", name),
-		attribute.String("namespace", namespace),
+		attribute.String("namespace", sv.GetNamespace()),
 		attribute.String("actor", actorUID),
 	))
 	defer span.End()
 
 	defer func() {
 		args := []any{
-			"name", name,
-			"namespace", namespace,
+			"namespace", sv.GetNamespace(),
 			"actorUID", actorUID,
 		}
 
+		if createdSv != nil {
+			args = append(args, "name", createdSv.GetName())
+			span.SetAttributes(attribute.String("name", createdSv.GetName()))
+		}
+
 		success := createErr == nil
 		args = append(args, "success", success)
 		if !success {
@@ -151,6 +161,14 @@ func (s *SecureValueService) Update(ctx context.Context, newSecureValue *secretv
 }
 
 func (s *SecureValueService) createNewVersion(ctx context.Context, sv *secretv1beta1.SecureValue, actorUID string) (*secretv1beta1.SecureValue, error) {
+	if err := s.secureValueMutator.Mutate(sv, admission.Create); err != nil {
+		return nil, err
+	}
+
+	if errorList := s.secureValueValidator.Validate(sv, nil, admission.Create); len(errorList) > 0 {
+		return nil, contracts.NewErrValidateSecureValue(errorList)
+	}
+
 	createdSv, err := s.secureValueMetadataStorage.Create(ctx, sv, actorUID)
 	if err != nil {
 		return nil, fmt.Errorf("creating secure value: %w", err)
@@ -196,6 +214,13 @@ func (s *SecureValueService) createNewVersion(ctx context.Context, sv *secretv1b
 }
 
 func (s *SecureValueService) Read(ctx context.Context, namespace xkube.Namespace, name string) (_ *secretv1beta1.SecureValue, readErr error) {
+	if namespace == "" {
+		return nil, fmt.Errorf("namespace cannot be empty")
+	}
+	if name == "" {
+		return nil, fmt.Errorf("name cannot be empty")
+	}
+
 	start := time.Now()
 
 	ctx, span := s.tracer.Start(ctx, "SecureValueService.Read", trace.WithAttributes(
@@ -229,6 +254,10 @@ func (s *SecureValueService) Read(ctx context.Context, namespace xkube.Namespace
 }
 
 func (s *SecureValueService) List(ctx context.Context, namespace xkube.Namespace) (_ *secretv1beta1.SecureValueList, listErr error) {
+	if namespace == "" {
+		return nil, fmt.Errorf("namespace cannot be empty")
+	}
+
 	start := time.Now()
 
 	ctx, span := s.tracer.Start(ctx, "SecureValueService.List", trace.WithAttributes(
@@ -292,6 +321,13 @@ func (s *SecureValueService) List(ctx context.Context, namespace xkube.Namespace
 }
 
 func (s *SecureValueService) Delete(ctx context.Context, namespace xkube.Namespace, name string) (_ *secretv1beta1.SecureValue, deleteErr error) {
+	if namespace == "" {
+		return nil, fmt.Errorf("namespace cannot be empty")
+	}
+	if name == "" {
+		return nil, fmt.Errorf("name cannot be empty")
+	}
+
 	start := time.Now()
 
 	ctx, span := s.tracer.Start(ctx, "SecureValueService.Delete", trace.WithAttributes(
diff --git a/pkg/registry/apis/secret/testutils/testutils.go b/pkg/registry/apis/secret/testutils/testutils.go
index 6ade8366c89..66b37a91f40 100644
--- a/pkg/registry/apis/secret/testutils/testutils.go
+++ b/pkg/registry/apis/secret/testutils/testutils.go
@@ -20,8 +20,10 @@ import (
 	cipher "github.com/grafana/grafana/pkg/registry/apis/secret/encryption/cipher/service"
 	osskmsproviders "github.com/grafana/grafana/pkg/registry/apis/secret/encryption/kmsproviders"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/encryption/manager"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/mutator"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/secretkeeper/sqlkeeper"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/service"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/validator"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/xkube"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
@@ -123,7 +125,10 @@ func Setup(t *testing.T, opts ...func(*SetupConfig)) Sut {
 		keeperService = setupCfg.KeeperService
 	}
 
-	secureValueService := service.ProvideSecureValueService(tracer, accessClient, database, secureValueMetadataStorage, keeperMetadataStorage, keeperService, nil)
+	secureValueValidator := validator.ProvideSecureValueValidator()
+	secureValueMutator := mutator.ProvideSecureValueMutator()
+
+	secureValueService := service.ProvideSecureValueService(tracer, accessClient, database, secureValueMetadataStorage, secureValueValidator, secureValueMutator, keeperMetadataStorage, keeperService, nil)
 
 	decryptAuthorizer := decrypt.ProvideDecryptAuthorizer(tracer)
 
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index e3198908997..0204e37e25d 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -45,6 +45,7 @@ import (
 	cipher "github.com/grafana/grafana/pkg/registry/apis/secret/encryption/cipher/service"
 	encryptionManager "github.com/grafana/grafana/pkg/registry/apis/secret/encryption/manager"
 	secretinline "github.com/grafana/grafana/pkg/registry/apis/secret/inline"
+	secretmutator "github.com/grafana/grafana/pkg/registry/apis/secret/mutator"
 	secretsecurevalueservice "github.com/grafana/grafana/pkg/registry/apis/secret/service"
 	secretvalidator "github.com/grafana/grafana/pkg/registry/apis/secret/validator"
 	appregistry "github.com/grafana/grafana/pkg/registry/apps"
@@ -437,6 +438,8 @@ var wireBasicSet = wire.NewSet(
 	secretsecurevalueservice.ProvideSecureValueService,
 	secretvalidator.ProvideKeeperValidator,
 	secretvalidator.ProvideSecureValueValidator,
+	secretmutator.ProvideKeeperMutator,
+	secretmutator.ProvideSecureValueMutator,
 	secretmigrator.NewWithEngine,
 	secretdatabase.ProvideDatabase,
 	wire.Bind(new(secretcontracts.Database), new(*secretdatabase.Database)),
diff --git a/pkg/server/wire_gen.go b/pkg/server/wire_gen.go
index 6ef87327da4..c14f55a6507 100644
--- a/pkg/server/wire_gen.go
+++ b/pkg/server/wire_gen.go
@@ -68,6 +68,7 @@ import (
 	"github.com/grafana/grafana/pkg/registry/apis/secret/encryption/kmsproviders"
 	manager4 "github.com/grafana/grafana/pkg/registry/apis/secret/encryption/manager"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/inline"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/mutator"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/secretkeeper"
 	service12 "github.com/grafana/grafana/pkg/registry/apis/secret/service"
 	validator3 "github.com/grafana/grafana/pkg/registry/apis/secret/validator"
@@ -763,6 +764,8 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	if err != nil {
 		return nil, err
 	}
+	secureValueValidator := validator3.ProvideSecureValueValidator()
+	secureValueMutator := mutator.ProvideSecureValueMutator()
 	keeperMetadataStorage, err := metadata.ProvideKeeperMetadataStorage(databaseDatabase, tracer, registerer)
 	if err != nil {
 		return nil, err
@@ -791,8 +794,7 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	if err != nil {
 		return nil, err
 	}
-	secureValueService := service12.ProvideSecureValueService(tracer, accessClient, databaseDatabase, secureValueMetadataStorage, keeperMetadataStorage, ossKeeperService, registerer)
-	secureValueValidator := validator3.ProvideSecureValueValidator()
+	secureValueService := service12.ProvideSecureValueService(tracer, accessClient, databaseDatabase, secureValueMetadataStorage, secureValueValidator, secureValueMutator, keeperMetadataStorage, ossKeeperService, registerer)
 	secureValueClient := secret.ProvideSecureValueClient(secureValueService, secureValueValidator, accessClient)
 	decryptAuthorizer := decrypt.ProvideDecryptAuthorizer(tracer)
 	decryptStorage, err := metadata.ProvideDecryptStorage(tracer, ossKeeperService, keeperMetadataStorage, secureValueMetadataStorage, decryptAuthorizer, registerer)
@@ -1332,6 +1334,8 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	if err != nil {
 		return nil, err
 	}
+	secureValueValidator := validator3.ProvideSecureValueValidator()
+	secureValueMutator := mutator.ProvideSecureValueMutator()
 	keeperMetadataStorage, err := metadata.ProvideKeeperMetadataStorage(databaseDatabase, tracer, registerer)
 	if err != nil {
 		return nil, err
@@ -1360,8 +1364,7 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	if err != nil {
 		return nil, err
 	}
-	secureValueService := service12.ProvideSecureValueService(tracer, accessClient, databaseDatabase, secureValueMetadataStorage, keeperMetadataStorage, ossKeeperService, registerer)
-	secureValueValidator := validator3.ProvideSecureValueValidator()
+	secureValueService := service12.ProvideSecureValueService(tracer, accessClient, databaseDatabase, secureValueMetadataStorage, secureValueValidator, secureValueMutator, keeperMetadataStorage, ossKeeperService, registerer)
 	secureValueClient := secret.ProvideSecureValueClient(secureValueService, secureValueValidator, accessClient)
 	decryptAuthorizer := decrypt.ProvideDecryptAuthorizer(tracer)
 	decryptStorage, err := metadata.ProvideDecryptStorage(tracer, ossKeeperService, keeperMetadataStorage, secureValueMetadataStorage, decryptAuthorizer, registerer)
@@ -1591,7 +1594,7 @@ var withOTelSet = wire.NewSet(
 	otelTracer, grpcserver.ProvideService, interceptors.ProvideAuthenticator,
 )
 
-var wireBasicSet = wire.NewSet(annotationsimpl.ProvideService, wire.Bind(new(annotations.Repository), new(*annotationsimpl.RepositoryImpl)), New, api.ProvideHTTPServer, query.ProvideService, wire.Bind(new(query.Service), new(*query.ServiceImpl)), bus.ProvideBus, wire.Bind(new(bus.Bus), new(*bus.InProcBus)), rendering.ProvideService, wire.Bind(new(rendering.Service), new(*rendering.RenderingService)), routing.ProvideRegister, wire.Bind(new(routing.RouteRegister), new(*routing.RouteRegisterImpl)), hooks.ProvideService, kvstore.ProvideService, localcache.ProvideService, bundleregistry.ProvideService, wire.Bind(new(supportbundles.Service), new(*bundleregistry.Service)), updatemanager.ProvideGrafanaService, updatemanager.ProvidePluginsService, service.ProvideService, wire.Bind(new(usagestats.Service), new(*service.UsageStats)), validator2.ProvideService, legacy.ProvideLegacyMigrator, pluginsintegration.WireSet, dashboards.ProvideFileStoreManager, wire.Bind(new(dashboards.FileStore), new(*dashboards.FileStoreManager)), cloudwatch.ProvideService, cloudmonitoring.ProvideService, azuremonitor.ProvideService, postgres.ProvideService, mysql.ProvideService, mssql.ProvideService, store.ProvideEntityEventsService, dualwrite.ProvideService, httpclientprovider.New, wire.Bind(new(httpclient.Provider), new(*httpclient2.Provider)), serverlock.ProvideService, annotationsimpl.ProvideCleanupService, wire.Bind(new(annotations.Cleaner), new(*annotationsimpl.CleanupServiceImpl)), cleanup.ProvideService, shorturlimpl.ProvideService, wire.Bind(new(shorturls.Service), new(*shorturlimpl.ShortURLService)), queryhistory.ProvideService, wire.Bind(new(queryhistory.Service), new(*queryhistory.QueryHistoryService)), correlations.ProvideService, wire.Bind(new(correlations.Service), new(*correlations.CorrelationsService)), quotaimpl.ProvideService, remotecache.ProvideService, wire.Bind(new(remotecache.CacheStorage), new(*remotecache.RemoteCache)), authinfoimpl.ProvideService, wire.Bind(new(login.AuthInfoService), new(*authinfoimpl.Service)), authinfoimpl.ProvideStore, datasourceproxy.ProvideService, sort.ProvideService, search2.ProvideService, searchV2.ProvideService, searchV2.ProvideSearchHTTPService, store.ProvideService, store.ProvideSystemUsersService, live.ProvideService, pushhttp.ProvideService, contexthandler.ProvideService, service10.ProvideService, wire.Bind(new(service10.LDAP), new(*service10.LDAPImpl)), jwt.ProvideService, wire.Bind(new(jwt.JWTService), new(*jwt.AuthService)), store2.ProvideDBStore, image.ProvideDeleteExpiredService, ngalert.ProvideService, librarypanels.ProvideService, wire.Bind(new(librarypanels.Service), new(*librarypanels.LibraryPanelService)), libraryelements.ProvideService, wire.Bind(new(libraryelements.Service), new(*libraryelements.LibraryElementService)), notifications.ProvideService, notifications.ProvideSmtpService, github.ProvideFactory, tracing.ProvideService, tracing.ProvideTracingConfig, wire.Bind(new(tracing.Tracer), new(*tracing.TracingService)), withOTelSet, testdatasource.ProvideService, api4.ProvideService, opentsdb.ProvideService, socialimpl.ProvideService, influxdb.ProvideService, wire.Bind(new(social.Service), new(*socialimpl.SocialService)), tempo.ProvideService, loki.ProvideService, graphite.ProvideService, prometheus.ProvideService, elasticsearch.ProvideService, pyroscope.ProvideService, parca.ProvideService, zipkin.ProvideService, jaeger.ProvideService, service7.ProvideCacheService, wire.Bind(new(datasources.CacheService), new(*service7.CacheServiceImpl)), service2.ProvideEncryptionService, wire.Bind(new(encryption2.Internal), new(*service2.Service)), manager.ProvideSecretsService, wire.Bind(new(secrets2.Service), new(*manager.SecretsService)), database.ProvideSecretsStore, wire.Bind(new(secrets2.Store), new(*database.SecretsStoreImpl)), grafanads.ProvideService, wire.Bind(new(dashboardsnapshots.Store), new(*database4.DashboardSnapshotStore)), database4.ProvideStore, wire.Bind(new(dashboardsnapshots.Service), new(*service8.ServiceImpl)), service8.ProvideService, service7.ProvideService, wire.Bind(new(datasources.DataSourceService), new(*service7.Service)), service7.ProvideLegacyDataSourceLookup, retriever.ProvideService, wire.Bind(new(serviceaccounts.ServiceAccountRetriever), new(*retriever.Service)), ossaccesscontrol.ProvideServiceAccountPermissions, wire.Bind(new(accesscontrol.ServiceAccountPermissionsService), new(*ossaccesscontrol.ServiceAccountPermissionsService)), manager2.ProvideServiceAccountsService, proxy.ProvideServiceAccountsProxy, wire.Bind(new(serviceaccounts.Service), new(*proxy.ServiceAccountsProxy)), mtdsclient.NewNullMTDatasourceClientBuilder, expr.ProvideService, featuremgmt.ProvideManagerService, featuremgmt.ProvideToggles, service5.ProvideDashboardServiceImpl, wire.Bind(new(dashboards2.PermissionsRegistrationService), new(*service5.DashboardServiceImpl)), service5.ProvideDashboardService, service5.ProvideDashboardProvisioningService, service5.ProvideDashboardPluginService, database2.ProvideDashboardStore, folderimpl.ProvideService, wire.Bind(new(folder.Service), new(*folderimpl.Service)), folderimpl.ProvideStore, wire.Bind(new(folder.Store), new(*folderimpl.FolderStoreImpl)), folderimpl.ProvideDashboardFolderStore, wire.Bind(new(folder.FolderStore), new(*folderimpl.DashboardFolderStoreImpl)), service9.ProvideService, wire.Bind(new(dashboardimport.Service), new(*service9.ImportDashboardService)), service6.ProvideService, wire.Bind(new(plugindashboards.Service), new(*service6.Service)), service6.ProvideDashboardUpdater, sanitizer.ProvideService, kvstore2.ProvideService, avatar.ProvideAvatarCacheServer, statscollector.ProvideService, csrf.ProvideCSRFFilter, wire.Bind(new(csrf.Service), new(*csrf.CSRF)), ossaccesscontrol.ProvideTeamPermissions, wire.Bind(new(accesscontrol.TeamPermissionsService), new(*ossaccesscontrol.TeamPermissionsService)), ossaccesscontrol.ProvideFolderPermissions, wire.Bind(new(accesscontrol.FolderPermissionsService), new(*ossaccesscontrol.FolderPermissionsService)), ossaccesscontrol.ProvideDashboardPermissions, wire.Bind(new(accesscontrol.DashboardPermissionsService), new(*ossaccesscontrol.DashboardPermissionsService)), ossaccesscontrol.ProvideReceiverPermissionsService, wire.Bind(new(accesscontrol.ReceiverPermissionsService), new(*ossaccesscontrol.ReceiverPermissionsService)), starimpl.ProvideService, playlistimpl.ProvideService, apikeyimpl.ProvideService, dashverimpl.ProvideService, service3.ProvideService, wire.Bind(new(publicdashboards.Service), new(*service3.PublicDashboardServiceImpl)), database3.ProvideStore, wire.Bind(new(publicdashboards.Store), new(*database3.PublicDashboardStoreImpl)), metric.ProvideService, api2.ProvideApi, api3.ProvideApi, userimpl.ProvideService, orgimpl.ProvideService, orgimpl.ProvideDeletionService, statsimpl.ProvideService, grpccontext.ProvideContextHandler, grpcserver.ProvideHealthService, grpcserver.ProvideReflectionService, resolver.ProvideEntityReferenceResolver, teamimpl.ProvideService, teamapi.ProvideTeamAPI, tempuserimpl.ProvideService, loginattemptimpl.ProvideService, wire.Bind(new(loginattempt.Service), new(*loginattemptimpl.Service)), migrations2.ProvideDataSourceMigrationService, migrations2.ProvideSecretMigrationProvider, wire.Bind(new(migrations2.SecretMigrationProvider), new(*migrations2.SecretMigrationProviderImpl)), resourcepermissions.NewActionSetService, wire.Bind(new(accesscontrol.ActionResolver), new(resourcepermissions.ActionSetService)), wire.Bind(new(pluginaccesscontrol.ActionSetRegistry), new(resourcepermissions.ActionSetService)), permreg.ProvidePermissionRegistry, acimpl.ProvideAccessControl, dualwrite2.ProvideZanzanaReconciler, navtreeimpl.ProvideService, wire.Bind(new(accesscontrol.AccessControl), new(*acimpl.AccessControl)), wire.Bind(new(notifications.TempUserStore), new(tempuser.Service)), tagimpl.ProvideService, wire.Bind(new(tag.Service), new(*tagimpl.Service)), authnimpl.ProvideService, authnimpl.ProvideIdentitySynchronizer, authnimpl.ProvideAuthnService, authnimpl.ProvideAuthnServiceAuthenticateOnly, authnimpl.ProvideRegistration, supportbundlesimpl.ProvideService, extsvcaccounts.ProvideExtSvcAccountsService, wire.Bind(new(serviceaccounts.ExtSvcAccountsService), new(*extsvcaccounts.ExtSvcAccountsService)), registry2.ProvideExtSvcRegistry, wire.Bind(new(extsvcauth.ExternalServiceRegistry), new(*registry2.Registry)), anonstore.ProvideAnonDBStore, wire.Bind(new(anonstore.AnonStore), new(*anonstore.AnonDBStore)), loggermw.Provide, slogadapter.Provide, signingkeysimpl.ProvideEmbeddedSigningKeysService, wire.Bind(new(signingkeys.Service), new(*signingkeysimpl.Service)), ssosettingsimpl.ProvideService, wire.Bind(new(ssosettings.Service), new(*ssosettingsimpl.Service)), idimpl.ProvideService, wire.Bind(new(auth.IDService), new(*idimpl.Service)), cloudmigrationimpl.ProvideService, userimpl.ProvideVerifier, connectors.ProvideOrgRoleMapper, wire.Bind(new(user.Verifier), new(*userimpl.Verifier)), authz.WireSet, metadata.ProvideSecureValueMetadataStorage, metadata.ProvideKeeperMetadataStorage, metadata.ProvideDecryptStorage, decrypt.ProvideDecryptAuthorizer, decrypt.ProvideDecryptService, inline.ProvideInlineSecureValueService, encryption.ProvideDataKeyStorage, encryption.ProvideGlobalDataKeyStorage, encryption.ProvideEncryptedValueStorage, encryption.ProvideGlobalEncryptedValueStorage, service12.ProvideSecureValueService, validator3.ProvideKeeperValidator, validator3.ProvideSecureValueValidator, migrator2.NewWithEngine, database5.ProvideDatabase, wire.Bind(new(contracts.Database), new(*database5.Database)), manager4.ProvideEncryptionManager, service11.ProvideAESGCMCipherService, resource.ProvideStorageMetrics, resource.ProvideIndexMetrics, apiserver.WireSet, apiregistry.WireSet, appregistry.WireSet)
+var wireBasicSet = wire.NewSet(annotationsimpl.ProvideService, wire.Bind(new(annotations.Repository), new(*annotationsimpl.RepositoryImpl)), New, api.ProvideHTTPServer, query.ProvideService, wire.Bind(new(query.Service), new(*query.ServiceImpl)), bus.ProvideBus, wire.Bind(new(bus.Bus), new(*bus.InProcBus)), rendering.ProvideService, wire.Bind(new(rendering.Service), new(*rendering.RenderingService)), routing.ProvideRegister, wire.Bind(new(routing.RouteRegister), new(*routing.RouteRegisterImpl)), hooks.ProvideService, kvstore.ProvideService, localcache.ProvideService, bundleregistry.ProvideService, wire.Bind(new(supportbundles.Service), new(*bundleregistry.Service)), updatemanager.ProvideGrafanaService, updatemanager.ProvidePluginsService, service.ProvideService, wire.Bind(new(usagestats.Service), new(*service.UsageStats)), validator2.ProvideService, legacy.ProvideLegacyMigrator, pluginsintegration.WireSet, dashboards.ProvideFileStoreManager, wire.Bind(new(dashboards.FileStore), new(*dashboards.FileStoreManager)), cloudwatch.ProvideService, cloudmonitoring.ProvideService, azuremonitor.ProvideService, postgres.ProvideService, mysql.ProvideService, mssql.ProvideService, store.ProvideEntityEventsService, dualwrite.ProvideService, httpclientprovider.New, wire.Bind(new(httpclient.Provider), new(*httpclient2.Provider)), serverlock.ProvideService, annotationsimpl.ProvideCleanupService, wire.Bind(new(annotations.Cleaner), new(*annotationsimpl.CleanupServiceImpl)), cleanup.ProvideService, shorturlimpl.ProvideService, wire.Bind(new(shorturls.Service), new(*shorturlimpl.ShortURLService)), queryhistory.ProvideService, wire.Bind(new(queryhistory.Service), new(*queryhistory.QueryHistoryService)), correlations.ProvideService, wire.Bind(new(correlations.Service), new(*correlations.CorrelationsService)), quotaimpl.ProvideService, remotecache.ProvideService, wire.Bind(new(remotecache.CacheStorage), new(*remotecache.RemoteCache)), authinfoimpl.ProvideService, wire.Bind(new(login.AuthInfoService), new(*authinfoimpl.Service)), authinfoimpl.ProvideStore, datasourceproxy.ProvideService, sort.ProvideService, search2.ProvideService, searchV2.ProvideService, searchV2.ProvideSearchHTTPService, store.ProvideService, store.ProvideSystemUsersService, live.ProvideService, pushhttp.ProvideService, contexthandler.ProvideService, service10.ProvideService, wire.Bind(new(service10.LDAP), new(*service10.LDAPImpl)), jwt.ProvideService, wire.Bind(new(jwt.JWTService), new(*jwt.AuthService)), store2.ProvideDBStore, image.ProvideDeleteExpiredService, ngalert.ProvideService, librarypanels.ProvideService, wire.Bind(new(librarypanels.Service), new(*librarypanels.LibraryPanelService)), libraryelements.ProvideService, wire.Bind(new(libraryelements.Service), new(*libraryelements.LibraryElementService)), notifications.ProvideService, notifications.ProvideSmtpService, github.ProvideFactory, tracing.ProvideService, tracing.ProvideTracingConfig, wire.Bind(new(tracing.Tracer), new(*tracing.TracingService)), withOTelSet, testdatasource.ProvideService, api4.ProvideService, opentsdb.ProvideService, socialimpl.ProvideService, influxdb.ProvideService, wire.Bind(new(social.Service), new(*socialimpl.SocialService)), tempo.ProvideService, loki.ProvideService, graphite.ProvideService, prometheus.ProvideService, elasticsearch.ProvideService, pyroscope.ProvideService, parca.ProvideService, zipkin.ProvideService, jaeger.ProvideService, service7.ProvideCacheService, wire.Bind(new(datasources.CacheService), new(*service7.CacheServiceImpl)), service2.ProvideEncryptionService, wire.Bind(new(encryption2.Internal), new(*service2.Service)), manager.ProvideSecretsService, wire.Bind(new(secrets2.Service), new(*manager.SecretsService)), database.ProvideSecretsStore, wire.Bind(new(secrets2.Store), new(*database.SecretsStoreImpl)), grafanads.ProvideService, wire.Bind(new(dashboardsnapshots.Store), new(*database4.DashboardSnapshotStore)), database4.ProvideStore, wire.Bind(new(dashboardsnapshots.Service), new(*service8.ServiceImpl)), service8.ProvideService, service7.ProvideService, wire.Bind(new(datasources.DataSourceService), new(*service7.Service)), service7.ProvideLegacyDataSourceLookup, retriever.ProvideService, wire.Bind(new(serviceaccounts.ServiceAccountRetriever), new(*retriever.Service)), ossaccesscontrol.ProvideServiceAccountPermissions, wire.Bind(new(accesscontrol.ServiceAccountPermissionsService), new(*ossaccesscontrol.ServiceAccountPermissionsService)), manager2.ProvideServiceAccountsService, proxy.ProvideServiceAccountsProxy, wire.Bind(new(serviceaccounts.Service), new(*proxy.ServiceAccountsProxy)), mtdsclient.NewNullMTDatasourceClientBuilder, expr.ProvideService, featuremgmt.ProvideManagerService, featuremgmt.ProvideToggles, service5.ProvideDashboardServiceImpl, wire.Bind(new(dashboards2.PermissionsRegistrationService), new(*service5.DashboardServiceImpl)), service5.ProvideDashboardService, service5.ProvideDashboardProvisioningService, service5.ProvideDashboardPluginService, database2.ProvideDashboardStore, folderimpl.ProvideService, wire.Bind(new(folder.Service), new(*folderimpl.Service)), folderimpl.ProvideStore, wire.Bind(new(folder.Store), new(*folderimpl.FolderStoreImpl)), folderimpl.ProvideDashboardFolderStore, wire.Bind(new(folder.FolderStore), new(*folderimpl.DashboardFolderStoreImpl)), service9.ProvideService, wire.Bind(new(dashboardimport.Service), new(*service9.ImportDashboardService)), service6.ProvideService, wire.Bind(new(plugindashboards.Service), new(*service6.Service)), service6.ProvideDashboardUpdater, sanitizer.ProvideService, kvstore2.ProvideService, avatar.ProvideAvatarCacheServer, statscollector.ProvideService, csrf.ProvideCSRFFilter, wire.Bind(new(csrf.Service), new(*csrf.CSRF)), ossaccesscontrol.ProvideTeamPermissions, wire.Bind(new(accesscontrol.TeamPermissionsService), new(*ossaccesscontrol.TeamPermissionsService)), ossaccesscontrol.ProvideFolderPermissions, wire.Bind(new(accesscontrol.FolderPermissionsService), new(*ossaccesscontrol.FolderPermissionsService)), ossaccesscontrol.ProvideDashboardPermissions, wire.Bind(new(accesscontrol.DashboardPermissionsService), new(*ossaccesscontrol.DashboardPermissionsService)), ossaccesscontrol.ProvideReceiverPermissionsService, wire.Bind(new(accesscontrol.ReceiverPermissionsService), new(*ossaccesscontrol.ReceiverPermissionsService)), starimpl.ProvideService, playlistimpl.ProvideService, apikeyimpl.ProvideService, dashverimpl.ProvideService, service3.ProvideService, wire.Bind(new(publicdashboards.Service), new(*service3.PublicDashboardServiceImpl)), database3.ProvideStore, wire.Bind(new(publicdashboards.Store), new(*database3.PublicDashboardStoreImpl)), metric.ProvideService, api2.ProvideApi, api3.ProvideApi, userimpl.ProvideService, orgimpl.ProvideService, orgimpl.ProvideDeletionService, statsimpl.ProvideService, grpccontext.ProvideContextHandler, grpcserver.ProvideHealthService, grpcserver.ProvideReflectionService, resolver.ProvideEntityReferenceResolver, teamimpl.ProvideService, teamapi.ProvideTeamAPI, tempuserimpl.ProvideService, loginattemptimpl.ProvideService, wire.Bind(new(loginattempt.Service), new(*loginattemptimpl.Service)), migrations2.ProvideDataSourceMigrationService, migrations2.ProvideSecretMigrationProvider, wire.Bind(new(migrations2.SecretMigrationProvider), new(*migrations2.SecretMigrationProviderImpl)), resourcepermissions.NewActionSetService, wire.Bind(new(accesscontrol.ActionResolver), new(resourcepermissions.ActionSetService)), wire.Bind(new(pluginaccesscontrol.ActionSetRegistry), new(resourcepermissions.ActionSetService)), permreg.ProvidePermissionRegistry, acimpl.ProvideAccessControl, dualwrite2.ProvideZanzanaReconciler, navtreeimpl.ProvideService, wire.Bind(new(accesscontrol.AccessControl), new(*acimpl.AccessControl)), wire.Bind(new(notifications.TempUserStore), new(tempuser.Service)), tagimpl.ProvideService, wire.Bind(new(tag.Service), new(*tagimpl.Service)), authnimpl.ProvideService, authnimpl.ProvideIdentitySynchronizer, authnimpl.ProvideAuthnService, authnimpl.ProvideAuthnServiceAuthenticateOnly, authnimpl.ProvideRegistration, supportbundlesimpl.ProvideService, extsvcaccounts.ProvideExtSvcAccountsService, wire.Bind(new(serviceaccounts.ExtSvcAccountsService), new(*extsvcaccounts.ExtSvcAccountsService)), registry2.ProvideExtSvcRegistry, wire.Bind(new(extsvcauth.ExternalServiceRegistry), new(*registry2.Registry)), anonstore.ProvideAnonDBStore, wire.Bind(new(anonstore.AnonStore), new(*anonstore.AnonDBStore)), loggermw.Provide, slogadapter.Provide, signingkeysimpl.ProvideEmbeddedSigningKeysService, wire.Bind(new(signingkeys.Service), new(*signingkeysimpl.Service)), ssosettingsimpl.ProvideService, wire.Bind(new(ssosettings.Service), new(*ssosettingsimpl.Service)), idimpl.ProvideService, wire.Bind(new(auth.IDService), new(*idimpl.Service)), cloudmigrationimpl.ProvideService, userimpl.ProvideVerifier, connectors.ProvideOrgRoleMapper, wire.Bind(new(user.Verifier), new(*userimpl.Verifier)), authz.WireSet, metadata.ProvideSecureValueMetadataStorage, metadata.ProvideKeeperMetadataStorage, metadata.ProvideDecryptStorage, decrypt.ProvideDecryptAuthorizer, decrypt.ProvideDecryptService, inline.ProvideInlineSecureValueService, encryption.ProvideDataKeyStorage, encryption.ProvideGlobalDataKeyStorage, encryption.ProvideEncryptedValueStorage, encryption.ProvideGlobalEncryptedValueStorage, service12.ProvideSecureValueService, validator3.ProvideKeeperValidator, validator3.ProvideSecureValueValidator, mutator.ProvideKeeperMutator, mutator.ProvideSecureValueMutator, migrator2.NewWithEngine, database5.ProvideDatabase, wire.Bind(new(contracts.Database), new(*database5.Database)), manager4.ProvideEncryptionManager, service11.ProvideAESGCMCipherService, resource.ProvideStorageMetrics, resource.ProvideIndexMetrics, apiserver.WireSet, apiregistry.WireSet, appregistry.WireSet)
 
 var wireSet = wire.NewSet(
 	wireBasicSet, metrics.WireSet, sqlstore.ProvideService, metrics2.ProvideService, wire.Bind(new(notifications.Service), new(*notifications.NotificationService)), wire.Bind(new(notifications.WebhookSender), new(*notifications.NotificationService)), wire.Bind(new(notifications.EmailSender), new(*notifications.NotificationService)), wire.Bind(new(db.DB), new(*sqlstore.SQLStore)), prefimpl.ProvideService, oauthtoken.ProvideService, wire.Bind(new(oauthtoken.OAuthTokenService), new(*oauthtoken.Service)), wire.Bind(new(cleanup.AlertRuleService), new(*store2.DBstore)),

From 67c75de94245cdfbc58512e2df54d4d26b8b21f6 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Fri, 8 Aug 2025 13:32:04 +0200
Subject: [PATCH 043/243] InfluxDB: Ad hoc filters support for expressions
 (#109344)

* Support adhoc filters

* Tests
---
 .../datasource/influxdb/datasource.test.ts    | 154 ++++++++++++++++++
 .../plugins/datasource/influxdb/datasource.ts |  19 ++-
 2 files changed, 170 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.test.ts b/public/app/plugins/datasource/influxdb/datasource.test.ts
index 4633f20744a..12ae898d58d 100644
--- a/public/app/plugins/datasource/influxdb/datasource.test.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.test.ts
@@ -419,3 +419,157 @@ describe('interpolateQueryExpr', () => {
     expect(result.adhocFilters![0].value).toBe(templateVarValue);
   });
 });
+
+describe('interpolateVariablesInQueries', () => {
+  const templateSrvStub = {
+    replace: jest.fn().mockImplementation((target: string) => {
+      if (target === '$database') {
+        return 'test_db';
+      }
+      if (target === '$measurement') {
+        return 'cpu_usage';
+      }
+      if (target === 'SELECT * FROM $measurement WHERE database = "$database"') {
+        return 'SELECT * FROM cpu_usage WHERE database = "test_db"';
+      }
+      if (target === 'SELECT * FROM $measurement') {
+        return 'SELECT * FROM cpu_usage';
+      }
+      if (target === '$server') {
+        return 'prod-server';
+      }
+      return target;
+    }),
+  } as unknown as TemplateSrv;
+  let dsInfluxQL = getMockInfluxDS(getMockDSInstanceSettings(), templateSrvStub);
+  let dsFlux = getMockInfluxDS(getMockDSInstanceSettings({ version: InfluxVersion.Flux }), templateSrvStub);
+  let dsSQL = getMockInfluxDS(getMockDSInstanceSettings({ version: InfluxVersion.SQL }), templateSrvStub);
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should return an empty array if there are no queries', () => {
+    const result = dsInfluxQL.interpolateVariablesInQueries([], {}, []);
+    expect(result).toEqual([]);
+  });
+
+  it('should interpolate template variables in query rawQuery (Flux)', () => {
+    const queries: InfluxQuery[] = [
+      {
+        refId: 'A',
+        rawQuery: true,
+        query: 'SELECT * FROM $measurement WHERE database = "$database"',
+      } as InfluxQuery,
+    ];
+
+    const result = dsFlux.interpolateVariablesInQueries(queries, {}, []);
+
+    expect(result).toHaveLength(1);
+    expect(result[0].query).toBe('SELECT * FROM cpu_usage WHERE database = "test_db"');
+  });
+
+  it('should apply adhoc filters to queries (InfluxQL)', () => {
+    const queries: InfluxQuery[] = [
+      {
+        refId: 'A',
+        rawQuery: false,
+        measurement: 'cpu',
+        tags: [],
+      } as InfluxQuery,
+    ];
+
+    const adhocFilters: AdHocVariableFilter[] = [
+      { key: 'host', value: 'server1', operator: '=' },
+      { key: 'region', value: 'us-east', operator: '=' },
+    ];
+
+    const result = dsInfluxQL.interpolateVariablesInQueries(queries, {}, adhocFilters);
+
+    expect(result).toHaveLength(1);
+    expect(result[0].adhocFilters).toEqual(adhocFilters);
+  });
+
+  it('should apply adhoc filters to queries (SQL)', () => {
+    const queries: InfluxQuery[] = [
+      {
+        refId: 'A',
+        rawQuery: false,
+        measurement: 'cpu',
+        tags: [],
+      } as InfluxQuery,
+    ];
+
+    const adhocFilters: AdHocVariableFilter[] = [
+      { key: 'host', value: 'server1', operator: '=' },
+      { key: 'region', value: 'us-east', operator: '=' },
+    ];
+
+    const result = dsSQL.interpolateVariablesInQueries(queries, {}, adhocFilters);
+
+    expect(result).toHaveLength(1);
+    expect(result[0].adhocFilters).toEqual(adhocFilters);
+  });
+
+  it('should interpolate template variables in adhoc filter values (InfluxQL)', () => {
+    const templateSrvWithAdhoc = {
+      replace: jest.fn().mockImplementation((target: string) => {
+        if (target === '$server') {
+          return 'prod-server';
+        }
+        return target;
+      }),
+    } as unknown as TemplateSrv;
+
+    const ds = getMockInfluxDS(getMockDSInstanceSettings({ version: InfluxVersion.InfluxQL }), templateSrvWithAdhoc);
+    const queries: InfluxQuery[] = [
+      {
+        refId: 'A',
+        rawQuery: false,
+        measurement: 'cpu',
+        tags: [],
+      } as InfluxQuery,
+    ];
+
+    const adhocFilters: AdHocVariableFilter[] = [{ key: 'host', value: '$server', operator: '=' }];
+
+    const result = ds.interpolateVariablesInQueries(queries, {}, adhocFilters);
+
+    expect(result[0].adhocFilters![0].value).toBe('prod-server');
+  });
+
+  it('should preserve existing tags when applying adhoc filters', () => {
+    const queries: InfluxQuery[] = [
+      {
+        refId: 'A',
+        rawQuery: false,
+        measurement: 'cpu',
+        tags: [{ key: 'datacenter', value: 'dc1', operator: '=' }],
+      } as InfluxQuery,
+    ];
+
+    const adhocFilters: AdHocVariableFilter[] = [{ key: 'host', value: 'server1', operator: '=' }];
+
+    const result = dsInfluxQL.interpolateVariablesInQueries(queries, {}, adhocFilters);
+
+    expect(result[0].tags?.length).toEqual(2);
+    expect(result[0].tags![0]).toEqual({ key: 'datacenter', value: 'dc1', operator: '=' });
+    expect(result[0].tags![1]).toEqual({ key: 'host', value: 'server1', operator: '=' });
+    expect(result[0].adhocFilters).toEqual(adhocFilters);
+  });
+
+  it('should handle empty adhoc filters array', () => {
+    const queries: InfluxQuery[] = [
+      {
+        refId: 'A',
+        rawQuery: true,
+        query: 'SELECT * FROM cpu',
+      } as InfluxQuery,
+    ];
+
+    const result = dsInfluxQL.interpolateVariablesInQueries(queries, {}, []);
+
+    expect(result).toHaveLength(1);
+    expect(result[0].adhocFilters).toEqual([]);
+  });
+});
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index a21031f20ab..b073f333fcd 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -221,7 +221,11 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
     return this.templateSrv.containsTemplate(queryText);
   }
 
-  interpolateVariablesInQueries(queries: InfluxQuery[], scopedVars: ScopedVars): InfluxQuery[] {
+  interpolateVariablesInQueries(
+    queries: InfluxQuery[],
+    scopedVars: ScopedVars,
+    filters?: AdHocVariableFilter[]
+  ): InfluxQuery[] {
     if (!queries || queries.length === 0) {
       return [];
     }
@@ -240,10 +244,19 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
         };
       }
 
+      const queryWithVariables = this.applyVariables(query, scopedVars, filters);
+      if (queryWithVariables.adhocFilters?.length) {
+        queryWithVariables.adhocFilters = (queryWithVariables.adhocFilters ?? []).map((af) => {
+          const { condition, ...asTag } = af;
+          asTag.value = this.templateSrv.replace(asTag.value ?? '', scopedVars);
+          return asTag;
+        });
+        queryWithVariables.tags = [...(queryWithVariables.tags ?? []), ...queryWithVariables.adhocFilters];
+      }
+
       return {
-        ...query,
+        ...queryWithVariables,
         datasource: this.getRef(),
-        ...this.applyVariables(query, scopedVars),
       };
     });
   }

From 3a4dc10d3f12cc7d2167dabe5cb2fa13226aafdd Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Fri, 8 Aug 2025 13:12:33 +0100
Subject: [PATCH 044/243] Chore: skip failing DashboardMigratorToBackend test
 (#109387)

---
 .../features/dashboard/state/DashboardMigratorToBackend.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts b/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
index 23cc35596ae..07ca5cf2849 100644
--- a/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
+++ b/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
@@ -113,7 +113,7 @@ describe('Backend / Frontend result comparison', () => {
   const jsonInputs = readdirSync(inputDir);
 
   jsonInputs.forEach((inputFile) => {
-    it(`should migrate ${inputFile} correctly`, async () => {
+    it.skip(`should migrate ${inputFile} correctly`, async () => {
       const jsonInput = JSON.parse(readFileSync(path.join(inputDir, inputFile), 'utf8'));
       const backendOutput = JSON.parse(readFileSync(path.join(outputDir, inputFile), 'utf8'));
 

From f3ca49f2b3d3a0d06a04c26a61431f468c806fb3 Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Fri, 8 Aug 2025 14:24:17 +0200
Subject: [PATCH 045/243] Chore: Use proper database in integration tests
 (#109119)

* Chore: Apply proper database settings to integration tests

* add logging

* join host and port in database config to override default ports

* apply test fixes from the original pr

* host might contain port already

* increase timeout

* increase timeout even more

* even larger timeouts

* Use eventually for stats

* Use eventually also for listing settings as index takes some time

---------

Co-authored-by: Roberto Jimenez Sanchez <roberto.jimenez@grafana.com>
---
 pkg/services/sqlstore/database_config.go      |  3 +
 pkg/services/sqlstore/sqlutil/sqlutil.go      | 15 ++++
 .../apis/provisioning/repository_test.go      | 87 +++++++++++--------
 pkg/tests/testinfra/testinfra.go              | 17 ++++
 4 files changed, 84 insertions(+), 38 deletions(-)

diff --git a/pkg/services/sqlstore/database_config.go b/pkg/services/sqlstore/database_config.go
index 47e77640aa8..c1d80ceb32d 100644
--- a/pkg/services/sqlstore/database_config.go
+++ b/pkg/services/sqlstore/database_config.go
@@ -94,6 +94,9 @@ func (dbCfg *DatabaseConfig) readConfig(cfg *setting.Cfg) error {
 	} else {
 		dbCfg.Type = sec.Key("type").String()
 		dbCfg.Host = sec.Key("host").String()
+		if port := sec.Key("port").String(); port != "" {
+			dbCfg.Host = dbCfg.Host + ":" + port
+		}
 		dbCfg.Name = sec.Key("name").String()
 		dbCfg.User = sec.Key("user").String()
 		dbCfg.ConnectionString = sec.Key("connection_string").String()
diff --git a/pkg/services/sqlstore/sqlutil/sqlutil.go b/pkg/services/sqlstore/sqlutil/sqlutil.go
index 8506acdab79..7d3d09a5ff3 100644
--- a/pkg/services/sqlstore/sqlutil/sqlutil.go
+++ b/pkg/services/sqlstore/sqlutil/sqlutil.go
@@ -22,6 +22,11 @@ type TestDB struct {
 	DriverName string
 	ConnStr    string
 	Path       string
+	Host       string
+	Port       string
+	User       string
+	Password   string
+	Database   string
 	Cleanup    func()
 }
 
@@ -132,6 +137,11 @@ func mySQLTestDB() (*TestDB, error) {
 	return &TestDB{
 		DriverName: "mysql",
 		ConnStr:    conn_str,
+		Host:       host,
+		Port:       port,
+		User:       "grafana",
+		Password:   "password",
+		Database:   "grafana_tests",
 		Cleanup:    func() {},
 	}, nil
 }
@@ -149,6 +159,11 @@ func postgresTestDB() (*TestDB, error) {
 	return &TestDB{
 		DriverName: "postgres",
 		ConnStr:    connStr,
+		Host:       host,
+		Port:       port,
+		User:       "grafanatest",
+		Password:   "grafanatest",
+		Database:   "grafanatest",
 		Cleanup:    func() {},
 	}, nil
 }
diff --git a/pkg/tests/apis/provisioning/repository_test.go b/pkg/tests/apis/provisioning/repository_test.go
index fcf1b2185d2..f2e366fa233 100644
--- a/pkg/tests/apis/provisioning/repository_test.go
+++ b/pkg/tests/apis/provisioning/repository_test.go
@@ -115,50 +115,61 @@ func TestIntegrationProvisioning_CreatingAndGetting(t *testing.T) {
 
 	// Viewer can see settings listing
 	t.Run("viewer has access to list", func(t *testing.T) {
-		settings := &provisioning.RepositoryViewList{}
-		rsp := helper.ViewerREST.Get().
-			Namespace("default").
-			Suffix("settings").
-			Do(context.Background())
-		require.NoError(t, rsp.Error())
-		err := rsp.Into(settings)
-		require.NoError(t, err)
-		require.Len(t, settings.Items, len(inputFiles))
+		require.EventuallyWithT(t, func(collect *assert.CollectT) {
+			settings := &provisioning.RepositoryViewList{}
+			rsp := helper.ViewerREST.Get().
+				Namespace("default").
+				Suffix("settings").
+				Do(context.Background())
+			if !assert.NoError(collect, rsp.Error()) {
+				return
+			}
 
-		// FIXME: this should be an enterprise integration test
-		if extensions.IsEnterprise {
-			require.ElementsMatch(t, []provisioning.RepositoryType{
-				provisioning.LocalRepositoryType,
-				provisioning.GitHubRepositoryType,
-				provisioning.GitRepositoryType,
-				provisioning.BitbucketRepositoryType,
-				provisioning.GitLabRepositoryType,
-			}, settings.AvailableRepositoryTypes)
-		} else {
-			require.ElementsMatch(t, []provisioning.RepositoryType{
-				provisioning.LocalRepositoryType,
-				provisioning.GitHubRepositoryType,
-			}, settings.AvailableRepositoryTypes)
-		}
+			err := rsp.Into(settings)
+			if !assert.NoError(collect, err) {
+				return
+			}
+			if !assert.Len(collect, settings.Items, len(inputFiles)) {
+				return
+			}
+
+			// FIXME: this should be an enterprise integration test
+			if extensions.IsEnterprise {
+				assert.ElementsMatch(collect, []provisioning.RepositoryType{
+					provisioning.LocalRepositoryType,
+					provisioning.GitHubRepositoryType,
+					provisioning.GitRepositoryType,
+					provisioning.BitbucketRepositoryType,
+					provisioning.GitLabRepositoryType,
+				}, settings.AvailableRepositoryTypes)
+			} else {
+				assert.ElementsMatch(collect, []provisioning.RepositoryType{
+					provisioning.LocalRepositoryType,
+					provisioning.GitHubRepositoryType,
+				}, settings.AvailableRepositoryTypes)
+			}
+		}, time.Second*10, time.Millisecond*100, "Expected settings to match")
 	})
 
 	t.Run("Repositories are reported in stats", func(t *testing.T) {
-		report := apis.DoRequest(helper.K8sTestHelper, apis.RequestParams{
-			Method: http.MethodGet,
-			Path:   "/api/admin/usage-report-preview",
-			User:   helper.Org1.Admin,
-		}, &usagestats.Report{})
+		require.EventuallyWithT(t, func(collect *assert.CollectT) {
+			report := apis.DoRequest(helper.K8sTestHelper, apis.RequestParams{
+				Method: http.MethodGet,
+				Path:   "/api/admin/usage-report-preview",
+				User:   helper.Org1.Admin,
+			}, &usagestats.Report{})
 
-		stats := map[string]any{}
-		for k, v := range report.Result.Metrics {
-			if strings.HasPrefix(k, "stats.repository.") {
-				stats[k] = v
+			stats := map[string]any{}
+			for k, v := range report.Result.Metrics {
+				if strings.HasPrefix(k, "stats.repository.") {
+					stats[k] = v
+				}
 			}
-		}
-		require.Equal(t, map[string]any{
-			"stats.repository.github.count": 1.0,
-			"stats.repository.local.count":  1.0,
-		}, stats)
+			assert.Equal(collect, map[string]any{
+				"stats.repository.github.count": 1.0,
+				"stats.repository.local.count":  1.0,
+			}, stats)
+		}, time.Second*10, time.Millisecond*100, "Expected stats to match")
 	})
 }
 
diff --git a/pkg/tests/testinfra/testinfra.go b/pkg/tests/testinfra/testinfra.go
index 1aa4380467a..1cac67b10ff 100644
--- a/pkg/tests/testinfra/testinfra.go
+++ b/pkg/tests/testinfra/testinfra.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -85,6 +86,22 @@ func StartGrafanaEnv(t *testing.T, grafDir, cfgPath string) (string, *server.Tes
 
 	err = featuremgmt.InitOpenFeatureWithCfg(cfg)
 	require.NoError(t, err)
+
+	// Use proper database type based on the environment variable GRAFANA_TEST_DB in tests
+	testDB, err := sqlutil.GetTestDB(sqlutil.GetTestDBType())
+	require.NoError(t, err)
+	t.Cleanup(testDB.Cleanup)
+
+	dbCfg := cfg.Raw.Section("database")
+	dbCfg.Key("type").SetValue(testDB.DriverName)
+	dbCfg.Key("host").SetValue(testDB.Host)
+	dbCfg.Key("port").SetValue(testDB.Port)
+	dbCfg.Key("user").SetValue(testDB.User)
+	dbCfg.Key("password").SetValue(testDB.Password)
+	dbCfg.Key("name").SetValue(testDB.Database)
+
+	t.Log("Using test database", "type", testDB.DriverName, "host", testDB.Host, "port", testDB.Port, "user", testDB.User, "name", testDB.Database)
+
 	env, err := server.InitializeForTest(t, t, cfg, serverOpts, apiServerOpts)
 	require.NoError(t, err)
 

From e1e9a570afdc2b917cb7ade4f756d7669e292cfd Mon Sep 17 00:00:00 2001
From: Sergej-Vlasov <37613182+Sergej-Vlasov@users.noreply.github.com>
Date: Fri, 8 Aug 2025 13:42:51 +0100
Subject: [PATCH 046/243] TabsLayout: Rethinking tab repeats (#108134)

* wip: rework tab repeat behaviour

* wip: tab repeats rendering

* wip: tab repeats rework

* rework tab drag and drop to account for repeats

* add TabItemRepeater tests

* clean up

* prevent canvas actions in cloned tabs and rows

* add repeat name into tab title

* prettier ffix

* fix cloneLayout bug

* remove experimental title adjustment on repeat
---
 .../scene/layout-rows/RowsLayoutManager.tsx   |   5 +-
 .../layout-rows/RowsLayoutManagerRenderer.tsx |   5 +-
 .../scene/layout-tabs/TabItem.tsx             |  24 +-
 .../scene/layout-tabs/TabItemEditor.tsx       |   2 +-
 .../scene/layout-tabs/TabItemRenderer.tsx     |   4 +-
 .../layout-tabs/TabItemRepeater.test.tsx      | 165 +++++++++++
 .../scene/layout-tabs/TabItemRepeater.tsx     | 192 +++++++++++++
 .../TabItemRepeaterBehavior.test.tsx          | 272 ------------------
 .../layout-tabs/TabItemRepeaterBehavior.ts    | 161 -----------
 .../scene/layout-tabs/TabsLayoutManager.tsx   | 125 +++++---
 .../layout-tabs/TabsLayoutManagerRenderer.tsx |  24 +-
 .../layoutSerializers/TabsLayoutSerializer.ts |  23 +-
 public/locales/en-US/grafana.json             |   1 +
 13 files changed, 481 insertions(+), 522 deletions(-)
 create mode 100644 public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.test.tsx
 create mode 100644 public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.tsx
 delete mode 100644 public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeaterBehavior.test.tsx
 delete mode 100644 public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeaterBehavior.ts

diff --git a/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx b/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx
index 1b04a9d6c23..1cdf72a480c 100644
--- a/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx
@@ -17,7 +17,6 @@ import { getDashboardSceneFor } from '../../utils/utils';
 import { DashboardGridItem } from '../layout-default/DashboardGridItem';
 import { DefaultGridLayoutManager } from '../layout-default/DefaultGridLayoutManager';
 import { RowRepeaterBehavior } from '../layout-default/RowRepeaterBehavior';
-import { TabItemRepeaterBehavior } from '../layout-tabs/TabItemRepeaterBehavior';
 import { TabsLayoutManager } from '../layout-tabs/TabsLayoutManager';
 import { getRowFromClipboard } from '../layouts-shared/paste';
 import { generateUniqueTitle, ungroupLayout } from '../layouts-shared/utils';
@@ -196,14 +195,12 @@ export class RowsLayoutManager extends SceneObjectBase<RowsLayoutManagerState> i
         const conditionalRendering = tab.state.conditionalRendering;
         conditionalRendering?.clearParent();
 
-        const behavior = tab.state.$behaviors?.find((b) => b instanceof TabItemRepeaterBehavior);
-
         rows.push(
           new RowItem({
             layout: tab.state.layout.clone(),
             title: tab.state.title,
             conditionalRendering,
-            repeatByVariable: behavior?.state.variableName,
+            repeatByVariable: tab.state.repeatByVariable,
           })
         );
       }
diff --git a/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManagerRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManagerRenderer.tsx
index 17c19241f83..9c74a5b37a7 100644
--- a/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManagerRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManagerRenderer.tsx
@@ -7,6 +7,7 @@ import { Trans } from '@grafana/i18n';
 import { MultiValueVariable, SceneComponentProps, sceneGraph, useSceneObjectState } from '@grafana/scenes';
 import { Button, useStyles2 } from '@grafana/ui';
 
+import { isInCloneChain } from '../../utils/clone';
 import { useDashboardState } from '../../utils/utils';
 import { useClipboardState } from '../layouts-shared/useClipboardState';
 
@@ -20,6 +21,8 @@ export function RowLayoutManagerRenderer({ model }: SceneComponentProps<RowsLayo
   const styles = useStyles2(getStyles);
   const { hasCopiedRow } = useClipboardState();
 
+  const isClone = isInCloneChain(rows[0]?.state.key || '');
+
   return (
     <DragDropContext
       onBeforeDragStart={(start) => model.forceSelectRow(start.draggableId)}
@@ -42,7 +45,7 @@ export function RowLayoutManagerRenderer({ model }: SceneComponentProps<RowsLayo
               <RowWrapper row={row} manager={model} key={row.state.key!} />
             ))}
             {dropProvided.placeholder}
-            {isEditing && (
+            {isEditing && !isClone && (
               <div className="dashboard-canvas-add-button">
                 <Button
                   icon="plus"
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx
index 7ebc9e07b1c..655f0470925 100644
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx
@@ -32,7 +32,6 @@ import { LayoutParent } from '../types/LayoutParent';
 
 import { useEditOptions } from './TabItemEditor';
 import { TabItemRenderer } from './TabItemRenderer';
-import { TabItemRepeaterBehavior } from './TabItemRepeaterBehavior';
 import { TabItems } from './TabItems';
 import { TabsLayoutManager } from './TabsLayoutManager';
 
@@ -41,6 +40,8 @@ export interface TabItemState extends SceneObjectState {
   title?: string;
   isDropTarget?: boolean;
   conditionalRendering?: ConditionalRendering;
+  repeatByVariable?: string;
+  repeatedTabs?: TabItem[];
 }
 
 export class TabItem
@@ -179,19 +180,10 @@ export class TabItem
   }
 
   public onChangeRepeat(repeat: string | undefined) {
-    let repeatBehavior = this._getRepeatBehavior();
-
     if (repeat) {
-      // Remove repeat behavior if it exists to trigger repeat when adding new one
-      if (repeatBehavior) {
-        repeatBehavior.removeBehavior();
-      }
-
-      repeatBehavior = new TabItemRepeaterBehavior({ variableName: repeat });
-      this.setState({ $behaviors: [...(this.state.$behaviors ?? []), repeatBehavior] });
-      repeatBehavior.activate();
+      this.setState({ repeatByVariable: repeat });
     } else {
-      repeatBehavior?.removeBehavior();
+      this.setState({ repeatedTabs: undefined, $variables: undefined, repeatByVariable: undefined });
     }
   }
 
@@ -218,10 +210,6 @@ export class TabItem
     }
   }
 
-  public getRepeatVariable(): string | undefined {
-    return this._getRepeatBehavior()?.state.variableName;
-  }
-
   public getParentLayout(): TabsLayoutManager {
     return sceneGraph.getAncestor(this, TabsLayoutManager);
   }
@@ -240,8 +228,4 @@ export class TabItem
     const duplicateTitles = parentLayout.duplicateTitles();
     return !duplicateTitles.has(this.state.title);
   }
-
-  private _getRepeatBehavior(): TabItemRepeaterBehavior | undefined {
-    return this.state.$behaviors?.find((b) => b instanceof TabItemRepeaterBehavior);
-  }
 }
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemEditor.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemEditor.tsx
index 558ff0d147f..0a2b0b3f30e 100644
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemEditor.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemEditor.tsx
@@ -105,7 +105,7 @@ function TabRepeatSelect({ tab }: { tab: TabItem }) {
     <>
       <RepeatRowSelect2
         sceneContext={dashboard}
-        repeat={tab.getRepeatVariable()}
+        repeat={tab.state.repeatByVariable}
         onChange={(repeat) => tab.onChangeRepeat(repeat)}
       />
       {isAnyPanelUsingDashboardDS ? (
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRenderer.tsx
index dc14f4531fe..9d725a175a8 100644
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRenderer.tsx
@@ -16,13 +16,13 @@ import { TabItem } from './TabItem';
 export function TabItemRenderer({ model }: SceneComponentProps<TabItem>) {
   const { title, key, isDropTarget } = model.useState();
   const parentLayout = model.getParentLayout();
-  const { tabs, currentTabIndex } = parentLayout.useState();
+  const { currentTabIndex } = parentLayout.useState();
   const titleInterpolated = sceneGraph.interpolate(model, title, undefined, 'text');
   const { isSelected, onSelect, isSelectable } = useElementSelection(key);
   const { isEditing } = useDashboardState(model);
   const mySlug = model.getSlug();
   const urlKey = parentLayout.getUrlKey();
-  const myIndex = tabs.findIndex((tab) => tab === model);
+  const myIndex = parentLayout.getTabs().findIndex((tab) => tab === model);
   const isActive = myIndex === currentTabIndex;
   const location = useLocation();
   const href = textUtil.sanitize(locationUtil.getUrlForPartial(location, { [urlKey]: mySlug }));
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.test.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.test.tsx
new file mode 100644
index 00000000000..6533dab789d
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.test.tsx
@@ -0,0 +1,165 @@
+import { act, screen, waitFor } from '@testing-library/react';
+import { render } from 'test/test-utils';
+
+import { VariableRefresh } from '@grafana/data';
+import { getPanelPlugin } from '@grafana/data/test';
+import { setPluginImportUtils } from '@grafana/runtime';
+import { SceneTimeRange, SceneVariableSet, TestVariable, VariableValueOption, PanelBuilders } from '@grafana/scenes';
+import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE } from 'app/features/variables/constants';
+import { TextMode } from 'app/plugins/panel/text/panelcfg.gen';
+
+import { DashboardScene } from '../DashboardScene';
+import { AutoGridItem } from '../layout-auto-grid/AutoGridItem';
+import { AutoGridLayout } from '../layout-auto-grid/AutoGridLayout';
+import { AutoGridLayoutManager } from '../layout-auto-grid/AutoGridLayoutManager';
+
+import { TabItem } from './TabItem';
+import { TabsLayoutManager } from './TabsLayoutManager';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  setPluginExtensionGetter: jest.fn(),
+  getPluginLinkExtensions: jest.fn().mockReturnValue({ extensions: [] }),
+}));
+
+setPluginImportUtils({
+  importPanelPlugin: () => Promise.resolve(getPanelPlugin({})),
+  getPanelPluginFromCache: () => undefined,
+});
+
+describe('TabItemRepeater', () => {
+  describe('Given scene with variable with 3 values', () => {
+    it('Should repeat tab', async () => {
+      const { tabToRepeat } = renderScene({ variableQueryTime: 0 });
+
+      await waitFor(() => {
+        expect(screen.queryByText('Tab A')).toBeInTheDocument();
+        expect(screen.queryByText('Tab B')).toBeInTheDocument();
+        expect(screen.queryByText('Tab C')).toBeInTheDocument();
+      });
+
+      expect(tabToRepeat.state.key).toBe('tab-1-clone-0');
+      expect(tabToRepeat.state.repeatedTabs!.length).toBe(2);
+      expect(tabToRepeat.state.repeatedTabs![0].state.key).toBe('tab-1-clone-1');
+    });
+
+    it('Should update repeats when variable value changes', async () => {
+      const { repeatByVariable, tabToRepeat } = renderScene({ variableQueryTime: 0 });
+
+      await waitFor(() => {
+        expect(screen.queryByText('Tab C')).toBeInTheDocument();
+      });
+
+      act(() => {
+        repeatByVariable.changeValueTo(['C', 'D']);
+      });
+
+      await waitFor(() => {
+        expect(screen.queryByText('Tab A')).not.toBeInTheDocument();
+        expect(screen.queryByText('Tab D')).toBeInTheDocument();
+      });
+
+      expect(tabToRepeat.state.repeatedTabs!.length).toBe(1);
+    });
+
+    it('Should skip update repeats when variable values the same', async () => {
+      const { repeatByVariable, tabToRepeat } = renderScene({ variableQueryTime: 0 });
+      let stateUpdates = 0;
+
+      tabToRepeat.subscribeToState((s) => stateUpdates++);
+
+      await waitFor(() => {
+        expect(screen.queryByText('Tab C')).toBeInTheDocument();
+      });
+
+      act(() => {
+        repeatByVariable.changeValueTo(['A1', 'B1', 'C1']);
+      });
+
+      expect(stateUpdates).toBe(1);
+    });
+
+    it('Should handle removing repeats', async () => {
+      const { tabToRepeat } = renderScene({ variableQueryTime: 0 });
+
+      await waitFor(() => {
+        expect(screen.queryByText('Tab C')).toBeInTheDocument();
+      });
+
+      act(() => {
+        tabToRepeat.onChangeRepeat(undefined);
+      });
+
+      expect(screen.queryByText('Tab C')).not.toBeInTheDocument();
+      expect(tabToRepeat.state.$variables).toBe(undefined);
+      expect(tabToRepeat.state.repeatedTabs).toBe(undefined);
+      expect(tabToRepeat.state.repeatByVariable).toBe(undefined);
+    });
+  });
+});
+
+interface SceneOptions {
+  variableQueryTime: number;
+  variableRefresh?: VariableRefresh;
+}
+
+function buildTextPanel(key: string, content: string) {
+  const panel = PanelBuilders.text().setOption('content', content).setOption('mode', TextMode.Markdown).build();
+  panel.setState({ key });
+  return panel;
+}
+
+function renderScene(
+  options: SceneOptions,
+  variableOptions?: VariableValueOption[],
+  variableStateOverrides?: { isMulti: boolean }
+) {
+  const tabs = [
+    new TabItem({
+      key: 'tab-1',
+      title: 'Tab $server',
+      repeatByVariable: 'server',
+      layout: new AutoGridLayoutManager({
+        layout: new AutoGridLayout({
+          children: [
+            new AutoGridItem({
+              body: buildTextPanel('text-1', 'Panel inside repeated tab, server = $server'),
+            }),
+          ],
+        }),
+      }),
+    }),
+  ];
+
+  const layout = new TabsLayoutManager({ tabs });
+  const repeatByVariable = new TestVariable({
+    name: 'server',
+    query: 'A.*',
+    value: ALL_VARIABLE_VALUE,
+    text: ALL_VARIABLE_TEXT,
+    isMulti: true,
+    includeAll: true,
+    delayMs: options.variableQueryTime,
+    refresh: options.variableRefresh,
+    optionsToReturn: variableOptions ?? [
+      { label: 'A', value: 'A1' },
+      { label: 'B', value: 'B1' },
+      { label: 'C', value: 'C1' },
+    ],
+    ...variableStateOverrides,
+  });
+
+  const scene = new DashboardScene({
+    $timeRange: new SceneTimeRange({ from: 'now-6h', to: 'now' }),
+    $variables: new SceneVariableSet({
+      variables: [repeatByVariable],
+    }),
+    body: layout,
+  });
+
+  const tabToRepeat = tabs[0];
+
+  render(<scene.Component model={scene} />);
+
+  return { scene, layout, tabs, tabToRepeat, repeatByVariable };
+}
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.tsx
new file mode 100644
index 00000000000..9c3291b25d2
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.tsx
@@ -0,0 +1,192 @@
+import { css } from '@emotion/css';
+import { isEqual } from 'lodash';
+import { useEffect } from 'react';
+
+import { t } from '@grafana/i18n';
+import {
+  MultiValueVariable,
+  SceneVariableSet,
+  LocalValueVariable,
+  sceneGraph,
+  VariableValueSingle,
+} from '@grafana/scenes';
+import { Spinner, Tooltip, useStyles2 } from '@grafana/ui';
+
+import { DashboardStateChangedEvent } from '../../edit-pane/shared';
+import { getCloneKey } from '../../utils/clone';
+import { dashboardLog, getMultiVariableValues } from '../../utils/utils';
+import { DashboardRepeatsProcessedEvent } from '../types/DashboardRepeatsProcessedEvent';
+
+import { TabItem } from './TabItem';
+import { TabsLayoutManager } from './TabsLayoutManager';
+
+export interface Props {
+  tab: TabItem;
+  manager: TabsLayoutManager;
+  variable: MultiValueVariable;
+}
+
+export function TabItemRepeater({
+  tab,
+  variable,
+}: {
+  tab: TabItem;
+  manager: TabsLayoutManager;
+  variable: MultiValueVariable;
+}) {
+  const { repeatedTabs } = tab.useState();
+  const styles = useStyles2(getStyles);
+
+  // Subscribe to variable state changes and perform repeats when the variable changes
+  useEffect(() => {
+    performTabRepeats(variable, tab, false);
+
+    const variableChangeSub = variable.subscribeToState((state) => performTabRepeats(variable, tab, false));
+    const editEventSub = tab.subscribeToEvent(DashboardStateChangedEvent, (e) =>
+      performTabRepeats(variable, tab, true)
+    );
+
+    return () => {
+      editEventSub.unsubscribe();
+      variableChangeSub.unsubscribe();
+    };
+  }, [variable, tab]);
+
+  if (
+    repeatedTabs === undefined ||
+    sceneGraph.hasVariableDependencyInLoadingState(variable) ||
+    variable.state.loading
+  ) {
+    dashboardLog.logger('TabItemRepeater', false, 'Variable is loading, showing spinner');
+    return (
+      <Tooltip content={t('dashboard.tabs-layout.tab.repeat.loading', 'Loading tab repeats')}>
+        <div className={styles.spinnerWrapper}>
+          <Spinner />
+        </div>
+      </Tooltip>
+    );
+  }
+
+  return (
+    <>
+      <tab.Component model={tab} key={tab.state.key!} />
+      {repeatedTabs?.map((tabClone) => (
+        <tabClone.Component model={tabClone} key={tabClone.state.key!} />
+      ))}
+    </>
+  );
+}
+
+export function performTabRepeats(variable: MultiValueVariable, tab: TabItem, contentChanged: boolean) {
+  if (sceneGraph.hasVariableDependencyInLoadingState(variable)) {
+    dashboardLog.logger('TabItemRepeater', false, 'Skipped dependency in loading state');
+    return;
+  }
+
+  if (variable.state.loading) {
+    dashboardLog.logger('TabItemRepeater', false, 'Skipped, variable is loading');
+    return;
+  }
+
+  const { values, texts } = getMultiVariableValues(variable);
+  const prevValues = getPrevRepeatValues(tab, variable.state.name);
+
+  if (!contentChanged && isEqual(prevValues, values)) {
+    dashboardLog.logger('TabItemRepeater', false, 'Skipped, values the same');
+    return;
+  }
+
+  if (contentChanged) {
+    dashboardLog.logger('TabItemRepeater', false, 'Performing repeats, contentChanged');
+  } else {
+    dashboardLog.logger('TabItemRepeater', false, 'Performing repeats, variable values changed', values);
+  }
+
+  const clonedTabs = createTabRepeats({ values, texts, variable, tab });
+
+  tab.setState({ repeatedTabs: clonedTabs });
+  tab.publishEvent(new DashboardRepeatsProcessedEvent({ source: tab }), true);
+}
+
+/**
+ * Get previous variable values given the current repeated state
+ */
+function getPrevRepeatValues(mainTab: TabItem, varName: string): VariableValueSingle[] {
+  const values: VariableValueSingle[] = [];
+
+  if (!mainTab.state.repeatedTabs) {
+    return [];
+  }
+
+  function collectVariableValue(tab: TabItem) {
+    const variable = sceneGraph.lookupVariable(varName, tab);
+    if (variable) {
+      const value = variable.getValue();
+      if (value != null && !Array.isArray(value)) {
+        values.push(value);
+      }
+    }
+  }
+
+  collectVariableValue(mainTab);
+
+  for (const tab of mainTab.state.repeatedTabs) {
+    collectVariableValue(tab);
+  }
+
+  return values;
+}
+
+export function createTabRepeats({
+  values,
+  texts,
+  variable,
+  tab,
+}: {
+  values: VariableValueSingle[];
+  texts: VariableValueSingle[];
+  variable: MultiValueVariable;
+  tab: TabItem;
+}) {
+  const variableValues = values.length ? values : [''];
+  const variableTexts = texts.length ? texts : variable.hasAllValue() ? ['All'] : ['None'];
+  const repeats: TabItem[] = [];
+
+  // Loop through variable values and create repeats
+  for (let tabIndex = 0; tabIndex < variableValues.length; tabIndex++) {
+    const isSourceTab = tabIndex === 0;
+    const tabCloneKey = getCloneKey(tab.state.key!, tabIndex);
+    const tabClone = isSourceTab
+      ? tab
+      : tab.clone({ repeatByVariable: undefined, repeatedTabs: undefined, layout: undefined });
+
+    const layout = isSourceTab ? tab.getLayout() : tab.getLayout().cloneLayout(tabCloneKey, false);
+
+    tabClone.setState({
+      key: tabCloneKey,
+      $variables: new SceneVariableSet({
+        variables: [
+          new LocalValueVariable({
+            name: variable.state.name,
+            value: variableValues[tabIndex],
+            text: String(variableTexts[tabIndex]),
+            isMulti: variable.state.isMulti,
+            includeAll: variable.state.includeAll,
+          }),
+        ],
+      }),
+      layout,
+    });
+
+    if (!isSourceTab) {
+      repeats.push(tabClone);
+    }
+  }
+  return repeats;
+}
+
+const getStyles = () => ({
+  spinnerWrapper: css({
+    alignSelf: 'center',
+  }),
+});
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeaterBehavior.test.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeaterBehavior.test.tsx
deleted file mode 100644
index 93a0d400a71..00000000000
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeaterBehavior.test.tsx
+++ /dev/null
@@ -1,272 +0,0 @@
-import { VariableRefresh } from '@grafana/data';
-import { getPanelPlugin } from '@grafana/data/test';
-import { setPluginImportUtils } from '@grafana/runtime';
-import {
-  SceneGridRow,
-  SceneTimeRange,
-  SceneVariableSet,
-  TestVariable,
-  VariableValueOption,
-  PanelBuilders,
-} from '@grafana/scenes';
-import { ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE } from 'app/features/variables/constants';
-import { TextMode } from 'app/plugins/panel/text/panelcfg.gen';
-
-import { getCloneKey, isInCloneChain, joinCloneKeys } from '../../utils/clone';
-import { activateFullSceneTree } from '../../utils/test-utils';
-import { DashboardScene } from '../DashboardScene';
-import { DashboardGridItem } from '../layout-default/DashboardGridItem';
-import { DefaultGridLayoutManager } from '../layout-default/DefaultGridLayoutManager';
-
-import { TabItem } from './TabItem';
-import { TabItemRepeaterBehavior } from './TabItemRepeaterBehavior';
-import { TabsLayoutManager } from './TabsLayoutManager';
-
-jest.mock('@grafana/runtime', () => ({
-  ...jest.requireActual('@grafana/runtime'),
-  setPluginExtensionGetter: jest.fn(),
-  getPluginLinkExtensions: jest.fn().mockReturnValue({ extensions: [] }),
-}));
-
-setPluginImportUtils({
-  importPanelPlugin: () => Promise.resolve(getPanelPlugin({})),
-  getPanelPluginFromCache: () => undefined,
-});
-
-describe('TabItemRepeaterBehavior', () => {
-  describe('Given scene with variable with 5 values', () => {
-    let scene: DashboardScene, layout: TabsLayoutManager, repeatBehavior: TabItemRepeaterBehavior;
-    let layoutStateUpdates: unknown[];
-
-    beforeEach(async () => {
-      ({ scene, layout, repeatBehavior } = buildScene({ variableQueryTime: 0 }));
-
-      layoutStateUpdates = [];
-      layout.subscribeToState((state) => layoutStateUpdates.push(state));
-
-      activateFullSceneTree(scene);
-      await new Promise((r) => setTimeout(r, 1));
-    });
-
-    it('Should repeat tab', () => {
-      // Verify that first tab still has repeat behavior
-      const tab1 = layout.state.tabs[0];
-      expect(tab1.state.key).toBe(getCloneKey('tab-1', 0));
-      expect(tab1.state.$behaviors?.[0]).toBeInstanceOf(TabItemRepeaterBehavior);
-      expect(tab1.state.$variables!.state.variables[0].getValue()).toBe('A1');
-
-      const tab1Children = getTabChildren(tab1);
-      expect(tab1Children[0].state.key!).toBe(joinCloneKeys(tab1.state.key!, 'grid-item-0'));
-      expect(tab1Children[0].state.body?.state.key).toBe(joinCloneKeys(tab1Children[0].state.key!, 'panel-0'));
-
-      const tab2 = layout.state.tabs[1];
-      expect(tab2.state.key).toBe(getCloneKey('tab-1', 1));
-      expect(tab2.state.$behaviors).toEqual([]);
-      expect(tab2.state.$variables!.state.variables[0].getValueText?.()).toBe('B');
-
-      const tab2Children = getTabChildren(tab2);
-      expect(tab2Children[0].state.key!).toBe(joinCloneKeys(tab2.state.key!, 'grid-item-0'));
-      expect(tab2Children[0].state.body?.state.key).toBe(joinCloneKeys(tab2Children[0].state.key!, 'panel-0'));
-    });
-
-    it('Repeated tabs should be read only', () => {
-      const tab1 = layout.state.tabs[0];
-      expect(isInCloneChain(tab1.state.key!)).toBe(false);
-
-      const tab2 = layout.state.tabs[1];
-      expect(isInCloneChain(tab2.state.key!)).toBe(true);
-    });
-
-    it('Should push tab at the bottom down', () => {
-      // Should push tab at the bottom down
-      const tabAtTheBottom = layout.state.tabs[5];
-      expect(tabAtTheBottom.state.title).toBe('Tab at the bottom');
-    });
-
-    it('Should handle second repeat cycle and update remove old repeats', async () => {
-      // trigger another repeat cycle by changing the variable
-      const variable = scene.state.$variables!.state.variables[0] as TestVariable;
-      variable.changeValueTo(['B1', 'C1']);
-
-      await new Promise((r) => setTimeout(r, 1));
-
-      // should now only have 2 repeated tabs (and the panel above + the tab at the bottom)
-      expect(layout.state.tabs.length).toBe(3);
-    });
-
-    it('Should ignore repeat process if variable values are the same', async () => {
-      // trigger another repeat cycle by changing the variable
-      repeatBehavior.performRepeat();
-
-      await new Promise((r) => setTimeout(r, 1));
-
-      expect(layoutStateUpdates.length).toBe(1);
-    });
-  });
-
-  describe('Given scene with variable with 15 values', () => {
-    let scene: DashboardScene, layout: TabsLayoutManager;
-    let layoutStateUpdates: unknown[];
-
-    beforeEach(async () => {
-      ({ scene, layout } = buildScene({ variableQueryTime: 0 }, [
-        { label: 'A', value: 'A1' },
-        { label: 'B', value: 'B1' },
-        { label: 'C', value: 'C1' },
-        { label: 'D', value: 'D1' },
-        { label: 'E', value: 'E1' },
-        { label: 'F', value: 'F1' },
-        { label: 'G', value: 'G1' },
-        { label: 'H', value: 'H1' },
-        { label: 'I', value: 'I1' },
-        { label: 'J', value: 'J1' },
-        { label: 'K', value: 'K1' },
-        { label: 'L', value: 'L1' },
-        { label: 'M', value: 'M1' },
-        { label: 'N', value: 'N1' },
-        { label: 'O', value: 'O1' },
-      ]));
-
-      layoutStateUpdates = [];
-      layout.subscribeToState((state) => layoutStateUpdates.push(state));
-
-      activateFullSceneTree(scene);
-      await new Promise((r) => setTimeout(r, 1));
-    });
-
-    it('Should handle second repeat cycle and update remove old repeats', async () => {
-      // should have 15 repeated tabs (and the panel above)
-      expect(layout.state.tabs.length).toBe(16);
-
-      // trigger another repeat cycle by changing the variable
-      const variable = scene.state.$variables!.state.variables[0] as TestVariable;
-      variable.changeValueTo(['B1', 'C1']);
-
-      await new Promise((r) => setTimeout(r, 1));
-
-      // should now only have 2 repeated tabs (and the panel above)
-      expect(layout.state.tabs.length).toBe(3);
-    });
-  });
-
-  describe('Given a scene with empty variable', () => {
-    it('Should preserve repeat tab', async () => {
-      const { scene, layout } = buildScene({ variableQueryTime: 0 }, []);
-      activateFullSceneTree(scene);
-      await new Promise((r) => setTimeout(r, 1));
-
-      // Should have 2 tabs, one without repeat and one with the dummy tab
-      expect(layout.state.tabs.length).toBe(2);
-      expect(layout.state.tabs[0].state.$behaviors?.[0]).toBeInstanceOf(TabItemRepeaterBehavior);
-    });
-  });
-});
-
-interface SceneOptions {
-  variableQueryTime: number;
-  variableRefresh?: VariableRefresh;
-}
-
-function buildTextPanel(key: string, content: string) {
-  const panel = PanelBuilders.text().setOption('content', content).setOption('mode', TextMode.Markdown).build();
-  panel.setState({ key });
-  return panel;
-}
-
-function buildScene(
-  options: SceneOptions,
-  variableOptions?: VariableValueOption[],
-  variableStateOverrides?: { isMulti: boolean }
-) {
-  const repeatBehavior = new TabItemRepeaterBehavior({ variableName: 'server' });
-
-  const tabs = [
-    new TabItem({
-      key: 'tab-1',
-      $behaviors: [repeatBehavior],
-      layout: DefaultGridLayoutManager.fromGridItems([
-        new DashboardGridItem({
-          key: 'grid-item-1',
-          x: 0,
-          y: 11,
-          width: 24,
-          height: 5,
-          body: buildTextPanel('text-1', 'Panel inside repeated tab, server = $server'),
-        }),
-      ]),
-    }),
-    new TabItem({
-      key: 'tab-2',
-      title: 'Tab at the bottom',
-      layout: DefaultGridLayoutManager.fromGridItems([
-        new DashboardGridItem({
-          key: 'grid-item-2',
-          x: 0,
-          y: 17,
-          body: buildTextPanel('text-2', 'Panel inside tab, server = $server'),
-        }),
-        new DashboardGridItem({
-          key: 'grid-item-3',
-          x: 0,
-          y: 25,
-          body: buildTextPanel('text-3', 'Panel inside tab, server = $server'),
-        }),
-      ]),
-    }),
-  ];
-
-  const layout = new TabsLayoutManager({ tabs });
-
-  const scene = new DashboardScene({
-    $timeRange: new SceneTimeRange({ from: 'now-6h', to: 'now' }),
-    $variables: new SceneVariableSet({
-      variables: [
-        new TestVariable({
-          name: 'server',
-          query: 'A.*',
-          value: ALL_VARIABLE_VALUE,
-          text: ALL_VARIABLE_TEXT,
-          isMulti: true,
-          includeAll: true,
-          delayMs: options.variableQueryTime,
-          refresh: options.variableRefresh,
-          optionsToReturn: variableOptions ?? [
-            { label: 'A', value: 'A1' },
-            { label: 'B', value: 'B1' },
-            { label: 'C', value: 'C1' },
-            { label: 'D', value: 'D1' },
-            { label: 'E', value: 'E1' },
-          ],
-          ...variableStateOverrides,
-        }),
-      ],
-    }),
-    body: layout,
-  });
-
-  const tabToRepeat = repeatBehavior.parent as SceneGridRow;
-
-  return { scene, layout, tabs, repeatBehavior, tabToRepeat };
-}
-
-function getTabLayout(tab: TabItem): DefaultGridLayoutManager {
-  const layout = tab.getLayout();
-
-  if (!(layout instanceof DefaultGridLayoutManager)) {
-    throw new Error('Invalid layout');
-  }
-
-  return layout;
-}
-
-function getTabChildren(tab: TabItem): DashboardGridItem[] {
-  const layout = getTabLayout(tab);
-
-  const filteredChildren = layout.state.grid.state.children.filter((child) => child instanceof DashboardGridItem);
-
-  if (filteredChildren.length !== layout.state.grid.state.children.length) {
-    throw new Error('Invalid layout');
-  }
-
-  return filteredChildren;
-}
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeaterBehavior.ts b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeaterBehavior.ts
deleted file mode 100644
index a0e0207c7ad..00000000000
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeaterBehavior.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import { isEqual } from 'lodash';
-
-import {
-  LocalValueVariable,
-  MultiValueVariable,
-  sceneGraph,
-  SceneObjectBase,
-  SceneObjectState,
-  SceneVariableSet,
-  VariableDependencyConfig,
-  VariableValueSingle,
-} from '@grafana/scenes';
-
-import { isClonedKeyOf, getCloneKey } from '../../utils/clone';
-import { getMultiVariableValues } from '../../utils/utils';
-import { DashboardRepeatsProcessedEvent } from '../types/DashboardRepeatsProcessedEvent';
-
-import { TabItem } from './TabItem';
-import { TabsLayoutManager } from './TabsLayoutManager';
-
-interface TabItemRepeaterBehaviorState extends SceneObjectState {
-  variableName: string;
-}
-
-export class TabItemRepeaterBehavior extends SceneObjectBase<TabItemRepeaterBehaviorState> {
-  protected _variableDependency = new VariableDependencyConfig(this, {
-    variableNames: [this.state.variableName],
-    onVariableUpdateCompleted: () => this.performRepeat(),
-  });
-
-  private _prevRepeatValues?: VariableValueSingle[];
-  private _clonedTabs?: TabItem[];
-
-  public constructor(state: TabItemRepeaterBehaviorState) {
-    super(state);
-
-    this.addActivationHandler(() => this._activationHandler());
-  }
-
-  private _activationHandler() {
-    this.performRepeat();
-  }
-
-  private _getTab(): TabItem {
-    if (!(this.parent instanceof TabItem)) {
-      throw new Error('RepeatedTabItemBehavior: Parent is not a TabItem');
-    }
-
-    return this.parent;
-  }
-
-  private _getLayout(): TabsLayoutManager {
-    const layout = this._getTab().parent;
-
-    if (!(layout instanceof TabsLayoutManager)) {
-      throw new Error('RepeatedTabItemBehavior: Layout is not a TabsLayoutManager');
-    }
-
-    return layout;
-  }
-
-  public performRepeat(force = false) {
-    if (this._variableDependency.hasDependencyInLoadingState()) {
-      return;
-    }
-
-    const variable = sceneGraph.lookupVariable(this.state.variableName, this.parent?.parent!);
-
-    if (!variable) {
-      console.error('RepeatedTabItemBehavior: Variable not found');
-      return;
-    }
-
-    if (!(variable instanceof MultiValueVariable)) {
-      console.error('RepeatedTabItemBehavior: Variable is not a MultiValueVariable');
-      return;
-    }
-
-    const tabToRepeat = this._getTab();
-    const layout = this._getLayout();
-    const { values, texts } = getMultiVariableValues(variable);
-
-    // Do nothing if values are the same
-    if (isEqual(this._prevRepeatValues, values) && !force) {
-      return;
-    }
-
-    this._prevRepeatValues = values;
-
-    this._clonedTabs = [];
-
-    const tabContent = tabToRepeat.getLayout();
-
-    // when variable has no options (due to error or similar) it will not render any panels at all
-    // adding a placeholder in this case so that there is at least empty panel that can display error
-    const emptyVariablePlaceholderOption = {
-      values: [''],
-      texts: variable.hasAllValue() ? ['All'] : ['None'],
-    };
-
-    const variableValues = values.length ? values : emptyVariablePlaceholderOption.values;
-    const variableTexts = texts.length ? texts : emptyVariablePlaceholderOption.texts;
-
-    // Loop through variable values and create repeats
-    for (let tabIndex = 0; tabIndex < variableValues.length; tabIndex++) {
-      const isSourceTab = tabIndex === 0;
-      const tabClone = isSourceTab ? tabToRepeat : tabToRepeat.clone({ $behaviors: [] });
-
-      const tabCloneKey = getCloneKey(tabToRepeat.state.key!, tabIndex);
-
-      tabClone.setState({
-        key: tabCloneKey,
-        $variables: new SceneVariableSet({
-          variables: [
-            new LocalValueVariable({
-              name: this.state.variableName,
-              value: variableValues[tabIndex],
-              text: String(variableTexts[tabIndex]),
-              isMulti: variable.state.isMulti,
-              includeAll: variable.state.includeAll,
-            }),
-          ],
-        }),
-        layout: tabContent.cloneLayout?.(tabCloneKey, isSourceTab),
-      });
-
-      this._clonedTabs.push(tabClone);
-    }
-
-    updateLayout(layout, this._clonedTabs, tabToRepeat.state.key!);
-
-    // Used from dashboard url sync
-    this.publishEvent(new DashboardRepeatsProcessedEvent({ source: this }), true);
-  }
-
-  public removeBehavior() {
-    const tab = this._getTab();
-    const layout = this._getLayout();
-    const tabs = getTabsFilterOutRepeatClones(layout, tab.state.key!);
-
-    layout.setState({ tabs });
-
-    // Remove behavior and the scoped local variable
-    tab.setState({ $behaviors: tab.state.$behaviors!.filter((b) => b !== this), $variables: undefined });
-  }
-}
-
-function updateLayout(layout: TabsLayoutManager, tabs: TabItem[], tabKey: string) {
-  const allTabs = getTabsFilterOutRepeatClones(layout, tabKey);
-  const index = allTabs.findIndex((tab) => tab.state.key!.includes(tabKey));
-
-  if (index === -1) {
-    throw new Error('TabItemRepeaterBehavior: Tab not found in layout');
-  }
-
-  layout.setState({ tabs: [...allTabs.slice(0, index), ...tabs, ...allTabs.slice(index + 1)] });
-}
-
-function getTabsFilterOutRepeatClones(layout: TabsLayoutManager, tabKey: string) {
-  return layout.state.tabs.filter((tab) => !isClonedKeyOf(tab.state.key!, tabKey));
-}
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx
index f83a91748ed..4ebf8583330 100644
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx
@@ -1,6 +1,7 @@
 import { t } from '@grafana/i18n';
 import {
   sceneGraph,
+  SceneObject,
   SceneObjectBase,
   SceneObjectState,
   SceneObjectUrlSyncConfig,
@@ -11,7 +12,15 @@ import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboa
 
 import { dashboardEditActions, ObjectsReorderedOnCanvasEvent } from '../../edit-pane/shared';
 import { serializeTabsLayout } from '../../serialization/layoutSerializers/TabsLayoutSerializer';
-import { isClonedKey, joinCloneKeys } from '../../utils/clone';
+import {
+  containsCloneKey,
+  getCloneKey,
+  getLastKeyFromClone,
+  getOriginalKey,
+  isClonedKey,
+  isClonedKeyOf,
+  joinCloneKeys,
+} from '../../utils/clone';
 import { getDashboardSceneFor } from '../../utils/utils';
 import { RowItem } from '../layout-rows/RowItem';
 import { RowsLayoutManager } from '../layout-rows/RowsLayoutManager';
@@ -21,7 +30,6 @@ import { DashboardLayoutManager } from '../types/DashboardLayoutManager';
 import { LayoutRegistryItem } from '../types/LayoutRegistryItem';
 
 import { TabItem } from './TabItem';
-import { TabItemRepeaterBehavior } from './TabItemRepeaterBehavior';
 import { TabsLayoutManagerRenderer } from './TabsLayoutManagerRenderer';
 
 interface TabsLayoutManagerState extends SceneObjectState {
@@ -88,7 +96,7 @@ export class TabsLayoutManager extends SceneObjectBase<TabsLayoutManagerState> i
 
     if (typeof values[key] === 'string') {
       // find tab with matching slug
-      const matchIndex = this.state.tabs.findIndex((tab) => tab.getSlug() === urlValue);
+      const matchIndex = this.getTabs().findIndex((tab) => tab.getSlug() === urlValue);
       if (matchIndex !== -1) {
         this.setState({ currentTabIndex: matchIndex });
       }
@@ -96,13 +104,22 @@ export class TabsLayoutManager extends SceneObjectBase<TabsLayoutManagerState> i
   }
 
   public switchToTab(tab: TabItem) {
-    this.setState({ currentTabIndex: this.state.tabs.indexOf(tab) });
+    this.setState({ currentTabIndex: this.getTabs().indexOf(tab) });
   }
 
   public getCurrentTab(): TabItem {
-    return this.state.tabs.length > this.state.currentTabIndex
-      ? this.state.tabs[this.state.currentTabIndex]
-      : this.state.tabs[0];
+    return this.getTabs().length > this.state.currentTabIndex
+      ? this.getTabs()[this.state.currentTabIndex]
+      : this.getTabs()[0];
+  }
+
+  public getTabs(): TabItem[] {
+    const tabsWithRepeats = this.state.tabs.reduce<TabItem[]>((acc, tab) => {
+      acc.push(tab, ...(tab.state.repeatedTabs ?? []));
+
+      return acc;
+    }, []);
+    return tabsWithRepeats;
   }
 
   public addPanel(vizPanel: VizPanel) {
@@ -112,7 +129,7 @@ export class TabsLayoutManager extends SceneObjectBase<TabsLayoutManagerState> i
   public getVizPanels(): VizPanel[] {
     const panels: VizPanel[] = [];
 
-    for (const tab of this.state.tabs) {
+    for (const tab of this.getTabs()) {
       const innerPanels = tab.getLayout().getVizPanels();
       panels.push(...innerPanels);
     }
@@ -134,12 +151,28 @@ export class TabsLayoutManager extends SceneObjectBase<TabsLayoutManagerState> i
   }
 
   public getOutlineChildren() {
-    return this.state.tabs;
+    const outlineChildren: SceneObject[] = [];
+
+    for (const tab of this.state.tabs) {
+      outlineChildren.push(tab);
+
+      if (tab.state.repeatedTabs) {
+        for (const clone of tab.state.repeatedTabs!) {
+          outlineChildren.push(clone);
+        }
+      }
+    }
+
+    return outlineChildren;
   }
 
   public addNewTab(tab?: TabItem) {
     const newTab = tab ?? new TabItem({});
-    const existingNames = new Set(this.state.tabs.map((tab) => tab.state.title).filter((title) => title !== undefined));
+    const existingNames = new Set(
+      this.getTabs()
+        .map((tab) => tab.state.title)
+        .filter((title) => title !== undefined)
+    );
     const newTitle = generateUniqueTitle(newTab.state.title, existingNames);
     if (newTitle !== newTab.state.title) {
       newTab.setState({ title: newTitle });
@@ -148,9 +181,9 @@ export class TabsLayoutManager extends SceneObjectBase<TabsLayoutManagerState> i
     dashboardEditActions.addElement({
       addedObject: newTab,
       source: this,
-      perform: () => this.setState({ tabs: [...this.state.tabs, newTab], currentTabIndex: this.state.tabs.length }),
+      perform: () => this.setState({ tabs: [...this.state.tabs, newTab], currentTabIndex: this.getTabs().length }),
       undo: () => {
-        const indexOfNewTab = this.state.tabs.findIndex((t) => t === newTab);
+        const indexOfNewTab = this.getTabs().findIndex((t) => t === newTab);
         this.setState({
           tabs: this.state.tabs.filter((t) => t !== newTab),
           // if the new tab was the current tab, set the current tab to the previous tab
@@ -175,24 +208,8 @@ export class TabsLayoutManager extends SceneObjectBase<TabsLayoutManagerState> i
     this.addNewTab(tab);
   }
 
-  public activateRepeaters() {
-    this.state.tabs.forEach((tab) => {
-      if (!tab.isActive) {
-        tab.activate();
-      }
-
-      const behavior = (tab.state.$behaviors ?? []).find((b) => b instanceof TabItemRepeaterBehavior);
-
-      if (!behavior?.isActive) {
-        behavior?.activate();
-      }
-
-      tab.getLayout().activateRepeaters?.();
-    });
-  }
-
   public shouldUngroup(): boolean {
-    return this.state.tabs.length === 1;
+    return this.getTabs().length === 1;
   }
 
   public removeTab(tabToRemove: TabItem) {
@@ -234,31 +251,54 @@ export class TabsLayoutManager extends SceneObjectBase<TabsLayoutManagerState> i
   }
 
   public moveTab(fromIndex: number, toIndex: number) {
-    const objectToMove = this.state.tabs[fromIndex];
+    // fromIndex and toIndex include repeated tab so we need to find original indexes
+    const allTabs = this.getTabs();
+    const objectToMove = allTabs[fromIndex];
+    let destinationTab = allTabs[toIndex];
+    let selectionIndex = toIndex;
+
+    if (containsCloneKey(getLastKeyFromClone(destinationTab.state.key!))) {
+      if (isClonedKeyOf(destinationTab.state.key!, objectToMove.state.key!)) {
+        // moving tab between its clones
+        return;
+      }
+      const originalTabKey = getCloneKey(getOriginalKey(destinationTab.state.key!), 0);
+      const originalTabIndex = allTabs.findIndex((tab) => tab.state.key === originalTabKey);
+
+      if (originalTabIndex !== -1) {
+        destinationTab = allTabs[originalTabIndex];
+
+        const isMovingLeft = toIndex < fromIndex;
+        selectionIndex = originalTabIndex + (isMovingLeft ? 0 : destinationTab.state.repeatedTabs?.length || 0);
+      }
+    }
+
+    const originalFromIndex = this.state.tabs.findIndex((tab) => tab === objectToMove);
+    const originalToIndex = this.state.tabs.findIndex((tab) => tab === destinationTab);
 
     dashboardEditActions.moveElement({
       source: this,
       movedObject: objectToMove,
       perform: () => {
-        this.rearrangeTabs(fromIndex, toIndex);
+        this.rearrangeTabs(originalFromIndex, originalToIndex, selectionIndex);
       },
       undo: () => {
-        this.rearrangeTabs(toIndex, fromIndex);
+        this.rearrangeTabs(originalToIndex, originalFromIndex, fromIndex);
       },
     });
   }
 
-  private rearrangeTabs(fromIndex: number, toIndex: number) {
+  private rearrangeTabs(fromIndex: number, toIndex: number, selectedTabIndex: number) {
     const tabs = [...this.state.tabs];
     const [removed] = tabs.splice(fromIndex, 1);
     tabs.splice(toIndex, 0, removed);
-    this.setState({ tabs, currentTabIndex: toIndex });
+    this.setState({ tabs, currentTabIndex: selectedTabIndex });
     this.publishEvent(new ObjectsReorderedOnCanvasEvent(this), true);
   }
 
   public forceSelectTab(tabKey: string) {
-    const tabIndex = this.state.tabs.findIndex((tab) => tab.state.key === tabKey);
-    const tab = this.state.tabs[tabIndex];
+    const tabIndex = this.getTabs().findIndex((tab) => tab.state.key === tabKey);
+    const tab = this.getTabs()[tabIndex];
 
     if (!tab) {
       return;
@@ -286,12 +326,13 @@ export class TabsLayoutManager extends SceneObjectBase<TabsLayoutManagerState> i
         const conditionalRendering = row.state.conditionalRendering;
         conditionalRendering?.clearParent();
 
-        const $behaviors = row.state.repeatByVariable
-          ? [new TabItemRepeaterBehavior({ variableName: row.state.repeatByVariable })]
-          : undefined;
-
         tabs.push(
-          new TabItem({ layout: row.state.layout.clone(), title: row.state.title, conditionalRendering, $behaviors })
+          new TabItem({
+            layout: row.state.layout.clone(),
+            title: row.state.title,
+            conditionalRendering,
+            repeatByVariable: row.state.repeatByVariable,
+          })
         );
       }
     } else {
@@ -326,7 +367,7 @@ export class TabsLayoutManager extends SceneObjectBase<TabsLayoutManagerState> i
     const titleCounts = new Map<string | undefined, number>();
     const duplicateTitles = new Set<string | undefined>();
 
-    this.state.tabs.forEach((tab) => {
+    this.getTabs().forEach((tab) => {
       const title = sceneGraph.interpolate(tab, tab.state.title);
       const count = (titleCounts.get(title) ?? 0) + 1;
       titleCounts.set(title, count);
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx
index 2e8af50fe10..1e4c81c546a 100644
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx
@@ -4,14 +4,17 @@ import { DragDropContext, Droppable } from '@hello-pangea/dnd';
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans } from '@grafana/i18n';
-import { SceneComponentProps } from '@grafana/scenes';
+import { MultiValueVariable, SceneComponentProps, sceneGraph, useSceneObjectState } from '@grafana/scenes';
 import { Button, TabContent, TabsBar, useStyles2 } from '@grafana/ui';
 
 import { useIsConditionallyHidden } from '../../conditional-rendering/useIsConditionallyHidden';
+import { isInCloneChain } from '../../utils/clone';
 import { getDashboardSceneFor } from '../../utils/utils';
 import { dashboardCanvasAddButtonHoverStyles } from '../layouts-shared/styles';
 import { useClipboardState } from '../layouts-shared/useClipboardState';
 
+import { TabItem } from './TabItem';
+import { TabItemRepeater } from './TabItemRepeater';
 import { TabsLayoutManager } from './TabsLayoutManager';
 
 export function TabsLayoutManagerRenderer({ model }: SceneComponentProps<TabsLayoutManager>) {
@@ -24,6 +27,8 @@ export function TabsLayoutManagerRenderer({ model }: SceneComponentProps<TabsLay
   const { hasCopiedTab } = useClipboardState();
   const [_, conditionalRenderingClass, conditionalRenderingOverlay] = useIsConditionallyHidden(currentTab);
 
+  const isClone = isInCloneChain(tabs[0]?.state.key || '');
+
   return (
     <div className={styles.tabLayoutContainer}>
       <TabsBar className={styles.tabsBar}>
@@ -46,14 +51,14 @@ export function TabsLayoutManagerRenderer({ model }: SceneComponentProps<TabsLay
               {(dropProvided) => (
                 <div className={styles.tabsContainer} ref={dropProvided.innerRef} {...dropProvided.droppableProps}>
                   {tabs.map((tab) => (
-                    <tab.Component model={tab} key={tab.state.key!} />
+                    <TabWrapper tab={tab} manager={model} key={tab.state.key!} />
                   ))}
 
                   {dropProvided.placeholder}
                 </div>
               )}
             </Droppable>
-            {isEditing && (
+            {isEditing && !isClone && (
               <div className="dashboard-canvas-add-button">
                 <Button
                   icon="plus"
@@ -97,6 +102,19 @@ export function TabsLayoutManagerRenderer({ model }: SceneComponentProps<TabsLay
   );
 }
 
+function TabWrapper({ tab, manager }: { tab: TabItem; manager: TabsLayoutManager }) {
+  const { repeatByVariable } = useSceneObjectState(tab, { shouldActivateOrKeepAlive: true });
+
+  if (repeatByVariable) {
+    const variable = sceneGraph.lookupVariable(repeatByVariable, manager);
+
+    if (variable instanceof MultiValueVariable) {
+      return <TabItemRepeater tab={tab} key={tab.state.key!} manager={manager} variable={variable} />;
+    }
+  }
+  return <tab.Component model={tab} key={tab.state.key!} />;
+}
+
 const getStyles = (theme: GrafanaTheme2) => ({
   tabLayoutContainer: css({
     display: 'flex',
diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts
index bfcec4787b3..883f80c5415 100644
--- a/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts
+++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts
@@ -1,7 +1,6 @@
 import { Spec as DashboardV2Spec, TabsLayoutTabKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
 
 import { TabItem } from '../../scene/layout-tabs/TabItem';
-import { TabItemRepeaterBehavior } from '../../scene/layout-tabs/TabItemRepeaterBehavior';
 import { TabsLayoutManager } from '../../scene/layout-tabs/TabsLayoutManager';
 import { isClonedKey } from '../../utils/clone';
 
@@ -24,6 +23,12 @@ export function serializeTab(tab: TabItem): TabsLayoutTabKind {
     spec: {
       title: tab.state.title,
       layout: layout,
+      ...(tab.state.repeatByVariable && {
+        repeat: {
+          mode: 'variable',
+          value: tab.state.repeatByVariable,
+        },
+      }),
     },
   };
 
@@ -33,17 +38,6 @@ export function serializeTab(tab: TabItem): TabsLayoutTabKind {
     tabKind.spec.conditionalRendering = conditionalRenderingRootGroup;
   }
 
-  if (tab.state.$behaviors) {
-    for (const behavior of tab.state.$behaviors) {
-      if (behavior instanceof TabItemRepeaterBehavior) {
-        if (tabKind.spec.repeat) {
-          throw new Error('Multiple repeaters are not supported');
-        }
-        tabKind.spec.repeat = { value: behavior.state.variableName, mode: 'variable' };
-      }
-    }
-  }
-
   return tabKind;
 }
 
@@ -71,14 +65,11 @@ export function deserializeTab(
   panelIdGenerator?: () => number
 ): TabItem {
   const layout = tab.spec.layout;
-  const $behaviors = !tab.spec.repeat
-    ? undefined
-    : [new TabItemRepeaterBehavior({ variableName: tab.spec.repeat.value })];
 
   return new TabItem({
     title: tab.spec.title,
     layout: layoutDeserializerRegistry.get(layout.kind).deserialize(layout, elements, preload, panelIdGenerator),
-    $behaviors,
+    repeatByVariable: tab.spec.repeat?.value,
     conditionalRendering: getConditionalRendering(tab),
   });
 }
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 9c0de122a5c..dcde328be5e 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -5233,6 +5233,7 @@
         "new": "New tab",
         "repeat": {
           "learn-more": "Learn more",
+          "loading": "Loading tab repeats",
           "warning": "Panels in this tab use the {{SHARED_DASHBOARD_QUERY}} data source. These panels will reference the panel in the original tab, not the ones in the repeated tabs."
         }
       },

From 67140e9850b59c6bff599c800a1fadc226c0151b Mon Sep 17 00:00:00 2001
From: Sergej-Vlasov <37613182+Sergej-Vlasov@users.noreply.github.com>
Date: Fri, 8 Aug 2025 13:43:13 +0100
Subject: [PATCH 047/243] AutoGridItemRenderer: Fix repeated panel lazy loading
 and drag and drop (#109334)

* wip: wrap individual grid items with lazy loader

* fix repeated panel lazy loading and drag and drop in auto grid item
---
 .../layout-auto-grid/AutoGridItemRenderer.tsx | 80 +++++++++++++------
 .../AutoGridLayoutRenderer.tsx                | 42 ++--------
 2 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
index aefaf3fabb8..f3cee9f8b23 100644
--- a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
@@ -1,11 +1,13 @@
 import { css, cx } from '@emotion/css';
+import { memo, useMemo } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data/';
-import { SceneComponentProps } from '@grafana/scenes';
+import { LazyLoader, SceneComponentProps, VizPanel } from '@grafana/scenes';
 import { useStyles2 } from '@grafana/ui';
 
 import { useIsConditionallyHidden } from '../../conditional-rendering/useIsConditionallyHidden';
 import { useDashboardState } from '../../utils/utils';
+import { getIsLazy } from '../layouts-shared/utils';
 
 import { AutoGridItem } from './AutoGridItem';
 import { DRAGGED_ITEM_HEIGHT, DRAGGED_ITEM_LEFT, DRAGGED_ITEM_TOP, DRAGGED_ITEM_WIDTH } from './const';
@@ -13,11 +15,13 @@ import { DRAGGED_ITEM_HEIGHT, DRAGGED_ITEM_LEFT, DRAGGED_ITEM_TOP, DRAGGED_ITEM_
 export function AutoGridItemRenderer({ model }: SceneComponentProps<AutoGridItem>) {
   const { body, repeatedPanels, key } = model.useState();
   const { draggingKey } = model.getParentGrid().useState();
-  const { isEditing } = useDashboardState(model);
+  const { isEditing, preload } = useDashboardState(model);
   const [isConditionallyHidden, conditionalRenderingClass, conditionalRenderingOverlay] =
     useIsConditionallyHidden(model);
   const styles = useStyles2(getStyles);
 
+  const isLazy = useMemo(() => getIsLazy(preload), [preload]);
+
   if (isConditionallyHidden && !isEditing) {
     return null;
   }
@@ -25,37 +29,65 @@ export function AutoGridItemRenderer({ model }: SceneComponentProps<AutoGridItem
   const isDragging = !!draggingKey;
   const isDragged = draggingKey === key;
 
+  const Wrapper = useMemo(
+    () =>
+      memo(
+        ({
+          item,
+          addDndContainer,
+          isDragged,
+          isDragging,
+        }: {
+          item: VizPanel;
+          addDndContainer: boolean;
+          isDragged: boolean;
+          isDragging: boolean;
+        }) => (
+          <div
+            {...(addDndContainer
+              ? { ref: model.containerRef, ['data-auto-grid-item-drop-target']: isDragging ? key : undefined }
+              : {})}
+          >
+            {isDragged && <div className={styles.draggedPlaceholder} />}
+            {isLazy ? (
+              <LazyLoader
+                key={item.state.key!}
+                className={cx(conditionalRenderingClass, styles.wrapper, isDragged && styles.draggedWrapper)}
+              >
+                <item.Component model={item} />
+                {conditionalRenderingOverlay}
+              </LazyLoader>
+            ) : (
+              <div className={cx(conditionalRenderingClass, styles.wrapper, isDragged && styles.draggedWrapper)}>
+                <item.Component model={item} />
+                {conditionalRenderingOverlay}
+              </div>
+            )}
+          </div>
+        )
+      ),
+    [conditionalRenderingClass, conditionalRenderingOverlay, isLazy, key, model.containerRef, styles]
+  );
+
   return repeatedPanels ? (
     <>
-      {repeatedPanels.map((item) => (
-        <div className={cx(conditionalRenderingClass, styles.wrapper)} key={item.state.key}>
-          <item.Component model={item} />
-          {conditionalRenderingOverlay}
-        </div>
+      {repeatedPanels.map((item, index) => (
+        <Wrapper
+          item={item}
+          addDndContainer={index === 0}
+          key={item.state.key!}
+          isDragged={isDragged}
+          isDragging={isDragging}
+        />
       ))}
     </>
   ) : (
-    <div ref={model.containerRef} data-auto-grid-item-drop-target={isDragging ? key : undefined}>
-      {isDragged && <div className={styles.draggedPlaceholder} />}
-
-      <div className={cx(!isDragged && conditionalRenderingClass, styles.wrapper, isDragged && styles.draggedWrapper)}>
-        <body.Component model={body} />
-        {conditionalRenderingOverlay}
-      </div>
-    </div>
+    <Wrapper item={body} addDndContainer key={body.state.key!} isDragged={isDragged} isDragging={isDragging} />
   );
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  container: css({
-    width: '100%',
-    height: '100%',
-  }),
-  wrapper: css({
-    width: '100%',
-    height: '100%',
-    position: 'relative',
-  }),
+  wrapper: css({ width: '100%', height: '100%', position: 'relative' }),
   draggedWrapper: css({
     position: 'absolute',
     zIndex: 1000,
diff --git a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutRenderer.tsx
index 2a44564b536..c70a3ef5200 100644
--- a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutRenderer.tsx
@@ -1,15 +1,13 @@
 import { css, cx } from '@emotion/css';
-import { useMemo } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { LazyLoader, SceneComponentProps, sceneGraph } from '@grafana/scenes';
+import { SceneComponentProps, sceneGraph } from '@grafana/scenes';
 import { useStyles2 } from '@grafana/ui';
 
 import { useHasClonedParents } from '../../utils/clone';
 import { useDashboardState } from '../../utils/utils';
 import { CanvasGridAddActions } from '../layouts-shared/CanvasGridAddActions';
 import { dashboardCanvasAddButtonHoverStyles } from '../layouts-shared/styles';
-import { getIsLazy } from '../layouts-shared/utils';
 
 import { AutoGridLayout, AutoGridLayoutState } from './AutoGridLayout';
 import { AutoGridLayoutManager } from './AutoGridLayoutManager';
@@ -18,12 +16,10 @@ export function AutoGridLayoutRenderer({ model }: SceneComponentProps<AutoGridLa
   const { children, isHidden } = model.useState();
   const hasClonedParents = useHasClonedParents(model);
   const styles = useStyles2(getStyles, model.state);
-  const { layoutOrchestrator, isEditing, preload } = useDashboardState(model);
+  const { layoutOrchestrator, isEditing } = useDashboardState(model);
   const layoutManager = sceneGraph.getAncestor(model, AutoGridLayoutManager);
   const { fillScreen } = layoutManager.useState();
 
-  const isLazy = useMemo(() => getIsLazy(preload), [preload]);
-
   if (isHidden || !layoutOrchestrator) {
     return null;
   }
@@ -35,15 +31,9 @@ export function AutoGridLayoutRenderer({ model }: SceneComponentProps<AutoGridLa
       className={cx(styles.container, fillScreen && styles.containerFillScreen, isEditing && styles.containerEditing)}
       ref={model.containerRef}
     >
-      {children.map((item) =>
-        isLazy ? (
-          <LazyLoader key={item.state.key!} className={styles.container}>
-            <item.Component key={item.state.key} model={item} />
-          </LazyLoader>
-        ) : (
-          <item.Component key={item.state.key} model={item} />
-        )
-      )}
+      {children.map((item) => (
+        <item.Component key={item.state.key} model={item} />
+      ))}
       {showCanvasActions && <CanvasGridAddActions layoutManager={layoutManager} />}
     </div>
   );
@@ -75,24 +65,6 @@ const getStyles = (theme: GrafanaTheme2, state: AutoGridLayoutState) => ({
     // Show add action when hovering over the grid
     ...dashboardCanvasAddButtonHoverStyles,
   }),
-  containerFillScreen: css({
-    flexGrow: 1,
-  }),
-  containerEditing: css({
-    paddingBottom: theme.spacing(5),
-    position: 'relative',
-  }),
-  wrapper: css({
-    display: 'grid',
-    position: 'relative',
-    width: '100%',
-    height: '100%',
-  }),
-  dragging: css({
-    position: 'fixed',
-    top: 0,
-    left: 0,
-    zIndex: theme.zIndex.portal + 1,
-    pointerEvents: 'none',
-  }),
+  containerFillScreen: css({ flexGrow: 1 }),
+  containerEditing: css({ paddingBottom: theme.spacing(5), position: 'relative' }),
 });

From 9b0dc4614c4a7a34656d786441b31459678718ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= <pstibrany@gmail.com>
Date: Fri, 8 Aug 2025 14:59:59 +0200
Subject: [PATCH 048/243] Cleanup old indexes in the same goroutine as build of
 the index. (#109382)

* Cleanup old indexes in the same goroutine as build of the index.

* Add test.
---
 pkg/storage/unified/search/bleve.go      | 15 ++++++++++----
 pkg/storage/unified/search/bleve_test.go | 25 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/pkg/storage/unified/search/bleve.go b/pkg/storage/unified/search/bleve.go
index 1e0d19e2e4f..01dcc3cabd9 100644
--- a/pkg/storage/unified/search/bleve.go
+++ b/pkg/storage/unified/search/bleve.go
@@ -246,7 +246,7 @@ func (b *bleveBackend) BuildIndex(
 		}
 	}
 
-	resourceDir := filepath.Join(b.opts.Root, cleanFileSegment(key.Namespace), cleanFileSegment(fmt.Sprintf("%s.%s", key.Resource, key.Group)))
+	resourceDir := b.getResourceDir(key)
 
 	var index bleve.Index
 	cachedIndex := b.getCachedIndex(key)
@@ -377,13 +377,20 @@ func (b *bleveBackend) BuildIndex(
 		b.indexMetrics.OpenIndexes.WithLabelValues(idx.indexStorage).Inc()
 	}
 
-	// Start a background task to cleanup the old index directories. If we have built a new file-based index,
-	// the new name is ignored. If we have created in-memory index and fileIndexName is empty, all old directories can be removed.
-	go b.cleanOldIndexes(resourceDir, fileIndexName)
+	// Clean up the old index directories. If we have built a new file-based index, the new name is ignored.
+	// If we have created in-memory index and fileIndexName is empty, all old directories can be removed.
+	//
+	// We do the cleanup on the same goroutine as the index building. Using background goroutine could
+	// cleanup new index directory that is being built by new call to BuildIndex.
+	b.cleanOldIndexes(resourceDir, fileIndexName)
 
 	return idx, nil
 }
 
+func (b *bleveBackend) getResourceDir(key resource.NamespacedResource) string {
+	return filepath.Join(b.opts.Root, cleanFileSegment(key.Namespace), cleanFileSegment(fmt.Sprintf("%s.%s", key.Resource, key.Group)))
+}
+
 func cleanFileSegment(input string) string {
 	input = strings.ReplaceAll(input, string(filepath.Separator), "_")
 	input = strings.ReplaceAll(input, "..", "_")
diff --git a/pkg/storage/unified/search/bleve_test.go b/pkg/storage/unified/search/bleve_test.go
index a391efde3a1..a5acceaecc8 100644
--- a/pkg/storage/unified/search/bleve_test.go
+++ b/pkg/storage/unified/search/bleve_test.go
@@ -945,6 +945,12 @@ func TestRebuildingIndexClosesPreviousCachedIndex(t *testing.T) {
 			firstIndex, err := backend.BuildIndex(context.Background(), ns, int64(firstSize), 100, nil, "test", indexTestDocs(ns, firstSize))
 			require.NoError(t, err)
 
+			if testCase.firstInMemory {
+				verifyDirEntriesCount(t, backend.getResourceDir(ns), 0)
+			} else {
+				verifyDirEntriesCount(t, backend.getResourceDir(ns), 1)
+			}
+
 			openInMemoryIndexes := 0
 
 			secondSize := 100
@@ -955,6 +961,12 @@ func TestRebuildingIndexClosesPreviousCachedIndex(t *testing.T) {
 			secondIndex, err := backend.BuildIndex(context.Background(), ns, int64(secondSize), 100, nil, "test", indexTestDocs(ns, secondSize))
 			require.NoError(t, err)
 
+			if testCase.secondInMemory {
+				verifyDirEntriesCount(t, backend.getResourceDir(ns), 0)
+			} else {
+				verifyDirEntriesCount(t, backend.getResourceDir(ns), 1)
+			}
+
 			// Verify that first and second index are different, and first one is now closed.
 			require.NotEqual(t, firstIndex, secondIndex)
 
@@ -975,6 +987,19 @@ func TestRebuildingIndexClosesPreviousCachedIndex(t *testing.T) {
 	}
 }
 
+func verifyDirEntriesCount(t *testing.T, dir string, count int) {
+	ents, err := os.ReadDir(dir)
+	if err != nil {
+		if os.IsNotExist(err) {
+			ents = nil
+			// This is fine, if dir doesn't exist.
+		} else {
+			require.NoError(t, err)
+		}
+	}
+	require.Len(t, ents, count)
+}
+
 func indexTestDocs(ns resource.NamespacedResource, docs int) func(index resource.ResourceIndex) (int64, error) {
 	return func(index resource.ResourceIndex) (int64, error) {
 		var items []*resource.BulkIndexItem

From 463e544db9812ef6bf02dfe764585b21a00c172c Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Fri, 8 Aug 2025 15:28:17 +0200
Subject: [PATCH 049/243] Add boilerplate code for favoriteDatasource feature
 flag (#109383)

---
 .../grafana-data/src/types/featureToggles.gen.ts    |  4 ++++
 pkg/services/featuremgmt/registry.go                |  7 +++++++
 pkg/services/featuremgmt/toggles_gen.csv            |  1 +
 pkg/services/featuremgmt/toggles_gen.go             |  4 ++++
 pkg/services/featuremgmt/toggles_gen.json           | 13 +++++++++++++
 5 files changed, 29 insertions(+)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 6d2b6c7d02c..68b70a37ed5 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -1081,6 +1081,10 @@ export interface FeatureToggles {
   */
   adhocFiltersInTooltips?: boolean;
   /**
+  * Enable favorite datasources
+  */
+  favoriteDatasources?: boolean;
+  /**
   * New Log Context component
   */
   newLogContext?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 68daf7665a7..93ce87ecfbc 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -1872,6 +1872,13 @@ var (
 			Owner:        grafanaDataProSquad,
 			FrontendOnly: true,
 		},
+		{
+			Name:         "favoriteDatasources",
+			Description:  "Enable favorite datasources",
+			Stage:        FeatureStageExperimental,
+			Owner:        grafanaPluginsPlatformSquad,
+			FrontendOnly: true,
+		},
 		{
 			Name:         "newLogContext",
 			Description:  "New Log Context component",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 62d51933df7..c6bae7b1a40 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -242,5 +242,6 @@ dashboardDsAdHocFiltering,experimental,@grafana/datapro,false,false,true
 dashboardLevelTimeMacros,experimental,@grafana/dashboards-squad,false,false,true
 alertmanagerRemoteSecondaryWithRemoteState,experimental,@grafana/alerting-squad,false,false,false
 adhocFiltersInTooltips,experimental,@grafana/datapro,false,false,true
+favoriteDatasources,experimental,@grafana/plugins-platform-backend,false,false,true
 newLogContext,experimental,@grafana/observability-logs,false,false,true
 newClickhouseConfigPageDesign,privatePreview,@grafana/partner-datasources,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index e1638343dcc..f0e6d5585d8 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -979,6 +979,10 @@ const (
 	// Enable adhoc filter buttons in visualization tooltips
 	FlagAdhocFiltersInTooltips = "adhocFiltersInTooltips"
 
+	// FlagFavoriteDatasources
+	// Enable favorite datasources
+	FlagFavoriteDatasources = "favoriteDatasources"
+
 	// FlagNewLogContext
 	// New Log Context component
 	FlagNewLogContext = "newLogContext"
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 10d99a492ed..575701a2971 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -1316,6 +1316,19 @@
         "frontend": true
       }
     },
+    {
+      "metadata": {
+        "name": "favoriteDatasources",
+        "resourceVersion": "1754648387873",
+        "creationTimestamp": "2025-08-08T10:19:47Z"
+      },
+      "spec": {
+        "description": "Enable favorite datasources",
+        "stage": "experimental",
+        "codeowner": "@grafana/plugins-platform-backend",
+        "frontend": true
+      }
+    },
     {
       "metadata": {
         "name": "featureHighlights",

From f836ea2ada1f12356ed4ec13fadb3a965b6a0fd3 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Fri, 8 Aug 2025 14:31:14 +0100
Subject: [PATCH 050/243] CI: Switch jest unit tests to self-hosted runners
 (#109304)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* trigger a workflow run for baseline

* attempt to improve caching with upfront action

* CYPRESS_INSTALL_BINARY: 0

* PUPPETEER_SKIP_DOWNLOAD: true

* use ubuntu-x64-large runners

* increase to 16 shards 🚀

* fix incorrect shard total

* ubuntu-x64 runners

* Revert "ubuntu-x64 runners"

This reverts commit 3411c7c5e1039263b17a3065cd7d45fa4c3c8f69.

* try caching node_modules

* fix flakey scopes test

* try just ubuntu-x64-large for yarn-install job

* run again, last one had a dodgy trace

* try different runners for yarn instlal

* Move node_modules cache steps to composite action, use ubuntu-x64 runners for everything

* fix duplicate runs-on

* specify shell for composite action

* fix some flaky tests

* update codeowners

* dedupe yarn.lock

* align yarn action, switch tests back to ubuntu-x64-large

* align yarn action cache keys

* fix required-frontend-unit-tests not checking repo out

* try without the node_modules magic

* actually skip the node_modules caching magic

* skip hardened mode

* skip downloading cypress

* comment
---
 .github/CODEOWNERS                            |   1 +
 .github/actionlint.yaml                       |  20 +++
 .github/actions/setup-node/action.yml         |  11 ++
 .../workflows/deploy-storybook-preview.yml    |  14 +-
 .github/workflows/pr-frontend-unit-tests.yml  | 122 ++++++++++--------
 package.json                                  |   2 +-
 .../grafana-o11y-ds-frontend/package.json     |   2 +-
 packages/grafana-prometheus/package.json      |   2 +-
 packages/grafana-sql/package.json             |   2 +-
 .../scopes/tests/dashboardsList.test.ts       |   4 +-
 .../inspect/VariablesUnknownTable.test.tsx    |   1 +
 .../datasource/azuremonitor/package.json      |   2 +-
 .../datasource/cloud-monitoring/package.json  |   2 +-
 .../package.json                              |   2 +-
 .../plugins/datasource/jaeger/package.json    |   2 +-
 .../app/plugins/datasource/mssql/package.json |   2 +-
 .../app/plugins/datasource/mysql/package.json |   2 +-
 .../app/plugins/datasource/tempo/package.json |   2 +-
 .../plugins/datasource/zipkin/package.json    |   2 +-
 yarn.lock                                     |  32 ++---
 20 files changed, 133 insertions(+), 96 deletions(-)
 create mode 100644 .github/actions/setup-node/action.yml

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d9429f2f1d6..25dea1ec619 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1133,6 +1133,7 @@ embed.go @grafana/grafana-as-code
 /.github/actions/setup-grafana-bench/ @Proximyst
 /.github/actions/build-package @grafana/grafana-developer-enablement-squad
 /.github/actions/change-detection @grafana/grafana-developer-enablement-squad
+/.github/actions/setup-node @grafana/grafana-frontend-platform
 /.github/workflows/actionlint-format.txt @grafana/grafana-developer-enablement-squad
 /.github/workflows/actionlint.yml @grafana/grafana-developer-enablement-squad
 /.github/workflows/add-to-whats-new.yml @grafana/docs-tooling
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index d54ad5d2f1f..aac54bd425c 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -6,3 +6,23 @@ self-hosted-runner:
     - github-hosted-ubuntu-x64-small
     - github-hosted-ubuntu-x64-large
     - github-hosted-windows-x64-large
+    - ubuntu-x64
+    - ubuntu-x64-io
+    - ubuntu-x64-small
+    - ubuntu-x64-small-io
+    - ubuntu-x64-large
+    - ubuntu-x64-large-io
+    - ubuntu-x64-xlarge
+    - ubuntu-x64-xlarge-io
+    - ubuntu-x64-2xlarge
+    - ubuntu-x64-2xlarge-io
+    - ubuntu-arm64
+    - ubuntu-arm64-io
+    - ubuntu-arm64-small
+    - ubuntu-arm64-small-io
+    - ubuntu-arm64-large
+    - ubuntu-arm64-large-io
+    - ubuntu-arm64-xlarge
+    - ubuntu-arm64-xlarge-io
+    - ubuntu-arm64-2xlarge
+    - ubuntu-arm64-2xlarge-io
\ No newline at end of file
diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml
new file mode 100644
index 00000000000..5762389f83b
--- /dev/null
+++ b/.github/actions/setup-node/action.yml
@@ -0,0 +1,11 @@
+name: Setup Node.js
+description: Sets up a node.js environment with presets for the Grafana repository.
+
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/setup-node@v4
+      with:
+        node-version-file: '.nvmrc'
+        cache: 'yarn'
+        cache-dependency-path: 'yarn.lock'
\ No newline at end of file
diff --git a/.github/workflows/deploy-storybook-preview.yml b/.github/workflows/deploy-storybook-preview.yml
index a1fecce67cb..57c4ee5bbd4 100644
--- a/.github/workflows/deploy-storybook-preview.yml
+++ b/.github/workflows/deploy-storybook-preview.yml
@@ -32,19 +32,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-
-      - name: Cache node_modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-          key: node_modules-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            node_modules-
+        uses: ./.github/actions/setup-node
 
       - name: Install dependencies
         env:
diff --git a/.github/workflows/pr-frontend-unit-tests.yml b/.github/workflows/pr-frontend-unit-tests.yml
index 283a186c50d..1d320df49e9 100644
--- a/.github/workflows/pr-frontend-unit-tests.yml
+++ b/.github/workflows/pr-frontend-unit-tests.yml
@@ -11,7 +11,7 @@ permissions: {}
 jobs:
   detect-changes:
     name: Detect whether code changed
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-x64-small
     permissions:
       contents: read
     outputs:
@@ -31,100 +31,115 @@ jobs:
     permissions:
       contents: read
       id-token: write
+    needs:
+      - detect-changes
     # Run this workflow only for PRs from forks; if it gets merged into `main` or `release-*`,
     # the `frontend-unit-tests-enterprise` workflow will run instead
-    needs: detect-changes
     if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true && needs.detect-changes.outputs.changed == 'true'
-    runs-on: ubuntu-latest-8-cores
-    name: "Unit tests (${{ matrix.chunk }} / 8)"
+    runs-on: ubuntu-x64-large
+    name: "Unit tests (${{ matrix.shard }} / ${{ matrix.total }})"
     strategy:
       fail-fast: false
       matrix:
-        chunk: [1, 2, 3, 4, 5, 6, 7, 8]
+        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        total: [16]
     steps:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'yarn'
-        cache-dependency-path: 'yarn.lock'
-    - run: yarn install --immutable --check-cache
+    - name: Setup Node.js
+      uses: ./.github/actions/setup-node
+    - name: Yarn install
+      run: yarn install --immutable
+      env:
+        PUPPETEER_SKIP_DOWNLOAD: true
+        CYPRESS_INSTALL_BINARY: 0
     - run: yarn run test:ci
       env:
-        TEST_MAX_WORKERS: 2
-        TEST_SHARD: ${{ matrix.chunk }}
-        TEST_SHARD_TOTAL: 8
+        TEST_MAX_WORKERS: 4
+        TEST_SHARD: ${{ matrix.shard }}
+        TEST_SHARD_TOTAL: ${{ matrix.total }}
 
   frontend-unit-tests-enterprise:
     permissions:
       contents: read
       id-token: write
+    needs:
+      - detect-changes
     # Run this workflow for non-PR events (like pushes to `main` or `release-*`) OR for internal PRs (PRs not from forks)
-    needs: detect-changes
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false && needs.detect-changes.outputs.changed == 'true'
-    runs-on: ubuntu-latest-8-cores
-    name: "Unit tests (${{ matrix.chunk }} / 8)"
+    runs-on: ubuntu-x64-large
+    name: "Unit tests (${{ matrix.shard }} / ${{ matrix.total }})"
     strategy:
       fail-fast: false
       matrix:
-        chunk: [1, 2, 3, 4, 5, 6, 7, 8]
+        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        total: [16]
     steps:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'yarn'
-        cache-dependency-path: 'yarn.lock'
     - name: Setup Enterprise
       uses: ./.github/actions/setup-enterprise
       with:
         github-app-name: 'grafana-ci-bot'
-    - run: yarn install --immutable --check-cache
+    - name: Setup Node.js
+      uses: ./.github/actions/setup-node
+    - name: Yarn install
+      run: yarn install --immutable
+      env:
+        # Switch from default hardened mode to faster mode for internal PRs
+        YARN_ENABLE_HARDENED_MODE: ${{ github.event.pull_request.head.repo.fork == false && '1' || '0' }}
+        PUPPETEER_SKIP_DOWNLOAD: true
+        CYPRESS_INSTALL_BINARY: 0
     - run: yarn run test:ci
       env:
-        TEST_MAX_WORKERS: 2
-        TEST_SHARD: ${{ matrix.chunk }}
-        TEST_SHARD_TOTAL: 8
+        TEST_MAX_WORKERS: 4
+        TEST_SHARD: ${{ matrix.shard }}
+        TEST_SHARD_TOTAL: ${{ matrix.total }}
 
   frontend-decoupled-plugin-tests:
-    needs: detect-changes
+    needs:
+      - detect-changes
     if: needs.detect-changes.outputs.changed == 'true'
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-x64-large
     name: "Decoupled plugin tests"
     steps:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'yarn'
-        cache-dependency-path: 'yarn.lock'
-    - run: yarn install --immutable --check-cache
+    - name: Setup Node.js
+      uses: ./.github/actions/setup-node
+    - name: Yarn install
+      run: yarn install --immutable
+      env:
+        # Switch from default hardened mode to faster mode for internal PRs
+        YARN_ENABLE_HARDENED_MODE: ${{ github.event.pull_request.head.repo.fork == false && '1' || '0' }}
+        PUPPETEER_SKIP_DOWNLOAD: true
+        CYPRESS_INSTALL_BINARY: 0
     - run: yarn run plugin:test:ci
 
   frontend-packages-unit-tests:
-    needs: detect-changes
+    needs:
+      - detect-changes
     if: needs.detect-changes.outputs.changed == 'true'
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-x64-large
     name: "Packages unit tests"
     steps:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'yarn'
-        cache-dependency-path: 'yarn.lock'
-    - run: yarn install --immutable --check-cache
+    - name: Setup Node.js
+      uses: ./.github/actions/setup-node
+    - name: Yarn install
+      run: yarn install --immutable
+      env:
+        # Switch from default hardened mode to faster mode for internal PRs
+        YARN_ENABLE_HARDENED_MODE: ${{ github.event.pull_request.head.repo.fork == false && '1' || '0' }}
+        PUPPETEER_SKIP_DOWNLOAD: true
+        CYPRESS_INSTALL_BINARY: 0
     - run: yarn run packages:test:ci
 
-
   # This is the job that is actually required by rulesets.
   # We need to require EITHER the OSS or the Enterprise job to pass.
   # However, if one is skipped, GitHub won't flat-map the shards,
@@ -141,15 +156,14 @@ jobs:
     if: always()
 
     name: All frontend unit tests complete
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-x64-small
     steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Check test suites
-        env:
-          NEEDS: ${{ toJson(needs) }}
-        run: |
-          FAILURES="$(echo "$NEEDS" | jq 'with_entries(select(.value.result == "failure")) | map_values(.result)')"
-          echo "$FAILURES"
-          if [ "$(echo "$FAILURES" | jq '. | length')" != "0" ]; then
-            exit 1
-          fi
-          echo "All OK!"
+        uses: ./.github/actions/check-jobs
+        with:
+          needs: ${{ toJson(needs) }}
+          failure-message: "One or more unit test jobs have failed"
+          success-message: "All unit tests completed successfully"
\ No newline at end of file
diff --git a/package.json b/package.json
index 997095b4a40..a901d578992 100644
--- a/package.json
+++ b/package.json
@@ -286,7 +286,7 @@
     "@grafana/llm": "0.22.1",
     "@grafana/monaco-logql": "^0.0.8",
     "@grafana/o11y-ds-frontend": "workspace:*",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/prometheus": "workspace:*",
     "@grafana/runtime": "workspace:*",
     "@grafana/scenes": "6.29.5",
diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json
index bf02da0ddd6..877f5db62cc 100644
--- a/packages/grafana-o11y-ds-frontend/package.json
+++ b/packages/grafana-o11y-ds-frontend/package.json
@@ -20,7 +20,7 @@
     "@emotion/css": "11.13.5",
     "@grafana/data": "12.2.0-pre",
     "@grafana/e2e-selectors": "12.2.0-pre",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/runtime": "12.2.0-pre",
     "@grafana/schema": "12.2.0-pre",
     "@grafana/ui": "12.2.0-pre",
diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json
index 3540319148b..d7bb214b562 100644
--- a/packages/grafana-prometheus/package.json
+++ b/packages/grafana-prometheus/package.json
@@ -44,7 +44,7 @@
     "@grafana/data": "12.2.0-pre",
     "@grafana/e2e-selectors": "12.2.0-pre",
     "@grafana/i18n": "12.2.0-pre",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/runtime": "12.2.0-pre",
     "@grafana/schema": "12.2.0-pre",
     "@grafana/ui": "12.2.0-pre",
diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json
index 222a64434b1..d102a94d029 100644
--- a/packages/grafana-sql/package.json
+++ b/packages/grafana-sql/package.json
@@ -19,7 +19,7 @@
     "@grafana/data": "12.2.0-pre",
     "@grafana/e2e-selectors": "12.2.0-pre",
     "@grafana/i18n": "12.2.0-pre",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/runtime": "12.2.0-pre",
     "@grafana/ui": "12.2.0-pre",
     "@react-awesome-query-builder/ui": "6.6.15",
diff --git a/public/app/features/scopes/tests/dashboardsList.test.ts b/public/app/features/scopes/tests/dashboardsList.test.ts
index 30a33ad200c..0e53733658a 100644
--- a/public/app/features/scopes/tests/dashboardsList.test.ts
+++ b/public/app/features/scopes/tests/dashboardsList.test.ts
@@ -1,3 +1,5 @@
+import { waitFor } from '@testing-library/dom';
+
 import { config, locationService } from '@grafana/runtime';
 
 import { ScopesService } from '../ScopesService';
@@ -276,7 +278,7 @@ describe('Dashboards list', () => {
     await updateScopes(scopesService, ['mimir']);
     await searchDashboards('unknown');
     expectDashboardsSearch();
-    expectNoDashboardsForFilter();
+    await waitFor(() => expectNoDashboardsForFilter());
 
     await clearNotFound();
     expectDashboardSearchValue('');
diff --git a/public/app/features/variables/inspect/VariablesUnknownTable.test.tsx b/public/app/features/variables/inspect/VariablesUnknownTable.test.tsx
index 8a8c80ce049..a696c5a3ee6 100644
--- a/public/app/features/variables/inspect/VariablesUnknownTable.test.tsx
+++ b/public/app/features/variables/inspect/VariablesUnknownTable.test.tsx
@@ -81,6 +81,7 @@ describe('VariablesUnknownTable', () => {
 
         await userEvent.click(screen.getByRole('heading', { name: /renamed or missing variables/i }));
 
+        await waitFor(() => expect(screen.queryByTestId('Spinner')).not.toBeInTheDocument());
         expect(screen.getByText('No renamed or missing variables found.')).toBeInTheDocument();
       });
     });
diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json
index f10f7d16ca2..9acb5a941b7 100644
--- a/public/app/plugins/datasource/azuremonitor/package.json
+++ b/public/app/plugins/datasource/azuremonitor/package.json
@@ -7,7 +7,7 @@
     "@emotion/css": "11.13.5",
     "@grafana/data": "12.2.0-pre",
     "@grafana/i18n": "12.2.0-pre",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/runtime": "12.2.0-pre",
     "@grafana/schema": "12.2.0-pre",
     "@grafana/ui": "12.2.0-pre",
diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json
index 500985c2307..7c2d0083f16 100644
--- a/public/app/plugins/datasource/cloud-monitoring/package.json
+++ b/public/app/plugins/datasource/cloud-monitoring/package.json
@@ -7,7 +7,7 @@
     "@emotion/css": "11.13.5",
     "@grafana/data": "12.2.0-pre",
     "@grafana/google-sdk": "0.3.4",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/runtime": "12.2.0-pre",
     "@grafana/schema": "12.2.0-pre",
     "@grafana/ui": "12.2.0-pre",
diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
index e32e7a96323..17c6e899eec 100644
--- a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "@emotion/css": "11.13.5",
     "@grafana/data": "12.2.0-pre",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/runtime": "12.2.0-pre",
     "@grafana/sql": "12.2.0-pre",
     "@grafana/ui": "12.2.0-pre",
diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json
index 72fc318e294..e58c6a5f6b4 100644
--- a/public/app/plugins/datasource/jaeger/package.json
+++ b/public/app/plugins/datasource/jaeger/package.json
@@ -8,7 +8,7 @@
     "@grafana/data": "workspace:*",
     "@grafana/e2e-selectors": "workspace:*",
     "@grafana/o11y-ds-frontend": "workspace:*",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/runtime": "workspace:*",
     "@grafana/ui": "workspace:*",
     "lodash": "4.17.21",
diff --git a/public/app/plugins/datasource/mssql/package.json b/public/app/plugins/datasource/mssql/package.json
index 1119a9bd9df..91f90a3fb8a 100644
--- a/public/app/plugins/datasource/mssql/package.json
+++ b/public/app/plugins/datasource/mssql/package.json
@@ -7,7 +7,7 @@
     "@emotion/css": "11.13.5",
     "@grafana/data": "12.2.0-pre",
     "@grafana/i18n": "12.2.0-pre",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/runtime": "12.2.0-pre",
     "@grafana/sql": "12.2.0-pre",
     "@grafana/ui": "12.2.0-pre",
diff --git a/public/app/plugins/datasource/mysql/package.json b/public/app/plugins/datasource/mysql/package.json
index 4f8814c2e2f..a19fda38150 100644
--- a/public/app/plugins/datasource/mysql/package.json
+++ b/public/app/plugins/datasource/mysql/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "@emotion/css": "11.13.5",
     "@grafana/data": "12.2.0-pre",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/runtime": "12.2.0-pre",
     "@grafana/sql": "12.2.0-pre",
     "@grafana/ui": "12.2.0-pre",
diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json
index feffb9df70b..2a6d293f260 100644
--- a/public/app/plugins/datasource/tempo/package.json
+++ b/public/app/plugins/datasource/tempo/package.json
@@ -10,7 +10,7 @@
     "@grafana/lezer-traceql": "0.0.23",
     "@grafana/monaco-logql": "^0.0.8",
     "@grafana/o11y-ds-frontend": "workspace:*",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/runtime": "workspace:*",
     "@grafana/schema": "workspace:*",
     "@grafana/ui": "workspace:*",
diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json
index a1efe638434..2888569ad27 100644
--- a/public/app/plugins/datasource/zipkin/package.json
+++ b/public/app/plugins/datasource/zipkin/package.json
@@ -8,7 +8,7 @@
     "@grafana/data": "workspace:*",
     "@grafana/e2e-selectors": "workspace:*",
     "@grafana/o11y-ds-frontend": "workspace:*",
-    "@grafana/plugin-ui": "0.10.8",
+    "@grafana/plugin-ui": "0.10.9",
     "@grafana/runtime": "workspace:*",
     "@grafana/ui": "workspace:*",
     "lodash": "4.17.21",
diff --git a/yarn.lock b/yarn.lock
index a5e9d5b4734..818bdbe01d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2542,7 +2542,7 @@ __metadata:
     "@grafana/e2e-selectors": "npm:12.2.0-pre"
     "@grafana/i18n": "npm:12.2.0-pre"
     "@grafana/plugin-configs": "npm:12.2.0-pre"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/runtime": "npm:12.2.0-pre"
     "@grafana/schema": "npm:12.2.0-pre"
     "@grafana/ui": "npm:12.2.0-pre"
@@ -2588,7 +2588,7 @@ __metadata:
     "@grafana/data": "npm:12.2.0-pre"
     "@grafana/e2e-selectors": "npm:12.2.0-pre"
     "@grafana/plugin-configs": "npm:12.2.0-pre"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/runtime": "npm:12.2.0-pre"
     "@grafana/sql": "npm:12.2.0-pre"
     "@grafana/ui": "npm:12.2.0-pre"
@@ -2702,7 +2702,7 @@ __metadata:
     "@grafana/e2e-selectors": "workspace:*"
     "@grafana/o11y-ds-frontend": "workspace:*"
     "@grafana/plugin-configs": "workspace:*"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/runtime": "workspace:*"
     "@grafana/ui": "workspace:*"
     "@testing-library/dom": "npm:10.4.1"
@@ -2789,7 +2789,7 @@ __metadata:
     "@grafana/e2e-selectors": "npm:12.2.0-pre"
     "@grafana/i18n": "npm:12.2.0-pre"
     "@grafana/plugin-configs": "npm:12.2.0-pre"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/runtime": "npm:12.2.0-pre"
     "@grafana/sql": "npm:12.2.0-pre"
     "@grafana/ui": "npm:12.2.0-pre"
@@ -2821,7 +2821,7 @@ __metadata:
     "@grafana/data": "npm:12.2.0-pre"
     "@grafana/e2e-selectors": "npm:12.2.0-pre"
     "@grafana/plugin-configs": "npm:12.2.0-pre"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/runtime": "npm:12.2.0-pre"
     "@grafana/sql": "npm:12.2.0-pre"
     "@grafana/ui": "npm:12.2.0-pre"
@@ -2887,7 +2887,7 @@ __metadata:
     "@grafana/e2e-selectors": "npm:12.2.0-pre"
     "@grafana/google-sdk": "npm:0.3.4"
     "@grafana/plugin-configs": "npm:12.2.0-pre"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/runtime": "npm:12.2.0-pre"
     "@grafana/schema": "npm:12.2.0-pre"
     "@grafana/ui": "npm:12.2.0-pre"
@@ -2936,7 +2936,7 @@ __metadata:
     "@grafana/monaco-logql": "npm:^0.0.8"
     "@grafana/o11y-ds-frontend": "workspace:*"
     "@grafana/plugin-configs": "npm:12.2.0-pre"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/runtime": "workspace:*"
     "@grafana/schema": "workspace:*"
     "@grafana/ui": "workspace:*"
@@ -2994,7 +2994,7 @@ __metadata:
     "@grafana/e2e-selectors": "workspace:*"
     "@grafana/o11y-ds-frontend": "workspace:*"
     "@grafana/plugin-configs": "workspace:*"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/runtime": "workspace:*"
     "@grafana/ui": "workspace:*"
     "@testing-library/dom": "npm:10.4.1"
@@ -3374,7 +3374,7 @@ __metadata:
     "@emotion/css": "npm:11.13.5"
     "@grafana/data": "npm:12.2.0-pre"
     "@grafana/e2e-selectors": "npm:12.2.0-pre"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/runtime": "npm:12.2.0-pre"
     "@grafana/schema": "npm:12.2.0-pre"
     "@grafana/ui": "npm:12.2.0-pre"
@@ -3444,9 +3444,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/plugin-ui@npm:0.10.8, @grafana/plugin-ui@npm:^0.10.1":
-  version: 0.10.8
-  resolution: "@grafana/plugin-ui@npm:0.10.8"
+"@grafana/plugin-ui@npm:0.10.9, @grafana/plugin-ui@npm:^0.10.1":
+  version: 0.10.9
+  resolution: "@grafana/plugin-ui@npm:0.10.9"
   dependencies:
     "@emotion/css": "npm:^11.11.2"
     "@hello-pangea/dnd": "npm:^17.0.0"
@@ -3468,7 +3468,7 @@ __metadata:
     react: ^18.2.0
     react-dom: ^18.2.0
     rxjs: ^7.8.1
-  checksum: 10/3ef5eddd9a517fe2c7a0796f3d96dcd802153b625c46d7b2733f91f0378c6a8423022cae238b3bb6f554845f7e1bf63447ed8f9d3a6a5ada7d3df1e53c9cbf09
+  checksum: 10/3f49f6fef04594b5ea98052738bee64ed587fa7646947d90633b833c83a7376627feabf256f077d69a5ca2f19a3df4fe7c42f67d98e1c0c834ba4712086cd423
   languageName: node
   linkType: hard
 
@@ -3481,7 +3481,7 @@ __metadata:
     "@grafana/data": "npm:12.2.0-pre"
     "@grafana/e2e-selectors": "npm:12.2.0-pre"
     "@grafana/i18n": "npm:12.2.0-pre"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/runtime": "npm:12.2.0-pre"
     "@grafana/schema": "npm:12.2.0-pre"
     "@grafana/ui": "npm:12.2.0-pre"
@@ -3654,7 +3654,7 @@ __metadata:
     "@grafana/data": "npm:12.2.0-pre"
     "@grafana/e2e-selectors": "npm:12.2.0-pre"
     "@grafana/i18n": "npm:12.2.0-pre"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/runtime": "npm:12.2.0-pre"
     "@grafana/ui": "npm:12.2.0-pre"
     "@react-awesome-query-builder/ui": "npm:6.6.15"
@@ -18215,7 +18215,7 @@ __metadata:
     "@grafana/monaco-logql": "npm:^0.0.8"
     "@grafana/o11y-ds-frontend": "workspace:*"
     "@grafana/plugin-e2e": "npm:2.1.7"
-    "@grafana/plugin-ui": "npm:0.10.8"
+    "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/prometheus": "workspace:*"
     "@grafana/runtime": "workspace:*"
     "@grafana/scenes": "npm:6.29.5"

From 73f24d31169b0345e904088a24d3f4cd4208179d Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Fri, 8 Aug 2025 16:03:27 +0200
Subject: [PATCH 051/243] Alerting: Pass exact matchers to the backend in the
 state history UI (#109292)

---
 .../alerting/unified/api/stateHistoryApi.ts   | 28 ++++++++++++++---
 .../EventListSceneObject.tsx                  | 15 ++++++++-
 .../HistoryEventsList.test.tsx                | 31 +++++++++++++++++++
 public/locales/en-US/grafana.json             |  2 +-
 4 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/public/app/features/alerting/unified/api/stateHistoryApi.ts b/public/app/features/alerting/unified/api/stateHistoryApi.ts
index 2f82fe6ef2d..bb4c85c58a9 100644
--- a/public/app/features/alerting/unified/api/stateHistoryApi.ts
+++ b/public/app/features/alerting/unified/api/stateHistoryApi.ts
@@ -4,11 +4,29 @@ import { alertingApi } from './alertingApi';
 
 export const stateHistoryApi = alertingApi.injectEndpoints({
   endpoints: (build) => ({
-    getRuleHistory: build.query<DataFrameJSON, { ruleUid?: string; from?: number; to?: number; limit?: number }>({
-      query: ({ ruleUid, from, to, limit = 100 }) => ({
-        url: '/api/v1/rules/history',
-        params: { ruleUID: ruleUid, from, to, limit },
-      }),
+    getRuleHistory: build.query<
+      DataFrameJSON,
+      { ruleUid?: string; from?: number; to?: number; limit?: number; labels?: Record<string, string> }
+    >({
+      query: ({ ruleUid, from, to, limit = 100, labels }) => {
+        const params: Record<string, string | number | undefined> = {
+          ruleUID: ruleUid,
+          from,
+          to,
+          limit,
+        };
+
+        if (labels) {
+          Object.entries(labels).forEach(([key, value]) => {
+            params[`labels_${key}`] = value;
+          });
+        }
+
+        return {
+          url: '/api/v1/rules/history',
+          params,
+        };
+      },
     }),
   }),
 });
diff --git a/public/app/features/alerting/unified/components/rules/central-state-history/EventListSceneObject.tsx b/public/app/features/alerting/unified/components/rules/central-state-history/EventListSceneObject.tsx
index 24fe014c246..c8fd1eb751b 100644
--- a/public/app/features/alerting/unified/components/rules/central-state-history/EventListSceneObject.tsx
+++ b/public/app/features/alerting/unified/components/rules/central-state-history/EventListSceneObject.tsx
@@ -29,6 +29,7 @@ import { AITriageButtonComponent } from '../../../enterprise-components/AI/AIGen
 import { usePagination } from '../../../hooks/usePagination';
 import { combineMatcherStrings } from '../../../utils/alertmanager';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../../utils/datasource';
+import { parsePromQLStyleMatcherLooseSafe } from '../../../utils/matchers';
 import { createRelativeUrl } from '../../../utils/url';
 import { AlertLabels } from '../../AlertLabels';
 import { CollapseToggle } from '../../CollapseToggle';
@@ -65,6 +66,17 @@ export const HistoryEventsList = ({
   const from = timeRange?.from.unix();
   const to = timeRange?.to.unix();
 
+  const labelMatchers = parsePromQLStyleMatcherLooseSafe(valueInLabelFilter.toString());
+
+  // Prepare labels for filtering on the backend side.
+  // Backend supports only exact matchers.
+  const labelFilters: Record<string, string> = {};
+  labelMatchers.forEach((matcher) => {
+    if (!matcher.isRegex && matcher.isEqual) {
+      labelFilters[matcher.name] = matcher.value;
+    }
+  });
+
   const {
     data: stateHistory,
     isLoading,
@@ -74,6 +86,7 @@ export const HistoryEventsList = ({
     from: from,
     to: to,
     limit: LIMIT_EVENTS,
+    labels: Object.keys(labelFilters).length > 0 ? labelFilters : undefined,
   });
 
   const { historyRecords: historyRecordsNotSorted } = useRuleHistoryRecords(stateHistory, {
@@ -102,7 +115,7 @@ export const HistoryEventsList = ({
         >
           {t(
             'alerting.central-alert-history.too-many-events.text',
-            'The selected time period has too many events to display. Diplaying the latest 5000 events. Try using a shorter time period.'
+            'The selected time period has too many events to display. Displaying the latest 5000 events. Try using a shorter time period.'
           )}
         </Alert>
       )}
diff --git a/public/app/features/alerting/unified/components/rules/central-state-history/HistoryEventsList.test.tsx b/public/app/features/alerting/unified/components/rules/central-state-history/HistoryEventsList.test.tsx
index e2196595e57..1dea299dd2e 100644
--- a/public/app/features/alerting/unified/components/rules/central-state-history/HistoryEventsList.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/central-state-history/HistoryEventsList.test.tsx
@@ -4,6 +4,7 @@ import { byLabelText, byTestId } from 'testing-library-selector';
 import { getDefaultTimeRange } from '@grafana/data';
 
 import { setupMswServer } from '../../../mockApi';
+import { captureRequests } from '../../../mocks/server/events';
 
 import { StateFilterValues } from './CentralAlertHistoryScene';
 import { HistoryEventsList } from './EventListSceneObject';
@@ -148,4 +149,34 @@ describe('HistoryEventsList', () => {
     });
     expect(ui.rowHeader.query()).not.toBeInTheDocument();
   });
+
+  describe('backend filtering', () => {
+    it('should send only exact match filters to the backend', async () => {
+      const capture = captureRequests((req) => req.url.includes('/api/v1/rules/history'));
+
+      render(
+        <HistoryEventsList
+          valueInLabelFilter={'alertname=alert1, grafana_folder=~".*folder.*", severity!=high, team="alerting"'}
+          valueInStateToFilter={StateFilterValues.all}
+          valueInStateFromFilter={StateFilterValues.all}
+          addFilter={jest.fn()}
+          timeRange={getDefaultTimeRange()}
+        />
+      );
+
+      await waitFor(() => {
+        expect(ui.loadingBar.query()).not.toBeInTheDocument();
+      });
+
+      const requests = await capture;
+      expect(requests).toHaveLength(1);
+
+      const url = new URL(requests[0].url);
+
+      expect(url.searchParams.get('labels_alertname')).toBe('alert1');
+      expect(url.searchParams.get('labels_team')).toBe('alerting');
+      expect(url.searchParams.get('labels_grafana_folder')).toBeNull();
+      expect(url.searchParams.get('labels_severity')).toBeNull();
+    });
+  });
 });
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index dcde328be5e..34429ae992c 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -788,7 +788,7 @@
       },
       "filterBy": "Filter by:",
       "too-many-events": {
-        "text": "The selected time period has too many events to display. Diplaying the latest 5000 events. Try using a shorter time period.",
+        "text": "The selected time period has too many events to display. Displaying the latest 5000 events. Try using a shorter time period.",
         "title": "Unable to display all events"
       }
     },

From 4e94e463cf4e56e6866f51ea2fc7284309b8ce73 Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Fri, 8 Aug 2025 16:08:36 +0200
Subject: [PATCH 052/243] Alerting: Fix private labels filtering test (#109393)

---
 .../ngalert/schedule/recording_rule_test.go   | 61 ++++++++++++++++---
 1 file changed, 52 insertions(+), 9 deletions(-)

diff --git a/pkg/services/ngalert/schedule/recording_rule_test.go b/pkg/services/ngalert/schedule/recording_rule_test.go
index 115da2e73d6..b5da12947d5 100644
--- a/pkg/services/ngalert/schedule/recording_rule_test.go
+++ b/pkg/services/ngalert/schedule/recording_rule_test.go
@@ -12,8 +12,11 @@ import (
 	"time"
 
 	"github.com/benbjohnson/clock"
+	"github.com/gogo/protobuf/proto"
+	"github.com/golang/snappy"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
+	"github.com/prometheus/prometheus/prompb"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/atomic"
 
@@ -756,12 +759,12 @@ func testRecordingRule_Integration(t *testing.T, writeTarget *writer.TestRemoteW
 		rule := gen.With(withQueryForHealth("ok")).GenerateRef()
 		rule.Record.TargetDatasourceUID = dsUID
 		rule.Labels = map[string]string{
-			"normal_label":                             "value1",
-			"another_label":                            "value2",
+			"normal_label":                             "not_filtered_1",
+			"another_label":                            "not_filtered_2",
 			models.AutogeneratedRouteLabel:             "filtered",
 			models.AutogeneratedRouteReceiverNameLabel: "filtered",
-			"__user_custom__":                          "not_filtered",
-			"only_end__":                               "not_filtered",
+			"__user_custom__":                          "not_filtered_3",
+			"only_end__":                               "not_filtered_4",
 		}
 
 		ruleStore.PutRule(context.Background(), rule)
@@ -790,12 +793,27 @@ func testRecordingRule_Integration(t *testing.T, writeTarget *writer.TestRemoteW
 			require.Equal(t, 1, writeTarget.RequestsCount)
 			require.NotEmpty(t, writeTarget.LastRequestBody)
 
-			// Check that the body doesn't contain the private labels
-			require.NotContains(t, writeTarget.LastRequestBody, models.AutogeneratedRouteLabel)
-			require.NotContains(t, writeTarget.LastRequestBody, models.AutogeneratedRouteReceiverNameLabel)
+			writeReq := decodePrometheusWriteRequest(t, writeTarget.LastRequestBody)
 
-			require.Contains(t, writeTarget.LastRequestBody, "__user_custom__")
-			require.Contains(t, writeTarget.LastRequestBody, rule.Record.Metric)
+			// Check that the private labels are filtered out
+			for _, label := range []string{
+				models.AutogeneratedRouteLabel,
+				models.AutogeneratedRouteReceiverNameLabel,
+			} {
+				_, found := getLabel(writeReq, label)
+				require.False(t, found, "Label %s should not be present in the write request", label)
+			}
+
+			// Check that user-defined labels are preserved
+			for _, label := range []string{
+				"normal_label",
+				"another_label",
+				"__user_custom__",
+				"only_end__",
+			} {
+				value, _ := getLabel(writeReq, label)
+				require.Equal(t, rule.Labels[label], value, "Label %s=%s should be present in the write request", label, rule.Labels[label])
+			}
 		})
 	})
 }
@@ -874,3 +892,28 @@ type mockPluginContextProvider struct{}
 func (m *mockPluginContextProvider) GetWithDataSource(ctx context.Context, pluginID string, user identity.Requester, ds *datasources.DataSource) (backend.PluginContext, error) {
 	return backend.PluginContext{}, nil
 }
+
+func decodePrometheusWriteRequest(t *testing.T, data string) *prompb.WriteRequest {
+	t.Helper()
+
+	decompressed, err := snappy.Decode(nil, []byte(data))
+	require.NoError(t, err)
+
+	var writeReq prompb.WriteRequest
+	err = proto.Unmarshal(decompressed, &writeReq)
+	require.NoError(t, err)
+
+	return &writeReq
+}
+
+func getLabel(req *prompb.WriteRequest, labelName string) (string, bool) {
+	for _, ts := range req.Timeseries {
+		for _, label := range ts.Labels {
+			if label.Name == labelName {
+				return label.Value, true
+			}
+		}
+	}
+
+	return "", false
+}

From 992d189c0fb3f8adfa93ea47d6aeb361b41c53e7 Mon Sep 17 00:00:00 2001
From: Paul Marbach <paul.marbach@grafana.com>
Date: Fri, 8 Aug 2025 10:55:53 -0400
Subject: [PATCH 053/243] Table: Frozen columns (#109276)

* Table: Frozen columns

* i18n extract

* clamp the frozen columns by the total number of cols visible

* future-proof a bit: frozenColumns.left, add to kitchenSink
---
 .../panel-table/table_kitchen_sink.json       |  5 ++++-
 .../src/components/Table/TableNG/TableNG.tsx  | 19 ++++++++++++++++++-
 .../src/components/Table/TableNG/styles.ts    | 14 +++++++++++---
 .../src/components/Table/TableNG/types.ts     |  1 +
 .../panel/table/table-new/TablePanel.tsx      |  1 +
 .../plugins/panel/table/table-new/module.tsx  |  9 +++++++++
 .../panel/table/table-new/panelcfg.cue        |  4 ++++
 .../panel/table/table-new/panelcfg.gen.ts     |  6 ++++++
 public/locales/en-US/grafana.json             |  2 ++
 9 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/devenv/dev-dashboards/panel-table/table_kitchen_sink.json b/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
index 77ba090a0df..257893982e0 100644
--- a/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
+++ b/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
@@ -410,6 +410,9 @@
       "id": 1,
       "options": {
         "cellHeight": "sm",
+        "frozenColumns": {
+          "left": 1
+        },
         "footer": {
           "countRows": false,
           "enablePagination": false,
@@ -1670,5 +1673,5 @@
   "timezone": "",
   "title": "Panel Tests - Table - Kitchen Sink",
   "uid": "dcb9f5e9-8066-4397-889e-864b99555dbb",
-  "version": 7
+  "version": 8
 }
diff --git a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
index 4adbf7541c9..a3e532f7cad 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
@@ -87,6 +87,7 @@ export function TableNG(props: TableNGProps) {
     enableSharedCrosshair = false,
     enableVirtualization,
     footerOptions,
+    frozenColumns = 0,
     getActions = () => [],
     height,
     initialSortBy,
@@ -184,6 +185,19 @@ export function TableNG(props: TableNGProps) {
     [theme]
   );
   const widths = useMemo(() => computeColWidths(visibleFields, availableWidth), [visibleFields, availableWidth]);
+  const numColsFullyInView = useMemo(
+    () =>
+      widths.reduce(
+        ([count, remainingWidth], nextWidth) => {
+          if (remainingWidth - nextWidth >= 0) {
+            return [count + 1, remainingWidth - nextWidth];
+          }
+          return [count, 0];
+        },
+        [0, availableWidth]
+      )[0],
+    [widths, availableWidth]
+  );
   const headerHeight = useHeaderHeight({
     columnWidths: widths,
     fields: visibleFields,
@@ -476,6 +490,7 @@ export function TableNG(props: TableNGProps) {
           name: displayName,
           width,
           headerCellClass,
+          frozen: Math.min(frozenColumns, numColsFullyInView) > i,
           renderCell: renderCellContent,
           renderHeaderCell: ({ column, sortDirection }) => (
             <HeaderCell
@@ -617,8 +632,11 @@ export function TableNG(props: TableNGProps) {
     expandedRows,
     filter,
     footerCalcs,
+    frozenColumns,
+    getCellActions,
     hasNestedFrames,
     isCountRowsSet,
+    numColsFullyInView,
     onCellFilterAdded,
     panelContext,
     rowHeight,
@@ -631,7 +649,6 @@ export function TableNG(props: TableNGProps) {
     theme,
     visibleFields,
     widths,
-    getCellActions,
   ]);
 
   // invalidate columns on every structureRev change. this supports width editing in the fieldConfig.
diff --git a/packages/grafana-ui/src/components/Table/TableNG/styles.ts b/packages/grafana-ui/src/components/Table/TableNG/styles.ts
index 9fed490c224..739652cf92f 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/styles.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/styles.ts
@@ -46,12 +46,20 @@ export const getGridStyles = (
     '& > :not(.rdg-summary-row, .rdg-header-row) > .rdg-cell': {
       '&:hover, &[aria-selected=true]': { boxShadow: theme.shadows.z2 },
       // selected cells should appear below hovered cells.
-      '&:hover': { zIndex: theme.zIndex.tooltip - 2 },
-      '&[aria-selected=true]': { zIndex: theme.zIndex.tooltip - 3 },
+      '&:hover': { zIndex: theme.zIndex.tooltip - 4 },
+      '&[aria-selected=true]': { zIndex: theme.zIndex.tooltip - 5 },
     },
 
+    '.rdg-cell.rdg-cell-frozen': { zIndex: theme.zIndex.tooltip - 2 },
+
     '.rdg-header-row, .rdg-summary-row': {
-      '.rdg-cell': { zIndex: theme.zIndex.tooltip - 1 },
+      '.rdg-cell': {
+        zIndex: theme.zIndex.tooltip - 3,
+
+        '&.rdg-cell-frozen': {
+          zIndex: theme.zIndex.tooltip - 1,
+        },
+      },
     },
   }),
   gridNested: css({
diff --git a/packages/grafana-ui/src/components/Table/TableNG/types.ts b/packages/grafana-ui/src/components/Table/TableNG/types.ts
index 105e900189c..8a2b25bc986 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/types.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/types.ts
@@ -129,6 +129,7 @@ export interface BaseTableProps {
   onCellFilterAdded?: TableFilterActionCallback;
   footerOptions?: TableFooterCalc;
   footerValues?: FooterItem[];
+  frozenColumns?: number;
   enablePagination?: boolean;
   cellHeight?: TableCellHeight;
   structureRev?: number;
diff --git a/public/app/plugins/panel/table/table-new/TablePanel.tsx b/public/app/plugins/panel/table/table-new/TablePanel.tsx
index 6859e6368fb..18bce856a4a 100644
--- a/public/app/plugins/panel/table/table-new/TablePanel.tsx
+++ b/public/app/plugins/panel/table/table-new/TablePanel.tsx
@@ -77,6 +77,7 @@ export function TablePanel(props: Props) {
       onColumnResize={(displayName, resizedWidth) => onColumnResize(displayName, resizedWidth, props)}
       onCellFilterAdded={panelContext.onAddAdHocFilter}
       footerOptions={options.footer}
+      frozenColumns={options.frozenColumns?.left}
       enablePagination={options.footer?.enablePagination}
       cellHeight={options.cellHeight}
       timeRange={timeRange}
diff --git a/public/app/plugins/panel/table/table-new/module.tsx b/public/app/plugins/panel/table/table-new/module.tsx
index a40d4c0b047..bde9b5c7c40 100644
--- a/public/app/plugins/panel/table/table-new/module.tsx
+++ b/public/app/plugins/panel/table/table-new/module.tsx
@@ -128,6 +128,15 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(TablePanel)
         category,
         defaultValue: defaultOptions.showHeader,
       })
+      .addNumberInput({
+        path: 'frozenColumns.left',
+        name: t('table-new.name-frozen-columns', 'Frozen columns'),
+        description: t('table-new.description-frozen-columns', 'Columns are frozen from the left side of the table'),
+        settings: {
+          placeholder: 'none',
+        },
+        category,
+      })
       .addRadio({
         path: 'cellHeight',
         name: t('table-new.name-cell-height', 'Cell height'),
diff --git a/public/app/plugins/panel/table/table-new/panelcfg.cue b/public/app/plugins/panel/table/table-new/panelcfg.cue
index 214e854f4a4..1bfbd053cf2 100644
--- a/public/app/plugins/panel/table/table-new/panelcfg.cue
+++ b/public/app/plugins/panel/table/table-new/panelcfg.cue
@@ -44,6 +44,10 @@ composableKinds: PanelCfg: {
 					}
 					// Controls the height of the rows
 					cellHeight?: ui.TableCellHeight & (*"sm" | _)
+          // Defines the number of columns to freeze on the left side of the table
+          frozenColumns?: {
+            left?: number | *0
+          }
 				} @cuetsy(kind="interface")
 				FieldConfig: {
 					ui.TableFieldOptions
diff --git a/public/app/plugins/panel/table/table-new/panelcfg.gen.ts b/public/app/plugins/panel/table/table-new/panelcfg.gen.ts
index 5b771ff2640..bed8165671a 100644
--- a/public/app/plugins/panel/table/table-new/panelcfg.gen.ts
+++ b/public/app/plugins/panel/table/table-new/panelcfg.gen.ts
@@ -23,6 +23,12 @@ export interface Options {
    * Represents the index of the selected frame
    */
   frameIndex: number;
+  /**
+   * number of columns on the left side of the table that should be frozen
+   */
+  frozenColumns?: {
+    left?: number;
+  };
   /**
    * Controls whether the panel should show the header
    */
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 34429ae992c..5f45a3bab72 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -12717,6 +12717,7 @@
     "description-column-filter": "Enables/disables field filters in table",
     "description-count-rows": "Display a single count for all data rows",
     "description-fields": "Select the fields that should be calculated",
+    "description-frozen-columns": "Columns are frozen from the left side of the table",
     "description-min-column-width": "The minimum width for column auto resizing",
     "name-calculation": "Calculation",
     "name-cell-height": "Cell height",
@@ -12728,6 +12729,7 @@
     "name-count-rows": "Count rows",
     "name-enable-pagination": "Enable pagination",
     "name-fields": "Fields",
+    "name-frozen-columns": "Frozen columns",
     "name-hide-in-table": "Hide in table",
     "name-min-column-width": "Minimum column width",
     "name-show-table-footer": "Show table footer",

From bd2f14e01bfb2a808cae128a7ca1864815017f26 Mon Sep 17 00:00:00 2001
From: Matt Cowley <me@mattcowley.co.uk>
Date: Fri, 8 Aug 2025 15:58:48 +0100
Subject: [PATCH 054/243] Plugins: Move AppChrome extension point to top of
 stack (#109015)

* Plugins: Move AppChrome extension point to top of stack

* Plugins: Switch AppChrome extension gating to chromeless flag
---
 .../AppChrome/AppChromeExtensionPoint.tsx       | 17 ++++-------------
 public/app/routes/RoutesWrapper.tsx             |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/public/app/core/components/AppChrome/AppChromeExtensionPoint.tsx b/public/app/core/components/AppChrome/AppChromeExtensionPoint.tsx
index 16d651e72bd..96d7d68d8ad 100644
--- a/public/app/core/components/AppChrome/AppChromeExtensionPoint.tsx
+++ b/public/app/core/components/AppChrome/AppChromeExtensionPoint.tsx
@@ -1,25 +1,16 @@
-import { useLocation } from 'react-router-dom';
-
 import { PluginExtensionPoints } from '@grafana/data';
 import { config, renderLimitedComponents, usePluginComponents } from '@grafana/runtime';
-
-const excludedRoutes: Record<string, boolean> = {
-  '/login': true,
-  '/signup': true,
-  '/verify': true,
-  '/user/password/send-reset-email': true,
-  '/user/password/reset': true,
-  '/sandbox/benchmarks': true,
-};
+import { useGrafana } from 'app/core/context/GrafanaContext';
 
 export function AppChromeExtensionPoint(): JSX.Element | null {
-  const location = useLocation();
+  const { chrome } = useGrafana();
+  const state = chrome.useState();
 
   if (config.featureToggles.enableAppChromeExtensions !== true) {
     return null;
   }
 
-  if (excludedRoutes[location.pathname]) {
+  if (state.chromeless) {
     return null;
   }
 
diff --git a/public/app/routes/RoutesWrapper.tsx b/public/app/routes/RoutesWrapper.tsx
index 1c79403d8ed..dafa5b000c5 100644
--- a/public/app/routes/RoutesWrapper.tsx
+++ b/public/app/routes/RoutesWrapper.tsx
@@ -34,6 +34,7 @@ export function RouterWrapper(props: RouterWrapperProps) {
                 <AppChrome>
                   <AppNotificationList />
                   <Stack gap={0} grow={1} direction="column">
+                    <AppChromeExtensionPoint />
                     {props.pageBanners.map((Banner, index) => (
                       <Banner key={index.toString()} />
                     ))}
@@ -42,7 +43,6 @@ export function RouterWrapper(props: RouterWrapperProps) {
                   {props.bodyRenderHooks.map((Hook, index) => (
                     <Hook key={index.toString()} />
                   ))}
-                  <AppChromeExtensionPoint />
                 </AppChrome>
                 <ModalRoot />
               </ModalsContextProvider>

From f019848209be0cf90a29b1eaccb7ef5e96e8d789 Mon Sep 17 00:00:00 2001
From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Date: Fri, 8 Aug 2025 11:00:38 -0400
Subject: [PATCH 055/243] Update CODEOWNERS for what's new and upgrade guide
 (#109406)

---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 25dea1ec619..d5081caa079 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -43,8 +43,8 @@
 /docs/sources/datasources/                                                        @lwandz13
 /docs/sources/panels-visualizations/                                              @imatwawana
 /docs/sources/release-notes/                                                      @irenerl24 @GrafanaWriter
-/docs/sources/upgrade-guide/                                                      @imatwawana
-/docs/sources/whatsnew/                                                           @imatwawana
+/docs/sources/upgrade-guide/                                                      @jtvdez
+/docs/sources/whatsnew/                                                           @jtvdez
 
 /docs/sources/developers/plugins/                                                 @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
 

From 155f1fc58c1f6f5fdfbc609c1ed41b94679d60c7 Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Fri, 8 Aug 2025 11:18:02 -0400
Subject: [PATCH 056/243] RepositoryOverview: Bugfix recent job not displaying
 in OSS (#109407)

fix condition
---
 .../provisioning/Repository/RepositoryOverview.tsx   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/app/features/provisioning/Repository/RepositoryOverview.tsx b/public/app/features/provisioning/Repository/RepositoryOverview.tsx
index 25053decfa0..eaba56e5cc8 100644
--- a/public/app/features/provisioning/Repository/RepositoryOverview.tsx
+++ b/public/app/features/provisioning/Repository/RepositoryOverview.tsx
@@ -253,12 +253,12 @@ export function RepositoryOverview({ repo }: { repo: Repository }) {
         </Grid>
 
         {/* job status is not ready for Cloud yet */}
-        {config.buildInfo.edition === GrafanaEdition.OpenSource ||
-          (config.buildInfo.edition === GrafanaEdition.Enterprise && (
-            <div className={styles.cardContainer}>
-              <RecentJobs repo={repo} />
-            </div>
-          ))}
+        {(config.buildInfo.edition === GrafanaEdition.OpenSource ||
+          config.buildInfo.edition === GrafanaEdition.Enterprise) && (
+          <div className={styles.cardContainer}>
+            <RecentJobs repo={repo} />
+          </div>
+        )}
       </Stack>
     </Box>
   );

From 5e4dd1c907fa0d72fb6a2b36a05946ec85e0da7c Mon Sep 17 00:00:00 2001
From: Artur Wierzbicki <artur.wierzbicki@grafana.com>
Date: Fri, 8 Aug 2025 19:31:47 +0400
Subject: [PATCH 057/243] AutoTriager: add git sync (#107103)

add gitsync
---
 .github/commands.json                     | 8 ++++++++
 .github/workflows/auto-triager/labels.txt | 1 +
 2 files changed, 9 insertions(+)

diff --git a/.github/commands.json b/.github/commands.json
index 06f91a56c59..9923a064fd2 100644
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -947,6 +947,14 @@
       "url": "https://github.com/orgs/grafana/projects/202"
     }
   },
+  {
+    "type": "label",
+    "name": "area/gitsync",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/792"
+    }
+  },
   {
     "type": "label",
     "name": "area/backend/db/sqlite",
diff --git a/.github/workflows/auto-triager/labels.txt b/.github/workflows/auto-triager/labels.txt
index 517a6ad867d..18ef2df93d8 100644
--- a/.github/workflows/auto-triager/labels.txt
+++ b/.github/workflows/auto-triager/labels.txt
@@ -14,6 +14,7 @@ area/backend/db/mysql
 area/backend/db/postgres
 area/backend/db/sql
 area/backend/db/sqlite
+area/gitsync
 area/configuration
 area/dashboard/annotations
 area/dashboard/data-links

From f77e8839d9ae11c2c3ffc220e2ef6f91f775fd84 Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matias.chomicki@grafana.com>
Date: Fri, 8 Aug 2025 19:13:01 +0200
Subject: [PATCH 058/243] New Logs Panel: Display nanoseconds if present 
 (#109210)

* processing: display nanoseconds if present

* Nanoseconds: add control in log line menu

* virtualization: adapt to timestamp format

* Translations

* LogLine: update test

* virtualization: update test

* LogLineMenu: update test

* LogListControls: add third state for new logs panel timestamps

* Logs Panel: expose as a new panel option

* Translations

* Logs Panel: set timestamp resolution from panel config

* Module: add default value

* LogLine: update test

* Spelling

* chore: rename setter

* LogListControls: use custom button for resolution

* Translations

* Translations

* Prettier

* Logs Panel: conditionally show timestamp and details options

* Add integration test
---
 .../logs/panelcfg/x/LogsPanelCfg_types.gen.ts |   1 +
 .../logs/components/panel/LogLine.test.tsx    |  32 ++++
 .../logs/components/panel/LogLine.tsx         |  13 +-
 .../logs/components/panel/LogLineMenu.tsx     |  24 +--
 .../logs/components/panel/LogList.test.tsx    |  29 +++-
 .../logs/components/panel/LogList.tsx         |  13 +-
 .../logs/components/panel/LogListContext.tsx  | 142 ++++++++++++------
 .../logs/components/panel/LogListControls.tsx | 108 +++++++++++--
 .../panel/__mocks__/LogListContext.tsx        |   7 +
 .../logs/components/panel/processing.ts       |  28 +++-
 .../components/panel/virtualization.test.ts   |  15 +-
 .../logs/components/panel/virtualization.ts   |   9 +-
 public/app/plugins/panel/logs/LogsPanel.tsx   |   5 +
 public/app/plugins/panel/logs/module.tsx      |  84 +++++++----
 public/app/plugins/panel/logs/panelcfg.cue    |   1 +
 public/app/plugins/panel/logs/panelcfg.gen.ts |   1 +
 public/locales/en-US/grafana.json             |  13 +-
 17 files changed, 412 insertions(+), 113 deletions(-)

diff --git a/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
index da04269f0b3..5a048b59af0 100644
--- a/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
@@ -45,6 +45,7 @@ export interface Options {
   showTime: boolean;
   sortOrder: common.LogsSortOrder;
   syntaxHighlighting?: boolean;
+  timestampResolution?: ('ms' | 'ns');
   wrapLogMessage: boolean;
 }
 
diff --git a/public/app/features/logs/components/panel/LogLine.test.tsx b/public/app/features/logs/components/panel/LogLine.test.tsx
index 89803a457bb..de1d119afae 100644
--- a/public/app/features/logs/components/panel/LogLine.test.tsx
+++ b/public/app/features/logs/components/panel/LogLine.test.tsx
@@ -79,6 +79,38 @@ describe.each(fontSizes)('LogLine', (fontSize: LogListFontSize) => {
     expect(screen.getByText('log message 1')).toBeInTheDocument();
   });
 
+  test('Renders a log line with millisecond timestamps', () => {
+    log.timestamp = '2025-08-06 11:35:19.504';
+    render(
+      <LogListContext.Provider
+        value={{
+          ...defaultValue,
+          timestampResolution: 'ms',
+        }}
+      >
+        <LogLine {...defaultProps} />
+      </LogListContext.Provider>
+    );
+    expect(screen.getByText('2025-08-06 11:35:19.504')).toBeInTheDocument();
+  });
+
+  test('Renders a log line with nanosecond timestamps', () => {
+    log.timestamp = '2025-08-06 11:35:19.504';
+    log.timeEpochMs = 1754472919504;
+    log.timeEpochNs = '1754472919504133766';
+    render(
+      <LogListContext.Provider
+        value={{
+          ...defaultValue,
+          timestampResolution: 'ns',
+        }}
+      >
+        <LogLine {...defaultProps} />
+      </LogListContext.Provider>
+    );
+    expect(screen.getByText('2025-08-06 11:35:19.504133766')).toBeInTheDocument();
+  });
+
   test('Renders a log line with displayed fields', () => {
     render(
       <LogListContextProvider {...contextProps}>
diff --git a/public/app/features/logs/components/panel/LogLine.tsx b/public/app/features/logs/components/panel/LogLine.tsx
index f3b994250f5..72934c8cffd 100644
--- a/public/app/features/logs/components/panel/LogLine.tsx
+++ b/public/app/features/logs/components/panel/LogLine.tsx
@@ -99,6 +99,7 @@ const LogLineComponent = memo(
       fontSize,
       hasLogsWithErrors,
       hasSampledLogs,
+      timestampResolution,
       onLogLineHover,
     } = useLogListContext();
     const [collapsed, setCollapsed] = useState<boolean | undefined>(
@@ -211,6 +212,7 @@ const LogLineComponent = memo(
               log={log}
               showTime={showTime}
               styles={styles}
+              timestampResolution={timestampResolution}
               wrapLogMessage={wrapLogMessage}
             />
           </div>
@@ -248,18 +250,25 @@ const LogLineComponent = memo(
 );
 LogLineComponent.displayName = 'LogLineComponent';
 
+export type LogLineTimestampResolution = 'ms' | 'ns';
+
 interface LogProps {
   displayedFields: string[];
   log: LogListModel;
   showTime: boolean;
   styles: LogLineStyles;
+  timestampResolution: LogLineTimestampResolution;
   wrapLogMessage: boolean;
 }
 
-const Log = memo(({ displayedFields, log, showTime, styles, wrapLogMessage }: LogProps) => {
+const Log = memo(({ displayedFields, log, showTime, styles, timestampResolution, wrapLogMessage }: LogProps) => {
   return (
     <>
-      {showTime && <span className={`${styles.timestamp} level-${log.logLevel} field`}>{log.timestamp}</span>}
+      {showTime && (
+        <span className={`${styles.timestamp} level-${log.logLevel} field`}>
+          {timestampResolution === 'ms' ? log.timestamp : log.timestampNs}
+        </span>
+      )}
       {
         // When logs are unwrapped, we want an empty column space to align with other log lines.
       }
diff --git a/public/app/features/logs/components/panel/LogLineMenu.tsx b/public/app/features/logs/components/panel/LogLineMenu.tsx
index e2ab764e3d9..a9bba004538 100644
--- a/public/app/features/logs/components/panel/LogLineMenu.tsx
+++ b/public/app/features/logs/components/panel/LogLineMenu.tsx
@@ -134,23 +134,23 @@ export const LogLineMenu = ({ log, styles }: Props) => {
       </Menu>
     ),
     [
-      enableLogDetails,
-      toggleLogDetails,
+      copyLinkToLogLine,
+      copyLogLine,
       detailsDisplayed,
+      enableLogDetails,
+      isAssistantAvailable,
       log,
+      logLineMenuCustomItems,
+      onPermalinkClick,
+      onPinLine,
+      onUnpinLine,
+      openAssistantByLog,
+      pinned,
       shouldlogSupportsContext,
       showContext,
-      pinned,
-      onPinLine,
-      togglePinning,
-      onUnpinLine,
       showFirstDivider,
-      copyLogLine,
-      onPermalinkClick,
-      copyLinkToLogLine,
-      logLineMenuCustomItems,
-      isAssistantAvailable,
-      openAssistantByLog,
+      toggleLogDetails,
+      togglePinning,
     ]
   );
 
diff --git a/public/app/features/logs/components/panel/LogList.test.tsx b/public/app/features/logs/components/panel/LogList.test.tsx
index 4f740d8059b..4032aa2b9e4 100644
--- a/public/app/features/logs/components/panel/LogList.test.tsx
+++ b/public/app/features/logs/components/panel/LogList.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 import { CoreApp, getDefaultTimeRange, LogRowModel, LogsDedupStrategy, LogsSortOrder, store } from '@grafana/data';
-import { reportInteraction } from '@grafana/runtime';
+import { config, reportInteraction } from '@grafana/runtime';
 
 import { disablePopoverMenu, enablePopoverMenu, isPopoverMenuDisabled } from '../../utils';
 import { createLogRow } from '../mocks/logRow';
@@ -36,6 +36,14 @@ jest.mock('../../utils', () => ({
   enablePopoverMenu: jest.fn(),
 }));
 
+const originalFlagValue = config.featureToggles.newLogsPanel;
+beforeAll(() => {
+  config.featureToggles.newLogsPanel = true;
+});
+afterAll(() => {
+  config.featureToggles.newLogsPanel = originalFlagValue;
+});
+
 describe('LogList', () => {
   let logs: LogRowModel[], defaultProps: Props;
   beforeEach(() => {
@@ -344,6 +352,25 @@ describe('LogList', () => {
       expect(screen.getByText('log message 1')).toBeInTheDocument();
       expect(screen.getByText('some text')).toBeInTheDocument();
     });
+
+    test('Allows to toggle between ms and ns precision timestamps', async () => {
+      logs = [createLogRow({ uid: '1', timeEpochMs: 1754472919504, timeEpochNs: '1754472919504133766' })];
+
+      render(<LogList {...defaultProps} showTime showControls logs={logs} />);
+
+      expect(screen.getByText('2025-08-06 03:35:19.504')).toBeInTheDocument();
+      expect(screen.getByLabelText('Show nanosecond timestamps')).toBeInTheDocument();
+
+      await userEvent.click(screen.getByLabelText('Show nanosecond timestamps'));
+
+      expect(screen.getByText('2025-08-06 03:35:19.504133766')).toBeInTheDocument();
+      expect(screen.getByLabelText('Hide timestamps')).toBeInTheDocument();
+
+      await userEvent.click(screen.getByLabelText('Hide timestamps'));
+
+      expect(screen.queryByText(/2025-08-06 03:35:19/)).not.toBeInTheDocument();
+      expect(screen.getByLabelText('Show millisecond timestamps')).toBeInTheDocument();
+    });
   });
   describe('Interactions', () => {
     beforeEach(() => {
diff --git a/public/app/features/logs/components/panel/LogList.tsx b/public/app/features/logs/components/panel/LogList.tsx
index b9c55ab1b80..f3388cdf82f 100644
--- a/public/app/features/logs/components/panel/LogList.tsx
+++ b/public/app/features/logs/components/panel/LogList.tsx
@@ -24,7 +24,7 @@ import { PopoverMenu } from 'app/features/explore/Logs/PopoverMenu';
 import { GetFieldLinksFn } from 'app/plugins/panel/logs/types';
 
 import { InfiniteScrollMode, InfiniteScroll, LoadMoreLogsType } from './InfiniteScroll';
-import { getGridTemplateColumns } from './LogLine';
+import { getGridTemplateColumns, LogLineTimestampResolution } from './LogLine';
 import { LogLineDetails, LogLineDetailsMode } from './LogLineDetails';
 import { GetRowContextQueryFn, LogLineMenuCustomItem } from './LogLineMenu';
 import { LogListContextProvider, LogListState, useLogListContext } from './LogListContext';
@@ -80,6 +80,7 @@ export interface Props {
   showTime: boolean;
   sortOrder: LogsSortOrder;
   timeRange: TimeRange;
+  timestampResolution?: LogLineTimestampResolution;
   timeZone: string;
   syntaxHighlighting?: boolean;
   wrapLogMessage: boolean;
@@ -148,6 +149,7 @@ export const LogList = ({
   sortOrder,
   syntaxHighlighting = logOptionsStorageKey ? store.getBool(`${logOptionsStorageKey}.syntaxHighlighting`, true) : true,
   timeRange,
+  timestampResolution,
   timeZone,
   wrapLogMessage,
 }: Props) => {
@@ -189,6 +191,7 @@ export const LogList = ({
       showTime={showTime}
       sortOrder={sortOrder}
       syntaxHighlighting={syntaxHighlighting}
+      timestampResolution={timestampResolution}
       wrapLogMessage={wrapLogMessage}
     >
       <LogListSearchContextProvider>
@@ -241,6 +244,7 @@ const LogListComponent = ({
     showDetails,
     showTime,
     sortOrder,
+    timestampResolution,
     toggleDetails,
     wrapLogMessage,
   } = useLogListContext();
@@ -253,8 +257,11 @@ const LogListComponent = ({
   const scrollRef = useRef<HTMLDivElement | null>(null);
   const virtualization = useMemo(() => new LogLineVirtualization(theme, fontSize), [theme, fontSize]);
   const dimensions = useMemo(
-    () => (wrapLogMessage ? [] : virtualization.calculateFieldDimensions(processedLogs, displayedFields)),
-    [displayedFields, processedLogs, virtualization, wrapLogMessage]
+    () =>
+      wrapLogMessage
+        ? []
+        : virtualization.calculateFieldDimensions(processedLogs, displayedFields, timestampResolution),
+    [displayedFields, processedLogs, timestampResolution, virtualization, wrapLogMessage]
   );
   const styles = useStyles2(getStyles, dimensions, displayedFields, { showTime });
   const widthContainer = wrapperRef.current ?? containerElement;
diff --git a/public/app/features/logs/components/panel/LogListContext.tsx b/public/app/features/logs/components/panel/LogListContext.tsx
index b50df85aa84..c302a510761 100644
--- a/public/app/features/logs/components/panel/LogListContext.tsx
+++ b/public/app/features/logs/components/panel/LogListContext.tsx
@@ -11,7 +11,12 @@ import {
   useState,
 } from 'react';
 
-import { createContext as createAssistantContext, ItemDataType, useAssistant } from '@grafana/assistant';
+import {
+  createContext as createAssistantContext,
+  ItemDataType,
+  OpenAssistantProps,
+  useAssistant,
+} from '@grafana/assistant';
 import {
   CoreApp,
   DataFrame,
@@ -30,6 +35,7 @@ import { PopoverContent } from '@grafana/ui';
 import { checkLogsError, checkLogsSampled, downloadLogs as download, DownloadFormat } from '../../utils';
 import { getDisplayedFieldsForLogs } from '../otel/formats';
 
+import { LogLineTimestampResolution } from './LogLine';
 import { LogLineDetailsMode } from './LogLineDetails';
 import { GetRowContextQueryFn, LogLineMenuCustomItem } from './LogLineMenu';
 import { LogListFontSize } from './LogList';
@@ -62,8 +68,10 @@ export interface LogListContextData extends Omit<Props, 'containerElement' | 'lo
   setShowTime: (showTime: boolean) => void;
   setShowUniqueLabels: (showUniqueLabels: boolean) => void;
   setSortOrder: (sortOrder: LogsSortOrder) => void;
+  setTimestampResolution: (format: LogLineTimestampResolution) => void;
   setWrapLogMessage: (showTime: boolean) => void;
   showDetails: LogListModel[];
+  timestampResolution: LogLineTimestampResolution;
   toggleDetails: (log: LogListModel) => void;
   isAssistantAvailable: boolean;
   openAssistantByLog: ((log: LogListModel) => void) | undefined;
@@ -97,11 +105,13 @@ export const LogListContext = createContext<LogListContextData>({
   setShowUniqueLabels: () => {},
   setSortOrder: () => {},
   setSyntaxHighlighting: () => {},
+  setTimestampResolution: () => {},
   setWrapLogMessage: () => {},
   showDetails: [],
   showTime: true,
   sortOrder: LogsSortOrder.Ascending,
   syntaxHighlighting: true,
+  timestampResolution: 'ns',
   toggleDetails: () => {},
   wrapLogMessage: false,
   isAssistantAvailable: false,
@@ -139,6 +149,7 @@ export type LogListState = Pick<
   | 'showTime'
   | 'sortOrder'
   | 'syntaxHighlighting'
+  | 'timestampResolution'
   | 'wrapLogMessage'
 >;
 
@@ -183,6 +194,7 @@ export interface Props {
   showTime: boolean;
   sortOrder: LogsSortOrder;
   syntaxHighlighting?: boolean;
+  timestampResolution?: LogLineTimestampResolution;
   wrapLogMessage: boolean;
 }
 
@@ -226,6 +238,9 @@ export const LogListContextProvider = ({
   showUniqueLabels,
   sortOrder,
   syntaxHighlighting,
+  timestampResolution = logOptionsStorageKey
+    ? (store.get(`${logOptionsStorageKey}.timestampResolution`) ?? 'ms')
+    : 'ms',
   wrapLogMessage,
 }: Props) => {
   const [logListState, setLogListState] = useState<LogListState>({
@@ -240,6 +255,7 @@ export const LogListContextProvider = ({
     showUniqueLabels,
     sortOrder,
     syntaxHighlighting,
+    timestampResolution,
     wrapLogMessage,
   });
   const [showDetails, setShowDetails] = useState<LogListModel[]>([]);
@@ -247,47 +263,6 @@ export const LogListContextProvider = ({
   const [detailsMode, setDetailsMode] = useState<LogLineDetailsMode>(detailsModeProp ?? 'sidebar');
   const [isAssistantAvailable, openAssistant] = useAssistant();
 
-  const openAssistantByLog = useCallback(
-    async (log: LogListModel) => {
-      if (!openAssistant) {
-        return;
-      }
-
-      const datasource = await getDataSourceSrv().get(log.datasourceUid);
-      const context = [];
-      if (datasource) {
-        context.push(
-          createAssistantContext(ItemDataType.Datasource, {
-            datasourceUid: datasource.uid,
-            datasourceName: datasource.name,
-            datasourceType: datasource.type,
-            img: datasource.meta?.info?.logos?.small,
-          })
-        );
-      }
-      openAssistant({
-        prompt: `${t('logs.log-line-menu.log-line-explainer', 'Explain this log line in a concise way')}:
-
-      \`\`\`
-${log.entry.replaceAll('`', '\\`')}
-      \`\`\`
-      `,
-        context: [
-          ...context,
-          createAssistantContext(ItemDataType.Structured, {
-            title: t('logs.log-line-menu.log-line', 'Log line'),
-            data: {
-              labels: log.labels,
-              value: log.entry,
-              timestamp: log.timestamp,
-            },
-          }),
-        ],
-      });
-    },
-    [openAssistant]
-  );
-
   useEffect(() => {
     if (noInteractions) {
       return;
@@ -302,11 +277,13 @@ ${log.entry.replaceAll('`', '\\`')}
       detailsWidth,
       detailsMode,
       withDisplayedFields: displayedFields.length > 0,
+      timestampResolution: logListState.timestampResolution,
     });
     // Just once
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  // OTel displayed fields
   useEffect(() => {
     if (displayedFields.length > 0 || !config.featureToggles.otelLogsFormatting || !setDisplayedFields) {
       return;
@@ -317,6 +294,7 @@ ${log.entry.replaceAll('`', '\\`')}
     }
   }, [displayedFields.length, logs, setDisplayedFields]);
 
+  // Sync state
   useEffect(() => {
     // Props are updated in the context only of the panel is being externally controlled.
     if (showControls && app !== CoreApp.PanelEditor) {
@@ -345,6 +323,7 @@ ${log.entry.replaceAll('`', '\\`')}
     wrapLogMessage,
   ]);
 
+  // Sync filter levels
   useEffect(() => {
     if (filterLevels === undefined) {
       return;
@@ -357,16 +336,19 @@ ${log.entry.replaceAll('`', '\\`')}
     });
   }, [filterLevels]);
 
+  // Sync font size
   useEffect(() => {
     setLogListState((logListState) => ({ ...logListState, fontSize }));
   }, [fontSize]);
 
+  // Sync pinned logs
   useEffect(() => {
     if (!shallowCompare(logListState.pinnedLogs ?? [], pinnedLogs ?? [])) {
       setLogListState({ ...logListState, pinnedLogs });
     }
   }, [logListState, pinnedLogs]);
 
+  // Sync show details
   useEffect(() => {
     if (!showDetails.length) {
       return;
@@ -379,6 +361,7 @@ ${log.entry.replaceAll('`', '\\`')}
     }
   }, [logs, showDetails]);
 
+  // Sync log details width
   useEffect(() => {
     const handleResize = debounce(() => {
       setDetailsWidthState((detailsWidth) => getDetailsWidth(containerElement, logOptionsStorageKey, detailsWidth));
@@ -390,6 +373,14 @@ ${log.entry.replaceAll('`', '\\`')}
     };
   }, [containerElement, logOptionsStorageKey]);
 
+  // Sync timestamp resolution
+  useEffect(() => {
+    setLogListState((state) => ({
+      ...state,
+      timestampResolution,
+    }));
+  }, [timestampResolution]);
+
   const detailsDisplayed = useCallback(
     (log: LogListModel) => !!showDetails.find((shownLog) => shownLog.uid === log.uid),
     [showDetails]
@@ -438,10 +429,16 @@ ${log.entry.replaceAll('`', '\\`')}
 
   const setShowTime = useCallback(
     (showTime: boolean) => {
-      setLogListState({ ...logListState, showTime });
+      const newTimestampFormat = showTime === false ? 'ms' : logListState.timestampResolution;
+      setLogListState({
+        ...logListState,
+        showTime,
+        timestampResolution: newTimestampFormat,
+      });
       onLogOptionsChange?.('showTime', showTime);
       if (logOptionsStorageKey) {
         store.set(`${logOptionsStorageKey}.showTime`, showTime);
+        store.set(`${logOptionsStorageKey}.timestampResolution`, newTimestampFormat);
       }
     },
     [logListState, logOptionsStorageKey, onLogOptionsChange]
@@ -552,6 +549,29 @@ ${log.entry.replaceAll('`', '\\`')}
     [containerElement, logOptionsStorageKey]
   );
 
+  const setTimestampResolution = useCallback(
+    (timestampResolution: LogLineTimestampResolution) => {
+      if (logOptionsStorageKey) {
+        store.set(`${logOptionsStorageKey}.timestampResolution`, timestampResolution);
+      }
+      setLogListState((state) => ({
+        ...state,
+        timestampResolution,
+      }));
+    },
+    [logOptionsStorageKey]
+  );
+
+  const openAssistantByLog = useCallback(
+    (log: LogListModel) => {
+      if (!openAssistant) {
+        return;
+      }
+      handleOpenAssistant(openAssistant, log);
+    },
+    [openAssistant]
+  );
+
   const hasLogsWithErrors = useMemo(() => logs.some((log) => !!checkLogsError(log)), [logs]);
   const hasSampledLogs = useMemo(() => logs.some((log) => !!checkLogsSampled(log)), [logs]);
   const hasUnescapedContent = useMemo(() => logs.some((r) => r.hasUnescapedContent), [logs]);
@@ -609,12 +629,14 @@ ${log.entry.replaceAll('`', '\\`')}
         setShowUniqueLabels,
         setSortOrder,
         setSyntaxHighlighting,
+        setTimestampResolution,
         setWrapLogMessage,
         showDetails,
         showTime: logListState.showTime,
         showUniqueLabels: logListState.showUniqueLabels,
         sortOrder: logListState.sortOrder,
         syntaxHighlighting: logListState.syntaxHighlighting,
+        timestampResolution: logListState.timestampResolution,
         toggleDetails,
         wrapLogMessage: logListState.wrapLogMessage,
         isAssistantAvailable,
@@ -686,3 +708,37 @@ const reportInteractionOnce = (interactionName: string, properties?: Record<stri
   sessionStorage.setItem(key, '1');
   reportInteraction(interactionName, properties);
 };
+
+async function handleOpenAssistant(openAssistant: (props: OpenAssistantProps) => void, log: LogListModel) {
+  const datasource = await getDataSourceSrv().get(log.datasourceUid);
+  const context = [];
+  if (datasource) {
+    context.push(
+      createAssistantContext(ItemDataType.Datasource, {
+        datasourceUid: datasource.uid,
+        datasourceName: datasource.name,
+        datasourceType: datasource.type,
+        img: datasource.meta?.info?.logos?.small,
+      })
+    );
+  }
+  openAssistant({
+    prompt: `${t('logs.log-line-menu.log-line-explainer', 'Explain this log line in a concise way')}:
+
+      \`\`\`
+${log.entry.replaceAll('`', '\\`')}
+      \`\`\`
+      `,
+    context: [
+      ...context,
+      createAssistantContext(ItemDataType.Structured, {
+        title: t('logs.log-line-menu.log-line', 'Log line'),
+        data: {
+          labels: log.labels,
+          value: log.entry,
+          timestamp: log.timestamp,
+        },
+      }),
+    ],
+  });
+}
diff --git a/public/app/features/logs/components/panel/LogListControls.tsx b/public/app/features/logs/components/panel/LogListControls.tsx
index 670a2767fea..edc1bee1613 100644
--- a/public/app/features/logs/components/panel/LogListControls.tsx
+++ b/public/app/features/logs/components/panel/LogListControls.tsx
@@ -6,11 +6,12 @@ import { CoreApp, EventBus, LogLevel, LogsDedupDescription, LogsDedupStrategy, L
 import { GrafanaTheme2 } from '@grafana/data/';
 import { t } from '@grafana/i18n';
 import { config, reportInteraction } from '@grafana/runtime';
-import { Dropdown, IconButton, Menu, useStyles2 } from '@grafana/ui';
+import { Dropdown, Icon, IconButton, Menu, Tooltip, useStyles2 } from '@grafana/ui';
 
 import { LogsVisualisationType } from '../../../explore/Logs/Logs';
 import { DownloadFormat } from '../../utils';
 
+import { LogLineTimestampResolution } from './LogLine';
 import { useLogListContext } from './LogListContext';
 import { useLogListSearchContext } from './LogListSearchContext';
 import { ScrollToLogsEvent } from './virtualization';
@@ -280,18 +281,22 @@ export const LogListControls = ({ eventBus, visualisationType = 'logs' }: Props)
                 />
               </Dropdown>
               <div className={styles.divider} />
-              <IconButton
-                name="clock-nine"
-                aria-pressed={showTime}
-                className={showTime ? styles.controlButtonActive : styles.controlButton}
-                onClick={onShowTimestampsClick}
-                tooltip={
-                  showTime
-                    ? t('logs.logs-controls.hide-timestamps', 'Hide timestamps')
-                    : t('logs.logs-controls.show-timestamps', 'Show timestamps')
-                }
-                size="lg"
-              />
+              {config.featureToggles.newLogsPanel ? (
+                <TimestampResolutionButton />
+              ) : (
+                <IconButton
+                  name="clock-nine"
+                  aria-pressed={showTime}
+                  className={showTime ? styles.controlButtonActive : styles.controlButton}
+                  onClick={onShowTimestampsClick}
+                  tooltip={
+                    showTime
+                      ? t('logs.logs-controls.hide-timestamps', 'Hide timestamps')
+                      : t('logs.logs-controls.show-timestamps', 'Show timestamps')
+                  }
+                  size="lg"
+                />
+              )}
               {/* When this is used in a Plugin context, app is unknown */}
               {showUniqueLabels !== undefined && app !== CoreApp.Unknown && (
                 <IconButton
@@ -451,6 +456,47 @@ export const LogListControls = ({ eventBus, visualisationType = 'logs' }: Props)
   );
 };
 
+const TimestampResolutionButton = () => {
+  const styles = useStyles2(getStyles);
+  const { setTimestampResolution, setShowTime, showTime, timestampResolution } = useLogListContext();
+
+  const onShowTimestampsClick = useCallback(() => {
+    if (!config.featureToggles.newLogsPanel) {
+      reportInteraction('logs_log_list_controls_show_time_clicked', {
+        show_time: !showTime,
+      });
+      setShowTime(!showTime);
+      return;
+    }
+    if (!showTime || timestampResolution === 'ns') {
+      setShowTime(!showTime);
+    } else if (timestampResolution === 'ms') {
+      setTimestampResolution('ns');
+    }
+  }, [setShowTime, setTimestampResolution, showTime, timestampResolution]);
+
+  return (
+    <Tooltip content={getTimestampTooltip(showTime, timestampResolution)}>
+      <button
+        aria-label={getTimestampTooltip(showTime, timestampResolution)}
+        aria-pressed={showTime}
+        className={`${styles.timestampResolutionButton} ${showTime ? styles.controlButtonActive : styles.controlButton}`}
+        type="button"
+        onClick={onShowTimestampsClick}
+      >
+        <Icon name="clock-nine" size="lg" className={styles.timestampResolutionIcon} />
+        {showTime && (
+          <span className={styles.resolutionText}>
+            {timestampResolution === 'ms'
+              ? t('logs.logs-controls.resolution-ms', 'ms')
+              : t('logs.logs-controls.resolution-ns', 'ns')}
+          </span>
+        )}
+      </button>
+    </Tooltip>
+  );
+};
+
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     navContainer: css({
@@ -510,5 +556,41 @@ const getStyles = (theme: GrafanaTheme2) => {
         backgroundColor: theme.colors.warning.main,
       },
     }),
+    timestampResolutionButton: css({
+      position: 'relative',
+      zIndex: 0,
+      margin: 0,
+      boxShadow: 'none',
+      border: 'none',
+      display: 'inline-flex',
+      background: 'transparent',
+      justifyContent: 'center',
+      alignItems: 'center',
+      padding: 0,
+      overflow: 'visible',
+    }),
+    timestampResolutionIcon: css({
+      verticalAlign: 'baseline',
+    }),
+    resolutionText: css({
+      color: theme.colors.text.primary,
+      fontSize: 10,
+      position: 'absolute',
+      bottom: -4,
+      right: 0,
+      lineHeight: '10px',
+      backgroundColor: theme.colors.background.elevated,
+      paddingLeft: 2,
+    }),
   };
 };
+
+function getTimestampTooltip(showTime: boolean, timestampResolution: LogLineTimestampResolution) {
+  if (!showTime) {
+    return t('logs.logs-controls.show-ms-timestamps', 'Show millisecond timestamps');
+  }
+  if (timestampResolution === 'ms') {
+    return t('logs.logs-controls.show-ns-timestamps', 'Show nanosecond timestamps');
+  }
+  return t('logs.logs-controls.hide-timestamps', 'Hide timestamps');
+}
diff --git a/public/app/features/logs/components/panel/__mocks__/LogListContext.tsx b/public/app/features/logs/components/panel/__mocks__/LogListContext.tsx
index 53b020bbe88..007ac591dca 100644
--- a/public/app/features/logs/components/panel/__mocks__/LogListContext.tsx
+++ b/public/app/features/logs/components/panel/__mocks__/LogListContext.tsx
@@ -39,11 +39,13 @@ export const LogListContext = createContext<LogListContextData>({
   setShowUniqueLabels: () => {},
   setSortOrder: () => {},
   setSyntaxHighlighting: () => {},
+  setTimestampResolution: () => {},
   setWrapLogMessage: () => {},
   showDetails: [],
   showTime: true,
   sortOrder: LogsSortOrder.Ascending,
   syntaxHighlighting: true,
+  timestampResolution: 'ns',
   toggleDetails: () => {},
   wrapLogMessage: false,
   detailsMode: 'sidebar',
@@ -87,6 +89,7 @@ export const defaultValue: LogListContextData = {
   setSortOrder: jest.fn(),
   setPrettifyJSON: jest.fn(),
   setSyntaxHighlighting: jest.fn(),
+  setTimestampResolution: jest.fn(),
   setWrapLogMessage: jest.fn(),
   closeDetails: jest.fn(),
   detailsDisplayed: jest.fn(),
@@ -108,6 +111,7 @@ export const defaultValue: LogListContextData = {
   wrapLogMessage: false,
   isAssistantAvailable: false,
   openAssistantByLog: () => {},
+  timestampResolution: 'ns',
 };
 
 export const defaultProps: Props = {
@@ -130,6 +134,7 @@ export const defaultProps: Props = {
   showTime: true,
   sortOrder: LogsSortOrder.Descending,
   syntaxHighlighting: true,
+  timestampResolution: 'ms',
   wrapLogMessage: true,
 };
 
@@ -155,6 +160,7 @@ export const LogListContextProvider = ({
   showTime = true,
   sortOrder = LogsSortOrder.Descending,
   syntaxHighlighting = true,
+  timestampResolution = 'ms',
   wrapLogMessage = true,
 }: Partial<Props> & { showDetails?: LogListModel[] }) => {
   const hasLogsWithErrors = logs.some((log) => !!checkLogsError(log));
@@ -198,6 +204,7 @@ export const LogListContextProvider = ({
         showTime,
         sortOrder,
         syntaxHighlighting,
+        timestampResolution,
         wrapLogMessage,
       }}
     >
diff --git a/public/app/features/logs/components/panel/processing.ts b/public/app/features/logs/components/panel/processing.ts
index ee6826aa900..1e01be8d235 100644
--- a/public/app/features/logs/components/panel/processing.ts
+++ b/public/app/features/logs/components/panel/processing.ts
@@ -2,7 +2,16 @@ import ansicolor from 'ansicolor';
 import { parse, stringify } from 'lossless-json';
 import Prism, { Grammar } from 'prismjs';
 
-import { DataFrame, dateTimeFormat, Labels, LogLevel, LogRowModel, LogsSortOrder, textUtil } from '@grafana/data';
+import {
+  DataFrame,
+  dateTimeFormat,
+  Labels,
+  LogLevel,
+  LogRowModel,
+  LogsSortOrder,
+  systemDateFormats,
+  textUtil,
+} from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { GetFieldLinksFn } from 'app/plugins/panel/logs/types';
 
@@ -90,7 +99,8 @@ export class LogListModel implements LogRowModel {
     this._grammar = grammar;
     this.timestamp = dateTimeFormat(log.timeEpochMs, {
       timeZone,
-      defaultWithMS: true,
+      // YYYY-MM-DD HH:mm:ss.SSS
+      format: systemDateFormats.fullDateMS,
     });
     this._virtualization = virtualization;
     this._wrapLogMessage = wrapLogMessage;
@@ -158,6 +168,11 @@ export class LogListModel implements LogRowModel {
     return checkLogsSampled(this);
   }
 
+  get timestampNs(): string {
+    let suffix = this.timeEpochNs.substring(this.timeEpochMs.toString().length);
+    return this.timestamp + suffix;
+  }
+
   getDisplayedFieldValue(fieldName: string, stripAnsi = false): string {
     if (fieldName === LOG_LINE_BODY_FIELD_NAME) {
       return stripAnsi ? ansicolor.strip(this.body) : this.body;
@@ -234,7 +249,14 @@ export const preProcessLogs = (
 ): LogListModel[] => {
   const orderedLogs = sortLogRows(logs, order);
   return orderedLogs.map((log) =>
-    preProcessLog(log, { escape, getFieldLinks, grammar, timeZone, virtualization, wrapLogMessage })
+    preProcessLog(log, {
+      escape,
+      getFieldLinks,
+      grammar,
+      timeZone,
+      virtualization,
+      wrapLogMessage,
+    })
   );
 };
 
diff --git a/public/app/features/logs/components/panel/virtualization.test.ts b/public/app/features/logs/components/panel/virtualization.test.ts
index 342262aafd1..8574d22dda6 100644
--- a/public/app/features/logs/components/panel/virtualization.test.ts
+++ b/public/app/features/logs/components/panel/virtualization.test.ts
@@ -282,7 +282,7 @@ describe('Virtualization', () => {
 
   describe('calculateFieldDimensions', () => {
     test('Measures displayed fields including the log line body', () => {
-      expect(virtualization.calculateFieldDimensions([log], ['place', LOG_LINE_BODY_FIELD_NAME])).toEqual([
+      expect(virtualization.calculateFieldDimensions([log], ['place', LOG_LINE_BODY_FIELD_NAME], 'ms')).toEqual([
         {
           field: 'timestamp',
           width: 23,
@@ -301,6 +301,19 @@ describe('Virtualization', () => {
         },
       ]);
     });
+
+    test('Measures nanosecond timestamps', () => {
+      expect(virtualization.calculateFieldDimensions([log], [], 'ns')).toEqual([
+        {
+          field: 'timestamp',
+          width: 29,
+        },
+        {
+          field: 'level',
+          width: 4,
+        },
+      ]);
+    });
   });
 
   describe('With small font size', () => {
diff --git a/public/app/features/logs/components/panel/virtualization.ts b/public/app/features/logs/components/panel/virtualization.ts
index 6207085d1a5..15889c1c2af 100644
--- a/public/app/features/logs/components/panel/virtualization.ts
+++ b/public/app/features/logs/components/panel/virtualization.ts
@@ -2,6 +2,7 @@ import ansicolor from 'ansicolor';
 
 import { BusEventWithPayload, GrafanaTheme2 } from '@grafana/data';
 
+import { LogLineTimestampResolution } from './LogLine';
 import { LOG_LINE_DETAILS_HEIGHT, LogLineDetailsMode } from './LogLineDetails';
 import { LogListFontSize } from './LogList';
 import { LogListModel } from './processing';
@@ -176,7 +177,11 @@ export class LogLineVirtualization {
     };
   };
 
-  calculateFieldDimensions = (logs: LogListModel[], displayedFields: string[] = []) => {
+  calculateFieldDimensions = (
+    logs: LogListModel[],
+    displayedFields: string[] = [],
+    timestampResolution: LogLineTimestampResolution
+  ) => {
     if (!logs.length) {
       return [];
     }
@@ -184,7 +189,7 @@ export class LogLineVirtualization {
     let levelWidth = 0;
     const fieldWidths: Record<string, number> = {};
     for (let i = 0; i < logs.length; i++) {
-      let width = this.measureTextWidth(logs[i].timestamp);
+      let width = this.measureTextWidth(timestampResolution === 'ms' ? logs[i].timestamp : logs[i].timestampNs);
       if (width > timestampWidth) {
         timestampWidth = Math.round(width);
       }
diff --git a/public/app/plugins/panel/logs/LogsPanel.tsx b/public/app/plugins/panel/logs/LogsPanel.tsx
index 73ee2c3604d..3c80bcacad0 100644
--- a/public/app/plugins/panel/logs/LogsPanel.tsx
+++ b/public/app/plugins/panel/logs/LogsPanel.tsx
@@ -125,6 +125,9 @@ interface LogsPanelProps extends PanelProps<Options> {
    *
    * Set the mode used by the Log Details panel. Displayed as a sidebar, or inline below the log line. Defaults to "inline".
    * detailsMode?: 'inline' | 'sidebar'
+   *
+   * When showing timestamps, toggle between showing nanoseconds or milliseconds.
+   * timestampResolution?: 'ms' | 'ns'
    */
 }
 interface LogsPermalinkUrlState {
@@ -166,6 +169,7 @@ export const LogsPanel = ({
     syntaxHighlighting,
     detailsMode: detailsModeProp,
     noInteractions,
+    timestampResolution,
     ...options
   },
   id,
@@ -607,6 +611,7 @@ export const LogsPanel = ({
               logOptionsStorageKey={storageKey}
               syntaxHighlighting={syntaxHighlighting}
               timeRange={data.timeRange}
+              timestampResolution={timestampResolution}
               timeZone={timeZone}
               wrapLogMessage={wrapLogMessage}
             />
diff --git a/public/app/plugins/panel/logs/module.tsx b/public/app/plugins/panel/logs/module.tsx
index cccc4cfab01..085df68cdde 100644
--- a/public/app/plugins/panel/logs/module.tsx
+++ b/public/app/plugins/panel/logs/module.tsx
@@ -7,11 +7,11 @@ import { Options } from './panelcfg.gen';
 import { LogsPanelSuggestionsSupplier } from './suggestions';
 
 export const plugin = new PanelPlugin<Options>(LogsPanel)
-  .setPanelOptions((builder) => {
+  .setPanelOptions((builder, context) => {
     const category = [t('logs.category-logs', 'Logs')];
     builder.addBooleanSwitch({
       path: 'showTime',
-      name: t('logs.name-time', 'Time'),
+      name: t('logs.name-time', 'Show timestamps'),
       category,
       description: '',
       defaultValue: false,
@@ -33,6 +33,23 @@ export const plugin = new PanelPlugin<Options>(LogsPanel)
           description: '',
           defaultValue: false,
         });
+    } else if (context.options?.showTime) {
+      builder.addRadio({
+        path: 'timestampResolution',
+        name: t('logs.timestamp-format', 'Timestamp resolution'),
+        category,
+        description: '',
+        defaultValue: 'ms',
+        settings: {
+          options: [
+            { value: 'ms', label: t('logs.logs.timestamp-resolution.label-milliseconds', 'Milliseconds') },
+            {
+              value: 'ns',
+              label: t('logs.logs.timestamp-resolution.label-nanoseconds', 'Nanoseconds'),
+            },
+          ],
+        },
+      });
     }
 
     builder.addBooleanSwitch({
@@ -63,24 +80,42 @@ export const plugin = new PanelPlugin<Options>(LogsPanel)
       });
     }
 
-    builder
-      .addBooleanSwitch({
-        path: 'enableLogDetails',
-        name: t('logs.name-enable-log-details', 'Enable log details'),
+    builder.addBooleanSwitch({
+      path: 'enableLogDetails',
+      name: t('logs.name-enable-log-details', 'Enable log details'),
+      category,
+      description: '',
+      defaultValue: true,
+    });
+
+    if (config.featureToggles.newLogsPanel && context.options?.enableLogDetails) {
+      builder.addRadio({
+        path: 'detailsMode',
+        name: t('logs.name-details-mode', 'Log Details panel mode'),
         category,
         description: '',
-        defaultValue: true,
-      })
-      .addBooleanSwitch({
-        path: 'enableInfiniteScrolling',
-        name: t('logs.name-enable-infinite-scrolling', 'Enable infinite scrolling'),
-        category,
-        description: t(
-          'logs.description-enable-infinite-scrolling',
-          'Experimental. Request more results by scrolling to the bottom of the logs list.'
-        ),
-        defaultValue: false,
+        settings: {
+          options: [
+            { value: 'inline', label: t('logs.name-details-options.label-inline', 'Inline') },
+            {
+              value: 'sidebar',
+              label: t('logs.name-details-options.label-sidebar', 'Sidebar'),
+            },
+          ],
+        },
       });
+    }
+
+    builder.addBooleanSwitch({
+      path: 'enableInfiniteScrolling',
+      name: t('logs.name-enable-infinite-scrolling', 'Enable infinite scrolling'),
+      category,
+      description: t(
+        'logs.description-enable-infinite-scrolling',
+        'Experimental. Request more results by scrolling to the bottom of the logs list.'
+      ),
+      defaultValue: false,
+    });
 
     if (config.featureToggles.newLogsPanel) {
       builder
@@ -108,21 +143,6 @@ export const plugin = new PanelPlugin<Options>(LogsPanel)
               },
             ],
           },
-        })
-        .addRadio({
-          path: 'detailsMode',
-          name: t('logs.name-details-mode', 'Log Details panel mode'),
-          category,
-          description: '',
-          settings: {
-            options: [
-              { value: 'inline', label: t('logs.name-details-options.label-inline', 'Inline') },
-              {
-                value: 'sidebar',
-                label: t('logs.name-details-options.label-sidebar', 'Sidebar'),
-              },
-            ],
-          },
         });
     }
 
diff --git a/public/app/plugins/panel/logs/panelcfg.cue b/public/app/plugins/panel/logs/panelcfg.cue
index 1f8f16fe13b..44eb486d3a0 100644
--- a/public/app/plugins/panel/logs/panelcfg.cue
+++ b/public/app/plugins/panel/logs/panelcfg.cue
@@ -42,6 +42,7 @@ composableKinds: PanelCfg: {
 					noInteractions?:          bool
 					fontSize?:                "default" | "small"                  @cuetsy(kind="enum", memberNames="default|small")
 					detailsMode?:             "inline" | "sidebar"                  @cuetsy(kind="enum", memberNames="inline|sidebar")
+					timestampResolution?:     "ms" | "ns"                  @cuetsy(kind="enum", memberNames="ms|ns")
 					// TODO: figure out how to define callbacks
 					onClickFilterLabel?:     _
 					onClickFilterOutLabel?:  _
diff --git a/public/app/plugins/panel/logs/panelcfg.gen.ts b/public/app/plugins/panel/logs/panelcfg.gen.ts
index ef4c192dbe2..ad5a194f733 100644
--- a/public/app/plugins/panel/logs/panelcfg.gen.ts
+++ b/public/app/plugins/panel/logs/panelcfg.gen.ts
@@ -43,6 +43,7 @@ export interface Options {
   showTime: boolean;
   sortOrder: common.LogsSortOrder;
   syntaxHighlighting?: boolean;
+  timestampResolution?: ('ms' | 'ns');
   wrapLogMessage: boolean;
 }
 
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 5f45a3bab72..4cc86e24c64 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -9543,6 +9543,12 @@
         "total-bytes-processed": "Total bytes processed"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "Milliseconds",
+        "label-nanoseconds": "Nanoseconds"
+      }
+    },
     "logs-controls": {
       "deduplication": "Deduplication",
       "disable-highlighting": "Disable highlighting",
@@ -9566,8 +9572,12 @@
       "oldest-first": "Sorted by oldest logs first - Click to show newest first",
       "prettify-json": "Expand JSON logs",
       "remove-escaping": "Remove escaping",
+      "resolution-ms": "ms",
+      "resolution-ns": "ns",
       "scroll-bottom": "Scroll to bottom",
       "scroll-top": "Scroll to top",
+      "show-ms-timestamps": "Show millisecond timestamps",
+      "show-ns-timestamps": "Show nanosecond timestamps",
       "show-search": "Search in logs result",
       "show-timestamps": "Show timestamps",
       "show-unique-labels": "Show unique labels",
@@ -9600,7 +9610,7 @@
     "name-order": "Order",
     "name-prettify-json": "Prettify JSON",
     "name-show-controls": "Show controls",
-    "name-time": "Time",
+    "name-time": "Show timestamps",
     "name-unique-labels": "Unique labels",
     "name-wrap-lines": "Wrap lines",
     "order-options": {
@@ -9616,6 +9626,7 @@
       "line-contains": "Add as line contains filter",
       "line-contains-not": "Add as line does not contain filter"
     },
+    "timestamp-format": "Timestamp resolution",
     "un-themed-log-details": {
       "aria-label-data-links": "Data links",
       "aria-label-fields": "Fields",

From 898ef9cf587c9a200b73244fe5c50e86ef32e54c Mon Sep 17 00:00:00 2001
From: "alerting-team[bot]"
 <158350966+alerting-team[bot]@users.noreply.github.com>
Date: Fri, 8 Aug 2025 18:13:23 +0000
Subject: [PATCH 059/243] Alerting: Update alerting module to
 dae4478cb0dc9326319d27e5f3feb301825f2922 (#109419)

* [create-pull-request] automated change
* omit email templates from the result

---------

Co-authored-by: yuri-tceretian <25988953+yuri-tceretian@users.noreply.github.com>
Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
---
 go.mod                                                        | 2 +-
 go.sum                                                        | 4 ++--
 go.work.sum                                                   | 2 ++
 .../alerting/notifications/templategroup/legacy_storage.go    | 3 ++-
 .../notifications/templategroup/templates_group_test.go       | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index aedd1d3871f..ddf89b0be38 100644
--- a/go.mod
+++ b/go.mod
@@ -85,7 +85,7 @@ require (
 	github.com/googleapis/gax-go/v2 v2.14.2 // @grafana/grafana-backend-group
 	github.com/gorilla/mux v1.8.1 // @grafana/grafana-backend-group
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // @grafana/grafana-app-platform-squad
-	github.com/grafana/alerting v0.0.0-20250729175202-b4b881b7b263 // @grafana/alerting-backend
+	github.com/grafana/alerting v0.0.0-20250808160954-dae4478cb0dc // @grafana/alerting-backend
 	github.com/grafana/authlib v0.0.0-20250710201142-9542f2f28d43 // @grafana/identity-access-team
 	github.com/grafana/authlib/types v0.0.0-20250710201142-9542f2f28d43 // @grafana/identity-access-team
 	github.com/grafana/dataplane/examples v0.0.1 // @grafana/observability-metrics
diff --git a/go.sum b/go.sum
index aa7c88a369c..4e04d349097 100644
--- a/go.sum
+++ b/go.sum
@@ -1580,8 +1580,8 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20250729175202-b4b881b7b263 h1:hcr/AmPB0KL4H+gCEFIdKUnkihTxGAkAOiZA7GDYoL8=
-github.com/grafana/alerting v0.0.0-20250729175202-b4b881b7b263/go.mod h1:VKxaR93Gff0ZlO2sPcdPVob1a/UzArFEW5zx3Bpyhls=
+github.com/grafana/alerting v0.0.0-20250808160954-dae4478cb0dc h1:y2p0VGthW0XeJ4g1q0x1rsz5Vx+m9WIFgf6vcuIGFDY=
+github.com/grafana/alerting v0.0.0-20250808160954-dae4478cb0dc/go.mod h1:VKxaR93Gff0ZlO2sPcdPVob1a/UzArFEW5zx3Bpyhls=
 github.com/grafana/authlib v0.0.0-20250710201142-9542f2f28d43 h1:vVPT0i5Y1vI6qzecYStV2yk7cHKrC3Pc7AgvwT5KydQ=
 github.com/grafana/authlib v0.0.0-20250710201142-9542f2f28d43/go.mod h1:1fWkOiL+m32NBgRHZtlZGz2ji868tPZACYbqP3nBRJI=
 github.com/grafana/authlib/types v0.0.0-20250710201142-9542f2f28d43 h1:NlkGMnVi/oUn6Cr90QbJYpQJ4FnjyAIG9Ex5GtTZIzw=
diff --git a/go.work.sum b/go.work.sum
index 34c0540f8ce..66413aede3c 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -775,10 +775,12 @@ github.com/d4l3k/messagediff v1.2.1 h1:ZcAIMYsUg0EAp9X+tt8/enBE/Q8Yd5kzPynLyKptt
 github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo=
 github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892 h1:qg9VbHo1TlL0KDM0vYvBG9EY0X0Yku5WYIPoFWt8f6o=
 github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod h1:CTDl0pzVzE5DEzZhPfvhY/9sPFMQIxaJ9VAMs9AagrE=
+github.com/dchest/siphash v1.2.3 h1:QXwFc8cFOR2dSa/gE6o/HokBMWtLUaNDVd+22aKHeEA=
 github.com/dchest/siphash v1.2.3/go.mod h1:0NvQU092bT0ipiFN++/rXm69QG9tVxLAlQHIXMPAkHc=
 github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g=
 github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY=
 github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3 h1:tkum0XDgfR0jcVVXuTsYv/erY2NnEDqwRojbxR1rBYA=
+github.com/dgryski/go-ddmin v0.0.0-20210904190556-96a6d69f1034 h1:BuCyszxPxUjBrYW2HNVrimC0rBUs2U27jCJGVh0IKTM=
 github.com/dgryski/go-ddmin v0.0.0-20210904190556-96a6d69f1034/go.mod h1:zz4KxBkcXUWKjIcrc+uphJ1gPh/t18ymGm3PmQ+VGTk=
 github.com/dgryski/go-sip13 v0.0.0-20190329191031-25c5027a8c7b h1:Yqiad0+sloMPdd/0Fg22actpFx0dekpzt1xJmVNVkU0=
 github.com/dhui/dktest v0.3.0 h1:kwX5a7EkLcjo7VpsPQSYJcKGbXBXdjI9FGjuUj1jn6I=
diff --git a/pkg/registry/apps/alerting/notifications/templategroup/legacy_storage.go b/pkg/registry/apps/alerting/notifications/templategroup/legacy_storage.go
index c03d9275b24..f6734bbd356 100644
--- a/pkg/registry/apps/alerting/notifications/templategroup/legacy_storage.go
+++ b/pkg/registry/apps/alerting/notifications/templategroup/legacy_storage.go
@@ -200,7 +200,8 @@ func (s *legacyStorage) Delete(ctx context.Context, name string, deleteValidatio
 }
 
 func (s *legacyStorage) defaultTemplate() (definitions.NotificationTemplate, error) {
-	defaultTemplate, err := templates.DefaultTemplate()
+	// Omit some templates that we do not want to use to see.
+	defaultTemplate, err := templates.DefaultTemplate(templates.DefaultTemplatesToOmit)
 	if err != nil {
 		return definitions.NotificationTemplate{}, err
 	}
diff --git a/pkg/tests/apis/alerting/notifications/templategroup/templates_group_test.go b/pkg/tests/apis/alerting/notifications/templategroup/templates_group_test.go
index 3d1e83cbd4a..ba76f3f2d1a 100644
--- a/pkg/tests/apis/alerting/notifications/templategroup/templates_group_test.go
+++ b/pkg/tests/apis/alerting/notifications/templategroup/templates_group_test.go
@@ -108,7 +108,7 @@ func TestIntegrationResourceIdentifier(t *testing.T) {
 		require.NoError(t, err)
 		require.NotEmptyf(t, actual.Name, "Resource name should not be empty")
 
-		defaultDefn, err := templates.DefaultTemplate()
+		defaultDefn, err := templates.DefaultTemplate(templates.DefaultTemplatesToOmit)
 		require.NoError(t, err)
 		require.Equal(t, v0alpha1.TemplateGroupSpec{
 			Title:   v0alpha1.DefaultTemplateTitle,

From 1bb68a1151125fbf1221bb17ef5757105acfd551 Mon Sep 17 00:00:00 2001
From: Moustafa Baiou <moustafa.baiou@grafana.com>
Date: Fri, 8 Aug 2025 14:39:04 -0400
Subject: [PATCH 060/243] Revert "Alerting: Add store level pagination of
 rules" (#109422)

Revert "Alerting: Add store level pagination of rules (#108633)"

This reverts commit 2f0190d775062b1f1e33a8b6323f5fad78ddacb0.
---
 pkg/services/ngalert/api/persist.go           |   1 -
 .../ngalert/api/prometheus/api_prometheus.go  |  66 ++++--
 pkg/services/ngalert/models/alert_rule.go     |  56 -----
 pkg/services/ngalert/store/alert_rule.go      | 180 ----------------
 pkg/services/ngalert/store/alert_rule_test.go | 197 +-----------------
 pkg/services/ngalert/tests/fakes/rules.go     |  87 --------
 6 files changed, 51 insertions(+), 536 deletions(-)

diff --git a/pkg/services/ngalert/api/persist.go b/pkg/services/ngalert/api/persist.go
index 5a60c2e0637..2150edbe34c 100644
--- a/pkg/services/ngalert/api/persist.go
+++ b/pkg/services/ngalert/api/persist.go
@@ -23,7 +23,6 @@ type RuleStore interface {
 	GetAlertRuleByUID(ctx context.Context, query *ngmodels.GetAlertRuleByUIDQuery) (*ngmodels.AlertRule, error)
 	GetAlertRulesGroupByRuleUID(ctx context.Context, query *ngmodels.GetAlertRulesGroupByRuleUIDQuery) ([]*ngmodels.AlertRule, error)
 	ListAlertRules(ctx context.Context, query *ngmodels.ListAlertRulesQuery) (ngmodels.RulesGroup, error)
-	ListAlertRulesByGroup(ctx context.Context, query *ngmodels.ListAlertRulesByGroupQuery) (ngmodels.RulesGroup, string, error)
 	ListDeletedRules(ctx context.Context, orgID int64) ([]*ngmodels.AlertRule, error)
 
 	// InsertAlertRules will insert all alert rules passed into the function
diff --git a/pkg/services/ngalert/api/prometheus/api_prometheus.go b/pkg/services/ngalert/api/prometheus/api_prometheus.go
index c223bce9aac..2e753a6db1d 100644
--- a/pkg/services/ngalert/api/prometheus/api_prometheus.go
+++ b/pkg/services/ngalert/api/prometheus/api_prometheus.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -29,7 +30,7 @@ import (
 
 type RuleStoreReader interface {
 	GetUserVisibleNamespaces(context.Context, int64, identity.Requester) (map[string]*folder.Folder, error)
-	ListAlertRulesStore
+	ListAlertRules(ctx context.Context, query *ngmodels.ListAlertRulesQuery) (ngmodels.RulesGroup, error)
 }
 
 type RuleGroupAccessControlService interface {
@@ -240,7 +241,7 @@ type RuleGroupStatusesOptions struct {
 }
 
 type ListAlertRulesStore interface {
-	ListAlertRulesByGroup(ctx context.Context, query *ngmodels.ListAlertRulesByGroupQuery) (ngmodels.RulesGroup, string, error)
+	ListAlertRules(ctx context.Context, query *ngmodels.ListAlertRulesQuery) (ngmodels.RulesGroup, error)
 }
 
 func (srv PrometheusSrv) RouteGetRuleStatuses(c *contextmodel.ReqContext) response.Response {
@@ -475,24 +476,15 @@ func PrepareRuleGroupStatuses(log log.Logger, store ListAlertRulesStore, opts Ru
 
 	receiverName := opts.Query.Get("receiver_name")
 
-	maxGroups := getInt64WithDefault(opts.Query, "group_limit", -1)
-	nextToken := opts.Query.Get("group_next_token")
-
-	if maxGroups == 0 {
-		return ruleResponse
+	alertRuleQuery := ngmodels.ListAlertRulesQuery{
+		OrgID:         opts.OrgID,
+		NamespaceUIDs: namespaceUIDs,
+		DashboardUID:  dashboardUID,
+		PanelID:       panelID,
+		RuleGroups:    ruleGroups,
+		ReceiverName:  receiverName,
 	}
-
-	byGroupQuery := ngmodels.ListAlertRulesByGroupQuery{
-		OrgID:              opts.OrgID,
-		GroupLimit:         maxGroups,
-		GroupContinueToken: nextToken,
-		NamespaceUIDs:      namespaceUIDs,
-		DashboardUID:       dashboardUID,
-		PanelID:            panelID,
-		RuleGroups:         ruleGroups,
-		ReceiverName:       receiverName,
-	}
-	ruleList, continueToken, err := store.ListAlertRulesByGroup(opts.Ctx, &byGroupQuery)
+	ruleList, err := store.ListAlertRules(opts.Ctx, &alertRuleQuery)
 	if err != nil {
 		ruleResponse.Status = "error"
 		ruleResponse.Error = fmt.Sprintf("failure getting rules: %s", err.Error())
@@ -506,9 +498,31 @@ func PrepareRuleGroupStatuses(log log.Logger, store ListAlertRulesStore, opts Ru
 		ruleNamesSet[rn] = struct{}{}
 	}
 
+	maxGroups := getInt64WithDefault(opts.Query, "group_limit", -1)
+	nextToken := opts.Query.Get("group_next_token")
+	if nextToken != "" {
+		if _, err := base64.URLEncoding.DecodeString(nextToken); err != nil {
+			nextToken = ""
+		}
+	}
+
 	groupedRules := getGroupedRules(log, ruleList, ruleNamesSet, opts.AllowedNamespaces)
 	rulesTotals := make(map[string]int64, len(groupedRules))
+	var newToken string
+	foundToken := false
 	for _, rg := range groupedRules {
+		if nextToken != "" && !foundToken {
+			if !tokenGreaterThanOrEqual(getRuleGroupNextToken(rg.Folder, rg.GroupKey.RuleGroup), nextToken) {
+				continue
+			}
+			foundToken = true
+		}
+
+		if maxGroups > -1 && len(ruleResponse.Data.RuleGroups) == int(maxGroups) {
+			newToken = getRuleGroupNextToken(rg.Folder, rg.GroupKey.RuleGroup)
+			break
+		}
+
 		ruleGroup, totals := toRuleGroup(log, rg.GroupKey, rg.Folder, rg.Rules, provenanceRecords, limitAlertsPerRule, stateFilterSet, matchers, labelOptions, ruleStatusMutator, alertStateMutator)
 		ruleGroup.Totals = totals
 		for k, v := range totals {
@@ -532,7 +546,7 @@ func PrepareRuleGroupStatuses(log log.Logger, store ListAlertRulesStore, opts Ru
 		}
 	}
 
-	ruleResponse.Data.NextToken = continueToken
+	ruleResponse.Data.NextToken = newToken
 
 	// Only return Totals if there is no pagination
 	if maxGroups == -1 {
@@ -542,6 +556,18 @@ func PrepareRuleGroupStatuses(log log.Logger, store ListAlertRulesStore, opts Ru
 	return ruleResponse
 }
 
+func getRuleGroupNextToken(namespace, group string) string {
+	return base64.URLEncoding.EncodeToString([]byte(namespace + "/" + group))
+}
+
+// Returns true if tokenA >= tokenB
+func tokenGreaterThanOrEqual(tokenA string, tokenB string) bool {
+	decodedTokenA, _ := base64.URLEncoding.DecodeString(tokenA)
+	decodedTokenB, _ := base64.URLEncoding.DecodeString(tokenB)
+
+	return string(decodedTokenA) >= string(decodedTokenB)
+}
+
 type ruleGroup struct {
 	Folder   string
 	GroupKey ngmodels.AlertRuleGroupKey
diff --git a/pkg/services/ngalert/models/alert_rule.go b/pkg/services/ngalert/models/alert_rule.go
index b497b101e4d..e21527cd430 100644
--- a/pkg/services/ngalert/models/alert_rule.go
+++ b/pkg/services/ngalert/models/alert_rule.go
@@ -2,7 +2,6 @@ package models
 
 import (
 	"context"
-	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -880,61 +879,6 @@ type GetAlertRulesGroupByRuleUIDQuery struct {
 	OrgID int64
 }
 
-type RuleTypeFilter int
-
-const (
-	RuleTypeFilterAll RuleTypeFilter = iota
-	RuleTypeFilterAlerting
-	RuleTypeFilterRecording
-)
-
-type ListAlertRulesByGroupQuery struct {
-	OrgID         int64
-	RuleUIDs      []string
-	NamespaceUIDs []string
-	ExcludeOrgs   []int64
-	RuleGroups    []string
-
-	// DashboardUID and PanelID are optional and allow filtering rules
-	// to return just those for a dashboard and panel.
-	DashboardUID string
-	PanelID      int64
-
-	ReceiverName     string
-	TimeIntervalName string
-
-	HasPrometheusRuleDefinition *bool
-
-	RuleType RuleTypeFilter
-
-	GroupLimit         int64  // Number of groups to fetch
-	GroupContinueToken string // Token for per-group pagination
-}
-
-type GroupCursor struct {
-	NamespaceUID string `json:"n"`
-	RuleGroup    string `json:"g"`
-}
-
-func EncodeGroupCursor(c GroupCursor) string {
-	data, _ := json.Marshal(c)
-	return base64.URLEncoding.EncodeToString(data)
-}
-
-func DecodeGroupCursor(token string) (GroupCursor, error) {
-	var c GroupCursor
-	data, err := base64.URLEncoding.DecodeString(token)
-	if err != nil {
-		return c, fmt.Errorf("failed to decode group token: %w", err)
-	}
-
-	if err := json.Unmarshal(data, &c); err != nil {
-		return c, fmt.Errorf("failed to unmarshal group cursor: %w", err)
-	}
-
-	return c, nil
-}
-
 // ListAlertRulesQuery is the query for listing alert rules
 type ListAlertRulesQuery struct {
 	OrgID         int64
diff --git a/pkg/services/ngalert/store/alert_rule.go b/pkg/services/ngalert/store/alert_rule.go
index ab8676c754d..c535bbe4379 100644
--- a/pkg/services/ngalert/store/alert_rule.go
+++ b/pkg/services/ngalert/store/alert_rule.go
@@ -582,186 +582,6 @@ func (st DBstore) CountInFolders(ctx context.Context, orgID int64, folderUIDs []
 	return count, err
 }
 
-func (st DBstore) ListAlertRulesByGroup(ctx context.Context, query *ngmodels.ListAlertRulesByGroupQuery) (result ngmodels.RulesGroup, nextToken string, err error) {
-	err = st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
-		q := sess.Table("alert_rule")
-
-		if query.OrgID >= 0 {
-			q = q.Where("org_id = ?", query.OrgID)
-		}
-
-		if query.DashboardUID != "" {
-			q = q.Where("dashboard_uid = ?", query.DashboardUID)
-			if query.PanelID != 0 {
-				q = q.Where("panel_id = ?", query.PanelID)
-			}
-		}
-
-		if len(query.NamespaceUIDs) > 0 {
-			args, in := getINSubQueryArgs(query.NamespaceUIDs)
-			q = q.Where(fmt.Sprintf("namespace_uid IN (%s)", strings.Join(in, ",")), args...)
-		}
-
-		if len(query.RuleUIDs) > 0 {
-			args, in := getINSubQueryArgs(query.RuleUIDs)
-			q = q.Where(fmt.Sprintf("uid IN (%s)", strings.Join(in, ",")), args...)
-		}
-
-		var groupsMap map[string]struct{}
-		if len(query.RuleGroups) > 0 {
-			groupsMap = make(map[string]struct{})
-			args, in := getINSubQueryArgs(query.RuleGroups)
-			q = q.Where(fmt.Sprintf("rule_group IN (%s)", strings.Join(in, ",")), args...)
-			for _, group := range query.RuleGroups {
-				groupsMap[group] = struct{}{}
-			}
-		}
-
-		if query.ReceiverName != "" {
-			q, err = st.filterByContentInNotificationSettings(query.ReceiverName, q)
-			if err != nil {
-				return err
-			}
-		}
-
-		if query.TimeIntervalName != "" {
-			q, err = st.filterByContentInNotificationSettings(query.TimeIntervalName, q)
-			if err != nil {
-				return err
-			}
-		}
-
-		if query.HasPrometheusRuleDefinition != nil {
-			q, err = st.filterWithPrometheusRuleDefinition(*query.HasPrometheusRuleDefinition, q)
-			if err != nil {
-				return err
-			}
-		}
-
-		switch query.RuleType {
-		case ngmodels.RuleTypeFilterAlerting:
-			q = q.Where("record = ''")
-		case ngmodels.RuleTypeFilterRecording:
-			q = q.Where("record != ''")
-		case ngmodels.RuleTypeFilterAll:
-			// no additional filter
-		default:
-			return fmt.Errorf("unknown rule type filter %q", query.RuleType)
-		}
-
-		// Order by group first, then by rule index within group
-		q = q.Asc("namespace_uid", "rule_group", "rule_group_idx", "id")
-
-		var cursor ngmodels.GroupCursor
-		if query.GroupContinueToken != "" {
-			// only set the cursor if it's valid, otherwise we'll start from the beginning
-			if cur, err := ngmodels.DecodeGroupCursor(query.GroupContinueToken); err == nil {
-				cursor = cur
-			}
-		}
-
-		// Build group cursor condition
-		if cursor.NamespaceUID != "" {
-			q = buildGroupCursorCondition(q, cursor)
-		}
-
-		// No arbitrary fetch limit - let the loop control pagination
-		alertRules := make([]*ngmodels.AlertRule, 0)
-		rule := new(alertRule)
-		rows, err := q.Rows(rule)
-		if err != nil {
-			return err
-		}
-		defer func() {
-			_ = rows.Close()
-		}()
-
-		// Process rules and implement per-group pagination
-		var groupsFetched int64
-		for rows.Next() {
-			rule := new(alertRule)
-			err = rows.Scan(rule)
-			if err != nil {
-				st.Logger.Error("Invalid rule found in DB store, ignoring it", "func", "ListAlertRulesByGroup", "error", err)
-				continue
-			}
-
-			converted, err := alertRuleToModelsAlertRule(*rule, st.Logger)
-			if err != nil {
-				st.Logger.Error("Invalid rule found in DB store, cannot convert, ignoring it", "func", "ListAlertRulesByGroup", "error", err)
-				continue
-			}
-
-			// Check if we've moved to a new group
-			key := ngmodels.GroupCursor{
-				NamespaceUID: converted.NamespaceUID,
-				RuleGroup:    converted.RuleGroup,
-			}
-			if key != cursor {
-				// Check if we've reached the group limit
-				if query.GroupLimit > 0 && groupsFetched == query.GroupLimit {
-					// Generate next token for the next group
-					nextToken = ngmodels.EncodeGroupCursor(cursor)
-					break
-				}
-
-				// Reset for new group
-				cursor = key
-				groupsFetched++
-			}
-
-			// Apply post-query filters
-			if !shouldIncludeRule(&converted, query, groupsMap) {
-				continue
-			}
-
-			alertRules = append(alertRules, &converted)
-		}
-
-		result = alertRules
-		return nil
-	})
-	return result, nextToken, err
-}
-
-func buildGroupCursorCondition(sess *xorm.Session, c ngmodels.GroupCursor) *xorm.Session {
-	return sess.Where("(namespace_uid > ?)", c.NamespaceUID).
-		Or("(namespace_uid = ? AND rule_group > ?)", c.NamespaceUID, c.RuleGroup)
-}
-
-func shouldIncludeRule(rule *ngmodels.AlertRule, query *ngmodels.ListAlertRulesByGroupQuery, groupsMap map[string]struct{}) bool {
-	if query.ReceiverName != "" {
-		if !slices.ContainsFunc(rule.NotificationSettings, func(settings ngmodels.NotificationSettings) bool {
-			return settings.Receiver == query.ReceiverName
-		}) {
-			return false
-		}
-	}
-
-	if query.TimeIntervalName != "" {
-		if !slices.ContainsFunc(rule.NotificationSettings, func(settings ngmodels.NotificationSettings) bool {
-			return slices.Contains(settings.MuteTimeIntervals, query.TimeIntervalName) ||
-				slices.Contains(settings.ActiveTimeIntervals, query.TimeIntervalName)
-		}) {
-			return false
-		}
-	}
-
-	if query.HasPrometheusRuleDefinition != nil {
-		if *query.HasPrometheusRuleDefinition != rule.HasPrometheusRuleDefinition() {
-			return false
-		}
-	}
-
-	if groupsMap != nil {
-		if _, ok := groupsMap[rule.RuleGroup]; !ok {
-			return false
-		}
-	}
-
-	return true
-}
-
 // ListAlertRules is a handler for retrieving alert rules of specific organisation.
 func (st DBstore) ListAlertRules(ctx context.Context, query *ngmodels.ListAlertRulesQuery) (result ngmodels.RulesGroup, err error) {
 	err = st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
diff --git a/pkg/services/ngalert/store/alert_rule_test.go b/pkg/services/ngalert/store/alert_rule_test.go
index e83dae824b6..588f78dd8c2 100644
--- a/pkg/services/ngalert/store/alert_rule_test.go
+++ b/pkg/services/ngalert/store/alert_rule_test.go
@@ -1596,14 +1596,14 @@ func TestIntegrationGetRuleVersions(t *testing.T) {
 
 // createAlertRule creates an alert rule in the database and returns it.
 // If a generator is not specified, uniqueness of primary key is not guaranteed.
-func createRule(tb testing.TB, store *DBstore, generator *models.AlertRuleGenerator) *models.AlertRule {
-	tb.Helper()
+func createRule(t *testing.T, store *DBstore, generator *models.AlertRuleGenerator) *models.AlertRule {
+	t.Helper()
 	if generator == nil {
 		generator = models.RuleGen.With(models.RuleMuts.WithIntervalMatching(store.Cfg.BaseInterval))
 	}
 	rule := generator.GenerateRef()
 	converted, err := alertRuleFromModelsAlertRule(*rule)
-	require.NoError(tb, err)
+	require.NoError(t, err)
 	err = store.SQLStore.WithDbSession(context.Background(), func(sess *db.Session) error {
 		converted.ID = 0
 		_, err := sess.Table(alertRule{}).InsertOne(&converted)
@@ -1622,12 +1622,12 @@ func createRule(tb testing.TB, store *DBstore, generator *models.AlertRuleGenera
 		rule = &r
 		return err
 	})
-	require.NoError(tb, err)
+	require.NoError(t, err)
 
 	return rule
 }
 
-func setupFolderService(t testing.TB, sqlStore db.DB, cfg *setting.Cfg, features featuremgmt.FeatureToggles) folder.Service {
+func setupFolderService(t *testing.T, sqlStore db.DB, cfg *setting.Cfg, features featuremgmt.FeatureToggles) folder.Service {
 	tracer := tracing.InitializeTracerForTest()
 	inProcBus := bus.ProvideBus(tracer)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
@@ -1735,169 +1735,6 @@ func TestIntegration_AlertRuleVersionsCleanup(t *testing.T) {
 	})
 }
 
-func TestIntegration_ListAlertRulesByGroup(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	sqlStore := db.InitTestDB(t)
-	cfg := setting.NewCfg()
-	cfg.UnifiedAlerting = setting.UnifiedAlertingSettings{
-		BaseInterval: time.Duration(rand.Int64N(100)+1) * time.Second,
-	}
-	folderService := setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures())
-	bus := &fakeBus{}
-	orgID := int64(1)
-	ruleGen := models.RuleGen.With(
-		models.RuleMuts.WithIntervalMatching(cfg.UnifiedAlerting.BaseInterval),
-		models.RuleMuts.WithOrgID(orgID),
-	)
-	store := createTestStore(sqlStore, folderService, &logtest.Fake{}, cfg.UnifiedAlerting, bus)
-
-	// set test params
-	numFolders := 10
-	numRules := 50
-	rulesPerGroup := 5
-	totalGroups := numRules / rulesPerGroup // 10
-
-	// create rules with different group names
-	rules, _ := createManyRules(t,
-		store,
-		ruleGen,
-		numFolders,
-		numRules,
-		rulesPerGroup,
-	)
-	// sort rules by folder, then group, then group index
-	slices.SortStableFunc(rules, func(a, b *models.AlertRule) int {
-		if a.NamespaceUID != b.NamespaceUID {
-			return strings.Compare(a.NamespaceUID, b.NamespaceUID)
-		}
-		if a.RuleGroup != b.RuleGroup {
-			return strings.Compare(a.RuleGroup, b.RuleGroup)
-		}
-		return a.RuleGroupIndex - b.RuleGroupIndex
-	})
-
-	t.Run("should return all rules when no limit passed", func(t *testing.T) {
-		result, continueToken, err := store.ListAlertRulesByGroup(context.Background(), &models.ListAlertRulesByGroupQuery{
-			OrgID: orgID,
-		})
-		require.NoError(t, err)
-		require.Len(t, result, 50, "should return all rules when no limit is set")
-		require.Empty(t, continueToken, "continue token should be empty when no limit is set")
-	})
-
-	t.Run("should return paginated results when group limit is set", func(t *testing.T) {
-		// random number from 1 to totalGroups - 1 (to ensure we always receive less than totalGroups)
-		groupLimit := rand.Int64N(int64(totalGroups)-1) + 1
-		result, continueToken, err := store.ListAlertRulesByGroup(context.Background(), &models.ListAlertRulesByGroupQuery{
-			OrgID:      orgID,
-			GroupLimit: groupLimit,
-		})
-		require.NoError(t, err)
-		expectedRuleCount := groupLimit * int64(rulesPerGroup)
-		require.Len(t, result, int(expectedRuleCount), fmt.Sprintf("should return %d rules when group limit is set", expectedRuleCount))
-		require.NotEmpty(t, continueToken, "continue token should not be empty when limit is set")
-	})
-
-	t.Run("pagination should all for continuation", func(t *testing.T) {
-		groupLimit := int64(2) // fixed group limit for this test
-		result, continueToken, err := store.ListAlertRulesByGroup(context.Background(), &models.ListAlertRulesByGroupQuery{
-			OrgID:      orgID,
-			GroupLimit: groupLimit,
-		})
-		require.NoError(t, err)
-		require.Len(t, result, int(groupLimit*int64(rulesPerGroup)), "should return rules for the first two groups")
-		require.NotEmpty(t, continueToken, "continue token should not be empty")
-
-		for i, rule := range result {
-			expected := rules[i].RuleGroup
-			actual := rule.RuleGroup
-			require.Equal(t, expected, actual, "rules should be ordered by group name")
-		}
-
-		resultRules := make([]*models.AlertRule, 0, len(result))
-		resultRules = append(resultRules, result...)
-
-		// Continue from previous, fetching the rest of the rules
-		result, continueToken, err = store.ListAlertRulesByGroup(context.Background(), &models.ListAlertRulesByGroupQuery{
-			OrgID:              orgID,
-			GroupContinueToken: continueToken,
-		})
-		require.NoError(t, err)
-		resultRules = append(resultRules, result...)
-		require.Len(t, resultRules, numRules, "should return all rules when continuing from the last token")
-		require.Empty(t, continueToken, "continue token should be empty when all rules are fetched")
-		for i, rule := range resultRules {
-			expected := rules[i].RuleGroup
-			actual := rule.RuleGroup
-			require.Equal(t, expected, actual, "rules should be ordered by group name")
-		}
-	})
-}
-
-func Benchmark_ListAlertRules(b *testing.B) {
-	orgID := int64(1)
-	ruleGen := models.RuleGen
-
-	// init
-	sqlStore := db.InitTestDB(b)
-	cfg := setting.NewCfg()
-	cfg.UnifiedAlerting = setting.UnifiedAlertingSettings{
-		BaseInterval: time.Duration(rand.Int64N(100)) * time.Second,
-	}
-	folderService := setupFolderService(b, sqlStore, cfg, featuremgmt.WithFeatures())
-	bus := &fakeBus{}
-	store := createTestStore(sqlStore, folderService, &logtest.Fake{}, cfg.UnifiedAlerting, bus)
-
-	ruleGen = ruleGen.With(
-		ruleGen.WithIntervalMatching(cfg.UnifiedAlerting.BaseInterval),
-		ruleGen.WithOrgID(orgID),
-	)
-
-	// define benchmark parameters
-	numFolders := 5
-	numRules := 10000
-	rulesPerGroup := 100
-	assert.Greater(b, numRules, rulesPerGroup, "n must be greater than rulesPerGroup")
-	assert.Equal(b, 0, numRules%rulesPerGroup, "n % rulesPerGroup must be zero to create equal groups")
-
-	// create rules and folders (5 folders, each with n/rulesPerGroup rules)
-	_, _ = createManyRules(b,
-		store,
-		ruleGen,
-		numFolders,    // number of folders
-		numRules,      // total number of rules
-		rulesPerGroup, // rules per group
-	)
-
-	b.Run(fmt.Sprintf("list %d rules unpaginated", numRules), func(b *testing.B) {
-		for b.Loop() {
-			_, err := store.ListAlertRules(context.Background(), &models.ListAlertRulesQuery{
-				OrgID: orgID,
-			})
-			if err != nil {
-				b.Fatal(err)
-			}
-		}
-	})
-
-	for _, groupLimit := range []int{1, 2, 5, 10, 50, 100} {
-		b.Run(fmt.Sprintf("list %d groups paginated", groupLimit), func(b *testing.B) {
-			for b.Loop() {
-				_, _, err := store.ListAlertRulesByGroup(context.Background(), &models.ListAlertRulesByGroupQuery{
-					OrgID:      orgID,
-					GroupLimit: int64(groupLimit),
-				})
-				if err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-	}
-}
-
 func TestIntegration_ListAlertRules(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -2138,27 +1975,3 @@ func (f *fakeBus) Publish(ctx context.Context, msg bus.Msg) error {
 
 	return nil
 }
-
-func createManyRules(tb testing.TB, store *DBstore, ruleGen *models.AlertRuleGenerator, numFolders, numRules, rulesPerGroup int) ([]*models.AlertRule, []string) {
-	tb.Helper()
-
-	require.Greater(tb, numRules, 0, "numRules must be greater than 0")
-	require.Greater(tb, numFolders, 0, "numFolders must be greater than 0")
-	require.Greater(tb, numRules, rulesPerGroup, "numRules must be greater than rulesPerGroup")
-	require.Greater(tb, rulesPerGroup, 0, "rulesPerGroup must be greater than 0")
-	require.Equal(tb, numRules%rulesPerGroup, 0, "numRules % rulesPerGroup must be zero to create equal groups")
-
-	rules := make([]*models.AlertRule, 0, numRules)
-	namespaceUIDs := make([]string, numFolders)
-	for i := range namespaceUIDs {
-		namespaceUIDs[i] = fmt.Sprintf("ns-%d", i)
-	}
-	for i := 0; i < numRules; i++ {
-		gen := ruleGen.With(
-			ruleGen.WithNamespaceUID(namespaceUIDs[i%numFolders]),
-			ruleGen.WithGroupName(fmt.Sprintf("group_%d", i%(numRules/rulesPerGroup))),
-		)
-		rules = append(rules, createRule(tb, store, gen))
-	}
-	return rules, namespaceUIDs
-}
diff --git a/pkg/services/ngalert/tests/fakes/rules.go b/pkg/services/ngalert/tests/fakes/rules.go
index c17c70bf6c9..046522f3214 100644
--- a/pkg/services/ngalert/tests/fakes/rules.go
+++ b/pkg/services/ngalert/tests/fakes/rules.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"math/rand"
 	"slices"
-	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -186,88 +185,6 @@ func (f *RuleStore) GetAlertRulesGroupByRuleUID(_ context.Context, q *models.Get
 	return ruleList, nil
 }
 
-func (f *RuleStore) ListAlertRulesByGroup(_ context.Context, q *models.ListAlertRulesByGroupQuery) (models.RulesGroup, string, error) {
-	f.mtx.Lock()
-	defer f.mtx.Unlock()
-	f.RecordedOps = append(f.RecordedOps, *q)
-
-	if err := f.Hook(*q); err != nil {
-		return nil, "", err
-	}
-
-	query := &models.ListAlertRulesQuery{
-		OrgID:                       q.OrgID,
-		NamespaceUIDs:               q.NamespaceUIDs,
-		DashboardUID:                q.DashboardUID,
-		PanelID:                     q.PanelID,
-		RuleGroups:                  q.RuleGroups,
-		RuleUIDs:                    q.RuleUIDs,
-		ReceiverName:                q.ReceiverName,
-		HasPrometheusRuleDefinition: q.HasPrometheusRuleDefinition,
-	}
-
-	ruleList, err := f.listAlertRules(query)
-	if err != nil {
-		return nil, "", err
-	}
-
-	// < group limit logic >
-
-	// sort rules to ensure order is consistent, pagination depends on this
-	slices.SortFunc(ruleList, func(a, b *models.AlertRule) int {
-		nsCmp := strings.Compare(a.NamespaceUID, b.NamespaceUID)
-		if nsCmp != 0 {
-			return nsCmp
-		}
-		rgCmp := strings.Compare(a.RuleGroup, b.RuleGroup)
-		if rgCmp != 0 {
-			return rgCmp
-		}
-		return models.RulesGroupComparer(a, b)
-	})
-
-	var nextToken string
-	var cursor models.GroupCursor
-	if q.GroupContinueToken != "" {
-		if cur, err := models.DecodeGroupCursor(q.GroupContinueToken); err == nil {
-			cursor = cur
-		}
-	}
-
-	if q.GroupLimit < 0 {
-		return ruleList, "", nil
-	}
-
-	outputRules := make([]*models.AlertRule, 0, len(ruleList))
-	var groupsFetched int64
-	initialCursor := cursor
-	for _, r := range ruleList {
-		// skip rules before the initial cursor
-		if initialCursor.NamespaceUID != "" &&
-			(strings.Compare(r.NamespaceUID, initialCursor.NamespaceUID) < 0 ||
-				(strings.Compare(r.NamespaceUID, initialCursor.NamespaceUID) == 0 && strings.Compare(r.RuleGroup, initialCursor.RuleGroup) <= 0)) {
-			continue
-		}
-
-		key := models.GroupCursor{
-			NamespaceUID: r.NamespaceUID,
-			RuleGroup:    r.RuleGroup,
-		}
-		if key != cursor {
-			if q.GroupLimit > 0 && groupsFetched == q.GroupLimit {
-				nextToken = models.EncodeGroupCursor(cursor)
-				break
-			}
-			cursor = key
-			groupsFetched++
-		}
-
-		outputRules = append(outputRules, r)
-	}
-
-	return outputRules, nextToken, nil
-}
-
 func (f *RuleStore) ListAlertRules(_ context.Context, q *models.ListAlertRulesQuery) (models.RulesGroup, error) {
 	f.mtx.Lock()
 	defer f.mtx.Unlock()
@@ -277,10 +194,6 @@ func (f *RuleStore) ListAlertRules(_ context.Context, q *models.ListAlertRulesQu
 		return nil, err
 	}
 
-	return f.listAlertRules(q)
-}
-
-func (f *RuleStore) listAlertRules(q *models.ListAlertRulesQuery) (models.RulesGroup, error) {
 	hasDashboard := func(r *models.AlertRule, dashboardUID string, panelID int64) bool {
 		if dashboardUID != "" {
 			if r.DashboardUID == nil || *r.DashboardUID != dashboardUID {

From c07c0f27d2c33ca8bf00d243844aad3270cf62d5 Mon Sep 17 00:00:00 2001
From: owensmallwood <owen.smallwood@grafana.com>
Date: Fri, 8 Aug 2025 12:53:01 -0600
Subject: [PATCH 061/243] Unified Storage: Makes writing and reading index
 thread-safe in the queue processor (#109420)

makes writing and reading index thread-safe
---
 pkg/storage/unified/resource/search.go       | 2 +-
 pkg/storage/unified/resource/search_queue.go | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg/storage/unified/resource/search.go b/pkg/storage/unified/resource/search.go
index f605acc7e80..5fa6ad34fb6 100644
--- a/pkg/storage/unified/resource/search.go
+++ b/pkg/storage/unified/resource/search.go
@@ -944,7 +944,7 @@ func (s *searchSupport) getOrCreateIndexQueueProcessor(index ResourceIndex, nsr
 	key := fmt.Sprintf("%s/%s/%s", nsr.Namespace, nsr.Group, nsr.Resource)
 	if indexQueueProcessor, ok := s.indexQueueProcessors[key]; ok {
 		// index stored on existing processor may have been closed and rebuilt, so we need to update it
-		indexQueueProcessor.index = index
+		indexQueueProcessor.updateIndex(index)
 		return indexQueueProcessor, nil
 	}
 
diff --git a/pkg/storage/unified/resource/search_queue.go b/pkg/storage/unified/resource/search_queue.go
index 08f3e5eeac4..9c71d913222 100644
--- a/pkg/storage/unified/resource/search_queue.go
+++ b/pkg/storage/unified/resource/search_queue.go
@@ -33,6 +33,12 @@ type IndexEvent struct {
 	Err               error
 }
 
+func (b *indexQueueProcessor) updateIndex(newIndex ResourceIndex) {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	b.index = newIndex
+}
+
 // newIndexQueueProcessor creates a new IndexQueueProcessor for the given index
 func newIndexQueueProcessor(index ResourceIndex, nsr NamespacedResource, batchSize int, builder DocumentBuilder, resChan chan *IndexEvent) *indexQueueProcessor {
 	return &indexQueueProcessor{
@@ -128,7 +134,10 @@ func (b *indexQueueProcessor) process(batch []*WrittenEvent) {
 		req.Items = append(req.Items, item)
 	}
 
+	b.mu.Lock()
 	err := b.index.BulkIndex(req)
+	b.mu.Unlock()
+
 	if err != nil {
 		for _, r := range resp {
 			r.Err = err

From c7bff24e35efc4c66a081d8d34defe7c95ccc7cd Mon Sep 17 00:00:00 2001
From: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>
Date: Fri, 8 Aug 2025 12:26:20 -0700
Subject: [PATCH 062/243] Geomap: Update no repeat option docs (#109375)

---
 .../panels-visualizations/visualizations/geomap/index.md    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/sources/panels-visualizations/visualizations/geomap/index.md b/docs/sources/panels-visualizations/visualizations/geomap/index.md
index 3a10dea71d6..be4f0fe7641 100644
--- a/docs/sources/panels-visualizations/visualizations/geomap/index.md
+++ b/docs/sources/panels-visualizations/visualizations/geomap/index.md
@@ -186,11 +186,7 @@ You might need to reload the dashboard for this feature to work.
 
 #### No map repeating
 
-The **No map repeating** option prevents the base map tiles from repeating horizontally when you pan across the world. This constrains the view to a single instance of the world map and avoids visual confusion when displaying global datasets.
-
-{{< admonition type="note" >}}
-Enabling this option requires the map to reinitialize.
-{{< /admonition >}}
+The **No map repeating** option prevents the base map tiles from repeating horizontally when you pan across the world. This constrains the view to a single instance of the world map and avoids visual confusion when displaying global datasets. Enabling this option requires the map to reinitialize.
 
 ### Map layers options
 

From 6851d8ae0caccf8678c684687af3d4ea53277942 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@grafana.com>
Date: Fri, 8 Aug 2025 16:51:12 -0400
Subject: [PATCH 063/243] Storage: Skip slow test
 TestIntegrationBenchmarkResourceServer (#109424)

---
 pkg/storage/unified/sql/test/benchmark_test.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/storage/unified/sql/test/benchmark_test.go b/pkg/storage/unified/sql/test/benchmark_test.go
index 585776fd7bb..fe1b219c751 100644
--- a/pkg/storage/unified/sql/test/benchmark_test.go
+++ b/pkg/storage/unified/sql/test/benchmark_test.go
@@ -51,6 +51,8 @@ func TestIntegrationBenchmarkSQLStorageBackend(t *testing.T) {
 }
 
 func TestIntegrationBenchmarkResourceServer(t *testing.T) {
+	t.Skip("skipping slow test, causing CI to fail due to timeout")
+
 	if testing.Short() {
 		t.Skip("skipping integration test in short mode")
 	}

From d921872b97e01587b6da8a27c4124228a9e46740 Mon Sep 17 00:00:00 2001
From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Date: Fri, 8 Aug 2025 17:20:33 -0400
Subject: [PATCH 064/243] Docs: Add variable indexing section (#108725)

---
 .../create-dynamic-dashboard/index.md           |  2 +-
 .../variables/add-template-variables/index.md   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/sources/dashboards/build-dashboards/create-dynamic-dashboard/index.md b/docs/sources/dashboards/build-dashboards/create-dynamic-dashboard/index.md
index 638ed32d79e..f61882de4c3 100644
--- a/docs/sources/dashboards/build-dashboards/create-dynamic-dashboard/index.md
+++ b/docs/sources/dashboards/build-dashboards/create-dynamic-dashboard/index.md
@@ -326,7 +326,7 @@ When a dashboard is in edit mode, you can undo and redo changes you've made usin
 When you've made a change and hover the cursor over the buttons, the tooltip displays the change you're about to undo or redo.
 Also, you can continue undoing or redoing as many changes as you need:
 
-{{< video-embed src="/media/docs/grafana/dashboards/screenrecord-undo-redo-v12.0.mp4" >}}
+{{< video-embed src="/media/docs/grafana/dashboards/screen-record-undo-redo-v12.0.mp4" >}}
 
 The undo and redo buttons are only available at the dashboard level and only apply to changes made there, such as dashboard layout and grouping and high-level dashboard or panel updates.
 They aren't visible and don't apply when you're configuring a panel or making changes in the dashboard settings.
diff --git a/docs/sources/dashboards/variables/add-template-variables/index.md b/docs/sources/dashboards/variables/add-template-variables/index.md
index 38b2bbc27e1..fba0ae43969 100644
--- a/docs/sources/dashboards/variables/add-template-variables/index.md
+++ b/docs/sources/dashboards/variables/add-template-variables/index.md
@@ -351,6 +351,23 @@ InfluxDB and Prometheus use regular expressions, so the same variable would be i
 
 Elasticsearch uses Lucene query syntax, so the same variable would be formatted as `("host1" OR "host2" OR "host3")`. In this case, every value must be escaped so that the value only contains Lucene control words and quotation marks.
 
+#### Variable indexing
+
+If you have a multi-value variable that's formatted as an array, you can use array positions to reference the values rather than the actual values.
+You can use this functionality in dashboard panels to filter data, and when you do so, the array is maintained.
+
+To reference variable values this way, use the following syntax:
+
+```text
+${query0.0}
+```
+
+The preceding syntax references the first, or `0`, position in the array.
+
+In the following example, there's an array of three values, `1t`, `2t`, and `3t`, and rather than referencing those values, the panel query references the second value in the array using the syntax `${query0.1}`:
+
+{{< figure src="/media/docs/grafana/dashboards/screenshot-indexed-variables-v12.1.png" max-width="750px" alt="Panel query using variable indexing to reference a value" >}}
+
 #### Troubleshoot multi-value variables
 
 Automatic escaping and formatting can cause problems and it can be tricky to grasp the logic behind it. Especially for InfluxDB and Prometheus where the use of regular expression syntax requires that the variable is used in regular expression operator context.

From a819e977a1d7535bd2b867e65938f09b684f1fcc Mon Sep 17 00:00:00 2001
From: Paul Marbach <paul.marbach@grafana.com>
Date: Fri, 8 Aug 2025 18:27:44 -0400
Subject: [PATCH 065/243] Table: Fix some styling issues with frozen columns
 (#109425)

---
 .../src/themes/colorManipulator.test.ts       |  13 ++
 .../src/themes/colorManipulator.ts            |  27 +++
 .../src/components/Table/TableNG/styles.ts    | 202 +++++++++---------
 3 files changed, 146 insertions(+), 96 deletions(-)

diff --git a/packages/grafana-data/src/themes/colorManipulator.test.ts b/packages/grafana-data/src/themes/colorManipulator.test.ts
index 4f65f50c4d5..5619ddc4928 100644
--- a/packages/grafana-data/src/themes/colorManipulator.test.ts
+++ b/packages/grafana-data/src/themes/colorManipulator.test.ts
@@ -11,6 +11,7 @@ import {
   getLuminance,
   lighten,
   asRgbString,
+  onBackground,
 } from './colorManipulator';
 
 describe('utils/colorManipulator', () => {
@@ -423,4 +424,16 @@ describe('utils/colorManipulator', () => {
       expect(asRgbString('#000000')).toEqual('rgb(0, 0, 0)');
     });
   });
+
+  describe('onBackground', () => {
+    it('should calculate the foreground color given a background color', () => {
+      expect(onBackground('#ffffff', '#000').toHexString()).toBe('#ffffff');
+      expect(onBackground('#ffffff00', '#000').toHexString()).toBe('#000000');
+      expect(onBackground('#ffffff77', '#000').toHexString()).toBe('#777777');
+      expect(onBackground('#262a6d82', '#644242').toHexString()).toBe('#443658');
+      expect(onBackground('rgba(255,0,0,0.5)', 'rgba(0,255,0,0.5)').toRgbString()).toBe('rgba(170, 85, 0, 0.75)');
+      expect(onBackground('rgba(255,0,0,0.5)', 'rgba(0,0,255,1)').toRgbString()).toBe('rgb(128, 0, 128)');
+      expect(onBackground('rgba(0,0,255,1)', 'rgba(0,0,0,0.5)').toRgbString()).toBe('rgb(0, 0, 255)');
+    });
+  });
 });
diff --git a/packages/grafana-data/src/themes/colorManipulator.ts b/packages/grafana-data/src/themes/colorManipulator.ts
index 9964e9a09bc..eccb661b7d8 100644
--- a/packages/grafana-data/src/themes/colorManipulator.ts
+++ b/packages/grafana-data/src/themes/colorManipulator.ts
@@ -366,6 +366,32 @@ export function lighten(color: string, coefficient: number) {
   return recomposeColor(parts);
 }
 
+/**
+ * given foreground and background colors, returns the color of the foreground color on the background color.
+ * this is valuable for foreground colors with alpha.
+ *
+ * adapted from https://github.com/scttcper/tinycolor/blob/2927a9d2aa03e037486a79a295542a7848621691/src/index.ts#L583-L594
+ *
+ * @param foreground
+ * @param background
+ * @returns a tinycolor instance
+ */
+export const onBackground = (
+  foreground: tinycolor.ColorInput,
+  background: tinycolor.ColorInput
+): tinycolor.Instance => {
+  const fg = tinycolor(foreground).toRgb();
+  const bg = tinycolor(background).toRgb();
+  const alpha = fg.a + bg.a * (1 - fg.a);
+
+  return tinycolor({
+    r: (fg.r * fg.a + bg.r * bg.a * (1 - fg.a)) / alpha,
+    g: (fg.g * fg.a + bg.g * bg.a * (1 - fg.a)) / alpha,
+    b: (fg.b * fg.a + bg.b * bg.a * (1 - fg.a)) / alpha,
+    a: alpha,
+  });
+};
+
 interface DecomposeColor {
   type: string;
   values: any;
@@ -387,4 +413,5 @@ export const colorManipulator = {
   alpha,
   darken,
   lighten,
+  onBackground,
 };
diff --git a/packages/grafana-ui/src/components/Table/TableNG/styles.ts b/packages/grafana-ui/src/components/Table/TableNG/styles.ts
index 739652cf92f..983372aeb0b 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/styles.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/styles.ts
@@ -1,7 +1,7 @@
 import { css } from '@emotion/css';
 import { Property } from 'csstype';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, colorManipulator } from '@grafana/data';
 
 import { COLUMN, TABLE } from './constants';
 import { TableCellStyles } from './types';
@@ -10,109 +10,120 @@ import { getJustifyContent } from './utils';
 export const getGridStyles = (
   theme: GrafanaTheme2,
   { enablePagination, transparent }: { enablePagination?: boolean; transparent?: boolean }
-) => ({
-  grid: css({
-    '--rdg-background-color': transparent ? theme.colors.background.canvas : theme.colors.background.primary,
-    '--rdg-header-background-color': transparent ? theme.colors.background.canvas : theme.colors.background.primary,
-    '--rdg-border-color': theme.colors.border.weak,
-    '--rdg-color': theme.colors.text.primary,
-    '--rdg-summary-border-color': theme.colors.border.weak,
-    '--rdg-summary-border-width': '1px',
+) => {
+  const bgColor = transparent ? theme.colors.background.canvas : theme.colors.background.primary;
+  // this needs to be pre-calc'd since the theme colors have alpha and the border color becomes
+  // unpredictable for background color cells
+  const borderColor = colorManipulator.onBackground(theme.colors.border.weak, bgColor).toHexString();
 
-    // note: this cannot have any transparency since default cells that
-    // overlay/overflow on hover inherit this background and need to occlude cells below
-    '--rdg-row-background-color': transparent ? theme.colors.background.canvas : theme.colors.background.primary,
-    '--rdg-row-hover-background-color': transparent
-      ? theme.colors.background.primary
-      : theme.colors.background.secondary,
+  return {
+    grid: css({
+      '--rdg-background-color': bgColor,
+      '--rdg-header-background-color': bgColor,
+      '--rdg-border-color': borderColor,
+      '--rdg-color': theme.colors.text.primary,
+      '--rdg-summary-border-color': borderColor,
+      '--rdg-summary-border-width': '1px',
 
-    // TODO: magic 32px number is unfortunate. it would be better to have the content
-    // flow using flexbox rather than hard-coding this size via a calc
-    blockSize: enablePagination ? 'calc(100% - 32px)' : '100%',
-    scrollbarWidth: 'thin',
-    scrollbarColor: theme.isDark ? '#fff5 #fff1' : '#0005 #0001',
+      // note: this cannot have any transparency since default cells that
+      // overlay/overflow on hover inherit this background and need to occlude cells below
+      '--rdg-row-background-color': bgColor,
+      '--rdg-row-hover-background-color': transparent
+        ? theme.colors.background.primary
+        : theme.colors.background.secondary,
 
-    border: 'none',
+      // TODO: magic 32px number is unfortunate. it would be better to have the content
+      // flow using flexbox rather than hard-coding this size via a calc
+      blockSize: enablePagination ? 'calc(100% - 32px)' : '100%',
+      scrollbarWidth: 'thin',
+      scrollbarColor: theme.isDark ? '#fff5 #fff1' : '#0005 #0001',
 
-    '.rdg-cell': {
-      padding: TABLE.CELL_PADDING,
+      border: 'none',
 
-      '&:last-child': {
-        borderInlineEnd: 'none',
-      },
-    },
-
-    // add a box shadow on hover and selection for all body cells
-    '& > :not(.rdg-summary-row, .rdg-header-row) > .rdg-cell': {
-      '&:hover, &[aria-selected=true]': { boxShadow: theme.shadows.z2 },
-      // selected cells should appear below hovered cells.
-      '&:hover': { zIndex: theme.zIndex.tooltip - 4 },
-      '&[aria-selected=true]': { zIndex: theme.zIndex.tooltip - 5 },
-    },
-
-    '.rdg-cell.rdg-cell-frozen': { zIndex: theme.zIndex.tooltip - 2 },
-
-    '.rdg-header-row, .rdg-summary-row': {
       '.rdg-cell': {
-        zIndex: theme.zIndex.tooltip - 3,
+        padding: TABLE.CELL_PADDING,
 
-        '&.rdg-cell-frozen': {
-          zIndex: theme.zIndex.tooltip - 1,
+        '&:last-child': {
+          borderInlineEnd: 'none',
         },
       },
-    },
-  }),
-  gridNested: css({
-    height: '100%',
-    width: `calc(100% - ${COLUMN.EXPANDER_WIDTH - TABLE.CELL_PADDING * 2 - 1}px)`,
-    overflow: 'visible',
-    marginLeft: COLUMN.EXPANDER_WIDTH - TABLE.CELL_PADDING - 1,
-    marginBlock: TABLE.CELL_PADDING,
-  }),
-  cellNested: css({ '&[aria-selected=true]': { outline: 'none' } }),
-  noDataNested: css({
-    height: TABLE.NESTED_NO_DATA_HEIGHT,
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    color: theme.colors.text.secondary,
-    fontSize: theme.typography.h4.fontSize,
-  }),
-  cellActions: css({
-    display: 'none',
-    position: 'absolute',
-    top: 0,
-    margin: 'auto',
-    height: '100%',
-    color: theme.colors.text.primary,
-    background: theme.isDark ? 'rgba(0, 0, 0, 0.7)' : 'rgba(255, 255, 255, 0.7)',
-    padding: theme.spacing.x0_5,
-    paddingInlineStart: theme.spacing.x1,
-  }),
-  cellActionsEnd: css({ left: 0 }),
-  cellActionsStart: css({ right: 0 }),
-  headerRow: css({
-    paddingBlockStart: 0,
-    fontWeight: 'normal',
-    '& .rdg-cell': { height: '100%', alignItems: 'flex-end' },
-  }),
-  displayNone: css({ display: 'none' }),
-  paginationContainer: css({
-    alignItems: 'center',
-    display: 'flex',
-    justifyContent: 'center',
-    marginTop: '8px',
-    width: '100%',
-  }),
-  paginationSummary: css({
-    color: theme.colors.text.secondary,
-    fontSize: theme.typography.bodySmall.fontSize,
-    display: 'flex',
-    justifyContent: 'flex-end',
-    padding: theme.spacing(0, 1, 0, 2),
-  }),
-  menuItem: css({ maxWidth: '200px' }),
-});
+
+      // add a box shadow on hover and selection for all body cells
+      '& > :not(.rdg-summary-row, .rdg-header-row) > .rdg-cell': {
+        '&:hover, &[aria-selected=true]': { boxShadow: theme.shadows.z2 },
+        // selected cells should appear below hovered cells.
+        '&:hover': { zIndex: theme.zIndex.tooltip - 7 },
+        '&[aria-selected=true]': { zIndex: theme.zIndex.tooltip - 6 },
+      },
+
+      '.rdg-cell.rdg-cell-frozen': {
+        backgroundColor: '--rdg-row-background-color',
+        zIndex: theme.zIndex.tooltip - 4,
+        '&:hover': { zIndex: theme.zIndex.tooltip - 2 },
+        '&[aria-selected=true]': { zIndex: theme.zIndex.tooltip - 3 },
+      },
+
+      '.rdg-header-row, .rdg-summary-row': {
+        '.rdg-cell': {
+          zIndex: theme.zIndex.tooltip - 5,
+          '&.rdg-cell-frozen': {
+            zIndex: theme.zIndex.tooltip - 1,
+          },
+        },
+      },
+    }),
+    gridNested: css({
+      height: '100%',
+      width: `calc(100% - ${COLUMN.EXPANDER_WIDTH - TABLE.CELL_PADDING * 2 - 1}px)`,
+      overflow: 'visible',
+      marginLeft: COLUMN.EXPANDER_WIDTH - TABLE.CELL_PADDING - 1,
+      marginBlock: TABLE.CELL_PADDING,
+    }),
+    cellNested: css({ '&[aria-selected=true]': { outline: 'none' } }),
+    noDataNested: css({
+      height: TABLE.NESTED_NO_DATA_HEIGHT,
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.h4.fontSize,
+    }),
+    cellActions: css({
+      display: 'none',
+      position: 'absolute',
+      top: 0,
+      margin: 'auto',
+      height: '100%',
+      color: theme.colors.text.primary,
+      background: theme.isDark ? 'rgba(0, 0, 0, 0.7)' : 'rgba(255, 255, 255, 0.7)',
+      padding: theme.spacing.x0_5,
+      paddingInlineStart: theme.spacing.x1,
+    }),
+    cellActionsEnd: css({ left: 0 }),
+    cellActionsStart: css({ right: 0 }),
+    headerRow: css({
+      paddingBlockStart: 0,
+      fontWeight: 'normal',
+      '& .rdg-cell': { height: '100%', alignItems: 'flex-end' },
+    }),
+    displayNone: css({ display: 'none' }),
+    paginationContainer: css({
+      alignItems: 'center',
+      display: 'flex',
+      justifyContent: 'center',
+      marginTop: '8px',
+      width: '100%',
+    }),
+    paginationSummary: css({
+      color: theme.colors.text.secondary,
+      fontSize: theme.typography.bodySmall.fontSize,
+      display: 'flex',
+      justifyContent: 'flex-end',
+      padding: theme.spacing(0, 1, 0, 2),
+    }),
+    menuItem: css({ maxWidth: '200px' }),
+  };
+};
 
 export const getFooterStyles = (justifyContent: Property.JustifyContent) => ({
   footerCellCountRows: css({ display: 'flex', justifyContent: 'space-between' }),
@@ -135,7 +146,6 @@ export const getDefaultCellStyles: TableCellStyles = (theme, { textAlign, should
     display: 'flex',
     alignItems: 'center',
     textAlign,
-    backgroundClip: 'padding-box !important', // helps when cells have a bg color
     justifyContent: getJustifyContent(textAlign),
     ...(shouldOverflow && { minHeight: '100%' }),
     '&:hover, &[aria-selected=true]': {

From 49e5729fb1ef8a6fda29319e1e00bd351f321bd5 Mon Sep 17 00:00:00 2001
From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Date: Sat, 9 Aug 2025 03:38:11 -0400
Subject: [PATCH 066/243] Docs: Clarify geomap tooltip behavior (#107930)

---
 .../visualizations/geomap/index.md            | 62 ++++++++++++-------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/docs/sources/panels-visualizations/visualizations/geomap/index.md b/docs/sources/panels-visualizations/visualizations/geomap/index.md
index be4f0fe7641..fb9511a2ac5 100644
--- a/docs/sources/panels-visualizations/visualizations/geomap/index.md
+++ b/docs/sources/panels-visualizations/visualizations/geomap/index.md
@@ -53,7 +53,7 @@ Geomaps allow you to view and customize the world map using geospatial data. It'
 
 You can configure and overlay [map layers](#layer-type), like heatmaps and networks, and blend included basemaps or your own custom maps. This helps you to easily focus on the important location-based characteristics of the data.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-example-8-1-0.png" max-width="1200px" alt="Geomap visualization" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-example-8-1-0.png" max-width="750px" alt="Geomap visualization" >}}
 
 When a geomap is in focus, in addition to typical mouse controls, you can pan around using the arrow keys or zoom in and out using the plus (`+`) and minus (`-`) keys or icons.
 
@@ -345,7 +345,7 @@ Styles can be set within the "properties" object of the GeoJSON with support for
 
 The Night / Day layer displays night and day regions based on the current time range.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-day-night-9-1-0.png" max-width="1200px" alt="Geomap panel Night / Day" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-day-night-9-1-0.png" max-width="600px" alt="Geomap panel Night / Day" >}}
 
 <!-- prettier-ignore-start -->
 | Option | Description |
@@ -368,11 +368,11 @@ The Route layer is currently in [public preview](/docs/release-life-cycle/). Gra
 
 The Route layer renders data points as a route.
 
-{{< figure src="/media/docs/grafana/geomap-route-layer-basic-9-4-0.png" max-width="1200px" alt="Geomap panel Route" >}}
+{{< figure src="/media/docs/grafana/geomap-route-layer-basic-9-4-0.png" max-width="600px" alt="Geomap panel Route" >}}
 
 The layer can also render a route with arrows.
 
-{{< figure src="/media/docs/grafana/geomap-route-layer-arrow-size-9-4-0.png" max-width="1200px" alt="Geomap panel Route arrows with size" >}}
+{{< figure src="/media/docs/grafana/geomap-route-layer-arrow-size-9-4-0.png" max-width="600px" alt="Geomap panel Route arrows with size" >}}
 
 <!-- prettier-ignore-start -->
 | Option | Description |
@@ -397,7 +397,7 @@ The Photos layer is currently in [public preview](/docs/release-life-cycle/). Gr
 
 The Photos layer renders a photo at each data point.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-photos-9-3-0.png" max-width="1200px" alt="Geomap panel Photos" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-photos-9-3-0.png" max-width="600px" alt="Geomap panel Photos" >}}
 
 <!-- prettier-ignore-start -->
 | Option | Description |
@@ -467,7 +467,7 @@ You can convert node graph data to a network layer:
 
 A map from a collaborative free geographic world database.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-osm-9-1-0.png" max-width="1200px" alt="Geomap panel Open Street Map" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-osm-9-1-0.png" max-width="600px" alt="Geomap panel Open Street Map" >}}
 
 - **Opacity** from 0 (transparent) to 1 (opaque)
 - **Display tooltip** - allows you to toggle tooltips for the layer.
@@ -481,9 +481,9 @@ A CARTO layer is from CARTO Raster basemaps.
 - **Theme**
   - Auto
   - Light
-    {{< figure src="/static/img/docs/geomap-panel/geomap-carto-light-9-1-0.png" max-width="1200px" alt="Geomap panel CARTO light example" >}}
+    {{< figure src="/static/img/docs/geomap-panel/geomap-carto-light-9-1-0.png" max-width="600px" alt="Geomap panel CARTO light example" >}}
   - Dark
-    {{< figure src="/static/img/docs/geomap-panel/geomap-carto-dark-9-1-0.png" max-width="1200px" alt="Geomap panel CARTO dark example" >}}
+    {{< figure src="/static/img/docs/geomap-panel/geomap-carto-dark-9-1-0.png" max-width="600px" alt="Geomap panel CARTO dark example" >}}
 - **Show labels** shows the Country details on top of the map.
 - **Opacity** from 0 (transparent) to 1 (opaque)
 - **Display tooltip** - allows you to toggle tooltips for the layer.
@@ -496,17 +496,17 @@ An ArcGIS layer is a layer from an ESRI ArcGIS MapServer.
 
 - **Server Instance** to select the map type.
   - World Street Map
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wsm-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS World Street Map" >}}
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wsm-9-1-0.png" max-width="600px" alt="Geomap panel ArcGIS World Street Map" >}}
   - World Imagery
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wi-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS World Imagery" >}}
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wi-9-1-0.png" max-width="600px" alt="Geomap panel ArcGIS World Imagery" >}}
   - World Physical
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wp-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS World Physical" >}}
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wp-9-1-0.png" max-width="600px" alt="Geomap panel ArcGIS World Physical" >}}
   - Topographic
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-topographic-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS Topographic" >}}
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-topographic-9-1-0.png" max-width="600px" alt="Geomap panel ArcGIS Topographic" >}}
   - USA Topographic
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-usa-topographic-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS USA Topographic" >}}
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-usa-topographic-9-1-0.png" max-width="600px" alt="Geomap panel ArcGIS USA Topographic" >}}
   - World Ocean
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-ocean-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS World Ocean" >}}
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-ocean-9-1-0.png" max-width="600px" alt="Geomap panel ArcGIS World Ocean" >}}
   - Custom MapServer (see [XYZ](#xyz-tile-layer) for formatting)
     - URL template
     - Attribution
@@ -522,7 +522,7 @@ An ArcGIS layer is a layer from an ESRI ArcGIS MapServer.
 
 The XYZ Tile layer is a map from a generic tile layer.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-xyz-9-1-0.png" max-width="1200px" alt="Geomap panel xyz example" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-xyz-9-1-0.png" max-width="600px" alt="Geomap panel xyz example" >}}
 
 - **URL template** - Set a valid tile server url, with {z}/{x}/{y} for example: https://tile.openstreetmap.org/{z}/{x}/{y}.png
 - **Attribution** sets the reference string for the layer if displayed in [map controls](#show-attribution)
@@ -643,7 +643,7 @@ The map controls section contains various options for map information and tool o
 
 Displays zoom controls in the upper left corner. This control can be useful when using systems that don't have a mouse.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-zoom-9-1-0.png" max-width="1200px" alt="Geomap panel zoom" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-zoom-9-1-0.png" max-width="300px" alt="Geomap panel zoom" >}}
 
 #### Mouse wheel zoom
 
@@ -653,19 +653,19 @@ Enables the mouse wheel to be used for zooming in or out.
 
 Displays attribution for basemap layers.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-attribution-9-1-0.png" max-width="1200px" alt="Geomap panel attribution" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-attribution-9-1-0.png" max-width="400px" alt="Geomap panel attribution" >}}
 
 #### Show scale
 
 Displays scale information in the bottom left corner in meters (m) or kilometers (km).
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-scale-9-1-0.png" max-width="1200px" alt="Geomap panel scale" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-scale-9-1-0.png" max-width="400px" alt="Geomap panel scale" >}}
 
 #### Show measure tools
 
 Displays measure tools in the upper right corner. Measurements appear only when this control is open.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-9-1-0.png" max-width="1200px" alt="Geomap panel measure" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-9-1-0.png" max-width="400px" alt="Geomap panel measure" >}}
 
 - **Click** to start measuring
 - **Continue clicking** to continue measurement
@@ -682,7 +682,7 @@ Get the spherical length of a geometry. This length is the sum of the great circ
 - **Miles (mi)**
 - **Nautical miles (nmi)**
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-length-9-1-0.png" max-width="1200px" alt="Geomap panel measure length" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-length-9-1-0.png" max-width="400px" alt="Geomap panel measure length" >}}
 
 ##### Area
 
@@ -695,7 +695,7 @@ Get the spherical area of a geometry. This area is calculated assuming that poly
 - **Acres (acre)**
 - **Hectare (ha)**
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-area-9-1-0.png" max-width="1200px" alt="Geomap panel measure area" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-area-9-1-0.png" max-width="550px" alt="Geomap panel measure area" >}}
 
 #### Show debug
 
@@ -704,13 +704,31 @@ Displays debug information in the upper right corner. This can be useful for deb
 - **Zoom** displays current zoom level of the map.
 - **Center** displays the current **longitude**, **latitude** of the map center.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-debug-9-1-0.png" max-width="1200px" alt="Geomap panel debug" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-debug-9-1-0.png" max-width="400px" alt="Geomap panel debug" >}}
 
 #### Tooltip
 
+Tooltips are supported for the **Markers**, **Heatmap**, **Photos** (beta) layers.
+For these layer types, choose from the following tooltip options:
+
 - **None** displays tooltips only when a data point is clicked.
 - **Details** displays tooltips when a mouse pointer hovers over a data point.
 
+When a data point on the geomap represents one row&mdash;that is, only a single row of response data is relevant to that point&mdash;the tooltip displays a grid with the row's names and values:
+
+{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-single-row-marker-v12.1.png" max-width="750px" alt="A data point with one row of associated data" >}}
+
+When a data point represents more than one row&mdash;that is, different rows but with the same geographical information&mdash;then each row appears as a single entry:
+
+{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-multiple-row-marker-v12.1.png" max-width="750px" alt="A data point with mulitple rows of associated data" >}}
+
+The text displayed in each tooltip row is associated with the first field value in each data row.
+Click it to expand and display the full details of the data row.
+
+{{< admonition type="note" >}}
+The data appearing in each detail row is determined by the underlying query and transformations applied to the query's results, and can't be directly controlled using tooltip options.
+{{< /admonition >}}
+
 ### Standard options
 
 {{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}

From 744f6e50f734d3f6a225be4ba18d0d9152f45b0f Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <mariell.hoversholm@grafana.com>
Date: Mon, 11 Aug 2025 10:24:03 +0200
Subject: [PATCH 067/243] Actions: Don't specify ref on clone  (#109440)

---
 .github/workflows/trufflehog.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/trufflehog.yml b/.github/workflows/trufflehog.yml
index 057a708c129..0a15e4ee13f 100644
--- a/.github/workflows/trufflehog.yml
+++ b/.github/workflows/trufflehog.yml
@@ -30,7 +30,6 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: ${{ steps.fetch_depth.outputs.fetch_depth }}
-          ref: ${{ github.event.pull_request.head.ref }}
       - name: Trufflehog
         uses: trufflesecurity/trufflehog@eafb8c5f6a06175141c27f17bcc17941853d0047 # v3.90.0
         with:

From 7ee2b3c124f0f4225cb6247bc05fe1cec99dc0a9 Mon Sep 17 00:00:00 2001
From: "grafana-pr-automation[bot]"
 <140550294+grafana-pr-automation[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 08:26:30 +0000
Subject: [PATCH 068/243] I18n: Download translations from Crowdin (#109431)

New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 public/locales/cs-CZ/grafana.json   | 18 ++++++++++++++++--
 public/locales/de-DE/grafana.json   | 18 ++++++++++++++++--
 public/locales/es-ES/grafana.json   | 16 +++++++++++++++-
 public/locales/fr-FR/grafana.json   | 18 ++++++++++++++++--
 public/locales/hu-HU/grafana.json   | 18 ++++++++++++++++--
 public/locales/id-ID/grafana.json   | 18 ++++++++++++++++--
 public/locales/it-IT/grafana.json   | 16 +++++++++++++++-
 public/locales/ja-JP/grafana.json   | 18 ++++++++++++++++--
 public/locales/ko-KR/grafana.json   | 16 +++++++++++++++-
 public/locales/nl-NL/grafana.json   | 18 ++++++++++++++++--
 public/locales/pl-PL/grafana.json   | 16 +++++++++++++++-
 public/locales/pt-BR/grafana.json   | 16 +++++++++++++++-
 public/locales/pt-PT/grafana.json   | 16 +++++++++++++++-
 public/locales/ru-RU/grafana.json   | 16 +++++++++++++++-
 public/locales/sv-SE/grafana.json   | 16 +++++++++++++++-
 public/locales/tr-TR/grafana.json   | 16 +++++++++++++++-
 public/locales/zh-Hans/grafana.json | 18 ++++++++++++++++--
 public/locales/zh-Hant/grafana.json | 18 ++++++++++++++++--
 18 files changed, 279 insertions(+), 27 deletions(-)

diff --git a/public/locales/cs-CZ/grafana.json b/public/locales/cs-CZ/grafana.json
index 0feca03d480..47a483b5485 100644
--- a/public/locales/cs-CZ/grafana.json
+++ b/public/locales/cs-CZ/grafana.json
@@ -796,7 +796,7 @@
       },
       "filterBy": "Filtrovat dle:",
       "too-many-events": {
-        "text": "Vybrané časové období má příliš mnoho událostí k zobrazení. Zobrazuje se posledních 5 000 událostí. Zkuste použít kratší časové období.",
+        "text": "",
         "title": "Všechny události nejde zobrazit"
       }
     },
@@ -5273,6 +5273,7 @@
         "new": "Nová karta",
         "repeat": {
           "learn-more": "Zjistěte víc",
+          "loading": "",
           "warning": "Panely v této záložce používají zdroj dat {{SHARED_DASHBOARD_QUERY}}. Tyto panely budou odkazovat na panel v původní záložce, nikoli na panely v opakovaných záložkách."
         }
       },
@@ -9602,6 +9603,12 @@
         "total-bytes-processed": "Celkový počet zpracovaných bajtů"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Deduplikace",
       "disable-highlighting": "Zakázat zvýraznění",
@@ -9625,8 +9632,12 @@
       "oldest-first": "Seřazeno od nejstarších protokolů – kliknutím zobrazíte nejnovější protokoly jako první",
       "prettify-json": "Rozbalit protokoly JSON",
       "remove-escaping": "Odebrat únik",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Posunout dolů",
       "scroll-top": "Posunout nahoru",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "Výsledek vyhledávání v protokolech",
       "show-timestamps": "Zobrazit časová razítka",
       "show-unique-labels": "Zobrazit jedinečné štítky",
@@ -9659,7 +9670,7 @@
     "name-order": "Objednávka",
     "name-prettify-json": "Zkrášlit JSON",
     "name-show-controls": "Zobrazit ovládací prvky",
-    "name-time": "Čas",
+    "name-time": "",
     "name-unique-labels": "Jedinečné štítky",
     "name-wrap-lines": "Zalomit řádky",
     "order-options": {
@@ -9675,6 +9686,7 @@
       "line-contains": "Přidat jako řádek obsahuje filtr",
       "line-contains-not": "Přidat jako řádek neobsahuje filtr"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Propojení dat",
       "aria-label-fields": "Pole",
@@ -12800,6 +12812,7 @@
     "description-column-filter": "Povolit/zakázat filtry polí v tabulce",
     "description-count-rows": "Zobrazit jeden počet pro všechny datové řádky",
     "description-fields": "Vyberte pole, která by měla být vypočtena",
+    "description-frozen-columns": "",
     "description-min-column-width": "Minimální šířka pro automatickou změnu velikosti sloupce",
     "name-calculation": "Výpočet",
     "name-cell-height": "Výška buňky",
@@ -12811,6 +12824,7 @@
     "name-count-rows": "Spočítat řádky",
     "name-enable-pagination": "Povolit stránkování",
     "name-fields": "Pole",
+    "name-frozen-columns": "",
     "name-hide-in-table": "Skrýt v tabulce",
     "name-min-column-width": "Minimální šířka sloupce",
     "name-show-table-footer": "Zobrazit zápatí tabulky",
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index ea9fe9fa559..538de115260 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -788,7 +788,7 @@
       },
       "filterBy": "Filtern nach:",
       "too-many-events": {
-        "text": "Der ausgewählte Zeitraum enthält zu viele Ereignisse, die nicht alle angezeigt werden können. Es werden nur die letzten 5.000 Ereignisse angezeigt. Versuchen Sie es mit einem kürzeren Zeitraum.",
+        "text": "",
         "title": "Es können nicht alle Ereignisse angezeigt werden"
       }
     },
@@ -5233,6 +5233,7 @@
         "new": "Neues Tab",
         "repeat": {
           "learn-more": "Mehr erfahren",
+          "loading": "",
           "warning": "Die Panels in dieser Registerkarte verwenden {{SHARED_DASHBOARD_QUERY}} als Datenquelle. Diese Panels verweisen auf das Panel in der ursprünglichen Registerkarte, nicht auf die in den wiederholten Registerkarten."
         }
       },
@@ -9542,6 +9543,12 @@
         "total-bytes-processed": "Gesamte verarbeitete Bytes"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Deduplizierung",
       "disable-highlighting": "Markierung deaktivieren",
@@ -9565,8 +9572,12 @@
       "oldest-first": "Sortiert nach ältesten Logs zuerst – klicken Sie, um die neuesten zuerst anzuzeigen",
       "prettify-json": "JSON-Logs ausklappen",
       "remove-escaping": "Escaping entfernen",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Nach unten scrollen",
       "scroll-top": "Nach oben scrollen",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "Ergebnis der Suche in Logs",
       "show-timestamps": "Zeitstempel anzeigen",
       "show-unique-labels": "Eindeutige Labels anzeigen",
@@ -9599,7 +9610,7 @@
     "name-order": "Reihenfolge",
     "name-prettify-json": "JSON formatieren",
     "name-show-controls": "Steuerelemente anzeigen",
-    "name-time": "Zeit",
+    "name-time": "",
     "name-unique-labels": "Eindeutige Labels",
     "name-wrap-lines": "Zeilen umbrechen",
     "order-options": {
@@ -9615,6 +9626,7 @@
       "line-contains": "„Als Zeile hinzufügen“ enthält Filter",
       "line-contains-not": "„Als Zeile hinzufügen“ enthält keinen Filter"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Datenlinks",
       "aria-label-fields": "Felder",
@@ -12716,6 +12728,7 @@
     "description-column-filter": "Aktiviert/deaktiviert Feldfilter in der Tabelle",
     "description-count-rows": "Eine einzelne Anzahl für alle Datenzeilen anzeigen",
     "description-fields": "Wählen Sie die Felder aus, die berechnet werden sollen",
+    "description-frozen-columns": "",
     "description-min-column-width": "Die Mindestbreite für die automatische Größenänderung der Spalte",
     "name-calculation": "Berechnung",
     "name-cell-height": "Zellenhöhe",
@@ -12727,6 +12740,7 @@
     "name-count-rows": "Zeilen zählen",
     "name-enable-pagination": "Seitennummerierung aktivieren",
     "name-fields": "Felder",
+    "name-frozen-columns": "",
     "name-hide-in-table": "In Tabelle ausblenden",
     "name-min-column-width": "Minimale Spaltenbreite",
     "name-show-table-footer": "Tabellenfußzeile anzeigen",
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index b6a8c01694f..5160034287c 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -788,7 +788,7 @@
       },
       "filterBy": "Filtrar por:",
       "too-many-events": {
-        "text": "El periodo de tiempo seleccionado tiene demasiados eventos que mostrar. Se muestran los últimos 5000 eventos. Intenta utilizar un periodo de tiempo más corto.",
+        "text": "",
         "title": "No se pueden mostrar todos los eventos"
       }
     },
@@ -5233,6 +5233,7 @@
         "new": "Nueva pestaña",
         "repeat": {
           "learn-more": "Más información",
+          "loading": "",
           "warning": "Los paneles de esta pestaña utilizan la fuente de datos {{SHARED_DASHBOARD_QUERY}}. Estos paneles harán referencia al panel en la pestaña original, no a los de las pestañas repetidas."
         }
       },
@@ -9542,6 +9543,12 @@
         "total-bytes-processed": "Total de bytes procesados"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Deduplicación",
       "disable-highlighting": "Desactivar resaltado",
@@ -9565,8 +9572,12 @@
       "oldest-first": "Ordenado por los logs más antiguos primero: haga clic para mostrar los más nuevos primero",
       "prettify-json": "Expandir logs JSON",
       "remove-escaping": "Eliminar escape",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Desplazarse al final",
       "scroll-top": "Desplazarse al inicio",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "",
       "show-timestamps": "Mostrar marcas temporales",
       "show-unique-labels": "Mostrar etiquetas únicas",
@@ -9615,6 +9626,7 @@
       "line-contains": "Añadir como filtro «la línea contiene»",
       "line-contains-not": "Añadir como filtro «la línea no contiene»"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Enlaces de datos",
       "aria-label-fields": "Campos",
@@ -12716,6 +12728,7 @@
     "description-column-filter": "",
     "description-count-rows": "",
     "description-fields": "",
+    "description-frozen-columns": "",
     "description-min-column-width": "",
     "name-calculation": "",
     "name-cell-height": "",
@@ -12727,6 +12740,7 @@
     "name-count-rows": "",
     "name-enable-pagination": "",
     "name-fields": "",
+    "name-frozen-columns": "",
     "name-hide-in-table": "",
     "name-min-column-width": "",
     "name-show-table-footer": "",
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index d6fcb7569d5..cbf876f9fde 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -788,7 +788,7 @@
       },
       "filterBy": "Filtrer par :",
       "too-many-events": {
-        "text": "La période sélectionnée contient trop d'événements à afficher. Affichage des 5 000 derniers événements. Essayez d'utiliser une période plus courte.",
+        "text": "",
         "title": "Impossible d'afficher tous les événements"
       }
     },
@@ -5233,6 +5233,7 @@
         "new": "Nouvel onglet",
         "repeat": {
           "learn-more": "En savoir plus",
+          "loading": "",
           "warning": "Les panneaux de cet onglet utilisent la source de données {{SHARED_DASHBOARD_QUERY}}. Ces panneaux feront référence au panneau de l’onglet d’origine, pas à ceux des onglets répétés."
         }
       },
@@ -9542,6 +9543,12 @@
         "total-bytes-processed": "Nombre total d’octets traités"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Déduplication",
       "disable-highlighting": "Désactiver la surbrillance",
@@ -9565,8 +9572,12 @@
       "oldest-first": "Trié par les journaux les plus anciens en premier - Cliquez pour afficher les plus récents en premier",
       "prettify-json": "Développer les journaux JSON",
       "remove-escaping": "Supprimer l’échappement",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Faire défiler vers le bas",
       "scroll-top": "Retour en haut de page",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "Rechercher dans les résultats de logs",
       "show-timestamps": "Afficher les horodatages",
       "show-unique-labels": "Afficher les étiquettes uniques",
@@ -9599,7 +9610,7 @@
     "name-order": "Ordre",
     "name-prettify-json": "Embellir le JSON",
     "name-show-controls": "Afficher les contrôles",
-    "name-time": "Heure",
+    "name-time": "",
     "name-unique-labels": "Étiquettes uniques",
     "name-wrap-lines": "Retour à la ligne automatique",
     "order-options": {
@@ -9615,6 +9626,7 @@
       "line-contains": "Ajouter car la ligne contient un filtre",
       "line-contains-not": "Ajouter car la ligne ne contient pas de filtre"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Données de liaison",
       "aria-label-fields": "Champs",
@@ -12716,6 +12728,7 @@
     "description-column-filter": "Active ou désactive les filtres de champ dans le tableau",
     "description-count-rows": "Afficher un seul total pour l’ensemble des lignes de données",
     "description-fields": "Sélectionner les champs à utiliser pour le calcul",
+    "description-frozen-columns": "",
     "description-min-column-width": "La largeur minimale pour le redimensionnement automatique des colonnes",
     "name-calculation": "Calcul",
     "name-cell-height": "Hauteur de cellule",
@@ -12727,6 +12740,7 @@
     "name-count-rows": "Compter les lignes",
     "name-enable-pagination": "Activer la pagination",
     "name-fields": "Champs",
+    "name-frozen-columns": "",
     "name-hide-in-table": "Masquer dans le tableau",
     "name-min-column-width": "Largeur minimale de colonne",
     "name-show-table-footer": "Afficher le pied de tableau",
diff --git a/public/locales/hu-HU/grafana.json b/public/locales/hu-HU/grafana.json
index 9fed586ab03..759bf87701b 100644
--- a/public/locales/hu-HU/grafana.json
+++ b/public/locales/hu-HU/grafana.json
@@ -788,7 +788,7 @@
       },
       "filterBy": "Szűrési mód:",
       "too-many-events": {
-        "text": "A kijelölt időszakban túl sok esemény jeleníthető meg. A legutóbbi 5000 esemény megjelenítése. Próbálkozzon rövidebb időtartammal.",
+        "text": "",
         "title": "Nem lehet megjeleníteni az összes eseményt"
       }
     },
@@ -5233,6 +5233,7 @@
         "new": "Új lap",
         "repeat": {
           "learn-more": "További információk",
+          "loading": "",
           "warning": "Az ezen a lapon lévő panelek a(z) {{SHARED_DASHBOARD_QUERY}} adatforrást használják. Ezek a panelek az eredeti lapon lévő panelre hivatkoznak, nem az ismétlődő lapokon lévőkre."
         }
       },
@@ -9542,6 +9543,12 @@
         "total-bytes-processed": "Összes feldolgozott bájt"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Duplikálás megszüntetése",
       "disable-highlighting": "Kiemelés letiltása",
@@ -9565,8 +9572,12 @@
       "oldest-first": "Rendezés a legrégebbi naplók szerint – kattintson, hogy a legújabb naplók jelenjenek meg elsőként",
       "prettify-json": "JSON-naplók kibontása",
       "remove-escaping": "Módosított értelmezés eltávolítása",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Görgetés az aljára",
       "scroll-top": "Görgetés a tetejére",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "Keresés a naplóeredményekben",
       "show-timestamps": "Időbélyegek megjelenítése",
       "show-unique-labels": "Egyedi címkék megjelenítése",
@@ -9599,7 +9610,7 @@
     "name-order": "Sorrend",
     "name-prettify-json": "JSON szépítése",
     "name-show-controls": "Vezérlőelemek megjelenítése",
-    "name-time": "Idő",
+    "name-time": "",
     "name-unique-labels": "Egyedi címkék",
     "name-wrap-lines": "Sortörés",
     "order-options": {
@@ -9615,6 +9626,7 @@
       "line-contains": "A hozzáadás sorként szűrőt tartalmaz",
       "line-contains-not": "A hozzáadás sorként nem tartalmaz szűrőt"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Adathivatkozások",
       "aria-label-fields": "Mezők",
@@ -12716,6 +12728,7 @@
     "description-column-filter": "Engedélyezi/letiltja a mezőszűrőket a táblázatban",
     "description-count-rows": "Egyetlen szám megjelenítése az összes adatsorhoz",
     "description-fields": "Válassza ki a kiszámítandó mezőket",
+    "description-frozen-columns": "",
     "description-min-column-width": "Az oszlop automatikus átméretezésének minimális szélessége",
     "name-calculation": "Számítás",
     "name-cell-height": "Cellamagasság",
@@ -12727,6 +12740,7 @@
     "name-count-rows": "Sorok számlálása",
     "name-enable-pagination": "Oldalszámozás engedélyezése",
     "name-fields": "Mezők",
+    "name-frozen-columns": "",
     "name-hide-in-table": "Elrejtés a táblázatban",
     "name-min-column-width": "Minimális oszlopszélesség",
     "name-show-table-footer": "Táblázatlábléc megjelenítése",
diff --git a/public/locales/id-ID/grafana.json b/public/locales/id-ID/grafana.json
index fb6bbc076b8..8a28f512a8a 100644
--- a/public/locales/id-ID/grafana.json
+++ b/public/locales/id-ID/grafana.json
@@ -784,7 +784,7 @@
       },
       "filterBy": "Filter menurut:",
       "too-many-events": {
-        "text": "Periode waktu yang dipilih memiliki terlalu banyak kejadian untuk ditampilkan. Menampilkan 5000 kejadian terbaru. Coba gunakan periode waktu yang lebih singkat.",
+        "text": "",
         "title": "Tidak dapat menampilkan semua kejadian"
       }
     },
@@ -5213,6 +5213,7 @@
         "new": "Tab baru",
         "repeat": {
           "learn-more": "Pelajari lebih lanjut",
+          "loading": "",
           "warning": "Panel di tab ini menggunakan sumber data {{SHARED_DASHBOARD_QUERY}}. Panel-panel ini akan mereferensikan panel di tab asli, bukan yang ada di tab berulang."
         }
       },
@@ -9512,6 +9513,12 @@
         "total-bytes-processed": "Total bita yang diproses"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Deduplikasi",
       "disable-highlighting": "Nonaktifkan penyorotan",
@@ -9535,8 +9542,12 @@
       "oldest-first": "Diurutkan berdasarkan log paling lama lebih dulu - Klik untuk menampilkan yang terbaru lebih dulu",
       "prettify-json": "Perluas log JSON",
       "remove-escaping": "Hapus escape",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Gulir ke bawah",
       "scroll-top": "Gulir ke atas",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "Cari di hasil log",
       "show-timestamps": "Tampilkan stempel waktu",
       "show-unique-labels": "Tampilkan label unik",
@@ -9569,7 +9580,7 @@
     "name-order": "Urutan",
     "name-prettify-json": "Rapikan JSON",
     "name-show-controls": "Tampilkan kontrol",
-    "name-time": "Waktu",
+    "name-time": "",
     "name-unique-labels": "Label unik",
     "name-wrap-lines": "Bungkus baris",
     "order-options": {
@@ -9585,6 +9596,7 @@
       "line-contains": "Tambahkan sebagai baris berisi filter",
       "line-contains-not": "Tambahkan sebagai baris tidak berisi filter"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Tautan data",
       "aria-label-fields": "Bidang",
@@ -12674,6 +12686,7 @@
     "description-column-filter": "Mengaktifkan/menonaktifkan filter bidang di tabel",
     "description-count-rows": "Tampilkan satu hitungan untuk semua baris data",
     "description-fields": "Pilih bidang yang harus dihitung",
+    "description-frozen-columns": "",
     "description-min-column-width": "Lebar minimum untuk perubahan ukuran kolom otomatis",
     "name-calculation": "Perhitungan",
     "name-cell-height": "Tinggi sel",
@@ -12685,6 +12698,7 @@
     "name-count-rows": "Hitung baris",
     "name-enable-pagination": "Aktifkan paginasi",
     "name-fields": "Bidang",
+    "name-frozen-columns": "",
     "name-hide-in-table": "Sembunyikan di tabel",
     "name-min-column-width": "Lebar kolom minimum",
     "name-show-table-footer": "Tampilkan footer tabel",
diff --git a/public/locales/it-IT/grafana.json b/public/locales/it-IT/grafana.json
index d3be0e4f180..5f7afb75cfc 100644
--- a/public/locales/it-IT/grafana.json
+++ b/public/locales/it-IT/grafana.json
@@ -788,7 +788,7 @@
       },
       "filterBy": "Filtra per:",
       "too-many-events": {
-        "text": "Il periodo di tempo selezionato ha troppi eventi da visualizzare. Visualizzazione degli ultimi 5000 eventi. Prova a utilizzare un periodo di tempo più breve.",
+        "text": "",
         "title": "Impossibile visualizzare tutti gli eventi"
       }
     },
@@ -5233,6 +5233,7 @@
         "new": "Nuova scheda",
         "repeat": {
           "learn-more": "Scopri di più",
+          "loading": "",
           "warning": "I pannelli in questa scheda utilizzano l'origine dei dati {{SHARED_DASHBOARD_QUERY}}. Questi pannelli faranno riferimento al pannello nella scheda originale, non a quelli nelle schede ripetute."
         }
       },
@@ -9542,6 +9543,12 @@
         "total-bytes-processed": ""
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Deduplicazione",
       "disable-highlighting": "Disabilita evidenziazione",
@@ -9565,8 +9572,12 @@
       "oldest-first": "Ordine: prima i registri meno recenti - Fai clic per mostrare prima i più recenti",
       "prettify-json": "Ingrandisci i registri JSON",
       "remove-escaping": "Rimuovi escaping",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Scorri verso il basso",
       "scroll-top": "Scorri verso l'alto",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "",
       "show-timestamps": "Mostra marca temporale",
       "show-unique-labels": "Mostra etichette univoche",
@@ -9615,6 +9626,7 @@
       "line-contains": "Aggiungi come riga contenente filtro",
       "line-contains-not": "Aggiungi come riga non contenente filtro"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Collegamenti dati",
       "aria-label-fields": "Campi",
@@ -12716,6 +12728,7 @@
     "description-column-filter": "",
     "description-count-rows": "",
     "description-fields": "",
+    "description-frozen-columns": "",
     "description-min-column-width": "",
     "name-calculation": "",
     "name-cell-height": "",
@@ -12727,6 +12740,7 @@
     "name-count-rows": "",
     "name-enable-pagination": "",
     "name-fields": "",
+    "name-frozen-columns": "",
     "name-hide-in-table": "",
     "name-min-column-width": "",
     "name-show-table-footer": "",
diff --git a/public/locales/ja-JP/grafana.json b/public/locales/ja-JP/grafana.json
index 81fb4eeeefc..6920e43b39a 100644
--- a/public/locales/ja-JP/grafana.json
+++ b/public/locales/ja-JP/grafana.json
@@ -784,7 +784,7 @@
       },
       "filterBy": "フィルタ条件：",
       "too-many-events": {
-        "text": "選択した期間には、表示するイベントが多すぎます。最新の5000イベントを表示します。もっと短い期間を使ってみてください。",
+        "text": "",
         "title": "すべてのイベントを表示できません"
       }
     },
@@ -5213,6 +5213,7 @@
         "new": "新しいタブ",
         "repeat": {
           "learn-more": "もっと詳しく",
+          "loading": "",
           "warning": "このタブのパネルは{{SHARED_DASHBOARD_QUERY}}データソースを使用しています。これらのパネルは、繰り返されたタブ内のパネルではなく、元のタブのパネルを参照します。"
         }
       },
@@ -9512,6 +9513,12 @@
         "total-bytes-processed": "処理済み総バイト数"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "重複排除",
       "disable-highlighting": "ハイライトを無効にする",
@@ -9535,8 +9542,12 @@
       "oldest-first": "古いログ順に並び替え - クリックして最新のログを最初に表示",
       "prettify-json": "JSONログを展開",
       "remove-escaping": "エスケープを削除",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "一番下までスクロール",
       "scroll-top": "一番上までスクロール",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "ログ結果内を検索",
       "show-timestamps": "タイムスタンプを表示",
       "show-unique-labels": "一意のラベルを表示",
@@ -9569,7 +9580,7 @@
     "name-order": "順番",
     "name-prettify-json": "JSONを整形",
     "name-show-controls": "コントロールを表示",
-    "name-time": "時間",
+    "name-time": "",
     "name-unique-labels": "一意のラベル",
     "name-wrap-lines": "行を折り返す",
     "order-options": {
@@ -9585,6 +9596,7 @@
       "line-contains": "行にフィルタが含まれている場合はフィルタとして追加",
       "line-contains-not": "フィルタが含まれていない行として追加"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "データリンク",
       "aria-label-fields": "フィールド",
@@ -12674,6 +12686,7 @@
     "description-column-filter": "テーブルのフィールドフィルターを有効/無効化",
     "description-count-rows": "すべてのデータ行の単一カウントを表示",
     "description-fields": "計算するフィールドを選択",
+    "description-frozen-columns": "",
     "description-min-column-width": "列の自動サイズ変更の最小幅",
     "name-calculation": "計算",
     "name-cell-height": "セルの高さ",
@@ -12685,6 +12698,7 @@
     "name-count-rows": "行数",
     "name-enable-pagination": "ページ分割を有効化",
     "name-fields": "フィールド",
+    "name-frozen-columns": "",
     "name-hide-in-table": "テーブルで非表示",
     "name-min-column-width": "最小列幅",
     "name-show-table-footer": "テーブルフッターを表示",
diff --git a/public/locales/ko-KR/grafana.json b/public/locales/ko-KR/grafana.json
index d4bfb796944..2000fc6489a 100644
--- a/public/locales/ko-KR/grafana.json
+++ b/public/locales/ko-KR/grafana.json
@@ -784,7 +784,7 @@
       },
       "filterBy": "필터링 기준:",
       "too-many-events": {
-        "text": "선택한 기간에 표시할 이벤트가 너무 많습니다. 최신 기준 5,000개의 이벤트를 표시합니다. 더 짧은 기간을 사용해 보세요.",
+        "text": "",
         "title": "모든 이벤트 표시 불가"
       }
     },
@@ -5213,6 +5213,7 @@
         "new": "새 탭",
         "repeat": {
           "learn-more": "자세히 알아보기",
+          "loading": "",
           "warning": "이 탭의 패널은 {{SHARED_DASHBOARD_QUERY}} 데이터 소스를 사용합니다. 이러한 패널은 반복된 탭이 아닌 원래 탭의 패널을 참조합니다."
         }
       },
@@ -9512,6 +9513,12 @@
         "total-bytes-processed": "처리된 총 바이트"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "중복 제거",
       "disable-highlighting": "강조 표시 비활성화",
@@ -9535,8 +9542,12 @@
       "oldest-first": "오래된 로그순으로 정렬 - 클릭하여 최신 로그순으로 표시",
       "prettify-json": "JSON 로그 펼치기",
       "remove-escaping": "이스케이프 제거",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "맨 아래로 스크롤",
       "scroll-top": "맨 위로 스크롤",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "",
       "show-timestamps": "타임스탬프 표시",
       "show-unique-labels": "고유 라벨 표시",
@@ -9585,6 +9596,7 @@
       "line-contains": "라인에 포함 필터로 추가",
       "line-contains-not": "라인에 미포함 필터로 추가"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "데이터 링크",
       "aria-label-fields": "필드",
@@ -12674,6 +12686,7 @@
     "description-column-filter": "",
     "description-count-rows": "",
     "description-fields": "",
+    "description-frozen-columns": "",
     "description-min-column-width": "",
     "name-calculation": "",
     "name-cell-height": "",
@@ -12685,6 +12698,7 @@
     "name-count-rows": "",
     "name-enable-pagination": "",
     "name-fields": "",
+    "name-frozen-columns": "",
     "name-hide-in-table": "",
     "name-min-column-width": "",
     "name-show-table-footer": "",
diff --git a/public/locales/nl-NL/grafana.json b/public/locales/nl-NL/grafana.json
index 59ace6534f7..493cbe1b05f 100644
--- a/public/locales/nl-NL/grafana.json
+++ b/public/locales/nl-NL/grafana.json
@@ -788,7 +788,7 @@
       },
       "filterBy": "Filteren op:",
       "too-many-events": {
-        "text": "De geselecteerde tijdsperiode heeft te veel gebeurtenissen om weer te geven. Weergave van de laatste 5000 evenementen. Probeer een kortere periode te gebruiken.",
+        "text": "",
         "title": "Kan niet alle gebeurtenissen weergeven"
       }
     },
@@ -5233,6 +5233,7 @@
         "new": "Nieuw tabblad",
         "repeat": {
           "learn-more": "Meer informatie",
+          "loading": "",
           "warning": "Panelen in dit tabblad gebruiken de gegevensbron van{{SHARED_DASHBOARD_QUERY}}. Deze panelen verwijzen naar het paneel in het oorspronkelijke tabblad, niet naar die in de herhaalde tabbladen."
         }
       },
@@ -9542,6 +9543,12 @@
         "total-bytes-processed": "Totaal aantal verwerkte bytes"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Dedupliceren",
       "disable-highlighting": "Markeren uitschakelen",
@@ -9565,8 +9572,12 @@
       "oldest-first": "Gesorteerd op oudste logboeken eerst - klik om nieuwste eerst weer te geven",
       "prettify-json": "JSON-logs uitvouwen",
       "remove-escaping": "Escaping verwijderen",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Naar beneden scrollen",
       "scroll-top": "Naar boven scrollen",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "Zoeken in logresultaten",
       "show-timestamps": "Tijdstempels weergeven",
       "show-unique-labels": "Unieke labels weergeven",
@@ -9599,7 +9610,7 @@
     "name-order": "Orde",
     "name-prettify-json": "JSON verfraaien",
     "name-show-controls": "Bedieningselementen tonen",
-    "name-time": "Tijd",
+    "name-time": "",
     "name-unique-labels": "Unieke labels",
     "name-wrap-lines": "Lijnen omsluiten",
     "order-options": {
@@ -9615,6 +9626,7 @@
       "line-contains": "Toevoegen als regel filter bevat",
       "line-contains-not": "Toevoegen als regel geen filter bevat"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Gegevenslinks",
       "aria-label-fields": "Velden",
@@ -12716,6 +12728,7 @@
     "description-column-filter": "Schakelt veldfilters in tabel in/uit",
     "description-count-rows": "Een enkele telling weergeven voor alle gegevensrijen",
     "description-fields": "Selecteer de velden die moeten worden berekend",
+    "description-frozen-columns": "",
     "description-min-column-width": "De minimale breedte voor het automatisch aanpassen van de kolomgrootte",
     "name-calculation": "Berekening",
     "name-cell-height": "Celhoogte",
@@ -12727,6 +12740,7 @@
     "name-count-rows": "Rijen tellen",
     "name-enable-pagination": "Paginering inschakelen",
     "name-fields": "Velden",
+    "name-frozen-columns": "",
     "name-hide-in-table": "In tabel verbergen",
     "name-min-column-width": "Minimale kolombreedte",
     "name-show-table-footer": "Voettekst tabel tonen",
diff --git a/public/locales/pl-PL/grafana.json b/public/locales/pl-PL/grafana.json
index 03545911c0d..ab1ca2aad14 100644
--- a/public/locales/pl-PL/grafana.json
+++ b/public/locales/pl-PL/grafana.json
@@ -796,7 +796,7 @@
       },
       "filterBy": "Filtruj wg:",
       "too-many-events": {
-        "text": "Zbyt wiele zdarzeń do wyświetlenia w wybranym okresie. Wyświetlanie ostatnich 5000 zdarzeń. Spróbuj użyć krótszego okresu.",
+        "text": "",
         "title": "Nie można wyświetlić wszystkich zdarzeń"
       }
     },
@@ -5273,6 +5273,7 @@
         "new": "Nowa karta",
         "repeat": {
           "learn-more": "Dowiedz się więcej",
+          "loading": "",
           "warning": "Panele na tej karcie korzystają ze źródła danych {{SHARED_DASHBOARD_QUERY}}. Panele te będą odwoływać się do panelu na oryginalnej karcie, a nie do tych na powtórzonych kartach."
         }
       },
@@ -9602,6 +9603,12 @@
         "total-bytes-processed": "Łączna liczba przetworzonych bajtów"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Deduplikacja",
       "disable-highlighting": "Wyłącz wyróżnianie",
@@ -9625,8 +9632,12 @@
       "oldest-first": "Sortowanie od najstarszych wpisów dziennika – kliknij, aby wyświetlić najpierw najnowsze",
       "prettify-json": "Rozwiń logi JSON",
       "remove-escaping": "Usuń znaki unikowe",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Przewiń w dół",
       "scroll-top": "Przewiń w górę",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "",
       "show-timestamps": "Pokaż znaczniki czasu",
       "show-unique-labels": "Pokaż unikalne etykiety",
@@ -9675,6 +9686,7 @@
       "line-contains": "Dodaj jako wiersz zawierający filtr",
       "line-contains-not": "Dodaj jako wiersz nie zawierający filtra"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Połączenia danych",
       "aria-label-fields": "Pola",
@@ -12800,6 +12812,7 @@
     "description-column-filter": "",
     "description-count-rows": "",
     "description-fields": "",
+    "description-frozen-columns": "",
     "description-min-column-width": "",
     "name-calculation": "",
     "name-cell-height": "",
@@ -12811,6 +12824,7 @@
     "name-count-rows": "",
     "name-enable-pagination": "",
     "name-fields": "",
+    "name-frozen-columns": "",
     "name-hide-in-table": "",
     "name-min-column-width": "",
     "name-show-table-footer": "",
diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json
index ca54a66c741..b5763fbf26b 100644
--- a/public/locales/pt-BR/grafana.json
+++ b/public/locales/pt-BR/grafana.json
@@ -788,7 +788,7 @@
       },
       "filterBy": "Filtrar por:",
       "too-many-events": {
-        "text": "O período selecionado tem eventos demais para exibir. Exibindo os últimos 5.000 eventos. Tente usar um período mais curto.",
+        "text": "",
         "title": "Não é possível exibir todos os eventos"
       }
     },
@@ -5233,6 +5233,7 @@
         "new": "Nova aba",
         "repeat": {
           "learn-more": "Saiba mais",
+          "loading": "",
           "warning": "Os painéis nesta aba usam a fonte de dados {{SHARED_DASHBOARD_QUERY}}. Esses painéis farão referência ao painel na aba original, não aos painéis nas abas repetidas."
         }
       },
@@ -9542,6 +9543,12 @@
         "total-bytes-processed": "Total de bytes processados"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Desduplicação",
       "disable-highlighting": "Desativar destaque",
@@ -9565,8 +9572,12 @@
       "oldest-first": "Organizado por logs mais antigos primeiro: clique para exibir os mais recentes primeiro",
       "prettify-json": "Expandir logs JSON",
       "remove-escaping": "Remover escape",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Rolar para baixo",
       "scroll-top": "Rolar para cima",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "",
       "show-timestamps": "Exibir data e hora",
       "show-unique-labels": "Exibir rótulos únicos",
@@ -9615,6 +9626,7 @@
       "line-contains": "Adicionar como linha contém filtro",
       "line-contains-not": "Adicionar como linha não contém filtro"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Links de dados",
       "aria-label-fields": "Campos",
@@ -12716,6 +12728,7 @@
     "description-column-filter": "",
     "description-count-rows": "",
     "description-fields": "",
+    "description-frozen-columns": "",
     "description-min-column-width": "",
     "name-calculation": "",
     "name-cell-height": "",
@@ -12727,6 +12740,7 @@
     "name-count-rows": "",
     "name-enable-pagination": "",
     "name-fields": "",
+    "name-frozen-columns": "",
     "name-hide-in-table": "",
     "name-min-column-width": "",
     "name-show-table-footer": "",
diff --git a/public/locales/pt-PT/grafana.json b/public/locales/pt-PT/grafana.json
index 70de3d510b4..93d62ffb1f1 100644
--- a/public/locales/pt-PT/grafana.json
+++ b/public/locales/pt-PT/grafana.json
@@ -788,7 +788,7 @@
       },
       "filterBy": "Filtrar por:",
       "too-many-events": {
-        "text": "O período selecionado tem demasiados eventos para exibir. A exibir os últimos 5000 eventos. Tente utilizar um período mais curto.",
+        "text": "",
         "title": "Não é possível exibir todos os eventos"
       }
     },
@@ -5233,6 +5233,7 @@
         "new": "Novo separador",
         "repeat": {
           "learn-more": "Saiba mais",
+          "loading": "",
           "warning": "Os painéis neste separador utilizam a origem de dados {{SHARED_DASHBOARD_QUERY}}. Estes painéis irão referenciar o painel no separador original, não os dos separadores repetidos."
         }
       },
@@ -9542,6 +9543,12 @@
         "total-bytes-processed": "Total de bytes processados"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Desduplicação",
       "disable-highlighting": "Desativar destaque",
@@ -9565,8 +9572,12 @@
       "oldest-first": "Ordenado por registos mais antigos primeiro - Clique para mostrar os mais recentes primeiro",
       "prettify-json": "Expandir registos JSON",
       "remove-escaping": "Remover a opção de ignorar",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Rolar para baixo",
       "scroll-top": "Rolar para o topo",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "",
       "show-timestamps": "Mostrar registos de data e hora",
       "show-unique-labels": "Mostrar etiquetas únicas",
@@ -9615,6 +9626,7 @@
       "line-contains": "Adicionar, pois a linha contém filtro",
       "line-contains-not": "Adicionar, pois a linha não contém filtro"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Ligações de dados",
       "aria-label-fields": "Campos",
@@ -12716,6 +12728,7 @@
     "description-column-filter": "",
     "description-count-rows": "",
     "description-fields": "",
+    "description-frozen-columns": "",
     "description-min-column-width": "",
     "name-calculation": "",
     "name-cell-height": "",
@@ -12727,6 +12740,7 @@
     "name-count-rows": "",
     "name-enable-pagination": "",
     "name-fields": "",
+    "name-frozen-columns": "",
     "name-hide-in-table": "",
     "name-min-column-width": "",
     "name-show-table-footer": "",
diff --git a/public/locales/ru-RU/grafana.json b/public/locales/ru-RU/grafana.json
index 79b65bfbaa0..9ab69a1fb0c 100644
--- a/public/locales/ru-RU/grafana.json
+++ b/public/locales/ru-RU/grafana.json
@@ -796,7 +796,7 @@
       },
       "filterBy": "Фильтр по:",
       "too-many-events": {
-        "text": "Выбранный период времени содержит слишком много событий для отображения. Отображаются последние 5000 событий. Попробуйте использовать более короткий период времени.",
+        "text": "",
         "title": "Невозможно отобразить все события"
       }
     },
@@ -5273,6 +5273,7 @@
         "new": "Новая вкладка",
         "repeat": {
           "learn-more": "Подробнее",
+          "loading": "",
           "warning": "Панели на этой вкладке используют источник данных {{SHARED_DASHBOARD_QUERY}}. Эти панели будут ссылаться на панель на исходной вкладке, а не на панели в повторяющихся вкладках."
         }
       },
@@ -9602,6 +9603,12 @@
         "total-bytes-processed": "Всего обработано байтов"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Дедупликация",
       "disable-highlighting": "Отключить выделение",
@@ -9625,8 +9632,12 @@
       "oldest-first": "Сначала отображаются самые старые журналы. Нажмите, чтобы показать сначала самые новые",
       "prettify-json": "Развернуть журналы JSON",
       "remove-escaping": "Удалить экранирование",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Прокрутить вниз",
       "scroll-top": "Прокрутить вверх",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "",
       "show-timestamps": "Показать метки времени",
       "show-unique-labels": "Показать уникальные метки",
@@ -9675,6 +9686,7 @@
       "line-contains": "Добавить, поскольку строка содержит фильтр",
       "line-contains-not": "Добавить, поскольку строка не содержит фильтр"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Ссылки на данные",
       "aria-label-fields": "Поля",
@@ -12800,6 +12812,7 @@
     "description-column-filter": "",
     "description-count-rows": "",
     "description-fields": "",
+    "description-frozen-columns": "",
     "description-min-column-width": "",
     "name-calculation": "",
     "name-cell-height": "",
@@ -12811,6 +12824,7 @@
     "name-count-rows": "",
     "name-enable-pagination": "",
     "name-fields": "",
+    "name-frozen-columns": "",
     "name-hide-in-table": "",
     "name-min-column-width": "",
     "name-show-table-footer": "",
diff --git a/public/locales/sv-SE/grafana.json b/public/locales/sv-SE/grafana.json
index 96bd984aa3d..617594cca3e 100644
--- a/public/locales/sv-SE/grafana.json
+++ b/public/locales/sv-SE/grafana.json
@@ -788,7 +788,7 @@
       },
       "filterBy": "Filtrera efter: ",
       "too-many-events": {
-        "text": "Den valda tidsperioden har för många händelser att visa. Visar de senaste 5 000 händelserna. Prova att använda en kortare tidsperiod.",
+        "text": "",
         "title": "Det gick inte att visa alla händelser"
       }
     },
@@ -5233,6 +5233,7 @@
         "new": "Ny flik",
         "repeat": {
           "learn-more": "Läs mer",
+          "loading": "",
           "warning": "Paneler i denna flik använder datakällan {{SHARED_DASHBOARD_QUERY}}. Dessa paneler kommer att referera till panelen i den ursprungliga fliken, inte de i de upprepade flikerna."
         }
       },
@@ -9542,6 +9543,12 @@
         "total-bytes-processed": "Totalt antal byte som behandlats"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Avduplicering",
       "disable-highlighting": "Inaktivera markering",
@@ -9565,8 +9572,12 @@
       "oldest-first": "Sorterat efter äldsta loggar först – klicka om du vill visa nyaste först",
       "prettify-json": "Expandera JSON-loggar",
       "remove-escaping": "Ta bort undantagstecken",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "Skrolla längst ner",
       "scroll-top": "Skrolla till toppen",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "",
       "show-timestamps": "Visa tidsstämplar",
       "show-unique-labels": "Visa unika etiketter",
@@ -9615,6 +9626,7 @@
       "line-contains": "Lägg till som rad innehåller filter",
       "line-contains-not": "Lägg till som rad innehåller inte filter"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Datalänkar",
       "aria-label-fields": "Fält",
@@ -12716,6 +12728,7 @@
     "description-column-filter": "",
     "description-count-rows": "",
     "description-fields": "",
+    "description-frozen-columns": "",
     "description-min-column-width": "",
     "name-calculation": "",
     "name-cell-height": "",
@@ -12727,6 +12740,7 @@
     "name-count-rows": "",
     "name-enable-pagination": "",
     "name-fields": "",
+    "name-frozen-columns": "",
     "name-hide-in-table": "",
     "name-min-column-width": "",
     "name-show-table-footer": "",
diff --git a/public/locales/tr-TR/grafana.json b/public/locales/tr-TR/grafana.json
index a5dfca6d021..b349f3a97f1 100644
--- a/public/locales/tr-TR/grafana.json
+++ b/public/locales/tr-TR/grafana.json
@@ -788,7 +788,7 @@
       },
       "filterBy": "Filtre ölçütü:",
       "too-many-events": {
-        "text": "Seçilen zaman diliminde görüntülenecek çok fazla etkinlik var. En son 5000 etkinlik görüntüleniyor. Daha kısa bir süre kullanmayı deneyin.",
+        "text": "",
         "title": "Tüm etkinlikler görüntülenemiyor"
       }
     },
@@ -5233,6 +5233,7 @@
         "new": "Yeni sekme",
         "repeat": {
           "learn-more": "Daha fazla bilgi edinin",
+          "loading": "",
           "warning": "Bu sekmedeki paneller {{SHARED_DASHBOARD_QUERY}} veri kaynağını kullanır. Bu paneller tekrarlanan sekmelerdeki panelleri değil, orijinal sekmedeki paneli referans alacaktır."
         }
       },
@@ -9542,6 +9543,12 @@
         "total-bytes-processed": "İşlenen toplam bayt"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "Yinelenenleri kaldırma",
       "disable-highlighting": "Vurgulamayı devre dışı bırak",
@@ -9565,8 +9572,12 @@
       "oldest-first": "Günlükler eskiden yeniye sıralandı: En yenileri göstermek için tıklayın",
       "prettify-json": "JSON günlük kayıtlarını genişlet",
       "remove-escaping": "Kaçış karakterini kaldır",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "En alta kaydır",
       "scroll-top": "En üste kaydır",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "",
       "show-timestamps": "Zaman damgalarını göster",
       "show-unique-labels": "Benzersiz etiketleri göster",
@@ -9615,6 +9626,7 @@
       "line-contains": "Satır içerir filtresi olarak ekle",
       "line-contains-not": "Satır içermez filtresi olarak ekle"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "Veri bağlantıları",
       "aria-label-fields": "Alanlar",
@@ -12716,6 +12728,7 @@
     "description-column-filter": "",
     "description-count-rows": "",
     "description-fields": "",
+    "description-frozen-columns": "",
     "description-min-column-width": "",
     "name-calculation": "",
     "name-cell-height": "",
@@ -12727,6 +12740,7 @@
     "name-count-rows": "",
     "name-enable-pagination": "",
     "name-fields": "",
+    "name-frozen-columns": "",
     "name-hide-in-table": "",
     "name-min-column-width": "",
     "name-show-table-footer": "",
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 3e2faa32a22..9b47775d336 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -784,7 +784,7 @@
       },
       "filterBy": "筛选方式：",
       "too-many-events": {
-        "text": "所选时间段的事件过多，无法显示。正在显示最近的 5000 个事件。请尝试缩短时间段。",
+        "text": "",
         "title": "无法显示所有事件"
       }
     },
@@ -5213,6 +5213,7 @@
         "new": "新建标签页",
         "repeat": {
           "learn-more": "了解更多",
+          "loading": "",
           "warning": "此选项卡中的面板使用 {{SHARED_DASHBOARD_QUERY}} 数据源。这些面板将引用原始选项卡中的面板，而不是重复选项卡中的面板。"
         }
       },
@@ -9512,6 +9513,12 @@
         "total-bytes-processed": "已处理的总字节数"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "去重",
       "disable-highlighting": "禁用突出显示",
@@ -9535,8 +9542,12 @@
       "oldest-first": "先显示最旧日志 - 点击以先显示最新日志",
       "prettify-json": "展开 JSON 日志",
       "remove-escaping": "移除转义",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "滚动到底部",
       "scroll-top": "滚动到顶部",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "在日志结果中搜索",
       "show-timestamps": "显示时间戳",
       "show-unique-labels": "显示唯一标签",
@@ -9569,7 +9580,7 @@
     "name-order": "顺序",
     "name-prettify-json": "美化 JSON",
     "name-show-controls": "显示控件",
-    "name-time": "时间",
+    "name-time": "",
     "name-unique-labels": "唯一标签",
     "name-wrap-lines": "多行显示",
     "order-options": {
@@ -9585,6 +9596,7 @@
       "line-contains": "添加为包含筛选器的行",
       "line-contains-not": "添加为不包含筛选器的行"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "数据关联",
       "aria-label-fields": "字段",
@@ -12674,6 +12686,7 @@
     "description-column-filter": "启用/禁用表格中的字段筛选条件",
     "description-count-rows": "显示所有数据行的单个计数",
     "description-fields": "选择应计算的字段",
+    "description-frozen-columns": "",
     "description-min-column-width": "列自动调整大小的最小宽度",
     "name-calculation": "计算",
     "name-cell-height": "单元格高度",
@@ -12685,6 +12698,7 @@
     "name-count-rows": "计算行",
     "name-enable-pagination": "启用分页",
     "name-fields": "字段",
+    "name-frozen-columns": "",
     "name-hide-in-table": "在表格中隐藏",
     "name-min-column-width": "最小列宽",
     "name-show-table-footer": "显示表格页脚",
diff --git a/public/locales/zh-Hant/grafana.json b/public/locales/zh-Hant/grafana.json
index 27486937ac0..b72aa60c9c8 100644
--- a/public/locales/zh-Hant/grafana.json
+++ b/public/locales/zh-Hant/grafana.json
@@ -784,7 +784,7 @@
       },
       "filterBy": "篩選條件：",
       "too-many-events": {
-        "text": "所選時間段內的事件過多，無法顯示。顯示最近 5000 個事件。請嘗試使用較短的時間段。",
+        "text": "",
         "title": "無法顯示所有事件"
       }
     },
@@ -5213,6 +5213,7 @@
         "new": "新分頁",
         "repeat": {
           "learn-more": "了解更多資訊",
+          "loading": "",
           "warning": "此分頁中的面板使用 {{SHARED_DASHBOARD_QUERY}} 資料來源。這些面板將參考原始分頁中的面板，而不是重複分頁中的面板。"
         }
       },
@@ -9512,6 +9513,12 @@
         "total-bytes-processed": "已處理的總位元組數"
       }
     },
+    "logs": {
+      "timestamp-resolution": {
+        "label-milliseconds": "",
+        "label-nanoseconds": ""
+      }
+    },
     "logs-controls": {
       "deduplication": "重複資料",
       "disable-highlighting": "停用醒目提示",
@@ -9535,8 +9542,12 @@
       "oldest-first": "按最舊紀錄排序 - 按一下以顯示最新紀錄",
       "prettify-json": "展開 JSON 紀錄",
       "remove-escaping": "移除轉義",
+      "resolution-ms": "",
+      "resolution-ns": "",
       "scroll-bottom": "滾動到底部",
       "scroll-top": "捲動回頂部",
+      "show-ms-timestamps": "",
+      "show-ns-timestamps": "",
       "show-search": "在紀錄結果中搜尋",
       "show-timestamps": "顯示時間戳記",
       "show-unique-labels": "顯示唯一標籤",
@@ -9569,7 +9580,7 @@
     "name-order": "順序",
     "name-prettify-json": "美化 JSON",
     "name-show-controls": "顯示控制項",
-    "name-time": "時間",
+    "name-time": "",
     "name-unique-labels": "唯一標籤",
     "name-wrap-lines": "換行",
     "order-options": {
@@ -9585,6 +9596,7 @@
       "line-contains": "新增為包含篩選條件的行",
       "line-contains-not": "新增為不包含篩選條件的行"
     },
+    "timestamp-format": "",
     "un-themed-log-details": {
       "aria-label-data-links": "資料連結",
       "aria-label-fields": "欄位",
@@ -12674,6 +12686,7 @@
     "description-column-filter": "啟用/停用表格中的欄位篩選條件",
     "description-count-rows": "顯示所有資料列的單一計數",
     "description-fields": "選擇應計算的欄位",
+    "description-frozen-columns": "",
     "description-min-column-width": "欄自動調整大小的最小寬度",
     "name-calculation": "計算",
     "name-cell-height": "儲存格高度",
@@ -12685,6 +12698,7 @@
     "name-count-rows": "計數列",
     "name-enable-pagination": "啟用分頁",
     "name-fields": "欄位",
+    "name-frozen-columns": "",
     "name-hide-in-table": "在表格中隱藏",
     "name-min-column-width": "最小欄寬",
     "name-show-table-footer": "顯示表格頁尾",

From 58c4305d64a8e1d33d4f10f0cb2e4e2c318c2fac Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Mon, 11 Aug 2025 09:54:36 +0100
Subject: [PATCH 069/243] Access: Feature toggle for resource permissions
 (#109418)

feature toggle for resource permissions
---
 .../grafana-data/src/types/featureToggles.gen.ts   |  4 ++++
 pkg/services/featuremgmt/registry.go               |  8 ++++++++
 pkg/services/featuremgmt/toggles_gen.csv           |  1 +
 pkg/services/featuremgmt/toggles_gen.go            |  4 ++++
 pkg/services/featuremgmt/toggles_gen.json          | 14 ++++++++++++++
 5 files changed, 31 insertions(+)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 68b70a37ed5..977ecadda45 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -988,6 +988,10 @@ export interface FeatureToggles {
   */
   kubernetesAuthzApis?: boolean;
   /**
+  * Registers AuthZ resource permission /apis endpoints
+  */
+  kubernetesAuthzResourcePermissionApis?: boolean;
+  /**
   * Enables create, delete, and update mutations for resources owned by IAM identity
   */
   kubernetesAuthnMutation?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 93ce87ecfbc..58b874aaa54 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -1705,6 +1705,14 @@ var (
 			HideFromAdminPage: true,
 			HideFromDocs:      true,
 		},
+		{
+			Name:              "kubernetesAuthzResourcePermissionApis",
+			Description:       "Registers AuthZ resource permission /apis endpoints",
+			Stage:             FeatureStageExperimental,
+			Owner:             identityAccessTeam,
+			HideFromAdminPage: true,
+			HideFromDocs:      true,
+		},
 		{
 			Name:              "kubernetesAuthnMutation",
 			Description:       "Enables create, delete, and update mutations for resources owned by IAM identity",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index c6bae7b1a40..382137df4e0 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -222,6 +222,7 @@ alertingListViewV2PreviewToggle,privatePreview,@grafana/alerting-squad,false,fal
 alertRuleUseFiredAtForStartsAt,experimental,@grafana/alerting-squad,false,false,false
 alertingBulkActionsInUI,GA,@grafana/alerting-squad,false,false,true
 kubernetesAuthzApis,experimental,@grafana/identity-access-team,false,false,false
+kubernetesAuthzResourcePermissionApis,experimental,@grafana/identity-access-team,false,false,false
 kubernetesAuthnMutation,experimental,@grafana/identity-access-team,false,false,false
 restoreDashboards,experimental,@grafana/grafana-frontend-platform,false,false,false
 skipTokenRotationIfRecent,GA,@grafana/identity-access-team,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index f0e6d5585d8..cde2bae2dbf 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -899,6 +899,10 @@ const (
 	// Registers AuthZ /apis endpoint
 	FlagKubernetesAuthzApis = "kubernetesAuthzApis"
 
+	// FlagKubernetesAuthzResourcePermissionApis
+	// Registers AuthZ resource permission /apis endpoints
+	FlagKubernetesAuthzResourcePermissionApis = "kubernetesAuthzResourcePermissionApis"
+
 	// FlagKubernetesAuthnMutation
 	// Enables create, delete, and update mutations for resources owned by IAM identity
 	FlagKubernetesAuthnMutation = "kubernetesAuthnMutation"
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 575701a2971..a68e0239c7f 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -1755,6 +1755,20 @@
         "hideFromDocs": true
       }
     },
+    {
+      "metadata": {
+        "name": "kubernetesAuthzResourcePermissionApis",
+        "resourceVersion": "1754668670559",
+        "creationTimestamp": "2025-08-08T15:57:50Z"
+      },
+      "spec": {
+        "description": "Registers AuthZ resource permission /apis endpoints",
+        "stage": "experimental",
+        "codeowner": "@grafana/identity-access-team",
+        "hideFromAdminPage": true,
+        "hideFromDocs": true
+      }
+    },
     {
       "metadata": {
         "name": "kubernetesDashboards",

From 63bab8076ddb1d9ca565b250515be35a23e0c314 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Mon, 11 Aug 2025 11:55:19 +0200
Subject: [PATCH 070/243] Dashboards Migrations: V24 set defaults when no
 thresholds are defined (#109402)

---
 .../pkg/migration/schemaversion/v24.go        | 22 +++++++++----------
 .../output/v22.table_panel_align.json         | 14 +++++++++++-
 .../state/DashboardMigratorToBackend.test.ts  |  2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/apps/dashboard/pkg/migration/schemaversion/v24.go b/apps/dashboard/pkg/migration/schemaversion/v24.go
index 15807d54697..542938351f6 100644
--- a/apps/dashboard/pkg/migration/schemaversion/v24.go
+++ b/apps/dashboard/pkg/migration/schemaversion/v24.go
@@ -514,23 +514,23 @@ func migrateDefaults(prevDefaults map[string]interface{}) map[string]interface{}
 		"mappings": []interface{}{},
 	}
 
-	// Only add default thresholds if we have prevDefaults (meaning this is a table panel being migrated)
-	// and no specific thresholds exist in prevDefaults
+	// Add default thresholds for all table panels to match frontend behavior
+	// The frontend applies the table panel's default field config which includes thresholds
 	hasThresholds := false
 	if prevDefaults != nil {
 		if thresholds, ok := prevDefaults["thresholds"].([]interface{}); ok && len(thresholds) > 0 {
 			hasThresholds = true
 		}
+	}
 
-		// Only add default thresholds for table panels (when prevDefaults exists) without existing thresholds
-		if !hasThresholds {
-			defaults["thresholds"] = map[string]interface{}{
-				"mode": "absolute",
-				"steps": []interface{}{
-					map[string]interface{}{"color": "green"},
-					map[string]interface{}{"color": "red", "value": 80},
-				},
-			}
+	// Add default thresholds for all table panels (when prevDefaults exists) without existing thresholds
+	if !hasThresholds {
+		defaults["thresholds"] = map[string]interface{}{
+			"mode": "absolute",
+			"steps": []interface{}{
+				map[string]interface{}{"color": "green"},
+				map[string]interface{}{"color": "red", "value": 80},
+			},
 		}
 	}
 
diff --git a/apps/dashboard/pkg/migration/testdata/output/v22.table_panel_align.json b/apps/dashboard/pkg/migration/testdata/output/v22.table_panel_align.json
index cc0ffedf895..56482fefdfa 100644
--- a/apps/dashboard/pkg/migration/testdata/output/v22.table_panel_align.json
+++ b/apps/dashboard/pkg/migration/testdata/output/v22.table_panel_align.json
@@ -15,7 +15,19 @@
             },
             "inspect": false
           },
-          "mappings": []
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
         },
         "overrides": [
           {
diff --git a/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts b/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
index 07ca5cf2849..23cc35596ae 100644
--- a/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
+++ b/public/app/features/dashboard/state/DashboardMigratorToBackend.test.ts
@@ -113,7 +113,7 @@ describe('Backend / Frontend result comparison', () => {
   const jsonInputs = readdirSync(inputDir);
 
   jsonInputs.forEach((inputFile) => {
-    it.skip(`should migrate ${inputFile} correctly`, async () => {
+    it(`should migrate ${inputFile} correctly`, async () => {
       const jsonInput = JSON.parse(readFileSync(path.join(inputDir, inputFile), 'utf8'));
       const backendOutput = JSON.parse(readFileSync(path.join(outputDir, inputFile), 'utf8'));
 

From 1625bc1e4e2c7eaff0d8d6a7d82f0d87d4b4df80 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 10:56:05 +0100
Subject: [PATCH 071/243] Update dependency nx to v21 (#109232)

* Update dependency nx to v21

* auto exit terminal ui

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 nx.json      |   3 +
 package.json |   2 +-
 yarn.lock    | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 216 insertions(+), 5 deletions(-)

diff --git a/nx.json b/nx.json
index e60803eee58..f5f0322645b 100644
--- a/nx.json
+++ b/nx.json
@@ -8,5 +8,8 @@
       "cache": true
     }
   },
+  "tui": {
+    "autoExit": true
+  },
   "defaultBase": "main"
 }
diff --git a/package.json b/package.json
index a901d578992..4946d16793d 100644
--- a/package.json
+++ b/package.json
@@ -223,7 +223,7 @@
     "msw": "2.10.4",
     "mutationobserver-shim": "0.3.7",
     "node-notifier": "10.0.1",
-    "nx": "20.7.1",
+    "nx": "21.3.11",
     "openapi-types": "^12.1.3",
     "pa11y-ci": "^4.0.0",
     "pdf-parse": "^1.1.1",
diff --git a/yarn.lock b/yarn.lock
index 818bdbe01d6..1bafff658bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4168,6 +4168,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jest/diff-sequences@npm:30.0.1":
+  version: 30.0.1
+  resolution: "@jest/diff-sequences@npm:30.0.1"
+  checksum: 10/0ddb7c7ba92d6057a2ee51a9cfc2155b77cca707fe959167466ea02dcb0687018cc3c22b9622f25f3a417d6ad370e2d4dcfedf9f1410dc9c02954a7484423cc7
+  languageName: node
+  linkType: hard
+
 "@jest/environment@npm:^29.7.0":
   version: 29.7.0
   resolution: "@jest/environment@npm:29.7.0"
@@ -4213,6 +4220,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jest/get-type@npm:30.0.1":
+  version: 30.0.1
+  resolution: "@jest/get-type@npm:30.0.1"
+  checksum: 10/bd6cb2fe1661b652f06e5c6f7ef5aa37247a5b4bf04aad8ce6a8a8ba659efaf983bab9d52755be8cf92478f8d894c024de2fbddf4c3f6be804b808a20dfc347b
+  languageName: node
+  linkType: hard
+
 "@jest/globals@npm:^29.7.0":
   version: 29.7.0
   resolution: "@jest/globals@npm:29.7.0"
@@ -4281,6 +4295,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jest/schemas@npm:30.0.5":
+  version: 30.0.5
+  resolution: "@jest/schemas@npm:30.0.5"
+  dependencies:
+    "@sinclair/typebox": "npm:^0.34.0"
+  checksum: 10/40df4db55d4aeed09d1c7e19caf23788309cea34490a1c5d584c913494195e698b9967e996afc27226cac6d76e7512fe73ae6b9584480695c60dd18a5459cdba
+  languageName: node
+  linkType: hard
+
 "@jest/schemas@npm:^29.6.3":
   version: 29.6.3
   resolution: "@jest/schemas@npm:29.6.3"
@@ -5519,6 +5542,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-darwin-arm64@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-darwin-arm64@npm:21.3.11"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@nx/nx-darwin-x64@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-darwin-x64@npm:20.7.1"
@@ -5526,6 +5556,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-darwin-x64@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-darwin-x64@npm:21.3.11"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@nx/nx-freebsd-x64@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-freebsd-x64@npm:20.7.1"
@@ -5533,6 +5570,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-freebsd-x64@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-freebsd-x64@npm:21.3.11"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@nx/nx-linux-arm-gnueabihf@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-arm-gnueabihf@npm:20.7.1"
@@ -5540,6 +5584,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-linux-arm-gnueabihf@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-linux-arm-gnueabihf@npm:21.3.11"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@nx/nx-linux-arm64-gnu@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-arm64-gnu@npm:20.7.1"
@@ -5547,6 +5598,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-linux-arm64-gnu@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-linux-arm64-gnu@npm:21.3.11"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@nx/nx-linux-arm64-musl@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-arm64-musl@npm:20.7.1"
@@ -5554,6 +5612,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-linux-arm64-musl@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-linux-arm64-musl@npm:21.3.11"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "@nx/nx-linux-x64-gnu@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-x64-gnu@npm:20.7.1"
@@ -5561,6 +5626,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-linux-x64-gnu@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-linux-x64-gnu@npm:21.3.11"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@nx/nx-linux-x64-musl@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-x64-musl@npm:20.7.1"
@@ -5568,6 +5640,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-linux-x64-musl@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-linux-x64-musl@npm:21.3.11"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "@nx/nx-win32-arm64-msvc@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-win32-arm64-msvc@npm:20.7.1"
@@ -5575,6 +5654,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-win32-arm64-msvc@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-win32-arm64-msvc@npm:21.3.11"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@nx/nx-win32-x64-msvc@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-win32-x64-msvc@npm:20.7.1"
@@ -5582,6 +5668,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-win32-x64-msvc@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-win32-x64-msvc@npm:21.3.11"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@octokit/auth-token@npm:^4.0.0":
   version: 4.0.0
   resolution: "@octokit/auth-token@npm:4.0.0"
@@ -11240,7 +11333,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^5.0.0":
+"ansi-styles@npm:^5.0.0, ansi-styles@npm:^5.2.0":
   version: 5.2.0
   resolution: "ansi-styles@npm:5.2.0"
   checksum: 10/d7f4e97ce0623aea6bc0d90dcd28881ee04cba06c570b97fd3391bd7a268eedfd9d5e2dd4fdcbdd82b8105df5faf6f24aaedc08eaf3da898e702db5948f63469
@@ -18433,7 +18526,7 @@ __metadata:
     nanoid: "npm:^5.0.9"
     node-forge: "npm:^1.3.1"
     node-notifier: "npm:10.0.1"
-    nx: "npm:20.7.1"
+    nx: "npm:21.3.11"
     ol: "npm:10.6.1"
     ol-ext: "npm:4.0.33"
     openapi-types: "npm:^12.1.3"
@@ -20708,6 +20801,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-diff@npm:^30.0.2":
+  version: 30.0.5
+  resolution: "jest-diff@npm:30.0.5"
+  dependencies:
+    "@jest/diff-sequences": "npm:30.0.1"
+    "@jest/get-type": "npm:30.0.1"
+    chalk: "npm:^4.1.2"
+    pretty-format: "npm:30.0.5"
+  checksum: 10/4cd3120640588a7bcc2ff3ff23c5b12939d0155f25098f7ed63e7801a9553fdcd0590a9fdd8b085646b0f1132e6da1228805fa9d2a83dd3686e146d804edb1ca
+  languageName: node
+  linkType: hard
+
 "jest-docblock@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-docblock@npm:29.7.0"
@@ -23987,7 +24092,92 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nx@npm:20.7.1, nx@npm:>=17.1.2 < 21":
+"nx@npm:21.3.11":
+  version: 21.3.11
+  resolution: "nx@npm:21.3.11"
+  dependencies:
+    "@napi-rs/wasm-runtime": "npm:0.2.4"
+    "@nx/nx-darwin-arm64": "npm:21.3.11"
+    "@nx/nx-darwin-x64": "npm:21.3.11"
+    "@nx/nx-freebsd-x64": "npm:21.3.11"
+    "@nx/nx-linux-arm-gnueabihf": "npm:21.3.11"
+    "@nx/nx-linux-arm64-gnu": "npm:21.3.11"
+    "@nx/nx-linux-arm64-musl": "npm:21.3.11"
+    "@nx/nx-linux-x64-gnu": "npm:21.3.11"
+    "@nx/nx-linux-x64-musl": "npm:21.3.11"
+    "@nx/nx-win32-arm64-msvc": "npm:21.3.11"
+    "@nx/nx-win32-x64-msvc": "npm:21.3.11"
+    "@yarnpkg/lockfile": "npm:^1.1.0"
+    "@yarnpkg/parsers": "npm:3.0.2"
+    "@zkochan/js-yaml": "npm:0.0.7"
+    axios: "npm:^1.8.3"
+    chalk: "npm:^4.1.0"
+    cli-cursor: "npm:3.1.0"
+    cli-spinners: "npm:2.6.1"
+    cliui: "npm:^8.0.1"
+    dotenv: "npm:~16.4.5"
+    dotenv-expand: "npm:~11.0.6"
+    enquirer: "npm:~2.3.6"
+    figures: "npm:3.2.0"
+    flat: "npm:^5.0.2"
+    front-matter: "npm:^4.0.2"
+    ignore: "npm:^5.0.4"
+    jest-diff: "npm:^30.0.2"
+    jsonc-parser: "npm:3.2.0"
+    lines-and-columns: "npm:2.0.3"
+    minimatch: "npm:9.0.3"
+    node-machine-id: "npm:1.1.12"
+    npm-run-path: "npm:^4.0.1"
+    open: "npm:^8.4.0"
+    ora: "npm:5.3.0"
+    resolve.exports: "npm:2.0.3"
+    semver: "npm:^7.5.3"
+    string-width: "npm:^4.2.3"
+    tar-stream: "npm:~2.2.0"
+    tmp: "npm:~0.2.1"
+    tree-kill: "npm:^1.2.2"
+    tsconfig-paths: "npm:^4.1.2"
+    tslib: "npm:^2.3.0"
+    yaml: "npm:^2.6.0"
+    yargs: "npm:^17.6.2"
+    yargs-parser: "npm:21.1.1"
+  peerDependencies:
+    "@swc-node/register": ^1.8.0
+    "@swc/core": ^1.3.85
+  dependenciesMeta:
+    "@nx/nx-darwin-arm64":
+      optional: true
+    "@nx/nx-darwin-x64":
+      optional: true
+    "@nx/nx-freebsd-x64":
+      optional: true
+    "@nx/nx-linux-arm-gnueabihf":
+      optional: true
+    "@nx/nx-linux-arm64-gnu":
+      optional: true
+    "@nx/nx-linux-arm64-musl":
+      optional: true
+    "@nx/nx-linux-x64-gnu":
+      optional: true
+    "@nx/nx-linux-x64-musl":
+      optional: true
+    "@nx/nx-win32-arm64-msvc":
+      optional: true
+    "@nx/nx-win32-x64-msvc":
+      optional: true
+  peerDependenciesMeta:
+    "@swc-node/register":
+      optional: true
+    "@swc/core":
+      optional: true
+  bin:
+    nx: bin/nx.js
+    nx-cloud: bin/nx-cloud.js
+  checksum: 10/a53230e33dd00e0962d1ade5f90611b66b109a3fc932abbe1d5e0d136857347f946a29325bd24f6293b836c97b8340d7e602837be4b36d9d3424c24f1b630847
+  languageName: node
+  linkType: hard
+
+"nx@npm:>=17.1.2 < 21":
   version: 20.7.1
   resolution: "nx@npm:20.7.1"
   dependencies:
@@ -26005,6 +26195,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pretty-format@npm:30.0.5":
+  version: 30.0.5
+  resolution: "pretty-format@npm:30.0.5"
+  dependencies:
+    "@jest/schemas": "npm:30.0.5"
+    ansi-styles: "npm:^5.2.0"
+    react-is: "npm:^18.3.1"
+  checksum: 10/bb65e53092f321257d80cd2c0165e65123805c9d4c4ada1ddac15b08c8879d6d031e6f01ac80e2685ef95ac35d302065196a036c63cd8729747f6e0fa21a55bf
+  languageName: node
+  linkType: hard
+
 "pretty-format@npm:^27.0.2, pretty-format@npm:^27.5.1":
   version: 27.5.1
   resolution: "pretty-format@npm:27.5.1"
@@ -27083,7 +27284,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:18.2.0, react-is@npm:^18.0.0, react-is@npm:^18.2.0":
+"react-is@npm:18.2.0":
   version: 18.2.0
   resolution: "react-is@npm:18.2.0"
   checksum: 10/200cd65bf2e0be7ba6055f647091b725a45dd2a6abef03bf2380ce701fd5edccee40b49b9d15edab7ac08a762bf83cb4081e31ec2673a5bfb549a36ba21570df
@@ -27104,6 +27305,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-is@npm:^18.0.0, react-is@npm:^18.2.0, react-is@npm:^18.3.1":
+  version: 18.3.1
+  resolution: "react-is@npm:18.3.1"
+  checksum: 10/d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22
+  languageName: node
+  linkType: hard
+
 "react-lifecycles-compat@npm:^3.0.4":
   version: 3.0.4
   resolution: "react-lifecycles-compat@npm:3.0.4"

From a0cf529465a3c03627f5cbd8af29f7715e42e711 Mon Sep 17 00:00:00 2001
From: Konrad Lalik <konradlalik@gmail.com>
Date: Mon, 11 Aug 2025 12:06:58 +0200
Subject: [PATCH 072/243] Alerting: Fix subpath handling in the alerting
 package (#109448)

Take subpath into account when building contact points APIs URL
---
 .../src/grafana/api/util.test.ts              | 67 +++++++++++++++++++
 .../grafana-alerting/src/grafana/api/util.ts  |  6 +-
 2 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 packages/grafana-alerting/src/grafana/api/util.test.ts

diff --git a/packages/grafana-alerting/src/grafana/api/util.test.ts b/packages/grafana-alerting/src/grafana/api/util.test.ts
new file mode 100644
index 00000000000..215cba04187
--- /dev/null
+++ b/packages/grafana-alerting/src/grafana/api/util.test.ts
@@ -0,0 +1,67 @@
+import { config } from '@grafana/runtime';
+
+import { getAPIBaseURL, getAPINamespace, getAPIReducerPath } from './util';
+
+describe('API utilities', () => {
+  const originalAppSubUrl = config.appSubUrl;
+  const originalNamespace = config.namespace;
+
+  afterEach(() => {
+    // Restore original config after each test
+    config.appSubUrl = originalAppSubUrl;
+    config.namespace = originalNamespace;
+  });
+
+  describe('getAPIBaseURL', () => {
+    const group = 'notifications.alerting.grafana.app';
+    const version = 'v0alpha1';
+
+    it('should generate correct API base URL without subpath', () => {
+      config.appSubUrl = '';
+      config.namespace = 'default';
+
+      const result = getAPIBaseURL(group, version);
+
+      expect(result).toBe('/apis/notifications.alerting.grafana.app/v0alpha1/namespaces/default');
+    });
+
+    it('should generate correct API base URL with subpath', () => {
+      config.appSubUrl = '/grafana';
+      config.namespace = 'default';
+
+      const result = getAPIBaseURL(group, version);
+
+      expect(result).toBe('/grafana/apis/notifications.alerting.grafana.app/v0alpha1/namespaces/default');
+    });
+
+    it('should handle different namespace', () => {
+      config.appSubUrl = '/grafana';
+      config.namespace = 'custom-namespace';
+
+      const result = getAPIBaseURL(group, version);
+
+      expect(result).toBe('/grafana/apis/notifications.alerting.grafana.app/v0alpha1/namespaces/custom-namespace');
+    });
+  });
+
+  describe('getAPINamespace', () => {
+    it('should return configured namespace', () => {
+      config.namespace = 'test-namespace';
+
+      const result = getAPINamespace();
+
+      expect(result).toBe('test-namespace');
+    });
+  });
+
+  describe('getAPIReducerPath', () => {
+    it('should generate correct reducer path', () => {
+      const group = 'notifications.alerting.grafana.app';
+      const version = 'v0alpha1';
+
+      const result = getAPIReducerPath(group, version);
+
+      expect(result).toBe('notifications.alerting.grafana.app/v0alpha1');
+    });
+  });
+});
diff --git a/packages/grafana-alerting/src/grafana/api/util.ts b/packages/grafana-alerting/src/grafana/api/util.ts
index fa9a623d592..a562e151366 100644
--- a/packages/grafana-alerting/src/grafana/api/util.ts
+++ b/packages/grafana-alerting/src/grafana/api/util.ts
@@ -6,8 +6,10 @@ import { config } from '@grafana/runtime';
 
 export const getAPINamespace = () => config.namespace;
 
-export const getAPIBaseURL = (group: string, version: string) =>
-  `/apis/${group}/${version}/namespaces/${getAPINamespace()}` as const;
+export const getAPIBaseURL = (group: string, version: string) => {
+  const subPath = config.appSubUrl || '';
+  return `${subPath}/apis/${group}/${version}/namespaces/${getAPINamespace()}` as const;
+};
 
 // By including the version in the reducer path we can prevent cache bugs when different versions of the API are used for the same entities
 export const getAPIReducerPath = (group: string, version: string) => `${group}/${version}` as const;

From f80627f228116b32aab08e4b9378293eedbfb784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Mon, 11 Aug 2025 12:10:15 +0200
Subject: [PATCH 073/243] Provisioning: Store Recent Jobs Temporarilly in
 Unified Storage (#109392)

* Add HistoryJob back to Spec

* Generate client

* Put back History Jobs

* Add a controller to remove historic jobs after some minutes

* Start only if Loki is not used

* Format code

* Update OpenAPI spec

* Change log level

* Fix condition

* Fix staticcheck

* Use provisioning identity

* Fix registration APIs

* Fix readonly issue

* Update OpenAPI
---
 .../pkg/apis/provisioning/v0alpha1/jobs.go    |  21 +
 .../apis/provisioning/v0alpha1/register.go    |  30 +
 .../v0alpha1/zz_generated.deepcopy.go         |  61 ++
 .../v0alpha1/zz_generated.openapi.go          |  96 ++
 ...enerated.openapi_violation_exceptions.list |   1 +
 .../provisioning/v0alpha1/historicjob.go      | 211 ++++
 .../pkg/generated/applyconfiguration/utils.go |   2 +
 .../v0alpha1/fake/fake_historicjob.go         |  39 +
 .../v0alpha1/fake/fake_provisioning_client.go |   4 +
 .../v0alpha1/generated_expansion.go           |   2 +
 .../provisioning/v0alpha1/historicjob.go      |  60 ++
 .../v0alpha1/provisioning_client.go           |   5 +
 .../informers/externalversions/generic.go     |   2 +
 .../provisioning/v0alpha1/historicjob.go      |  88 ++
 .../provisioning/v0alpha1/interface.go        |   7 +
 .../v0alpha1/expansion_generated.go           |   8 +
 .../provisioning/v0alpha1/historicjob.go      |  56 +
 .../provisioning/controller/historyjob.go     |  89 ++
 .../apis/provisioning/jobs/history.go         | 133 ++-
 .../apis/provisioning/jobs/persistentstore.go |   2 +
 pkg/registry/apis/provisioning/register.go    |  54 +-
 .../provisioning.grafana.app-v0alpha1.json    | 959 ++++++++++++++++++
 22 files changed, 1874 insertions(+), 56 deletions(-)
 create mode 100644 apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/historicjob.go
 create mode 100644 apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/fake/fake_historicjob.go
 create mode 100644 apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/historicjob.go
 create mode 100644 apps/provisioning/pkg/generated/informers/externalversions/provisioning/v0alpha1/historicjob.go
 create mode 100644 apps/provisioning/pkg/generated/listers/provisioning/v0alpha1/historicjob.go
 create mode 100644 pkg/registry/apis/provisioning/controller/historyjob.go

diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go
index e11ab36d147..814f2e56a3d 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go
@@ -235,3 +235,24 @@ type JobResourceSummary struct {
 	// This may not be an exhaustive list and recommend looking at the logs for more info
 	Errors []string `json:"errors,omitempty"`
 }
+
+// HistoricJob is a history entry of Job. It is used to store Jobs that have been processed.
+//
+// The repository name and type are stored as labels.
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +genclient
+type HistoricJob struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   JobSpec   `json:"spec,omitempty"`
+	Status JobStatus `json:"status,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type HistoricJobList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []HistoricJob `json:"items,omitempty"`
+}
diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/register.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/register.go
index c7db279034c..000ff7f22ff 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/register.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/register.go
@@ -87,6 +87,34 @@ var JobResourceInfo = utils.NewResourceInfo(GROUP, VERSION,
 		},
 	})
 
+var HistoricJobResourceInfo = utils.NewResourceInfo(GROUP, VERSION,
+	"historicjobs", "historicjob", "HistoricJob",
+	func() runtime.Object { return &HistoricJob{} },     // newObj
+	func() runtime.Object { return &HistoricJobList{} }, // newList
+	utils.TableColumns{ // Returned by `kubectl get`. Doesn't affect disk storage.
+		Definition: []metav1.TableColumnDefinition{
+			{Name: "Name", Type: "string", Format: "name"},
+			{Name: "Created At", Type: "date"},
+			{Name: "Action", Type: "string"},
+			{Name: "State", Type: "string"},
+			{Name: "Message", Type: "string"},
+		},
+		Reader: func(obj any) ([]interface{}, error) {
+			m, ok := obj.(*HistoricJob)
+			if !ok {
+				return nil, errors.New("expected HistoricJob")
+			}
+
+			return []interface{}{
+				m.Name, // may our may not be nice to read
+				m.CreationTimestamp.UTC().Format(time.RFC3339),
+				m.Spec.Action,
+				m.Status.State,
+				m.Status.Message,
+			}, nil
+		},
+	})
+
 var (
 	// SchemeGroupVersion is group version used to register these objects
 	SchemeGroupVersion   = schema.GroupVersion{Group: GROUP, Version: VERSION}
@@ -124,6 +152,8 @@ func AddKnownTypes(gv schema.GroupVersion, scheme *runtime.Scheme) error {
 		&Job{},
 		&JobList{},
 		&RefList{},
+		&HistoricJob{},
+		&HistoricJobList{},
 	)
 	return nil
 }
diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go
index c5438fccd0e..174505a880f 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go
@@ -237,6 +237,67 @@ func (in *HealthStatus) DeepCopy() *HealthStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *HistoricJob) DeepCopyInto(out *HistoricJob) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HistoricJob.
+func (in *HistoricJob) DeepCopy() *HistoricJob {
+	if in == nil {
+		return nil
+	}
+	out := new(HistoricJob)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *HistoricJob) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *HistoricJobList) DeepCopyInto(out *HistoricJobList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]HistoricJob, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HistoricJobList.
+func (in *HistoricJobList) DeepCopy() *HistoricJobList {
+	if in == nil {
+		return nil
+	}
+	out := new(HistoricJobList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *HistoricJobList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *HistoryItem) DeepCopyInto(out *HistoryItem) {
 	*out = *in
diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
index 19911653735..a05e91483a8 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
@@ -25,6 +25,8 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.GitLabRepositoryConfig":    schema_pkg_apis_provisioning_v0alpha1_GitLabRepositoryConfig(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.GitRepositoryConfig":       schema_pkg_apis_provisioning_v0alpha1_GitRepositoryConfig(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.HealthStatus":              schema_pkg_apis_provisioning_v0alpha1_HealthStatus(ref),
+		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.HistoricJob":               schema_pkg_apis_provisioning_v0alpha1_HistoricJob(ref),
+		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.HistoricJobList":           schema_pkg_apis_provisioning_v0alpha1_HistoricJobList(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.HistoryItem":               schema_pkg_apis_provisioning_v0alpha1_HistoryItem(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.HistoryList":               schema_pkg_apis_provisioning_v0alpha1_HistoryList(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.Job":                       schema_pkg_apis_provisioning_v0alpha1_Job(ref),
@@ -602,6 +604,100 @@ func schema_pkg_apis_provisioning_v0alpha1_HealthStatus(ref common.ReferenceCall
 	}
 }
 
+func schema_pkg_apis_provisioning_v0alpha1_HistoricJob(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "HistoricJob is a history entry of Job. It is used to store Jobs that have been processed.\n\nThe repository name and type are stored as labels.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.JobSpec"),
+						},
+					},
+					"status": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.JobStatus"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.JobSpec", "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.JobStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_provisioning_v0alpha1_HistoricJobList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.HistoricJob"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.HistoricJob", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
 func schema_pkg_apis_provisioning_v0alpha1_HistoryItem(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list
index a92f95837a2..3060c1f664d 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list
@@ -24,3 +24,4 @@ API rule violation: names_match,github.com/grafana/grafana/apps/provisioning/pkg
 API rule violation: names_match,github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1,ResourceWrapper,URLs
 API rule violation: names_match,github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1,SyncStatus,JobID
 API rule violation: names_match,github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1,WebhookResponse,Message
+API rule violation: streaming_list_type_json_tags,github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1,HistoricJobList,Items
diff --git a/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/historicjob.go b/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/historicjob.go
new file mode 100644
index 00000000000..66db5359b54
--- /dev/null
+++ b/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/historicjob.go
@@ -0,0 +1,211 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by applyconfiguration-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	types "k8s.io/apimachinery/pkg/types"
+	v1 "k8s.io/client-go/applyconfigurations/meta/v1"
+)
+
+// HistoricJobApplyConfiguration represents a declarative configuration of the HistoricJob type for use
+// with apply.
+type HistoricJobApplyConfiguration struct {
+	v1.TypeMetaApplyConfiguration    `json:",inline"`
+	*v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"`
+	Spec                             *JobSpecApplyConfiguration   `json:"spec,omitempty"`
+	Status                           *JobStatusApplyConfiguration `json:"status,omitempty"`
+}
+
+// HistoricJob constructs a declarative configuration of the HistoricJob type for use with
+// apply.
+func HistoricJob(name, namespace string) *HistoricJobApplyConfiguration {
+	b := &HistoricJobApplyConfiguration{}
+	b.WithName(name)
+	b.WithNamespace(namespace)
+	b.WithKind("HistoricJob")
+	b.WithAPIVersion("provisioning.grafana.app/v0alpha1")
+	return b
+}
+
+// WithKind sets the Kind field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Kind field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithKind(value string) *HistoricJobApplyConfiguration {
+	b.TypeMetaApplyConfiguration.Kind = &value
+	return b
+}
+
+// WithAPIVersion sets the APIVersion field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the APIVersion field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithAPIVersion(value string) *HistoricJobApplyConfiguration {
+	b.TypeMetaApplyConfiguration.APIVersion = &value
+	return b
+}
+
+// WithName sets the Name field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Name field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithName(value string) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.ObjectMetaApplyConfiguration.Name = &value
+	return b
+}
+
+// WithGenerateName sets the GenerateName field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the GenerateName field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithGenerateName(value string) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.ObjectMetaApplyConfiguration.GenerateName = &value
+	return b
+}
+
+// WithNamespace sets the Namespace field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Namespace field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithNamespace(value string) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.ObjectMetaApplyConfiguration.Namespace = &value
+	return b
+}
+
+// WithUID sets the UID field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the UID field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithUID(value types.UID) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.ObjectMetaApplyConfiguration.UID = &value
+	return b
+}
+
+// WithResourceVersion sets the ResourceVersion field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the ResourceVersion field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithResourceVersion(value string) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.ObjectMetaApplyConfiguration.ResourceVersion = &value
+	return b
+}
+
+// WithGeneration sets the Generation field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Generation field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithGeneration(value int64) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.ObjectMetaApplyConfiguration.Generation = &value
+	return b
+}
+
+// WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the CreationTimestamp field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithCreationTimestamp(value metav1.Time) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.ObjectMetaApplyConfiguration.CreationTimestamp = &value
+	return b
+}
+
+// WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the DeletionTimestamp field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value
+	return b
+}
+
+// WithDeletionGracePeriodSeconds sets the DeletionGracePeriodSeconds field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value
+	return b
+}
+
+// WithLabels puts the entries into the Labels field in the declarative configuration
+// and returns the receiver, so that objects can be build by chaining "With" function invocations.
+// If called multiple times, the entries provided by each call will be put on the Labels field,
+// overwriting an existing map entries in Labels field with the same key.
+func (b *HistoricJobApplyConfiguration) WithLabels(entries map[string]string) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries))
+	}
+	for k, v := range entries {
+		b.ObjectMetaApplyConfiguration.Labels[k] = v
+	}
+	return b
+}
+
+// WithAnnotations puts the entries into the Annotations field in the declarative configuration
+// and returns the receiver, so that objects can be build by chaining "With" function invocations.
+// If called multiple times, the entries provided by each call will be put on the Annotations field,
+// overwriting an existing map entries in Annotations field with the same key.
+func (b *HistoricJobApplyConfiguration) WithAnnotations(entries map[string]string) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 {
+		b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries))
+	}
+	for k, v := range entries {
+		b.ObjectMetaApplyConfiguration.Annotations[k] = v
+	}
+	return b
+}
+
+// WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration
+// and returns the receiver, so that objects can be build by chaining "With" function invocations.
+// If called multiple times, values provided by each call will be appended to the OwnerReferences field.
+func (b *HistoricJobApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	for i := range values {
+		if values[i] == nil {
+			panic("nil value passed to WithOwnerReferences")
+		}
+		b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i])
+	}
+	return b
+}
+
+// WithFinalizers adds the given value to the Finalizers field in the declarative configuration
+// and returns the receiver, so that objects can be build by chaining "With" function invocations.
+// If called multiple times, values provided by each call will be appended to the Finalizers field.
+func (b *HistoricJobApplyConfiguration) WithFinalizers(values ...string) *HistoricJobApplyConfiguration {
+	b.ensureObjectMetaApplyConfigurationExists()
+	for i := range values {
+		b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i])
+	}
+	return b
+}
+
+func (b *HistoricJobApplyConfiguration) ensureObjectMetaApplyConfigurationExists() {
+	if b.ObjectMetaApplyConfiguration == nil {
+		b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{}
+	}
+}
+
+// WithSpec sets the Spec field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Spec field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithSpec(value *JobSpecApplyConfiguration) *HistoricJobApplyConfiguration {
+	b.Spec = value
+	return b
+}
+
+// WithStatus sets the Status field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Status field is set to the value of the last call.
+func (b *HistoricJobApplyConfiguration) WithStatus(value *JobStatusApplyConfiguration) *HistoricJobApplyConfiguration {
+	b.Status = value
+	return b
+}
+
+// GetName retrieves the value of the Name field in the declarative configuration.
+func (b *HistoricJobApplyConfiguration) GetName() *string {
+	b.ensureObjectMetaApplyConfigurationExists()
+	return b.ObjectMetaApplyConfiguration.Name
+}
diff --git a/apps/provisioning/pkg/generated/applyconfiguration/utils.go b/apps/provisioning/pkg/generated/applyconfiguration/utils.go
index 6fc85d35cda..7c6cb060f78 100644
--- a/apps/provisioning/pkg/generated/applyconfiguration/utils.go
+++ b/apps/provisioning/pkg/generated/applyconfiguration/utils.go
@@ -32,6 +32,8 @@ func ForKind(kind schema.GroupVersionKind) interface{} {
 		return &provisioningv0alpha1.GitRepositoryConfigApplyConfiguration{}
 	case v0alpha1.SchemeGroupVersion.WithKind("HealthStatus"):
 		return &provisioningv0alpha1.HealthStatusApplyConfiguration{}
+	case v0alpha1.SchemeGroupVersion.WithKind("HistoricJob"):
+		return &provisioningv0alpha1.HistoricJobApplyConfiguration{}
 	case v0alpha1.SchemeGroupVersion.WithKind("Job"):
 		return &provisioningv0alpha1.JobApplyConfiguration{}
 	case v0alpha1.SchemeGroupVersion.WithKind("JobResourceSummary"):
diff --git a/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/fake/fake_historicjob.go b/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/fake/fake_historicjob.go
new file mode 100644
index 00000000000..94611b64ce0
--- /dev/null
+++ b/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/fake/fake_historicjob.go
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	v0alpha1 "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	provisioningv0alpha1 "github.com/grafana/grafana/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1"
+	typedprovisioningv0alpha1 "github.com/grafana/grafana/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1"
+	gentype "k8s.io/client-go/gentype"
+)
+
+// fakeHistoricJobs implements HistoricJobInterface
+type fakeHistoricJobs struct {
+	*gentype.FakeClientWithListAndApply[*v0alpha1.HistoricJob, *v0alpha1.HistoricJobList, *provisioningv0alpha1.HistoricJobApplyConfiguration]
+	Fake *FakeProvisioningV0alpha1
+}
+
+func newFakeHistoricJobs(fake *FakeProvisioningV0alpha1, namespace string) typedprovisioningv0alpha1.HistoricJobInterface {
+	return &fakeHistoricJobs{
+		gentype.NewFakeClientWithListAndApply[*v0alpha1.HistoricJob, *v0alpha1.HistoricJobList, *provisioningv0alpha1.HistoricJobApplyConfiguration](
+			fake.Fake,
+			namespace,
+			v0alpha1.SchemeGroupVersion.WithResource("historicjobs"),
+			v0alpha1.SchemeGroupVersion.WithKind("HistoricJob"),
+			func() *v0alpha1.HistoricJob { return &v0alpha1.HistoricJob{} },
+			func() *v0alpha1.HistoricJobList { return &v0alpha1.HistoricJobList{} },
+			func(dst, src *v0alpha1.HistoricJobList) { dst.ListMeta = src.ListMeta },
+			func(list *v0alpha1.HistoricJobList) []*v0alpha1.HistoricJob {
+				return gentype.ToPointerSlice(list.Items)
+			},
+			func(list *v0alpha1.HistoricJobList, items []*v0alpha1.HistoricJob) {
+				list.Items = gentype.FromPointerSlice(items)
+			},
+		),
+		fake,
+	}
+}
diff --git a/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/fake/fake_provisioning_client.go b/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/fake/fake_provisioning_client.go
index 4a6afceb6de..d6fe94156be 100644
--- a/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/fake/fake_provisioning_client.go
+++ b/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/fake/fake_provisioning_client.go
@@ -14,6 +14,10 @@ type FakeProvisioningV0alpha1 struct {
 	*testing.Fake
 }
 
+func (c *FakeProvisioningV0alpha1) HistoricJobs(namespace string) v0alpha1.HistoricJobInterface {
+	return newFakeHistoricJobs(c, namespace)
+}
+
 func (c *FakeProvisioningV0alpha1) Jobs(namespace string) v0alpha1.JobInterface {
 	return newFakeJobs(c, namespace)
 }
diff --git a/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/generated_expansion.go b/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/generated_expansion.go
index 9916a25266d..21b7a18b414 100644
--- a/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/generated_expansion.go
+++ b/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/generated_expansion.go
@@ -4,6 +4,8 @@
 
 package v0alpha1
 
+type HistoricJobExpansion interface{}
+
 type JobExpansion interface{}
 
 type RepositoryExpansion interface{}
diff --git a/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/historicjob.go b/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/historicjob.go
new file mode 100644
index 00000000000..f59daff7e25
--- /dev/null
+++ b/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/historicjob.go
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	context "context"
+
+	provisioningv0alpha1 "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	applyconfigurationprovisioningv0alpha1 "github.com/grafana/grafana/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1"
+	scheme "github.com/grafana/grafana/apps/provisioning/pkg/generated/clientset/versioned/scheme"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	gentype "k8s.io/client-go/gentype"
+)
+
+// HistoricJobsGetter has a method to return a HistoricJobInterface.
+// A group's client should implement this interface.
+type HistoricJobsGetter interface {
+	HistoricJobs(namespace string) HistoricJobInterface
+}
+
+// HistoricJobInterface has methods to work with HistoricJob resources.
+type HistoricJobInterface interface {
+	Create(ctx context.Context, historicJob *provisioningv0alpha1.HistoricJob, opts v1.CreateOptions) (*provisioningv0alpha1.HistoricJob, error)
+	Update(ctx context.Context, historicJob *provisioningv0alpha1.HistoricJob, opts v1.UpdateOptions) (*provisioningv0alpha1.HistoricJob, error)
+	// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
+	UpdateStatus(ctx context.Context, historicJob *provisioningv0alpha1.HistoricJob, opts v1.UpdateOptions) (*provisioningv0alpha1.HistoricJob, error)
+	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
+	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*provisioningv0alpha1.HistoricJob, error)
+	List(ctx context.Context, opts v1.ListOptions) (*provisioningv0alpha1.HistoricJobList, error)
+	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *provisioningv0alpha1.HistoricJob, err error)
+	Apply(ctx context.Context, historicJob *applyconfigurationprovisioningv0alpha1.HistoricJobApplyConfiguration, opts v1.ApplyOptions) (result *provisioningv0alpha1.HistoricJob, err error)
+	// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
+	ApplyStatus(ctx context.Context, historicJob *applyconfigurationprovisioningv0alpha1.HistoricJobApplyConfiguration, opts v1.ApplyOptions) (result *provisioningv0alpha1.HistoricJob, err error)
+	HistoricJobExpansion
+}
+
+// historicJobs implements HistoricJobInterface
+type historicJobs struct {
+	*gentype.ClientWithListAndApply[*provisioningv0alpha1.HistoricJob, *provisioningv0alpha1.HistoricJobList, *applyconfigurationprovisioningv0alpha1.HistoricJobApplyConfiguration]
+}
+
+// newHistoricJobs returns a HistoricJobs
+func newHistoricJobs(c *ProvisioningV0alpha1Client, namespace string) *historicJobs {
+	return &historicJobs{
+		gentype.NewClientWithListAndApply[*provisioningv0alpha1.HistoricJob, *provisioningv0alpha1.HistoricJobList, *applyconfigurationprovisioningv0alpha1.HistoricJobApplyConfiguration](
+			"historicjobs",
+			c.RESTClient(),
+			scheme.ParameterCodec,
+			namespace,
+			func() *provisioningv0alpha1.HistoricJob { return &provisioningv0alpha1.HistoricJob{} },
+			func() *provisioningv0alpha1.HistoricJobList { return &provisioningv0alpha1.HistoricJobList{} },
+		),
+	}
+}
diff --git a/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/provisioning_client.go b/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/provisioning_client.go
index b260183135e..401bc533cfe 100644
--- a/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/provisioning_client.go
+++ b/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/provisioning_client.go
@@ -14,6 +14,7 @@ import (
 
 type ProvisioningV0alpha1Interface interface {
 	RESTClient() rest.Interface
+	HistoricJobsGetter
 	JobsGetter
 	RepositoriesGetter
 }
@@ -23,6 +24,10 @@ type ProvisioningV0alpha1Client struct {
 	restClient rest.Interface
 }
 
+func (c *ProvisioningV0alpha1Client) HistoricJobs(namespace string) HistoricJobInterface {
+	return newHistoricJobs(c, namespace)
+}
+
 func (c *ProvisioningV0alpha1Client) Jobs(namespace string) JobInterface {
 	return newJobs(c, namespace)
 }
diff --git a/apps/provisioning/pkg/generated/informers/externalversions/generic.go b/apps/provisioning/pkg/generated/informers/externalversions/generic.go
index cdbcc682e3d..4a62aab044a 100644
--- a/apps/provisioning/pkg/generated/informers/externalversions/generic.go
+++ b/apps/provisioning/pkg/generated/informers/externalversions/generic.go
@@ -39,6 +39,8 @@ func (f *genericInformer) Lister() cache.GenericLister {
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
 	// Group=provisioning.grafana.app, Version=v0alpha1
+	case v0alpha1.SchemeGroupVersion.WithResource("historicjobs"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Provisioning().V0alpha1().HistoricJobs().Informer()}, nil
 	case v0alpha1.SchemeGroupVersion.WithResource("jobs"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Provisioning().V0alpha1().Jobs().Informer()}, nil
 	case v0alpha1.SchemeGroupVersion.WithResource("repositories"):
diff --git a/apps/provisioning/pkg/generated/informers/externalversions/provisioning/v0alpha1/historicjob.go b/apps/provisioning/pkg/generated/informers/externalversions/provisioning/v0alpha1/historicjob.go
new file mode 100644
index 00000000000..fae7e78c2f6
--- /dev/null
+++ b/apps/provisioning/pkg/generated/informers/externalversions/provisioning/v0alpha1/historicjob.go
@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by informer-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	context "context"
+	time "time"
+
+	apisprovisioningv0alpha1 "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	versioned "github.com/grafana/grafana/apps/provisioning/pkg/generated/clientset/versioned"
+	internalinterfaces "github.com/grafana/grafana/apps/provisioning/pkg/generated/informers/externalversions/internalinterfaces"
+	provisioningv0alpha1 "github.com/grafana/grafana/apps/provisioning/pkg/generated/listers/provisioning/v0alpha1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	watch "k8s.io/apimachinery/pkg/watch"
+	cache "k8s.io/client-go/tools/cache"
+)
+
+// HistoricJobInformer provides access to a shared informer and lister for
+// HistoricJobs.
+type HistoricJobInformer interface {
+	Informer() cache.SharedIndexInformer
+	Lister() provisioningv0alpha1.HistoricJobLister
+}
+
+type historicJobInformer struct {
+	factory          internalinterfaces.SharedInformerFactory
+	tweakListOptions internalinterfaces.TweakListOptionsFunc
+	namespace        string
+}
+
+// NewHistoricJobInformer constructs a new informer for HistoricJob type.
+// Always prefer using an informer factory to get a shared informer instead of getting an independent
+// one. This reduces memory footprint and number of connections to the server.
+func NewHistoricJobInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
+	return NewFilteredHistoricJobInformer(client, namespace, resyncPeriod, indexers, nil)
+}
+
+// NewFilteredHistoricJobInformer constructs a new informer for HistoricJob type.
+// Always prefer using an informer factory to get a shared informer instead of getting an independent
+// one. This reduces memory footprint and number of connections to the server.
+func NewFilteredHistoricJobInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
+	return cache.NewSharedIndexInformer(
+		&cache.ListWatch{
+			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ProvisioningV0alpha1().HistoricJobs(namespace).List(context.Background(), options)
+			},
+			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ProvisioningV0alpha1().HistoricJobs(namespace).Watch(context.Background(), options)
+			},
+			ListWithContextFunc: func(ctx context.Context, options v1.ListOptions) (runtime.Object, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ProvisioningV0alpha1().HistoricJobs(namespace).List(ctx, options)
+			},
+			WatchFuncWithContext: func(ctx context.Context, options v1.ListOptions) (watch.Interface, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ProvisioningV0alpha1().HistoricJobs(namespace).Watch(ctx, options)
+			},
+		},
+		&apisprovisioningv0alpha1.HistoricJob{},
+		resyncPeriod,
+		indexers,
+	)
+}
+
+func (f *historicJobInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
+	return NewFilteredHistoricJobInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)
+}
+
+func (f *historicJobInformer) Informer() cache.SharedIndexInformer {
+	return f.factory.InformerFor(&apisprovisioningv0alpha1.HistoricJob{}, f.defaultInformer)
+}
+
+func (f *historicJobInformer) Lister() provisioningv0alpha1.HistoricJobLister {
+	return provisioningv0alpha1.NewHistoricJobLister(f.Informer().GetIndexer())
+}
diff --git a/apps/provisioning/pkg/generated/informers/externalversions/provisioning/v0alpha1/interface.go b/apps/provisioning/pkg/generated/informers/externalversions/provisioning/v0alpha1/interface.go
index 0b7c499f035..cbe2fcefaf3 100644
--- a/apps/provisioning/pkg/generated/informers/externalversions/provisioning/v0alpha1/interface.go
+++ b/apps/provisioning/pkg/generated/informers/externalversions/provisioning/v0alpha1/interface.go
@@ -10,6 +10,8 @@ import (
 
 // Interface provides access to all the informers in this group version.
 type Interface interface {
+	// HistoricJobs returns a HistoricJobInformer.
+	HistoricJobs() HistoricJobInformer
 	// Jobs returns a JobInformer.
 	Jobs() JobInformer
 	// Repositories returns a RepositoryInformer.
@@ -27,6 +29,11 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList
 	return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions}
 }
 
+// HistoricJobs returns a HistoricJobInformer.
+func (v *version) HistoricJobs() HistoricJobInformer {
+	return &historicJobInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
+}
+
 // Jobs returns a JobInformer.
 func (v *version) Jobs() JobInformer {
 	return &jobInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
diff --git a/apps/provisioning/pkg/generated/listers/provisioning/v0alpha1/expansion_generated.go b/apps/provisioning/pkg/generated/listers/provisioning/v0alpha1/expansion_generated.go
index 94ecc5121e1..7f0649542b3 100644
--- a/apps/provisioning/pkg/generated/listers/provisioning/v0alpha1/expansion_generated.go
+++ b/apps/provisioning/pkg/generated/listers/provisioning/v0alpha1/expansion_generated.go
@@ -4,6 +4,14 @@
 
 package v0alpha1
 
+// HistoricJobListerExpansion allows custom methods to be added to
+// HistoricJobLister.
+type HistoricJobListerExpansion interface{}
+
+// HistoricJobNamespaceListerExpansion allows custom methods to be added to
+// HistoricJobNamespaceLister.
+type HistoricJobNamespaceListerExpansion interface{}
+
 // JobListerExpansion allows custom methods to be added to
 // JobLister.
 type JobListerExpansion interface{}
diff --git a/apps/provisioning/pkg/generated/listers/provisioning/v0alpha1/historicjob.go b/apps/provisioning/pkg/generated/listers/provisioning/v0alpha1/historicjob.go
new file mode 100644
index 00000000000..56cb38c5515
--- /dev/null
+++ b/apps/provisioning/pkg/generated/listers/provisioning/v0alpha1/historicjob.go
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by lister-gen. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	provisioningv0alpha1 "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	listers "k8s.io/client-go/listers"
+	cache "k8s.io/client-go/tools/cache"
+)
+
+// HistoricJobLister helps list HistoricJobs.
+// All objects returned here must be treated as read-only.
+type HistoricJobLister interface {
+	// List lists all HistoricJobs in the indexer.
+	// Objects returned here must be treated as read-only.
+	List(selector labels.Selector) (ret []*provisioningv0alpha1.HistoricJob, err error)
+	// HistoricJobs returns an object that can list and get HistoricJobs.
+	HistoricJobs(namespace string) HistoricJobNamespaceLister
+	HistoricJobListerExpansion
+}
+
+// historicJobLister implements the HistoricJobLister interface.
+type historicJobLister struct {
+	listers.ResourceIndexer[*provisioningv0alpha1.HistoricJob]
+}
+
+// NewHistoricJobLister returns a new HistoricJobLister.
+func NewHistoricJobLister(indexer cache.Indexer) HistoricJobLister {
+	return &historicJobLister{listers.New[*provisioningv0alpha1.HistoricJob](indexer, provisioningv0alpha1.Resource("historicjob"))}
+}
+
+// HistoricJobs returns an object that can list and get HistoricJobs.
+func (s *historicJobLister) HistoricJobs(namespace string) HistoricJobNamespaceLister {
+	return historicJobNamespaceLister{listers.NewNamespaced[*provisioningv0alpha1.HistoricJob](s.ResourceIndexer, namespace)}
+}
+
+// HistoricJobNamespaceLister helps list and get HistoricJobs.
+// All objects returned here must be treated as read-only.
+type HistoricJobNamespaceLister interface {
+	// List lists all HistoricJobs in the indexer for a given namespace.
+	// Objects returned here must be treated as read-only.
+	List(selector labels.Selector) (ret []*provisioningv0alpha1.HistoricJob, err error)
+	// Get retrieves the HistoricJob from the indexer for a given namespace and name.
+	// Objects returned here must be treated as read-only.
+	Get(name string) (*provisioningv0alpha1.HistoricJob, error)
+	HistoricJobNamespaceListerExpansion
+}
+
+// historicJobNamespaceLister implements the HistoricJobNamespaceLister
+// interface.
+type historicJobNamespaceLister struct {
+	listers.ResourceIndexer[*provisioningv0alpha1.HistoricJob]
+}
diff --git a/pkg/registry/apis/provisioning/controller/historyjob.go b/pkg/registry/apis/provisioning/controller/historyjob.go
new file mode 100644
index 00000000000..2e4e13f359d
--- /dev/null
+++ b/pkg/registry/apis/provisioning/controller/historyjob.go
@@ -0,0 +1,89 @@
+package controller
+
+import (
+	"context"
+	"time"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/client-go/tools/cache"
+
+	"github.com/grafana/grafana-app-sdk/logging"
+	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	client "github.com/grafana/grafana/apps/provisioning/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1"
+	informer "github.com/grafana/grafana/apps/provisioning/pkg/generated/informers/externalversions/provisioning/v0alpha1"
+	"github.com/grafana/grafana/pkg/apimachinery/identity"
+)
+
+const (
+	historyJobControllerLoggerName = "provisioning-historyjob-controller"
+)
+
+// HistoryJobController manages the cleanup of old HistoryJob entries.
+type HistoryJobController struct {
+	client         client.ProvisioningV0alpha1Interface
+	logger         logging.Logger
+	expirationTime time.Duration
+}
+
+// NewHistoryJobController creates a new HistoryJobController.
+func NewHistoryJobController(
+	provisioningClient client.ProvisioningV0alpha1Interface,
+	historyJobInformer informer.HistoricJobInformer,
+	expirationTime time.Duration,
+) (*HistoryJobController, error) {
+	c := &HistoryJobController{
+		client:         provisioningClient,
+		logger:         logging.DefaultLogger.With("logger", historyJobControllerLoggerName),
+		expirationTime: expirationTime,
+	}
+
+	// Use the resync events from the shared informer to trigger cleanup for each job
+	_, err := historyJobInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+		AddFunc: func(obj interface{}) {
+			c.cleanupJob(obj)
+		},
+		UpdateFunc: func(oldObj, newObj interface{}) {
+			c.cleanupJob(newObj)
+		},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return c, nil
+}
+
+func (c *HistoryJobController) cleanupJob(obj interface{}) {
+	job, ok := obj.(*provisioning.HistoricJob)
+	if !ok {
+		c.logger.Error("Expected HistoricJob but got", "type", obj)
+		return
+	}
+
+	age := time.Since(job.CreationTimestamp.Time)
+	if age > c.expirationTime {
+		namespace := job.Namespace
+		ctx, _, err := identity.WithProvisioningIdentity(context.Background(), namespace)
+		if err != nil {
+			c.logger.Error("Failed to set provisioning identity for cleanup", "error", err)
+			return
+		}
+
+		ctx = request.WithNamespace(ctx, namespace)
+		err = c.client.HistoricJobs(job.Namespace).Delete(ctx, job.Name, metav1.DeleteOptions{})
+		if err != nil && !apierrors.IsNotFound(err) {
+			c.logger.Error("Failed to delete expired HistoryJob",
+				"namespace", job.Namespace,
+				"name", job.Name,
+				"age", age,
+				"error", err)
+		} else {
+			c.logger.Info("Deleted expired HistoryJob",
+				"namespace", job.Namespace,
+				"name", job.Name,
+				"age", age)
+		}
+	}
+}
diff --git a/pkg/registry/apis/provisioning/jobs/history.go b/pkg/registry/apis/provisioning/jobs/history.go
index 0a7897319f9..95fc4b73b3d 100644
--- a/pkg/registry/apis/provisioning/jobs/history.go
+++ b/pkg/registry/apis/provisioning/jobs/history.go
@@ -3,9 +3,13 @@ package jobs
 import (
 	"context"
 	"fmt"
-	"sync"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/rest"
 
 	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
 )
@@ -24,63 +28,100 @@ type History interface {
 	GetJob(ctx context.Context, namespace, repo, uid string) (*provisioning.Job, error)
 }
 
-// NewJobHistoryCache creates a History client
-func NewJobHistoryCache() History {
-	history := &recentHistory{
-		maxJobs:     9, // 10-1
-		repoHistory: make(map[string]provisioning.JobList),
+// NewStorageBackedHistory creates a History client backed by unified storage
+// This should be replaced by loki when running in cloud
+func NewStorageBackedHistory(store rest.Storage) (History, error) {
+	var ok bool
+	history := &storageBackedHistory{}
+	history.creator, ok = store.(rest.Creater)
+	if !ok {
+		return nil, fmt.Errorf("storage does not implement rest.Creater")
 	}
-	return history
+
+	history.lister, ok = store.(rest.Lister)
+	if !ok {
+		return nil, fmt.Errorf("storage does not implement rest.Lister")
+	}
+
+	return history, nil
 }
 
-type recentHistory struct {
-	maxJobs     int
-	repoMu      sync.Mutex
-	repoHistory map[string]provisioning.JobList
+type storageBackedHistory struct {
+	creator rest.Creater
+	lister  rest.Lister
 }
 
 // Write implements History.
-func (h *recentHistory) WriteJob(ctx context.Context, job *provisioning.Job) error {
-	h.repoMu.Lock()
-	defer h.repoMu.Unlock()
-
-	copy := job.DeepCopy()
-	delete(copy.Labels, LabelJobClaim)
-
-	items := []provisioning.Job{*copy}
-	key := fmt.Sprintf("%s/%s", job.Namespace, job.Spec.Repository)
-	v, ok := h.repoHistory[key]
-	if ok {
-		max := min(len(v.Items), h.maxJobs)
-		items = append(items, v.Items[0:max]...)
+func (s *storageBackedHistory) WriteJob(ctx context.Context, job *provisioning.Job) error {
+	if job.UID == "" {
+		return fmt.Errorf("missing UID in job '%s'", job.GetName())
 	}
-	h.repoHistory[key] = provisioning.JobList{Items: items}
-	return nil
+	if job.Labels == nil {
+		job.Labels = make(map[string]string)
+	}
+	job.Labels[LabelRepository] = job.Spec.Repository
+	job.Labels[LabelJobOriginalUID] = string(job.UID)
+
+	// Generate a new name based on the input job
+	job.GenerateName = job.Name + "-"
+	job.Name = ""
+	// We also reset the UID as this is not the same object.
+	job.UID = ""
+	// We aren't allowed to write with ResourceVersion set.
+	job.ResourceVersion = ""
+
+	_, err := s.creator.Create(ctx, &provisioning.HistoricJob{
+		ObjectMeta: job.ObjectMeta,
+		Spec:       job.Spec,
+		Status:     job.Status,
+	}, nil, &metav1.CreateOptions{})
+	return err
 }
 
-// Recent implements History.
-func (h *recentHistory) RecentJobs(ctx context.Context, namespace, repo string) (*provisioning.JobList, error) {
-	h.repoMu.Lock()
-	defer h.repoMu.Unlock()
-
-	rsp := &provisioning.JobList{}
-	key := fmt.Sprintf("%s/%s", namespace, repo)
-	v, ok := h.repoHistory[key]
-	if ok {
-		rsp.Items = v.Items
-	}
-	return rsp, nil
-}
-
-func (h *recentHistory) GetJob(ctx context.Context, namespace, repo, job string) (*provisioning.Job, error) {
-	jobs, err := h.RecentJobs(ctx, namespace, repo)
+func (s *storageBackedHistory) getJobs(ctx context.Context, namespace string, labels labels.Set) (*provisioning.JobList, error) {
+	ctx = request.WithNamespace(ctx, namespace)
+	obj, err := s.lister.List(ctx, &internalversion.ListOptions{
+		LabelSelector: labels.AsSelector(),
+	})
 	if err != nil {
 		return nil, err
 	}
-	for _, item := range jobs.Items {
-		if string(item.UID) == job {
-			return &item, nil
-		}
+
+	historic, ok := obj.(*provisioning.HistoricJobList)
+	if !ok {
+		return nil, fmt.Errorf("expected HistoricJobList, found %T", historic)
+	}
+
+	jobs := &provisioning.JobList{
+		ListMeta: historic.ListMeta,
+	}
+	for _, job := range historic.Items {
+		jobs.Items = append(jobs.Items, provisioning.Job{
+			ObjectMeta: job.ObjectMeta,
+			Spec:       job.Spec,
+			Status:     job.Status,
+		})
+	}
+	return jobs, nil
+}
+
+// Recent implements History.
+func (s *storageBackedHistory) RecentJobs(ctx context.Context, namespace, repo string) (*provisioning.JobList, error) {
+	return s.getJobs(ctx, namespace, labels.Set{
+		LabelRepository: repo,
+	})
+}
+
+// GetJob implements History.
+func (s *storageBackedHistory) GetJob(ctx context.Context, namespace, repo, job string) (*provisioning.Job, error) {
+	jobs, err := s.getJobs(ctx, namespace, labels.Set{
+		LabelJobOriginalUID: job,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if len(jobs.Items) == 1 {
+		return &jobs.Items[0], nil
 	}
 	return nil, apierrors.NewNotFound(provisioning.JobResourceInfo.GroupResource(), job)
 }
diff --git a/pkg/registry/apis/provisioning/jobs/persistentstore.go b/pkg/registry/apis/provisioning/jobs/persistentstore.go
index b25fdff68e2..2649337b76f 100644
--- a/pkg/registry/apis/provisioning/jobs/persistentstore.go
+++ b/pkg/registry/apis/provisioning/jobs/persistentstore.go
@@ -30,6 +30,8 @@ const (
 	LabelJobClaim = "provisioning.grafana.app/claim"
 	// LabelRepository contains the repository name as a label. This allows for label selectors to find the archived version of a job.
 	LabelRepository = "provisioning.grafana.app/repository"
+	// LabelJobOriginalUID contains the Job's original uid as a label. This allows for label selectors to find the archived version of a job.
+	LabelJobOriginalUID = "provisioning.grafana.app/original-uid"
 )
 
 var (
diff --git a/pkg/registry/apis/provisioning/register.go b/pkg/registry/apis/provisioning/register.go
index ee8ad2dd02e..b741d55cdd2 100644
--- a/pkg/registry/apis/provisioning/register.go
+++ b/pkg/registry/apis/provisioning/register.go
@@ -99,6 +99,7 @@ type APIBuilder struct {
 		jobs.Queue
 		jobs.Store
 	}
+	jobHistoryConfig  *JobHistoryConfig
 	jobHistory        jobs.History
 	tester            *RepositoryTester
 	resourceLister    resources.ResourceLister
@@ -143,12 +144,6 @@ func NewAPIBuilder(
 		git.Mutator(repositorySecrets),
 		github.Mutator(repositorySecrets),
 	}
-	// Create job history based on configuration
-	// Default to in-memory cache if no config provided
-	jobHistory := jobs.NewJobHistoryCache()
-	if jobHistoryConfig != nil && jobHistoryConfig.Loki != nil {
-		jobHistory = jobs.NewLokiJobHistory(*jobHistoryConfig.Loki)
-	}
 
 	b := &APIBuilder{
 		mutators:            mutators,
@@ -167,7 +162,7 @@ func NewAPIBuilder(
 		unified:             unified,
 		repositorySecrets:   repositorySecrets,
 		access:              access,
-		jobHistory:          jobHistory,
+		jobHistoryConfig:    jobHistoryConfig,
 		availableRepositoryTypes: map[provisioning.RepositoryType]bool{
 			provisioning.LocalRepositoryType:  true,
 			provisioning.GitHubRepositoryType: true,
@@ -351,7 +346,8 @@ func (b *APIBuilder) GetAuthorizer() authorizer.Authorizer {
 				}
 				return authorizer.DecisionDeny, "viewer role is required", nil
 
-			case provisioning.JobResourceInfo.GetName():
+			case provisioning.JobResourceInfo.GetName(),
+				provisioning.HistoricJobResourceInfo.GetName():
 				// Jobs are shown on the configuration page.
 				if id.GetOrgRole().Includes(identity.RoleAdmin) {
 					return authorizer.DecisionAllow, "", nil
@@ -418,13 +414,32 @@ func (b *APIBuilder) UpdateAPIGroupInfo(apiGroupInfo *genericapiserver.APIGroupI
 		return fmt.Errorf("failed to create job storage: %w", err)
 	}
 
+	storage := map[string]rest.Storage{}
+	// Create job history based on configuration
+	// Default to in-memory cache if no config provided
+	var jobHistory jobs.History
+	if b.jobHistoryConfig != nil && b.jobHistoryConfig.Loki != nil {
+		jobHistory = jobs.NewLokiJobHistory(*b.jobHistoryConfig.Loki)
+	} else {
+		historicJobStore, err := grafanaregistry.NewCompleteRegistryStore(opts.Scheme, provisioning.HistoricJobResourceInfo, opts.OptsGetter)
+		if err != nil {
+			return fmt.Errorf("failed to create historic job storage: %w", err)
+		}
+
+		jobHistory, err = jobs.NewStorageBackedHistory(historicJobStore)
+		if err != nil {
+			return fmt.Errorf("failed to create historic job wrapper: %w", err)
+		}
+
+		storage[provisioning.HistoricJobResourceInfo.StoragePath()] = historicJobStore
+	}
+
+	b.jobHistory = jobHistory
 	b.jobs, err = jobs.NewJobStore(realJobStore, 30*time.Second) // FIXME: this timeout
 	if err != nil {
 		return fmt.Errorf("failed to create job store: %w", err)
 	}
 
-	storage := map[string]rest.Storage{}
-
 	// Although we never interact with jobs via the API, we want them to be readable (watchable!) from the API.
 	storage[provisioning.JobResourceInfo.StoragePath()] = readonly.Wrap(realJobStore)
 
@@ -725,6 +740,25 @@ func (b *APIBuilder) GetPostStartHooks() (map[string]genericapiserver.PostStartH
 			}
 
 			go repoController.Run(postStartHookCtx.Context, repoControllerWorkers)
+
+			// If Loki not used, start the controller for history jobs
+			if b.jobHistoryConfig == nil || b.jobHistoryConfig.Loki == nil {
+				// Create HistoryJobController for cleanup of old job history entries
+				// Separate informer factory for HistoryJob cleanup with resync interval
+				historyJobExpiration := 30 * time.Second
+				historyJobInformerFactory := informers.NewSharedInformerFactory(c, historyJobExpiration)
+				historyJobInformer := historyJobInformerFactory.Provisioning().V0alpha1().HistoricJobs()
+				go historyJobInformer.Informer().Run(postStartHookCtx.Done())
+				_, err = controller.NewHistoryJobController(
+					b.GetClient(),
+					historyJobInformer,
+					historyJobExpiration,
+				)
+				if err != nil {
+					return fmt.Errorf("create history job controller: %w", err)
+				}
+			}
+
 			return nil
 		},
 	}
diff --git a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
index ab1e77d03b9..bee7f437b4d 100644
--- a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
@@ -36,6 +36,836 @@
         }
       }
     },
+    "/apis/provisioning.grafana.app/v0alpha1/namespaces/{namespace}/historicjobs": {
+      "get": {
+        "tags": [
+          "HistoricJob"
+        ],
+        "description": "list or watch objects of kind HistoricJob",
+        "operationId": "listHistoricJob",
+        "parameters": [
+          {
+            "name": "allowWatchBookmarks",
+            "in": "query",
+            "description": "allowWatchBookmarks requests watch events with type \"BOOKMARK\". Servers that do not implement bookmarks may ignore this flag and bookmarks are sent at the server's discretion. Clients should not assume bookmarks are returned at any specific interval, nor may they assume the server will send any BOOKMARK event during a session. If this is not a watch, this field is ignored.",
+            "schema": {
+              "type": "boolean",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "continue",
+            "in": "query",
+            "description": "The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the \"next key\".\n\nThis field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "fieldSelector",
+            "in": "query",
+            "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "labelSelector",
+            "in": "query",
+            "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "limit is a maximum number of responses to return for a list call. If more items exist, the server will set the `continue` field on the list metadata to a value that can be used with the same initial query to retrieve the next set of results. Setting a limit may return fewer than the requested amount of items (up to zero items) in the event all requested objects are filtered out and clients should only use the presence of the continue field to determine whether more results are available. Servers may choose not to support the limit argument and will return all of the available results. If limit is specified and the continue field is empty, clients may assume that no more results are available. This field is not supported if watch is true.\n\nThe server guarantees that the objects returned when using continue will be identical to issuing a single list call without a limit - that is, no objects created, modified, or deleted after the first request is issued will be included in any subsequent continued requests. This is sometimes referred to as a consistent snapshot, and ensures that a client that is using limit to receive smaller chunks of a very large result can ensure they see all possible objects. If objects are updated during a chunked list the version of the object that was present at the time the first list result was calculated is returned.",
+            "schema": {
+              "type": "integer",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "resourceVersion",
+            "in": "query",
+            "description": "resourceVersion sets a constraint on what resource versions a request may be served from. See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "resourceVersionMatch",
+            "in": "query",
+            "description": "resourceVersionMatch determines how resourceVersion is applied to list calls. It is highly recommended that resourceVersionMatch be set for list calls where resourceVersion is set See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "sendInitialEvents",
+            "in": "query",
+            "description": "`sendInitialEvents=true` may be set together with `watch=true`. In that case, the watch stream will begin with synthetic events to produce the current state of objects in the collection. Once all such events have been sent, a synthetic \"Bookmark\" event  will be sent. The bookmark will report the ResourceVersion (RV) corresponding to the set of objects, and be marked with `\"k8s.io/initial-events-end\": \"true\"` annotation. Afterwards, the watch stream will proceed as usual, sending watch events corresponding to changes (subsequent to the RV) to objects watched.\n\nWhen `sendInitialEvents` option is set, we require `resourceVersionMatch` option to also be set. The semantic of the watch request is as following: - `resourceVersionMatch` = NotOlderThan\n  is interpreted as \"data at least as new as the provided `resourceVersion`\"\n  and the bookmark event is send when the state is synced\n  to a `resourceVersion` at least as fresh as the one provided by the ListOptions.\n  If `resourceVersion` is unset, this is interpreted as \"consistent read\" and the\n  bookmark event is send when the state is synced at least to the moment\n  when request started being processed.\n- `resourceVersionMatch` set to any other value or unset\n  Invalid error is returned.\n\nDefaults to true if `resourceVersion=\"\"` or `resourceVersion=\"0\"` (for backward compatibility reasons) and to false otherwise.",
+            "schema": {
+              "type": "boolean",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "timeoutSeconds",
+            "in": "query",
+            "description": "Timeout for the list/watch call. This limits the duration of the call, regardless of any activity or inactivity.",
+            "schema": {
+              "type": "integer",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "watch",
+            "in": "query",
+            "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
+            "schema": {
+              "type": "boolean",
+              "uniqueItems": true
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJobList"
+                }
+              },
+              "application/json;stream=watch": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJobList"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJobList"
+                }
+              },
+              "application/vnd.kubernetes.protobuf;stream=watch": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJobList"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJobList"
+                }
+              }
+            }
+          }
+        },
+        "x-kubernetes-action": "list",
+        "x-kubernetes-group-version-kind": {
+          "group": "provisioning.grafana.app",
+          "version": "v0alpha1",
+          "kind": "HistoricJob"
+        }
+      },
+      "post": {
+        "tags": [
+          "HistoricJob"
+        ],
+        "description": "create a HistoricJob",
+        "operationId": "createHistoricJob",
+        "parameters": [
+          {
+            "name": "dryRun",
+            "in": "query",
+            "description": "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "fieldManager",
+            "in": "query",
+            "description": "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "fieldValidation",
+            "in": "query",
+            "description": "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+              }
+            },
+            "application/vnd.kubernetes.protobuf": {
+              "schema": {
+                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+              }
+            },
+            "application/yaml": {
+              "schema": {
+                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              }
+            }
+          },
+          "201": {
+            "description": "Created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              }
+            }
+          },
+          "202": {
+            "description": "Accepted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              }
+            }
+          }
+        },
+        "x-kubernetes-action": "post",
+        "x-kubernetes-group-version-kind": {
+          "group": "provisioning.grafana.app",
+          "version": "v0alpha1",
+          "kind": "HistoricJob"
+        }
+      },
+      "delete": {
+        "tags": [
+          "HistoricJob"
+        ],
+        "description": "delete collection of HistoricJob",
+        "operationId": "deletecollectionHistoricJob",
+        "parameters": [
+          {
+            "name": "continue",
+            "in": "query",
+            "description": "The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the \"next key\".\n\nThis field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "dryRun",
+            "in": "query",
+            "description": "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "fieldSelector",
+            "in": "query",
+            "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "gracePeriodSeconds",
+            "in": "query",
+            "description": "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately.",
+            "schema": {
+              "type": "integer",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "ignoreStoreReadErrorWithClusterBreakingPotential",
+            "in": "query",
+            "description": "if set to true, it will trigger an unsafe deletion of the resource in case the normal deletion flow fails with a corrupt object error. A resource is considered corrupt if it can not be retrieved from the underlying storage successfully because of a) its data can not be transformed e.g. decryption failure, or b) it fails to decode into an object. NOTE: unsafe deletion ignores finalizer constraints, skips precondition checks, and removes the object from the storage. WARNING: This may potentially break the cluster if the workload associated with the resource being unsafe-deleted relies on normal deletion flow. Use only if you REALLY know what you are doing. The default value is false, and the user must opt in to enable it",
+            "schema": {
+              "type": "boolean",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "labelSelector",
+            "in": "query",
+            "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "limit is a maximum number of responses to return for a list call. If more items exist, the server will set the `continue` field on the list metadata to a value that can be used with the same initial query to retrieve the next set of results. Setting a limit may return fewer than the requested amount of items (up to zero items) in the event all requested objects are filtered out and clients should only use the presence of the continue field to determine whether more results are available. Servers may choose not to support the limit argument and will return all of the available results. If limit is specified and the continue field is empty, clients may assume that no more results are available. This field is not supported if watch is true.\n\nThe server guarantees that the objects returned when using continue will be identical to issuing a single list call without a limit - that is, no objects created, modified, or deleted after the first request is issued will be included in any subsequent continued requests. This is sometimes referred to as a consistent snapshot, and ensures that a client that is using limit to receive smaller chunks of a very large result can ensure they see all possible objects. If objects are updated during a chunked list the version of the object that was present at the time the first list result was calculated is returned.",
+            "schema": {
+              "type": "integer",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "orphanDependents",
+            "in": "query",
+            "description": "Deprecated: please use the PropagationPolicy, this field will be deprecated in 1.7. Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list. Either this field or PropagationPolicy may be set, but not both.",
+            "schema": {
+              "type": "boolean",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "propagationPolicy",
+            "in": "query",
+            "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy. Acceptable values are: 'Orphan' - orphan the dependents; 'Background' - allow the garbage collector to delete the dependents in the background; 'Foreground' - a cascading policy that deletes all dependents in the foreground.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "resourceVersion",
+            "in": "query",
+            "description": "resourceVersion sets a constraint on what resource versions a request may be served from. See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "resourceVersionMatch",
+            "in": "query",
+            "description": "resourceVersionMatch determines how resourceVersion is applied to list calls. It is highly recommended that resourceVersionMatch be set for list calls where resourceVersion is set See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "sendInitialEvents",
+            "in": "query",
+            "description": "`sendInitialEvents=true` may be set together with `watch=true`. In that case, the watch stream will begin with synthetic events to produce the current state of objects in the collection. Once all such events have been sent, a synthetic \"Bookmark\" event  will be sent. The bookmark will report the ResourceVersion (RV) corresponding to the set of objects, and be marked with `\"k8s.io/initial-events-end\": \"true\"` annotation. Afterwards, the watch stream will proceed as usual, sending watch events corresponding to changes (subsequent to the RV) to objects watched.\n\nWhen `sendInitialEvents` option is set, we require `resourceVersionMatch` option to also be set. The semantic of the watch request is as following: - `resourceVersionMatch` = NotOlderThan\n  is interpreted as \"data at least as new as the provided `resourceVersion`\"\n  and the bookmark event is send when the state is synced\n  to a `resourceVersion` at least as fresh as the one provided by the ListOptions.\n  If `resourceVersion` is unset, this is interpreted as \"consistent read\" and the\n  bookmark event is send when the state is synced at least to the moment\n  when request started being processed.\n- `resourceVersionMatch` set to any other value or unset\n  Invalid error is returned.\n\nDefaults to true if `resourceVersion=\"\"` or `resourceVersion=\"0\"` (for backward compatibility reasons) and to false otherwise.",
+            "schema": {
+              "type": "boolean",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "timeoutSeconds",
+            "in": "query",
+            "description": "Timeout for the list/watch call. This limits the duration of the call, regardless of any activity or inactivity.",
+            "schema": {
+              "type": "integer",
+              "uniqueItems": true
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
+                }
+              }
+            }
+          }
+        },
+        "x-kubernetes-action": "deletecollection",
+        "x-kubernetes-group-version-kind": {
+          "group": "provisioning.grafana.app",
+          "version": "v0alpha1",
+          "kind": "HistoricJob"
+        }
+      },
+      "parameters": [
+        {
+          "name": "namespace",
+          "in": "path",
+          "description": "object name and auth scope, such as for teams and projects",
+          "required": true,
+          "schema": {
+            "type": "string",
+            "uniqueItems": true
+          }
+        },
+        {
+          "name": "pretty",
+          "in": "query",
+          "description": "If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget).",
+          "schema": {
+            "type": "string",
+            "uniqueItems": true
+          }
+        }
+      ]
+    },
+    "/apis/provisioning.grafana.app/v0alpha1/namespaces/{namespace}/historicjobs/{name}": {
+      "get": {
+        "tags": [
+          "HistoricJob"
+        ],
+        "description": "read the specified HistoricJob",
+        "operationId": "getHistoricJob",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              }
+            }
+          }
+        },
+        "x-kubernetes-action": "get",
+        "x-kubernetes-group-version-kind": {
+          "group": "provisioning.grafana.app",
+          "version": "v0alpha1",
+          "kind": "HistoricJob"
+        }
+      },
+      "put": {
+        "tags": [
+          "HistoricJob"
+        ],
+        "description": "replace the specified HistoricJob",
+        "operationId": "replaceHistoricJob",
+        "parameters": [
+          {
+            "name": "dryRun",
+            "in": "query",
+            "description": "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "fieldManager",
+            "in": "query",
+            "description": "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "fieldValidation",
+            "in": "query",
+            "description": "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+              }
+            },
+            "application/vnd.kubernetes.protobuf": {
+              "schema": {
+                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+              }
+            },
+            "application/yaml": {
+              "schema": {
+                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              }
+            }
+          },
+          "201": {
+            "description": "Created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              }
+            }
+          }
+        },
+        "x-kubernetes-action": "put",
+        "x-kubernetes-group-version-kind": {
+          "group": "provisioning.grafana.app",
+          "version": "v0alpha1",
+          "kind": "HistoricJob"
+        }
+      },
+      "delete": {
+        "tags": [
+          "HistoricJob"
+        ],
+        "description": "delete a HistoricJob",
+        "operationId": "deleteHistoricJob",
+        "parameters": [
+          {
+            "name": "dryRun",
+            "in": "query",
+            "description": "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "gracePeriodSeconds",
+            "in": "query",
+            "description": "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately.",
+            "schema": {
+              "type": "integer",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "ignoreStoreReadErrorWithClusterBreakingPotential",
+            "in": "query",
+            "description": "if set to true, it will trigger an unsafe deletion of the resource in case the normal deletion flow fails with a corrupt object error. A resource is considered corrupt if it can not be retrieved from the underlying storage successfully because of a) its data can not be transformed e.g. decryption failure, or b) it fails to decode into an object. NOTE: unsafe deletion ignores finalizer constraints, skips precondition checks, and removes the object from the storage. WARNING: This may potentially break the cluster if the workload associated with the resource being unsafe-deleted relies on normal deletion flow. Use only if you REALLY know what you are doing. The default value is false, and the user must opt in to enable it",
+            "schema": {
+              "type": "boolean",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "orphanDependents",
+            "in": "query",
+            "description": "Deprecated: please use the PropagationPolicy, this field will be deprecated in 1.7. Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list. Either this field or PropagationPolicy may be set, but not both.",
+            "schema": {
+              "type": "boolean",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "propagationPolicy",
+            "in": "query",
+            "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy. Acceptable values are: 'Orphan' - orphan the dependents; 'Background' - allow the garbage collector to delete the dependents in the background; 'Foreground' - a cascading policy that deletes all dependents in the foreground.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
+                }
+              }
+            }
+          },
+          "202": {
+            "description": "Accepted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
+                }
+              }
+            }
+          }
+        },
+        "x-kubernetes-action": "delete",
+        "x-kubernetes-group-version-kind": {
+          "group": "provisioning.grafana.app",
+          "version": "v0alpha1",
+          "kind": "HistoricJob"
+        }
+      },
+      "patch": {
+        "tags": [
+          "HistoricJob"
+        ],
+        "description": "partially update the specified HistoricJob",
+        "operationId": "updateHistoricJob",
+        "parameters": [
+          {
+            "name": "dryRun",
+            "in": "query",
+            "description": "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "fieldManager",
+            "in": "query",
+            "description": "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint. This field is required for apply requests (application/apply-patch) but optional for non-apply patch types (JsonPatch, MergePatch, StrategicMergePatch).",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "fieldValidation",
+            "in": "query",
+            "description": "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
+            "schema": {
+              "type": "string",
+              "uniqueItems": true
+            }
+          },
+          {
+            "name": "force",
+            "in": "query",
+            "description": "Force is going to \"force\" Apply requests. It means user will re-acquire conflicting fields owned by other people. Force flag must be unset for non-apply patch requests.",
+            "schema": {
+              "type": "boolean",
+              "uniqueItems": true
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/apply-patch+yaml": {
+              "schema": {
+                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Patch"
+              }
+            },
+            "application/json-patch+json": {
+              "schema": {
+                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Patch"
+              }
+            },
+            "application/merge-patch+json": {
+              "schema": {
+                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Patch"
+              }
+            },
+            "application/strategic-merge-patch+json": {
+              "schema": {
+                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Patch"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              }
+            }
+          },
+          "201": {
+            "description": "Created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/vnd.kubernetes.protobuf": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              },
+              "application/yaml": {
+                "schema": {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              }
+            }
+          }
+        },
+        "x-kubernetes-action": "patch",
+        "x-kubernetes-group-version-kind": {
+          "group": "provisioning.grafana.app",
+          "version": "v0alpha1",
+          "kind": "HistoricJob"
+        }
+      },
+      "parameters": [
+        {
+          "name": "name",
+          "in": "path",
+          "description": "name of the HistoricJob",
+          "required": true,
+          "schema": {
+            "type": "string",
+            "uniqueItems": true
+          }
+        },
+        {
+          "name": "namespace",
+          "in": "path",
+          "description": "object name and auth scope, such as for teams and projects",
+          "required": true,
+          "schema": {
+            "type": "string",
+            "uniqueItems": true
+          }
+        },
+        {
+          "name": "pretty",
+          "in": "query",
+          "description": "If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget).",
+          "schema": {
+            "type": "string",
+            "uniqueItems": true
+          }
+        }
+      ]
+    },
     "/apis/provisioning.grafana.app/v0alpha1/namespaces/{namespace}/jobs": {
       "get": {
         "tags": [
@@ -2802,6 +3632,90 @@
           }
         }
       },
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob": {
+        "description": "HistoricJob is a history entry of Job. It is used to store Jobs that have been processed.\n\nThe repository name and type are stored as labels.",
+        "type": "object",
+        "properties": {
+          "apiVersion": {
+            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+            "type": "string"
+          },
+          "kind": {
+            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+            "type": "string"
+          },
+          "metadata": {
+            "default": {},
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"
+              }
+            ]
+          },
+          "spec": {
+            "default": {},
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.JobSpec"
+              }
+            ]
+          },
+          "status": {
+            "default": {},
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.JobStatus"
+              }
+            ]
+          }
+        },
+        "x-kubernetes-group-version-kind": [
+          {
+            "group": "provisioning.grafana.app",
+            "kind": "HistoricJob",
+            "version": "v0alpha1"
+          }
+        ]
+      },
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJobList": {
+        "type": "object",
+        "properties": {
+          "apiVersion": {
+            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+            "type": "string"
+          },
+          "items": {
+            "type": "array",
+            "items": {
+              "default": {},
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
+                }
+              ]
+            }
+          },
+          "kind": {
+            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+            "type": "string"
+          },
+          "metadata": {
+            "default": {},
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta"
+              }
+            ]
+          }
+        },
+        "x-kubernetes-group-version-kind": [
+          {
+            "group": "provisioning.grafana.app",
+            "kind": "HistoricJobList",
+            "version": "v0alpha1"
+          }
+        ]
+      },
       "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.Job": {
         "description": "The repository name and type are stored as labels",
         "type": "object",
@@ -4301,6 +5215,51 @@
           }
         }
       },
+      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.HistoricJob": {
+        "description": "HistoricJob is a history entry of Job. It is used to store Jobs that have been processed.\n\nThe repository name and type are stored as labels.",
+        "type": "object",
+        "properties": {
+          "apiVersion": {
+            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+            "type": "string"
+          },
+          "kind": {
+            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+            "type": "string"
+          },
+          "metadata": {
+            "default": {}
+          },
+          "spec": {
+            "default": {}
+          },
+          "status": {
+            "default": {}
+          }
+        }
+      },
+      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.HistoricJobList": {
+        "type": "object",
+        "properties": {
+          "apiVersion": {
+            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+            "type": "string"
+          },
+          "items": {
+            "type": "array",
+            "items": {
+              "default": {}
+            }
+          },
+          "kind": {
+            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+            "type": "string"
+          },
+          "metadata": {
+            "default": {}
+          }
+        }
+      },
       "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.HistoryItem": {
         "type": "object",
         "required": [

From 439d4d383cbd30afeeebe577fb849d48882cb08e Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 11 Aug 2025 13:47:33 +0300
Subject: [PATCH 074/243] Provisioning: Hide HistoricJobs from OpenAPI spec
 (#109454)

histtoric jobs
---
 .../pkg/apis/provisioning/v0alpha1/jobs.go    |   6 +-
 .../v0alpha1/zz_generated.openapi.go          |   2 +-
 pkg/registry/apis/provisioning/register.go    |  10 +-
 .../provisioning.grafana.app-v0alpha1.json    | 834 +-----------------
 4 files changed, 17 insertions(+), 835 deletions(-)

diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go
index 814f2e56a3d..d28c96f08aa 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go
@@ -236,7 +236,11 @@ type JobResourceSummary struct {
 	Errors []string `json:"errors,omitempty"`
 }
 
-// HistoricJob is a history entry of Job. It is used to store Jobs that have been processed.
+// HistoricJob is an append only log, saving all jobs that have been processed.
+//
+// NOTE: This should not be used directly by any external consumer.
+// When there is a more stable integration with loki (an appropriate append only store)
+// this may be removed without notice.
 //
 // The repository name and type are stored as labels.
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
index a05e91483a8..6c3445f6a66 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
@@ -608,7 +608,7 @@ func schema_pkg_apis_provisioning_v0alpha1_HistoricJob(ref common.ReferenceCallb
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Description: "HistoricJob is a history entry of Job. It is used to store Jobs that have been processed.\n\nThe repository name and type are stored as labels.",
+				Description: "HistoricJob is an append only log, saving all jobs that have been processed.\n\nNOTE: This should not be used directly by any external consumer. When there is a more stable integration with loki (an appropriate append only store) this may be removed without notice.\n\nThe repository name and type are stored as labels.",
 				Type:        []string{"object"},
 				Properties: map[string]spec.Schema{
 					"kind": {
diff --git a/pkg/registry/apis/provisioning/register.go b/pkg/registry/apis/provisioning/register.go
index b741d55cdd2..241930c75e1 100644
--- a/pkg/registry/apis/provisioning/register.go
+++ b/pkg/registry/apis/provisioning/register.go
@@ -775,8 +775,16 @@ func (b *APIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.OpenAPI, err
 	oas.Info.Description = "Provisioning"
 
 	root := "/apis/" + b.GetGroupVersion().String() + "/"
-	repoprefix := root + "namespaces/{namespace}/repositories/{name}"
 
+	// Hide the internal historic jobs endpoint from the OpenAPI spec.
+	historicjobs := root + "namespaces/{namespace}/historicjobs"
+	for path := range oas.Paths.Paths {
+		if strings.HasPrefix(path, historicjobs) {
+			delete(oas.Paths.Paths, path)
+		}
+	}
+
+	repoprefix := root + "namespaces/{namespace}/repositories/{name}"
 	defs := b.GetOpenAPIDefinitions()(func(path string) spec.Ref { return spec.Ref{} })
 	defsBase := "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1."
 	refsBase := "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1."
diff --git a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
index bee7f437b4d..d57917f2e21 100644
--- a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
@@ -36,836 +36,6 @@
         }
       }
     },
-    "/apis/provisioning.grafana.app/v0alpha1/namespaces/{namespace}/historicjobs": {
-      "get": {
-        "tags": [
-          "HistoricJob"
-        ],
-        "description": "list or watch objects of kind HistoricJob",
-        "operationId": "listHistoricJob",
-        "parameters": [
-          {
-            "name": "allowWatchBookmarks",
-            "in": "query",
-            "description": "allowWatchBookmarks requests watch events with type \"BOOKMARK\". Servers that do not implement bookmarks may ignore this flag and bookmarks are sent at the server's discretion. Clients should not assume bookmarks are returned at any specific interval, nor may they assume the server will send any BOOKMARK event during a session. If this is not a watch, this field is ignored.",
-            "schema": {
-              "type": "boolean",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "continue",
-            "in": "query",
-            "description": "The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the \"next key\".\n\nThis field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "fieldSelector",
-            "in": "query",
-            "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "labelSelector",
-            "in": "query",
-            "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "limit",
-            "in": "query",
-            "description": "limit is a maximum number of responses to return for a list call. If more items exist, the server will set the `continue` field on the list metadata to a value that can be used with the same initial query to retrieve the next set of results. Setting a limit may return fewer than the requested amount of items (up to zero items) in the event all requested objects are filtered out and clients should only use the presence of the continue field to determine whether more results are available. Servers may choose not to support the limit argument and will return all of the available results. If limit is specified and the continue field is empty, clients may assume that no more results are available. This field is not supported if watch is true.\n\nThe server guarantees that the objects returned when using continue will be identical to issuing a single list call without a limit - that is, no objects created, modified, or deleted after the first request is issued will be included in any subsequent continued requests. This is sometimes referred to as a consistent snapshot, and ensures that a client that is using limit to receive smaller chunks of a very large result can ensure they see all possible objects. If objects are updated during a chunked list the version of the object that was present at the time the first list result was calculated is returned.",
-            "schema": {
-              "type": "integer",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "resourceVersion",
-            "in": "query",
-            "description": "resourceVersion sets a constraint on what resource versions a request may be served from. See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "resourceVersionMatch",
-            "in": "query",
-            "description": "resourceVersionMatch determines how resourceVersion is applied to list calls. It is highly recommended that resourceVersionMatch be set for list calls where resourceVersion is set See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "sendInitialEvents",
-            "in": "query",
-            "description": "`sendInitialEvents=true` may be set together with `watch=true`. In that case, the watch stream will begin with synthetic events to produce the current state of objects in the collection. Once all such events have been sent, a synthetic \"Bookmark\" event  will be sent. The bookmark will report the ResourceVersion (RV) corresponding to the set of objects, and be marked with `\"k8s.io/initial-events-end\": \"true\"` annotation. Afterwards, the watch stream will proceed as usual, sending watch events corresponding to changes (subsequent to the RV) to objects watched.\n\nWhen `sendInitialEvents` option is set, we require `resourceVersionMatch` option to also be set. The semantic of the watch request is as following: - `resourceVersionMatch` = NotOlderThan\n  is interpreted as \"data at least as new as the provided `resourceVersion`\"\n  and the bookmark event is send when the state is synced\n  to a `resourceVersion` at least as fresh as the one provided by the ListOptions.\n  If `resourceVersion` is unset, this is interpreted as \"consistent read\" and the\n  bookmark event is send when the state is synced at least to the moment\n  when request started being processed.\n- `resourceVersionMatch` set to any other value or unset\n  Invalid error is returned.\n\nDefaults to true if `resourceVersion=\"\"` or `resourceVersion=\"0\"` (for backward compatibility reasons) and to false otherwise.",
-            "schema": {
-              "type": "boolean",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "timeoutSeconds",
-            "in": "query",
-            "description": "Timeout for the list/watch call. This limits the duration of the call, regardless of any activity or inactivity.",
-            "schema": {
-              "type": "integer",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "watch",
-            "in": "query",
-            "description": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.",
-            "schema": {
-              "type": "boolean",
-              "uniqueItems": true
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJobList"
-                }
-              },
-              "application/json;stream=watch": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJobList"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJobList"
-                }
-              },
-              "application/vnd.kubernetes.protobuf;stream=watch": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJobList"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJobList"
-                }
-              }
-            }
-          }
-        },
-        "x-kubernetes-action": "list",
-        "x-kubernetes-group-version-kind": {
-          "group": "provisioning.grafana.app",
-          "version": "v0alpha1",
-          "kind": "HistoricJob"
-        }
-      },
-      "post": {
-        "tags": [
-          "HistoricJob"
-        ],
-        "description": "create a HistoricJob",
-        "operationId": "createHistoricJob",
-        "parameters": [
-          {
-            "name": "dryRun",
-            "in": "query",
-            "description": "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "fieldManager",
-            "in": "query",
-            "description": "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "fieldValidation",
-            "in": "query",
-            "description": "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-              }
-            },
-            "application/vnd.kubernetes.protobuf": {
-              "schema": {
-                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-              }
-            },
-            "application/yaml": {
-              "schema": {
-                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              }
-            }
-          },
-          "201": {
-            "description": "Created",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              }
-            }
-          },
-          "202": {
-            "description": "Accepted",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              }
-            }
-          }
-        },
-        "x-kubernetes-action": "post",
-        "x-kubernetes-group-version-kind": {
-          "group": "provisioning.grafana.app",
-          "version": "v0alpha1",
-          "kind": "HistoricJob"
-        }
-      },
-      "delete": {
-        "tags": [
-          "HistoricJob"
-        ],
-        "description": "delete collection of HistoricJob",
-        "operationId": "deletecollectionHistoricJob",
-        "parameters": [
-          {
-            "name": "continue",
-            "in": "query",
-            "description": "The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the \"next key\".\n\nThis field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "dryRun",
-            "in": "query",
-            "description": "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "fieldSelector",
-            "in": "query",
-            "description": "A selector to restrict the list of returned objects by their fields. Defaults to everything.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "gracePeriodSeconds",
-            "in": "query",
-            "description": "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately.",
-            "schema": {
-              "type": "integer",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "ignoreStoreReadErrorWithClusterBreakingPotential",
-            "in": "query",
-            "description": "if set to true, it will trigger an unsafe deletion of the resource in case the normal deletion flow fails with a corrupt object error. A resource is considered corrupt if it can not be retrieved from the underlying storage successfully because of a) its data can not be transformed e.g. decryption failure, or b) it fails to decode into an object. NOTE: unsafe deletion ignores finalizer constraints, skips precondition checks, and removes the object from the storage. WARNING: This may potentially break the cluster if the workload associated with the resource being unsafe-deleted relies on normal deletion flow. Use only if you REALLY know what you are doing. The default value is false, and the user must opt in to enable it",
-            "schema": {
-              "type": "boolean",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "labelSelector",
-            "in": "query",
-            "description": "A selector to restrict the list of returned objects by their labels. Defaults to everything.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "limit",
-            "in": "query",
-            "description": "limit is a maximum number of responses to return for a list call. If more items exist, the server will set the `continue` field on the list metadata to a value that can be used with the same initial query to retrieve the next set of results. Setting a limit may return fewer than the requested amount of items (up to zero items) in the event all requested objects are filtered out and clients should only use the presence of the continue field to determine whether more results are available. Servers may choose not to support the limit argument and will return all of the available results. If limit is specified and the continue field is empty, clients may assume that no more results are available. This field is not supported if watch is true.\n\nThe server guarantees that the objects returned when using continue will be identical to issuing a single list call without a limit - that is, no objects created, modified, or deleted after the first request is issued will be included in any subsequent continued requests. This is sometimes referred to as a consistent snapshot, and ensures that a client that is using limit to receive smaller chunks of a very large result can ensure they see all possible objects. If objects are updated during a chunked list the version of the object that was present at the time the first list result was calculated is returned.",
-            "schema": {
-              "type": "integer",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "orphanDependents",
-            "in": "query",
-            "description": "Deprecated: please use the PropagationPolicy, this field will be deprecated in 1.7. Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list. Either this field or PropagationPolicy may be set, but not both.",
-            "schema": {
-              "type": "boolean",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "propagationPolicy",
-            "in": "query",
-            "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy. Acceptable values are: 'Orphan' - orphan the dependents; 'Background' - allow the garbage collector to delete the dependents in the background; 'Foreground' - a cascading policy that deletes all dependents in the foreground.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "resourceVersion",
-            "in": "query",
-            "description": "resourceVersion sets a constraint on what resource versions a request may be served from. See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "resourceVersionMatch",
-            "in": "query",
-            "description": "resourceVersionMatch determines how resourceVersion is applied to list calls. It is highly recommended that resourceVersionMatch be set for list calls where resourceVersion is set See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.\n\nDefaults to unset",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "sendInitialEvents",
-            "in": "query",
-            "description": "`sendInitialEvents=true` may be set together with `watch=true`. In that case, the watch stream will begin with synthetic events to produce the current state of objects in the collection. Once all such events have been sent, a synthetic \"Bookmark\" event  will be sent. The bookmark will report the ResourceVersion (RV) corresponding to the set of objects, and be marked with `\"k8s.io/initial-events-end\": \"true\"` annotation. Afterwards, the watch stream will proceed as usual, sending watch events corresponding to changes (subsequent to the RV) to objects watched.\n\nWhen `sendInitialEvents` option is set, we require `resourceVersionMatch` option to also be set. The semantic of the watch request is as following: - `resourceVersionMatch` = NotOlderThan\n  is interpreted as \"data at least as new as the provided `resourceVersion`\"\n  and the bookmark event is send when the state is synced\n  to a `resourceVersion` at least as fresh as the one provided by the ListOptions.\n  If `resourceVersion` is unset, this is interpreted as \"consistent read\" and the\n  bookmark event is send when the state is synced at least to the moment\n  when request started being processed.\n- `resourceVersionMatch` set to any other value or unset\n  Invalid error is returned.\n\nDefaults to true if `resourceVersion=\"\"` or `resourceVersion=\"0\"` (for backward compatibility reasons) and to false otherwise.",
-            "schema": {
-              "type": "boolean",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "timeoutSeconds",
-            "in": "query",
-            "description": "Timeout for the list/watch call. This limits the duration of the call, regardless of any activity or inactivity.",
-            "schema": {
-              "type": "integer",
-              "uniqueItems": true
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
-                }
-              }
-            }
-          }
-        },
-        "x-kubernetes-action": "deletecollection",
-        "x-kubernetes-group-version-kind": {
-          "group": "provisioning.grafana.app",
-          "version": "v0alpha1",
-          "kind": "HistoricJob"
-        }
-      },
-      "parameters": [
-        {
-          "name": "namespace",
-          "in": "path",
-          "description": "object name and auth scope, such as for teams and projects",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        },
-        {
-          "name": "pretty",
-          "in": "query",
-          "description": "If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget).",
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        }
-      ]
-    },
-    "/apis/provisioning.grafana.app/v0alpha1/namespaces/{namespace}/historicjobs/{name}": {
-      "get": {
-        "tags": [
-          "HistoricJob"
-        ],
-        "description": "read the specified HistoricJob",
-        "operationId": "getHistoricJob",
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              }
-            }
-          }
-        },
-        "x-kubernetes-action": "get",
-        "x-kubernetes-group-version-kind": {
-          "group": "provisioning.grafana.app",
-          "version": "v0alpha1",
-          "kind": "HistoricJob"
-        }
-      },
-      "put": {
-        "tags": [
-          "HistoricJob"
-        ],
-        "description": "replace the specified HistoricJob",
-        "operationId": "replaceHistoricJob",
-        "parameters": [
-          {
-            "name": "dryRun",
-            "in": "query",
-            "description": "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "fieldManager",
-            "in": "query",
-            "description": "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "fieldValidation",
-            "in": "query",
-            "description": "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-              }
-            },
-            "application/vnd.kubernetes.protobuf": {
-              "schema": {
-                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-              }
-            },
-            "application/yaml": {
-              "schema": {
-                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              }
-            }
-          },
-          "201": {
-            "description": "Created",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              }
-            }
-          }
-        },
-        "x-kubernetes-action": "put",
-        "x-kubernetes-group-version-kind": {
-          "group": "provisioning.grafana.app",
-          "version": "v0alpha1",
-          "kind": "HistoricJob"
-        }
-      },
-      "delete": {
-        "tags": [
-          "HistoricJob"
-        ],
-        "description": "delete a HistoricJob",
-        "operationId": "deleteHistoricJob",
-        "parameters": [
-          {
-            "name": "dryRun",
-            "in": "query",
-            "description": "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "gracePeriodSeconds",
-            "in": "query",
-            "description": "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately.",
-            "schema": {
-              "type": "integer",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "ignoreStoreReadErrorWithClusterBreakingPotential",
-            "in": "query",
-            "description": "if set to true, it will trigger an unsafe deletion of the resource in case the normal deletion flow fails with a corrupt object error. A resource is considered corrupt if it can not be retrieved from the underlying storage successfully because of a) its data can not be transformed e.g. decryption failure, or b) it fails to decode into an object. NOTE: unsafe deletion ignores finalizer constraints, skips precondition checks, and removes the object from the storage. WARNING: This may potentially break the cluster if the workload associated with the resource being unsafe-deleted relies on normal deletion flow. Use only if you REALLY know what you are doing. The default value is false, and the user must opt in to enable it",
-            "schema": {
-              "type": "boolean",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "orphanDependents",
-            "in": "query",
-            "description": "Deprecated: please use the PropagationPolicy, this field will be deprecated in 1.7. Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list. Either this field or PropagationPolicy may be set, but not both.",
-            "schema": {
-              "type": "boolean",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "propagationPolicy",
-            "in": "query",
-            "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy. Acceptable values are: 'Orphan' - orphan the dependents; 'Background' - allow the garbage collector to delete the dependents in the background; 'Foreground' - a cascading policy that deletes all dependents in the foreground.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
-                }
-              }
-            }
-          },
-          "202": {
-            "description": "Accepted",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
-                }
-              }
-            }
-          }
-        },
-        "x-kubernetes-action": "delete",
-        "x-kubernetes-group-version-kind": {
-          "group": "provisioning.grafana.app",
-          "version": "v0alpha1",
-          "kind": "HistoricJob"
-        }
-      },
-      "patch": {
-        "tags": [
-          "HistoricJob"
-        ],
-        "description": "partially update the specified HistoricJob",
-        "operationId": "updateHistoricJob",
-        "parameters": [
-          {
-            "name": "dryRun",
-            "in": "query",
-            "description": "When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "fieldManager",
-            "in": "query",
-            "description": "fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint. This field is required for apply requests (application/apply-patch) but optional for non-apply patch types (JsonPatch, MergePatch, StrategicMergePatch).",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "fieldValidation",
-            "in": "query",
-            "description": "fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered.",
-            "schema": {
-              "type": "string",
-              "uniqueItems": true
-            }
-          },
-          {
-            "name": "force",
-            "in": "query",
-            "description": "Force is going to \"force\" Apply requests. It means user will re-acquire conflicting fields owned by other people. Force flag must be unset for non-apply patch requests.",
-            "schema": {
-              "type": "boolean",
-              "uniqueItems": true
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/apply-patch+yaml": {
-              "schema": {
-                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Patch"
-              }
-            },
-            "application/json-patch+json": {
-              "schema": {
-                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Patch"
-              }
-            },
-            "application/merge-patch+json": {
-              "schema": {
-                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Patch"
-              }
-            },
-            "application/strategic-merge-patch+json": {
-              "schema": {
-                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Patch"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              }
-            }
-          },
-          "201": {
-            "description": "Created",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/vnd.kubernetes.protobuf": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              },
-              "application/yaml": {
-                "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob"
-                }
-              }
-            }
-          }
-        },
-        "x-kubernetes-action": "patch",
-        "x-kubernetes-group-version-kind": {
-          "group": "provisioning.grafana.app",
-          "version": "v0alpha1",
-          "kind": "HistoricJob"
-        }
-      },
-      "parameters": [
-        {
-          "name": "name",
-          "in": "path",
-          "description": "name of the HistoricJob",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        },
-        {
-          "name": "namespace",
-          "in": "path",
-          "description": "object name and auth scope, such as for teams and projects",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        },
-        {
-          "name": "pretty",
-          "in": "query",
-          "description": "If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget).",
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        }
-      ]
-    },
     "/apis/provisioning.grafana.app/v0alpha1/namespaces/{namespace}/jobs": {
       "get": {
         "tags": [
@@ -3633,7 +2803,7 @@
         }
       },
       "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoricJob": {
-        "description": "HistoricJob is a history entry of Job. It is used to store Jobs that have been processed.\n\nThe repository name and type are stored as labels.",
+        "description": "HistoricJob is an append only log, saving all jobs that have been processed.\n\nNOTE: This should not be used directly by any external consumer. When there is a more stable integration with loki (an appropriate append only store) this may be removed without notice.\n\nThe repository name and type are stored as labels.",
         "type": "object",
         "properties": {
           "apiVersion": {
@@ -5216,7 +4386,7 @@
         }
       },
       "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.HistoricJob": {
-        "description": "HistoricJob is a history entry of Job. It is used to store Jobs that have been processed.\n\nThe repository name and type are stored as labels.",
+        "description": "HistoricJob is an append only log, saving all jobs that have been processed.\n\nNOTE: This should not be used directly by any external consumer. When there is a more stable integration with loki (an appropriate append only store) this may be removed without notice.\n\nThe repository name and type are stored as labels.",
         "type": "object",
         "properties": {
           "apiVersion": {

From 6ca3d8a27ac630a106619950d2d2df041b0bffff Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Mon, 11 Aug 2025 12:57:20 +0200
Subject: [PATCH 075/243] Alerting: Enable alertingSaveStateCompressed by
 default (#109390)

---
 packages/grafana-data/src/types/featureToggles.gen.ts | 2 +-
 pkg/services/featuremgmt/registry.go                  | 2 +-
 pkg/services/featuremgmt/toggles_gen.json             | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 977ecadda45..ab2b61ba179 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -447,7 +447,7 @@ export interface FeatureToggles {
   alertingSaveStatePeriodic?: boolean;
   /**
   * Enables the compressed protobuf-based alert state storage
-  * @default false
+  * @default true
   */
   alertingSaveStateCompressed?: boolean;
   /**
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 58b874aaa54..96e117d40cf 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -759,7 +759,7 @@ var (
 			Stage:        FeatureStagePublicPreview,
 			FrontendOnly: false,
 			Owner:        grafanaAlertingSquad,
-			Expression:   "false",
+			Expression:   "true",
 		},
 		{
 			Name:              "scopeApi",
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index a68e0239c7f..6edcea489d1 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -444,14 +444,17 @@
     {
       "metadata": {
         "name": "alertingSaveStateCompressed",
-        "resourceVersion": "1753448760331",
-        "creationTimestamp": "2025-01-27T17:47:33Z"
+        "resourceVersion": "1754657532777",
+        "creationTimestamp": "2025-01-27T17:47:33Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2025-08-08 12:52:12.777935 +0000 UTC"
+        }
       },
       "spec": {
         "description": "Enables the compressed protobuf-based alert state storage",
         "stage": "preview",
         "codeowner": "@grafana/alerting-squad",
-        "expression": "false"
+        "expression": "true"
       }
     },
     {

From f3182a383814879679f9f9272b17a908c171107a Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Mon, 11 Aug 2025 13:27:54 +0200
Subject: [PATCH 076/243] Dashboard Migrations: Add observability logging to
 dashboard conversion process (#109368)

---
 apps/dashboard/go.mod                         |  2 +-
 .../pkg/migration/conversion/conversion.go    |  3 ++
 apps/dashboard/pkg/migration/conversion/v0.go | 40 +++++++++++++++++
 apps/dashboard/pkg/migration/metrics.go       | 44 +++++++++++++++++++
 4 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 apps/dashboard/pkg/migration/metrics.go

diff --git a/apps/dashboard/go.mod b/apps/dashboard/go.mod
index 30fd80214d5..ed72fa1aa90 100644
--- a/apps/dashboard/go.mod
+++ b/apps/dashboard/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/grafana/grafana-app-sdk v0.40.3
 	github.com/grafana/grafana-plugin-sdk-go v0.278.0
 	github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250514132646-acbc7b54ed9e
+	github.com/prometheus/client_golang v1.23.0
 	github.com/stretchr/testify v1.10.0
 	k8s.io/apimachinery v0.33.3
 	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
@@ -80,7 +81,6 @@ require (
 	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.23.0 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.65.0 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
diff --git a/apps/dashboard/pkg/migration/conversion/conversion.go b/apps/dashboard/pkg/migration/conversion/conversion.go
index fb78859fc3c..ca93badb127 100644
--- a/apps/dashboard/pkg/migration/conversion/conversion.go
+++ b/apps/dashboard/pkg/migration/conversion/conversion.go
@@ -8,8 +8,11 @@ import (
 	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
 	dashv2alpha1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1"
 	dashv2beta1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2beta1"
+	"github.com/grafana/grafana/pkg/infra/log"
 )
 
+var logger = log.New("dashboard.conversion")
+
 func RegisterConversions(s *runtime.Scheme) error {
 	// v0 conversions
 	if err := s.AddConversionFunc((*dashv0.Dashboard)(nil), (*dashv1.Dashboard)(nil), func(a, b interface{}, scope conversion.Scope) error {
diff --git a/apps/dashboard/pkg/migration/conversion/v0.go b/apps/dashboard/pkg/migration/conversion/v0.go
index a63fe00f611..6ea720a3fb5 100644
--- a/apps/dashboard/pkg/migration/conversion/v0.go
+++ b/apps/dashboard/pkg/migration/conversion/v0.go
@@ -1,6 +1,9 @@
 package conversion
 
 import (
+	"errors"
+	"fmt"
+
 	"k8s.io/apimachinery/pkg/conversion"
 
 	dashv0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
@@ -25,8 +28,45 @@ func Convert_V0_to_V1(in *dashv0.Dashboard, out *dashv1.Dashboard, scope convers
 	if err := migration.Migrate(out.Spec.Object, schemaversion.LATEST_VERSION); err != nil {
 		out.Status.Conversion.Failed = true
 		out.Status.Conversion.Error = err.Error()
+
+		// Classify error type for metrics
+		errorType := "conversion_error"
+		var migrationErr *schemaversion.MigrationError
+		var minVersionErr *schemaversion.MinimumVersionError
+		if errors.As(err, &migrationErr) {
+			errorType = "schema_version_migration_error"
+		} else if errors.As(err, &minVersionErr) {
+			errorType = "schema_minimum_version_error"
+		}
+
+		// Record failure metrics
+		migration.MDashboardConversionFailureTotal.WithLabelValues(
+			dashv0.APIVERSION,
+			dashv1.APIVERSION,
+			fmt.Sprintf("%v", in.Spec.Object["schemaVersion"]),
+			fmt.Sprintf("%d", schemaversion.LATEST_VERSION),
+			errorType,
+		).Inc()
+
+		logger.Error("Dashboard conversion failed",
+			"sourceVersionAPI", dashv0.APIVERSION,
+			"targetVersionAPI", dashv1.APIVERSION,
+			"dashboardUID", in.UID,
+			"sourceSchemaVersion", in.Spec.Object["schemaVersion"],
+			"targetSchemaVersion", schemaversion.LATEST_VERSION,
+			"errorType", errorType,
+			"error", err)
+
+		return nil
 	}
 
+	migration.MDashboardConversionSuccessTotal.WithLabelValues(
+		dashv0.APIVERSION,
+		dashv1.APIVERSION,
+		fmt.Sprintf("%v", in.Spec.Object["schemaVersion"]),
+		fmt.Sprintf("%d", schemaversion.LATEST_VERSION),
+	).Inc()
+
 	return nil
 }
 
diff --git a/apps/dashboard/pkg/migration/metrics.go b/apps/dashboard/pkg/migration/metrics.go
new file mode 100644
index 00000000000..04e88370e74
--- /dev/null
+++ b/apps/dashboard/pkg/migration/metrics.go
@@ -0,0 +1,44 @@
+package migration
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+const (
+	metricsNamespace = "grafana"
+	metricsSubSystem = "dashboard_migration"
+)
+
+var (
+	// MDashboardConversionSuccessTotal is a metric counter for successful dashboard conversions
+	MDashboardConversionSuccessTotal *prometheus.CounterVec
+
+	// MDashboardConversionFailureTotal is a metric counter for failed dashboard conversions
+	MDashboardConversionFailureTotal *prometheus.CounterVec
+)
+
+func init() {
+	MDashboardConversionSuccessTotal = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Namespace: metricsNamespace,
+		Subsystem: metricsSubSystem,
+		Name:      "conversion_success_total",
+		Help:      "Total number of successful dashboard conversions",
+	}, []string{"source_version_api", "target_version_api", "source_schema_version", "target_schema_version"})
+
+	MDashboardConversionFailureTotal = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Namespace: metricsNamespace,
+		Subsystem: metricsSubSystem,
+		Name:      "conversion_failure_total",
+		Help:      "Total number of failed dashboard conversions",
+	}, []string{"source_version_api", "target_version_api", "source_schema_version", "target_schema_version", "error_type"})
+}
+
+// RegisterMetrics registers all migration metrics with the provided Prometheus registerer
+func RegisterMetrics(reg prometheus.Registerer) {
+	if reg != nil {
+		reg.MustRegister(
+			MDashboardConversionSuccessTotal,
+			MDashboardConversionFailureTotal,
+		)
+	}
+}

From 4682a288a3c9827a11caf6ff9af78c6378f44b99 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Mon, 11 Aug 2025 13:38:50 +0200
Subject: [PATCH 077/243] Dashboard: Add processingTime metric for easier
 querying and bump scenes to 6.29.7 (#109442)

* Dashboard: Add processingTime calculation to profiler and upgrade scenes

- Add processingTime calculation (duration - networkDuration) to dashboard profiler
- Upgrade to @grafana/scenes 6.29.6 with profiler improvements
- Update documentation

* Bump scenes to stable

* Cancel ongoing profile on dashboard scene page page unmount

* Update docs

* Bump latest scenes
---
 package.json                                  |  4 ++--
 .../pages/DashboardScenePage.tsx              |  2 ++
 .../dashboard/services/DashboardProfiler.ts   |  1 +
 .../dashboard-render-performance-profiling.md | 17 +++++++++++++-
 yarn.lock                                     | 22 +++++++++----------
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 4946d16793d..dd9cc608ef9 100644
--- a/package.json
+++ b/package.json
@@ -289,8 +289,8 @@
     "@grafana/plugin-ui": "0.10.9",
     "@grafana/prometheus": "workspace:*",
     "@grafana/runtime": "workspace:*",
-    "@grafana/scenes": "6.29.5",
-    "@grafana/scenes-react": "6.29.5",
+    "@grafana/scenes": "6.29.7",
+    "@grafana/scenes-react": "6.29.7",
     "@grafana/schema": "workspace:*",
     "@grafana/sql": "workspace:*",
     "@grafana/ui": "workspace:*",
diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePage.tsx b/public/app/features/dashboard-scene/pages/DashboardScenePage.tsx
index ef1ec38b653..d7eb249f1c7 100644
--- a/public/app/features/dashboard-scene/pages/DashboardScenePage.tsx
+++ b/public/app/features/dashboard-scene/pages/DashboardScenePage.tsx
@@ -11,6 +11,7 @@ import PageLoader from 'app/core/components/PageLoader/PageLoader';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { DashboardPageError } from 'app/features/dashboard/containers/DashboardPageError';
 import { DashboardPageRouteParams, DashboardPageRouteSearchParams } from 'app/features/dashboard/containers/types';
+import { getDashboardSceneProfiler } from 'app/features/dashboard/services/DashboardProfiler';
 import { DashboardRoutes } from 'app/types/dashboard';
 
 import { DashboardPrompt } from '../saving/DashboardPrompt';
@@ -48,6 +49,7 @@ export function DashboardScenePage({ route, queryParams, location }: Props) {
     }
 
     return () => {
+      getDashboardSceneProfiler().cancelProfile();
       preserveDashboardSceneStateInLocalStorage(locationService.getSearch(), uid);
       stateManager.clearState();
       stateManager.resetActiveManager();
diff --git a/public/app/features/dashboard/services/DashboardProfiler.ts b/public/app/features/dashboard/services/DashboardProfiler.ts
index aa4ce4d2caa..e62a8382d24 100644
--- a/public/app/features/dashboard/services/DashboardProfiler.ts
+++ b/public/app/features/dashboard/services/DashboardProfiler.ts
@@ -15,6 +15,7 @@ export function getDashboardInteractionCallback(uid: string, title: string) {
     const payload = {
       duration: e.duration,
       networkDuration: e.networkDuration,
+      processingTime: e.duration - e.networkDuration,
       startTs: e.startTs,
       endTs: e.endTs,
       totalJSHeapSize: e.totalJSHeapSize,
diff --git a/public/app/features/dashboard/services/dashboard-render-performance-profiling.md b/public/app/features/dashboard/services/dashboard-render-performance-profiling.md
index c31f8d0933e..465fdcc4465 100644
--- a/public/app/features/dashboard/services/dashboard-render-performance-profiling.md
+++ b/public/app/features/dashboard/services/dashboard-render-performance-profiling.md
@@ -63,6 +63,7 @@ The interactions mentioned above are reported to Echo service as well as sent to
 const payload = {
   duration: e.duration,
   networkDuration: e.networkDuration,
+  processingTime: e.duration - e.networkDuration,
   startTs: e.startTs,
   endTs: e.endTs,
   totalJSHeapSize: e.totalJSHeapSize,
@@ -108,11 +109,22 @@ interface SceneInteractionProfileEvent {
 For each tracked interaction, the system collects:
 
 - **Dashboard Metadata**: UID, title
-- **Performance Metrics**: Duration, network duration
+- **Performance Metrics**:
+  - `duration`: Total interaction time from start to finish
+  - `networkDuration`: Time spent on network requests (API calls, data fetching)
+  - `processingTime`: Client-side processing time calculated as `duration - networkDuration`
 - **Memory Metrics**: JavaScript heap usage statistics
 - **Timing Information**: Time since boot, profile start and end timestamps
 - **Interaction Context**: Type of user interaction
 
+#### Performance Metric Breakdown
+
+The performance metrics provide detailed insights into where time is spent during dashboard interactions:
+
+- **Total Duration (`duration`)**: Complete time from interaction start to completion
+- **Network Time (`networkDuration`)**: Time spent waiting for server responses (data source queries, API calls)
+- **Processing Time (`processingTime`)**: Time spent on client-side operations (rendering, computations, DOM updates)
+
 ## Debugging and Development
 
 ### Enable Profiler Debug Logging
@@ -176,6 +188,7 @@ The system reports the following data for each interaction:
   uid: string,                  // Dashboard UID
   duration: number,             // Total duration
   networkDuration: number,      // Network time
+  processingTime: number,       // Client-side processing time (duration - networkDuration)
   startTs: number,              // Profile start timestamp
   endTs: number,                // Profile end timestamp
   totalJSHeapSize: number,      // Memory metrics
@@ -231,3 +244,5 @@ This fallback catches cases where visibility events might be missed and prevents
 - [PR #1199 - SceneRenderProfiler: add start and end timestamps to profile events](https://github.com/grafana/scenes/pull/1199)
 - [PR #1205 - SceneRenderProfiler: Handle tab inactivity](https://github.com/grafana/scenes/pull/1205)
 - [PR #1209 - SceneRenderProfiler: Only capture network requests within measurement window](https://github.com/grafana/scenes/pull/1209)
+- [PR #1211 - SceneRenderProfiler: Improve profiler accuracy by adding cancellation and skipping inactive tabs](https://github.com/grafana/scenes/pull/1211)
+- [PR #1212 - SceneQueryController: Fix profiler query controller registration on scene re-activation](https://github.com/grafana/scenes/pull/1212)
diff --git a/yarn.lock b/yarn.lock
index 1bafff658bb..9bb15efa1b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3584,11 +3584,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/scenes-react@npm:6.29.5":
-  version: 6.29.5
-  resolution: "@grafana/scenes-react@npm:6.29.5"
+"@grafana/scenes-react@npm:6.29.7":
+  version: 6.29.7
+  resolution: "@grafana/scenes-react@npm:6.29.7"
   dependencies:
-    "@grafana/scenes": "npm:6.29.5"
+    "@grafana/scenes": "npm:6.29.7"
     lru-cache: "npm:^10.2.2"
     react-use: "npm:^17.4.0"
   peerDependencies:
@@ -3600,13 +3600,13 @@ __metadata:
     react: ^18.0.0
     react-dom: ^18.0.0
     react-router-dom: ^6.28.0
-  checksum: 10/fd09f6614b4efcca8febbafb05054f5b05d8c064e078314325ddad80028e5ff52171c7f0bf6cd92137d78f2c476ee8b97c98c433c433e97eada04c496b57a2e3
+  checksum: 10/d3db42b8face33a871cc2b983b00890b4a7b9cf685b06dd02df730036f9c13f1cdbc0dcb578453a0ce29381bdceb26d2a07ae4be77a8f753677dde1560eb491f
   languageName: node
   linkType: hard
 
-"@grafana/scenes@npm:6.29.5":
-  version: 6.29.5
-  resolution: "@grafana/scenes@npm:6.29.5"
+"@grafana/scenes@npm:6.29.7":
+  version: 6.29.7
+  resolution: "@grafana/scenes@npm:6.29.7"
   dependencies:
     "@floating-ui/react": "npm:^0.26.16"
     "@leeoniya/ufuzzy": "npm:^1.0.16"
@@ -3626,7 +3626,7 @@ __metadata:
     react: ^18.0.0
     react-dom: ^18.0.0
     react-router-dom: ^6.28.0
-  checksum: 10/f96500bc31bc3fc06c618e498016290d8cf1c43f69733fe6d351f3ce060db9b4487bfe7f3d352384b2612ab2931754b87778015c934ac9d67649d3f840752b19
+  checksum: 10/a2bbda33c78cd568d6333e033e1b587917ee4ca00d8f69e3707197d6712beba1d1b9244f05259bc4cce7416b9ec67d24eddaa1e6073695e2b4a7af1a37253174
   languageName: node
   linkType: hard
 
@@ -18311,8 +18311,8 @@ __metadata:
     "@grafana/plugin-ui": "npm:0.10.9"
     "@grafana/prometheus": "workspace:*"
     "@grafana/runtime": "workspace:*"
-    "@grafana/scenes": "npm:6.29.5"
-    "@grafana/scenes-react": "npm:6.29.5"
+    "@grafana/scenes": "npm:6.29.7"
+    "@grafana/scenes-react": "npm:6.29.7"
     "@grafana/schema": "workspace:*"
     "@grafana/sql": "workspace:*"
     "@grafana/test-utils": "workspace:*"

From e0404f924c4b1b8f11dca6abed77b3131e094de4 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 11 Aug 2025 15:22:56 +0300
Subject: [PATCH 078/243] K8s/SecureValues: Wire InlineSecureValueSupport to
 apistore (#109449)

* inline wire

* extra fields

* add variable

* wire
---
 pkg/registry/apis/dashboard/legacy_storage.go |   2 +-
 pkg/registry/apis/iam/register.go             |   2 +-
 pkg/registry/apis/provisioning/register.go    |   8 +-
 pkg/server/wire_gen.go                        | 310 +++++++++---------
 .../apiserver/options/grafana-aggregator.go   |   2 +-
 pkg/services/apiserver/options/storage.go     |   6 +-
 pkg/services/apiserver/service.go             |   6 +-
 pkg/storage/unified/apistore/restoptions.go   |  20 +-
 pkg/storage/unified/apistore/store.go         |   5 +-
 pkg/storage/unified/client.go                 |  30 +-
 pkg/storage/unified/client_test.go            |   8 +-
 pkg/storage/unified/resource/server.go        |  31 +-
 pkg/storage/unified/sql/server.go             |   6 +-
 13 files changed, 245 insertions(+), 191 deletions(-)

diff --git a/pkg/registry/apis/dashboard/legacy_storage.go b/pkg/registry/apis/dashboard/legacy_storage.go
index 7fb9d54340e..97bcf1ce4f3 100644
--- a/pkg/registry/apis/dashboard/legacy_storage.go
+++ b/pkg/registry/apis/dashboard/legacy_storage.go
@@ -42,7 +42,7 @@ func (s *DashboardStorage) NewStore(dash utils.ResourceInfo, scheme *runtime.Sch
 		return nil, err
 	}
 	client := legacy.NewDirectResourceClient(server) // same context
-	optsGetter := apistore.NewRESTOptionsGetterForClient(client,
+	optsGetter := apistore.NewRESTOptionsGetterForClient(client, nil,
 		defaultOpts.StorageConfig.Config, nil,
 	)
 	optsGetter.RegisterOptions(dash.GroupResource(), apistore.StorageOptions{
diff --git a/pkg/registry/apis/iam/register.go b/pkg/registry/apis/iam/register.go
index f1de0924641..4a233b6090b 100644
--- a/pkg/registry/apis/iam/register.go
+++ b/pkg/registry/apis/iam/register.go
@@ -333,7 +333,7 @@ func NewLocalStore(resourceInfo utils.ResourceInfo, scheme *runtime.Scheme, defa
 	}
 
 	client := resource.NewLocalResourceClient(server)
-	optsGetter := apistore.NewRESTOptionsGetterForClient(client, defaultOpts.StorageConfig.Config, nil)
+	optsGetter := apistore.NewRESTOptionsGetterForClient(client, nil, defaultOpts.StorageConfig.Config, nil)
 
 	store, err := grafanaregistry.NewRegistryStore(scheme, resourceInfo, optsGetter)
 	return store, err
diff --git a/pkg/registry/apis/provisioning/register.go b/pkg/registry/apis/provisioning/register.go
index 241930c75e1..3956498f944 100644
--- a/pkg/registry/apis/provisioning/register.go
+++ b/pkg/registry/apis/provisioning/register.go
@@ -59,6 +59,7 @@ import (
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning/safepath"
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning/secrets"
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning/usage"
+	"github.com/grafana/grafana/pkg/registry/apis/secret"
 	"github.com/grafana/grafana/pkg/services/apiserver"
 	"github.com/grafana/grafana/pkg/services/apiserver/builder"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -107,7 +108,8 @@ type APIBuilder struct {
 	legacyMigrator    legacy.LegacyMigrator
 	storageStatus     dualwrite.Service
 	unified           resource.ResourceClient
-	repositorySecrets secrets.RepositorySecrets
+	decryptSvc        secret.DecryptService
+	repositorySecrets secrets.RepositorySecrets // << Will be removed when the decryptSvc usage is stable
 	client            client.ProvisioningV0alpha1Interface
 	access            authlib.AccessChecker
 	mutators          []controller.Mutator
@@ -130,6 +132,7 @@ func NewAPIBuilder(
 	legacyMigrator legacy.LegacyMigrator,
 	storageStatus dualwrite.Service,
 	usageStats usagestats.Service,
+	decryptSvc secret.DecryptService,
 	repositorySecrets secrets.RepositorySecrets,
 	access authlib.AccessChecker,
 	tracer tracing.Tracer,
@@ -160,6 +163,7 @@ func NewAPIBuilder(
 		legacyMigrator:      legacyMigrator,
 		storageStatus:       storageStatus,
 		unified:             unified,
+		decryptSvc:          decryptSvc,
 		repositorySecrets:   repositorySecrets,
 		access:              access,
 		jobHistoryConfig:    jobHistoryConfig,
@@ -232,6 +236,7 @@ func RegisterAPIService(
 	legacyMigrator legacy.LegacyMigrator,
 	storageStatus dualwrite.Service,
 	usageStats usagestats.Service,
+	decryptSvc secret.DecryptService,
 	repositorySecrets secrets.RepositorySecrets,
 	tracer tracing.Tracer,
 	extraBuilders []ExtraBuilder,
@@ -250,6 +255,7 @@ func RegisterAPIService(
 		configProvider, ghFactory,
 		legacyMigrator, storageStatus,
 		usageStats,
+		decryptSvc,
 		repositorySecrets,
 		access,
 		tracer,
diff --git a/pkg/server/wire_gen.go b/pkg/server/wire_gen.go
index c14f55a6507..928c80ce67d 100644
--- a/pkg/server/wire_gen.go
+++ b/pkg/server/wire_gen.go
@@ -27,7 +27,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/usagestats"
 	"github.com/grafana/grafana/pkg/infra/usagestats/service"
 	"github.com/grafana/grafana/pkg/infra/usagestats/statscollector"
-	validator2 "github.com/grafana/grafana/pkg/infra/usagestats/validator"
+	validator3 "github.com/grafana/grafana/pkg/infra/usagestats/validator"
 	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/login/social/connectors"
 	"github.com/grafana/grafana/pkg/login/social/socialimpl"
@@ -35,7 +35,7 @@ import (
 	"github.com/grafana/grafana/pkg/middleware/loggermw"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
 	provider2 "github.com/grafana/grafana/pkg/plugins/backendplugin/provider"
-	manager3 "github.com/grafana/grafana/pkg/plugins/manager"
+	manager4 "github.com/grafana/grafana/pkg/plugins/manager"
 	"github.com/grafana/grafana/pkg/plugins/manager/filestore"
 	"github.com/grafana/grafana/pkg/plugins/manager/loader/assetpath"
 	"github.com/grafana/grafana/pkg/plugins/manager/process"
@@ -64,14 +64,14 @@ import (
 	"github.com/grafana/grafana/pkg/registry/apis/secret"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/decrypt"
-	service11 "github.com/grafana/grafana/pkg/registry/apis/secret/encryption/cipher/service"
+	service4 "github.com/grafana/grafana/pkg/registry/apis/secret/encryption/cipher/service"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/encryption/kmsproviders"
-	manager4 "github.com/grafana/grafana/pkg/registry/apis/secret/encryption/manager"
+	manager2 "github.com/grafana/grafana/pkg/registry/apis/secret/encryption/manager"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/inline"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/mutator"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/secretkeeper"
-	service12 "github.com/grafana/grafana/pkg/registry/apis/secret/service"
-	validator3 "github.com/grafana/grafana/pkg/registry/apis/secret/validator"
+	service5 "github.com/grafana/grafana/pkg/registry/apis/secret/service"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/validator"
 	"github.com/grafana/grafana/pkg/registry/apis/userstorage"
 	"github.com/grafana/grafana/pkg/registry/apps"
 	advisor2 "github.com/grafana/grafana/pkg/registry/apps/advisor"
@@ -92,7 +92,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/annotations/annotationsimpl"
 	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl"
 	"github.com/grafana/grafana/pkg/services/anonymous/anonimpl/anonstore"
-	"github.com/grafana/grafana/pkg/services/anonymous/validator"
+	validator2 "github.com/grafana/grafana/pkg/services/anonymous/validator"
 	"github.com/grafana/grafana/pkg/services/apikey/apikeyimpl"
 	"github.com/grafana/grafana/pkg/services/apiserver"
 	"github.com/grafana/grafana/pkg/services/apiserver/aggregatorrunner"
@@ -110,18 +110,18 @@ import (
 	"github.com/grafana/grafana/pkg/services/contexthandler"
 	"github.com/grafana/grafana/pkg/services/correlations"
 	"github.com/grafana/grafana/pkg/services/dashboardimport"
-	service9 "github.com/grafana/grafana/pkg/services/dashboardimport/service"
+	service11 "github.com/grafana/grafana/pkg/services/dashboardimport/service"
 	dashboards2 "github.com/grafana/grafana/pkg/services/dashboards"
 	database2 "github.com/grafana/grafana/pkg/services/dashboards/database"
-	service5 "github.com/grafana/grafana/pkg/services/dashboards/service"
+	service7 "github.com/grafana/grafana/pkg/services/dashboards/service"
 	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
-	database4 "github.com/grafana/grafana/pkg/services/dashboardsnapshots/database"
-	service8 "github.com/grafana/grafana/pkg/services/dashboardsnapshots/service"
+	database5 "github.com/grafana/grafana/pkg/services/dashboardsnapshots/database"
+	service10 "github.com/grafana/grafana/pkg/services/dashboardsnapshots/service"
 	"github.com/grafana/grafana/pkg/services/dashboardversion/dashverimpl"
 	"github.com/grafana/grafana/pkg/services/datasourceproxy"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/datasources/guardian"
-	service7 "github.com/grafana/grafana/pkg/services/datasources/service"
+	service9 "github.com/grafana/grafana/pkg/services/datasources/service"
 	encryption2 "github.com/grafana/grafana/pkg/services/encryption"
 	"github.com/grafana/grafana/pkg/services/encryption/provider"
 	service2 "github.com/grafana/grafana/pkg/services/encryption/service"
@@ -137,7 +137,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/kmsproviders/osskmsproviders"
 	"github.com/grafana/grafana/pkg/services/ldap"
 	api4 "github.com/grafana/grafana/pkg/services/ldap/api"
-	service10 "github.com/grafana/grafana/pkg/services/ldap/service"
+	service12 "github.com/grafana/grafana/pkg/services/ldap/service"
 	"github.com/grafana/grafana/pkg/services/libraryelements"
 	"github.com/grafana/grafana/pkg/services/librarypanels"
 	"github.com/grafana/grafana/pkg/services/licensing"
@@ -159,7 +159,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/playlist/playlistimpl"
 	"github.com/grafana/grafana/pkg/services/plugindashboards"
-	service6 "github.com/grafana/grafana/pkg/services/plugindashboards/service"
+	service8 "github.com/grafana/grafana/pkg/services/plugindashboards/service"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/advisor"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/angulardetectorsprovider"
@@ -181,7 +181,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginerrs"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginexternal"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugininstaller"
-	service4 "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
+	service6 "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/provisionedplugins"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/renderer"
@@ -211,7 +211,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/secrets/migrator"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/extsvcaccounts"
-	manager2 "github.com/grafana/grafana/pkg/services/serviceaccounts/manager"
+	manager3 "github.com/grafana/grafana/pkg/services/serviceaccounts/manager"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/proxy"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/retriever"
 	"github.com/grafana/grafana/pkg/services/shorturls"
@@ -244,7 +244,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/validations"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/storage/legacysql/dualwrite"
-	database5 "github.com/grafana/grafana/pkg/storage/secret/database"
+	database4 "github.com/grafana/grafana/pkg/storage/secret/database"
 	"github.com/grafana/grafana/pkg/storage/secret/encryption"
 	"github.com/grafana/grafana/pkg/storage/secret/metadata"
 	migrator2 "github.com/grafana/grafana/pkg/storage/secret/migrator"
@@ -439,14 +439,55 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	}
 	ossDashboardStats := search.ProvideDashboardStats()
 	documentBuilderSupplier := search.ProvideDocumentBuilders(sqlStore, ossDashboardStats)
+	databaseDatabase := database4.ProvideDatabase(sqlStore, tracer)
+	secureValueMetadataStorage, err := metadata.ProvideSecureValueMetadataStorage(databaseDatabase, tracer, registerer)
+	if err != nil {
+		return nil, err
+	}
+	secureValueValidator := validator.ProvideSecureValueValidator()
+	secureValueMutator := mutator.ProvideSecureValueMutator()
+	keeperMetadataStorage, err := metadata.ProvideKeeperMetadataStorage(databaseDatabase, tracer, registerer)
+	if err != nil {
+		return nil, err
+	}
+	encryptedValueStorage, err := encryption.ProvideEncryptedValueStorage(databaseDatabase, tracer)
+	if err != nil {
+		return nil, err
+	}
+	dataKeyStorage, err := encryption.ProvideDataKeyStorage(databaseDatabase, tracer, registerer)
+	if err != nil {
+		return nil, err
+	}
+	cipher, err := service4.ProvideAESGCMCipherService(tracer, usageStats)
+	if err != nil {
+		return nil, err
+	}
+	providerConfig, err := kmsproviders.ProvideOSSKMSProviders(cfg, cipher)
+	if err != nil {
+		return nil, err
+	}
+	encryptionManager, err := manager2.ProvideEncryptionManager(tracer, dataKeyStorage, usageStats, cipher, providerConfig)
+	if err != nil {
+		return nil, err
+	}
+	ossKeeperService, err := secretkeeper.ProvideService(tracer, encryptedValueStorage, encryptionManager, registerer)
+	if err != nil {
+		return nil, err
+	}
+	secureValueService := service5.ProvideSecureValueService(tracer, accessClient, databaseDatabase, secureValueMetadataStorage, secureValueValidator, secureValueMutator, keeperMetadataStorage, ossKeeperService, registerer)
+	inlineSecureValueSupport, err := inline.ProvideInlineSecureValueService(cfg, tracer, secureValueService, accessClient)
+	if err != nil {
+		return nil, err
+	}
 	options := &unified.Options{
-		Cfg:      cfg,
-		Features: featureToggles,
-		DB:       sqlStore,
-		Tracer:   tracingService,
-		Reg:      registerer,
-		Authzc:   accessClient,
-		Docs:     documentBuilderSupplier,
+		Cfg:          cfg,
+		Features:     featureToggles,
+		DB:           sqlStore,
+		Tracer:       tracingService,
+		Reg:          registerer,
+		Authzc:       accessClient,
+		Docs:         documentBuilderSupplier,
+		SecureValues: inlineSecureValueSupport,
 	}
 	storageMetrics := resource.ProvideStorageMetrics(registerer)
 	bleveIndexMetrics := resource.ProvideIndexMetrics(registerer)
@@ -476,13 +517,13 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	if err != nil {
 		return nil, err
 	}
-	serviceAccountsService, err := manager2.ProvideServiceAccountsService(cfg, usageStats, sqlStore, apikeyService, kvStore, userService, orgService, acimplService, serviceAccountPermissionsService, serverLockService)
+	serviceAccountsService, err := manager3.ProvideServiceAccountsService(cfg, usageStats, sqlStore, apikeyService, kvStore, userService, orgService, acimplService, serviceAccountPermissionsService, serverLockService)
 	if err != nil {
 		return nil, err
 	}
 	extSvcAccountsService := extsvcaccounts.ProvideExtSvcAccountsService(acimplService, cfg, inProcBus, sqlStore, featureToggles, registerer, serviceAccountsService, secretsService, tracingService)
 	registryRegistry := registry2.ProvideExtSvcRegistry(cfg, extSvcAccountsService, serverLockService, featureToggles)
-	service13 := service4.ProvideService(sqlStore, secretsService)
+	service13 := service6.ProvideService(sqlStore, secretsService)
 	serviceregistrationService := serviceregistration.ProvideService(cfg, featureToggles, registryRegistry, service13)
 	initialize := pipeline.ProvideInitializationStage(pluginManagementCfg, inMemory, providerService, processService, serviceregistrationService, acimplService, actionSetService, envVarsProvider, tracingService)
 	terminate, err := pipeline.ProvideTerminationStage(pluginManagementCfg, inMemory, processService)
@@ -501,12 +542,12 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	if err != nil {
 		return nil, err
 	}
-	dashboardServiceImpl, err := service5.ProvideDashboardServiceImpl(cfg, dashboardsStore, dashboardFolderStoreImpl, featureToggles, folderPermissionsService, accessControl, acimplService, folderimplService, registerer, eventualRestConfigProvider, userService, quotaService, orgService, publicDashboardServiceWrapperImpl, resourceClient, dualwriteService, sortService, serverLockService, kvStore)
+	dashboardServiceImpl, err := service7.ProvideDashboardServiceImpl(cfg, dashboardsStore, dashboardFolderStoreImpl, featureToggles, folderPermissionsService, accessControl, acimplService, folderimplService, registerer, eventualRestConfigProvider, userService, quotaService, orgService, publicDashboardServiceWrapperImpl, resourceClient, dualwriteService, sortService, serverLockService, kvStore)
 	if err != nil {
 		return nil, err
 	}
-	pluginService := service5.ProvideDashboardPluginService(featureToggles, dashboardServiceImpl)
-	service14 := service6.ProvideService(fileStoreManager, pluginService)
+	pluginService := service7.ProvideDashboardPluginService(featureToggles, dashboardServiceImpl)
+	service14 := service8.ProvideService(fileStoreManager, pluginService)
 	orgRoleMapper := connectors.ProvideOrgRoleMapper(cfg, orgService)
 	ssosettingsimplService := ssosettingsimpl.ProvideService(cfg, sqlStore, accessControl, routeRegisterImpl, featureToggles, secretsService, usageStats, registerer, ossImpl, ossLicensingService)
 	socialService := socialimpl.ProvideService(cfg, featureToggles, usageStats, bundleregistryService, remoteCache, orgRoleMapper, ssosettingsimplService)
@@ -527,15 +568,15 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	if err != nil {
 		return nil, err
 	}
-	pluginInstaller := manager3.ProvideInstaller(pluginManagementCfg, inMemory, loaderLoader, repoManager, serviceregistrationService)
+	pluginInstaller := manager4.ProvideInstaller(pluginManagementCfg, inMemory, loaderLoader, repoManager, serviceregistrationService)
 	ossProvider := guardian.ProvideGuardian()
-	cacheServiceImpl := service7.ProvideCacheService(cacheService, sqlStore, ossProvider)
+	cacheServiceImpl := service9.ProvideCacheService(cacheService, sqlStore, ossProvider)
 	shortURLService := shorturlimpl.ProvideService(sqlStore)
 	queryHistoryService := queryhistory.ProvideService(cfg, sqlStore, routeRegisterImpl, accessControl)
-	dashboardService := service5.ProvideDashboardService(featureToggles, dashboardServiceImpl)
+	dashboardService := service7.ProvideDashboardService(featureToggles, dashboardServiceImpl)
 	dashverService := dashverimpl.ProvideService(cfg, sqlStore, dashboardService, dashboardsStore, featureToggles, eventualRestConfigProvider, userService, resourceClient, dualwriteService, sortService)
-	dashboardSnapshotStore := database4.ProvideStore(sqlStore, cfg)
-	serviceImpl := service8.ProvideService(dashboardSnapshotStore, secretsService, dashboardService)
+	dashboardSnapshotStore := database5.ProvideStore(sqlStore, cfg)
+	serviceImpl := service10.ProvideService(dashboardSnapshotStore, secretsService, dashboardService)
 	dBstore, err := store2.ProvideDBStore(cfg, featureToggles, sqlStore, folderimplService, dashboardService, accessControl, inProcBus)
 	if err != nil {
 		return nil, err
@@ -551,7 +592,7 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	datasourcePermissionsService := ossaccesscontrol.ProvideDatasourcePermissionsService(cfg, featureToggles, sqlStore)
 	requestConfigProvider := pluginconfig.NewRequestConfigProvider(pluginInstanceCfg)
 	baseProvider := plugincontext.ProvideBaseService(cfg, requestConfigProvider)
-	service15, err := service7.ProvideService(sqlStore, secretsService, secretsKVStore, cfg, featureToggles, accessControl, datasourcePermissionsService, quotaService, pluginstoreService, middlewareHandler, baseProvider)
+	service15, err := service9.ProvideService(sqlStore, secretsService, secretsKVStore, cfg, featureToggles, accessControl, datasourcePermissionsService, quotaService, pluginstoreService, middlewareHandler, baseProvider)
 	if err != nil {
 		return nil, err
 	}
@@ -567,7 +608,7 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	if err != nil {
 		return nil, err
 	}
-	dashboardProvisioningService := service5.ProvideDashboardProvisioningService(featureToggles, dashboardServiceImpl)
+	dashboardProvisioningService := service7.ProvideDashboardProvisioningService(featureToggles, dashboardServiceImpl)
 	receiverPermissionsService, err := ossaccesscontrol.ProvideReceiverPermissionsService(cfg, featureToggles, routeRegisterImpl, sqlStore, accessControl, ossLicensingService, acimplService, teamService, userService, actionSetService)
 	if err != nil {
 		return nil, err
@@ -647,7 +688,7 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	statsService := statsimpl.ProvideService(cfg, sqlStore, dashboardService, folderimplService, orgService, featureToggles)
 	gatherer := metrics.ProvideGatherer()
 	apiAPI := api3.ProvideApi(starService, dashboardService)
-	anonUserLimitValidatorImpl := validator.ProvideAnonUserLimitValidator()
+	anonUserLimitValidatorImpl := validator2.ProvideAnonUserLimitValidator()
 	anonDeviceService := anonimpl.ProvideAnonymousDeviceService(usageStats, authnService, sqlStore, cfg, orgService, serverLockService, accessControl, routeRegisterImpl, anonUserLimitValidatorImpl)
 	signingkeysimplService, err := signingkeysimpl.ProvideEmbeddedSigningKeysService(sqlStore, secretsService, remoteCache, routeRegisterImpl)
 	if err != nil {
@@ -663,7 +704,7 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	if err != nil {
 		return nil, err
 	}
-	validatorService, err := validator2.ProvideService(pluginstoreService)
+	validatorService, err := validator3.ProvideService(pluginstoreService)
 	if err != nil {
 		return nil, err
 	}
@@ -702,7 +743,7 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	}
 	v2 := appregistry.ProvideAppInstallers(featureToggles, playlistAppInstaller, pluginsAppInstaller, shortURLAppInstaller)
 	builderMetrics := builder.ProvideBuilderMetrics(registerer)
-	apiserverService, err := apiserver.ProvideService(cfg, featureToggles, routeRegisterImpl, tracingService, serverLockService, sqlStore, kvStore, middlewareHandler, scopedPluginDatasourceProvider, plugincontextProvider, pluginstoreService, dualwriteService, resourceClient, eventualRestConfigProvider, v, eventualRestConfigProvider, registerer, aggregatorRunner, v2, builderMetrics)
+	apiserverService, err := apiserver.ProvideService(cfg, featureToggles, routeRegisterImpl, tracingService, serverLockService, sqlStore, kvStore, middlewareHandler, scopedPluginDatasourceProvider, plugincontextProvider, pluginstoreService, dualwriteService, resourceClient, inlineSecureValueSupport, eventualRestConfigProvider, v, eventualRestConfigProvider, registerer, aggregatorRunner, v2, builderMetrics)
 	if err != nil {
 		return nil, err
 	}
@@ -723,8 +764,8 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	if err != nil {
 		return nil, err
 	}
-	importDashboardService := service9.ProvideService(routeRegisterImpl, quotaService, service14, pluginstoreService, libraryPanelService, dashboardService, accessControl, folderimplService, featureToggles)
-	dashboardUpdater := service6.ProvideDashboardUpdater(inProcBus, pluginstoreService, service14, importDashboardService, service13, pluginService, dashboardService)
+	importDashboardService := service11.ProvideService(routeRegisterImpl, quotaService, service14, pluginstoreService, libraryPanelService, dashboardService, accessControl, folderimplService, featureToggles)
+	dashboardUpdater := service8.ProvideDashboardUpdater(inProcBus, pluginstoreService, service14, importDashboardService, service13, pluginService, dashboardService)
 	sanitizerProvider := sanitizer.ProvideService(renderingService)
 	healthService, err := grpcserver.ProvideHealthService(cfg, grpcserverProvider)
 	if err != nil {
@@ -736,7 +777,7 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	}
 	ossGroups := ldap.ProvideGroupsService()
 	identitySynchronizer := authnimpl.ProvideIdentitySynchronizer(authnimplService)
-	ldapImpl := service10.ProvideService(cfg, featureToggles, ssosettingsimplService)
+	ldapImpl := service12.ProvideService(cfg, featureToggles, ssosettingsimplService)
 	apiService := api4.ProvideService(cfg, routeRegisterImpl, accessControl, userService, authinfoimplService, ossGroups, identitySynchronizer, orgService, ldapImpl, userAuthTokenService, bundleregistryService)
 	dashboardsAPIBuilder := dashboard.RegisterAPIService(cfg, featureToggles, apiserverService, dashboardService, dashboardProvisioningService, pluginstoreService, service15, dashboardServiceImpl, accessControl, accessClient, provisioningServiceImpl, dashboardsStore, registerer, sqlStore, tracingService, resourceClient, dualwriteService, sortService, quotaService, dashboardFolderStoreImpl, libraryPanelService, eventualRestConfigProvider, userService)
 	snapshotsAPIBuilder := dashboardsnapshot.RegisterAPIService(serviceImpl, apiserverService, cfg, featureToggles, sqlStore, registerer)
@@ -751,7 +792,7 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	if err != nil {
 		return nil, err
 	}
-	legacyDataSourceLookup := service7.ProvideLegacyDataSourceLookup(service15)
+	legacyDataSourceLookup := service9.ProvideLegacyDataSourceLookup(service15)
 	queryAPIBuilder, err := query2.RegisterAPIService(cfg, featureToggles, apiserverService, service15, pluginstoreService, accessControl, middlewareHandler, plugincontextProvider, registerer, tracingService, legacyDataSourceLookup, exprService)
 	if err != nil {
 		return nil, err
@@ -759,43 +800,6 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	userStorageAPIBuilder := userstorage.RegisterAPIService(featureToggles, apiserverService, registerer)
 	factory := github.ProvideFactory()
 	legacyMigrator := legacy.ProvideLegacyMigrator(sqlStore, provisioningServiceImpl, libraryPanelService, accessControl, featureToggles)
-	databaseDatabase := database5.ProvideDatabase(sqlStore, tracer)
-	secureValueMetadataStorage, err := metadata.ProvideSecureValueMetadataStorage(databaseDatabase, tracer, registerer)
-	if err != nil {
-		return nil, err
-	}
-	secureValueValidator := validator3.ProvideSecureValueValidator()
-	secureValueMutator := mutator.ProvideSecureValueMutator()
-	keeperMetadataStorage, err := metadata.ProvideKeeperMetadataStorage(databaseDatabase, tracer, registerer)
-	if err != nil {
-		return nil, err
-	}
-	encryptedValueStorage, err := encryption.ProvideEncryptedValueStorage(databaseDatabase, tracer)
-	if err != nil {
-		return nil, err
-	}
-	dataKeyStorage, err := encryption.ProvideDataKeyStorage(databaseDatabase, tracer, registerer)
-	if err != nil {
-		return nil, err
-	}
-	cipher, err := service11.ProvideAESGCMCipherService(tracer, usageStats)
-	if err != nil {
-		return nil, err
-	}
-	providerConfig, err := kmsproviders.ProvideOSSKMSProviders(cfg, cipher)
-	if err != nil {
-		return nil, err
-	}
-	encryptionManager, err := manager4.ProvideEncryptionManager(tracer, dataKeyStorage, usageStats, cipher, providerConfig)
-	if err != nil {
-		return nil, err
-	}
-	ossKeeperService, err := secretkeeper.ProvideService(tracer, encryptedValueStorage, encryptionManager, registerer)
-	if err != nil {
-		return nil, err
-	}
-	secureValueService := service12.ProvideSecureValueService(tracer, accessClient, databaseDatabase, secureValueMetadataStorage, secureValueValidator, secureValueMutator, keeperMetadataStorage, ossKeeperService, registerer)
-	secureValueClient := secret.ProvideSecureValueClient(secureValueService, secureValueValidator, accessClient)
 	decryptAuthorizer := decrypt.ProvideDecryptAuthorizer(tracer)
 	decryptStorage, err := metadata.ProvideDecryptStorage(tracer, ossKeeperService, keeperMetadataStorage, secureValueMetadataStorage, decryptAuthorizer, registerer)
 	if err != nil {
@@ -805,10 +809,11 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	if err != nil {
 		return nil, err
 	}
+	secureValueClient := secret.ProvideSecureValueClient(secureValueService, secureValueValidator, accessClient)
 	repositorySecrets := secrets.ProvideRepositorySecrets(featureToggles, secretsService, secureValueClient, v3, cfg)
 	webhookExtraBuilder := webhooks.ProvideWebhooks(cfg, featureToggles, repositorySecrets, factory, renderingService, resourceClient, eventualRestConfigProvider)
 	v4 := extras.ProvideProvisioningOSSExtras(webhookExtraBuilder)
-	apiBuilder, err := provisioning2.RegisterAPIService(cfg, featureToggles, apiserverService, registerer, resourceClient, eventualRestConfigProvider, factory, accessClient, legacyMigrator, dualwriteService, usageStats, repositorySecrets, tracingService, v4)
+	apiBuilder, err := provisioning2.RegisterAPIService(cfg, featureToggles, apiserverService, registerer, resourceClient, eventualRestConfigProvider, factory, accessClient, legacyMigrator, dualwriteService, usageStats, v3, repositorySecrets, tracingService, v4)
 	if err != nil {
 		return nil, err
 	}
@@ -1007,14 +1012,55 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	}
 	ossDashboardStats := search.ProvideDashboardStats()
 	documentBuilderSupplier := search.ProvideDocumentBuilders(sqlStore, ossDashboardStats)
+	databaseDatabase := database4.ProvideDatabase(sqlStore, tracer)
+	secureValueMetadataStorage, err := metadata.ProvideSecureValueMetadataStorage(databaseDatabase, tracer, registerer)
+	if err != nil {
+		return nil, err
+	}
+	secureValueValidator := validator.ProvideSecureValueValidator()
+	secureValueMutator := mutator.ProvideSecureValueMutator()
+	keeperMetadataStorage, err := metadata.ProvideKeeperMetadataStorage(databaseDatabase, tracer, registerer)
+	if err != nil {
+		return nil, err
+	}
+	encryptedValueStorage, err := encryption.ProvideEncryptedValueStorage(databaseDatabase, tracer)
+	if err != nil {
+		return nil, err
+	}
+	dataKeyStorage, err := encryption.ProvideDataKeyStorage(databaseDatabase, tracer, registerer)
+	if err != nil {
+		return nil, err
+	}
+	cipher, err := service4.ProvideAESGCMCipherService(tracer, usageStats)
+	if err != nil {
+		return nil, err
+	}
+	providerConfig, err := kmsproviders.ProvideOSSKMSProviders(cfg, cipher)
+	if err != nil {
+		return nil, err
+	}
+	encryptionManager, err := manager2.ProvideEncryptionManager(tracer, dataKeyStorage, usageStats, cipher, providerConfig)
+	if err != nil {
+		return nil, err
+	}
+	ossKeeperService, err := secretkeeper.ProvideService(tracer, encryptedValueStorage, encryptionManager, registerer)
+	if err != nil {
+		return nil, err
+	}
+	secureValueService := service5.ProvideSecureValueService(tracer, accessClient, databaseDatabase, secureValueMetadataStorage, secureValueValidator, secureValueMutator, keeperMetadataStorage, ossKeeperService, registerer)
+	inlineSecureValueSupport, err := inline.ProvideInlineSecureValueService(cfg, tracer, secureValueService, accessClient)
+	if err != nil {
+		return nil, err
+	}
 	options := &unified.Options{
-		Cfg:      cfg,
-		Features: featureToggles,
-		DB:       sqlStore,
-		Tracer:   tracingService,
-		Reg:      registerer,
-		Authzc:   accessClient,
-		Docs:     documentBuilderSupplier,
+		Cfg:          cfg,
+		Features:     featureToggles,
+		DB:           sqlStore,
+		Tracer:       tracingService,
+		Reg:          registerer,
+		Authzc:       accessClient,
+		Docs:         documentBuilderSupplier,
+		SecureValues: inlineSecureValueSupport,
 	}
 	storageMetrics := resource.ProvideStorageMetrics(registerer)
 	bleveIndexMetrics := resource.ProvideIndexMetrics(registerer)
@@ -1044,13 +1090,13 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	if err != nil {
 		return nil, err
 	}
-	serviceAccountsService, err := manager2.ProvideServiceAccountsService(cfg, usageStats, sqlStore, apikeyService, kvStore, userService, orgService, acimplService, serviceAccountPermissionsService, serverLockService)
+	serviceAccountsService, err := manager3.ProvideServiceAccountsService(cfg, usageStats, sqlStore, apikeyService, kvStore, userService, orgService, acimplService, serviceAccountPermissionsService, serverLockService)
 	if err != nil {
 		return nil, err
 	}
 	extSvcAccountsService := extsvcaccounts.ProvideExtSvcAccountsService(acimplService, cfg, inProcBus, sqlStore, featureToggles, registerer, serviceAccountsService, secretsService, tracingService)
 	registryRegistry := registry2.ProvideExtSvcRegistry(cfg, extSvcAccountsService, serverLockService, featureToggles)
-	service13 := service4.ProvideService(sqlStore, secretsService)
+	service13 := service6.ProvideService(sqlStore, secretsService)
 	serviceregistrationService := serviceregistration.ProvideService(cfg, featureToggles, registryRegistry, service13)
 	initialize := pipeline.ProvideInitializationStage(pluginManagementCfg, inMemory, providerService, processService, serviceregistrationService, acimplService, actionSetService, envVarsProvider, tracingService)
 	terminate, err := pipeline.ProvideTerminationStage(pluginManagementCfg, inMemory, processService)
@@ -1069,12 +1115,12 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	if err != nil {
 		return nil, err
 	}
-	dashboardServiceImpl, err := service5.ProvideDashboardServiceImpl(cfg, dashboardsStore, dashboardFolderStoreImpl, featureToggles, folderPermissionsService, accessControl, acimplService, folderimplService, registerer, eventualRestConfigProvider, userService, quotaService, orgService, publicDashboardServiceWrapperImpl, resourceClient, dualwriteService, sortService, serverLockService, kvStore)
+	dashboardServiceImpl, err := service7.ProvideDashboardServiceImpl(cfg, dashboardsStore, dashboardFolderStoreImpl, featureToggles, folderPermissionsService, accessControl, acimplService, folderimplService, registerer, eventualRestConfigProvider, userService, quotaService, orgService, publicDashboardServiceWrapperImpl, resourceClient, dualwriteService, sortService, serverLockService, kvStore)
 	if err != nil {
 		return nil, err
 	}
-	pluginService := service5.ProvideDashboardPluginService(featureToggles, dashboardServiceImpl)
-	service14 := service6.ProvideService(fileStoreManager, pluginService)
+	pluginService := service7.ProvideDashboardPluginService(featureToggles, dashboardServiceImpl)
+	service14 := service8.ProvideService(fileStoreManager, pluginService)
 	oauthtokentestService := oauthtokentest.ProvideService()
 	ossCachingService := caching.ProvideCachingService()
 	middlewareHandler, err := pluginsintegration.ProvideClientWithMiddlewares(cfg, inMemory, oauthtokentestService, tracingService, ossCachingService, featureToggles, registerer)
@@ -1086,19 +1132,19 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	if err != nil {
 		return nil, err
 	}
-	pluginInstaller := manager3.ProvideInstaller(pluginManagementCfg, inMemory, loaderLoader, repoManager, serviceregistrationService)
+	pluginInstaller := manager4.ProvideInstaller(pluginManagementCfg, inMemory, loaderLoader, repoManager, serviceregistrationService)
 	ossProvider := guardian.ProvideGuardian()
-	cacheServiceImpl := service7.ProvideCacheService(cacheService, sqlStore, ossProvider)
+	cacheServiceImpl := service9.ProvideCacheService(cacheService, sqlStore, ossProvider)
 	userAuthTokenService, err := authimpl.ProvideUserAuthTokenService(sqlStore, serverLockService, quotaService, secretsService, cfg, tracingService, featureToggles)
 	if err != nil {
 		return nil, err
 	}
 	shortURLService := shorturlimpl.ProvideService(sqlStore)
 	queryHistoryService := queryhistory.ProvideService(cfg, sqlStore, routeRegisterImpl, accessControl)
-	dashboardService := service5.ProvideDashboardService(featureToggles, dashboardServiceImpl)
+	dashboardService := service7.ProvideDashboardService(featureToggles, dashboardServiceImpl)
 	dashverService := dashverimpl.ProvideService(cfg, sqlStore, dashboardService, dashboardsStore, featureToggles, eventualRestConfigProvider, userService, resourceClient, dualwriteService, sortService)
-	dashboardSnapshotStore := database4.ProvideStore(sqlStore, cfg)
-	serviceImpl := service8.ProvideService(dashboardSnapshotStore, secretsService, dashboardService)
+	dashboardSnapshotStore := database5.ProvideStore(sqlStore, cfg)
+	serviceImpl := service10.ProvideService(dashboardSnapshotStore, secretsService, dashboardService)
 	dBstore, err := store2.ProvideDBStore(cfg, featureToggles, sqlStore, folderimplService, dashboardService, accessControl, inProcBus)
 	if err != nil {
 		return nil, err
@@ -1114,7 +1160,7 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	datasourcePermissionsService := ossaccesscontrol.ProvideDatasourcePermissionsService(cfg, featureToggles, sqlStore)
 	requestConfigProvider := pluginconfig.NewRequestConfigProvider(pluginInstanceCfg)
 	baseProvider := plugincontext.ProvideBaseService(cfg, requestConfigProvider)
-	service15, err := service7.ProvideService(sqlStore, secretsService, secretsKVStore, cfg, featureToggles, accessControl, datasourcePermissionsService, quotaService, pluginstoreService, middlewareHandler, baseProvider)
+	service15, err := service9.ProvideService(sqlStore, secretsService, secretsKVStore, cfg, featureToggles, accessControl, datasourcePermissionsService, quotaService, pluginstoreService, middlewareHandler, baseProvider)
 	if err != nil {
 		return nil, err
 	}
@@ -1130,7 +1176,7 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	if err != nil {
 		return nil, err
 	}
-	dashboardProvisioningService := service5.ProvideDashboardProvisioningService(featureToggles, dashboardServiceImpl)
+	dashboardProvisioningService := service7.ProvideDashboardProvisioningService(featureToggles, dashboardServiceImpl)
 	receiverPermissionsService, err := ossaccesscontrol.ProvideReceiverPermissionsService(cfg, featureToggles, routeRegisterImpl, sqlStore, accessControl, ossLicensingService, acimplService, teamService, userService, actionSetService)
 	if err != nil {
 		return nil, err
@@ -1217,7 +1263,7 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	statsService := statsimpl.ProvideService(cfg, sqlStore, dashboardService, folderimplService, orgService, featureToggles)
 	gatherer := metrics.ProvideGathererForTest(registerer)
 	apiAPI := api3.ProvideApi(starService, dashboardService)
-	anonUserLimitValidatorImpl := validator.ProvideAnonUserLimitValidator()
+	anonUserLimitValidatorImpl := validator2.ProvideAnonUserLimitValidator()
 	anonDeviceService := anonimpl.ProvideAnonymousDeviceService(usageStats, authnService, sqlStore, cfg, orgService, serverLockService, accessControl, routeRegisterImpl, anonUserLimitValidatorImpl)
 	signingkeysimplService, err := signingkeysimpl.ProvideEmbeddedSigningKeysService(sqlStore, secretsService, remoteCache, routeRegisterImpl)
 	if err != nil {
@@ -1233,7 +1279,7 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	if err != nil {
 		return nil, err
 	}
-	validatorService, err := validator2.ProvideService(pluginstoreService)
+	validatorService, err := validator3.ProvideService(pluginstoreService)
 	if err != nil {
 		return nil, err
 	}
@@ -1272,7 +1318,7 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	}
 	v2 := appregistry.ProvideAppInstallers(featureToggles, playlistAppInstaller, pluginsAppInstaller, shortURLAppInstaller)
 	builderMetrics := builder.ProvideBuilderMetrics(registerer)
-	apiserverService, err := apiserver.ProvideService(cfg, featureToggles, routeRegisterImpl, tracingService, serverLockService, sqlStore, kvStore, middlewareHandler, scopedPluginDatasourceProvider, plugincontextProvider, pluginstoreService, dualwriteService, resourceClient, eventualRestConfigProvider, v, eventualRestConfigProvider, registerer, aggregatorRunner, v2, builderMetrics)
+	apiserverService, err := apiserver.ProvideService(cfg, featureToggles, routeRegisterImpl, tracingService, serverLockService, sqlStore, kvStore, middlewareHandler, scopedPluginDatasourceProvider, plugincontextProvider, pluginstoreService, dualwriteService, resourceClient, inlineSecureValueSupport, eventualRestConfigProvider, v, eventualRestConfigProvider, registerer, aggregatorRunner, v2, builderMetrics)
 	if err != nil {
 		return nil, err
 	}
@@ -1293,8 +1339,8 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	if err != nil {
 		return nil, err
 	}
-	importDashboardService := service9.ProvideService(routeRegisterImpl, quotaService, service14, pluginstoreService, libraryPanelService, dashboardService, accessControl, folderimplService, featureToggles)
-	dashboardUpdater := service6.ProvideDashboardUpdater(inProcBus, pluginstoreService, service14, importDashboardService, service13, pluginService, dashboardService)
+	importDashboardService := service11.ProvideService(routeRegisterImpl, quotaService, service14, pluginstoreService, libraryPanelService, dashboardService, accessControl, folderimplService, featureToggles)
+	dashboardUpdater := service8.ProvideDashboardUpdater(inProcBus, pluginstoreService, service14, importDashboardService, service13, pluginService, dashboardService)
 	sanitizerProvider := sanitizer.ProvideService(renderingService)
 	healthService, err := grpcserver.ProvideHealthService(cfg, grpcserverProvider)
 	if err != nil {
@@ -1306,7 +1352,7 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	}
 	ossGroups := ldap.ProvideGroupsService()
 	identitySynchronizer := authnimpl.ProvideIdentitySynchronizer(authnimplService)
-	ldapImpl := service10.ProvideService(cfg, featureToggles, ssosettingsimplService)
+	ldapImpl := service12.ProvideService(cfg, featureToggles, ssosettingsimplService)
 	apiService := api4.ProvideService(cfg, routeRegisterImpl, accessControl, userService, authinfoimplService, ossGroups, identitySynchronizer, orgService, ldapImpl, userAuthTokenService, bundleregistryService)
 	dashboardsAPIBuilder := dashboard.RegisterAPIService(cfg, featureToggles, apiserverService, dashboardService, dashboardProvisioningService, pluginstoreService, service15, dashboardServiceImpl, accessControl, accessClient, provisioningServiceImpl, dashboardsStore, registerer, sqlStore, tracingService, resourceClient, dualwriteService, sortService, quotaService, dashboardFolderStoreImpl, libraryPanelService, eventualRestConfigProvider, userService)
 	snapshotsAPIBuilder := dashboardsnapshot.RegisterAPIService(serviceImpl, apiserverService, cfg, featureToggles, sqlStore, registerer)
@@ -1321,7 +1367,7 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	if err != nil {
 		return nil, err
 	}
-	legacyDataSourceLookup := service7.ProvideLegacyDataSourceLookup(service15)
+	legacyDataSourceLookup := service9.ProvideLegacyDataSourceLookup(service15)
 	queryAPIBuilder, err := query2.RegisterAPIService(cfg, featureToggles, apiserverService, service15, pluginstoreService, accessControl, middlewareHandler, plugincontextProvider, registerer, tracingService, legacyDataSourceLookup, exprService)
 	if err != nil {
 		return nil, err
@@ -1329,43 +1375,6 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	userStorageAPIBuilder := userstorage.RegisterAPIService(featureToggles, apiserverService, registerer)
 	factory := github.ProvideFactory()
 	legacyMigrator := legacy.ProvideLegacyMigrator(sqlStore, provisioningServiceImpl, libraryPanelService, accessControl, featureToggles)
-	databaseDatabase := database5.ProvideDatabase(sqlStore, tracer)
-	secureValueMetadataStorage, err := metadata.ProvideSecureValueMetadataStorage(databaseDatabase, tracer, registerer)
-	if err != nil {
-		return nil, err
-	}
-	secureValueValidator := validator3.ProvideSecureValueValidator()
-	secureValueMutator := mutator.ProvideSecureValueMutator()
-	keeperMetadataStorage, err := metadata.ProvideKeeperMetadataStorage(databaseDatabase, tracer, registerer)
-	if err != nil {
-		return nil, err
-	}
-	encryptedValueStorage, err := encryption.ProvideEncryptedValueStorage(databaseDatabase, tracer)
-	if err != nil {
-		return nil, err
-	}
-	dataKeyStorage, err := encryption.ProvideDataKeyStorage(databaseDatabase, tracer, registerer)
-	if err != nil {
-		return nil, err
-	}
-	cipher, err := service11.ProvideAESGCMCipherService(tracer, usageStats)
-	if err != nil {
-		return nil, err
-	}
-	providerConfig, err := kmsproviders.ProvideOSSKMSProviders(cfg, cipher)
-	if err != nil {
-		return nil, err
-	}
-	encryptionManager, err := manager4.ProvideEncryptionManager(tracer, dataKeyStorage, usageStats, cipher, providerConfig)
-	if err != nil {
-		return nil, err
-	}
-	ossKeeperService, err := secretkeeper.ProvideService(tracer, encryptedValueStorage, encryptionManager, registerer)
-	if err != nil {
-		return nil, err
-	}
-	secureValueService := service12.ProvideSecureValueService(tracer, accessClient, databaseDatabase, secureValueMetadataStorage, secureValueValidator, secureValueMutator, keeperMetadataStorage, ossKeeperService, registerer)
-	secureValueClient := secret.ProvideSecureValueClient(secureValueService, secureValueValidator, accessClient)
 	decryptAuthorizer := decrypt.ProvideDecryptAuthorizer(tracer)
 	decryptStorage, err := metadata.ProvideDecryptStorage(tracer, ossKeeperService, keeperMetadataStorage, secureValueMetadataStorage, decryptAuthorizer, registerer)
 	if err != nil {
@@ -1375,10 +1384,11 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	if err != nil {
 		return nil, err
 	}
+	secureValueClient := secret.ProvideSecureValueClient(secureValueService, secureValueValidator, accessClient)
 	repositorySecrets := secrets.ProvideRepositorySecrets(featureToggles, secretsService, secureValueClient, v3, cfg)
 	webhookExtraBuilder := webhooks.ProvideWebhooks(cfg, featureToggles, repositorySecrets, factory, renderingService, resourceClient, eventualRestConfigProvider)
 	v4 := extras.ProvideProvisioningOSSExtras(webhookExtraBuilder)
-	apiBuilder, err := provisioning2.RegisterAPIService(cfg, featureToggles, apiserverService, registerer, resourceClient, eventualRestConfigProvider, factory, accessClient, legacyMigrator, dualwriteService, usageStats, repositorySecrets, tracingService, v4)
+	apiBuilder, err := provisioning2.RegisterAPIService(cfg, featureToggles, apiserverService, registerer, resourceClient, eventualRestConfigProvider, factory, accessClient, legacyMigrator, dualwriteService, usageStats, v3, repositorySecrets, tracingService, v4)
 	if err != nil {
 		return nil, err
 	}
@@ -1476,7 +1486,7 @@ func InitializeForCLI(cfg *setting.Cfg) (Runner, error) {
 		return Runner{}, err
 	}
 	tracer := otelTracer()
-	databaseDatabase := database5.ProvideDatabase(sqlStore, tracer)
+	databaseDatabase := database4.ProvideDatabase(sqlStore, tracer)
 	registerer := metrics.ProvideRegisterer()
 	globalDataKeyStorage, err := encryption.ProvideGlobalDataKeyStorage(databaseDatabase, tracer, registerer)
 	if err != nil {
@@ -1494,7 +1504,7 @@ func InitializeForCLI(cfg *setting.Cfg) (Runner, error) {
 	if err != nil {
 		return Runner{}, err
 	}
-	cipher, err := service11.ProvideAESGCMCipherService(tracer, usageStats)
+	cipher, err := service4.ProvideAESGCMCipherService(tracer, usageStats)
 	if err != nil {
 		return Runner{}, err
 	}
@@ -1502,11 +1512,11 @@ func InitializeForCLI(cfg *setting.Cfg) (Runner, error) {
 	if err != nil {
 		return Runner{}, err
 	}
-	encryptionManager, err := manager4.ProvideEncryptionManager(tracer, dataKeyStorage, usageStats, cipher, providerConfig)
+	encryptionManager, err := manager2.ProvideEncryptionManager(tracer, dataKeyStorage, usageStats, cipher, providerConfig)
 	if err != nil {
 		return Runner{}, err
 	}
-	consolidationService := service12.ProvideConsolidationService(tracer, globalDataKeyStorage, encryptedValueStorage, globalEncryptedValueStorage, encryptionManager)
+	consolidationService := service5.ProvideConsolidationService(tracer, globalDataKeyStorage, encryptedValueStorage, globalEncryptedValueStorage, encryptionManager)
 	runner := NewRunner(cfg, sqlStore, ossImpl, serviceService, featureToggles, secretsService, secretsMigrator, userService, consolidationService)
 	return runner, nil
 }
@@ -1594,7 +1604,7 @@ var withOTelSet = wire.NewSet(
 	otelTracer, grpcserver.ProvideService, interceptors.ProvideAuthenticator,
 )
 
-var wireBasicSet = wire.NewSet(annotationsimpl.ProvideService, wire.Bind(new(annotations.Repository), new(*annotationsimpl.RepositoryImpl)), New, api.ProvideHTTPServer, query.ProvideService, wire.Bind(new(query.Service), new(*query.ServiceImpl)), bus.ProvideBus, wire.Bind(new(bus.Bus), new(*bus.InProcBus)), rendering.ProvideService, wire.Bind(new(rendering.Service), new(*rendering.RenderingService)), routing.ProvideRegister, wire.Bind(new(routing.RouteRegister), new(*routing.RouteRegisterImpl)), hooks.ProvideService, kvstore.ProvideService, localcache.ProvideService, bundleregistry.ProvideService, wire.Bind(new(supportbundles.Service), new(*bundleregistry.Service)), updatemanager.ProvideGrafanaService, updatemanager.ProvidePluginsService, service.ProvideService, wire.Bind(new(usagestats.Service), new(*service.UsageStats)), validator2.ProvideService, legacy.ProvideLegacyMigrator, pluginsintegration.WireSet, dashboards.ProvideFileStoreManager, wire.Bind(new(dashboards.FileStore), new(*dashboards.FileStoreManager)), cloudwatch.ProvideService, cloudmonitoring.ProvideService, azuremonitor.ProvideService, postgres.ProvideService, mysql.ProvideService, mssql.ProvideService, store.ProvideEntityEventsService, dualwrite.ProvideService, httpclientprovider.New, wire.Bind(new(httpclient.Provider), new(*httpclient2.Provider)), serverlock.ProvideService, annotationsimpl.ProvideCleanupService, wire.Bind(new(annotations.Cleaner), new(*annotationsimpl.CleanupServiceImpl)), cleanup.ProvideService, shorturlimpl.ProvideService, wire.Bind(new(shorturls.Service), new(*shorturlimpl.ShortURLService)), queryhistory.ProvideService, wire.Bind(new(queryhistory.Service), new(*queryhistory.QueryHistoryService)), correlations.ProvideService, wire.Bind(new(correlations.Service), new(*correlations.CorrelationsService)), quotaimpl.ProvideService, remotecache.ProvideService, wire.Bind(new(remotecache.CacheStorage), new(*remotecache.RemoteCache)), authinfoimpl.ProvideService, wire.Bind(new(login.AuthInfoService), new(*authinfoimpl.Service)), authinfoimpl.ProvideStore, datasourceproxy.ProvideService, sort.ProvideService, search2.ProvideService, searchV2.ProvideService, searchV2.ProvideSearchHTTPService, store.ProvideService, store.ProvideSystemUsersService, live.ProvideService, pushhttp.ProvideService, contexthandler.ProvideService, service10.ProvideService, wire.Bind(new(service10.LDAP), new(*service10.LDAPImpl)), jwt.ProvideService, wire.Bind(new(jwt.JWTService), new(*jwt.AuthService)), store2.ProvideDBStore, image.ProvideDeleteExpiredService, ngalert.ProvideService, librarypanels.ProvideService, wire.Bind(new(librarypanels.Service), new(*librarypanels.LibraryPanelService)), libraryelements.ProvideService, wire.Bind(new(libraryelements.Service), new(*libraryelements.LibraryElementService)), notifications.ProvideService, notifications.ProvideSmtpService, github.ProvideFactory, tracing.ProvideService, tracing.ProvideTracingConfig, wire.Bind(new(tracing.Tracer), new(*tracing.TracingService)), withOTelSet, testdatasource.ProvideService, api4.ProvideService, opentsdb.ProvideService, socialimpl.ProvideService, influxdb.ProvideService, wire.Bind(new(social.Service), new(*socialimpl.SocialService)), tempo.ProvideService, loki.ProvideService, graphite.ProvideService, prometheus.ProvideService, elasticsearch.ProvideService, pyroscope.ProvideService, parca.ProvideService, zipkin.ProvideService, jaeger.ProvideService, service7.ProvideCacheService, wire.Bind(new(datasources.CacheService), new(*service7.CacheServiceImpl)), service2.ProvideEncryptionService, wire.Bind(new(encryption2.Internal), new(*service2.Service)), manager.ProvideSecretsService, wire.Bind(new(secrets2.Service), new(*manager.SecretsService)), database.ProvideSecretsStore, wire.Bind(new(secrets2.Store), new(*database.SecretsStoreImpl)), grafanads.ProvideService, wire.Bind(new(dashboardsnapshots.Store), new(*database4.DashboardSnapshotStore)), database4.ProvideStore, wire.Bind(new(dashboardsnapshots.Service), new(*service8.ServiceImpl)), service8.ProvideService, service7.ProvideService, wire.Bind(new(datasources.DataSourceService), new(*service7.Service)), service7.ProvideLegacyDataSourceLookup, retriever.ProvideService, wire.Bind(new(serviceaccounts.ServiceAccountRetriever), new(*retriever.Service)), ossaccesscontrol.ProvideServiceAccountPermissions, wire.Bind(new(accesscontrol.ServiceAccountPermissionsService), new(*ossaccesscontrol.ServiceAccountPermissionsService)), manager2.ProvideServiceAccountsService, proxy.ProvideServiceAccountsProxy, wire.Bind(new(serviceaccounts.Service), new(*proxy.ServiceAccountsProxy)), mtdsclient.NewNullMTDatasourceClientBuilder, expr.ProvideService, featuremgmt.ProvideManagerService, featuremgmt.ProvideToggles, service5.ProvideDashboardServiceImpl, wire.Bind(new(dashboards2.PermissionsRegistrationService), new(*service5.DashboardServiceImpl)), service5.ProvideDashboardService, service5.ProvideDashboardProvisioningService, service5.ProvideDashboardPluginService, database2.ProvideDashboardStore, folderimpl.ProvideService, wire.Bind(new(folder.Service), new(*folderimpl.Service)), folderimpl.ProvideStore, wire.Bind(new(folder.Store), new(*folderimpl.FolderStoreImpl)), folderimpl.ProvideDashboardFolderStore, wire.Bind(new(folder.FolderStore), new(*folderimpl.DashboardFolderStoreImpl)), service9.ProvideService, wire.Bind(new(dashboardimport.Service), new(*service9.ImportDashboardService)), service6.ProvideService, wire.Bind(new(plugindashboards.Service), new(*service6.Service)), service6.ProvideDashboardUpdater, sanitizer.ProvideService, kvstore2.ProvideService, avatar.ProvideAvatarCacheServer, statscollector.ProvideService, csrf.ProvideCSRFFilter, wire.Bind(new(csrf.Service), new(*csrf.CSRF)), ossaccesscontrol.ProvideTeamPermissions, wire.Bind(new(accesscontrol.TeamPermissionsService), new(*ossaccesscontrol.TeamPermissionsService)), ossaccesscontrol.ProvideFolderPermissions, wire.Bind(new(accesscontrol.FolderPermissionsService), new(*ossaccesscontrol.FolderPermissionsService)), ossaccesscontrol.ProvideDashboardPermissions, wire.Bind(new(accesscontrol.DashboardPermissionsService), new(*ossaccesscontrol.DashboardPermissionsService)), ossaccesscontrol.ProvideReceiverPermissionsService, wire.Bind(new(accesscontrol.ReceiverPermissionsService), new(*ossaccesscontrol.ReceiverPermissionsService)), starimpl.ProvideService, playlistimpl.ProvideService, apikeyimpl.ProvideService, dashverimpl.ProvideService, service3.ProvideService, wire.Bind(new(publicdashboards.Service), new(*service3.PublicDashboardServiceImpl)), database3.ProvideStore, wire.Bind(new(publicdashboards.Store), new(*database3.PublicDashboardStoreImpl)), metric.ProvideService, api2.ProvideApi, api3.ProvideApi, userimpl.ProvideService, orgimpl.ProvideService, orgimpl.ProvideDeletionService, statsimpl.ProvideService, grpccontext.ProvideContextHandler, grpcserver.ProvideHealthService, grpcserver.ProvideReflectionService, resolver.ProvideEntityReferenceResolver, teamimpl.ProvideService, teamapi.ProvideTeamAPI, tempuserimpl.ProvideService, loginattemptimpl.ProvideService, wire.Bind(new(loginattempt.Service), new(*loginattemptimpl.Service)), migrations2.ProvideDataSourceMigrationService, migrations2.ProvideSecretMigrationProvider, wire.Bind(new(migrations2.SecretMigrationProvider), new(*migrations2.SecretMigrationProviderImpl)), resourcepermissions.NewActionSetService, wire.Bind(new(accesscontrol.ActionResolver), new(resourcepermissions.ActionSetService)), wire.Bind(new(pluginaccesscontrol.ActionSetRegistry), new(resourcepermissions.ActionSetService)), permreg.ProvidePermissionRegistry, acimpl.ProvideAccessControl, dualwrite2.ProvideZanzanaReconciler, navtreeimpl.ProvideService, wire.Bind(new(accesscontrol.AccessControl), new(*acimpl.AccessControl)), wire.Bind(new(notifications.TempUserStore), new(tempuser.Service)), tagimpl.ProvideService, wire.Bind(new(tag.Service), new(*tagimpl.Service)), authnimpl.ProvideService, authnimpl.ProvideIdentitySynchronizer, authnimpl.ProvideAuthnService, authnimpl.ProvideAuthnServiceAuthenticateOnly, authnimpl.ProvideRegistration, supportbundlesimpl.ProvideService, extsvcaccounts.ProvideExtSvcAccountsService, wire.Bind(new(serviceaccounts.ExtSvcAccountsService), new(*extsvcaccounts.ExtSvcAccountsService)), registry2.ProvideExtSvcRegistry, wire.Bind(new(extsvcauth.ExternalServiceRegistry), new(*registry2.Registry)), anonstore.ProvideAnonDBStore, wire.Bind(new(anonstore.AnonStore), new(*anonstore.AnonDBStore)), loggermw.Provide, slogadapter.Provide, signingkeysimpl.ProvideEmbeddedSigningKeysService, wire.Bind(new(signingkeys.Service), new(*signingkeysimpl.Service)), ssosettingsimpl.ProvideService, wire.Bind(new(ssosettings.Service), new(*ssosettingsimpl.Service)), idimpl.ProvideService, wire.Bind(new(auth.IDService), new(*idimpl.Service)), cloudmigrationimpl.ProvideService, userimpl.ProvideVerifier, connectors.ProvideOrgRoleMapper, wire.Bind(new(user.Verifier), new(*userimpl.Verifier)), authz.WireSet, metadata.ProvideSecureValueMetadataStorage, metadata.ProvideKeeperMetadataStorage, metadata.ProvideDecryptStorage, decrypt.ProvideDecryptAuthorizer, decrypt.ProvideDecryptService, inline.ProvideInlineSecureValueService, encryption.ProvideDataKeyStorage, encryption.ProvideGlobalDataKeyStorage, encryption.ProvideEncryptedValueStorage, encryption.ProvideGlobalEncryptedValueStorage, service12.ProvideSecureValueService, validator3.ProvideKeeperValidator, validator3.ProvideSecureValueValidator, mutator.ProvideKeeperMutator, mutator.ProvideSecureValueMutator, migrator2.NewWithEngine, database5.ProvideDatabase, wire.Bind(new(contracts.Database), new(*database5.Database)), manager4.ProvideEncryptionManager, service11.ProvideAESGCMCipherService, resource.ProvideStorageMetrics, resource.ProvideIndexMetrics, apiserver.WireSet, apiregistry.WireSet, appregistry.WireSet)
+var wireBasicSet = wire.NewSet(annotationsimpl.ProvideService, wire.Bind(new(annotations.Repository), new(*annotationsimpl.RepositoryImpl)), New, api.ProvideHTTPServer, query.ProvideService, wire.Bind(new(query.Service), new(*query.ServiceImpl)), bus.ProvideBus, wire.Bind(new(bus.Bus), new(*bus.InProcBus)), rendering.ProvideService, wire.Bind(new(rendering.Service), new(*rendering.RenderingService)), routing.ProvideRegister, wire.Bind(new(routing.RouteRegister), new(*routing.RouteRegisterImpl)), hooks.ProvideService, kvstore.ProvideService, localcache.ProvideService, bundleregistry.ProvideService, wire.Bind(new(supportbundles.Service), new(*bundleregistry.Service)), updatemanager.ProvideGrafanaService, updatemanager.ProvidePluginsService, service.ProvideService, wire.Bind(new(usagestats.Service), new(*service.UsageStats)), validator3.ProvideService, legacy.ProvideLegacyMigrator, pluginsintegration.WireSet, dashboards.ProvideFileStoreManager, wire.Bind(new(dashboards.FileStore), new(*dashboards.FileStoreManager)), cloudwatch.ProvideService, cloudmonitoring.ProvideService, azuremonitor.ProvideService, postgres.ProvideService, mysql.ProvideService, mssql.ProvideService, store.ProvideEntityEventsService, dualwrite.ProvideService, httpclientprovider.New, wire.Bind(new(httpclient.Provider), new(*httpclient2.Provider)), serverlock.ProvideService, annotationsimpl.ProvideCleanupService, wire.Bind(new(annotations.Cleaner), new(*annotationsimpl.CleanupServiceImpl)), cleanup.ProvideService, shorturlimpl.ProvideService, wire.Bind(new(shorturls.Service), new(*shorturlimpl.ShortURLService)), queryhistory.ProvideService, wire.Bind(new(queryhistory.Service), new(*queryhistory.QueryHistoryService)), correlations.ProvideService, wire.Bind(new(correlations.Service), new(*correlations.CorrelationsService)), quotaimpl.ProvideService, remotecache.ProvideService, wire.Bind(new(remotecache.CacheStorage), new(*remotecache.RemoteCache)), authinfoimpl.ProvideService, wire.Bind(new(login.AuthInfoService), new(*authinfoimpl.Service)), authinfoimpl.ProvideStore, datasourceproxy.ProvideService, sort.ProvideService, search2.ProvideService, searchV2.ProvideService, searchV2.ProvideSearchHTTPService, store.ProvideService, store.ProvideSystemUsersService, live.ProvideService, pushhttp.ProvideService, contexthandler.ProvideService, service12.ProvideService, wire.Bind(new(service12.LDAP), new(*service12.LDAPImpl)), jwt.ProvideService, wire.Bind(new(jwt.JWTService), new(*jwt.AuthService)), store2.ProvideDBStore, image.ProvideDeleteExpiredService, ngalert.ProvideService, librarypanels.ProvideService, wire.Bind(new(librarypanels.Service), new(*librarypanels.LibraryPanelService)), libraryelements.ProvideService, wire.Bind(new(libraryelements.Service), new(*libraryelements.LibraryElementService)), notifications.ProvideService, notifications.ProvideSmtpService, github.ProvideFactory, tracing.ProvideService, tracing.ProvideTracingConfig, wire.Bind(new(tracing.Tracer), new(*tracing.TracingService)), withOTelSet, testdatasource.ProvideService, api4.ProvideService, opentsdb.ProvideService, socialimpl.ProvideService, influxdb.ProvideService, wire.Bind(new(social.Service), new(*socialimpl.SocialService)), tempo.ProvideService, loki.ProvideService, graphite.ProvideService, prometheus.ProvideService, elasticsearch.ProvideService, pyroscope.ProvideService, parca.ProvideService, zipkin.ProvideService, jaeger.ProvideService, service9.ProvideCacheService, wire.Bind(new(datasources.CacheService), new(*service9.CacheServiceImpl)), service2.ProvideEncryptionService, wire.Bind(new(encryption2.Internal), new(*service2.Service)), manager.ProvideSecretsService, wire.Bind(new(secrets2.Service), new(*manager.SecretsService)), database.ProvideSecretsStore, wire.Bind(new(secrets2.Store), new(*database.SecretsStoreImpl)), grafanads.ProvideService, wire.Bind(new(dashboardsnapshots.Store), new(*database5.DashboardSnapshotStore)), database5.ProvideStore, wire.Bind(new(dashboardsnapshots.Service), new(*service10.ServiceImpl)), service10.ProvideService, service9.ProvideService, wire.Bind(new(datasources.DataSourceService), new(*service9.Service)), service9.ProvideLegacyDataSourceLookup, retriever.ProvideService, wire.Bind(new(serviceaccounts.ServiceAccountRetriever), new(*retriever.Service)), ossaccesscontrol.ProvideServiceAccountPermissions, wire.Bind(new(accesscontrol.ServiceAccountPermissionsService), new(*ossaccesscontrol.ServiceAccountPermissionsService)), manager3.ProvideServiceAccountsService, proxy.ProvideServiceAccountsProxy, wire.Bind(new(serviceaccounts.Service), new(*proxy.ServiceAccountsProxy)), mtdsclient.NewNullMTDatasourceClientBuilder, expr.ProvideService, featuremgmt.ProvideManagerService, featuremgmt.ProvideToggles, service7.ProvideDashboardServiceImpl, wire.Bind(new(dashboards2.PermissionsRegistrationService), new(*service7.DashboardServiceImpl)), service7.ProvideDashboardService, service7.ProvideDashboardProvisioningService, service7.ProvideDashboardPluginService, database2.ProvideDashboardStore, folderimpl.ProvideService, wire.Bind(new(folder.Service), new(*folderimpl.Service)), folderimpl.ProvideStore, wire.Bind(new(folder.Store), new(*folderimpl.FolderStoreImpl)), folderimpl.ProvideDashboardFolderStore, wire.Bind(new(folder.FolderStore), new(*folderimpl.DashboardFolderStoreImpl)), service11.ProvideService, wire.Bind(new(dashboardimport.Service), new(*service11.ImportDashboardService)), service8.ProvideService, wire.Bind(new(plugindashboards.Service), new(*service8.Service)), service8.ProvideDashboardUpdater, sanitizer.ProvideService, kvstore2.ProvideService, avatar.ProvideAvatarCacheServer, statscollector.ProvideService, csrf.ProvideCSRFFilter, wire.Bind(new(csrf.Service), new(*csrf.CSRF)), ossaccesscontrol.ProvideTeamPermissions, wire.Bind(new(accesscontrol.TeamPermissionsService), new(*ossaccesscontrol.TeamPermissionsService)), ossaccesscontrol.ProvideFolderPermissions, wire.Bind(new(accesscontrol.FolderPermissionsService), new(*ossaccesscontrol.FolderPermissionsService)), ossaccesscontrol.ProvideDashboardPermissions, wire.Bind(new(accesscontrol.DashboardPermissionsService), new(*ossaccesscontrol.DashboardPermissionsService)), ossaccesscontrol.ProvideReceiverPermissionsService, wire.Bind(new(accesscontrol.ReceiverPermissionsService), new(*ossaccesscontrol.ReceiverPermissionsService)), starimpl.ProvideService, playlistimpl.ProvideService, apikeyimpl.ProvideService, dashverimpl.ProvideService, service3.ProvideService, wire.Bind(new(publicdashboards.Service), new(*service3.PublicDashboardServiceImpl)), database3.ProvideStore, wire.Bind(new(publicdashboards.Store), new(*database3.PublicDashboardStoreImpl)), metric.ProvideService, api2.ProvideApi, api3.ProvideApi, userimpl.ProvideService, orgimpl.ProvideService, orgimpl.ProvideDeletionService, statsimpl.ProvideService, grpccontext.ProvideContextHandler, grpcserver.ProvideHealthService, grpcserver.ProvideReflectionService, resolver.ProvideEntityReferenceResolver, teamimpl.ProvideService, teamapi.ProvideTeamAPI, tempuserimpl.ProvideService, loginattemptimpl.ProvideService, wire.Bind(new(loginattempt.Service), new(*loginattemptimpl.Service)), migrations2.ProvideDataSourceMigrationService, migrations2.ProvideSecretMigrationProvider, wire.Bind(new(migrations2.SecretMigrationProvider), new(*migrations2.SecretMigrationProviderImpl)), resourcepermissions.NewActionSetService, wire.Bind(new(accesscontrol.ActionResolver), new(resourcepermissions.ActionSetService)), wire.Bind(new(pluginaccesscontrol.ActionSetRegistry), new(resourcepermissions.ActionSetService)), permreg.ProvidePermissionRegistry, acimpl.ProvideAccessControl, dualwrite2.ProvideZanzanaReconciler, navtreeimpl.ProvideService, wire.Bind(new(accesscontrol.AccessControl), new(*acimpl.AccessControl)), wire.Bind(new(notifications.TempUserStore), new(tempuser.Service)), tagimpl.ProvideService, wire.Bind(new(tag.Service), new(*tagimpl.Service)), authnimpl.ProvideService, authnimpl.ProvideIdentitySynchronizer, authnimpl.ProvideAuthnService, authnimpl.ProvideAuthnServiceAuthenticateOnly, authnimpl.ProvideRegistration, supportbundlesimpl.ProvideService, extsvcaccounts.ProvideExtSvcAccountsService, wire.Bind(new(serviceaccounts.ExtSvcAccountsService), new(*extsvcaccounts.ExtSvcAccountsService)), registry2.ProvideExtSvcRegistry, wire.Bind(new(extsvcauth.ExternalServiceRegistry), new(*registry2.Registry)), anonstore.ProvideAnonDBStore, wire.Bind(new(anonstore.AnonStore), new(*anonstore.AnonDBStore)), loggermw.Provide, slogadapter.Provide, signingkeysimpl.ProvideEmbeddedSigningKeysService, wire.Bind(new(signingkeys.Service), new(*signingkeysimpl.Service)), ssosettingsimpl.ProvideService, wire.Bind(new(ssosettings.Service), new(*ssosettingsimpl.Service)), idimpl.ProvideService, wire.Bind(new(auth.IDService), new(*idimpl.Service)), cloudmigrationimpl.ProvideService, userimpl.ProvideVerifier, connectors.ProvideOrgRoleMapper, wire.Bind(new(user.Verifier), new(*userimpl.Verifier)), authz.WireSet, metadata.ProvideSecureValueMetadataStorage, metadata.ProvideKeeperMetadataStorage, metadata.ProvideDecryptStorage, decrypt.ProvideDecryptAuthorizer, decrypt.ProvideDecryptService, inline.ProvideInlineSecureValueService, encryption.ProvideDataKeyStorage, encryption.ProvideGlobalDataKeyStorage, encryption.ProvideEncryptedValueStorage, encryption.ProvideGlobalEncryptedValueStorage, service5.ProvideSecureValueService, validator.ProvideKeeperValidator, validator.ProvideSecureValueValidator, mutator.ProvideKeeperMutator, mutator.ProvideSecureValueMutator, migrator2.NewWithEngine, database4.ProvideDatabase, wire.Bind(new(contracts.Database), new(*database4.Database)), manager2.ProvideEncryptionManager, service4.ProvideAESGCMCipherService, resource.ProvideStorageMetrics, resource.ProvideIndexMetrics, apiserver.WireSet, apiregistry.WireSet, appregistry.WireSet)
 
 var wireSet = wire.NewSet(
 	wireBasicSet, metrics.WireSet, sqlstore.ProvideService, metrics2.ProvideService, wire.Bind(new(notifications.Service), new(*notifications.NotificationService)), wire.Bind(new(notifications.WebhookSender), new(*notifications.NotificationService)), wire.Bind(new(notifications.EmailSender), new(*notifications.NotificationService)), wire.Bind(new(db.DB), new(*sqlstore.SQLStore)), prefimpl.ProvideService, oauthtoken.ProvideService, wire.Bind(new(oauthtoken.OAuthTokenService), new(*oauthtoken.Service)), wire.Bind(new(cleanup.AlertRuleService), new(*store2.DBstore)),
diff --git a/pkg/services/apiserver/options/grafana-aggregator.go b/pkg/services/apiserver/options/grafana-aggregator.go
index 367b4940cc7..bc8b6f66fa6 100644
--- a/pkg/services/apiserver/options/grafana-aggregator.go
+++ b/pkg/services/apiserver/options/grafana-aggregator.go
@@ -75,7 +75,7 @@ func (o *GrafanaAggregatorOptions) ApplyTo(aggregatorConfig *aggregatorapiserver
 		return err
 	}
 	// override the RESTOptionsGetter to use the in memory storage options
-	restOptionsGetter, err := apistore.NewRESTOptionsGetterMemory(etcdOptions.StorageConfig)
+	restOptionsGetter, err := apistore.NewRESTOptionsGetterMemory(etcdOptions.StorageConfig, nil)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/services/apiserver/options/storage.go b/pkg/services/apiserver/options/storage.go
index 2ff900037fd..5d7661a99e1 100644
--- a/pkg/services/apiserver/options/storage.go
+++ b/pkg/services/apiserver/options/storage.go
@@ -14,6 +14,7 @@ import (
 	"k8s.io/client-go/rest"
 
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	secret "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/storage/unified/apistore"
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
@@ -63,6 +64,9 @@ type StorageOptions struct {
 	// value, it is considered large and gets partially stored in blob storage.
 	BlobThresholdBytes int
 
+	// Support writing secrets inline
+	InlineSecrets secret.InlineSecureValueSupport
+
 	// {resource}.{group} = 1|2|3|4
 	UnifiedStorageConfig map[string]setting.UnifiedStorageConfig
 
@@ -164,7 +168,7 @@ func (o *StorageOptions) ApplyTo(serverConfig *genericapiserver.RecommendedConfi
 	if err != nil {
 		return err
 	}
-	getter := apistore.NewRESTOptionsGetterForClient(unified, etcdOptions.StorageConfig, o.ConfigProvider)
+	getter := apistore.NewRESTOptionsGetterForClient(unified, o.InlineSecrets, etcdOptions.StorageConfig, o.ConfigProvider)
 	serverConfig.RESTOptionsGetter = getter
 	return nil
 }
diff --git a/pkg/services/apiserver/service.go b/pkg/services/apiserver/service.go
index be580025823..31777f82a65 100644
--- a/pkg/services/apiserver/service.go
+++ b/pkg/services/apiserver/service.go
@@ -39,6 +39,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/registry/apis/datasource"
+	secret "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/services/apiserver/aggregatorrunner"
 	"github.com/grafana/grafana/pkg/services/apiserver/appinstaller"
 	"github.com/grafana/grafana/pkg/services/apiserver/auth/authenticator"
@@ -105,6 +106,7 @@ type service struct {
 	contextProvider    datasource.PluginContextWrapper
 	pluginStore        pluginstore.Store
 	unified            resource.ResourceClient
+	secrets            secret.InlineSecureValueSupport
 	restConfigProvider RestConfigProvider
 
 	buildHandlerChainFuncFromBuilders builder.BuildHandlerChainFuncFromBuilders
@@ -128,6 +130,7 @@ func ProvideService(
 	pluginStore pluginstore.Store,
 	storageStatus dualwrite.Service,
 	unified resource.ResourceClient,
+	secrets secret.InlineSecureValueSupport,
 	restConfigProvider RestConfigProvider,
 	buildHandlerChainFuncFromBuilders builder.BuildHandlerChainFuncFromBuilders,
 	eventualRestConfigProvider *eventualRestConfigProvider,
@@ -159,6 +162,7 @@ func ProvideService(
 		serverLockService:                 serverLockService,
 		storageStatus:                     storageStatus,
 		unified:                           unified,
+		secrets:                           secrets,
 		restConfigProvider:                restConfigProvider,
 		buildHandlerChainFuncFromBuilders: buildHandlerChainFuncFromBuilders,
 		aggregatorRunner:                  aggregatorRunner,
@@ -337,7 +341,7 @@ func (s *service) start(ctx context.Context) error {
 			return err
 		}
 	} else {
-		getter := apistore.NewRESTOptionsGetterForClient(s.unified, o.RecommendedOptions.Etcd.StorageConfig, s.restConfigProvider)
+		getter := apistore.NewRESTOptionsGetterForClient(s.unified, s.secrets, o.RecommendedOptions.Etcd.StorageConfig, s.restConfigProvider)
 		optsregister = getter.RegisterOptions
 		serverConfig.RESTOptionsGetter = getter
 	}
diff --git a/pkg/storage/unified/apistore/restoptions.go b/pkg/storage/unified/apistore/restoptions.go
index 42c91e9219c..53ce1d2bb2a 100644
--- a/pkg/storage/unified/apistore/restoptions.go
+++ b/pkg/storage/unified/apistore/restoptions.go
@@ -19,6 +19,7 @@ import (
 	flowcontrolrequest "k8s.io/apiserver/pkg/util/flowcontrol/request"
 	"k8s.io/client-go/tools/cache"
 
+	secret "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
 )
 
@@ -28,6 +29,7 @@ type StorageOptionsRegister func(gr schema.GroupResource, opts StorageOptions)
 
 type RESTOptionsGetter struct {
 	client         resource.ResourceClient
+	secrets        secret.InlineSecureValueSupport
 	original       storagebackend.Config
 	configProvider RestConfigProvider
 
@@ -35,16 +37,22 @@ type RESTOptionsGetter struct {
 	options map[string]StorageOptions
 }
 
-func NewRESTOptionsGetterForClient(client resource.ResourceClient, original storagebackend.Config, configProvider RestConfigProvider) *RESTOptionsGetter {
+func NewRESTOptionsGetterForClient(
+	client resource.ResourceClient,
+	secrets secret.InlineSecureValueSupport,
+	original storagebackend.Config,
+	configProvider RestConfigProvider,
+) *RESTOptionsGetter {
 	return &RESTOptionsGetter{
 		client:         client,
+		secrets:        secrets,
 		original:       original,
 		options:        make(map[string]StorageOptions),
 		configProvider: configProvider,
 	}
 }
 
-func NewRESTOptionsGetterMemory(originalStorageConfig storagebackend.Config) (*RESTOptionsGetter, error) {
+func NewRESTOptionsGetterMemory(originalStorageConfig storagebackend.Config, secrets secret.InlineSecureValueSupport) (*RESTOptionsGetter, error) {
 	backend, err := resource.NewCDKBackend(context.Background(), resource.CDKBackendOptions{
 		Bucket: memblob.OpenBucket(&memblob.Options{}),
 	})
@@ -59,6 +67,7 @@ func NewRESTOptionsGetterMemory(originalStorageConfig storagebackend.Config) (*R
 	}
 	return NewRESTOptionsGetterForClient(
 		resource.NewLocalResourceClient(server),
+		secrets,
 		originalStorageConfig,
 		nil,
 	), nil
@@ -67,7 +76,7 @@ func NewRESTOptionsGetterMemory(originalStorageConfig storagebackend.Config) (*R
 // Optionally, this constructor allows specifying directories
 // for resources that are required to be read/watched on startup and there
 // won't be any write operations that initially bootstrap their directories
-func NewRESTOptionsGetterForFile(path string,
+func NewRESTOptionsGetterForFileXX(path string,
 	originalStorageConfig storagebackend.Config,
 	features map[string]any) (*RESTOptionsGetter, error) {
 	if path == "" {
@@ -95,6 +104,7 @@ func NewRESTOptionsGetterForFile(path string,
 	}
 	return NewRESTOptionsGetterForClient(
 		resource.NewLocalResourceClient(server),
+		nil, // secrets
 		originalStorageConfig,
 		nil,
 	), nil
@@ -137,8 +147,10 @@ func (r *RESTOptionsGetter) GetRESTOptions(resource schema.GroupResource, _ runt
 			trigger storage.IndexerFuncs,
 			indexers *cache.Indexers,
 		) (storage.Interface, factory.DestroyFunc, error) {
+			opts := r.options[resource.String()]
+			opts.SecureValues = r.secrets
 			return NewStorage(config, r.client, keyFunc, nil, newFunc, newListFunc, getAttrsFunc,
-				trigger, indexers, r.configProvider, r.options[resource.String()])
+				trigger, indexers, r.configProvider, opts)
 		},
 		DeleteCollectionWorkers: 0,
 		EnableGarbageCollection: false,
diff --git a/pkg/storage/unified/apistore/store.go b/pkg/storage/unified/apistore/store.go
index c8580ca1fcc..ea2761eb86e 100644
--- a/pkg/storage/unified/apistore/store.go
+++ b/pkg/storage/unified/apistore/store.go
@@ -32,9 +32,9 @@ import (
 	"k8s.io/client-go/tools/cache"
 
 	authtypes "github.com/grafana/authlib/types"
-
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
+	secrets "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
 	"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
 )
@@ -61,6 +61,9 @@ type StorageOptions struct {
 	// Add internalID label when missing
 	RequireDeprecatedInternalID bool
 
+	// Process inline secure values
+	SecureValues secrets.InlineSecureValueSupport
+
 	// Temporary fix to support adding default permissions AfterCreate
 	Permissions DefaultPermissionSetter
 }
diff --git a/pkg/storage/unified/client.go b/pkg/storage/unified/client.go
index 635f134825c..60a96e77855 100644
--- a/pkg/storage/unified/client.go
+++ b/pkg/storage/unified/client.go
@@ -6,24 +6,23 @@ import (
 	"path/filepath"
 	"time"
 
-	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
-	"gocloud.dev/blob/fileblob"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
 	otgrpc "github.com/opentracing-contrib/go-grpc"
 	"github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
+	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
+	"gocloud.dev/blob/fileblob"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/grafana/authlib/types"
 	"github.com/grafana/dskit/flagext"
 	"github.com/grafana/dskit/grpcclient"
 	"github.com/grafana/dskit/middleware"
 	"github.com/grafana/dskit/services"
-
 	infraDB "github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	secrets "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/services/apiserver/options"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
@@ -36,13 +35,14 @@ import (
 )
 
 type Options struct {
-	Cfg      *setting.Cfg
-	Features featuremgmt.FeatureToggles
-	DB       infraDB.DB
-	Tracer   tracing.Tracer
-	Reg      prometheus.Registerer
-	Authzc   types.AccessClient
-	Docs     resource.DocumentBuilderSupplier
+	Cfg          *setting.Cfg
+	Features     featuremgmt.FeatureToggles
+	DB           infraDB.DB
+	Tracer       tracing.Tracer
+	Reg          prometheus.Registerer
+	Authzc       types.AccessClient
+	Docs         resource.DocumentBuilderSupplier
+	SecureValues secrets.InlineSecureValueSupport
 }
 
 type clientMetrics struct {
@@ -64,7 +64,7 @@ func ProvideUnifiedStorageClient(opts *Options,
 		SearchServerAddress: apiserverCfg.Key("search_server_address").MustString(""),
 		BlobStoreURL:        apiserverCfg.Key("blob_url").MustString(""),
 		BlobThresholdBytes:  apiserverCfg.Key("blob_threshold_bytes").MustInt(options.BlobThresholdDefault),
-	}, opts.Cfg, opts.Features, opts.DB, opts.Tracer, opts.Reg, opts.Authzc, opts.Docs, storageMetrics, indexMetrics)
+	}, opts.Cfg, opts.Features, opts.DB, opts.Tracer, opts.Reg, opts.Authzc, opts.Docs, storageMetrics, indexMetrics, opts.SecureValues)
 	if err == nil {
 		// Used to get the folder stats
 		client = federated.NewFederatedClient(
@@ -86,6 +86,7 @@ func newClient(opts options.StorageOptions,
 	docs resource.DocumentBuilderSupplier,
 	storageMetrics *resource.StorageMetrics,
 	indexMetrics *resource.BleveIndexMetrics,
+	secure secrets.InlineSecureValueSupport,
 ) (resource.ResourceClient, error) {
 	ctx := context.Background()
 
@@ -168,6 +169,7 @@ func newClient(opts options.StorageOptions,
 			StorageMetrics: storageMetrics,
 			IndexMetrics:   indexMetrics,
 			Features:       features,
+			SecureValues:   secure,
 		}
 
 		if cfg.QOSEnabled {
diff --git a/pkg/storage/unified/client_test.go b/pkg/storage/unified/client_test.go
index 3169786ba64..48d57032501 100644
--- a/pkg/storage/unified/client_test.go
+++ b/pkg/storage/unified/client_test.go
@@ -6,6 +6,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc"
+
 	authlib "github.com/grafana/authlib/types"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/services/apiserver/options"
@@ -13,9 +16,6 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
 	"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
-	"github.com/stretchr/testify/require"
-
-	"google.golang.org/grpc"
 )
 
 func TestUnifiedStorageClient(t *testing.T) {
@@ -45,6 +45,7 @@ func TestUnifiedStorageClient(t *testing.T) {
 				nil,
 				nil,
 				nil,
+				nil,
 			)
 			require.NoError(t, err)
 
@@ -78,6 +79,7 @@ func TestUnifiedStorageClient(t *testing.T) {
 				nil,
 				nil,
 				nil,
+				nil,
 			)
 			require.NoError(t, err)
 
diff --git a/pkg/storage/unified/resource/server.go b/pkg/storage/unified/resource/server.go
index 78bf79627da..39e38062fb5 100644
--- a/pkg/storage/unified/resource/server.go
+++ b/pkg/storage/unified/resource/server.go
@@ -21,8 +21,8 @@ import (
 	claims "github.com/grafana/authlib/types"
 	"github.com/grafana/dskit/backoff"
 	"github.com/grafana/dskit/ring"
-
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
+	secrets "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
 	"github.com/grafana/grafana/pkg/util/scheduler"
 )
@@ -208,6 +208,9 @@ type ResourceServerOptions struct {
 	// Link RBAC
 	AccessClient claims.AccessClient
 
+	// Manage secure values
+	SecureValues secrets.InlineSecureValueSupport
+
 	// Callbacks for startup and shutdown
 	Lifecycle LifecycleHooks
 
@@ -297,6 +300,7 @@ func NewResourceServer(opts ResourceServerOptions) (ResourceServer, error) {
 		blob:             blobstore,
 		diagnostics:      opts.Diagnostics,
 		access:           opts.AccessClient,
+		secure:           opts.SecureValues,
 		writeHooks:       opts.WriteHooks,
 		lifecycle:        opts.Lifecycle,
 		now:              opts.Now,
@@ -333,6 +337,7 @@ type server struct {
 	log            *slog.Logger
 	backend        StorageBackend
 	blob           BlobSupport
+	secure         secrets.InlineSecureValueSupport
 	search         *searchSupport
 	diagnostics    resourcepb.DiagnosticsServer
 	access         claims.AccessClient
@@ -444,16 +449,6 @@ func (s *server) newEvent(ctx context.Context, user claims.AuthInfo, key *resour
 		return nil, NewBadRequestError("can not save annotation: " + utils.AnnoKeyGrantPermissions)
 	}
 
-	// Verify that this resource can reference secure values
-	secure, err := obj.GetSecureValues()
-	if err != nil {
-		return nil, AsErrorResult(err)
-	}
-	if len(secure) > 0 {
-		// See: https://github.com/grafana/grafana/pull/107803
-		return nil, NewBadRequestError("Saving secure values is not yet supported")
-	}
-
 	event := &WriteEvent{
 		Value:  value,
 		Key:    key,
@@ -477,6 +472,20 @@ func (s *server) newEvent(ctx context.Context, user claims.AuthInfo, key *resour
 		}
 	}
 
+	// Verify that this resource can reference secure values
+	secure, err := obj.GetSecureValues()
+	if err != nil {
+		return nil, AsErrorResult(err)
+	}
+	if len(secure) > 0 {
+		if s.secure == nil {
+			return nil, NewBadRequestError("secure storage not configured")
+		}
+
+		// See: https://github.com/grafana/grafana/pull/107803
+		return nil, NewBadRequestError("Saving secure values is not yet supported")
+	}
+
 	if key.Namespace != obj.GetNamespace() {
 		return nil, NewBadRequestError("key/namespace do not match")
 	}
diff --git a/pkg/storage/unified/sql/server.go b/pkg/storage/unified/sql/server.go
index e89b20a0780..1eee524df75 100644
--- a/pkg/storage/unified/sql/server.go
+++ b/pkg/storage/unified/sql/server.go
@@ -11,8 +11,8 @@ import (
 	"github.com/grafana/authlib/types"
 	"github.com/grafana/dskit/ring"
 	"github.com/grafana/dskit/services"
-
 	infraDB "github.com/grafana/grafana/pkg/infra/db"
+	secrets "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/setting"
@@ -38,6 +38,7 @@ type ServerOptions struct {
 	IndexMetrics   *resource.BleveIndexMetrics
 	Features       featuremgmt.FeatureToggles
 	QOSQueue       QOSEnqueueDequeuer
+	SecureValues   secrets.InlineSecureValueSupport
 	Ring           *ring.Ring
 	RingLifecycler *ring.BasicLifecycler
 }
@@ -52,7 +53,8 @@ func NewResourceServer(
 		Blob: resource.BlobConfig{
 			URL: apiserverCfg.Key("blob_url").MustString(""),
 		},
-		Reg: opts.Reg,
+		Reg:          opts.Reg,
+		SecureValues: opts.SecureValues,
 	}
 	if opts.AccessClient != nil {
 		serverOptions.AccessClient = resource.NewAuthzLimitedClient(opts.AccessClient, resource.AuthzOptions{Tracer: opts.Tracer, Registry: opts.Reg})

From 7cde0dfaf52848955b5f1c5905d03c534439a409 Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Mon, 11 Aug 2025 14:40:44 +0200
Subject: [PATCH 079/243] Chore: Disable cgo for postgres/mysql tests (#109444)

* disable cgo for postgres/mysql tests

* add missing error constants
---
 .github/workflows/pr-test-integration.yml |  4 ++--
 pkg/util/sqlite/sqlite_nocgo.go           | 23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-test-integration.yml b/.github/workflows/pr-test-integration.yml
index 314ca335979..89b4132d304 100644
--- a/.github/workflows/pr-test-integration.yml
+++ b/.github/workflows/pr-test-integration.yml
@@ -93,7 +93,7 @@ jobs:
         run: |
           set -euo pipefail
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/pkgs-with-tests-named.sh -b TestIntegration | ./scripts/ci/backend-tests/shard.sh -N"$SHARD" -d-)"
-          go test -p=1 -tags=mysql -timeout=5m -run '^TestIntegration' "${PACKAGES[@]}"
+          CGO_ENABLED=0 go test -p=1 -tags=mysql -timeout=5m -run '^TestIntegration' "${PACKAGES[@]}"
   postgres:
     strategy:
       matrix:
@@ -138,7 +138,7 @@ jobs:
         run: |
           set -euo pipefail
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/pkgs-with-tests-named.sh -b TestIntegration | ./scripts/ci/backend-tests/shard.sh -N"$SHARD" -d-)"
-          go test -p=1 -tags=postgres -timeout=5m -run '^TestIntegration' "${PACKAGES[@]}"
+          CGO_ENABLED=0 go test -p=1 -tags=postgres -timeout=5m -run '^TestIntegration' "${PACKAGES[@]}"
 
   # This is the job that is actually required by rulesets.
   # We want to only require one job instead of all the individual tests and shards.
diff --git a/pkg/util/sqlite/sqlite_nocgo.go b/pkg/util/sqlite/sqlite_nocgo.go
index e3b9a0429d3..28afe0f985f 100644
--- a/pkg/util/sqlite/sqlite_nocgo.go
+++ b/pkg/util/sqlite/sqlite_nocgo.go
@@ -2,7 +2,28 @@
 
 package sqlite
 
-import "modernc.org/sqlite"
+import (
+	"database/sql"
+	"errors"
+
+	"modernc.org/sqlite"
+)
+
+const DriverName = "sqlite"
+
+// The errors below are used in tests to simulate specific SQLite errors. It's a temporary solution
+// until we rewrite the tests not to depend on the sqlite3 package internals directly.
+// Note: Since modernc.org/sqlite driver does not expose error codes like sqlite3, we cannot use the same approach.
+var (
+	TestErrUniqueConstraintViolation = errors.New("unique constraint violation (simulated)")
+	TestErrBusy                      = errors.New("database is busy (simulated)")
+	TestErrLocked                    = errors.New("database is locked (simulated)")
+)
+
+func init() {
+	// alias the driver name to match the CGo driver
+	sql.Register("sqlite3", &Driver{})
+}
 
 //
 // FIXME (@zserge)

From 63237f0be851d65acfb09ede64c1aa9c5c6b5454 Mon Sep 17 00:00:00 2001
From: Yulia Shanyrova <yulia.shanyrova@grafana.com>
Date: Mon, 11 Aug 2025 14:45:21 +0200
Subject: [PATCH 080/243] Plugins: All plugins are up to date message if now
 new updates available (#109175)

* add message for no updates abailable

* add tests to PluginList
---
 .../admin/components/PluginList.test.tsx      | 97 +++++++++++++++++++
 .../plugins/admin/components/PluginList.tsx   | 11 ++-
 public/locales/en-US/grafana.json             |  3 +
 3 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 public/app/features/plugins/admin/components/PluginList.test.tsx

diff --git a/public/app/features/plugins/admin/components/PluginList.test.tsx b/public/app/features/plugins/admin/components/PluginList.test.tsx
new file mode 100644
index 00000000000..3588bd3f895
--- /dev/null
+++ b/public/app/features/plugins/admin/components/PluginList.test.tsx
@@ -0,0 +1,97 @@
+import { render, screen } from '@testing-library/react';
+
+import { PluginSignatureStatus, PluginSignatureType, PluginType } from '@grafana/data';
+import { config } from '@grafana/runtime';
+
+import { CatalogPlugin } from '../types';
+
+import { PluginList } from './PluginList';
+
+jest.mock('react-router-dom-v5-compat', () => ({ useLocation: jest.fn(), useSearchParams: jest.fn() }));
+
+const mockUseLocation = jest.requireMock('react-router-dom-v5-compat').useLocation;
+const mockUseSearchParams = jest.requireMock('react-router-dom-v5-compat').useSearchParams;
+
+const mockPlugin: CatalogPlugin = {
+  description: 'Test plugin description',
+  downloads: 1000,
+  hasUpdate: false,
+  id: 'test-plugin',
+  info: { logos: { small: 'small-logo-url', large: 'large-logo-url' }, keywords: ['test', 'plugin'] },
+  isDev: false,
+  isCore: false,
+  isEnterprise: false,
+  isInstalled: true,
+  isDisabled: false,
+  isDeprecated: false,
+  isManaged: false,
+  isPreinstalled: { found: false, withVersion: false },
+  isPublished: true,
+  name: 'Test Plugin',
+  orgName: 'Test Org',
+  signature: PluginSignatureStatus.valid,
+  signatureType: PluginSignatureType.grafana,
+  signatureOrg: 'Test Signature Org',
+  popularity: 4,
+  publishedAt: '2023-01-01',
+  type: PluginType.app,
+  updatedAt: '2023-12-01',
+  installedVersion: '1.0.0',
+  angularDetected: false,
+  isFullyInstalled: true,
+  accessControl: {},
+};
+
+const mockPlugin2: CatalogPlugin = {
+  ...mockPlugin,
+  id: 'test-plugin-2',
+  name: 'Test Plugin 2',
+  type: PluginType.datasource,
+};
+
+describe('PluginList', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseLocation.mockReturnValue({ pathname: '/plugins' });
+    mockUseSearchParams.mockReturnValue([new URLSearchParams(), jest.fn()]);
+    config.appSubUrl = '';
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render plugins when not loading and plugins exist', () => {
+    const plugins = [mockPlugin, mockPlugin2];
+    render(<PluginList plugins={plugins} isLoading={false} />);
+
+    expect(screen.getByTestId('plugin-list')).toBeInTheDocument();
+    expect(screen.getByText('Test Plugin')).toBeInTheDocument();
+    expect(screen.getByText('Test Plugin 2')).toBeInTheDocument();
+  });
+
+  it('should show "All plugins are up to date" message when filterBy=has-update and no plugins', () => {
+    mockUseSearchParams.mockReturnValue([new URLSearchParams('filterBy=has-update'), jest.fn()]);
+
+    render(<PluginList plugins={[]} isLoading={false} />);
+
+    expect(screen.getByText('All plugins are up to date')).toBeInTheDocument();
+  });
+
+  it('should show "No plugins found" message when filterBy=all and not loading', () => {
+    mockUseSearchParams.mockReturnValue([new URLSearchParams('filterBy=all'), jest.fn()]);
+
+    render(<PluginList plugins={[]} isLoading={false} />);
+
+    expect(screen.getByText('No plugins found')).toBeInTheDocument();
+  });
+
+  it('should not show empty state when filterBy=has-update but plugins exist', () => {
+    mockUseSearchParams.mockReturnValue([new URLSearchParams('filterBy=has-update'), jest.fn()]);
+
+    render(<PluginList plugins={[mockPlugin]} isLoading={false} />);
+
+    expect(screen.queryByText('All plugins are up to date')).not.toBeInTheDocument();
+    expect(screen.getByText('Test Plugin')).toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/plugins/admin/components/PluginList.tsx b/public/app/features/plugins/admin/components/PluginList.tsx
index 74b7a0cd2b0..6ba9fff955f 100644
--- a/public/app/features/plugins/admin/components/PluginList.tsx
+++ b/public/app/features/plugins/admin/components/PluginList.tsx
@@ -1,4 +1,4 @@
-import { useLocation } from 'react-router-dom-v5-compat';
+import { useLocation, useSearchParams } from 'react-router-dom-v5-compat';
 
 import { t } from '@grafana/i18n';
 import { config } from '@grafana/runtime';
@@ -15,9 +15,18 @@ interface Props {
 
 export const PluginList = ({ plugins, isLoading }: Props) => {
   const { pathname } = useLocation();
+  const [searchParams] = useSearchParams();
 
   const pathName = config.appSubUrl + (pathname.endsWith('/') ? pathname.slice(0, -1) : pathname);
 
+  if (searchParams.get('filterBy') === 'has-update' && !isLoading && plugins.length === 0) {
+    return (
+      <EmptyState
+        variant="not-found"
+        message={t('plugins.no-updates-available.message', 'All plugins are up to date')}
+      />
+    );
+  }
   if (!isLoading && plugins.length === 0) {
     return <EmptyState variant="not-found" message={t('plugins.empty-state.message', 'No plugins found')} />;
   }
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 4cc86e24c64..98441d484f4 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -10941,6 +10941,9 @@
       "label-plugin-id": "Plugin Id",
       "label-severity": "Severity"
     },
+    "no-updates-available": {
+      "message": "All plugins are up to date"
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "That plugin cannot be found. Please check the url is correct or <1></1>go to the <3>plugin catalog</3>.",
       "title-plugin-not-found": "Plugin not found"

From cc1f00cbfbbc77c17b3251101e95248815b12e37 Mon Sep 17 00:00:00 2001
From: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
Date: Mon, 11 Aug 2025 07:12:16 -0600
Subject: [PATCH 081/243] Dashboard versions: Fix list for large dashboards
 (#109433)

---
 .../dashboardversion/dashverimpl/dashver.go   | 18 ++++-
 .../dashverimpl/dashver_test.go               | 67 +++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/pkg/services/dashboardversion/dashverimpl/dashver.go b/pkg/services/dashboardversion/dashverimpl/dashver.go
index b2063f44091..77a4d0576fd 100644
--- a/pkg/services/dashboardversion/dashverimpl/dashver.go
+++ b/pkg/services/dashboardversion/dashverimpl/dashver.go
@@ -259,13 +259,29 @@ func (s *Service) listHistoryThroughK8s(ctx context.Context, orgID int64, dashbo
 		return nil, dashboards.ErrDashboardNotFound
 	}
 
+	// if k8s returns a continue token, we need to fetch the next page(s) until we either reach the limit or there are no more pages
+	continueToken = out.GetContinue()
+	for (len(out.Items) < int(limit)) && (continueToken != "") {
+		tempOut, err := s.k8sclient.List(ctx, orgID, v1.ListOptions{
+			LabelSelector: labelSelector,
+			FieldSelector: fieldSelector,
+			Continue:      continueToken,
+			Limit:         limit - int64(len(out.Items)),
+		})
+		if err != nil {
+			return nil, err
+		}
+		out.Items = append(out.Items, tempOut.Items...)
+		continueToken = tempOut.GetContinue()
+	}
+
 	dashboards, err := s.UnstructuredToLegacyDashboardVersionList(ctx, out.Items, orgID)
 	if err != nil {
 		return nil, err
 	}
 
 	return &dashver.DashboardVersionResponse{
-		ContinueToken: out.GetContinue(),
+		ContinueToken: continueToken,
 		Versions:      dashboards,
 	}, nil
 }
diff --git a/pkg/services/dashboardversion/dashverimpl/dashver_test.go b/pkg/services/dashboardversion/dashverimpl/dashver_test.go
index 1b32379e1a5..0bca02e8e93 100644
--- a/pkg/services/dashboardversion/dashverimpl/dashver_test.go
+++ b/pkg/services/dashboardversion/dashverimpl/dashver_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -197,6 +198,72 @@ func TestListDashboardVersions(t *testing.T) {
 			}}}, res)
 	})
 
+	t.Run("List returns correct continue token across multiple pages", func(t *testing.T) {
+		dashboardService := dashboards.NewFakeDashboardService(t)
+		dashboardVersionService := Service{dashSvc: dashboardService, features: featuremgmt.WithFeatures()}
+		mockCli := new(client.MockK8sHandler)
+		dashboardVersionService.k8sclient = mockCli
+		dashboardVersionService.features = featuremgmt.WithFeatures()
+
+		dashboardService.On("GetDashboardUIDByID", mock.Anything,
+			mock.AnythingOfType("*dashboards.GetDashboardRefByIDQuery")).
+			Return(&dashboards.DashboardRef{UID: "uid"}, nil)
+		query := dashver.ListDashboardVersionsQuery{DashboardID: 42, Limit: 3}
+		mockCli.On("GetUsersFromMeta", mock.Anything, mock.Anything).Return(map[string]*user.User{}, nil)
+		firstPage := &unstructured.UnstructuredList{
+			Items: []unstructured.Unstructured{
+				{Object: map[string]any{
+					"metadata": map[string]any{
+						"name":            "uid",
+						"resourceVersion": "11",
+						"generation":      int64(4),
+						"labels": map[string]any{
+							utils.LabelKeyDeprecatedInternalID: "42", // nolint:staticcheck
+						},
+					},
+					"spec": map[string]any{},
+				}},
+				{Object: map[string]any{
+					"metadata": map[string]any{
+						"name":            "uid",
+						"resourceVersion": "12",
+						"generation":      int64(5),
+						"labels": map[string]any{
+							utils.LabelKeyDeprecatedInternalID: "42", // nolint:staticcheck
+						},
+					},
+					"spec": map[string]any{},
+				}},
+			},
+		}
+		firstMeta, err := meta.ListAccessor(firstPage)
+		require.NoError(t, err)
+		firstMeta.SetContinue("t1")
+		secondPage := &unstructured.UnstructuredList{
+			Items: []unstructured.Unstructured{
+				{Object: map[string]any{
+					"metadata": map[string]any{
+						"name":            "uid",
+						"resourceVersion": "13",
+						"generation":      int64(6),
+						"labels": map[string]any{
+							utils.LabelKeyDeprecatedInternalID: "42", // nolint:staticcheck
+						},
+					},
+					"spec": map[string]any{},
+				}},
+			},
+		}
+		mockCli.On("List", mock.Anything, mock.Anything, mock.Anything).Return(firstPage, nil).Once()
+		mockCli.On("List", mock.Anything, mock.Anything, mock.Anything).Return(secondPage, nil).Once()
+
+		res, err := dashboardVersionService.List(context.Background(), &query)
+		require.Nil(t, err)
+		require.Equal(t, 3, len(res.Versions))
+		require.Equal(t, "", res.ContinueToken)
+		mockCli.AssertNumberOfCalls(t, "List", 2)
+	})
+
 	t.Run("should return dashboard not found error when k8s client says not found", func(t *testing.T) {
 		dashboardService := dashboards.NewFakeDashboardService(t)
 		dashboardVersionService := Service{dashSvc: dashboardService, features: featuremgmt.WithFeatures()}

From ce1afa626d6967a8c819672dd689f60354677e17 Mon Sep 17 00:00:00 2001
From: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
Date: Mon, 11 Aug 2025 07:12:46 -0600
Subject: [PATCH 082/243] Dashboard versions: Cleanup logic (#109432)

* Dashboard versions: Cleanup logic

* more cleanup
---
 .../dashboardversion/dashverimpl/dashver.go   | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/pkg/services/dashboardversion/dashverimpl/dashver.go b/pkg/services/dashboardversion/dashverimpl/dashver.go
index 77a4d0576fd..3341d8a1339 100644
--- a/pkg/services/dashboardversion/dashverimpl/dashver.go
+++ b/pkg/services/dashboardversion/dashverimpl/dashver.go
@@ -69,7 +69,6 @@ func ProvideService(cfg *setting.Cfg, db db.DB, dashboardService dashboards.Dash
 }
 
 func (s *Service) Get(ctx context.Context, query *dashver.GetDashboardVersionQuery) (*dashver.DashboardVersionDTO, error) {
-	// Get the DashboardUID if not populated
 	if query.DashboardUID == "" {
 		u, err := s.getDashUIDMaybeEmpty(ctx, query.DashboardID)
 		if err != nil {
@@ -78,17 +77,6 @@ func (s *Service) Get(ctx context.Context, query *dashver.GetDashboardVersionQue
 		query.DashboardUID = u
 	}
 
-	// The store methods require the dashboard ID (uid is not in the dashboard
-	// versions table, at time of this writing), so get the DashboardID if it
-	// was not populated.
-	if query.DashboardID == 0 {
-		id, err := s.getDashIDMaybeEmpty(ctx, query.DashboardUID, query.OrgID)
-		if err != nil {
-			return nil, err
-		}
-		query.DashboardID = id
-	}
-
 	version, err := s.getHistoryThroughK8s(ctx, query.OrgID, query.DashboardUID, query.Version)
 	if err != nil {
 		return nil, err
@@ -128,7 +116,6 @@ func (s *Service) DeleteExpired(ctx context.Context, cmd *dashver.DeleteExpiredV
 
 // List all dashboard versions for the given dashboard ID.
 func (s *Service) List(ctx context.Context, query *dashver.ListDashboardVersionsQuery) (*dashver.DashboardVersionResponse, error) {
-	// Get the DashboardUID if not populated
 	if query.DashboardUID == "" {
 		u, err := s.getDashUIDMaybeEmpty(ctx, query.DashboardID)
 		if err != nil {
@@ -137,16 +124,6 @@ func (s *Service) List(ctx context.Context, query *dashver.ListDashboardVersions
 		query.DashboardUID = u
 	}
 
-	// The store methods require the dashboard ID (uid is not in the dashboard
-	// versions table, at time of this writing), so get the DashboardID if it
-	// was not populated.
-	if query.DashboardID == 0 {
-		id, err := s.getDashIDMaybeEmpty(ctx, query.DashboardUID, query.OrgID)
-		if err != nil {
-			return nil, err
-		}
-		query.DashboardID = id
-	}
 	if query.Limit == 0 {
 		query.Limit = 1000
 	}
@@ -182,23 +159,6 @@ func (s *Service) getDashUIDMaybeEmpty(ctx context.Context, id int64) (string, e
 	return result.UID, nil
 }
 
-// getDashIDMaybeEmpty is a helper function which takes a dashboardUID and
-// returns the ID. If the dashboard is not found, it will return -1.
-func (s *Service) getDashIDMaybeEmpty(ctx context.Context, uid string, orgID int64) (int64, error) {
-	q := dashboards.GetDashboardQuery{UID: uid, OrgID: orgID}
-	result, err := s.dashSvc.GetDashboard(ctx, &q)
-	if err != nil {
-		if errors.Is(err, dashboards.ErrDashboardNotFound) {
-			s.log.Debug("dashboard not found")
-			return -1, nil
-		} else {
-			s.log.Error("error getting dashboard", err)
-			return -1, err
-		}
-	}
-	return result.ID, nil
-}
-
 func (s *Service) getHistoryThroughK8s(ctx context.Context, orgID int64, dashboardUID string, version int64) (*dashver.DashboardVersionDTO, error) {
 	// this is an unideal implementation - we have to list all versions and filter here, since there currently is no way to query for the
 	// generation id in unified storage, so we cannot query for the dashboard version directly, and we cannot use search as history is not indexed.

From 0e59bcdbb89b785d8239e66c671631e0564ad4de Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Mon, 11 Aug 2025 15:20:35 +0200
Subject: [PATCH 083/243] Alerting: Apply backend label filtering to chart
 visualization in state history UI (#109459)

---
 .../CentralHistoryRuntimeDataSource.ts        | 12 +++++++----
 .../EventListSceneObject.tsx                  | 15 +++----------
 .../HistoryEventsList.test.tsx                | 21 +++++++++++++++++++
 .../rules/central-state-history/utils.ts      | 17 +++++++++++++++
 4 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/public/app/features/alerting/unified/components/rules/central-state-history/CentralHistoryRuntimeDataSource.ts b/public/app/features/alerting/unified/components/rules/central-state-history/CentralHistoryRuntimeDataSource.ts
index bab7a40e855..f6b76f5e00a 100644
--- a/public/app/features/alerting/unified/components/rules/central-state-history/CentralHistoryRuntimeDataSource.ts
+++ b/public/app/features/alerting/unified/components/rules/central-state-history/CentralHistoryRuntimeDataSource.ts
@@ -12,7 +12,7 @@ import { stateHistoryApi } from '../../../api/stateHistoryApi';
 import { DataSourceInformation } from '../../../home/Insights';
 
 import { LIMIT_EVENTS } from './EventListSceneObject';
-import { historyResultToDataFrame } from './utils';
+import { historyResultToDataFrame, parseBackendLabelFilters } from './utils';
 
 const historyDataSourceUid = '__history_api_ds_uid__';
 const historyDataSourcePluginId = '__history_api_ds_pluginId__';
@@ -65,7 +65,9 @@ class HistoryAPIDatasource extends RuntimeDataSource<HistoryAPIQuery> {
     const stateTo = templateSrv.replace(query.stateTo ?? '', request.scopedVars);
     const stateFrom = templateSrv.replace(query.stateFrom ?? '', request.scopedVars);
 
-    const historyResult = await getHistory(from, to);
+    const labelFilters = parseBackendLabelFilters(labels);
+
+    const historyResult = await getHistory(from, to, labelFilters);
 
     return {
       data: historyResultToDataFrame(historyResult, { stateTo, stateFrom, labels }),
@@ -85,15 +87,17 @@ class HistoryAPIDatasource extends RuntimeDataSource<HistoryAPIQuery> {
  * Fetch the history events from the history api.
  * @param from the start time
  * @param to the end time
- * @returns the history events only filtered by time
+ * @param labels optional label filters for backend filtering
+ * @returns the history events filtered by time and labels
  */
-export const getHistory = (from: number, to: number) => {
+export const getHistory = (from: number, to: number, labels?: Record<string, string>) => {
   return dispatch(
     stateHistoryApi.endpoints.getRuleHistory.initiate(
       {
         from: from,
         to: to,
         limit: LIMIT_EVENTS,
+        labels: labels,
       },
       {
         forceRefetch: Boolean(getTimeSrv().getAutoRefreshInteval().interval), // force refetch in case we are using the refresh option
diff --git a/public/app/features/alerting/unified/components/rules/central-state-history/EventListSceneObject.tsx b/public/app/features/alerting/unified/components/rules/central-state-history/EventListSceneObject.tsx
index c8fd1eb751b..4f83a7aec0f 100644
--- a/public/app/features/alerting/unified/components/rules/central-state-history/EventListSceneObject.tsx
+++ b/public/app/features/alerting/unified/components/rules/central-state-history/EventListSceneObject.tsx
@@ -29,7 +29,6 @@ import { AITriageButtonComponent } from '../../../enterprise-components/AI/AIGen
 import { usePagination } from '../../../hooks/usePagination';
 import { combineMatcherStrings } from '../../../utils/alertmanager';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../../utils/datasource';
-import { parsePromQLStyleMatcherLooseSafe } from '../../../utils/matchers';
 import { createRelativeUrl } from '../../../utils/url';
 import { AlertLabels } from '../../AlertLabels';
 import { CollapseToggle } from '../../CollapseToggle';
@@ -39,6 +38,7 @@ import { LABELS_FILTER, STATE_FILTER_FROM, STATE_FILTER_TO } from './CentralAler
 import { EventDetails } from './EventDetails';
 import { HistoryErrorMessage } from './HistoryErrorMessage';
 import { useRuleHistoryRecords } from './useRuleHistoryRecords';
+import { parseBackendLabelFilters } from './utils';
 
 export const LIMIT_EVENTS = 5000; // limit is hard-capped at 5000 at the BE level.
 const PAGE_SIZE = 100;
@@ -66,16 +66,7 @@ export const HistoryEventsList = ({
   const from = timeRange?.from.unix();
   const to = timeRange?.to.unix();
 
-  const labelMatchers = parsePromQLStyleMatcherLooseSafe(valueInLabelFilter.toString());
-
-  // Prepare labels for filtering on the backend side.
-  // Backend supports only exact matchers.
-  const labelFilters: Record<string, string> = {};
-  labelMatchers.forEach((matcher) => {
-    if (!matcher.isRegex && matcher.isEqual) {
-      labelFilters[matcher.name] = matcher.value;
-    }
-  });
+  const labelFilters = parseBackendLabelFilters(valueInLabelFilter.toString());
 
   const {
     data: stateHistory,
@@ -86,7 +77,7 @@ export const HistoryEventsList = ({
     from: from,
     to: to,
     limit: LIMIT_EVENTS,
-    labels: Object.keys(labelFilters).length > 0 ? labelFilters : undefined,
+    labels: labelFilters,
   });
 
   const { historyRecords: historyRecordsNotSorted } = useRuleHistoryRecords(stateHistory, {
diff --git a/public/app/features/alerting/unified/components/rules/central-state-history/HistoryEventsList.test.tsx b/public/app/features/alerting/unified/components/rules/central-state-history/HistoryEventsList.test.tsx
index 1dea299dd2e..d538fc8b0c2 100644
--- a/public/app/features/alerting/unified/components/rules/central-state-history/HistoryEventsList.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/central-state-history/HistoryEventsList.test.tsx
@@ -7,6 +7,7 @@ import { setupMswServer } from '../../../mockApi';
 import { captureRequests } from '../../../mocks/server/events';
 
 import { StateFilterValues } from './CentralAlertHistoryScene';
+import { getHistory } from './CentralHistoryRuntimeDataSource';
 import { HistoryEventsList } from './EventListSceneObject';
 
 setupMswServer();
@@ -178,5 +179,25 @@ describe('HistoryEventsList', () => {
       expect(url.searchParams.get('labels_grafana_folder')).toBeNull();
       expect(url.searchParams.get('labels_severity')).toBeNull();
     });
+
+    it('should apply same backend filtering to chart data via getHistory function', async () => {
+      const capture = captureRequests((req) => req.url.includes('/api/v1/rules/history'));
+
+      const from = 123;
+      const to = 456;
+      const labels = { alertname: 'alert_1', team: 'alerting' };
+
+      await getHistory(from, to, labels);
+
+      const requests = await capture;
+      expect(requests).toHaveLength(1);
+
+      const url = new URL(requests[0].url);
+
+      expect(url.searchParams.get('labels_alertname')).toBe(labels.alertname);
+      expect(url.searchParams.get('labels_team')).toBe(labels.team);
+      expect(url.searchParams.get('from')).toBe(from.toString());
+      expect(url.searchParams.get('to')).toBe(to.toString());
+    });
   });
 });
diff --git a/public/app/features/alerting/unified/components/rules/central-state-history/utils.ts b/public/app/features/alerting/unified/components/rules/central-state-history/utils.ts
index a629b03dfb2..aaa7ea4830e 100644
--- a/public/app/features/alerting/unified/components/rules/central-state-history/utils.ts
+++ b/public/app/features/alerting/unified/components/rules/central-state-history/utils.ts
@@ -24,6 +24,23 @@ import { LABELS_FILTER, STATE_FILTER_FROM, STATE_FILTER_TO, StateFilterValues }
 const GROUPING_INTERVAL = 10 * 1000; // 10 seconds
 const QUERY_PARAM_PREFIX = 'var-'; // Prefix used by Grafana to sync variables in the URL
 
+/**
+ * Parse label filters and prepare backend filters.
+ * Backend supports only exact matchers.
+ */
+export function parseBackendLabelFilters(labelFilter: string): Record<string, string> {
+  const labelMatchers = parsePromQLStyleMatcherLooseSafe(labelFilter);
+  const labelFilters: Record<string, string> = {};
+
+  labelMatchers.forEach((matcher) => {
+    if (!matcher.isRegex && matcher.isEqual) {
+      labelFilters[matcher.name] = matcher.value;
+    }
+  });
+
+  return labelFilters;
+}
+
 interface HistoryFilters {
   stateTo: string;
   stateFrom: string;

From c39c6a2a874d8396555ad147726d29c1de21c79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ida=20=C5=A0tambuk?= <ida.stambuk@grafana.com>
Date: Mon, 11 Aug 2025 15:20:48 +0200
Subject: [PATCH 084/243] CloudWatch: Append query type to the request id
 (#109068)

---
 .../cloudwatch/mocks/LogsQueryRunner.ts       | 18 +----------
 .../cloudwatch/mocks/MetricsQueryRunner.ts    |  2 +-
 .../CloudWatchLogsQueryRunner.test.ts         | 12 ++++++++
 .../query-runner/CloudWatchLogsQueryRunner.ts |  2 +-
 .../CloudWatchMetricsQueryRunner.test.ts      | 30 +++++++++++++++++++
 .../CloudWatchMetricsQueryRunner.ts           |  1 +
 6 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/public/app/plugins/datasource/cloudwatch/mocks/LogsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/mocks/LogsQueryRunner.ts
index 912523e0398..282fcd077bf 100644
--- a/public/app/plugins/datasource/cloudwatch/mocks/LogsQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/mocks/LogsQueryRunner.ts
@@ -4,7 +4,7 @@ import { CustomVariableModel, DataFrame, DataSourceInstanceSettings } from '@gra
 import { BackendDataSourceResponse, toDataQueryResponse } from '@grafana/runtime';
 
 import { CloudWatchLogsQueryRunner } from '../query-runner/CloudWatchLogsQueryRunner';
-import { CloudWatchJsonData, CloudWatchLogsQueryStatus, CloudWatchLogsRequest } from '../types';
+import { CloudWatchJsonData, CloudWatchLogsQueryStatus } from '../types';
 
 import { CloudWatchSettings, setupMockedTemplateService } from './CloudWatchDataSource';
 
@@ -52,19 +52,3 @@ export function genMockFrames(numResponses: number): DataFrame[] {
 
   return mockFrames;
 }
-
-export function genMockCloudWatchLogsRequest(overrides: Partial<CloudWatchLogsRequest> = {}) {
-  const request: CloudWatchLogsRequest = {
-    queryString: 'fields @timestamp, @message | sort @timestamp desc',
-    logGroupNames: ['log-group-name-1', 'log-group-name-2'],
-    logGroups: [
-      { arn: 'log-group-arn-1', name: 'log-group-name-1' },
-      { arn: 'log-group-arn-2', name: 'log-group-name-2' },
-    ],
-    refId: 'A',
-    region: 'us-east-1',
-    ...overrides,
-  };
-
-  return request;
-}
diff --git a/public/app/plugins/datasource/cloudwatch/mocks/MetricsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/mocks/MetricsQueryRunner.ts
index ace86da0ec5..69cc7d20fb9 100644
--- a/public/app/plugins/datasource/cloudwatch/mocks/MetricsQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/mocks/MetricsQueryRunner.ts
@@ -26,7 +26,7 @@ export function setupMockedMetricsQueryRunner({
     range: TimeRangeMock,
     rangeRaw: { from: '1483228800', to: '1483232400' },
     targets: [],
-    requestId: '',
+    requestId: 'mockId',
     interval: '',
     intervalMs: 0,
     scopedVars: {},
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts
index f51b642942e..d6a40c4b89c 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts
@@ -64,6 +64,18 @@ describe('CloudWatchLogsQueryRunner', () => {
   });
 
   describe('handleLogQueries', () => {
+    it('appends -logs to the requestId', async () => {
+      const { runner, queryMock } = setupMockedLogsQueryRunner();
+
+      const request = {
+        ...LogsRequestMock,
+        requestId: 'mockId',
+      };
+      await expect(runner.handleLogQueries(LogsRequestMock.targets, request, queryMock)).toEmitValuesWith(() => {
+        expect(queryMock.mock.calls[0][0].requestId).toEqual('mockId-logs');
+      });
+    });
+
     it('should request to start each query and then request to get the query results', async () => {
       const { runner } = setupMockedLogsQueryRunner();
 
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
index b86fb1ee44e..97ba156b287 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts
@@ -420,7 +420,7 @@ export class CloudWatchLogsQueryRunner extends CloudWatchRequest {
       ...options,
       range,
       skipQueryCache: true,
-      requestId: options?.requestId || '', // dummy
+      requestId: options?.requestId + '-logs' || '', // adding -logs to prevent requestId from matching metric queries from the same panel
       interval: options?.interval || '', // dummy
       intervalMs: options?.intervalMs || 1, // dummy
       scopedVars: options?.scopedVars || {}, // dummy
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts
index 35978d1382b..0234af74af8 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts
@@ -255,6 +255,36 @@ describe('CloudWatchMetricsQueryRunner', () => {
         });
       });
 
+      it('should append -metrics to the request id', async () => {
+        const queries: CloudWatchMetricsQuery[] = [
+          {
+            id: '',
+            metricQueryType: MetricQueryType.Search,
+            metricEditorMode: MetricEditorMode.Builder,
+            queryMode: 'Metrics',
+            refId: 'A',
+            region: 'us-east-1',
+            namespace: 'AWS/EC2',
+            metricName: 'CPUUtilization',
+            dimensions: {
+              InstanceId: 'i-12345678',
+            },
+            statistic: 'Average',
+            period: '[[period]]',
+          },
+        ];
+
+        const { runner, queryMock, request } = setupMockedMetricsQueryRunner({
+          // DataSourceWithBackend runs toDataQueryResponse({response from CW backend})
+          response: toDataQueryResponse(resultsFromBEQuery),
+          variables: [periodIntervalVariable],
+        });
+
+        await expect(runner.handleMetricQueries(queries, request, queryMock)).toEmitValuesWith(() => {
+          expect(queryMock.mock.calls[0][0].requestId).toEqual('mockId-metrics');
+        });
+      });
+
       it('should return series list', async () => {
         const { runner, request, queryMock } = setupMockedMetricsQueryRunner({
           // DataSourceWithBackend runs toDataQueryResponse({response from CW backend})
diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts
index 3fc10803226..6560e3d4eed 100644
--- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts
+++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts
@@ -77,6 +77,7 @@ export class CloudWatchMetricsQueryRunner extends CloudWatchRequest {
 
     const request: DataQueryRequest<CloudWatchQuery> = {
       ...options,
+      requestId: options.requestId + '-metrics', // adding -metrics to prevent requestId from matching logs queries sent from the same panel
       targets: validMetricsQueries,
     };
 

From b8b7fee877110e0cafd9c158db714fbf36767861 Mon Sep 17 00:00:00 2001
From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Date: Mon, 11 Aug 2025 09:30:54 -0400
Subject: [PATCH 085/243] Docs: Add dashboards previews alias (#109358)

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
---
 docs/sources/dashboards/_index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/sources/dashboards/_index.md b/docs/sources/dashboards/_index.md
index 69696e00405..e42a1d654d3 100644
--- a/docs/sources/dashboards/_index.md
+++ b/docs/sources/dashboards/_index.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - features/dashboard/dashboards/
+  - features/dashboard/dashboards/ # /docs/grafana/latest/features/dashboard/dashboards/
+  - dashboards/previews/ # /docs/grafana/latest/dashboards/previews/
 labels:
   products:
     - cloud

From 19d2bfba7f881a8a1452e0fddd8377fc8c39c3d8 Mon Sep 17 00:00:00 2001
From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Date: Mon, 11 Aug 2025 09:59:25 -0400
Subject: [PATCH 086/243] Dos: Remove OSS and enterprise product labels
 (#109270)

---
 .../create-dynamic-dashboard/index.md         | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/docs/sources/dashboards/build-dashboards/create-dynamic-dashboard/index.md b/docs/sources/dashboards/build-dashboards/create-dynamic-dashboard/index.md
index f61882de4c3..0e9f99946bc 100644
--- a/docs/sources/dashboards/build-dashboards/create-dynamic-dashboard/index.md
+++ b/docs/sources/dashboards/build-dashboards/create-dynamic-dashboard/index.md
@@ -2,7 +2,6 @@
 labels:
   products:
     - cloud
-    - enterprise
     - oss
   stage:
     - experimental
@@ -158,6 +157,14 @@ To create a dashboard, follow these steps:
 1. When you've saved all the changes you want to make to the dashboard, click **Back to dashboard**.
 1. Toggle off the edit mode switch.
 
+{{< admonition type="caution" >}}
+
+Dynamic dashboards is an [experimental](https://grafana.com/docs/release-life-cycle/) feature. Engineering and on-call support is not available. Documentation is either limited or not provided outside of code comments. No SLA is provided. To get early access to this feature, request it through [this form](https://docs.google.com/forms/d/e/1FAIpQLSd73nQzuhzcHJOrLFK4ef_uMxHAQiPQh1-rsQUT2MRqbeMLpg/viewform?usp=dialog).
+
+**Do not enable this feature in production environments as it may result in the irreversible loss of data.**
+
+{{< /admonition >}}
+
 ## Group panels
 
 To help create meaningful sections in your dashboard, you can group panels into rows or tabs.
@@ -287,6 +294,14 @@ To configure show/hide rules, follow these steps:
 1. Click **Save**.
 1. Toggle off the edit mode switch.
 
+{{< admonition type="caution" >}}
+
+Dynamic dashboards is an [experimental](https://grafana.com/docs/release-life-cycle/) feature. Engineering and on-call support is not available. Documentation is either limited or not provided outside of code comments. No SLA is provided. To get early access to this feature, request it through [this form](https://docs.google.com/forms/d/e/1FAIpQLSd73nQzuhzcHJOrLFK4ef_uMxHAQiPQh1-rsQUT2MRqbeMLpg/viewform?usp=dialog).
+
+**Do not enable this feature in production environments as it may result in the irreversible loss of data.**
+
+{{< /admonition >}}
+
 ## Edit dashboards
 
 When the dashboard is in edit mode, the edit pane that opens displays options associated with the part of the dashboard that it's in focus.
@@ -388,3 +403,11 @@ To make a copy of a dashboard, follow these steps:
    By default, the copied dashboard has the same name as the original dashboard with the word "Copy" appended and is in the same folder.
 
 1. Click **Save**.
+
+{{< admonition type="caution" >}}
+
+Dynamic dashboards is an [experimental](https://grafana.com/docs/release-life-cycle/) feature. Engineering and on-call support is not available. Documentation is either limited or not provided outside of code comments. No SLA is provided. To get early access to this feature, request it through [this form](https://docs.google.com/forms/d/e/1FAIpQLSd73nQzuhzcHJOrLFK4ef_uMxHAQiPQh1-rsQUT2MRqbeMLpg/viewform?usp=dialog).
+
+**Do not enable this feature in production environments as it may result in the irreversible loss of data.**
+
+{{< /admonition >}}

From b8f74bc9cc6521f113345be72e92605d0690a151 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 15:38:55 +0100
Subject: [PATCH 087/243] Update locker to v0.14.0 (#107968)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  6 +++---
 yarn.lock    | 48 ++++++++++++++++++++++++------------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index dd9cc608ef9..ca7677e8f2c 100644
--- a/package.json
+++ b/package.json
@@ -300,9 +300,9 @@
     "@lezer/common": "1.2.3",
     "@lezer/highlight": "1.2.1",
     "@lezer/lr": "1.4.2",
-    "@locker/near-membrane-dom": "0.13.6",
-    "@locker/near-membrane-shared": "0.13.6",
-    "@locker/near-membrane-shared-dom": "0.13.6",
+    "@locker/near-membrane-dom": "0.14.0",
+    "@locker/near-membrane-shared": "0.14.0",
+    "@locker/near-membrane-shared-dom": "0.14.0",
     "@msagl/core": "^1.1.19",
     "@msagl/parser": "^1.1.19",
     "@opentelemetry/api": "1.9.0",
diff --git a/yarn.lock b/yarn.lock
index 9bb15efa1b9..090b7aabd94 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5049,39 +5049,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@locker/near-membrane-base@npm:0.13.6":
-  version: 0.13.6
-  resolution: "@locker/near-membrane-base@npm:0.13.6"
+"@locker/near-membrane-base@npm:0.14.0":
+  version: 0.14.0
+  resolution: "@locker/near-membrane-base@npm:0.14.0"
   dependencies:
-    "@locker/near-membrane-shared": "npm:0.13.6"
-  checksum: 10/308ff2a9a4a078837116d1ce140f9f367feb49f6a0802f7427ec225b594092d653918adceb9dd4a279c56433546002ccbcc64ada3fa0a72616ea598f061767bb
+    "@locker/near-membrane-shared": "npm:0.14.0"
+  checksum: 10/edf0374ae27a7cd2a35daca08d7d7507d02b0fe2ecdb0811415ef1a180c436601f60bb0e213a12e9eaf4c79344a7a3a71cc58eafc2dc85ddce2b17ce0dc55e0d
   languageName: node
   linkType: hard
 
-"@locker/near-membrane-dom@npm:0.13.6":
-  version: 0.13.6
-  resolution: "@locker/near-membrane-dom@npm:0.13.6"
+"@locker/near-membrane-dom@npm:0.14.0":
+  version: 0.14.0
+  resolution: "@locker/near-membrane-dom@npm:0.14.0"
   dependencies:
-    "@locker/near-membrane-base": "npm:0.13.6"
-    "@locker/near-membrane-shared": "npm:0.13.6"
-    "@locker/near-membrane-shared-dom": "npm:0.13.6"
-  checksum: 10/ad622f0a57c9041e396663c1cd293cdb1a98ae2a48a08616fc8331526d836716f7a25774a55d87d4b716f2ff0c03013239790a2261eb9c9992f570d75d7c0f8a
+    "@locker/near-membrane-base": "npm:0.14.0"
+    "@locker/near-membrane-shared": "npm:0.14.0"
+    "@locker/near-membrane-shared-dom": "npm:0.14.0"
+  checksum: 10/c227402b325e6a3876c2b0302e0d633a1dcb7cdbb637b031ae087152b38932d73660a9f4d3a0c27c7b79e1deb2189b767fbe68e43395f1cc723ac8443c72fb62
   languageName: node
   linkType: hard
 
-"@locker/near-membrane-shared-dom@npm:0.13.6":
-  version: 0.13.6
-  resolution: "@locker/near-membrane-shared-dom@npm:0.13.6"
+"@locker/near-membrane-shared-dom@npm:0.14.0":
+  version: 0.14.0
+  resolution: "@locker/near-membrane-shared-dom@npm:0.14.0"
   dependencies:
-    "@locker/near-membrane-shared": "npm:0.13.6"
-  checksum: 10/2171637f36f780df424de705d4ee792a5499c6b09e050458c0d0eb2d021ed0b900c70f13c35354299b3bc8ff2484615c4e9967a4c794a90b35222d6431d75142
+    "@locker/near-membrane-shared": "npm:0.14.0"
+  checksum: 10/7bce1235be6887ebe9cce0d600f86a7dc6b3a36d112d691e3925a90991f51516a2abdad38183cc6f5213edb936305c3f570f4856ec4a326971de4c0bf626ca9f
   languageName: node
   linkType: hard
 
-"@locker/near-membrane-shared@npm:0.13.6":
-  version: 0.13.6
-  resolution: "@locker/near-membrane-shared@npm:0.13.6"
-  checksum: 10/4596c9167f27483cd1875a70f25f395125943ff4dcc5b03e95f785ccc00d8b767c2b1d8e81271f7923ec5c6189efcd58d4c5f531bdf45be2be37fdd6ac7a6023
+"@locker/near-membrane-shared@npm:0.14.0":
+  version: 0.14.0
+  resolution: "@locker/near-membrane-shared@npm:0.14.0"
+  checksum: 10/a908416a8d4bd8b5e4c0d74927f5d027cccfc72160699785846f490d2e31f26f9f2b1eeee9aee17fae1ce4d82ff8a8a78dcffd4bf91c9ec8b295fea5c7d60f69
   languageName: node
   linkType: hard
 
@@ -18323,9 +18323,9 @@ __metadata:
     "@lezer/common": "npm:1.2.3"
     "@lezer/highlight": "npm:1.2.1"
     "@lezer/lr": "npm:1.4.2"
-    "@locker/near-membrane-dom": "npm:0.13.6"
-    "@locker/near-membrane-shared": "npm:0.13.6"
-    "@locker/near-membrane-shared-dom": "npm:0.13.6"
+    "@locker/near-membrane-dom": "npm:0.14.0"
+    "@locker/near-membrane-shared": "npm:0.14.0"
+    "@locker/near-membrane-shared-dom": "npm:0.14.0"
     "@manypkg/get-packages": "npm:^3.0.0"
     "@msagl/core": "npm:^1.1.19"
     "@msagl/parser": "npm:^1.1.19"

From fef5d7a67fcc600a7569d87af62d3650c565666b Mon Sep 17 00:00:00 2001
From: Syerikjan Kh <syerikjan.khusayan@grafana.com>
Date: Mon, 11 Aug 2025 10:54:37 -0400
Subject: [PATCH 088/243] Docs: Helm chart plugin installation (#109467)

* docs: helm chart plugin installation

* Update docs/sources/administration/plugin-management/_index.md

Co-authored-by: Anna Urbiztondo <anna.urbiztondo@grafana.com>

---------

Co-authored-by: Anna Urbiztondo <anna.urbiztondo@grafana.com>
---
 .../plugin-management/_index.md               | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/docs/sources/administration/plugin-management/_index.md b/docs/sources/administration/plugin-management/_index.md
index b7c674b4b18..ac5d102b8f0 100644
--- a/docs/sources/administration/plugin-management/_index.md
+++ b/docs/sources/administration/plugin-management/_index.md
@@ -151,10 +151,11 @@ Here is an example based on `grafana-lokiexplore-app` plugins.
 
 #### Install plugins using the Grafana Helm chart
 
-With the Grafana Helm chart, add the plugins you want to install as a list using the `plugins` field in the your values file. For more information about the configuration, refer to [the Helm chart configuration reference](https://github.com/grafana/helm-charts/tree/main/charts/grafana#configuration).
+With the Grafana Helm chart, you can install plugins using one of the following methods:
 
-The following YAML snippet installs v1.9.0 of the Grafana OnCall App plugin and the Redis data source plugin.
-You must incorporate this snippet within your Helm values file.
+##### Method 1: Using the `plugins` field
+
+Add the plugins you want to install as a list in your values file. For more information about the configuration, refer to [the Helm chart configuration reference](https://github.com/grafana/helm-charts/tree/main/charts/grafana#configuration).
 
 ```yaml
 plugins:
@@ -162,7 +163,31 @@ plugins:
   - redis-datasource
 ```
 
-When the update is complete, a confirmation message will indicate the installation was successful.
+##### Method 2: Using `GF_PLUGINS_PREINSTALL_SYNC`
+
+Add the following to your `values.yaml` file:
+
+```yaml
+env:
+  # Format: <plugin ID>@[<plugin version>]@<url to plugin zip>
+  GF_PLUGINS_PREINSTALL_SYNC: grafana-oncall-app@1.9.0@https://grafana.com/api/plugins/grafana-oncall-app/versions/v1.9.0/download
+
+  # Or without version and URL (latest version will be used)
+  # GF_PLUGINS_PREINSTALL_SYNC: grafana-oncall-app
+
+  # Multiple plugins (comma-separated)
+  # GF_PLUGINS_PREINSTALL_SYNC: grafana-oncall-app,redis-datasource
+```
+
+##### Method 3: Using `GF_PLUGINS_INSTALL` (Deprecated since 12.1.0)
+
+```yaml
+env:
+  # Comma-separated list of plugin IDs
+  GF_PLUGINS_INSTALL: grafana-oncall-app,redis-datasource
+```
+
+When the installation is complete, a confirmation message will indicate that the plugins were successfully installed.
 
 ### Update a plugin
 

From fccb51660c795fff2365dcd666104540b555ff4b Mon Sep 17 00:00:00 2001
From: Jacob Valdez <jacob.valdez@grafana.com>
Date: Mon, 11 Aug 2025 09:55:52 -0500
Subject: [PATCH 089/243] docs: fix refs to fix links in http api docs
 (#109429)

---
 docs/sources/developers/http_api/folder.md | 25 ++++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/docs/sources/developers/http_api/folder.md b/docs/sources/developers/http_api/folder.md
index 6a8e2b1f771..cd66653e0e6 100644
--- a/docs/sources/developers/http_api/folder.md
+++ b/docs/sources/developers/http_api/folder.md
@@ -14,13 +14,24 @@ labels:
     - enterprise
     - oss
 title: Folder HTTP API
+refs:
+  apis:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/developers/http_api/apis/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/developer-resources/api-reference/http-api/apis/
+  alerting:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/
 ---
 
 # New Folders APIs
 
 > If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions](/docs/grafana/latest/administration/roles-and-permissions/access-control/custom-role-actions-scopes/) for more information.
 
-> To view more about the new api structure, refer to [API overview]({{< ref "apis" >}}).
+> To view more about the new api structure, refer to [API overview](ref:apis).
 
 ### Get all folders
 
@@ -28,7 +39,7 @@ title: Folder HTTP API
 
 Returns all folders that the authenticated user has permission to view within the given organization. Use the `limit` query parameter to control the maximum number of dashboards returned. To retrieve additional dashboards, utilize the `continue` token provided in the response to fetch the next page.
 
-- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- namespace: to read more about the namespace to use, see the [API overview](ref:apis).
 
 **Required permissions**
 
@@ -94,7 +105,7 @@ Status Codes:
 
 Will return the folder given the folder uid.
 
-- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- namespace: to read more about the namespace to use, see the [API overview](ref:apis).
 - uid: the unique identifier of the folder to update. this will be the _name_ in the folder response
 
 **Required permissions**
@@ -156,7 +167,7 @@ Status Codes:
 
 Creates a new folder.
 
-- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- namespace: to read more about the namespace to use, see the [API overview](ref:apis).
 
 **Required permissions**
 
@@ -238,7 +249,7 @@ Status Codes:
 
 Updates an existing folder identified by uid.
 
-- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- namespace: to read more about the namespace to use, see the [API overview](ref:apis).
 - uid: the unique identifier of the folder to update. this will be the _name_ in the folder response
 
 **Required permissions**
@@ -328,9 +339,9 @@ Content-Length: 97
 
 Deletes an existing folder identified by UID along with all dashboards (and their alerts) stored in the folder. This operation cannot be reverted.
 
-If [Grafana Alerting]({{< relref "/docs/grafana/latest/alerting" >}}) is enabled, you can set an optional query parameter `forceDeleteRules=false` so that requests will fail with 400 (Bad Request) error if the folder contains any Grafana alerts. However, if this parameter is set to `true` then it will delete any Grafana alerts under this folder.
+If [Grafana Alerting](ref:alerting) is enabled, you can set an optional query parameter `forceDeleteRules=false` so that requests will fail with 400 (Bad Request) error if the folder contains any Grafana alerts. However, if this parameter is set to `true` then it will delete any Grafana alerts under this folder.
 
-- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- namespace: to read more about the namespace to use, see the [API overview](ref:apis).
 - uid: the unique identifier of the folder to delete. this will be the _name_ in the folder response
 
 **Required permissions**

From 6fe0893630b01114a4b18dd4d8cc9d43d497f022 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 11 Aug 2025 16:29:44 +0100
Subject: [PATCH 090/243] Revert "Update dependency nx to v21 (#109232)"
 (#109476)

This reverts commit 1625bc1e4e2c7eaff0d8d6a7d82f0d87d4b4df80.
---
 nx.json      |   3 -
 package.json |   2 +-
 yarn.lock    | 216 +--------------------------------------------------
 3 files changed, 5 insertions(+), 216 deletions(-)

diff --git a/nx.json b/nx.json
index f5f0322645b..e60803eee58 100644
--- a/nx.json
+++ b/nx.json
@@ -8,8 +8,5 @@
       "cache": true
     }
   },
-  "tui": {
-    "autoExit": true
-  },
   "defaultBase": "main"
 }
diff --git a/package.json b/package.json
index ca7677e8f2c..eb043cf14b3 100644
--- a/package.json
+++ b/package.json
@@ -223,7 +223,7 @@
     "msw": "2.10.4",
     "mutationobserver-shim": "0.3.7",
     "node-notifier": "10.0.1",
-    "nx": "21.3.11",
+    "nx": "20.7.1",
     "openapi-types": "^12.1.3",
     "pa11y-ci": "^4.0.0",
     "pdf-parse": "^1.1.1",
diff --git a/yarn.lock b/yarn.lock
index 090b7aabd94..8a4938c488a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4168,13 +4168,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/diff-sequences@npm:30.0.1":
-  version: 30.0.1
-  resolution: "@jest/diff-sequences@npm:30.0.1"
-  checksum: 10/0ddb7c7ba92d6057a2ee51a9cfc2155b77cca707fe959167466ea02dcb0687018cc3c22b9622f25f3a417d6ad370e2d4dcfedf9f1410dc9c02954a7484423cc7
-  languageName: node
-  linkType: hard
-
 "@jest/environment@npm:^29.7.0":
   version: 29.7.0
   resolution: "@jest/environment@npm:29.7.0"
@@ -4220,13 +4213,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/get-type@npm:30.0.1":
-  version: 30.0.1
-  resolution: "@jest/get-type@npm:30.0.1"
-  checksum: 10/bd6cb2fe1661b652f06e5c6f7ef5aa37247a5b4bf04aad8ce6a8a8ba659efaf983bab9d52755be8cf92478f8d894c024de2fbddf4c3f6be804b808a20dfc347b
-  languageName: node
-  linkType: hard
-
 "@jest/globals@npm:^29.7.0":
   version: 29.7.0
   resolution: "@jest/globals@npm:29.7.0"
@@ -4295,15 +4281,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/schemas@npm:30.0.5":
-  version: 30.0.5
-  resolution: "@jest/schemas@npm:30.0.5"
-  dependencies:
-    "@sinclair/typebox": "npm:^0.34.0"
-  checksum: 10/40df4db55d4aeed09d1c7e19caf23788309cea34490a1c5d584c913494195e698b9967e996afc27226cac6d76e7512fe73ae6b9584480695c60dd18a5459cdba
-  languageName: node
-  linkType: hard
-
 "@jest/schemas@npm:^29.6.3":
   version: 29.6.3
   resolution: "@jest/schemas@npm:29.6.3"
@@ -5542,13 +5519,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/nx-darwin-arm64@npm:21.3.11":
-  version: 21.3.11
-  resolution: "@nx/nx-darwin-arm64@npm:21.3.11"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@nx/nx-darwin-x64@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-darwin-x64@npm:20.7.1"
@@ -5556,13 +5526,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/nx-darwin-x64@npm:21.3.11":
-  version: 21.3.11
-  resolution: "@nx/nx-darwin-x64@npm:21.3.11"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@nx/nx-freebsd-x64@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-freebsd-x64@npm:20.7.1"
@@ -5570,13 +5533,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/nx-freebsd-x64@npm:21.3.11":
-  version: 21.3.11
-  resolution: "@nx/nx-freebsd-x64@npm:21.3.11"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@nx/nx-linux-arm-gnueabihf@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-arm-gnueabihf@npm:20.7.1"
@@ -5584,13 +5540,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm-gnueabihf@npm:21.3.11":
-  version: 21.3.11
-  resolution: "@nx/nx-linux-arm-gnueabihf@npm:21.3.11"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
 "@nx/nx-linux-arm64-gnu@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-arm64-gnu@npm:20.7.1"
@@ -5598,13 +5547,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm64-gnu@npm:21.3.11":
-  version: 21.3.11
-  resolution: "@nx/nx-linux-arm64-gnu@npm:21.3.11"
-  conditions: os=linux & cpu=arm64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@nx/nx-linux-arm64-musl@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-arm64-musl@npm:20.7.1"
@@ -5612,13 +5554,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm64-musl@npm:21.3.11":
-  version: 21.3.11
-  resolution: "@nx/nx-linux-arm64-musl@npm:21.3.11"
-  conditions: os=linux & cpu=arm64 & libc=musl
-  languageName: node
-  linkType: hard
-
 "@nx/nx-linux-x64-gnu@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-x64-gnu@npm:20.7.1"
@@ -5626,13 +5561,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-x64-gnu@npm:21.3.11":
-  version: 21.3.11
-  resolution: "@nx/nx-linux-x64-gnu@npm:21.3.11"
-  conditions: os=linux & cpu=x64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@nx/nx-linux-x64-musl@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-x64-musl@npm:20.7.1"
@@ -5640,13 +5568,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-x64-musl@npm:21.3.11":
-  version: 21.3.11
-  resolution: "@nx/nx-linux-x64-musl@npm:21.3.11"
-  conditions: os=linux & cpu=x64 & libc=musl
-  languageName: node
-  linkType: hard
-
 "@nx/nx-win32-arm64-msvc@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-win32-arm64-msvc@npm:20.7.1"
@@ -5654,13 +5575,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/nx-win32-arm64-msvc@npm:21.3.11":
-  version: 21.3.11
-  resolution: "@nx/nx-win32-arm64-msvc@npm:21.3.11"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@nx/nx-win32-x64-msvc@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-win32-x64-msvc@npm:20.7.1"
@@ -5668,13 +5582,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/nx-win32-x64-msvc@npm:21.3.11":
-  version: 21.3.11
-  resolution: "@nx/nx-win32-x64-msvc@npm:21.3.11"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@octokit/auth-token@npm:^4.0.0":
   version: 4.0.0
   resolution: "@octokit/auth-token@npm:4.0.0"
@@ -11333,7 +11240,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^5.0.0, ansi-styles@npm:^5.2.0":
+"ansi-styles@npm:^5.0.0":
   version: 5.2.0
   resolution: "ansi-styles@npm:5.2.0"
   checksum: 10/d7f4e97ce0623aea6bc0d90dcd28881ee04cba06c570b97fd3391bd7a268eedfd9d5e2dd4fdcbdd82b8105df5faf6f24aaedc08eaf3da898e702db5948f63469
@@ -18526,7 +18433,7 @@ __metadata:
     nanoid: "npm:^5.0.9"
     node-forge: "npm:^1.3.1"
     node-notifier: "npm:10.0.1"
-    nx: "npm:21.3.11"
+    nx: "npm:20.7.1"
     ol: "npm:10.6.1"
     ol-ext: "npm:4.0.33"
     openapi-types: "npm:^12.1.3"
@@ -20801,18 +20708,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^30.0.2":
-  version: 30.0.5
-  resolution: "jest-diff@npm:30.0.5"
-  dependencies:
-    "@jest/diff-sequences": "npm:30.0.1"
-    "@jest/get-type": "npm:30.0.1"
-    chalk: "npm:^4.1.2"
-    pretty-format: "npm:30.0.5"
-  checksum: 10/4cd3120640588a7bcc2ff3ff23c5b12939d0155f25098f7ed63e7801a9553fdcd0590a9fdd8b085646b0f1132e6da1228805fa9d2a83dd3686e146d804edb1ca
-  languageName: node
-  linkType: hard
-
 "jest-docblock@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-docblock@npm:29.7.0"
@@ -24092,92 +23987,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nx@npm:21.3.11":
-  version: 21.3.11
-  resolution: "nx@npm:21.3.11"
-  dependencies:
-    "@napi-rs/wasm-runtime": "npm:0.2.4"
-    "@nx/nx-darwin-arm64": "npm:21.3.11"
-    "@nx/nx-darwin-x64": "npm:21.3.11"
-    "@nx/nx-freebsd-x64": "npm:21.3.11"
-    "@nx/nx-linux-arm-gnueabihf": "npm:21.3.11"
-    "@nx/nx-linux-arm64-gnu": "npm:21.3.11"
-    "@nx/nx-linux-arm64-musl": "npm:21.3.11"
-    "@nx/nx-linux-x64-gnu": "npm:21.3.11"
-    "@nx/nx-linux-x64-musl": "npm:21.3.11"
-    "@nx/nx-win32-arm64-msvc": "npm:21.3.11"
-    "@nx/nx-win32-x64-msvc": "npm:21.3.11"
-    "@yarnpkg/lockfile": "npm:^1.1.0"
-    "@yarnpkg/parsers": "npm:3.0.2"
-    "@zkochan/js-yaml": "npm:0.0.7"
-    axios: "npm:^1.8.3"
-    chalk: "npm:^4.1.0"
-    cli-cursor: "npm:3.1.0"
-    cli-spinners: "npm:2.6.1"
-    cliui: "npm:^8.0.1"
-    dotenv: "npm:~16.4.5"
-    dotenv-expand: "npm:~11.0.6"
-    enquirer: "npm:~2.3.6"
-    figures: "npm:3.2.0"
-    flat: "npm:^5.0.2"
-    front-matter: "npm:^4.0.2"
-    ignore: "npm:^5.0.4"
-    jest-diff: "npm:^30.0.2"
-    jsonc-parser: "npm:3.2.0"
-    lines-and-columns: "npm:2.0.3"
-    minimatch: "npm:9.0.3"
-    node-machine-id: "npm:1.1.12"
-    npm-run-path: "npm:^4.0.1"
-    open: "npm:^8.4.0"
-    ora: "npm:5.3.0"
-    resolve.exports: "npm:2.0.3"
-    semver: "npm:^7.5.3"
-    string-width: "npm:^4.2.3"
-    tar-stream: "npm:~2.2.0"
-    tmp: "npm:~0.2.1"
-    tree-kill: "npm:^1.2.2"
-    tsconfig-paths: "npm:^4.1.2"
-    tslib: "npm:^2.3.0"
-    yaml: "npm:^2.6.0"
-    yargs: "npm:^17.6.2"
-    yargs-parser: "npm:21.1.1"
-  peerDependencies:
-    "@swc-node/register": ^1.8.0
-    "@swc/core": ^1.3.85
-  dependenciesMeta:
-    "@nx/nx-darwin-arm64":
-      optional: true
-    "@nx/nx-darwin-x64":
-      optional: true
-    "@nx/nx-freebsd-x64":
-      optional: true
-    "@nx/nx-linux-arm-gnueabihf":
-      optional: true
-    "@nx/nx-linux-arm64-gnu":
-      optional: true
-    "@nx/nx-linux-arm64-musl":
-      optional: true
-    "@nx/nx-linux-x64-gnu":
-      optional: true
-    "@nx/nx-linux-x64-musl":
-      optional: true
-    "@nx/nx-win32-arm64-msvc":
-      optional: true
-    "@nx/nx-win32-x64-msvc":
-      optional: true
-  peerDependenciesMeta:
-    "@swc-node/register":
-      optional: true
-    "@swc/core":
-      optional: true
-  bin:
-    nx: bin/nx.js
-    nx-cloud: bin/nx-cloud.js
-  checksum: 10/a53230e33dd00e0962d1ade5f90611b66b109a3fc932abbe1d5e0d136857347f946a29325bd24f6293b836c97b8340d7e602837be4b36d9d3424c24f1b630847
-  languageName: node
-  linkType: hard
-
-"nx@npm:>=17.1.2 < 21":
+"nx@npm:20.7.1, nx@npm:>=17.1.2 < 21":
   version: 20.7.1
   resolution: "nx@npm:20.7.1"
   dependencies:
@@ -26195,17 +26005,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:30.0.5":
-  version: 30.0.5
-  resolution: "pretty-format@npm:30.0.5"
-  dependencies:
-    "@jest/schemas": "npm:30.0.5"
-    ansi-styles: "npm:^5.2.0"
-    react-is: "npm:^18.3.1"
-  checksum: 10/bb65e53092f321257d80cd2c0165e65123805c9d4c4ada1ddac15b08c8879d6d031e6f01ac80e2685ef95ac35d302065196a036c63cd8729747f6e0fa21a55bf
-  languageName: node
-  linkType: hard
-
 "pretty-format@npm:^27.0.2, pretty-format@npm:^27.5.1":
   version: 27.5.1
   resolution: "pretty-format@npm:27.5.1"
@@ -27284,7 +27083,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:18.2.0":
+"react-is@npm:18.2.0, react-is@npm:^18.0.0, react-is@npm:^18.2.0":
   version: 18.2.0
   resolution: "react-is@npm:18.2.0"
   checksum: 10/200cd65bf2e0be7ba6055f647091b725a45dd2a6abef03bf2380ce701fd5edccee40b49b9d15edab7ac08a762bf83cb4081e31ec2673a5bfb549a36ba21570df
@@ -27305,13 +27104,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^18.0.0, react-is@npm:^18.2.0, react-is@npm:^18.3.1":
-  version: 18.3.1
-  resolution: "react-is@npm:18.3.1"
-  checksum: 10/d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22
-  languageName: node
-  linkType: hard
-
 "react-lifecycles-compat@npm:^3.0.4":
   version: 3.0.4
   resolution: "react-lifecycles-compat@npm:3.0.4"

From 298b492f1af627eb536ca7aad1b12ef766248cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= <pstibrany@gmail.com>
Date: Mon, 11 Aug 2025 18:20:47 +0200
Subject: [PATCH 091/243] search queue index mutex (#109474)

Use custom mutex for index, and don't hold it during BulkIndex.
---
 pkg/storage/unified/resource/search_queue.go | 30 +++++++++++---------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkg/storage/unified/resource/search_queue.go b/pkg/storage/unified/resource/search_queue.go
index 9c71d913222..23310caf9df 100644
--- a/pkg/storage/unified/resource/search_queue.go
+++ b/pkg/storage/unified/resource/search_queue.go
@@ -12,7 +12,6 @@ import (
 // It is responsible for ingesting events for a single index
 // It will batch events and send them to the index in a single bulk request
 type indexQueueProcessor struct {
-	index     ResourceIndex
 	nsr       NamespacedResource
 	queue     chan *WrittenEvent
 	batchSize int
@@ -20,8 +19,11 @@ type indexQueueProcessor struct {
 
 	resChan chan *IndexEvent // Channel to send results to the caller
 
-	mu      sync.Mutex
-	running bool
+	indexMu sync.Mutex
+	index   ResourceIndex
+
+	runningMu sync.Mutex
+	running   bool
 }
 
 type IndexEvent struct {
@@ -34,8 +36,8 @@ type IndexEvent struct {
 }
 
 func (b *indexQueueProcessor) updateIndex(newIndex ResourceIndex) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
+	b.indexMu.Lock()
+	defer b.indexMu.Unlock()
 	b.index = newIndex
 }
 
@@ -57,8 +59,8 @@ func (b *indexQueueProcessor) Add(evt *WrittenEvent) {
 	b.queue <- evt
 
 	// Start the processor if it's not already running
-	b.mu.Lock()
-	defer b.mu.Unlock()
+	b.runningMu.Lock()
+	defer b.runningMu.Unlock()
 	if !b.running {
 		b.running = true
 		go b.runProcessor()
@@ -68,9 +70,9 @@ func (b *indexQueueProcessor) Add(evt *WrittenEvent) {
 // runProcessor is the task processing the queue of written events
 func (b *indexQueueProcessor) runProcessor() {
 	defer func() {
-		b.mu.Lock()
+		b.runningMu.Lock()
 		b.running = false
-		b.mu.Unlock()
+		b.runningMu.Unlock()
 	}()
 
 	for {
@@ -122,8 +124,9 @@ func (b *indexQueueProcessor) process(batch []*WrittenEvent) {
 		} else {
 			item.Action = ActionIndex
 			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			defer cancel()
 			doc, err := b.builder.BuildDocument(ctx, evt.Key, evt.ResourceVersion, evt.Value)
+			cancel()
+
 			if err != nil {
 				result.Err = err
 			} else {
@@ -134,10 +137,11 @@ func (b *indexQueueProcessor) process(batch []*WrittenEvent) {
 		req.Items = append(req.Items, item)
 	}
 
-	b.mu.Lock()
-	err := b.index.BulkIndex(req)
-	b.mu.Unlock()
+	b.indexMu.Lock()
+	idx := b.index
+	b.indexMu.Unlock()
 
+	err := idx.BulkIndex(req)
 	if err != nil {
 		for _, r := range resp {
 			r.Err = err

From fbef31b2e03e6ae179d5a677bd8d8c9a5351c611 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 11 Aug 2025 17:22:48 +0100
Subject: [PATCH 092/243] Chore: Unskip some more storybook a11y checks
 (#109452)

* Unskip some more a11y checks

* set aria-label correctly in story
---
 .betterer.results                                 | 15 ---------------
 .../components/ColorPicker/ColorPicker.story.tsx  |  4 +---
 .../src/components/FormField/FormField.story.tsx  |  2 --
 .../src/components/FormField/FormField.tsx        |  6 ++++--
 .../RadioButtonGroup/RadioButtonGroup.story.tsx   |  8 +++-----
 .../src/components/Link/TextLink.story.tsx        |  2 --
 .../src/components/VizLayout/VizLayout.story.tsx  |  9 +++++----
 7 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 8eae87a35fa..7c4d3a577f5 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -4224,36 +4224,24 @@ exports[`no skipping a11y tests in stories`] = {
     "packages/grafana-alerting/src/grafana/contactPoints/components/ContactPointSelector/ContactPointSelector.story.tsx:5381": [
       [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
     ],
-    "packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx:5381": [
-      [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
-    ],
     "packages/grafana-ui/src/components/Combobox/MultiCombobox.story.tsx:5381": [
       [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
     ],
     "packages/grafana-ui/src/components/FileDropzone/FileDropzone.story.tsx:5381": [
       [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
     ],
-    "packages/grafana-ui/src/components/FormField/FormField.story.tsx:5381": [
-      [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
-    ],
     "packages/grafana-ui/src/components/Forms/Checkbox.story.tsx:5381": [
       [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
     ],
     "packages/grafana-ui/src/components/Forms/FieldArray.story.tsx:5381": [
       [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
     ],
-    "packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx:5381": [
-      [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
-    ],
     "packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.story.tsx:5381": [
       [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
     ],
     "packages/grafana-ui/src/components/Layout/Stack/Stack.story.tsx:5381": [
       [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
     ],
-    "packages/grafana-ui/src/components/Link/TextLink.story.tsx:5381": [
-      [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
-    ],
     "packages/grafana-ui/src/components/Menu/Menu.story.tsx:5381": [
       [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
     ],
@@ -4284,9 +4272,6 @@ exports[`no skipping a11y tests in stories`] = {
     "packages/grafana-ui/src/components/Table/Table.story.tsx:5381": [
       [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
     ],
-    "packages/grafana-ui/src/components/VizLayout/VizLayout.story.tsx:5381": [
-      [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
-    ],
     "packages/grafana-ui/src/components/VizLegend/VizLegend.story.tsx:5381": [
       [0, 0, 0, "No skipping of a11y tests in stories. Please fix the component or story instead.", "5381"]
     ]
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
index 5b3f6921084..d2c681f2e4a 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
@@ -18,12 +18,10 @@ const meta: Meta<typeof ColorPicker> = {
     controls: {
       exclude: ['onChange', 'onColorChange'],
     },
-    // TODO fix a11y issue in story and remove this
-    a11y: { test: 'off' },
   },
   args: {
     enableNamedColors: false,
-    color: '#00ff00',
+    color: '#0000ff',
   },
 };
 
diff --git a/packages/grafana-ui/src/components/FormField/FormField.story.tsx b/packages/grafana-ui/src/components/FormField/FormField.story.tsx
index 9d39b20536b..845001dcacc 100644
--- a/packages/grafana-ui/src/components/FormField/FormField.story.tsx
+++ b/packages/grafana-ui/src/components/FormField/FormField.story.tsx
@@ -9,8 +9,6 @@ const meta: Meta<typeof FormField> = {
     controls: {
       exclude: ['inputEl'],
     },
-    // TODO fix a11y issue in story and remove this
-    a11y: { test: 'off' },
   },
   args: {
     inputWidth: 20,
diff --git a/packages/grafana-ui/src/components/FormField/FormField.tsx b/packages/grafana-ui/src/components/FormField/FormField.tsx
index b949a02d106..4d9bca9ded8 100644
--- a/packages/grafana-ui/src/components/FormField/FormField.tsx
+++ b/packages/grafana-ui/src/components/FormField/FormField.tsx
@@ -1,5 +1,5 @@
 import { css, cx } from '@emotion/css';
-import { InputHTMLAttributes } from 'react';
+import { InputHTMLAttributes, useId } from 'react';
 import * as React from 'react';
 
 import { InlineFormLabel } from '../FormLabel/FormLabel';
@@ -36,13 +36,15 @@ export const FormField = ({
   ...inputProps
 }: Props) => {
   const styles = getStyles();
+  const id = useId();
   return (
     <div className={cx(styles.formField, className)}>
-      <InlineFormLabel width={labelWidth} tooltip={tooltip} interactive={interactive}>
+      <InlineFormLabel htmlFor={id} width={labelWidth} tooltip={tooltip} interactive={interactive}>
         {label}
       </InlineFormLabel>
       {inputEl || (
         <input
+          id={id}
           type="text"
           className={`gf-form-input ${inputWidth ? `width-${inputWidth}` : ''}`}
           {...inputProps}
diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx
index 8f8dadc33f0..b66140fe586 100644
--- a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx
+++ b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx
@@ -14,8 +14,6 @@ const meta: Meta = {
     controls: {
       exclude: ['className', 'options', 'value', 'onChange', 'onClick', 'id'],
     },
-    // TODO fix a11y issue in story and remove this
-    a11y: { test: 'off' },
   },
   argTypes: {
     disabledOptions: {
@@ -37,9 +35,9 @@ export const RadioButtons: StoryFn = (args) => {
   ];
 
   const optionsWithOnlyIcons = [
-    { description: 'Prometheus', value: 'prometheus', icon: 'gf-interpolation-linear' },
-    { description: 'Graphite', value: 'graphite', icon: 'gf-interpolation-smooth' },
-    { description: 'Elastic', value: 'elastic', icon: 'gf-interpolation-step-after' },
+    { ariaLabel: 'Prometheus', description: 'Prometheus', value: 'prometheus', icon: 'gf-interpolation-linear' },
+    { ariaLabel: 'Graphite', description: 'Graphite', value: 'graphite', icon: 'gf-interpolation-smooth' },
+    { ariaLabel: 'Elastic', description: 'Elastic', value: 'elastic', icon: 'gf-interpolation-step-after' },
   ];
 
   return (
diff --git a/packages/grafana-ui/src/components/Link/TextLink.story.tsx b/packages/grafana-ui/src/components/Link/TextLink.story.tsx
index b353b15674f..6c1b9eb5fff 100644
--- a/packages/grafana-ui/src/components/Link/TextLink.story.tsx
+++ b/packages/grafana-ui/src/components/Link/TextLink.story.tsx
@@ -15,8 +15,6 @@ const meta: Meta = {
       page: mdx,
     },
     controls: { exclude: ['href', 'external'] },
-    // TODO fix a11y issue in story and remove this
-    a11y: { test: 'off' },
   },
   argTypes: {
     variant: {
diff --git a/packages/grafana-ui/src/components/VizLayout/VizLayout.story.tsx b/packages/grafana-ui/src/components/VizLayout/VizLayout.story.tsx
index d73c22c82c4..903afb6e428 100644
--- a/packages/grafana-ui/src/components/VizLayout/VizLayout.story.tsx
+++ b/packages/grafana-ui/src/components/VizLayout/VizLayout.story.tsx
@@ -11,8 +11,6 @@ const meta: Meta = {
     controls: {
       exclude: ['legend'],
     },
-    // TODO fix a11y issue in story and remove this
-    a11y: { test: 'off' },
   },
   argTypes: {
     width: { control: { type: 'range', min: 100, max: 1000 } },
@@ -36,7 +34,7 @@ export const BottomLegend: StoryFn = ({ height, width, legendItems }) => {
   const legend = (
     <VizLayout.Legend placement="bottom" maxHeight="30%">
       {items.map((_, index) => (
-        <div style={{ height: '30px', width: '100%', background: 'blue', marginBottom: '2px' }} key={index}>
+        <div style={{ height: '30px', width: '100%', background: 'lightblue', marginBottom: '2px' }} key={index}>
           Legend item {index}
         </div>
       ))}
@@ -66,7 +64,10 @@ export const RightLegend: StoryFn = ({ height, width, legendItems, legendWidth }
   const legend = (
     <VizLayout.Legend placement="right" maxWidth="50%">
       {items.map((_, index) => (
-        <div style={{ height: '30px', width: `${legendWidth}px`, background: 'blue', marginBottom: '2px' }} key={index}>
+        <div
+          style={{ height: '30px', width: `${legendWidth}px`, background: 'lightblue', marginBottom: '2px' }}
+          key={index}
+        >
           Legend item {index}
         </div>
       ))}

From 43ac5b52f9bc705756e91c9e61090300bd2fe29f Mon Sep 17 00:00:00 2001
From: geekeryy <jiangyang.me@gmail.com>
Date: Tue, 12 Aug 2025 00:45:19 +0800
Subject: [PATCH 093/243] InfluxDB: Fix Unable to use self-signed CA for adding
 influxdb data source (#105586)

* Fix Unable to use self-signed CA for verification when adding influxdb data source (#105585)

* Update pkg/tsdb/influxdb/fsql/fsql.go

---------

Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com>
---
 pkg/tsdb/influxdb/fsql/client.go            | 10 +++++++---
 pkg/tsdb/influxdb/fsql/fsql.go              |  2 +-
 pkg/tsdb/influxdb/influxdb.go               |  1 +
 pkg/tsdb/influxdb/models/datasource_info.go |  3 +++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkg/tsdb/influxdb/fsql/client.go b/pkg/tsdb/influxdb/fsql/client.go
index 270599d0351..0935fa8815a 100644
--- a/pkg/tsdb/influxdb/fsql/client.go
+++ b/pkg/tsdb/influxdb/fsql/client.go
@@ -11,6 +11,7 @@ import (
 	"github.com/apache/arrow-go/v18/arrow/flight/flightsql"
 	"github.com/apache/arrow-go/v18/arrow/ipc"
 	"github.com/apache/arrow-go/v18/arrow/memory"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -28,8 +29,8 @@ func (c *client) FlightClient() flight.Client {
 	return c.Client.Client
 }
 
-func newFlightSQLClient(addr string, metadata metadata.MD, secure bool, proxyClient proxy.Client) (*client, error) {
-	dialOptions, err := grpcDialOptions(secure, proxyClient)
+func newFlightSQLClient(addr string, metadata metadata.MD, secure bool, tlsConfig *httpclient.TLSOptions, proxyClient proxy.Client) (*client, error) {
+	dialOptions, err := grpcDialOptions(secure, tlsConfig, proxyClient)
 	if err != nil {
 		return nil, fmt.Errorf("grpc dial options: %s", err)
 	}
@@ -46,7 +47,7 @@ func newFlightSQLClient(addr string, metadata metadata.MD, secure bool, proxyCli
 	return &client{Client: fsqlClient, md: metadata}, nil
 }
 
-func grpcDialOptions(secure bool, proxyClient proxy.Client) ([]grpc.DialOption, error) {
+func grpcDialOptions(secure bool, tlsConfig *httpclient.TLSOptions, proxyClient proxy.Client) ([]grpc.DialOption, error) {
 	dialOptions := []grpc.DialOption{}
 	secureDialOpt := grpc.WithTransportCredentials(insecure.NewCredentials())
 
@@ -55,6 +56,9 @@ func grpcDialOptions(secure bool, proxyClient proxy.Client) ([]grpc.DialOption,
 		if err != nil {
 			return nil, fmt.Errorf("x509: %s", err)
 		}
+		if tlsConfig != nil && len(tlsConfig.CACertificate) > 0 {
+			pool.AppendCertsFromPEM([]byte(tlsConfig.CACertificate))
+		}
 		secureDialOpt = grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(pool, ""))
 	}
 	dialOptions = append(dialOptions, secureDialOpt)
diff --git a/pkg/tsdb/influxdb/fsql/fsql.go b/pkg/tsdb/influxdb/fsql/fsql.go
index 6869696fab3..b81bfc55b06 100644
--- a/pkg/tsdb/influxdb/fsql/fsql.go
+++ b/pkg/tsdb/influxdb/fsql/fsql.go
@@ -143,7 +143,7 @@ func runnerFromDataSource(dsInfo *models.DatasourceInfo) (*runner, error) {
 		md.Set("Authorization", fmt.Sprintf("Bearer %s", dsInfo.Token))
 	}
 
-	fsqlClient, err := newFlightSQLClient(u, md, !dsInfo.InsecureGrpc, dsInfo.ProxyClient)
+	fsqlClient, err := newFlightSQLClient(u, md, !dsInfo.InsecureGrpc, dsInfo.TLSConfig, dsInfo.ProxyClient)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/tsdb/influxdb/influxdb.go b/pkg/tsdb/influxdb/influxdb.go
index 6523ea0158f..c4a04e19008 100644
--- a/pkg/tsdb/influxdb/influxdb.go
+++ b/pkg/tsdb/influxdb/influxdb.go
@@ -92,6 +92,7 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			Token:         settings.DecryptedSecureJSONData["token"],
 			Timeout:       opts.Timeouts.Timeout,
 			ProxyClient:   proxyClient,
+			TLSConfig:     opts.TLS,
 		}
 		return model, nil
 	}
diff --git a/pkg/tsdb/influxdb/models/datasource_info.go b/pkg/tsdb/influxdb/models/datasource_info.go
index 9683a28d2c8..8bf26c68bbc 100644
--- a/pkg/tsdb/influxdb/models/datasource_info.go
+++ b/pkg/tsdb/influxdb/models/datasource_info.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
 )
 
@@ -25,5 +26,7 @@ type DatasourceInfo struct {
 	// FlightSQL grpc connection
 	InsecureGrpc bool `json:"insecureGrpc"`
 
+	TLSConfig *httpclient.TLSOptions
+
 	ProxyClient proxy.Client
 }

From 5363615d9766444b1d16a97b53e96671c408e7d2 Mon Sep 17 00:00:00 2001
From: Alex Spencer <52186778+alexjonspencer1@users.noreply.github.com>
Date: Mon, 11 Aug 2025 10:00:33 -0700
Subject: [PATCH 094/243] Trendline: Add higher polynomial degrees (#109001)

* enhancement: add higher polynomial degrees + warning

* chore: i18n

* chore: refactor

* chore: renaming for clarity!
---
 .../transformers/regression/constants.ts      |  31 ++++
 .../transformers/regression/regression.ts     |   5 +
 .../regression/regressionEditor.tsx           | 159 +++++++-----------
 .../features/transformers/regression/utils.ts |  15 ++
 public/locales/en-US/grafana.json             |   8 +-
 5 files changed, 121 insertions(+), 97 deletions(-)
 create mode 100644 public/app/features/transformers/regression/constants.ts
 create mode 100644 public/app/features/transformers/regression/utils.ts

diff --git a/public/app/features/transformers/regression/constants.ts b/public/app/features/transformers/regression/constants.ts
new file mode 100644
index 00000000000..849f01e82ea
--- /dev/null
+++ b/public/app/features/transformers/regression/constants.ts
@@ -0,0 +1,31 @@
+import { FieldMatcherID, fieldMatchers } from '@grafana/data';
+import { t } from '@grafana/i18n';
+import { FieldNamePicker } from '@grafana/ui/internal';
+
+import { ModelType } from './regression';
+
+export const getModelTypeOptions = () =>
+  [
+    {
+      label: t('transformers.regression-transformer-editor.model-type-options.label.linear', 'Linear'),
+      value: ModelType.linear,
+    },
+    {
+      label: t('transformers.regression-transformer-editor.model-type-options.label.polynomial', 'Polynomial'),
+      value: ModelType.polynomial,
+    },
+  ] as const satisfies Array<{ label: string; value: ModelType }>;
+
+export const fieldNamePickerSettings = {
+  editor: FieldNamePicker,
+  id: '',
+  name: '',
+  settings: { width: 24, isClearable: false },
+} as const;
+
+export const LABEL_WIDTH = 20;
+
+export const FIELD_MATCHERS = {
+  firstTimeMatcher: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
+  numericMatcher: fieldMatchers.get(FieldMatcherID.numeric).get({}),
+};
diff --git a/public/app/features/transformers/regression/regression.ts b/public/app/features/transformers/regression/regression.ts
index ce350dde9ac..f830cac0758 100644
--- a/public/app/features/transformers/regression/regression.ts
+++ b/public/app/features/transformers/regression/regression.ts
@@ -33,6 +33,11 @@ export const DEGREES = [
   { label: () => t('transformers.regression-transformer-editor.label.cubic', 'Cubic'), value: 3 },
   { label: () => t('transformers.regression-transformer-editor.label.quartic', 'Quartic'), value: 4 },
   { label: () => t('transformers.regression-transformer-editor.label.quintic', 'Quintic'), value: 5 },
+  { label: () => t('transformers.regression-transformer-editor.label.sextic', 'Sextic'), value: 6 },
+  { label: () => t('transformers.regression-transformer-editor.label.septic', 'Septic'), value: 7 },
+  { label: () => t('transformers.regression-transformer-editor.label.octic', 'Octic'), value: 8 },
+  { label: () => t('transformers.regression-transformer-editor.label.nonic', 'Nonic'), value: 9 },
+  { label: () => t('transformers.regression-transformer-editor.label.decic', 'Decic'), value: 10 },
 ];
 
 export const getRegressionTransformer: () => SynchronousDataTransformerInfo<RegressionTransformerOptions> = () => ({
diff --git a/public/app/features/transformers/regression/regressionEditor.tsx b/public/app/features/transformers/regression/regressionEditor.tsx
index 86da5797d10..909e2b69285 100644
--- a/public/app/features/transformers/regression/regressionEditor.tsx
+++ b/public/app/features/transformers/regression/regressionEditor.tsx
@@ -1,16 +1,14 @@
-import { useEffect } from 'react';
+import { ReactElement, useEffect, useMemo } from 'react';
 
 import {
   DataTransformerID,
   TransformerRegistryItem,
   TransformerUIProps,
   TransformerCategory,
-  fieldMatchers,
-  FieldMatcherID,
   Field,
 } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { InlineField, Select } from '@grafana/ui';
+import { Combobox, InlineField } from '@grafana/ui';
 import { FieldNamePicker } from '@grafana/ui/internal';
 import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
 
@@ -18,111 +16,80 @@ import { getTransformationContent } from '../docs/getTransformationContent';
 import darkImage from '../images/dark/regression.svg';
 import lightImage from '../images/light/regression.svg';
 
+import { FIELD_MATCHERS, LABEL_WIDTH, fieldNamePickerSettings, getModelTypeOptions } from './constants';
 import { DEFAULTS, DEGREES, ModelType, getRegressionTransformer, RegressionTransformerOptions } from './regression';
-
-const fieldNamePickerSettings = {
-  editor: FieldNamePicker,
-  id: '',
-  name: '',
-  settings: { width: 24, isClearable: false },
-};
-
-const LABEL_WIDTH = 20;
+import { findFirstFieldByMatcher } from './utils';
 
 export const RegressionTransformerEditor = ({
   input,
   options,
   onChange,
 }: TransformerUIProps<RegressionTransformerOptions>) => {
-  const modelTypeOptions = [
-    {
-      label: t('transformers.regression-transformer-editor.model-type-options.label.linear', 'Linear'),
-      value: ModelType.linear,
-    },
-    {
-      label: t('transformers.regression-transformer-editor.model-type-options.label.polynomial', 'Polynomial'),
-      value: ModelType.polynomial,
-    },
-  ];
+  const modelTypeOptions = useMemo(() => getModelTypeOptions(), []);
+  const degreeOptions = useMemo(
+    () =>
+      DEGREES.map((deg) => {
+        return {
+          label: deg.label(),
+          value: deg.value,
+        };
+      }),
+    []
+  );
 
+  // Auto-select default X and Y fields when they're not explicitly set by the user.
+  // This provides better UX when adding a new regression transform by automatically
+  // choosing sensible defaults: time field (or numeric fallback) for X, and a different
+  // numeric field for Y. Only runs when fields are missing due to early return optimization.
   useEffect(() => {
     let x: Field | undefined;
     let y: Field | undefined;
+
+    // Both fields already selected, nothing to do, early return
+    if (options.xFieldName && options.yFieldName) {
+      return;
+    }
+
     if (!options.xFieldName) {
-      const timeMatcher = fieldMatchers.get(FieldMatcherID.firstTimeField).get({});
-      for (const frame of input) {
-        x = frame.fields.find((field) => timeMatcher(field, frame, input));
-        if (x) {
-          break;
-        }
-      }
-      if (!x) {
-        const firstMatcher = fieldMatchers.get(FieldMatcherID.numeric).get({});
-        for (const frame of input) {
-          x = frame.fields.find((field) => firstMatcher(field, frame, input));
-          if (x) {
-            break;
-          }
-        }
-      }
+      x =
+        findFirstFieldByMatcher(input, FIELD_MATCHERS.firstTimeMatcher) ||
+        findFirstFieldByMatcher(input, FIELD_MATCHERS.numericMatcher);
     }
     if (!options.yFieldName) {
-      const numberMatcher = fieldMatchers.get(FieldMatcherID.numeric).get({});
-      for (const frame of input) {
-        y = frame.fields.find((field) => numberMatcher(field, frame, input) && field !== x);
-        if (y) {
-          break;
-        }
-      }
+      y = findFirstFieldByMatcher(input, FIELD_MATCHERS.numericMatcher, x);
     }
 
     if (x && y) {
       onChange({ ...options, xFieldName: x.name, yFieldName: y.name });
     }
-  });
+  }, [input, options, onChange]);
 
   return (
     <>
-      <InlineField
-        labelWidth={LABEL_WIDTH}
-        label={t('transformers.regression-transformer-editor.label-x-field', 'X field')}
-      >
+      <RegressionField label={t('transformers.regression-transformer-editor.label-x-field', 'X field')}>
         <FieldNamePicker
           context={{ data: input }}
           value={options.xFieldName ?? ''}
           item={fieldNamePickerSettings}
-          onChange={(v) => {
-            onChange({ ...options, xFieldName: v });
-          }}
-        ></FieldNamePicker>
-      </InlineField>
-      <InlineField
-        labelWidth={LABEL_WIDTH}
-        label={t('transformers.regression-transformer-editor.label-y-field', 'Y field')}
-      >
+          onChange={(v) => onChange({ ...options, xFieldName: v })}
+        />
+      </RegressionField>
+      <RegressionField label={t('transformers.regression-transformer-editor.label-y-field', 'Y field')}>
         <FieldNamePicker
           context={{ data: input }}
           value={options.yFieldName ?? ''}
           item={fieldNamePickerSettings}
-          onChange={(v) => {
-            onChange({ ...options, yFieldName: v });
-          }}
-        ></FieldNamePicker>
-      </InlineField>
-      <InlineField
-        labelWidth={LABEL_WIDTH}
-        label={t('transformers.regression-transformer-editor.label-model-type', 'Model type')}
-      >
-        <Select
+          onChange={(v) => onChange({ ...options, yFieldName: v })}
+        />
+      </RegressionField>
+      <RegressionField label={t('transformers.regression-transformer-editor.label-model-type', 'Model type')}>
+        <Combobox
           value={options.modelType ?? DEFAULTS.modelType}
-          onChange={(v) => {
-            onChange({ ...options, modelType: v.value ?? DEFAULTS.modelType });
-          }}
+          onChange={(v) => onChange({ ...options, modelType: v.value ?? DEFAULTS.modelType })}
           options={modelTypeOptions}
-        ></Select>
-      </InlineField>
-      <InlineField
-        labelWidth={LABEL_WIDTH}
+        />
+      </RegressionField>
+      <RegressionField
         label={t('transformers.regression-transformer-editor.label-predicted-points', 'Predicted points')}
         tooltip={t(
           'transformers.regression-transformer-editor.tooltip-number-of-xy-points-to-predict',
@@ -131,34 +98,34 @@ export const RegressionTransformerEditor = ({
       >
         <NumberInput
           value={options.predictionCount ?? DEFAULTS.predictionCount}
-          onChange={(v) => {
-            onChange({ ...options, predictionCount: v });
-          }}
-        ></NumberInput>
-      </InlineField>
+          onChange={(v) => onChange({ ...options, predictionCount: v })}
+        />
+      </RegressionField>
       {options.modelType === ModelType.polynomial && (
-        <InlineField
-          labelWidth={LABEL_WIDTH}
+        <RegressionField
           label={t('transformers.regression-transformer-editor.label-degree', 'Degree')}
+          tooltip={t(
+            'transformers.regression-transformer-editor.tooltip-high-degree-polynomial',
+            'Higher-degree polynomials (e.g., degree 4 or higher) can result in misleading trends and unstable fits. Proceed with caution.'
+          )}
         >
-          <Select<number>
+          <Combobox
             value={options.degree ?? DEFAULTS.degree}
-            options={DEGREES.map((deg) => {
-              return {
-                label: deg.label(),
-                value: deg.value,
-              };
-            })}
-            onChange={(v) => {
-              onChange({ ...options, degree: v.value });
-            }}
-          ></Select>
-        </InlineField>
+            options={degreeOptions}
+            onChange={(v) => onChange({ ...options, degree: Number(v.value) })}
+          />
+        </RegressionField>
       )}
     </>
   );
 };
 
+const RegressionField = ({ label, tooltip, children }: { label: string; tooltip?: string; children: ReactElement }) => (
+  <InlineField labelWidth={LABEL_WIDTH} label={label} tooltip={tooltip}>
+    {children}
+  </InlineField>
+);
+
 export const getRegressionTransformerRegistryItem: () => TransformerRegistryItem<RegressionTransformerOptions> = () => {
   const regressionTransformer = getRegressionTransformer();
   return {
diff --git a/public/app/features/transformers/regression/utils.ts b/public/app/features/transformers/regression/utils.ts
new file mode 100644
index 00000000000..c4b143b6895
--- /dev/null
+++ b/public/app/features/transformers/regression/utils.ts
@@ -0,0 +1,15 @@
+import { DataFrame, Field } from '@grafana/data';
+
+export const findFirstFieldByMatcher = (
+  input: DataFrame[],
+  matcher: (field: Field, frame: DataFrame, input: DataFrame[]) => boolean,
+  excludeField?: Field
+): Field | undefined => {
+  for (const frame of input) {
+    const field = frame.fields.find((field) => matcher(field, frame, input) && field !== excludeField);
+    if (field) {
+      return field;
+    }
+  }
+  return undefined;
+};
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 98441d484f4..3bfd1996f34 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -13642,9 +13642,14 @@
     "regression-transformer-editor": {
       "label": {
         "cubic": "Cubic",
+        "decic": "Decic",
+        "nonic": "Nonic",
+        "octic": "Octic",
         "quadratic": "Quadratic",
         "quartic": "Quartic",
-        "quintic": "Quintic"
+        "quintic": "Quintic",
+        "septic": "Septic",
+        "sextic": "Sextic"
       },
       "label-degree": "Degree",
       "label-model-type": "Model type",
@@ -13661,6 +13666,7 @@
       "tags": {
         "regression-analysis": "Regression analysis"
       },
+      "tooltip-high-degree-polynomial": "Higher-degree polynomials (e.g., degree 4 or higher) can result in misleading trends and unstable fits. Proceed with caution.",
       "tooltip-number-of-xy-points-to-predict": "Number of X,Y points to predict"
     },
     "rename-by-regex-transformer": {

From 790b9fc1cf77dbd3336485b2254ceb19b0a665a4 Mon Sep 17 00:00:00 2001
From: Jacob Valdez <jacob.valdez@grafana.com>
Date: Mon, 11 Aug 2025 13:25:33 -0500
Subject: [PATCH 095/243] Docs: adjusting the audit log label info (#109088)

---
 .../setup-grafana/configure-security/audit-grafana.md     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/sources/setup-grafana/configure-security/audit-grafana.md b/docs/sources/setup-grafana/configure-security/audit-grafana.md
index 597b4269faa..624c81432c4 100644
--- a/docs/sources/setup-grafana/configure-security/audit-grafana.md
+++ b/docs/sources/setup-grafana/configure-security/audit-grafana.md
@@ -420,9 +420,11 @@ tenant_id =
 
 If you have multiple Grafana instances sending logs to the same Loki service or if you are using Loki for non-audit logs, audit logs come with additional labels to help identifying them:
 
-- **host** - OS hostname on which the Grafana instance is running.
-- **grafana_instance** - Application URL.
-- **kind** - `auditing`
+| Label            | Value                                                |
+| ---------------- | ---------------------------------------------------- |
+| host             | OS hostname on which the Grafana instance is running |
+| grafana_instance | Application URL                                      |
+| kind             | `auditing`                                           |
 
 When basic authentication is needed to ingest logs in your Loki instance, you can specify credentials in the URL field. For example:
 

From cff39476f37ca655440fcbc7b7d33935b1c4d283 Mon Sep 17 00:00:00 2001
From: Collin Fingar <collin.fingar@grafana.com>
Date: Mon, 11 Aug 2025 15:58:00 -0400
Subject: [PATCH 096/243] QueryLibrary: Updated Entrypoint Discoverability
 (#108413)

* Updated query library discoverability

* Reverted to plus

* Fixed coloring issue
---
 .../QueryOperationAction.tsx                  | 20 ++++++++++++++++--
 .../query/components/QueryEditorRow.tsx       | 21 +++++++++++--------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx b/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
index f61344fd947..a747d9dbcdf 100644
--- a/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
+++ b/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
@@ -11,17 +11,25 @@ interface BaseQueryOperationActionProps {
   onClick: (e: React.MouseEvent) => void;
   disabled?: boolean;
   dataTestId?: string;
+  isGroupEnd?: boolean;
+  isHighlighted?: boolean;
 }
 
 function BaseQueryOperationAction(props: QueryOperationActionProps | QueryOperationToggleActionProps) {
   const styles = useStyles2(getStyles);
 
   return (
-    <div className={cx(styles.icon, 'active' in props && props.active && styles.active)}>
+    <div
+      className={cx(
+        styles.icon,
+        'active' in props && props.active && styles.active,
+        props.isGroupEnd && styles.iconGroupEnd
+      )}
+    >
       <IconButton
         name={props.icon}
         tooltip={props.title}
-        className={styles.icon}
+        className={cx(styles.icon, props.isHighlighted && styles.highlighted)}
         disabled={!!props.disabled}
         onClick={props.onClick}
         type="button"
@@ -51,6 +59,14 @@ const getStyles = (theme: GrafanaTheme2) => {
       position: 'relative',
       color: theme.colors.text.secondary,
     }),
+    highlighted: css({
+      color: theme.colors.primary.main,
+    }),
+
+    iconGroupEnd: css({
+      borderRight: `1px solid ${theme.colors.border.medium}`,
+      paddingRight: theme.spacing(0.5),
+    }),
     active: css({
       '&:before': {
         display: 'block',
diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx
index b711b76d8c8..4a2e1511ae2 100644
--- a/public/app/features/query/components/QueryEditorRow.tsx
+++ b/public/app/features/query/components/QueryEditorRow.tsx
@@ -371,6 +371,16 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
 
     return (
       <>
+        <MaybeQueryLibrarySaveButton query={query} app={this.props.app} />
+        <ReplaceQueryFromLibrary
+          datasourceFilters={datasource?.name ? [datasource.name] : []}
+          onSelectQuery={(query) => {
+            onQueryReplacedFromLibrary?.();
+            onReplace?.(query);
+          }}
+          app={this.props.app}
+        />
+
         {hasEditorHelp && (
           <QueryOperationToggleAction
             title={t('query-operation.header.datasource-help', 'Show data source help')}
@@ -380,20 +390,11 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
           />
         )}
         {this.renderExtraActions()}
-        <MaybeQueryLibrarySaveButton query={query} app={this.props.app} />
         <QueryOperationAction
           title={t('query-operation.header.duplicate-query', 'Duplicate query')}
           icon="copy"
           onClick={this.onCopyQuery}
         />
-        <ReplaceQueryFromLibrary
-          datasourceFilters={datasource?.name ? [datasource.name] : []}
-          onSelectQuery={(query) => {
-            onQueryReplacedFromLibrary?.();
-            onReplace?.(query);
-          }}
-          app={this.props.app}
-        />
         {!hideHideQueryButton ? (
           <QueryOperationToggleAction
             dataTestId={selectors.components.QueryEditorRow.actionButton('Hide response')}
@@ -556,6 +557,8 @@ function ReplaceQueryFromLibrary<TQuery extends DataQuery>({
       title={t('query-operation.header.replace-query-from-library', 'Replace with query from library')}
       icon="book"
       onClick={onReplaceQueryFromLibrary}
+      isGroupEnd
+      isHighlighted
     />
   ) : null;
 }

From 238961d3ea5dbc66e149c619b757d234b8b27cf6 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Mon, 11 Aug 2025 15:35:36 -0500
Subject: [PATCH 097/243] VizTooltip: Replace `ExemplarHoverView` with
 `VizTooltip` components (#109369)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
---
 .../uPlot/geometries/EventsCanvas.tsx         |  16 +-
 .../data-hover/DataHoverView.test.tsx         |   4 +-
 .../data-hover/DataHoverView.tsx              |  82 +-----
 .../data-hover/ExemplarHoverView.tsx          | 117 ---------
 .../data-hover/ExemplarTooltip.tsx            |  39 +++
 .../panel/candlestick/CandlestickPanel.tsx    |   8 +-
 .../panel/heatmap/ExemplarModalHeader.tsx     |  26 --
 .../plugins/panel/heatmap/HeatmapTooltip.tsx  |  23 +-
 .../panel/timeseries/TimeSeriesPanel.tsx      |   1 +
 .../timeseries/plugins/ExemplarMarker.tsx     | 235 +++++++-----------
 .../timeseries/plugins/ExemplarsPlugin.tsx    |  62 +++--
 public/locales/en-US/grafana.json             |   1 +
 12 files changed, 204 insertions(+), 410 deletions(-)
 delete mode 100644 public/app/features/visualization/data-hover/ExemplarHoverView.tsx
 create mode 100644 public/app/features/visualization/data-hover/ExemplarTooltip.tsx
 delete mode 100644 public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx

diff --git a/packages/grafana-ui/src/components/uPlot/geometries/EventsCanvas.tsx b/packages/grafana-ui/src/components/uPlot/geometries/EventsCanvas.tsx
index a246bfd59f8..f4f2e71b7ae 100644
--- a/packages/grafana-ui/src/components/uPlot/geometries/EventsCanvas.tsx
+++ b/packages/grafana-ui/src/components/uPlot/geometries/EventsCanvas.tsx
@@ -1,9 +1,9 @@
-import { useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useLayoutEffect, useMemo, useRef, useState, ReactNode } from 'react';
 import * as React from 'react';
 import { useMountedState } from 'react-use';
 import uPlot from 'uplot';
 
-import { DataFrame, DataFrameFieldIndex } from '@grafana/data';
+import { DataFrame } from '@grafana/data';
 
 import { UPlotConfigBuilder } from '../config/UPlotConfigBuilder';
 
@@ -14,11 +14,8 @@ interface EventsCanvasProps {
   id: string;
   config: UPlotConfigBuilder;
   events: DataFrame[];
-  renderEventMarker: (dataFrame: DataFrame, dataFrameFieldIndex: DataFrameFieldIndex) => React.ReactNode;
-  mapEventToXYCoords: (
-    dataFrame: DataFrame,
-    dataFrameFieldIndex: DataFrameFieldIndex
-  ) => { x: number; y: number } | undefined;
+  renderEventMarker: (dataFrame: DataFrame, rowIndex: number) => ReactNode;
+  mapEventToXYCoords: (dataFrame: DataFrame, rowIndex: number) => { x: number; y: number } | undefined;
 }
 
 export function EventsCanvas({ id, events, renderEventMarker, mapEventToXYCoords, config }: EventsCanvasProps) {
@@ -50,14 +47,15 @@ export function EventsCanvas({ id, events, renderEventMarker, mapEventToXYCoords
 
     for (let i = 0; i < events.length; i++) {
       const frame = events[i];
+
       for (let j = 0; j < frame.length; j++) {
-        const coords = mapEventToXYCoords(frame, { fieldIndex: j, frameIndex: i });
+        const coords = mapEventToXYCoords(frame, j);
         if (!coords) {
           continue;
         }
         markers.push(
           <Marker {...coords} key={`${id}-marker-${i}-${j}`}>
-            {renderEventMarker(frame, { fieldIndex: j, frameIndex: i })}
+            {renderEventMarker(frame, j)}
           </Marker>
         );
       }
diff --git a/public/app/features/visualization/data-hover/DataHoverView.test.tsx b/public/app/features/visualization/data-hover/DataHoverView.test.tsx
index b5b2eef3c55..d756d41b250 100644
--- a/public/app/features/visualization/data-hover/DataHoverView.test.tsx
+++ b/public/app/features/visualization/data-hover/DataHoverView.test.tsx
@@ -1,12 +1,12 @@
 import { render, screen } from '@testing-library/react';
 
-import { ArrayDataFrame } from '@grafana/data';
+import { arrayToDataFrame } from '@grafana/data';
 
 import { DataHoverView } from './DataHoverView';
 
 describe('DataHoverView component', () => {
   it('should default to multi mode if mode is null or undefined', () => {
-    const data = new ArrayDataFrame([{ foo: 'bar' }]);
+    const data = arrayToDataFrame([{ foo: 'bar' }]);
     render(<DataHoverView data={data} rowIndex={0} />);
 
     expect(screen.queryByText('bar')).toBeInTheDocument();
diff --git a/public/app/features/visualization/data-hover/DataHoverView.tsx b/public/app/features/visualization/data-hover/DataHoverView.tsx
index 0c51b28da32..01c999f7fbf 100644
--- a/public/app/features/visualization/data-hover/DataHoverView.tsx
+++ b/public/app/features/visualization/data-hover/DataHoverView.tsx
@@ -1,116 +1,61 @@
 import { css } from '@emotion/css';
 
-import {
-  arrayUtils,
-  DataFrame,
-  Field,
-  formattedValueToString,
-  getFieldDisplayName,
-  GrafanaTheme2,
-  LinkModel,
-} from '@grafana/data';
+import { DataFrame, Field, formattedValueToString, getFieldDisplayName, GrafanaTheme2, LinkModel } from '@grafana/data';
 import { Trans } from '@grafana/i18n';
-import { SortOrder, TooltipDisplayMode } from '@grafana/schema';
 import { TextLink, useStyles2 } from '@grafana/ui';
 import { renderValue } from 'app/plugins/panel/geomap/utils/uiUtils';
-
-import { ExemplarHoverView } from './ExemplarHoverView';
+import { getDataLinks } from 'app/plugins/panel/status-history/utils';
 
 export interface Props {
   data?: DataFrame; // source data
   rowIndex?: number | null; // the hover row
   columnIndex?: number | null; // the hover column
-  sortOrder?: SortOrder;
-  mode?: TooltipDisplayMode | null;
   header?: string;
   padding?: number;
-  maxHeight?: number;
 }
 
 export interface DisplayValue {
   name: string;
   value: unknown;
   valueString: string;
-  highlight: boolean;
 }
 
-export function getDisplayValuesAndLinks(
-  data: DataFrame,
-  rowIndex: number,
-  columnIndex?: number | null,
-  sortOrder?: SortOrder,
-  mode?: TooltipDisplayMode | null
-) {
-  const fields = data.fields;
-  const hoveredField = columnIndex != null ? fields[columnIndex] : null;
+export function getDisplayValuesAndLinks(data: DataFrame, rowIndex: number, columnIndex?: number) {
+  const visibleFields = data.fields.filter(
+    (f, i) => !Boolean(f.config.custom?.hideFrom?.tooltip) && (columnIndex == null || i === columnIndex)
+  );
 
-  const visibleFields = fields.filter((f) => !Boolean(f.config.custom?.hideFrom?.tooltip));
-  const traceIDField = visibleFields.find((field) => field.name === 'traceID') || fields[0];
-  const orderedVisibleFields = [];
-  // Only include traceID if it's visible and put it in front.
-  if (visibleFields.filter((field) => traceIDField === field).length > 0) {
-    orderedVisibleFields.push(traceIDField);
-  }
-  orderedVisibleFields.push(...visibleFields.filter((field) => traceIDField !== field));
-
-  if (orderedVisibleFields.length === 0) {
+  if (visibleFields.length === 0) {
     return null;
   }
 
   const displayValues: DisplayValue[] = [];
   const links: Array<LinkModel<Field>> = [];
-  const linkLookup = new Set<string>();
-
-  for (const field of orderedVisibleFields) {
-    if (mode === TooltipDisplayMode.Single && field !== hoveredField) {
-      continue;
-    }
 
+  for (const field of visibleFields) {
     const value = field.values[rowIndex];
     const fieldDisplay = field.display ? field.display(value) : { text: `${value}`, numeric: +value };
 
-    if (field.getLinks) {
-      field.getLinks({ calculatedValue: fieldDisplay, valueRowIndex: rowIndex }).forEach((link) => {
-        const key = `${link.title}/${link.href}`;
-        if (!linkLookup.has(key)) {
-          links.push(link);
-          linkLookup.add(key);
-        }
-      });
-    }
+    links.push(...getDataLinks(field, rowIndex));
 
     displayValues.push({
       name: getFieldDisplayName(field, data),
       value,
       valueString: formattedValueToString(fieldDisplay),
-      highlight: field === hoveredField,
     });
   }
 
-  if (sortOrder && sortOrder !== SortOrder.None) {
-    displayValues.sort((a, b) => arrayUtils.sortValues(sortOrder)(a.value, b.value));
-  }
-
   return { displayValues, links };
 }
 
-export const DataHoverView = ({
-  data,
-  rowIndex,
-  columnIndex,
-  sortOrder,
-  mode,
-  header,
-  padding = 0,
-  maxHeight,
-}: Props) => {
+export const DataHoverView = ({ data, rowIndex, header, padding = 0 }: Props) => {
   const styles = useStyles2(getStyles, padding);
 
   if (!data || rowIndex == null) {
     return null;
   }
 
-  const dispValuesAndLinks = getDisplayValuesAndLinks(data, rowIndex, columnIndex, sortOrder, mode);
+  const dispValuesAndLinks = getDisplayValuesAndLinks(data, rowIndex);
 
   if (dispValuesAndLinks == null) {
     return null;
@@ -118,10 +63,6 @@ export const DataHoverView = ({
 
   const { displayValues, links } = dispValuesAndLinks;
 
-  if (header === 'Exemplar') {
-    return <ExemplarHoverView displayValues={displayValues} links={links} header={header} maxHeight={maxHeight} />;
-  }
-
   return (
     <div className={styles.wrapper}>
       {header && (
@@ -154,6 +95,7 @@ export const DataHoverView = ({
     </div>
   );
 };
+
 const getStyles = (theme: GrafanaTheme2, padding = 0) => {
   return {
     wrapper: css({
diff --git a/public/app/features/visualization/data-hover/ExemplarHoverView.tsx b/public/app/features/visualization/data-hover/ExemplarHoverView.tsx
deleted file mode 100644
index 3325188ee5e..00000000000
--- a/public/app/features/visualization/data-hover/ExemplarHoverView.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { css } from '@emotion/css';
-
-import { GrafanaTheme2, LinkModel } from '@grafana/data';
-import { DataLinkButton, useStyles2 } from '@grafana/ui';
-import { VizTooltipRow } from '@grafana/ui/internal';
-import { renderValue } from 'app/plugins/panel/geomap/utils/uiUtils';
-
-import { DisplayValue } from './DataHoverView';
-
-export interface Props {
-  displayValues: DisplayValue[];
-  links?: LinkModel[];
-  header?: string;
-  maxHeight?: number;
-}
-
-export const ExemplarHoverView = ({ displayValues, links, header = 'Exemplar', maxHeight }: Props) => {
-  const styles = useStyles2(getStyles, 0, maxHeight);
-
-  const time = displayValues.find((val) => val.name === 'Time');
-  displayValues = displayValues.filter((val) => val.name !== 'Time'); // time?
-
-  return (
-    <div className={styles.exemplarWrapper}>
-      <div className={styles.exemplarHeader}>
-        <span className={styles.title}>{header}</span>
-        {time && <span className={styles.time}>{renderValue(time.valueString)}</span>}
-      </div>
-      <div className={styles.exemplarContent}>
-        {displayValues.map((displayValue, i) => {
-          return (
-            <VizTooltipRow
-              key={i}
-              label={displayValue.name}
-              value={renderValue(displayValue.valueString)}
-              justify={'space-between'}
-              isPinned={false}
-            />
-          );
-        })}
-      </div>
-      {links && links.length > 0 && (
-        <div className={styles.exemplarFooter}>
-          {links.map((link, i) => (
-            <DataLinkButton link={link} key={i} buttonProps={{ size: 'md' }} />
-          ))}
-        </div>
-      )}
-    </div>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2, padding = 0, maxHeight?: number) => {
-  return {
-    exemplarWrapper: css({
-      display: 'flex',
-      flexDirection: 'column',
-      flex: 1,
-      gap: 4,
-      whiteSpace: 'pre',
-      borderRadius: theme.shape.radius.default,
-      background: theme.colors.background.primary,
-      border: `1px solid ${theme.colors.border.weak}`,
-    }),
-    exemplarHeader: css({
-      display: 'flex',
-      flexDirection: 'column',
-      alignItems: 'flex-start',
-      gap: theme.spacing(0.5),
-      color: theme.colors.text.secondary,
-      padding: theme.spacing(1),
-    }),
-    time: css({
-      color: theme.colors.text.primary,
-    }),
-    exemplarContent: css({
-      display: 'flex',
-      flexDirection: 'column',
-      flex: 1,
-      gap: 4,
-      borderTop: `1px solid ${theme.colors.border.medium}`,
-      padding: theme.spacing(1),
-      overflowY: 'auto',
-      maxHeight: maxHeight,
-    }),
-    exemplarFooter: css({
-      display: 'flex',
-      flexDirection: 'column',
-      padding: theme.spacing(1),
-      borderTop: `1px solid ${theme.colors.border.medium}`,
-      gap: 4,
-    }),
-    linkButton: css({
-      width: 'fit-content',
-    }),
-    label: css({
-      color: theme.colors.text.secondary,
-      fontWeight: 400,
-      textOverflow: 'ellipsis',
-      overflow: 'hidden',
-      marginRight: theme.spacing(0.5),
-    }),
-    value: css({
-      fontWeight: 500,
-      textOverflow: 'ellipsis',
-      overflow: 'hidden',
-    }),
-    title: css({
-      fontWeight: theme.typography.fontWeightMedium,
-      overflow: 'hidden',
-      display: 'inline-block',
-      whiteSpace: 'nowrap',
-      textOverflow: 'ellipsis',
-      flexGrow: 1,
-    }),
-  };
-};
diff --git a/public/app/features/visualization/data-hover/ExemplarTooltip.tsx b/public/app/features/visualization/data-hover/ExemplarTooltip.tsx
new file mode 100644
index 00000000000..9473c7b70d5
--- /dev/null
+++ b/public/app/features/visualization/data-hover/ExemplarTooltip.tsx
@@ -0,0 +1,39 @@
+import { LinkModel } from '@grafana/data';
+import { t } from '@grafana/i18n';
+import {
+  VizTooltipContent,
+  VizTooltipFooter,
+  VizTooltipItem,
+  VizTooltipHeader,
+  VizTooltipWrapper,
+} from '@grafana/ui/internal';
+
+export interface Props {
+  items: VizTooltipItem[];
+  links?: LinkModel[];
+  isPinned: boolean;
+  maxHeight?: number;
+}
+
+export const ExemplarTooltip = ({ items, links, isPinned, maxHeight }: Props) => {
+  const timeItem = items.find((val) => val.label === 'Time');
+
+  return (
+    <VizTooltipWrapper>
+      <VizTooltipHeader
+        item={{
+          label: t('exemplar-tooltip-header', 'Exemplar'),
+          value: timeItem?.value ?? '',
+        }}
+        isPinned={isPinned}
+      />
+      <VizTooltipContent
+        items={items.filter((item) => item !== timeItem)}
+        isPinned={isPinned}
+        maxHeight={maxHeight}
+        scrollable={maxHeight != null}
+      />
+      <VizTooltipFooter dataLinks={links ?? []} />
+    </VizTooltipWrapper>
+  );
+};
diff --git a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
index 39d68078b51..b07ec3fe71f 100644
--- a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
+++ b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
@@ -324,7 +324,13 @@ export const CandlestickPanel = ({
             />
             <OutsideRangePlugin config={uplotConfig} onChangeTimeRange={onChangeTimeRange} />
             {data.annotations && (
-              <ExemplarsPlugin config={uplotConfig} exemplars={data.annotations} timeZone={timeZone} />
+              <ExemplarsPlugin
+                config={uplotConfig}
+                exemplars={data.annotations}
+                timeZone={timeZone}
+                maxHeight={options.tooltip.maxHeight}
+                maxWidth={options.tooltip.maxWidth}
+              />
             )}
             {((canEditThresholds && onThresholdsChange) || showThresholds) && (
               <ThresholdControlsPlugin
diff --git a/public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx b/public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx
deleted file mode 100644
index 4d66229d940..00000000000
--- a/public/app/plugins/panel/heatmap/ExemplarModalHeader.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { CSSProperties } from 'react';
-import * as React from 'react';
-
-import { CloseButton } from 'app/core/components/CloseButton/CloseButton';
-
-export function ExemplarModalHeader(props: { onClick: () => void; style?: React.CSSProperties }) {
-  const defaultStyle: CSSProperties = {
-    position: 'relative',
-    top: 'auto',
-    right: 'auto',
-    marginRight: 0,
-  };
-
-  return (
-    <div
-      style={{
-        width: '100%',
-        display: 'flex',
-        justifyContent: 'flex-end',
-        paddingBottom: '6px',
-      }}
-    >
-      <CloseButton onClick={props.onClick} style={props.style ?? defaultStyle} />
-    </div>
-  );
-}
diff --git a/public/app/plugins/panel/heatmap/HeatmapTooltip.tsx b/public/app/plugins/panel/heatmap/HeatmapTooltip.tsx
index 5859e93ac79..48ca1fe7578 100644
--- a/public/app/plugins/panel/heatmap/HeatmapTooltip.tsx
+++ b/public/app/plugins/panel/heatmap/HeatmapTooltip.tsx
@@ -27,7 +27,8 @@ import {
 import { ColorScale } from 'app/core/components/ColorScale/ColorScale';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { isHeatmapCellsDense, readHeatmapRowsCustomMeta } from 'app/features/transformers/calculateHeatmap/heatmap';
-import { DataHoverView } from 'app/features/visualization/data-hover/DataHoverView';
+import { getDisplayValuesAndLinks } from 'app/features/visualization/data-hover/DataHoverView';
+import { ExemplarTooltip } from 'app/features/visualization/data-hover/ExemplarTooltip';
 
 import { getDataLinks, getFieldActions } from '../status-history/utils';
 import { isTooltipScrollable } from '../timeseries/utils';
@@ -54,13 +55,23 @@ interface HeatmapTooltipProps {
 
 export const HeatmapTooltip = (props: HeatmapTooltipProps) => {
   if (props.seriesIdx === 2) {
+    const dispValuesAndLinks = getDisplayValuesAndLinks(props.dataRef.current!.exemplars!, props.dataIdxs[2]!);
+
+    if (dispValuesAndLinks == null) {
+      return null;
+    }
+
+    const { displayValues, links } = dispValuesAndLinks;
+
     return (
-      <DataHoverView
-        data={props.dataRef.current!.exemplars}
-        rowIndex={props.dataIdxs[2]}
-        header={'Exemplar'}
-        padding={8}
+      <ExemplarTooltip
+        items={displayValues.map((dispVal) => ({
+          label: dispVal.name,
+          value: dispVal.valueString,
+        }))}
+        links={links}
         maxHeight={props.maxHeight}
+        isPinned={props.isPinned}
       />
     );
   }
diff --git a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
index c948b75b296..49d34358a93 100644
--- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
+++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
@@ -160,6 +160,7 @@ export const TimeSeriesPanel = ({
                     exemplars={data.annotations}
                     timeZone={timeZone}
                     maxHeight={options.tooltip.maxHeight}
+                    maxWidth={options.tooltip.maxWidth}
                   />
                 )}
                 {((canEditThresholds && onThresholdsChange) || showThresholds) && (
diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
index f41e5e3af7a..3ac418177f9 100644
--- a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
@@ -9,40 +9,45 @@ import {
   useHover,
   useInteractions,
 } from '@floating-ui/react';
-import { CSSProperties, useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import * as React from 'react';
 
-import { DataFrame, DataFrameFieldIndex, Field, formattedValueToString, GrafanaTheme2, LinkModel } from '@grafana/data';
+import { DataFrame, Field, formattedValueToString, GrafanaTheme2, LinkModel } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { TimeZone } from '@grafana/schema';
 import { Portal, UPlotConfigBuilder, useStyles2 } from '@grafana/ui';
-import { DisplayValue } from 'app/features/visualization/data-hover/DataHoverView';
-import { ExemplarHoverView } from 'app/features/visualization/data-hover/ExemplarHoverView';
+import { VizTooltipItem } from '@grafana/ui/internal';
+import { CloseButton } from 'app/core/components/CloseButton/CloseButton';
+import { ExemplarTooltip } from 'app/features/visualization/data-hover/ExemplarTooltip';
 
-import { ExemplarModalHeader } from '../../heatmap/ExemplarModalHeader';
+import { getDataLinks } from '../../status-history/utils';
 
 interface ExemplarMarkerProps {
   timeZone: TimeZone;
   dataFrame: DataFrame;
-  dataFrameFieldIndex: DataFrameFieldIndex;
+  frameIndex: number;
+  rowIndex: number;
   config: UPlotConfigBuilder;
   exemplarColor?: string;
-  clickedExemplarFieldIndex: DataFrameFieldIndex | undefined;
-  setClickedExemplarFieldIndex: React.Dispatch<DataFrameFieldIndex | undefined>;
+  clickedRowIndex: number | undefined;
+  setClickedRowIndex: React.Dispatch<number | undefined>;
   maxHeight?: number;
+  maxWidth?: number;
 }
 
 export const ExemplarMarker = ({
   timeZone,
   dataFrame,
-  dataFrameFieldIndex,
+  frameIndex,
+  rowIndex,
   config,
   exemplarColor,
-  clickedExemplarFieldIndex,
-  setClickedExemplarFieldIndex,
+  clickedRowIndex,
+  setClickedRowIndex,
   maxHeight,
+  maxWidth,
 }: ExemplarMarkerProps) => {
-  const styles = useStyles2(getExemplarMarkerStyles);
+  const styles = useStyles2(getExemplarMarkerStyles, maxWidth);
   const [isOpen, setIsOpen] = useState(false);
   const [isLocked, setIsLocked] = useState(false);
 
@@ -69,24 +74,19 @@ export const ExemplarMarker = ({
   const dismiss = useDismiss(context);
   const hover = useHover(context, {
     handleClose: safePolygon(),
-    enabled: clickedExemplarFieldIndex === undefined,
+    enabled: clickedRowIndex === undefined,
   });
 
   const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, hover]);
 
   useEffect(() => {
-    if (
-      !(
-        clickedExemplarFieldIndex?.fieldIndex === dataFrameFieldIndex.fieldIndex &&
-        clickedExemplarFieldIndex?.frameIndex === dataFrameFieldIndex.frameIndex
-      )
-    ) {
+    if (clickedRowIndex !== rowIndex) {
       setIsLocked(false);
     }
-  }, [clickedExemplarFieldIndex, dataFrameFieldIndex]);
+  }, [clickedRowIndex, rowIndex]);
 
   const getSymbol = () => {
-    const symbols = [
+    return (
       <rect
         fill={exemplarColor}
         key="diamond"
@@ -94,27 +94,38 @@ export const ExemplarMarker = ({
         width="4.78985"
         height="4.78985"
         transform="rotate(45 3.38672 0)"
-      />,
-      <path
-        fill={exemplarColor}
-        key="x"
-        d="M1.94444 3.49988L0 5.44432L1.55552 6.99984L3.49996 5.05539L5.4444 6.99983L6.99992 5.44431L5.05548 3.49988L6.99983 1.55552L5.44431 0L3.49996 1.94436L1.5556 0L8.42584e-05 1.55552L1.94444 3.49988Z"
-      />,
-      <path fill={exemplarColor} key="triangle" d="M4 0L7.4641 6H0.535898L4 0Z" />,
-      <rect fill={exemplarColor} key="rectangle" width="5" height="5" />,
-      <path
-        fill={exemplarColor}
-        key="pentagon"
-        d="M3 0.5L5.85317 2.57295L4.76336 5.92705H1.23664L0.146831 2.57295L3 0.5Z"
-      />,
-      <path
-        fill={exemplarColor}
-        key="plus"
-        d="m2.35672,4.2425l0,2.357l1.88558,0l0,-2.357l2.3572,0l0,-1.88558l-2.3572,0l0,-2.35692l-1.88558,0l0,2.35692l-2.35672,0l0,1.88558l2.35672,0z"
-      />,
-    ];
+      />
+    );
 
-    return symbols[dataFrameFieldIndex.frameIndex % symbols.length];
+    // const symbols = [
+    //   <rect
+    //     fill={exemplarColor}
+    //     key="diamond"
+    //     x="3.38672"
+    //     width="4.78985"
+    //     height="4.78985"
+    //     transform="rotate(45 3.38672 0)"
+    //   />,
+    //   <path
+    //     fill={exemplarColor}
+    //     key="x"
+    //     d="M1.94444 3.49988L0 5.44432L1.55552 6.99984L3.49996 5.05539L5.4444 6.99983L6.99992 5.44431L5.05548 3.49988L6.99983 1.55552L5.44431 0L3.49996 1.94436L1.5556 0L8.42584e-05 1.55552L1.94444 3.49988Z"
+    //   />,
+    //   <path fill={exemplarColor} key="triangle" d="M4 0L7.4641 6H0.535898L4 0Z" />,
+    //   <rect fill={exemplarColor} key="rectangle" width="5" height="5" />,
+    //   <path
+    //     fill={exemplarColor}
+    //     key="pentagon"
+    //     d="M3 0.5L5.85317 2.57295L4.76336 5.92705H1.23664L0.146831 2.57295L3 0.5Z"
+    //   />,
+    //   <path
+    //     fill={exemplarColor}
+    //     key="plus"
+    //     d="m2.35672,4.2425l0,2.357l1.88558,0l0,-2.357l2.3572,0l0,-1.88558l-2.3572,0l0,-2.35692l-1.88558,0l0,2.35692l-2.35672,0l0,1.88558l2.35672,0z"
+    //   />,
+    // ];
+
+    // return symbols[dataFrameFieldIndex.frameIndex % symbols.length];
   };
 
   const lockExemplarModal = () => {
@@ -122,70 +133,56 @@ export const ExemplarMarker = ({
   };
 
   const renderMarker = useCallback(() => {
-    //Put fields with links on the top
-    const fieldsWithLinks =
-      dataFrame.fields.filter((field) => field.config.links?.length && field.config.links?.length > 0) || [];
-    const orderedDataFrameFields = [
-      ...fieldsWithLinks,
-      ...dataFrame.fields.filter((field) => !fieldsWithLinks.includes(field)),
-    ];
-
     const onClose = () => {
       setIsLocked(false);
       setIsOpen(false);
-      setClickedExemplarFieldIndex(undefined);
+      setClickedRowIndex(undefined);
     };
 
-    let displayValues: DisplayValue[] = [];
-    let links: LinkModel[] | undefined = [];
-    orderedDataFrameFields.map((field: Field, i) => {
-      const value = field.values[dataFrameFieldIndex.fieldIndex];
+    let items: VizTooltipItem[] = [];
+    let links: LinkModel[] = [];
 
-      if (field.config.links?.length) {
-        links?.push(...(field.getLinks?.({ valueRowIndex: dataFrameFieldIndex.fieldIndex }) || []));
-      }
+    dataFrame.fields.forEach((field: Field) => {
+      const value = field.values[rowIndex];
 
-      const fieldDisplay = field.display ? field.display(value) : { text: `${value}`, numeric: +value };
+      links.push(...getDataLinks(field, rowIndex));
 
-      displayValues.push({
-        name: field.name,
-        value,
-        valueString: formattedValueToString(fieldDisplay),
-        highlight: false,
+      const fieldDisplay = field.display?.(value) ?? { text: `${value}`, numeric: +value };
+
+      items.push({
+        label: field.state?.displayName ?? field.name,
+        value: formattedValueToString(fieldDisplay),
       });
     });
 
-    const exemplarHeaderCustomStyle: CSSProperties = {
-      position: 'relative',
-      top: '35px',
-      right: '5px',
-      marginRight: 0,
-    };
-
     return (
-      <div className={styles.tooltip} ref={refs.setFloating} style={floatingStyles} {...getFloatingProps()}>
-        {isLocked && <ExemplarModalHeader onClick={onClose} style={exemplarHeaderCustomStyle} />}
-        <ExemplarHoverView displayValues={displayValues} links={links} maxHeight={maxHeight} />
+      <div
+        className={cx(styles.tooltipWrapper, isLocked && styles.pinned)}
+        ref={refs.setFloating}
+        style={floatingStyles}
+        {...getFloatingProps()}
+      >
+        {isLocked && <CloseButton onClick={onClose} />}
+        <ExemplarTooltip items={items} links={links} isPinned={isLocked} maxHeight={maxHeight} />
       </div>
     );
   }, [
     dataFrame.fields,
-    dataFrameFieldIndex,
+    rowIndex,
     styles,
     isLocked,
-    setClickedExemplarFieldIndex,
+    setClickedRowIndex,
     floatingStyles,
     getFloatingProps,
     refs.setFloating,
     maxHeight,
   ]);
 
-  const seriesColor = config
-    .getSeries()
-    .find((s) => s.props.dataFrameFieldIndex?.frameIndex === dataFrameFieldIndex.frameIndex)?.props.lineColor;
+  const seriesColor = config.getSeries().find((s) => s.props.dataFrameFieldIndex?.frameIndex === frameIndex)
+    ?.props.lineColor;
 
   const onExemplarClick = () => {
-    setClickedExemplarFieldIndex(dataFrameFieldIndex);
+    setClickedRowIndex(rowIndex);
     lockExemplarModal();
   };
 
@@ -220,12 +217,7 @@ export const ExemplarMarker = ({
   );
 };
 
-const getExemplarMarkerStyles = (theme: GrafanaTheme2) => {
-  const bg = theme.isDark ? theme.v1.palette.dark2 : theme.v1.palette.white;
-  const headerBg = theme.isDark ? theme.v1.palette.dark9 : theme.v1.palette.gray5;
-  const shadowColor = theme.isDark ? theme.v1.palette.black : theme.v1.palette.white;
-  const tableBgOdd = theme.isDark ? theme.v1.palette.dark3 : theme.v1.palette.gray6;
-
+const getExemplarMarkerStyles = (theme: GrafanaTheme2, maxWidth: number | undefined) => {
   return {
     markerWrapper: css({
       padding: '0 4px 4px 4px',
@@ -249,66 +241,6 @@ const getExemplarMarkerStyles = (theme: GrafanaTheme2) => {
       borderBottom: `4px solid ${theme.v1.palette.red}`,
       pointerEvents: 'none',
     }),
-    wrapper: css({
-      background: bg,
-      border: `1px solid ${headerBg}`,
-      borderRadius: theme.shape.borderRadius(2),
-      boxShadow: `0 0 20px ${shadowColor}`,
-      padding: theme.spacing(1),
-    }),
-    exemplarsTable: css({
-      width: '100%',
-      'tr td': {
-        padding: '5px 10px',
-        whiteSpace: 'nowrap',
-        borderBottom: `4px solid ${theme.components.panel.background}`,
-      },
-      tr: {
-        backgroundColor: theme.colors.background.primary,
-        '&:nth-child(even)': {
-          backgroundColor: tableBgOdd,
-        },
-      },
-    }),
-    valueWrapper: css({
-      display: 'flex',
-      flexDirection: 'row',
-      flexWrap: 'wrap',
-      columnGap: theme.spacing(1),
-      '> span': {
-        flexGrow: 0,
-      },
-      '> *': {
-        flex: '1 1',
-        alignSelf: 'center',
-      },
-    }),
-    tooltip: css({
-      background: 'none',
-      padding: 0,
-      overflowY: 'auto',
-      maxHeight: '95vh',
-      boxShadow: theme.shadows.z2,
-    }),
-    header: css({
-      background: headerBg,
-      padding: '6px 10px',
-      display: 'flex',
-    }),
-    title: css({
-      fontWeight: theme.typography.fontWeightMedium,
-      paddingRight: theme.spacing(2),
-      overflow: 'hidden',
-      display: 'inline-block',
-      whiteSpace: 'nowrap',
-      textOverflow: 'ellipsis',
-      flexGrow: 1,
-    }),
-    body: css({
-      fontWeight: theme.typography.fontWeightMedium,
-      borderRadius: theme.shape.borderRadius(2),
-      overflow: 'hidden',
-    }),
     marble: css({
       display: 'block',
       opacity: 0.5,
@@ -321,5 +253,18 @@ const getExemplarMarkerStyles = (theme: GrafanaTheme2) => {
       opacity: 1,
       filter: 'drop-shadow(0 0 8px rgba(0, 0, 0, 0.5))',
     }),
+    tooltipWrapper: css({
+      background: theme.colors.background.elevated,
+      maxWidth: maxWidth ?? 'none',
+      whiteSpace: 'pre',
+      borderRadius: theme.shape.radius.default,
+      position: 'fixed',
+      border: `1px solid ${theme.colors.border.weak}`,
+      boxShadow: theme.shadows.z2,
+      userSelect: 'text',
+    }),
+    pinned: css({
+      boxShadow: theme.shadows.z3,
+    }),
   };
 };
diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
index 673f2288dc7..50974a7ac94 100644
--- a/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
@@ -1,14 +1,7 @@
-import { useCallback, useLayoutEffect, useRef, useState } from 'react';
+import { ReactNode, useCallback, useLayoutEffect, useRef, useState } from 'react';
 import uPlot from 'uplot';
 
-import {
-  DataFrame,
-  DataFrameFieldIndex,
-  Labels,
-  TIME_SERIES_TIME_FIELD_NAME,
-  TIME_SERIES_VALUE_FIELD_NAME,
-  TimeZone,
-} from '@grafana/data';
+import { DataFrame, Labels, TIME_SERIES_TIME_FIELD_NAME, TIME_SERIES_VALUE_FIELD_NAME, TimeZone } from '@grafana/data';
 import { FIXED_UNIT, EventsCanvas, UPlotConfigBuilder } from '@grafana/ui';
 
 import { ExemplarMarker } from './ExemplarMarker';
@@ -19,12 +12,20 @@ interface ExemplarsPluginProps {
   timeZone: TimeZone;
   visibleSeries?: VisibleExemplarLabels;
   maxHeight?: number;
+  maxWidth?: number;
 }
 
-export const ExemplarsPlugin = ({ exemplars, timeZone, config, visibleSeries, maxHeight }: ExemplarsPluginProps) => {
+export const ExemplarsPlugin = ({
+  exemplars,
+  timeZone,
+  config,
+  visibleSeries,
+  maxHeight,
+  maxWidth,
+}: ExemplarsPluginProps) => {
   const plotInstance = useRef<uPlot>();
 
-  const [lockedExemplarFieldIndex, setLockedExemplarFieldIndex] = useState<DataFrameFieldIndex | undefined>();
+  const [lockedExemplarRowIndex, setLockedExemplarRowIndex] = useState<number | undefined>();
 
   useLayoutEffect(() => {
     config.addHook('init', (u) => {
@@ -32,7 +33,7 @@ export const ExemplarsPlugin = ({ exemplars, timeZone, config, visibleSeries, ma
     });
   }, [config]);
 
-  const mapExemplarToXYCoords = useCallback((dataFrame: DataFrame, dataFrameFieldIndex: DataFrameFieldIndex) => {
+  const mapExemplarToXYCoords = useCallback((dataFrame: DataFrame, rowIndex: number) => {
     const time = dataFrame.fields.find((f) => f.name === TIME_SERIES_TIME_FIELD_NAME);
     const value = dataFrame.fields.find((f) => f.name === TIME_SERIES_VALUE_FIELD_NAME);
 
@@ -47,7 +48,7 @@ export const ExemplarsPlugin = ({ exemplars, timeZone, config, visibleSeries, ma
     const yMin = plotInstance.current.scales[yScale].min;
     const yMax = plotInstance.current.scales[yScale].max;
 
-    let y = value.values[dataFrameFieldIndex.fieldIndex];
+    let y = value.values[rowIndex];
     // To not to show exemplars outside of the graph we set the y value to min if it is smaller and max if it is bigger than the size of the graph
     if (yMin != null && y < yMin) {
       y = yMin;
@@ -58,18 +59,17 @@ export const ExemplarsPlugin = ({ exemplars, timeZone, config, visibleSeries, ma
     }
 
     return {
-      x: plotInstance.current.valToPos(time.values[dataFrameFieldIndex.fieldIndex], 'x'),
+      x: plotInstance.current.valToPos(time.values[rowIndex], 'x'),
       y: plotInstance.current.valToPos(y, yScale),
     };
   }, []);
 
   const renderMarker = useCallback(
-    (dataFrame: DataFrame, dataFrameFieldIndex: DataFrameFieldIndex) => {
-      const showMarker =
-        visibleSeries !== undefined ? showExemplarMarker(visibleSeries, dataFrame, dataFrameFieldIndex) : true;
+    (dataFrame: DataFrame, rowIndex: number): ReactNode => {
+      const showMarker = visibleSeries !== undefined ? showExemplarMarker(visibleSeries, dataFrame, rowIndex) : true;
 
       const markerColor =
-        visibleSeries !== undefined ? getExemplarColor(dataFrame, dataFrameFieldIndex, visibleSeries) : undefined;
+        visibleSeries !== undefined ? getExemplarColor(dataFrame, rowIndex, visibleSeries) : undefined;
 
       if (!showMarker) {
         return <></>;
@@ -77,18 +77,20 @@ export const ExemplarsPlugin = ({ exemplars, timeZone, config, visibleSeries, ma
 
       return (
         <ExemplarMarker
-          setClickedExemplarFieldIndex={setLockedExemplarFieldIndex}
-          clickedExemplarFieldIndex={lockedExemplarFieldIndex}
+          setClickedRowIndex={setLockedExemplarRowIndex}
+          clickedRowIndex={lockedExemplarRowIndex}
           timeZone={timeZone}
           dataFrame={dataFrame}
-          dataFrameFieldIndex={dataFrameFieldIndex}
+          frameIndex={0}
+          rowIndex={rowIndex}
           config={config}
           exemplarColor={markerColor}
           maxHeight={maxHeight}
+          maxWidth={maxWidth}
         />
       );
     },
-    [config, timeZone, visibleSeries, setLockedExemplarFieldIndex, lockedExemplarFieldIndex, maxHeight]
+    [visibleSeries, lockedExemplarRowIndex, timeZone, config, maxHeight, maxWidth]
   );
 
   return (
@@ -138,11 +140,7 @@ interface LabelWithExemplarUIData {
 /**
  * Get color of active series in legend
  */
-const getExemplarColor = (
-  dataFrame: DataFrame,
-  dataFrameFieldIndex: DataFrameFieldIndex,
-  visibleLabels: VisibleExemplarLabels
-) => {
+const getExemplarColor = (dataFrame: DataFrame, rowIndex: number, visibleLabels: VisibleExemplarLabels) => {
   let exemplarColor;
   visibleLabels.labels.some((visibleLabel) => {
     const labelKeys = Object.keys(visibleLabel.labels);
@@ -151,7 +149,7 @@ const getExemplarColor = (
     });
     if (fields.length) {
       const hasMatch = fields.every((field, index, fields) => {
-        const value = field.values[dataFrameFieldIndex.fieldIndex];
+        const value = field.values[rowIndex];
         return visibleLabel.labels[field.name] === value;
       });
 
@@ -168,11 +166,7 @@ const getExemplarColor = (
 /**
  * Determine if the current exemplar marker is filtered by what series are selected in the legend UI
  */
-const showExemplarMarker = (
-  visibleSeries: VisibleExemplarLabels,
-  dataFrame: DataFrame,
-  dataFrameFieldIndex: DataFrameFieldIndex
-) => {
+const showExemplarMarker = (visibleSeries: VisibleExemplarLabels, dataFrame: DataFrame, rowIndex: number) => {
   let showMarker = false;
   // If all series are visible, don't filter any exemplars
   if (visibleSeries.labels.length === visibleSeries.totalSeriesCount) {
@@ -196,7 +190,7 @@ const showExemplarMarker = (
           showMarker = visibleSeries.labels.some((series) => {
             return Object.keys(series.labels).every((label) => {
               const value = series.labels[label];
-              return fields.find((field) => field.values[dataFrameFieldIndex.fieldIndex] === value);
+              return fields.find((field) => field.values[rowIndex] === value);
             });
           });
         }
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 3bfd1996f34..fddcbfc2009 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -6806,6 +6806,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "Exemplar",
   "explore": {
     "accordian-logs": {
       "events": "Events",

From 101aea9647fc35c3de1ca67003347f0d8818865a Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Tue, 12 Aug 2025 08:53:56 +0300
Subject: [PATCH 098/243] K8s/Meta: Support setting secure values on a struct
 type (#109381)

---
 pkg/apimachinery/utils/meta.go      | 49 ++++++++++++++++++++++-------
 pkg/apimachinery/utils/meta_test.go | 14 +++++++++
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/pkg/apimachinery/utils/meta.go b/pkg/apimachinery/utils/meta.go
index 17f69da01a5..bdf9a100540 100644
--- a/pkg/apimachinery/utils/meta.go
+++ b/pkg/apimachinery/utils/meta.go
@@ -836,7 +836,7 @@ func (m *grafanaMetaAccessor) SetSourceProperties(v SourceProperties) {
 func (m *grafanaMetaAccessor) GetSecureValues() (vals common.InlineSecureValues, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = fmt.Errorf("error reading spec")
+			err = fmt.Errorf("error reading secure values")
 		}
 	}()
 
@@ -888,7 +888,7 @@ func (m *grafanaMetaAccessor) GetSecureValues() (vals common.InlineSecureValues,
 	if f.Kind() == reflect.Struct {
 		num := f.NumField()
 		vals = make(common.InlineSecureValues, num)
-		for i := 0; i < f.NumField(); i++ {
+		for i := range num {
 			val := f.Field(i)
 			if val.IsValid() && val.CanInterface() {
 				property = val.Interface()
@@ -901,14 +901,7 @@ func (m *grafanaMetaAccessor) GetSecureValues() (vals common.InlineSecureValues,
 					continue // nothing
 				}
 
-				field := f.Type().Field(i)
-				fname := field.Tag.Get("json")
-				if fname == "" {
-					fname = field.Name
-				} else {
-					fname, _ = strings.CutSuffix(fname, ",omitempty")
-				}
-				vals[fname] = inline
+				vals[getJSONFieldName(f, i)] = inline
 				continue
 			}
 			return nil, fmt.Errorf("value not an interface")
@@ -923,12 +916,36 @@ func (m *grafanaMetaAccessor) GetSecureValues() (vals common.InlineSecureValues,
 func (m *grafanaMetaAccessor) SetSecureValues(vals common.InlineSecureValues) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = fmt.Errorf("error setting spec")
+			fmt.Printf("ERR: %v", r)
+			err = fmt.Errorf("error writing secure values")
 		}
 	}()
 
 	f := m.r.FieldByName("Secure")
 	if f.IsValid() && f.CanSet() {
+		if f.Kind() == reflect.Struct {
+			keys := make(map[string]bool, len(vals))
+			for k := range vals {
+				keys[k] = true
+			}
+			for i := 0; i < f.NumField(); i++ {
+				val := f.Field(i)
+				if val.IsValid() && val.CanInterface() && val.CanSet() {
+					k := getJSONFieldName(f, i)
+					sv := vals[k]
+					val.Set(reflect.ValueOf(sv))
+					delete(keys, k)
+				} else {
+					return fmt.Errorf("invalid secure value: %v", val)
+				}
+			}
+			if len(keys) > 0 {
+				return fmt.Errorf("invalid secure value key: %v", keys)
+			}
+			return
+		}
+
+		// It should be a generic map
 		f.Set(reflect.ValueOf(vals))
 		return
 	}
@@ -943,6 +960,16 @@ func (m *grafanaMetaAccessor) SetSecureValues(vals common.InlineSecureValues) (e
 	return fmt.Errorf("unable to set secure values on (%T)", m.raw)
 }
 
+func getJSONFieldName(f reflect.Value, idx int) string {
+	field := f.Type().Field(idx)
+	fname := field.Tag.Get("json")
+	if fname == "" {
+		return field.Name
+	}
+	fname, _ = strings.CutSuffix(fname, ",omitempty")
+	return fname
+}
+
 func ToObjectReference(obj GrafanaMetaAccessor) common.ObjectReference {
 	gvk := obj.GetGroupVersionKind()
 	return common.ObjectReference{
diff --git a/pkg/apimachinery/utils/meta_test.go b/pkg/apimachinery/utils/meta_test.go
index 7bc63884699..54db0fbe976 100644
--- a/pkg/apimachinery/utils/meta_test.go
+++ b/pkg/apimachinery/utils/meta_test.go
@@ -400,6 +400,20 @@ func TestMetaAccessor(t *testing.T) {
 		secure, err := meta.GetSecureValues()
 		require.NoError(t, err)
 		require.JSONEq(t, `{"v1": {"name": "hello"}}`, asJSON(secure, true))
+
+		// Check that we can write
+		err = meta.SetSecureValues(common.InlineSecureValues{
+			"v2": {Name: "bbb"},
+		})
+		require.NoError(t, err)
+		secure, err = meta.GetSecureValues()
+		require.NoError(t, err)
+		require.JSONEq(t, `{"v2": {"name": "bbb"}}`, asJSON(secure, true)) // NOTE: v1 was removed
+
+		err = meta.SetSecureValues(common.InlineSecureValues{
+			"UNKNOWN": {Name: "bbb"}, // not a valid name
+		})
+		require.Error(t, err)
 	})
 
 	t.Run("test reading old repo fields (now manager+source)", func(t *testing.T) {

From 402572c5801248b2d0be1042c40d97799c396db9 Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Tue, 12 Aug 2025 09:42:10 +0300
Subject: [PATCH 099/243] Add ConfigProvider and modify quota.Service to use it
 (#109395)

* Add config provider and integrate with wire setup

* Refactor quota service to use config provider for configuration management

* Enhance OSSConfigProvider to include logging and update ProvideService to return an error. Refactor server initialization to handle potential errors from config provider. Remove unnecessary wire binding for OSSConfigProvider.

* Update CODEOWNERS to include the configprovider package under the grafana-backend-services-squad.

* Refactor quota service initialization to include context in multiple service providers. Update tests and service implementations to ensure proper context handling during service creation.
---
 .github/CODEOWNERS                            |  1 +
 pkg/api/org_users_test.go                     |  5 +++-
 pkg/cmd/grafana-cli/commands/commands.go      |  9 +++---
 pkg/cmd/grafana-server/commands/cli.go        |  4 ++-
 pkg/configprovider/configprovider.go          | 26 +++++++++++++++++
 pkg/server/service.go                         |  4 +--
 pkg/server/wire.go                            | 10 ++++---
 pkg/server/wire_gen.go                        | 28 ++++++++++++++-----
 pkg/server/wireexts_oss.go                    |  7 +++++
 .../libraryelements_permissions_test.go       | 13 +++++++--
 pkg/services/org/orgimpl/store_test.go        |  8 ++++--
 pkg/services/quota/quotaimpl/quota.go         | 18 ++++++------
 pkg/services/quota/quotaimpl/quota_test.go    |  9 ++++--
 pkg/services/serviceaccounts/tests/common.go  |  9 ++++--
 pkg/services/team/teamimpl/store_test.go      | 14 +++++++---
 pkg/services/user/userimpl/store_test.go      | 16 ++++++++---
 pkg/tests/api/alerting/api_namespace_test.go  | 12 +++++---
 pkg/tests/api/alerting/testing.go             |  5 +++-
 pkg/tests/api/correlations/common_test.go     |  9 ++++--
 pkg/tests/api/plugins/api_plugins_test.go     |  9 ++++--
 pkg/tests/api/shorturl/short_url_test.go      |  5 +++-
 pkg/tests/api/stats/admin_test.go             |  5 +++-
 pkg/tests/apis/helper.go                      | 13 ++++++---
 pkg/tests/testinfra/testinfra.go              | 25 +++++++++--------
 pkg/tests/utils.go                            |  5 +++-
 25 files changed, 196 insertions(+), 73 deletions(-)
 create mode 100644 pkg/configprovider/configprovider.go

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d5081caa079..2f1e67251d0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -115,6 +115,7 @@
 /pkg/components/loki/ @grafana/grafana-backend-group
 /pkg/components/null/ @grafana/grafana-backend-group
 /pkg/components/simplejson/ @grafana/grafana-backend-group
+/pkg/configprovider/ @grafana/grafana-backend-services-squad
 /pkg/events/ @grafana/grafana-backend-group
 /pkg/extensions/ @grafana/grafana-backend-group
 /pkg/ifaces/ @grafana/grafana-backend-group
diff --git a/pkg/api/org_users_test.go b/pkg/api/org_users_test.go
index 585c746f647..4a2e301bbf0 100644
--- a/pkg/api/org_users_test.go
+++ b/pkg/api/org_users_test.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/authn/authntest"
 	"github.com/stretchr/testify/assert"
@@ -43,7 +44,9 @@ func setUpGetOrgUsersDB(t *testing.T, sqlStore db.DB, cfg *setting.Cfg) {
 	cfg.AutoAssignOrg = true
 	cfg.AutoAssignOrgId = int(testOrgID)
 
-	quotaService := quotaimpl.ProvideService(sqlStore, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), sqlStore, cfgProvider)
 	orgService, err := orgimpl.ProvideService(sqlStore, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := userimpl.ProvideService(
diff --git a/pkg/cmd/grafana-cli/commands/commands.go b/pkg/cmd/grafana-cli/commands/commands.go
index ae7f5f93f67..519ae771b3e 100644
--- a/pkg/cmd/grafana-cli/commands/commands.go
+++ b/pkg/cmd/grafana-cli/commands/commands.go
@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -19,7 +20,7 @@ import (
 func runRunnerCommand(command func(commandLine utils.CommandLine, runner server.Runner) error) func(context *cli.Context) error {
 	return func(context *cli.Context) error {
 		cmd := &utils.ContextCommandLine{Context: context}
-		runner, err := initializeRunner(cmd)
+		runner, err := initializeRunner(context.Context, cmd)
 		if err != nil {
 			return fmt.Errorf("%v: %w", "failed to initialize runner", err)
 		}
@@ -34,7 +35,7 @@ func runRunnerCommand(command func(commandLine utils.CommandLine, runner server.
 func runDbCommand(command func(commandLine utils.CommandLine, cfg *setting.Cfg, sqlStore db.DB) error) func(context *cli.Context) error {
 	return func(context *cli.Context) error {
 		cmd := &utils.ContextCommandLine{Context: context}
-		runner, err := initializeRunner(cmd)
+		runner, err := initializeRunner(context.Context, cmd)
 		if err != nil {
 			return fmt.Errorf("%v: %w", "failed to initialize runner", err)
 		}
@@ -50,7 +51,7 @@ func runDbCommand(command func(commandLine utils.CommandLine, cfg *setting.Cfg,
 	}
 }
 
-func initializeRunner(cmd *utils.ContextCommandLine) (server.Runner, error) {
+func initializeRunner(ctx context.Context, cmd *utils.ContextCommandLine) (server.Runner, error) {
 	configOptions := strings.Split(cmd.String("configOverrides"), " ")
 	cfg, err := setting.NewCfgFromArgs(setting.CommandLineArgs{
 		Config:   cmd.ConfigFile(),
@@ -62,7 +63,7 @@ func initializeRunner(cmd *utils.ContextCommandLine) (server.Runner, error) {
 		return server.Runner{}, err
 	}
 
-	runner, err := server.InitializeForCLI(cfg)
+	runner, err := server.InitializeForCLI(ctx, cfg)
 	if err != nil {
 		return server.Runner{}, fmt.Errorf("%v: %w", "failed to initialize runner", err)
 	}
diff --git a/pkg/cmd/grafana-server/commands/cli.go b/pkg/cmd/grafana-server/commands/cli.go
index 949c865060a..57083f93fd2 100644
--- a/pkg/cmd/grafana-server/commands/cli.go
+++ b/pkg/cmd/grafana-server/commands/cli.go
@@ -106,12 +106,15 @@ func RunServer(opts standalone.BuildInfo, cli *cli.Context) error {
 
 	metrics.SetBuildInformation(metrics.ProvideRegisterer(), opts.Version, opts.Commit, opts.BuildBranch, getBuildstamp(opts))
 
+	ctx := context.Background()
+
 	// Initialize the OpenFeature feature flag system
 	if err := featuremgmt.InitOpenFeatureWithCfg(cfg); err != nil {
 		return err
 	}
 
 	s, err := server.Initialize(
+		ctx,
 		cfg,
 		server.Options{
 			PidFile:     PidFile,
@@ -125,7 +128,6 @@ func RunServer(opts standalone.BuildInfo, cli *cli.Context) error {
 		return err
 	}
 
-	ctx := context.Background()
 	go listenToSystemSignals(ctx, s)
 	return s.Run()
 }
diff --git a/pkg/configprovider/configprovider.go b/pkg/configprovider/configprovider.go
new file mode 100644
index 00000000000..8f20e87eaa2
--- /dev/null
+++ b/pkg/configprovider/configprovider.go
@@ -0,0 +1,26 @@
+package configprovider
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type ConfigProvider interface {
+	Get(context.Context) *setting.Cfg
+}
+
+type OSSConfigProvider struct {
+	Cfg *setting.Cfg
+	log log.Logger
+}
+
+func (c *OSSConfigProvider) Get(_ context.Context) *setting.Cfg {
+	c.log.Debug("OSSConfigProvider Get")
+	return c.Cfg
+}
+
+func ProvideService(cfg *setting.Cfg) (ConfigProvider, error) {
+	return &OSSConfigProvider{Cfg: cfg, log: log.New("configprovider")}, nil
+}
diff --git a/pkg/server/service.go b/pkg/server/service.go
index f10bf072494..ba8c0d5a1f9 100644
--- a/pkg/server/service.go
+++ b/pkg/server/service.go
@@ -27,8 +27,8 @@ func NewService(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*cor
 	return s, nil
 }
 
-func (s *coreService) start(_ context.Context) error {
-	serv, err := Initialize(s.cfg, s.opts, s.apiOpts)
+func (s *coreService) start(ctx context.Context) error {
+	serv, err := Initialize(ctx, s.cfg, s.opts, s.apiOpts)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index 0204e37e25d..392a4fec45e 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -7,6 +7,8 @@
 package server
 
 import (
+	"context"
+
 	"github.com/google/wire"
 	"github.com/stretchr/testify/mock"
 	"go.opentelemetry.io/otel"
@@ -502,12 +504,12 @@ var wireTestSet = wire.NewSet(
 	wire.Bind(new(cleanup.AlertRuleService), new(*ngstore.DBstore)),
 )
 
-func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Server, error) {
+func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Server, error) {
 	wire.Build(wireExtsSet)
 	return &Server{}, nil
 }
 
-func InitializeForTest(t sqlutil.ITestDB, testingT interface {
+func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interface {
 	mock.TestingT
 	Cleanup(func())
 }, cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions,
@@ -516,14 +518,14 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	return &TestEnv{Server: &Server{}, TestingT: testingT, SQLStore: &sqlstore.SQLStore{}, Cfg: &setting.Cfg{}}, nil
 }
 
-func InitializeForCLI(cfg *setting.Cfg) (Runner, error) {
+func InitializeForCLI(ctx context.Context, cfg *setting.Cfg) (Runner, error) {
 	wire.Build(wireExtsCLISet)
 	return Runner{}, nil
 }
 
 // InitializeForCLITarget is a simplified set of dependencies for the CLI, used
 // by the server target subcommand to launch specific dskit modules.
-func InitializeForCLITarget(cfg *setting.Cfg) (ModuleRunner, error) {
+func InitializeForCLITarget(ctx context.Context, cfg *setting.Cfg) (ModuleRunner, error) {
 	wire.Build(wireExtsBaseCLISet)
 	return ModuleRunner{}, nil
 }
diff --git a/pkg/server/wire_gen.go b/pkg/server/wire_gen.go
index 928c80ce67d..9779e16a121 100644
--- a/pkg/server/wire_gen.go
+++ b/pkg/server/wire_gen.go
@@ -6,6 +6,7 @@
 package server
 
 import (
+	"context"
 	"github.com/google/wire"
 	httpclient2 "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana/apps/advisor/pkg/app/checkregistry"
@@ -13,6 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/avatar"
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/expr"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/httpclient"
@@ -281,7 +283,7 @@ import (
 
 // Injectors from wire.go:
 
-func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Server, error) {
+func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Server, error) {
 	routeRegisterImpl := routing.ProvideRegister()
 	tracingConfig, err := tracing.ProvideTracingConfig(cfg)
 	if err != nil {
@@ -388,7 +390,11 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	mysqlService := mysql.ProvideService()
 	mssqlService := mssql.ProvideService(cfg)
 	entityEventsService := store.ProvideEntityEventsService(cfg, sqlStore, featureToggles)
-	quotaService := quotaimpl.ProvideService(sqlStore, cfg)
+	configProvider, err := configprovider.ProvideService(cfg)
+	if err != nil {
+		return nil, err
+	}
+	quotaService := quotaimpl.ProvideService(ctx, sqlStore, configProvider)
 	orgService, err := orgimpl.ProvideService(sqlStore, cfg, quotaService)
 	if err != nil {
 		return nil, err
@@ -851,7 +857,7 @@ func Initialize(cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*Ser
 	return server, nil
 }
 
-func InitializeForTest(t sqlutil.ITestDB, testingT interface {
+func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interface {
 	Cleanup(func())
 	mock.TestingT
 }, cfg *setting.Cfg, opts Options, apiOpts api.ServerOptions) (*TestEnv, error) {
@@ -961,7 +967,11 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	mysqlService := mysql.ProvideService()
 	mssqlService := mssql.ProvideService(cfg)
 	entityEventsService := store.ProvideEntityEventsService(cfg, sqlStore, featureToggles)
-	quotaService := quotaimpl.ProvideService(sqlStore, cfg)
+	configProvider, err := configprovider.ProvideService(cfg)
+	if err != nil {
+		return nil, err
+	}
+	quotaService := quotaimpl.ProvideService(ctx, sqlStore, configProvider)
 	orgService, err := orgimpl.ProvideService(sqlStore, cfg, quotaService)
 	if err != nil {
 		return nil, err
@@ -1430,7 +1440,7 @@ func InitializeForTest(t sqlutil.ITestDB, testingT interface {
 	return testEnv, nil
 }
 
-func InitializeForCLI(cfg *setting.Cfg) (Runner, error) {
+func InitializeForCLI(ctx context.Context, cfg *setting.Cfg) (Runner, error) {
 	featureManager, err := featuremgmt.ProvideManagerService(cfg)
 	if err != nil {
 		return Runner{}, err
@@ -1471,7 +1481,11 @@ func InitializeForCLI(cfg *setting.Cfg) (Runner, error) {
 		return Runner{}, err
 	}
 	secretsMigrator := migrator.ProvideSecretsMigrator(serviceService, secretsService, sqlStore, ossImpl, featureToggles)
-	quotaService := quotaimpl.ProvideService(sqlStore, cfg)
+	configProvider, err := configprovider.ProvideService(cfg)
+	if err != nil {
+		return Runner{}, err
+	}
+	quotaService := quotaimpl.ProvideService(ctx, sqlStore, configProvider)
 	orgService, err := orgimpl.ProvideService(sqlStore, cfg, quotaService)
 	if err != nil {
 		return Runner{}, err
@@ -1523,7 +1537,7 @@ func InitializeForCLI(cfg *setting.Cfg) (Runner, error) {
 
 // InitializeForCLITarget is a simplified set of dependencies for the CLI, used
 // by the server target subcommand to launch specific dskit modules.
-func InitializeForCLITarget(cfg *setting.Cfg) (ModuleRunner, error) {
+func InitializeForCLITarget(ctx context.Context, cfg *setting.Cfg) (ModuleRunner, error) {
 	ossImpl := setting.ProvideProvider(cfg)
 	featureManager, err := featuremgmt.ProvideManagerService(cfg)
 	if err != nil {
diff --git a/pkg/server/wireexts_oss.go b/pkg/server/wireexts_oss.go
index 61a05716b47..57c18d86cc4 100644
--- a/pkg/server/wireexts_oss.go
+++ b/pkg/server/wireexts_oss.go
@@ -7,6 +7,7 @@ package server
 import (
 	"github.com/google/wire"
 
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
@@ -71,6 +72,10 @@ var provisioningExtras = wire.NewSet(
 	extras.ProvideProvisioningOSSExtras,
 )
 
+var configProviderExtras = wire.NewSet(
+	configprovider.ProvideService,
+)
+
 var wireExtsBasicSet = wire.NewSet(
 	authimpl.ProvideUserAuthTokenService,
 	wire.Bind(new(auth.UserTokenService), new(*authimpl.UserAuthTokenService)),
@@ -144,6 +149,7 @@ var wireExtsBasicSet = wire.NewSet(
 	gsmKMSProviders.ProvideOSSKMSProviders,
 	secret.ProvideSecureValueClient,
 	provisioningExtras,
+	configProviderExtras,
 )
 
 var wireExtsSet = wire.NewSet(
@@ -173,6 +179,7 @@ var wireExtsBaseCLISet = wire.NewSet(
 	hooks.ProvideService,
 	setting.ProvideProvider, wire.Bind(new(setting.Provider), new(*setting.OSSImpl)),
 	licensing.ProvideService, wire.Bind(new(licensing.Licensing), new(*licensing.OSSLicensingService)),
+	configProviderExtras,
 )
 
 // wireModuleServerSet is a wire set for the ModuleServer.
diff --git a/pkg/services/libraryelements/libraryelements_permissions_test.go b/pkg/services/libraryelements/libraryelements_permissions_test.go
index 4f040b13fce..48a533e92a3 100644
--- a/pkg/services/libraryelements/libraryelements_permissions_test.go
+++ b/pkg/services/libraryelements/libraryelements_permissions_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana-openapi-client-go/models"
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/libraryelements/model"
@@ -32,7 +33,9 @@ func TestIntegrationLibraryElementPermissions(t *testing.T) {
 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{})
 
 	grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, path)
-	quotaService := quotaimpl.ProvideService(env.SQLStore, env.Cfg)
+	cfgProvider, err := configprovider.ProvideService(env.Cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), env.SQLStore, cfgProvider)
 	orgService, err := orgimpl.ProvideService(env.SQLStore, env.Cfg, quotaService)
 	require.NoError(t, err)
 
@@ -138,7 +141,9 @@ func TestIntegrationLibraryElementGranularPermissions(t *testing.T) {
 	}
 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{})
 	grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, path)
-	quotaService := quotaimpl.ProvideService(env.SQLStore, env.Cfg)
+	cfgProvider, err := configprovider.ProvideService(env.Cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), env.SQLStore, cfgProvider)
 	orgService, err := orgimpl.ProvideService(env.SQLStore, env.Cfg, quotaService)
 	require.NoError(t, err)
 
@@ -357,7 +362,9 @@ func createUserInOrg(t *testing.T, db db.DB, cfg *setting.Cfg, cmd user.CreateUs
 	cfg.AutoAssignOrg = true
 	cfg.AutoAssignOrgId = 1
 
-	quotaService := quotaimpl.ProvideService(db, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), db, cfgProvider)
 	orgService, err := orgimpl.ProvideService(db, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := userimpl.ProvideService(
diff --git a/pkg/services/org/orgimpl/store_test.go b/pkg/services/org/orgimpl/store_test.go
index c2fe4c77bf8..3357282ab31 100644
--- a/pkg/services/org/orgimpl/store_test.go
+++ b/pkg/services/org/orgimpl/store_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
@@ -108,7 +109,8 @@ func TestIntegrationOrgDataAccess(t *testing.T) {
 				City:     "city",
 				ZipCode:  "zip",
 				State:    "state",
-				Country:  "country"},
+				Country:  "country",
+			},
 		})
 		require.NoError(t, err)
 		orga, err := orgStore.Get(context.Background(), ac2.ID)
@@ -1039,7 +1041,9 @@ func TestIntegration_SQLStore_RemoveOrgUser(t *testing.T) {
 func createOrgAndUserSvc(t *testing.T, store db.DB, cfg *setting.Cfg) (org.Service, user.Service) {
 	t.Helper()
 
-	quotaService := quotaimpl.ProvideService(store, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), store, cfgProvider)
 	orgService, err := ProvideService(store, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := userimpl.ProvideService(
diff --git a/pkg/services/quota/quotaimpl/quota.go b/pkg/services/quota/quotaimpl/quota.go
index 0d720653630..8b0da1f71bf 100644
--- a/pkg/services/quota/quotaimpl/quota.go
+++ b/pkg/services/quota/quotaimpl/quota.go
@@ -7,11 +7,11 @@ import (
 	"go.opentelemetry.io/otel"
 	"golang.org/x/sync/errgroup"
 
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/quota"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 // tracer is the global tracer for the quota service. Tracer pulls the globally
@@ -46,8 +46,8 @@ func (s *serviceDisabled) RegisterQuotaReporter(e *quota.NewUsageReporter) error
 
 type service struct {
 	store  store
-	Cfg    *setting.Cfg
-	Logger log.Logger
+	cfg    configprovider.ConfigProvider
+	logger log.Logger
 
 	mutex     sync.RWMutex
 	reporters map[quota.TargetSrv]quota.UsageReporterFunc
@@ -57,26 +57,26 @@ type service struct {
 	targetToSrv *quota.TargetToSrv
 }
 
-func ProvideService(db db.DB, cfg *setting.Cfg) quota.Service {
+func ProvideService(ctx context.Context, db db.DB, configProvider configprovider.ConfigProvider) quota.Service {
 	logger := log.New("quota_service")
 	s := service{
 		store:         &sqlStore{db: db, logger: logger},
-		Cfg:           cfg,
-		Logger:        logger,
+		cfg:           configProvider,
+		logger:        logger,
 		reporters:     make(map[quota.TargetSrv]quota.UsageReporterFunc),
 		defaultLimits: &quota.Map{},
 		targetToSrv:   quota.NewTargetToSrv(),
 	}
 
-	if s.IsDisabled() {
+	if s.IsDisabled(ctx) {
 		return &serviceDisabled{}
 	}
 
 	return &s
 }
 
-func (s *service) IsDisabled() bool {
-	return !s.Cfg.Quota.Enabled
+func (s *service) IsDisabled(ctx context.Context) bool {
+	return !s.cfg.Get(ctx).Quota.Enabled
 }
 
 // QuotaReached checks that quota is reached for a target. Runs CheckQuotaReached and take context and scope parameters from the request context
diff --git a/pkg/services/quota/quotaimpl/quota_test.go b/pkg/services/quota/quotaimpl/quota_test.go
index bf89d4aec5d..c7f4e6d0c60 100644
--- a/pkg/services/quota/quotaimpl/quota_test.go
+++ b/pkg/services/quota/quotaimpl/quota_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/httpclient"
 	"github.com/grafana/grafana/pkg/infra/kvstore"
@@ -105,7 +106,9 @@ func TestIntegrationQuotaCommandsAndQueries(t *testing.T) {
 	}
 
 	b := bus.ProvideBus(tracing.InitializeTracerForTest())
-	quotaService := ProvideService(sqlStore, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := ProvideService(context.Background(), sqlStore, cfgProvider)
 	orgService, err := orgimpl.ProvideService(sqlStore, cfg, quotaService)
 	require.NoError(t, err)
 	userService, err := userimpl.ProvideService(
@@ -247,7 +250,9 @@ func TestIntegrationQuotaCommandsAndQueries(t *testing.T) {
 			}()
 			cfg.UnifiedAlerting = setting.UnifiedAlertingSettings{Enabled: util.Pointer(false)}
 
-			quotaSrv := ProvideService(sqlStore, cfg)
+			cfgProvider, err := configprovider.ProvideService(cfg)
+			require.NoError(t, err)
+			quotaSrv := ProvideService(context.Background(), sqlStore, cfgProvider)
 			q, err := getQuotaBySrvTargetScope(t, quotaSrv, ngalertmodels.QuotaTargetSrv, ngalertmodels.QuotaTarget, quota.OrgScope, &quota.ScopeParameters{OrgID: o.ID})
 
 			require.NoError(t, err)
diff --git a/pkg/services/serviceaccounts/tests/common.go b/pkg/services/serviceaccounts/tests/common.go
index c88155232ee..f2a50e732c4 100644
--- a/pkg/services/serviceaccounts/tests/common.go
+++ b/pkg/services/serviceaccounts/tests/common.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/apikey"
@@ -43,7 +44,9 @@ func SetupUserServiceAccount(t *testing.T, db db.DB, cfg *setting.Cfg, testUser
 		role = testUser.Role
 	}
 
-	quotaService := quotaimpl.ProvideService(db, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), db, cfgProvider)
 	orgService, err := orgimpl.ProvideService(db, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := userimpl.ProvideService(
@@ -122,7 +125,9 @@ func SetupApiKeys(t *testing.T, store db.DB, cfg *setting.Cfg, testKeys []TestAp
 func SetupUsersServiceAccounts(t *testing.T, sqlStore db.DB, cfg *setting.Cfg, testUsers []TestUser) (users []user.User, orgID int64) {
 	role := string(org.RoleNone)
 
-	quotaService := quotaimpl.ProvideService(sqlStore, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), sqlStore, cfgProvider)
 	orgService, err := orgimpl.ProvideService(sqlStore, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := userimpl.ProvideService(
diff --git a/pkg/services/team/teamimpl/store_test.go b/pkg/services/team/teamimpl/store_test.go
index ba569d1ef40..2a455bc2a7e 100644
--- a/pkg/services/team/teamimpl/store_test.go
+++ b/pkg/services/team/teamimpl/store_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
@@ -47,7 +48,9 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 				},
 			},
 		}
-		quotaService := quotaimpl.ProvideService(sqlStore, cfg)
+		cfgProvider, err := configprovider.ProvideService(cfg)
+		require.NoError(t, err)
+		quotaService := quotaimpl.ProvideService(context.Background(), sqlStore, cfgProvider)
 		orgSvc, err := orgimpl.ProvideService(sqlStore, cfg, quotaService)
 		require.NoError(t, err)
 		userSvc, err := userimpl.ProvideService(
@@ -453,7 +456,9 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 
 			t.Run("Should be able to exclude service accounts from teamembers", func(t *testing.T) {
 				sqlStore = db.InitTestDB(t)
-				quotaService := quotaimpl.ProvideService(sqlStore, cfg)
+				cfgProvider, err := configprovider.ProvideService(cfg)
+				require.NoError(t, err)
+				quotaService := quotaimpl.ProvideService(context.Background(), sqlStore, cfgProvider)
 				orgSvc, err := orgimpl.ProvideService(sqlStore, cfg, quotaService)
 				require.NoError(t, err)
 				userSvc, err := userimpl.ProvideService(
@@ -609,7 +614,9 @@ func TestIntegrationSQLStore_GetTeamMembers_ACFilter(t *testing.T) {
 		team2, errCreateTeam := teamSvc.CreateTeam(context.Background(), &team2Cmd)
 		require.NoError(t, errCreateTeam)
 
-		quotaService := quotaimpl.ProvideService(store, cfg)
+		cfgProvider, err := configprovider.ProvideService(cfg)
+		require.NoError(t, err)
+		quotaService := quotaimpl.ProvideService(context.Background(), store, cfgProvider)
 		orgSvc, err := orgimpl.ProvideService(store, cfg, quotaService)
 		require.NoError(t, err)
 		userSvc, err := userimpl.ProvideService(
@@ -682,7 +689,6 @@ func TestIntegrationSQLStore_GetTeamMembers_ACFilter(t *testing.T) {
 			expectedNumUsers: 0,
 		},
 		{
-
 			desc: "should return some team members",
 			query: &team.GetTeamMembersQuery{
 				OrgID: testOrgID,
diff --git a/pkg/services/user/userimpl/store_test.go b/pkg/services/user/userimpl/store_test.go
index bfa19888346..be42acc2716 100644
--- a/pkg/services/user/userimpl/store_test.go
+++ b/pkg/services/user/userimpl/store_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
@@ -37,7 +38,9 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 	}
 
 	ss, cfg := db.InitTestDBWithCfg(t)
-	quotaService := quotaimpl.ProvideService(ss, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), ss, cfgProvider)
 	orgService, err := orgimpl.ProvideService(ss, cfg, quotaService)
 	require.NoError(t, err)
 	userStore := ProvideStore(ss, setting.NewCfg())
@@ -396,7 +399,8 @@ func TestIntegrationUserDataAccess(t *testing.T) {
 			_, err = userStore.GetSignedInUser(context.Background(),
 				&user.GetSignedInUserQuery{
 					OrgID:  users[1].OrgID,
-					UserID: userID}) // zero
+					UserID: userID,
+				}) // zero
 			require.Error(t, err)
 		}
 	})
@@ -1068,7 +1072,9 @@ func TestIntegrationMetricsUsage(t *testing.T) {
 	}
 	ss, cfg := db.InitTestDBWithCfg(t)
 	userStore := ProvideStore(ss, setting.NewCfg())
-	quotaService := quotaimpl.ProvideService(ss, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), ss, cfgProvider)
 	orgService, err := orgimpl.ProvideService(ss, cfg, quotaService)
 	require.NoError(t, err)
 
@@ -1127,7 +1133,9 @@ func assertEqualUser(t *testing.T, expected, got *user.User) {
 func createOrgAndUserSvc(t *testing.T, store db.DB, cfg *setting.Cfg) (org.Service, user.Service) {
 	t.Helper()
 
-	quotaService := quotaimpl.ProvideService(store, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), store, cfgProvider)
 	orgService, err := orgimpl.ProvideService(store, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := ProvideService(
diff --git a/pkg/tests/api/alerting/api_namespace_test.go b/pkg/tests/api/alerting/api_namespace_test.go
index 5ef2508a36b..6a9c0a6fa11 100644
--- a/pkg/tests/api/alerting/api_namespace_test.go
+++ b/pkg/tests/api/alerting/api_namespace_test.go
@@ -1,6 +1,7 @@
 package alerting
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -10,8 +11,7 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
 
-	"bytes"
-
+	"github.com/grafana/grafana/pkg/configprovider"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
@@ -180,7 +180,9 @@ func TestIntegration_NamespacingForRules(t *testing.T) {
 	})
 
 	t.Run("org separation", func(t *testing.T) {
-		orgService, err := orgimpl.ProvideService(store, cfg, quotaimpl.ProvideService(store, cfg))
+		cfgProvider, err := configprovider.ProvideService(cfg)
+		require.NoError(t, err)
+		orgService, err := orgimpl.ProvideService(store, cfg, quotaimpl.ProvideService(context.Background(), store, cfgProvider))
 		require.NoError(t, err)
 		newOrg, err := orgService.CreateWithMember(context.Background(), &org.CreateOrgCommand{Name: "Test Org 2"})
 		require.NoError(t, err)
@@ -386,7 +388,9 @@ func TestIntegration_NamespacingForPrometheusRules(t *testing.T) {
 	})
 
 	t.Run("should maintain org separation for Prometheus rules", func(t *testing.T) {
-		orgService, err := orgimpl.ProvideService(store, cfg, quotaimpl.ProvideService(store, cfg))
+		cfgProvider, err := configprovider.ProvideService(cfg)
+		require.NoError(t, err)
+		orgService, err := orgimpl.ProvideService(store, cfg, quotaimpl.ProvideService(context.Background(), store, cfgProvider))
 		require.NoError(t, err)
 		newOrg, err := orgService.CreateWithMember(context.Background(), &org.CreateOrgCommand{Name: "Prometheus Test Org 2"})
 		require.NoError(t, err)
diff --git a/pkg/tests/api/alerting/testing.go b/pkg/tests/api/alerting/testing.go
index 056f813cf1d..b3b7166b2e6 100644
--- a/pkg/tests/api/alerting/testing.go
+++ b/pkg/tests/api/alerting/testing.go
@@ -20,6 +20,7 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/grafana/pkg/api"
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/expr"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/tracing"
@@ -1460,7 +1461,9 @@ func createUser(t *testing.T, db db.DB, cfg *setting.Cfg, cmd user.CreateUserCom
 	cfg.AutoAssignOrg = true
 	cfg.AutoAssignOrgId = 1
 
-	quotaService := quotaimpl.ProvideService(db, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), db, cfgProvider)
 	orgService, err := orgimpl.ProvideService(db, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := userimpl.ProvideService(
diff --git a/pkg/tests/api/correlations/common_test.go b/pkg/tests/api/correlations/common_test.go
index 2bd291db9e8..f7039417a67 100644
--- a/pkg/tests/api/correlations/common_test.go
+++ b/pkg/tests/api/correlations/common_test.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/server"
 	"github.com/grafana/grafana/pkg/services/correlations"
@@ -144,7 +145,9 @@ func (c TestContext) createOrg(name string) int64 {
 	c.t.Helper()
 	store := c.env.SQLStore
 	c.env.Cfg.AutoAssignOrg = false
-	quotaService := quotaimpl.ProvideService(store, c.env.Cfg)
+	cfgProvider, err := configprovider.ProvideService(c.env.Cfg)
+	require.NoError(c.t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), store, cfgProvider)
 	orgService, err := orgimpl.ProvideService(store, c.env.Cfg, quotaService)
 	require.NoError(c.t, err)
 	orgId, err := orgService.GetOrCreate(context.Background(), name)
@@ -158,7 +161,9 @@ func (c TestContext) createUser(cmd user.CreateUserCommand) User {
 	c.env.Cfg.AutoAssignOrg = true
 	c.env.Cfg.AutoAssignOrgId = 1
 
-	quotaService := quotaimpl.ProvideService(store, c.env.Cfg)
+	cfgProvider, err := configprovider.ProvideService(c.env.Cfg)
+	require.NoError(c.t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), store, cfgProvider)
 	orgService, err := orgimpl.ProvideService(store, c.env.Cfg, quotaService)
 	require.NoError(c.t, err)
 	usrSvc, err := userimpl.ProvideService(
diff --git a/pkg/tests/api/plugins/api_plugins_test.go b/pkg/tests/api/plugins/api_plugins_test.go
index 56a10ed6a7f..ff3878476a0 100644
--- a/pkg/tests/api/plugins/api_plugins_test.go
+++ b/pkg/tests/api/plugins/api_plugins_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
@@ -199,7 +200,9 @@ func createUser(t *testing.T, db db.DB, cfg *setting.Cfg, cmd user.CreateUserCom
 	cfg.AutoAssignOrg = true
 	cfg.AutoAssignOrgId = 1
 
-	quotaService := quotaimpl.ProvideService(db, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), db, cfgProvider)
 	orgService, err := orgimpl.ProvideService(db, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := userimpl.ProvideService(
@@ -224,7 +227,7 @@ func makePostRequest(t *testing.T, URL string) (int, map[string]interface{}) {
 	b, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
 
-	var body = make(map[string]interface{})
+	body := make(map[string]interface{})
 	err = json.Unmarshal(b, &body)
 	require.NoError(t, err)
 
@@ -251,7 +254,7 @@ func expectedResp(t *testing.T, filename string) dtos.PluginList {
 }
 
 func updateRespSnapshot(t *testing.T, filename string, body string) {
-	err := os.WriteFile(filepath.Join("data", filename), []byte(body), 0600)
+	err := os.WriteFile(filepath.Join("data", filename), []byte(body), 0o600)
 	if err != nil {
 		t.Errorf("error writing snapshot %s: %v", filename, err)
 	}
diff --git a/pkg/tests/api/shorturl/short_url_test.go b/pkg/tests/api/shorturl/short_url_test.go
index a938b861281..cc014662457 100644
--- a/pkg/tests/api/shorturl/short_url_test.go
+++ b/pkg/tests/api/shorturl/short_url_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/org"
@@ -110,7 +111,9 @@ func createUser(t *testing.T, db db.DB, cfg *setting.Cfg, cmd user.CreateUserCom
 	cfg.AutoAssignOrg = true
 	cfg.AutoAssignOrgId = 1
 
-	quotaService := quotaimpl.ProvideService(db, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), db, cfgProvider)
 	orgService, err := orgimpl.ProvideService(db, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := userimpl.ProvideService(
diff --git a/pkg/tests/api/stats/admin_test.go b/pkg/tests/api/stats/admin_test.go
index b1b18a7f2b7..7e6356e555d 100644
--- a/pkg/tests/api/stats/admin_test.go
+++ b/pkg/tests/api/stats/admin_test.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/org"
@@ -90,7 +91,9 @@ func createUser(t *testing.T, db db.DB, cfg *setting.Cfg, cmd user.CreateUserCom
 	cfg.AutoAssignOrg = true
 	cfg.AutoAssignOrgId = 1
 
-	quotaService := quotaimpl.ProvideService(db, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), db, cfgProvider)
 	orgService, err := orgimpl.ProvideService(db, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := userimpl.ProvideService(
diff --git a/pkg/tests/apis/helper.go b/pkg/tests/apis/helper.go
index 994e9f96a13..1865c42b49f 100644
--- a/pkg/tests/apis/helper.go
+++ b/pkg/tests/apis/helper.go
@@ -29,6 +29,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/server"
@@ -95,7 +96,9 @@ func NewK8sTestHelper(t *testing.T, opts testinfra.GrafanaOpts) *K8sTestHelper {
 		Namespacer: request.GetNamespaceMapper(nil),
 	}
 
-	quotaService := quotaimpl.ProvideService(c.env.SQLStore, c.env.Cfg)
+	cfgProvider, err := configprovider.ProvideService(c.env.Cfg)
+	require.NoError(c.t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), c.env.SQLStore, cfgProvider)
 	orgSvc, err := orgimpl.ProvideService(c.env.SQLStore, c.env.Cfg, quotaService)
 	require.NoError(c.t, err)
 	c.orgSvc = orgSvc
@@ -375,8 +378,10 @@ type K8sResponse[T any] struct {
 	Status   *metav1.Status
 }
 
-type AnyResourceResponse = K8sResponse[AnyResource]
-type AnyResourceListResponse = K8sResponse[AnyResourceList]
+type (
+	AnyResourceResponse     = K8sResponse[AnyResource]
+	AnyResourceListResponse = K8sResponse[AnyResourceList]
+)
 
 func (c *K8sTestHelper) PostResource(user User, resource string, payload AnyResource) AnyResourceResponse {
 	c.t.Helper()
@@ -799,7 +804,7 @@ func VerifyOpenAPISnapshots(t *testing.T, dir string, gv schema.GroupVersion, h
 		}
 
 		if write {
-			e2 := os.WriteFile(fpath, []byte(pretty), 0644)
+			e2 := os.WriteFile(fpath, []byte(pretty), 0o644)
 			if e2 != nil {
 				t.Errorf("error writing file: %s", e2.Error())
 			}
diff --git a/pkg/tests/testinfra/testinfra.go b/pkg/tests/testinfra/testinfra.go
index 1cac67b10ff..bb1073c9d8f 100644
--- a/pkg/tests/testinfra/testinfra.go
+++ b/pkg/tests/testinfra/testinfra.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
 	"github.com/prometheus/client_golang/prometheus"
@@ -102,7 +103,7 @@ func StartGrafanaEnv(t *testing.T, grafDir, cfgPath string) (string, *server.Tes
 
 	t.Log("Using test database", "type", testDB.DriverName, "host", testDB.Host, "port", testDB.Port, "user", testDB.User, "name", testDB.Database)
 
-	env, err := server.InitializeForTest(t, t, cfg, serverOpts, apiServerOpts)
+	env, err := server.InitializeForTest(ctx, t, t, cfg, serverOpts, apiServerOpts)
 	require.NoError(t, err)
 
 	require.NotNil(t, env.Cfg)
@@ -207,16 +208,16 @@ func CreateGrafDir(t *testing.T, opts GrafanaOpts) (string, string) {
 	require.True(t, found, "Couldn't detect project root directory")
 
 	cfgDir := filepath.Join(tmpDir, "conf")
-	err := os.MkdirAll(cfgDir, 0750)
+	err := os.MkdirAll(cfgDir, 0o750)
 	require.NoError(t, err)
 	dataDir := filepath.Join(tmpDir, "data")
 	// nolint:gosec
-	err = os.MkdirAll(dataDir, 0750)
+	err = os.MkdirAll(dataDir, 0o750)
 	require.NoError(t, err)
 	logsDir := filepath.Join(tmpDir, "logs")
 	pluginsDir := filepath.Join(tmpDir, "plugins")
 	publicDir := filepath.Join(tmpDir, "public")
-	err = os.MkdirAll(publicDir, 0750)
+	err = os.MkdirAll(publicDir, 0o750)
 	require.NoError(t, err)
 
 	viewsDir := filepath.Join(publicDir, "views")
@@ -225,7 +226,7 @@ func CreateGrafDir(t *testing.T, opts GrafanaOpts) (string, string) {
 
 	// add a stub manifest to the build directory
 	buildDir := filepath.Join(publicDir, "build")
-	err = os.MkdirAll(buildDir, 0750)
+	err = os.MkdirAll(buildDir, 0o750)
 	require.NoError(t, err)
 	err = os.WriteFile(filepath.Join(buildDir, "assets-manifest.json"), []byte(`{
 		"entrypoints": {
@@ -255,7 +256,7 @@ func CreateGrafDir(t *testing.T, opts GrafanaOpts) (string, string) {
 		  "integrity": "sha256-k1g7TksMHFQhhQGE"
 		}
 	  }
-	  `), 0750)
+	  `), 0o750)
 	require.NoError(t, err)
 
 	emailsDir := filepath.Join(publicDir, "emails")
@@ -263,16 +264,16 @@ func CreateGrafDir(t *testing.T, opts GrafanaOpts) (string, string) {
 	require.NoError(t, err)
 	provDir := filepath.Join(cfgDir, "provisioning")
 	provDSDir := filepath.Join(provDir, "datasources")
-	err = os.MkdirAll(provDSDir, 0750)
+	err = os.MkdirAll(provDSDir, 0o750)
 	require.NoError(t, err)
 	provNotifiersDir := filepath.Join(provDir, "notifiers")
-	err = os.MkdirAll(provNotifiersDir, 0750)
+	err = os.MkdirAll(provNotifiersDir, 0o750)
 	require.NoError(t, err)
 	provPluginsDir := filepath.Join(provDir, "plugins")
-	err = os.MkdirAll(provPluginsDir, 0750)
+	err = os.MkdirAll(provPluginsDir, 0o750)
 	require.NoError(t, err)
 	provDashboardsDir := filepath.Join(provDir, "dashboards")
-	err = os.MkdirAll(provDashboardsDir, 0750)
+	err = os.MkdirAll(provDashboardsDir, 0o750)
 	require.NoError(t, err)
 	corePluginsDir := filepath.Join(publicDir, "app/plugins")
 	err = fs.CopyRecursive(filepath.Join(rootDir, "public", "app/plugins"), corePluginsDir)
@@ -621,7 +622,9 @@ func CreateUser(t *testing.T, store db.DB, cfg *setting.Cfg, cmd user.CreateUser
 	cfg.AutoAssignOrgId = 1
 	cmd.OrgID = 1
 
-	quotaService := quotaimpl.ProvideService(store, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), store, cfgProvider)
 	orgService, err := orgimpl.ProvideService(store, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := userimpl.ProvideService(
diff --git a/pkg/tests/utils.go b/pkg/tests/utils.go
index 4ea428df9f7..b8eba7b5f39 100644
--- a/pkg/tests/utils.go
+++ b/pkg/tests/utils.go
@@ -12,6 +12,7 @@ import (
 	goapi "github.com/grafana/grafana-openapi-client-go/client"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/configprovider"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions"
@@ -40,7 +41,9 @@ func CreateUser(t *testing.T, db db.DB, cfg *setting.Cfg, cmd user.CreateUserCom
 	cfg.AutoAssignOrg = true
 	cfg.AutoAssignOrgId = 1
 
-	quotaService := quotaimpl.ProvideService(db, cfg)
+	cfgProvider, err := configprovider.ProvideService(cfg)
+	require.NoError(t, err)
+	quotaService := quotaimpl.ProvideService(context.Background(), db, cfgProvider)
 	orgService, err := orgimpl.ProvideService(db, cfg, quotaService)
 	require.NoError(t, err)
 	usrSvc, err := userimpl.ProvideService(

From 0d8518dc2f8c255c559bc07748a29f0faeb7f1bd Mon Sep 17 00:00:00 2001
From: Matheus Macabu <macabu@users.noreply.github.com>
Date: Tue, 12 Aug 2025 08:57:32 +0200
Subject: [PATCH 100/243] Build: Add -buildvcs=false flag to go build (#109472)

---
 pkg/build/cmd.go                       | 4 ++++
 pkg/build/daggerbuild/backend/build.go | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/pkg/build/cmd.go b/pkg/build/cmd.go
index 226bd15245f..1bad7828946 100644
--- a/pkg/build/cmd.go
+++ b/pkg/build/cmd.go
@@ -203,6 +203,10 @@ func doBuild(binaryName, pkg string, opts BuildOpts) error {
 		args = append(args, "-race")
 	}
 
+	// We should not publish Grafana as a Go module, disabling vcs changes the version to (devel)
+	// and works better with SBOM and Vulnerability Scanners.
+	args = append(args, "-buildvcs=false")
+
 	args = append(args, "-o", binary)
 	args = append(args, pkg)
 
diff --git a/pkg/build/daggerbuild/backend/build.go b/pkg/build/daggerbuild/backend/build.go
index 4b0f69d9fa5..a80862770ab 100644
--- a/pkg/build/daggerbuild/backend/build.go
+++ b/pkg/build/daggerbuild/backend/build.go
@@ -34,6 +34,9 @@ func GoLDFlags(flags []LDFlag) string {
 // GoBuildCommand returns the arguments for go build to be used in 'WithExec'.
 func GoBuildCommand(output string, ldflags []LDFlag, tags []string, main string) []string {
 	args := []string{"go", "build",
+		// We should not publish Grafana as a Go module, disabling vcs changes the version to (devel)
+		// and works better with SBOM and Vulnerability Scanners.
+		"-buildvcs=false",
 		fmt.Sprintf("-ldflags=\"%s\"", GoLDFlags(ldflags)),
 		fmt.Sprintf("-o=%s", output),
 		"-trimpath",

From 8a690e977e9ce9479dd92bd891d231f3a6981ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Tue, 12 Aug 2025 09:17:25 +0200
Subject: [PATCH 101/243] Provisioning: Return unmanaged count in stats
 (#109462)

* Unmanaged counts

* Add integration test

* Generate open api spec
---
 .../pkg/apis/provisioning/v0alpha1/types.go   |   5 +
 .../v0alpha1/zz_generated.deepcopy.go         |   5 +
 .../v0alpha1/zz_generated.openapi.go          |  19 +++
 .../apis/provisioning/resources/object.go     |  29 ++++
 .../provisioning.grafana.app-v0alpha1.json    |   8 ++
 pkg/tests/apis/provisioning/stats_test.go     | 125 ++++++++++++++++++
 6 files changed, 191 insertions(+)
 create mode 100644 pkg/tests/apis/provisioning/stats_test.go

diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/types.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/types.go
index edcf2f790fa..e633deda52a 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/types.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/types.go
@@ -439,6 +439,11 @@ type ResourceStats struct {
 	// +listType=atomic
 	Instance []ResourceCount `json:"instance,omitempty"`
 
+	// Stats across all unified storage
+	// When legacy storage is still used, this will offer a shim
+	// +listType=atomic
+	Unmanaged []ResourceCount `json:"unmanaged,omitempty"`
+
 	// Stats for each manager
 	// +listType=atomic
 	Managed []ManagerStats `json:"managed,omitempty"`
diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go
index 174505a880f..863fa3e0817 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go
@@ -974,6 +974,11 @@ func (in *ResourceStats) DeepCopyInto(out *ResourceStats) {
 		*out = make([]ResourceCount, len(*in))
 		copy(*out, *in)
 	}
+	if in.Unmanaged != nil {
+		in, out := &in.Unmanaged, &out.Unmanaged
+		*out = make([]ResourceCount, len(*in))
+		copy(*out, *in)
+	}
 	if in.Managed != nil {
 		in, out := &in.Managed, &out.Managed
 		*out = make([]ManagerStats, len(*in))
diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
index 6c3445f6a66..50832fe9d6d 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
@@ -2126,6 +2126,25 @@ func schema_pkg_apis_provisioning_v0alpha1_ResourceStats(ref common.ReferenceCal
 							},
 						},
 					},
+					"unmanaged": {
+						VendorExtensible: spec.VendorExtensible{
+							Extensions: spec.Extensions{
+								"x-kubernetes-list-type": "atomic",
+							},
+						},
+						SchemaProps: spec.SchemaProps{
+							Description: "Stats across all unified storage When legacy storage is still used, this will offer a shim",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceCount"),
+									},
+								},
+							},
+						},
+					},
 					"managed": {
 						VendorExtensible: spec.VendorExtensible{
 							Extensions: spec.Extensions{
diff --git a/pkg/registry/apis/provisioning/resources/object.go b/pkg/registry/apis/provisioning/resources/object.go
index a30694417bb..f97d6199c76 100644
--- a/pkg/registry/apis/provisioning/resources/object.go
+++ b/pkg/registry/apis/provisioning/resources/object.go
@@ -146,6 +146,12 @@ func (o *ResourceListerFromSearch) Stats(ctx context.Context, namespace, reposit
 				Resource: v.Resource,
 				Count:    v.Count,
 			})
+			// Everything is unmanaged in legacy storage
+			stats.Unmanaged = append(stats.Unmanaged, provisioning.ResourceCount{
+				Group:    v.Group,
+				Resource: v.Resource,
+				Count:    v.Count,
+			})
 		}
 		return stats, nil
 	}
@@ -157,12 +163,35 @@ func (o *ResourceListerFromSearch) Stats(ctx context.Context, namespace, reposit
 	if err != nil {
 		return nil, err
 	}
+
+	// Create a map to track managed counts by group/resource
+	managedCounts := make(map[string]int64)
+	for _, manager := range stats.Managed {
+		for _, managedStat := range manager.Stats {
+			key := managedStat.Group + ":" + managedStat.Resource
+			managedCounts[key] += managedStat.Count
+		}
+	}
+
 	for _, v := range info.Stats {
 		stats.Instance = append(stats.Instance, provisioning.ResourceCount{
 			Group:    v.Group,
 			Resource: v.Resource,
 			Count:    v.Count,
 		})
+
+		// Calculate unmanaged count: total - managed
+		key := v.Group + ":" + v.Resource
+		managedCount := managedCounts[key]
+		unmanagedCount := v.Count - managedCount
+
+		if unmanagedCount > 0 {
+			stats.Unmanaged = append(stats.Unmanaged, provisioning.ResourceCount{
+				Group:    v.Group,
+				Resource: v.Resource,
+				Count:    unmanagedCount,
+			})
+		}
 	}
 	return stats, nil
 }
diff --git a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
index d57917f2e21..b9df6bea5ea 100644
--- a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
@@ -5289,6 +5289,14 @@
           },
           "metadata": {
             "default": {}
+          },
+          "unmanaged": {
+            "description": "Stats across all unified storage When legacy storage is still used, this will offer a shim",
+            "type": "array",
+            "items": {
+              "default": {}
+            },
+            "x-kubernetes-list-type": "atomic"
           }
         }
       },
diff --git a/pkg/tests/apis/provisioning/stats_test.go b/pkg/tests/apis/provisioning/stats_test.go
new file mode 100644
index 00000000000..22b4c8372fb
--- /dev/null
+++ b/pkg/tests/apis/provisioning/stats_test.go
@@ -0,0 +1,125 @@
+package provisioning
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
+)
+
+func TestIntegrationProvisioning_Stats(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	const repo = "stats-test-repo1"
+
+	testRepo := TestRepo{
+		Name: repo,
+		Copies: map[string]string{
+			"testdata/all-panels.json":   "dashboard1.json",
+			"testdata/text-options.json": "folder/dashboard2.json",
+		},
+		ExpectedDashboards: 2,
+		ExpectedFolders:    1,
+	}
+	helper.CreateRepo(t, testRepo)
+
+	// Create some unmanaged dashboards directly in Grafana
+	unmanagedDash1 := helper.LoadYAMLOrJSONFile("exportunifiedtorepository/dashboard-test-v1.yaml")
+	dashboard1Obj, err := helper.DashboardsV1.Resource.Create(ctx, unmanagedDash1, metav1.CreateOptions{})
+	require.NoError(t, err, "should be able to create unmanaged dashboard")
+	dashboard1Name := dashboard1Obj.GetName()
+
+	// Verify that the unmanaged dashboard is indeed unmanaged
+	dashboard1, err := helper.DashboardsV1.Resource.Get(ctx, dashboard1Name, metav1.GetOptions{})
+	require.NoError(t, err)
+	manager1, found1 := dashboard1.GetAnnotations()[utils.AnnoKeyManagerIdentity]
+	require.True(t, !found1 || manager1 == "", "dashboard1 should be unmanaged")
+
+	// Get global stats
+	result := helper.AdminREST.Get().
+		Namespace("default").
+		Resource("stats").
+		Do(ctx)
+	require.NoError(t, result.Error(), "should be able to get global stats")
+
+	statsObj, err := result.Get()
+	require.NoError(t, err, "should be able to get global stats object")
+	unstructuredStats := statsObj.(*unstructured.Unstructured)
+
+	// Parse instance stats
+	instanceStats, _, err := unstructured.NestedSlice(unstructuredStats.Object, "instance")
+	require.NoError(t, err, "should be able to get instance stats")
+
+	var dashboardInstanceCount int64
+	for _, instanceStat := range instanceStats {
+		stat := instanceStat.(map[string]interface{})
+		group, _, _ := unstructured.NestedString(stat, "group")
+		resource, _, _ := unstructured.NestedString(stat, "resource")
+		if group == "dashboard.grafana.app" && resource == "dashboards" {
+			count, _, _ := unstructured.NestedInt64(stat, "count")
+			dashboardInstanceCount = count
+			break
+		}
+	}
+	require.GreaterOrEqual(t, dashboardInstanceCount, int64(3), "should have at least 3 dashboards total (2 managed + 1 unmanaged)")
+
+	// Parse managed stats
+	managedStats, _, err := unstructured.NestedSlice(unstructuredStats.Object, "managed")
+	require.NoError(t, err, "should be able to get managed stats")
+
+	var totalManagedDashboards int64
+	foundRepo := false
+	for _, manager := range managedStats {
+		managerObj := manager.(map[string]interface{})
+		identity, _, _ := unstructured.NestedString(managerObj, "id")
+
+		if identity == repo {
+			foundRepo = true
+			stats, _, _ := unstructured.NestedSlice(managerObj, "stats")
+			for _, statObj := range stats {
+				stat := statObj.(map[string]interface{})
+				group, _, _ := unstructured.NestedString(stat, "group")
+				resource, _, _ := unstructured.NestedString(stat, "resource")
+				if group == "dashboard.grafana.app" && resource == "dashboards" {
+					count, _, _ := unstructured.NestedInt64(stat, "count")
+					totalManagedDashboards += count
+					require.Equal(t, int64(2), count, "repo should manage 2 dashboards")
+				} else if group == "folder.grafana.app" && resource == "folders" {
+					count, _, _ := unstructured.NestedInt64(stat, "count")
+					require.Equal(t, int64(1), count, "repo should manage 1 folder")
+				}
+			}
+		}
+	}
+	require.True(t, foundRepo, "should find stats for repo1")
+
+	// Parse unmanaged stats
+	unmanagedStats, _, err := unstructured.NestedSlice(unstructuredStats.Object, "unmanaged")
+	require.NoError(t, err, "should be able to get unmanaged stats")
+
+	var unmanagedDashboardCount int64
+	for _, unmanagedStat := range unmanagedStats {
+		stat := unmanagedStat.(map[string]interface{})
+		group, _, _ := unstructured.NestedString(stat, "group")
+		resource, _, _ := unstructured.NestedString(stat, "resource")
+		if group == "dashboard.grafana.app" && resource == "dashboards" {
+			count, _, _ := unstructured.NestedInt64(stat, "count")
+			unmanagedDashboardCount = count
+			break
+		}
+	}
+	require.GreaterOrEqual(t, unmanagedDashboardCount, int64(1), "should have at least 1 unmanaged dashboard")
+
+	// Verify the math: instance = managed + unmanaged
+	require.Equal(t, dashboardInstanceCount, totalManagedDashboards+unmanagedDashboardCount,
+		"instance count should equal managed + unmanaged counts")
+}

From 20d253fc394c68ed97635dafb4f96899fff601e2 Mon Sep 17 00:00:00 2001
From: "grafana-pr-automation[bot]"
 <140550294+grafana-pr-automation[bot]@users.noreply.github.com>
Date: Tue, 12 Aug 2025 08:42:56 +0000
Subject: [PATCH 102/243] I18n: Download translations from Crowdin (#109502)

New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../src/locales/cs-CZ/grafana-prometheus.json |  270 +-
 .../src/locales/de-DE/grafana-prometheus.json |  270 +-
 .../src/locales/es-ES/grafana-prometheus.json |  642 +--
 .../src/locales/fr-FR/grafana-prometheus.json |  270 +-
 .../src/locales/hu-HU/grafana-prometheus.json |  270 +-
 .../src/locales/id-ID/grafana-prometheus.json |  270 +-
 .../src/locales/it-IT/grafana-prometheus.json |  642 +--
 .../src/locales/ja-JP/grafana-prometheus.json |  270 +-
 .../src/locales/ko-KR/grafana-prometheus.json |  642 +--
 .../src/locales/nl-NL/grafana-prometheus.json |  270 +-
 .../src/locales/pl-PL/grafana-prometheus.json |  642 +--
 .../src/locales/pt-BR/grafana-prometheus.json |  642 +--
 .../src/locales/pt-PT/grafana-prometheus.json |  642 +--
 .../src/locales/ru-RU/grafana-prometheus.json |  642 +--
 .../src/locales/sv-SE/grafana-prometheus.json |  642 +--
 .../src/locales/tr-TR/grafana-prometheus.json |  642 +--
 .../locales/zh-Hans/grafana-prometheus.json   |  270 +-
 .../locales/zh-Hant/grafana-prometheus.json   |  270 +-
 .../src/locales/cs-CZ/grafana-sql.json        |    4 +-
 .../src/locales/de-DE/grafana-sql.json        |    4 +-
 .../src/locales/es-ES/grafana-sql.json        |  112 +-
 .../src/locales/fr-FR/grafana-sql.json        |    4 +-
 .../src/locales/hu-HU/grafana-sql.json        |    4 +-
 .../src/locales/id-ID/grafana-sql.json        |    4 +-
 .../src/locales/it-IT/grafana-sql.json        |  112 +-
 .../src/locales/ja-JP/grafana-sql.json        |    4 +-
 .../src/locales/ko-KR/grafana-sql.json        |  112 +-
 .../src/locales/nl-NL/grafana-sql.json        |    4 +-
 .../src/locales/pl-PL/grafana-sql.json        |  112 +-
 .../src/locales/pt-BR/grafana-sql.json        |  112 +-
 .../src/locales/pt-PT/grafana-sql.json        |  112 +-
 .../src/locales/ru-RU/grafana-sql.json        |  112 +-
 .../src/locales/sv-SE/grafana-sql.json        |  112 +-
 .../src/locales/tr-TR/grafana-sql.json        |  112 +-
 .../src/locales/zh-Hans/grafana-sql.json      |    4 +-
 .../src/locales/zh-Hant/grafana-sql.json      |    4 +-
 .../grafana-azure-monitor-datasource.json     |   16 +-
 .../grafana-azure-monitor-datasource.json     |   16 +-
 .../grafana-azure-monitor-datasource.json     |   18 +-
 .../grafana-azure-monitor-datasource.json     |   16 +-
 .../grafana-azure-monitor-datasource.json     |   16 +-
 .../grafana-azure-monitor-datasource.json     |   16 +-
 .../grafana-azure-monitor-datasource.json     |   18 +-
 .../grafana-azure-monitor-datasource.json     |   16 +-
 .../grafana-azure-monitor-datasource.json     |   18 +-
 .../grafana-azure-monitor-datasource.json     |   16 +-
 .../grafana-azure-monitor-datasource.json     |   18 +-
 .../grafana-azure-monitor-datasource.json     |   18 +-
 .../grafana-azure-monitor-datasource.json     |   18 +-
 .../grafana-azure-monitor-datasource.json     |   18 +-
 .../grafana-azure-monitor-datasource.json     |   18 +-
 .../grafana-azure-monitor-datasource.json     |   18 +-
 .../grafana-azure-monitor-datasource.json     |   16 +-
 .../grafana-azure-monitor-datasource.json     |   16 +-
 public/locales/cs-CZ/grafana.json             | 2052 +++----
 public/locales/de-DE/grafana.json             | 2038 +++----
 public/locales/es-ES/grafana.json             | 3906 ++++++-------
 public/locales/fr-FR/grafana.json             | 2036 +++----
 public/locales/hu-HU/grafana.json             | 2036 +++----
 public/locales/id-ID/grafana.json             | 2028 +++----
 public/locales/it-IT/grafana.json             | 5076 +++++++++--------
 public/locales/ja-JP/grafana.json             | 2028 +++----
 public/locales/ko-KR/grafana.json             | 3900 ++++++-------
 public/locales/nl-NL/grafana.json             | 2036 +++----
 public/locales/pl-PL/grafana.json             | 3924 ++++++-------
 public/locales/pt-BR/grafana.json             | 3906 ++++++-------
 public/locales/pt-PT/grafana.json             | 3908 ++++++-------
 public/locales/ru-RU/grafana.json             | 3924 ++++++-------
 public/locales/sv-SE/grafana.json             | 3908 ++++++-------
 public/locales/tr-TR/grafana.json             | 3908 ++++++-------
 public/locales/zh-Hans/grafana.json           | 2030 +++----
 public/locales/zh-Hant/grafana.json           | 2028 +++----
 72 files changed, 32205 insertions(+), 32025 deletions(-)

diff --git a/packages/grafana-prometheus/src/locales/cs-CZ/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/cs-CZ/grafana-prometheus.json
index 44a8acbc7a2..5bd2fde979c 100644
--- a/packages/grafana-prometheus/src/locales/cs-CZ/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/cs-CZ/grafana-prometheus.json
@@ -158,8 +158,8 @@
         "aria-label-prometheus-type": "Typ Prometheus",
         "aria-label-select-http-method": "Vyberte metodu HTTP",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Nástroj pro tvorbu",
+          "label-code": "Kód"
         },
         "label-cache-level": "Úroveň vyrovnávací paměti",
         "label-custom-query-parameters": "Vlastní parametry dotazu",
@@ -200,114 +200,114 @@
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(Deaktivováno)",
+      "enabled-label": "Prohlížeč metrik"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Zahrnuje pouze jedinečné štítky",
+        "description-custom": "Zadejte šablonu pro pojmenování",
+        "description-verbose": "Všechny názvy a hodnoty štítků",
+        "label-auto": "Auto.",
+        "label-custom": "Vlastní",
+        "label-verbose": "Podrobný"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Vypočítat průměr z rozměrů",
+        "documentation-bottomk": "Nejmenší k prvky podle hodnoty vzorku",
+        "documentation-count": "Spočítat prvky ve vektoru",
+        "documentation-count-values": "Spočítat počet prvků se stejnou hodnotou",
+        "documentation-group": "Všechny hodnoty ve výsledném vektoru jsou 1",
+        "documentation-max": "Vybrat maximum nad rozměry",
+        "documentation-min": "Vybrat minimum podle rozměrů",
+        "documentation-quantile": "Vypočítat φ-kvantil (0 ≤ φ ≤ 1) podle rozměrů",
+        "documentation-stddev": "Vypočítat populační směrodatnou odchylku podle rozměrů",
+        "documentation-stdvar": "Vypočítat standardní rozptyl populace podle rozměrů",
+        "documentation-sum": "Vypočítat součet podle rozměrů",
+        "documentation-topk": "Největší k prvky podle hodnoty vzorku"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Vrátí vstupní vektor se všemi hodnotami vzorku převedenými na jejich absolutní hodnotu.",
+        "documentation-absent": "Vrátí prázdný vektor, pokud vektor, který mu byl předán, obsahuje nějaké prvky, a vektor s jedním prvkem s hodnotou 1, pokud vektor, který mu byl předán, neobsahuje žádné prvky. To je užitečné pro upozorňování, když pro danou kombinaci názvu metriky a štítku neexistuje žádná časová řada.",
+        "documentation-absent-over-time": "Vrátí prázdný vektor, pokud vektor rozsahu, který mu byl předán, obsahuje nějaké prvky, a vektor s jedním prvkem s hodnotou 1, pokud vektor rozsahu, který mu byl předán, neobsahuje žádné prvky.",
+        "documentation-avg-over-time": "Průměrná hodnota všech bodů v zadaném intervalu.",
+        "documentation-ceil": "Zaokrouhlí vzorové hodnoty všech prvků v části „v“ nahoru na nejbližší celé číslo.",
+        "documentation-changes": "Pro každou vstupní časovou řadu vrátí „changes(v range-vector)“ počet změn její hodnoty v zadaném časovém rozsahu jako okamžitý vektor.",
+        "documentation-clamp": "Omezí hodnoty všech prvků v části „v“ tak, aby měly dolní hranici „min“ a horní hranici „max“.",
+        "documentation-clamp-max": "Omezí hodnoty všech prvků v části „v“ tak, aby měly horní hranici „max“.",
+        "documentation-clamp-min": "Omezí hodnoty všech prvků v části „v“ tak, aby měly dolní hranici „min“.",
+        "documentation-count-over-time": "Počet všech hodnot v zadaném intervalu.",
+        "documentation-count-scalar": "Vrací počet prvků vektoru časové řady jako skalární hodnotu. To je rozdíl od agregačního operátoru „count()“, který vždy vrací vektor (prázdný, pokud je vstupní vektor prázdný) a umožňuje seskupování podle štítků pomocí klauzule „by“.",
+        "documentation-day-of-month": "Vrátí den v měsíci pro každý z daných časů v UTC. Vrácené hodnoty jsou od 1 do 31.",
+        "documentation-day-of-week": "Vrátí den v týdnu pro každý z daných časů v UTC. Vrácené hodnoty jsou od 0 do 6, kde 0 znamená neděli atd.",
+        "documentation-day-of-year": "Vrátí den v roce pro každý z daných časů v UTC. Vrácené hodnoty jsou od 1 do 365 pro roky, které nejsou přestupné, a od 1 do 366 pro přestupné roky.",
+        "documentation-days-in-month": "Vrátí počet dní v měsíci pro každý z daných časů v UTC. Vrácené hodnoty jsou od 28 do 31.",
+        "documentation-deg": "Převádí radiány na stupně pro všechny prvky v",
+        "documentation-delta": "Vypočítá rozdíl mezi první a poslední hodnotou každého prvku časové řady ve vektoru rozsahu „v“ a vrátí okamžitý vektor s danými deltami a ekvivalentními štítky. Delta je extrapolována tak, aby pokrývala celý časový rozsah, jak je specifikováno ve voliči vektoru rozsahu, takže je možné získat neceločíselný výsledek, i když jsou všechny hodnoty vzorku celá čísla.",
+        "documentation-deriv": "Vypočítá derivaci časové řady za sekundu ve vektoru rozsahu „v“ pomocí jednoduché lineární regrese.",
+        "documentation-double-exponential-smoothing": "Vytvoří vyhlazenou hodnotu pro časové řady na základě rozsahu v části „v“. Čím nižší je vyhlazovací faktor „sf“, tím větší důležitost je přikládána starým datům. Čím vyšší je trendový faktor „tf“, tím více trendů v datech je zvažováno. „sf“ i „tf“ musí být mezi 0 a 1.",
+        "documentation-drop-common-labels": "Vynechá všechny štítky, které mají stejný název a hodnotu ve všech řadách ve vstupním vektoru.",
+        "documentation-exp": "Vypočítá exponenciální funkci pro všechny prvky v části „v“.\nZvláštní případy jsou:\n* „Exp(+Inf) = +Inf“ \n* „Exp(NaN) = NaN“",
+        "documentation-floor": "Zaokrouhlí vzorové hodnoty všech prvků v části „v“ dolů na nejbližší celé číslo.",
+        "documentation-histogram-avg": "Vrátí aritmetický průměr pozorovaných hodnot uložených v nativním histogramu. Vzorky, které nejsou nativními histogramy, jsou ignorovány a ve vráceném vektoru se nezobrazují.",
+        "documentation-histogram-count": "Vrátí počet pozorování uložených v nativním histogramu.",
+        "documentation-histogram-fraction": "Vrátí odhadovaný zlomek pozorování mezi zadanou dolní a horní hodnotou.",
+        "documentation-histogram-quantile": "Vypočítá φ-kvantil (0 ≤ φ ≤ 1) ze segmentů „b“ histogramu. Vzorky v „b“ jsou počty pozorování v každém segmentu. Každý vzorek musí mít štítek „le“, kde hodnota štítku označuje inkluzivní horní hranici segmentu. (Vzorky bez takového štítku jsou tiše ignorovány.) Typ metriky histogramu automaticky poskytuje časové řady s příponou „_bucket“ a příslušnými štítky.",
+        "documentation-histogram-stddev": "Vrátí odhadovanou směrodatnou odchylku pozorování v nativním histogramu na základě geometrického průměru segmentů, kde se pozorování nacházejí.",
+        "documentation-histogram-stdvar": "Vrátí odhadovaný standardní rozptyl pozorování v nativním histogramu.",
+        "documentation-histogram-sum": "Vrátí součet pozorování uložených v nativním histogramu.",
+        "documentation-holt-winters": "Přejmenováno na double_exponential_smoothing v prometheus v3.x. Pro verze Prometheus rovné a větší než v3.0 použijte double_exponential_smoothing. \n\nVytváří vyhlazenou hodnotu pro časové řady na základě rozsahu v „v“. Čím nižší je vyhlazovací faktor „sf“, tím větší význam je přikládán starým datům. Čím vyšší je trendový faktor „tf“, tím více trendů v datech je zvažováno. „sf“ i „tf“ musí být mezi 0 a 1.",
+        "documentation-hour": "Vrátí hodinu dne pro každý z daných časů v UTC. Vrácené hodnoty jsou od 0 do 23.",
+        "documentation-idelta": "Vypočítá rozdíl mezi posledními dvěma vzorky ve vektoru rozsahu „v“ a vrátí okamžitý vektor s danými deltami a ekvivalentními štítky.",
+        "documentation-increase": "Vypočítá nárůst časové řady ve vektoru rozsahu. Přerušení monotónnosti (například resetování počítadla v důsledku restartů cíle) se automaticky upravují. Nárůst je extrapolován tak, aby pokrýval celý časový rozsah, jak je specifikováno ve voliči vektoru rozsahu, takže je možné získat neceločíselný výsledek, i když se počítadlo zvyšuje pouze o celočíselné přírůstky.",
+        "documentation-info": "Vrátí nejnovější podrobnosti a metadata o skupině metrik, jako jsou jejich štítky a aktuální hodnoty, bez provádění jakýchkoli výpočtů",
+        "documentation-irate": "Vypočítá okamžitou rychlost nárůstu časové řady ve vektoru rozsahu za sekundu. Vychází z posledních dvou datových bodů. Přerušení monotónnosti (například resetování počítadla v důsledku restartu cíle) se automaticky upravují.",
+        "documentation-label-join": "Pro každou časovou řadu v části „v“ spojí všechny hodnoty všech „src_labels“ pomocí „separator“ a vrátí časové řady se štítkem „dst_label“ obsahujícím spojenou hodnotu. V této funkci může být libovolný počet „src_labels“.",
+        "documentation-label-replace": "Pro každou časovou řadu v části „v“ porovná „label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)“ regulární výraz „regex“ se štítkem „src_label“. Pokud se shoduje, pak se vrátí časová řada se štítkem „dst_label“ nahrazeným rozšířením „replacement“. „$1“ se nahradí první odpovídající podskupinou, „$2“ druhou atd. Pokud se regulární výraz neshoduje, pak se časová řada vrátí beze změny.",
+        "documentation-last-over-time": "Nejnovější bodová hodnota v zadaném intervalu.",
+        "documentation-ln": "Vypočítá přirozený logaritmus pro všechny prvky v části „v“.\nZvláštní případy jsou:\n * „ln(+Inf) = +Inf“\n * „ln(0) = -Inf“\n * „ln(x < 0) = NaN“\n * „ln(NaN) = NaN“",
+        "documentation-log10": "Vypočítá desetinný logaritmus pro všechny prvky v části „v“. Zvláštní případy jsou ekvivalentní těm v „ln“.",
+        "documentation-log2": "Vypočítá binární logaritmus pro všechny prvky v části „v“. Zvláštní případy jsou ekvivalentní těm v části „ln“.",
+        "documentation-max-over-time": "Maximální hodnota všech bodů v zadaném intervalu.",
+        "documentation-min-over-time": "Minimální hodnota všech bodů v zadaném intervalu.",
+        "documentation-minute": "Vrátí minutu hodiny pro každý z daných časů v UTC. Vrácené hodnoty jsou od 0 do 59.",
+        "documentation-month": "Vrátí měsíc v roce pro každý z daných časů v UTC. Vrácené hodnoty jsou od 1 do 12, kde 1 znamená leden atd.",
+        "documentation-pi": "Vrátí pí",
+        "documentation-predict-linear": "Předpovídá hodnotu časové řady „t“ sekund od této chvíle na základě vektoru rozsahu „v“ pomocí jednoduché lineární regrese.",
+        "documentation-present-over-time": "Hodnota 1 pro libovolnou řadu v zadaném intervalu.",
+        "documentation-quantile-over-time": "φ-kvantil (0 ≤ φ ≤ 1) hodnot v zadaném intervalu.",
+        "documentation-rad": "Převádí stupně na radiány pro všechny prvky v části v",
+        "documentation-rate": "Vypočítá průměrnou rychlost nárůstu časové řady za sekundu ve vektoru rozsahu. Přerušení monotónnosti (například resetování počítadla v důsledku restartů cíle) se automaticky upravují. Výpočet také extrapoluje na konce časového rozsahu, což umožňuje vynechané metriky nebo nedokonalé srovnání cyklů metrik s časovým obdobím rozsahu.",
+        "documentation-resets": "Pro každou vstupní časovou řadu vrátí „resets(v range-vector)“ počet resetů počítadla v zadaném časovém rozsahu jako okamžitý vektor. Jakékoli snížení hodnoty mezi dvěma po sobě jdoucími vzorky je interpretováno jako reset počítadla.",
+        "documentation-round": "Zaokrouhlí vzorové hodnoty všech prvků v části „v“ na nejbližší celé číslo. Shody se zaokrouhlují nahoru. Volitelný argument „to_nearest“ umožňuje určit nejbližší násobek, na který by měly být vzorové hodnoty zaokrouhleny. Tento násobek může být také zlomkem.",
+        "documentation-scalar": "Vzhledem k jednoprvkovému vstupnímu vektoru vrátí „scalar(v instant-vector)“ hodnotu vzorku tohoto jednoho prvku jako skalární hodnotu. Pokud vstupní vektor nemá přesně jeden prvek, „scalar“ vrátí „NaN“.",
+        "documentation-sgn": "Vrátí vektor se všemi hodnotami vzorku převedenými na jejich znaménko, definované takto: 1, pokud je v kladné, -1, pokud je v záporné, a 0, pokud se v rovná nule.",
+        "documentation-sort": "Vrátí vektorové prvky seřazené podle jejich vzorových hodnot ve vzestupném pořadí.",
+        "documentation-sort-desc": "Vrátí vektorové prvky seřazené podle jejich vzorových hodnot v sestupném pořadí.",
+        "documentation-sqrt": "Vypočítá druhou odmocninu všech prvků v části „v“.",
+        "documentation-stddev-over-time": "Standardní odchylka hodnot v zadaném intervalu.",
+        "documentation-stdvar-over-time": "Standardní rozptyl hodnot v zadaném intervalu.",
+        "documentation-sum-over-time": "Součet všech hodnot v zadaném intervalu.",
+        "documentation-time": "Vrátí počet sekund od 1. ledna 1970 UTC. Upozorňujeme, že se nejedná o aktuální čas, ale o čas, kdy má být výraz vyhodnocen.",
+        "documentation-timestamp": "Vrátí časové razítko každého ze vzorků daného vektoru jako počet sekund od 1. ledna 1970 UTC.",
+        "documentation-vector": "Vrátí skalární hodnotu jako vektor bez štítků.",
+        "documentation-year": "Vrátí rok pro každý z daných časů v UTC."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "vypočítá arkus kosinus všech prvků v {{argument}}",
+        "documentation-acosh": "vypočítá inverzní hyperbolický kosinus všech prvků v {{argument}}",
+        "documentation-asin": "vypočítá arkus sinus všech prvků v {{argument}}",
+        "documentation-asinh": "vypočítá inverzní hyperbolický sinus všech prvků v {{argument}}",
+        "documentation-atan": "vypočítá arkus tangens všech prvků v {{argument}}",
+        "documentation-atanh": "vypočítá inverzní hyperbolický tangens všech prvků v {{argument}}",
+        "documentation-cos": "vypočítá kosinus všech prvků v {{argument}}",
+        "documentation-cosh": "vypočítá hyperbolický kosinus všech prvků v {{argument}}",
+        "documentation-sin": "vypočítá sinus všech prvků v {{argument}}",
+        "documentation-sinh": "vypočítá hyperbolický sinus všech prvků v {{argument}}",
+        "documentation-tan": "vypočítá tangens všech prvků v {{argument}}",
+        "documentation-tanh": "vypočítá hyperbolický tangens všech prvků v {{argument}}"
       }
     },
     "querybuilder": {
@@ -316,31 +316,31 @@
         "title-give-feedback": "Průzkumník metrik je nový. Dejte nám prosím vědět, jak ho můžeme vylepšit"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Příklady: {{value}}",
+        "format": "Formát: {{value}}",
+        "legend": "Legenda: {{value}}",
+        "step": "Krok: {{value}}",
+        "type": "Typ: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Hledat metriky podle názvu",
+        "type": "Filtrovat podle typu"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Kumulativní metrika, která představuje jedno monotónně rostoucí počítadlo, jehož hodnota se může při restartu pouze zvýšit nebo vynulovat.",
+        "description-gauge": "Metrika, která představuje jednu číselnou hodnotu, která může libovolně stoupat a klesat.",
+        "description-histogram": "Histogram vzorkuje pozorování (obvykle údaje jako doba trvání požadavků nebo velikosti odpovědí) a počítá je v konfigurovatelných segmentech.",
+        "description-native-histogram": "Nativní histogramy se od klasických histogramů Prometheus liší v několika ohledech: Hranice nativních histogramových segmentů se počítají podle vzorce, který závisí na měřítku (rozlišení) nativního histogramu, a nejsou definovány uživatelem.",
+        "description-no-type": "Tyto metriky nemají v metadatech definovaný typ.",
+        "description-summary": "Shrnuje vzorky pozorování (obvykle údaje jako délka požadavků a velikost odpovědí) a dokáže vypočítat konfigurovatelné kvantily v posuvném časovém okně.",
+        "description-unknown": "Těmto metrikám byl v metadatech přiřazen neznámý typ.",
+        "label-counter": "Počítadlo",
+        "label-gauge": "Měřidlo",
+        "label-histogram": "Histogram",
+        "label-native-histogram": "Nativní histogram",
+        "label-no-type": "Žádný typ",
+        "label-summary": "Shrnutí",
+        "label-unknown": "Neznámý"
       },
       "handle-function": {
         "text": {
@@ -358,8 +358,8 @@
         "tooltip-label-filters": "Volitelné: používá se k filtrování metriky vybrané pro tento typ dotazu."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Načítání štítků",
+        "noOptionsMessage-no-labels-found": "Nebyly nalezeny žádné štítky"
       },
       "metric-combobox": {
         "async-select": {
@@ -409,18 +409,18 @@
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Vypočítá {{aggregationName}} podle rozměrů při zachování {{labelWord}} {{labels}}.",
+          "label-default": "Vypočítá {{aggregationName}} podle rozměrů.",
+          "label-without": "Vypočítá {{aggregationName}} podle rozměrů {{labels}}. Všechny ostatní štítky jsou zachovány."
         }
       },
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "Nastavit dolní limit pro parametr kroku",
         "aria-label-select-resolution": "Vyberte rozlišení",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Teplotní mapa",
+          "label-table": "Tabulka",
+          "label-time-series": "Časové řady"
         },
         "label-exemplars": "Příklady",
         "label-format": "Formát",
@@ -436,8 +436,8 @@
         "tooltip-autocomplete-suggestions-limited": "Počet názvů metrik překračuje limit automatického doplňování. Zobrazuje se pouze {{autocompleteLimit}} nejrelevantnější/ch metrik. Prahovou hodnotu můžete upravit v nastavení zdroje dat."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Došlo k syntaktické chybě nebo nelze vizualizovat strukturu dotazu při přepnutí do režimu nástroje pro tvorbu. Části dotazu mohou být ztraceny.",
+        "confirmText-continue": "Pokračovat",
         "kick-start-your-query": "Spustit dotaz",
         "label-explain": "Vysvětlit",
         "run-queries": "Spustit dotazy",
@@ -453,8 +453,8 @@
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Nástroj pro tvorbu",
+          "label-code": "Kód"
         }
       },
       "query-pattern": {
@@ -483,9 +483,9 @@
       "results-table": {
         "content-descriptive-type": "Při vytváření {{descriptiveType}} Prometheus zobrazí více řad s počítadlem typů. ",
         "description": "Popis",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Nebyly nalezeny žádné metriky. Zkuste rozšířit filtry štítků.",
+        "message-expand-search": "Nebyly nalezeny žádné metriky. Zkuste rozšířit vyhledávání a filtry.",
+        "message-no-metrics-found": "Ve zdroji dat nebyly nalezeny žádné metriky.",
         "name": "Název",
         "type": "Typ"
       },
diff --git a/packages/grafana-prometheus/src/locales/de-DE/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/de-DE/grafana-prometheus.json
index c391ba11f3d..fa5b613265e 100644
--- a/packages/grafana-prometheus/src/locales/de-DE/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/de-DE/grafana-prometheus.json
@@ -158,8 +158,8 @@
         "aria-label-prometheus-type": "Prometheus-Typ",
         "aria-label-select-http-method": "HTTP-Methode auswählen",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Code"
         },
         "label-cache-level": "Cache-Level",
         "label-custom-query-parameters": "Benutzerdefinierte Abfrageparameter",
@@ -200,114 +200,114 @@
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(Deaktiviert)",
+      "enabled-label": "Metriken-Browser"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Enthält nur eindeutige Labels",
+        "description-custom": "Namensvorlage bereitstellen",
+        "description-verbose": "Alle Label-Namen und -Werte",
+        "label-auto": "Auto",
+        "label-custom": "Benutzerdefiniert",
+        "label-verbose": "Ausführlich"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Durchschnitt über Dimensionen berechnen",
+        "documentation-bottomk": "Kleinste k-Elemente nach Probenwert",
+        "documentation-count": "Anzahl der Elemente im Vektor zählen",
+        "documentation-count-values": "Anzahl der Elemente mit selbem Wert zählen",
+        "documentation-group": "Alle Werte im resultierenden Vektor sind 1",
+        "documentation-max": "Maximum über Dimensionen auswählen",
+        "documentation-min": "Minimum über Dimensionen auswählen",
+        "documentation-quantile": "φ-Quantil (0 ≤ φ ≤ 1) über Dimensionen berechnen",
+        "documentation-stddev": "Populationsstandardabweichung über Dimensionen berechnen",
+        "documentation-stdvar": "Populationsstandardvarianz über Dimensionen berechnen",
+        "documentation-sum": "Summe über Dimensionen berechnen",
+        "documentation-topk": "Größte k-Elemente nach Stichprobenwert"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Gibt den Eingabevektor mit allen Probenwerten zurück, die zu ihrem Absolutwert umgerechnet wurden.",
+        "documentation-absent": "Gibt einen leeren Vektor zurück, wenn der übergebene Vektor Elemente enthält, und einen 1-Element-Vektor mit dem Wert 1, wenn der übergebene Vektor keine Elemente enthält. Dies ist nützlich, um zu warnen, wenn für eine bestimmte Kombination aus Metrikname und Label keine Zeitreihen vorhanden sind.",
+        "documentation-absent-over-time": "Gibt einen leeren Vektor zurück, wenn der übergebene Bereichsvektor Elemente enthält, und einen 1-Element-Vektor mit dem Wert 1, wenn der übergebene Bereichsvektor keine Elemente enthält.",
+        "documentation-avg-over-time": "Der Durchschnittswert aller Punkte im angegebenen Intervall.",
+        "documentation-ceil": "Rundet die Probenwerte aller Elemente in „v“ auf die nächste ganze Zahl auf.",
+        "documentation-changes": "Für jede Eingabezeitreihe gibt „changes(v range-vector)“ die Anzahl der Änderungen seines Werts innerhalb des angegebenen Zeitbereichs als Momentanvektor zurück.",
+        "documentation-clamp": "Begrenzt die Probenwerte aller Elemente in „v“ auf eine Untergrenze von „min“ und eine Obergrenze von „max“.",
+        "documentation-clamp-max": "Begrenzt die Probenwerte aller Elemente in „v“ auf eine Obergrenze von „max“.",
+        "documentation-clamp-min": "Begrenzt die Probenwerte aller Elemente in „v“ auf eine Untergrenze von „min“.",
+        "documentation-count-over-time": "Die Anzahl aller Werte im angegebenen Intervall.",
+        "documentation-count-scalar": "Gibt die Anzahl der Elemente in einem Zeitreihenvektor als Skalar zurück. Dies steht im Gegensatz zum Aggregationsoperator „count()“, der immer einen Vektor zurückgibt (einen leeren, wenn der Eingabevektor leer ist) und die Gruppierung nach Labels über eine „by“-Klausel ermöglicht.",
+        "documentation-day-of-month": "Gibt den Tag des Monats für jede der angegebenen Zeiten in UTC zurück. Die zurückgegebenen Werte liegen zwischen 1 und 31.",
+        "documentation-day-of-week": "Gibt den Tag der Woche für jede der angegebenen Zeiten in UTC zurück. Die zurückgegebenen Werte liegen zwischen 0 und 6, wobei 0 für Sonntag steht usw.",
+        "documentation-day-of-year": "Gibt den Tag des Jahres für jede der angegebenen Zeiten in UTC zurück. Die zurückgegebenen Werte liegen zwischen 1 und 365 für Nicht-Schaltjahre und zwischen 1 und 366 für Schaltjahre.",
+        "documentation-days-in-month": "Gibt die Anzahl der Tage im Monat für jede der angegebenen Zeiten in UTC zurück. Die zurückgegebenen Werte liegen zwischen 28 und 31.",
+        "documentation-deg": "Rechnet Radianten in Grad um, bei allen Elementen in v",
+        "documentation-delta": "Berechnet die Differenz zwischen dem ersten und dem letzten Wert jedes Zeitreihenelements in einem Bereichsvektor „v“ und gibt einen Momentanvektor mit den angegebenen Deltas und äquivalenten Labels zurück. Das Delta wird extrapoliert, um den gesamten Zeitbereich zu umfassen, wie im Bereichsvektor-Selektor angegeben, sodass es möglich ist, ein nicht ganzzahliges Ergebnis zu erhalten, auch wenn die Probenwerte alle ganze Zahlen sind.",
+        "documentation-deriv": "Berechnet die Ableitung pro Sekunde der Zeitreihe in einem Bereichsvektor „v“ mithilfe einer einfachen linearen Regression.",
+        "documentation-double-exponential-smoothing": "Erzeugt einen geglätteten Wert für Zeitreihen basierend auf dem Bereich in „v“. Je niedriger der Glättungsfaktor „sf“ ist, desto mehr Bedeutung kommt alten Daten zu. Je höher der Trendfaktor „tf“ ist, desto mehr Trends in den Daten werden berücksichtigt. Sowohl „sf“ als auch „tf“ müssen zwischen 0 und 1 liegen.",
+        "documentation-drop-common-labels": "Löscht alle Labels, die den gleichen Namen und Wert über alle Reihen im Eingabevektor aufweisen.",
+        "documentation-exp": "Berechnet die Exponentialfunktion für alle Elemente in „v“.\nSonderfälle sind:\n* „Exp(+Inf) = +Inf“ \n* „Exp(NaN) = NaN“",
+        "documentation-floor": "Rundet die Probenwerte aller Elemente in „v“ auf die nächste ganze Zahl ab.",
+        "documentation-histogram-avg": "Gibt den arithmetischen Mittelwert der beobachteten Werte zurück, die in einem nativen Histogramm gespeichert sind. Proben, die keine nativen Histogramme sind, werden ignoriert und nicht im zurückgegebenen Vektor angezeigt.",
+        "documentation-histogram-count": "Gibt die Anzahl der in einem nativen Histogramm gespeicherten Beobachtungen zurück.",
+        "documentation-histogram-fraction": "Gibt den geschätzten Anteil der Beobachtungen zwischen den angegebenen unteren und oberen Werten zurück.",
+        "documentation-histogram-quantile": "Berechnet das φ-Quantil (0 ≤ φ ≤ 1) von den Buckets „b“ eines Histogramms. Die Proben in „b“ sind die Anzahl der Beobachtungen in jedem Bucket. Jede Probe muss ein Label „le“ haben, wobei der Labelwert die inklusive obere Grenze des Buckets angibt. (Proben ohne ein solches Label werden still ignoriert.) Der Histogramm-Metriktyp stellt automatisch Zeitreihen mit dem Suffix „_bucket“ und den entsprechenden Labels bereit.",
+        "documentation-histogram-stddev": "Gibt die geschätzte Standardabweichung der Beobachtungen in einem nativen Histogramm zurück, basierend auf dem geometrischen Mittel der Buckets, wo die Beobachtungen liegen.",
+        "documentation-histogram-stdvar": "Gibt die geschätzte Standardabweichung von Beobachtungen in einem nativen Histogramm zurück.",
+        "documentation-histogram-sum": "Gibt die Summe der in einem nativen Histogramm gespeicherten Beobachtungen zurück.",
+        "documentation-holt-winters": "Umbenannt in double_exponential_smoothing in Prometheus v3.x. Bitte verwenden Sie für Prometheus-Versionen gleich und höher als v3.0 double_exponential_smoothing. \n\nErzeugt einen geglätteten Wert für Zeitreihen, basierend auf dem Bereich in „v“. Je niedriger der Glättungsfaktor „sf“ ist, desto mehr Bedeutung kommt alten Daten zu. Je höher der Trendfaktor „tf“ ist, desto mehr Trends in den Daten werden berücksichtigt. Sowohl „sf“ als auch „tf“ müssen zwischen 0 und 1 liegen.",
+        "documentation-hour": "Gibt die Stunde des Tages für jede der angegebenen Zeiten in UTC zurück. Die zurückgegebenen Werte liegen zwischen 0 und 23.",
+        "documentation-idelta": "Berechnet die Differenz zwischen den letzten beiden Proben im Bereichsvektor „v“ und gibt einen Momentanvektor mit den angegebenen Deltas und äquivalenten Labels zurück.",
+        "documentation-increase": "Berechnet die Zunahme der Zeitreihe im Bereichsvektor. Brüche in der Monotonie (z. B. Zählerzurücksetzungen aufgrund von Zielneustarts) werden automatisch angepasst. Die Zunahme wird extrapoliert, um den gesamten Zeitbereich zu umfassen, wie im Bereichsvektor-Selektor angegeben, sodass es möglich ist, ein nicht ganzzahliges Ergebnis zu erhalten, auch wenn ein Zähler nur um ganzzahlige Inkremente zunimmt.",
+        "documentation-info": "Gibt die neuesten Details und Metadaten zu einer Gruppe von Metriken zurück, z. B. ihre Labels und aktuellen Werte, ohne Berechnungen durchzuführen",
+        "documentation-irate": "Berechnet die momentane Anstiegsrate (pro Sekunde) der Zeitreihe im Bereichsvektor. Dies basiert auf den letzten beiden Datenpunkten. Brüche in der Monotonie (z. B. Zählerzurücksetzungen aufgrund von Zielneustarts) werden automatisch angepasst.",
+        "documentation-label-join": "Verbindet für jede Zeitreihe in „v“ alle Werte aller „src_labels“ mit „separator“ und gibt die Zeitreihe mit dem Label „dst_label“ zurück, das den verbundenen Wert enthält. Es kann eine beliebige Anzahl von „src_labels“ in dieser Funktion geben.",
+        "documentation-label-replace": "Für jede Zeitreihe in „v“ gleicht „label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)“ den regulären Ausdruck „regex“ mit dem Label „src_label“ ab. Bei einer Übereinstimmung wird die Zeitreihe mit dem Label „dst_label“ zurückgegeben, das durch die Erweiterung von „replacement“ ersetzt wird. „$1“ wird durch die erste übereinstimmende Untergruppe ersetzt, „$2“ durch die zweite usw. Wenn der reguläre Ausdruck nicht übereinstimmt, wird die Zeitreihe unverändert zurückgegeben.",
+        "documentation-last-over-time": "Der letzte Punktwert im angegebenen Intervall.",
+        "documentation-ln": "Berechnet den natürlichen Logarithmus für alle Elemente in „v“.\nSonderfälle sind:\n * „ln(+Inf) = +Inf“\n * „ln(0) = -Inf“\n * „ln(x < 0) = NaN“\n * „ln(NaN) = NaN“",
+        "documentation-log10": "Berechnet den Dezimal-Logarithmus für alle Elemente in „v“. Die Sonderfälle entsprechen denen in „ln“.",
+        "documentation-log2": "Berechnet den binären Logarithmus für alle Elemente in „v“. Die Sonderfälle entsprechen denen in „ln“.",
+        "documentation-max-over-time": "Der Maximalwert aller Punkte im angegebenen Intervall.",
+        "documentation-min-over-time": "Der Minimalwert aller Punkte im angegebenen Intervall.",
+        "documentation-minute": "Gibt die Minute der Stunde für jede der angegebenen Zeiten in UTC zurück. Die zurückgegebenen Werte liegen zwischen 0 und 59.",
+        "documentation-month": "Gibt den Monat des Jahres für jede der angegebenen Zeiten in UTC zurück. Die zurückgegebenen Werte liegen zwischen 1 und 12, wobei 1 für Januar steht usw.",
+        "documentation-pi": "Gibt pi zurück",
+        "documentation-predict-linear": "Prognostiziert den Wert der Zeitreihe „t“ Sekunden ab jetzt, basierend auf dem Bereichsvektor „v“, mithilfe einer einfachen linearen Regression.",
+        "documentation-present-over-time": "Der Wert 1 für jede Reihe im angegebenen Intervall.",
+        "documentation-quantile-over-time": "Das φ-Quantil (0 ≤ φ ≤ 1) der Werte im angegebenen Intervall.",
+        "documentation-rad": "Rechnet Grad in Radianten um, bei allen Elementen in v",
+        "documentation-rate": "Berechnet die durchschnittliche Anstiegsrate (pro Sekunde) der Zeitreihe im Bereichsvektor. Brüche in der Monotonie (z. B. Zählerzurücksetzungen aufgrund von Zielneustarts) werden automatisch angepasst. Außerdem extrapoliert die Berechnung zu den Enden des Zeitbereichs, um ausgelassene Scrapes oder eine unvollkommene Ausrichtung der Scrape-Zyklen mit dem Zeitraum des Bereichs zu ermöglichen.",
+        "documentation-resets": "Für jede Eingabezeitreihe gibt „resets(v range-vector)“ die Anzahl der Zählerzurücksetzungen innerhalb des angegebenen Zeitbereichs als Momentanvektor zurück. Jede Abnahme des Werts zwischen zwei aufeinanderfolgenden Proben wird als Zählerzurücksetzung interpretiert.",
+        "documentation-round": "Rundet die Probenwerte aller Elemente in „v“ auf die nächste ganze Zahl. Gleichstände werden durch Aufrunden gelöst. Mit dem optionalen Argument „to_nearest“ können Sie das nächste Vielfache angeben, auf das die Probenwerte gerundet werden sollen. Dieses Vielfache kann auch ein Bruch sein.",
+        "documentation-scalar": "Bei einem Eingabevektor mit einem einzelnen Element gibt „scalar(v instant-vector)“ den Probenwert dieses einzelnen Elements als Skalar zurück. Wenn der Eingabevektor nicht genau ein Element hat, gibt „scalar“ „NaN“ zurück.",
+        "documentation-sgn": "Gibt einen Vektor mit allen Probenwerten zurück, die in ihr Vorzeichen umgewandelt wurden, wie folgt definiert: 1, wenn v positiv ist, -1, wenn v negativ ist und 0, wenn v gleich Null ist.",
+        "documentation-sort": "Gibt Vektorelemente zurück, die in aufsteigender Reihenfolge nach ihren Probenwerten sortiert sind.",
+        "documentation-sort-desc": "Gibt Vektorelemente zurück, die in absteigender Reihenfolge nach ihren Probenwerten sortiert sind.",
+        "documentation-sqrt": "Berechnet die Quadratwurzel aller Elemente in „v“.",
+        "documentation-stddev-over-time": "Die Populationsstandardabweichung der Werte im angegebenen Intervall.",
+        "documentation-stdvar-over-time": "Die Populationsstandardvarianz der Werte im angegebenen Intervall.",
+        "documentation-sum-over-time": "Die Summe aller Werte im angegebenen Intervall.",
+        "documentation-time": "Gibt die Anzahl der Sekunden seit dem 1. Januar 1970 UTC zurück. Beachten Sie, dass dies nicht tatsächlich die aktuelle Zeit wiedergibt, sondern den Zeitpunkt, zu dem der Ausdruck ausgewertet werden soll.",
+        "documentation-timestamp": "Gibt den Zeitstempel jeder der Proben des angegebenen Vektors als Anzahl der Sekunden seit dem 1. Januar 1970 UTC zurück.",
+        "documentation-vector": "Gibt den Skalar „s“ als Vektor ohne Labels zurück.",
+        "documentation-year": "Gibt das Jahr für jede der angegebenen Zeiten in UTC zurück."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "berechnet den Arkuskosinus aller Elemente in {{argument}}",
+        "documentation-acosh": "berechnet den inversen hyperbolischen Kosinus aller Elemente in {{argument}}",
+        "documentation-asin": "berechnet den Arkussinus aller Elemente in {{argument}}",
+        "documentation-asinh": "berechnet den inversen hyperbolischen Sinus aller Elemente in {{argument}}",
+        "documentation-atan": "berechnet den Arkustangens aller Elemente in {{argument}}",
+        "documentation-atanh": "berechnet den inversen hyperbolischen Tangens aller Elemente in {{argument}}",
+        "documentation-cos": "berechnet den Kosinus aller Elemente in {{argument}}",
+        "documentation-cosh": "berechnet den hyperbolischen Kosinus aller Elemente in {{argument}}",
+        "documentation-sin": "berechnet den Sinus aller Elemente in {{argument}}",
+        "documentation-sinh": "berechnet den hyperbolischen Sinus aller Elemente in {{argument}}",
+        "documentation-tan": "berechnet den Tangens aller Elemente in {{argument}}",
+        "documentation-tanh": "berechnet den hyperbolischen Tangens aller Elemente in {{argument}}"
       }
     },
     "querybuilder": {
@@ -316,31 +316,31 @@
         "title-give-feedback": "Der Metrik-Explorer ist neu. Bitte teilen Sie uns mit, wie wir ihn verbessern können."
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Exemplare: {{value}}",
+        "format": "Format: {{value}}",
+        "legend": "Legende: {{value}}",
+        "step": "Schritt: {{value}}",
+        "type": "Typ: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Metriken nach Namen suchen",
+        "type": "Nach Typ filtern"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Eine kumulative Metrik, die einen einzelnen monoton ansteigenden Zähler darstellt, dessen Wert nur ansteigen oder beim Neustart auf Null zurückgesetzt werden kann.",
+        "description-gauge": "Eine Metrik, die einen einzelnen numerischen Wert darstellt, der beliebig nach oben und unten verlaufen kann.",
+        "description-histogram": "Ein Histogramm fragt Beobachtungen ab (in der Regel Dinge wie Anfragedauer oder Antwortgrößen) und zählt sie in konfigurierbaren Buckets.",
+        "description-native-histogram": "Native Histogramme unterscheiden sich in mehrerer Hinsicht von klassischen Prometheus-Histogrammen: Die Grenzen der nativen Histogramm-Buckets werden durch eine Formel berechnet, die von der Skala (Auflösung) des nativen Histogramms abhängt, und sind nicht benutzerdefiniert.",
+        "description-no-type": "Diese Metriken haben keinen festgelegten Typ in den Metadaten.",
+        "description-summary": "Eine Zusammenfassung fragt Beobachtungen ab (in der Regel Dinge wie Anfragedauer und Antwortgrößen) und kann konfigurierbare Quantile über ein gleitendes Zeitfenster berechnen.",
+        "description-unknown": "Diesen Metriken wurde in den Metadaten der Typ „unbekannt“ zugewiesen.",
+        "label-counter": "Zähler",
+        "label-gauge": "Anzeige",
+        "label-histogram": "Histogramm",
+        "label-native-histogram": "Natives Histogramm",
+        "label-no-type": "Kein Typ",
+        "label-summary": "Zusammenfassung",
+        "label-unknown": "Unbekannt"
       },
       "handle-function": {
         "text": {
@@ -358,8 +358,8 @@
         "tooltip-label-filters": "Optional: wird verwendet, um die Metrikauswahl für diesen Abfragetyp zu filtern."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Labels werden geladen",
+        "noOptionsMessage-no-labels-found": "Keine Labels gefunden"
       },
       "metric-combobox": {
         "async-select": {
@@ -409,18 +409,18 @@
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Berechnet {{aggregationName}} über Dimensionen unter Beibehaltung von {{labelWord}} {{labels}}.",
+          "label-default": "Berechnet {{aggregationName}} über die Dimensionen.",
+          "label-without": "Berechnet {{aggregationName}} über die Dimensionen {{labels}}. Alle anderen Labels werden beibehalten."
         }
       },
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "Untergrenze für den Schrittparameter festlegen",
         "aria-label-select-resolution": "Auflösung auswählen",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Heatmap",
+          "label-table": "Tabelle",
+          "label-time-series": "Zeitreihen"
         },
         "label-exemplars": "Exemplare",
         "label-format": "Format",
@@ -436,8 +436,8 @@
         "tooltip-autocomplete-suggestions-limited": "Die Anzahl der Metriknamen überschreitet die Grenze der Autovervollständigung. Es werden nur die für {{autocompleteLimit}} relevantesten Metriken angezeigt. Sie können die Grenze in den Datenquelleneinstellungen anpassen."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Es liegt ein Syntaxfehler vor oder die Abfragestruktur kann beim Wechsel in den Builder-Modus nicht visualisiert werden. Teile der Abfrage können verlorengehen.",
+        "confirmText-continue": "Fortfahren",
         "kick-start-your-query": "Starten Sie Ihre Abfrage",
         "label-explain": "Erklären",
         "run-queries": "Abfragen ausführen",
@@ -453,8 +453,8 @@
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Code"
         }
       },
       "query-pattern": {
@@ -483,9 +483,9 @@
       "results-table": {
         "content-descriptive-type": "Bei der Erstellung von {{descriptiveType}} zeigt Prometheus mehrere Reihen mit dem Typ Counter. ",
         "description": "Beschreibung",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Es wurden keine Metriken gefunden. Versuchen Sie, Ihre Label-Filter zu erweitern.",
+        "message-expand-search": "Es wurden keine Metriken gefunden. Versuchen Sie, Ihre Suche und Ihre Filter zu erweitern.",
+        "message-no-metrics-found": "Es wurden keine Metriken in der Datenquelle gefunden.",
         "name": "Name",
         "type": "Typ"
       },
diff --git a/packages/grafana-prometheus/src/locales/es-ES/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/es-ES/grafana-prometheus.json
index c0016de4b4a..87aeffdaf55 100644
--- a/packages/grafana-prometheus/src/locales/es-ES/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/es-ES/grafana-prometheus.json
@@ -2,496 +2,496 @@
   "grafana-prometheus": {
     "components": {
       "annotation-query-editor": {
-        "annotation-data-load-error": "",
-        "aria-label-lower-limit-parameter": "",
-        "label-min-step": "",
-        "label-series-value-as-timestamp": "",
+        "annotation-data-load-error": "¡Error de carga de datos de anotación!",
+        "aria-label-lower-limit-parameter": "Establecer límite inferior para el parámetro de paso",
+        "label-min-step": "Paso mínimo",
+        "label-series-value-as-timestamp": "Valor de la serie como marca de tiempo",
         "label-tags": "Etiquetas",
-        "label-text": "",
+        "label-text": "Texto",
         "label-title": "Título",
-        "placeholder-auto": "",
-        "tooltip-either-pattern-example-instance-replaced-label": "",
-        "tooltip-min-step": "",
-        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": ""
+        "placeholder-auto": "auto",
+        "tooltip-either-pattern-example-instance-replaced-label": "Utilice el nombre o un patrón. Por ejemplo, {{labelTemplate}} se reemplaza con el valor de etiqueta para la etiqueta {{labelName}}.",
+        "tooltip-min-step": "Un límite inferior adicional para el parámetro de paso de la consulta de Prometheus y para las variables <2>{{intervalVar}}</2> y <4>{{rateIntervalVar}}</4>.",
+        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": "La unidad de la marca de tiempo es milisegundos. Si la unidad del valor de la serie es segundos, multiplica su vector de rango por 1000."
       },
       "get-query-type-options": {
         "description": {
-          "instant-query-range": ""
+          "instant-query-range": "Ejecutar una consulta instantánea y una consulta de rango"
         },
         "label": {
-          "both": ""
+          "both": "Ambas"
         },
         "range-options": {
           "description": {
-            "query-range": ""
+            "query-range": "Ejecutar consulta en un rango de tiempo"
           },
           "label": {
-            "instant": "",
-            "range": ""
+            "instant": "Instantánea",
+            "range": "Rango"
           }
         }
       },
       "label-selector": {
-        "aria-label-filter-expression-for-label": "",
-        "description-select-labels": "",
-        "select-labels-to-search-in": ""
+        "aria-label-filter-expression-for-label": "Expresión de filtro para etiqueta",
+        "description-select-labels": "Una vez seleccionados los valores de las etiquetas, solo se muestran las posibles combinaciones de etiquetas.",
+        "select-labels-to-search-in": "2. Selecciona las etiquetas en las que buscar"
       },
       "metric-selector": {
-        "aria-label-filter-expression-for-metric": "",
-        "aria-label-limit-results-from-series-endpoint": "",
-        "description-series-limit": "",
-        "label-select-metric": "",
-        "select-a-metric": "",
-        "series-limit": ""
+        "aria-label-filter-expression-for-metric": "Expresión de filtro para métrica",
+        "aria-label-limit-results-from-series-endpoint": "Limitar los resultados del punto de conexión de la serie",
+        "description-series-limit": "El límite se aplica a todas las métricas, etiquetas y valores. Deja el campo vacío para usar el límite predeterminado. Define el valor en 0 para desactivar el límite y obtenerlo todo (esto puede causar problemas de rendimiento).",
+        "label-select-metric": "Una vez seleccionada una métrica, solo se muestran las etiquetas posibles. Las etiquetas están limitadas por el límite de la serie a continuación.",
+        "select-a-metric": "1. Seleccionar una métrica",
+        "series-limit": "Límite de series"
       },
       "prom-cheat-sheet": {
-        "prom-ql-cheat-sheet": ""
+        "prom-ql-cheat-sheet": "Hoja de referencia de PromQL"
       },
       "prom-exemplar-field": {
-        "exemplars": "",
-        "tooltip-disable-query": "",
-        "tooltip-enable-query": ""
+        "exemplars": "Ejemplos",
+        "tooltip-disable-query": "Deshabilitar consulta con ejemplos",
+        "tooltip-enable-query": "Habilitar consulta con ejemplos"
       },
       "prom-explore-extra-field": {
-        "aria-label-prometheus-extra-field": "",
-        "aria-label-query-type-field": "",
-        "aria-label-step-field": "",
-        "min-step": "",
-        "query-type": "",
-        "tooltip-units-builtin-variables-example-interval-rateinterval": ""
+        "aria-label-prometheus-extra-field": "Campo adicional de Prometheus",
+        "aria-label-query-type-field": "Campo de tipo de consulta",
+        "aria-label-step-field": "Campo de paso",
+        "min-step": "Paso mínimo",
+        "query-type": "Tipo de consulta",
+        "tooltip-units-builtin-variables-example-interval-rateinterval": "Aquí se pueden utilizar unidades de tiempo y variables integradas, por ejemplo: {{example1}}, {{example2}}, {{example3}}, {{example4}} {{example5}}, {{example6}}, {{example7}} (valor predeterminado si no se especifica ninguna unidad: {{default}})"
       },
       "prom-query-field": {
-        "placeholder-enter-a-prom-ql-query": ""
+        "placeholder-enter-a-prom-ql-query": "Introduzca una consulta de PromQL..."
       },
       "prom-variable-query-editor": {
-        "aria-label-classic-query": "",
-        "aria-label-metric-regex": "",
-        "aria-label-metric-selector": "",
-        "aria-label-prometheus-query": "",
-        "aria-label-query-type": "",
-        "aria-label-series-query": "",
-        "label-classic-query": "",
+        "aria-label-classic-query": "Consulta clásica",
+        "aria-label-metric-regex": "Expresión regular métrica",
+        "aria-label-metric-selector": "Selector de métricas",
+        "aria-label-prometheus-query": "Consulta de Prometheus",
+        "aria-label-query-type": "Tipo de consulta",
+        "aria-label-series-query": "Consulta de series",
+        "label-classic-query": "Consulta clásica",
         "label-label": "Etiqueta",
-        "label-metric-regex": "",
+        "label-metric-regex": "Expresión regular métrica",
         "label-query": "Consulta",
-        "label-query-type": "",
-        "label-series-query": "",
-        "placeholder-classic-query": "",
-        "placeholder-metric-regex": "",
-        "placeholder-prometheus-query": "",
+        "label-query-type": "Tipo de consulta",
+        "label-series-query": "Consulta de series",
+        "placeholder-classic-query": "Consulta clásica",
+        "placeholder-metric-regex": "Expresión regular métrica",
+        "placeholder-prometheus-query": "Consulta de Prometheus",
         "placeholder-select-query-type": "Seleccionar tipo de consulta",
-        "placeholder-series-query": "",
-        "returns-metrics-matching-specified-metric-regex": "",
-        "tooltip-classic-query": "",
-        "tooltip-label": "",
-        "tooltip-metric-regex": "",
-        "tooltip-query": "",
-        "tooltip-query-type": "",
-        "tooltip-series-query": ""
+        "placeholder-series-query": "Consulta de series",
+        "returns-metrics-matching-specified-metric-regex": "Devuelve una lista de métricas que coinciden con la expresión regular de métrica especificada.",
+        "tooltip-classic-query": "La implementación original del editor de consultas de variables de Prometheus. Introduzca una cadena con el tipo de consulta y los parámetros correctos como se describe en estos documentos. Por ejemplo, {{exampleQuery}}.",
+        "tooltip-label": "Devuelve una lista de valores de etiqueta para el nombre de etiqueta en todas las métricas, a menos que se especifique la métrica.",
+        "tooltip-metric-regex": "Devuelve una lista de nombres de etiquetas, filtrando opcionalmente por la expresión regular de métrica especificada.",
+        "tooltip-query": "Devuelve una lista de resultados de la consulta de Prometheus para la consulta. Esto puede incluir funciones de Prometheus, es decir, {{exampleQuery}}.",
+        "tooltip-query-type": "El plugin de fuente de datos de Prometheus proporciona los siguientes tipos de consulta para las variables de plantilla.",
+        "tooltip-series-query": "Introduzca una métrica con etiquetas, solo una métrica o solo etiquetas, es decir, {{example1}}, {{example2}} o {{example3}}. Devuelve una lista de series temporales asociadas con los datos introducidos."
       },
       "selector-actions": {
-        "aria-label-selector": "",
-        "aria-label-selector-clear-button": "",
-        "aria-label-use-selector-as-metrics-button": "",
-        "aria-label-use-selector-for-query-button": "",
-        "aria-label-validate-submit-button": "",
+        "aria-label-selector": "selector",
+        "aria-label-selector-clear-button": "Botón de borrado del selector",
+        "aria-label-use-selector-as-metrics-button": "Utilizar el selector como botón de métricas",
+        "aria-label-use-selector-for-query-button": "Utilizar el selector para el botón de consulta",
+        "aria-label-validate-submit-button": "Validar botón de envío",
         "clear": "Borrar",
-        "resulting-selector": "",
-        "use-as-rate-query": "",
-        "use-query": "",
-        "validate-selector": ""
+        "resulting-selector": "4. Selector resultante",
+        "use-as-rate-query": "Utilizar como consulta de tasa",
+        "use-query": "Utilizar consulta",
+        "validate-selector": "Validar selector"
       },
       "value-selector": {
-        "aria-label-filter-expression-for-label-values": "",
-        "aria-label-values-for": "",
-        "description-search-field-values-across-selected-labels": "",
-        "select-multiple-values-for-your-labels": ""
+        "aria-label-filter-expression-for-label-values": "Expresión de filtro para valores de etiqueta",
+        "aria-label-values-for": "Valores para {{labelKey}}",
+        "description-search-field-values-across-selected-labels": "Utilice el campo de búsqueda para encontrar valores en las etiquetas seleccionadas.",
+        "select-multiple-values-for-your-labels": "3. Seleccione (varios) valores para sus etiquetas"
       }
     },
     "configuration": {
       "alerting-settings-overhaul": {
-        "label-allow-as-recording-rules-target": "",
-        "label-manage-alerts-via-alerting-ui": "",
+        "label-allow-as-recording-rules-target": "Permitir como objetivo de las reglas de grabación",
+        "label-manage-alerts-via-alerting-ui": "Gestionar alertas a través de la interfaz de usuario de Alerting",
         "title-alerting": "Alertas",
-        "tooltip-allow-as-recording-rules-target": "",
+        "tooltip-allow-as-recording-rules-target": "Permita que esta fuente de datos se seleccione como objetivo para escribir reglas de log.",
         "tooltip-manage-alerts-via-alerting-ui": "Gestiona las reglas de alerta para esta fuente de datos. Para gestionar otros recursos de alerta, añade una fuente de datos de Alertmanager."
       },
       "config-editor": {
-        "browser-access-mode-error": "",
-        "description-advanced-settings": "",
+        "browser-access-mode-error": "El modo de acceso a través del navegador en la fuente de datos de Prometheus ya no está disponible. Cambia al modo de acceso al servidor.",
+        "description-advanced-settings": "Los ajustes adicionales son ajustes opcionales que se pueden configurar para tener un mayor control sobre su fuente de datos.",
         "title-advanced-settings": "Ajustes avanzados",
         "title-error": "Error"
       },
       "data-source-http-settings-overhaul": {
         "tooltip-browser-access-mode": "Tu método de acceso es <1>Navegador</1>, esto significa que la URL debe ser accesible desde el navegador.",
-        "tooltip-http-url": "",
+        "tooltip-http-url": "Especifique una URL HTTP completa (por ejemplo, {{exampleURL}})",
         "tooltip-server-access-mode": "Tu método de acceso es <1>Servidor</1>, esto significa que la URL debe ser accesible desde el «backend» o servidor de Grafana."
       },
       "docs-tip": {
-        "visit-docs-for-more-details-here": ""
+        "visit-docs-for-more-details-here": "Consulte los documentos aquí para obtener más información."
       },
       "exemplar-setting": {
         "label-data-source": "Fuente de datos",
-        "label-internal-link": "",
+        "label-internal-link": "Enlace interno",
         "label-label-name": "Nombre de la etiqueta",
-        "label-remove-exemplar-link": "",
+        "label-remove-exemplar-link": "Eliminar enlace de ejemplo",
         "label-url": "URL",
-        "label-url-label": "",
-        "placeholder-go-to-examplecom": "",
-        "placeholder-httpsexamplecomvalueraw": "",
-        "placeholder-trace-id": "",
-        "title-remove-exemplar-link": "",
-        "tooltip-data-source": "",
-        "tooltip-internal-link": "",
-        "tooltip-label-name": "",
-        "tooltip-url": "",
-        "tooltip-url-label": ""
+        "label-url-label": "Etiqueta de URL",
+        "placeholder-go-to-examplecom": "Ir a ejemplo.com",
+        "placeholder-httpsexamplecomvalueraw": "https://ejemplo.com/${__value.raw}",
+        "placeholder-trace-id": "traceID",
+        "title-remove-exemplar-link": "Eliminar enlace de ejemplo",
+        "tooltip-data-source": "La fuente de datos a la que se dirigirá el ejemplo.",
+        "tooltip-internal-link": "Habilite esta opción si tiene un enlace interno. Cuando está habilitado, indica el selector de fuente de datos. Seleccione el almacén de datos de trazas de backend para sus datos de ejemplo.",
+        "tooltip-label-name": "El nombre del campo en el objeto de etiquetas que debe utilizarse para obtener el traceID.",
+        "tooltip-url": "La URL del backend de traza al que el usuario iría para ver su traza",
+        "tooltip-url-label": "Utilícelo para anular la etiqueta del botón en el campo traceID del ejemplo."
       },
       "exemplars-settings": {
         "add": "Añadir",
-        "no-exemplars-configurations": "",
-        "title-exemplars": ""
+        "no-exemplars-configurations": "No hay configuraciones de ejemplos",
+        "title-exemplars": "Ejemplos"
       },
       "prom-settings": {
-        "aria-label-default-editor": "",
-        "aria-label-prom-type-type": "",
-        "aria-label-prometheus-type": "",
-        "aria-label-select-http-method": "",
+        "aria-label-default-editor": "Editor predeterminado (Código o Creador)",
+        "aria-label-prom-type-type": "Tipo {{promType}}",
+        "aria-label-prometheus-type": "Tipo de Prometheus",
+        "aria-label-select-http-method": "Seleccionar método HTTP",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Constructor",
+          "label-code": "Código"
         },
-        "label-cache-level": "",
-        "label-custom-query-parameters": "",
-        "label-default-editor": "",
-        "label-disable-metrics-lookup": "",
-        "label-disable-recording-rules-beta": "",
-        "label-http-method": "",
-        "label-incremental-querying-beta": "",
-        "label-metric-names-suggestion-limit": "",
-        "label-prom-type-version": "",
-        "label-prometheus-type": "",
-        "label-query-overlap-window": "",
-        "label-query-timeout": "",
-        "label-scrape-interval": "",
-        "label-series-limit": "",
-        "label-use-series-endpoint": "",
-        "more-info": "",
-        "placeholder-example-maxsourceresolutionmtimeout": "",
-        "title-interval-behaviour": "",
-        "title-other": "",
+        "label-cache-level": "Nivel de caché",
+        "label-custom-query-parameters": "Parámetros de consulta personalizados",
+        "label-default-editor": "Editor predeterminado",
+        "label-disable-metrics-lookup": "Deshabilitar la búsqueda de métricas",
+        "label-disable-recording-rules-beta": "Deshabilitar reglas de registro (beta)",
+        "label-http-method": "Método HTTP",
+        "label-incremental-querying-beta": "Consulta incremental (beta)",
+        "label-metric-names-suggestion-limit": "Límite de sugerencia de nombres de métricas",
+        "label-prom-type-version": "Versión de {{promType}}",
+        "label-prometheus-type": "Tipo de Prometheus",
+        "label-query-overlap-window": "Ventana de superposición de consultas",
+        "label-query-timeout": "Tiempo de espera de la consulta",
+        "label-scrape-interval": "Intervalo de recuperación de datos",
+        "label-series-limit": "Límite de series",
+        "label-use-series-endpoint": "Utilizar punto de conexión de la serie",
+        "more-info": "Para obtener más información sobre cómo configurar el tipo y la versión de Prometheus en las fuentes de datos, consulte la <2>documentación de aprovisionamiento</2>.",
+        "placeholder-example-maxsourceresolutionmtimeout": "Ejemplo: {{example}}",
+        "title-interval-behaviour": "Comportamiento del intervalo",
+        "title-other": "Otro",
         "title-performance": "Rendimiento",
-        "title-query-editor": "",
-        "tooltip-cache-level": "",
-        "tooltip-custom-query-parameters": "",
-        "tooltip-default-editor": "",
-        "tooltip-disable-metrics-lookup": "",
-        "tooltip-disable-recording-rules-beta": "",
-        "tooltip-http-method": "",
-        "tooltip-incremental-querying-beta": "",
-        "tooltip-metric-names-suggestion-limit": "",
-        "tooltip-prom-type-version": "",
-        "tooltip-prometheus-type": "",
-        "tooltip-query-overlap-window": "",
-        "tooltip-query-timeout": "",
-        "tooltip-scrape-interval": "",
-        "tooltip-series-limit": "",
-        "tooltip-use-series-endpoint": ""
+        "title-query-editor": "Editor de consultas",
+        "tooltip-cache-level": "Establece el nivel de caché del navegador para las consultas del editor. Se recomienda una configuración de caché más alta para fuentes de datos de alta cardinalidad.",
+        "tooltip-custom-query-parameters": "Añada parámetros personalizados a la URL de la consulta de Prometheus. Por ejemplo, {{example1}}, {{example2}}, {{example3}} o{{example4}}. Deben concatenarse varios parámetros junto con {{concatenationChar}}.",
+        "tooltip-default-editor": "Establece la opción de editor predeterminada para todos los usuarios de esta fuente de datos.",
+        "tooltip-disable-metrics-lookup": "Al marcar esta opción, se desactivará el selector de métricas y la compatibilidad con métricas/etiquetas en el autocompletado del campo de consulta. Esto es útil si tienes problemas de rendimiento con instancias de Prometheus de mayor tamaño. ",
+        "tooltip-disable-recording-rules-beta": "Esta función deshabilitará las reglas de registro. Actívelo para mejorar el rendimiento del dashboard",
+        "tooltip-http-method": "Puede utilizar el método HTTP POST o GET para consultar su fuente de datos de Prometheus. POST es el método recomendado, ya que permite consultas de mayor tamaño. Cámbielo a GET si tiene una versión de Prometheus anterior a la 2.1 o si las solicitudes POST están restringidas en su red.",
+        "tooltip-incremental-querying-beta": "Esta función cambiará el comportamiento predeterminado de las consultas relativas para solicitar siempre datos nuevos de la instancia de Prometheus, en lugar de almacenar en caché los resultados de las consultas y solo se solicitarán nuevos registros. Actívelo para disminuir la carga de la base de datos y de la red.",
+        "tooltip-metric-names-suggestion-limit": "El número máximo de nombres de métricas que pueden aparecer como sugerencias de autocompletado en el modo de código del editor de consultas.",
+        "tooltip-prom-type-version": "Utilice esta opción para establecer la versión de su instancia {{promType}} si no se configura automáticamente.",
+        "tooltip-prometheus-type": "Defina este valor en el tipo de su base de datos de Prometheus, por ejemplo, Prometheus, Cortex, Mimir o Thanos. Si cambia este campo, se guardarán sus ajustes actuales. Ciertos tipos de Prometheus admiten o no admiten varias API. Por ejemplo, algunos tipos admiten la coincidencia de expresiones regulares para consultas de etiquetas para mejorar el rendimiento. Algunos tipos tienen una API para metadatos. Si configuraseste valor incorrectamente, puede experimentar un comportamiento extraño al consultar métricas y etiquetas. Consulte la documentación de Prometheus para asegurarse de introducir el tipo correcto.",
+        "tooltip-query-overlap-window": "Establezca una duración como {{example1}}, {{example2}} o {{example3}}. El valor predeterminado es {{default}}. Esta duración se añadirá a la duración de cada solicitud incremental.",
+        "tooltip-query-timeout": "Establezca el tiempo de espera de la consulta de Prometheus.",
+        "tooltip-scrape-interval": "Este intervalo es la frecuencia con la que Prometheus recupera datos de los objetivos. Establezca este valor en el intervalo típico de recuperación de datos y evaluación definido en su archivo de configuración de Prometheus. Si establece un valor mayor que el intervalo de su archivo de configuración de Prometheus, Grafana evaluará los datos de acuerdo con este intervalo y verá menos puntos de datos. El valor predeterminado es {{default}}.",
+        "tooltip-series-limit": "El límite se aplica a todos los recursos (métricas, etiquetas y valores) para ambos puntos finales (series y etiquetas). Deje el campo vacío para usar el límite predeterminado (40 000). Establezca el valor en 0 para desactivar el límite y obtenerlo todo (esto puede causar problemas de rendimiento). El límite predeterminado es 40 000.",
+        "tooltip-use-series-endpoint": "Al marcar esta opción, se favorecerá el punto de conexión de la serie con el parámetro {{exampleParameter}} sobre el punto final de los valores de la etiqueta con el parámetro {{exampleParameter}}. Aunque el punto de conexión de los valores de etiqueta se considera más eficiente, algunos usuarios pueden preferir la serie porque tiene un método POST, mientras que el punto de los valores de etiqueta solo tiene un método GET."
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(Deshabilitado)",
+      "enabled-label": "Navegador de métricas"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Solo incluye etiquetas únicas",
+        "description-custom": "Proporciona una plantilla de nombres",
+        "description-verbose": "Todos los nombres y valores de etiqueta",
+        "label-auto": "Automático",
+        "label-custom": "Personalizado",
+        "label-verbose": "Detallado"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Calcular la media sobre las dimensiones",
+        "documentation-bottomk": "Elementos k más pequeños por valor de muestra",
+        "documentation-count": "Contar el número de elementos en el vector",
+        "documentation-count-values": "Contar el número de elementos con el mismo valor",
+        "documentation-group": "Todos los valores en el vector resultante son 1",
+        "documentation-max": "Seleccionar el máximo sobre las dimensiones",
+        "documentation-min": "Seleccionar mínimo sobre dimensiones",
+        "documentation-quantile": "Calcular el cuantil φ (0 ≤ φ ≤ 1) sobre las dimensiones",
+        "documentation-stddev": "Calcular la desviación estándar de la población sobre las dimensiones",
+        "documentation-stdvar": "Calcular la varianza estándar de la población sobre las dimensiones",
+        "documentation-sum": "Calcular la suma sobre las dimensiones",
+        "documentation-topk": "Elementos k más grandes por valor de muestra"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Devuelve el vector de entrada con todos los valores de muestra convertidos a su valor absoluto.",
+        "documentation-absent": "Devuelve un vector vacío si el vector que se le pasa tiene algún elemento y un vector de un elemento con el valor 1 si el vector que se le pasa no tiene elementos. Esto es útil para alertar cuando no existen series temporales para una combinación determinada de nombre y etiqueta de métrica.",
+        "documentation-absent-over-time": "Devuelve un vector vacío si el vector de rango que se le pasa tiene algún elemento y un vector de 1 elemento con valor 1 si el vector de rango que se le pasa no tiene elementos.",
+        "documentation-avg-over-time": "El valor medio de todos los puntos en el intervalo especificado.",
+        "documentation-ceil": "Redondea los valores de muestra de todos los elementos en «v» hacia arriba al número entero más cercano.",
+        "documentation-changes": "Para cada serie temporal de entrada, «changes(v range-vector)» devuelve el número de veces que su valor ha cambiado dentro del intervalo de tiempo proporcionado como un vector instantáneo.",
+        "documentation-clamp": "Fija los valores de muestra de todos los elementos en «v» para tener un límite inferior de «mín.» y un límite superior de «máx.».",
+        "documentation-clamp-max": "Limita los valores de muestra de todos los elementos en «v» para que tengan un límite superior de «máx.».",
+        "documentation-clamp-min": "Limita los valores de muestra de todos los elementos en «v» para que tengan un límite inferior de «mín.».",
+        "documentation-count-over-time": "El recuento de todos los valores en el intervalo especificado.",
+        "documentation-count-scalar": "Devuelve el número de elementos en un vector de serie temporal como un escalar. Esto contrasta con el operador de agregación «count()», que siempre devuelve un vector (uno vacío si el vector de entrada está vacío) y permite la agrupación por etiquetas a través de una cláusula «by».",
+        "documentation-day-of-month": "Devuelve el día del mes para cada una de las horas indicadas en UTC. Los valores devueltos van del 1 al 31.",
+        "documentation-day-of-week": "Devuelve el día de la semana para cada una de las horas indicadas en UTC. Los valores devueltos van del 0 al 6, donde 0 significa domingo, etc.",
+        "documentation-day-of-year": "Devuelve el día del año para cada una de las horas indicadas en UTC. Los valores devueltos van del 1 al 365 para los años no bisiestos y del 1 al 366 para los años bisiestos.",
+        "documentation-days-in-month": "Devuelve el número de días del mes para cada una de las horas indicadas en UTC. Los valores devueltos van del 28 al 31.",
+        "documentation-deg": "Convierte radianes a grados para todos los elementos en v",
+        "documentation-delta": "Calcula la diferencia entre el primer y el último valor de cada elemento de la serie temporal en un vector de rango «v», devolviendo un vector instantáneo con los deltas dados y las etiquetas equivalentes. El delta se extrapola para cubrir el rango de tiempo completo como se especifica en el selector de vector de rango, de modo que es posible obtener un resultado no entero incluso si los valores de muestra son todos enteros.",
+        "documentation-deriv": "Calcula la derivada por segundo de la serie temporal en un vector de rango «v», utilizando una regresión lineal simple.",
+        "documentation-double-exponential-smoothing": "Produce un valor suavizado para las series temporales en función del rango en «v». Cuanto menor sea el factor de suavizado «sf», más importancia se le dará a los datos antiguos. Cuanto mayor sea el factor de tendencia «tf», más tendencias se considerarán en los datos. Tanto «sf» como «tf» deben estar entre 0 y 1.",
+        "documentation-drop-common-labels": "Desecha todas las etiquetas que tienen el mismo nombre y valor en todas las series del vector de entrada.",
+        "documentation-exp": "Calcula la función exponencial para todos los elementos en «v».\nLos casos especiales son:\n* «Exp(+Inf) = +Inf» \n* «Exp(NaN) = NaN»",
+        "documentation-floor": "Redondea los valores de muestra de todos los elementos en «v» hacia abajo al número entero más cercano.",
+        "documentation-histogram-avg": "Devuelve la media aritmética de los valores observados almacenados en un histograma nativo. Las muestras que no son histogramas nativos se ignoran y no aparecen en el vector devuelto.",
+        "documentation-histogram-count": "Devuelve el recuento de observaciones almacenadas en un histograma nativo.",
+        "documentation-histogram-fraction": "Devuelve la fracción estimada de observaciones entre los valores inferior y superior proporcionados.",
+        "documentation-histogram-quantile": "Calcula el cuantil φ (0 ≤ φ ≤ 1) a partir de los cubos «b» de un histograma. Las muestras en «b» son los recuentos de observaciones en cada cubo. Cada muestra debe tener una etiqueta «le», donde el valor de la etiqueta denota el límite superior inclusivo del cubo. (Las muestras sin dicha etiqueta se ignoran silenciosamente). El tipo de métrica del histograma proporciona automáticamente series temporales con el sufijo «_bucket» y las etiquetas que correspondan.",
+        "documentation-histogram-stddev": "Devuelve la desviación estándar estimada de las observaciones en un histograma nativo, basada en la media geométrica de los segmentos en los que se encuentran las observaciones.",
+        "documentation-histogram-stdvar": "Devuelve la varianza estándar estimada de las observaciones en un histograma nativo.",
+        "documentation-histogram-sum": "Devuelve la suma de observaciones almacenadas en un histograma nativo.",
+        "documentation-holt-winters": "Renombrado como double_exponential_smoothing en Prometheus v3.x. Para versiones de Prometheus iguales y superiores a v3.0, utiliza double_exponential_smoothing. \n\nProduce un valor suavizado para las series temporales en función del rango en «v». Cuanto menor sea el factor de suavizado «sf», más importancia se le dará a los datos antiguos. Cuanto mayor sea el factor de tendencia «tf», más tendencias se considerarán en los datos. Tanto «sf» como «tf» deben estar entre 0 y 1.",
+        "documentation-hour": "Devuelve la hora del día para cada una de las horas indicadas en UTC. Los valores devueltos van de 0 a 23.",
+        "documentation-idelta": "Calcula la diferencia entre las dos últimas muestras en el vector de rango «v», devolviendo un vector instantáneo con los deltas dados y las etiquetas equivalentes.",
+        "documentation-increase": "Calcula el aumento en la serie temporal en el vector de rango. Las interrupciones en la monotonía (como los reinicios del contador debido a reinicios del objetivo) se ajustan automáticamente. El aumento se extrapola para cubrir todo el rango de tiempo especificado en el selector de vector de rango, de modo que es posible obtener un resultado no entero incluso si un contador aumenta solo en incrementos enteros.",
+        "documentation-info": "Devuelve los detalles y metadatos más recientes sobre un grupo de métricas, como sus etiquetas y valores actuales, sin realizar ningún cálculo",
+        "documentation-irate": "Calcula la tasa de aumento instantánea por segundo de la serie temporal en el vector de rango. Se basa en los dos últimos puntos de datos. Las interrupciones en la monotonía (como los reinicios del contador debido a reinicios del objetivo) se ajustan automáticamente.",
+        "documentation-label-join": "Para cada serie temporal en «v», une todos los valores de todas las «src_labels» usando «separator» y devuelve la serie temporal con la etiqueta «dst_label» que contiene el valor unido. Puede haber cualquier número de «src_labels» en esta función.",
+        "documentation-label-replace": "Para cada serie temporal en «v», «label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)» coincide con la expresión regular «regex» en la etiqueta «src_label». Si coincide, la serie temporal se devuelve con la etiqueta «dst_label» reemplazada por la expansión de «replacement». «$1» se sustituye por el primer subgrupo coincidente, «$2» por el segundo, etc. Si la expresión regular no coincide, entonces la serie temporal se devuelve sin cambios.",
+        "documentation-last-over-time": "El valor de punto más reciente en el intervalo especificado.",
+        "documentation-ln": "Calcula el logaritmo natural para todos los elementos en «v».\nLos casos especiales son:\n * «ln(+Inf) = +Inf»\n * «ln(0) = -Inf»\n * «ln(x < 0) = NaN»\n * «ln(NaN) = NaN»",
+        "documentation-log10": "Calcula el logaritmo decimal para todos los elementos en «v». Los casos especiales son equivalentes a los de «ln».",
+        "documentation-log2": "Calcula el logaritmo binario para todos los elementos en «v». Los casos especiales son equivalentes a los de «ln».",
+        "documentation-max-over-time": "El valor máximo de todos los puntos en el intervalo especificado.",
+        "documentation-min-over-time": "El valor mínimo de todos los puntos en el intervalo especificado.",
+        "documentation-minute": "Devuelve el minuto de la hora para cada una de las horas indicadas en UTC. Los valores devueltos van de 0 a 59.",
+        "documentation-month": "Devuelve el mes del año para cada una de las horas indicadas en UTC. Los valores devueltos van del 1 al 12, donde 1 significa enero, etc.",
+        "documentation-pi": "Devuelve pi",
+        "documentation-predict-linear": "Predice el valor de la serie temporal «t» segundos a partir de ahora, en función del vector de rango «v», utilizando una regresión lineal simple.",
+        "documentation-present-over-time": "El valor 1 para cualquier serie en el intervalo especificado.",
+        "documentation-quantile-over-time": "El cuantil φ (0 ≤ φ ≤ 1) de los valores en el intervalo especificado.",
+        "documentation-rad": "Convierte grados a radianes para todos los elementos en v",
+        "documentation-rate": "Calcula la tasa media de aumento por segundo de la serie temporal en el vector de rango. Las interrupciones en la monotonía (como los reinicios del contador debido a reinicios del objetivo) se ajustan automáticamente. Además, el cálculo se extrapola a los extremos del rango de tiempo, lo que permite tener en cuenta los raspados perdidos o una alineación imperfecta de los ciclos de raspado con el periodo de tiempo del rango.",
+        "documentation-resets": "Para cada serie temporal de entrada, «resets(v range-vector)» devuelve el número de reinicios del contador dentro del intervalo de tiempo proporcionado como un vector instantáneo. Cualquier disminución del valor entre dos muestras consecutivas se interpreta como un reinicio del contador.",
+        "documentation-round": "Redondea los valores de muestra de todos los elementos en «v» al número entero más cercano. Los empates se resuelven redondeando hacia arriba. El argumento opcional «to_nearest» permite especificar el múltiplo más cercano al que se deben redondear los valores de muestra. Este múltiplo también puede ser una fracción.",
+        "documentation-scalar": "Dado un vector de entrada de un solo elemento, «scalar(v instant-vector)» devuelve el valor de muestra de ese único elemento como un escalar. Si el vector de entrada no tiene exactamente un elemento, «scalar» devolverá «NaN».",
+        "documentation-sgn": "Devuelve un vector con todos los valores de muestra convertidos a su signo, definido de la siguiente manera: 1 si v es positivo, -1 si v es negativo y 0 si v es igual a cero.",
+        "documentation-sort": "Devuelve los elementos del vector ordenados por sus valores de muestra, en orden ascendente.",
+        "documentation-sort-desc": "Devuelve los elementos del vector ordenados por sus valores de muestra, en orden descendente.",
+        "documentation-sqrt": "Calcula la raíz cuadrada de todos los elementos en «v».",
+        "documentation-stddev-over-time": "La desviación estándar de la población de los valores en el intervalo especificado.",
+        "documentation-stdvar-over-time": "La varianza estándar de la población de los valores en el intervalo especificado.",
+        "documentation-sum-over-time": "La suma de todos los valores en el intervalo especificado.",
+        "documentation-time": "Devuelve el número de segundos desde el 1 de enero de 1970 UTC. Ten en cuenta que esto no devuelve la hora actual, sino la hora en la que se evaluará la expresión.",
+        "documentation-timestamp": "Devuelve la marca de tiempo de cada una de las muestras del vector dado como el número de segundos desde el 1 de enero de 1970 UTC.",
+        "documentation-vector": "Devuelve el escalar «s» como un vector sin etiquetas.",
+        "documentation-year": "Devuelve el año para cada una de las horas indicadas en UTC."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "calcula el arcocoseno de todos los elementos en {{argument}}",
+        "documentation-acosh": "calcula el coseno hiperbólico inverso de todos los elementos en {{argument}}",
+        "documentation-asin": "calcula el arcoseno de todos los elementos en {{argument}}",
+        "documentation-asinh": "calcula el seno hiperbólico inverso de todos los elementos en {{argument}}",
+        "documentation-atan": "calcula el arcotangente de todos los elementos en {{argument}}",
+        "documentation-atanh": "calcula la tangente hiperbólica inversa de todos los elementos en {{argument}}",
+        "documentation-cos": "calcula el coseno de todos los elementos en {{argument}}",
+        "documentation-cosh": "calcula el coseno hiperbólico de todos los elementos en {{argument}}",
+        "documentation-sin": "calcula el seno de todos los elementos en {{argument}}",
+        "documentation-sinh": "calcula el seno hiperbólico de todos los elementos en {{argument}}",
+        "documentation-tan": "calcula la tangente de todos los elementos en {{argument}}",
+        "documentation-tanh": "calcula la tangente hiperbólica de todos los elementos en {{argument}}"
       }
     },
     "querybuilder": {
       "feedback-link": {
         "give-feedback": "Enviar comentarios",
-        "title-give-feedback": ""
+        "title-give-feedback": "El explorador de métricas es nuevo. Háganos saber cómo podemos mejorarlo"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Ejemplos: {{value}}",
+        "format": "Formato: {{value}}",
+        "legend": "Leyenda: {{value}}",
+        "step": "Paso: {{value}}",
+        "type": "Tipo: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Buscar métricas por nombre",
+        "type": "Filtrar por tipo"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Una métrica acumulativa que representa un solo contador que aumenta de forma monótona cuyo valor solo puede aumentar o restablecerse a cero al reiniciar.",
+        "description-gauge": "Una métrica que representa un solo valor numérico que puede subir y bajar arbitrariamente.",
+        "description-histogram": "Un histograma toma muestras de observaciones (normalmente cosas como la duración de las solicitudes o el tamaño de las respuestas) y las cuenta en cubos configurables.",
+        "description-native-histogram": "Los histogramas nativos se diferencian de los histogramas clásicos de Prometheus en varios aspectos: los límites de los cubos de los histogramas nativos se calculan mediante una fórmula que depende de la escala (resolución) del histograma nativo y no los define el usuario.",
+        "description-no-type": "Estas métricas no tienen un tipo definido en los metadatos.",
+        "description-summary": "Resume las observaciones de las muestras (normalmente aspectos como la duración de las solicitudes y el tamaño de las respuestas) y puede calcular cuantiles configurables en una ventana de tiempo deslizante.",
+        "description-unknown": "A estas métricas se les ha dado el tipo «desconocido» en los metadatos.",
+        "label-counter": "Contador",
+        "label-gauge": "Medidor",
+        "label-histogram": "Histograma",
+        "label-native-histogram": "Histograma nativo",
+        "label-no-type": "Ningún tipo",
+        "label-summary": "Resumen",
+        "label-unknown": "Desconocido"
       },
       "handle-function": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "El análisis de la consulta es ambiguo."
         }
       },
       "label-filter-item": {
-        "aria-label-remove": "",
-        "placeholder-select-label": "",
+        "aria-label-remove": "Eliminar {{name}}",
+        "placeholder-select-label": "Seleccionar etiqueta",
         "placeholder-select-value": "Seleccionar valor"
       },
       "label-filters": {
-        "label-filters": "",
-        "label-label-filters": "",
-        "tooltip-label-filters": ""
+        "label-filters": "Filtros de etiquetas",
+        "label-label-filters": "Filtros de etiquetas",
+        "tooltip-label-filters": "Opcional: se utiliza para filtrar la selección de métricas para este tipo de consulta."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Cargando etiquetas",
+        "noOptionsMessage-no-labels-found": "No se ha encontrado ninguna etiqueta"
       },
       "metric-combobox": {
         "async-select": {
-          "aria-label-open-metrics-explorer": "",
-          "placeholder-select-metric": "",
-          "tooltip-open-metrics-explorer": ""
+          "aria-label-open-metrics-explorer": "Abrir el explorador de métricas",
+          "placeholder-select-metric": "Seleccionar métrica",
+          "tooltip-open-metrics-explorer": "Abrir el explorador de métricas"
         },
         "label-metric": "Métrica",
-        "tooltip-metric": ""
+        "tooltip-metric": "Opcional: devuelve una lista de valores de etiqueta para el nombre de etiqueta en la métrica especificada."
       },
       "metrics-modal": {
-        "aria-label-browse-metrics": "",
-        "currently-selected": "",
-        "metrics-pre-filtered": "",
-        "title-metrics-explorer": ""
+        "aria-label-browse-metrics": "Examinar métricas",
+        "currently-selected": "Seleccionada actualmente: {{selected}}",
+        "metrics-pre-filtered": "Estas métricas se han filtrado previamente por las etiquetas elegidas en los filtros de etiquetas.",
+        "title-metrics-explorer": "Explorador de métricas"
       },
       "nested-query": {
         "label": {
-          "ignoring": "",
+          "ignoring": "Ignorando",
           "on": "Activada"
         },
         "operator": "Operador",
-        "tooltip-remove-match": "",
-        "vector-matches": ""
+        "tooltip-remove-match": "Eliminar coincidencia",
+        "vector-matches": "Coincidencias de vector"
       },
       "operation-editor": {
-        "not-found": "",
-        "title-remove": ""
+        "not-found": "Operación {{id}} no encontrada",
+        "title-remove": "Eliminar {{name}}"
       },
       "operation-header": {
         "placeholder-replace-with": "Reemplazar con",
-        "title-click-to-view-alternative-operations": "",
-        "title-remove-operation": ""
+        "title-click-to-view-alternative-operations": "Haga clic para ver operaciones alternativas",
+        "title-remove-operation": "Eliminar operación"
       },
       "operation-info-button": {
-        "title-click-to-show-description": "",
-        "title-remove-operation": ""
+        "title-click-to-show-description": "Haga clic para mostrar la descripción",
+        "title-remove-operation": "Eliminar operación"
       },
       "operation-list": {
-        "operations": "",
+        "operations": "Operaciones",
         "placeholder-search": "Buscar",
-        "title-add-operation": ""
+        "title-add-operation": "Añadir operación"
       },
       "operation-param-editor": {
-        "title-add": "",
-        "title-remove": ""
+        "title-add": "Añadir {{name}}",
+        "title-remove": "Eliminar {{name}}"
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Calcula {{aggregationName}} sobre las dimensiones a la vez que conserva {{labelWord}} {{labels}}.",
+          "label-default": "Calcula {{aggregationName}} sobre las dimensiones.",
+          "label-without": "Calcula {{aggregationName}} sobre las dimensiones {{labels}}. Todas las demás etiquetas se conservan."
         }
       },
       "prom-query-builder-options": {
-        "aria-label-lower-limit-parameter": "",
-        "aria-label-select-resolution": "",
+        "aria-label-lower-limit-parameter": "Establecer límite inferior para el parámetro de paso",
+        "aria-label-select-resolution": "Seleccionar resolución",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Mapa de calor",
+          "label-table": "Tabla",
+          "label-time-series": "Serie temporal"
         },
-        "label-exemplars": "",
+        "label-exemplars": "Ejemplos",
         "label-format": "Formato",
-        "label-min-step": "",
-        "label-resolution": "",
+        "label-min-step": "Paso mínimo",
+        "label-resolution": "Resolución",
         "label-type": "Tipo",
-        "placeholder-auto": "",
+        "placeholder-auto": "auto",
         "title-options": "Opciones",
-        "tooltip-min-step": ""
+        "tooltip-min-step": "Un límite inferior adicional para el parámetro de paso de la consulta de Prometheus y para las variables <2>{{interval}}</2> y <4>{{rateInterval}}</4>."
       },
       "prom-query-code-editor-autocomplete-info": {
-        "autocomplete-suggestions-limited": "",
-        "tooltip-autocomplete-suggestions-limited": ""
+        "autocomplete-suggestions-limited": "Sugerencias de autocompletado limitadas",
+        "tooltip-autocomplete-suggestions-limited": "El número de nombres de métricas supera el límite de autocompletado. Solo se muestran las {{autocompleteLimit}} métricas más relevantes. Puede ajustar el umbral en la configuración de la fuente de datos."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Hay un error de sintaxis o la estructura de la consulta no se puede visualizar al cambiar al modo constructor. Es posible que se pierdan partes de la consulta.",
+        "confirmText-continue": "Continuar",
         "kick-start-your-query": "Inicie su consulta",
-        "label-explain": "",
-        "run-queries": "",
-        "title-parsing-error-switch-builder": ""
+        "label-explain": "Explicación",
+        "run-queries": "Ejecutar consultas",
+        "title-parsing-error-switch-builder": "Error de análisis: ¿cambiar al modo Creador?"
       },
       "prom-query-legend-editor": {
-        "label-legend": "",
-        "placeholder-select-legend-mode": "",
-        "tooltip-legend": ""
+        "label-legend": "Leyenda",
+        "placeholder-select-legend-mode": "Seleccionar modo de leyenda",
+        "tooltip-legend": "Anulación o plantilla del nombre de la serie. Por ejemplo, {{templateExample}} se reemplazará con el valor de etiqueta para {{labelName}}."
       },
       "query-builder-hints": {
-        "hint-details": ""
+        "hint-details": "pista: {{hintDetails}}"
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Constructor",
+          "label-code": "Código"
         }
       },
       "query-pattern": {
-        "apply-query": "",
-        "aria-label-apply-query-starter-button": "",
-        "aria-label-back-button": "",
-        "aria-label-create-new-query-button": "",
-        "aria-label-raw-query": "",
-        "aria-label-use-this-query-button": "",
+        "apply-query": "Aplicar consulta",
+        "aria-label-apply-query-starter-button": "botón de inicio de aplicación de consulta",
+        "aria-label-back-button": "botón para volver",
+        "aria-label-create-new-query-button": "botón para crear una nueva consulta",
+        "aria-label-raw-query": "Consulta sin procesar {{patternName}}",
+        "aria-label-use-this-query-button": "utilizar este botón de consulta",
         "back": "Atrás",
-        "create-new-query": "",
+        "create-new-query": "Crear una nueva consulta",
         "use-this-query": "Utilizar esta consulta"
       },
       "query-patterns-modal": {
-        "aria-label-close-kick-start-your-query-modal": "",
+        "aria-label-close-kick-start-your-query-modal": "cerrar iniciar su modo de consulta",
         "aria-label-kick-start-your-query-modal": "Inicie su modal de consulta",
-        "aria-label-toggle-query-starter": "",
+        "aria-label-toggle-query-starter": "abrir y cerrar tarjeta de iniciador de consultas {{patternType}}",
         "close": "Cerrar",
-        "description-kick-start-your-query": "",
-        "label-toggle-query-starter": "",
+        "description-kick-start-your-query": "Inicie su consulta seleccionando una de estas consultas. A continuación, puede continuar para completar su consulta.",
+        "label-toggle-query-starter": "iniciadores de consultas {{patternType}}",
         "title-kick-start-your-query": "Inicie su consulta"
       },
       "raw-query": {
-        "aria-label-selector": ""
+        "aria-label-selector": "selector"
       },
       "results-table": {
-        "content-descriptive-type": "",
+        "content-descriptive-type": "Al crear un {{descriptiveType}}, Prometheus expone varias series con el contador de tipos. ",
         "description": "Descripción",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "No se han encontrado métricas. Intenta ampliar los filtros de etiquetas.",
+        "message-expand-search": "No se han encontrado métricas. Intenta ampliar la búsqueda y los filtros.",
+        "message-no-metrics-found": "No se han encontrado métricas en la fuente de datos.",
         "name": "Nombre",
         "type": "Tipo"
       },
       "update-function-args": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "El análisis de la consulta es ambiguo."
         }
       }
     }
diff --git a/packages/grafana-prometheus/src/locales/fr-FR/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/fr-FR/grafana-prometheus.json
index 75fffbffa7e..74fdd4a4ff2 100644
--- a/packages/grafana-prometheus/src/locales/fr-FR/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/fr-FR/grafana-prometheus.json
@@ -158,8 +158,8 @@
         "aria-label-prometheus-type": "Type Prometheus",
         "aria-label-select-http-method": "Sélectionner la méthode HTTP",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Code"
         },
         "label-cache-level": "Niveau du cache",
         "label-custom-query-parameters": "Paramètres de requête personnalisés",
@@ -200,114 +200,114 @@
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(Désactivé)",
+      "enabled-label": "Navigateur de métriques"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Inclut uniquement les étiquettes uniques",
+        "description-custom": "Fournir un modèle de nommage",
+        "description-verbose": "Tous les noms et valeurs d’étiquettes",
+        "label-auto": "Auto",
+        "label-custom": "Personnalisée",
+        "label-verbose": "Verbeux"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Calculer la moyenne par dimension",
+        "documentation-bottomk": "Les plus petits éléments k selon la valeur de l’échantillon",
+        "documentation-count": "Compter le nombre d’éléments dans le vecteur",
+        "documentation-count-values": "Compter le nombre d’éléments avec la même valeur",
+        "documentation-group": "Toutes les valeurs du vecteur résultant sont égales à 1",
+        "documentation-max": "Sélectionner la valeur maximale par dimension",
+        "documentation-min": "Sélectionner la valeur minimale par dimension",
+        "documentation-quantile": "Calculer le quantile φ (0 ≤ φ ≤ 1) par dimension",
+        "documentation-stddev": "Calculer l’écart-type de la population par dimension",
+        "documentation-stdvar": "Calculer la variance-type de la population par dimension",
+        "documentation-sum": "Calculer la somme par dimension",
+        "documentation-topk": "Les plus grands éléments k selon la valeur de l’échantillon"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Renvoie le vecteur d’entrée avec toutes les valeurs converties en valeurs absolues.",
+        "documentation-absent": "Renvoie un vecteur vide si le vecteur passé en paramètre contient des éléments et un vecteur à un élément contenant la valeur 1 s’il est vide. Utile pour déclencher des alertes lorsqu’aucune série chronologique n’existe pour une combinaison donnée de nom de métrique et d’étiquette.",
+        "documentation-absent-over-time": "Renvoie un vecteur vide si le vecteur de plage passé en paramètre contient des éléments et un vecteur à un élément contenant la valeur 1 s’il est vide.",
+        "documentation-avg-over-time": "La valeur moyenne de tous les points dans l’intervalle spécifié.",
+        "documentation-ceil": "Arrondit à l’entier supérieur les valeurs d’échantillon de tous les éléments dans « v ».",
+        "documentation-changes": "Pour chaque série chronologique d’entrée, « changes(v range-vector) » renvoie le nombre de fois où sa valeur a changé dans la période spécifiée, sous forme de vecteur instantané.",
+        "documentation-clamp": "Saturation des valeurs d’échantillon des éléments de « v » : applique une borne inférieure « min. » et une borne supérieure « max. ».",
+        "documentation-clamp-max": "Saturation des valeurs d’échantillon des éléments de « v » : applique une borne supérieure « max. ».",
+        "documentation-clamp-min": "Saturation des valeurs d’échantillon des éléments de « v » : applique une borne inférieure « min. ».",
+        "documentation-count-over-time": "Le nombre total de valeurs dans l’intervalle spécifié.",
+        "documentation-count-scalar": "Renvoie le nombre d’éléments dans un vecteur de séries chronologiques sous forme scalaire. Contrairement à l’opérateur d’agrégation « count() », qui renvoie toujours un vecteur (même vide) et permet un regroupement via « by ».",
+        "documentation-day-of-month": "Renvoie le jour du mois pour chaque horodatage fourni (en UTC). Les valeurs renvoyées vont de 1 à 31.",
+        "documentation-day-of-week": "Renvoie le jour de la semaine pour chaque horodatage fourni (en UTC). Les valeurs renvoyées vont de 0 (dimanche) à 6 (samedi).",
+        "documentation-day-of-year": "Renvoie le jour de l’année pour chaque horodatage fourni (en UTC). Les valeurs renvoyées vont de 1 à 365 pour les années non bissextiles et de 1 à 366 pour les années bissextiles.",
+        "documentation-days-in-month": "Renvoie le nombre de jours dans le mois pour chaque horodatage fourni (en UTC). Les valeurs renvoyées vont de 28 à 31.",
+        "documentation-deg": "Convertit des radians en degrés pour tous les éléments dans v",
+        "documentation-delta": "Calcule la différence entre la première et la dernière valeur de chaque élément d’une série chronologique dans un vecteur de plage « v » et renvoie un vecteur instantané avec les écarts et les étiquettes correspondantes. L’écart est extrapolé sur toute la plage de temps, ce qui peut produire des résultats non entiers même avec des valeurs d’échantillon entières.",
+        "documentation-deriv": "Calcule la dérivée par seconde d’une série chronologique dans un vecteur de plage « v », à l’aide d’une régression linéaire simple.",
+        "documentation-double-exponential-smoothing": "Produit une valeur lissée pour une série chronologique à partir de la plage « v ». Plus le facteur de lissage « sf » est bas, plus l’importance est donnée aux anciennes données. Plus le facteur de tendance « tf » est élevé, plus les tendances sont prises en compte. Les valeurs de « sf » et de « tf » doivent être comprises entre 0 et 1.",
+        "documentation-drop-common-labels": "Supprime toutes les étiquettes dont les noms et les valeurs sont identiques dans toutes les séries du vecteur d’entrée.",
+        "documentation-exp": "Calcule la fonction exponentielle de tous les éléments de « v ».\nCas particuliers :\n* « Exp(+Inf) = +Inf » \n* « Exp(NaN) = NaN »",
+        "documentation-floor": "Arrondit à l’entier inférieur les valeurs d’échantillon de tous les éléments dans « v ».",
+        "documentation-histogram-avg": "Renvoie la moyenne arithmétique des valeurs observées dans un histogramme natif. Les échantillons non natifs sont ignorés et exclus du vecteur retourné.",
+        "documentation-histogram-count": "Renvoie le nombre d’observations enregistrées dans un histogramme natif.",
+        "documentation-histogram-fraction": "Renvoie la fraction estimée des observations comprises entre les valeurs inférieure et supérieure fournies.",
+        "documentation-histogram-quantile": "Calcule le quantile φ (0 ≤ φ ≤ 1) à partir des buckets « b » d’un histogramme. Les échantillons dans « b » correspondent aux comptes d’observations dans chaque bucket. Chaque échantillon doit comporter une étiquette « le » dont la valeur indique la borne supérieure (incluse) du bucket. (Les échantillons ne comportant pas cette étiquette sont ignorés sans avertissement.) Le type de métrique histogramme fournit automatiquement des séries chronologiques avec le suffixe « _bucket » et les étiquettes appropriées.",
+        "documentation-histogram-stddev": "Renvoie l’écart-type estimé des observations dans un histogramme natif, calculé à partir de la moyenne géométrique des buckets dans lesquels se trouvent les observations.",
+        "documentation-histogram-stdvar": "Renvoie la variance-type estimée des observations dans un histogramme natif.",
+        "documentation-histogram-sum": "Renvoie la somme des observations enregistrées dans un histogramme natif.",
+        "documentation-holt-winters": "Renommée en double_exponential_smoothing dans Prometheus v3.x. Pour les versions de Prometheus égales ou supérieures à la v3.0, merci d’utiliser double_exponential_smoothing. \n\nGénère une valeur lissée pour une série chronologique en fonction de l’intervalle défini dans « v ». Plus le facteur de lissage « sf » est faible, plus l’importance est donnée aux données anciennes. Plus le facteur de tendance « tf » est élevé, plus les tendances des données sont prises en compte. Les valeurs de « sf » et de « tf » doivent être comprises entre 0 et 1.",
+        "documentation-hour": "Renvoie l’heure de la journée pour chaque horodatage fourni (en UTC). Les valeurs renvoyées vont de 0 à 23.",
+        "documentation-idelta": "Calcule la différence entre les deux derniers échantillons dans le vecteur de plage « v » et renvoie un vecteur instantané contenant les deltas et les étiquettes correspondantes.",
+        "documentation-increase": "Calcule l’augmentation d’une série chronologique sur une période donnée. Les ruptures de monotonie (comme les remises à zéro du compteur liées à un redémarrage de la cible) sont automatiquement corrigées. L’augmentation est extrapolée sur l’ensemble de l’intervalle de temps spécifié dans le sélecteur de plage, ce qui permet d’obtenir un résultat non entier, même si le compteur n’augmente que par valeurs entières.",
+        "documentation-info": "Renvoie les dernières métadonnées disponibles sur un groupe de métriques, comme leurs étiquettes et valeurs actuelles, sans effectuer de calcul",
+        "documentation-irate": "Calcule le taux instantané d’augmentation par seconde d’une série chronologique sur l’intervalle donné. Ce calcul repose sur les deux derniers points de données. Les ruptures de monotonie (comme les remises à zéro du compteur dues à un redémarrage de la cible) sont automatiquement corrigées.",
+        "documentation-label-join": "Pour chaque série chronologique dans « v », concatène toutes les valeurs des étiquettes « src_labels » en utilisant un « séparateur », puis renvoie la série avec une nouvelle étiquette « dst_label » contenant cette valeur concaténée. Cette fonction peut prendre un nombre quelconque de « src_labels ».",
+        "documentation-label-replace": "Pour chaque série chronologique dans « v », la fonction « label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string) » applique l’expression régulière « regex » à l’étiquette « src_label ». Si elle correspond, la série est renvoyée avec l’étiquette « dst_label » remplacée selon la chaîne « replacement ». « $1 » est remplacé par le premier groupe capturé, « $2 » par le second, etc. Si l’expression régulière ne correspond pas, la série est renvoyée inchangée.",
+        "documentation-last-over-time": "La valeur de point la plus récente dans l’intervalle spécifié.",
+        "documentation-ln": "Calcule le logarithme népérien pour tous les éléments de « v ».\nCas particuliers :\n * « ln(+Inf) = +Inf »\n * « ln(0) = -Inf »\n * « ln(x < 0) = NaN »\n * « ln(NaN) = NaN »",
+        "documentation-log10": "Calcule le logarithme décimal pour tous les éléments de « v ». Les cas particuliers sont identiques à ceux de « ln ».",
+        "documentation-log2": "Calcule le logarithme binaire pour tous les éléments de « v ». Les cas particuliers sont identiques à ceux de « ln ».",
+        "documentation-max-over-time": "La valeur maximale de tous les points sur l’intervalle spécifié.",
+        "documentation-min-over-time": "La valeur minimale de tous les points sur l’intervalle spécifié.",
+        "documentation-minute": "Renvoie la minute de l’heure pour chaque horodatage fourni (en UTC). Les valeurs renvoyées vont de 0 à 59.",
+        "documentation-month": "Renvoie le mois de l’année pour chaque horodatage fourni (en UTC). Les valeurs renvoyées vont de 1 à 12 (1 correspondant à janvier, etc.).",
+        "documentation-pi": "Renvoie la valeur de pi",
+        "documentation-predict-linear": "Prédit la valeur de la série chronologique à « t » secondes dans le futur, en se basant sur le vecteur d’intervalle « v », à l’aide d’une régression linéaire simple.",
+        "documentation-present-over-time": "La valeur 1 pour toute série dans l’intervalle spécifié.",
+        "documentation-quantile-over-time": "Le quantile φ (0 ≤ φ ≤ 1) des valeurs dans l’intervalle spécifié.",
+        "documentation-rad": "Convertit les degrés en radians pour tous les éléments de v",
+        "documentation-rate": "Calcule le taux moyen d’augmentation par seconde de la série chronologique dans le vecteur d’intervalle. Les ruptures de monotonie (telles que les remises à zéro du compteur dues à un redémarrage de la cible) sont automatiquement corrigées. Le calcul est également extrapolé aux extrémités de l’intervalle de temps, afin de compenser d’éventuelles collectes manquées ou un mauvais alignement des cycles de collecte avec la période analysée.",
+        "documentation-resets": "Pour chaque série chronologique d’entrée, « resets(v range-vector) » renvoie le nombre de remises à zéro du compteur sur la période donnée, sous forme de vecteur instantané. Toute diminution de la valeur entre deux échantillons consécutifs est interprétée comme une remise à zéro du compteur.",
+        "documentation-round": "Arrondit les valeurs d’échantillon de tous les éléments de « v » à l’entier le plus proche. En cas d’égalité, l’arrondi est effectué vers le haut. L’argument optionnel « to_nearest » permet de spécifier le multiple auquel les valeurs doivent être arrondies. Ce multiple peut être fractionnaire.",
+        "documentation-scalar": "À partir d’un vecteur contenant un seul élément, « scalar(v instant-vector) » renvoie la valeur de cet échantillon sous forme de scalaire. Si le vecteur d’entrée ne contient pas exactement un élément, « scalar » renvoie « NaN ».",
+        "documentation-sgn": "Renvoie un vecteur avec toutes les valeurs converties en leur signe : 1 si la valeur est positive, -1 si elle est négative et 0 si elle est nulle.",
+        "documentation-sort": "Renvoie les éléments du vecteur triés par valeur d’échantillon, par ordre croissant.",
+        "documentation-sort-desc": "Renvoie les éléments du vecteur triés par valeur d’échantillon, par ordre décroissant.",
+        "documentation-sqrt": "Calcule la racine carrée de tous les éléments de « v ».",
+        "documentation-stddev-over-time": "L’écart-type de la population des valeurs dans l’intervalle spécifié.",
+        "documentation-stdvar-over-time": "La variance-type de la population des valeurs dans l’intervalle spécifié.",
+        "documentation-sum-over-time": "La somme de toutes les valeurs dans l’intervalle spécifié.",
+        "documentation-time": "Renvoie le nombre de secondes écoulées depuis le 1er janvier 1970 (UTC). À noter : cette valeur ne correspond pas à l’heure actuelle, mais à l’instant auquel l’expression est évaluée.",
+        "documentation-timestamp": "Renvoie l’horodatage de chaque échantillon du vecteur fourni, sous forme de nombre de secondes depuis le 1er janvier 1970 (UTC).",
+        "documentation-vector": "Renvoie le scalaire « s » sous forme de vecteur sans étiquette.",
+        "documentation-year": "Renvoie l’année correspondant à chaque horodatage fourni (en UTC)."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "calcule l’arc cosinus de tous les éléments dans {{argument}}",
+        "documentation-acosh": "calcule le cosinus hyperbolique inverse de tous les éléments dans {{argument}}",
+        "documentation-asin": "calcule l’arc sinus de tous les éléments dans {{argument}}",
+        "documentation-asinh": "calcule le sinus hyperbolique inverse de tous les éléments dans {{argument}}",
+        "documentation-atan": "calcule l’arc tangente de tous les éléments dans {{argument}}",
+        "documentation-atanh": "calcule la tangente hyperbolique inverse de tous les éléments dans {{argument}}",
+        "documentation-cos": "calcule le cosinus de tous les éléments dans {{argument}}",
+        "documentation-cosh": "calcule le cosinus hyperbolique de tous les éléments dans {{argument}}",
+        "documentation-sin": "calcule le sinus de tous les éléments dans {{argument}}",
+        "documentation-sinh": "calcule le sinus hyperbolique de tous les éléments dans {{argument}}",
+        "documentation-tan": "calcule la tangente de tous les éléments dans {{argument}}",
+        "documentation-tanh": "calcule la tangente hyperbolique de tous les éléments dans {{argument}}"
       }
     },
     "querybuilder": {
@@ -316,31 +316,31 @@
         "title-give-feedback": "L’explorateur de métriques est une nouvelle fonctionnalité ; faites-nous part de vos retours pour l’améliorer"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Exemples : {{value}}",
+        "format": "Format : {{value}}",
+        "legend": "Légende : {{value}}",
+        "step": "Étape : {{value}}",
+        "type": "Type : {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Rechercher des métriques par nom",
+        "type": "Filtrer par type"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Une métrique cumulative qui représente un compteur croissant dont la valeur ne peut qu’augmenter ou être réinitialisée à zéro lors d’un redémarrage.",
+        "description-gauge": "Une métrique représentant une valeur numérique unique pouvant fluctuer librement.",
+        "description-histogram": "Un histogramme échantillonne des observations (par exemple, durées de requêtes ou tailles de réponse) et les répartit dans des classes configurables.",
+        "description-native-histogram": "Les histogrammes natifs diffèrent des histogrammes classiques de Prometheus à plusieurs égards : leurs bornes de classe sont calculées à partir d’une formule dépendant de leur résolution et ne sont pas définies par l’utilisateur.",
+        "description-no-type": "Ces métriques n’ont pas de type défini dans les métadonnées.",
+        "description-summary": "Un résumé échantillonne des observations (par exemple, durées de requêtes ou tailles de réponse) et permet de calculer des quantiles configurables sur une fenêtre temporelle glissante.",
+        "description-unknown": "Ces métriques sont marquées comme inconnues dans les métadonnées.",
+        "label-counter": "Compteur",
+        "label-gauge": "Jauge",
+        "label-histogram": "Histogramme",
+        "label-native-histogram": "Histogramme natif",
+        "label-no-type": "Aucun type",
+        "label-summary": "Résumé",
+        "label-unknown": "Inconnu"
       },
       "handle-function": {
         "text": {
@@ -358,8 +358,8 @@
         "tooltip-label-filters": "Facultatif : utilisé pour filtrer la sélection de métrique pour ce type de requête."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Chargement des étiquettes",
+        "noOptionsMessage-no-labels-found": "Aucune étiquette trouvée"
       },
       "metric-combobox": {
         "async-select": {
@@ -409,18 +409,18 @@
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Calcule {{aggregationName}} sur les dimensions tout en conservant {{labelWord}} {{labels}}.",
+          "label-default": "Calcule {{aggregationName}} sur les dimensions.",
+          "label-without": "Calcule {{aggregationName}} sur les dimensions {{labels}}. Toutes les autres étiquettes sont conservées."
         }
       },
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "Définir la limite inférieure pour le paramètre d’étape",
         "aria-label-select-resolution": "Sélectionner une résolution",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Carte thermique",
+          "label-table": "Tableau",
+          "label-time-series": "Série chronologique"
         },
         "label-exemplars": "Exemples",
         "label-format": "Format",
@@ -436,8 +436,8 @@
         "tooltip-autocomplete-suggestions-limited": "Le nombre de noms de métriques dépasse la limite de saisie semi-automatique. Seules les {{autocompleteLimit}} métriques les plus pertinentes sont affichées. Vous pouvez ajuster le seuil dans les paramètres de la source de données."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Une erreur de syntaxe ou une structure de requête invalide empêche l’affichage en mode Builder. Certaines parties de la requête peuvent être perdues.",
+        "confirmText-continue": "Continuer",
         "kick-start-your-query": "Lancer votre requête",
         "label-explain": "Expliquer",
         "run-queries": "Exécuter les requêtes",
@@ -453,8 +453,8 @@
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Code"
         }
       },
       "query-pattern": {
@@ -483,9 +483,9 @@
       "results-table": {
         "content-descriptive-type": "Lors de la création d’un(e) {{descriptiveType}}, Prometheus expose plusieurs séries avec le compteur de type. ",
         "description": "Description",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Aucune métrique trouvée. Essayez d’élargir vos filtres d’étiquettes.",
+        "message-expand-search": "Aucune métrique trouvée. Essayez d’élargir votre recherche et vos filtres.",
+        "message-no-metrics-found": "Aucune métrique trouvée dans la source de données.",
         "name": "Nom",
         "type": "Type"
       },
diff --git a/packages/grafana-prometheus/src/locales/hu-HU/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/hu-HU/grafana-prometheus.json
index 454e51f3684..65ac3ae2f6e 100644
--- a/packages/grafana-prometheus/src/locales/hu-HU/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/hu-HU/grafana-prometheus.json
@@ -158,8 +158,8 @@
         "aria-label-prometheus-type": "Prometheus-típus",
         "aria-label-select-http-method": "HTTP-módszer kiválasztása",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Építő",
+          "label-code": "Kód"
         },
         "label-cache-level": "Gyorsítótár szintje",
         "label-custom-query-parameters": "Egyéni lekérdezési paraméterek",
@@ -200,114 +200,114 @@
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(Letiltva)",
+      "enabled-label": "Metrikaböngésző"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Csak egyedi címkéket tartalmaz",
+        "description-custom": "Adjon meg egy elnevezési sablont",
+        "description-verbose": "Minden címkenév és -érték",
+        "label-auto": "Automatikus",
+        "label-custom": "Egyéni",
+        "label-verbose": "Részletes"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Számítsa ki a méretek átlagát",
+        "documentation-bottomk": "A legkisebb k elem mintaérték szerint",
+        "documentation-count": "Számolja meg a vektor elemeinek számát",
+        "documentation-count-values": "Számolja meg az azonos értékű elemek számát",
+        "documentation-group": "Az eredményül kapott vektor összes értéke: 1",
+        "documentation-max": "Válassza ki a maximális méreteket",
+        "documentation-min": "Válassza ki a minimális méreteket",
+        "documentation-quantile": "Számítsa ki a φ-kvantilist (0 ≤ φ ≤ 1) a dimenziók mentén",
+        "documentation-stddev": "Számítsa ki a populáció szórását a dimenziók mentén",
+        "documentation-stdvar": "Számítsa ki a populáció szabványos varianciáját a dimenziók mentén",
+        "documentation-sum": "Számítsa ki az összeget a dimenziók mentén",
+        "documentation-topk": "A legnagyobb k elemek mintaérték szerint"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Visszaadja a bemeneti vektort, amelyben az összes mintaérték abszolút értékre van konvertálva.",
+        "documentation-absent": "Üres vektort ad vissza, ha az átadott vektor tartalmaz elemeket, és 1 elemből álló vektort ad vissza, amelynek értéke 1, ha az átadott vektor nem tartalmaz elemeket. Ez akkor hasznos, ha figyelmeztetésre van szükség, amikor egy adott metrika név-címke kombinációjához nem létezik idősor.",
+        "documentation-absent-over-time": "Üres vektort ad vissza, ha az átadott tartományvektor tartalmaz elemeket, és 1 elemből álló vektort ad vissza, amelynek értéke 1, ha az átadott tartományvektor nem tartalmaz elemeket.",
+        "documentation-avg-over-time": "A megadott intervallum összes pontjának átlagértéke.",
+        "documentation-ceil": "A „v” összes elemének mintavételi értékeit a legközelebbi egész számra felkerekíti.",
+        "documentation-changes": "Minden bemeneti idősor esetében a „changes(v range-vector)” függvény az adott időtartományon belül az érték változásának számát adja vissza pillanatnyi vektorként.",
+        "documentation-clamp": "A „v” összes elemének mintavételi értékeit úgy rögzíti, hogy az alsó határ „min”, a felső határ pedig „max” legyen.",
+        "documentation-clamp-max": "A „v” összes elemének mintavételi értékeit úgy rögzíti, hogy a felső határ „max” legyen.",
+        "documentation-clamp-min": "A „v” összes elemének mintavételi értékeit úgy rögzíti, hogy az alsó határ „min” legyen.",
+        "documentation-count-over-time": "A megadott intervallum összes értékének száma.",
+        "documentation-count-scalar": "Visszaadja az idősorvektor elemeinek számát skalárként. Ez ellentétben áll a „count()” összesítő operátorral, amely mindig vektort ad vissza (üreset, ha a bemeneti vektor üres) és lehetővé teszi a címkék szerinti csoportosítást a „by” záradékkal.",
+        "documentation-day-of-month": "Visszaadja az időpontok adott hónapra vonatkozó napját UTC-ben. A visszaadott értékek 1 és 31 között lehetnek.",
+        "documentation-day-of-week": "Visszaadja az időpontok adott hétre vonatkozó napját UTC-ben. A visszaadott értékek 0 és 6 között lehetnek, ahol a 0 vasárnapot jelent stb.",
+        "documentation-day-of-year": "Visszaadja az időpontok adott évre vonatkozó napját UTC-ben. A visszaadott értékek 1 és 365 között lehetnek a nem szökőévek esetében, és 1 és 366 között a szökőévek esetében.",
+        "documentation-days-in-month": "Visszaadja az adott időpontokhoz tartozó hónap napjainak számát UTC időzóna szerint. A visszaadott értékek 28 és 31 között lehetnek.",
+        "documentation-deg": "A v összes elemének radiánjait fokokká alakítja át",
+        "documentation-delta": "Kiszámítja a „v” tartományvektorban szereplő idősorelemek első és utolsó értéke közötti különbséget, és visszaad egy pillanatnyi vektort a megadott deltákkal és egyenértékű címkékkel. A delta extrapolálásra kerül, hogy lefedje a tartományvektor-választóban megadott teljes időtartományt, így lehetséges, hogy nem egész számú eredményt kapunk, még akkor is, ha a mintaértékek mind egész számok.",
+        "documentation-deriv": "Egyszerű lineáris regresszió segítségével kiszámítja az idősor másodpercenkénti deriváltját egy „v” tartományvektorban.",
+        "documentation-double-exponential-smoothing": "A „v” tartomány alapján simított értéket állít elő az idősorokhoz. Minél alacsonyabb az „sf” simítási tényező, annál nagyobb jelentőséget kapnak a régebbi adatok. Minél magasabb a „tf” trendtényező, annál nagyobb szerepet kapnak az adatokban a trendek. Mind az „sf”, mind a „tf” értékének 0 és 1 között kell lennie.",
+        "documentation-drop-common-labels": "Eltávolít minden olyan címkét, amely azonos névvel és értékkel rendelkezik a bemeneti vektor összes sorozatában.",
+        "documentation-exp": "Kiszámítja az exponenciális függvényt a „v” összes elemére.\nKülönleges esetek:\n* „Exp(+Inf) = +Inf”\n* „Exp(NaN) = NaN”",
+        "documentation-floor": "A „v” összes elemének mintavételi értékeit a legközelebbi egész számra lekerekíti.",
+        "documentation-histogram-avg": "Visszaadja a natív hisztogramban tárolt megfigyelt értékek számtani átlagát. A natív hisztogramokhoz nem tartozó minták figyelmen kívül maradnak, és nem jelennek meg a visszaadott vektorban.",
+        "documentation-histogram-count": "Visszaadja a natív hisztogramban tárolt megfigyelések számát.",
+        "documentation-histogram-fraction": "Visszaadja a megadott alsó és felső értékek közötti megfigyelések becsült arányát.",
+        "documentation-histogram-quantile": "Kiszámítja a φ-kvantilt (0 ≤ φ ≤ 1) a hisztogram „b” gyűjtőiből. A „b” minták az egyes gyűjtőkben található megfigyelések számát jelentik. Minden mintának rendelkeznie kell egy „le” címkével, amelynek értéke a gyűjtő felső határát jelöli. (Az ilyen címkével nem rendelkező mintákat a rendszer figyelmen kívül hagyja.) A hisztogram metrikus típusa automatikusan ellátja az idősorokat a „_bucket” utótaggal és a megfelelő címkékkel.",
+        "documentation-histogram-stddev": "Visszaadja a natív hisztogramban szereplő megfigyelések becsült szórását a megfigyelések helyét tartalmazó tartományok geometriai átlaga alapján.",
+        "documentation-histogram-stdvar": "Visszaadja a natív hisztogramban szereplő megfigyelések becsült varianciáját.",
+        "documentation-histogram-sum": "Visszaadja a natív hisztogramban tárolt megfigyelések összegét.",
+        "documentation-holt-winters": "A Prometheus v3.x verzióban double_exponential_smoothing megnevezést kapott. A Prometheus v3.0 vagy annál újabb verzóknál használja a double_exponential_smoothing funkciót.\n\nA „v” tartomány alapján simított értéket állít elő az idősorokhoz. Minél alacsonyabb az „sf” simítási tényező, annál nagyobb jelentőséget kapnak a régebbi adatok. Minél magasabb a „tf” trendtényező, annál nagyobb szerepet kapnak az adatokban a trendek. Mind az „sf”, mind a „tf” értékének 0 és 1 között kell lennie.",
+        "documentation-hour": "Visszaadja az adott időpontok óráját UTC-ben. A visszaadott értékek 0 és 23 között lehetnek.",
+        "documentation-idelta": "Kiszámítja a „v” tartományvektor utolsó két mintája közötti különbséget, és visszaad egy pillanatnyi vektort a megadott deltákkal és egyenértékű címkékkel.",
+        "documentation-increase": "Kiszámítja az idősor növekedését a tartományvektorban. A monotonitás megszakadásait (például a cél újraindítása miatt bekövetkező számláló-visszaállításokat) a rendszer automatikusan kiigazítja. A növekedés extrapolálásra kerül, hogy lefedje a tartományvektor-választóban megadott teljes időtartományt, így lehetséges, hogy nem egész számú eredményt kapunk, még akkor is, ha a számláló csak egész számmal növekszik.",
+        "documentation-info": "A legfrissebb részleteket és metaadatokat adja vissza egy mutatócsoportról, például a címkéket és az aktuális értékeket, anélkül, hogy bármilyen számítást végezne.",
+        "documentation-irate": "Kiszámítja az idősor másodpercenkénti növekedési sebességét a tartományvektorban. Ez az utolsó két adatponton alapul. A monotonitás megszakadásait (például a cél újraindítása miatt bekövetkező számláló-visszaállításokat) a rendszer automatikusan kiigazítja.",
+        "documentation-label-join": "A „v” vektor minden idősorához összekapcsolja az összes „src_labels” értékét a „separator” segítségével, és visszaadja az összekapcsolt értéket tartalmazó, „dst_label” címkével ellátott idősorokat. Ebben a függvényben tetszőleges számú „src_labels” lehet.",
+        "documentation-label-replace": "A „v” minden idősorához a „label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)” a „regex” reguláris kifejezést a „src_label” címkével hasonlítja össze. Ha egyezik, akkor az idősor a „dst_label” címkét adja vissza, amelyet a „replacement” kiterjesztése helyettesít. Az „$1” helyére az első egyező alcsoport, az „$2” helyére a második stb. kerül. Ha a reguláris kifejezés nem egyezik, akkor az idősor változatlanul kerül visszaadásra.",
+        "documentation-last-over-time": "A legutóbbi pontérték a megadott intervallumban.",
+        "documentation-ln": "Kiszámítja a természetes logaritmust a „v” összes elemére.\nKülönleges esetek:\n * „ln(+Inf) = +Inf”\n * „ln(0) = -Inf”\n * „ln(x < 0) = NaN”\n * „ln(NaN) = NaN”",
+        "documentation-log10": "Kiszámítja a „v” összes elemének decimális logaritmusát. A különleges esetek megegyeznek az „ln” esetével.",
+        "documentation-log2": "Kiszámítja a „v” összes elemének bináris logaritmusát. A különleges esetek megegyeznek az „ln” esetével.",
+        "documentation-max-over-time": "A megadott intervallum összes pontjának maximális értéke.",
+        "documentation-min-over-time": "A megadott intervallum összes pontjának minimális értéke.",
+        "documentation-minute": "Visszaadja az adott időpontok percét UTC-ben. A visszaadott értékek 0 és 59 között lehetnek.",
+        "documentation-month": "Visszaadja az év hónapját az adott időpontokhoz UTC-ben. A visszaadott értékek 1 és 12 között lehetnek, ahol 1 január, stb.",
+        "documentation-pi": "A pi értékét adja vissza",
+        "documentation-predict-linear": "Egyszerű lineáris regresszióval megjósolja a „t” másodperccel későbbi idősor értékét a „v” tartományvektor alapján.",
+        "documentation-present-over-time": "Az 1-es érték a megadott intervallum bármely sorozata esetében.",
+        "documentation-quantile-over-time": "A megadott intervallum értékeinek φ-kvantilise (0 ≤ φ ≤ 1).",
+        "documentation-rad": "A „v” összes elemének fokjait radiánra alakítja át",
+        "documentation-rate": "Kiszámítja az idősor másodpercenkénti átlagos növekedési sebességét a tartományvektorban. A monotonitás megszakadásait (például a cél újraindítása miatt bekövetkező számláló-visszaállításokat) a rendszer automatikusan kiigazítja. Ezenkívül a számítás extrapolálja az időtartomány végeit, figyelembe véve a kihagyott lekérdezéseket vagy a lekérdezési ciklusok és a tartomány időtartamának nem tökéletes összehangolását.",
+        "documentation-resets": "Minden bemeneti idősor esetében a „resets(v range-vector)” a megadott időtartományon belüli számláló-visszaállítások számát azonnali vektorként adja vissza. Két egymást követő minta közötti értékcsökkenést a program számláló-visszaállításként értelmez.",
+        "documentation-round": "A „v” összes elemének mintaértékeit a legközelebbi egész számra kerekíti. Az egyenlő értékeket felfelé kerekíti. Az opcionális „to_nearest” argumentum lehetővé teszi a mintaértékek kerekítésének legközelebbi többszörösének megadását. Ez a többszörös lehet törtszám is.",
+        "documentation-scalar": "Egy egyelemes bemeneti vektor esetén a „scalar(v instant-vector)” az adott egy elem mintavételi értékét skalárként adja vissza. Ha a bemeneti vektor nem pontosan egy elemmel rendelkezik, a „scalar” a „NaN” értéket adja vissza.",
+        "documentation-sgn": "Egy vektort ad vissza, amelyben az összes mintaérték az előjelére van konvertálva, az alábbiak szerint: 1, ha „v” pozitív, -1, ha „v” negatív, és 0, ha „v” nulla.",
+        "documentation-sort": "A mintavételi értékeik szerint növekvő sorrendbe rendezve adja vissza a vektorelemeket.",
+        "documentation-sort-desc": "A mintavételi értékeik szerint csökkenő sorrendbe rendezve adja vissza a vektorelemeket.",
+        "documentation-sqrt": "Kiszámítja a „v” összes elemének négyzetgyökét.",
+        "documentation-stddev-over-time": "A megadott intervallum értékeinek populációs szórása.",
+        "documentation-stdvar-over-time": "A megadott intervallum értékeinek populációs varianciája.",
+        "documentation-sum-over-time": "A megadott intervallum összes értékének összege.",
+        "documentation-time": "Visszaadja az 1970. január 1-től eltelt másodpercek számát UTC-időzóna szerint. Ne feledje, hogy ez valójában nem a jelenlegi időt adja vissza, hanem azt az időpontot, amikor a kifejezés kiértékelésre kerül.",
+        "documentation-timestamp": "Visszaadja az adott vektor minden mintájának időbélyegét az 1970. január 1. óta eltelt másodpercek számaként UTC-időzónában.",
+        "documentation-vector": "Visszaadja a skaláris „s” értéket címkék nélküli vektorként.",
+        "documentation-year": "Visszaadja az adott időpontok évét UTC-ben."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "kiszámítja a(z) {{argument}} összes elemének arkusz koszinuszát",
+        "documentation-acosh": "kiszámítja a(z) {{argument}} összes elemének inverz hiperbolikus koszinuszát",
+        "documentation-asin": "kiszámítja a(z) {{argument}} összes elemének arkusz szinuszát",
+        "documentation-asinh": "kiszámítja a(z) {{argument}} összes elemének inverz hiperbolikus szinuszát",
+        "documentation-atan": "kiszámítja a(z) {{argument}} összes elemének arkusz tangensét",
+        "documentation-atanh": "kiszámítja a(z) {{argument}} összes elemének inverz hiperbolikus tangensét",
+        "documentation-cos": "kiszámítja a(z) {{argument}} összes elemének koszinuszát",
+        "documentation-cosh": "kiszámítja a(z) {{argument}} összes elemének hiperbolikus koszinuszát",
+        "documentation-sin": "kiszámítja a(z) {{argument}} összes elemének szinuszát",
+        "documentation-sinh": "kiszámítja a(z) {{argument}} összes elemének hiperbolikus szinuszát",
+        "documentation-tan": "kiszámítja a(z) {{argument}} összes elemének tangensét",
+        "documentation-tanh": "kiszámítja a(z) {{argument}} összes elemének hiperbolikus tangensét"
       }
     },
     "querybuilder": {
@@ -316,31 +316,31 @@
         "title-give-feedback": "A metrikaböngésző új, és számítunk az építő jellegű visszajelzésére"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Mintapéldányok: {{value}}",
+        "format": "Formátum: {{value}}",
+        "legend": "Jelmagyarázat: {{value}}",
+        "step": "Lépés: {{value}}",
+        "type": "Típus: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Metrikák keresése név alapján",
+        "type": "Szűrés típus szerint"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Egyetlen, monoton növekvő számlálóhoz tartozó kumulatív mutató, amelynek értéke csak növekedhet, vagy újraindításkor nullára állítható vissza.",
+        "description-gauge": "Egyetlen numerikus értéket képviselő mutató, amely szabadon növekedhet és csökkenhet.",
+        "description-histogram": "A hisztogram mintákat vesz a megfigyelésekből (általában olyanokból, mint a kérések időtartama vagy a válaszok mérete), és konfigurálható kategóriákba sorolja őket.",
+        "description-native-histogram": "A natív hisztogramok számos szempontból eltérnek a klasszikus Prometheus hisztogramoktól: A natív hisztogramok tartományhatárai egy képlet alapján kerülnek kiszámolásra, amely a natív hisztogram méretarányától (felbontásától) függ, és nem a felhasználó határozza meg.",
+        "description-no-type": "Ezeknek a mutatóknak nincs meghatározott típusa a metaadatokban.",
+        "description-summary": "Összefoglalja a mintavételi megfigyeléseket (általában olyanokat, mint a kérések időtartama és a válaszok mérete), és konfigurálható kvantiliseket számíthat ki egy változó időablakban.",
+        "description-unknown": "Ezek a mutatók a metaadatokban ismeretlen típusúak.",
+        "label-counter": "Számláló",
+        "label-gauge": "Mérőeszköz",
+        "label-histogram": "Hisztogram",
+        "label-native-histogram": "Natív hisztogram",
+        "label-no-type": "Nincs típus",
+        "label-summary": "Összegzés",
+        "label-unknown": "Ismeretlen"
       },
       "handle-function": {
         "text": {
@@ -358,8 +358,8 @@
         "tooltip-label-filters": "Opcionális: a lekérdezéstípushoz kiválasztott metrika szűrésére szolgál."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Címkék betöltése",
+        "noOptionsMessage-no-labels-found": "Nem található címke"
       },
       "metric-combobox": {
         "async-select": {
@@ -409,18 +409,18 @@
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Kiszámítja a(z) {{aggregationName}} összesítést a dimenziók mentén, miközben megőrzi a(z) {{labelWord}} {{labels}} címkéket.",
+          "label-default": "Kiszámítja a(z) {{aggregationName}} összesítést a dimenziók mentén.",
+          "label-without": "Kiszámítja a(z) {{aggregationName}} összesítést a(z) {{labels}} dimenziók mentén. Minden más címke megmarad."
         }
       },
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "Állítsa be a léptékparaméter alsó határát",
         "aria-label-select-resolution": "Felbontás kiválasztása",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Hőtérkép",
+          "label-table": "Táblázat",
+          "label-time-series": "Idősor"
         },
         "label-exemplars": "Mintapéldányok",
         "label-format": "Formátum",
@@ -436,8 +436,8 @@
         "tooltip-autocomplete-suggestions-limited": "A metrikanevek száma meghaladja az automatikus kitöltés korlátját. Csak a(z) {{autocompleteLimit}} legrelevánsabb metrika jelenik meg. A küszöbértéket az adatforrás beállításai között módosíthatja."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Szintaktikai hiba történt, vagy a lekérdezési struktúra nem jeleníthető meg szerkesztő módra való váltáskor. A lekérdezés egyes részei elveszhetnek.",
+        "confirmText-continue": "Folytatás",
         "kick-start-your-query": "Előbeállításos lekérdezés",
         "label-explain": "Magyarázat",
         "run-queries": "Lekérdezések futtatása",
@@ -453,8 +453,8 @@
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Építő",
+          "label-code": "Kód"
         }
       },
       "query-pattern": {
@@ -483,9 +483,9 @@
       "results-table": {
         "content-descriptive-type": "{{descriptiveType}} létrehozásakor a Prometheus több, számláló típusú sorozatot jelenít meg. ",
         "description": "Leírás",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Nem található metrika. Próbálja meg kibővíteni a címkeszűrőket.",
+        "message-expand-search": "Nem található metrika. Próbálja meg kibővíteni a keresést és a szűrőket.",
+        "message-no-metrics-found": "Nem található metrika az adatforrásban.",
         "name": "Név",
         "type": "Típus"
       },
diff --git a/packages/grafana-prometheus/src/locales/id-ID/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/id-ID/grafana-prometheus.json
index e674183019f..a4717d49d3e 100644
--- a/packages/grafana-prometheus/src/locales/id-ID/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/id-ID/grafana-prometheus.json
@@ -158,8 +158,8 @@
         "aria-label-prometheus-type": "Jenis Prometheus",
         "aria-label-select-http-method": "Pilih metode HTTP",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Pembangun",
+          "label-code": "Kode"
         },
         "label-cache-level": "Level cache",
         "label-custom-query-parameters": "Parameter kueri kustom",
@@ -200,114 +200,114 @@
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(Dinonaktifkan)",
+      "enabled-label": "Browser metrik"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Hanya menyertakan label unik",
+        "description-custom": "Berikan templat penamaan",
+        "description-verbose": "Semua nama dan nilai label",
+        "label-auto": "Otomatis",
+        "label-custom": "Kustom",
+        "label-verbose": "Verbose"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Hitung rata-rata atas dimensi",
+        "documentation-bottomk": "Elemen k terkecil berdasarkan nilai sampel",
+        "documentation-count": "Hitung jumlah elemen dalam vektor",
+        "documentation-count-values": "Hitung jumlah elemen dengan nilai yang sama",
+        "documentation-group": "Semua nilai dalam vektor yang dihasilkan adalah 1",
+        "documentation-max": "Pilih dimensi maksimum",
+        "documentation-min": "Pilih dimensi minimum",
+        "documentation-quantile": "Hitung φ-kuantil (0 ≤ φ ≤ 1) berdasarkan dimensi",
+        "documentation-stddev": "Hitung standar deviasi populasi berdasarkan dimensi",
+        "documentation-stdvar": "Hitung varians standar populasi berdasarkan dimensi",
+        "documentation-sum": "Hitung jumlah berdasarkan dimensi",
+        "documentation-topk": "Elemen k terbesar berdasarkan nilai sampel"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Mengembalikan vektor input dengan semua nilai sampel dikonversi ke nilai absolutnya.",
+        "documentation-absent": "Mengembalikan vektor kosong jika vektor yang diteruskan memiliki elemen, dan vektor dengan satu elemen bernilai 1 jika vektor tersebut tidak memiliki elemen. Ini berguna untuk memberi peringatan saat tidak ada deret waktu yang tersedia untuk kombinasi nama metrik dan label tertentu.",
+        "documentation-absent-over-time": "Mengembalikan vektor kosong jika vektor rentang yang diteruskan memiliki elemen, dan vektor dengan satu elemen bernilai 1 jika vektor rentang tersebut tidak memiliki elemen.",
+        "documentation-avg-over-time": "Nilai rata-rata dari semua poin dalam interval yang ditentukan.",
+        "documentation-ceil": "Membulatkan nilai sampel dari semua elemen dalam `v` ke bilangan bulat terdekat.",
+        "documentation-changes": "Untuk setiap deret waktu input, `changes(v range-vector)` mengembalikan berapa kali nilainya telah berubah dalam rentang waktu yang diberikan sebagai vektor instan.",
+        "documentation-clamp": "Menjepit nilai sampel dari semua elemen dalam `v` untuk memiliki batas bawah `min` dan batas atas `max`.",
+        "documentation-clamp-max": "Menjepit nilai sampel dari semua elemen dalam `v` agar memiliki batas atas `maks`.",
+        "documentation-clamp-min": "Menjepit nilai sampel dari semua elemen dalam `v` untuk memiliki batas bawah `min`.",
+        "documentation-count-over-time": "Hitungan semua nilai dalam interval yang ditentukan.",
+        "documentation-count-scalar": "Mengembalikan jumlah elemen dalam vektor deret waktu sebagai skalar. Ini bertentangan dengan operator agregasi `count()`, yang selalu mengembalikan vektor (kosong jika vektor input kosong) dan memungkinkan pengelompokan berdasarkan label melalui klausa `by`.",
+        "documentation-day-of-month": "Mengembalikan hari dalam sebulan untuk setiap waktu yang diberikan dalam UTC. Nilai yang dikembalikan adalah dari 1 hingga 31.",
+        "documentation-day-of-week": "Mengembalikan hari dalam seminggu untuk setiap waktu yang diberikan dalam UTC. Nilai yang dikembalikan adalah dari 0 hingga 6, di mana 0 berarti hari Minggu, dll.",
+        "documentation-day-of-year": "Mengembalikan hari dalam setahun untuk setiap waktu yang diberikan dalam UTC. Nilai yang dikembalikan adalah dari 1 hingga 365 untuk tahun non-kabisat, dan 1 hingga 366 pada tahun kabisat.",
+        "documentation-days-in-month": "Mengembalikan jumlah hari dalam sebulan untuk setiap waktu yang diberikan dalam UTC. Nilai yang dikembalikan adalah dari 28 hingga 31.",
+        "documentation-deg": "Mengonversi radian ke derajat untuk semua elemen dalam v",
+        "documentation-delta": "Menghitung perbedaan antara nilai pertama dan terakhir dari setiap elemen deret waktu dalam vektor rentang `v`, lalu mengembalikan vektor instan dengan delta dan label yang sesuai. Delta tersebut diekstrapolasi untuk mencakup seluruh rentang waktu yang ditentukan oleh pemilih vektor, sehingga memungkinkan hasil berupa bilangan non-integer meskipun nilai sampelnya semuanya bilangan bulat.",
+        "documentation-deriv": "Menghitung turunan per detik dari deret waktu dalam vektor rentang `v`, menggunakan regresi linier sederhana.",
+        "documentation-double-exponential-smoothing": "Menghasilkan nilai yang dihaluskan untuk deret waktu berdasarkan rentang dalam `v`. Semakin rendah faktor penghalusan `sf`, semakin besar bobot yang diberikan ke data lama. Semakin tinggi faktor tren `tf`, semakin banyak tren dalam data yang dipertimbangkan. `sf` dan `tf` harus antara 0 dan 1.",
+        "documentation-drop-common-labels": "Menghapus semua label yang memiliki nama dan nilai yang sama di semua deret dalam vektor input.",
+        "documentation-exp": "Menghitung fungsi eksponensial untuk semua elemen dalam `v`.\nKasus khusus adalah:\n* `Exp(+Inf) = +Inf` \n* `Exp(NaN) = NaN`",
+        "documentation-floor": "Membulatkan nilai sampel dari semua elemen dalam `v` ke bilangan bulat terdekat.",
+        "documentation-histogram-avg": "Mengembalikan rata-rata aritmatika dari nilai yang diamati yang disimpan dalam histogram asli. Sampel yang bukan histogram asli diabaikan dan tidak muncul dalam vektor yang dikembalikan.",
+        "documentation-histogram-count": "Mengembalikan jumlah pengamatan yang disimpan dalam histogram asli.",
+        "documentation-histogram-fraction": "Mengembalikan perkiraan fraksi pengamatan antara nilai bawah dan atas yang diberikan.",
+        "documentation-histogram-quantile": "Menghitung φ-kuantil (0 ≤ φ ≤ 1) dari bucket `b` dari histogram. Sampel dalam 'b' adalah jumlah pengamatan di setiap bucket. Setiap sampel harus memiliki label `le` di mana nilai label menunjukkan batas atas inklusif dari bucket. (Sampel tanpa label seperti itu akan diabaikan tanpa peringatan.) Tipe metrik histogram secara otomatis menyediakan deret waktu dengan akhiran `_bucket` dan label yang sesuai.",
+        "documentation-histogram-stddev": "Mengembalikan estimasi standar deviasi pengamatan dalam histogram asli, berdasarkan rata-rata geometris dari bucket tempat pengamatan berada.",
+        "documentation-histogram-stdvar": "Mengembalikan perkiraan varians standar pengamatan dalam histogram asli.",
+        "documentation-histogram-sum": "Mengembalikan jumlah pengamatan yang disimpan dalam histogram asli.",
+        "documentation-holt-winters": "Diganti namanya menjadi double_exponential_smoothing di prometheus v3.x. Untuk versi prometheus yang sama dan lebih besar dari v3.0, gunakan double_exponential_smoothing. \n\nMenghasilkan nilai yang dihaluskan untuk deret waktu berdasarkan rentang dalam `v`. Semakin rendah faktor penghalusan `sf`, semakin besar bobot yang diberikan ke data lama. Semakin tinggi faktor tren `tf`, semakin banyak tren dalam data yang dipertimbangkan. `sf` dan `tf` harus antara 0 dan 1.",
+        "documentation-hour": "Mengembalikan jam dalam sehari untuk setiap waktu yang diberikan dalam UTC. Nilai yang dikembalikan adalah dari 0 hingga 23.",
+        "documentation-idelta": "Menghitung perbedaan antara dua sampel terakhir dalam vektor rentang `v`, mengembalikan vektor instan dengan delta dan label yang setara yang diberikan.",
+        "documentation-increase": "Menghitung peningkatan dalam deret waktu pada vektor rentang. Pemutusan dalam monotonisitas (seperti pengaturan ulang penghitung akibat target dimulai ulang) disesuaikan secara otomatis. Nilai peningkatan diekstrapolasi untuk mencakup seluruh rentang waktu seperti yang ditentukan dalam pemilih vektor rentang, sehingga memungkinkan diperolehnya hasil non-integer meskipun penghitung hanya bertambah dalam satuan bulat.",
+        "documentation-info": "Mengembalikan detail dan metadata terbaru tentang sekelompok metrik, seperti label dan nilai saat ini, tanpa melakukan perhitungan apa pun",
+        "documentation-irate": "Menghitung laju kenaikan instan per detik dari deret waktu dalam vektor rentang, berdasarkan dua titik data terakhir. Pemutusan dalam monotonisitas (seperti reset penghitung karena target dimulai ulang) disesuaikan secara otomatis.",
+        "documentation-label-join": "Untuk setiap deret waktu dalam `v`, gabungkan semua nilai dari semua `src_labels` menggunakan `separator` dan kembalikan rangkaian waktu dengan label `dst_label` yang berisi nilai yang digabungkan. Dalam fungsi ini, dapat ada sejumlah `src_labels`.",
+        "documentation-label-replace": "Untuk setiap deret waktu dalam `v`, `label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)`  mencocokkan ekspresi reguler `regex` terhadap label `src_label`.  Jika cocok, rangkaian waktu dikembalikan dengan label `dst_label` diganti dengan perluasan `replacement`. `$1` diganti dengan subkelompok pertama yang cocok, `$2` dengan yang kedua, dll. Jika ekspresi reguler tidak cocok, deret waktu dikembalikan tanpa perubahan.",
+        "documentation-last-over-time": "Nilai poin terbaru dalam interval yang ditentukan.",
+        "documentation-ln": "Menghitung logaritma alami untuk semua elemen dalam `v`.\nKasus khusus adalah:\n * `ln(+Inf) = +Inf`\n * `ln(0) = -Inf`\n * `ln(x < 0) = NaN`\n * `ln(NaN) = NaN`",
+        "documentation-log10": "Menghitung logaritma desimal untuk semua elemen dalam `v`. Kasus khusus setara dengan yang ada di `ln`.",
+        "documentation-log2": "Menghitung logaritma biner untuk semua elemen dalam `v`. Kasus khusus setara dengan yang ada di `ln`.",
+        "documentation-max-over-time": "Nilai maksimum dari semua poin dalam interval yang ditentukan.",
+        "documentation-min-over-time": "Nilai minimum dari semua poin dalam interval yang ditentukan.",
+        "documentation-minute": "Mengembalikan menit dari jam untuk setiap waktu yang diberikan dalam UTC. Nilai yang dikembalikan adalah dari 0 hingga 59.",
+        "documentation-month": "Mengembalikan bulan dalam setahun untuk setiap waktu yang diberikan dalam UTC. Nilai yang dikembalikan adalah dari 1 hingga 12, di mana 1 berarti Januari, dll.",
+        "documentation-pi": "Mengembalikan pi",
+        "documentation-predict-linear": "Memprediksi nilai deret waktu `t` detik dari sekarang, berdasarkan vektor rentang `v`, menggunakan regresi linier sederhana.",
+        "documentation-present-over-time": "Nilai 1 untuk setiap deret dalam interval yang ditentukan.",
+        "documentation-quantile-over-time": "Nilai φ-kuantil (0 ≤ φ ≤ 1) dalam interval yang ditentukan.",
+        "documentation-rad": "Mengonversi derajat menjadi radian untuk semua elemen dalam v",
+        "documentation-rate": "Menghitung laju peningkatan rata-rata per detik dari deret waktu dalam vektor rentang. Pemutusan monotonisitas (seperti reset penghitung akibat target yang dimulai ulang) akan disesuaikan secara otomatis. Selain itu, perhitungan ini juga melakukan ekstrapolasi hingga ke ujung rentang waktu, sehingga tetap memperhitungkan scrape yang terlewat atau ketidaksesuaian waktu antara siklus scrape dan periode waktu rentang.",
+        "documentation-resets": "Untuk setiap deret waktu input, `resets(v range-vector)` mengembalikan jumlah reset penghitung dalam rentang waktu yang diberikan sebagai vektor instan. Setiap penurunan nilai antara dua sampel berturut-turut ditafsirkan sebagai reset penghitung.",
+        "documentation-round": "Membulatkan nilai sampel dari semua elemen dalam `v` ke bilangan bulat terdekat. Ikatan diselesaikan dengan pembulatan ke atas. Argumen opsional `to_nearest` memungkinkan untuk menentukan kelipatan terdekat di mana nilai sampel harus dibulatkan. Kelipatan ini juga mungkin pecahan.",
+        "documentation-scalar": "Dengan vektor input elemen tunggal, `skalar(v instant-vector)` mengembalikan nilai sampel dari elemen tunggal tersebut sebagai skalar. Jika vektor input tidak memiliki satu elemen persis, `skalar` akan mengembalikan `NaN`.",
+        "documentation-sgn": "Mengembalikan vektor dengan semua nilai sampel dikonversi ke tanda mereka, didefinisikan sebagai berikut: 1 jika v positif, -1 jika v negatif dan 0 jika v sama dengan nol.",
+        "documentation-sort": "Mengembalikan elemen vektor yang diurutkan berdasarkan nilai sampelnya, dalam urutan naik.",
+        "documentation-sort-desc": "Mengembalikan elemen vektor yang diurutkan berdasarkan nilai sampelnya, dalam urutan menurun.",
+        "documentation-sqrt": "Menghitung akar kuadrat dari semua elemen dalam `v`.",
+        "documentation-stddev-over-time": "Standar deviasi populasi dari nilai dalam interval yang ditentukan.",
+        "documentation-stdvar-over-time": "Varians standar populasi dari nilai dalam interval yang ditentukan.",
+        "documentation-sum-over-time": "Jumlah semua nilai dalam interval yang ditentukan.",
+        "documentation-time": "Mengembalikan jumlah detik sejak 1 Januari 1970 UTC. Perhatikan bahwa ini tidak benar-benar mengembalikan waktu saat ini, tetapi waktu saat ekspresi dievaluasi.",
+        "documentation-timestamp": "Mengembalikan stempel waktu dari setiap sampel vektor yang diberikan sebagai jumlah detik sejak 1 Januari 1970 UTC.",
+        "documentation-vector": "Mengembalikan skalar `s` sebagai vektor tanpa label.",
+        "documentation-year": "Mengembalikan tahun untuk setiap waktu yang diberikan dalam UTC."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "menghitung arkus kosinus dari semua elemen di {{argument}}",
+        "documentation-acosh": "menghitung kosinus hiperbolik inversi dari semua elemen di {{argument}}",
+        "documentation-asin": "menghitung arcsin dari semua elemen di {{argument}}",
+        "documentation-asinh": "menghitung sinus hiperbolik inversi dari semua elemen di {{argument}}",
+        "documentation-atan": "menghitung arctangent dari semua elemen di {{argument}}",
+        "documentation-atanh": "menghitung tanget hiperbolik inversi dari semua elemen di {{argument}}",
+        "documentation-cos": "menghitung kosinus dari semua elemen di {{argument}}",
+        "documentation-cosh": "menghitung kosinus hiperbolik dari semua elemen di {{argument}}",
+        "documentation-sin": "menghitung sinus dari semua elemen di {{argument}}",
+        "documentation-sinh": "menghitung sinus hiperbolik dari semua elemen di {{argument}}",
+        "documentation-tan": "menghitung tangent dari semua elemen di {{argument}}",
+        "documentation-tanh": "menghitung tanget hiperbolik dari semua elemen di {{argument}}"
       }
     },
     "querybuilder": {
@@ -316,31 +316,31 @@
         "title-give-feedback": "Penjelajah metrik ini masih baru, beri tahu kami cara untuk meningkatkannya"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Contoh: {{value}}",
+        "format": "Format: {{value}}",
+        "legend": "Legenda: {{value}}",
+        "step": "Langkah: {{value}}",
+        "type": "Tipe: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Cari metrik berdasarkan nama",
+        "type": "Filter berdasarkan jenis"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Metrik kumulatif yang merepresentasikan satu penghitung yang meningkat secara monoton, yang nilainya hanya dapat bertambah atau direset ke nol saat sistem dimulai ulang.",
+        "description-gauge": "Metrik yang merepresentasikan satu nilai numerik yang dapat naik turun secara bebas.",
+        "description-histogram": "Histogram mengambil sampel pengamatan (biasanya seperti durasi permintaan atau ukuran respons) dan menghitungnya dalam bucket yang dapat dikonfigurasi.",
+        "description-native-histogram": "Histogram asli berbeda dari histogram Prometheus klasik dalam beberapa hal: Batas bucket pada histogram asli dihitung menggunakan rumus yang bergantung pada skala (resolusi) histogram, dan tidak ditentukan oleh pengguna.",
+        "description-no-type": "Metrik ini tidak memiliki tipe yang ditentukan dalam metadata.",
+        "description-summary": "Ringkasan mengambil sampel pengamatan (biasanya seperti durasi permintaan dan ukuran respons), dan dapat menghitung kuantil yang dapat dikonfigurasi selama rentang waktu geser.",
+        "description-unknown": "Metrik ini telah diberi tipe yang tidak diketahui dalam metadata.",
+        "label-counter": "Penghitung",
+        "label-gauge": "Pengukur",
+        "label-histogram": "Histogram",
+        "label-native-histogram": "Histogram asli",
+        "label-no-type": "Tanpa tipe",
+        "label-summary": "Ringkasan",
+        "label-unknown": "Tidak diketahui"
       },
       "handle-function": {
         "text": {
@@ -358,8 +358,8 @@
         "tooltip-label-filters": "Opsional: digunakan untuk menyaring metrik yang dipilih untuk jenis kueri ini."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Memuat label",
+        "noOptionsMessage-no-labels-found": "Tidak ada label yang ditemukan"
       },
       "metric-combobox": {
         "async-select": {
@@ -409,18 +409,18 @@
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Menghitung {{aggregationName}} berdasarkan dimensi sekaligus mempertahankan {{labelWord}} {{labels}}.",
+          "label-default": "Menghitung {{aggregationName}} berdasarkan dimensi.",
+          "label-without": "Menghitung {{aggregationName}} berdasarkan dimensi {{labels}}. Semua label lainnya dipertahankan."
         }
       },
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "Tetapkan batas bawah untuk parameter langkah",
         "aria-label-select-resolution": "Pilih resolusi",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Peta panas",
+          "label-table": "Tabel",
+          "label-time-series": "Deret waktu"
         },
         "label-exemplars": "Contoh",
         "label-format": "Format",
@@ -436,8 +436,8 @@
         "tooltip-autocomplete-suggestions-limited": "Jumlah nama metrik melebihi batas pelengkapan otomatis. Hanya {{autocompleteLimit}} metrik yang paling relevan yang ditampilkan. Anda dapat menyesuaikan ambang batas dalam pengaturan sumber data."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Ada kesalahan sintaksis, atau struktur kueri tidak dapat divisualisasikan saat beralih ke mode pembuat. Bagian dari kueri mungkin hilang.",
+        "confirmText-continue": "Lanjutkan",
         "kick-start-your-query": "Mulai kueri Anda",
         "label-explain": "Penjelasan",
         "run-queries": "Jalankan kueri",
@@ -453,8 +453,8 @@
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Pembangun",
+          "label-code": "Kode"
         }
       },
       "query-pattern": {
@@ -483,9 +483,9 @@
       "results-table": {
         "content-descriptive-type": "Saat membuat {{descriptiveType}}, Prometheus mengekspos beberapa data seri dengan penghitung jenis. ",
         "description": "Deskripsi",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Tidak ada metrik yang ditemukan. Coba perluas filter label Anda.",
+        "message-expand-search": "Tidak ada metrik yang ditemukan. Coba perluas pencarian dan filter Anda.",
+        "message-no-metrics-found": "Tidak ada metrik yang ditemukan di sumber data.",
         "name": "Nama",
         "type": "Jenis"
       },
diff --git a/packages/grafana-prometheus/src/locales/it-IT/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/it-IT/grafana-prometheus.json
index 2671478ca0f..65199a0802f 100644
--- a/packages/grafana-prometheus/src/locales/it-IT/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/it-IT/grafana-prometheus.json
@@ -2,496 +2,496 @@
   "grafana-prometheus": {
     "components": {
       "annotation-query-editor": {
-        "annotation-data-load-error": "",
-        "aria-label-lower-limit-parameter": "",
-        "label-min-step": "",
-        "label-series-value-as-timestamp": "",
+        "annotation-data-load-error": "Errore di caricamento dei dati di annotazione!",
+        "aria-label-lower-limit-parameter": "Imposta il limite inferiore per il parametro passaggio",
+        "label-min-step": "Passaggio minimo",
+        "label-series-value-as-timestamp": "Valore della serie come marca temporale",
         "label-tags": "Tag",
-        "label-text": "",
+        "label-text": "Testo",
         "label-title": "Titolo",
-        "placeholder-auto": "",
-        "tooltip-either-pattern-example-instance-replaced-label": "",
-        "tooltip-min-step": "",
-        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": ""
+        "placeholder-auto": "automatico",
+        "tooltip-either-pattern-example-instance-replaced-label": "Usa il nome o un modello. Ad esempio, {{labelTemplate}} viene sostituito con il valore dell'etichetta per l'etichetta {{labelName}}.",
+        "tooltip-min-step": "Un ulteriore limite inferiore per il parametro passaggio della query Prometheus e per le variabili <2>{{intervalVar}}</2> e <4>{{rateIntervalVar}}</4>.",
+        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": "L'unità di misura della marca temporale è millisecondi. Se l'unità di misura del valore della serie è secondi, moltiplica il suo vettore di intervallo per 1000."
       },
       "get-query-type-options": {
         "description": {
-          "instant-query-range": ""
+          "instant-query-range": "Esegui una query istantanea e una query di intervallo"
         },
         "label": {
-          "both": ""
+          "both": "Entrambe"
         },
         "range-options": {
           "description": {
-            "query-range": ""
+            "query-range": "Esegui query su un intervallo di tempo"
           },
           "label": {
-            "instant": "",
-            "range": ""
+            "instant": "Istantanea",
+            "range": "Intervallo"
           }
         }
       },
       "label-selector": {
-        "aria-label-filter-expression-for-label": "",
-        "description-select-labels": "",
-        "select-labels-to-search-in": ""
+        "aria-label-filter-expression-for-label": "Filtra espressione per etichetta",
+        "description-select-labels": "Una volta selezionati i valori delle etichette, vengono mostrate solo le possibili combinazioni di etichette.",
+        "select-labels-to-search-in": "2. Seleziona le etichette in cui cercare"
       },
       "metric-selector": {
-        "aria-label-filter-expression-for-metric": "",
-        "aria-label-limit-results-from-series-endpoint": "",
-        "description-series-limit": "",
-        "label-select-metric": "",
-        "select-a-metric": "",
-        "series-limit": ""
+        "aria-label-filter-expression-for-metric": "Filtra espressione per metrica",
+        "aria-label-limit-results-from-series-endpoint": "Limita i risultati dall'endpoint della serie",
+        "description-series-limit": "Il limite si applica a tutte le metriche, etichette e valori. Lascia il campo vuoto per utilizzare il limite predefinito. Imposta su 0 per disabilitare il limite e recuperare tutto: ciò potrebbe causare problemi di prestazioni.",
+        "label-select-metric": "Una volta selezionata una metrica, vengono mostrate solo le possibili etichette. Le etichette sono limitate dal limite della serie riportato di seguito.",
+        "select-a-metric": "1. Seleziona una metrica",
+        "series-limit": "Limite della serie"
       },
       "prom-cheat-sheet": {
-        "prom-ql-cheat-sheet": ""
+        "prom-ql-cheat-sheet": "Scheda di riferimento rapido PromQL"
       },
       "prom-exemplar-field": {
-        "exemplars": "",
-        "tooltip-disable-query": "",
-        "tooltip-enable-query": ""
+        "exemplars": "Esempi",
+        "tooltip-disable-query": "Disabilita query con esempi",
+        "tooltip-enable-query": "Abilita query con esempi"
       },
       "prom-explore-extra-field": {
-        "aria-label-prometheus-extra-field": "",
-        "aria-label-query-type-field": "",
-        "aria-label-step-field": "",
-        "min-step": "",
-        "query-type": "",
-        "tooltip-units-builtin-variables-example-interval-rateinterval": ""
+        "aria-label-prometheus-extra-field": "Campo aggiuntivo Prometheus",
+        "aria-label-query-type-field": "Campo di tipo query",
+        "aria-label-step-field": "Campo passaggio",
+        "min-step": "Passaggio minimo",
+        "query-type": "Tipo di query",
+        "tooltip-units-builtin-variables-example-interval-rateinterval": "Qui è possibile utilizzare unità di tempo e variabili integrate, ad esempio: {{example1}}, {{example2}}, {{example3}}, {{example4}}, {{example5}}, {{example6}}, {{example7}} (impostazione predefinita se non è specificata alcuna unità: {{default}})"
       },
       "prom-query-field": {
-        "placeholder-enter-a-prom-ql-query": ""
+        "placeholder-enter-a-prom-ql-query": "Inserisci una query PromQL…"
       },
       "prom-variable-query-editor": {
-        "aria-label-classic-query": "",
-        "aria-label-metric-regex": "",
-        "aria-label-metric-selector": "",
-        "aria-label-prometheus-query": "",
-        "aria-label-query-type": "",
-        "aria-label-series-query": "",
-        "label-classic-query": "",
+        "aria-label-classic-query": "Query classica",
+        "aria-label-metric-regex": "Espressione regolare metrica",
+        "aria-label-metric-selector": "Selettore metrica",
+        "aria-label-prometheus-query": "Query Prometheus",
+        "aria-label-query-type": "Tipo di query",
+        "aria-label-series-query": "Query della serie",
+        "label-classic-query": "Query classica",
         "label-label": "Etichetta",
-        "label-metric-regex": "",
+        "label-metric-regex": "Espressione regolare metrica",
         "label-query": "Query",
-        "label-query-type": "",
-        "label-series-query": "",
-        "placeholder-classic-query": "",
-        "placeholder-metric-regex": "",
-        "placeholder-prometheus-query": "",
+        "label-query-type": "Tipo di query",
+        "label-series-query": "Query della serie",
+        "placeholder-classic-query": "Query classica",
+        "placeholder-metric-regex": "Espressione regolare metrica",
+        "placeholder-prometheus-query": "Query Prometheus",
         "placeholder-select-query-type": "Seleziona il tipo di query",
-        "placeholder-series-query": "",
-        "returns-metrics-matching-specified-metric-regex": "",
-        "tooltip-classic-query": "",
-        "tooltip-label": "",
-        "tooltip-metric-regex": "",
-        "tooltip-query": "",
-        "tooltip-query-type": "",
-        "tooltip-series-query": ""
+        "placeholder-series-query": "Query della serie",
+        "returns-metrics-matching-specified-metric-regex": "Restituisce un elenco di metriche corrispondenti all'espressione regolare metrica specificata.",
+        "tooltip-classic-query": "L'implementazione originale dell'editor di query variabile Prometheus. Inserisci una stringa con il tipo di query e i parametri corretti come descritto in questi documenti. Ad esempio, {{exampleQuery}}.",
+        "tooltip-label": "Restituisce un elenco di valori di etichetta per il nome dell'etichetta in tutte le metriche, a meno che la metrica non sia specificata.",
+        "tooltip-metric-regex": "Restituisce un elenco di nomi di etichette, filtrando facoltativamente in base all'espressione regolare metrica specificata.",
+        "tooltip-query": "Restituisce un elenco di risultati della query Prometheus per la query. Questo può includere funzioni Prometheus, ad esempio {{exampleQuery}}.",
+        "tooltip-query-type": "Il plugin dell'origine dati di Prometheus fornisce i seguenti tipi di query per le variabili del modello.",
+        "tooltip-series-query": "Inserisci una metrica con etichette, solo una metrica o solo etichette, ad esempio {{example1}}, {{example2}} o {{example3}}. Restituisce un elenco di serie temporali associate ai dati inseriti."
       },
       "selector-actions": {
-        "aria-label-selector": "",
-        "aria-label-selector-clear-button": "",
-        "aria-label-use-selector-as-metrics-button": "",
-        "aria-label-use-selector-for-query-button": "",
-        "aria-label-validate-submit-button": "",
+        "aria-label-selector": "selettore",
+        "aria-label-selector-clear-button": "Pulsante Cancella selettore",
+        "aria-label-use-selector-as-metrics-button": "Pulsante Usa selettore come metrica",
+        "aria-label-use-selector-for-query-button": "Pulsante Usa selettore per query",
+        "aria-label-validate-submit-button": "Pulsante Convalida invio",
         "clear": "Cancella",
-        "resulting-selector": "",
-        "use-as-rate-query": "",
-        "use-query": "",
-        "validate-selector": ""
+        "resulting-selector": "4. Selettore risultante",
+        "use-as-rate-query": "Usa come query di valutazione",
+        "use-query": "Usa query",
+        "validate-selector": "Convalida selettore"
       },
       "value-selector": {
-        "aria-label-filter-expression-for-label-values": "",
-        "aria-label-values-for": "",
-        "description-search-field-values-across-selected-labels": "",
-        "select-multiple-values-for-your-labels": ""
+        "aria-label-filter-expression-for-label-values": "Filtra espressione per valori etichetta",
+        "aria-label-values-for": "Valori per {{labelKey}}",
+        "description-search-field-values-across-selected-labels": "Utilizza il campo di ricerca per trovare i valori nelle etichette selezionate.",
+        "select-multiple-values-for-your-labels": "3. Seleziona (più) valori per le tue etichette"
       }
     },
     "configuration": {
       "alerting-settings-overhaul": {
-        "label-allow-as-recording-rules-target": "",
-        "label-manage-alerts-via-alerting-ui": "",
+        "label-allow-as-recording-rules-target": "Consenti come destinazione delle regole di registrazione",
+        "label-manage-alerts-via-alerting-ui": "Gestisci gli avvisi tramite l'interfaccia utente di avviso",
         "title-alerting": "Avvisi",
-        "tooltip-allow-as-recording-rules-target": "",
+        "tooltip-allow-as-recording-rules-target": "Consenti a questa origine dati di essere selezionata come destinazione per la scrittura delle regole di registrazione.",
         "tooltip-manage-alerts-via-alerting-ui": "Gestisci le regole di avviso per questa origine dati. Per gestire altre risorse di avviso, aggiungi un'origine dati Alertmanager."
       },
       "config-editor": {
-        "browser-access-mode-error": "",
-        "description-advanced-settings": "",
+        "browser-access-mode-error": "La modalità di accesso al browser nell'origine dati di Prometheus non è più disponibile. Passa alla modalità di accesso al server.",
+        "description-advanced-settings": "Le impostazioni aggiuntive sono opzionali e possono essere configurate per un maggiore controllo sull'origine dei dati.",
         "title-advanced-settings": "Impostazioni avanzate",
         "title-error": "Errore"
       },
       "data-source-http-settings-overhaul": {
         "tooltip-browser-access-mode": "Il metodo di accesso è <1>Browser</1>, quindi l'URL deve essere accessibile dal browser.",
-        "tooltip-http-url": "",
+        "tooltip-http-url": "Specifica un URL HTTP completo (ad esempio {{exampleURL}})",
         "tooltip-server-access-mode": "Il metodo di accesso è <1>Server</1>, quindi l'URL deve essere accessibile dal server/back-end di Grafana."
       },
       "docs-tip": {
-        "visit-docs-for-more-details-here": ""
+        "visit-docs-for-more-details-here": "Visita la documentazione per maggiori dettagli qui."
       },
       "exemplar-setting": {
         "label-data-source": "Origine dei dati",
-        "label-internal-link": "",
+        "label-internal-link": "Link interno",
         "label-label-name": "Nome etichetta",
-        "label-remove-exemplar-link": "",
+        "label-remove-exemplar-link": "Rimuovi link di esempio",
         "label-url": "URL",
-        "label-url-label": "",
-        "placeholder-go-to-examplecom": "",
-        "placeholder-httpsexamplecomvalueraw": "",
-        "placeholder-trace-id": "",
-        "title-remove-exemplar-link": "",
-        "tooltip-data-source": "",
-        "tooltip-internal-link": "",
-        "tooltip-label-name": "",
-        "tooltip-url": "",
-        "tooltip-url-label": ""
+        "label-url-label": "Etichetta URL",
+        "placeholder-go-to-examplecom": "Vai a example.com",
+        "placeholder-httpsexamplecomvalueraw": "https://example.com/${__value.raw}",
+        "placeholder-trace-id": "traceID",
+        "title-remove-exemplar-link": "Rimuovi link di esempio",
+        "tooltip-data-source": "L'origine dati a cui l'esempio si collegherà.",
+        "tooltip-internal-link": "Abilita questa opzione se disponi di un link interno. Quando è abilitata, questa opzione mostra il selettore dell'origine dati. Seleziona l'archivio dati di tracciamento di backend per i dati dell'esempio.",
+        "tooltip-label-name": "Il nome del campo nell'oggetto etichette che deve essere utilizzato per ottenere il traceID.",
+        "tooltip-url": "L'URL di backend della traccia a cui l'utente verrebbe indirizzato per visualizzarla",
+        "tooltip-url-label": "Da utilizzare per sovrascrivere l'etichetta del pulsante sul campo traceID dell'esempio."
       },
       "exemplars-settings": {
         "add": "Aggiungi",
-        "no-exemplars-configurations": "",
-        "title-exemplars": ""
+        "no-exemplars-configurations": "Nessuna configurazione di esempi",
+        "title-exemplars": "Esemplari"
       },
       "prom-settings": {
-        "aria-label-default-editor": "",
-        "aria-label-prom-type-type": "",
-        "aria-label-prometheus-type": "",
-        "aria-label-select-http-method": "",
+        "aria-label-default-editor": "Editor predefinito (codice o generatore)",
+        "aria-label-prom-type-type": "Tipo {{promType}}",
+        "aria-label-prometheus-type": "Tipo Prometheus",
+        "aria-label-select-http-method": "Seleziona il metodo HTTP",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Codice"
         },
-        "label-cache-level": "",
-        "label-custom-query-parameters": "",
-        "label-default-editor": "",
-        "label-disable-metrics-lookup": "",
-        "label-disable-recording-rules-beta": "",
-        "label-http-method": "",
-        "label-incremental-querying-beta": "",
-        "label-metric-names-suggestion-limit": "",
-        "label-prom-type-version": "",
-        "label-prometheus-type": "",
-        "label-query-overlap-window": "",
-        "label-query-timeout": "",
-        "label-scrape-interval": "",
-        "label-series-limit": "",
-        "label-use-series-endpoint": "",
-        "more-info": "",
-        "placeholder-example-maxsourceresolutionmtimeout": "",
-        "title-interval-behaviour": "",
-        "title-other": "",
+        "label-cache-level": "Livello cache",
+        "label-custom-query-parameters": "Parametri di query personalizzati",
+        "label-default-editor": "Editor predefinito",
+        "label-disable-metrics-lookup": "Disabilita ricerca delle metriche",
+        "label-disable-recording-rules-beta": "Disabilita regole di registrazione (beta)",
+        "label-http-method": "Metodo HTTP",
+        "label-incremental-querying-beta": "Query incrementale (beta)",
+        "label-metric-names-suggestion-limit": "Limite di suggerimento dei nomi delle metriche",
+        "label-prom-type-version": "Versione {{promType}}",
+        "label-prometheus-type": "Tipo Prometheus",
+        "label-query-overlap-window": "Finestra di sovrapposizione delle query",
+        "label-query-timeout": "Timeout query",
+        "label-scrape-interval": "Intervallo di raccolta",
+        "label-series-limit": "Limite della serie",
+        "label-use-series-endpoint": "Usa endpoint della serie",
+        "more-info": "Per ulteriori informazioni sulla configurazione del tipo e della versione di Prometheus nelle origini dati, consulta la <2>documentazione sul provisioning</2>.",
+        "placeholder-example-maxsourceresolutionmtimeout": "Esempio: {{example}}",
+        "title-interval-behaviour": "Comportamento intervallo",
+        "title-other": "Altro",
         "title-performance": "Performance",
-        "title-query-editor": "",
-        "tooltip-cache-level": "",
-        "tooltip-custom-query-parameters": "",
-        "tooltip-default-editor": "",
-        "tooltip-disable-metrics-lookup": "",
-        "tooltip-disable-recording-rules-beta": "",
-        "tooltip-http-method": "",
-        "tooltip-incremental-querying-beta": "",
-        "tooltip-metric-names-suggestion-limit": "",
-        "tooltip-prom-type-version": "",
-        "tooltip-prometheus-type": "",
-        "tooltip-query-overlap-window": "",
-        "tooltip-query-timeout": "",
-        "tooltip-scrape-interval": "",
-        "tooltip-series-limit": "",
-        "tooltip-use-series-endpoint": ""
+        "title-query-editor": "Editor query",
+        "tooltip-cache-level": "Imposta il livello di memorizzazione nella cache del browser per le query dell'editor. Si consigliano impostazioni della cache più elevate per origini dati ad alta cardinalità.",
+        "tooltip-custom-query-parameters": "Aggiungi parametri personalizzati all'URL della query Prometheus. Ad esempio {{example1}}, {{example2}}, {{example3}} o {{example4}}. Più parametri devono essere concatenati insieme a {{concatenationChar}}.",
+        "tooltip-default-editor": "Imposta l'opzione editor predefinita per tutti gli utenti di questa origine dati.",
+        "tooltip-disable-metrics-lookup": "Selezionando questa opzione, il selettore di metriche e il supporto di metriche/etichette nel completamento automatico del campo di query verranno disabilitati. Questo è utile se hai problemi di prestazioni con istanze Prometheus più grandi. ",
+        "tooltip-disable-recording-rules-beta": "Questa funzionalità disabiliterà le regole di registrazione. Attiva questa opzione per migliorare le prestazioni della dashboard",
+        "tooltip-http-method": "Puoi utilizzare il metodo POST o GET HTTP per eseguire query sull'origine dati di Prometheus. POST è il metodo consigliato in quanto consente query più grandi. Usa GET se hai una versione di Prometheus precedente alla 2.1 o se le richieste POST sono limitate nella tua rete.",
+        "tooltip-incremental-querying-beta": "Questa funzionalità modificherà il comportamento predefinito delle query relative per richiedere sempre dati aggiornati dall'istanza di Prometheus, mentre i risultati delle query verranno memorizzati nella cache e verranno richiesti solo i nuovi record. Attiva questa opzione per ridurre il carico del database e della rete.",
+        "tooltip-metric-names-suggestion-limit": "Il numero massimo di nomi di metriche che possono apparire come suggerimenti di completamento automatico nella modalità Codice dell'editor di query.",
+        "tooltip-prom-type-version": "Utilizza questa opzione per impostare la versione della tua istanza {{promType}} se non è configurata automaticamente.",
+        "tooltip-prometheus-type": "Imposta questo valore sul tipo del tuo database Prometheus, ad esempio Prometheus, Cortex, Mimir o Thanos. La modifica di questo campo salverà le impostazioni correnti. Alcuni tipi di Prometheus supportano o meno varie API. Ad esempio, alcuni tipi supportano la corrispondenza delle espressioni regolari per le query delle etichette per migliorare le prestazioni. Alcuni tipi hanno un'API per i metadati. Se imposti questo valore in modo errato, potresti riscontrare un comportamento strano durante l'interrogazione di metriche ed etichette. Controlla la documentazione di Prometheus per assicurarti di inserire il tipo corretto.",
+        "tooltip-query-overlap-window": "Imposta una durata come {{example1}} o {{example2}} o {{example3}}. Impostazione predefinita di {{default}}. Questa durata verrà aggiunta alla durata di ogni richiesta incrementale.",
+        "tooltip-query-timeout": "Imposta il timeout della query Prometheus.",
+        "tooltip-scrape-interval": "Questo intervallo indica la frequenza con cui Prometheus esegue la raccolta dei target. Imposta questo valore sull'intervallo di raccolta e valutazione tipico configurato nel file di configurazione di Prometheus. Se imposti questo valore su un valore maggiore dell'intervallo del file di configurazione di Prometheus, Grafana valuterà i dati in base a questo intervallo e vedrai meno punti dati. L'impostazione predefinita è {{default}}.",
+        "tooltip-series-limit": "Il limite si applica a tutte le risorse (metriche, etichette e valori) per entrambi gli endpoint (serie ed etichette). Lascia il campo vuoto per utilizzare il limite predefinito (40000). Imposta su 0 per disabilitare il limite e recuperare tutto: ciò potrebbe causare problemi di prestazioni. Il limite predefinito è 40000.",
+        "tooltip-use-series-endpoint": "Selezionando questa opzione, l'endpoint della serie con il parametro {{exampleParameter}} sarà preferito rispetto all'endpoint dei valori dell'etichetta con il parametro {{exampleParameter}}. Sebbene l'endpoint dei valori dell'etichetta sia considerato più performante, alcuni utenti potrebbero preferire la serie perché ha un metodo POST mentre l'endpoint dei valori dell'etichetta ha solo un metodo GET."
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(Disattivato)",
+      "enabled-label": "Browser metriche"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Include solo etichette univoche",
+        "description-custom": "Fornisci un modello di denominazione",
+        "description-verbose": "Tutti i nomi e i valori delle etichette",
+        "label-auto": "Automatica",
+        "label-custom": "Personalizzazione",
+        "label-verbose": "Dettagliata"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Calcola la media sulle dimensioni",
+        "documentation-bottomk": "Elementi k più piccoli per valore campione",
+        "documentation-count": "Conta il numero di elementi nel vettore",
+        "documentation-count-values": "Conta il numero di elementi con lo stesso valore",
+        "documentation-group": "Tutti i valori nel vettore risultante sono 1",
+        "documentation-max": "Seleziona massimo su dimensioni",
+        "documentation-min": "Seleziona minimo su dimensioni",
+        "documentation-quantile": "Calcola φ-quantile (0 ≤ φ ≤ 1) su dimensioni",
+        "documentation-stddev": "Calcola la deviazione standard della popolazione sulle dimensioni",
+        "documentation-stdvar": "Calcola la varianza standard della popolazione sulle dimensioni",
+        "documentation-sum": "Calcola la somma sulle dimensioni",
+        "documentation-topk": "Elementi k più grandi per valore campione"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Restituisce il vettore di input con tutti i valori di esempio convertiti nel loro valore assoluto.",
+        "documentation-absent": "Restituisce un vettore vuoto se il vettore passato ad esso ha elementi e un vettore a 1 elemento con il valore 1 se il vettore passato ad esso non ha elementi. Questo è utile per avvisare quando non esistono serie temporali per un dato nome di metrica e combinazione di etichette.",
+        "documentation-absent-over-time": "Restituisce un vettore vuoto se il vettore di intervallo passato ad esso ha elementi e un vettore a 1 elemento con il valore 1 se il vettore di intervallo passato ad esso non ha elementi.",
+        "documentation-avg-over-time": "Il valore medio di tutti i punti nell'intervallo specificato.",
+        "documentation-ceil": "Arrotonda i valori campione di tutti gli elementi in \"v\" al numero intero più vicino.",
+        "documentation-changes": "Per ogni serie temporale di input, \"changes(v range-vector)\" restituisce il numero di volte in cui il suo valore è cambiato all'interno dell'intervallo di tempo fornito come vettore istantaneo.",
+        "documentation-clamp": "Blocca i valori campione di tutti gli elementi in \"v\" per avere un limite inferiore di \"min\" e un limite superiore di \"max\".",
+        "documentation-clamp-max": "Blocca i valori campione di tutti gli elementi in \"v\" per avere un limite superiore di \"max\".",
+        "documentation-clamp-min": "Blocca i valori campione di tutti gli elementi in \"v\" per avere un limite inferiore di \"min\".",
+        "documentation-count-over-time": "Il conteggio di tutti i valori nell'intervallo specificato.",
+        "documentation-count-scalar": "Restituisce il numero di elementi in un vettore di serie temporali come scalare. Questo è in contrasto con l'operatore di aggregazione \"count()\", che restituisce sempre un vettore (uno vuoto se il vettore di input è vuoto) e consente il raggruppamento per etichette tramite una clausola \"by\".",
+        "documentation-day-of-month": "Restituisce il giorno del mese per ciascuno degli orari specificati in UTC. I valori restituiti sono compresi tra 1 e 31.",
+        "documentation-day-of-week": "Restituisce il giorno della settimana per ciascuno degli orari specificati in UTC. I valori restituiti sono compresi tra 0 e 6, dove 0 significa domenica, ecc.",
+        "documentation-day-of-year": "Restituisce il giorno dell'anno per ciascuno degli orari specificati in UTC. I valori restituiti sono compresi tra 1 e 365 per gli anni non bisestili e tra 1 e 366 per gli anni bisestili.",
+        "documentation-days-in-month": "Restituisce il numero di giorni del mese per ciascuno degli orari specificati in UTC. I valori restituiti sono compresi tra 28 e 31.",
+        "documentation-deg": "Converte i radianti in gradi per tutti gli elementi in v",
+        "documentation-delta": "Calcola la differenza tra il primo e l'ultimo valore di ciascun elemento della serie temporale in un vettore di intervallo \"v\", restituendo un vettore istantaneo con i delta dati e le etichette equivalenti. Il delta viene estrapolato per coprire l'intero intervallo di tempo come specificato nel selettore del vettore di intervallo, in modo che sia possibile ottenere un risultato non intero anche se i valori del campione sono tutti interi.",
+        "documentation-deriv": "Calcola la derivata al secondo della serie temporale in un vettore di intervallo \"v\", utilizzando la regressione lineare semplice.",
+        "documentation-double-exponential-smoothing": "Produce un valore livellato per le serie temporali in base all'intervallo in \"v\". Più basso è il fattore di livellamento \"sf\", maggiore è l'importanza data ai vecchi dati. Più alto è il fattore di tendenza \"tf\", più tendenze nei dati vengono considerate. Sia \"sf\" che \"tf\" devono essere compresi tra 0 e 1.",
+        "documentation-drop-common-labels": "Elimina tutte le etichette che hanno lo stesso nome e valore in tutte le serie nel vettore di input.",
+        "documentation-exp": "Calcola la funzione esponenziale per tutti gli elementi in \"v\".\nI casi speciali sono:\n* \"Exp(+Inf) = +Inf\" \n* \"Exp(NaN) = NaN\"",
+        "documentation-floor": "Arrotonda i valori campione di tutti gli elementi in \"v\" al numero intero più vicino.",
+        "documentation-histogram-avg": "Restituisce la media aritmetica dei valori osservati memorizzati in un istogramma nativo. I campioni che non sono istogrammi nativi vengono ignorati e non vengono visualizzati nel vettore restituito.",
+        "documentation-histogram-count": "Restituisce il conteggio delle osservazioni memorizzate in un istogramma nativo.",
+        "documentation-histogram-fraction": "Restituisce la frazione stimata di osservazioni tra i valori inferiore e superiore forniti.",
+        "documentation-histogram-quantile": "Calcola il φ-quantile (0 ≤ φ ≤ 1) dai bucket \"b\" di un istogramma. I campioni in 'b' sono i conteggi delle osservazioni in ciascun bucket. Ogni campione deve avere un'etichetta \"le\" in cui il valore dell'etichetta indica il limite superiore inclusivo del bucket (i campioni senza tale etichetta vengono ignorati silenziosamente.) Il tipo di metrica dell'istogramma fornisce automaticamente le serie temporali con il suffisso \"_bucket\" e le etichette appropriate.",
+        "documentation-histogram-stddev": "Restituisce la deviazione standard stimata delle osservazioni in un istogramma nativo, in base alla media geometrica dei bucket in cui si trovano le osservazioni.",
+        "documentation-histogram-stdvar": "Restituisce la varianza standard stimata delle osservazioni in un istogramma nativo.",
+        "documentation-histogram-sum": "Restituisce la somma delle osservazioni memorizzate in un istogramma nativo.",
+        "documentation-holt-winters": "Rinominato come double_exponential_smoothing in prometheus v3.x. Per le versioni di prometheus uguali e superiori a v3.0, utilizza double_exponential_smoothing. \n\nProduce un valore livellato per le serie temporali in base all'intervallo in \"v\". Più basso è il fattore di livellamento \"sf\", maggiore è l'importanza data ai vecchi dati. Più alto è il fattore di tendenza \"tf\", più tendenze nei dati vengono considerate. Sia \"sf\" che \"tf\" devono essere compresi tra 0 e 1.",
+        "documentation-hour": "Restituisce l'ora del giorno per ciascuno degli orari specificati in UTC. I valori restituiti sono compresi tra 0 e 23.",
+        "documentation-idelta": "Calcola la differenza tra gli ultimi due campioni nel vettore di intervallo \"v\", restituendo un vettore istantaneo con i delta dati e le etichette equivalenti.",
+        "documentation-increase": "Calcola l'incremento della serie temporale nel vettore di intervallo. Le interruzioni di monotonicità (come i reset del contatore dovuti ai riavvii del target) vengono regolate automaticamente. L'incremento viene estrapolato per coprire l'intero intervallo di tempo come specificato nel selettore del vettore di intervallo, in modo che sia possibile ottenere un risultato non intero anche se un contatore aumenta solo di incrementi interi.",
+        "documentation-info": "Restituisce i dettagli e i metadati più recenti su un gruppo di metriche, come le etichette e i valori correnti, senza eseguire alcun calcolo",
+        "documentation-irate": "Calcola il tasso di incremento istantaneo al secondo della serie temporale nel vettore di intervallo. Questo si basa sugli ultimi due punti dati. Le interruzioni di monotonicità (come i reset del contatore dovuti ai riavvii del target) vengono regolate automaticamente.",
+        "documentation-label-join": "Per ogni serie temporale in \"v\", unisce tutti i valori di tutte le \"src_labels\" utilizzando \"separator\" e restituisce la serie temporale con l'etichetta \"dst_label\" contenente il valore unito. In questa funzione può esserci un numero qualsiasi di \"src_labels\".",
+        "documentation-label-replace": "Per ogni serie temporale in \"v\", \"label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)\" corrisponde all'espressione regolare \"regex\" rispetto all'etichetta \"src_label\". Se corrisponde, la serie temporale viene restituita con l'etichetta \"dst_label\" sostituita dall'espansione di \"replacement\". \"$1\" viene sostituito con il primo sottogruppo corrispondente, \"$2\" con il secondo, ecc. Se l'espressione regolare non corrisponde, la serie temporale viene restituita invariata.",
+        "documentation-last-over-time": "Il valore del punto più recente nell'intervallo specificato.",
+        "documentation-ln": "Calcola il logaritmo naturale per tutti gli elementi in \"v\".\nI casi speciali sono:\n * \"ln(+Inf) = +Inf\"\n * \"ln(0) = -Inf\"\n * \"ln(x < 0) = NaN\"\n * \"ln(NaN) = NaN\"",
+        "documentation-log10": "Calcola il logaritmo decimale per tutti gli elementi in \"v\". I casi speciali sono equivalenti a quelli in \"ln\".",
+        "documentation-log2": "Calcola il logaritmo binario per tutti gli elementi in \"v\". I casi speciali sono equivalenti a quelli in \"ln\".",
+        "documentation-max-over-time": "Il valore massimo di tutti i punti nell'intervallo specificato.",
+        "documentation-min-over-time": "Il valore minimo di tutti i punti nell'intervallo specificato.",
+        "documentation-minute": "Restituisce il minuto dell'ora per ciascuno degli orari specificati in UTC. I valori restituiti sono compresi tra 0 e 59.",
+        "documentation-month": "Restituisce il mese dell'anno per ciascuno degli orari specificati in UTC. I valori restituiti sono compresi tra 1 e 12, dove 1 significa gennaio, ecc.",
+        "documentation-pi": "Restituisce pi",
+        "documentation-predict-linear": "Prevede il valore delle serie temporali \"t\" secondi da ora, in base al vettore di intervallo \"v\", utilizzando la regressione lineare semplice.",
+        "documentation-present-over-time": "Il valore 1 per qualsiasi serie nell'intervallo specificato.",
+        "documentation-quantile-over-time": "Il φ-quantile (0 ≤ φ ≤ 1) dei valori nell'intervallo specificato.",
+        "documentation-rad": "Converte i gradi in radianti per tutti gli elementi in v",
+        "documentation-rate": "Calcola il tasso medio di incremento al secondo della serie temporale nel vettore di intervallo. Le interruzioni di monotonicità (come i reset del contatore dovuti ai riavvii del target) vengono regolate automaticamente. Inoltre, il calcolo estrapola alle estremità dell'intervallo temporale, consentendo di perdere i graffi o l'allineamento imperfetto dei cicli di raschiatura con il periodo di tempo dell'intervallo.",
+        "documentation-resets": "Per ogni serie temporale di input, \"resets(v range-vector)\" restituisce il numero di reset del contatore all'interno dell'intervallo di tempo fornito come vettore istantaneo. Qualsiasi diminuzione del valore tra due campioni consecutivi viene interpretata come un reset del contatore.",
+        "documentation-round": "Arrotonda i valori campione di tutti gli elementi in \"v\" al numero intero più vicino. I pareggi vengono risolti arrotondando per eccesso. L'argomento facoltativo \"to_nearest\" consente di specificare il multiplo più vicino a cui devono essere arrotondati i valori campione. Questo multiplo può anche essere una frazione.",
+        "documentation-scalar": "Dato un vettore di input a elemento singolo, \"scalar(v instant-vector)\" restituisce il valore campione di quel singolo elemento come scalare. Se il vettore di input non ha esattamente un elemento, \"scalar\" restituirà \"NaN\".",
+        "documentation-sgn": "Restituisce un vettore con tutti i valori di esempio convertiti nel loro segno, definito come questo: 1 se v è positivo, -1 se v è negativo e 0 se v è uguale a zero.",
+        "documentation-sort": "Restituisce gli elementi del vettore ordinati in base ai loro valori campione, in ordine crescente.",
+        "documentation-sort-desc": "Restituisce gli elementi del vettore ordinati in base ai loro valori di esempio, in ordine decrescente.",
+        "documentation-sqrt": "Calcola la radice quadrata di tutti gli elementi in \"v\".",
+        "documentation-stddev-over-time": "La deviazione standard della popolazione dei valori nell'intervallo specificato.",
+        "documentation-stdvar-over-time": "La varianza standard della popolazione dei valori nell'intervallo specificato.",
+        "documentation-sum-over-time": "La somma di tutti i valori nell'intervallo specificato.",
+        "documentation-time": "Restituisce il numero di secondi trascorsi dal 1° gennaio 1970 UTC. Si noti che questo non restituisce effettivamente l'ora corrente, ma l'ora in cui l'espressione deve essere valutata.",
+        "documentation-timestamp": "Restituisce la marca temporale di ciascuno dei campioni del vettore specificato come numero di secondi dal 1° gennaio 1970 UTC.",
+        "documentation-vector": "Restituisce lo scalare \"s\" come vettore senza etichette.",
+        "documentation-year": "Restituisce l'anno per ciascuno degli orari specificati in UTC."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "calcola l'arcocoseno di tutti gli elementi in {{argument}}",
+        "documentation-acosh": "calcola il coseno iperbolico inverso di tutti gli elementi in {{argument}}",
+        "documentation-asin": "calcola l'arcoseno di tutti gli elementi in {{argument}}",
+        "documentation-asinh": "calcola il seno iperbolico inverso di tutti gli elementi in {{argument}}",
+        "documentation-atan": "calcola l'arcotangente di tutti gli elementi in {{argument}}",
+        "documentation-atanh": "calcola la tangente iperbolica inversa di tutti gli elementi in {{argument}}",
+        "documentation-cos": "calcola il coseno di tutti gli elementi in {{argument}}",
+        "documentation-cosh": "calcola il coseno iperbolico di tutti gli elementi in {{argument}}",
+        "documentation-sin": "calcola il seno di tutti gli elementi in {{argument}}",
+        "documentation-sinh": "calcola il seno iperbolico di tutti gli elementi in {{argument}}",
+        "documentation-tan": "calcola la tangente di tutti gli elementi in {{argument}}",
+        "documentation-tanh": "calcola la tangente iperbolica di tutti gli elementi in {{argument}}"
       }
     },
     "querybuilder": {
       "feedback-link": {
         "give-feedback": "Lascia un feedback",
-        "title-give-feedback": ""
+        "title-give-feedback": "L'esplora metriche è nuovo, facci sapere come possiamo migliorarlo"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Esempi: {{value}}",
+        "format": "Formato: {{value}}",
+        "legend": "Legenda: {{value}}",
+        "step": "Incremento: {{value}}",
+        "type": "Tipo: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Cerca metriche per nome",
+        "type": "Filtra per tipo"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Una metrica cumulativa che rappresenta un singolo contatore monotonamente crescente il cui valore può solo aumentare o essere azzerato al riavvio.",
+        "description-gauge": "Una metrica che rappresenta un singolo valore numerico che può arbitrariamente salire e scendere.",
+        "description-histogram": "Un istogramma campiona le osservazioni (di solito cose come la durata delle richieste o le dimensioni delle risposte) e le conta in bucket configurabili.",
+        "description-native-histogram": "Gli istogrammi nativi sono diversi dagli istogrammi classici di Prometheus in diversi modi: i limiti dei bucket degli istogrammi nativi sono calcolati da una formula che dipende dalla scala (risoluzione) dell'istogramma nativo e non sono definiti dall'utente.",
+        "description-no-type": "Queste metriche non hanno un tipo definito nei metadati.",
+        "description-summary": "Un riepilogo campiona le osservazioni (di solito cose come la durata delle richieste e le dimensioni delle risposte) e può calcolare quantili configurabili su una finestra temporale scorrevole.",
+        "description-unknown": "A queste metriche è stato assegnato il tipo sconosciuto nei metadati.",
+        "label-counter": "Contatore",
+        "label-gauge": "Calibro",
+        "label-histogram": "Istogramma",
+        "label-native-histogram": "Istogramma nativo",
+        "label-no-type": "Nessun tipo",
+        "label-summary": "Riepilogo",
+        "label-unknown": "Sconosciuto"
       },
       "handle-function": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "L'analisi della query è ambigua."
         }
       },
       "label-filter-item": {
-        "aria-label-remove": "",
-        "placeholder-select-label": "",
+        "aria-label-remove": "Rimuovi {{name}}",
+        "placeholder-select-label": "Seleziona etichetta",
         "placeholder-select-value": "Seleziona valore"
       },
       "label-filters": {
-        "label-filters": "",
-        "label-label-filters": "",
-        "tooltip-label-filters": ""
+        "label-filters": "Filtri etichetta",
+        "label-label-filters": "Filtri etichetta",
+        "tooltip-label-filters": "Facoltativo: utilizzato per filtrare la metrica selezionata per questo tipo di query."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Caricamento delle etichette",
+        "noOptionsMessage-no-labels-found": "Nessuna etichetta trovata"
       },
       "metric-combobox": {
         "async-select": {
-          "aria-label-open-metrics-explorer": "",
-          "placeholder-select-metric": "",
-          "tooltip-open-metrics-explorer": ""
+          "aria-label-open-metrics-explorer": "Apri Esplora metriche",
+          "placeholder-select-metric": "Seleziona metrica",
+          "tooltip-open-metrics-explorer": "Apri Esplora metriche"
         },
         "label-metric": "Metrica",
-        "tooltip-metric": ""
+        "tooltip-metric": "Facoltativo: restituisce un elenco di valori di etichetta per il nome dell'etichetta nella metrica specificata."
       },
       "metrics-modal": {
-        "aria-label-browse-metrics": "",
-        "currently-selected": "",
-        "metrics-pre-filtered": "",
-        "title-metrics-explorer": ""
+        "aria-label-browse-metrics": "Sfoglia metriche",
+        "currently-selected": "Attualmente selezionata: {{selected}}",
+        "metrics-pre-filtered": "Queste metriche sono state pre-filtrate in base alle etichette scelte nei filtri delle etichette.",
+        "title-metrics-explorer": "Esplora metriche"
       },
       "nested-query": {
         "label": {
-          "ignoring": "",
+          "ignoring": "Ignora",
           "on": "In data"
         },
         "operator": "Operatore",
-        "tooltip-remove-match": "",
-        "vector-matches": ""
+        "tooltip-remove-match": "Rimuovi corrispondenza",
+        "vector-matches": "Corrispondenze vettoriali"
       },
       "operation-editor": {
-        "not-found": "",
-        "title-remove": ""
+        "not-found": "{{id}} operazione non trovata",
+        "title-remove": "Rimuovi {{name}}"
       },
       "operation-header": {
         "placeholder-replace-with": "Sostituisci con",
-        "title-click-to-view-alternative-operations": "",
-        "title-remove-operation": ""
+        "title-click-to-view-alternative-operations": "Fai clic per visualizzare operazioni alternative",
+        "title-remove-operation": "Rimuovi operazione"
       },
       "operation-info-button": {
-        "title-click-to-show-description": "",
-        "title-remove-operation": ""
+        "title-click-to-show-description": "Fai clic per mostrare la descrizione",
+        "title-remove-operation": "Rimuovi operazione"
       },
       "operation-list": {
-        "operations": "",
+        "operations": "Operazioni",
         "placeholder-search": "Cerca",
-        "title-add-operation": ""
+        "title-add-operation": "Aggiungi operazione"
       },
       "operation-param-editor": {
-        "title-add": "",
-        "title-remove": ""
+        "title-add": "Aggiungi {{name}}",
+        "title-remove": "Rimuovi {{name}}"
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Calcola {{aggregationName}} sulle dimensioni preservando {{labelWord}} {{labels}}.",
+          "label-default": "Calcola {{aggregationName}} sulle dimensioni.",
+          "label-without": "Calcola {{aggregationName}} sulle dimensioni {{labels}}. Tutte le altre etichette vengono conservate."
         }
       },
       "prom-query-builder-options": {
-        "aria-label-lower-limit-parameter": "",
-        "aria-label-select-resolution": "",
+        "aria-label-lower-limit-parameter": "Imposta il limite inferiore per il parametro step",
+        "aria-label-select-resolution": "Seleziona risoluzione",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Mappa di calore",
+          "label-table": "Tabella",
+          "label-time-series": "Serie temporale"
         },
-        "label-exemplars": "",
+        "label-exemplars": "Esempi",
         "label-format": "Formato",
-        "label-min-step": "",
-        "label-resolution": "",
+        "label-min-step": "Passaggio minimo",
+        "label-resolution": "Risoluzione",
         "label-type": "Tipo",
-        "placeholder-auto": "",
+        "placeholder-auto": "automatico",
         "title-options": "Opzioni",
-        "tooltip-min-step": ""
+        "tooltip-min-step": "Un ulteriore limite inferiore per il parametro passaggio della query Prometheus e per le variabili <2>{{interval}}</2> e <4>{{rateInterval}}</4>."
       },
       "prom-query-code-editor-autocomplete-info": {
-        "autocomplete-suggestions-limited": "",
-        "tooltip-autocomplete-suggestions-limited": ""
+        "autocomplete-suggestions-limited": "Suggerimenti di completamento automatico limitati",
+        "tooltip-autocomplete-suggestions-limited": "Il numero di nomi di metriche supera il limite di completamento automatico. Vengono visualizzate solo le metriche {{autocompleteLimit}} più rilevanti. È possibile regolare la soglia nelle impostazioni dell'origine dati."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Si è verificato un errore di sintassi oppure la struttura della query non può essere visualizzata quando si passa alla modalità generatore. Parti della query potrebbero andare perse.",
+        "confirmText-continue": "Continua",
         "kick-start-your-query": "Avvia la query",
-        "label-explain": "",
-        "run-queries": "",
-        "title-parsing-error-switch-builder": ""
+        "label-explain": "Spiega",
+        "run-queries": "Esegui query",
+        "title-parsing-error-switch-builder": "Errore di analisi: passare alla modalità generatore?"
       },
       "prom-query-legend-editor": {
-        "label-legend": "",
-        "placeholder-select-legend-mode": "",
-        "tooltip-legend": ""
+        "label-legend": "Legenda",
+        "placeholder-select-legend-mode": "Seleziona la modalità legenda",
+        "tooltip-legend": "Sovrascrittura o modello del nome della serie. Es. {{templateExample}} verrà sostituito con il valore dell'etichetta per {{labelName}}."
       },
       "query-builder-hints": {
-        "hint-details": ""
+        "hint-details": "suggerimento: {{hintDetails}}"
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Codice"
         }
       },
       "query-pattern": {
-        "apply-query": "",
-        "aria-label-apply-query-starter-button": "",
-        "aria-label-back-button": "",
-        "aria-label-create-new-query-button": "",
-        "aria-label-raw-query": "",
-        "aria-label-use-this-query-button": "",
+        "apply-query": "Applica query",
+        "aria-label-apply-query-starter-button": "pulsante di avvio applica query",
+        "aria-label-back-button": "pulsante indietro",
+        "aria-label-create-new-query-button": "pulsante crea nuova query",
+        "aria-label-raw-query": "query non elaborata {{patternName}}",
+        "aria-label-use-this-query-button": "utilizza questo pulsante di query",
         "back": "Indietro",
-        "create-new-query": "",
+        "create-new-query": "Crea nuova query",
         "use-this-query": "Utilizza questa query"
       },
       "query-patterns-modal": {
-        "aria-label-close-kick-start-your-query-modal": "",
+        "aria-label-close-kick-start-your-query-modal": "chiudi avvia modalità query",
         "aria-label-kick-start-your-query-modal": "Avvia il modale della query",
-        "aria-label-toggle-query-starter": "",
+        "aria-label-toggle-query-starter": "apri e chiudi la scheda di avvio della query {{patternType}}",
         "close": "Chiudi",
-        "description-kick-start-your-query": "",
-        "label-toggle-query-starter": "",
+        "description-kick-start-your-query": "Avvia la query selezionando una di queste query. Ora puoi continuare a completare la query.",
+        "label-toggle-query-starter": "Avvii query {{patternType}}",
         "title-kick-start-your-query": "Avvia la query"
       },
       "raw-query": {
-        "aria-label-selector": ""
+        "aria-label-selector": "selettore"
       },
       "results-table": {
-        "content-descriptive-type": "",
+        "content-descriptive-type": "Quando si crea un {{descriptiveType}}, Prometheus mostra più serie con il contatore di tipo. ",
         "description": "Descrizione",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Non sono state trovate metriche. Prova ad espandere i filtri delle etichette.",
+        "message-expand-search": "Non sono state trovate metriche. Prova ad espandere la ricerca e i filtri.",
+        "message-no-metrics-found": "Non sono state trovate metriche nell'origine dati.",
         "name": "Nome",
         "type": "Tipo"
       },
       "update-function-args": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "L'analisi della query è ambigua."
         }
       }
     }
diff --git a/packages/grafana-prometheus/src/locales/ja-JP/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/ja-JP/grafana-prometheus.json
index 72b1785b222..5c8b7cf0513 100644
--- a/packages/grafana-prometheus/src/locales/ja-JP/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/ja-JP/grafana-prometheus.json
@@ -158,8 +158,8 @@
         "aria-label-prometheus-type": "Prometheusタイプ",
         "aria-label-select-http-method": "HTTPメソッドを選択",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "ビルダー",
+          "label-code": "コード"
         },
         "label-cache-level": "キャッシュレベル",
         "label-custom-query-parameters": "カスタムクエリパラメーター",
@@ -200,114 +200,114 @@
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(無効化)",
+      "enabled-label": "メトリックブラウザ"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "一意のラベルのみを含む",
+        "description-custom": "命名テンプレートを提供する",
+        "description-verbose": "すべてのラベル名と値",
+        "label-auto": "自動",
+        "label-custom": "カスタム",
+        "label-verbose": "詳細"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "次元間の平均を計算",
+        "documentation-bottomk": "サンプル値が最小のk個の要素",
+        "documentation-count": "ベクトル内の要素数をカウント",
+        "documentation-count-values": "同じ値を持つ要素の数をカウントする",
+        "documentation-group": "結果のベクトルのすべての値は1です",
+        "documentation-max": "次元での最大値を選択",
+        "documentation-min": "次元での最小値を選択",
+        "documentation-quantile": "次元間でφ分位数 (0 ≤ φ ≤ 1) を計算します",
+        "documentation-stddev": "次元にわたる母集団標準偏差を計算",
+        "documentation-stdvar": "次元にわたる母集団標準分散を計算",
+        "documentation-sum": "次元の合計を計算",
+        "documentation-topk": "サンプル値が最大のk個の要素"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "すべてのサンプル値が絶対値に変換された入力ベクトルを返します。",
+        "documentation-absent": "渡されたベクトルに要素がある場合は空のベクトルを返し、渡されたベクトルに要素がない場合は値1の1要素ベクトルを返します。これは、指定されたメトリック名とラベルの組み合わせに時系列が存在しない場合に警告するのに役立ちます。",
+        "documentation-absent-over-time": "渡された範囲ベクトルに要素がある場合は空のベクトルを返し、渡された範囲ベクトルに要素がない場合は値1の1要素ベクトルを返します。",
+        "documentation-avg-over-time": "指定された間隔内のすべてのポイントの平均値。",
+        "documentation-ceil": "「v」のすべての要素のサンプル値を最も近い整数に切り上げます。",
+        "documentation-changes": "入力時系列ごとに、'changes(v range-vector)'は、指定された時間範囲内でその値が変更された回数をインスタントベクトルとして返します。",
+        "documentation-clamp": "「v」のすべての要素のサンプル値を「min」の下限と「max」の上限に固定します。",
+        "documentation-clamp-max": "「v」のすべての要素のサンプル値を「max」の上限に固定します。",
+        "documentation-clamp-min": "「v」のすべての要素のサンプル値を「min」の下限に固定します。",
+        "documentation-count-over-time": "指定された間隔のすべての値の個数。",
+        "documentation-count-scalar": "時系列ベクトルの要素数をスカラーとして返します。これは、常にベクトル (入力ベクトルが空の場合は空のベクトル) を返し、「by」句を介してラベルでグループ化できる「count()」集計演算子とは対照的です。",
+        "documentation-day-of-month": "UTCで指定された各時間の月の日を返します。返される値は1から31です。",
+        "documentation-day-of-week": "UTCで指定された各時間の曜日を返します。返される値は0から6までで、0は日曜日などを意味します。",
+        "documentation-day-of-year": "指定された各時刻の1年の日をUTCで返します。返される値は、非うるう年では1から365、うるう年では1から366です。",
+        "documentation-days-in-month": "UTCで指定された時間ごとに、その月の日数を返します。返される値は28から31です。",
+        "documentation-deg": "vのすべての要素のラジアンを度に変換します",
+        "documentation-delta": "範囲ベクトル「v」の各時系列要素の最初と最後の値の差を計算し、指定されたデルタと同等のラベルを持つインスタントベクトルを返します。デルタは、範囲ベクトルセレクターで指定されたフルタイム範囲をカバーするように外挿されるため、サンプル値がすべて整数であっても、非整数の結果を得ることができます。",
+        "documentation-deriv": "単純な線形回帰を使用して、範囲ベクトル「v」の時系列の秒単位の導関数を計算します。",
+        "documentation-double-exponential-smoothing": "「v」の範囲に基づいて、時系列の平滑化された値を生成します。平滑化係数「sf」が小さいほど、古いデータが重要になります。トレンド係数「tf」が高いほど、データのトレンドが考慮されます。「sf」と「tf」の両方が0と1の間でなければなりません。",
+        "documentation-drop-common-labels": "入力ベクトルのすべての系列にわたって、同じ名前と値を持つすべてのラベルをドロップします。",
+        "documentation-exp": "「v」のすべての要素の指数関数を計算します。\n特殊なケースは次のとおりです。\n* 'Exp(+Inf) = +Inf' \n* 'Exp(NaN) = NaN'",
+        "documentation-floor": "「v」のすべての要素のサンプル値を最も近い整数に切り下げます。",
+        "documentation-histogram-avg": "ネイティブヒストグラムに保存されている観測値の算術平均を返します。ネイティブヒストグラムではないサンプルは無視され、返されるベクトルには表示されません。",
+        "documentation-histogram-count": "ネイティブヒストグラムに保存されている観測値の数を返します。",
+        "documentation-histogram-fraction": "指定された下限値と上限値の間の観測値の推定割合を返します。",
+        "documentation-histogram-quantile": "ヒストグラムのバケット「b」からφ分位数 (0 ≤ φ ≤ 1) を計算します。「b」のサンプルは、各バケットの観測値の数です。各サンプルにはラベル「le」が必要です。ラベル値は、バケットの上限を含むことを示します。(そのようなラベルのないサンプルは、黙って無視されます。) ヒストグラムメトリックタイプは、自動的に「_bucket」サフィックスと適切なラベルを持つ時系列を提供します。",
+        "documentation-histogram-stddev": "観測値が存在するバケットの幾何平均に基づいて、ネイティブヒストグラムの観測値の推定標準偏差を返します。",
+        "documentation-histogram-stdvar": "ネイティブヒストグラムの観測値の推定標準分散を返します。",
+        "documentation-histogram-sum": "ネイティブヒストグラムに保存されている観測値の数を返します。",
+        "documentation-holt-winters": "Prometheus v3.xでdouble_exponential_smoothingに名前が変更されました。v3.0以降のPrometheusバージョンでは、double_exponential_smoothingを使用してください。「v」の範囲に基づいて、時系列の平滑化された値を生成します。平滑化係数「sf」が小さいほど、古いデータが重要になります。トレンド係数「tf」が高いほど、データのトレンドが考慮されます。「sf」と「tf」の両方が0と1の間でなければなりません。",
+        "documentation-hour": "UTCで指定された各時刻の時間を返します。返される値は0から23です。",
+        "documentation-idelta": "範囲ベクトル「v」の最後の2つのサンプルの差を計算し、指定されたデルタと同等のラベルを持つインスタントベクトルを返します。",
+        "documentation-increase": "範囲ベクトルの時系列の増加を計算します。単調性の破れ (ターゲットの再起動によるカウンターのリセットなど) は自動的に調整されます。増加は、範囲ベクトルセレクターで指定された全時間範囲をカバーするように外挿されるため、カウンターが整数だけ増加する場合でも、非整数の結果を得ることができます。",
+        "documentation-info": "計算を行わずに、ラベルや現在の値など、メトリックのグループに関する最新の詳細とメタデータを返します",
+        "documentation-irate": "範囲ベクトル内の時系列の1秒あたりの瞬間的な増加率を計算します。これは、最後の2つのデータポイントに基づいています。単調性の破れ (ターゲットの再起動によるカウンターのリセットなど) は自動的に調整されます。",
+        "documentation-label-join": "「v」の各時系列について、「separator」を使用してすべての「src_labels」のすべての値を結合し、結合された値を含むラベル「dst_label」を持つ時系列を返します。この関数には任意の数の「src_labels」を含めることができます。",
+        "documentation-label-replace": "「v」の各時系列について、「label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)」は、ラベル「src_label」に対して正規表現「regex」と一致します。一致する場合、時系列はラベル「dst_label」を「replacement」の拡張に置き換えて返されます。「$1」は最初の一致するサブグループに置き換えられ、「$2」は2番目などに置き換えられます。正規表現が一致しない場合、時系列は変更されずに返されます。",
+        "documentation-last-over-time": "指定された間隔の最新のポイント値。",
+        "documentation-ln": "「v」のすべての要素の自然対数を計算します。\n特殊なケースは次のとおりです。\n* 'ln(+Inf) = +Inf'\n * 'ln(0) = -Inf'\n * 'ln(x < 0) = NaN'\n * 'ln(NaN) = NaN'",
+        "documentation-log10": "「v」のすべての要素の10進対数を計算します。特殊なケースは「ln」のケースと同等です。",
+        "documentation-log2": "「v」のすべての要素の二進対数を計算します。特殊なケースは「ln」のケースと同等です。",
+        "documentation-max-over-time": "指定された間隔内のすべてのポイントの最大値。",
+        "documentation-min-over-time": "指定された間隔内のすべてのポイントの最小値。",
+        "documentation-minute": "UTCで指定された各時間の分を返します。返される値は0から59です。",
+        "documentation-month": "UTCで指定された各時間の年の月を返します。返される値は1から12までで、1は1月などを意味します。",
+        "documentation-pi": "π (パイ) を返します",
+        "documentation-predict-linear": "単純な線形回帰を使用して、範囲ベクトル「v」に基づいて、今から「t」秒後の時系列の値を予測します。",
+        "documentation-present-over-time": "指定された間隔内の任意の系列の値1。",
+        "documentation-quantile-over-time": "指定された間隔の値のφ分位数 (0 ≤ φ ≤ 1)。",
+        "documentation-rad": "vのすべての要素の度数をラジアンに変換します",
+        "documentation-rate": "範囲ベクトル内の時系列について、秒あたりの平均増加率を計算します。単調性の破れ (ターゲットの再起動によるカウンターのリセットなど) は自動的に調整されます。また、計算では時間範囲の端まで外挿を行い、スクレイプの見逃しや、スクレイプサイクルと範囲の期間との不完全なアライメントに対応します。",
+        "documentation-resets": "入力時系列ごとに、'resets(v range-vector)'は、指定された時間範囲内のカウンターリセットの数をインスタントベクトルとして返します。2つの連続するサンプル間の値の減少は、カウンターリセットとして解釈されます。",
+        "documentation-round": "「v」のすべての要素のサンプル値を最も近い整数に丸めます。端数は切り上げられます。オプションの「to_nearest」引数を使用すると、サンプル値を丸める最も近い倍数を指定できます。この倍数は分数でもかまいません。",
+        "documentation-scalar": "単一要素の入力ベクトルを指定すると、'scalar(v instant-vector)'はその単一要素のサンプル値をスカラーとして返します。要素がちょうど1つでない場合、'scalar'は'NaN'を返します。",
+        "documentation-sgn": "すべてのサンプル値が符号に変換されたベクトルを返します。これは次のように定義されます。vが正の場合は1、vが負の場合は-1、vがゼロの場合は0。",
+        "documentation-sort": "サンプル値でソートされたベクトル要素を昇順で返します。",
+        "documentation-sort-desc": "サンプル値で並べ替えたベクトル要素を降順で返します。",
+        "documentation-sqrt": "「v」のすべての要素の平方根を計算します。",
+        "documentation-stddev-over-time": "指定された間隔の値の母集団標準分散。",
+        "documentation-stdvar-over-time": "指定された間隔の値の母集団標準分散。",
+        "documentation-sum-over-time": "指定された間隔のすべての値の合計。",
+        "documentation-time": "1970年1月1日 (UTC) 以降の秒数を返します。これは実際には現在の時刻を返すのではなく、式が評価される時刻を返すことに注意してください。",
+        "documentation-timestamp": "指定されたベクトルの各サンプルのタイムスタンプを、1970年1月1日 (UTC) からの秒数として返します。",
+        "documentation-vector": "スカラー値sをラベルのないベクトルとして返します。",
+        "documentation-year": "UTCで指定された各時間の年を返します。"
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "{{argument}}のすべての要素のアークコサインを計算します",
+        "documentation-acosh": "{{argument}}のすべての要素の逆双曲線コサインを計算します",
+        "documentation-asin": "{{argument}}のすべての要素のアークサインを計算します",
+        "documentation-asinh": "{{argument}}のすべての要素の逆双曲線サインを計算します",
+        "documentation-atan": "{{argument}}のすべての要素のアークタンジェントを計算します",
+        "documentation-atanh": "{{argument}}のすべての要素の逆双曲線タンジェントを計算します",
+        "documentation-cos": "{{argument}}のすべての要素のコサインを計算します",
+        "documentation-cosh": "{{argument}}のすべての要素の双曲線コサインを計算します",
+        "documentation-sin": "{{argument}}のすべての要素のサインを計算します",
+        "documentation-sinh": "{{argument}}のすべての要素の双曲線サインを計算します",
+        "documentation-tan": "{{argument}}のすべての要素のタンジェントを計算します",
+        "documentation-tanh": "{{argument}}のすべての要素の双曲線タンジェントを計算します"
       }
     },
     "querybuilder": {
@@ -316,31 +316,31 @@
         "title-give-feedback": "メトリックエクスプローラーは新機能です。改善点についてお聞かせください"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "例示データ：{{value}}",
+        "format": "フォーマット：{{value}}",
+        "legend": "凡例：{{value}}",
+        "step": "ステップ値：{{value}}",
+        "type": "タイプ：{{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "名前でメトリックを検索",
+        "type": "タイプで絞り込む"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "単一の単調増加カウンターを表す累積メトリックです。その値は増加するか、再起動時にゼロにリセットされるかのみです。",
+        "description-gauge": "任意に増減する単一の数値を表すメトリック。",
+        "description-histogram": "ヒストグラムは、観測値 (通常はリクエスト期間や応答サイズなど) をサンプリングし、設定可能なバケットでカウントします。",
+        "description-native-histogram": "ネイティブヒストグラムは、従来のPrometheusヒストグラムとは多くの点で異なります。ネイティブヒストグラムのバケット境界は、ネイティブヒストグラムのスケール (分解能) に依存する式によって計算され、ユーザー定義ではありません。",
+        "description-no-type": "これらのメトリックには、メタデータで定義されたタイプがありません。",
+        "description-summary": "要約は観測値 (通常はリクエスト期間や応答サイズなど) をサンプリングし、スライディング時間ウィンドウにわたって構成可能な分位数を計算できます。",
+        "description-unknown": "これらのメトリックには、メタデータでunknownタイプが指定されています。",
+        "label-counter": "カウンター",
+        "label-gauge": "ゲージ",
+        "label-histogram": "ヒストグラム",
+        "label-native-histogram": "ネイティブヒストグラム",
+        "label-no-type": "型なし",
+        "label-summary": "概要",
+        "label-unknown": "不明な"
       },
       "handle-function": {
         "text": {
@@ -358,8 +358,8 @@
         "tooltip-label-filters": "オプション: このクエリタイプのメトリック選択をフィルタリングするために使用します。"
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "ラベルを読み込み中",
+        "noOptionsMessage-no-labels-found": "ラベルが見つかりません"
       },
       "metric-combobox": {
         "async-select": {
@@ -409,18 +409,18 @@
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "{{labelWord}}{{labels}}を保持しながら、次元間で{{aggregationName}}を計算します。",
+          "label-default": "次元間で{{aggregationName}}を計算します。",
+          "label-without": "{{labels}}次元間で{{aggregationName}}を計算します。他のすべてのラベルは保持されます。"
         }
       },
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "ステップパラメーターの下限を設定",
         "aria-label-select-resolution": "解像度を選択",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "ヒートマップ",
+          "label-table": "テーブル",
+          "label-time-series": "時系列"
         },
         "label-exemplars": "エグゼンプラー",
         "label-format": "形式",
@@ -436,8 +436,8 @@
         "tooltip-autocomplete-suggestions-limited": "メトリック名の数がオートコンプリート制限を超えています。最も関連性の高い{{autocompleteLimit}}個のメトリックのみが表示されます。データソース設定で閾値を調整できます。"
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "構文エラーが発生しているか、ビルダーモードに切り替えたときにクエリ構造を視覚化できません。クエリの一部が失われる可能性があります。",
+        "confirmText-continue": "続行",
         "kick-start-your-query": "クエリを開始",
         "label-explain": "説明",
         "run-queries": "クエリを実行",
@@ -453,8 +453,8 @@
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "ビルダー",
+          "label-code": "コード"
         }
       },
       "query-pattern": {
@@ -483,9 +483,9 @@
       "results-table": {
         "content-descriptive-type": "{{descriptiveType}}を作成する際、Prometheusはタイプカウンターで複数の系列を公開します。",
         "description": "説明",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "メトリックが見つかりません。ラベルフィルターを拡張してみてください。",
+        "message-expand-search": "メトリックが見つかりません。検索とフィルターを拡張してみてください。",
+        "message-no-metrics-found": "データソース内にメトリックが見つかりません。",
         "name": "名前",
         "type": "種類"
       },
diff --git a/packages/grafana-prometheus/src/locales/ko-KR/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/ko-KR/grafana-prometheus.json
index 975a9631f32..47272c39554 100644
--- a/packages/grafana-prometheus/src/locales/ko-KR/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/ko-KR/grafana-prometheus.json
@@ -2,496 +2,496 @@
   "grafana-prometheus": {
     "components": {
       "annotation-query-editor": {
-        "annotation-data-load-error": "",
-        "aria-label-lower-limit-parameter": "",
-        "label-min-step": "",
-        "label-series-value-as-timestamp": "",
+        "annotation-data-load-error": "주석 데이터 로드 오류!",
+        "aria-label-lower-limit-parameter": "단계 매개변수에 대한 하한 설정",
+        "label-min-step": "최소 단계",
+        "label-series-value-as-timestamp": "타임스탬프로 표시된 계열 값",
         "label-tags": "태그",
-        "label-text": "",
+        "label-text": "텍스트",
         "label-title": "제목",
-        "placeholder-auto": "",
-        "tooltip-either-pattern-example-instance-replaced-label": "",
-        "tooltip-min-step": "",
-        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": ""
+        "placeholder-auto": "자동",
+        "tooltip-either-pattern-example-instance-replaced-label": "이름 또는 패턴을 사용하세요. 예를 들어, {{labelTemplate}}은(는) {{labelName}} 레이블에 대한 레이블 값으로 대체됩니다.",
+        "tooltip-min-step": "Prometheus 쿼리의 단계 매개변수와 <2>{{intervalVar}}</2> 및 <4>{{rateIntervalVar}}</4> 변수에 대한 추가적인 하한입니다.",
+        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": "타임스탬프 단위는 밀리초입니다. 계열 값의 단위가 초인 경우, 범위 벡터에 1,000을 곱합니다."
       },
       "get-query-type-options": {
         "description": {
-          "instant-query-range": ""
+          "instant-query-range": "인스턴트 쿼리 및 범위 쿼리 실행"
         },
         "label": {
-          "both": ""
+          "both": "둘 다"
         },
         "range-options": {
           "description": {
-            "query-range": ""
+            "query-range": "특정 시간 범위에 대해 쿼리 실행"
           },
           "label": {
-            "instant": "",
-            "range": ""
+            "instant": "즉시",
+            "range": "범위"
           }
         }
       },
       "label-selector": {
-        "aria-label-filter-expression-for-label": "",
-        "description-select-labels": "",
-        "select-labels-to-search-in": ""
+        "aria-label-filter-expression-for-label": "레이블에 대한 표현식 필터링",
+        "description-select-labels": "레이블 값을 선택하면, 가능한 레이블 조합만 표시됩니다.",
+        "select-labels-to-search-in": "2. 검색할 레이블을 선택합니다."
       },
       "metric-selector": {
-        "aria-label-filter-expression-for-metric": "",
-        "aria-label-limit-results-from-series-endpoint": "",
-        "description-series-limit": "",
-        "label-select-metric": "",
-        "select-a-metric": "",
-        "series-limit": ""
+        "aria-label-filter-expression-for-metric": "메트릭에 대한 표현식 필터링",
+        "aria-label-limit-results-from-series-endpoint": "시리즈 엔드포인트의 결과 제한",
+        "description-series-limit": "제한은 모든 메트릭, 레이블, 값에 적용됩니다. 기본 한도를 사용하려면 필드를 비워 두세요. 한도를 비활성화하고 모든 것을 가져오려면 0으로 설정하세요. 이렇게 하면 성능 문제가 발생할 수 있습니다.",
+        "label-select-metric": "메트릭을 선택하면, 가능한 레이블만 표시됩니다. 레이블은 아래의 시리즈 한도에 의해 제한됩니다.",
+        "select-a-metric": "1. 메트릭을 선택합니다.",
+        "series-limit": "시리즈 한도"
       },
       "prom-cheat-sheet": {
-        "prom-ql-cheat-sheet": ""
+        "prom-ql-cheat-sheet": "PromQL 치트 시트"
       },
       "prom-exemplar-field": {
-        "exemplars": "",
-        "tooltip-disable-query": "",
-        "tooltip-enable-query": ""
+        "exemplars": "예제",
+        "tooltip-disable-query": "예제를 사용한 쿼리 비활성화",
+        "tooltip-enable-query": "예제를 사용한 쿼리 활성화"
       },
       "prom-explore-extra-field": {
-        "aria-label-prometheus-extra-field": "",
-        "aria-label-query-type-field": "",
-        "aria-label-step-field": "",
-        "min-step": "",
-        "query-type": "",
-        "tooltip-units-builtin-variables-example-interval-rateinterval": ""
+        "aria-label-prometheus-extra-field": "Prometheus 추가 필드",
+        "aria-label-query-type-field": "쿼리 유형 필드",
+        "aria-label-step-field": "단계 필드",
+        "min-step": "최소 단계",
+        "query-type": "쿼리 유형",
+        "tooltip-units-builtin-variables-example-interval-rateinterval": "여기에서 시간 단위 및 기본 제공 변수를 사용할 수 있습니다. 예: {{example1}}, {{example2}}, {{example3}}, {{example4}}, {{example5}}, {{example6}}, {{example7}}(단위가 지정되지 않은 경우 기본값: {{default}})"
       },
       "prom-query-field": {
-        "placeholder-enter-a-prom-ql-query": ""
+        "placeholder-enter-a-prom-ql-query": "PromQL 쿼리를 입력하세요..."
       },
       "prom-variable-query-editor": {
-        "aria-label-classic-query": "",
-        "aria-label-metric-regex": "",
-        "aria-label-metric-selector": "",
-        "aria-label-prometheus-query": "",
-        "aria-label-query-type": "",
-        "aria-label-series-query": "",
-        "label-classic-query": "",
+        "aria-label-classic-query": "클래식 쿼리",
+        "aria-label-metric-regex": "메트릭 정규식",
+        "aria-label-metric-selector": "메트릭 선택기",
+        "aria-label-prometheus-query": "Prometheus 쿼리",
+        "aria-label-query-type": "쿼리 유형",
+        "aria-label-series-query": "시리즈 쿼리",
+        "label-classic-query": "클래식 쿼리",
         "label-label": "라벨",
-        "label-metric-regex": "",
+        "label-metric-regex": "메트릭 정규식",
         "label-query": "쿼리",
-        "label-query-type": "",
-        "label-series-query": "",
-        "placeholder-classic-query": "",
-        "placeholder-metric-regex": "",
-        "placeholder-prometheus-query": "",
+        "label-query-type": "쿼리 유형",
+        "label-series-query": "시리즈 쿼리",
+        "placeholder-classic-query": "클래식 쿼리",
+        "placeholder-metric-regex": "메트릭 정규식",
+        "placeholder-prometheus-query": "Prometheus 쿼리",
         "placeholder-select-query-type": "쿼리 유형 선택",
-        "placeholder-series-query": "",
-        "returns-metrics-matching-specified-metric-regex": "",
-        "tooltip-classic-query": "",
-        "tooltip-label": "",
-        "tooltip-metric-regex": "",
-        "tooltip-query": "",
-        "tooltip-query-type": "",
-        "tooltip-series-query": ""
+        "placeholder-series-query": "시리즈 쿼리",
+        "returns-metrics-matching-specified-metric-regex": "지정된 메트릭 정규식과 매칭하는 메트릭 목록을 반환합니다.",
+        "tooltip-classic-query": "Prometheus 변수 쿼리 편집기의 원래 구현입니다. 이 문서에 설명된 대로 올바른 쿼리 유형 및 매개변수가 있는 문자열을 입력합니다. 예: {{exampleQuery}}.",
+        "tooltip-label": "메트릭이 지정되지 않은 한, 모든 메트릭에서 레이블 이름에 대한 레이블 값 목록을 반환합니다.",
+        "tooltip-metric-regex": "필요에 따라 지정된 메트릭 정규식을 기준으로 필터링하여, 레이블 이름 목록을 반환합니다.",
+        "tooltip-query": "쿼리에 대한 Prometheus 쿼리 결과 목록을 반환합니다. 여기에는 Prometheus 기능이 포함될 수 있습니다. 예: {{exampleQuery}}.",
+        "tooltip-query-type": "Prometheus 데이터 소스 플러그인은 템플릿 변수에 대해 다음과 같은 쿼리 유형을 제공합니다.",
+        "tooltip-series-query": "레이블이 있는 메트릭 또는 메트릭만 단독으로 또는 레이블만 단독으로 입력하세요. 예: {{example1}}, {{example2}}, {{example3}}. 입력된 데이터와 관련된 시계열 목록을 반환합니다."
       },
       "selector-actions": {
-        "aria-label-selector": "",
-        "aria-label-selector-clear-button": "",
-        "aria-label-use-selector-as-metrics-button": "",
-        "aria-label-use-selector-for-query-button": "",
-        "aria-label-validate-submit-button": "",
+        "aria-label-selector": "선택기",
+        "aria-label-selector-clear-button": "선택기 지우기 버튼",
+        "aria-label-use-selector-as-metrics-button": "메트릭 버튼으로 선택기 사용",
+        "aria-label-use-selector-for-query-button": "쿼리 버튼에 선택기 사용",
+        "aria-label-validate-submit-button": "제출 버튼 유효성 검사",
         "clear": "초기화",
-        "resulting-selector": "",
-        "use-as-rate-query": "",
-        "use-query": "",
-        "validate-selector": ""
+        "resulting-selector": "4. 결과로 나타난 선택기",
+        "use-as-rate-query": "요율 쿼리로 사용",
+        "use-query": "쿼리 사용",
+        "validate-selector": "선택기 검증"
       },
       "value-selector": {
-        "aria-label-filter-expression-for-label-values": "",
-        "aria-label-values-for": "",
-        "description-search-field-values-across-selected-labels": "",
-        "select-multiple-values-for-your-labels": ""
+        "aria-label-filter-expression-for-label-values": "레이블 값에 대한 필터 표현식",
+        "aria-label-values-for": "{{labelKey}} 값",
+        "description-search-field-values-across-selected-labels": "검색 필드를 사용하여 선택한 레이블 전체에서 값을 찾습니다.",
+        "select-multiple-values-for-your-labels": "3. 레이블에 대한 (여러) 값을 선택합니다."
       }
     },
     "configuration": {
       "alerting-settings-overhaul": {
-        "label-allow-as-recording-rules-target": "",
-        "label-manage-alerts-via-alerting-ui": "",
+        "label-allow-as-recording-rules-target": "기록 규칙 대상으로 허용",
+        "label-manage-alerts-via-alerting-ui": "경보 UI를 통해 경보를 관리합니다.",
         "title-alerting": "경고",
-        "tooltip-allow-as-recording-rules-target": "",
+        "tooltip-allow-as-recording-rules-target": "이 데이터 소스를 기록 규칙 작성 대상으로 선택하도록 허용합니다.",
         "tooltip-manage-alerts-via-alerting-ui": "이 데이터 소스에 대한 경고 규칙을 관리합니다. 다른 Alerting 리소스를 관리하려면 Alertmanager 데이터 소스를 추가하세요."
       },
       "config-editor": {
-        "browser-access-mode-error": "",
-        "description-advanced-settings": "",
+        "browser-access-mode-error": "Prometheus 데이터 소스에서 브라우저 액세스 모드를 더 이상 사용할 수 없습니다. 서버 액세스 모드로 전환합니다.",
+        "description-advanced-settings": "추가 설정은 데이터 소스를 보다 세부적으로 제어하기 위해 구성할 수 있는 선택적 설정입니다. ",
         "title-advanced-settings": "고급 설정",
         "title-error": "오류"
       },
       "data-source-http-settings-overhaul": {
         "tooltip-browser-access-mode": "액세스 방법이 <1>브라우저</1>이므로 브라우저에서 URL에 액세스할 수 있어야 합니다.",
-        "tooltip-http-url": "",
+        "tooltip-http-url": "전체 HTTP URL을 지정(예: {{exampleURL}})합니다.",
         "tooltip-server-access-mode": "액세스 방법이 <1>서버</1>이므로 Grafana 백엔드 또는 서버에서 URL에 액세스할 수 있어야 합니다."
       },
       "docs-tip": {
-        "visit-docs-for-more-details-here": ""
+        "visit-docs-for-more-details-here": "자세한 내용은 여기에서 문서를 참조하세요."
       },
       "exemplar-setting": {
         "label-data-source": "데이터 소스",
-        "label-internal-link": "",
+        "label-internal-link": "내부 링크",
         "label-label-name": "라벨 이름",
-        "label-remove-exemplar-link": "",
+        "label-remove-exemplar-link": "예시 링크 제거",
         "label-url": "URL",
-        "label-url-label": "",
-        "placeholder-go-to-examplecom": "",
-        "placeholder-httpsexamplecomvalueraw": "",
-        "placeholder-trace-id": "",
-        "title-remove-exemplar-link": "",
-        "tooltip-data-source": "",
-        "tooltip-internal-link": "",
-        "tooltip-label-name": "",
-        "tooltip-url": "",
-        "tooltip-url-label": ""
+        "label-url-label": "URL 레이블",
+        "placeholder-go-to-examplecom": "example.com으로 이동",
+        "placeholder-httpsexamplecomvalueraw": "https://example.com/${__value.raw}",
+        "placeholder-trace-id": "추적 ID",
+        "title-remove-exemplar-link": "예시 링크 제거",
+        "tooltip-data-source": "예제에서 탐색할 데이터 소스입니다.",
+        "tooltip-internal-link": "내부 링크가 있는 경우 이 옵션을 활성화합니다. 활성화하면, 데이터 소스 선택기가 표시됩니다. 예시 데이터에 대한 백엔드 추적 데이터 저장소를 선택합니다.",
+        "tooltip-label-name": "추적 ID를 가져오는 데 사용해야 하는 레이블 개체 내 필드 이름입니다.",
+        "tooltip-url": "사용자가 추적을 확인하기 위해 이동할 추적 백엔드의 URL입니다. ",
+        "tooltip-url-label": "예제 추적 ID 필드의 버튼 레이블을 재정의하는 데 사용합니다."
       },
       "exemplars-settings": {
         "add": "추가",
-        "no-exemplars-configurations": "",
-        "title-exemplars": ""
+        "no-exemplars-configurations": "예시 구성 없음",
+        "title-exemplars": "예제"
       },
       "prom-settings": {
-        "aria-label-default-editor": "",
-        "aria-label-prom-type-type": "",
-        "aria-label-prometheus-type": "",
-        "aria-label-select-http-method": "",
+        "aria-label-default-editor": "기본 편집기(코드 또는 빌더)",
+        "aria-label-prom-type-type": "{{promType}} 유형",
+        "aria-label-prometheus-type": "Prometheus 유형",
+        "aria-label-select-http-method": "HTTP 메소드 선택",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "빌더",
+          "label-code": "코드"
         },
-        "label-cache-level": "",
-        "label-custom-query-parameters": "",
-        "label-default-editor": "",
-        "label-disable-metrics-lookup": "",
-        "label-disable-recording-rules-beta": "",
-        "label-http-method": "",
-        "label-incremental-querying-beta": "",
-        "label-metric-names-suggestion-limit": "",
-        "label-prom-type-version": "",
-        "label-prometheus-type": "",
-        "label-query-overlap-window": "",
-        "label-query-timeout": "",
-        "label-scrape-interval": "",
-        "label-series-limit": "",
-        "label-use-series-endpoint": "",
-        "more-info": "",
-        "placeholder-example-maxsourceresolutionmtimeout": "",
-        "title-interval-behaviour": "",
-        "title-other": "",
+        "label-cache-level": "캐시 수준",
+        "label-custom-query-parameters": "사용자 지정 쿼리 파라미터",
+        "label-default-editor": "기본 편집기",
+        "label-disable-metrics-lookup": "메트릭 조회 비활성화",
+        "label-disable-recording-rules-beta": "기록 규칙 비활성화(베타)",
+        "label-http-method": "HTTP 메소드",
+        "label-incremental-querying-beta": "증분 쿼리(베타)",
+        "label-metric-names-suggestion-limit": "메트릭 이름 제안 한도",
+        "label-prom-type-version": "{{promType}} 버전",
+        "label-prometheus-type": "Prometheus 유형",
+        "label-query-overlap-window": "쿼리 중복 창",
+        "label-query-timeout": "쿼리 시간 초과",
+        "label-scrape-interval": "스크레이핑 간격",
+        "label-series-limit": "계열 한도",
+        "label-use-series-endpoint": "계열 엔드포인트 사용",
+        "more-info": "데이터 소스에서 prometheus 유형 및 버전을 구성하는 방법에 대한 자세한 내용은 <2>프로비저닝 문서</2>를 참조하시기 바랍니다.",
+        "placeholder-example-maxsourceresolutionmtimeout": "예: {{example}} ",
+        "title-interval-behaviour": "간격 동작",
+        "title-other": "기타",
         "title-performance": "성능",
-        "title-query-editor": "",
-        "tooltip-cache-level": "",
-        "tooltip-custom-query-parameters": "",
-        "tooltip-default-editor": "",
-        "tooltip-disable-metrics-lookup": "",
-        "tooltip-disable-recording-rules-beta": "",
-        "tooltip-http-method": "",
-        "tooltip-incremental-querying-beta": "",
-        "tooltip-metric-names-suggestion-limit": "",
-        "tooltip-prom-type-version": "",
-        "tooltip-prometheus-type": "",
-        "tooltip-query-overlap-window": "",
-        "tooltip-query-timeout": "",
-        "tooltip-scrape-interval": "",
-        "tooltip-series-limit": "",
-        "tooltip-use-series-endpoint": ""
+        "title-query-editor": "쿼리 편집기",
+        "tooltip-cache-level": "편집기 쿼리에 대한 브라우저 캐싱 수준을 설정합니다. 카디널리티(cardinality)가 높은 데이터 소스에는 더 높은 캐시 설정을 권장합니다.",
+        "tooltip-custom-query-parameters": "Prometheus 쿼리 URL에 사용자 지정 매개변수를 추가합니다. 예: {{example1}}, {{example2}}, {{example3}}, {{example4}}. 여러 파라미터는 {{concatenationChar}}와(과) 함께 연결해야 합니다.",
+        "tooltip-default-editor": "이 데이터 소스의 모든 사용자에 대한 기본 편집기 옵션을 설정합니다.",
+        "tooltip-disable-metrics-lookup": "이 옵션을 선택하면, 쿼리 필드의 자동 완성에서 메트릭 선택기 및 메트릭/레이블 지원이 비활성화됩니다. 이는 대규모 Prometheus 인스턴스에서 성능 문제가 발생하는 경우에 유용합니다. ",
+        "tooltip-disable-recording-rules-beta": "이 기능을 사용하면 기록 규칙이 비활성화됩니다. 대시보드 성능을 향상시키려면 이 기능을 켜세요.",
+        "tooltip-http-method": "POST 또는 GET HTTP 메소드를 사용하여 Prometheus 데이터 소스를 쿼리할 수 있습니다. POST는 더 큰 쿼리를 허용하기 때문에 권장되는 메소드입니다. Prometheus 버전이 2.1보다 이전 버전이거나 네트워크에서 POST 요청이 제한되어 있는 경우 이를 GET으로 변경하세요.",
+        "tooltip-incremental-querying-beta": "이 기능은 상대적 쿼리의 기본 동작을 항상 Prometheus 인스턴스에서 최신 데이터를 요청하도록 변경합니다. 대신 쿼리 결과가 캐시되고 새 레코드만 요청됩니다. 데이터베이스 및 네트워크 부하를 줄이려면 이 기능을 켜세요.",
+        "tooltip-metric-names-suggestion-limit": "쿼리 편집기의 코드 모드에서 자동 완성 제안으로 표시될 수 있는 메트릭 이름 개수 최대 한도입니다.",
+        "tooltip-prom-type-version": "{{promType}} 인스턴스의 버전이 자동으로 구성되지 않은 경우 이를 사용하여 버전을 설정합니다.",
+        "tooltip-prometheus-type": "이를 Prometheus 데이터베이스의 유형(예: Prometheus, Cortex, Mimir, Thanos)으로 설정합니다. 이 필드를 변경하면 현재 설정이 저장됩니다. Prometheus는 유형에 따라 다양한 API를 지원할 수도, 지원하지 않을 수도 있습니다. 예를 들어, 일부 유형은 성능을 개선하기 위해 레이블 쿼리에 대한 정규식 매칭을 지원합니다. 일부 유형에는 메타데이터용 API가 있습니다. 이를 잘못 설정하면, 메트릭 및 레이블을 쿼리할 때 이상 작동이 발생할 수 있습니다. Prometheus 설명서를 살펴보고 올바른 유형을 입력했는지 확인하세요.",
+        "tooltip-query-overlap-window": "{{example1}}, {{example2}}, 또는 {{example3}} 등의 지속 시간을 설정합니다. 기본값은 {{default}}입니다. 이 기간은 각 증분 요청의 기간에 추가됩니다.",
+        "tooltip-query-timeout": "Prometheus 쿼리 타임아웃을 설정합니다.",
+        "tooltip-scrape-interval": "이 간격은 Prometheus가 대상을 스크레이핑하는 빈도입니다. 이를 Prometheus 구성 파일에서 구성된 일반적인 스크레이핑 및 평가 간격으로 설정합니다. 이 값을 Prometheus 구성 파일 간격보다 큰 값으로 설정하면, Grafana는 이 간격에 맞춰 데이터를 평가하며 데이터 포인트가 더 적게 표시됩니다. 기본값은 {{default}}입니다.",
+        "tooltip-series-limit": "이 제한은 두 엔드포인트(계열 및 레이블)의 모든 리소스(메트릭, 레이블 및 값)에 적용됩니다. 기본 한도(40,000)를 사용하려면 필드를 비워 두세요. 한도를 비활성화하고 모든 것을 가져오려면 0으로 설정하세요. 이렇게 하면 성능 문제가 발생할 수 있습니다. 기본 한도는 40,000입니다.",
+        "tooltip-use-series-endpoint": "이 옵션을 선택하면 {{exampleParameter}} 파라미터가 있는 레이블 값 엔드포인트보다 {{exampleParameter}} 파라미터가 있는 계열 엔드포인트가 선호됩니다. 레이블 값 엔드포인트가 성능이 더 우수한 것으로 간주되지만, 레이블 값 엔드포인트에는 GET 메서드만 있는 반면 계열 엔드포인트에는 POST 메소드가 있기 때문에 일부 사용자는 계열을 선호할 수 있습니다."
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(비활성화됨)",
+      "enabled-label": "메트릭 브라우저"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "고유 레이블만 포함",
+        "description-custom": "이름 지정 템플릿 제공",
+        "description-verbose": "모든 레이블 이름 및 값",
+        "label-auto": "자동",
+        "label-custom": "사용자 지정",
+        "label-verbose": "자세히"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "차원에 대한 평균을 계산합니다",
+        "documentation-bottomk": "샘플 값 기준으로 가장 작은 k개 요소",
+        "documentation-count": "벡터 요소의 개수를 셉니다",
+        "documentation-count-values": "동일한 값을 가진 요소의 개수를 셉니다",
+        "documentation-group": "결과 벡터의 값은 모두 1입니다",
+        "documentation-max": "차원에 대한 최대값을 선택합니다",
+        "documentation-min": "차원에 대한 최소값을 선택합니다",
+        "documentation-quantile": "차원에 대한 φ-분위수(0 ≤ φ ≤ 1)를 계산합니다",
+        "documentation-stddev": "차원에 대한 모집단 표준 편차를 계산합니다",
+        "documentation-stdvar": "차원에 대한 모집단 표준 분산을 계산합니다",
+        "documentation-sum": "차원에 대한 합계를 계산합니다",
+        "documentation-topk": "샘플 값 기준으로 가장 큰 k개 요소"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "모든 샘플 값이 절대값으로 변환된 입력 벡터를 반환합니다.",
+        "documentation-absent": "전달된 벡터에 요소가 있으면 빈 벡터를 반환하고, 전달된 벡터에 요소가 없으면 값이 1인 요소 1개를 가진 벡터를 반환합니다. 이는 지정된 메트릭 이름 및 레이블 조합에 대한 시계열이 없을 경우 경고를 생성하는 데 유용합니다.",
+        "documentation-absent-over-time": "전달된 범위 벡터에 요소가 있으면 빈 벡터를 반환하고, 전달된 범위 벡터에 요소가 없으면 값이 1인 요소 1개를 가진 벡터를 반환합니다.",
+        "documentation-avg-over-time": "지정된 간격의 모든 포인트를 평균한 값입니다.",
+        "documentation-ceil": "`v`에 속한 모든 요소의 샘플 값을 가장 가까운 정수로 반올림합니다.",
+        "documentation-changes": "각 입력 시계열에 대해 `changes(v range-vector)`는 제공된 시간 범위 내에서 값이 변경된 횟수를 인스턴트 벡터로 반환합니다.",
+        "documentation-clamp": "`v`에 속한 모든 요소의 샘플 값을 `min`의 하한과 `max`의 상한을 갖도록 고정합니다.",
+        "documentation-clamp-max": "`v`에 속한 모든 요소의 샘플 값을 `max`의 상한을 갖도록 고정합니다.",
+        "documentation-clamp-min": "`v`에 속한 모든 요소의 샘플 값을 `min`의 하한을 갖도록 고정합니다.",
+        "documentation-count-over-time": "지정된 간격에 속한 모든 값을 계수한 값입니다.",
+        "documentation-count-scalar": "시계열 벡터의 요소 수를 스칼라로 반환합니다. 이는 항상 벡터를 반환(입력 벡터가 비어 있는 경우 빈 벡터)하고 `by` 절을 통해 레이블별로 그룹화할 수 있는 `count()` 집계 연산자와는 다릅니다.",
+        "documentation-day-of-month": "UTC로 지정된 각 시간에 대해 해당 월의 날을 반환합니다. 반환된 값은 1부터 31까지입니다.",
+        "documentation-day-of-week": "UTC로 지정된 각 시간에 대한 요일을 반환합니다. 반환된 값은 0부터 6까지이며, 여기서 0은 일요일 등을 의미합니다.",
+        "documentation-day-of-year": "UTC로 지정된 각 시간에 대해 해당 연도의 날을 반환합니다. 반환되는 값은 윤년이 아닌 경우 1부터 365까지, 윤년인 경우 1부터 366까지입니다.",
+        "documentation-days-in-month": "UTC로 지정된 각 시간에 대해 해당 월의 일수를 반환합니다. 반환되는 값은 28부터 31까지입니다.",
+        "documentation-deg": "v의 모든 요소에 대해 라디안을 도(degree)로 변환합니다",
+        "documentation-delta": "범위 벡터 `v`의 각 시계열 요소의 첫 번째 값과 마지막 값의 차이를 계산하여 지정된 델타 및 동일한 레이블을 가진 인스턴트 벡터를 반환합니다. 델타는 범위 벡터 선택기에서 지정된 전체 시간 범위를 커버하도록 외삽되므로 샘플 값이 모두 정수인 경우에도 정수가 아닌 결과를 얻을 수 있습니다.",
+        "documentation-deriv": "단순 선형 회귀를 사용하여 범위 벡터 `v`에서 시계열의 초당 도함수를 계산합니다.",
+        "documentation-double-exponential-smoothing": "`v`의 범위를 토대로 시계열의 평활화 값을 생성합니다. 평활화 계수 `sf`가 낮을수록 이전 데이터의 중요성이 커집니다. 추세 계수 `tf`가 높을수록 데이터의 추세가 더 많이 고려됩니다. `sf`와 `tf` 모두 0과 1 사이여야 합니다.",
+        "documentation-drop-common-labels": "입력 벡터의 모든 시리즈에서 이름과 값이 동일한 레이블을 모두 제거합니다.",
+        "documentation-exp": "`v`의 모든 요소에 대한 지수 함수를 계산합니다.\n특수한 경우는 다음과 같습니다.\n* `Exp(+Inf) = +Inf` \n* `Exp(NaN) = NaN`",
+        "documentation-floor": "`v`에 속한 모든 요소의 샘플 값을 가장 가까운 정수로 내림합니다.",
+        "documentation-histogram-avg": "기본 히스토그램에 저장된 관찰 값의 산술 평균을 반환합니다. 기본 히스토그램이 아닌 샘플은 무시되며 반환된 벡터에 표시되지 않습니다.",
+        "documentation-histogram-count": "기본 히스토그램에 저장된 관찰값의 개수를 반환합니다.",
+        "documentation-histogram-fraction": "제공된 하한값과 상한값 사이에 속한 관찰값의 추정 비율을 소수로 반환합니다.",
+        "documentation-histogram-quantile": "히스토그램의 구간 `b`에서 φ-분위수(0 ≤ φ ≤ 1)를 계산합니다. `b`의 샘플은 각 구간의 관찰값의 개수입니다. 각 샘플에는 레이블 `le`가 있어야 하며 레이블 값은 버킷의 상한을 나타냅니다. (이러한 레이블이 없는 샘플은 자동으로 무시됩니다.) 히스토그램 메트릭 유형은 자동으로 `_bucket` 접미사와 적절한 레이블이 있는 시계열을 제공합니다.",
+        "documentation-histogram-stddev": "관찰값이 있는 구간의 기하 평균을 토대로 기본 히스토그램에서 관찰값의 추정 표준 편차를 반환합니다.",
+        "documentation-histogram-stdvar": "기본 히스토그램에서 관찰값의 추정 표준 분산을 반환합니다.",
+        "documentation-histogram-sum": "기본 히스토그램에 저장된 관찰값의 합계를 반환합니다.",
+        "documentation-holt-winters": "Prometheus v3.x에서 double_exponential_smoothing으로 이름이 변경되었습니다. Prometheus 버전이 v3.0 이상인 경우 double_exponential_smoothing을 사용하세요. \n\n`v`의 범위를 토대로 시계열의 평활화 값을 생성합니다. 평활화 계수 `sf`가 낮을수록 이전 데이터의 중요성이 커집니다. 추세 계수 `tf`가 높을수록 데이터의 추세가 더 많이 고려됩니다. `sf`와 `tf` 모두 0과 1 사이여야 합니다.",
+        "documentation-hour": "UTC로 지정된 각 시간에 대해 해당 날의 시간을 반환합니다. 반환되는 값은 0부터 23까지입니다.",
+        "documentation-idelta": "범위 벡터 `v`의 마지막 두 샘플 간의 차이를 계산하여 지정된 델타 및 동일한 레이블을 가진 인스턴트 벡터를 반환합니다.",
+        "documentation-increase": "범위 벡터의 시계열 증가분을 계산합니다. 단조성 중단(예: 대상이 재시작되면서 카운터가 초기화되는 경우)은 자동으로 조정됩니다. 증가분은 범위 벡터 선택기에서 지정된 시간 범위 전체를 커버하도록 외삽되므로 카운터가 정수 단위로만 증가하는 경우에도 정수가 아닌 결과를 얻을 수 있습니다.",
+        "documentation-info": "계산 없이 레이블 및 현재 값과 같은 메트릭 그룹에 대한 최신 세부 정보 및 메타데이터를 반환합니다",
+        "documentation-irate": "마지막 두 데이터 포인트를 토대로 범위 벡터의 시계열 증가분의 초당 순간 속도를 계산합니다. 단조성 중단(예: 대상이 재시작되면서 카운터가 초기화되는 경우)은 자동으로 조정됩니다.",
+        "documentation-label-join": "`v`의 각 시계열에 대해 `separator`를 사용하여 모든 `src_labels`의 모든 값을 결합하고 결합된 값이 포함된 레이블 `dst_label`을 가진 시계열을 반환합니다. 이 함수에는 `src_labels`를 제한 없이 여러 개 사용할 수 있습니다.",
+        "documentation-label-replace": "`v`의 각 시계열에 대해 `label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)`는 레이블 `src_label`에 대해 정규 표현식 `regex`를 매칭합니다. 정규식이 일치하면 레이블 `dst_label`이 `replacement`의 확장으로 대체되어 시계열이 반환됩니다. `$1`은 첫 번째 일치하는 하위 그룹으로, `$2`는 두 번째 하위 그룹으로 대체됩니다. 정규 표현식이 일치하지 않으면 시계열이 변경되지 않고 반환됩니다.",
+        "documentation-last-over-time": "지정된 간격의 가장 최근 포인트 값입니다.",
+        "documentation-ln": "`v`의 모든 요소에 대해 자연 로그를 계산합니다.\n특수한 경우는 다음과 같습니다.\n * `ln(+Inf) = +Inf`\n * `ln(0) = -Inf`\n * `ln(x < 0) = NaN`\n * `ln(NaN) = NaN`",
+        "documentation-log10": "`v`의 모든 요소에 대한 상용로그를 계산합니다. 특수한 경우는 `ln`의 경우와 동일합니다.",
+        "documentation-log2": "`v`의 모든 요소에 대한 이진로그를 계산합니다. 특수한 경우는 `ln`의 경우와 동일합니다.",
+        "documentation-max-over-time": "지정된 간격의 모든 포인트의 최대값입니다.",
+        "documentation-min-over-time": "지정된 간격의 모든 포인트의 최소값입니다.",
+        "documentation-minute": "UTC로 지정된 각 시간에 대해 해당 시간의 분을 반환합니다. 반환되는 값은 0부터 59까지입니다.",
+        "documentation-month": "UTC로 지정된 각 시간에 대해 해당 연도의 월을 반환합니다. 반환되는 값은 1부터 12까지이며, 여기서 1은 1월 등을 의미합니다.",
+        "documentation-pi": "파이(pi)를 반환합니다",
+        "documentation-predict-linear": "단순 선형 회귀를 사용하여 범위 벡터 `v`를 토대로 현재부터 `t`초 후의 시계열 값을 예측합니다.",
+        "documentation-present-over-time": "지정된 간격에 속한 모든 시리즈에 대한 값 1을 반환합니다.",
+        "documentation-quantile-over-time": "지정된 간격에 속한 값의 φ-분위수(0 ≤ φ ≤ 1)입니다.",
+        "documentation-rad": "v의 모든 요소에 대해 도(degree)를 라디안으로 변환합니다",
+        "documentation-rate": "범위 벡터의 시계열 증가분의 초당 평균 속도를 계산합니다. 단조성 중단(예: 대상이 재시작되면서 카운터가 초기화되는 경우)은 자동으로 조정됩니다. 또한, 시간 범위의 끝까지 외삽하여 계산하기 때문에 스크레이프가 누락되거나 범위의 기간과 스크레이프 주기가 완전하게 일치하지 않더라도 문제없이 처리됩니다.",
+        "documentation-resets": "각 입력 시계열에 대해 `resets(v range-vector)`는 제공된 시간 범위 내에서 카운터가 재설정된 횟수를 인스턴트 벡터로 반환합니다. 두 연속 샘플 사이의 값이 감소하면 카운터가 재설정된 것으로 해석합니다.",
+        "documentation-round": "`v`의 모든 요소의 샘플 값을 가장 가까운 정수로 반올림합니다. 값이 정확히 중간인 경우에는 반올림하여 해결합니다. 선택 사항인 `to_nearest` 인수를 사용하면 샘플 값을 반올림할 가장 가까운 배수를 지정할 수 있습니다. 이 배수는 소수로도 지정할 수 있습니다.",
+        "documentation-scalar": "단일 요소로 구성된 입력 벡터가 주어지면 `scalar(v instant-vector)`는 해당 단일 요소의 샘플 값을 스칼라로 반환합니다. 입력 벡터의 요소가 정확히 한 개가 아닌 경우 `scalar`는 `NaN`을 반환합니다.",
+        "documentation-sgn": "모든 샘플 값이 부호로 변환된 벡터를 반환하며 다음과 같이 정의됩니다. v가 양수이면 1, v가 음수이면 -1, v가 0이면 0입니다.",
+        "documentation-sort": "샘플 값에 따라 오름차순으로 정렬된 벡터 요소를 반환합니다.",
+        "documentation-sort-desc": "샘플 값에 따라 내림차순으로 정렬된 벡터 요소를 반환합니다.",
+        "documentation-sqrt": "`v`의 모든 요소의 제곱근을 계산합니다.",
+        "documentation-stddev-over-time": "지정된 간격에 속한 값의 모집단 표준 편차입니다.",
+        "documentation-stdvar-over-time": "지정된 간격에 속한 값의 모집단 표준 분산입니다.",
+        "documentation-sum-over-time": "지정된 간격에 속한 모든 값의 합계입니다.",
+        "documentation-time": "UTC 기준으로 1970년 1월 1일 이후의 초(seconds) 수를 반환합니다. 반환된 값은 실제 현재 시간이 아닌 표현식이 평가되는 시간을 기준으로 합니다.",
+        "documentation-timestamp": "지정된 벡터의 각 샘플의 타임스탬프를 UTC 기준 1970년 1월 1일 이후의 초 수로 반환합니다.",
+        "documentation-vector": "스칼라 `s`를 레이블이 없는 벡터로 반환합니다.",
+        "documentation-year": "UTC로 지정된 각 시간에 대한 연도를 반환합니다."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "{{argument}}의 모든 요소의 아크코사인을 계산합니다",
+        "documentation-acosh": "{{argument}}의 모든 요소의 역쌍곡 코사인을 계산합니다",
+        "documentation-asin": "{{argument}}의 모든 요소의 아크사인을 계산합니다",
+        "documentation-asinh": "{{argument}}의 모든 요소의 역쌍곡 사인을 계산합니다",
+        "documentation-atan": "{{argument}}의 모든 요소의 아크탄젠트를 계산합니다",
+        "documentation-atanh": "{{argument}}의 모든 요소의 역쌍곡 탄젠트를 계산합니다",
+        "documentation-cos": "{{argument}}의 모든 요소의 코사인을 계산합니다",
+        "documentation-cosh": "{{argument}}의 모든 요소의 쌍곡 코사인을 계산합니다",
+        "documentation-sin": "{{argument}}의 모든 요소의 사인을 계산합니다",
+        "documentation-sinh": "{{argument}}의 모든 요소의 쌍곡 사인을 계산합니다",
+        "documentation-tan": "{{argument}}의 모든 요소의 탄젠트를 계산합니다",
+        "documentation-tanh": "{{argument}}의 모든 요소의 쌍곡 탄젠트를 계산합니다"
       }
     },
     "querybuilder": {
       "feedback-link": {
         "give-feedback": "피드백 제출하기",
-        "title-give-feedback": ""
+        "title-give-feedback": "메트릭 탐색기는 새로운 기능이니, 개선할 사항이 있다면, 저희 측에 알려주세요. "
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "예시: {{value}}",
+        "format": "형식: {{value}}",
+        "legend": "범례: {{value}}",
+        "step": "단계: {{value}}",
+        "type": "유형: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "이름으로 메트릭 검색",
+        "type": "유형으로 필터링"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "단조 증가하는 단일 카운터를 나타내는 누적 메트릭으로, 값은 증가만 가능하거나 다시 시작할 때 0으로 재설정될 수 있습니다.",
+        "description-gauge": "임의로 오르내릴 수 있는 단일 숫자 값을 나타내는 메트릭입니다.",
+        "description-histogram": "히스토그램은 관찰값(일반적으로 요청 기간 또는 응답 크기와 같은 것)을 샘플링하여 구성 가능한 구간별로 항목 수를 계수합니다.",
+        "description-native-histogram": "기본 히스토그램은 여러 가지 면에서 기존 Prometheus 히스토그램과 다릅니다. 기본 히스토그램 구간의 경계는 사용자가 정의할 수 없으며, 히스토그램의 스케일(해상도)에 따라 달라지는 공식을 사용하여 계산됩니다.",
+        "description-no-type": "이러한 메트릭은 메타데이터에 정의된 유형이 없습니다.",
+        "description-summary": "요약은 관찰값(일반적으로 요청 기간 및 응답 크기와 같은 것)을 샘플링하며 슬라이딩 시간 창에서 구성 가능한 분위수를 계산할 수 있습니다.",
+        "description-unknown": "이러한 메트릭은 메타데이터에서 알 수 없는 유형으로 지정되었습니다.",
+        "label-counter": "카운터",
+        "label-gauge": "게이지",
+        "label-histogram": "히스토그램",
+        "label-native-histogram": "기본 히스토그램",
+        "label-no-type": "유형 없음",
+        "label-summary": "요약",
+        "label-unknown": "알 수 없음"
       },
       "handle-function": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "쿼리 구문 분석이 모호합니다."
         }
       },
       "label-filter-item": {
-        "aria-label-remove": "",
-        "placeholder-select-label": "",
+        "aria-label-remove": "{{name}} 삭제",
+        "placeholder-select-label": "레이블 선택",
         "placeholder-select-value": "값 선택"
       },
       "label-filters": {
-        "label-filters": "",
-        "label-label-filters": "",
-        "tooltip-label-filters": ""
+        "label-filters": "레이블 필터",
+        "label-label-filters": "레이블 필터",
+        "tooltip-label-filters": "선택 사항: 이 쿼리 유형에 대한 메트릭 선택을 필터링하는 데 사용됩니다."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "레이블 로딩 중",
+        "noOptionsMessage-no-labels-found": "레이블을 찾을 수 없습니다"
       },
       "metric-combobox": {
         "async-select": {
-          "aria-label-open-metrics-explorer": "",
-          "placeholder-select-metric": "",
-          "tooltip-open-metrics-explorer": ""
+          "aria-label-open-metrics-explorer": "메트릭 탐색기 열기",
+          "placeholder-select-metric": "메트릭 선택",
+          "tooltip-open-metrics-explorer": "메트릭 탐색기 열기"
         },
         "label-metric": "메트릭",
-        "tooltip-metric": ""
+        "tooltip-metric": "선택 사항: 지정된 메트릭에서 레이블 이름에 대한 레이블 값 목록을 반환합니다."
       },
       "metrics-modal": {
-        "aria-label-browse-metrics": "",
-        "currently-selected": "",
-        "metrics-pre-filtered": "",
-        "title-metrics-explorer": ""
+        "aria-label-browse-metrics": "메트릭 찾아보기",
+        "currently-selected": "현재 선택 사항: {{selected}} ",
+        "metrics-pre-filtered": "이러한 메트릭은 레이블 필터에서 선택한 레이블로 사전 필터링되었습니다.",
+        "title-metrics-explorer": "메트릭 탐색기"
       },
       "nested-query": {
         "label": {
-          "ignoring": "",
+          "ignoring": "무시 중",
           "on": "켜기"
         },
         "operator": "작업 수행자",
-        "tooltip-remove-match": "",
-        "vector-matches": ""
+        "tooltip-remove-match": "매칭 항목 제거",
+        "vector-matches": "벡터 매칭"
       },
       "operation-editor": {
-        "not-found": "",
-        "title-remove": ""
+        "not-found": "{{id}} 연산을 찾을 수 없습니다.",
+        "title-remove": "{{name}} 삭제"
       },
       "operation-header": {
         "placeholder-replace-with": "다음으로 교체",
-        "title-click-to-view-alternative-operations": "",
-        "title-remove-operation": ""
+        "title-click-to-view-alternative-operations": "대체 연산을 보려면 클릭하세요.",
+        "title-remove-operation": "연산 제거"
       },
       "operation-info-button": {
-        "title-click-to-show-description": "",
-        "title-remove-operation": ""
+        "title-click-to-show-description": "설명을 보려면 클릭하세요.",
+        "title-remove-operation": "연산 제거"
       },
       "operation-list": {
-        "operations": "",
+        "operations": "연산",
         "placeholder-search": "검색",
-        "title-add-operation": ""
+        "title-add-operation": "연산 추가"
       },
       "operation-param-editor": {
-        "title-add": "",
-        "title-remove": ""
+        "title-add": "{{name}} 추가",
+        "title-remove": "{{name}} 삭제"
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "{{labelWord}} {{labels}}을(를) 유지하면서 차원에 대해 {{aggregationName}}을(를) 계산합니다.",
+          "label-default": "차원에 대해 {{aggregationName}}을(를) 계산합니다.",
+          "label-without": "차원 {{labels}}에 대해 {{aggregationName}}을(를) 계산합니다. 다른 모든 레이블은 그대로 유지합니다."
         }
       },
       "prom-query-builder-options": {
-        "aria-label-lower-limit-parameter": "",
-        "aria-label-select-resolution": "",
+        "aria-label-lower-limit-parameter": "단계 매개변수에 대한 하한 설정",
+        "aria-label-select-resolution": "해상도 선택",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "히트맵",
+          "label-table": "테이블",
+          "label-time-series": "시계열"
         },
-        "label-exemplars": "",
+        "label-exemplars": "예제",
         "label-format": "형식",
-        "label-min-step": "",
-        "label-resolution": "",
+        "label-min-step": "최소 단계",
+        "label-resolution": "해상도",
         "label-type": "유형",
-        "placeholder-auto": "",
+        "placeholder-auto": "자동",
         "title-options": "옵션",
-        "tooltip-min-step": ""
+        "tooltip-min-step": "Prometheus 쿼리의 단계 매개변수와 <2>{{interval}}</2> 및 <4>{{rateInterval}} </4> 변수에 대한 추가적인 하한."
       },
       "prom-query-code-editor-autocomplete-info": {
-        "autocomplete-suggestions-limited": "",
-        "tooltip-autocomplete-suggestions-limited": ""
+        "autocomplete-suggestions-limited": "자동 완성 제안 제한됨",
+        "tooltip-autocomplete-suggestions-limited": "메트릭 이름 수가 자동 완성 한도를 초과합니다. 가장 관련성이 높은 {{autocompleteLimit}}개 메트릭만 표시됩니다. 데이터 소스 설정에서 임계값을 조정할 수 있습니다."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "구문 오류가 있거나 빌더 모드로 전환할 때 쿼리 구조를 시각화할 수 없습니다. 쿼리의 일부가 손실될 수 있습니다.",
+        "confirmText-continue": "계속",
         "kick-start-your-query": "쿼리 시작하기",
-        "label-explain": "",
-        "run-queries": "",
-        "title-parsing-error-switch-builder": ""
+        "label-explain": "설명",
+        "run-queries": "쿼리 실행",
+        "title-parsing-error-switch-builder": "구문 분석 오류: 빌더 모드로 전환하시겠어요?"
       },
       "prom-query-legend-editor": {
-        "label-legend": "",
-        "placeholder-select-legend-mode": "",
-        "tooltip-legend": ""
+        "label-legend": "범례",
+        "placeholder-select-legend-mode": "범례 모드 선택",
+        "tooltip-legend": "계열 이름 재정의 또는 템플릿. 예: {{templateExample}} 은(는) {{labelName}}에 대한 레이블 값으로 대체됩니다."
       },
       "query-builder-hints": {
-        "hint-details": ""
+        "hint-details": "힌트: {{hintDetails}}"
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "빌더",
+          "label-code": "코드"
         }
       },
       "query-pattern": {
-        "apply-query": "",
-        "aria-label-apply-query-starter-button": "",
-        "aria-label-back-button": "",
-        "aria-label-create-new-query-button": "",
-        "aria-label-raw-query": "",
-        "aria-label-use-this-query-button": "",
+        "apply-query": "쿼리 적용",
+        "aria-label-apply-query-starter-button": "쿼리 스타터 버튼 적용",
+        "aria-label-back-button": "뒤로 가기 버튼",
+        "aria-label-create-new-query-button": "새 쿼리 버튼 생성",
+        "aria-label-raw-query": "{{patternName}} 원시 쿼리",
+        "aria-label-use-this-query-button": "이 쿼리 사용 버튼",
         "back": "뒤로",
-        "create-new-query": "",
+        "create-new-query": "새 쿼리 생성",
         "use-this-query": "이 쿼리 사용"
       },
       "query-patterns-modal": {
-        "aria-label-close-kick-start-your-query-modal": "",
+        "aria-label-close-kick-start-your-query-modal": "쿼리 모달 시작 닫기",
         "aria-label-kick-start-your-query-modal": "쿼리 모달 시작하기",
-        "aria-label-toggle-query-starter": "",
+        "aria-label-toggle-query-starter": "{{patternType}} 쿼리 스타터 카드 열기 및 닫기",
         "close": "닫기",
-        "description-kick-start-your-query": "",
-        "label-toggle-query-starter": "",
+        "description-kick-start-your-query": "다음 쿼리 중 하나를 선택하여 쿼리를 시작합니다. 그런 다음 쿼리를 계속 완료할 수 있습니다.",
+        "label-toggle-query-starter": "{{patternType}} 쿼리 스타터",
         "title-kick-start-your-query": "쿼리 시작하기"
       },
       "raw-query": {
-        "aria-label-selector": ""
+        "aria-label-selector": "선택기"
       },
       "results-table": {
-        "content-descriptive-type": "",
+        "content-descriptive-type": "{{descriptiveType}}을 생성할 때 Prometheus는 유형 카운터와 함께 여러 계열을 노출합니다. ",
         "description": "설명",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "메트릭을 찾을 수 없습니다. 레이블 필터를 확장해 보세요.",
+        "message-expand-search": "메트릭을 찾을 수 없습니다. 검색 및 필터를 확장해 보세요.",
+        "message-no-metrics-found": "데이터 소스에서 메트릭을 찾을 수 없습니다.",
         "name": "이름",
         "type": "유형"
       },
       "update-function-args": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "쿼리 구문 분석이 모호합니다."
         }
       }
     }
diff --git a/packages/grafana-prometheus/src/locales/nl-NL/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/nl-NL/grafana-prometheus.json
index f20146043d3..a2f0a377ebd 100644
--- a/packages/grafana-prometheus/src/locales/nl-NL/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/nl-NL/grafana-prometheus.json
@@ -158,8 +158,8 @@
         "aria-label-prometheus-type": "Prometheus-type",
         "aria-label-select-http-method": "HTTP-methode selecteren",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Bouwer",
+          "label-code": "Code"
         },
         "label-cache-level": "Cacheniveau",
         "label-custom-query-parameters": "Aangepaste query-parameters",
@@ -200,114 +200,114 @@
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(Uitgeschakeld)",
+      "enabled-label": "Metriekenbrowser"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Bevat alleen unieke labels",
+        "description-custom": "Geef een naamgevingssjabloon op",
+        "description-verbose": "Alle labelnamen en -waarden",
+        "label-auto": "Automatisch",
+        "label-custom": "Aangepast",
+        "label-verbose": "Gedetailleerd"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Bereken het gemiddelde over dimensies",
+        "documentation-bottomk": "Kleinste k-elementen per steekproefwaarde",
+        "documentation-count": "Aantal elementen in de vector tellen",
+        "documentation-count-values": "Aantal elementen met dezelfde waarde tellen",
+        "documentation-group": "Alle waarden in de resulterende vector zijn 1",
+        "documentation-max": "Selecteer maximum over dimensies",
+        "documentation-min": "Selecteer minimum over dimensies",
+        "documentation-quantile": "Bereken φ-kwantiel (0 ≤ φ ≤ 1) over dimensies",
+        "documentation-stddev": "Bereken de standaardafwijking van de populatie over dimensies",
+        "documentation-stdvar": "Bereken de standaardvariantie van de populatie over dimensies",
+        "documentation-sum": "Bereken de som over dimensies",
+        "documentation-topk": "Grootste k-elementen per steekproefwaarde"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Retourneert de invoervector met alle steekproefwaarden omgezet naar hun absolute waarde.",
+        "documentation-absent": "Retourneert een lege vector terug als de doorgegeven vector elementen heeft en een 1-elementvector met de waarde 1 als de doorgegeven vector geen elementen heeft. Dit is handig om te waarschuwen wanneer er geen tijdreeksen bestaan voor een bepaalde metrische naam en labelcombinatie.",
+        "documentation-absent-over-time": "Retourneert een lege vector terug als de doorgegeven bereikvector elementen heeft en een 1-elementvector met de waarde 1 als de doorgegeven bereikvector geen elementen heeft.",
+        "documentation-avg-over-time": "De gemiddelde waarde van alle punten in het opgegeven interval.",
+        "documentation-ceil": "Rondt de steekproefwaarden van alle elementen in 'v' naar boven af op het dichtstbijzijnde gehele getal.",
+        "documentation-changes": "Voor elke invoertijdreeks retourneert 'changes(v range-vector)' het aantal keren dat de waarde is gewijzigd binnen het opgegeven tijdsbereik als een instantvector.",
+        "documentation-clamp": "Klemt de steekproefwaarden van alle elementen in 'v' vast om een ondergrens van 'min' en een bovengrens van 'max' te hebben.",
+        "documentation-clamp-max": "Klemt de steekproefwaarden van alle elementen in 'v' vast om een bovengrens van 'max' te hebben.",
+        "documentation-clamp-min": "Klemt de steekproefwaarden van alle elementen in 'v' vast om een ondergrens van 'min' te hebben.",
+        "documentation-count-over-time": "Het aantal van alle waarden in het opgegeven interval.",
+        "documentation-count-scalar": "Retourneert het aantal elementen in een tijdreeksvector als een scalaire waarde. Dit staat in contrast met de aggregatieoperator 'count()', die altijd een vector retourneert (een lege als de invoervector leeg is) en groepering op labels mogelijk maakt via een 'by'-clausule.",
+        "documentation-day-of-month": "Retourneert de dag van de maand voor elk van de opgegeven tijden in UTC. Geretourneerde waarden zijn van 1 tot 31.",
+        "documentation-day-of-week": "Retourneert de dag van de week voor elk van de opgegeven tijden in UTC. Geretourneerde waarden zijn van 0 tot 6, waarbij 0 zondag betekent, enz.",
+        "documentation-day-of-year": "Retourneert de dag van het jaar voor elk van de opgegeven tijden in UTC. Geretourneerde waarden zijn van 1 tot 365 voor niet-schrikkeljaren en 1 tot 366 in schrikkeljaren.",
+        "documentation-days-in-month": "Retourneert het aantal dagen in de maand voor elk van de opgegeven tijden in UTC. Geretourneerde waarden zijn van 28 tot 31.",
+        "documentation-deg": "Converteert radialen naar graden voor alle elementen in v",
+        "documentation-delta": "Berekent het verschil tussen de eerste en laatste waarde van elk tijdreeks-element in een bereikvector 'v' en geeft een instantvector terug met de gegeven delta's en equivalente labels. De delta wordt geëxtrapoleerd om het volledige tijdsbereik te dekken zoals gespecificeerd in de bereikvectorselector, zodat het mogelijk is om een niet-geheel getal te krijgen, zelfs als de steekproefwaarden allemaal gehele getallen zijn.",
+        "documentation-deriv": "Berekent de afgeleide per seconde van de tijdreeks in een bereikvector 'v', met behulp van eenvoudige lineaire regressie.",
+        "documentation-double-exponential-smoothing": "Produceert een gladde waarde voor tijdreeksen op basis van het bereik in 'v'. Hoe lager de gladmakingsfactor 'sf', hoe meer belang wordt gehecht aan oude gegevens. Hoe hoger de trendfactor 'tf', hoe meer trends in de gegevens worden overwogen. Zowel 'sf' als 'tf' moeten tussen 0 en 1 liggen.",
+        "documentation-drop-common-labels": "Verwijdert alle labels met dezelfde naam en waarde in alle reeksen in de invoervector.",
+        "documentation-exp": "Berekent de exponentiële functie voor alle elementen in 'v'.\nSpeciale gevallen zijn:\n* 'Exp(+Inf) = +Inf' \n* 'Exp(NaN) = NaN'",
+        "documentation-floor": "Rondt de steekproefwaarden van alle elementen in 'v' naar boven af op het dichtstbijzijnde gehele getal.",
+        "documentation-histogram-avg": "Retourneert het rekenkundige gemiddelde van de waargenomen waarden opgeslagen in een native histogram. Monsters die geen native histogrammen zijn, worden genegeerd en verschijnen niet in de geretourneerde vector.",
+        "documentation-histogram-count": "Retourneert het aantal waarnemingen dat is opgeslagen in een native histogram.",
+        "documentation-histogram-fraction": "Retourneert de geschatte fractie van observaties tussen de opgegeven lagere en hogere waarden.",
+        "documentation-histogram-quantile": "Berekent het φ-kwantiel (0 ≤ φ ≤ 1) uit de buckets 'b' van een histogram. De steekproeven in 'b' zijn de tellingen van observaties in elke bucket. Elke steekproef moet een label 'le' hebben waarbij de labelwaarde de inclusieve bovengrens van de bucket aangeeft. (Steekproeven zonder een dergelijk label worden stilzwijgend genegeerd.) Het metrische type histogram biedt automatisch tijdreeksen met het achtervoegsel '_bucket' en de juiste labels.",
+        "documentation-histogram-stddev": "Retourneert de geschatte standaardafwijking van waarnemingen in een native histogram, gebaseerd op het geometrische gemiddelde van de buckets waar de waarnemingen liggen.",
+        "documentation-histogram-stdvar": "Retourneert de geschatte standaardvariantie van waarnemingen in een native histogram.",
+        "documentation-histogram-sum": "Retourneert het aantal waarnemingen dat is opgeslagen in een native histogram.",
+        "documentation-holt-winters": "Hernoemd als double_exponential_smoothing in prometheus v3.x. Gebruik voor prometheus-versies gelijk aan en groter dan v3.0 double_exponential_smoothing. \n\nProduceert een gladde waarde voor tijdreeksen op basis van het bereik in 'v'. Hoe lager de gladmakingsfactor 'sf', hoe meer belang wordt gehecht aan oude gegevens. Hoe hoger de trendfactor 'tf', hoe meer trends in de gegevens worden overwogen. Zowel 'sf' als 'tf' moeten tussen 0 en 1 liggen.",
+        "documentation-hour": "Retourneert het uur van de dag voor elk van de opgegeven tijden in UTC. Geretourneerde waarden zijn van 0 tot 23.",
+        "documentation-idelta": "Berekent het verschil tussen de laatste twee steekproeven in de bereikvector 'v' en geeft een instantvector terug met de gegeven delta's en equivalente labels.",
+        "documentation-increase": "Berekent de toename in de tijdreeks in de bereikvector. Breuken in monotoniciteit (zoals teller-resets als gevolg van doelherstarten) worden automatisch aangepast. De toename wordt geëxtrapoleerd om het volledige tijdsbereik te dekken zoals gespecificeerd in de bereikvectorselector, zodat het mogelijk is om een niet-geheel getal te krijgen, zelfs als een teller alleen met gehele stappen toeneemt.",
+        "documentation-info": "Retourneert de nieuwste details en metadata over een groep statistieken, zoals hun labels en huidige waarden, zonder berekeningen uit te voeren",
+        "documentation-irate": "Berekent de momentane snelheid per seconde van de toename van de tijdreeks in de bereikvector. Dit is gebaseerd op de laatste twee datapunten. Breuken in monotoniciteit (zoals teller-resets als gevolg van doelherstarten) worden automatisch aangepast.",
+        "documentation-label-join": "Voor elke tijdreeks in 'v' worden alle waarden van alle 'src_labels' samengevoegd met behulp van 'separator' en wordt de tijdreeks geretourneerd met het label 'dst_label' dat de samengevoegde waarde bevat. Er kan een willekeurig aantal 'src_labels' in deze functie zijn.",
+        "documentation-label-replace": "Voor elke tijdreeks in 'v', 'label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)' komt de reguliere expressie 'regex' overeen met het label 'src_label'. Als het overeenkomt, wordt de tijdreeks geretourneerd met het label 'dst_label' vervangen door de uitbreiding van 'replacement'. '$1' wordt vervangen door de eerste overeenkomende subgroep, '$2' met de tweede enz. Als de reguliere expressie niet overeenkomt, wordt de tijdreeks ongewijzigd geretourneerd.",
+        "documentation-last-over-time": "De meest recente puntwaarde in het opgegeven interval.",
+        "documentation-ln": "Berekent het natuurlijke logaritme voor alle elementen in 'v'.\nSpeciale gevallen zijn:\n * 'ln(+Inf) = +Inf'\n * 'ln(0) = -Inf'\n * 'ln(x < 0) = NaN'\n * 'ln(NaN) = NaN'",
+        "documentation-log10": "Berekent het decimale logaritme voor alle elementen in 'v'. De speciale gevallen zijn gelijk aan die in 'ln'.",
+        "documentation-log2": "Berekent het binaire logaritme voor alle elementen in 'v'. De speciale gevallen zijn gelijk aan die in 'ln'.",
+        "documentation-max-over-time": "De maximale waarde van alle punten in het opgegeven interval.",
+        "documentation-min-over-time": "De minimale waarde van alle punten in het opgegeven interval.",
+        "documentation-minute": "Retourneert de minuut van het uur voor elk van de opgegeven tijden in UTC. Geretourneerde waarden zijn van 0 tot 59.",
+        "documentation-month": "Retourneert de maand van het jaar voor elk van de opgegeven tijden in UTC. Geretourneerde waarden zijn van 1 tot 12, waarbij 1 januari betekent, enz.",
+        "documentation-pi": "Retourneert pi",
+        "documentation-predict-linear": "Voorspelt de waarde van tijdreeksen 't' seconden vanaf nu, op basis van de bereikvector 'v', met behulp van eenvoudige lineaire regressie.",
+        "documentation-present-over-time": "De waarde 1 voor elke reeks in het opgegeven interval.",
+        "documentation-quantile-over-time": "Het φ-kwantiel (0 ≤ φ ≤ 1) van de waarden in het opgegeven interval.",
+        "documentation-rad": "Converteert graden naar radialen voor alle elementen in v",
+        "documentation-rate": "Berekent de gemiddelde snelheid per seconde van de toename van de tijdreeks in de bereikvector. Breuken in monotoniciteit (zoals teller-resets als gevolg van doelherstarten) worden automatisch aangepast. Ook extrapoleert de berekening naar de uiteinden van het tijdsbereik, waardoor gemiste scrapes of imperfecte uitlijning van scrapecycli met de tijdsperiode van het bereik mogelijk zijn.",
+        "documentation-resets": "Voor elke invoertijdreeks retourneert 'resets(v range-vector)' het aantal teller-resets binnen het opgegeven tijdsbereik als een instantvector. Elke afname van de waarde tussen twee opeenvolgende monsters wordt geïnterpreteerd als een teller-reset.",
+        "documentation-round": "Rondt de steekproefwaarden van alle elementen in 'v' af op het dichtstbijzijnde gehele getal. Gelijken wordt opgelost door naar boven af te ronden. Met het optionele argument 'to_nearest' kan het dichtstbijzijnde veelvoud worden opgegeven waarop de steekproefwaarden moeten worden afgerond. Dit veelvoud kan ook een breuk zijn.",
+        "documentation-scalar": "Gegeven een invoervector met één element, retourneert 'scalar(v instant-vector)' de steekproefwaarde van dat enkele element als een scalaire waarde. Als de invoervector niet precies één element heeft, retourneert 'scalar' 'NaN'.",
+        "documentation-sgn": "Retourneert een vector met alle steekproefwaarden omgezet naar hun teken, gedefinieerd als volgt: 1 als v positief is, -1 als v negatief is en 0 als v gelijk is aan nul.",
+        "documentation-sort": "Retourneert vectorelementen gesorteerd op hun steekproefwaarden, in oplopende volgorde.",
+        "documentation-sort-desc": "Retourneert vectorelementen gesorteerd op hun steekproefwaarden, in aflopende volgorde.",
+        "documentation-sqrt": "Berekent de vierkantswortel van alle elementen in 'v'.",
+        "documentation-stddev-over-time": "De standaardafwijking van de populatie van de waarden in het opgegeven interval.",
+        "documentation-stdvar-over-time": "De standaardvariantie van de populatie van de waarden in het opgegeven interval.",
+        "documentation-sum-over-time": "Het aantal van alle waarden in het opgegeven interval.",
+        "documentation-time": "Retourneert het aantal seconden sinds 1 januari 1970 UTC. Merk op dat dit niet de huidige tijd retourneert, maar de tijd waarop de expressie moet worden geëvalueerd.",
+        "documentation-timestamp": "Retourneert het tijdstempel van elk van de steekproeven van de gegeven vector als het aantal seconden sinds 1 januari 1970 UTC.",
+        "documentation-vector": "Retourneert de scalaire 's' als een vector zonder labels.",
+        "documentation-year": "Retourneert het jaar voor elk van de opgegeven tijden in UTC."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "berekent de boogcosinus van alle elementen in {{argument}}",
+        "documentation-acosh": "berekent de inverse hyperbolische cosinus van alle elementen in {{argument}}",
+        "documentation-asin": "berekent de boogsinus van alle elementen in {{argument}}",
+        "documentation-asinh": "berekent de inverse hyperbolische cosinus van alle elementen in {{argument}} ",
+        "documentation-atan": "berekent de boogtangens van alle elementen in {{argument}}",
+        "documentation-atanh": "berekent de inverse hyperbolische cosinus van alle elementen in {{argument}}",
+        "documentation-cos": "berekent de cosinus van alle elementen in {{argument}}",
+        "documentation-cosh": "berekent de inverse hyperbolische cosinus van alle elementen in {{argument}} ",
+        "documentation-sin": "berekent de cosinus van alle elementen in {{argument}} ",
+        "documentation-sinh": "berekent de inverse hyperbolische cosinus van alle elementen in {{argument}}",
+        "documentation-tan": "berekent de cosinus van alle elementen in {{argument}}",
+        "documentation-tanh": "berekent de inverse hyperbolische cosinus van alle elementen in {{argument}} "
       }
     },
     "querybuilder": {
@@ -316,31 +316,31 @@
         "title-give-feedback": "De metriekverkenner is nieuw, laat ons weten hoe we deze kunnen verbeteren"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Voorbeelden: {{value}}",
+        "format": "Formaat: {{value}}",
+        "legend": "Legenda: {{value}}",
+        "step": "Stap: {{value}}",
+        "type": "Type: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Metriek zoeken op naam",
+        "type": "Filteren op type"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Een cumulatieve statistiek die een enkele monotoon toenemende teller vertegenwoordigt waarvan de waarde alleen kan toenemen of kan worden gereset naar nul bij het opnieuw opstarten.",
+        "description-gauge": "Een statistiek die een enkele numerieke waarde vertegenwoordigt die willekeurig op en neer kan gaan.",
+        "description-histogram": "Een histogram neemt steekproeven van observaties (meestal dingen zoals verzoekduur of responsgrootte) en telt ze in configureerbare buckets.",
+        "description-native-histogram": "Native histogrammen verschillen op een aantal manieren van klassieke Prometheus-histogrammen: native histogrambucketgrenzen worden berekend met een formule die afhankelijk is van de schaal (resolutie) van het native histogram en zijn niet door de gebruiker gedefinieerd.",
+        "description-no-type": "Deze statistieken hebben geen gedefinieerd type in de metagegevens.",
+        "description-summary": "Een samenvatting neemt steekproeven van observaties (meestal dingen zoals verzoekduur en responsgrootte) en kan configureerbare kwantielen berekenen over een glijdend tijdsvenster.",
+        "description-unknown": "Deze statistieken hebben het type onbekend gekregen in de metagegevens.",
+        "label-counter": "Teller",
+        "label-gauge": "Meter",
+        "label-histogram": "Histogram",
+        "label-native-histogram": "Native histogram",
+        "label-no-type": "Geen type",
+        "label-summary": "Samenvatting",
+        "label-unknown": "Onbekend"
       },
       "handle-function": {
         "text": {
@@ -358,8 +358,8 @@
         "tooltip-label-filters": "Optioneel: wordt gebruikt om de metrische selectie voor dit query-type te filteren."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Labels laden",
+        "noOptionsMessage-no-labels-found": "Geen labels gevonden"
       },
       "metric-combobox": {
         "async-select": {
@@ -409,18 +409,18 @@
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Berekent {{aggregationName}} over dimensies met behoud van {{labelWord}} {{labels}}.",
+          "label-default": "Berekent {{aggregationName}} over de dimensies.",
+          "label-without": "Berekent {{aggregationName}} over de dimensies {{labels}}. Alle andere labels blijven behouden."
         }
       },
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "Ondergrens instellen voor de stapparameter",
         "aria-label-select-resolution": "Resolutie selecteren",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Heatmap",
+          "label-table": "Tabel",
+          "label-time-series": "Tijdreeks"
         },
         "label-exemplars": "Voorbeelden",
         "label-format": "Formaat",
@@ -436,8 +436,8 @@
         "tooltip-autocomplete-suggestions-limited": "Het aantal metrische namen overschrijdt de limiet voor automatisch aanvullen. Alleen de meest relevante metriek voor {{autocompleteLimit}} worden weergegeven. Je kunt de drempelwaarde aanpassen in de instellingen van de gegevensbron."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Er is een syntaxisfout of de querystructuur kan niet worden gevisualiseerd bij het overschakelen naar de bouwmodus. Delen van de query kunnen verloren gaan.",
+        "confirmText-continue": "Doorgaan",
         "kick-start-your-query": "Start je query",
         "label-explain": "Leg uit",
         "run-queries": "Query's uitvoeren",
@@ -453,8 +453,8 @@
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Bouwer",
+          "label-code": "Code"
         }
       },
       "query-pattern": {
@@ -483,9 +483,9 @@
       "results-table": {
         "content-descriptive-type": "Bij het maken van een {{descriptiveType}} stelt Prometheus meerdere series bloot met de typeteller. ",
         "description": "Beschrijving",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Er zijn geen statistieken gevonden. Probeer uw labelfilters uit te breiden.",
+        "message-expand-search": "Er zijn geen statistieken gevonden. Probeer uw zoekopdracht en filters uit te breiden.",
+        "message-no-metrics-found": "Er zijn geen statistieken gevonden in de gegevensbron.",
         "name": "Naam",
         "type": "Type"
       },
diff --git a/packages/grafana-prometheus/src/locales/pl-PL/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/pl-PL/grafana-prometheus.json
index fe3211ff5e4..831896f3ef1 100644
--- a/packages/grafana-prometheus/src/locales/pl-PL/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/pl-PL/grafana-prometheus.json
@@ -2,496 +2,496 @@
   "grafana-prometheus": {
     "components": {
       "annotation-query-editor": {
-        "annotation-data-load-error": "",
-        "aria-label-lower-limit-parameter": "",
-        "label-min-step": "",
-        "label-series-value-as-timestamp": "",
+        "annotation-data-load-error": "Błąd ładowania danych adnotacji!",
+        "aria-label-lower-limit-parameter": "Ustaw dolną granicę dla parametru kroku",
+        "label-min-step": "Min. krok",
+        "label-series-value-as-timestamp": "Wartość szeregu jako znacznik czasu",
         "label-tags": "Znaczniki",
-        "label-text": "",
+        "label-text": "Tekst",
         "label-title": "Tytuł",
-        "placeholder-auto": "",
-        "tooltip-either-pattern-example-instance-replaced-label": "",
-        "tooltip-min-step": "",
-        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": ""
+        "placeholder-auto": "automatycznie",
+        "tooltip-either-pattern-example-instance-replaced-label": "Użyj nazwy lub wzorca. Na przykład wzorzec {{labelTemplate}} jest zastępowany wartością etykiety {{labelName}}.",
+        "tooltip-min-step": "Dodatkowa dolna granica dla parametru kroku zapytania Prometheus oraz dla zmiennych <2>{{intervalVar}}</2> i <4>{{rateIntervalVar}}</4>.",
+        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": "Jednostką znacznika czasu są milisekundy. Jeśli jednostką wartości szeregu są sekundy, należy pomnożyć wektor zakresu przez 1000."
       },
       "get-query-type-options": {
         "description": {
-          "instant-query-range": ""
+          "instant-query-range": "Uruchom zapytanie natychmiastowe i zapytanie dotyczące zakresu"
         },
         "label": {
-          "both": ""
+          "both": "Oba"
         },
         "range-options": {
           "description": {
-            "query-range": ""
+            "query-range": "Uruchom zapytanie obejmujące określony przedział czasu"
           },
           "label": {
-            "instant": "",
-            "range": ""
+            "instant": "Natychmiastowe",
+            "range": "Zakres"
           }
         }
       },
       "label-selector": {
-        "aria-label-filter-expression-for-label": "",
-        "description-select-labels": "",
-        "select-labels-to-search-in": ""
+        "aria-label-filter-expression-for-label": "Wyrażenie filtrujące dla etykiety",
+        "description-select-labels": "Po wybraniu wartości etykiet wyświetlane są tylko możliwe kombinacje etykiet.",
+        "select-labels-to-search-in": "2. Wybierz etykiety do wyszukania"
       },
       "metric-selector": {
-        "aria-label-filter-expression-for-metric": "",
-        "aria-label-limit-results-from-series-endpoint": "",
-        "description-series-limit": "",
-        "label-select-metric": "",
-        "select-a-metric": "",
-        "series-limit": ""
+        "aria-label-filter-expression-for-metric": "Wyrażenie filtrujące dla wskaźnika",
+        "aria-label-limit-results-from-series-endpoint": "Ogranicz wyniki z punktu końcowego szeregu",
+        "description-series-limit": "Limit dotyczy wszystkich wskaźników, etykiet i wartości. Pozostaw pole puste, aby użyć domyślnego limitu. Ustaw wartość 0, aby wyłączyć limit i pobrać wszystko. Może to spowodować problemy z wydajnością.",
+        "label-select-metric": "Po wybraniu wskaźnika wyświetlane są tylko możliwe etykiety. Etykiety są ograniczone przez poniższy limit szeregu.",
+        "select-a-metric": "1. Wybierz wskaźnik",
+        "series-limit": "Limit szeregu"
       },
       "prom-cheat-sheet": {
-        "prom-ql-cheat-sheet": ""
+        "prom-ql-cheat-sheet": "PromQL – ściągawka"
       },
       "prom-exemplar-field": {
-        "exemplars": "",
-        "tooltip-disable-query": "",
-        "tooltip-enable-query": ""
+        "exemplars": "Przykłady",
+        "tooltip-disable-query": "Wyłącz zapytanie ze wzorami",
+        "tooltip-enable-query": "Włącz zapytanie ze wzorami"
       },
       "prom-explore-extra-field": {
-        "aria-label-prometheus-extra-field": "",
-        "aria-label-query-type-field": "",
-        "aria-label-step-field": "",
-        "min-step": "",
-        "query-type": "",
-        "tooltip-units-builtin-variables-example-interval-rateinterval": ""
+        "aria-label-prometheus-extra-field": "Dodatkowe pole Prometheus",
+        "aria-label-query-type-field": "Pole typu zapytania",
+        "aria-label-step-field": "Pole kroku",
+        "min-step": "Min. krok",
+        "query-type": "Typ zapytania",
+        "tooltip-units-builtin-variables-example-interval-rateinterval": "Można użyć jednostek czasu i wbudowanych zmiennych, na przykład: {{example1}}, {{example2}}, {{example3}}, {{example4}}, {{example5}}, {{example6}}, {{example7}} (jeśli nie określono jednostki, domyślnie {{default}})"
       },
       "prom-query-field": {
-        "placeholder-enter-a-prom-ql-query": ""
+        "placeholder-enter-a-prom-ql-query": "Wpisz zapytanie PromQL…"
       },
       "prom-variable-query-editor": {
-        "aria-label-classic-query": "",
-        "aria-label-metric-regex": "",
-        "aria-label-metric-selector": "",
-        "aria-label-prometheus-query": "",
-        "aria-label-query-type": "",
-        "aria-label-series-query": "",
-        "label-classic-query": "",
+        "aria-label-classic-query": "Zapytanie klasyczne",
+        "aria-label-metric-regex": "Wyrażenie regularne wskaźnika",
+        "aria-label-metric-selector": "Selektor wskaźnika",
+        "aria-label-prometheus-query": "Zapytanie Prometheus",
+        "aria-label-query-type": "Typ zapytania",
+        "aria-label-series-query": "Zapytanie szeregowe",
+        "label-classic-query": "Zapytanie klasyczne",
         "label-label": "Etykieta",
-        "label-metric-regex": "",
+        "label-metric-regex": "Wyrażenie regularne wskaźnika",
         "label-query": "Zapytanie",
-        "label-query-type": "",
-        "label-series-query": "",
-        "placeholder-classic-query": "",
-        "placeholder-metric-regex": "",
-        "placeholder-prometheus-query": "",
+        "label-query-type": "Typ zapytania",
+        "label-series-query": "Zapytanie szeregowe",
+        "placeholder-classic-query": "Zapytanie klasyczne",
+        "placeholder-metric-regex": "Wyrażenie regularne wskaźnika",
+        "placeholder-prometheus-query": "Zapytanie Prometheus",
         "placeholder-select-query-type": "Wybierz typ zapytania",
-        "placeholder-series-query": "",
-        "returns-metrics-matching-specified-metric-regex": "",
-        "tooltip-classic-query": "",
-        "tooltip-label": "",
-        "tooltip-metric-regex": "",
-        "tooltip-query": "",
-        "tooltip-query-type": "",
-        "tooltip-series-query": ""
+        "placeholder-series-query": "Zapytanie szeregowe",
+        "returns-metrics-matching-specified-metric-regex": "Zwraca listę wskaźników pasujących do określonego wyrażenia regularnego wskaźnika.",
+        "tooltip-classic-query": "Oryginalna implementacja edytora zapytań zmiennych w systemie Prometheus. Wpisz ciąg z prawidłowym typem zapytania i parametrami zgodnie z opisem w tych dokumentach. Przykład: {{exampleQuery}}.",
+        "tooltip-label": "Zwraca listę wartości etykiet dla nazwy etykiety we wszystkich wskaźnikach, chyba że wskaźnik został określony.",
+        "tooltip-metric-regex": "Zwraca listę nazw etykiet, opcjonalnie filtrując ją według określonego wyrażenia regularnego wskaźnika.",
+        "tooltip-query": "Zwraca listę wyników zapytania Prometheus dla zapytania. Może to obejmować funkcje systemu Prometheus, czyli {{exampleQuery}}.",
+        "tooltip-query-type": "Wtyczka źródła danych Prometheus zapewnia następujące typy zapytań dla zmiennych szablonu.",
+        "tooltip-series-query": "Wprowadź wskaźnik z etykietami, sam wskaźnik lub same etykiety, czyli {{example1}}, {{example2}} lub {{example3}}. Zwraca listę szeregów czasowych powiązanych z wprowadzonymi danymi."
       },
       "selector-actions": {
-        "aria-label-selector": "",
-        "aria-label-selector-clear-button": "",
-        "aria-label-use-selector-as-metrics-button": "",
-        "aria-label-use-selector-for-query-button": "",
-        "aria-label-validate-submit-button": "",
+        "aria-label-selector": "selektor",
+        "aria-label-selector-clear-button": "Przycisk czyszczenia selektora",
+        "aria-label-use-selector-as-metrics-button": "Użyj selektora jako przycisku wskaźnika",
+        "aria-label-use-selector-for-query-button": "Użyj selektora dla przycisku zapytania",
+        "aria-label-validate-submit-button": "Zatwierdź przycisk przesyłania",
         "clear": "Wyczyść",
-        "resulting-selector": "",
-        "use-as-rate-query": "",
-        "use-query": "",
-        "validate-selector": ""
+        "resulting-selector": "4. Wynikowy selektor",
+        "use-as-rate-query": "Użyj jako zapytania o częstotliwość",
+        "use-query": "Użyj zapytania",
+        "validate-selector": "Zatwierdź selektor"
       },
       "value-selector": {
-        "aria-label-filter-expression-for-label-values": "",
-        "aria-label-values-for": "",
-        "description-search-field-values-across-selected-labels": "",
-        "select-multiple-values-for-your-labels": ""
+        "aria-label-filter-expression-for-label-values": "Wyrażenie filtrujące dla wartości etykiety",
+        "aria-label-values-for": "Wartości dla: {{labelKey}}",
+        "description-search-field-values-across-selected-labels": "Użyj pola wyszukiwania, aby znaleźć wartości w wybranych etykietach.",
+        "select-multiple-values-for-your-labels": "3. Wybierz (wiele) wartości dla etykiet"
       }
     },
     "configuration": {
       "alerting-settings-overhaul": {
-        "label-allow-as-recording-rules-target": "",
-        "label-manage-alerts-via-alerting-ui": "",
+        "label-allow-as-recording-rules-target": "Zezwalaj na wybór jako cel reguł rejestracji",
+        "label-manage-alerts-via-alerting-ui": "Zarządzaj alertami za pośrednictwem interfejsu alertów",
         "title-alerting": "Alerty",
-        "tooltip-allow-as-recording-rules-target": "",
+        "tooltip-allow-as-recording-rules-target": "Zezwalaj na wybór tego źródła danych jako celu do zapisywania reguł rejestrowania.",
         "tooltip-manage-alerts-via-alerting-ui": "Zarządzaj regułami alertów dla tego źródła danych. Aby zarządzać innymi zasobami alertów, dodaj źródło danych Alertmanager."
       },
       "config-editor": {
-        "browser-access-mode-error": "",
-        "description-advanced-settings": "",
+        "browser-access-mode-error": "Tryb dostępu do przeglądarki w źródle danych Prometheus nie jest już dostępny. Przełącz się na tryb dostępu do serwera.",
+        "description-advanced-settings": "Dodatkowe ustawienia to opcje, które można skonfigurować, aby uzyskać większą kontrolę nad źródłem danych.",
         "title-advanced-settings": "Ustawienia zaawansowane",
         "title-error": "Błąd"
       },
       "data-source-http-settings-overhaul": {
         "tooltip-browser-access-mode": "Twoja metoda dostępu to <1>Przeglądarka</1>, co oznacza, że adres URL musi być dostępny z przeglądarki.",
-        "tooltip-http-url": "",
+        "tooltip-http-url": "Podaj pełny adres URL HTTP (na przykład {{exampleURL}})",
         "tooltip-server-access-mode": "Twoja metoda dostępu to <1>Serwer</1>, co oznacza, że adres URL musi być dostępny z backendu/serwera usługi Grafana."
       },
       "docs-tip": {
-        "visit-docs-for-more-details-here": ""
+        "visit-docs-for-more-details-here": "Więcej informacji znajdziesz w dokumentacji tutaj."
       },
       "exemplar-setting": {
         "label-data-source": "Źródło danych",
-        "label-internal-link": "",
+        "label-internal-link": "Link wewnętrzny",
         "label-label-name": "Nazwa etykiety",
-        "label-remove-exemplar-link": "",
+        "label-remove-exemplar-link": "Usuń przykładowy link",
         "label-url": "URL",
-        "label-url-label": "",
-        "placeholder-go-to-examplecom": "",
-        "placeholder-httpsexamplecomvalueraw": "",
-        "placeholder-trace-id": "",
-        "title-remove-exemplar-link": "",
-        "tooltip-data-source": "",
-        "tooltip-internal-link": "",
-        "tooltip-label-name": "",
-        "tooltip-url": "",
-        "tooltip-url-label": ""
+        "label-url-label": "Etykieta adresu URL",
+        "placeholder-go-to-examplecom": "Przejdź do strony example.com",
+        "placeholder-httpsexamplecomvalueraw": "https://example.com/${__value.raw}",
+        "placeholder-trace-id": "Identyfikator śledzenia",
+        "title-remove-exemplar-link": "Usuń przykładowy link",
+        "tooltip-data-source": "Źródło danych, do którego będzie prowadzić przykład.",
+        "tooltip-internal-link": "Włącz tę opcję, jeśli masz link wewnętrzny. Po włączeniu tej opcji wyświetlany jest selektor źródła danych. Wybierz magazyn danych śledzenia w środowisku zaplecza dla przykładowych danych.",
+        "tooltip-label-name": "Nazwa pola w obiekcie etykiet, które powinno być użyte do uzyskania identyfikatora śledzenia.",
+        "tooltip-url": "Adres URL zaplecza śledzenia, do którego użytkownik może przejść, aby zobaczyć dane śledzenia",
+        "tooltip-url-label": "Użyj, aby zastąpić etykietę przycisku w przykładowym polu identyfikatora śledzenia."
       },
       "exemplars-settings": {
         "add": "Dodaj",
-        "no-exemplars-configurations": "",
-        "title-exemplars": ""
+        "no-exemplars-configurations": "Brak konfiguracji przykładów",
+        "title-exemplars": "Przykłady"
       },
       "prom-settings": {
-        "aria-label-default-editor": "",
-        "aria-label-prom-type-type": "",
-        "aria-label-prometheus-type": "",
-        "aria-label-select-http-method": "",
+        "aria-label-default-editor": "Domyślny edytor (kod lub konstruktor)",
+        "aria-label-prom-type-type": "Typ: {{promType}}",
+        "aria-label-prometheus-type": "Typ Prometheus",
+        "aria-label-select-http-method": "Wybierz metodę HTTP",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Konstruktor",
+          "label-code": "Kod"
         },
-        "label-cache-level": "",
-        "label-custom-query-parameters": "",
-        "label-default-editor": "",
-        "label-disable-metrics-lookup": "",
-        "label-disable-recording-rules-beta": "",
-        "label-http-method": "",
-        "label-incremental-querying-beta": "",
-        "label-metric-names-suggestion-limit": "",
-        "label-prom-type-version": "",
-        "label-prometheus-type": "",
-        "label-query-overlap-window": "",
-        "label-query-timeout": "",
-        "label-scrape-interval": "",
-        "label-series-limit": "",
-        "label-use-series-endpoint": "",
-        "more-info": "",
-        "placeholder-example-maxsourceresolutionmtimeout": "",
-        "title-interval-behaviour": "",
-        "title-other": "",
+        "label-cache-level": "Poziom pamięci podręcznej",
+        "label-custom-query-parameters": "Niestandardowe parametry zapytania",
+        "label-default-editor": "Edytor domyślny",
+        "label-disable-metrics-lookup": "Wyłącz wyszukiwanie wskaźników",
+        "label-disable-recording-rules-beta": "Wyłącz reguły rejestrowania (beta)",
+        "label-http-method": "Metoda HTTP",
+        "label-incremental-querying-beta": "Zapytania przyrostowe (beta)",
+        "label-metric-names-suggestion-limit": "Limit sugestii nazw wskaźników",
+        "label-prom-type-version": "Wersja: {{promType}}",
+        "label-prometheus-type": "Typ Prometheus",
+        "label-query-overlap-window": "Okno nakładania się zapytań",
+        "label-query-timeout": "Limit czasu zapytania",
+        "label-scrape-interval": "Odstęp czasowy pobierania danych",
+        "label-series-limit": "Limit szeregu",
+        "label-use-series-endpoint": "Użyj punktu końcowego szeregu",
+        "more-info": "Więcej informacji na temat konfigurowania typu i wersji systemu Prometheus w źródłach danych można znaleźć w <2>dokumentach dotyczących aprowizacji</2>.",
+        "placeholder-example-maxsourceresolutionmtimeout": "Przykład: {{example}}",
+        "title-interval-behaviour": "Sposób działania odstępu czasu",
+        "title-other": "Inne",
         "title-performance": "Wydajność",
-        "title-query-editor": "",
-        "tooltip-cache-level": "",
-        "tooltip-custom-query-parameters": "",
-        "tooltip-default-editor": "",
-        "tooltip-disable-metrics-lookup": "",
-        "tooltip-disable-recording-rules-beta": "",
-        "tooltip-http-method": "",
-        "tooltip-incremental-querying-beta": "",
-        "tooltip-metric-names-suggestion-limit": "",
-        "tooltip-prom-type-version": "",
-        "tooltip-prometheus-type": "",
-        "tooltip-query-overlap-window": "",
-        "tooltip-query-timeout": "",
-        "tooltip-scrape-interval": "",
-        "tooltip-series-limit": "",
-        "tooltip-use-series-endpoint": ""
+        "title-query-editor": "Edytor zapytań",
+        "tooltip-cache-level": "Ustawia poziom buforowania przeglądarki dla zapytań edytora. W przypadku źródeł danych o wysokiej kardynalności zaleca się ustawienie pamięci podręcznej na wyższym poziomie.",
+        "tooltip-custom-query-parameters": "Dodaj niestandardowe parametry do adresu URL zapytania Prometheus. Na przykład {{example1}}, {{example2}}, {{example3}} lub {{example4}}. Wiele parametrów należy połączyć razem za pomocą znaków {{concatenationChar}}.",
+        "tooltip-default-editor": "Ustaw domyślną opcję edytora dla wszystkich użytkowników tego źródła danych.",
+        "tooltip-disable-metrics-lookup": "Zaznaczenie tej opcji spowoduje wyłączenie selektora wskaźników i obsługi wskaźników/etykiet w autouzupełnianiu pola zapytania. Pomaga to w przypadku problemów z wydajnością większych instancji systemu Prometheus. ",
+        "tooltip-disable-recording-rules-beta": "Ta funkcja wyłącza reguły rejestrowania. Włącz tę opcję, aby poprawić wydajność pulpitu",
+        "tooltip-http-method": "Możesz użyć metody HTTP POST lub GET, aby wysłać zapytanie do źródła danych Prometheus. POST jest zalecaną metodą, ponieważ obsługuje większe zapytania. Wybierz metodę GET, jeśli wersja systemu Prometheus jest starsza niż 2.1 lub jeśli żądania POST są objęte ograniczeniami w Twojej sieci.",
+        "tooltip-incremental-querying-beta": "Ta funkcja zmienia domyślny sposób działania zapytań względnych, aby zawsze żądały świeżych danych z instancji Prometheus. Zamiast tego wyniki zapytań będą buforowane, a wysyłane żądania będą uwzględniać tylko nowe rekordy. Włącz tę opcję, aby zmniejszyć obciążenie bazy danych i sieci.",
+        "tooltip-metric-names-suggestion-limit": "Maksymalna liczba nazw wskaźników, które mogą pojawiać się jako sugestie autouzupełniania w edytorze zapytań w trybie kodu.",
+        "tooltip-prom-type-version": "Użyj tej opcji, aby ustawić wersję {{promType}} instancji, jeśli nie jest ona automatycznie skonfigurowana.",
+        "tooltip-prometheus-type": "Ustaw w tym polu typ bazy danych systemu Prometheus, np. Prometheus, Cortex, Mimir lub Thanos. Zmiana tego pola spowoduje zapisanie bieżących ustawień. Obsługa interfejsów API zależy od konkretnego typu bazy danych Prometheus. Na przykład niektóre typy obsługują dopasowywanie wyrażeń regularnych do zapytań o etykiety w celu poprawy wydajności. Niektóre typy mają interfejs API metadanych. Jeśli ustawisz tę opcję nieprawidłowo, może to spowodować nietypowe działanie podczas wysyłania zapytań dotyczących wskaźników i etykiet. Sprawdź dokumentację systemu Prometheus, aby upewnić się, że wpisujesz prawidłowy typ.",
+        "tooltip-query-overlap-window": "Ustaw czas trwania, np. {{example1}}, {{example2}} lub {{example3}}. Domyślnie {{default}}. Ten czas trwania zostanie dodany do czasu trwania każdego zapytania przyrostowego.",
+        "tooltip-query-timeout": "Ustaw limit czasu zapytania Prometheus.",
+        "tooltip-scrape-interval": "Ten odstęp czasu określa, jak często Prometheus pobiera dane z obiektów docelowych. Ustaw tę wartość na typowy odstęp czasu pobierania i oceny określony w pliku konfiguracyjnym systemu Prometheus. Jeśli ustawisz tę wartość na większą niż odstęp czasu w tym pliku konfiguracyjnym, Grafana będzie analizować dane zgodnie z tym odstępem czasowym i zobaczysz mniej punktów danych. Wartość domyślna to {{default}}.",
+        "tooltip-series-limit": "Limit dotyczy wszystkich zasobów (wskaźników, etykiet i wartości) dla obu punktów końcowych (serii i etykiet). Pozostaw pole puste, aby użyć domyślnego limitu (40 000). Ustaw wartość 0, aby wyłączyć limit i pobrać wszystko. Może to spowodować problemy z wydajnością. Domyślny limit wynosi 40 000.",
+        "tooltip-use-series-endpoint": "Zaznaczenie tej opcji spowoduje preferowanie punktu końcowego szeregu z parametrem {{exampleParameter}}, a nie punktu końcowego wartości etykiet z parametrem {{exampleParameter}}. Chociaż punkt końcowy wartości etykiet jest uważany za bardziej wydajny, niektórzy użytkownicy mogą preferować szeregi, ponieważ obsługują one metodę POST, podczas gdy punkt końcowy wartości etykiet uwzględnia tylko metodę GET."
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(wyłączone)",
+      "enabled-label": "Przeglądarka metryk"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Zawiera tylko unikalne etykiety",
+        "description-custom": "Podaj szablon nazewnictwa",
+        "description-verbose": "Wszystkie nazwy i wartości etykiet",
+        "label-auto": "Automatycznie",
+        "label-custom": "Niestandardowy",
+        "label-verbose": "Szczegółowy"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Oblicz średnią wymiarów",
+        "documentation-bottomk": "Najmniejsza liczba k elementów według wartości próbki",
+        "documentation-count": "Policz liczbę elementów w wektorze",
+        "documentation-count-values": "Policz liczbę elementów o tej samej wartości",
+        "documentation-group": "Wszystkie wartości w wektorze wynikowym wynoszą 1",
+        "documentation-max": "Wybierz wartość maksymalną z wymiarów",
+        "documentation-min": "Wybierz wartość minimalną z wymiarów",
+        "documentation-quantile": "Oblicz φ-kwantyl (0 ≤ φ ≤ 1) z wymiarów",
+        "documentation-stddev": "Oblicz odchylenie standardowe populacji z wymiarów",
+        "documentation-stdvar": "Oblicz wariancję standardową populacji z wymiarów",
+        "documentation-sum": "Oblicz sumę z wymiarów",
+        "documentation-topk": "Największa liczba k elementów według wartości próbki"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Zwraca wektor wejściowy ze wszystkimi wartościami próbki przekonwertowanymi na ich wartość bezwzględną.",
+        "documentation-absent": "Zwraca pusty wektor, jeśli przekazany wektor ma jakiekolwiek elementy, i jednoelementowy wektor o wartości 1, jeśli przekazany wektor nie ma żadnych elementów. Jest to przydatne do ostrzegania, gdy nie istnieją szeregi czasowe dla danej kombinacji nazwy metryki i etykiety.",
+        "documentation-absent-over-time": "Zwraca pusty wektor, jeśli przekazany wektor zakresu ma jakiekolwiek elementy, i jednoelementowy wektor o wartości 1, jeśli przekazany wektor zakresu nie ma żadnych elementów.",
+        "documentation-avg-over-time": "Średnia wartość wszystkich punktów w określonym odstępie czasu.",
+        "documentation-ceil": "Zaokrągla wartości próbek wszystkich elementów w „v” w górę do najbliższej liczby całkowitej.",
+        "documentation-changes": "Dla każdego wejściowego szeregu czasowego „changes(v range-vector)” zwraca liczbę zmian jego wartości w podanym zakresie czasu jako wektor chwilowy.",
+        "documentation-clamp": "Ogranicza próbkowane wartości wszystkich elementów w „v”, aby określić dolną granicę „min” i górną granicę „max”.",
+        "documentation-clamp-max": "Ogranicza próbkowane wartości wszystkich elementów w „v”, aby określić górną granicę „max”.",
+        "documentation-clamp-min": "Ogranicza próbkowane wartości wszystkich elementów w „v”, aby określić dolną granicę „min”.",
+        "documentation-count-over-time": "Liczba wszystkich wartości w określonym przedziale.",
+        "documentation-count-scalar": "Zwraca liczbę elementów w wektorze szeregu czasowego jako wartość skalarną. Jest to przeciwieństwo operatora agregacji „count()”, który zawsze zwraca wektor (pusty, jeśli wektor wejściowy jest pusty) i pozwala na grupowanie według etykiet za pomocą klauzuli „by”.",
+        "documentation-day-of-month": "Zwraca dzień miesiąca dla każdego z podanych czasów w czasie UTC. Zwracane wartości wynoszą od 1 do 31.",
+        "documentation-day-of-week": "Zwraca dzień tygodnia dla każdego z podanych czasów w czasie UTC. Zwracane wartości wynoszą od 0 do 6, gdzie 0 oznacza niedzielę itd.",
+        "documentation-day-of-year": "Zwraca dzień roku dla każdego z podanych czasów w czasie UTC. Zwracane wartości wynoszą od 1 do 365 dla lat nieprzestępnych i od 1 do 366 dla lat przestępnych.",
+        "documentation-days-in-month": "Zwraca liczbę dni w miesiącu dla każdego z podanych czasów w czasie UTC. Zwracane wartości wynoszą od 28 do 31.",
+        "documentation-deg": "Konwertuje radiany na stopnie dla wszystkich elementów w „v”",
+        "documentation-delta": "Oblicza różnicę między pierwszą i ostatnią wartością każdego elementu szeregu czasowego w wektorze zakresu „v”, zwracając wektor chwilowy z podanymi deltami i równoważnymi etykietami. Delta jest ekstrapolowana w celu pokrycia pełnego zakresu czasu określonego w selektorze wektora zakresu, tak aby możliwe było uzyskanie wyniku niebędącego liczbą całkowitą, nawet jeśli wszystkie wartości próbek są liczbami całkowitymi.",
+        "documentation-deriv": "Oblicza pochodną na sekundę szeregu czasowego w wektorze zakresu „v”, stosując prostą regresję liniową.",
+        "documentation-double-exponential-smoothing": "Tworzy wygładzoną wartość dla szeregów czasowych na podstawie zakresu w „v”. Im niższy współczynnik wygładzania „sf”, tym większą wagę mają stare dane. Im wyższy współczynnik trendu „tf”, tym więcej trendów w danych jest brane pod uwagę. Zarówno „sf”, jak i „tf” muszą mieścić się w przedziale od 0 do 1.",
+        "documentation-drop-common-labels": "Usuwa wszystkie etykiety, które mają tę samą nazwę i wartość we wszystkich seriach w wektorze wejściowym.",
+        "documentation-exp": "Oblicza funkcję wykładniczą dla wszystkich elementów w „v”.\nPrzypadki szczególne:\n* „Exp(+Inf) = +Inf” \n* „Exp(NaN) = NaN”",
+        "documentation-floor": "Zaokrągla wartości próbek wszystkich elementów w „v” w dół do najbliższej liczby całkowitej.",
+        "documentation-histogram-avg": "Zwraca średnią arytmetyczną zaobserwowanych wartości przechowywanych w histogramie natywnym. Próbki, które nie są histogramami natywnymi, są ignorowane i nie pojawiają się w zwracanym wektorze.",
+        "documentation-histogram-count": "Zwraca liczbę obserwacji przechowywanych w histogramie natywnym.",
+        "documentation-histogram-fraction": "Zwraca szacunkowy ułamek obserwacji między podanymi wartościami dolną i górną.",
+        "documentation-histogram-quantile": "Oblicza φ-kwantyl (0 ≤ φ ≤ 1) z przedziałów „b” histogramu. Próbki w „b” to liczby obserwacji w każdym przedziale. Każda próbka musi mieć etykietę „le”, gdzie wartość etykiety oznacza górną granicę przedziału włącznie. (Próbki bez takiej etykiety są ignorowane bez komunikatu). Typ metryki histogramu automatycznie zapewnia szeregi czasowe z przyrostkiem „_bucket” i odpowiednimi etykietami.",
+        "documentation-histogram-stddev": "Zwraca szacowane odchylenie standardowe obserwacji w histogramie natywnym, na podstawie średniej geometrycznej przedziałów, w których znajdują się obserwacje.",
+        "documentation-histogram-stdvar": "Zwraca oszacowaną wariancję standardową obserwacji w histogramie natywnym.",
+        "documentation-histogram-sum": "Zwraca sumę obserwacji przechowywanych w histogramie natywnym.",
+        "documentation-holt-winters": "W Prometheus 3.x nazwa zmieniła się na double_exponential_smoothing. W przypadku Prometheus w wersji 3.0 lub nowszej należy używać double_exponential_smoothing. \n\nTworzy wygładzoną wartość dla szeregów czasowych na podstawie zakresu w „v”. Im niższy współczynnik wygładzania „sf”, tym większą wagę mają stare dane. Im wyższy współczynnik trendu „tf”, tym więcej trendów w danych jest brane pod uwagę. Zarówno „sf”, jak i „tf” muszą mieścić się w przedziale od 0 do 1.",
+        "documentation-hour": "Zwraca godzinę dla każdego z podanych czasów w UTC. Zwracane wartości wynoszą od 0 do 23.",
+        "documentation-idelta": "Oblicza różnicę między dwiema ostatnimi próbkami w wektorze zakresu „v”, zwracając wektor chwilowy z podanymi deltami i równoważnymi etykietami.",
+        "documentation-increase": "Oblicza przyrost szeregu czasowego w wektorze zakresu. Przerwy w monotoniczności (takie jak resetowanie licznika z powodu ponownego uruchomienia celu) są automatycznie korygowane. Przyrost jest ekstrapolowany w celu pokrycia pełnego zakresu czasu określonego w selektorze wektora zakresu, tak aby możliwe było uzyskanie wyniku niebędącego liczbą całkowitą, nawet jeśli licznik zwiększa się tylko o liczby całkowite.",
+        "documentation-info": "Zwraca najnowsze szczegóły i metadane dotyczące grupy metryk, takie jak ich etykiety i bieżące wartości, bez wykonywania jakichkolwiek obliczeń",
+        "documentation-irate": "Oblicza chwilową szybkość przyrostu szeregu czasowego na sekundę w wektorze zakresu. Jest to oparte na ostatnich dwóch punktach danych. Przerwy w monotoniczności (takie jak zresetowanie licznika z powodu ponownego uruchomienia celu) są automatycznie korygowane.",
+        "documentation-label-join": "Dla każdego szeregu czasowego w „v” łączy wszystkie wartości wszystkich „src_labels” za pomocą elementu „separator” i zwraca szereg czasowy z etykietą „dst_label” zawierającą połączoną wartość. Ta funkcja może zawierać dowolną liczbę „src_labels”.",
+        "documentation-label-replace": "Dla każdego szeregu czasowego w „v” „label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)” dopasowuje wyrażenie regularne „regex” do etykiety „src_label”. Jeśli dane się zgadzają, szereg czasowy jest zwracany z etykietą „dst_label” zastąpioną rozszerzeniem „replacement”. Element „$1” jest zastępowany pierwszą pasującą podgrupą, „$2” drugą itd. Jeśli wyrażenie regularne nie pasuje, to szereg czasowy jest zwracany bez zmian.",
+        "documentation-last-over-time": "Najnowsza wartość punktowa w określonym przedziale.",
+        "documentation-ln": "Oblicza logarytm naturalny dla wszystkich elementów w „v”.\nPrzypadki szczególne:\n * „ln(+Inf) = +Inf”\n * „ln(0) = -Inf”\n * „ln(x < 0) = NaN”\n * „ln(NaN) = NaN”",
+        "documentation-log10": "Oblicza logarytm dziesiętny dla wszystkich elementów w „v”. Przypadki szczególne są równoważne z przypadkami w „ln”.",
+        "documentation-log2": "Oblicza logarytm binarny dla wszystkich elementów w „v”. Przypadki szczególne są równoważne z przypadkami w „ln”.",
+        "documentation-max-over-time": "Maksymalna wartość wszystkich punktów w określonym odstępie czasu.",
+        "documentation-min-over-time": "Minimalna wartość wszystkich punktów w określonym odstępie czasu.",
+        "documentation-minute": "Zwraca minutę dla każdego z podanych czasów w UTC. Zwracane wartości wynoszą od 0 do 59.",
+        "documentation-month": "Zwraca miesiąc dla każdego z podanych czasów w UTC. Zwracane wartości wynoszą od 1 do 12, gdzie 1 oznacza styczeń itd.",
+        "documentation-pi": "Zwraca pi",
+        "documentation-predict-linear": "Przewiduje wartość szeregu czasowego „t” sekund od teraz, na podstawie wektora zakresu „v”, stosując prostą regresję liniową.",
+        "documentation-present-over-time": "Wartość 1 dla dowolnej serii w określonym odstępie czasu.",
+        "documentation-quantile-over-time": "φ-kwantyl (0 ≤ φ ≤ 1) wartości w określonym odstępie czasu.",
+        "documentation-rad": "Konwertuje stopnie na radiany dla wszystkich elementów w „v”",
+        "documentation-rate": "Oblicza średnią szybkość przyrostu szeregu czasowego na sekundę w wektorze zakresu. Przerwy w monotoniczności (takie jak resetowanie licznika z powodu ponownego uruchomienia celu) są automatycznie korygowane. Ponadto obliczenia są ekstrapolowane do końców zakresu czasu, co pozwala na pominięcie pobierania lub niedoskonałe dopasowanie cykli pobierania do przedziału zakresu czasu.",
+        "documentation-resets": "Dla każdego wejściowego szeregu czasowego „resets(v range-vector)” zwraca liczbę resetów licznika w podanym zakresie czasu jako wektor chwilowy. Każdy spadek wartości między dwiema kolejnymi próbkami jest interpretowany jako zresetowanie licznika.",
+        "documentation-round": "Zaokrągla wartości próbek wszystkich elementów w „v” do najbliższej liczby całkowitej. Remisy są rozwiązywane przez zaokrąglenie w górę. Opcjonalny argument „to_nearest” pozwala określić najbliższą wielokrotność, do której należy zaokrąglić wartości próbek. Wielokrotność ta może być również ułamkiem.",
+        "documentation-scalar": "Dla jednoelementowego wektora wejściowego „scalar(v instant-vector)” zwraca wartość próbki tego pojedynczego elementu jako wartość skalarną. Jeśli wektor wejściowy nie ma dokładnie jednego elementu, „scalar” zwróci „NaN”.",
+        "documentation-sgn": "Zwraca wektor ze wszystkimi wartościami próbek przekonwertowanymi na ich znak, zdefiniowany jako: 1, jeśli v jest dodatnie, -1, jeśli v jest ujemne, i 0, jeśli v jest równe zero.",
+        "documentation-sort": "Zwraca elementy wektora posortowane według ich próbkowanych wartości w kolejności rosnącej.",
+        "documentation-sort-desc": "Zwraca elementy wektora posortowane według ich próbkowanych wartości w kolejności malejącej.",
+        "documentation-sqrt": "Oblicza pierwiastek kwadratowy wszystkich elementów w „v”.",
+        "documentation-stddev-over-time": "Odchylenie standardowe populacji wartości w określonym przedziale.",
+        "documentation-stdvar-over-time": "Wariancja standardowa populacji wartości w określonym przedziale.",
+        "documentation-sum-over-time": "Suma wszystkich wartości w określonym przedziale.",
+        "documentation-time": "Zwraca liczbę sekund od 1 stycznia 1970 r. UTC. Zwróć uwagę, że nie zwraca to bieżącego czasu, ale czas, w którym wyrażenie ma zostać ocenione.",
+        "documentation-timestamp": "Zwraca sygnaturę czasową każdej z próbek danego wektora jako liczbę sekund od 1 stycznia 1970 r. UTC.",
+        "documentation-vector": "Zwraca wartość skalarną „s” jako wektor bez etykiet.",
+        "documentation-year": "Zwraca rok dla każdego z podanych czasów w UTC."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "oblicza arcus cosinus wszystkich elementów w {{argument}}",
+        "documentation-acosh": "oblicza odwrotny cosinus hiperboliczny wszystkich elementów w {{argument}}",
+        "documentation-asin": "oblicza arcus sinus wszystkich elementów w {{argument}}",
+        "documentation-asinh": "oblicza odwrotny sinus hiperboliczny wszystkich elementów w {{argument}}",
+        "documentation-atan": "oblicza arcus tangens wszystkich elementów w {{argument}}",
+        "documentation-atanh": "oblicza odwrotny tangens hiperboliczny wszystkich elementów w {{argument}}",
+        "documentation-cos": "oblicza cosinus wszystkich elementów w {{argument}}",
+        "documentation-cosh": "oblicza cosinus hiperboliczny wszystkich elementów w {{argument}}",
+        "documentation-sin": "oblicza sinus wszystkich elementów w {{argument}}",
+        "documentation-sinh": "oblicza sinus hiperboliczny wszystkich elementów w {{argument}}",
+        "documentation-tan": "oblicza tangens wszystkich elementów w {{argument}}",
+        "documentation-tanh": "oblicza tangens hiperboliczny wszystkich elementów w {{argument}}"
       }
     },
     "querybuilder": {
       "feedback-link": {
         "give-feedback": "Przekaż opinię",
-        "title-give-feedback": ""
+        "title-give-feedback": "Eksplorator wskaźników to nowa funkcja – daj nam znać, jak możemy go ulepszyć"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Przykłady: {{value}}",
+        "format": "Format: {{value}}",
+        "legend": "Legenda: {{value}}",
+        "step": "Krok: {{value}}",
+        "type": "Typ: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Wyszukaj metryki według nazwy",
+        "type": "Filtruj wg typu"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Metryka skumulowana reprezentująca pojedynczy monotonicznie rosnący licznik, którego wartość może tylko wzrosnąć lub zostać zresetowana do zera po ponownym uruchomieniu.",
+        "description-gauge": "Metryka reprezentująca pojedynczą wartość liczbową, która może dowolnie wzrastać i spadać.",
+        "description-histogram": "Histogram pobiera próbki obserwacji (zwykle takie jak czasy trwania żądań lub rozmiary odpowiedzi) i zlicza je w konfigurowalnych przedziałach.",
+        "description-native-histogram": "Histogramy natywne różnią się od klasycznych histogramów Prometheus na wiele sposobów: granice przedziału histogramu natywnego są obliczane za pomocą wzoru, który zależy od skali (rozdzielczości) histogramu natywnego i nie są definiowane przez użytkownika.",
+        "description-no-type": "Te metryki nie mają zdefiniowanego typu w metadanych.",
+        "description-summary": "Podsumowanie pobiera próbki obserwacji (zwykle takie jak czasy trwania żądań i rozmiary odpowiedzi) i może obliczać konfigurowalne kwantyle w przesuwnym oknie czasowym.",
+        "description-unknown": "Te metryki mają przypisany typ nieznany w metadanych.",
+        "label-counter": "Licznik",
+        "label-gauge": "Wskaźnik",
+        "label-histogram": "Histogram",
+        "label-native-histogram": "Histogram natywny",
+        "label-no-type": "Bez typu",
+        "label-summary": "Podsumowanie",
+        "label-unknown": "Nieznany"
       },
       "handle-function": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "Wynik analizy zapytania jest niejednoznaczny."
         }
       },
       "label-filter-item": {
-        "aria-label-remove": "",
-        "placeholder-select-label": "",
+        "aria-label-remove": "Usuń: {{name}}",
+        "placeholder-select-label": "Wybierz etykietę",
         "placeholder-select-value": "Wybierz wartość"
       },
       "label-filters": {
-        "label-filters": "",
-        "label-label-filters": "",
-        "tooltip-label-filters": ""
+        "label-filters": "Filtry etykiet",
+        "label-label-filters": "Filtry etykiet",
+        "tooltip-label-filters": "Opcjonalnie: służy do filtrowania wskaźników wybranych dla tego typu zapytania."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Ładowanie etykiet",
+        "noOptionsMessage-no-labels-found": "Nie znaleziono etykiet"
       },
       "metric-combobox": {
         "async-select": {
-          "aria-label-open-metrics-explorer": "",
-          "placeholder-select-metric": "",
-          "tooltip-open-metrics-explorer": ""
+          "aria-label-open-metrics-explorer": "Otwórz eksplorator wskaźników",
+          "placeholder-select-metric": "Wybierz wskaźnik",
+          "tooltip-open-metrics-explorer": "Otwórz eksplorator wskaźników"
         },
         "label-metric": "Metryka",
-        "tooltip-metric": ""
+        "tooltip-metric": "Opcjonalnie: zwraca listę wartości etykiet dla nazwy etykiety w określonym wskaźniku."
       },
       "metrics-modal": {
-        "aria-label-browse-metrics": "",
-        "currently-selected": "",
-        "metrics-pre-filtered": "",
-        "title-metrics-explorer": ""
+        "aria-label-browse-metrics": "Przeglądaj wskaźniki",
+        "currently-selected": "Obecnie wybrane: {{selected}}",
+        "metrics-pre-filtered": "Te wskaźniki zostały wstępnie przefiltrowane według etykiet wybranych w filtrze etykiet.",
+        "title-metrics-explorer": "Eksplorator wskaźników"
       },
       "nested-query": {
         "label": {
-          "ignoring": "",
+          "ignoring": "Ignorowanie",
           "on": "Wł."
         },
         "operator": "Operator",
-        "tooltip-remove-match": "",
-        "vector-matches": ""
+        "tooltip-remove-match": "Usuń dopasowanie",
+        "vector-matches": "Dopasowania wektorów"
       },
       "operation-editor": {
-        "not-found": "",
-        "title-remove": ""
+        "not-found": "Nie znaleziono operacji {{id}}",
+        "title-remove": "Usuń: {{name}}"
       },
       "operation-header": {
         "placeholder-replace-with": "Zastąp",
-        "title-click-to-view-alternative-operations": "",
-        "title-remove-operation": ""
+        "title-click-to-view-alternative-operations": "Kliknij, aby wyświetlić alternatywne operacje",
+        "title-remove-operation": "Usuń operację"
       },
       "operation-info-button": {
-        "title-click-to-show-description": "",
-        "title-remove-operation": ""
+        "title-click-to-show-description": "Kliknij, aby wyświetlić opis",
+        "title-remove-operation": "Usuń operację"
       },
       "operation-list": {
-        "operations": "",
+        "operations": "Operacje",
         "placeholder-search": "Szukaj",
-        "title-add-operation": ""
+        "title-add-operation": "Dodaj operację"
       },
       "operation-param-editor": {
-        "title-add": "",
-        "title-remove": ""
+        "title-add": "Dodaj: {{name}}",
+        "title-remove": "Usuń: {{name}}"
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Oblicza {{aggregationName}} z wymiarów, zachowując {{labelWord}} {{labels}}.",
+          "label-default": "Oblicza {{aggregationName}} z wymiarów.",
+          "label-without": "Oblicza {{aggregationName}} z {{labels}} wymiarów. Wszystkie inne etykiety są zachowywane."
         }
       },
       "prom-query-builder-options": {
-        "aria-label-lower-limit-parameter": "",
-        "aria-label-select-resolution": "",
+        "aria-label-lower-limit-parameter": "Ustaw dolną granicę dla parametru kroku",
+        "aria-label-select-resolution": "Wybierz rozwiązanie",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Mapa intensywności",
+          "label-table": "Tabela",
+          "label-time-series": "Szereg czasowy"
         },
-        "label-exemplars": "",
+        "label-exemplars": "Przykłady",
         "label-format": "Format",
-        "label-min-step": "",
-        "label-resolution": "",
+        "label-min-step": "Min. krok",
+        "label-resolution": "Rozwiązanie",
         "label-type": "Typ",
-        "placeholder-auto": "",
+        "placeholder-auto": "automatycznie",
         "title-options": "Opcje",
-        "tooltip-min-step": ""
+        "tooltip-min-step": "Dodatkowa dolna granica dla parametru kroku zapytania Prometheus oraz dla zmiennych <2>{{interval}}</2> i <4>{{rateInterval}}</4>."
       },
       "prom-query-code-editor-autocomplete-info": {
-        "autocomplete-suggestions-limited": "",
-        "tooltip-autocomplete-suggestions-limited": ""
+        "autocomplete-suggestions-limited": "Ograniczone sugestie autouzupełniania",
+        "tooltip-autocomplete-suggestions-limited": "Liczba nazw wskaźników przekracza limit autouzupełniania. Wyświetlane są tylko najbardziej odpowiednie wskaźniki ({{autocompleteLimit}}). Próg można dostosować w ustawieniach źródła danych."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Wystąpił błąd składni lub struktura zapytania nie może zostać zwizualizowana podczas przełączania na tryb konstruktora. Części zapytania mogą zostać utracone.",
+        "confirmText-continue": "Kontynuuj",
         "kick-start-your-query": "Uruchom zapytanie",
-        "label-explain": "",
-        "run-queries": "",
-        "title-parsing-error-switch-builder": ""
+        "label-explain": "Wyjaśnij",
+        "run-queries": "Uruchom zapytania",
+        "title-parsing-error-switch-builder": "Błąd analizy: przełączyć na tryb konstruktora?"
       },
       "prom-query-legend-editor": {
-        "label-legend": "",
-        "placeholder-select-legend-mode": "",
-        "tooltip-legend": ""
+        "label-legend": "Legenda",
+        "placeholder-select-legend-mode": "Wybierz tryb legendy",
+        "tooltip-legend": "Zastąpienie nazwy szeregu lub szablon. Na przykład wzorzec {{templateExample}} zostanie zastąpiony wartością etykiety {{labelName}}."
       },
       "query-builder-hints": {
-        "hint-details": ""
+        "hint-details": "wskazówka: {{hintDetails}}"
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Konstruktor",
+          "label-code": "Kod"
         }
       },
       "query-pattern": {
-        "apply-query": "",
-        "aria-label-apply-query-starter-button": "",
-        "aria-label-back-button": "",
-        "aria-label-create-new-query-button": "",
-        "aria-label-raw-query": "",
-        "aria-label-use-this-query-button": "",
+        "apply-query": "Zastosuj zapytanie",
+        "aria-label-apply-query-starter-button": "przycisk Zastosuj starter zapytania",
+        "aria-label-back-button": "przycisk Wstecz",
+        "aria-label-create-new-query-button": "przycisk Utwórz nowe zapytanie",
+        "aria-label-raw-query": "Nieprzetworzone zapytanie {{patternName}}",
+        "aria-label-use-this-query-button": "użyj tego przycisku zapytania",
         "back": "Wstecz",
-        "create-new-query": "",
+        "create-new-query": "Utwórz nowe zapytanie",
         "use-this-query": "Użyj tego zapytania"
       },
       "query-patterns-modal": {
-        "aria-label-close-kick-start-your-query-modal": "",
+        "aria-label-close-kick-start-your-query-modal": "zamknij okno modalne rozpoczęcia zapytania",
         "aria-label-kick-start-your-query-modal": "Uruchom okno modalne zapytania",
-        "aria-label-toggle-query-starter": "",
+        "aria-label-toggle-query-starter": "otwórz i zamknij kartę początkową zapytania {{patternType}}",
         "close": "Zamknij",
-        "description-kick-start-your-query": "",
-        "label-toggle-query-starter": "",
+        "description-kick-start-your-query": "Rozpocznij zapytanie, wybierając jedno z tych zapytań. Następnie możesz kontynuować tworzenie zapytania.",
+        "label-toggle-query-starter": "Startery zapytań {{patternType}}",
         "title-kick-start-your-query": "Uruchom zapytanie"
       },
       "raw-query": {
-        "aria-label-selector": ""
+        "aria-label-selector": "selektor"
       },
       "results-table": {
-        "content-descriptive-type": "",
+        "content-descriptive-type": "Podczas tworzenia zapytania {{descriptiveType}} system Prometheus udostępnia wiele szeregów z licznikiem typu. ",
         "description": "Opis",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Nie znaleziono żadnych metryk. Spróbuj rozszerzyć filtry etykiet.",
+        "message-expand-search": "Nie znaleziono żadnych metryk. Spróbuj rozszerzyć wyszukiwanie i filtry.",
+        "message-no-metrics-found": "W źródle danych nie znaleziono żadnych metryk.",
         "name": "Imię",
         "type": "Typ"
       },
       "update-function-args": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "Analiza zapytania jest niejednoznaczna."
         }
       }
     }
diff --git a/packages/grafana-prometheus/src/locales/pt-BR/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/pt-BR/grafana-prometheus.json
index 507ddf3c792..87354ed212b 100644
--- a/packages/grafana-prometheus/src/locales/pt-BR/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/pt-BR/grafana-prometheus.json
@@ -2,496 +2,496 @@
   "grafana-prometheus": {
     "components": {
       "annotation-query-editor": {
-        "annotation-data-load-error": "",
-        "aria-label-lower-limit-parameter": "",
-        "label-min-step": "",
-        "label-series-value-as-timestamp": "",
+        "annotation-data-load-error": "Erro ao carregar os dados da anotação!",
+        "aria-label-lower-limit-parameter": "Definir limite inferior para o parâmetro de etapa",
+        "label-min-step": "Etapa mínima",
+        "label-series-value-as-timestamp": "Valor da série como registro de data e hora",
         "label-tags": "Tags",
-        "label-text": "",
+        "label-text": "Texto",
         "label-title": "Título",
-        "placeholder-auto": "",
-        "tooltip-either-pattern-example-instance-replaced-label": "",
-        "tooltip-min-step": "",
-        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": ""
+        "placeholder-auto": "automático",
+        "tooltip-either-pattern-example-instance-replaced-label": "Use o nome ou um padrão. Por exemplo, {{labelTemplate}} é substituído pelo valor do rótulo {{labelName}}.",
+        "tooltip-min-step": "Um limite inferior adicional para o parâmetro de etapa da consulta do Prometheus e para as variáveis <2>{{intervalVar}}</2> e <4>{{rateIntervalVar}}</4>.",
+        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": "A unidade do registro de data e hora é milissegundos. Se a unidade do valor da série for segundos, multiplique seu vetor de intervalo por 1.000."
       },
       "get-query-type-options": {
         "description": {
-          "instant-query-range": ""
+          "instant-query-range": "Executar uma consulta instantânea e uma consulta de intervalo"
         },
         "label": {
-          "both": ""
+          "both": "Ambos"
         },
         "range-options": {
           "description": {
-            "query-range": ""
+            "query-range": "Executar consulta em um intervalo de tempo"
           },
           "label": {
-            "instant": "",
-            "range": ""
+            "instant": "Instantâneo",
+            "range": "Intervalo"
           }
         }
       },
       "label-selector": {
-        "aria-label-filter-expression-for-label": "",
-        "description-select-labels": "",
-        "select-labels-to-search-in": ""
+        "aria-label-filter-expression-for-label": "Filtrar expressão para o rótulo",
+        "description-select-labels": "Depois que os valores de rótulo são selecionados, apenas as combinações de rótulo possíveis são exibidas.",
+        "select-labels-to-search-in": "2. Selecione rótulos para busca"
       },
       "metric-selector": {
-        "aria-label-filter-expression-for-metric": "",
-        "aria-label-limit-results-from-series-endpoint": "",
-        "description-series-limit": "",
-        "label-select-metric": "",
-        "select-a-metric": "",
-        "series-limit": ""
+        "aria-label-filter-expression-for-metric": "Filtrar expressão para a métrica",
+        "aria-label-limit-results-from-series-endpoint": "Limitar resultados do endpoint da série",
+        "description-series-limit": "O limite se aplica a todas as métricas, rótulos e valores. Deixe o campo vazio para usar o limite padrão. Defina como 0 para desativar o limite e buscar tudo, o que pode afetar o desempenho.",
+        "label-select-metric": "Depois que uma métrica é selecionada, apenas os rótulos possíveis são exibidos. Os rótulos são limitados pelo limite de série abaixo.",
+        "select-a-metric": "1. Selecione uma métrica",
+        "series-limit": "Limite de série"
       },
       "prom-cheat-sheet": {
-        "prom-ql-cheat-sheet": ""
+        "prom-ql-cheat-sheet": "Ficha de referências do PromQL"
       },
       "prom-exemplar-field": {
-        "exemplars": "",
-        "tooltip-disable-query": "",
-        "tooltip-enable-query": ""
+        "exemplars": "Exemplares",
+        "tooltip-disable-query": "Desativar consulta com exemplares",
+        "tooltip-enable-query": "Ativar consulta com exemplares"
       },
       "prom-explore-extra-field": {
-        "aria-label-prometheus-extra-field": "",
-        "aria-label-query-type-field": "",
-        "aria-label-step-field": "",
-        "min-step": "",
-        "query-type": "",
-        "tooltip-units-builtin-variables-example-interval-rateinterval": ""
+        "aria-label-prometheus-extra-field": "Campo extra do Prometheus",
+        "aria-label-query-type-field": "Campo de tipo de consulta",
+        "aria-label-step-field": "Campo de etapa",
+        "min-step": "Etapa mínima",
+        "query-type": "Tipo de consulta",
+        "tooltip-units-builtin-variables-example-interval-rateinterval": "É possível usar unidades de tempo e variáveis integradas aqui. Por exemplo: {{example1}}, {{example2}}, {{example3}}, {{example4}}, {{example5}}, {{example6}}, {{example7}} (valor padrão se nenhuma unidade for especificada: {{default}})"
       },
       "prom-query-field": {
-        "placeholder-enter-a-prom-ql-query": ""
+        "placeholder-enter-a-prom-ql-query": "Insira uma consulta PromQL…"
       },
       "prom-variable-query-editor": {
-        "aria-label-classic-query": "",
-        "aria-label-metric-regex": "",
-        "aria-label-metric-selector": "",
-        "aria-label-prometheus-query": "",
-        "aria-label-query-type": "",
-        "aria-label-series-query": "",
-        "label-classic-query": "",
+        "aria-label-classic-query": "Consulta clássica",
+        "aria-label-metric-regex": "Regex da métrica",
+        "aria-label-metric-selector": "Seletor de métrica",
+        "aria-label-prometheus-query": "Consulta do Prometheus",
+        "aria-label-query-type": "Tipo de consulta",
+        "aria-label-series-query": "Consulta de série",
+        "label-classic-query": "Consulta clássica",
         "label-label": "Etiqueta",
-        "label-metric-regex": "",
+        "label-metric-regex": "Regex da métrica",
         "label-query": "Consulta",
-        "label-query-type": "",
-        "label-series-query": "",
-        "placeholder-classic-query": "",
-        "placeholder-metric-regex": "",
-        "placeholder-prometheus-query": "",
+        "label-query-type": "Tipo de consulta",
+        "label-series-query": "Consulta de série",
+        "placeholder-classic-query": "Consulta clássica",
+        "placeholder-metric-regex": "Regex da métrica",
+        "placeholder-prometheus-query": "Consulta do Prometheus",
         "placeholder-select-query-type": "Selecionar tipo de consulta",
-        "placeholder-series-query": "",
-        "returns-metrics-matching-specified-metric-regex": "",
-        "tooltip-classic-query": "",
-        "tooltip-label": "",
-        "tooltip-metric-regex": "",
-        "tooltip-query": "",
-        "tooltip-query-type": "",
-        "tooltip-series-query": ""
+        "placeholder-series-query": "Consulta de série",
+        "returns-metrics-matching-specified-metric-regex": "Retorna uma lista de métricas que correspondem à métrica regex especificada.",
+        "tooltip-classic-query": "A implementação original do editor de consultas variáveis do Prometheus. Insira uma string com o tipo de consulta e os parâmetros corretos, conforme descrito nesta documentação. Por exemplo, {{exampleQuery}}.",
+        "tooltip-label": "Retorna uma lista de valores de rótulo para o nome do rótulo em todas as métricas, a menos que a métrica seja especificada.",
+        "tooltip-metric-regex": "Retorna uma lista de nomes de rótulos, havendo a opção de filtrar por métrica regex especificada.",
+        "tooltip-query": "Retorna uma lista de resultados de consulta do Prometheus para a consulta. Isso pode incluir funções do Prometheus, como {{exampleQuery}}.",
+        "tooltip-query-type": "O plug-in de fonte de dados do Prometheus fornece os seguintes tipos de consulta para variáveis de modelo.",
+        "tooltip-series-query": "Insira uma métrica com rótulos, apenas uma métrica ou apenas rótulos, como {{example1}}, {{example2}} ou {{example3}}. Retorna uma lista de séries temporais associadas aos dados inseridos."
       },
       "selector-actions": {
-        "aria-label-selector": "",
-        "aria-label-selector-clear-button": "",
-        "aria-label-use-selector-as-metrics-button": "",
-        "aria-label-use-selector-for-query-button": "",
-        "aria-label-validate-submit-button": "",
+        "aria-label-selector": "seletor",
+        "aria-label-selector-clear-button": "Botão de redefinição do seletor",
+        "aria-label-use-selector-as-metrics-button": "Botão para usar o seletor como métrica",
+        "aria-label-use-selector-for-query-button": "Botão para usar o seletor para consulta",
+        "aria-label-validate-submit-button": "Botão para validar envio",
         "clear": "Limpar",
-        "resulting-selector": "",
-        "use-as-rate-query": "",
-        "use-query": "",
-        "validate-selector": ""
+        "resulting-selector": "4. Seletor resultante",
+        "use-as-rate-query": "Usar como consulta de taxa",
+        "use-query": "Usar consulta",
+        "validate-selector": "Validar seletor"
       },
       "value-selector": {
-        "aria-label-filter-expression-for-label-values": "",
-        "aria-label-values-for": "",
-        "description-search-field-values-across-selected-labels": "",
-        "select-multiple-values-for-your-labels": ""
+        "aria-label-filter-expression-for-label-values": "Filtrar expressão para valores do rótulo",
+        "aria-label-values-for": "Valores para {{labelKey}}",
+        "description-search-field-values-across-selected-labels": "Use o campo de busca para encontrar valores nos rótulos selecionados.",
+        "select-multiple-values-for-your-labels": "3. Selecione (vários) valores para seus rótulos"
       }
     },
     "configuration": {
       "alerting-settings-overhaul": {
-        "label-allow-as-recording-rules-target": "",
-        "label-manage-alerts-via-alerting-ui": "",
+        "label-allow-as-recording-rules-target": "Permitir como destino de regras de registro",
+        "label-manage-alerts-via-alerting-ui": "Gerenciar alertas por meio da interface de alertas",
         "title-alerting": "Alertas",
-        "tooltip-allow-as-recording-rules-target": "",
+        "tooltip-allow-as-recording-rules-target": "Permita que esta fonte de dados seja selecionada como destino para armazenar regras de gravação.",
         "tooltip-manage-alerts-via-alerting-ui": "Gerenciar regras de alerta para esta fonte de dados. Para gerenciar outros recursos do alerting, adicione uma fonte de dados do Alertmanager."
       },
       "config-editor": {
-        "browser-access-mode-error": "",
-        "description-advanced-settings": "",
+        "browser-access-mode-error": "O modo de acesso via navegador na fonte de dados do Prometheus não está mais disponível. Troque para o modo de acesso via servidor.",
+        "description-advanced-settings": "As configurações adicionais são opcionais, e você pode defini-las para ter mais controle sobre sua fonte de dados.",
         "title-advanced-settings": "Configurações avançadas",
         "title-error": "Erro"
       },
       "data-source-http-settings-overhaul": {
         "tooltip-browser-access-mode": "Seu método de acesso é <1>Navegador</1>, isso significa que deve ser possível acessar a URL a partir do navegador.",
-        "tooltip-http-url": "",
+        "tooltip-http-url": "Especifique uma URL HTTP completa (por exemplo, {{exampleURL}})",
         "tooltip-server-access-mode": "Seu método de acesso é <1>Servidor</1>, isso significa que deve ser possível acessar a URL a partir do back-end/servidor da Grafana."
       },
       "docs-tip": {
-        "visit-docs-for-more-details-here": ""
+        "visit-docs-for-more-details-here": "Acesse a documentação para mais informações aqui."
       },
       "exemplar-setting": {
         "label-data-source": "Fonte de dados",
-        "label-internal-link": "",
+        "label-internal-link": "Link interno",
         "label-label-name": "Nome do rótulo",
-        "label-remove-exemplar-link": "",
+        "label-remove-exemplar-link": "Remover link do exemplar",
         "label-url": "URL",
-        "label-url-label": "",
-        "placeholder-go-to-examplecom": "",
-        "placeholder-httpsexamplecomvalueraw": "",
-        "placeholder-trace-id": "",
-        "title-remove-exemplar-link": "",
-        "tooltip-data-source": "",
-        "tooltip-internal-link": "",
-        "tooltip-label-name": "",
-        "tooltip-url": "",
-        "tooltip-url-label": ""
+        "label-url-label": "Rótulo de URL",
+        "placeholder-go-to-examplecom": "Ir para exemplo.com",
+        "placeholder-httpsexamplecomvalueraw": "https://exemplo.com/${__value.raw}",
+        "placeholder-trace-id": "traceID",
+        "title-remove-exemplar-link": "Remover link do exemplar",
+        "tooltip-data-source": "A fonte de dados que será acessada pelo exemplar.",
+        "tooltip-internal-link": "Ative esta opção se você tiver um link interno. Quando ativada, essa opção revela o seletor de fonte de dados. Selecione o armazenamento de dados de traços de back-end para seus dados exemplares.",
+        "tooltip-label-name": "O nome do campo no objeto de rótulos que deve ser usado para obter o traceID.",
+        "tooltip-url": "A URL do back-end de traço que o usuário acessaria para ver seu traço",
+        "tooltip-url-label": "Use para substituir o rótulo do botão no campo traceID do exemplar."
       },
       "exemplars-settings": {
         "add": "Adicionar",
-        "no-exemplars-configurations": "",
-        "title-exemplars": ""
+        "no-exemplars-configurations": "Sem configurações de exemplares",
+        "title-exemplars": "Exemplares"
       },
       "prom-settings": {
-        "aria-label-default-editor": "",
-        "aria-label-prom-type-type": "",
-        "aria-label-prometheus-type": "",
-        "aria-label-select-http-method": "",
+        "aria-label-default-editor": "Editor padrão (código ou construtor)",
+        "aria-label-prom-type-type": "Tipo {{promType}}",
+        "aria-label-prometheus-type": "Tipo do Prometheus",
+        "aria-label-select-http-method": "Selecionar método HTTP",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Construtor",
+          "label-code": "Código"
         },
-        "label-cache-level": "",
-        "label-custom-query-parameters": "",
-        "label-default-editor": "",
-        "label-disable-metrics-lookup": "",
-        "label-disable-recording-rules-beta": "",
-        "label-http-method": "",
-        "label-incremental-querying-beta": "",
-        "label-metric-names-suggestion-limit": "",
-        "label-prom-type-version": "",
-        "label-prometheus-type": "",
-        "label-query-overlap-window": "",
-        "label-query-timeout": "",
-        "label-scrape-interval": "",
-        "label-series-limit": "",
-        "label-use-series-endpoint": "",
-        "more-info": "",
-        "placeholder-example-maxsourceresolutionmtimeout": "",
-        "title-interval-behaviour": "",
-        "title-other": "",
+        "label-cache-level": "Nível de cache",
+        "label-custom-query-parameters": "Parâmetros de consulta personalizados",
+        "label-default-editor": "Editor padrão",
+        "label-disable-metrics-lookup": "Desativar busca de métricas",
+        "label-disable-recording-rules-beta": "Desativar regras de registro (beta)",
+        "label-http-method": "Método HTTP",
+        "label-incremental-querying-beta": "Consulta incremental (beta)",
+        "label-metric-names-suggestion-limit": "Limite de sugestão de nomes de métricas",
+        "label-prom-type-version": "Versão {{promType}}",
+        "label-prometheus-type": "Tipo do Prometheus",
+        "label-query-overlap-window": "Janela de sobreposição de consulta",
+        "label-query-timeout": "Tempo limite da consulta",
+        "label-scrape-interval": "Intervalo de coleta",
+        "label-series-limit": "Limite de série",
+        "label-use-series-endpoint": "Usar endpoint da série",
+        "more-info": "Para mais informações sobre como configurar o tipo e a versão do Prometheus em fontes de dados, consulte a <2>documentação de provisionamento</2>.",
+        "placeholder-example-maxsourceresolutionmtimeout": "Exemplo: {{example}}",
+        "title-interval-behaviour": "Comportamento de intervalo",
+        "title-other": "Outro",
         "title-performance": "Desempenho",
-        "title-query-editor": "",
-        "tooltip-cache-level": "",
-        "tooltip-custom-query-parameters": "",
-        "tooltip-default-editor": "",
-        "tooltip-disable-metrics-lookup": "",
-        "tooltip-disable-recording-rules-beta": "",
-        "tooltip-http-method": "",
-        "tooltip-incremental-querying-beta": "",
-        "tooltip-metric-names-suggestion-limit": "",
-        "tooltip-prom-type-version": "",
-        "tooltip-prometheus-type": "",
-        "tooltip-query-overlap-window": "",
-        "tooltip-query-timeout": "",
-        "tooltip-scrape-interval": "",
-        "tooltip-series-limit": "",
-        "tooltip-use-series-endpoint": ""
+        "title-query-editor": "Editor de consultas",
+        "tooltip-cache-level": "Define o nível de cache do navegador para consultas do editor. Recomenda-se usar configurações de cache mais elevadas para fontes de dados de alta cardinalidade.",
+        "tooltip-custom-query-parameters": "Adicione parâmetros personalizados ao URL de consulta do Prometheus. Por exemplo, {{example1}}, {{example2}}, {{example3}} ou{{example4}}. Vários parâmetros devem ser concatenados com {{concatenationChar}}.",
+        "tooltip-default-editor": "Defina a opção de editor padrão para todos os usuários desta fonte de dados.",
+        "tooltip-disable-metrics-lookup": "Marcar esta opção desativará o seletor de métricas e a compatibilidade com métricas/rótulos no preenchimento automático do campo de consulta. Isso é útil se você tiver problemas de desempenho com instâncias maiores do Prometheus. ",
+        "tooltip-disable-recording-rules-beta": "Este recurso desativará as regras de registro. Ative o recurso para aprimorar o desempenho do painel",
+        "tooltip-http-method": "Você pode usar o método HTTP POST ou GET para consultar sua fonte de dados do Prometheus. POST é o método recomendado por permitir consultas maiores. Altere para GET se sua versão do Prometheus for anterior à versão 2.1 ou se as solicitações POST estiverem restritas na sua rede.",
+        "tooltip-incremental-querying-beta": "Este recurso alterará o comportamento padrão das consultas relativas: os dados recentes deixam de ser sempre solicitados da instância do Prometheus e passam a utilizar dados em cache e a solicitar apenas novos registros. Ative o recurso para diminuir a carga do banco de dados e da rede.",
+        "tooltip-metric-names-suggestion-limit": "A quantidade máxima de nomes de métricas que podem aparecer como sugestões de preenchimento automático no modo de Código do editor de consultas.",
+        "tooltip-prom-type-version": "Use essa opção para definir a versão da sua instância {{promType}} se ela não for configurada automaticamente.",
+        "tooltip-prometheus-type": "Defina essa opção para o tipo do seu banco de dados do Prometheus. Por exemplo: Prometheus, Cortex, Mimir ou Thanos. Ao alterar este campo, suas configurações atuais serão salvas. Certos tipos de Prometheus são compatíveis ou não com diversas APIs. Por exemplo, alguns tipos são compatíveis com correspondência de regex para consultas de rótulo, visando a melhoria do desempenho. Alguns tipos têm uma API para metadados. Se essa opção por definida incorretamente, a consulta de métricas e rótulos poderá apresentar um comportamento incomum. Verifique a documentação do Prometheus para garantir que você inseriu o tipo correto.",
+        "tooltip-query-overlap-window": "Defina uma duração como {{example1}}, {{example2}} ou {{example3}}. O valor padrão é {{default}}. Esta duração será adicionada à duração de cada solicitação subsequente.",
+        "tooltip-query-timeout": "Defina o tempo limite de consulta do Prometheus.",
+        "tooltip-scrape-interval": "Este intervalo é a frequência com que o Prometheus coleta dados dos alvos. Defina essa opção para o intervalo comum de coleta e avaliação configurado no seu arquivo de configuração do Prometheus. Se você definir um valor maior do que o intervalo do seu arquivo de configuração do Prometheus, a Grafana avaliará os dados de acordo com esse intervalo e você verá menos pontos de dados. O valor padrão é {{default}}.",
+        "tooltip-series-limit": "O limite se aplica a todos os recursos (métricas, rótulos e valores) para ambos os endpoints (séries e rótulos). Deixe o campo vazio para usar o limite padrão (40.000). Defina como 0 para desativar o limite e buscar tudo, o que pode afetar o desempenho. O limite padrão é 40.000.",
+        "tooltip-use-series-endpoint": "Ao marcar esta opção, o endpoint da série com o parâmetro {{exampleParameter}} terá preferência sobre o endpoint de valores de rótulo com o parâmetro {{exampleParameter}}. Ainda que o endpoint de valores de rótulo seja considerado mais eficiente, alguns usuários podem preferir a série por ela ter um método POST, enquanto o endpoint de valores de rótulo tem apenas um método GET."
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(desativado)",
+      "enabled-label": "Navegador de métricas"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Inclui apenas rótulos exclusivos",
+        "description-custom": "Forneça um modelo de nomenclatura",
+        "description-verbose": "Todos os nomes e valores de rótulos",
+        "label-auto": "Automático",
+        "label-custom": "Personalizado",
+        "label-verbose": "Descritivo"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Calcular a média sobre as dimensões",
+        "documentation-bottomk": "Menores elementos k por valor de amostra",
+        "documentation-count": "Contar o número de elementos no vetor",
+        "documentation-count-values": "Contar o número de elementos com o mesmo valor",
+        "documentation-group": "Todos os valores no vetor resultante são 1",
+        "documentation-max": "Selecionar o máximo sobre as dimensões",
+        "documentation-min": "Selecionar o mínimo sobre as dimensões",
+        "documentation-quantile": "Calcular φ-quantil (0 ≤ φ ≤ 1) sobre as dimensões",
+        "documentation-stddev": "Calcular o desvio padrão da população sobre as dimensões",
+        "documentation-stdvar": "Calcular a variância padrão da população sobre as dimensões",
+        "documentation-sum": "Calcular a soma sobre as dimensões",
+        "documentation-topk": "Maiores elementos k por valor de amostra"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Retorna o vetor de entrada com todos os valores de amostra convertidos para o seu valor absoluto.",
+        "documentation-absent": "Retorna um vetor vazio se o vetor passado para ele tiver algum elemento e um vetor de 1 elemento com o valor 1 se o vetor passado para ele não tiver elementos. Isso é útil para alertar quando não existe nenhuma série temporal para um determinado nome de métrica e combinação de rótulo.",
+        "documentation-absent-over-time": "Retorna um vetor vazio se o vetor de intervalo passado para ele tiver quaisquer elementos e um vetor de 1 elemento com o valor 1 se o vetor de intervalo passado para ele não tiver elementos.",
+        "documentation-avg-over-time": "O valor médio de todos os pontos no intervalo especificado.",
+        "documentation-ceil": "Arredonda os valores de amostra de todos os elementos em \"v\" para cima, para o número inteiro mais próximo.",
+        "documentation-changes": "Para cada série temporal de entrada, \"changes(v range-vector)\" retorna o número de vezes que seu valor mudou dentro do intervalo de tempo fornecido como um vetor instantâneo.",
+        "documentation-clamp": "Fixa os valores de amostra de todos os elementos em \"v\" para ter um limite inferior de \"mín.\" e um limite superior de \"máx.\".",
+        "documentation-clamp-max": "Fixa os valores de amostra de todos os elementos em \"v\" para ter um limite superior de \"máx.\".",
+        "documentation-clamp-min": "Fixa os valores de amostra de todos os elementos em \"v\" para ter um limite inferior de \"mín.\".",
+        "documentation-count-over-time": "A contagem de todos os valores no intervalo especificado.",
+        "documentation-count-scalar": "Retorna o número de elementos em um vetor de série temporal como um escalar. Isso contrasta com o operador de agregação \"count()\", que sempre retorna um vetor (um vazio se o vetor de entrada estiver vazio) e permite o agrupamento por rótulos por meio de uma cláusula \"by\".",
+        "documentation-day-of-month": "Retorna o dia do mês para cada um dos horários fornecidos em UTC. Os valores retornados são de 1 a 31.",
+        "documentation-day-of-week": "Retorna o dia da semana para cada um dos horários fornecidos em UTC. Os valores retornados são de 0 a 6, onde 0 significa domingo etc.",
+        "documentation-day-of-year": "Retorna o dia do ano para cada um dos horários fornecidos em UTC. Os valores retornados são de 1 a 365 para anos não bissextos e de 1 a 366 em anos bissextos.",
+        "documentation-days-in-month": "Retorna o número de dias no mês para cada um dos horários fornecidos em UTC. Os valores retornados são de 28 a 31.",
+        "documentation-deg": "Converte radianos em graus para todos os elementos em v",
+        "documentation-delta": "Calcula a diferença entre o primeiro e o último valor de cada elemento da série temporal em um vetor de intervalo \"v\", retornando um vetor instantâneo com os deltas fornecidos e rótulos equivalentes. O delta é extrapolado para cobrir o intervalo de tempo total, conforme especificado no seletor de vetor de intervalo, de modo que seja possível obter um resultado não inteiro, mesmo que os valores da amostra sejam todos inteiros.",
+        "documentation-deriv": "Calcula a derivada por segundo da série temporal em um vetor de intervalo \"v\", usando regressão linear simples.",
+        "documentation-double-exponential-smoothing": "Produz um valor suavizado para séries temporais com base no intervalo em \"v\". Quanto menor o fator de suavização \"sf\", mais importância é dada aos dados antigos. Quanto maior o fator de tendência \"tf\", mais tendências nos dados são consideradas. Tanto \"sf\" quanto \"tf\" devem estar entre 0 e 1.",
+        "documentation-drop-common-labels": "Elimina todos os rótulos que têm o mesmo nome e valor em todas as séries no vetor de entrada.",
+        "documentation-exp": "Calcula a função exponencial para todos os elementos em \"v\".\nCasos especiais são:\n* \"Exp(+Inf) = +Inf\" \n* \"Exp(NaN) = NaN\"",
+        "documentation-floor": "Arredonda os valores de amostra de todos os elementos em \"v\" para o número inteiro mais próximo.",
+        "documentation-histogram-avg": "Retorna a média aritmética dos valores observados armazenados em um histograma nativo. Amostras que não são histogramas nativos são ignoradas e não aparecem no vetor retornado.",
+        "documentation-histogram-count": "Retorna a contagem de observações armazenadas em um histograma nativo.",
+        "documentation-histogram-fraction": "Retorna a fração estimada de observações entre os valores inferior e superior fornecidos.",
+        "documentation-histogram-quantile": "Calcula o φ-quantil (0 ≤ φ ≤ 1) a partir dos buckets \"b\" de um histograma. As amostras em \"b\" são as contagens de observações em cada bucket. Cada amostra deve ter um rótulo \"le\" onde o valor do rótulo denota o limite superior inclusivo do bucket. (Amostras sem tal rótulo são silenciosamente ignoradas.) O tipo de métrica de histograma fornece automaticamente séries temporais com o sufixo \"_bucket\" e os rótulos apropriados.",
+        "documentation-histogram-stddev": "Retorna o desvio padrão estimado das observações em um histograma nativo, com base na média geométrica dos buckets onde as observações se encontram.",
+        "documentation-histogram-stdvar": "Retorna a variância padrão estimada das observações em um histograma nativo.",
+        "documentation-histogram-sum": "Retorna a soma de observações armazenadas em um histograma nativo.",
+        "documentation-holt-winters": "Renomeado como double_exponential_smoothing no Prometheus v3.x. Para versões do Prometheus iguais e superiores a v3.0, use double_exponential_smoothing. \n\nProduz um valor suavizado para séries temporais com base no intervalo em \"v\". Quanto menor o fator de suavização \"sf\", mais importância é dada aos dados antigos. Quanto maior o fator de tendência \"tf\", mais tendências nos dados são consideradas. Tanto \"sf\" quanto \"tf\" devem estar entre 0 e 1.",
+        "documentation-hour": "Retorna a hora do dia para cada um dos horários fornecidos em UTC. Os valores retornados são de 0 a 23.",
+        "documentation-idelta": "Calcula a diferença entre as duas últimas amostras no vetor de intervalo \"v\", retornando um vetor instantâneo com os deltas fornecidos e rótulos equivalentes.",
+        "documentation-increase": "Calcula o aumento na série temporal no vetor de intervalo. As quebras na monotonicidade (como redefinições de contador devido a reinicializações de destino) são ajustadas automaticamente. O aumento é extrapolado para cobrir o intervalo de tempo total, conforme especificado no seletor de vetor de intervalo, de modo que seja possível obter um resultado não inteiro, mesmo que um contador aumente apenas por incrementos inteiros.",
+        "documentation-info": "Retorna os detalhes e metadados mais recentes sobre um grupo de métricas, como seus rótulos e valores atuais, sem fazer nenhum cálculo",
+        "documentation-irate": "Calcula a taxa instantânea por segundo de aumento da série temporal no vetor de intervalo. Isso é baseado nos dois últimos pontos de dados. As quebras na monotonicidade (como redefinições de contador devido a reinicializações de destino) são ajustadas automaticamente.",
+        "documentation-label-join": "Para cada série temporal em \"v\", une todos os valores de todos os \"src_labels\" usando \"separator\" e retorna a série temporal com o rótulo \"dst_label\" contendo o valor unido. Pode haver qualquer número de \"src_labels\" nesta função.",
+        "documentation-label-replace": "Para cada série temporal em \"v\", \"label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)\" corresponde à expressão regular \"regex\" em relação ao rótulo \"src_label\". Se corresponder, a série temporal é retornada com o rótulo \"dst_label\" substituído pela expansão de \"replacement\". \"$1\" é substituído pelo primeiro subgrupo correspondente, \"$2\" pelo segundo etc. Se a expressão regular não corresponder, a série temporal é retornada inalterada.",
+        "documentation-last-over-time": "O valor do ponto mais recente no intervalo especificado.",
+        "documentation-ln": "Calcula o logaritmo natural para todos os elementos em \"v\".\nCasos especiais são:\n * \"ln(+Inf) = +Inf\"\n * \"ln(0) = -Inf\"\n * \"ln(x < 0) = NaN\"\n * \"ln(NaN) = NaN\"",
+        "documentation-log10": "Calcula o logaritmo decimal para todos os elementos em \"v\". Os casos especiais são equivalentes aos de \"ln\".",
+        "documentation-log2": "Calcula o logaritmo binário para todos os elementos em \"v\". Os casos especiais são equivalentes aos de \"ln\".",
+        "documentation-max-over-time": "O valor máximo de todos os pontos no intervalo especificado.",
+        "documentation-min-over-time": "O valor mínimo de todos os pontos no intervalo especificado.",
+        "documentation-minute": "Retorna o minuto da hora para cada um dos horários fornecidos em UTC. Os valores retornados são de 0 a 59.",
+        "documentation-month": "Retorna o mês do ano para cada um dos horários fornecidos em UTC. Os valores retornados são de 1 a 12, onde 1 significa janeiro etc.",
+        "documentation-pi": "Retorna pi",
+        "documentation-predict-linear": "Prevê o valor da série temporal \"t\" segundos a partir de agora, com base no vetor de intervalo \"v\", usando regressão linear simples.",
+        "documentation-present-over-time": "O valor 1 para qualquer série no intervalo especificado.",
+        "documentation-quantile-over-time": "O φ-quantil (0 ≤ φ ≤ 1) dos valores no intervalo especificado.",
+        "documentation-rad": "Converte graus em radianos para todos os elementos em v",
+        "documentation-rate": "Calcula a taxa média por segundo de aumento da série temporal no vetor de intervalo. As quebras na monotonicidade (como redefinições de contador devido a reinicializações de destino) são ajustadas automaticamente. Além disso, o cálculo extrapola para as extremidades do intervalo de tempo, permitindo raspagens perdidas ou alinhamento imperfeito dos ciclos de raspagem com o período de tempo do intervalo.",
+        "documentation-resets": "Para cada série temporal de entrada, \"resets(v range-vector)\" retorna o número de redefinições de contador dentro do intervalo de tempo fornecido como um vetor instantâneo. Qualquer diminuição no valor entre duas amostras consecutivas é interpretada como uma redefinição de contador.",
+        "documentation-round": "Arredonda os valores de amostra de todos os elementos em \"v\" para o número inteiro mais próximo. Os empates são resolvidos arredondando para cima. O argumento opcional \"to_nearest\" permite especificar o múltiplo mais próximo para o qual os valores de amostra devem ser arredondados. Este múltiplo também pode ser uma fração.",
+        "documentation-scalar": "Dado um vetor de entrada de elemento único, \"scalar(v instant-vector)\" retorna o valor de amostra desse elemento único como um escalar. Se o vetor de entrada não tiver exatamente um elemento, \"scalar\" retornará \"NaN\".",
+        "documentation-sgn": "Retorna um vetor com todos os valores de amostra convertidos para o seu sinal, definido como: 1 se v for positivo, -1 se v for negativo e 0 se v for igual a zero.",
+        "documentation-sort": "Retorna elementos vetoriais classificados por seus valores de amostra, em ordem crescente.",
+        "documentation-sort-desc": "Retorna elementos vetoriais classificados por seus valores de amostra, em ordem decrescente.",
+        "documentation-sqrt": "Calcula a raiz quadrada de todos os elementos em \"v\".",
+        "documentation-stddev-over-time": "O desvio padrão da população dos valores no intervalo especificado.",
+        "documentation-stdvar-over-time": "A variância padrão da população dos valores no intervalo especificado.",
+        "documentation-sum-over-time": "A soma de todos os valores no intervalo especificado.",
+        "documentation-time": "Retorna o número de segundos desde o dia 1 de janeiro de 1970 UTC. Observe que isso não retorna a hora atual, mas a hora em que a expressão deve ser avaliada.",
+        "documentation-timestamp": "Retorna o carimbo de data/hora de cada uma das amostras do vetor fornecido como o número de segundos desde o dia 1 de janeiro de 1970 UTC.",
+        "documentation-vector": "Retorna o escalar \"s\" como um vetor sem rótulos.",
+        "documentation-year": "Retorna o ano para cada um dos horários fornecidos em UTC."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "calcula o arco cosseno de todos os elementos em {{argument}}",
+        "documentation-acosh": "calcula o cosseno hiperbólico inverso de todos os elementos em {{argument}}",
+        "documentation-asin": "calcula o arco seno de todos os elementos em {{argument}}",
+        "documentation-asinh": "calcula o seno hiperbólico inverso de todos os elementos em {{argument}}",
+        "documentation-atan": "calcula o arco tangente de todos os elementos em {{argument}}",
+        "documentation-atanh": "calcula a tangente hiperbólica inversa de todos os elementos em {{argument}}",
+        "documentation-cos": "calcula o cosseno de todos os elementos em {{argument}}",
+        "documentation-cosh": "calcula o cosseno hiperbólico de todos os elementos em {{argument}}",
+        "documentation-sin": "calcula o seno de todos os elementos em {{argument}}",
+        "documentation-sinh": "calcula o seno hiperbólico de todos os elementos em {{argument}}",
+        "documentation-tan": "calcula a tangente de todos os elementos em {{argument}}",
+        "documentation-tanh": "calcula a tangente hiperbólica de todos os elementos em {{argument}}"
       }
     },
     "querybuilder": {
       "feedback-link": {
         "give-feedback": "Dar feedback",
-        "title-give-feedback": ""
+        "title-give-feedback": "O explorador de métricas é um recurso novo. Compartilhe conosco o que podemos fazer para torná-lo ainda melhor."
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Exemplares: {{value}}",
+        "format": "Formato: {{value}}",
+        "legend": "Legenda: {{value}}",
+        "step": "Etapa: {{value}}",
+        "type": "Tipo: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Buscar métricas por nome",
+        "type": "Filtrar por tipo"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Uma métrica cumulativa que representa um único contador monotonicamente crescente cujo valor só pode aumentar ou ser redefinido para zero ao reiniciar.",
+        "description-gauge": "Uma métrica que representa um único valor numérico que pode subir e descer arbitrariamente.",
+        "description-histogram": "Um histograma coleta amostras de observações (geralmente coisas como durações de solicitação ou tamanhos de resposta) e as conta em buckets configuráveis.",
+        "description-native-histogram": "Os histogramas nativos são diferentes dos histogramas clássicos do Prometheus de várias maneiras: os limites do bucket do histograma nativo são calculados por uma fórmula que depende da escala (resolução) do histograma nativo e não são definidos pelo usuário.",
+        "description-no-type": "Essas métricas não têm tipo definido nos metadados.",
+        "description-summary": "Um resumo coleta amostras de observações (geralmente coisas como durações de solicitação e tamanhos de resposta) e pode calcular quantis configuráveis em uma janela de tempo deslizante.",
+        "description-unknown": "Essas métricas receberam o tipo desconhecido nos metadados.",
+        "label-counter": "Contador",
+        "label-gauge": "Medidor",
+        "label-histogram": "Histograma",
+        "label-native-histogram": "Histograma nativo",
+        "label-no-type": "Sem tipo",
+        "label-summary": "Resumo",
+        "label-unknown": "Desconhecido"
       },
       "handle-function": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "A análise da consulta é ambígua."
         }
       },
       "label-filter-item": {
-        "aria-label-remove": "",
-        "placeholder-select-label": "",
+        "aria-label-remove": "Remover {{name}}",
+        "placeholder-select-label": "Selecionar rótulo",
         "placeholder-select-value": "Selecionar valor"
       },
       "label-filters": {
-        "label-filters": "",
-        "label-label-filters": "",
-        "tooltip-label-filters": ""
+        "label-filters": "Filtros de rótulo",
+        "label-label-filters": "Filtros de rótulo",
+        "tooltip-label-filters": "Opcional: usado para filtrar a métrica selecionada para este tipo de consulta."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Carregando rótulos",
+        "noOptionsMessage-no-labels-found": "Nenhum rótulo foi encontrado"
       },
       "metric-combobox": {
         "async-select": {
-          "aria-label-open-metrics-explorer": "",
-          "placeholder-select-metric": "",
-          "tooltip-open-metrics-explorer": ""
+          "aria-label-open-metrics-explorer": "Abrir explorador de métricas",
+          "placeholder-select-metric": "Selecionar métrica",
+          "tooltip-open-metrics-explorer": "Abrir explorador de métricas"
         },
         "label-metric": "Métrica",
-        "tooltip-metric": ""
+        "tooltip-metric": "Opcional: retorna uma lista de valores de rótulo para o nome do rótulo na métrica especificada."
       },
       "metrics-modal": {
-        "aria-label-browse-metrics": "",
-        "currently-selected": "",
-        "metrics-pre-filtered": "",
-        "title-metrics-explorer": ""
+        "aria-label-browse-metrics": "Navegar por métricas",
+        "currently-selected": "Selecionado agora: {{selected}}",
+        "metrics-pre-filtered": "Essas métricas foram pré-filtradas por rótulos escolhidos nos filtros de rótulo.",
+        "title-metrics-explorer": "Explorador de métricas"
       },
       "nested-query": {
         "label": {
-          "ignoring": "",
+          "ignoring": "Ignorando",
           "on": "Ativado"
         },
         "operator": "Operador",
-        "tooltip-remove-match": "",
-        "vector-matches": ""
+        "tooltip-remove-match": "Remover correspondência",
+        "vector-matches": "Correspondências de vetor"
       },
       "operation-editor": {
-        "not-found": "",
-        "title-remove": ""
+        "not-found": "Operação {{id}} não encontrada",
+        "title-remove": "Remover {{name}}"
       },
       "operation-header": {
         "placeholder-replace-with": "Substituir por",
-        "title-click-to-view-alternative-operations": "",
-        "title-remove-operation": ""
+        "title-click-to-view-alternative-operations": "Clique para conferir outras opções de operação",
+        "title-remove-operation": "Remover operação"
       },
       "operation-info-button": {
-        "title-click-to-show-description": "",
-        "title-remove-operation": ""
+        "title-click-to-show-description": "Clique para exibir a descrição",
+        "title-remove-operation": "Remover operação"
       },
       "operation-list": {
-        "operations": "",
+        "operations": "Operações",
         "placeholder-search": "Pesquisar",
-        "title-add-operation": ""
+        "title-add-operation": "Adicionar operação"
       },
       "operation-param-editor": {
-        "title-add": "",
-        "title-remove": ""
+        "title-add": "Adicionar {{name}}",
+        "title-remove": "Remover {{name}}"
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Calcula {{aggregationName}} sobre as dimensões, preservando {{labelWord}} {{labels}}.",
+          "label-default": "Calcula {{aggregationName}} sobre as dimensões.",
+          "label-without": "Calcula {{aggregationName}} sobre as dimensões {{labels}}. Todos os outros rótulos são preservados."
         }
       },
       "prom-query-builder-options": {
-        "aria-label-lower-limit-parameter": "",
-        "aria-label-select-resolution": "",
+        "aria-label-lower-limit-parameter": "Definir limite inferior para o parâmetro de etapa",
+        "aria-label-select-resolution": "Selecionar resolução",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Mapa de calor",
+          "label-table": "Tabela",
+          "label-time-series": "Séries temporais"
         },
-        "label-exemplars": "",
+        "label-exemplars": "Exemplares",
         "label-format": "Formato",
-        "label-min-step": "",
-        "label-resolution": "",
+        "label-min-step": "Etapa mínima",
+        "label-resolution": "Resolução",
         "label-type": "Tipo",
-        "placeholder-auto": "",
+        "placeholder-auto": "automático",
         "title-options": "Opções",
-        "tooltip-min-step": ""
+        "tooltip-min-step": "Um limite inferior adicional para o parâmetro de etapa da consulta do Prometheus e para as variáveis <2>{{interval}}</2> e <4>{{rateInterval}}</4>."
       },
       "prom-query-code-editor-autocomplete-info": {
-        "autocomplete-suggestions-limited": "",
-        "tooltip-autocomplete-suggestions-limited": ""
+        "autocomplete-suggestions-limited": "Sugestões limitadas de preenchimento automático",
+        "tooltip-autocomplete-suggestions-limited": "A quantidade de nomes de métricas excede o limite de preenchimento automático. Apenas as {{autocompleteLimit}} métricas mais relevantes são exibidas. Você pode ajustar o limite nas configurações da fonte de dados."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Há um erro de sintaxe ou a estrutura da consulta não pode ser visualizada ao alternar para o modo de construção. Partes da consulta podem ser perdidas.",
+        "confirmText-continue": "Continuar",
         "kick-start-your-query": "Iniciar sua consulta",
-        "label-explain": "",
-        "run-queries": "",
-        "title-parsing-error-switch-builder": ""
+        "label-explain": "Explicar",
+        "run-queries": "Executar consultas",
+        "title-parsing-error-switch-builder": "Erro de análise: deseja trocar para o modo de construção?"
       },
       "prom-query-legend-editor": {
-        "label-legend": "",
-        "placeholder-select-legend-mode": "",
-        "tooltip-legend": ""
+        "label-legend": "Legenda",
+        "placeholder-select-legend-mode": "Selecionar modo legenda",
+        "tooltip-legend": "Substituição ou modelo de nome de série. Exemplo: {{templateExample}} será substituído pelo valor do rótulo para {{labelName}}."
       },
       "query-builder-hints": {
-        "hint-details": ""
+        "hint-details": "dica: {{hintDetails}}"
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Construtor",
+          "label-code": "Código"
         }
       },
       "query-pattern": {
-        "apply-query": "",
-        "aria-label-apply-query-starter-button": "",
-        "aria-label-back-button": "",
-        "aria-label-create-new-query-button": "",
-        "aria-label-raw-query": "",
-        "aria-label-use-this-query-button": "",
+        "apply-query": "Aplicar consulta",
+        "aria-label-apply-query-starter-button": "botão de aplicação de inicializador de consulta",
+        "aria-label-back-button": "botão voltar",
+        "aria-label-create-new-query-button": "botão criar nova consulta",
+        "aria-label-raw-query": "consulta bruta de {{patternName}}",
+        "aria-label-use-this-query-button": "botão usar esta consulta",
         "back": "Voltar",
-        "create-new-query": "",
+        "create-new-query": "Criar nova consulta",
         "use-this-query": "Usar esta consulta"
       },
       "query-patterns-modal": {
-        "aria-label-close-kick-start-your-query-modal": "",
+        "aria-label-close-kick-start-your-query-modal": "modal para fechar início rápido de consulta",
         "aria-label-kick-start-your-query-modal": "Iniciar seu modal de consulta",
-        "aria-label-toggle-query-starter": "",
+        "aria-label-toggle-query-starter": "cartão de inicializador de consulta para abrir e fechar {{patternType}}",
         "close": "Fechar",
-        "description-kick-start-your-query": "",
-        "label-toggle-query-starter": "",
+        "description-kick-start-your-query": "Inicie sua consulta rapidamente selecionando uma dessas consultas. Em seguida, você poderá prosseguir para concluir sua consulta.",
+        "label-toggle-query-starter": "Inicializadores de consulta {{patternType}}",
         "title-kick-start-your-query": "Iniciar sua consulta"
       },
       "raw-query": {
-        "aria-label-selector": ""
+        "aria-label-selector": "seletor"
       },
       "results-table": {
-        "content-descriptive-type": "",
+        "content-descriptive-type": "Ao criar um {{descriptiveType}}, o Prometheus expõe várias séries com o contador de tipos. ",
         "description": "Descrição",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Não há métricas encontradas. Tente expandir seus filtros de rótulo.",
+        "message-expand-search": "Não há métricas encontradas. Tente expandir sua busca e filtros.",
+        "message-no-metrics-found": "Não há métricas encontradas na fonte de dados.",
         "name": "Nome",
         "type": "Tipo"
       },
       "update-function-args": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "A análise da consulta é ambígua."
         }
       }
     }
diff --git a/packages/grafana-prometheus/src/locales/pt-PT/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/pt-PT/grafana-prometheus.json
index 3f80c60195a..43cf491ccc9 100644
--- a/packages/grafana-prometheus/src/locales/pt-PT/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/pt-PT/grafana-prometheus.json
@@ -2,496 +2,496 @@
   "grafana-prometheus": {
     "components": {
       "annotation-query-editor": {
-        "annotation-data-load-error": "",
-        "aria-label-lower-limit-parameter": "",
-        "label-min-step": "",
-        "label-series-value-as-timestamp": "",
+        "annotation-data-load-error": "Erro de carregamento de dados de anotação!",
+        "aria-label-lower-limit-parameter": "Definir limite inferior para o parâmetro de passos",
+        "label-min-step": "Passo mín.",
+        "label-series-value-as-timestamp": "Valor da série como registo de data e hora",
         "label-tags": "Etiquetas",
-        "label-text": "",
+        "label-text": "Texto",
         "label-title": "Título",
-        "placeholder-auto": "",
-        "tooltip-either-pattern-example-instance-replaced-label": "",
-        "tooltip-min-step": "",
-        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": ""
+        "placeholder-auto": "auto",
+        "tooltip-either-pattern-example-instance-replaced-label": "Utilize o nome ou um padrão. Por exemplo, {{labelTemplate}} é substituído pelo valor da etiqueta para a etiqueta {{labelName}}.",
+        "tooltip-min-step": "Um limite inferior adicional para o parâmetro de etapa da consulta Prometheus e para as variáveis <2>{{intervalVar}}</2> e <4>{{rateIntervalVar}}</4>.",
+        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": "A unidade do registo de data e hora é milissegundos. Se a unidade do valor da série for segundos, multiplique o seu vetor de intervalo por 1000."
       },
       "get-query-type-options": {
         "description": {
-          "instant-query-range": ""
+          "instant-query-range": "Executar uma consulta instantânea e uma consulta de intervalo"
         },
         "label": {
-          "both": ""
+          "both": "Ambas"
         },
         "range-options": {
           "description": {
-            "query-range": ""
+            "query-range": "Executar consulta durante um intervalo de tempo"
           },
           "label": {
-            "instant": "",
-            "range": ""
+            "instant": "Instantânea ",
+            "range": "Alcance"
           }
         }
       },
       "label-selector": {
-        "aria-label-filter-expression-for-label": "",
-        "description-select-labels": "",
-        "select-labels-to-search-in": ""
+        "aria-label-filter-expression-for-label": "Expressão de filtro para etiqueta",
+        "description-select-labels": "Depois de selecionados os valores de etiqueta, apenas são mostradas as combinações de etiquetas possíveis.",
+        "select-labels-to-search-in": "2. Selecionar etiquetas para pesquisar em"
       },
       "metric-selector": {
-        "aria-label-filter-expression-for-metric": "",
-        "aria-label-limit-results-from-series-endpoint": "",
-        "description-series-limit": "",
-        "label-select-metric": "",
-        "select-a-metric": "",
-        "series-limit": ""
+        "aria-label-filter-expression-for-metric": "Expressão de filtro para métrica",
+        "aria-label-limit-results-from-series-endpoint": "Limitar resultados do ponto final da série",
+        "description-series-limit": "O limite aplica-se a todas as métricas, etiquetas e valores. Deixar o campo vazio para utilizar o limite predefinido. Definir para 0 para desativar o limite e obter tudo — isso pode causar problemas de desempenho.",
+        "label-select-metric": "Depois de selecionada uma métrica, apenas são mostradas as etiquetas possíveis. As etiquetas são limitadas pelo limite de série abaixo.",
+        "select-a-metric": "1. Selecionar uma métrica",
+        "series-limit": "Limite de série"
       },
       "prom-cheat-sheet": {
-        "prom-ql-cheat-sheet": ""
+        "prom-ql-cheat-sheet": "Folha de consulta PromQL"
       },
       "prom-exemplar-field": {
-        "exemplars": "",
-        "tooltip-disable-query": "",
-        "tooltip-enable-query": ""
+        "exemplars": "Exemplares",
+        "tooltip-disable-query": "Desativar consulta com exemplares",
+        "tooltip-enable-query": "Ativar consulta com exemplares"
       },
       "prom-explore-extra-field": {
-        "aria-label-prometheus-extra-field": "",
-        "aria-label-query-type-field": "",
-        "aria-label-step-field": "",
-        "min-step": "",
-        "query-type": "",
-        "tooltip-units-builtin-variables-example-interval-rateinterval": ""
+        "aria-label-prometheus-extra-field": "Campo extra do Prometheus",
+        "aria-label-query-type-field": "Campo de tipo de consulta",
+        "aria-label-step-field": "Campo de etapa",
+        "min-step": "Passo mín.",
+        "query-type": "Tipo de consulta",
+        "tooltip-units-builtin-variables-example-interval-rateinterval": "Unidades de tempo e variáveis integradas podem ser utilizadas aqui, por exemplo: {{example1}}, {{example2}}, {{example3}}, {{example4}}, {{example5}}, {{example6}}, {{example7}} (Predefinição se nenhuma unidade for especificada: {{default}})"
       },
       "prom-query-field": {
-        "placeholder-enter-a-prom-ql-query": ""
+        "placeholder-enter-a-prom-ql-query": "Introduza uma consulta PromQL..."
       },
       "prom-variable-query-editor": {
-        "aria-label-classic-query": "",
-        "aria-label-metric-regex": "",
-        "aria-label-metric-selector": "",
-        "aria-label-prometheus-query": "",
-        "aria-label-query-type": "",
-        "aria-label-series-query": "",
-        "label-classic-query": "",
+        "aria-label-classic-query": "Consulta clássica",
+        "aria-label-metric-regex": "Regex métrico",
+        "aria-label-metric-selector": "Seletor métrico",
+        "aria-label-prometheus-query": "Consulta Prometheus",
+        "aria-label-query-type": "Tipo de consulta",
+        "aria-label-series-query": "Consulta de série",
+        "label-classic-query": "Consulta clássica",
         "label-label": "Etiqueta",
-        "label-metric-regex": "",
+        "label-metric-regex": "Regex métrico",
         "label-query": "Consulta",
-        "label-query-type": "",
-        "label-series-query": "",
-        "placeholder-classic-query": "",
-        "placeholder-metric-regex": "",
-        "placeholder-prometheus-query": "",
+        "label-query-type": "Tipo de consulta",
+        "label-series-query": "Consulta de série",
+        "placeholder-classic-query": "Consulta clássica",
+        "placeholder-metric-regex": "Regex métrico",
+        "placeholder-prometheus-query": "Consulta Prometheus",
         "placeholder-select-query-type": "Selecionar o tipo de consulta",
-        "placeholder-series-query": "",
-        "returns-metrics-matching-specified-metric-regex": "",
-        "tooltip-classic-query": "",
-        "tooltip-label": "",
-        "tooltip-metric-regex": "",
-        "tooltip-query": "",
-        "tooltip-query-type": "",
-        "tooltip-series-query": ""
+        "placeholder-series-query": "Consulta de série",
+        "returns-metrics-matching-specified-metric-regex": "Devolve uma lista de métricas que correspondem ao regex métrico especificado.",
+        "tooltip-classic-query": "A implementação original do editor de consultas de variáveis Prometheus. Introduzir uma cadeia de carateres com o tipo de consulta e parâmetros corretos, conforme descrito nestes documentos. Por exemplo, {{exampleQuery}}.",
+        "tooltip-label": "Devolve uma lista de valores de etiqueta para o nome da etiqueta em todas as métricas, a menos que a métrica seja especificada.",
+        "tooltip-metric-regex": "Devolve uma lista de nomes de etiquetas, filtrando opcionalmente por regex métrico especificado.",
+        "tooltip-query": "Devolve uma lista de resultados de consulta Prometheus para a consulta. Isto pode incluir funções Prometheus, ou seja,{{exampleQuery}}.",
+        "tooltip-query-type": "O plugin de origem de dados do Prometheus fornece os seguintes tipos de consulta para variáveis de modelo.",
+        "tooltip-series-query": "Introduza uma métrica com etiquetas, apenas uma métrica ou apenas etiquetas, ou seja, {{example1}}, {{example2}}, ou {{example3}}. Devolve uma lista de séries temporais associadas aos dados inseridos."
       },
       "selector-actions": {
-        "aria-label-selector": "",
-        "aria-label-selector-clear-button": "",
-        "aria-label-use-selector-as-metrics-button": "",
-        "aria-label-use-selector-for-query-button": "",
-        "aria-label-validate-submit-button": "",
+        "aria-label-selector": "seletor",
+        "aria-label-selector-clear-button": "Botão de limpeza do seletor",
+        "aria-label-use-selector-as-metrics-button": "Utilizar o seletor como botão de métricas",
+        "aria-label-use-selector-for-query-button": "Utilizar o seletor para o botão de consulta",
+        "aria-label-validate-submit-button": "Validar botão de envio",
         "clear": "Limpar",
-        "resulting-selector": "",
-        "use-as-rate-query": "",
-        "use-query": "",
-        "validate-selector": ""
+        "resulting-selector": "4. Seletor resultante",
+        "use-as-rate-query": "Utilizar como consulta de taxa",
+        "use-query": "Utilizar consulta",
+        "validate-selector": "Validar seletor"
       },
       "value-selector": {
-        "aria-label-filter-expression-for-label-values": "",
-        "aria-label-values-for": "",
-        "description-search-field-values-across-selected-labels": "",
-        "select-multiple-values-for-your-labels": ""
+        "aria-label-filter-expression-for-label-values": "Expressão de filtro para valores de etiqueta",
+        "aria-label-values-for": "Valores para {{labelKey}}",
+        "description-search-field-values-across-selected-labels": "Utilizar o campo de pesquisa para encontrar valores nas etiquetas selecionadas.",
+        "select-multiple-values-for-your-labels": "3. Selecionar (vários) valores para as suas etiquetas"
       }
     },
     "configuration": {
       "alerting-settings-overhaul": {
-        "label-allow-as-recording-rules-target": "",
-        "label-manage-alerts-via-alerting-ui": "",
+        "label-allow-as-recording-rules-target": "Permitir como destino de regras de gravação",
+        "label-manage-alerts-via-alerting-ui": "Gerir alertas através da interface do utilizador Alerting",
         "title-alerting": "Alerta",
-        "tooltip-allow-as-recording-rules-target": "",
+        "tooltip-allow-as-recording-rules-target": "Permitir que esta origem de dados seja selecionada como destino para escrever regras de gravação.",
         "tooltip-manage-alerts-via-alerting-ui": "Gerir regras de alerta para esta origem de dados. Para gerir outros recursos do Alerting, adicione uma origem de dados do Alertmanager."
       },
       "config-editor": {
-        "browser-access-mode-error": "",
-        "description-advanced-settings": "",
+        "browser-access-mode-error": "O modo de acesso do navegador na origem de dados do Prometheus já não está disponível. Mude para o modo de acesso ao servidor.",
+        "description-advanced-settings": "As definições adicionais são definições opcionais que podem ser configuradas para obter mais controlo sobre a sua origem de dados.",
         "title-advanced-settings": "Definições avançadas",
         "title-error": "Erro"
       },
       "data-source-http-settings-overhaul": {
         "tooltip-browser-access-mode": "O seu método de acesso é <1>Navegador</1>, isto significa que o URL tem de estar acessível a partir do navegador.",
-        "tooltip-http-url": "",
+        "tooltip-http-url": "Especifique um URL HTTP completo (por exemplo, {{exampleURL}})",
         "tooltip-server-access-mode": "O seu método de acesso é <1>Servidor</1>, isto significa que o URL tem de estar acessível a partir do backend/servidor da Grafana."
       },
       "docs-tip": {
-        "visit-docs-for-more-details-here": ""
+        "visit-docs-for-more-details-here": "Visite os documentos para obter mais detalhes aqui."
       },
       "exemplar-setting": {
         "label-data-source": "Origem dos dados",
-        "label-internal-link": "",
+        "label-internal-link": "Link interno",
         "label-label-name": "Nome da etiqueta",
-        "label-remove-exemplar-link": "",
+        "label-remove-exemplar-link": "Remover link exemplar",
         "label-url": "URL",
-        "label-url-label": "",
-        "placeholder-go-to-examplecom": "",
-        "placeholder-httpsexamplecomvalueraw": "",
-        "placeholder-trace-id": "",
-        "title-remove-exemplar-link": "",
-        "tooltip-data-source": "",
-        "tooltip-internal-link": "",
-        "tooltip-label-name": "",
-        "tooltip-url": "",
-        "tooltip-url-label": ""
+        "label-url-label": "Etiqueta de URL",
+        "placeholder-go-to-examplecom": "Ir para example.com",
+        "placeholder-httpsexamplecomvalueraw": "https://example.com/${__value.raw}",
+        "placeholder-trace-id": "ID de rastreamento",
+        "title-remove-exemplar-link": "Remover link exemplar",
+        "tooltip-data-source": "A origem de dados para a qual o exemplar vai navegar.",
+        "tooltip-internal-link": "Ative esta opção se tiver um link interno. Quando ativado, isto revela o seletor de origem de dados. Selecionar o armazenamento de dados de rastreamento de backend para os seus dados exemplares.",
+        "tooltip-label-name": "O nome do campo no objeto de etiquetas que deve ser utilizado para obter a ID de rastreamento.",
+        "tooltip-url": "O URL do backend de rastreio que o utilizador iria utilizar para ver o seu rastreio",
+        "tooltip-url-label": "Utilizar para substituir a etiqueta do botão no campo de ID de rastreamento exemplar."
       },
       "exemplars-settings": {
         "add": "Adicionar",
-        "no-exemplars-configurations": "",
-        "title-exemplars": ""
+        "no-exemplars-configurations": "Sem configurações de exemplares",
+        "title-exemplars": "Exemplares"
       },
       "prom-settings": {
-        "aria-label-default-editor": "",
-        "aria-label-prom-type-type": "",
-        "aria-label-prometheus-type": "",
-        "aria-label-select-http-method": "",
+        "aria-label-default-editor": "Editor predefinido (código ou construtor)",
+        "aria-label-prom-type-type": "Tipo {{promType}}",
+        "aria-label-prometheus-type": "Tipo Prometheus",
+        "aria-label-select-http-method": "Selecionar método HTTP",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Construtor",
+          "label-code": "Cód."
         },
-        "label-cache-level": "",
-        "label-custom-query-parameters": "",
-        "label-default-editor": "",
-        "label-disable-metrics-lookup": "",
-        "label-disable-recording-rules-beta": "",
-        "label-http-method": "",
-        "label-incremental-querying-beta": "",
-        "label-metric-names-suggestion-limit": "",
-        "label-prom-type-version": "",
-        "label-prometheus-type": "",
-        "label-query-overlap-window": "",
-        "label-query-timeout": "",
-        "label-scrape-interval": "",
-        "label-series-limit": "",
-        "label-use-series-endpoint": "",
-        "more-info": "",
-        "placeholder-example-maxsourceresolutionmtimeout": "",
-        "title-interval-behaviour": "",
-        "title-other": "",
+        "label-cache-level": "Nível de cache",
+        "label-custom-query-parameters": "Parâmetros de consulta personalizados",
+        "label-default-editor": "Editor padrão",
+        "label-disable-metrics-lookup": "Desativar pesquisa de métricas",
+        "label-disable-recording-rules-beta": "Desativar regras de gravação (beta)",
+        "label-http-method": "Método HTTP",
+        "label-incremental-querying-beta": "Consulta incremental (beta)",
+        "label-metric-names-suggestion-limit": "Limite de sugestão de nomes de métricas",
+        "label-prom-type-version": "Versão {{promType}}",
+        "label-prometheus-type": "Tipo Prometheus",
+        "label-query-overlap-window": "Janela de sobreposição de consulta",
+        "label-query-timeout": "Tempo limite da consulta",
+        "label-scrape-interval": "Intervalo de raspagem",
+        "label-series-limit": "Limite de série",
+        "label-use-series-endpoint": "Utilizar ponto final da série",
+        "more-info": "Para obter mais informações sobre como configurar o tipo e a versão do Prometheus em origens de dados, consulte a <2>documentação de aprovisionamento</2>.",
+        "placeholder-example-maxsourceresolutionmtimeout": "Exemplo: {{example}}",
+        "title-interval-behaviour": "Comportamento de intervalo",
+        "title-other": "Outro",
         "title-performance": "Desempenho",
-        "title-query-editor": "",
-        "tooltip-cache-level": "",
-        "tooltip-custom-query-parameters": "",
-        "tooltip-default-editor": "",
-        "tooltip-disable-metrics-lookup": "",
-        "tooltip-disable-recording-rules-beta": "",
-        "tooltip-http-method": "",
-        "tooltip-incremental-querying-beta": "",
-        "tooltip-metric-names-suggestion-limit": "",
-        "tooltip-prom-type-version": "",
-        "tooltip-prometheus-type": "",
-        "tooltip-query-overlap-window": "",
-        "tooltip-query-timeout": "",
-        "tooltip-scrape-interval": "",
-        "tooltip-series-limit": "",
-        "tooltip-use-series-endpoint": ""
+        "title-query-editor": "Editor de consultas",
+        "tooltip-cache-level": "Definir o nível de cache do navegador para consultas do editor. São recomendadas definições de cache mais elevadas para origens de dados de elevada cardinalidade.",
+        "tooltip-custom-query-parameters": "Adicionar parâmetros personalizados ao URL de consulta do Prometheus. Por exemplo, {{example1}}, {{example2}}, {{example3}} ou {{example4}}. Os parâmetros múltiplos devem ser concatenados com {{concatenationChar}}.",
+        "tooltip-default-editor": "Definir a opção de editor predefinida para todos os utilizadores desta origem de dados.",
+        "tooltip-disable-metrics-lookup": "Ao selecionar esta opção desativará o seletor de métricas e o suporte de métrica/etiqueta no preenchimento automático do campo de consulta. Isto ajuda se tiver problemas de desempenho com instâncias maiores do Prometheus. ",
+        "tooltip-disable-recording-rules-beta": "Esta funcionalidade desativará as regras de gravação. Ative isto para melhorar o desempenho do painel de controlo",
+        "tooltip-http-method": "Pode utilizar o método HTTP POST ou GET para consultar a sua origem de dados Prometheus. POST é o método recomendado, pois permite consultas maiores. Altere esta opção para GET se tiver uma versão do Prometheus anterior à 2.1 ou se os pedidos POST forem restritos na sua rede.",
+        "tooltip-incremental-querying-beta": "Esta funcionalidade irá alterar o comportamento predefinido das consultas relativas para solicitar sempre dados novos da instância do Prometheus. Em vez disso, os resultados da consulta serão armazenados em cache e apenas serão solicitados novos registos. Ativar isto para diminuir a carga da base de dados e da rede.",
+        "tooltip-metric-names-suggestion-limit": "O número máximo de nomes de métricas que podem aparecer como sugestões de preenchimento automático no modo de Código do editor de consultas.",
+        "tooltip-prom-type-version": "Utilizar isto para definir a versão da sua instância {{promType}} se não estiver configurada automaticamente.",
+        "tooltip-prometheus-type": "Definir isto para o tipo da sua base de dados prometheus, por exemplo, Prometheus, Cortex, Mimir ou Thanos. Alterar este campo irá guardar as suas definições atuais. Certos tipos de Prometheus suportam ou não suportam várias APIs. Por exemplo, alguns tipos suportam correspondência de regex para consultas de etiqueta para melhorar o desempenho. Alguns tipos têm uma API para metadados. Se definir isto incorretamente, poderá experimentar um comportamento estranho ao consultar métricas e etiquetas. Verifique a sua documentação do Prometheus para garantir que introduz o tipo correto.",
+        "tooltip-query-overlap-window": "Definir uma duração como {{example1}} ou {{example2}} ou {{example3}}. Predefinição de {{default}}. Esta duração será adicionada à duração de cada pedido incremental.",
+        "tooltip-query-timeout": "Definir o tempo limite de consulta do Prometheus.",
+        "tooltip-scrape-interval": "Este intervalo é a frequência com que o Prometheus raspa os alvos. Definir isto para o intervalo típico de raspagem e avaliação configurado no seu ficheiro de configuração do Prometheus. Se definir isto para um valor maior do que o intervalo do seu ficheiro de configuração do Prometheus, a Grafana irá avaliar os dados de acordo com este intervalo e verá menos pontos de dados. Predefinições para {{default}}.",
+        "tooltip-series-limit": "O limite aplica-se a todos os recursos (métricas, etiquetas e valores) para ambos os pontos finais (séries e etiquetas). Deixar o campo vazio para utilizar o limite predefinido (40000). Definir para 0 para desativar o limite e obter tudo — isso pode causar problemas de desempenho. O limite predefinido é de 40000.",
+        "tooltip-use-series-endpoint": "A seleção desta opção, favorecerá o ponto final da série com o parâmetro {{exampleParameter}} em relação ao ponto final dos valores da etiqueta com o parâmetro {{exampleParameter}}. Embora o ponto final dos valores de etiqueta seja considerado mais eficiente, alguns utilizadores podem preferir a série, porque tem um método POST, enquanto o ponto final dos valores de etiqueta apenas tem um método GET."
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(Desativado)",
+      "enabled-label": "Navegador de métricas"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Inclui apenas etiquetas únicas",
+        "description-custom": "Forneça um modelo de nomenclatura",
+        "description-verbose": "Todos os nomes e valores de etiquetas",
+        "label-auto": "Automático",
+        "label-custom": "Personalizar",
+        "label-verbose": "Verboso"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Calcular a média sobre as dimensões",
+        "documentation-bottomk": "Menores elementos k por valor de amostra",
+        "documentation-count": "Contar o número de elementos no vetor",
+        "documentation-count-values": "Contar o número de elementos com o mesmo valor",
+        "documentation-group": "Todos os valores no vetor resultante são 1",
+        "documentation-max": "Selecionar o máximo sobre as dimensões",
+        "documentation-min": "Selecionar o mínimo sobre as dimensões",
+        "documentation-quantile": "Calcular o quantil φ (0 ≤ φ ≤ 1) sobre as dimensões",
+        "documentation-stddev": "Calcular o desvio-padrão da população sobre as dimensões",
+        "documentation-stdvar": "Calcular a variância padrão da população sobre as dimensões",
+        "documentation-sum": "Calcular a soma sobre as dimensões",
+        "documentation-topk": "Maiores elementos k por valor de amostra"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Devolve o vetor de entrada com todos os valores de amostra convertidos para o seu valor absoluto.",
+        "documentation-absent": "Devolve um vetor vazio se o vetor passado para o mesmo tiver quaisquer elementos e um vetor de 1 elemento com o valor 1 se o vetor passado para o mesmo não tiver elementos. Isto é útil para alertar quando não existem séries temporais para um determinado nome de métrica e combinação de rótulo.",
+        "documentation-absent-over-time": "Devolve um vetor vazio se o vetor de intervalo passado para o mesmo tiver quaisquer elementos e um vetor de 1 elemento com o valor 1 se o vetor de intervalo passado para o mesmo não tiver elementos.",
+        "documentation-avg-over-time": "O valor médio de todos os pontos no intervalo especificado.",
+        "documentation-ceil": "Arredonda os valores de amostra de todos os elementos em \"v\" para cima até ao número inteiro mais próximo.",
+        "documentation-changes": "Para cada série temporal de entrada, \"changes(v range-vector)\" devolve o número de vezes que o seu valor mudou dentro do intervalo de tempo fornecido como um vetor instantâneo.",
+        "documentation-clamp": "Fixa os valores de amostra de todos os elementos em \"v\" para ter um limite inferior de \"min\" e um limite superior de \"máx\".",
+        "documentation-clamp-max": "Fixa os valores de amostra de todos os elementos em \"v\" para ter um limite superior de \"máx\".",
+        "documentation-clamp-min": "Fixa os valores de amostra de todos os elementos em \"v\" para ter um limite inferior de \"min\".",
+        "documentation-count-over-time": "A contagem de todos os valores no intervalo especificado.",
+        "documentation-count-scalar": "Devolve o número de elementos num vetor de série temporal como um escalar. Isto contrasta com o operador de agregação 'count()', que devolve sempre um vetor (um vetor vazio se o vetor de entrada estiver vazio) e permite o agrupamento por etiquetas através de uma cláusula 'by'.",
+        "documentation-day-of-month": "Devolve o dia do mês para cada uma das horas fornecidas em UTC. Os valores devolvidos são de 1 a 31.",
+        "documentation-day-of-week": "Devolve o dia da semana para cada uma das horas fornecidas em UTC. Os valores devolvidos são de 0 a 6, onde 0 significa domingo, etc.",
+        "documentation-day-of-year": "Devolve o dia do ano para cada uma das horas fornecidas em UTC. Os valores devolvidos são de 1 a 365 para anos não bissextos e de 1 a 366 para anos bissextos.",
+        "documentation-days-in-month": "Devolve o número de dias do mês para cada uma das horas fornecidas em UTC. Os valores devolvidos são de 28 a 31.",
+        "documentation-deg": "Converte radianos em graus para todos os elementos em v",
+        "documentation-delta": "Calcula a diferença entre o primeiro e o último valor de cada elemento da série temporal num vetor de intervalo \"v\", devolvendo um vetor instantâneo com os deltas dados e etiquetas equivalentes. O delta é extrapolado para abranger o intervalo de tempo completo, conforme especificado no seletor de vetor de intervalo, de modo que seja possível obter um resultado não inteiro, mesmo que os valores de amostra sejam todos inteiros.",
+        "documentation-deriv": "Calcula a derivada por segundo da série temporal num vetor de intervalo \"v\", utilizando regressão linear simples.",
+        "documentation-double-exponential-smoothing": "Produz um valor suavizado para séries temporais com base no intervalo em \"v\". Quanto menor o fator de suavização \"sf\", mais importância é dada aos dados antigos. Quanto maior o fator de tendência \"tf\", mais tendências nos dados são consideradas. Tanto \"sf\" quanto \"tf\" devem estar entre 0 e 1.",
+        "documentation-drop-common-labels": "Elimina todas as etiquetas com o mesmo nome e valor em todas as séries no vetor de entrada.",
+        "documentation-exp": "Calcula a função exponencial para todos os elementos em \"v\".\nOs casos especiais são:\n* \"Exp(+Inf) = +Inf\" \n* \"Exp(NaN) = NaN\"",
+        "documentation-floor": "Arredonda os valores de amostra de todos os elementos em \"v\" para cima até ao número inteiro mais próximo.",
+        "documentation-histogram-avg": "Devolve a média aritmética dos valores observados armazenados num histograma nativo. As amostras que não são histogramas nativos são ignoradas e não aparecem no vetor devolvido.",
+        "documentation-histogram-count": "Devolve a contagem de observações armazenadas num histograma nativo.",
+        "documentation-histogram-fraction": "Devolve a fração estimada de observações entre os valores inferior e superior fornecidos.",
+        "documentation-histogram-quantile": "Calcula o quantil φ (0 ≤ φ ≤ 1) a partir dos buckets 'b' de um histograma. As amostras em 'b' são as contagens de observações em cada bucket. Cada amostra deve ter uma etiqueta 'le' onde o valor da etiqueta denota o limite superior inclusivo do bucket. (Amostras sem esta etiqueta são ignoradas silenciosamente.) O tipo de métrica de histograma fornece automaticamente séries temporais com o sufixo '_bucket' e as etiquetas apropriadas.",
+        "documentation-histogram-stddev": "Devolve o desvio-padrão estimado das observações num histograma nativo, com base na média geométrica dos buckets onde as observações se encontram.",
+        "documentation-histogram-stdvar": "Devolve a variância padrão estimada das observações num histograma nativo.",
+        "documentation-histogram-sum": "Devolve a soma de observações armazenadas num histograma nativo.",
+        "documentation-holt-winters": "Renomeado como double_exponential_smoothing no prometheus v3.x. Para versões do prometheus iguais e superiores a v3.0, usar double_exponential_smoothing. \n\nProduz um valor suavizado para séries temporais com base no intervalo em \"v\". Quanto menor o fator de suavização \"sf\", mais importância é dada aos dados antigos. Quanto maior o fator de tendência \"tf\", mais tendências são consideradas nos dados. Tanto \"sf\" quanto \"tf\" devem estar entre 0 e 1.",
+        "documentation-hour": "Devolve a hora do dia para cada uma das horas fornecidas em UTC. Os valores devolvidos são de 0 a 23.",
+        "documentation-idelta": "Calcula a diferença entre as duas últimas amostras no vetor de intervalo \"v\", devolvendo um vetor instantâneo com os deltas dados e etiquetas equivalentes.",
+        "documentation-increase": "Calcula o aumento na série temporal no vetor de intervalo. As quebras na monotonicidade (como redefinições de contador devido a reinícios de alvo) são ajustadas automaticamente. O aumento é extrapolado para abranger o intervalo de tempo completo, conforme especificado no seletor de vetor de intervalo, de modo que seja possível obter um resultado não inteiro, mesmo que um contador aumente apenas por incrementos inteiros.",
+        "documentation-info": "Devolve os detalhes e metadados mais recentes sobre um grupo de métricas, como as respetivas etiquetas e valores atuais, sem fazer quaisquer cálculos.",
+        "documentation-irate": "Calcula a taxa instantânea por segundo de aumento da série temporal no vetor de intervalo. Isto baseia-se nos dois últimos pontos de dados. As quebras na monotonicidade (como redefinições de contador devido a reinícios de alvo) são ajustadas automaticamente.",
+        "documentation-label-join": "Para cada série temporal em \"v\", une todos os valores de todos os \"src_labels\" usando \"separator\" e devolve a série temporal com a etiqueta \"dst_label\" contendo o valor unido. Pode haver qualquer número de \"src_labels\" nesta função.",
+        "documentation-label-replace": "Para cada série temporal em \"v\", \"label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)\" corresponde à expressão regular \"regex\" contra a etiqueta \"src_label\". Se corresponder, a série temporal é devolvida com a etiqueta \"dst_label\" substituída pela expansão de \"replacement\". \"$1\" é substituído pelo primeiro subgrupo correspondente, \"$2\" pelo segundo, etc. Se a expressão regular não corresponder, a série temporal é devolvida inalterada.",
+        "documentation-last-over-time": "O valor do ponto mais recente no intervalo especificado.",
+        "documentation-ln": "Calcula o logaritmo natural para todos os elementos em \"v\".\nOs casos especiais são:\n * \"ln(+Inf) = +Inf\"\n * \"ln(0) = -Inf\"\n * \"ln(x < 0) = NaN\"\n * \"ln(NaN) = NaN\"",
+        "documentation-log10": "Calcula o logaritmo decimal para todos os elementos em \"v\". Os casos especiais são equivalentes aos de \"ln\".",
+        "documentation-log2": "Calcula o logaritmo binário para todos os elementos em \"v\". Os casos especiais são equivalentes aos de \"ln\".",
+        "documentation-max-over-time": "O valor máximo de todos os pontos no intervalo especificado.",
+        "documentation-min-over-time": "O valor mínimo de todos os pontos no intervalo especificado.",
+        "documentation-minute": "Devolve o minuto da hora para cada uma das horas fornecidas em UTC. Os valores devolvidos são de 0 a 59.",
+        "documentation-month": "Devolve o mês do ano para cada uma das data/horas fornecidas em UTC. Os valores devolvidos são de 1 a 12, onde 1 significa janeiro, etc.",
+        "documentation-pi": "Devolve pi",
+        "documentation-predict-linear": "Prevê o valor da série temporal \"t\" segundos a partir de agora, com base no vetor de intervalo \"v\", utilizando regressão linear simples.",
+        "documentation-present-over-time": "O valor 1 para qualquer série no intervalo especificado.",
+        "documentation-quantile-over-time": "O quantil φ (0 ≤ φ ≤ 1) dos valores no intervalo especificado.",
+        "documentation-rad": "Converte graus em radianos para todos os elementos em v",
+        "documentation-rate": "Calcula a taxa média por segundo de aumento da série temporal no vetor de intervalo. As quebras na monotonicidade (como redefinições de contador devido a reinícios de alvo) são ajustadas automaticamente. Além disso, o cálculo extrapola para as extremidades do intervalo de tempo, tendo em conta recolhas perdidas ou alinhamento imperfeito dos ciclos de recolha com o período de tempo do intervalo.",
+        "documentation-resets": "Para cada série temporal de entrada, \"resets(v range-vector)\" devolve o número de redefinições do contador dentro do intervalo de tempo fornecido como um vetor instantâneo. Qualquer diminuição no valor entre duas amostras consecutivas é interpretada como uma redefinição do contador.",
+        "documentation-round": "Arredonda os valores de amostra de todos os elementos em \"v\" para o número inteiro mais próximo. Os empates são resolvidos arredondando para cima. O argumento opcional \"to_nearest\" permite especificar o múltiplo mais próximo para o qual os valores de amostra devem ser arredondados. Este múltiplo também pode ser uma fração.",
+        "documentation-scalar": "Dado um vetor de entrada de elemento único, \"scalar(v instant-vector)\" devolve o valor de amostra desse elemento único como um escalar. Se o vetor de entrada não tiver exatamente um elemento, \"scalar\" devolverá \"NaN\".",
+        "documentation-sgn": "Devolve um vetor com todos os valores de amostra convertidos para o seu sinal, definido como este: 1 se v for positivo, -1 se v for negativo e 0 se v for igual a zero.",
+        "documentation-sort": "Devolve elementos vetoriais ordenados pelos seus valores de amostra, por ordem ascendente.",
+        "documentation-sort-desc": "Devolve elementos vetoriais ordenados pelos seus valores de amostra, por ordem descendente.",
+        "documentation-sqrt": "Calcula a raiz quadrada de todos os elementos em \"v\".",
+        "documentation-stddev-over-time": "O desvio-padrão da população dos valores no intervalo especificado.",
+        "documentation-stdvar-over-time": "A variância padrão da população dos valores no intervalo especificado.",
+        "documentation-sum-over-time": "A soma de todos os valores no intervalo especificado.",
+        "documentation-time": "Devolve o número de segundos desde 1 de janeiro de 1970 UTC. Tenha em atenção que isto não devolve realmente a hora atual, mas a hora em que a expressão deve ser avaliada.",
+        "documentation-timestamp": "Devolve o carimbo de data/hora de cada uma das amostras do vetor fornecido como o número de segundos desde 1 de janeiro de 1970 UTC.",
+        "documentation-vector": "Devolve o escalar \"s\" como um vetor sem etiquetas.",
+        "documentation-year": "Devolve o ano para cada uma das horas fornecidas em UTC."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "calcula o arco cosseno de todos os elementos em {{argument}}",
+        "documentation-acosh": "calcula o cosseno hiperbólico inverso de todos os elementos em {{argument}}",
+        "documentation-asin": "calcula o arco seno de todos os elementos em {{argument}}",
+        "documentation-asinh": "calcula o seno hiperbólico inverso de todos os elementos em {{argument}}",
+        "documentation-atan": "calcula o arco tangente de todos os elementos em {{argument}}",
+        "documentation-atanh": "calcula a tangente hiperbólica inversa de todos os elementos em {{argument}}",
+        "documentation-cos": "calcula o cosseno de todos os elementos em {{argument}}",
+        "documentation-cosh": "calcula o cosseno hiperbólico de todos os elementos em {{argument}}",
+        "documentation-sin": "calcula o seno de todos os elementos em {{argument}}",
+        "documentation-sinh": "calcula o seno hiperbólico inverso de todos os elementos em {{argument}}",
+        "documentation-tan": "calcula a tangente de todos os elementos em {{argument}}",
+        "documentation-tanh": "calcula a tangente hiperbólica de todos os elementos em {{argument}}"
       }
     },
     "querybuilder": {
       "feedback-link": {
         "give-feedback": "Dar feedback",
-        "title-give-feedback": ""
+        "title-give-feedback": "O explorador de métricas é novo, diga-nos como podemos melhorá-lo"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Exemplares: {{value}}",
+        "format": "Formato: {{value}}",
+        "legend": "Legenda: {{value}}",
+        "step": "Passo: {{value}}",
+        "type": "Tipo: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Pesquisar métricas por nome",
+        "type": "Filtrar por tipo"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Uma métrica cumulativa que representa um único contador monotonicamente crescente cujo valor só pode aumentar ou ser redefinido para zero ao reiniciar.",
+        "description-gauge": "Uma métrica que representa um único valor numérico que pode subir e descer arbitrariamente.",
+        "description-histogram": "Um histograma recolhe amostras de observações (geralmente aspetos como durações de solicitações ou tamanhos de resposta) e conta-as em buckets configuráveis.",
+        "description-native-histogram": "Os histogramas nativos são diferentes dos histogramas clássicos do Prometheus de várias maneiras: os limites do bucket do histograma nativo são calculados por uma fórmula que depende da escala (resolução) do histograma nativo e não são definidos pelo utilizador.",
+        "description-no-type": "Estas métricas não têm tipo definido nos metadados.",
+        "description-summary": "Um resumo recolhe amostras de observações (geralmente aspetos como durações de solicitações e tamanhos de resposta) e pode calcular quantis configuráveis ao longo de uma janela de tempo deslizante.",
+        "description-unknown": "Estas métricas receberam o tipo desconhecido nos metadados.",
+        "label-counter": "Contador",
+        "label-gauge": "Medidor",
+        "label-histogram": "Histograma",
+        "label-native-histogram": "Histograma nativo",
+        "label-no-type": "Sem tipo",
+        "label-summary": "Resumo",
+        "label-unknown": "Desconhecido"
       },
       "handle-function": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "A análise da consulta é ambígua."
         }
       },
       "label-filter-item": {
-        "aria-label-remove": "",
-        "placeholder-select-label": "",
+        "aria-label-remove": "Remover {{name}}",
+        "placeholder-select-label": "Selecione etiqueta",
         "placeholder-select-value": "Selecionar valor"
       },
       "label-filters": {
-        "label-filters": "",
-        "label-label-filters": "",
-        "tooltip-label-filters": ""
+        "label-filters": "Filtros de etiquetas",
+        "label-label-filters": "Filtros de etiquetas",
+        "tooltip-label-filters": "Opcional: utilizado para filtrar a métrica selecionada para este tipo de consulta."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "A carregar etiquetas",
+        "noOptionsMessage-no-labels-found": "Nenhuma etiqueta encontrada"
       },
       "metric-combobox": {
         "async-select": {
-          "aria-label-open-metrics-explorer": "",
-          "placeholder-select-metric": "",
-          "tooltip-open-metrics-explorer": ""
+          "aria-label-open-metrics-explorer": "Abrir explorador de métricas",
+          "placeholder-select-metric": "Selecionar métrica",
+          "tooltip-open-metrics-explorer": "Abrir explorador de métricas"
         },
         "label-metric": "Métrica",
-        "tooltip-metric": ""
+        "tooltip-metric": "Opcional: devolve uma lista de valores de etiqueta para o nome da etiqueta na métrica especificada."
       },
       "metrics-modal": {
-        "aria-label-browse-metrics": "",
-        "currently-selected": "",
-        "metrics-pre-filtered": "",
-        "title-metrics-explorer": ""
+        "aria-label-browse-metrics": "Procurar métricas",
+        "currently-selected": "Atualmente selecionado: {{selected}}",
+        "metrics-pre-filtered": "Estas métricas foram pré-filtradas por etiquetas escolhidas nos filtros de etiquetas.",
+        "title-metrics-explorer": "Explorador de métricas"
       },
       "nested-query": {
         "label": {
-          "ignoring": "",
+          "ignoring": "Ignorando",
           "on": "Em "
         },
         "operator": "Operador",
-        "tooltip-remove-match": "",
-        "vector-matches": ""
+        "tooltip-remove-match": "Remover correspondência",
+        "vector-matches": "Correspondências de vetores"
       },
       "operation-editor": {
-        "not-found": "",
-        "title-remove": ""
+        "not-found": "Operação {{id}} não encontrada",
+        "title-remove": "Remover {{name}}"
       },
       "operation-header": {
         "placeholder-replace-with": "Substituir por",
-        "title-click-to-view-alternative-operations": "",
-        "title-remove-operation": ""
+        "title-click-to-view-alternative-operations": "Clicar para ver operações alternativas",
+        "title-remove-operation": "Remover operação"
       },
       "operation-info-button": {
-        "title-click-to-show-description": "",
-        "title-remove-operation": ""
+        "title-click-to-show-description": "Clicar para mostrar a descrição",
+        "title-remove-operation": "Remover operação"
       },
       "operation-list": {
-        "operations": "",
+        "operations": "Operações",
         "placeholder-search": "Pesquisar",
-        "title-add-operation": ""
+        "title-add-operation": "Adicionar operação"
       },
       "operation-param-editor": {
-        "title-add": "",
-        "title-remove": ""
+        "title-add": "Adicionar {{name}}",
+        "title-remove": "Remover {{name}}"
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Calcula {{aggregationName}} sobre as dimensões enquanto preserva {{labelWord}} {{labels}}.",
+          "label-default": "Calcula {{aggregationName}} sobre as dimensões.",
+          "label-without": "Calcula {{aggregationName}} sobre as dimensões {{labels}}. Todas as outras etiquetas são preservadas."
         }
       },
       "prom-query-builder-options": {
-        "aria-label-lower-limit-parameter": "",
-        "aria-label-select-resolution": "",
+        "aria-label-lower-limit-parameter": "Definir limite inferior para o parâmetro de passos",
+        "aria-label-select-resolution": "Selecionar resolução",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Mapa de calor",
+          "label-table": "Tabela",
+          "label-time-series": "Série temporal"
         },
-        "label-exemplars": "",
+        "label-exemplars": "Exemplares",
         "label-format": "Formato",
-        "label-min-step": "",
-        "label-resolution": "",
+        "label-min-step": "Passo mín.",
+        "label-resolution": "Resolução",
         "label-type": "Tipo",
-        "placeholder-auto": "",
+        "placeholder-auto": "auto",
         "title-options": "Opções",
-        "tooltip-min-step": ""
+        "tooltip-min-step": "Um limite inferior adicional para o parâmetro de etapa da consulta Prometheus e para as variáveis <2>{{interval}}</2> e <4>{{rateInterval}}</4>."
       },
       "prom-query-code-editor-autocomplete-info": {
-        "autocomplete-suggestions-limited": "",
-        "tooltip-autocomplete-suggestions-limited": ""
+        "autocomplete-suggestions-limited": "Sugestões de preenchimento automático limitadas",
+        "tooltip-autocomplete-suggestions-limited": "O número de nomes de métricas excede o limite de preenchimento automático. Apenas são exibidas as métricas mais relevantes para {{autocompleteLimit}}. Pode ajustar o limite nas definições da origem de dados."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Há um erro de sintaxe ou a estrutura da consulta não pode ser visualizada ao mudar para o modo de construtor. Partes da consulta podem ser perdidas.",
+        "confirmText-continue": "Continuar",
         "kick-start-your-query": "Dê início à sua consulta",
-        "label-explain": "",
-        "run-queries": "",
-        "title-parsing-error-switch-builder": ""
+        "label-explain": "Explicar",
+        "run-queries": "Executar consultas",
+        "title-parsing-error-switch-builder": "Erro de análise: mudar para o modo de construtor?"
       },
       "prom-query-legend-editor": {
-        "label-legend": "",
-        "placeholder-select-legend-mode": "",
-        "tooltip-legend": ""
+        "label-legend": "Legenda",
+        "placeholder-select-legend-mode": "Selecionar modo de legenda",
+        "tooltip-legend": "Substituição ou modelo do nome da série. Ex. {{templateExample}} será substituído pelo valor da etiqueta para{{labelName}}."
       },
       "query-builder-hints": {
-        "hint-details": ""
+        "hint-details": "dica: {{hintDetails}}"
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Construtor",
+          "label-code": "Cód."
         }
       },
       "query-pattern": {
-        "apply-query": "",
-        "aria-label-apply-query-starter-button": "",
-        "aria-label-back-button": "",
-        "aria-label-create-new-query-button": "",
-        "aria-label-raw-query": "",
-        "aria-label-use-this-query-button": "",
+        "apply-query": "Aplicar consulta",
+        "aria-label-apply-query-starter-button": "botão de início de aplicação de consulta",
+        "aria-label-back-button": "botão voltar",
+        "aria-label-create-new-query-button": "botão criar nova consulta",
+        "aria-label-raw-query": "Consulta bruta {{patternName}}",
+        "aria-label-use-this-query-button": "utilizar este botão de consulta",
         "back": "Voltar",
-        "create-new-query": "",
+        "create-new-query": "Criar uma nova consulta",
         "use-this-query": "Utilizar esta consulta"
       },
       "query-patterns-modal": {
-        "aria-label-close-kick-start-your-query-modal": "",
+        "aria-label-close-kick-start-your-query-modal": "fechar Iniciar o seu modal de consulta",
         "aria-label-kick-start-your-query-modal": "Dê início ao seu modal de consulta",
-        "aria-label-toggle-query-starter": "",
+        "aria-label-toggle-query-starter": "abrir e fechar cartão de início de consulta {{patternType}}",
         "close": "Fechar",
-        "description-kick-start-your-query": "",
-        "label-toggle-query-starter": "",
+        "description-kick-start-your-query": "Dê início à sua consulta selecionando uma destas consultas. Pode então continuar a completar a sua consulta.",
+        "label-toggle-query-starter": "Iniciadores de consulta {{patternType}}",
         "title-kick-start-your-query": "Dê início à sua consulta"
       },
       "raw-query": {
-        "aria-label-selector": ""
+        "aria-label-selector": "seletor"
       },
       "results-table": {
-        "content-descriptive-type": "",
+        "content-descriptive-type": "Ao criar um {{descriptiveType}}, o Prometheus expõe várias séries com o contador de tipos. ",
         "description": "Descrição",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Não foram encontradas métricas. Tente expandir os seus filtros de etiquetas.",
+        "message-expand-search": "Não foram encontradas métricas. Tente expandir a sua pesquisa e filtros.",
+        "message-no-metrics-found": "Não foram encontradas métricas na origem de dados.",
         "name": "Nome",
         "type": "Tipo"
       },
       "update-function-args": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "A análise da consulta é ambígua."
         }
       }
     }
diff --git a/packages/grafana-prometheus/src/locales/ru-RU/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/ru-RU/grafana-prometheus.json
index 896c67e458f..b6b4557d09d 100644
--- a/packages/grafana-prometheus/src/locales/ru-RU/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/ru-RU/grafana-prometheus.json
@@ -2,496 +2,496 @@
   "grafana-prometheus": {
     "components": {
       "annotation-query-editor": {
-        "annotation-data-load-error": "",
-        "aria-label-lower-limit-parameter": "",
-        "label-min-step": "",
-        "label-series-value-as-timestamp": "",
+        "annotation-data-load-error": "Ошибка загрузки данных аннотации.",
+        "aria-label-lower-limit-parameter": "Установить нижний предел для параметра шага",
+        "label-min-step": "Мин. шаг",
+        "label-series-value-as-timestamp": "Значение ряда как метка времени",
         "label-tags": "Теги",
-        "label-text": "",
+        "label-text": "Текст",
         "label-title": "Заголовок",
-        "placeholder-auto": "",
-        "tooltip-either-pattern-example-instance-replaced-label": "",
-        "tooltip-min-step": "",
-        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": ""
+        "placeholder-auto": "авто",
+        "tooltip-either-pattern-example-instance-replaced-label": "Используйте название или шаблон. Например, {{labelTemplate}} заменяется на значение метки {{labelName}}.",
+        "tooltip-min-step": "Дополнительный нижний предел для параметра шага запроса Prometheus и для переменных <2>{{intervalVar}}</2> и <4>{{rateIntervalVar}}</4>.",
+        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": "Единица метки времени — миллисекунды. Если единицей для значения ряда являются секунды, умножьте вектор диапазона на 1000."
       },
       "get-query-type-options": {
         "description": {
-          "instant-query-range": ""
+          "instant-query-range": "Выполните мгновенный запрос и запрос диапазона"
         },
         "label": {
-          "both": ""
+          "both": "Оба"
         },
         "range-options": {
           "description": {
-            "query-range": ""
+            "query-range": "Выполните запрос, относящийся к определенному диапазону времени"
           },
           "label": {
-            "instant": "",
-            "range": ""
+            "instant": "Мгновенный",
+            "range": "Диапазон"
           }
         }
       },
       "label-selector": {
-        "aria-label-filter-expression-for-label": "",
-        "description-select-labels": "",
-        "select-labels-to-search-in": ""
+        "aria-label-filter-expression-for-label": "Выражение фильтра для метки",
+        "description-select-labels": "После выбора значений меток отображаются только возможные комбинации меток.",
+        "select-labels-to-search-in": "2. Выберите метки для выполнения поиска"
       },
       "metric-selector": {
-        "aria-label-filter-expression-for-metric": "",
-        "aria-label-limit-results-from-series-endpoint": "",
-        "description-series-limit": "",
-        "label-select-metric": "",
-        "select-a-metric": "",
-        "series-limit": ""
+        "aria-label-filter-expression-for-metric": "Выражение фильтра для метрики",
+        "aria-label-limit-results-from-series-endpoint": "Ограничить результаты от конечной точки ряда",
+        "description-series-limit": "Лимит распространяется на все метрики, метки и значения. Оставьте поле пустым, чтобы использовался лимит по умолчанию. Установите значение 0, чтобы отключить ограничение и получать все данные. Это может привести к проблемам с производительностью.",
+        "label-select-metric": "После выбора метрики отображаются только возможные метки. Метки ограничены лимитом рядов, указанным ниже.",
+        "select-a-metric": "1. Выберите метрику",
+        "series-limit": "Лимит рядов"
       },
       "prom-cheat-sheet": {
-        "prom-ql-cheat-sheet": ""
+        "prom-ql-cheat-sheet": "Памятка PromQL"
       },
       "prom-exemplar-field": {
-        "exemplars": "",
-        "tooltip-disable-query": "",
-        "tooltip-enable-query": ""
+        "exemplars": "Образцы",
+        "tooltip-disable-query": "Отключить запросы с образцами",
+        "tooltip-enable-query": "Включить запросы с образцами"
       },
       "prom-explore-extra-field": {
-        "aria-label-prometheus-extra-field": "",
-        "aria-label-query-type-field": "",
-        "aria-label-step-field": "",
-        "min-step": "",
-        "query-type": "",
-        "tooltip-units-builtin-variables-example-interval-rateinterval": ""
+        "aria-label-prometheus-extra-field": "Дополнительное поле Prometheus",
+        "aria-label-query-type-field": "Поле типа запроса",
+        "aria-label-step-field": "Поле шага",
+        "min-step": "Мин. шаг",
+        "query-type": "Тип запроса",
+        "tooltip-units-builtin-variables-example-interval-rateinterval": "Здесь можно использовать единицы времени и встроенные переменные: например, {{example1}}, {{example2}}, {{example3}}, {{example4}}, {{example5}}, {{example6}}, {{example7}} (по умолчанию, если не указана единица: {{default}})"
       },
       "prom-query-field": {
-        "placeholder-enter-a-prom-ql-query": ""
+        "placeholder-enter-a-prom-ql-query": "Введите запрос PromQL…"
       },
       "prom-variable-query-editor": {
-        "aria-label-classic-query": "",
-        "aria-label-metric-regex": "",
-        "aria-label-metric-selector": "",
-        "aria-label-prometheus-query": "",
-        "aria-label-query-type": "",
-        "aria-label-series-query": "",
-        "label-classic-query": "",
+        "aria-label-classic-query": "Классический запрос",
+        "aria-label-metric-regex": "Регулярное выражение метрики",
+        "aria-label-metric-selector": "Селектор метрик",
+        "aria-label-prometheus-query": "Запрос Prometheus",
+        "aria-label-query-type": "Тип запроса",
+        "aria-label-series-query": "Запрос рядов",
+        "label-classic-query": "Классический запрос",
         "label-label": "Метка",
-        "label-metric-regex": "",
+        "label-metric-regex": "Регулярное выражение метрики",
         "label-query": "Запрос",
-        "label-query-type": "",
-        "label-series-query": "",
-        "placeholder-classic-query": "",
-        "placeholder-metric-regex": "",
-        "placeholder-prometheus-query": "",
+        "label-query-type": "Тип запроса",
+        "label-series-query": "Запрос рядов",
+        "placeholder-classic-query": "Классический запрос",
+        "placeholder-metric-regex": "Регулярное выражение метрики",
+        "placeholder-prometheus-query": "Запрос Prometheus",
         "placeholder-select-query-type": "Выбрать тип запроса",
-        "placeholder-series-query": "",
-        "returns-metrics-matching-specified-metric-regex": "",
-        "tooltip-classic-query": "",
-        "tooltip-label": "",
-        "tooltip-metric-regex": "",
-        "tooltip-query": "",
-        "tooltip-query-type": "",
-        "tooltip-series-query": ""
+        "placeholder-series-query": "Запрос рядов",
+        "returns-metrics-matching-specified-metric-regex": "Возвращает список метрик, соответствующих указанному регулярному выражению.",
+        "tooltip-classic-query": "Оригинальная реализация редактора запросов переменных Prometheus. Введите строку с правильным типом запроса и параметрами, указанными в документации. Например, {{exampleQuery}}.",
+        "tooltip-label": "Возвращает список значений для метки с соответствующим названием во всех метриках, если не указана конкретная метрика.",
+        "tooltip-metric-regex": "Возвращает список названий меток, при необходимости фильтруя их по указанному регулярному выражению метрики.",
+        "tooltip-query": "Возвращает список результатов запросов Prometheus для текущего запроса. Сюда могут входить функции Prometheus, например {{exampleQuery}}.",
+        "tooltip-query-type": "Плагин источника данных Prometheus предоставляет следующие типы запросов для переменных шаблона.",
+        "tooltip-series-query": "Укажите метрику с метками, только метрику или только метки, например {{example1}}, {{example2}} или {{example3}}. Возвращает список временных рядов, связанных с введенными данными."
       },
       "selector-actions": {
-        "aria-label-selector": "",
-        "aria-label-selector-clear-button": "",
-        "aria-label-use-selector-as-metrics-button": "",
-        "aria-label-use-selector-for-query-button": "",
-        "aria-label-validate-submit-button": "",
+        "aria-label-selector": "селектор",
+        "aria-label-selector-clear-button": "Кнопка очистки селектора",
+        "aria-label-use-selector-as-metrics-button": "Использовать селектор как кнопку метрик",
+        "aria-label-use-selector-for-query-button": "Использовать селектор для кнопки запроса",
+        "aria-label-validate-submit-button": "Проверить кнопку отправки",
         "clear": "Очистить",
-        "resulting-selector": "",
-        "use-as-rate-query": "",
-        "use-query": "",
-        "validate-selector": ""
+        "resulting-selector": "4. Полученный селектор",
+        "use-as-rate-query": "Использовать как запрос скорости изменения",
+        "use-query": "Использовать запрос",
+        "validate-selector": "Проверить селектор"
       },
       "value-selector": {
-        "aria-label-filter-expression-for-label-values": "",
-        "aria-label-values-for": "",
-        "description-search-field-values-across-selected-labels": "",
-        "select-multiple-values-for-your-labels": ""
+        "aria-label-filter-expression-for-label-values": "Выражение фильтра для значений меток",
+        "aria-label-values-for": "Значения для {{labelKey}}",
+        "description-search-field-values-across-selected-labels": "Используйте поле поиска, чтобы найти значения в выбранных метках.",
+        "select-multiple-values-for-your-labels": "3. Выберите значения для меток"
       }
     },
     "configuration": {
       "alerting-settings-overhaul": {
-        "label-allow-as-recording-rules-target": "",
-        "label-manage-alerts-via-alerting-ui": "",
+        "label-allow-as-recording-rules-target": "Разрешить в качестве цели для правил записи",
+        "label-manage-alerts-via-alerting-ui": "Управление оповещениями через пользовательский интерфейс Alerting",
         "title-alerting": "Оповещение",
-        "tooltip-allow-as-recording-rules-target": "",
+        "tooltip-allow-as-recording-rules-target": "Разрешить выбор этого источника данных в качестве цели для правил записи.",
         "tooltip-manage-alerts-via-alerting-ui": "Управление правилами оповещения для этого источника данных. Чтобы управлять другими ресурсами Alerting, добавьте обработчик оповещений Alertmanager в качестве источника данных."
       },
       "config-editor": {
-        "browser-access-mode-error": "",
-        "description-advanced-settings": "",
+        "browser-access-mode-error": "Режим доступа через браузер в источнике данных Prometheus больше не доступен. Переключитесь в режим доступа к серверу.",
+        "description-advanced-settings": "Дополнительные параметры — это необязательные параметры, которые можно настроить для получения большего контроля над источником данных.",
         "title-advanced-settings": "Дополнительные параметры",
         "title-error": "Ошибка"
       },
       "data-source-http-settings-overhaul": {
         "tooltip-browser-access-mode": "Вашим методом доступа является <1>Браузер</1>, то есть URL-адрес должен быть доступен из браузера.",
-        "tooltip-http-url": "",
+        "tooltip-http-url": "Укажите полный URL-адрес HTTP (например, {{exampleURL}})",
         "tooltip-server-access-mode": "Вашим методом доступа является <1>Сервер</1>, то есть URL-адрес должен быть доступен из серверной части/сервера Grafana."
       },
       "docs-tip": {
-        "visit-docs-for-more-details-here": ""
+        "visit-docs-for-more-details-here": "Более подробную информацию см. в документации."
       },
       "exemplar-setting": {
         "label-data-source": "Источник данных",
-        "label-internal-link": "",
+        "label-internal-link": "Внутренняя ссылка",
         "label-label-name": "Название метки",
-        "label-remove-exemplar-link": "",
+        "label-remove-exemplar-link": "Удалить образец ссылки",
         "label-url": "URL",
-        "label-url-label": "",
-        "placeholder-go-to-examplecom": "",
-        "placeholder-httpsexamplecomvalueraw": "",
-        "placeholder-trace-id": "",
-        "title-remove-exemplar-link": "",
-        "tooltip-data-source": "",
-        "tooltip-internal-link": "",
-        "tooltip-label-name": "",
-        "tooltip-url": "",
-        "tooltip-url-label": ""
+        "label-url-label": "Метка URL-адреса",
+        "placeholder-go-to-examplecom": "Перейти на example.com",
+        "placeholder-httpsexamplecomvalueraw": "https://example.com/${__value.raw}",
+        "placeholder-trace-id": "traceID",
+        "title-remove-exemplar-link": "Удалить образец ссылки",
+        "tooltip-data-source": "Источник данных, на который перейдет образец.",
+        "tooltip-internal-link": "Включите этот параметр, если у вас есть внутренняя ссылка. Если этот параметр включен, отображается селектор источников данных. Выберите серверное хранилище данных трассировки для вашего образца данных.",
+        "tooltip-label-name": "Имя поля в объекте меток, которое следует использовать для получения идентификатора traceID.",
+        "tooltip-url": "URL-адрес сервера трассировки, на который необходимо перейти пользователю для просмотра своей трассировки",
+        "tooltip-url-label": "Используйте для переопределения метки кнопки в поле traceID образца."
       },
       "exemplars-settings": {
         "add": "Добавить",
-        "no-exemplars-configurations": "",
-        "title-exemplars": ""
+        "no-exemplars-configurations": "Нет конфигураций образцов",
+        "title-exemplars": "Образцы"
       },
       "prom-settings": {
-        "aria-label-default-editor": "",
-        "aria-label-prom-type-type": "",
-        "aria-label-prometheus-type": "",
-        "aria-label-select-http-method": "",
+        "aria-label-default-editor": "Редактор по умолчанию (редактор кода или конструктор)",
+        "aria-label-prom-type-type": "Тип {{promType}}",
+        "aria-label-prometheus-type": "Тип Prometheus",
+        "aria-label-select-http-method": "Выбрать HTTP-метод",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Конструктор",
+          "label-code": "Код"
         },
-        "label-cache-level": "",
-        "label-custom-query-parameters": "",
-        "label-default-editor": "",
-        "label-disable-metrics-lookup": "",
-        "label-disable-recording-rules-beta": "",
-        "label-http-method": "",
-        "label-incremental-querying-beta": "",
-        "label-metric-names-suggestion-limit": "",
-        "label-prom-type-version": "",
-        "label-prometheus-type": "",
-        "label-query-overlap-window": "",
-        "label-query-timeout": "",
-        "label-scrape-interval": "",
-        "label-series-limit": "",
-        "label-use-series-endpoint": "",
-        "more-info": "",
-        "placeholder-example-maxsourceresolutionmtimeout": "",
-        "title-interval-behaviour": "",
-        "title-other": "",
+        "label-cache-level": "Уровень кэша",
+        "label-custom-query-parameters": "Пользовательские параметры запроса",
+        "label-default-editor": "Редактор по умолчанию",
+        "label-disable-metrics-lookup": "Отключить поиск метрик",
+        "label-disable-recording-rules-beta": "Отключить правила записи (бета)",
+        "label-http-method": "HTTP-метод",
+        "label-incremental-querying-beta": "Инкрементальные запросы (бета)",
+        "label-metric-names-suggestion-limit": "Лимит предложений названий метрик",
+        "label-prom-type-version": "Версия {{promType}}",
+        "label-prometheus-type": "Тип Prometheus",
+        "label-query-overlap-window": "Окно перекрытия запросов",
+        "label-query-timeout": "Превышение времени ожидания запроса",
+        "label-scrape-interval": "Интервал опроса",
+        "label-series-limit": "Лимит рядов",
+        "label-use-series-endpoint": "Использовать конечную точку ряда",
+        "more-info": "Более подробную информацию о настройке типа и версии Prometheus в источниках данных см. в <2>документации по подготовке</2>.",
+        "placeholder-example-maxsourceresolutionmtimeout": "Пример: {{example}}",
+        "title-interval-behaviour": "Поведение интервалов",
+        "title-other": "Прочее",
         "title-performance": "Производительность",
-        "title-query-editor": "",
-        "tooltip-cache-level": "",
-        "tooltip-custom-query-parameters": "",
-        "tooltip-default-editor": "",
-        "tooltip-disable-metrics-lookup": "",
-        "tooltip-disable-recording-rules-beta": "",
-        "tooltip-http-method": "",
-        "tooltip-incremental-querying-beta": "",
-        "tooltip-metric-names-suggestion-limit": "",
-        "tooltip-prom-type-version": "",
-        "tooltip-prometheus-type": "",
-        "tooltip-query-overlap-window": "",
-        "tooltip-query-timeout": "",
-        "tooltip-scrape-interval": "",
-        "tooltip-series-limit": "",
-        "tooltip-use-series-endpoint": ""
+        "title-query-editor": "Редактор запросов",
+        "tooltip-cache-level": "Устанавливает уровень кэширования в браузере для запросов редактора. Для источников данных с высокой кардинальностью рекомендуются более высокие настройки кэша.",
+        "tooltip-custom-query-parameters": "Добавьте пользовательские параметры в URL-адрес запроса Prometheus. Например, {{example1}}, {{example2}}, {{example3}}, или {{example4}}. Несколько параметров следует объединить с {{concatenationChar}}.",
+        "tooltip-default-editor": "Установите параметр редактора по умолчанию для всех пользователей этого источника данных.",
+        "tooltip-disable-metrics-lookup": "При включении этого параметра будут отключены выбор метрик и поддержка метрик/меток при автозаполнении поля запроса. Функция полезна, если вы испытываете проблемы с производительностью при использовании более крупных экземляров Prometheus. ",
+        "tooltip-disable-recording-rules-beta": "Функция отключит правила записи. Включите, чтобы улучшить производительность дашборда",
+        "tooltip-http-method": "Для отправки запросов в источник данных Prometheus можно использовать HTTP-методы POST или GET. POST является рекомендуемым методом, поскольку позволяет выполнять более крупные запросы. Измените метод на GET, если вы используете версию Prometheus старше 2.1 или в вашей сети запрещены запросы POST.",
+        "tooltip-incremental-querying-beta": "Функция изменит поведение относительных запросов по умолчанию. Вместо запроса свежих данных из экземпляра Prometheus, результаты запросов будут кэшироваться, и запрашиваться будут только новые записи. Включите, чтобы уменьшить нагрузку на базу данных и сеть.",
+        "tooltip-metric-names-suggestion-limit": "Максимальное количество названий метрик, которые могут отображаться в качестве предложений для автозаполнения в режиме кода редактора запросов.",
+        "tooltip-prom-type-version": "Используйте эту функцию, чтобы установить версию вашего экземпляра {{promType}}, если она не установлена автоматически.",
+        "tooltip-prometheus-type": "Установите тип вашей базы данных Prometheus, например Prometheus, Cortex, Mimir или Thanos. При изменении этого поля текущие настройки будут сохранены. Разные типы Prometheus могут поддерживать или не поддерживать различные API. Например, некоторые типы поддерживают сопоставление регулярных выражений для запросов меток в целях повышения производительности. Некоторые типы имеют API для метаданных. В случае неправильной настройки типа вы можете столкнуться со странным поведением источника данных при запросе метрик и меток. Проверьте документацию Prometheus и убедитесь, что указали правильный тип.",
+        "tooltip-query-overlap-window": "Задайте продолжительность, например {{example1}} или {{example2}}, или {{example3}}. По умолчанию: {{default}}. Эта продолжительность будет добавлена к продолжительности каждого инкрементального запроса.",
+        "tooltip-query-timeout": "Задайте время ожидания запроса Prometheus.",
+        "tooltip-scrape-interval": "Этот интервал определяет, как часто Prometheus будет опрашивать целевые объекты. Задайте стандартный интервал опроса и оценки, установленный в файле конфигурации Prometheus. Если вы установите значение больше, чем интервал в файле конфигурации Prometheus, Grafana будет оценивать данные в соответствии с этим интервалом и вы будете получать меньше точек данных. По умолчанию: {{default}}.",
+        "tooltip-series-limit": "Лимит распространяется на все ресурсы (метрики, метки и значения) для обеих конечных точек (серий и меток). Оставьте поле пустым, чтобы использовался лимит по умолчанию (40000). Установите значение 0, чтобы отключить ограничение и получать все данные. Это может привести к проблемам с производительностью. Лимит по умолчанию: 40000.",
+        "tooltip-use-series-endpoint": "При включении этого параметра конечная точка ряда с параметром {{exampleParameter}} будет иметь приоритет над конечной точкой значений меток с параметром {{exampleParameter}}. Хотя конечная точка значений меток считается более эффективной, некоторые пользователи предпочитают конечную точку ряда, поскольку она использует метод POST в отличие от конечной точки значений меток, которая использует метод GET."
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(отключено)",
+      "enabled-label": "Браузер метрик"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Включает только уникальные метки",
+        "description-custom": "Предоставьте шаблон именования",
+        "description-verbose": "Все имена и значения меток",
+        "label-auto": "Авто",
+        "label-custom": "Пользовательская",
+        "label-verbose": "Подробная"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Вычисляет среднее значение по измерениям",
+        "documentation-bottomk": "Наименьшее значение k элементов по значению выборки",
+        "documentation-count": "Считает количество элементов в векторе",
+        "documentation-count-values": "Считает количество элементов с одинаковым значением",
+        "documentation-group": "Все значения в итоговом векторе равны 1",
+        "documentation-max": "Выбирает максимальное значение по измерениям",
+        "documentation-min": "Выбирает минимальное значение по измерениям",
+        "documentation-quantile": "Вычисляет φ-квантиль (0 ≤ φ ≤ 1) по измерениям",
+        "documentation-stddev": "Вычисляет среднеквадратическое отклонение по измерениям",
+        "documentation-stdvar": "Вычисляет стандартную дисперсию по измерениям",
+        "documentation-sum": "Вычисляет сумму по измерениям",
+        "documentation-topk": "Наибольшее значение k элементов по значению выборки"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Возвращает входной вектор, в котором все значения выборки преобразованы в их абсолютные значения.",
+        "documentation-absent": "Возвращает пустой вектор, если переданный вектор имеет какие-либо элементы, и одноэлементный вектор со значением 1, если переданный вектор не имеет элементов. Функция полезна для оповещения, когда для данного имени метрики и комбинации меток не существует временных рядов.",
+        "documentation-absent-over-time": "Возвращает пустой вектор, если переданный вектор диапазона имеет какие-либо элементы, и одноэлементный вектор со значением 1, если переданный вектор диапазона не имеет элементов.",
+        "documentation-avg-over-time": "Среднее значение всех точек в указанном интервале.",
+        "documentation-ceil": "Округляет выборочные значения всех элементов в v в большую сторону до ближайшего целого числа.",
+        "documentation-changes": "Для каждого входного временного ряда функция changes(v range-vector) возвращает количество изменений его значения в пределах заданного временного диапазона в виде мгновенного вектора.",
+        "documentation-clamp": "Ограничивает выборочные значения всех элементов в v до нижнего предела min и верхнего предела max.",
+        "documentation-clamp-max": "Ограничивает выборочные значения всех элементов в v до верхнего предела max.",
+        "documentation-clamp-min": "Ограничивает выборочные значения всех элементов в v до нижнего предела min.",
+        "documentation-count-over-time": "Количество всех значений в указанном интервале.",
+        "documentation-count-scalar": "Возвращает количество элементов в векторе временных рядов в виде скаляра. Этим она отличается от оператора агрегации count(), который всегда возвращает вектор (пустой, если входной вектор пуст) и допускает группировку по меткам с помощью оператора by.",
+        "documentation-day-of-month": "Возвращает день месяца для каждого из указанных значений времени в формате UTC. Возвращаемые значения находятся в диапазоне от 1 до 31.",
+        "documentation-day-of-week": "Возвращает день недели для каждого из указанных значений времени в формате UTC. Возвращаемые значения находятся в диапазоне от 0 до 6, где 0 означает воскресенье и т. д.",
+        "documentation-day-of-year": "Возвращает день года для каждого из указанных значений времени в формате UTC. Возвращаемые значения находятся в диапазоне от 1 до 365 для невисокосных лет и от 1 до 366 для високосных лет.",
+        "documentation-days-in-month": "Возвращает количество дней в месяце для каждого из указанных значений времени в формате UTC. Возвращаемые значения находятся в диапазоне от 28 до 31.",
+        "documentation-deg": "Преобразует радианы в градусы для всех элементов в v.",
+        "documentation-delta": "Вычисляет разницу между первым и последним значением каждого элемента временного ряда в векторе диапазона v, возвращая мгновенный вектор с заданными дельтами и эквивалентными метками. Дельта экстраполируется для охвата всего временного диапазона, указанного в селекторе вектора диапазона, что позволяет получить нецелочисленный результат, даже если все значения выборки являются целыми числами.",
+        "documentation-deriv": "Вычисляет посекундную производную временного ряда в векторе диапазона v, используя простую линейную регрессию.",
+        "documentation-double-exponential-smoothing": "Возвращает сглаженное значение для временного ряда на основе диапазона в v. Чем ниже коэффициент сглаживания sf, тем большее значение придается старым данным. Чем выше коэффициент тренда tf, тем больше трендов в данных учитывается. Оба значения sf и tf должны находиться в диапазоне от 0 до 1.",
+        "documentation-drop-common-labels": "Удаляет все метки, имеющие одинаковое имя и значение во всех рядах входного вектора.",
+        "documentation-exp": "Вычисляет экспоненциальную функцию для всех элементов в v.\nОсобые случаи:\n* Exp(+Inf) = +Inf \n* Exp(NaN) = NaN",
+        "documentation-floor": "Округляет выборочные значения всех элементов в v в меньшую сторону до ближайшего целого числа.",
+        "documentation-histogram-avg": "Возвращает среднее арифметическое наблюдаемых значений, хранящихся во встроенной гистограмме. Выборки, не являющиеся встроенными гистограммами, игнорируются и не отображаются в возвращаемом векторе.",
+        "documentation-histogram-count": "Возвращает количество наблюдений, хранящихся во встроенной гистограмме.",
+        "documentation-histogram-fraction": "Возвращает вычисленную долю наблюдений между заданными нижним и верхним значениями.",
+        "documentation-histogram-quantile": "Вычисляет φ-квантиль (0 ≤ φ ≤ 1) из интервалов b гистограммы. Выборки в b представляют собой количество наблюдений в каждом интервале. Каждая выборка должна иметь метку le, где значение метки обозначает верхнюю границу интервала включительно. (Выборки без такой метки игнорируются.) Тип метрик гистограммы автоматически обеспечивает временные ряды с суффиксом _bucket и соответствующими метками.",
+        "documentation-histogram-stddev": "Возвращает вычисленное стандартное отклонение наблюдений во встроенной гистограмме на основе геометрического среднего значения интервалов, в которых находятся наблюдения.",
+        "documentation-histogram-stdvar": "Возвращает вычисленную стандартную дисперсию наблюдений во встроенной гистограмме.",
+        "documentation-histogram-sum": "Возвращает суммарное количество наблюдений, хранящихся во встроенной гистограмме.",
+        "documentation-holt-winters": "Переименована в double_exponential_smoothing в Prometheus v3.x. Используйте double_exponential_smoothing для версий Prometheus v3.0 и выше. \n\nВозвращает сглаженное значение для временного ряда на основе диапазона в v. Чем ниже коэффициент сглаживания sf, тем большее значение придается старым данным. Чем выше коэффициент тренда tf, тем больше трендов в данных учитывается. Оба значения sf и tf должны находиться в диапазоне от 0 до 1.",
+        "documentation-hour": "Возвращает час для каждого из указанных значений времени в формате UTC. Возвращаемые значения находятся в диапазоне от 0 до 23.",
+        "documentation-idelta": "Вычисляет разницу между двумя последними выборками в векторе диапазона v, возвращая мгновенный вектор с заданными дельтами и эквивалентными метками.",
+        "documentation-increase": "Вычисляет прирост временного ряда в векторе диапазона. Нарушения монотонности (например, сброс счетчика из-за перезапуска цели) автоматически корректируются. Прирост экстраполируется на весь временной диапазон, указанный в селекторе вектора диапазона, что позволяет получить нецелочисленный результат, даже если счетчик увеличивается только на целые числа.",
+        "documentation-info": "Возвращает последние сведения и метаданные о группе метрик, такие как их метки и текущие значения, без выполнения каких-либо вычислений.",
+        "documentation-irate": "Вычисляет мгновенную скорость прироста временного ряда в секунду в векторе диапазона. Вычисление основано на последних двух точках данных. Нарушения монотонности (например, сброс счетчика из-за перезапуска цели) автоматически корректируются.",
+        "documentation-label-join": "Для каждого временного ряда в v объединяет все значения всех меток src_labels с помощью функции separator и возвращает временной ряд с меткой dst_label, содержащий объединенное значение. В этой функции может быть любое количество меток src_labels.",
+        "documentation-label-replace": "Для каждого временного ряда в v функция label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string) сопоставляет регулярное выражение regex с меткой src_label. Если оно соответствует, то временной ряд возвращается с меткой dst_label, замененной на расширение replacement. $1 заменяется первой соответствующей подгруппой, $2 — второй и т. д. Если регулярное выражение не соответствует, то временной ряд возвращается без изменений.",
+        "documentation-last-over-time": "Самое последнее значение точки в указанном интервале.",
+        "documentation-ln": "Вычисляет натуральный логарифм для всех элементов в v.\nОсобые случаи:\n * ln(+Inf) = +Inf\n * ln(0) = -Inf\n * ln(x < 0) = NaN\n * ln(NaN) = NaN",
+        "documentation-log10": "Вычисляет десятичный логарифм для всех элементов в v. Особые случаи эквивалентны случаям в ln.",
+        "documentation-log2": "Вычисляет двоичный логарифм для всех элементов в v. Особые случаи эквивалентны случаям в ln.",
+        "documentation-max-over-time": "Максимальное значение всех точек в указанном интервале.",
+        "documentation-min-over-time": "Минимальное значение всех точек в указанном интервале.",
+        "documentation-minute": "Возвращает минуту для каждого из указанных значений времени в формате UTC. Возвращаемые значения находятся в диапазоне от 0 до 59.",
+        "documentation-month": "Возвращает месяц года для каждого из указанных значений времени в формате UTC. Возвращаемые значения находятся в диапазоне от 1 до 12, где 1 означает январь и т. д.",
+        "documentation-pi": "Возвращает число пи",
+        "documentation-predict-linear": "Прогнозирует значение временного ряда через t сек. с настоящего момента на основании вектора диапазона v, используя простую линейную регрессию.",
+        "documentation-present-over-time": "Значение 1 для любого ряда в указанном интервале.",
+        "documentation-quantile-over-time": "φ-квантиль (0 ≤ φ ≤ 1) значений в указанном интервале.",
+        "documentation-rad": "Преобразует градусы в радианы для всех элементов в v.",
+        "documentation-rate": "Вычисляет среднюю скорость прироста временного ряда в секунду в векторе диапазона. Нарушения монотонности (например, сброс счетчика из-за перезапуска цели) автоматически корректируются. Кроме того, вычисление экстраполируется на концы временного диапазона, что позволяет учитывать пропуски циклов извлечения данных или их несоответствие временному периоду диапазона.",
+        "documentation-resets": "Для каждого входного временного ряда функция resets(v range-vector) возвращает количество сбросов счетчика в пределах заданного временного диапазона в виде мгновенного вектора. Любое уменьшение значения между двумя последовательными выборками интерпретируется как сброс счетчика.",
+        "documentation-round": "Округляет выборочные значения всех элементов в v до ближайшего целого числа. В спорных случаях значения округляются в большую сторону. Необязательный аргумент to_nearest позволяет указать ближайшее кратное число, до которого следует округлить значения выборки. Кратное число также может быть дробью.",
+        "documentation-scalar": "Если задан одноэлементный входной вектор, функция scalar(v instant-vector) возвращает выборочное значение единственного элемента в виде скаляра. Если входной вектор содержит не один элемент, функция scalar вернет NaN.",
+        "documentation-sgn": "Возвращает вектор, в котором все выборочные значения преобразованы в соответствующие знаки, определяемые следующим образом: 1, если v является положительным, -1, если v является отрицательным, и 0, если v равно нулю.",
+        "documentation-sort": "Возвращает элементы вектора, отсортированные по значениям выборки, в порядке возрастания.",
+        "documentation-sort-desc": "Возвращает элементы вектора, отсортированные по значениям выборки, в порядке убывания.",
+        "documentation-sqrt": "Вычисляет квадратный корень всех элементов в v.",
+        "documentation-stddev-over-time": "Среднеквадратическое отклонение значений в указанном интервале.",
+        "documentation-stdvar-over-time": "Стандартная дисперсия значений в указанном интервале.",
+        "documentation-sum-over-time": "Сумма всех значений в указанном интервале.",
+        "documentation-time": "Возвращает количество секунд, прошедших с 1 января 1970 года по UTC. Обратите внимание, что возвращается не текущее время, а время, в которое должно быть получено выражение.",
+        "documentation-timestamp": "Возвращает временную метку каждого из образцов заданного вектора в виде количества секунд, прошедших с 1 января 1970 года по UTC.",
+        "documentation-vector": "Возвращает скаляр s в виде вектора без меток.",
+        "documentation-year": "Возвращает год для каждого из указанных значений времени в формате UTC."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "вычисляет арккосинус всех элементов в {{argument}}",
+        "documentation-acosh": "вычисляет обратный гиперболический косинус всех элементов в {{argument}}",
+        "documentation-asin": "вычисляет арксинус всех элементов в {{argument}}",
+        "documentation-asinh": "вычисляет обратный гиперболический синус всех элементов в {{argument}}",
+        "documentation-atan": "вычисляет арктангенс всех элементов в {{argument}}",
+        "documentation-atanh": "вычисляет обратный гиперболический тангенс всех элементов в {{argument}}",
+        "documentation-cos": "вычисляет косинус всех элементов в {{argument}}",
+        "documentation-cosh": "вычисляет гиперболический косинус всех элементов в {{argument}}",
+        "documentation-sin": "вычисляет синус всех элементов в {{argument}}",
+        "documentation-sinh": "вычисляет гиперболический синус всех элементов в {{argument}}",
+        "documentation-tan": "вычисляет тангенс всех элементов в {{argument}}",
+        "documentation-tanh": "вычисляет гиперболический тангенс всех элементов в {{argument}}"
       }
     },
     "querybuilder": {
       "feedback-link": {
         "give-feedback": "Отправить отзыв",
-        "title-give-feedback": ""
+        "title-give-feedback": "Обозреватель метрик — это новая функция. Сообщите нам, как мы можем ее улучшить"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Образцы: {{value}}",
+        "format": "Формат: {{value}}",
+        "legend": "Условные обозначения: {{value}}",
+        "step": "Шаг: {{value}}",
+        "type": "Тип: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Поиск метрик по имени",
+        "type": "Фильтр по типу"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Кумулятивная метрика, представляющая собой один монотонно увеличивающийся счетчик, значение которого может только увеличиваться или сбрасываться до нуля при перезапуске.",
+        "description-gauge": "Метрика, представляющая собой одно числовое значение, которое может произвольно увеличиваться и уменьшаться.",
+        "description-histogram": "Гистограмма содержит выборку наблюдений (обычно таких, как продолжительность запроса или размер ответа) и подсчитывает их в настраиваемых интервалах.",
+        "description-native-histogram": "Встроенные гистограммы отличаются от классических гистограмм Prometheus по ряду параметров: границы интервалов встроенной гистограммы вычисляются по формуле, которая зависит от ее масштаба (разрешения), и не определяются пользователем.",
+        "description-no-type": "Эти метрики не имеют определенного типа в метаданных.",
+        "description-summary": "Сводка содержит выборку наблюдений (обычно таких, как продолжительность запроса и размер ответа) и может вычислять настраиваемые квантили в скользящем временном окне.",
+        "description-unknown": "В метаданных этим метрикам присвоен тип «неизвестный».",
+        "label-counter": "Счетчик",
+        "label-gauge": "Индикатор",
+        "label-histogram": "Гистограмма",
+        "label-native-histogram": "Встроенная гистограмма",
+        "label-no-type": "Нет типа",
+        "label-summary": "Сводка",
+        "label-unknown": "Неизвестный"
       },
       "handle-function": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "Неоднозначные результаты анализа запроса."
         }
       },
       "label-filter-item": {
-        "aria-label-remove": "",
-        "placeholder-select-label": "",
+        "aria-label-remove": "Удалить {{name}}",
+        "placeholder-select-label": "Выбрать метку",
         "placeholder-select-value": "Выбрать значение"
       },
       "label-filters": {
-        "label-filters": "",
-        "label-label-filters": "",
-        "tooltip-label-filters": ""
+        "label-filters": "Фильтры меток",
+        "label-label-filters": "Фильтры меток",
+        "tooltip-label-filters": "(Необязательно.) Используется в качестве фильтра выбора метрик для этого типа запроса."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Загрузка меток",
+        "noOptionsMessage-no-labels-found": "Метки не найдены"
       },
       "metric-combobox": {
         "async-select": {
-          "aria-label-open-metrics-explorer": "",
-          "placeholder-select-metric": "",
-          "tooltip-open-metrics-explorer": ""
+          "aria-label-open-metrics-explorer": "Открыть обозреватель метрик",
+          "placeholder-select-metric": "Выбрать метрику",
+          "tooltip-open-metrics-explorer": "Открыть обозреватель метрик"
         },
         "label-metric": "Метрика",
-        "tooltip-metric": ""
+        "tooltip-metric": "(Необязательно.) Возвращает список значений для метки с соответствующим названием в указанной метрике."
       },
       "metrics-modal": {
-        "aria-label-browse-metrics": "",
-        "currently-selected": "",
-        "metrics-pre-filtered": "",
-        "title-metrics-explorer": ""
+        "aria-label-browse-metrics": "Поиск метрик",
+        "currently-selected": "Выбранные в данный момент: {{selected}}",
+        "metrics-pre-filtered": "Метрики были предварительно отфильтрованы по меткам, выбранным в соответствующих фильтрах.",
+        "title-metrics-explorer": "Обозреватель метрик"
       },
       "nested-query": {
         "label": {
-          "ignoring": "",
+          "ignoring": "Игнорирование",
           "on": "Вкл."
         },
         "operator": "Оператор",
-        "tooltip-remove-match": "",
-        "vector-matches": ""
+        "tooltip-remove-match": "Удалить совпадение",
+        "vector-matches": "Совпадения векторов"
       },
       "operation-editor": {
-        "not-found": "",
-        "title-remove": ""
+        "not-found": "Операция {{id}} не найдена",
+        "title-remove": "Удалить {{name}}"
       },
       "operation-header": {
         "placeholder-replace-with": "Заменить на",
-        "title-click-to-view-alternative-operations": "",
-        "title-remove-operation": ""
+        "title-click-to-view-alternative-operations": "Нажмите для просмотра альтернативных операций",
+        "title-remove-operation": "Удалить операцию"
       },
       "operation-info-button": {
-        "title-click-to-show-description": "",
-        "title-remove-operation": ""
+        "title-click-to-show-description": "Нажмите для отображения описания",
+        "title-remove-operation": "Удалить операцию"
       },
       "operation-list": {
-        "operations": "",
+        "operations": "Операции",
         "placeholder-search": "Поиск",
-        "title-add-operation": ""
+        "title-add-operation": "Добавить операцию"
       },
       "operation-param-editor": {
-        "title-add": "",
-        "title-remove": ""
+        "title-add": "Добавить {{name}}",
+        "title-remove": "Удалить {{name}}"
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Вычисляет {{aggregationName}} по измерениям, сохраняя {{labels}} {{labelWord}}.",
+          "label-default": "Вычисляет {{aggregationName}} по измерениям.",
+          "label-without": "Вычисляет {{aggregationName}} по измерениям {{labels}}. Все остальные метки сохраняются."
         }
       },
       "prom-query-builder-options": {
-        "aria-label-lower-limit-parameter": "",
-        "aria-label-select-resolution": "",
+        "aria-label-lower-limit-parameter": "Установить нижний предел для параметра шага",
+        "aria-label-select-resolution": "Выбрать разрешение",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Тепловая карта",
+          "label-table": "Таблица",
+          "label-time-series": "Временные ряды"
         },
-        "label-exemplars": "",
+        "label-exemplars": "Образцы",
         "label-format": "Формат",
-        "label-min-step": "",
-        "label-resolution": "",
+        "label-min-step": "Мин. шаг",
+        "label-resolution": "Разрешение",
         "label-type": "Тип",
-        "placeholder-auto": "",
+        "placeholder-auto": "авто",
         "title-options": "Параметры",
-        "tooltip-min-step": ""
+        "tooltip-min-step": "Дополнительный нижний предел для параметра шага запроса Prometheus и переменных <2>{{interval}}</2> и <4>{{rateInterval}}</4>."
       },
       "prom-query-code-editor-autocomplete-info": {
-        "autocomplete-suggestions-limited": "",
-        "tooltip-autocomplete-suggestions-limited": ""
+        "autocomplete-suggestions-limited": "Предложения для автозаполнения ограничены",
+        "tooltip-autocomplete-suggestions-limited": "Количество названий метрик превышает лимит автозаполнения. Отображаются только наиболее релевантные для {{autocompleteLimit}} метрики. Вы можете настроить порог в параметрах источника данных."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "При переключении в режим конструктора произошла синтаксическая ошибка или структура запроса не может быть визуализирована. Части запроса могут быть потеряны.",
+        "confirmText-continue": "Продолжить",
         "kick-start-your-query": "Запустить запрос",
-        "label-explain": "",
-        "run-queries": "",
-        "title-parsing-error-switch-builder": ""
+        "label-explain": "Объяснение",
+        "run-queries": "Выполнить запросы",
+        "title-parsing-error-switch-builder": "Ошибка анализа. Переключиться в режим конструктора?"
       },
       "prom-query-legend-editor": {
-        "label-legend": "",
-        "placeholder-select-legend-mode": "",
-        "tooltip-legend": ""
+        "label-legend": "Условные обозначения",
+        "placeholder-select-legend-mode": "Выберите режим условных обозначений",
+        "tooltip-legend": "Переопределение или шаблон имени ряда. Например, вместо {{templateExample}} будет использоваться значение метки для {{labelName}}."
       },
       "query-builder-hints": {
-        "hint-details": ""
+        "hint-details": "рекомендация: {{hintDetails}}"
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Конструктор",
+          "label-code": "Код"
         }
       },
       "query-pattern": {
-        "apply-query": "",
-        "aria-label-apply-query-starter-button": "",
-        "aria-label-back-button": "",
-        "aria-label-create-new-query-button": "",
-        "aria-label-raw-query": "",
-        "aria-label-use-this-query-button": "",
+        "apply-query": "Применить запрос",
+        "aria-label-apply-query-starter-button": "кнопка применения запроса",
+        "aria-label-back-button": "кнопка назад",
+        "aria-label-create-new-query-button": "кнопка создания нового запроса",
+        "aria-label-raw-query": "Необработанный запрос {{patternName}}",
+        "aria-label-use-this-query-button": "использовать кнопку запроса",
         "back": "Назад",
-        "create-new-query": "",
+        "create-new-query": "Создать новый запрос",
         "use-this-query": "Использовать запрос"
       },
       "query-patterns-modal": {
-        "aria-label-close-kick-start-your-query-modal": "",
+        "aria-label-close-kick-start-your-query-modal": "закрыть модальное окно запуска запроса",
         "aria-label-kick-start-your-query-modal": "Модальное окно запуска запроса",
-        "aria-label-toggle-query-starter": "",
+        "aria-label-toggle-query-starter": "открыть и закрыть карту запуска запроса {{patternType}}",
         "close": "Закрыть",
-        "description-kick-start-your-query": "",
-        "label-toggle-query-starter": "",
+        "description-kick-start-your-query": "Запустите запрос, выбрав один из этих вариантов. Затем можно продолжить выполнение запроса.",
+        "label-toggle-query-starter": "Элементы запуска запроса {{patternType}}",
         "title-kick-start-your-query": "Запустить запрос"
       },
       "raw-query": {
-        "aria-label-selector": ""
+        "aria-label-selector": "селектор"
       },
       "results-table": {
-        "content-descriptive-type": "",
+        "content-descriptive-type": "При создании {{descriptiveType}} Prometheus отображает несколько рядов со счетчиком типов. ",
         "description": "Описание",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Метрики не найдены. Попробуйте расширить фильтры меток.",
+        "message-expand-search": "Метрики не найдены. Попробуйте расширить поиск и фильтры.",
+        "message-no-metrics-found": "В источнике данных нет метрик.",
         "name": "Имя",
         "type": "Тип"
       },
       "update-function-args": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "Неоднозначные результаты анализа запроса."
         }
       }
     }
diff --git a/packages/grafana-prometheus/src/locales/sv-SE/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/sv-SE/grafana-prometheus.json
index f51290dffe1..2964bd9b374 100644
--- a/packages/grafana-prometheus/src/locales/sv-SE/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/sv-SE/grafana-prometheus.json
@@ -2,496 +2,496 @@
   "grafana-prometheus": {
     "components": {
       "annotation-query-editor": {
-        "annotation-data-load-error": "",
-        "aria-label-lower-limit-parameter": "",
-        "label-min-step": "",
-        "label-series-value-as-timestamp": "",
+        "annotation-data-load-error": "Fel vid laddning av kommentarsdata!",
+        "aria-label-lower-limit-parameter": "Ställ in nedre gräns för stegparametern",
+        "label-min-step": "Minsta steg",
+        "label-series-value-as-timestamp": "Serievärde som tidsstämpel",
         "label-tags": "Taggar",
-        "label-text": "",
+        "label-text": "Text",
         "label-title": "Titel",
-        "placeholder-auto": "",
-        "tooltip-either-pattern-example-instance-replaced-label": "",
-        "tooltip-min-step": "",
-        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": ""
+        "placeholder-auto": "auto",
+        "tooltip-either-pattern-example-instance-replaced-label": "Använd antingen namnet eller ett mönster. Till exempel ersätts {{labelTemplate}} med etikettvärdet för etiketten {{labelName}}.",
+        "tooltip-min-step": "En ytterligare nedre gräns för stegparametern för Prometheus-frågan och för variablerna <2>{{intervalVar}}</2> och <4>{{rateIntervalVar}}</4>.",
+        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": "Tidsstämpelns enhet är millisekunder. Om enheten för serievärdet är sekunder, multiplicera dess intervallvektor med 1 000."
       },
       "get-query-type-options": {
         "description": {
-          "instant-query-range": ""
+          "instant-query-range": "Kör en direktfråga och en intervallfråga"
         },
         "label": {
-          "both": ""
+          "both": "Båda"
         },
         "range-options": {
           "description": {
-            "query-range": ""
+            "query-range": "Kör fråga över ett tidsintervall"
           },
           "label": {
-            "instant": "",
-            "range": ""
+            "instant": "Direkt",
+            "range": "Räckvidd"
           }
         }
       },
       "label-selector": {
-        "aria-label-filter-expression-for-label": "",
-        "description-select-labels": "",
-        "select-labels-to-search-in": ""
+        "aria-label-filter-expression-for-label": "Filtrera uttryck för etikett",
+        "description-select-labels": "När etikettvärden väljs visas endast möjliga etikettkombinationer.",
+        "select-labels-to-search-in": "2. Välj etiketter att söka i"
       },
       "metric-selector": {
-        "aria-label-filter-expression-for-metric": "",
-        "aria-label-limit-results-from-series-endpoint": "",
-        "description-series-limit": "",
-        "label-select-metric": "",
-        "select-a-metric": "",
-        "series-limit": ""
+        "aria-label-filter-expression-for-metric": "Filtrera uttryck för mätvärde",
+        "aria-label-limit-results-from-series-endpoint": "Begränsa resultat från serieändpunkt",
+        "description-series-limit": "Gränsen gäller för alla mätvärden, etiketter och värden. Lämna fältet tomt för att använda standardgränsen. Ställ in på 0 för att inaktivera gränsen och hämta allt – detta kan orsaka prestandaproblem.",
+        "label-select-metric": "När ett mätvärde väljs visas endast möjliga etiketter. Etiketter begränsas av seriegränsen nedan.",
+        "select-a-metric": "1. Välj ett mått",
+        "series-limit": "Seriegräns"
       },
       "prom-cheat-sheet": {
-        "prom-ql-cheat-sheet": ""
+        "prom-ql-cheat-sheet": "PromQL-fusklapp"
       },
       "prom-exemplar-field": {
-        "exemplars": "",
-        "tooltip-disable-query": "",
-        "tooltip-enable-query": ""
+        "exemplars": "Exemplar",
+        "tooltip-disable-query": "Inaktivera fråga med exempel",
+        "tooltip-enable-query": "Aktivera fråga med exempel"
       },
       "prom-explore-extra-field": {
-        "aria-label-prometheus-extra-field": "",
-        "aria-label-query-type-field": "",
-        "aria-label-step-field": "",
-        "min-step": "",
-        "query-type": "",
-        "tooltip-units-builtin-variables-example-interval-rateinterval": ""
+        "aria-label-prometheus-extra-field": "Prometheus extrafält",
+        "aria-label-query-type-field": "Fält för typ av fråga",
+        "aria-label-step-field": "Stegfält",
+        "min-step": "Minsta steg",
+        "query-type": "Typ av fråga",
+        "tooltip-units-builtin-variables-example-interval-rateinterval": "Tidsenheter och inbyggda variabler kan användas här, till exempel: {{example1}}, {{example2}}, {{example3}}, {{example4}}, {{example5}}, {{example6}}, {{example7}} (Standard om ingen enhet anges: {{default}})"
       },
       "prom-query-field": {
-        "placeholder-enter-a-prom-ql-query": ""
+        "placeholder-enter-a-prom-ql-query": "Ange en PromQL-fråga …"
       },
       "prom-variable-query-editor": {
-        "aria-label-classic-query": "",
-        "aria-label-metric-regex": "",
-        "aria-label-metric-selector": "",
-        "aria-label-prometheus-query": "",
-        "aria-label-query-type": "",
-        "aria-label-series-query": "",
-        "label-classic-query": "",
+        "aria-label-classic-query": "Klassisk fråga",
+        "aria-label-metric-regex": "Måttregex",
+        "aria-label-metric-selector": "Måttväljare",
+        "aria-label-prometheus-query": "Prometheus-fråga",
+        "aria-label-query-type": "Typ av fråga",
+        "aria-label-series-query": "Seriefråga",
+        "label-classic-query": "Klassisk fråga",
         "label-label": "Etikett",
-        "label-metric-regex": "",
+        "label-metric-regex": "Måttregex",
         "label-query": "Fråga",
-        "label-query-type": "",
-        "label-series-query": "",
-        "placeholder-classic-query": "",
-        "placeholder-metric-regex": "",
-        "placeholder-prometheus-query": "",
+        "label-query-type": "Typ av fråga",
+        "label-series-query": "Seriefråga",
+        "placeholder-classic-query": "Klassisk fråga",
+        "placeholder-metric-regex": "Måttregex",
+        "placeholder-prometheus-query": "Prometheus-fråga",
         "placeholder-select-query-type": "Välj typ av fråga",
-        "placeholder-series-query": "",
-        "returns-metrics-matching-specified-metric-regex": "",
-        "tooltip-classic-query": "",
-        "tooltip-label": "",
-        "tooltip-metric-regex": "",
-        "tooltip-query": "",
-        "tooltip-query-type": "",
-        "tooltip-series-query": ""
+        "placeholder-series-query": "Seriefråga",
+        "returns-metrics-matching-specified-metric-regex": "Returnerar en lista över mätvärden som matchar angiven måttregex.",
+        "tooltip-classic-query": "Den ursprungliga implementeringen av Prometheus variabla frågeredigerare. Ange en sträng med rätt frågetyp och parametrar enligt beskrivningen i dessa dokument. Till exempel, {{exampleQuery}}.",
+        "tooltip-label": "Returnerar en lista över etikettvärden för etikettnamnet för alla mätvärden om inte mätvärdet är angivet.",
+        "tooltip-metric-regex": "Returnerar en lista över etikettnamn, eventuellt filtrering efter angiven måttregex.",
+        "tooltip-query": "Returnerar en lista över Prometheus frågeresultat för frågan. Detta kan inkludera Prometheus-funktioner, d.v.s. {{exampleQuery}}.",
+        "tooltip-query-type": "Prometheus-datakällans tillägg tillhandahåller följande frågetyper för mallvariabler.",
+        "tooltip-series-query": "Ange ett mätvärde med etiketter, endast ett mätvärde eller endast etiketter d.v.s. {{example1}}, {{example2}} eller {{example3}}. Returnerar en lista över tidsserier som är associerade med angivna data."
       },
       "selector-actions": {
-        "aria-label-selector": "",
-        "aria-label-selector-clear-button": "",
-        "aria-label-use-selector-as-metrics-button": "",
-        "aria-label-use-selector-for-query-button": "",
-        "aria-label-validate-submit-button": "",
+        "aria-label-selector": "väljare",
+        "aria-label-selector-clear-button": "Knapp för att rensa väljare",
+        "aria-label-use-selector-as-metrics-button": "Knapp för att använda väljare som mätvärde",
+        "aria-label-use-selector-for-query-button": "Använd väljare för frågeknapp",
+        "aria-label-validate-submit-button": "Validera skicka-knappen",
         "clear": "Rensa",
-        "resulting-selector": "",
-        "use-as-rate-query": "",
-        "use-query": "",
-        "validate-selector": ""
+        "resulting-selector": "4. Resulterande väljare",
+        "use-as-rate-query": "Använd som ”rate”-fråga",
+        "use-query": "Använd fråga",
+        "validate-selector": "Validera väljare"
       },
       "value-selector": {
-        "aria-label-filter-expression-for-label-values": "",
-        "aria-label-values-for": "",
-        "description-search-field-values-across-selected-labels": "",
-        "select-multiple-values-for-your-labels": ""
+        "aria-label-filter-expression-for-label-values": "Filtrera uttryck för etikettvärden",
+        "aria-label-values-for": "Värden för {{labelKey}}",
+        "description-search-field-values-across-selected-labels": "Använd sökfältet för att hitta värden över valda etiketter.",
+        "select-multiple-values-for-your-labels": "3. Välj (flera) värden för dina etiketter"
       }
     },
     "configuration": {
       "alerting-settings-overhaul": {
-        "label-allow-as-recording-rules-target": "",
-        "label-manage-alerts-via-alerting-ui": "",
+        "label-allow-as-recording-rules-target": "Tillåt som mål för inspelningsregler",
+        "label-manage-alerts-via-alerting-ui": "Hantera varningar via larmgränssnittet",
         "title-alerting": "Varnar",
-        "tooltip-allow-as-recording-rules-target": "",
+        "tooltip-allow-as-recording-rules-target": "Tillåt att denna datakälla väljs som mål för att skriva inspelningsregler.",
         "tooltip-manage-alerts-via-alerting-ui": "Hantera varningsregler för den här datakällan. Om du vill hantera andra varningsresurser ska du lägga till en Alertmanager-datakälla."
       },
       "config-editor": {
-        "browser-access-mode-error": "",
-        "description-advanced-settings": "",
+        "browser-access-mode-error": "Webbläsaråtkomstläge i Prometheus-datakällan är inte längre tillgängligt. Byt till serveråtkomstläge.",
+        "description-advanced-settings": "Ytterligare inställningar är valfria inställningar som kan konfigureras för ökad kontroll över din datakälla.",
         "title-advanced-settings": "Avancerade inställningar",
         "title-error": "Fel"
       },
       "data-source-http-settings-overhaul": {
         "tooltip-browser-access-mode": "Din åtkomstmetod är <1>Webbläsare</1>, vilket innebär att webbadressen måste vara tillgänglig från webbläsaren.",
-        "tooltip-http-url": "",
+        "tooltip-http-url": "Ange en fullständig HTTP-URL (till exempel {{exampleURL}})",
         "tooltip-server-access-mode": "Din åtkomstmetod är <1>Server</1>, vilket innebär att webbadressen måste vara tillgänglig från Grafana-gränssnittet/servern."
       },
       "docs-tip": {
-        "visit-docs-for-more-details-here": ""
+        "visit-docs-for-more-details-here": "Besök dokumentationen för mer information här."
       },
       "exemplar-setting": {
         "label-data-source": "Datakälla",
-        "label-internal-link": "",
+        "label-internal-link": "Intern länk",
         "label-label-name": "Etikettnamn",
-        "label-remove-exemplar-link": "",
+        "label-remove-exemplar-link": "Ta bort exempel på länk",
         "label-url": "URL",
-        "label-url-label": "",
-        "placeholder-go-to-examplecom": "",
-        "placeholder-httpsexamplecomvalueraw": "",
-        "placeholder-trace-id": "",
-        "title-remove-exemplar-link": "",
-        "tooltip-data-source": "",
-        "tooltip-internal-link": "",
-        "tooltip-label-name": "",
-        "tooltip-url": "",
-        "tooltip-url-label": ""
+        "label-url-label": "URL-etikett",
+        "placeholder-go-to-examplecom": "Gå till example.com",
+        "placeholder-httpsexamplecomvalueraw": "https://example.com/${__value.raw}",
+        "placeholder-trace-id": "traceID",
+        "title-remove-exemplar-link": "Ta bort exempel på länk",
+        "tooltip-data-source": "Datakällan som exemplet kommer att navigera till.",
+        "tooltip-internal-link": "Aktivera det här alternativet om du har en intern länk. När det är aktiverat visar detta datakällans väljare. Välj backend-spårningsdatalagret för dina exempeldata.",
+        "tooltip-label-name": "Namnet på fältet i etikettobjektet som ska användas för att hämta spårnings-ID.",
+        "tooltip-url": "URL till spårningssystemet som användaren går till för att se sin spårning",
+        "tooltip-url-label": "Används för att åsidosätta knappetiketten för fältet för exemplartrace-ID."
       },
       "exemplars-settings": {
         "add": "Lägg till",
-        "no-exemplars-configurations": "",
-        "title-exemplars": ""
+        "no-exemplars-configurations": "Inga exemplar-konfigurationer",
+        "title-exemplars": "Exemplar"
       },
       "prom-settings": {
-        "aria-label-default-editor": "",
-        "aria-label-prom-type-type": "",
-        "aria-label-prometheus-type": "",
-        "aria-label-select-http-method": "",
+        "aria-label-default-editor": "Standardredigerare (kod eller byggare)",
+        "aria-label-prom-type-type": "{{promType}} typ",
+        "aria-label-prometheus-type": "Prometheus-typ",
+        "aria-label-select-http-method": "Välj HTTP-metod",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Kod"
         },
-        "label-cache-level": "",
-        "label-custom-query-parameters": "",
-        "label-default-editor": "",
-        "label-disable-metrics-lookup": "",
-        "label-disable-recording-rules-beta": "",
-        "label-http-method": "",
-        "label-incremental-querying-beta": "",
-        "label-metric-names-suggestion-limit": "",
-        "label-prom-type-version": "",
-        "label-prometheus-type": "",
-        "label-query-overlap-window": "",
-        "label-query-timeout": "",
-        "label-scrape-interval": "",
-        "label-series-limit": "",
-        "label-use-series-endpoint": "",
-        "more-info": "",
-        "placeholder-example-maxsourceresolutionmtimeout": "",
-        "title-interval-behaviour": "",
-        "title-other": "",
+        "label-cache-level": "Cache-nivå",
+        "label-custom-query-parameters": "Anpassade frågeparametrar",
+        "label-default-editor": "Standardredigerare",
+        "label-disable-metrics-lookup": "Inaktivera sökning av mätvärden",
+        "label-disable-recording-rules-beta": "Inaktivera inspelningsregler (beta)",
+        "label-http-method": "HTTP-metod",
+        "label-incremental-querying-beta": "Inkrementell fråga (beta)",
+        "label-metric-names-suggestion-limit": "Begränsning för mätvärdesnamnförslag",
+        "label-prom-type-version": "{{promType}} version",
+        "label-prometheus-type": "Prometheus-typ",
+        "label-query-overlap-window": "Fönster för frågeöverlappning",
+        "label-query-timeout": "Timeout för fråga",
+        "label-scrape-interval": "Skrapningsintervall",
+        "label-series-limit": "Seriegräns",
+        "label-use-series-endpoint": "Använd serieändpunkt",
+        "more-info": "För mer information om hur du konfigurerar prometheustyp och -version i datakällor, se <2>provisioneringsdokumentationen</2>.",
+        "placeholder-example-maxsourceresolutionmtimeout": "Exempel: {{example}}",
+        "title-interval-behaviour": "Intervallbeteende",
+        "title-other": "Annat",
         "title-performance": "Performance",
-        "title-query-editor": "",
-        "tooltip-cache-level": "",
-        "tooltip-custom-query-parameters": "",
-        "tooltip-default-editor": "",
-        "tooltip-disable-metrics-lookup": "",
-        "tooltip-disable-recording-rules-beta": "",
-        "tooltip-http-method": "",
-        "tooltip-incremental-querying-beta": "",
-        "tooltip-metric-names-suggestion-limit": "",
-        "tooltip-prom-type-version": "",
-        "tooltip-prometheus-type": "",
-        "tooltip-query-overlap-window": "",
-        "tooltip-query-timeout": "",
-        "tooltip-scrape-interval": "",
-        "tooltip-series-limit": "",
-        "tooltip-use-series-endpoint": ""
+        "title-query-editor": "Frågeredigerare",
+        "tooltip-cache-level": "Anger webbläsarens cachelagringsnivå för redigeringsfrågor. Högre cacheinställningar rekommenderas för datakällor med hög kardinalitet.",
+        "tooltip-custom-query-parameters": "Lägg till anpassade parametrar i Prometheus fråge-URL. Till exempel {{example1}}, {{example2}}, {{example3}} eller {{example4}}. Flera parametrar ska sammanfogas med {{concatenationChar}}.",
+        "tooltip-default-editor": "Ange standardalternativ för redigerare för alla användare av den här datakällan.",
+        "tooltip-disable-metrics-lookup": "Om du markerar det här alternativet inaktiveras metrikväljaren och stödet för automatisk komplettering av metrik/etikett i sökfältet. Detta hjälper om du har prestandaproblem med större Prometheus-instanser. ",
+        "tooltip-disable-recording-rules-beta": "Denna funktion kommer att inaktivera inspelningsregler. Aktivera detta för att förbättra instrumentpanelens prestanda",
+        "tooltip-http-method": "Du kan använda antingen HTTP-metoden POST eller GET för att fråga din Prometheus-datakälla. POST är den rekommenderade metoden eftersom den tillåter större frågor. Ändra detta till GET om du har en Prometheus-version som är äldre än 2.1 eller om POST-förfrågningar är begränsade i ditt nätverk.",
+        "tooltip-incremental-querying-beta": "Denna funktion kommer att ändra standardbeteendet för relativa frågor till att alltid begära nya data från prometheus-instansen, istället kommer frågeresultat att cachelagras och endast nya poster begärs. Aktivera detta för att minska databas- och nätverksbelastningen.",
+        "tooltip-metric-names-suggestion-limit": "Maximalt antal metriknamn som kan visas som autofyllningsförslag i frågeredigerarens kodläge.",
+        "tooltip-prom-type-version": "Använd detta för att ställa in versionen av din {{promType}}-instans om den inte konfigureras automatiskt.",
+        "tooltip-prometheus-type": "Ställ in detta till typen av din prometheus-databas, t.ex. Prometheus, Cortex, Mimir eller Thanos. Om du ändrar det här fältet sparas dina nuvarande inställningar. Vissa typer av Prometheus stöder eller stöder inte olika API:er. Till exempel stöder vissa typer regex-matchning för etikettfrågor för att förbättra prestandan. Vissa typer har ett API för metadata. Om du ställer in detta felaktigt kan du uppleva konstigt beteende när du frågar efter mätvärden och etiketter. Kontrollera din Prometheus-dokumentation för att säkerställa att du anger rätt typ.",
+        "tooltip-query-overlap-window": "Ange en varaktighet som {{example1}} eller {{example2}} eller {{example3}}. Standard för {{default}}. Denna varaktighet kommer att läggas till varaktigheten för varje inkrementell begäran.",
+        "tooltip-query-timeout": "Ställ in timeout för Prometheus-fråga.",
+        "tooltip-scrape-interval": "Detta intervall anger hur ofta Prometheus skrapar målen. Ställ in detta till det typiska skrapnings- och utvärderingsintervallet som konfigurerats i din Prometheus-konfigurationsfil. Om du anger ett värde som är större än Prometheus-konfigurationsfilens intervall, kommer Grafana att bearbeta datan utifrån detta nya intervall, vilket resulterar i färre datapunkter. Standardvärdet är {{default}}.",
+        "tooltip-series-limit": "Gränsen gäller för alla resurser (mätvärden, etiketter och värden) för båda slutpunkterna (serier och etiketter). Lämna fältet tomt för att använda standardgränsen (40 000). Ställ in på 0 för att inaktivera gränsen och hämta allt – detta kan orsaka prestandaproblem. Standardgränsen är 40 000.",
+        "tooltip-use-series-endpoint": "Om du markerar det här alternativet kommer serieslutpunkten med parametern {{exampleParameter}} att prioriteras framför etikettvärdeslutpunkten med parametern {{exampleParameter}}. Även om slutpunkten för etikettvärden anses ha bättre prestanda, kan vissa användare föredra series-slutpunkten eftersom den stöder POST-metoden, medan slutpunkten för etikettvärden endast stöder GET-metoden."
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(Inaktiverad)",
+      "enabled-label": "Mätvärdesbläddrare"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Inkluderar endast unika etiketter",
+        "description-custom": "Tillhandahåll en namnmall",
+        "description-verbose": "Alla etikettnamn och värden",
+        "label-auto": "Auto",
+        "label-custom": "Anpassad",
+        "label-verbose": "Detaljerad"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Beräkna genomsnittet över dimensioner",
+        "documentation-bottomk": "Minsta k-element baserat på provvärde",
+        "documentation-count": "Räkna antalet element i vektorn",
+        "documentation-count-values": "Räkna antalet element med samma värde",
+        "documentation-group": "Alla värden i den resulterande vektorn är 1",
+        "documentation-max": "Välj maximalt över dimensioner",
+        "documentation-min": "Välj minimum över dimensioner",
+        "documentation-quantile": "Beräkna φ-kvantil (0 ≤ φ ≤ 1) över dimensioner",
+        "documentation-stddev": "Beräkna populationsstandardavvikelse över dimensioner",
+        "documentation-stdvar": "Beräkna populationsstandardvarians över dimensioner",
+        "documentation-sum": "Beräkna summan över dimensioner",
+        "documentation-topk": "Största k-element baserat på provvärde"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Returnerar indata-vektorn med alla provvärden konverterade till deras absoluta värde.",
+        "documentation-absent": "Returnerar en tom vektor om den vektor som skickas till den har några element och en 1-element vektor med värdet 1 om den vektor som skickas till den inte har några element. Det är användbart för att kunna varna när det inte finns några tidsserier för en given kombination av måttnamn och etikett.",
+        "documentation-absent-over-time": "Returnerar en tom vektor om intervallvektorn som skickas till den har några element och en 1-elementvektor med värdet 1 om intervallvektorn som skickas till den inte har några element.",
+        "documentation-avg-over-time": "Medelvärdet av alla punkter i det angivna intervallet.",
+        "documentation-ceil": "Avrundar provvärdena för alla element i ”v” uppåt till närmaste heltal.",
+        "documentation-changes": "För varje indatatidsserie returnerar ”changes(v range-vector)” antalet gånger dess värde har ändrats inom det angivna tidsintervallet, som en ögonblicksvektor.",
+        "documentation-clamp": "Begränsar provvärdena för alla element i ”v” till att ha en undre gräns på min och en övre gräns på max.",
+        "documentation-clamp-max": "Begränsar provvärdena för alla element i ”v” till att ha en övre gräns på ”max”.",
+        "documentation-clamp-min": "Begränsar provvärdena för alla element i ”v” till att ha en undre gräns på min.",
+        "documentation-count-over-time": "Antalet av alla värden i det angivna intervallet.",
+        "documentation-count-scalar": "Returnerar antalet element i en tidsserie-vektor som en skalär. Detta står i kontrast till aggregeringsoperatorn ”count()”, som alltid returnerar en vektor (en tom sådan om indatavektorn är tom) och tillåter gruppering efter etiketter via en by-sats.",
+        "documentation-day-of-month": "Returnerar dagen i månaden för var och en av de angivna tiderna i UTC. Returnerade värden är från 1 till 31.",
+        "documentation-day-of-week": "Returnerar veckodagen för var och en av de angivna tiderna i UTC. Returnerade värden är från 0 till 6, där 0 betyder söndag etc.",
+        "documentation-day-of-year": "Returnerar dagen på året för varje given tid i UTC. Värdena som returneras är från 1 till 365 för icke-skottår och från 1 till 366 för skottår.",
+        "documentation-days-in-month": "Returnerar antalet dagar i månaden för var och en av de angivna tiderna i UTC. Returnerade värden är från 28 till 31.",
+        "documentation-deg": "Konverterar radianer till grader för alla element i v",
+        "documentation-delta": "Beräknar skillnaden mellan det första och sista värdet för varje tidsserieelement i en intervallvektor ”v” och returnerar en omedelbar vektor med givna deltor och motsvarande etiketter. Deltan extrapoleras för att omfatta hela tidsintervallet som anges i intervallvektorväljaren så att det går att få ett icke-heltalresultat även om alla provvärden är heltal.",
+        "documentation-deriv": "Beräknar derivatan per sekund av tidsserien i en intervallvektor ”v” med hjälp av enkel linjär regression.",
+        "documentation-double-exponential-smoothing": "Skapar ett utjämnat värde för tidsserier baserat på intervallet i ”v”. Ju lägre utjämningsfaktorn ”sf” är, desto mer vikt ges till äldre data. Ju högre trendfaktorn ”tf” är, desto mer beaktas trender inom data. Både sf och tf måste vara mellan 0 och 1.",
+        "documentation-drop-common-labels": "Släpper alla etiketter som har samma namn och värde över alla serier i indata-vektorn.",
+        "documentation-exp": "Beräknar den exponentiella funktionen för alla element i ”v”.\nSpecialfall är:\n* ”Exp(+Inf) = +Inf” \n* ”Exp(NaN) = NaN”",
+        "documentation-floor": "Avrundar provvärdena för alla element i ”v” nedåt till närmaste heltal.",
+        "documentation-histogram-avg": "Returnerar det aritmetiska medelvärdet av observerade värden lagrade i ett internt histogram. Värden som inte är interna histogram ignoreras och visas inte i den returnerade vektorn.",
+        "documentation-histogram-count": "Returnerar antalet observationer som lagras i ett internt histogram.",
+        "documentation-histogram-fraction": "Returnerar den uppskattade andelen observationer mellan de angivna undre och övre värdena.",
+        "documentation-histogram-quantile": "Beräknar φ-kvantilen (0 ≤ φ ≤ 1) från ett histograms behållare ”b”. Värdena i ”b” är antalet observationer i varje behållare. Varje värde måste ha en etikett ”le”, där etikettvärdet anger behållarens inkluderande övre gräns. (Värden utan sådan etikett ignoreras utan att generera något felmeddelande.) Metriktypen histogram tillhandahåller automatiskt tidsserier med suffixet ”_bucket” och lämpliga etiketter.",
+        "documentation-histogram-stddev": "Returnerar den uppskattade standardavvikelsen för observationer i ett internt histogram, baserat på det geometriska medelvärdet av de behållare där observationerna finns.",
+        "documentation-histogram-stdvar": "Returnerar den uppskattade standardvariansen för observationer i ett internt histogram.",
+        "documentation-histogram-sum": "Returnerar summan för observationer som lagras i ett internt histogram.",
+        "documentation-holt-winters": "Omdöpt till double_exponential_smoothing i Prometheus v3.x. För Prometheus-versioner lika med eller större än v3.0 ska double_exponential_smoothing användas. \n\nFunktionen producerar ett utjämnat värde för tidsserier baserat på intervallet i ”v”. Ju lägre utjämningsfaktor ”sf” är, desto större vikt ges åt äldre data. Ju högre trendfaktor ”tf” är, desto mer beaktas trender i datan. Både sf och tf måste ligga mellan 0 och 1.",
+        "documentation-hour": "Returnerar timmen på dygnet i UTC för var och en av de angivna tidpunkterna. Värdena som returneras är mellan 0 och 23.",
+        "documentation-idelta": "Beräknar skillnaden mellan de två senaste värdena i intervallvektorn ”v” och returnerar en ögonblicksvektor med de givna deltavärdena och motsvarande etiketter.",
+        "documentation-increase": "Beräknar ökningen i tidsserien inom intervallvektorn. Brott i monotonin (som exempelvis räknaråterställningar på grund av målomstarter) justeras automatiskt. Ökningen extrapoleras för att täcka hela tidsintervallet som specificerats i intervallvektorsväljaren så att det är möjligt att få ett icke-heltalsresultat även om en räknare endast ökar med heltalsteg.",
+        "documentation-info": "Returnerar senaste detaljer och metadata om en grupp mätvärden, som till exempel deras etiketter och aktuella värden, utan att utföra några beräkningar",
+        "documentation-irate": "Beräknar den momentana ökningstakten per sekund för tidsserien i intervallvektorn. Denna beräkning baseras på de två senaste datapunkterna. Brott i monotonin (som exempelvis räknaråterställningar på grund av målomstarter) justeras automatiskt.",
+        "documentation-label-join": "För varje tidsserie i ”v” sammanfogas alla värden från samtliga ”src_labels” med hjälp av separator, och tidsserien returneras med etiketten ”dst_label” som innehåller det sammanfogade värdet. Denna funktion kan hantera valfritt antal ”src_labels”.",
+        "documentation-label-replace": "För varje tidsserie i ”v” matchar ”label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)” det reguljära uttrycket ”regex” mot etiketten ”src_label”. Om det finns en matchning, returneras tidsserien med etiketten ”dst_label” ersatt av expansionen av ”replacement”. ”$1” ersätts med den första matchande undergruppen, ”$2” med den andra och så vidare. Om det reguljära uttrycket inte matchar returneras tidsserien oförändrad.",
+        "documentation-last-over-time": "Det senaste punktvärdet i angivet intervall.",
+        "documentation-ln": "Beräknar den naturliga logaritmen för alla element i ”v”.\nSpecialfall är:\n * ”ln(+Inf) = +Inf”\n * ”ln(0) = -Inf”\n * ”ln(x < 0) = NaN”\n * ”ln(NaN) = NaN”",
+        "documentation-log10": "Beräknar den decimala logaritmen för alla element i ”v”. Specialfallen är ekvivalenta med dem i ”ln”.",
+        "documentation-log2": "Beräknar den binära logaritmen för alla element i ”v”. Specialfallen är ekvivalenta med dem i ”ln”.",
+        "documentation-max-over-time": "Maximivärdet av alla punkter i det angivna intervallet.",
+        "documentation-min-over-time": "Minimivärdet av alla punkter i det angivna intervallet.",
+        "documentation-minute": "Returnerar minuten i timmen för var och en av de angivna tiderna i UTC. Värdena som returneras är från 0 till 59.",
+        "documentation-month": "Returnerar månaden på året för var och en av de angivna tiderna i UTC. Värdena som returneras är från 1 till 12, där 1 betyder januari etc.",
+        "documentation-pi": "Returnerar pi",
+        "documentation-predict-linear": "Förutspår värdet på tidsserien ”t” sekunder från och med nu, baserat på intervallvektorn ”v”, med hjälp av enkel linjär regression.",
+        "documentation-present-over-time": "Värdet 1 för alla serier i det angivna intervallet.",
+        "documentation-quantile-over-time": "φ-kvantilen (0 ≤ φ ≤ 1) av värdena i det angivna intervallet.",
+        "documentation-rad": "Konverterar grader till radianer för alla element i v",
+        "documentation-rate": "Beräknar den genomsnittliga ökningstakten per sekund för tidsserien i intervallvektorn. Brott i monotonin (som exempelvis räknaråterställningar på grund av målomstarter) justeras automatiskt. Dessutom extrapolerar beräkningen till tidsintervallets ändar, vilket kompenserar för missade insamlingar eller bristfällig synkronisering mellan insamlingscykler och intervallets tidsperiod.",
+        "documentation-resets": "För varje inmatad tidsserie returnerar ”resets(v range-vector)” antalet räknaråterställningar inom det angivna tidsintervallet som en ögonblicksvektor. Varje minskning av värdet mellan två på varandra följande mätvärden tolkas som en räknaråterställning.",
+        "documentation-round": "Rundar av mätvärdena för alla element i ”v” till närmaste heltal. Lika avstånd rundas uppåt. Det valfria argumentet ”to_nearest” låter dig ange närmaste multipel som mätvärdena ska rundas till. Denna multipel kan även vara en fraktion.",
+        "documentation-scalar": "Om en indatavektor endast innehåller ett element, returnerar ”scalar(v instant-vector)” elementets värde som en skalär. Om indatavektorn inte har exakt ett element, returnerar ”scalar” värdet ”NaN”.",
+        "documentation-sgn": "Returnerar en vektor där alla mätvärden har konverterats till deras tecken, definierat på följande vis: 1 om ”v” är positivt, -1 om ”v” är negativt och 0 om ”v” är noll.",
+        "documentation-sort": "Returnerar vektorelement sorterade efter deras mätvärden, i stigande ordning.",
+        "documentation-sort-desc": "Returnerar vektorelement sorterade efter deras mätvärden, i fallande ordning.",
+        "documentation-sqrt": "Beräknar kvadratroten av alla element i ”v”.",
+        "documentation-stddev-over-time": "Populationens standardavvikelse för värdena inom det angivna intervallet.",
+        "documentation-stdvar-over-time": "Populationens standardvarians för värdena inom det angivna intervallet.",
+        "documentation-sum-over-time": "Summan av alla värden inom det angivna intervallet.",
+        "documentation-time": "Returnerar antalet sekunder sedan den 1 januari 1970 UTC. Observera att detta faktiskt inte returnerar aktuell tid, utan motsvarar den tidpunkt i förhållande till vilken uttrycket ska utvärderas.",
+        "documentation-timestamp": "Returnerar tidsstämpeln för varje mätvärde i den angivna vektorn som antalet sekunder sedan den 1 januari 1970 UTC.",
+        "documentation-vector": "Returnerar skalaren ”s” som en vektor utan etiketter.",
+        "documentation-year": "Returnerar året för var och en av de angivna tiderna i UTC."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "beräknar arccos för alla element i {{argument}}",
+        "documentation-acosh": "beräknar inversa hyperboliska cosinus för alla element i {{argument}}",
+        "documentation-asin": "beräknar arcsin för alla element i {{argument}}",
+        "documentation-asinh": "beräknar inversa hyperboliska sinus för alla element i {{argument}}",
+        "documentation-atan": "beräknar arctan för alla element i {{argument}}",
+        "documentation-atanh": "beräknar inversa hyperboliska tangens för alla element i {{argument}}",
+        "documentation-cos": "beräknar cos för alla element i {{argument}}",
+        "documentation-cosh": "beräknar hyperboliska cosinus för alla element i {{argument}}",
+        "documentation-sin": "beräknar sin för alla element i {{argument}}",
+        "documentation-sinh": "beräknar hyperboliska sinus för alla element i {{argument}}",
+        "documentation-tan": "beräknar tan för alla element i {{argument}}",
+        "documentation-tanh": "beräknar hyperboliska tangens för alla element i {{argument}}"
       }
     },
     "querybuilder": {
       "feedback-link": {
         "give-feedback": "Ge feedback",
-        "title-give-feedback": ""
+        "title-give-feedback": "Metrics Explorer är ny – berätta gärna hur vi kan förbättra den"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Exempel: {{value}}",
+        "format": "Format: {{value}}",
+        "legend": "Förklaring: {{value}}",
+        "step": "Steg: {{value}}",
+        "type": "Typ: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Sök mätvärden efter namn",
+        "type": "Filtrera efter typ"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Ett kumulativt mätvärde som representerar ett enda monotont ökande räknare vars värde endast kan ökas eller återställas till noll vid omstart.",
+        "description-gauge": "Ett mätvärde som representerar ett enda numeriskt värde som godtyckligt kan gå upp och ner.",
+        "description-histogram": "Ett histogram samplar observationer (vanligtvis sådant som förfrågningstider eller svarstorlekar) och räknar dem i konfigurerbara fack.",
+        "description-native-histogram": "Inbyggda histogram skiljer sig från klassiska Prometheus-histogram på flera sätt: Gränserna för inbyggda histogramfack beräknas med en formel som beror på det inbyggda histogrammets skala (upplösning) och är inte användardefinierade.",
+        "description-no-type": "Dessa mätvärden har ingen definierad typ i metadata.",
+        "description-summary": "En sammanställning samplar observationer (vanligtvis sådant som förfrågningstider och svarstorlekar) och kan beräkna konfigurerbara kvantiler över ett glidande tidsfönster.",
+        "description-unknown": "Dessa mätvärden har fått typen okänd i metadata.",
+        "label-counter": "Räknare",
+        "label-gauge": "Mätare",
+        "label-histogram": "Histogram",
+        "label-native-histogram": "Inbyggt histogram",
+        "label-no-type": "Ingen typ",
+        "label-summary": "Sammanfattning",
+        "label-unknown": "Okänt"
       },
       "handle-function": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "Tolkningen av frågan är tvetydig."
         }
       },
       "label-filter-item": {
-        "aria-label-remove": "",
-        "placeholder-select-label": "",
+        "aria-label-remove": "Ta bort {{name}}",
+        "placeholder-select-label": "Välj etikett",
         "placeholder-select-value": "Välj värde"
       },
       "label-filters": {
-        "label-filters": "",
-        "label-label-filters": "",
-        "tooltip-label-filters": ""
+        "label-filters": "Etikettfilter",
+        "label-label-filters": "Etikettfilter",
+        "tooltip-label-filters": "Valfritt: används för att filtrera det metriska valet för denna frågetyp."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Läser in etiketter",
+        "noOptionsMessage-no-labels-found": "Inga etiketter hittades"
       },
       "metric-combobox": {
         "async-select": {
-          "aria-label-open-metrics-explorer": "",
-          "placeholder-select-metric": "",
-          "tooltip-open-metrics-explorer": ""
+          "aria-label-open-metrics-explorer": "Öppna Metrics Explorer",
+          "placeholder-select-metric": "Välj mätvärde",
+          "tooltip-open-metrics-explorer": "Öppna Metrics Explorer"
         },
         "label-metric": "Mått",
-        "tooltip-metric": ""
+        "tooltip-metric": "Valfritt: returnerar en lista över etikettvärden för etikettnamnet i det angivna mätvärdet."
       },
       "metrics-modal": {
-        "aria-label-browse-metrics": "",
-        "currently-selected": "",
-        "metrics-pre-filtered": "",
-        "title-metrics-explorer": ""
+        "aria-label-browse-metrics": "Bläddra bland mätvärden",
+        "currently-selected": "För närvarande valt: {{selected}}",
+        "metrics-pre-filtered": "Mätvärdena har filtrerats i förväg med hjälp av de etiketter som valts i etikettfiltren.",
+        "title-metrics-explorer": "Metrics Explorer"
       },
       "nested-query": {
         "label": {
-          "ignoring": "",
+          "ignoring": "Ignorerar",
           "on": "På"
         },
         "operator": "Operatör",
-        "tooltip-remove-match": "",
-        "vector-matches": ""
+        "tooltip-remove-match": "Ta bort matchning",
+        "vector-matches": "Vektormatchningar"
       },
       "operation-editor": {
-        "not-found": "",
-        "title-remove": ""
+        "not-found": "Operationen {{id}} hittades inte",
+        "title-remove": "Ta bort {{name}}"
       },
       "operation-header": {
         "placeholder-replace-with": "Ersätt med",
-        "title-click-to-view-alternative-operations": "",
-        "title-remove-operation": ""
+        "title-click-to-view-alternative-operations": "Klicka för att visa alternativa åtgärder",
+        "title-remove-operation": "Ta bort operation"
       },
       "operation-info-button": {
-        "title-click-to-show-description": "",
-        "title-remove-operation": ""
+        "title-click-to-show-description": "Klicka för att visa beskrivning",
+        "title-remove-operation": "Ta bort operation"
       },
       "operation-list": {
-        "operations": "",
+        "operations": "Operationer",
         "placeholder-search": "Sök",
-        "title-add-operation": ""
+        "title-add-operation": "Lägg till operation"
       },
       "operation-param-editor": {
-        "title-add": "",
-        "title-remove": ""
+        "title-add": "Lägg till {{name}}",
+        "title-remove": "Ta bort {{name}}"
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "Beräknar {{aggregationName}} över dimensioner och bevarar samtidigt {{labelWord}} {{labels}}.",
+          "label-default": "Beräknar {{aggregationName}} över dimensionerna.",
+          "label-without": "Beräknar {{aggregationName}} över dimensionerna {{labels}}. Alla andra etiketter bevaras."
         }
       },
       "prom-query-builder-options": {
-        "aria-label-lower-limit-parameter": "",
-        "aria-label-select-resolution": "",
+        "aria-label-lower-limit-parameter": "Ställ in nedre gräns för stegparametern",
+        "aria-label-select-resolution": "Välj upplösning",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Värmekarta",
+          "label-table": "Tabell",
+          "label-time-series": "Tidsserier"
         },
-        "label-exemplars": "",
+        "label-exemplars": "Exemplar",
         "label-format": "Format",
-        "label-min-step": "",
-        "label-resolution": "",
+        "label-min-step": "Minsta steg",
+        "label-resolution": "Lösning ",
         "label-type": "Typ",
-        "placeholder-auto": "",
+        "placeholder-auto": "auto",
         "title-options": "Alternativ",
-        "tooltip-min-step": ""
+        "tooltip-min-step": "En ytterligare nedre gräns för stegparametern för Prometheus-frågan och för variablerna <2>{{interval}}</2> och <4>{{rateInterval}}</4>."
       },
       "prom-query-code-editor-autocomplete-info": {
-        "autocomplete-suggestions-limited": "",
-        "tooltip-autocomplete-suggestions-limited": ""
+        "autocomplete-suggestions-limited": "Antalet förslag vid autofyllning är begränsat",
+        "tooltip-autocomplete-suggestions-limited": "Antalet metriknamn är fler än vad som kan visas med autofyllning. De {{autocompleteLimit}} mest relevanta mätvärdena visas. Du kan justera tröskelvärdet i datakällans inställningar."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Det finns ett syntaxfel, eller så kan frågestrukturen inte visualiseras när du byter till byggläget. Delar av frågan kan gå förlorade.",
+        "confirmText-continue": "Fortsätt",
         "kick-start-your-query": "Kickstarta din fråga",
-        "label-explain": "",
-        "run-queries": "",
-        "title-parsing-error-switch-builder": ""
+        "label-explain": "Förklara",
+        "run-queries": "Kör frågor",
+        "title-parsing-error-switch-builder": "Tolkningsfel: Vill du byta till byggläget?"
       },
       "prom-query-legend-editor": {
-        "label-legend": "",
-        "placeholder-select-legend-mode": "",
-        "tooltip-legend": ""
+        "label-legend": "Förklaringar",
+        "placeholder-select-legend-mode": "Välj förklaringsläge",
+        "tooltip-legend": "Åsidosätt serienamn eller mall. Ex. {{templateExample}} kommer att ersättas med etikettvärdet för {{labelName}}."
       },
       "query-builder-hints": {
-        "hint-details": ""
+        "hint-details": "tips: {{hintDetails}}"
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Kod"
         }
       },
       "query-pattern": {
-        "apply-query": "",
-        "aria-label-apply-query-starter-button": "",
-        "aria-label-back-button": "",
-        "aria-label-create-new-query-button": "",
-        "aria-label-raw-query": "",
-        "aria-label-use-this-query-button": "",
+        "apply-query": "Tillämpa fråga",
+        "aria-label-apply-query-starter-button": "knapp för att tillämpa förvald fråga",
+        "aria-label-back-button": "bakåtknapp",
+        "aria-label-create-new-query-button": "knapp för att skapa ny fråga",
+        "aria-label-raw-query": "{{patternName}} rå fråga",
+        "aria-label-use-this-query-button": "använd denna frågeknapp",
         "back": "Tillbaka",
-        "create-new-query": "",
+        "create-new-query": "Skapa ny fråga",
         "use-this-query": "Använd denna fråga"
       },
       "query-patterns-modal": {
-        "aria-label-close-kick-start-your-query-modal": "",
+        "aria-label-close-kick-start-your-query-modal": "stäng dialogrutan för snabbstart för frågor",
         "aria-label-kick-start-your-query-modal": "Kickstarta din frågemodal",
-        "aria-label-toggle-query-starter": "",
+        "aria-label-toggle-query-starter": "öppna och stäng {{patternType}}-frågestartarkortet",
         "close": "Stäng",
-        "description-kick-start-your-query": "",
-        "label-toggle-query-starter": "",
+        "description-kick-start-your-query": "Snabbstarta din fråga genom att välja en av dessa frågor. Du kan sedan fortsätta att färdigställa din fråga.",
+        "label-toggle-query-starter": "{{patternType}}-frågestartare",
         "title-kick-start-your-query": "Kickstarta din fråga"
       },
       "raw-query": {
-        "aria-label-selector": ""
+        "aria-label-selector": "väljare"
       },
       "results-table": {
-        "content-descriptive-type": "",
+        "content-descriptive-type": "När du skapar en {{descriptiveType}} visar Prometheus flera dataserier av typen räknare. ",
         "description": "Beskrivning",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Inga mätvärden hittades. Försök att utöka dina etikettfilter.",
+        "message-expand-search": "Inga mätvärden hittades. Försök att utöka din sökning och dina filter.",
+        "message-no-metrics-found": "Inga mätvärden hittades i datakällan.",
         "name": "Namn",
         "type": "Typ"
       },
       "update-function-args": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "Tolkningen av frågan är tvetydig."
         }
       }
     }
diff --git a/packages/grafana-prometheus/src/locales/tr-TR/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/tr-TR/grafana-prometheus.json
index 9aa271d54fe..fe00c74f287 100644
--- a/packages/grafana-prometheus/src/locales/tr-TR/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/tr-TR/grafana-prometheus.json
@@ -2,496 +2,496 @@
   "grafana-prometheus": {
     "components": {
       "annotation-query-editor": {
-        "annotation-data-load-error": "",
-        "aria-label-lower-limit-parameter": "",
-        "label-min-step": "",
-        "label-series-value-as-timestamp": "",
+        "annotation-data-load-error": "Ek açıklama verisi yükleme hatası!",
+        "aria-label-lower-limit-parameter": "Adım parametresi için alt sınırı ayarlayın",
+        "label-min-step": "Min. adım",
+        "label-series-value-as-timestamp": "Zaman damgası olarak seri değeri",
         "label-tags": "Etiketler",
-        "label-text": "",
+        "label-text": "Metin",
         "label-title": "Başlık",
-        "placeholder-auto": "",
-        "tooltip-either-pattern-example-instance-replaced-label": "",
-        "tooltip-min-step": "",
-        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": ""
+        "placeholder-auto": "otomatik",
+        "tooltip-either-pattern-example-instance-replaced-label": "Adı ya da bir deseni kullanın. Örneğin {{labelTemplate}}, {{labelName}} etiketinin değeriyle değiştirilir.",
+        "tooltip-min-step": "Prometheus sorgusunun step (adım) parametresi ve <2>{{intervalVar}}</2> ile <4>{{rateIntervalVar}}</4> değişkenleri için ek bir alt sınırdır.",
+        "tooltip-timestamp-milliseconds-series-value-seconds-multiply": "Zaman damgasının birimi milisaniyedir. Seri değeri saniye cinsindense aralık vektörünü 1000 ile çarpın."
       },
       "get-query-type-options": {
         "description": {
-          "instant-query-range": ""
+          "instant-query-range": "Anlık (Instant) ve Aralık (Range) sorgusu çalıştırın"
         },
         "label": {
-          "both": ""
+          "both": "Her ikisi de"
         },
         "range-options": {
           "description": {
-            "query-range": ""
+            "query-range": "Sorguyu belirli bir zaman aralığında çalıştırın"
           },
           "label": {
-            "instant": "",
-            "range": ""
+            "instant": "Anlık",
+            "range": "Aralık"
           }
         }
       },
       "label-selector": {
-        "aria-label-filter-expression-for-label": "",
-        "description-select-labels": "",
-        "select-labels-to-search-in": ""
+        "aria-label-filter-expression-for-label": "Etiket için ifadeyi filtrele",
+        "description-select-labels": "Etiket değerleri seçildikten sonra yalnızca olası etiket kombinasyonları gösterilir.",
+        "select-labels-to-search-in": "2. Arama yapılacak etiketleri seçin"
       },
       "metric-selector": {
-        "aria-label-filter-expression-for-metric": "",
-        "aria-label-limit-results-from-series-endpoint": "",
-        "description-series-limit": "",
-        "label-select-metric": "",
-        "select-a-metric": "",
-        "series-limit": ""
+        "aria-label-filter-expression-for-metric": "Metrik için ifadeyi filtrele",
+        "aria-label-limit-results-from-series-endpoint": "Seri uç noktasından gelen sonuçları sınırla",
+        "description-series-limit": "Sınır, tüm metrikler, etiketler ve değerlere uygulanır. Varsayılan sınırı kullanmak için alanı boş bırakın. Sınırı devre dışı bırakmak ve tüm verileri getirmek için 0 olarak ayarlayın, bu ayar performans sorunlarına yol açabilir.",
+        "label-select-metric": "Bir metrik seçildiğinde yalnızca olası etiketler gösterilir. Etiketler, aşağıdaki seri sınırıyla sınırlıdır.",
+        "select-a-metric": "1. Bir metrik seçin",
+        "series-limit": "Seri sınırı"
       },
       "prom-cheat-sheet": {
-        "prom-ql-cheat-sheet": ""
+        "prom-ql-cheat-sheet": "PromQL Hızlı Referans"
       },
       "prom-exemplar-field": {
-        "exemplars": "",
-        "tooltip-disable-query": "",
-        "tooltip-enable-query": ""
+        "exemplars": "Örnekler",
+        "tooltip-disable-query": "Örnek içeren sorguyu devre dışı bırak",
+        "tooltip-enable-query": "Örnek içeren sorguyu etkinleştir"
       },
       "prom-explore-extra-field": {
-        "aria-label-prometheus-extra-field": "",
-        "aria-label-query-type-field": "",
-        "aria-label-step-field": "",
-        "min-step": "",
-        "query-type": "",
-        "tooltip-units-builtin-variables-example-interval-rateinterval": ""
+        "aria-label-prometheus-extra-field": "Prometheus ekstra alanı",
+        "aria-label-query-type-field": "Sorgu türü alanı",
+        "aria-label-step-field": "Adım alanı",
+        "min-step": "Min. adım",
+        "query-type": "Sorgu türü",
+        "tooltip-units-builtin-variables-example-interval-rateinterval": "Burada zaman birimleri ve yerleşik değişkenler kullanılabilir. Örneğin: {{example1}}, {{example2}}, {{example3}}, {{example4}}, {{example5}}, {{example6}}, {{example7}} (Bir birim belirtilmezse varsayılan: {{default}})"
       },
       "prom-query-field": {
-        "placeholder-enter-a-prom-ql-query": ""
+        "placeholder-enter-a-prom-ql-query": "Bir PromQL sorgusu girin…"
       },
       "prom-variable-query-editor": {
-        "aria-label-classic-query": "",
-        "aria-label-metric-regex": "",
-        "aria-label-metric-selector": "",
-        "aria-label-prometheus-query": "",
-        "aria-label-query-type": "",
-        "aria-label-series-query": "",
-        "label-classic-query": "",
+        "aria-label-classic-query": "Klasik Sorgu",
+        "aria-label-metric-regex": "Metrik düzenli ifadesi",
+        "aria-label-metric-selector": "Metrik seçici",
+        "aria-label-prometheus-query": "Prometheus Sorgusu",
+        "aria-label-query-type": "Sorgu türü",
+        "aria-label-series-query": "Seri Sorgusu",
+        "label-classic-query": "Klasik Sorgu",
         "label-label": "Etiket",
-        "label-metric-regex": "",
+        "label-metric-regex": "Metrik düzenli ifadesi",
         "label-query": "Sorgu",
-        "label-query-type": "",
-        "label-series-query": "",
-        "placeholder-classic-query": "",
-        "placeholder-metric-regex": "",
-        "placeholder-prometheus-query": "",
+        "label-query-type": "Sorgu türü",
+        "label-series-query": "Seri Sorgusu",
+        "placeholder-classic-query": "Klasik Sorgu",
+        "placeholder-metric-regex": "Metrik düzenli ifadesi",
+        "placeholder-prometheus-query": "Prometheus Sorgusu",
         "placeholder-select-query-type": "Sorgu türünü seçin",
-        "placeholder-series-query": "",
-        "returns-metrics-matching-specified-metric-regex": "",
-        "tooltip-classic-query": "",
-        "tooltip-label": "",
-        "tooltip-metric-regex": "",
-        "tooltip-query": "",
-        "tooltip-query-type": "",
-        "tooltip-series-query": ""
+        "placeholder-series-query": "Seri Sorgusu",
+        "returns-metrics-matching-specified-metric-regex": "Belirtilen metrik düzenli ifadesiyle eşleşen metriklerin listesi.",
+        "tooltip-classic-query": "Prometheus değişken sorgu düzenleyicisinin orijinal uygulaması. Bu belgelerde açıklanan doğru sorgu türü ve parametrelerle bir dize girin. Örneğin {{exampleQuery}}.",
+        "tooltip-label": "Bir metrik belirtilmedikçe tüm metriklerdeki etiket adı için etiket değerlerinin bir listesini döndürür.",
+        "tooltip-metric-regex": "Belirtilen metrik düzenli ifadesine göre isteğe bağlı filtreleme yaparak etiket adlarının bir listesini döndürür.",
+        "tooltip-query": "Sorgu için Prometheus sorgu sonuçlarının bir listesini döndürür. Bu sorgular Prometheus işlevlerini içerebilir, örneğin {{exampleQuery}}.",
+        "tooltip-query-type": "Prometheus veri kaynağı eklentisi, şablon değişkenleri için aşağıdaki sorgu türlerini sağlar.",
+        "tooltip-series-query": "Bir metrik ve etiketlerle, yalnızca metrik ya da yalnızca etiketlerle birlikte bir değer girin. Örneğin {{example1}}, {{example2}} veya {{example3}}. Girilen verilerle ilişkili zaman serilerinin bir listesini döndürür."
       },
       "selector-actions": {
-        "aria-label-selector": "",
-        "aria-label-selector-clear-button": "",
-        "aria-label-use-selector-as-metrics-button": "",
-        "aria-label-use-selector-for-query-button": "",
-        "aria-label-validate-submit-button": "",
+        "aria-label-selector": "seçici",
+        "aria-label-selector-clear-button": "Seçici temizleme düğmesi",
+        "aria-label-use-selector-as-metrics-button": "Seçiciyi metrik olarak kullan düğmesi",
+        "aria-label-use-selector-for-query-button": "Sorgu için seçiciyi kullan düğmesi",
+        "aria-label-validate-submit-button": "Gönder düğmesini doğrula",
         "clear": "Temizle",
-        "resulting-selector": "",
-        "use-as-rate-query": "",
-        "use-query": "",
-        "validate-selector": ""
+        "resulting-selector": "4. Oluşan seçici",
+        "use-as-rate-query": "Oran (rate) sorgusu olarak kullan",
+        "use-query": "Sorguyu kullan",
+        "validate-selector": "Seçiciyi doğrula"
       },
       "value-selector": {
-        "aria-label-filter-expression-for-label-values": "",
-        "aria-label-values-for": "",
-        "description-search-field-values-across-selected-labels": "",
-        "select-multiple-values-for-your-labels": ""
+        "aria-label-filter-expression-for-label-values": "Etiket değerleri için ifadeyi filtreleyin",
+        "aria-label-values-for": "{{labelKey}} değerleri",
+        "description-search-field-values-across-selected-labels": "Seçilen etiketler arasında değer bulmak için arama alanını kullanın.",
+        "select-multiple-values-for-your-labels": "3. Etiketleriniz için (birden fazla) değer seçin"
       }
     },
     "configuration": {
       "alerting-settings-overhaul": {
-        "label-allow-as-recording-rules-target": "",
-        "label-manage-alerts-via-alerting-ui": "",
+        "label-allow-as-recording-rules-target": "Kayıt kuralları hedefi olarak seçilmesine izin ver",
+        "label-manage-alerts-via-alerting-ui": "Uyarıları, Uyarı Sistemi Arayüzü üzerinden yönetin",
         "title-alerting": "Uyarı sistemi",
-        "tooltip-allow-as-recording-rules-target": "",
+        "tooltip-allow-as-recording-rules-target": "Kayıt kuralları yazmak için bu veri kaynağının hedef olarak seçilmesine izin verin.",
         "tooltip-manage-alerts-via-alerting-ui": "Bu veri kaynağı için uyarı kurallarını yönetin. Diğer Alerting kaynaklarını yönetmek için bir Alertmanager veri kaynağı ekleyin."
       },
       "config-editor": {
-        "browser-access-mode-error": "",
-        "description-advanced-settings": "",
+        "browser-access-mode-error": "Prometheus veri kaynağında tarayıcı erişim modu artık kullanılamamaktadır. Sunucu erişim moduna geçin.",
+        "description-advanced-settings": "Ek ayarlar, veri kaynağınız üzerinde daha fazla kontrol sağlamak için yapılandırılabilen isteğe bağlı ayarlardır.",
         "title-advanced-settings": "Gelişmiş ayarlar",
         "title-error": "Hata"
       },
       "data-source-http-settings-overhaul": {
         "tooltip-browser-access-mode": "Erişim yönteminizin <1>Browser</1> olması, URL'nin tarayıcıdan erişilebilir olması gerektiği anlamına gelir.",
-        "tooltip-http-url": "",
+        "tooltip-http-url": "Tam bir HTTP URL'si belirtin (örneğin {{exampleURL}})",
         "tooltip-server-access-mode": "Erişim yönteminizin <1>Server</1> olması URL'nin Grafana arka uç/sunucusundan erişilebilir olması gerektiği anlamına gelir."
       },
       "docs-tip": {
-        "visit-docs-for-more-details-here": ""
+        "visit-docs-for-more-details-here": "Daha fazla ayrıntı için belgelere göz atın."
       },
       "exemplar-setting": {
         "label-data-source": "Veri kaynağı",
-        "label-internal-link": "",
+        "label-internal-link": "Dâhilî bağlantı",
         "label-label-name": "Etiket adı",
-        "label-remove-exemplar-link": "",
+        "label-remove-exemplar-link": "Örnek bağlantıyı kaldır",
         "label-url": "URL",
-        "label-url-label": "",
-        "placeholder-go-to-examplecom": "",
-        "placeholder-httpsexamplecomvalueraw": "",
-        "placeholder-trace-id": "",
-        "title-remove-exemplar-link": "",
-        "tooltip-data-source": "",
-        "tooltip-internal-link": "",
-        "tooltip-label-name": "",
-        "tooltip-url": "",
-        "tooltip-url-label": ""
+        "label-url-label": "URL Etiketi",
+        "placeholder-go-to-examplecom": "example.com adresine gidin",
+        "placeholder-httpsexamplecomvalueraw": "https://example.com/${__value.raw}",
+        "placeholder-trace-id": "izleme kimliği",
+        "title-remove-exemplar-link": "Örnek bağlantıyı kaldır",
+        "tooltip-data-source": "Örneğin yönlendireceği veri kaynağı.",
+        "tooltip-internal-link": "Dâhilî bir bağlantınız varsa bu seçeneği etkinleştirin. Etkinleştirildiğinde veri kaynağı seçici görünür hâle gelir. Örnek veriniz için arka uç izleme veri deposunu seçin.",
+        "tooltip-label-name": "İzleme kimliğimi almak için kullanılacak etiketler nesnesindeki alanın adı.",
+        "tooltip-url": "Kullanıcının izlemeyi görebileceği izleme arka ucunun URL'si",
+        "tooltip-url-label": "Örnek izleme kimliği alanındaki düğme etiketini geçersiz kılmak için kullanılır."
       },
       "exemplars-settings": {
         "add": "Ekle",
-        "no-exemplars-configurations": "",
-        "title-exemplars": ""
+        "no-exemplars-configurations": "Örnek yapılandırma yok",
+        "title-exemplars": "Örnekler"
       },
       "prom-settings": {
-        "aria-label-default-editor": "",
-        "aria-label-prom-type-type": "",
-        "aria-label-prometheus-type": "",
-        "aria-label-select-http-method": "",
+        "aria-label-default-editor": "Varsayılan Düzenleyici (Kod veya Oluşturucu)",
+        "aria-label-prom-type-type": "{{promType}} tür",
+        "aria-label-prometheus-type": "Prometheus türü",
+        "aria-label-select-http-method": "HTTP yöntemini seçin",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Oluşturucu",
+          "label-code": "Kod"
         },
-        "label-cache-level": "",
-        "label-custom-query-parameters": "",
-        "label-default-editor": "",
-        "label-disable-metrics-lookup": "",
-        "label-disable-recording-rules-beta": "",
-        "label-http-method": "",
-        "label-incremental-querying-beta": "",
-        "label-metric-names-suggestion-limit": "",
-        "label-prom-type-version": "",
-        "label-prometheus-type": "",
-        "label-query-overlap-window": "",
-        "label-query-timeout": "",
-        "label-scrape-interval": "",
-        "label-series-limit": "",
-        "label-use-series-endpoint": "",
-        "more-info": "",
-        "placeholder-example-maxsourceresolutionmtimeout": "",
-        "title-interval-behaviour": "",
-        "title-other": "",
+        "label-cache-level": "Önbellek seviyesi",
+        "label-custom-query-parameters": "Özel sorgu parametreleri",
+        "label-default-editor": "Varsayılan düzenleyici",
+        "label-disable-metrics-lookup": "Metrik aramayı devre dışı bırak",
+        "label-disable-recording-rules-beta": "Kayıt kurallarını devre dışı bırak (beta)",
+        "label-http-method": "HTTP yöntemi",
+        "label-incremental-querying-beta": "Artımlı sorgulama (beta)",
+        "label-metric-names-suggestion-limit": "Metrik adları öneri sınırı",
+        "label-prom-type-version": "{{promType}} sürümü",
+        "label-prometheus-type": "Prometheus türü",
+        "label-query-overlap-window": "Sorgu çakışma penceresi",
+        "label-query-timeout": "Sorgu zaman aşımı",
+        "label-scrape-interval": "Kazıma aralığı",
+        "label-series-limit": "Seri sınırı",
+        "label-use-series-endpoint": "Seri uç noktasını kullan",
+        "more-info": "Prometheus türü ve sürümünü veri kaynaklarında yapılandırma hakkında daha fazla bilgi için <2>sağlama belgelerine</2> bakın.",
+        "placeholder-example-maxsourceresolutionmtimeout": "Örnek: {{example}}",
+        "title-interval-behaviour": "Aralık davranışı",
+        "title-other": "Diğer",
         "title-performance": "Performans",
-        "title-query-editor": "",
-        "tooltip-cache-level": "",
-        "tooltip-custom-query-parameters": "",
-        "tooltip-default-editor": "",
-        "tooltip-disable-metrics-lookup": "",
-        "tooltip-disable-recording-rules-beta": "",
-        "tooltip-http-method": "",
-        "tooltip-incremental-querying-beta": "",
-        "tooltip-metric-names-suggestion-limit": "",
-        "tooltip-prom-type-version": "",
-        "tooltip-prometheus-type": "",
-        "tooltip-query-overlap-window": "",
-        "tooltip-query-timeout": "",
-        "tooltip-scrape-interval": "",
-        "tooltip-series-limit": "",
-        "tooltip-use-series-endpoint": ""
+        "title-query-editor": "Sorgu düzenleyicisi",
+        "tooltip-cache-level": "Düzenleyici sorguları için tarayıcı önbelleğe alma düzeyini ayarlar. Yüksek ayırt ediciliğe sahip veri kaynakları için daha yüksek önbellek ayarları önerilir.",
+        "tooltip-custom-query-parameters": "Prometheus sorgu URL'sine özel parametreler ekleyin. Örneğin {{example1}}, {{example2}}, {{example3}} veya {{example4}}. Birden fazla parametre, {{concatenationChar}} karakteri ile birleştirilmelidir.",
+        "tooltip-default-editor": "Bu veri kaynağının tüm kullanıcıları için varsayılan düzenleyici seçeneğini ayarlayın.",
+        "tooltip-disable-metrics-lookup": "Bu seçeneği işaretlemek, metrik seçicisini ve sorgu alanındaki metrik/etiket desteğini otomatik tamamlama özelliğinde devre dışı bırakır. Bu, büyük Prometheus örneklerinde yaşanan performans sorunlarına yardımcı olabilir. ",
+        "tooltip-disable-recording-rules-beta": "Bu özellik, kayıt kurallarını devre dışı bırakacaktır. Pano performansını artırmak için bu seçeneği etkinleştirin",
+        "tooltip-http-method": "Prometheus veri kaynağınızı sorgulamak için POST veya GET HTTP yöntemini kullanabilirsiniz. POST, daha büyük sorgulara izin verdiği için önerilen yöntemdir. Prometheus sürümünüz 2.1'den eskiyse ya da ağınızda POST istekleri kısıtlıysa bunu GET olarak değiştirin.",
+        "tooltip-incremental-querying-beta": "Bu özellik, göreli sorguların varsayılan davranışını değiştirerek Prometheus örneğinden her zaman güncel veri istenmesini sağlar. Bunun yerine, sorgu sonuçları önbelleğe alınır ve yalnızca yeni kayıtlar istenir. Veri tabanı ve ağ yükünü azaltmak için bu özelliği etkinleştirin.",
+        "tooltip-metric-names-suggestion-limit": "Kod modundaki sorgu düzenleyicide otomatik tamamlama önerisi olarak görünebilecek maksimum metrik adı sayısı.",
+        "tooltip-prom-type-version": "{{promType}} örneğinizin sürümü otomatik olarak yapılandırılmamışsa bunu burada ayarlayın.",
+        "tooltip-prometheus-type": "Veri tabanınızın türünü burada belirtin, örneğin: Prometheus, Cortex, Mimir veya Thanos. Bu alanı değiştirdiğinizde mevcut ayarlarınız kaydedilecektir. Bazı Prometheus türleri çeşitli API'leri destekler veya desteklemez. Örneğin bazı türler, etiket sorgularında performansı artırmak için düzenli ifade eşlemesini destekler. Bazı türlerin meta veriler için bir API'si vardır. Bu ayarı yanlış yaparsanız metrik ve etiket sorgularında beklenmedik davranışlarla karşılaşabilirsiniz. Lütfen doğru türü girdiğinizden emin olmak için Prometheus belgelerinizi kontrol edin.",
+        "tooltip-query-overlap-window": "Süreyi {{example1}}, {{example2}} veya {{example3}} biçiminde ayarlayın. Varsayılan ayar {{default}}. Bu süre, her artımlı isteğin süresine eklenecektir.",
+        "tooltip-query-timeout": "Prometheus sorgu zaman aşımını ayarlayın.",
+        "tooltip-scrape-interval": "Bu aralık, Prometheus'un hedefleri ne sıklıkla sorguladığını belirtir. Bunu, Prometheus yapılandırma dosyanızda tanımlanan tipik sorgulama ve değerlendirme aralığına göre ayarlayın. Bu değeri Prometheus yapılandırma dosyasındaki aralıktan daha büyük ayarlarsanız Grafana verileri bu aralığa göre değerlendirir ve daha az veri noktası görürsünüz. Varsayılan ayar {{default}}.",
+        "tooltip-series-limit": "Sınır, her iki uç nokta (seri ve etiketler) için tüm kaynaklara (metrikler, etiketler ve değerler) uygulanır. Bu alanı boş bırakırsanız varsayılan sınır olan 40000 kullanılır. Sınırı devre dışı bırakmak ve tüm verileri getirmek için 0 olarak ayarlayın; bu ayar performans sorunlarına yol açabilir. Varsayılan sınır 40000'dir.",
+        "tooltip-use-series-endpoint": "Bu seçeneği işaretlemek, {{exampleParameter}} parametresine sahip seri uç noktasını, {{exampleParameter}} parametresine sahip etiket değerleri uç noktası yerine tercih eder. Etiket değerleri uç noktası genellikle daha yüksek performanslı kabul edilirken, bazı kullanıcılar seri uç noktasını tercih edebilir çünkü bu uç nokta POST yöntemini desteklerken etiket değerleri yalnızca GET yöntemini destekler."
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "(Devre dışı)",
+      "enabled-label": "Metrik tarayıcı"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "Yalnızca benzersiz etiketleri içerir",
+        "description-custom": "Bir adlandırma şablonu sağlayın",
+        "description-verbose": "Tüm etiket adları ve değerleri",
+        "label-auto": "Otomatik",
+        "label-custom": "Özel",
+        "label-verbose": "Ayrıntılı"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "Boyutlar üzerinden ortalamayı hesaplayın",
+        "documentation-bottomk": "Örnek değere göre en küçük k öğeleri",
+        "documentation-count": "Vektördeki öğe sayısını say",
+        "documentation-count-values": "Aynı değere sahip öğelerin sayısını say",
+        "documentation-group": "Ortaya çıkan vektördeki tüm değerler 1'dir",
+        "documentation-max": "Boyutlar üzerinden maksimumu seçin",
+        "documentation-min": "Boyutlar üzerinden minimumu seçin",
+        "documentation-quantile": "Boyutlar üzerinden φ-kuantili (0 ≤ φ ≤ 1) hesaplayın",
+        "documentation-stddev": "Boyutlar üzerinden popülasyon standart sapmasını hesaplayın",
+        "documentation-stdvar": "Boyutlar üzerinden popülasyon standart varyansını hesaplayın",
+        "documentation-sum": "Boyutlar üzerinden toplamı hesaplayın",
+        "documentation-topk": "Örnek değere göre en büyük k öğeleri"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "Tüm örnek değerleri mutlak değerlerine dönüştürülmüş girdi vektörünü verir.",
+        "documentation-absent": "Kendisine geçirilen vektörün herhangi bir öğesi varsa boş bir vektör ve kendisine geçirilen vektörün hiçbir öğesi yoksa değeri 1 olan 1 öğeli bir vektör verir. Bu, belirli bir metrik adı ve etiket kombinasyonu için zaman serisi olmadığında uyarı vermek için kullanışlıdır.",
+        "documentation-absent-over-time": "Kendisine geçirilen aralık vektörünün herhangi bir öğesi varsa boş bir vektör ve kendisine geçirilen aralık vektörünün hiçbir öğesi yoksa değeri 1 olan 1 öğeli bir vektör verir.",
+        "documentation-avg-over-time": "Belirtilen aralıktaki tüm noktaların ortalama değeri.",
+        "documentation-ceil": "`v` içindeki tüm öğelerin örnek değerlerini bir üst tam sayıya yuvarlar.",
+        "documentation-changes": "Her bir girdi zaman serisi için `changes(v range-vector)`, değerinin belirtilen zaman aralığında anlık bir vektör olarak kaç kez değiştiğini verir.",
+        "documentation-clamp": "`v` içindeki tüm öğelerin örnek değerlerini `min` alt sınırına ve `max` üst sınırına sahip olacak şekilde sabitler.",
+        "documentation-clamp-max": "`v` içindeki tüm öğelerin örnek değerlerini `max` üst sınırına sahip olacak şekilde sabitler.",
+        "documentation-clamp-min": "`v` içindeki tüm öğelerin örnek değerlerini `min` alt sınırına sahip olacak şekilde sabitler.",
+        "documentation-count-over-time": "Belirtilen aralıktaki tüm değerlerin sayısı.",
+        "documentation-count-scalar": "Bir zaman serisi vektöründeki öğelerin sayısını bir skaler olarak verir. Bu, her zaman bir vektör (giriş vektörü boşsa boş bir vektör) döndüren ve bir `by` maddesi aracılığıyla etiketlere göre gruplandırmaya izin veren `count()` toplama operatörünün tersidir.",
+        "documentation-day-of-month": "UTC'de verilen saatlerin her biri için ayın gününü verir. Döndürülen değerler 1 ile 31 arasındadır.",
+        "documentation-day-of-week": "UTC'de verilen saatlerin her biri için haftanın gününü verir. Döndürülen değerler 0 ile 6 arasındadır, burada 0 Pazar vb. anlamına gelir.",
+        "documentation-day-of-year": "UTC'de verilen saatlerin her biri için yılın gününü verir. Döndürülen değerler, artık olmayan yıllar için 1 ile 365, artık yıllarda 1 ile 366 arasındadır.",
+        "documentation-days-in-month": "UTC'de verilen saatlerin her biri için ay içindeki gün sayısını verir. Döndürülen değerler 28 ile 31 arasındadır.",
+        "documentation-deg": "v içindeki tüm öğeler için radyanları dereceye dönüştürür",
+        "documentation-delta": "Bir `v` aralık vektöründeki her bir zaman serisi öğesinin ilk ve son değeri arasındaki farkı hesaplar ve verilen deltalar ve eşdeğer etiketlerle bir anlık vektör verir. Delta, aralık vektör seçicisinde belirtildiği gibi tam zaman aralığını kapsayacak şekilde tahmin edilir, böylece örnek değerlerin tümü tam sayı olsa bile tam sayı olmayan bir sonuç elde etmek mümkün olur.",
+        "documentation-deriv": "Basit doğrusal regresyon kullanarak bir `v` aralık vektöründeki zaman serisinin saniye başına türevini hesaplar.",
+        "documentation-double-exponential-smoothing": "`v` içindeki aralığa dayalı olarak zaman serileri için düzeltilmiş bir değer üretir. Düzeltme faktörü `sf` ne kadar düşükse eski verilere o kadar fazla önem verilir. Eğilim faktörü `tf` ne kadar yüksekse verilerdeki eğilimler o kadar fazla dikkate alınır. Hem `sf` hem de `tf` 0 ile 1 arasında olmalıdır.",
+        "documentation-drop-common-labels": "Girdi vektöründeki tüm serilerde aynı ada ve değere sahip tüm etiketleri bırakır.",
+        "documentation-exp": "`v` içindeki tüm öğeler için üstel fonksiyonu hesaplar.\nÖzel durumlar şunlardır:\n* `Exp(+Inf) = +Inf` \n* `Exp(NaN) = NaN`",
+        "documentation-floor": "`v` içindeki tüm öğelerin örnek değerlerini bir üst tam sayıya yuvarlar.",
+        "documentation-histogram-avg": "Yerel bir histogramda saklanan gözlemlenen değerlerin aritmetik ortalamasını verir. Yerel histogram olmayan örnekler yok sayılır ve döndürülen vektörde görünmez.",
+        "documentation-histogram-count": "Yerel bir histogramda saklanan gözlemlerin sayısını verir.",
+        "documentation-histogram-fraction": "Sağlanan alt ve üst değerler arasındaki gözlemlerin tahmini kısmını verir.",
+        "documentation-histogram-quantile": "Bir histogramın `b` demetlerinden φ-kuantili (0 ≤ φ ≤ 1) hesaplar. `b` içindeki örnekler, her demetteki gözlemlerin sayısıdır. Her örnek, etiket değerinin demetin kapsayıcı üst sınırını belirttiği bir `le` etiketine sahip olmalıdır. (Böyle bir etiketi olmayan örnekler sessizce göz ardı edilir.) Histogram metrik türü, otomatik olarak zaman serilerine `_bucket` son eki ve uygun etiketler sağlar.",
+        "documentation-histogram-stddev": "Gözlemlerin bulunduğu demetlerin geometrik ortalamasına dayalı olarak yerel bir histogramdaki gözlemlerin tahmini standart sapmasını verir.",
+        "documentation-histogram-stdvar": "Yerel bir histogramdaki gözlemlerin tahmini standart varyansını verir.",
+        "documentation-histogram-sum": "Yerel bir histogramda saklanan gözlemlerin toplamını verir.",
+        "documentation-holt-winters": "Prometheus v3.x'te double_exponential_smoothing olarak yeniden adlandırıldı. v3.0'a eşit ve daha büyük prometheus sürümleri için lütfen double_exponential_smoothing kullanın.\n\n`v` içindeki aralığa dayalı olarak zaman serileri için düzeltilmiş bir değer üretir. Düzeltme faktörü `sf` ne kadar düşükse eski verilere o kadar fazla önem verilir. Eğilim faktörü `tf` ne kadar yüksekse verilerdeki eğilimler o kadar fazla dikkate alınır. Hem `sf` hem de `tf` 0 ile 1 arasında olmalıdır.",
+        "documentation-hour": "UTC'de verilen saatlerin her biri için günün saatini verir. Verilen değerler 0 ile 23 arasındadır.",
+        "documentation-idelta": "`v` aralık vektöründeki son iki örnek arasındaki farkı hesaplar ve verilen deltalar ve eşdeğer etiketlerle bir anlık vektör verir.",
+        "documentation-increase": "Aralık vektöründeki zaman serilerindeki artışı hesaplar. Tekdüzelikteki kesintiler (hedef yeniden başlatmalar nedeniyle sayaç sıfırlamaları gibi) için otomatik olarak ayarlanır. Artış, aralık vektör seçicisinde belirtildiği gibi tam zaman aralığını kapsayacak şekilde tahmin edilir, böylece bir sayaç yalnızca tam sayı artışlarıyla artsa bile tam sayı olmayan bir sonuç elde etmek mümkün olur.",
+        "documentation-info": "Herhangi bir hesaplama yapmadan, bir metrik grubu hakkında etiketleri ve mevcut değerleri gibi en son ayrıntıları ve meta verileri döndürür",
+        "documentation-irate": "Aralık vektöründeki zaman serisinin saniye başına anlık artış oranını hesaplar. Bu, son iki veri noktasına dayanır. Tekdüzelikteki kesintiler (hedef yeniden başlatmalar nedeniyle sayaç sıfırlamaları gibi) için otomatik olarak ayarlanır.",
+        "documentation-label-join": "`v` içindeki her bir zaman serisi için, `separator`kullanarak tüm `src_labels` değerlerini birleştirir ve birleştirilen değeri içeren `dst_label` etiketine sahip zaman serisini döndürür. Bu fonksiyonda herhangi bir sayıda `src_labels` olabilir.",
+        "documentation-label-replace": "`v` içindeki her zaman serisi için, `label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)` `regex` düzenli ifadesini `src_label` etiketine karşı eşleştirir. Zaman serisi eşleşirse, `replacement` genişlemesi ile değiştirilen `dst_label` etiketiyle döndürülür. `$1`, eşleşen ilk alt grup ile, `$2` ikinci alt grup ile değiştirilir. Düzenli ifade eşleşmezse zaman serisi değişmeden döndürülür.",
+        "documentation-last-over-time": "Belirtilen aralıktaki en son nokta değeri.",
+        "documentation-ln": "`v`içindeki tüm öğeler için doğal logaritmayı hesaplar.\nÖzel durumlar şunlardır:\n * `ln(+Inf) = +Inf`\n * `ln(0) = -Inf`\n * `ln(x < 0) = NaN`\n * `ln(NaN) = NaN`",
+        "documentation-log10": "`v` içindeki tüm öğeler için ondalık logaritmayı hesaplar. Özel durumlar `ln` içindeki durumlara eşdeğerdir.",
+        "documentation-log2": "`v` içindeki tüm öğeler için ikili logaritmayı hesaplar. Özel durumlar `ln` içindeki durumlara eşdeğerdir.",
+        "documentation-max-over-time": "Belirtilen aralıktaki tüm noktaların maksimum değeri.",
+        "documentation-min-over-time": "Belirtilen aralıktaki tüm noktaların minimum değeri.",
+        "documentation-minute": "UTC'de verilen saatlerin her biri için saatin dakikasını verir. Verilen değerler 0 ile 59 arasındadır.",
+        "documentation-month": "UTC'de verilen saatlerin her biri için yılın ayını verir. Verilen değerler 1 ile 12 arasındadır, burada 1 rakamı Ocak vb. anlamına gelir.",
+        "documentation-pi": "Pi değerini verir",
+        "documentation-predict-linear": "Basit doğrusal regresyon kullanarak, `v` aralık vektörüne dayalı olarak şu andan itibaren `t` saniyelik zaman serisinin değerini tahmin eder.",
+        "documentation-present-over-time": "Belirtilen aralıktaki herhangi bir seri için 1 değeri.",
+        "documentation-quantile-over-time": "Belirtilen aralıktaki değerlerin φ-kuantili (0 ≤ φ ≤ 1).",
+        "documentation-rad": "v içindeki tüm öğeler için dereceleri radyana dönüştürür",
+        "documentation-rate": "Aralık vektöründeki zaman serisinin saniye başına ortalama artış oranını hesaplar. Tekdüzelikteki kesintiler (hedef yeniden başlatmalar nedeniyle sayaç sıfırlamaları gibi) için otomatik olarak ayarlanır. Ayrıca hesaplama, zaman aralığının uçlarına dış değerleme yaparak kaçırılan kazımalar veya kazıma döngülerinin aralığın zaman periyodu ile kusurlu hizalanmasına izin verir.",
+        "documentation-resets": "Her bir girdi zaman serisi için `resets(v range-vector)`, belirtilen zaman aralığındaki sayaç sıfırlama sayısını anlık bir vektör olarak verir. Ardışık iki örnek arasındaki değerdeki herhangi bir düşüş, sayaç sıfırlaması olarak yorumlanır.",
+        "documentation-round": "`v` içindeki tüm öğelerin örnek değerlerini en yakın tam sayıya yuvarlar. Eşitlikler yukarı yönde yuvarlanarak çözülür. İsteğe bağlı `to_nearest` bağımsız değişkeni, örnek değerlerin yuvarlanması gereken en yakın katın belirlenmesini sağlar. Bu kat bir kesir de olabilir.",
+        "documentation-scalar": "Tek öğeli bir girdi vektörü verildiğinde, `scalar(v instant-vector)` bu tek öğenin örnek değerini bir skaler olarak verir. Girdi vektörünün tam olarak bir öğesi yoksa `scalar`, `NaN` verir.",
+        "documentation-sgn": "Tüm örnek değerleri işaretlerine dönüştürülmüş bir vektör verir, şu şekilde tanımlanır: v pozitifse 1, v negatifse -1 ve v sıfıra eşitse 0.",
+        "documentation-sort": "Örnek değerlerine göre artan sırada sıralanmış vektör öğelerini verir.",
+        "documentation-sort-desc": "Örnek değerlerine göre azalan sırada sıralanmış vektör öğelerini verir.",
+        "documentation-sqrt": "`v` içindeki tüm öğelerin karekökünü hesaplar.",
+        "documentation-stddev-over-time": "Belirtilen aralıktaki değerlerin popülasyon standart sapması.",
+        "documentation-stdvar-over-time": "Belirtilen aralıktaki değerlerin popülasyon standart varyansı.",
+        "documentation-sum-over-time": "Belirtilen aralıktaki tüm değerlerin toplamı.",
+        "documentation-time": "1 Ocak 1970 UTC'den bu yana geçen saniye sayısını verir. Bunun aslında geçerli zamanı değil, ifadenin değerlendirileceği zamanı verdiğini unutmayın.",
+        "documentation-timestamp": "Verilen vektörün her bir örneğinin zaman damgasını 1 Ocak 1970 UTC'den bu yana geçen saniye sayısı olarak verir.",
+        "documentation-vector": "Skalerleri etiketsiz bir vektör olarak verir.",
+        "documentation-year": "UTC'de verilen saatlerin her biri için yılı verir."
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "{{argument}} içindeki tüm öğelerin ark kosinüsünü hesaplar",
+        "documentation-acosh": "{{argument}} içindeki tüm öğelerin ters hiperbolik kosinüsünü hesaplar",
+        "documentation-asin": "{{argument}} içindeki tüm öğelerin ark sinüsünü hesaplar",
+        "documentation-asinh": "{{argument}} içindeki tüm öğelerin ters hiperbolik sinüsünü hesaplar",
+        "documentation-atan": "{{argument}} içindeki tüm öğelerin ark tanjantını hesaplar",
+        "documentation-atanh": "{{argument}} içindeki tüm öğelerin ters hiperbolik tanjantını hesaplar",
+        "documentation-cos": "{{argument}} içindeki tüm öğelerin kosinüsünü hesaplar",
+        "documentation-cosh": "{{argument}} içindeki tüm öğelerin hiperbolik kosinüsünü hesaplar",
+        "documentation-sin": "{{argument}} içindeki tüm öğelerin sinüsünü hesaplar",
+        "documentation-sinh": "{{argument}} içindeki tüm öğelerin hiperbolik sinüsünü hesaplar",
+        "documentation-tan": "{{argument}} içindeki tüm öğelerin tanjantını hesaplar",
+        "documentation-tanh": "{{argument}} içindeki tüm öğelerin hiperbolik tanjantını hesaplar"
       }
     },
     "querybuilder": {
       "feedback-link": {
         "give-feedback": "Geri bildirim gönder",
-        "title-give-feedback": ""
+        "title-give-feedback": "Metrik gezgini yeni olduğundan lütfen gelişime açık alanlarını bize bildirin"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "Örnekler: {{value}}",
+        "format": "Biçim: {{value}}",
+        "legend": "Gösterge: {{value}}",
+        "step": "Adım: {{value}}",
+        "type": "Tür: {{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "Metrikleri ada göre ara",
+        "type": "Türe göre filtrele"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "Değeri yalnızca yeniden başlatıldığında artabilen veya sıfırlanabilen tek bir monoton artan sayacı temsil eden kümülatif bir metrik.",
+        "description-gauge": "İsteğe bağlı olarak yukarı ve aşağı gidebilen tek bir sayısal değeri temsil eden bir metrik.",
+        "description-histogram": "Bir histogram, gözlemleri örnekler (genellikle istek süreleri veya yanıt boyutları gibi) ve bunları yapılandırılabilir demetlerde sayar.",
+        "description-native-histogram": "Yerel histogramlar, klasik Prometheus histogramlarından çeşitli şekillerde farklıdır: Yerel histogram küme sınırları, yerel histogramın ölçeğine (çözünürlüğüne) bağlı olan ve kullanıcı tarafından tanımlanmayan bir formülle hesaplanır.",
+        "description-no-type": "Bu metriklerin meta verilerde tanımlanmış bir türü yoktur.",
+        "description-summary": "Bir özet, gözlemleri örnekler (genellikle istek süreleri ve yanıt boyutları gibi) ve kayan bir zaman aralığında yapılandırılabilir nicelikleri hesaplayabilir.",
+        "description-unknown": "Bu metrikler, meta verilerde bilinmeyen tür olarak verilmiştir.",
+        "label-counter": "Sayaç",
+        "label-gauge": "Ölçü",
+        "label-histogram": "Histogram",
+        "label-native-histogram": "Yerel histogram",
+        "label-no-type": "Tür yok",
+        "label-summary": "Özet",
+        "label-unknown": "Bilinmeyen"
       },
       "handle-function": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "Sorgu ayrıştırma belirsiz."
         }
       },
       "label-filter-item": {
-        "aria-label-remove": "",
-        "placeholder-select-label": "",
+        "aria-label-remove": "{{name}} ögesini kaldır",
+        "placeholder-select-label": "Etiket seçin",
         "placeholder-select-value": "Değer seçin"
       },
       "label-filters": {
-        "label-filters": "",
-        "label-label-filters": "",
-        "tooltip-label-filters": ""
+        "label-filters": "Etiket filtreleri",
+        "label-label-filters": "Etiket filtreleri",
+        "tooltip-label-filters": "İsteğe bağlı: Bu sorgu türü için metrik seçimini filtrelemek amacıyla kullanılır."
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "Etiketler yükleniyor",
+        "noOptionsMessage-no-labels-found": "Etiket bulunamadı"
       },
       "metric-combobox": {
         "async-select": {
-          "aria-label-open-metrics-explorer": "",
-          "placeholder-select-metric": "",
-          "tooltip-open-metrics-explorer": ""
+          "aria-label-open-metrics-explorer": "Metrik gezginini aç",
+          "placeholder-select-metric": "Metrik seçin",
+          "tooltip-open-metrics-explorer": "Metrik gezginini aç"
         },
         "label-metric": "Metrik",
-        "tooltip-metric": ""
+        "tooltip-metric": "İsteğe bağlı: Belirtilen metrikteki etiket adı için etiket değerlerinin bir listesini döndürür."
       },
       "metrics-modal": {
-        "aria-label-browse-metrics": "",
-        "currently-selected": "",
-        "metrics-pre-filtered": "",
-        "title-metrics-explorer": ""
+        "aria-label-browse-metrics": "Metrikleri gözden geçir",
+        "currently-selected": "Şu anda seçili olan: {{selected}}",
+        "metrics-pre-filtered": "Bu metrikler, etiket filtrelerinde seçilen etiketlere göre önceden filtrelenmiştir.",
+        "title-metrics-explorer": "Metrik gezgini"
       },
       "nested-query": {
         "label": {
-          "ignoring": "",
+          "ignoring": "Yok sayılıyor",
           "on": "Açık"
         },
         "operator": "İşleç",
-        "tooltip-remove-match": "",
-        "vector-matches": ""
+        "tooltip-remove-match": "Eşleşmeyi kaldır",
+        "vector-matches": "Vektör eşleşmeleri"
       },
       "operation-editor": {
-        "not-found": "",
-        "title-remove": ""
+        "not-found": "{{id}} işlemi bulunamadı",
+        "title-remove": "{{name}} ögesini kaldır"
       },
       "operation-header": {
         "placeholder-replace-with": "Bununla değiştir:",
-        "title-click-to-view-alternative-operations": "",
-        "title-remove-operation": ""
+        "title-click-to-view-alternative-operations": "Alternatif işlemleri görüntülemek için tıklayın",
+        "title-remove-operation": "İşlemi kaldır"
       },
       "operation-info-button": {
-        "title-click-to-show-description": "",
-        "title-remove-operation": ""
+        "title-click-to-show-description": "Açıklamayı görüntülemek için tıklayın",
+        "title-remove-operation": "İşlemi kaldır"
       },
       "operation-list": {
-        "operations": "",
+        "operations": "İşlemler",
         "placeholder-search": "Ara",
-        "title-add-operation": ""
+        "title-add-operation": "İşlem ekle"
       },
       "operation-param-editor": {
-        "title-add": "",
-        "title-remove": ""
+        "title-add": "{{name}} ekle",
+        "title-remove": "{{name}} ögesini kaldır"
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "{{labelWord}} {{labels}} korunurken boyutlar üzerinden {{aggregationName}} hesaplar.",
+          "label-default": "Boyutlar üzerinden {{aggregationName}} hesaplar.",
+          "label-without": "{{labels}} boyutları üzerinden {{aggregationName}} hesaplar. Diğer tüm etiketler korunur."
         }
       },
       "prom-query-builder-options": {
-        "aria-label-lower-limit-parameter": "",
-        "aria-label-select-resolution": "",
+        "aria-label-lower-limit-parameter": "Adım parametresi için alt sınırı ayarlayın",
+        "aria-label-select-resolution": "Çözüm seçin",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "Isı Haritası",
+          "label-table": "Tablo",
+          "label-time-series": "Zaman serileri"
         },
-        "label-exemplars": "",
+        "label-exemplars": "Örnekler",
         "label-format": "Biçim",
-        "label-min-step": "",
-        "label-resolution": "",
+        "label-min-step": "Min. adım",
+        "label-resolution": "Çözünürlük",
         "label-type": "Tür",
-        "placeholder-auto": "",
+        "placeholder-auto": "otomatik",
         "title-options": "Seçenekler",
-        "tooltip-min-step": ""
+        "tooltip-min-step": "Prometheus sorgusunun step (adım) parametresi ve <2>{{interval}}</2> ile <4>{{rateInterval}}</4> değişkenleri için ek bir alt sınırdır."
       },
       "prom-query-code-editor-autocomplete-info": {
-        "autocomplete-suggestions-limited": "",
-        "tooltip-autocomplete-suggestions-limited": ""
+        "autocomplete-suggestions-limited": "Otomatik tamamlama önerileri sınırlı",
+        "tooltip-autocomplete-suggestions-limited": "Metrik adlarının sayısı otomatik tamamlama sınırını aşıyor. Yalnızca en alakalı {{autocompleteLimit}} metrik görüntülenir. Eşiği veri kaynağı ayarlarından düzenleyebilirsiniz."
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "Bir sözdizimi hatası var veya oluşturucu moduna geçerken sorgu yapısı görselleştirilemiyor. Sorgunun bazı kısımları kaybolabilir.",
+        "confirmText-continue": "Devam et",
         "kick-start-your-query": "Sorgunuzu hızlı başlatın",
-        "label-explain": "",
-        "run-queries": "",
-        "title-parsing-error-switch-builder": ""
+        "label-explain": "Açıkla",
+        "run-queries": "Sorguları çalıştır",
+        "title-parsing-error-switch-builder": "Ayrıştırma hatası: Oluşturucu moduna geçilsin mi?"
       },
       "prom-query-legend-editor": {
-        "label-legend": "",
-        "placeholder-select-legend-mode": "",
-        "tooltip-legend": ""
+        "label-legend": "Gösterge",
+        "placeholder-select-legend-mode": "Gösterge modunu seçin",
+        "tooltip-legend": "Seri adı geçersiz kılma veya şablon. Ör: {{templateExample}}, {{labelName}} etiketinin değeriyle değiştirilecektir."
       },
       "query-builder-hints": {
-        "hint-details": ""
+        "hint-details": "ipucu: {{hintDetails}}"
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Oluşturucu",
+          "label-code": "Kod"
         }
       },
       "query-pattern": {
-        "apply-query": "",
-        "aria-label-apply-query-starter-button": "",
-        "aria-label-back-button": "",
-        "aria-label-create-new-query-button": "",
-        "aria-label-raw-query": "",
-        "aria-label-use-this-query-button": "",
+        "apply-query": "Sorguyu uygula",
+        "aria-label-apply-query-starter-button": "sorguyu uygula başlatma düğmesi",
+        "aria-label-back-button": "geri düğmesi",
+        "aria-label-create-new-query-button": "yeni sorgu oluştur düğmesi",
+        "aria-label-raw-query": "{{patternName}} ham sorgusu",
+        "aria-label-use-this-query-button": "bu sorgu düğmesini kullanın",
         "back": "Geri",
-        "create-new-query": "",
+        "create-new-query": "Yeni sorgu oluştur",
         "use-this-query": "Bu sorguyu kullanın"
       },
       "query-patterns-modal": {
-        "aria-label-close-kick-start-your-query-modal": "",
+        "aria-label-close-kick-start-your-query-modal": "sorgunuzu hızlı başlatma modülünü kapat",
         "aria-label-kick-start-your-query-modal": "Sorgu modülünüzü hızlı başlatın",
-        "aria-label-toggle-query-starter": "",
+        "aria-label-toggle-query-starter": "{{patternType}} sorgu başlatıcı kartını aç ve kapat",
         "close": "Kapat",
-        "description-kick-start-your-query": "",
-        "label-toggle-query-starter": "",
+        "description-kick-start-your-query": "Bu sorgulardan birini seçerek sorgunuzu hızlı başlatın. Ardından sorgunuzu tamamlamaya devam edebilirsiniz.",
+        "label-toggle-query-starter": "{{patternType}} sorgu başlatıcıları",
         "title-kick-start-your-query": "Sorgunuzu hızlı başlatın"
       },
       "raw-query": {
-        "aria-label-selector": ""
+        "aria-label-selector": "seçici"
       },
       "results-table": {
-        "content-descriptive-type": "",
+        "content-descriptive-type": "Bir {{descriptiveType}} oluşturulduğunda, Prometheus sayaç türünde birden fazla seri sunar. ",
         "description": "Açıklama",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "Metrik bulunamadı. Etiket filtrelerinizi genişletmeyi deneyin.",
+        "message-expand-search": "Metrik bulunamadı. Aramanızı ve filtrelerinizi genişletmeyi deneyin.",
+        "message-no-metrics-found": "Veri kaynağında metrik bulunamadı.",
         "name": "Ad",
         "type": "Tür"
       },
       "update-function-args": {
         "text": {
-          "query-parsing-is-ambiguous": ""
+          "query-parsing-is-ambiguous": "Sorgu ayrıştırma belirsiz."
         }
       }
     }
diff --git a/packages/grafana-prometheus/src/locales/zh-Hans/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/zh-Hans/grafana-prometheus.json
index f15a039030c..855ecf3a4ed 100644
--- a/packages/grafana-prometheus/src/locales/zh-Hans/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/zh-Hans/grafana-prometheus.json
@@ -158,8 +158,8 @@
         "aria-label-prometheus-type": "Prometheus 类型",
         "aria-label-select-http-method": "选择 HTTP 方法",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "构建器",
+          "label-code": "代码"
         },
         "label-cache-level": "缓存级别",
         "label-custom-query-parameters": "自定义查询参数",
@@ -200,114 +200,114 @@
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "（已禁用）",
+      "enabled-label": "指标浏览器"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "仅包含唯一标签",
+        "description-custom": "提供命名模板",
+        "description-verbose": "所有标签名称和值",
+        "label-auto": "自动",
+        "label-custom": "自定义",
+        "label-verbose": "详细"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "计算各维度的平均值",
+        "documentation-bottomk": "按样本值取最小的 k 个元素",
+        "documentation-count": "计算向量中的元素数",
+        "documentation-count-values": "计算具有相同值的元素数",
+        "documentation-group": "结果向量中的所有值均为 1",
+        "documentation-max": "选择各维度的最大值",
+        "documentation-min": "选择各维度的最小值",
+        "documentation-quantile": "计算各维度的 φ-quantile (0 ≤ φ ≤ 1)",
+        "documentation-stddev": "计算各维度的总体标准差",
+        "documentation-stdvar": "计算各维度的总体标准差",
+        "documentation-sum": "计算各维度的总和",
+        "documentation-topk": "按样本值取最大的 k 个元素"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "返回输入向量，其中所有样本值都转换为其绝对值。",
+        "documentation-absent": "如果传入的向量包含任意元素，则返回一个空向量；如果传入的向量不包含任何元素，则返回一个值为 1 的单元素向量。这在针对某个特定指标名称和标签组合不存在任何时间序列时发出告警时非常有用。",
+        "documentation-absent-over-time": "如果传入的向量包含任意元素，则返回一个空向量；如果传入的向量不包含任何元素，则返回一个值为·1·的单元素向量。",
+        "documentation-avg-over-time": "指定间隔内所有点的平均值。",
+        "documentation-ceil": "将“v”中所有元素的样本值向上舍入到最接近的整数。",
+        "documentation-changes": "对于每个输入时间序列，“changes(v range-vector)”返回其值在提供的时间范围内更改的次数，作为瞬时向量。",
+        "documentation-clamp": "将“v”中所有元素的样本值限制为下限为“min”且上限为“max”。",
+        "documentation-clamp-max": "将“v”中所有元素的样本值限制为上限为“max”。",
+        "documentation-clamp-min": "将“v”中所有元素的样本值限制为下限为“min”。",
+        "documentation-count-over-time": "指定间隔内所有值的计数。",
+        "documentation-count-scalar": "返回时间序列向量中元素的数量作为标量。这与 'count()' 聚合运算符相反，后者始终返回一个向量（如果输入向量为空，则为空向量），并允许通过 'by' 子句按标签分组。",
+        "documentation-day-of-month": "返回每个月中给定时间的日期（UTC 时间）。返回的值介于 1 到 31 之间。",
+        "documentation-day-of-week": "返回每周中给定时间的日期（UTC 时间）。返回的值介于 0 到 6 之间，其中 0 表示星期日，以此类推。",
+        "documentation-day-of-year": "返回每年中的给定时间的日期（UTC 时间）。对于非闰年，返回的值介于 1 到 365 之间；对于闰年，返回的值介于 1 到 366 之间。",
+        "documentation-days-in-month": "返回每月中给定时间的天数（UTC 时间）。返回的值介于 28 到 31 之间。",
+        "documentation-deg": "将 v 中所有元素的弧度转换为度",
+        "documentation-delta": "计算范围矢量“v”中每个时间序列元素的第一个值和最后一个值之间的差，返回具有给定增量和等效标签的瞬时矢量。增量被外推以覆盖范围矢量选择器中指定的全时间范围，因此即使样本值都是整数，也可以获得非整数结果。",
+        "documentation-deriv": "使用简单线性回归计算范围向量“v”中时间序列的每秒导数。",
+        "documentation-double-exponential-smoothing": "根据“v”中的范围为时间序列生成平滑值。平滑因子“sf”越低，旧数据的重要性就越高。趋势因子“tf”越高，考虑的数据趋势就越多。“sf”和“tf”都必须介于 0 和 1 之间。",
+        "documentation-drop-common-labels": "删除输入向量中所有序列中具有相同名称和值的所有标签。",
+        "documentation-exp": "计算“v”中所有元素的指数函数。\n特殊情况是：\n* `Exp(+Inf) = +Inf` \n* `Exp(NaN) = NaN`",
+        "documentation-floor": "将“v”中所有元素的样本值向下舍入到最接近的整数。",
+        "documentation-histogram-avg": "返回存储在原生直方图中的观测值的算术平均值。非原生直方图的样本将被忽略，不会显示在返回的向量中。",
+        "documentation-histogram-count": "返回存储在原生直方图中的观测值的计数。",
+        "documentation-histogram-fraction": "返回所提供的下限值和上限值之间的估计观测值分数。",
+        "documentation-histogram-quantile": "从直方图的存储桶 'b' 计算 φ-quantile (0 ≤ φ ≤ 1)。'b' 中的样本是每个存储桶中的观测值计数。每个样本都必须有一个标签 'le'，其中标签值表示存储桶的包含上限。（没有此类标签的样本将被静默忽略。）直方图指标类型自动为时间序列提供 '_bucket' 后缀和相应的标签。",
+        "documentation-histogram-stddev": "根据观测值所在的存储桶的几何平均值，返回原生直方图中观测值的估计标准差。",
+        "documentation-histogram-stdvar": "返回原生直方图中观测值的估计标准方差。",
+        "documentation-histogram-sum": "返回存储在原生直方图中的观测值的总和。",
+        "documentation-holt-winters": "在 prometheus v3.x 中重命名为 double_exponential_smoothing。对于等于和大于 v3.0 的 prometheus 版本，请使用 double_exponential_smoothing。\n\n根据“v”中的范围为时间序列生成平滑值。平滑因子“sf”越低，旧数据的重要性就越高。趋势因子“tf”越高，考虑的数据趋势就越多。“sf”和“tf”都必须介于 0 和 1 之间。",
+        "documentation-hour": "返回每天中给定时间的小时（UTC 时间）。返回的值介于 0 到 23 之间。",
+        "documentation-idelta": "计算范围矢量“v”中最后两个样本之间的差，返回具有给定增量和等效标签的瞬时矢量。",
+        "documentation-increase": "计算范围矢量中时间序列的增加。单调性中断（例如由于目标重新启动而导致的计数器重置）会自动调整。增加被外推以覆盖范围矢量选择器中指定的全时间范围，因此即使计数器仅以整数增量增加，也可以获得非整数结果。",
+        "documentation-info": "返回有关一组指标的最新详细信息和元数据，例如其标签和当前值，而无需进行任何计算",
+        "documentation-irate": "计算范围矢量中时间序列的每秒瞬时增加率。这是基于最后两个数据点。单调性中断（例如由于目标重新启动而导致的计数器重置）会自动调整。",
+        "documentation-label-join": "对于“v”中的每个时间序列，使用“separator”连接所有“src_labels”的所有值，并返回包含连接值的标签“dst_label”的时间序列。此函数中可以有任意数量的“src_labels”。",
+        "documentation-label-replace": "对于“v”中的每个时间序列，“label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)”将正则表达式“regex”与标签“src_label”进行匹配。如果匹配，则返回时间序列，并将标签“dst_label”替换为“replacement”的扩展。“$1”替换为第一个匹配的子组，“$2”替换为第二个匹配的子组，依此类推。如果正则表达式不匹配，则返回不变的时间序列。",
+        "documentation-last-over-time": "指定间隔内的最近点值。",
+        "documentation-ln": "计算“v”中所有元素的自然对数。\n特殊情况是：\n * 'ln(+Inf) = +Inf'\n * 'ln(0) = -Inf'\n * 'ln(x < 0) = NaN'\n * 'ln(NaN) = NaN'",
+        "documentation-log10": "计算“v”中所有元素的十进制对数。特殊情况等同于“ln”中的情况。",
+        "documentation-log2": "计算“v”中所有元素的二进制对数。特殊情况等同于“ln”中的情况。",
+        "documentation-max-over-time": "指定间隔内所有点的最大值。",
+        "documentation-min-over-time": "指定间隔内所有点的最小值。",
+        "documentation-minute": "返回每小时中给定时间的分钟（UTC 时间）。返回的值介于 0 到 59 之间。",
+        "documentation-month": "返回每年中的给定时间的月份（UTC 时间）。返回的值介于 1 到 12 之间，其中 1 表示一月，以此类推。",
+        "documentation-pi": "返回 pi",
+        "documentation-predict-linear": "使用简单线性回归，根据范围向量“v”预测从现在开始的时间序列“t”秒的值。",
+        "documentation-present-over-time": "指定间隔内任何系列的值 1。",
+        "documentation-quantile-over-time": "指定间隔内值的 φ-quantile (0 ≤ φ ≤ 1)。",
+        "documentation-rad": "将 v 中所有元素的度转换为弧度",
+        "documentation-rate": "计算范围矢量中时间序列的每秒平均增加率。单调性中断（例如由于目标重新启动而导致的计数器重置）会自动调整。此外，计算外推到时间范围的末端，允许遗漏的抓取或抓取周期与范围的时间段不完美对齐。",
+        "documentation-resets": "对于每个输入时间序列，“resets(v range-vector)”返回提供的时间范围内的计数器重置次数，作为瞬时向量。两个连续样本之间的值的任何减小都被解释为计数器重置。",
+        "documentation-round": "将“v”中所有元素的样本值舍入到最接近的整数。通过向上舍入来解决绑定。可选的“to_nearest”参数允许指定应舍入样本值的最接近倍数。这个倍数也可能是分数。",
+        "documentation-scalar": "给定单元素输入向量，“scalar(v instant-vector)”返回该单个元素的样本值作为标量。如果输入向量不正好只有一个元素，“scalar”将返回“NaN”。",
+        "documentation-sgn": "返回一个向量，其中所有样本值都转换为其符号，定义如下：如果 v 为正，则为 1；如果 v 为负，则为 -1；如果 v 为零，则为 0。",
+        "documentation-sort": "返回按样本值排序的矢量元素，按升序排列。",
+        "documentation-sort-desc": "返回按样本值排序的向量元素，按降序排列。",
+        "documentation-sqrt": "计算“v”中所有元素的平方根。",
+        "documentation-stddev-over-time": "指定间隔内值的总体标准差。",
+        "documentation-stdvar-over-time": "指定间隔内值的总体标准方差。",
+        "documentation-sum-over-time": "指定间隔内所有值的总和。",
+        "documentation-time": "返回自 1970 年 1 月 1 日（UTC 时间）起的秒数。请注意，这实际上并不返回当前时间，而是返回要计算表达式的时间。",
+        "documentation-timestamp": "返回给定向量每个样本的时间戳，作为自 1970 年 1 月 1 日（UTC 时间）起的秒数。",
+        "documentation-vector": "返回标量“s”作为没有标签的矢量。",
+        "documentation-year": "返回每年给定时间的年份（UTC 时间）。"
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "计算 {{argument}} 中所有元素的反余弦",
+        "documentation-acosh": "计算 {{argument}} 中所有元素的反双曲余弦",
+        "documentation-asin": "计算 {{argument}} 中所有元素的反正弦",
+        "documentation-asinh": "计算 {{argument}} 中所有元素的反双曲正弦",
+        "documentation-atan": "计算 {{argument}} 中所有元素的反正切",
+        "documentation-atanh": "计算 {{argument}} 中所有元素的反双曲正切",
+        "documentation-cos": "计算 {{argument}} 中所有元素的余弦",
+        "documentation-cosh": "计算 {{argument}} 中所有元素的双曲余弦",
+        "documentation-sin": "计算 {{argument}} 中所有元素的正弦",
+        "documentation-sinh": "计算 {{argument}} 中所有元素的双曲正弦",
+        "documentation-tan": "计算 {{argument}} 中所有元素的正切",
+        "documentation-tanh": "计算 {{argument}} 中所有元素的双曲正切"
       }
     },
     "querybuilder": {
@@ -316,31 +316,31 @@
         "title-give-feedback": "指标浏览器是新功能，请告诉我们如何改进"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "范例：{{value}}",
+        "format": "格式：{{value}}",
+        "legend": "图例：{{value}}",
+        "step": "步骤：{{value}}",
+        "type": "类型：{{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "按名称搜索指标",
+        "type": "按类型筛选"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "表示单个单调递增计数器的累积指标，其值只能在重新启动时增加或重置为零。",
+        "description-gauge": "表示可以任意上下移动的单个数值的指标。",
+        "description-histogram": "直方图对观测值（通常是请求持续时间或响应大小等）进行抽样，并在可配置的存储桶中对其进行计数。",
+        "description-native-histogram": "原生直方图在许多方面与经典的 Prometheus 直方图不同：原生直方图的存储桶边界由公式计算，该公式取决于原生直方图的比例（分辨率），而不是由用户自定义。",
+        "description-no-type": "这些指标在元数据中没有定义的类型。",
+        "description-summary": "汇总对观测值（通常是请求持续时间和响应大小等）进行抽样，并可以在滑动时间窗口中计算可配置的分位数。",
+        "description-unknown": "这些指标在元数据中被赋予未知类型。",
+        "label-counter": "计数器",
+        "label-gauge": "仪表",
+        "label-histogram": "直方图",
+        "label-native-histogram": "原生直方图",
+        "label-no-type": "无类型",
+        "label-summary": "摘要",
+        "label-unknown": "未知"
       },
       "handle-function": {
         "text": {
@@ -358,8 +358,8 @@
         "tooltip-label-filters": "可选：用于筛选为此查询类型选择的指标。"
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "正在加载标签",
+        "noOptionsMessage-no-labels-found": "未找到标签"
       },
       "metric-combobox": {
         "async-select": {
@@ -409,18 +409,18 @@
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "计算各维度的 {{aggregationName}}，同时保留 {{labelWord}} {{labels}}。",
+          "label-default": "计算各维度的 {{aggregationName}}。",
+          "label-without": "计算各维度的 {{aggregationName}} {{labels}}。所有其他标签都将保留。"
         }
       },
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "设置步长参数的下限",
         "aria-label-select-resolution": "选择分辨率",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "热图",
+          "label-table": "表格",
+          "label-time-series": "时间序列"
         },
         "label-exemplars": "范例",
         "label-format": "格式",
@@ -436,8 +436,8 @@
         "tooltip-autocomplete-suggestions-limited": "指标名称的数量超过了自动完成限制。仅显示 {{autocompleteLimit}} 个最相关的指标。您可以在数据源设置中调整阈值。"
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "存在语法错误，或者切换到构建器模式时无法可视化查询结构。查询的某些部分可能会丢失。",
+        "confirmText-continue": "继续",
         "kick-start-your-query": "启动您的查询",
         "label-explain": "解释",
         "run-queries": "运行查询",
@@ -453,8 +453,8 @@
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "构建器",
+          "label-code": "代码"
         }
       },
       "query-pattern": {
@@ -483,9 +483,9 @@
       "results-table": {
         "content-descriptive-type": "创建 {{descriptiveType}} 时，Prometheus 会使用类型计数器公开多个序列。",
         "description": "描述",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "未找到指标。尝试展开您的标签筛选条件。",
+        "message-expand-search": "未找到指标。尝试展开您的搜索和筛选条件。",
+        "message-no-metrics-found": "数据源中未找到指标。",
         "name": "名称",
         "type": "类型"
       },
diff --git a/packages/grafana-prometheus/src/locales/zh-Hant/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/zh-Hant/grafana-prometheus.json
index d6a441a81bf..ef1dc5d46c2 100644
--- a/packages/grafana-prometheus/src/locales/zh-Hant/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/zh-Hant/grafana-prometheus.json
@@ -158,8 +158,8 @@
         "aria-label-prometheus-type": "Prometheus 類型",
         "aria-label-select-http-method": "選取 HTTP 方法",
         "editor-options": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "建立器",
+          "label-code": "代碼"
         },
         "label-cache-level": "快取層級",
         "label-custom-query-parameters": "自訂查詢參數",
@@ -200,114 +200,114 @@
       }
     },
     "metrics-browser": {
-      "disabled-label": "",
-      "enabled-label": ""
+      "disabled-label": "（已停用）",
+      "enabled-label": "指標瀏覽器"
     },
     "prom-query-legend-editor": {
       "get-legend-mode-options": {
-        "description-auto": "",
-        "description-custom": "",
-        "description-verbose": "",
-        "label-auto": "",
-        "label-custom": "",
-        "label-verbose": ""
+        "description-auto": "僅包含唯一標籤",
+        "description-custom": "提供命名範本",
+        "description-verbose": "所有標籤名稱和值",
+        "label-auto": "自動",
+        "label-custom": "自訂",
+        "label-verbose": "詳細"
       }
     },
     "promql": {
       "getAggregationOptions": {
-        "documentation-avg": "",
-        "documentation-bottomk": "",
-        "documentation-count": "",
-        "documentation-count-values": "",
-        "documentation-group": "",
-        "documentation-max": "",
-        "documentation-min": "",
-        "documentation-quantile": "",
-        "documentation-stddev": "",
-        "documentation-stdvar": "",
-        "documentation-sum": "",
-        "documentation-topk": ""
+        "documentation-avg": "計算維度的平均值",
+        "documentation-bottomk": "依照樣本值的最小 k 元素",
+        "documentation-count": "計算向量中的元素數量",
+        "documentation-count-values": "計算具有相同值的元素數",
+        "documentation-group": "結果向量中的所有值均為 1",
+        "documentation-max": "選取維度的最大值",
+        "documentation-min": "選取維度的最小值",
+        "documentation-quantile": "計算維度的 φ-quantile (0 ≤ φ ≤ 1)",
+        "documentation-stddev": "計算維度的總體標準差",
+        "documentation-stdvar": "計算維度上的總體標準差",
+        "documentation-sum": "計算維度的總和",
+        "documentation-topk": "按樣本值的最大 k 元素"
       },
       "getFunctions": {
-        "documentation-abs": "",
-        "documentation-absent": "",
-        "documentation-absent-over-time": "",
-        "documentation-avg-over-time": "",
-        "documentation-ceil": "",
-        "documentation-changes": "",
-        "documentation-clamp": "",
-        "documentation-clamp-max": "",
-        "documentation-clamp-min": "",
-        "documentation-count-over-time": "",
-        "documentation-count-scalar": "",
-        "documentation-day-of-month": "",
-        "documentation-day-of-week": "",
-        "documentation-day-of-year": "",
-        "documentation-days-in-month": "",
-        "documentation-deg": "",
-        "documentation-delta": "",
-        "documentation-deriv": "",
-        "documentation-double-exponential-smoothing": "",
-        "documentation-drop-common-labels": "",
-        "documentation-exp": "",
-        "documentation-floor": "",
-        "documentation-histogram-avg": "",
-        "documentation-histogram-count": "",
-        "documentation-histogram-fraction": "",
-        "documentation-histogram-quantile": "",
-        "documentation-histogram-stddev": "",
-        "documentation-histogram-stdvar": "",
-        "documentation-histogram-sum": "",
-        "documentation-holt-winters": "",
-        "documentation-hour": "",
-        "documentation-idelta": "",
-        "documentation-increase": "",
-        "documentation-info": "",
-        "documentation-irate": "",
-        "documentation-label-join": "",
-        "documentation-label-replace": "",
-        "documentation-last-over-time": "",
-        "documentation-ln": "",
-        "documentation-log10": "",
-        "documentation-log2": "",
-        "documentation-max-over-time": "",
-        "documentation-min-over-time": "",
-        "documentation-minute": "",
-        "documentation-month": "",
-        "documentation-pi": "",
-        "documentation-predict-linear": "",
-        "documentation-present-over-time": "",
-        "documentation-quantile-over-time": "",
-        "documentation-rad": "",
-        "documentation-rate": "",
-        "documentation-resets": "",
-        "documentation-round": "",
-        "documentation-scalar": "",
-        "documentation-sgn": "",
-        "documentation-sort": "",
-        "documentation-sort-desc": "",
-        "documentation-sqrt": "",
-        "documentation-stddev-over-time": "",
-        "documentation-stdvar-over-time": "",
-        "documentation-sum-over-time": "",
-        "documentation-time": "",
-        "documentation-timestamp": "",
-        "documentation-vector": "",
-        "documentation-year": ""
+        "documentation-abs": "傳回輸入向量，其中所有樣本值都轉換為其絕對值。",
+        "documentation-absent": "如果傳遞給它的向量有任何元素，則傳回空向量；如果傳遞給它的向量沒有元素，則傳回值為 1 的 1 元素向量。這對於在給定的指標名稱和標籤組合不存在時間序列時發出警報很有用。",
+        "documentation-absent-over-time": "如果傳遞給它的範圍向量有任何元素，則傳回空向量；如果傳遞給它的範圍向量沒有元素，則傳回值為 1 的 1 元素向量。",
+        "documentation-avg-over-time": "指定間隔內所有點的平均值。",
+        "documentation-ceil": "將「v」中所有元素的樣本值四捨五入為最接近的整數。",
+        "documentation-changes": "對於每個輸入時間序列，「changes(v range-vector)」會傳回其值在提供的時間範圍內作為即時向量變更的次數。",
+        "documentation-clamp": "將「v」中所有元素的樣本值限制為下限為「min」且上限為「max」。",
+        "documentation-clamp-max": "將「v」中所有元素的樣本值限制為「max」的上限。",
+        "documentation-clamp-min": "將「v」中所有元素的樣本值限制為「min」的下限。",
+        "documentation-count-over-time": "指定間隔中的所有值計數。",
+        "documentation-count-scalar": "以純量形式傳回時間序列向量中的元素數量。這與「count()」彙總運算子相反，後者始終傳回向量（如果輸入向量為空，則為空向量），並允許透過「by」子句按標籤分組。",
+        "documentation-day-of-month": "傳回 UTC 中每個指定時間的當月日期。傳回的值介於 1 至 31 之間。",
+        "documentation-day-of-week": "以 UTC 格式傳回每個指定時間的星期幾。傳回的值介於 0 至 6 之間，其中 0 表示星期日等。",
+        "documentation-day-of-year": "傳回每個指定時間的當年日期（UTC 時區）。傳回的值在非閏年為 1 至 365，在閏年為 1 至 366。",
+        "documentation-days-in-month": "針對 UTC 中的每個指定時間，傳回當月的天數。傳回的值介於 28 至 31 之間。",
+        "documentation-deg": "將 v 中所有元素的弧度轉換為度數",
+        "documentation-delta": "計算範圍向量「v」中每個時間序列元素的第一個值和最後一個值之間的差異，傳回具有給定增量和等效標籤的即時向量。增量被外推以涵蓋範圍向量選擇器中指定的完整時間範圍，因此即使樣本值都是整數，也可以得到非整數結果。",
+        "documentation-deriv": "使用簡單的線性回歸計算範圍向量「v」中時間序列的每秒導數。",
+        "documentation-double-exponential-smoothing": "根據「v」中的範圍，產生時間序列的平滑值。平滑因子「sf」越低，舊資料的重要性就越高。趨勢因子「tf」越高，就越考慮資料中的趨勢。「sf」和「tf」都必須介於 0 和 1 之間。",
+        "documentation-drop-common-labels": "刪除輸入向量中所有序列中具有相同名稱和值的所有標籤。",
+        "documentation-exp": "計算「v」中所有元素的指數函數。\n特殊情況為：\n* 'Exp(+Inf) = +Inf' \n* 'Exp(NaN) = NaN'",
+        "documentation-floor": "將「v」中所有元素的樣本值向下四捨五入為最接近的整數。",
+        "documentation-histogram-avg": "傳回儲存在原生直方圖中觀測值的算術平均值。將忽略非原生直方圖的樣本，且不會顯示在傳回的向量中。",
+        "documentation-histogram-count": "傳回儲存在本機直方圖中的觀測值計數。",
+        "documentation-histogram-fraction": "傳回所提供的下限值和上限值之間的估計觀測值分數。",
+        "documentation-histogram-quantile": "從直方圖的區塊「b」計算 φ-quantile (0 ≤ φ ≤ 1)。「b」中的樣本是每個區塊中的觀測值計數。每個樣本都必須有一個標籤「le」，其中標籤值表示區塊的包含上限。（沒有這樣標籤的樣本會被靜默忽略。）直方圖度量類型會自動提供帶有「_bucket」後綴和適當標籤的時間序列。",
+        "documentation-histogram-stddev": "根據觀測值所在的儲存貯體的幾何平均值，傳回原生直方圖中觀測值的估計標準差。",
+        "documentation-histogram-stdvar": "傳回原生直方圖中觀測值的估計標準差。",
+        "documentation-histogram-sum": "傳回儲存在本機直方圖中的觀測值總和。",
+        "documentation-holt-winters": "在 prometheus v3.x 中重新命名為 double_exponential_smoothing。對於等於或大於 v3.0 的 prometheus 版本，請使用 double_exponential_smoothing。\n\n根據「v」中的範圍為時間序列產生平滑值。平滑因子「sf」越低，舊資料的重要性就越高。趨勢因子「tf」越高，就會考慮越多的資料趨勢。「sf」和「tf」都必須介於 0 和 1 之間。",
+        "documentation-hour": "傳回 UTC 中每個指定時間的當日時數。傳回的值介於 0 到 23 之間。",
+        "documentation-idelta": "計算範圍向量「v」中最後兩個樣本之間的差異，傳回具有指定增量和等效標籤的即時向量。",
+        "documentation-increase": "計算範圍向量中時間序列的增加。單調性中斷（例如由於目標重新啟動而導致的計數器重置）會自動調整。增加會推斷為涵蓋範圍向量選擇器中指定的完整時間範圍，因此即使計數器僅以整數增量增加，也可以獲得非整數結果。",
+        "documentation-info": "傳回一組指標的最新詳細資訊和中繼資料，例如其標籤和目前值，而無需進行任何計算",
+        "documentation-irate": "計算範圍向量中時間序列的每秒瞬間增長率。這是以最後兩個資料點為基礎。單調性中斷（例如由於目標重新啟動而導致的計數器重置）會自動調整。",
+        "documentation-label-join": "對於「v」中的每個時序，使用「separator」連接所有「src_labels」的所有值，並傳回包含連接值的標籤「dst_label」的時序。此函數中可以有任意數量的「src_labels」。",
+        "documentation-label-replace": "對於「v」中的每個時序，「label_replace(v instant-vector, dst_label string, replacement string, src_label string, regex string)」將標籤「src_label」與規則運算式「regex」進行比對。如果匹配，則返回時序，並將標籤「dst_label」替換為「replacement」的擴展。「$1」被替換為第一個匹配的子群組，「$2」被替換為第二個匹配的子群組，依此類推。如果規則運算式不匹配，則返回不變的時序。",
+        "documentation-last-over-time": "指定間隔內的最新點值。",
+        "documentation-ln": "計算「v」中所有元素的自然對數。\n特殊情況為：\n * 'ln(+Inf) = +Inf'\n * 'ln(0) = -Inf'\n * 'ln(x < 0) = NaN'\n * 'ln(NaN) = NaN'",
+        "documentation-log10": "計算「v」中所有元素的十進位對數。特殊案例等同於「ln」中的案例。",
+        "documentation-log2": "計算「v」中所有元素的二進位對數。特殊案例等同於「ln」中的案例。",
+        "documentation-max-over-time": "指定間隔內所有點的最大值。",
+        "documentation-min-over-time": "指定間隔內所有點的最小值。",
+        "documentation-minute": "傳回 UTC 中每個指定時間的分鐘。傳回的值介於 0 到 59 之間。",
+        "documentation-month": "傳回 UTC 中每個指定時間的月份。傳回的值介於 1 到 12 之間，其中 1 表示一月等。",
+        "documentation-pi": "傳回 pi",
+        "documentation-predict-linear": "使用簡單的線性回歸，根據範圍向量「v」，預測從現在開始的時間序列「t」秒的值。",
+        "documentation-present-over-time": "指定間隔內任何序列的值 1。",
+        "documentation-quantile-over-time": "指定間隔內的 φ-quantile (0 ≤ φ ≤ 1) 值。",
+        "documentation-rad": "將 v 中所有元素的度數轉換為弧度",
+        "documentation-rate": "計算範圍向量中時間序列的每秒平均增長率。單調性中斷（例如由於目標重新啟動而導致的計數器重置）會自動調整。此外，計算外推到時間範圍的末端，允許錯過的刮擦或刮擦週期與範圍時間段的不完美對齊。",
+        "documentation-resets": "對於每個輸入時間序列，「resets(v range-vector)」會將提供的時間範圍內的計數器重設數傳回為即時向量。兩個連續樣本之間的數值減少會被解釋為計數器重設。",
+        "documentation-round": "將「v」中所有元素的樣本值四捨五入為最接近的整數。若出現相同情況，則向上取整。可選的「to_nearest」引數允許指定應將樣本值四捨五入為最接近的倍數。此倍數也可以是分數。",
+        "documentation-scalar": "假設有一個單元素輸入向量，「scalar(v instant-vector)」會將該單元素的樣本值作為純量傳回。如果輸入向量不僅僅只有一個元素，「scalar」會傳回「NaN」。",
+        "documentation-sgn": "傳回一個向量，其中所有樣本值都轉換為其符號，定義如下：如果 v 為正數，則為 1；如果 v 為負數，則為 -1；如果 v 等於零，則為 0。",
+        "documentation-sort": "傳回按樣本值排序的向量元素，按遞增順序排序。",
+        "documentation-sort-desc": "傳回按樣本值排序的向量元素，按遞減順序排列。",
+        "documentation-sqrt": "計算「v」中所有元素的平方根。",
+        "documentation-stddev-over-time": "指定間隔內值的總體標準差。",
+        "documentation-stdvar-over-time": "指定間隔內值的母體標準差。",
+        "documentation-sum-over-time": "指定間隔內所有值的總和。",
+        "documentation-time": "傳回自 1970 年 1 月 1 日 (UTC) 以來的秒數。請注意，這實際上並不會傳回目前時間，而是傳回要評估運算式的時間。",
+        "documentation-timestamp": "傳回指定向量每個樣本的時間戳記，作為自 1970 年 1 月 1 日 (UTC) 起的秒數。",
+        "documentation-vector": "傳回標量「s」作為沒有標籤的向量。",
+        "documentation-year": "傳回每個指定時間的年份（UTC 時間）。"
       },
       "getTrigonometricFunctions": {
-        "documentation-acos": "",
-        "documentation-acosh": "",
-        "documentation-asin": "",
-        "documentation-asinh": "",
-        "documentation-atan": "",
-        "documentation-atanh": "",
-        "documentation-cos": "",
-        "documentation-cosh": "",
-        "documentation-sin": "",
-        "documentation-sinh": "",
-        "documentation-tan": "",
-        "documentation-tanh": ""
+        "documentation-acos": "計算「{{argument}}」中所有元素的反餘弦值",
+        "documentation-acosh": "計算「{{argument}}」中所有元素的反雙曲餘弦值",
+        "documentation-asin": "計算「{{argument}}」中所有元素的反正弦值",
+        "documentation-asinh": "計算「{{argument}}」中所有元素的反雙曲正弦值",
+        "documentation-atan": "計算「{{argument}}」所有元素的反正切",
+        "documentation-atanh": "計算「{{argument}}」中所有元素的反雙曲正切",
+        "documentation-cos": "計算「{{argument}}」中所有元素的餘弦值",
+        "documentation-cosh": "計算「{{argument}}」中所有元素的雙曲餘弦值",
+        "documentation-sin": "計算「{{argument}}」中所有元素的正弦值",
+        "documentation-sinh": "計算「{{argument}}」中所有元素的反雙曲正弦值",
+        "documentation-tan": "計算「{{argument}}」中所有元素的正切值",
+        "documentation-tanh": "計算「{{argument}}」中所有元素的雙曲正切"
       }
     },
     "querybuilder": {
@@ -316,31 +316,31 @@
         "title-give-feedback": "指標瀏覽器為新功能，請告訴我們如何改善"
       },
       "get-collapsed-info": {
-        "exemplars": "",
-        "format": "",
-        "legend": "",
-        "step": "",
-        "type": ""
+        "exemplars": "範例：{{value}}",
+        "format": "格式：{{value}}",
+        "legend": "圖例：{{value}}",
+        "step": "步驟：{{value}}",
+        "type": "類型：{{value}}"
       },
       "get-placeholders": {
-        "browse": "",
-        "type": ""
+        "browse": "按名稱搜尋指標",
+        "type": "依照類型篩選"
       },
       "get-prom-types": {
-        "description-counter": "",
-        "description-gauge": "",
-        "description-histogram": "",
-        "description-native-histogram": "",
-        "description-no-type": "",
-        "description-summary": "",
-        "description-unknown": "",
-        "label-counter": "",
-        "label-gauge": "",
-        "label-histogram": "",
-        "label-native-histogram": "",
-        "label-no-type": "",
-        "label-summary": "",
-        "label-unknown": ""
+        "description-counter": "累積指標，代表單一單調遞增計數器，其值只能增加或在重新啟動時重設為零。",
+        "description-gauge": "代表單一數值的指標，可以任意上下移動。",
+        "description-histogram": "直方圖對觀察結果（通常是請求持續時間或回應大小等）進行抽樣，並在可設定的區塊中進行計數。",
+        "description-native-histogram": "原生直方圖在許多方面與經典的 Prometheus 直方圖不同：原生直方圖的區間界限是由一個公式計算得出，該公式取決於原生直方圖的比例（解析度），並且不是使用者定義的。",
+        "description-no-type": "這些指標在中繼資料中沒有定義的類型。",
+        "description-summary": "摘要樣本觀察（通常是請求持續時間和回應大小等），並且可以在滑動時間窗口中計算可設定的分位數。",
+        "description-unknown": "這些指標在中繼資料中被賦予未知類型。",
+        "label-counter": "計數器",
+        "label-gauge": "儀表",
+        "label-histogram": "直方圖",
+        "label-native-histogram": "原生直方圖",
+        "label-no-type": "無類型",
+        "label-summary": "摘要",
+        "label-unknown": "未知"
       },
       "handle-function": {
         "text": {
@@ -358,8 +358,8 @@
         "tooltip-label-filters": "選擇性設定：用於篩選為此查詢類型的指標選擇。"
       },
       "label-param-editor": {
-        "loadingMessage-loading-labels": "",
-        "noOptionsMessage-no-labels-found": ""
+        "loadingMessage-loading-labels": "載入標籤",
+        "noOptionsMessage-no-labels-found": "未找到標籤"
       },
       "metric-combobox": {
         "async-select": {
@@ -409,18 +409,18 @@
       },
       "operation-utils": {
         "getAggregationExplainer": {
-          "label-by": "",
-          "label-default": "",
-          "label-without": ""
+          "label-by": "計算維度上的「{{aggregationName}}」，同時保留 {{labelWord}} {{labels}}。",
+          "label-default": "計算維度的「{{aggregationName}}」。",
+          "label-without": "計算維度{{labels}}的「{{aggregationName}}」。保留所有其他標籤。"
         }
       },
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "設定步驟參數的下限",
         "aria-label-select-resolution": "選擇解決方案",
         "format-options": {
-          "label-heatmap": "",
-          "label-table": "",
-          "label-time-series": ""
+          "label-heatmap": "熱度圖",
+          "label-table": "表格",
+          "label-time-series": "時間序列"
         },
         "label-exemplars": "範例點",
         "label-format": "格式",
@@ -436,8 +436,8 @@
         "tooltip-autocomplete-suggestions-limited": "指標名稱的數量超過自動完成限制。僅顯示與{{autocompleteLimit}}最相關的指標。您可以在資料來源設定中調整臨界值。"
       },
       "prom-query-editor-selector": {
-        "body-syntax-error": "",
-        "confirmText-continue": "",
+        "body-syntax-error": "存在語法錯誤，或在切換至編輯器模式時無法將查詢結構視覺化。查詢的部分可能會遺失。",
+        "confirmText-continue": "繼續",
         "kick-start-your-query": "啟動您的查詢",
         "label-explain": "說明",
         "run-queries": "執行查詢",
@@ -453,8 +453,8 @@
       },
       "query-editor-mode-toggle": {
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "建立器",
+          "label-code": "代碼"
         }
       },
       "query-pattern": {
@@ -483,9 +483,9 @@
       "results-table": {
         "content-descriptive-type": "建立{{descriptiveType}}時，Prometheus 會透過類型計數器顯示多個序列。",
         "description": "說明",
-        "message-expand-label-filters": "",
-        "message-expand-search": "",
-        "message-no-metrics-found": "",
+        "message-expand-label-filters": "未找到指標。請嘗試展開標籤篩選條件。",
+        "message-expand-search": "未找到指標。請嘗試擴大搜尋範圍和篩選條件。",
+        "message-no-metrics-found": "在資料來源中未找到任何指標。",
         "name": "名稱（名字）",
         "type": "類型"
       },
diff --git a/packages/grafana-sql/src/locales/cs-CZ/grafana-sql.json b/packages/grafana-sql/src/locales/cs-CZ/grafana-sql.json
index 4b7fff9e223..68f1dd03de9 100644
--- a/packages/grafana-sql/src/locales/cs-CZ/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/cs-CZ/grafana-sql.json
@@ -56,8 +56,8 @@
       "query-header": {
         "content-invalid-query": "Váš dotaz je neplatný. Podrobnosti najdete níže. <1></1>Tento dotaz však můžete stále spustit.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Nástroj pro tvorbu",
+          "label-code": "Kód"
         },
         "label-dataset": "Soubor dat",
         "label-filter": "Filtrovat",
diff --git a/packages/grafana-sql/src/locales/de-DE/grafana-sql.json b/packages/grafana-sql/src/locales/de-DE/grafana-sql.json
index 152cc9af15b..784acba470c 100644
--- a/packages/grafana-sql/src/locales/de-DE/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/de-DE/grafana-sql.json
@@ -56,8 +56,8 @@
       "query-header": {
         "content-invalid-query": "Ihre Abfrage ist ungültig. Weitere Informationen finden Sie unten. <1></1>Sie können diese Abfrage aber trotzdem ausführen.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Code"
         },
         "label-dataset": "Datensatz",
         "label-filter": "Filter",
diff --git a/packages/grafana-sql/src/locales/es-ES/grafana-sql.json b/packages/grafana-sql/src/locales/es-ES/grafana-sql.json
index 6fcd133d0fa..50762539f05 100644
--- a/packages/grafana-sql/src/locales/es-ES/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/es-ES/grafana-sql.json
@@ -2,26 +2,26 @@
   "grafana-sql": {
     "components": {
       "confirm-modal": {
-        "builder-mode": "",
+        "builder-mode": "El modo Creador no muestra los cambios realizados en el código. El creador de consultas mostrará los últimos cambios que haya realizado en el modo Creador.",
         "cancel": "Cancelar",
-        "clipboard": "",
-        "copy-code-and-switch": "",
-        "discard-code-and-switch": "",
+        "clipboard": "¿Quiere copiar su código en el portapapeles?",
+        "copy-code-and-switch": "Copiar código y cambiar",
+        "discard-code-and-switch": "Descartar código y cambiar",
         "warning": "Advertencia"
       },
       "connection-limits": {
-        "auto-max-idle": "",
-        "content-auto-max-idle": "",
-        "content-max-idle": "",
-        "content-max-lifetime": "",
-        "content-max-open": "",
-        "max-idle": "",
-        "max-lifetime": "",
-        "max-open": "",
-        "title-connection-limits": ""
+        "auto-max-idle": "Inactividad máxima automática",
+        "content-auto-max-idle": "Si está habilitado, establece automáticamente el número de <1>Conexiones inactivas máximas</1> en el mismo valor que<3> Conexiones abiertas máximas</3>. Si no se establece el número de conexiones abiertas máximas, se establecerá en el valor predeterminado ({{defaultMaxIdle}}).",
+        "content-max-idle": "El número máximo de conexiones en el grupo de conexiones inactivas. Si <1>Conexiones abiertas máximas</1> es mayor que 0 pero menor que <3>Conexiones inactivas máximas</3>, entonces <5>Conexiones inactivas máximas</5> se reducirá para que coincida con el límite de <8>Conexiones abiertas máximas</8>. Si se establece en 0, no se conservan las conexiones inactivas.",
+        "content-max-lifetime": "La cantidad máxima de tiempo en segundos que se puede reutilizar una conexión. Si se establece en 0, las conexiones se reutilizan para siempre.",
+        "content-max-open": "El número máximo de conexiones abiertas a la base de datos. Si <1>Conexiones inactivas máximas</1> es mayor que 0 y <3>Conexiones abiertas máximas</3> es menor que <5>Conexiones inactivas máximas</5>, entonces <7>Conexiones inactivas máximas</7> se reducirá para que coincida con el límite de <9>Conexiones abiertas máximas</9>. Si se establece en 0, no hay límite en el número de conexiones abiertas.",
+        "max-idle": "Máx. inactivas",
+        "max-lifetime": "Vida útil máxima",
+        "max-open": "Máx. abiertas",
+        "title-connection-limits": "Límites de la conexión"
       },
       "dataset-selector": {
-        "aria-label-dataset-selector": ""
+        "aria-label-dataset-selector": "Selector de conjuntos de datos"
       },
       "error-boundary": {
         "fall-back": {
@@ -31,21 +31,21 @@
       "get-custom-operators": {
         "custom-operators": {
           "label": {
-            "macros": ""
+            "macros": "Macros"
           }
         }
       },
       "make-render-column": {
         "render-column": {
           "aria-label-group-by": "Agrupar por",
-          "title-remove-group-by-column": ""
+          "title-remove-group-by-column": "Eliminar grupo por columna"
         }
       },
       "order-by-row": {
-        "aria-label-order-by": "",
+        "aria-label-order-by": "Ordenar por",
         "label-limit": "Límite",
-        "label-offset": "",
-        "label-order-by": ""
+        "label-offset": "Separación",
+        "label-order-by": "Ordenar por"
       },
       "preview": {
         "label-element": {
@@ -54,100 +54,100 @@
         }
       },
       "query-header": {
-        "content-invalid-query": "",
+        "content-invalid-query": "Su consulta no es válida. A continuación podrá obtener más información. <1></1>En todo caso, puede ejecutar esta consulta.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Constructor",
+          "label-code": "Código"
         },
-        "label-dataset": "",
+        "label-dataset": "Conjunto de datos",
         "label-filter": "Filtro",
         "label-format": "Formato",
         "label-group": "Grupo",
-        "label-order": "",
+        "label-order": "Orden",
         "label-preview": "Vista previa",
         "label-table": "Tabla",
-        "placeholder-select-format": "",
+        "placeholder-select-format": "Seleccionar formato",
         "run-query": "Ejecutar consulta"
       },
       "query-toolbox": {
-        "content-hit-ctrlcmdreturn-to-run-query": "",
-        "tooltip-collapse": "",
-        "tooltip-expand": "",
-        "tooltip-format-query": ""
+        "content-hit-ctrlcmdreturn-to-run-query": "Pulse CTRL/CMD+Return para ejecutar la consulta",
+        "tooltip-collapse": "Contraer editor",
+        "tooltip-expand": "Expandir editor",
+        "tooltip-format-query": "Formatear consulta"
       },
       "query-validator": {
-        "query-will-process": "",
-        "validating-query": ""
+        "query-will-process": "<0></0> Esta consulta procesará <2>{{bytes}}</2> cuando se ejecute.",
+        "validating-query": "Validando consulta..."
       },
       "raw-editor": {
         "render-placeholder": {
-          "editing-in-expanded-code-editor": ""
+          "editing-in-expanded-code-editor": "Editando en el editor de código expandido"
         },
-        "title-query-num": ""
+        "title-query-num": "Consulta {{queryNum}}"
       },
       "select-column": {
         "label-column": "Columna"
       },
       "select-custom-function-parameters": {
-        "aria-label-parameter": "",
+        "aria-label-parameter": "Parámetro {{index}} para la columna {{columnIndex}}",
         "render-parameters": {
           "params": {
-            "title-remove-parameter": ""
+            "title-remove-parameter": "Eliminar parámetro"
           }
         },
-        "title-add-parameter": ""
+        "title-add-parameter": "Añadir parámetro"
       },
       "select-row": {
         "aggregate-options": {
           "options": {
             "label": {
-              "aggregations": "",
-              "macros": ""
+              "aggregations": "Agregaciones",
+              "macros": "Macros"
             }
           }
         },
         "label": {
-          "time": "",
+          "time": "tiempo",
           "value": "valor"
         },
         "label-alias": "Alias",
-        "label-data-operations": "",
-        "title-add-column": "",
-        "title-remove-column": ""
+        "label-data-operations": "Operaciones de datos",
+        "title-add-column": "Añadir columna",
+        "title-remove-column": "Eliminar columna"
       },
       "settings": {
-        "aria-label-conjunction": "",
+        "aria-label-conjunction": "Conjunción",
         "aria-label-field": "Campo",
         "aria-label-operator": "Operador",
-        "title-button-filter": ""
+        "title-button-filter": "Filtro {{ buttonLabel }}"
       },
       "sql-query-editor-lazy": {
         "text-loading-editor": "Cargando editor"
       },
       "table-selector": {
-        "aria-label-table-selector": "",
-        "placeholder-loading": "",
-        "placeholder-select-table": ""
+        "aria-label-table-selector": "Selector de tablas",
+        "placeholder-loading": "Cargando tablas",
+        "placeholder-select-table": "Seleccionar tabla"
       },
       "tlssecrets-config": {
-        "content-tlsssl-client-certificate": "",
-        "content-tlsssl-client-key": "",
-        "content-tlsssl-root-certificate": "",
-        "tlsssl-client-certificate": "",
-        "tlsssl-client-key": "",
+        "content-tlsssl-client-certificate": "Para autenticarse con un certificado de cliente TLS/SSL, proporciónelo aquí.",
+        "content-tlsssl-client-key": "Para autenticarse con un certificado TLS/SSL de cliente, proporcione la clave aquí.",
+        "content-tlsssl-root-certificate": "Si el modo TLS/SSL seleccionado requiere un certificado raíz del servidor, proporciónelo aquí",
+        "tlsssl-client-certificate": "Certificado de cliente TLS/SSL",
+        "tlsssl-client-key": "Clave de cliente TLS/SSL",
         "tlsssl-root-certificate": "Certificado raíz TLS/SSL"
       },
       "visual-editor": {
-        "label-filter-by-column-value": "",
-        "label-group-by-column": ""
+        "label-filter-by-column-value": "Filtrar por valor de columna",
+        "label-group-by-column": "Agrupar por columna"
       },
       "widgets": {
-        "aria-label-macros-value-selector": ""
+        "aria-label-macros-value-selector": "Selector de valores de macros"
       }
     },
     "utils": {
       "get-columns-width-indices": {
-        "label-selected-columns": ""
+        "label-selected-columns": "Columnas seleccionadas"
       }
     }
   }
diff --git a/packages/grafana-sql/src/locales/fr-FR/grafana-sql.json b/packages/grafana-sql/src/locales/fr-FR/grafana-sql.json
index d40e3f69bcc..f125322db6f 100644
--- a/packages/grafana-sql/src/locales/fr-FR/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/fr-FR/grafana-sql.json
@@ -56,8 +56,8 @@
       "query-header": {
         "content-invalid-query": "Votre requête n’est pas valide. Vérifiez ci-dessous pour en savoir plus. <1></1>Cependant, vous pouvez toujours exécuter cette requête.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Code"
         },
         "label-dataset": "Ensemble de données",
         "label-filter": "Filtrer",
diff --git a/packages/grafana-sql/src/locales/hu-HU/grafana-sql.json b/packages/grafana-sql/src/locales/hu-HU/grafana-sql.json
index bb168d14c87..2f48efc048e 100644
--- a/packages/grafana-sql/src/locales/hu-HU/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/hu-HU/grafana-sql.json
@@ -56,8 +56,8 @@
       "query-header": {
         "content-invalid-query": "A lekérdezés érvénytelen. A részleteket tekintse meg alább. <1></1>Ezt a lekérdezést azonban továbbra is futtathatja.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Építő",
+          "label-code": "Kód"
         },
         "label-dataset": "Adatkészlet",
         "label-filter": "Szűrő",
diff --git a/packages/grafana-sql/src/locales/id-ID/grafana-sql.json b/packages/grafana-sql/src/locales/id-ID/grafana-sql.json
index e4344f3ee68..7d4256c43eb 100644
--- a/packages/grafana-sql/src/locales/id-ID/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/id-ID/grafana-sql.json
@@ -56,8 +56,8 @@
       "query-header": {
         "content-invalid-query": "Kueri Anda tidak valid. Periksa di bawah ini untuk detailnya. <1></1>Namun, Anda masih dapat menjalankan kueri ini.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Pembangun",
+          "label-code": "Kode"
         },
         "label-dataset": "Kumpulan data",
         "label-filter": "Filter",
diff --git a/packages/grafana-sql/src/locales/it-IT/grafana-sql.json b/packages/grafana-sql/src/locales/it-IT/grafana-sql.json
index b7194050d6f..7197432881f 100644
--- a/packages/grafana-sql/src/locales/it-IT/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/it-IT/grafana-sql.json
@@ -2,26 +2,26 @@
   "grafana-sql": {
     "components": {
       "confirm-modal": {
-        "builder-mode": "",
+        "builder-mode": "La modalità generatore non visualizza le modifiche apportate al codice. Il generatore di query visualizzerà le ultime modifiche apportate in modalità generatore.",
         "cancel": "Annulla",
-        "clipboard": "",
-        "copy-code-and-switch": "",
-        "discard-code-and-switch": "",
+        "clipboard": "Copiare il tuo codice negli appunti?",
+        "copy-code-and-switch": "Copia codice e cambia",
+        "discard-code-and-switch": "Elimina codice e cambia",
         "warning": "Attenzione"
       },
       "connection-limits": {
-        "auto-max-idle": "",
-        "content-auto-max-idle": "",
-        "content-max-idle": "",
-        "content-max-lifetime": "",
-        "content-max-open": "",
-        "max-idle": "",
-        "max-lifetime": "",
-        "max-open": "",
-        "title-connection-limits": ""
+        "auto-max-idle": "Inattività massima automatica",
+        "content-auto-max-idle": "Se abilitato, imposta automaticamente il numero di <1>Connessioni inattive massime</1> sullo stesso valore di <3> Connessioni aperte massime</3>. Se il numero massimo di connessioni aperte non è impostato, verrà impostato sul valore predefinito ({{defaultMaxIdle}}).",
+        "content-max-idle": "Il numero massimo di connessioni nel pool di connessioni inattive. Se <1>Connessioni aperte massine</1> è maggiore di 0 ma inferiore a <3>Connessioni inattive massime</3>, le <5>Connessioni inattive massime</5> verranno ridotte per corrispondere al limite di <8>Connessioni aperte massime</8>. Se impostato su 0, non viene mantenuta alcuna connessione inattiva.",
+        "content-max-lifetime": "La quantità massima di tempo in secondi in cui una connessione può essere riutilizzata. Se impostato su 0, le connessioni vengono riutilizzate per sempre.",
+        "content-max-open": "Il numero massimo di connessioni aperte al database. Se <1>Connessioni inattive massime</1> è maggiore di 0 e <3>Connessioni aperte massime</3> è inferiore a <5>Connessioni inattive massime</5>, <7>Connessioni inattive massime</7> verrà ridotto affinché corrisponda al limite di <9>Connessioni aperte massime</9>. Se impostato su 0, non vi è alcun limite al numero di connessioni aperte.",
+        "max-idle": "Inattive massime",
+        "max-lifetime": "Durata massima",
+        "max-open": "Aperte massime",
+        "title-connection-limits": "Limiti di collegamento"
       },
       "dataset-selector": {
-        "aria-label-dataset-selector": ""
+        "aria-label-dataset-selector": "Selettore set di dati"
       },
       "error-boundary": {
         "fall-back": {
@@ -31,21 +31,21 @@
       "get-custom-operators": {
         "custom-operators": {
           "label": {
-            "macros": ""
+            "macros": "Macro"
           }
         }
       },
       "make-render-column": {
         "render-column": {
           "aria-label-group-by": "Raggruppa per",
-          "title-remove-group-by-column": ""
+          "title-remove-group-by-column": "Rimuovi gruppo per colonna"
         }
       },
       "order-by-row": {
-        "aria-label-order-by": "",
+        "aria-label-order-by": "Ordina per",
         "label-limit": "Limite",
-        "label-offset": "",
-        "label-order-by": ""
+        "label-offset": "Compensazione",
+        "label-order-by": "Ordina per"
       },
       "preview": {
         "label-element": {
@@ -54,100 +54,100 @@
         }
       },
       "query-header": {
-        "content-invalid-query": "",
+        "content-invalid-query": "Query non valida. Controlla qui sotto per i dettagli. <1></1>Tuttavia, puoi comunque eseguire questa query.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Codice"
         },
-        "label-dataset": "",
+        "label-dataset": "Set di dati",
         "label-filter": "Filtro",
         "label-format": "Formato",
         "label-group": "Gruppo",
-        "label-order": "",
+        "label-order": "Ordina",
         "label-preview": "Anteprima",
         "label-table": "Tabella",
-        "placeholder-select-format": "",
+        "placeholder-select-format": "Seleziona il formato",
         "run-query": "Esegui query"
       },
       "query-toolbox": {
-        "content-hit-ctrlcmdreturn-to-run-query": "",
-        "tooltip-collapse": "",
-        "tooltip-expand": "",
-        "tooltip-format-query": ""
+        "content-hit-ctrlcmdreturn-to-run-query": "Premi CTRL/CMD+Invio per eseguire la query",
+        "tooltip-collapse": "Comprimi editor",
+        "tooltip-expand": "Espandi editor",
+        "tooltip-format-query": "Formato query"
       },
       "query-validator": {
-        "query-will-process": "",
-        "validating-query": ""
+        "query-will-process": "<0></0> Questa query elabora <2>{{bytes}}</2> quando viene eseguita.",
+        "validating-query": "Convalida della query in corso..."
       },
       "raw-editor": {
         "render-placeholder": {
-          "editing-in-expanded-code-editor": ""
+          "editing-in-expanded-code-editor": "Modifica nell'editor di codice espanso"
         },
-        "title-query-num": ""
+        "title-query-num": "Query {{queryNum}}"
       },
       "select-column": {
         "label-column": "Colonna"
       },
       "select-custom-function-parameters": {
-        "aria-label-parameter": "",
+        "aria-label-parameter": "Parametro {{index}} per colonna {{columnIndex}}",
         "render-parameters": {
           "params": {
-            "title-remove-parameter": ""
+            "title-remove-parameter": "Rimuovi parametro"
           }
         },
-        "title-add-parameter": ""
+        "title-add-parameter": "Aggiungi parametro"
       },
       "select-row": {
         "aggregate-options": {
           "options": {
             "label": {
-              "aggregations": "",
-              "macros": ""
+              "aggregations": "Aggregazioni",
+              "macros": "Macro"
             }
           }
         },
         "label": {
-          "time": "",
+          "time": "tempo",
           "value": "valore"
         },
         "label-alias": "Nome alternativo",
-        "label-data-operations": "",
-        "title-add-column": "",
-        "title-remove-column": ""
+        "label-data-operations": "Operazioni sui dati",
+        "title-add-column": "Aggiungi colonna",
+        "title-remove-column": "Rimuovi colonna"
       },
       "settings": {
-        "aria-label-conjunction": "",
+        "aria-label-conjunction": "Congiunzione",
         "aria-label-field": "Campo",
         "aria-label-operator": "Operatore",
-        "title-button-filter": ""
+        "title-button-filter": "Filtro {{ buttonLabel }}"
       },
       "sql-query-editor-lazy": {
         "text-loading-editor": "Caricamento editor in corso..."
       },
       "table-selector": {
-        "aria-label-table-selector": "",
-        "placeholder-loading": "",
-        "placeholder-select-table": ""
+        "aria-label-table-selector": "Selettore tabella",
+        "placeholder-loading": "Caricamento tabelle",
+        "placeholder-select-table": "Seleziona tabella"
       },
       "tlssecrets-config": {
-        "content-tlsssl-client-certificate": "",
-        "content-tlsssl-client-key": "",
-        "content-tlsssl-root-certificate": "",
-        "tlsssl-client-certificate": "",
-        "tlsssl-client-key": "",
+        "content-tlsssl-client-certificate": "Per autenticarsi con un certificato client TLS/SSL, fornisci qui il certificato client.",
+        "content-tlsssl-client-key": "Per autenticarsi con un certificato TLS/SSL client, fornisci qui la chiave.",
+        "content-tlsssl-root-certificate": "Se la modalità TLS/SSL selezionata richiede un certificato radice del server, forniscilo qui",
+        "tlsssl-client-certificate": "Certificato client TLS/SSL",
+        "tlsssl-client-key": "Chiave client TLS/SSL",
         "tlsssl-root-certificate": "Certificato radice TLS/SSL"
       },
       "visual-editor": {
-        "label-filter-by-column-value": "",
-        "label-group-by-column": ""
+        "label-filter-by-column-value": "Filtra per valore colonna",
+        "label-group-by-column": "Raggruppa per colonna"
       },
       "widgets": {
-        "aria-label-macros-value-selector": ""
+        "aria-label-macros-value-selector": "Selettore valore macro"
       }
     },
     "utils": {
       "get-columns-width-indices": {
-        "label-selected-columns": ""
+        "label-selected-columns": "Colonne selezionate"
       }
     }
   }
diff --git a/packages/grafana-sql/src/locales/ja-JP/grafana-sql.json b/packages/grafana-sql/src/locales/ja-JP/grafana-sql.json
index 8c6668317e3..5aaeb7a6783 100644
--- a/packages/grafana-sql/src/locales/ja-JP/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/ja-JP/grafana-sql.json
@@ -56,8 +56,8 @@
       "query-header": {
         "content-invalid-query": "クエリが無効です。詳細は下記をご確認ください。<1></1>ただし、このクエリは引き続き実行できます。",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "ビルダー",
+          "label-code": "コード"
         },
         "label-dataset": "データセット",
         "label-filter": "フィルタリング",
diff --git a/packages/grafana-sql/src/locales/ko-KR/grafana-sql.json b/packages/grafana-sql/src/locales/ko-KR/grafana-sql.json
index ab01d9e61a0..61248514907 100644
--- a/packages/grafana-sql/src/locales/ko-KR/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/ko-KR/grafana-sql.json
@@ -2,26 +2,26 @@
   "grafana-sql": {
     "components": {
       "confirm-modal": {
-        "builder-mode": "",
+        "builder-mode": "빌더 모드에서는 코드의 변경 사항이 표시되지 않습니다. 쿼리 빌더는 빌더 모드에서 마지막으로 변경한 사항을 표시합니다.",
         "cancel": "취소",
-        "clipboard": "",
-        "copy-code-and-switch": "",
-        "discard-code-and-switch": "",
+        "clipboard": "코드를 클립보드에 복사하시겠어요?",
+        "copy-code-and-switch": "코드 복사 및 전환",
+        "discard-code-and-switch": "코드 삭제 및 전환",
         "warning": "경고"
       },
       "connection-limits": {
-        "auto-max-idle": "",
-        "content-auto-max-idle": "",
-        "content-max-idle": "",
-        "content-max-lifetime": "",
-        "content-max-open": "",
-        "max-idle": "",
-        "max-lifetime": "",
-        "max-open": "",
-        "title-connection-limits": ""
+        "auto-max-idle": "자동 최대 유휴",
+        "content-auto-max-idle": "활성화하면, <1>유휴 연결 수 최대 한도</1>를 <3>열린 연결 수 최대 한도</3>와 동일한 값으로 자동 설정합니다. 열린 연결 수 최대 한도를 설정하지 않으면, 기본값({{defaultMaxIdle}})으로 설정됩니다.",
+        "content-max-idle": "유휴 연결 풀의 연결 최대 한도입니다. <1>열린 연결 최대 한도</1>가 0보다 크지만 <3>유휴 연결 최대 한도</3>보다 작으면, <5>유휴 연결 최대 한도</5>가 <8>열린 연결 최대 한도</8>에 맞춰 감소합니다. 0으로 설정된 경우, 유휴 연결이 유지되지 않습니다.",
+        "content-max-lifetime": "연결을 재사용할 수 있는 최대 시간(초)입니다. 0으로 설정하면, 연결이 영구적으로 재사용됩니다.",
+        "content-max-open": "데이터베이스에 대한 열린 연결 최대 한도입니다. <1>유휴 연결 최대 한도</1>가 0보다 크고 <3>열린 연결 최대 한도</3>가 <5>유휴 연결 최대 한도</5>보다 작으면, <7>유휴 연결 최대 한도</7>가 <9>열린 연결 최대 한도</9>와 일치하도록 감소합니다. 0으로 설정하면, 열린 연결 수에 제한이 없습니다.",
+        "max-idle": "유휴 최대 한도",
+        "max-lifetime": "최대 수명 기간",
+        "max-open": "열 한도",
+        "title-connection-limits": "연결 한도"
       },
       "dataset-selector": {
-        "aria-label-dataset-selector": ""
+        "aria-label-dataset-selector": "데이터 집합 선택기"
       },
       "error-boundary": {
         "fall-back": {
@@ -31,21 +31,21 @@
       "get-custom-operators": {
         "custom-operators": {
           "label": {
-            "macros": ""
+            "macros": "매크로"
           }
         }
       },
       "make-render-column": {
         "render-column": {
           "aria-label-group-by": "그룹화 기준",
-          "title-remove-group-by-column": ""
+          "title-remove-group-by-column": "열별로 그룹 제거"
         }
       },
       "order-by-row": {
-        "aria-label-order-by": "",
+        "aria-label-order-by": "주문자",
         "label-limit": "제한",
-        "label-offset": "",
-        "label-order-by": ""
+        "label-offset": "오프셋",
+        "label-order-by": "주문자"
       },
       "preview": {
         "label-element": {
@@ -54,100 +54,100 @@
         }
       },
       "query-header": {
-        "content-invalid-query": "",
+        "content-invalid-query": "쿼리가 유효하지 않습니다. 자세한 내용은 아래에서 확인하세요. <1></1>하지만 이 쿼리는 계속 실행할 수 있습니다.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "빌더",
+          "label-code": "코드"
         },
-        "label-dataset": "",
+        "label-dataset": "데이터 집합",
         "label-filter": "필터",
         "label-format": "형식",
         "label-group": "그룹",
-        "label-order": "",
+        "label-order": "주문",
         "label-preview": "미리보기",
         "label-table": "표",
-        "placeholder-select-format": "",
+        "placeholder-select-format": "형식 선택",
         "run-query": "쿼리 실행"
       },
       "query-toolbox": {
-        "content-hit-ctrlcmdreturn-to-run-query": "",
-        "tooltip-collapse": "",
-        "tooltip-expand": "",
-        "tooltip-format-query": ""
+        "content-hit-ctrlcmdreturn-to-run-query": "쿼리를 실행하려면 CTRL/CMD+리턴 키를 누르세요.",
+        "tooltip-collapse": "편집기 접기",
+        "tooltip-expand": "편집기 펼치기",
+        "tooltip-format-query": "형식 쿼리"
       },
       "query-validator": {
-        "query-will-process": "",
-        "validating-query": ""
+        "query-will-process": "<0></0> 이 쿼리는 실행 시 <2>{{bytes}}</2>를 처리합니다.",
+        "validating-query": "쿼리 유효성 검사 중..."
       },
       "raw-editor": {
         "render-placeholder": {
-          "editing-in-expanded-code-editor": ""
+          "editing-in-expanded-code-editor": "확장된 코드 편집기에서 편집 중"
         },
-        "title-query-num": ""
+        "title-query-num": "{{queryNum}} 쿼리"
       },
       "select-column": {
         "label-column": "열"
       },
       "select-custom-function-parameters": {
-        "aria-label-parameter": "",
+        "aria-label-parameter": "{{columnIndex}} 열에 대한 {{index}} 매개변수",
         "render-parameters": {
           "params": {
-            "title-remove-parameter": ""
+            "title-remove-parameter": "매개변수 제거"
           }
         },
-        "title-add-parameter": ""
+        "title-add-parameter": "매개변수 추가"
       },
       "select-row": {
         "aggregate-options": {
           "options": {
             "label": {
-              "aggregations": "",
-              "macros": ""
+              "aggregations": "집계",
+              "macros": "매크로"
             }
           }
         },
         "label": {
-          "time": "",
+          "time": "시간",
           "value": "값"
         },
         "label-alias": "별칭",
-        "label-data-operations": "",
-        "title-add-column": "",
-        "title-remove-column": ""
+        "label-data-operations": "데이터 운영",
+        "title-add-column": "열 추가",
+        "title-remove-column": "열 삭제"
       },
       "settings": {
-        "aria-label-conjunction": "",
+        "aria-label-conjunction": "결합",
         "aria-label-field": "필드",
         "aria-label-operator": "작업 수행자",
-        "title-button-filter": ""
+        "title-button-filter": "{{ buttonLabel }} 필터"
       },
       "sql-query-editor-lazy": {
         "text-loading-editor": "편집기 로딩 중"
       },
       "table-selector": {
-        "aria-label-table-selector": "",
-        "placeholder-loading": "",
-        "placeholder-select-table": ""
+        "aria-label-table-selector": "테이블 선택기",
+        "placeholder-loading": "테이블 로딩 중",
+        "placeholder-select-table": "테이블 선택"
       },
       "tlssecrets-config": {
-        "content-tlsssl-client-certificate": "",
-        "content-tlsssl-client-key": "",
-        "content-tlsssl-root-certificate": "",
-        "tlsssl-client-certificate": "",
-        "tlsssl-client-key": "",
+        "content-tlsssl-client-certificate": "TLS/SSL 클라이언트 인증서를 사용하여 인증하려면 여기에서 클라이언트 인증서를 제공하세요. ",
+        "content-tlsssl-client-key": "클라이언트 TLS/SSL 인증서를 사용하여 인증하려면, 여기에 키를 제공하세요.",
+        "content-tlsssl-root-certificate": "선택한 TLS/SSL 모드에 서버 루트 인증서가 필요한 경우, 여기에서 제공하세요.",
+        "tlsssl-client-certificate": "TLS/SSL 클라이언트 인증서",
+        "tlsssl-client-key": "TLS/SSL 클라이언트 키",
         "tlsssl-root-certificate": "TLS/SSL 루트 인증서"
       },
       "visual-editor": {
-        "label-filter-by-column-value": "",
-        "label-group-by-column": ""
+        "label-filter-by-column-value": "열 값으로 필터링하기",
+        "label-group-by-column": "열별로 그룹화하기"
       },
       "widgets": {
-        "aria-label-macros-value-selector": ""
+        "aria-label-macros-value-selector": "매크로 값 선택기"
       }
     },
     "utils": {
       "get-columns-width-indices": {
-        "label-selected-columns": ""
+        "label-selected-columns": "선택한 열"
       }
     }
   }
diff --git a/packages/grafana-sql/src/locales/nl-NL/grafana-sql.json b/packages/grafana-sql/src/locales/nl-NL/grafana-sql.json
index 3fedf43d53d..4860e9bd054 100644
--- a/packages/grafana-sql/src/locales/nl-NL/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/nl-NL/grafana-sql.json
@@ -56,8 +56,8 @@
       "query-header": {
         "content-invalid-query": "Je query is ongeldig. Kijk hieronder voor meer informatie. <1></1>Je kunt deze query echter nog steeds uitvoeren.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Bouwer",
+          "label-code": "Code"
         },
         "label-dataset": "Gegevensreeks",
         "label-filter": "Filter",
diff --git a/packages/grafana-sql/src/locales/pl-PL/grafana-sql.json b/packages/grafana-sql/src/locales/pl-PL/grafana-sql.json
index 47e1140a92a..677637715ce 100644
--- a/packages/grafana-sql/src/locales/pl-PL/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/pl-PL/grafana-sql.json
@@ -2,26 +2,26 @@
   "grafana-sql": {
     "components": {
       "confirm-modal": {
-        "builder-mode": "",
+        "builder-mode": "Tryb konstruktora nie wyświetla zmian wprowadzonych w kodzie. Konstruktor zapytań wyświetla ostatnie zmiany wprowadzone w trybie konstruktora.",
         "cancel": "Anuluj",
-        "clipboard": "",
-        "copy-code-and-switch": "",
-        "discard-code-and-switch": "",
+        "clipboard": "Czy chcesz skopiować kod do schowka?",
+        "copy-code-and-switch": "Skopiuj kod i przełącz",
+        "discard-code-and-switch": "Odrzuć kod i przełącz",
         "warning": "Ostrzeżenie"
       },
       "connection-limits": {
-        "auto-max-idle": "",
-        "content-auto-max-idle": "",
-        "content-max-idle": "",
-        "content-max-lifetime": "",
-        "content-max-open": "",
-        "max-idle": "",
-        "max-lifetime": "",
-        "max-open": "",
-        "title-connection-limits": ""
+        "auto-max-idle": "Automatyczny maksymalny czas bezczynności",
+        "content-auto-max-idle": "Jeśli ta opcja jest włączona, automatycznie ustawia <1>maksymalną liczbę bezczynnych połączeń</1> na tę samą wartość, co <3>maksymalna liczba otwartych połączeń</3>. Jeśli maksymalna liczba otwartych połączeń nie jest określona, zostanie ustawiona wartość domyślna ({{defaultMaxIdle}}).",
+        "content-max-idle": "Maksymalna liczba połączeń w puli bezczynnych połączeń. Jeśli <1>maksymalna liczba otwartych połączeń</1> jest większa niż 0, ale mniejsza niż <3>maksymalna liczba bezczynnych połączeń</3>, to <5>maksymalna liczba bezczynnych połączeń</5> zostanie zmniejszona, aby dopasować ją do limitu <8>maksymalnej liczby otwartych połączeń</8>. Jeśli ustawiono wartość 0, nie są zachowywane żadne bezczynne połączenia.",
+        "content-max-lifetime": "Maksymalny czas w sekundach, przez który połączenie może być ponownie użyte. Jeśli ustawiono wartość 0, połączenia są ponownie wykorzystywane bez daty zakończenia.",
+        "content-max-open": "Maksymalna liczba otwartych połączeń z bazą danych. Jeśli <1>maksymalna liczba bezczynnych połączeń</1> jest większa niż 0, a <3>maksymalna liczba otwartych połączeń</3> jest mniejsza niż <5>maksymalna liczba bezczynnych połączeń</5>, to <7>maksymalna liczba bezczynnych połączeń</7> zostanie zmniejszona, aby dopasować ją do limitu <9>maksymalnej liczby otwartych połączeń</9>. Jeśli ustawiono wartość 0, liczba otwartych połączeń nie jest ograniczona.",
+        "max-idle": "Maks. czas bezczynności",
+        "max-lifetime": "Maks. czas istnienia",
+        "max-open": "Maks. czas otwarcia",
+        "title-connection-limits": "Limity połączeń"
       },
       "dataset-selector": {
-        "aria-label-dataset-selector": ""
+        "aria-label-dataset-selector": "Selektor zbioru danych"
       },
       "error-boundary": {
         "fall-back": {
@@ -31,21 +31,21 @@
       "get-custom-operators": {
         "custom-operators": {
           "label": {
-            "macros": ""
+            "macros": "Makra"
           }
         }
       },
       "make-render-column": {
         "render-column": {
           "aria-label-group-by": "Grupuj według",
-          "title-remove-group-by-column": ""
+          "title-remove-group-by-column": "Usuń grupę według kolumny"
         }
       },
       "order-by-row": {
-        "aria-label-order-by": "",
+        "aria-label-order-by": "Kolejność według",
         "label-limit": "Limit",
-        "label-offset": "",
-        "label-order-by": ""
+        "label-offset": "Przesunięcie",
+        "label-order-by": "Kolejność według"
       },
       "preview": {
         "label-element": {
@@ -54,100 +54,100 @@
         }
       },
       "query-header": {
-        "content-invalid-query": "",
+        "content-invalid-query": "Zapytanie jest nieprawidłowe. Szczegóły znajdziesz poniżej. <1></1>Nadal jednak możesz uruchomić to zapytanie.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Konstruktor",
+          "label-code": "Kod"
         },
-        "label-dataset": "",
+        "label-dataset": "Zbiór danych",
         "label-filter": "Filtr",
         "label-format": "Format",
         "label-group": "Grupa",
-        "label-order": "",
+        "label-order": "Kolejność",
         "label-preview": "Podgląd",
         "label-table": "Tabela",
-        "placeholder-select-format": "",
+        "placeholder-select-format": "Wybierz format",
         "run-query": "Uruchom zapytanie"
       },
       "query-toolbox": {
-        "content-hit-ctrlcmdreturn-to-run-query": "",
-        "tooltip-collapse": "",
-        "tooltip-expand": "",
-        "tooltip-format-query": ""
+        "content-hit-ctrlcmdreturn-to-run-query": "Naciśnij CTRL/CMD + Return, aby uruchomić zapytanie",
+        "tooltip-collapse": "Zwiń edytor",
+        "tooltip-expand": "Rozwiń edytor",
+        "tooltip-format-query": "Formatuj zapytanie"
       },
       "query-validator": {
-        "query-will-process": "",
-        "validating-query": ""
+        "query-will-process": "<0></0> To zapytanie przetworzy <2>{{bytes}}</2> po uruchomieniu.",
+        "validating-query": "Sprawdzanie poprawności zapytania…"
       },
       "raw-editor": {
         "render-placeholder": {
-          "editing-in-expanded-code-editor": ""
+          "editing-in-expanded-code-editor": "Edycja w rozszerzonym edytorze kodu"
         },
-        "title-query-num": ""
+        "title-query-num": "Zapytanie {{queryNum}}"
       },
       "select-column": {
         "label-column": "Kolumna"
       },
       "select-custom-function-parameters": {
-        "aria-label-parameter": "",
+        "aria-label-parameter": "Parametr {{index}} dotyczący kolumny {{columnIndex}}",
         "render-parameters": {
           "params": {
-            "title-remove-parameter": ""
+            "title-remove-parameter": "Usuń parametr"
           }
         },
-        "title-add-parameter": ""
+        "title-add-parameter": "Dodaj parametr"
       },
       "select-row": {
         "aggregate-options": {
           "options": {
             "label": {
-              "aggregations": "",
-              "macros": ""
+              "aggregations": "Agregacje",
+              "macros": "Makra"
             }
           }
         },
         "label": {
-          "time": "",
+          "time": "czas",
           "value": "wartość"
         },
         "label-alias": "Alias",
-        "label-data-operations": "",
-        "title-add-column": "",
-        "title-remove-column": ""
+        "label-data-operations": "Operacje na danych",
+        "title-add-column": "Dodaj kolumnę",
+        "title-remove-column": "Usuń kolumnę"
       },
       "settings": {
-        "aria-label-conjunction": "",
+        "aria-label-conjunction": "Koniunkcja",
         "aria-label-field": "Pole",
         "aria-label-operator": "Operator",
-        "title-button-filter": ""
+        "title-button-filter": "Filtr: {{ buttonLabel }}"
       },
       "sql-query-editor-lazy": {
         "text-loading-editor": "Ładowanie edytora…"
       },
       "table-selector": {
-        "aria-label-table-selector": "",
-        "placeholder-loading": "",
-        "placeholder-select-table": ""
+        "aria-label-table-selector": "Selektor tabel",
+        "placeholder-loading": "Ładowanie tabel",
+        "placeholder-select-table": "Wybierz tabelę"
       },
       "tlssecrets-config": {
-        "content-tlsssl-client-certificate": "",
-        "content-tlsssl-client-key": "",
-        "content-tlsssl-root-certificate": "",
-        "tlsssl-client-certificate": "",
-        "tlsssl-client-key": "",
+        "content-tlsssl-client-certificate": "Aby uwierzytelnić się za pomocą certyfikatu klienta TLS/SSL, podaj tutaj certyfikat klienta.",
+        "content-tlsssl-client-key": "Aby uwierzytelnić się za pomocą certyfikatu klienta TLS/SSL, podaj tutaj klucz.",
+        "content-tlsssl-root-certificate": "Jeśli wybrany tryb TLS/SSL wymaga certyfikatu głównego serwera, podaj go tutaj",
+        "tlsssl-client-certificate": "Certyfikat klienta TLS/SSL",
+        "tlsssl-client-key": "Klucz TLS/SSL klienta",
         "tlsssl-root-certificate": "Certyfikat główny TLS/SSL"
       },
       "visual-editor": {
-        "label-filter-by-column-value": "",
-        "label-group-by-column": ""
+        "label-filter-by-column-value": "Filtruj według wartości kolumny",
+        "label-group-by-column": "Grupuj wg kolumny"
       },
       "widgets": {
-        "aria-label-macros-value-selector": ""
+        "aria-label-macros-value-selector": "Selektor wartości makr"
       }
     },
     "utils": {
       "get-columns-width-indices": {
-        "label-selected-columns": ""
+        "label-selected-columns": "Wybrane kolumny"
       }
     }
   }
diff --git a/packages/grafana-sql/src/locales/pt-BR/grafana-sql.json b/packages/grafana-sql/src/locales/pt-BR/grafana-sql.json
index 8bb192f0a01..d897588a416 100644
--- a/packages/grafana-sql/src/locales/pt-BR/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/pt-BR/grafana-sql.json
@@ -2,26 +2,26 @@
   "grafana-sql": {
     "components": {
       "confirm-modal": {
-        "builder-mode": "",
+        "builder-mode": "O modo de construção não exibe as alterações feitas no código. O construtor de consultas exibirá as últimas alterações feitas no modo de construção.",
         "cancel": "Cancelar",
-        "clipboard": "",
-        "copy-code-and-switch": "",
-        "discard-code-and-switch": "",
+        "clipboard": "Deseja copiar seu código para a área de transferência?",
+        "copy-code-and-switch": "Copiar código e trocar",
+        "discard-code-and-switch": "Descartar código e trocar",
         "warning": "Aviso"
       },
       "connection-limits": {
-        "auto-max-idle": "",
-        "content-auto-max-idle": "",
-        "content-max-idle": "",
-        "content-max-lifetime": "",
-        "content-max-open": "",
-        "max-idle": "",
-        "max-lifetime": "",
-        "max-open": "",
-        "title-connection-limits": ""
+        "auto-max-idle": "Inatividade máxima automática",
+        "content-auto-max-idle": "Se ativado, define automaticamente o número <1>Máximo de conexões ociosas</1> para o mesmo valor que o<3> Máximo de conexões abertas</3>. Se o número máximo de conexões abertas não estiver definido, ele será definido de acordo com o padrão ({{defaultMaxIdle}}).",
+        "content-max-idle": "O número máximo de conexões no grupo de conexões ociosas. Se o <1>Máximo de conexões abertas</1> for maior que 0, mas menor que o <3>Máximo de conexões ociosas</3>, o <5>Máximo de conexões ociosas</5> será reduzido para corresponder ao limite do <8>Máximo de conexões abertas</8>. Se estiver definido como 0, nenhuma conexão ociosa será mantida.",
+        "content-max-lifetime": "A quantidade máxima de tempo em segundos que uma conexão pode ser reutilizada. Se estiver definido como 0, as conexões serão reutilizadas indefinidamente.",
+        "content-max-open": "O número máximo de conexões abertas com o banco de dados. Se o <1>Máximo de conexões ociosas</1> for maior que 0 e o <3>Máximo de conexões abertas</3> for menor que o <5>Máximo de conexões ociosas</5>, o <7>Máximo de conexões ociosas</7> será reduzido para corresponder ao limite do <9>Máximo de conexões abertas</9>. Se estiver definido como 0, não haverá limite para o número de conexões abertas.",
+        "max-idle": "Máximo de ociosidade",
+        "max-lifetime": "Tempo de vida máximo",
+        "max-open": "Máximo de aberturas",
+        "title-connection-limits": "Limites de conexão"
       },
       "dataset-selector": {
-        "aria-label-dataset-selector": ""
+        "aria-label-dataset-selector": "Seletor de conjunto de dados"
       },
       "error-boundary": {
         "fall-back": {
@@ -31,21 +31,21 @@
       "get-custom-operators": {
         "custom-operators": {
           "label": {
-            "macros": ""
+            "macros": "Macros"
           }
         }
       },
       "make-render-column": {
         "render-column": {
           "aria-label-group-by": "Agrupar por",
-          "title-remove-group-by-column": ""
+          "title-remove-group-by-column": "Remover grupo por coluna"
         }
       },
       "order-by-row": {
-        "aria-label-order-by": "",
+        "aria-label-order-by": "Ordenar por",
         "label-limit": "Limite",
-        "label-offset": "",
-        "label-order-by": ""
+        "label-offset": "Desvio",
+        "label-order-by": "Ordenar por"
       },
       "preview": {
         "label-element": {
@@ -54,100 +54,100 @@
         }
       },
       "query-header": {
-        "content-invalid-query": "",
+        "content-invalid-query": "Sua consulta é inválida. Confira abaixo para saber mais. <1></1>No entanto, você ainda pode executar esta consulta.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Construtor",
+          "label-code": "Código"
         },
-        "label-dataset": "",
+        "label-dataset": "Conjunto de dados",
         "label-filter": "Filtro",
         "label-format": "Formato",
         "label-group": "Grupo",
-        "label-order": "",
+        "label-order": "Ordem",
         "label-preview": "Visualizar",
         "label-table": "Tabela",
-        "placeholder-select-format": "",
+        "placeholder-select-format": "Selecionar formato",
         "run-query": "Executar consulta"
       },
       "query-toolbox": {
-        "content-hit-ctrlcmdreturn-to-run-query": "",
-        "tooltip-collapse": "",
-        "tooltip-expand": "",
-        "tooltip-format-query": ""
+        "content-hit-ctrlcmdreturn-to-run-query": "Pressione CTRL/CMD+Return para executar a consulta",
+        "tooltip-collapse": "Recolher editor",
+        "tooltip-expand": "Expandir editor",
+        "tooltip-format-query": "Formatar consulta"
       },
       "query-validator": {
-        "query-will-process": "",
-        "validating-query": ""
+        "query-will-process": "<0></0> Esta consulta processará <2>{{bytes}}</2> ao ser executada.",
+        "validating-query": "Validando consulta…"
       },
       "raw-editor": {
         "render-placeholder": {
-          "editing-in-expanded-code-editor": ""
+          "editing-in-expanded-code-editor": "Editando no editor de código expandido"
         },
-        "title-query-num": ""
+        "title-query-num": "Consulta {{queryNum}}"
       },
       "select-column": {
         "label-column": "Coluna"
       },
       "select-custom-function-parameters": {
-        "aria-label-parameter": "",
+        "aria-label-parameter": "Parâmetro {{index}} para coluna {{columnIndex}}",
         "render-parameters": {
           "params": {
-            "title-remove-parameter": ""
+            "title-remove-parameter": "Remover parâmetro"
           }
         },
-        "title-add-parameter": ""
+        "title-add-parameter": "Adicionar parâmetro"
       },
       "select-row": {
         "aggregate-options": {
           "options": {
             "label": {
-              "aggregations": "",
-              "macros": ""
+              "aggregations": "Agregações",
+              "macros": "Macros"
             }
           }
         },
         "label": {
-          "time": "",
+          "time": "tempo",
           "value": "valor"
         },
         "label-alias": "Apelido",
-        "label-data-operations": "",
-        "title-add-column": "",
-        "title-remove-column": ""
+        "label-data-operations": "Operações de dados",
+        "title-add-column": "Adicionar coluna",
+        "title-remove-column": "Remover coluna"
       },
       "settings": {
-        "aria-label-conjunction": "",
+        "aria-label-conjunction": "Conjunção",
         "aria-label-field": "Campo",
         "aria-label-operator": "Operador",
-        "title-button-filter": ""
+        "title-button-filter": "Filtro {{ buttonLabel }}"
       },
       "sql-query-editor-lazy": {
         "text-loading-editor": "Carregando editor..."
       },
       "table-selector": {
-        "aria-label-table-selector": "",
-        "placeholder-loading": "",
-        "placeholder-select-table": ""
+        "aria-label-table-selector": "Seletor de tabela",
+        "placeholder-loading": "Carregando tabelas",
+        "placeholder-select-table": "Selecionar tabela"
       },
       "tlssecrets-config": {
-        "content-tlsssl-client-certificate": "",
-        "content-tlsssl-client-key": "",
-        "content-tlsssl-root-certificate": "",
-        "tlsssl-client-certificate": "",
-        "tlsssl-client-key": "",
+        "content-tlsssl-client-certificate": "Para realizar a autenticação com um certificado de cliente TLS/SSL, insira o certificado de cliente aqui.",
+        "content-tlsssl-client-key": "Para realizar a autenticação com um certificado TLS/SSL de cliente, insira a chave aqui.",
+        "content-tlsssl-root-certificate": "Se o modo TLS/SSL selecionado exigir um certificado raiz do servidor, insira-o aqui",
+        "tlsssl-client-certificate": "Certificado de cliente TLS/SSL",
+        "tlsssl-client-key": "Chave de cliente TLS/SSL",
         "tlsssl-root-certificate": "Certificado raiz TLS/SSL"
       },
       "visual-editor": {
-        "label-filter-by-column-value": "",
-        "label-group-by-column": ""
+        "label-filter-by-column-value": "Filtrar por valor da coluna",
+        "label-group-by-column": "Agrupar por coluna"
       },
       "widgets": {
-        "aria-label-macros-value-selector": ""
+        "aria-label-macros-value-selector": "Seletor de valor de macros"
       }
     },
     "utils": {
       "get-columns-width-indices": {
-        "label-selected-columns": ""
+        "label-selected-columns": "Colunas selecionadas"
       }
     }
   }
diff --git a/packages/grafana-sql/src/locales/pt-PT/grafana-sql.json b/packages/grafana-sql/src/locales/pt-PT/grafana-sql.json
index 4a5f9824264..ced6291980a 100644
--- a/packages/grafana-sql/src/locales/pt-PT/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/pt-PT/grafana-sql.json
@@ -2,26 +2,26 @@
   "grafana-sql": {
     "components": {
       "confirm-modal": {
-        "builder-mode": "",
+        "builder-mode": "O modo de construtor não exibe as alterações feitas no código. O construtor de consultas exibirá as últimas alterações que efetuou no modo de construtor.",
         "cancel": "Cancelar",
-        "clipboard": "",
-        "copy-code-and-switch": "",
-        "discard-code-and-switch": "",
+        "clipboard": "Pretende copiar o seu código para a área de transferência?",
+        "copy-code-and-switch": "Copiar código e mudar",
+        "discard-code-and-switch": "Descartar código e mudar",
         "warning": "Aviso"
       },
       "connection-limits": {
-        "auto-max-idle": "",
-        "content-auto-max-idle": "",
-        "content-max-idle": "",
-        "content-max-lifetime": "",
-        "content-max-open": "",
-        "max-idle": "",
-        "max-lifetime": "",
-        "max-open": "",
-        "title-connection-limits": ""
+        "auto-max-idle": "Ralenti máximo automático",
+        "content-auto-max-idle": "Se ativado, defina automaticamente o número de <1>Ligações de ralenti máximas</1> para o mesmo valor que<3> Ligações abertas máximas</3>. Se o número de ligações abertas máximas não estiver definido, será definido para a predefinição ({{defaultMaxIdle}}).",
+        "content-max-idle": "O número máximo de ligações no conjunto de ligações de ralenti. Se <1>Ligações abertas máximas</1> for maior que 0, mas menor que as <3>Ligações de ralenti máximas</3>, então as <5>Ligações de ralenti máximas</5> serão reduzidas para corresponder ao limite de <8>Ligações abertas máximas</8>. Se definido para 0, nenhuma ligação de ralenti será retida.",
+        "content-max-lifetime": "A quantidade máxima de tempo em segundos que uma ligação pode ser reutilizada. Se definido para 0, as ligações serão reutilizadas para sempre.",
+        "content-max-open": "O número máximo de ligações abertas à base de dados. Se <1>Ligações de ralenti máximas</1> for maior que 0 e as <3>Ligações abertas máximas</3> for menor que <5>Ligações de ralenti máximas</5>, então <7>Ligações de ralenti máximas</7> serão reduzidas para corresponder ao limite de <9>Ligações abertas máximas</9>. Se definido para 0, não há limite para o número de ligações abertas.",
+        "max-idle": "Ralenti máx.",
+        "max-lifetime": "Tempo de vida máximo",
+        "max-open": "Aberturas máx.",
+        "title-connection-limits": "Limites da ligação"
       },
       "dataset-selector": {
-        "aria-label-dataset-selector": ""
+        "aria-label-dataset-selector": "Seletor de conjunto de dados"
       },
       "error-boundary": {
         "fall-back": {
@@ -31,21 +31,21 @@
       "get-custom-operators": {
         "custom-operators": {
           "label": {
-            "macros": ""
+            "macros": "Macros"
           }
         }
       },
       "make-render-column": {
         "render-column": {
           "aria-label-group-by": "Agrupar por",
-          "title-remove-group-by-column": ""
+          "title-remove-group-by-column": "Remover grupo por coluna"
         }
       },
       "order-by-row": {
-        "aria-label-order-by": "",
+        "aria-label-order-by": "Ordenar por",
         "label-limit": "Limite",
-        "label-offset": "",
-        "label-order-by": ""
+        "label-offset": "Deslocamento",
+        "label-order-by": "Ordenar por"
       },
       "preview": {
         "label-element": {
@@ -54,100 +54,100 @@
         }
       },
       "query-header": {
-        "content-invalid-query": "",
+        "content-invalid-query": "A sua consulta é inválida. Verifique abaixo para obter detalhes. <1></1>No entanto, ainda pode executar esta consulta.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Construtor",
+          "label-code": "Cód."
         },
-        "label-dataset": "",
+        "label-dataset": "Conjunto de dados",
         "label-filter": "Filtro",
         "label-format": "Formato",
         "label-group": "Grupo",
-        "label-order": "",
+        "label-order": "Encomenda",
         "label-preview": "Pré-visualizar",
         "label-table": "Tabela",
-        "placeholder-select-format": "",
+        "placeholder-select-format": "Selecionar formato",
         "run-query": "Executar consulta"
       },
       "query-toolbox": {
-        "content-hit-ctrlcmdreturn-to-run-query": "",
-        "tooltip-collapse": "",
-        "tooltip-expand": "",
-        "tooltip-format-query": ""
+        "content-hit-ctrlcmdreturn-to-run-query": "Pressione CTRL/CMD+Return para executar a consulta",
+        "tooltip-collapse": "Recolher editor",
+        "tooltip-expand": "Expandir editor",
+        "tooltip-format-query": "Formatar consulta"
       },
       "query-validator": {
-        "query-will-process": "",
-        "validating-query": ""
+        "query-will-process": "<0></0> Esta consulta processará <2>{{bytes}}</2> quando for executada.",
+        "validating-query": "A validar consulta..."
       },
       "raw-editor": {
         "render-placeholder": {
-          "editing-in-expanded-code-editor": ""
+          "editing-in-expanded-code-editor": "Editar no editor de código expandido"
         },
-        "title-query-num": ""
+        "title-query-num": "Consulta {{queryNum}}"
       },
       "select-column": {
         "label-column": "Coluna"
       },
       "select-custom-function-parameters": {
-        "aria-label-parameter": "",
+        "aria-label-parameter": "Parâmetro {{index}} para coluna {{columnIndex}}",
         "render-parameters": {
           "params": {
-            "title-remove-parameter": ""
+            "title-remove-parameter": "Remover parâmetro"
           }
         },
-        "title-add-parameter": ""
+        "title-add-parameter": "Adicionar parâmetro"
       },
       "select-row": {
         "aggregate-options": {
           "options": {
             "label": {
-              "aggregations": "",
-              "macros": ""
+              "aggregations": "Agregações",
+              "macros": "Macros"
             }
           }
         },
         "label": {
-          "time": "",
+          "time": "do fumo",
           "value": "valor"
         },
         "label-alias": "Nome alternativo",
-        "label-data-operations": "",
-        "title-add-column": "",
-        "title-remove-column": ""
+        "label-data-operations": "Operações de dados",
+        "title-add-column": "Adicionar coluna",
+        "title-remove-column": "Remover coluna"
       },
       "settings": {
-        "aria-label-conjunction": "",
+        "aria-label-conjunction": "Conjunção",
         "aria-label-field": "Campo",
         "aria-label-operator": "Operador",
-        "title-button-filter": ""
+        "title-button-filter": "Filtro {{ buttonLabel }}"
       },
       "sql-query-editor-lazy": {
         "text-loading-editor": "A carregar o editor..."
       },
       "table-selector": {
-        "aria-label-table-selector": "",
-        "placeholder-loading": "",
-        "placeholder-select-table": ""
+        "aria-label-table-selector": "Seletor de tabela",
+        "placeholder-loading": "A carregar tabelas",
+        "placeholder-select-table": "Selecionar tabela"
       },
       "tlssecrets-config": {
-        "content-tlsssl-client-certificate": "",
-        "content-tlsssl-client-key": "",
-        "content-tlsssl-root-certificate": "",
-        "tlsssl-client-certificate": "",
-        "tlsssl-client-key": "",
+        "content-tlsssl-client-certificate": "Para autenticar com um certificado de cliente TLS/SSL, forneça o certificado de cliente aqui.",
+        "content-tlsssl-client-key": "Para autenticar com um certificado TLS/SSL de cliente, forneça a chave aqui.",
+        "content-tlsssl-root-certificate": "Se o modo TLS/SSL selecionado exigir um certificado de raiz do servidor, forneça-o aqui",
+        "tlsssl-client-certificate": "Certificado de cliente TLS/SSL",
+        "tlsssl-client-key": "Chave de cliente TLS/SSL",
         "tlsssl-root-certificate": "Certificado de raiz TLS/SSL"
       },
       "visual-editor": {
-        "label-filter-by-column-value": "",
-        "label-group-by-column": ""
+        "label-filter-by-column-value": "Filtrar por valor de coluna",
+        "label-group-by-column": "Agrupar por coluna"
       },
       "widgets": {
-        "aria-label-macros-value-selector": ""
+        "aria-label-macros-value-selector": "Seletor de valor de macros"
       }
     },
     "utils": {
       "get-columns-width-indices": {
-        "label-selected-columns": ""
+        "label-selected-columns": "Colunas selecionadas"
       }
     }
   }
diff --git a/packages/grafana-sql/src/locales/ru-RU/grafana-sql.json b/packages/grafana-sql/src/locales/ru-RU/grafana-sql.json
index 12440aa0ddc..3e71d2e580d 100644
--- a/packages/grafana-sql/src/locales/ru-RU/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/ru-RU/grafana-sql.json
@@ -2,26 +2,26 @@
   "grafana-sql": {
     "components": {
       "confirm-modal": {
-        "builder-mode": "",
+        "builder-mode": "В режиме конструктора не отображаются изменения, внесенные в код. Конструктор запросов отобразит последние изменения, внесенные вами в режиме конструктора.",
         "cancel": "Отмена",
-        "clipboard": "",
-        "copy-code-and-switch": "",
-        "discard-code-and-switch": "",
+        "clipboard": "Копировать код в буфер обмена?",
+        "copy-code-and-switch": "Копировать код и переключиться",
+        "discard-code-and-switch": "Отменить код и переключиться",
         "warning": "Предупреждение"
       },
       "connection-limits": {
-        "auto-max-idle": "",
-        "content-auto-max-idle": "",
-        "content-max-idle": "",
-        "content-max-lifetime": "",
-        "content-max-open": "",
-        "max-idle": "",
-        "max-lifetime": "",
-        "max-open": "",
-        "title-connection-limits": ""
+        "auto-max-idle": "Автоматический максимум неактивных подключений",
+        "content-auto-max-idle": "Если этот параметр включен, параметр <1>Макс. кол-во неактивных подключений</1> автоматически устанавливается на значение параметра <3> Макс. кол-во открытых подключений</3>. Если максимальное количество открытых подключений не установлено, используется значение по умолчанию ({{defaultMaxIdle}}).",
+        "content-max-idle": "Максимальное количество подключений в пуле неактивных подключений. Если значение параметра <1>Макс. кол-во открытых подключений</1> больше 0, но меньше значения <3>Макс. кол-во неактивных подключений</3>, то значение <5>Макс. кол-во неактивных подключений</5> уменьшается, чтобы соответствовать предельному значению параметра <8>Макс. кол-во открытых подключений</8>. Если установлено значение 0, неактивные подключения не сохраняются.",
+        "content-max-lifetime": "Максимальное время (в секундах), в течение которого подключение может быть использовано повторно. Если установлено значение 0, подключения всегда используются повторно.",
+        "content-max-open": "Максимальное количество открытых подключений к базе данных. Если значение параметра <1>Макс. кол-во неактивных подключений</1> больше 0, а значение параметра <3>Макс. кол-во открытых подключений</3> меньше значения <5>Макс. кол-во неактивных подключений</5>, то значение <7>Макс. кол-во неактивных подключений</7> уменьшается, чтобы соответствовать предельному значению параметра <9>Макс. кол-во открытых подключений</9>. Если установлено значение 0, количество открытых подключений не ограничено.",
+        "max-idle": "Макс. кол-во неактивных подключений",
+        "max-lifetime": "Макс. время жизни",
+        "max-open": "Макс. кол-во открытых подключений",
+        "title-connection-limits": "Ограничения на кол-во подключений"
       },
       "dataset-selector": {
-        "aria-label-dataset-selector": ""
+        "aria-label-dataset-selector": "Селектор наборов данных"
       },
       "error-boundary": {
         "fall-back": {
@@ -31,21 +31,21 @@
       "get-custom-operators": {
         "custom-operators": {
           "label": {
-            "macros": ""
+            "macros": "Макрос"
           }
         }
       },
       "make-render-column": {
         "render-column": {
           "aria-label-group-by": "Группировать по",
-          "title-remove-group-by-column": ""
+          "title-remove-group-by-column": "Удалите группу по столбцу"
         }
       },
       "order-by-row": {
-        "aria-label-order-by": "",
+        "aria-label-order-by": "Упорядочить по",
         "label-limit": "Предельное значение",
-        "label-offset": "",
-        "label-order-by": ""
+        "label-offset": "Смещение",
+        "label-order-by": "Упорядочить по"
       },
       "preview": {
         "label-element": {
@@ -54,100 +54,100 @@
         }
       },
       "query-header": {
-        "content-invalid-query": "",
+        "content-invalid-query": "Недействительный запрос. См. подробности ниже. <1></1>Однако вы всё равно можете выполнить этот запрос.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Конструктор",
+          "label-code": "Код"
         },
-        "label-dataset": "",
+        "label-dataset": "Набор данных",
         "label-filter": "Фильтр",
         "label-format": "Формат",
         "label-group": "Группа",
-        "label-order": "",
+        "label-order": "Порядок",
         "label-preview": "Предварительный просмотр",
         "label-table": "Таблица",
-        "placeholder-select-format": "",
+        "placeholder-select-format": "Выбрать формат",
         "run-query": "Выполнить запрос"
       },
       "query-toolbox": {
-        "content-hit-ctrlcmdreturn-to-run-query": "",
-        "tooltip-collapse": "",
-        "tooltip-expand": "",
-        "tooltip-format-query": ""
+        "content-hit-ctrlcmdreturn-to-run-query": "Нажмите CTRL/CMD+Return, чтобы выполнить запрос",
+        "tooltip-collapse": "Свернуть редактор",
+        "tooltip-expand": "Развернуть редактор",
+        "tooltip-format-query": "Форматировать запрос"
       },
       "query-validator": {
-        "query-will-process": "",
-        "validating-query": ""
+        "query-will-process": "<0></0> При выполнении запрос обработает <2>{{bytes}}</2>.",
+        "validating-query": "Проверка запроса..."
       },
       "raw-editor": {
         "render-placeholder": {
-          "editing-in-expanded-code-editor": ""
+          "editing-in-expanded-code-editor": "Редактирование в расширенном редакторе кода"
         },
-        "title-query-num": ""
+        "title-query-num": "Запрос {{queryNum}}"
       },
       "select-column": {
         "label-column": "Столбец"
       },
       "select-custom-function-parameters": {
-        "aria-label-parameter": "",
+        "aria-label-parameter": "Параметр {{index}} для столбца {{columnIndex}}",
         "render-parameters": {
           "params": {
-            "title-remove-parameter": ""
+            "title-remove-parameter": "Удалить параметр"
           }
         },
-        "title-add-parameter": ""
+        "title-add-parameter": "Добавить параметр"
       },
       "select-row": {
         "aggregate-options": {
           "options": {
             "label": {
-              "aggregations": "",
-              "macros": ""
+              "aggregations": "Агрегации",
+              "macros": "Макрос"
             }
           }
         },
         "label": {
-          "time": "",
+          "time": "время",
           "value": "значение"
         },
         "label-alias": "Псевдоним",
-        "label-data-operations": "",
-        "title-add-column": "",
-        "title-remove-column": ""
+        "label-data-operations": "Операции с данными",
+        "title-add-column": "Добавить столбец",
+        "title-remove-column": "Удалить столбец"
       },
       "settings": {
-        "aria-label-conjunction": "",
+        "aria-label-conjunction": "Соединение",
         "aria-label-field": "Поле",
         "aria-label-operator": "Оператор",
-        "title-button-filter": ""
+        "title-button-filter": "Фильтр {{ buttonLabel }}"
       },
       "sql-query-editor-lazy": {
         "text-loading-editor": "Загрузка редактора"
       },
       "table-selector": {
-        "aria-label-table-selector": "",
-        "placeholder-loading": "",
-        "placeholder-select-table": ""
+        "aria-label-table-selector": "Селектор таблиц",
+        "placeholder-loading": "Загрузка таблиц",
+        "placeholder-select-table": "Выбрать таблицу"
       },
       "tlssecrets-config": {
-        "content-tlsssl-client-certificate": "",
-        "content-tlsssl-client-key": "",
-        "content-tlsssl-root-certificate": "",
-        "tlsssl-client-certificate": "",
-        "tlsssl-client-key": "",
+        "content-tlsssl-client-certificate": "Чтобы выполнить аутентификацию с помощью сертификата клиента TLS/SSL, укажите сертификат клиента здесь.",
+        "content-tlsssl-client-key": "Чтобы выполнить аутентификацию с помощью сертификата клиента TLS/SSL, укажите ключ здесь.",
+        "content-tlsssl-root-certificate": "Если выбранный режим TLS/SSL требует корневого сертификата сервера, укажите его здесь.",
+        "tlsssl-client-certificate": "Сертификат клиента TLS/SSL",
+        "tlsssl-client-key": "Ключ клиента TLS/SSL",
         "tlsssl-root-certificate": "Корневой сертификат TLS/SSL"
       },
       "visual-editor": {
-        "label-filter-by-column-value": "",
-        "label-group-by-column": ""
+        "label-filter-by-column-value": "Фильтр по значению столбца",
+        "label-group-by-column": "Группировать по столбцу"
       },
       "widgets": {
-        "aria-label-macros-value-selector": ""
+        "aria-label-macros-value-selector": "Селектор значений макросов"
       }
     },
     "utils": {
       "get-columns-width-indices": {
-        "label-selected-columns": ""
+        "label-selected-columns": "Выбранные столбцы"
       }
     }
   }
diff --git a/packages/grafana-sql/src/locales/sv-SE/grafana-sql.json b/packages/grafana-sql/src/locales/sv-SE/grafana-sql.json
index 4dd442d92a4..9533bd6afc4 100644
--- a/packages/grafana-sql/src/locales/sv-SE/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/sv-SE/grafana-sql.json
@@ -2,26 +2,26 @@
   "grafana-sql": {
     "components": {
       "confirm-modal": {
-        "builder-mode": "",
+        "builder-mode": "Byggläge visar inte ändringar gjorda i koden. Frågebyggaren visar de senaste ändringarna du gjorde i byggläget.",
         "cancel": "Avbryt",
-        "clipboard": "",
-        "copy-code-and-switch": "",
-        "discard-code-and-switch": "",
+        "clipboard": "Vill du kopiera din kod till urklippet?",
+        "copy-code-and-switch": "Kopiera kod och växla",
+        "discard-code-and-switch": "Kassera kod och växla",
         "warning": "Varning"
       },
       "connection-limits": {
-        "auto-max-idle": "",
-        "content-auto-max-idle": "",
-        "content-max-idle": "",
-        "content-max-lifetime": "",
-        "content-max-open": "",
-        "max-idle": "",
-        "max-lifetime": "",
-        "max-open": "",
-        "title-connection-limits": ""
+        "auto-max-idle": "Automatisk max. inaktiv",
+        "content-auto-max-idle": "Om det är aktiverat ställer du automatiskt in antalet <1>Maximalt antal inaktiva anslutningar</1> till samma värde som<3> Max öppna anslutningar</3>. Om antalet maximala öppna anslutningar inte är inställt kommer det att ställas in på standard ({{defaultMaxIdle}}).",
+        "content-max-idle": "Det maximala antalet anslutningar i den inaktiva anslutningspoolen. Om <1>Max öppna anslutningar</1> är större än 0 men mindre än <3>Max inaktiva anslutningar</3> kommer <5>Max inaktiva anslutningar</5> att reduceras för att matcha gränsen för <8>Max öppna anslutningar</8>. Om inställningen är 0 behålls inga inaktiva anslutningar.",
+        "content-max-lifetime": "Den maximala tiden i sekunder som en anslutning kan återanvändas. Om inställningen är 0 återanvänds anslutningarna för evigt.",
+        "content-max-open": "Det maximala antalet öppna anslutningar till databasen. Om <1>Max inaktiva anslutningar</1> är större än 0 och <3>Max öppna anslutningar</3> är mindre än <5>Max inaktiva anslutningar</5> kommer <7>Max inaktiva anslutningar</7> att reduceras för att matcha gränsen för <9>Max öppna anslutningar</9>. Om inställningen är 0 finns det ingen gräns för antalet öppna anslutningar.",
+        "max-idle": "Max inaktiv",
+        "max-lifetime": "Max livstid",
+        "max-open": "Max öppen",
+        "title-connection-limits": "Anslutningsbegränsningar"
       },
       "dataset-selector": {
-        "aria-label-dataset-selector": ""
+        "aria-label-dataset-selector": "Datauppsättningsväljare"
       },
       "error-boundary": {
         "fall-back": {
@@ -31,21 +31,21 @@
       "get-custom-operators": {
         "custom-operators": {
           "label": {
-            "macros": ""
+            "macros": "Makron"
           }
         }
       },
       "make-render-column": {
         "render-column": {
           "aria-label-group-by": "Gruppera efter",
-          "title-remove-group-by-column": ""
+          "title-remove-group-by-column": "Ta bort gruppen efter kolumn"
         }
       },
       "order-by-row": {
-        "aria-label-order-by": "",
+        "aria-label-order-by": "Sortera efter",
         "label-limit": "Gräns",
-        "label-offset": "",
-        "label-order-by": ""
+        "label-offset": "Förskjutning",
+        "label-order-by": "Sortera efter"
       },
       "preview": {
         "label-element": {
@@ -54,100 +54,100 @@
         }
       },
       "query-header": {
-        "content-invalid-query": "",
+        "content-invalid-query": "Din fråga är ogiltig. Se nedan för mer information. <1></1>Du kan däremot fortfarande köra denna fråga.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Builder",
+          "label-code": "Kod"
         },
-        "label-dataset": "",
+        "label-dataset": "Datauppsättning",
         "label-filter": "Filtrera",
         "label-format": "Format",
         "label-group": "Grupp",
-        "label-order": "",
+        "label-order": "Beställning",
         "label-preview": "Förhandsgranska",
         "label-table": "Tabell",
-        "placeholder-select-format": "",
+        "placeholder-select-format": "Välj format",
         "run-query": "Kör fråga"
       },
       "query-toolbox": {
-        "content-hit-ctrlcmdreturn-to-run-query": "",
-        "tooltip-collapse": "",
-        "tooltip-expand": "",
-        "tooltip-format-query": ""
+        "content-hit-ctrlcmdreturn-to-run-query": "Tryck på CTRL/CMD+Retur för att köra frågan",
+        "tooltip-collapse": "Minimera redigeraren",
+        "tooltip-expand": "Expandera redigeraren",
+        "tooltip-format-query": "Formatera fråga"
       },
       "query-validator": {
-        "query-will-process": "",
-        "validating-query": ""
+        "query-will-process": "<0></0> Den här frågan kommer att behandla <2>{{bytes}}</2> när den körs.",
+        "validating-query": "Validerar frågan …"
       },
       "raw-editor": {
         "render-placeholder": {
-          "editing-in-expanded-code-editor": ""
+          "editing-in-expanded-code-editor": "Redigering i expanderad kodredigerare"
         },
-        "title-query-num": ""
+        "title-query-num": "Fråga {{queryNum}}"
       },
       "select-column": {
         "label-column": "Kolumn"
       },
       "select-custom-function-parameters": {
-        "aria-label-parameter": "",
+        "aria-label-parameter": "Parameter {{index}} för kolumnen {{columnIndex}}",
         "render-parameters": {
           "params": {
-            "title-remove-parameter": ""
+            "title-remove-parameter": "Ta bort parameter"
           }
         },
-        "title-add-parameter": ""
+        "title-add-parameter": "Lägg till parameter"
       },
       "select-row": {
         "aggregate-options": {
           "options": {
             "label": {
-              "aggregations": "",
-              "macros": ""
+              "aggregations": "Aggregeringar",
+              "macros": "Makron"
             }
           }
         },
         "label": {
-          "time": "",
+          "time": "tid",
           "value": "värde"
         },
         "label-alias": "Alias",
-        "label-data-operations": "",
-        "title-add-column": "",
-        "title-remove-column": ""
+        "label-data-operations": "Dataåtgärder",
+        "title-add-column": "Lägg till kolumn",
+        "title-remove-column": "Ta bort kolumn"
       },
       "settings": {
-        "aria-label-conjunction": "",
+        "aria-label-conjunction": "Konjunktion",
         "aria-label-field": "Fält",
         "aria-label-operator": "Operatör",
-        "title-button-filter": ""
+        "title-button-filter": "{{ buttonLabel }} filter"
       },
       "sql-query-editor-lazy": {
         "text-loading-editor": "Laddar redigerare"
       },
       "table-selector": {
-        "aria-label-table-selector": "",
-        "placeholder-loading": "",
-        "placeholder-select-table": ""
+        "aria-label-table-selector": "Tabellväljare",
+        "placeholder-loading": "Laddar tabeller",
+        "placeholder-select-table": "Välj tabell"
       },
       "tlssecrets-config": {
-        "content-tlsssl-client-certificate": "",
-        "content-tlsssl-client-key": "",
-        "content-tlsssl-root-certificate": "",
-        "tlsssl-client-certificate": "",
-        "tlsssl-client-key": "",
+        "content-tlsssl-client-certificate": "För autentisering med ett TLS-/SSL-klientcertifikat anger du klientcertifikatet här.",
+        "content-tlsssl-client-key": "För autentisering med ett TLS-/SSL-klientcertifikat anger du nyckeln här.",
+        "content-tlsssl-root-certificate": "Om det valda TLS-/SSL-läget kräver ett serverrotcertifikat anger du det här",
+        "tlsssl-client-certificate": "TLS-/SSL-klientcertifikat",
+        "tlsssl-client-key": "TLS/SSL-klientnyckel",
         "tlsssl-root-certificate": "TLS-/SSL-rotcertifikat"
       },
       "visual-editor": {
-        "label-filter-by-column-value": "",
-        "label-group-by-column": ""
+        "label-filter-by-column-value": "Filtrera efter kolumnvärde",
+        "label-group-by-column": "Gruppera efter kolumn"
       },
       "widgets": {
-        "aria-label-macros-value-selector": ""
+        "aria-label-macros-value-selector": "Makrovärdesväljare"
       }
     },
     "utils": {
       "get-columns-width-indices": {
-        "label-selected-columns": ""
+        "label-selected-columns": "Valda kolumner"
       }
     }
   }
diff --git a/packages/grafana-sql/src/locales/tr-TR/grafana-sql.json b/packages/grafana-sql/src/locales/tr-TR/grafana-sql.json
index 06248f27ef1..873565bc5d1 100644
--- a/packages/grafana-sql/src/locales/tr-TR/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/tr-TR/grafana-sql.json
@@ -2,26 +2,26 @@
   "grafana-sql": {
     "components": {
       "confirm-modal": {
-        "builder-mode": "",
+        "builder-mode": "Oluşturucu modu, kodda yapılan değişiklikleri görüntülemez. Sorgu oluşturucu, oluşturucu modunda yaptığınız son değişiklikleri görüntüler.",
         "cancel": "İptal et",
-        "clipboard": "",
-        "copy-code-and-switch": "",
-        "discard-code-and-switch": "",
+        "clipboard": "Kodunuzu panoya kopyalamak istiyor musunuz?",
+        "copy-code-and-switch": "Kodu kopyala ve geçiş yap",
+        "discard-code-and-switch": "Kodu sil ve geçiş yap",
         "warning": "Uyarı"
       },
       "connection-limits": {
-        "auto-max-idle": "",
-        "content-auto-max-idle": "",
-        "content-max-idle": "",
-        "content-max-lifetime": "",
-        "content-max-open": "",
-        "max-idle": "",
-        "max-lifetime": "",
-        "max-open": "",
-        "title-connection-limits": ""
+        "auto-max-idle": "Otomatik maksimum boşta bağlantı sayısı",
+        "content-auto-max-idle": "Etkinleştirilirse <1>Maksimum boşta bağlantı</1> sayısı, <3>Maksimum açık bağlantı</3> sayısıyla aynı değere otomatik olarak ayarlanır. Maksimum açık bağlantı sayısı ayarlanmamışsa varsayılan değere ayarlanır ({{defaultMaxIdle}}).",
+        "content-max-idle": "Bu, boşta bağlantı havuzundaki maksimum bağlantı sayısını belirtir. <1>Maksimum açık bağlantı</1> değeri 0'dan büyük ancak <3>Maksimum boşta bağlantı</3> değerinden küçükse <5>Maksimum boşta bağlantı</5> sayısı, <8>Maksimum açık bağlantı</8> sınırına uyacak şekilde azaltılır. 0 olarak ayarlanırsa boşta bağlantılar tutulmaz.",
+        "content-max-lifetime": "Saniye cinsinden bir bağlantının yeniden kullanılabileceği maksimum süre. 0 olarak ayarlanırsa bağlantılar süresiz olarak yeniden kullanılır.",
+        "content-max-open": "Veri tabanına açılabilecek maksimum açık bağlantı sayısı. <1>Maksimum boşta bağlantı</1> sayısı 0'dan büyük ve <3>Maksimum açık bağlantı</3> sayısı <5>Maksimum boşta bağlantı</5> sayısından küçükse <7>Maksimum boşta bağlantı</7> değeri, <9>Maksimum açık bağlantı</9> sınırına uyacak şekilde azaltılır. 0 olarak ayarlanırsa açık bağlantı sayısı için bir sınır yoktur.",
+        "max-idle": "Maks. boşta",
+        "max-lifetime": "Maksimum kullanım süresi",
+        "max-open": "Maks. açık",
+        "title-connection-limits": "Bağlantı sınırları"
       },
       "dataset-selector": {
-        "aria-label-dataset-selector": ""
+        "aria-label-dataset-selector": "Veri kümesi seçici"
       },
       "error-boundary": {
         "fall-back": {
@@ -31,21 +31,21 @@
       "get-custom-operators": {
         "custom-operators": {
           "label": {
-            "macros": ""
+            "macros": "Makrolar"
           }
         }
       },
       "make-render-column": {
         "render-column": {
           "aria-label-group-by": "Gruplama ölçütü",
-          "title-remove-group-by-column": ""
+          "title-remove-group-by-column": "Grubu sütuna göre kaldır"
         }
       },
       "order-by-row": {
-        "aria-label-order-by": "",
+        "aria-label-order-by": "Sıralama ölçütü",
         "label-limit": "Sınırlama",
-        "label-offset": "",
-        "label-order-by": ""
+        "label-offset": "Ofset",
+        "label-order-by": "Sıralama ölçütü"
       },
       "preview": {
         "label-element": {
@@ -54,100 +54,100 @@
         }
       },
       "query-header": {
-        "content-invalid-query": "",
+        "content-invalid-query": "Sorgunuz geçersiz. Ayrıntılar için aşağıya bakın. <1></1>Ancak yine de bu sorguyu çalıştırabilirsiniz.",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "Oluşturucu",
+          "label-code": "Kod"
         },
-        "label-dataset": "",
+        "label-dataset": "Veri kümesi",
         "label-filter": "Filtreleyin",
         "label-format": "Biçim",
         "label-group": "Grup",
-        "label-order": "",
+        "label-order": "Sipariş",
         "label-preview": "Ön izleme",
         "label-table": "Tablo",
-        "placeholder-select-format": "",
+        "placeholder-select-format": "Biçimi seçin",
         "run-query": "Sorgu çalıştır"
       },
       "query-toolbox": {
-        "content-hit-ctrlcmdreturn-to-run-query": "",
-        "tooltip-collapse": "",
-        "tooltip-expand": "",
-        "tooltip-format-query": ""
+        "content-hit-ctrlcmdreturn-to-run-query": "Sorguyu çalıştırmak için CTRL/CMD+Return tuşlarına basın",
+        "tooltip-collapse": "Düzenleyiciyi daralt",
+        "tooltip-expand": "Düzenleyiciyi genişlet",
+        "tooltip-format-query": "Sorguyu biçimlendir"
       },
       "query-validator": {
-        "query-will-process": "",
-        "validating-query": ""
+        "query-will-process": "<0></0> Bu sorgu çalıştırıldığında <2>{{bytes}}</2> işlenecek.",
+        "validating-query": "Sorgu doğrulanıyor..."
       },
       "raw-editor": {
         "render-placeholder": {
-          "editing-in-expanded-code-editor": ""
+          "editing-in-expanded-code-editor": "Genişletilmiş kod düzenleyicide düzenleme"
         },
-        "title-query-num": ""
+        "title-query-num": "{{queryNum}}. sorgu"
       },
       "select-column": {
         "label-column": "Sütun"
       },
       "select-custom-function-parameters": {
-        "aria-label-parameter": "",
+        "aria-label-parameter": "{{columnIndex}} sütunu için {{index}} parametresi ",
         "render-parameters": {
           "params": {
-            "title-remove-parameter": ""
+            "title-remove-parameter": "Parametreyi kaldır"
           }
         },
-        "title-add-parameter": ""
+        "title-add-parameter": "Parametre ekle"
       },
       "select-row": {
         "aggregate-options": {
           "options": {
             "label": {
-              "aggregations": "",
-              "macros": ""
+              "aggregations": "Toplamalar",
+              "macros": "Makrolar"
             }
           }
         },
         "label": {
-          "time": "",
+          "time": "zaman",
           "value": "değer"
         },
         "label-alias": "Takma isim",
-        "label-data-operations": "",
-        "title-add-column": "",
-        "title-remove-column": ""
+        "label-data-operations": "Veri işlemleri",
+        "title-add-column": "Sütun ekle",
+        "title-remove-column": "Sütunu kaldır"
       },
       "settings": {
-        "aria-label-conjunction": "",
+        "aria-label-conjunction": "Birleşim",
         "aria-label-field": "Alan",
         "aria-label-operator": "İşleç",
-        "title-button-filter": ""
+        "title-button-filter": "{{ buttonLabel }} filtresi"
       },
       "sql-query-editor-lazy": {
         "text-loading-editor": "Düzenleyici yükleniyor"
       },
       "table-selector": {
-        "aria-label-table-selector": "",
-        "placeholder-loading": "",
-        "placeholder-select-table": ""
+        "aria-label-table-selector": "Tablo seçici",
+        "placeholder-loading": "Tablolar yükleniyor",
+        "placeholder-select-table": "Tablo seçin"
       },
       "tlssecrets-config": {
-        "content-tlsssl-client-certificate": "",
-        "content-tlsssl-client-key": "",
-        "content-tlsssl-root-certificate": "",
-        "tlsssl-client-certificate": "",
-        "tlsssl-client-key": "",
+        "content-tlsssl-client-certificate": "Bir TLS/SSL istemci sertifikasıyla kimlik doğrulamak için istemci sertifikasını burada sağlayın.",
+        "content-tlsssl-client-key": "Bir istemci TLS/SSL sertifikasıyla kimlik doğrulamak için anahtarı burada sağlayın.",
+        "content-tlsssl-root-certificate": "Seçilen TLS/SSL modu bir sunucu kök sertifikası gerektiriyorsa onu da burada sağlayın",
+        "tlsssl-client-certificate": "TLS/SSL İstemci Sertifikası",
+        "tlsssl-client-key": "TLS/SSL İstemci Anahtarı",
         "tlsssl-root-certificate": "TLS/SSL Kök Sertifikası"
       },
       "visual-editor": {
-        "label-filter-by-column-value": "",
-        "label-group-by-column": ""
+        "label-filter-by-column-value": "Sütun değerine göre filtreleyin",
+        "label-group-by-column": "Sütuna göre gruplayın"
       },
       "widgets": {
-        "aria-label-macros-value-selector": ""
+        "aria-label-macros-value-selector": "Makro değer seçici"
       }
     },
     "utils": {
       "get-columns-width-indices": {
-        "label-selected-columns": ""
+        "label-selected-columns": "Seçilen sütunlar"
       }
     }
   }
diff --git a/packages/grafana-sql/src/locales/zh-Hans/grafana-sql.json b/packages/grafana-sql/src/locales/zh-Hans/grafana-sql.json
index 45f714b1637..296562625e3 100644
--- a/packages/grafana-sql/src/locales/zh-Hans/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/zh-Hans/grafana-sql.json
@@ -56,8 +56,8 @@
       "query-header": {
         "content-invalid-query": "您的查询无效。请查看下方详情。<1></1>但是，您仍然可以运行此查询。",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "构建器",
+          "label-code": "代码"
         },
         "label-dataset": "数据集",
         "label-filter": "筛选条件",
diff --git a/packages/grafana-sql/src/locales/zh-Hant/grafana-sql.json b/packages/grafana-sql/src/locales/zh-Hant/grafana-sql.json
index d7acf261c24..f09f0f3dcfd 100644
--- a/packages/grafana-sql/src/locales/zh-Hant/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/zh-Hant/grafana-sql.json
@@ -56,8 +56,8 @@
       "query-header": {
         "content-invalid-query": "您的查詢無效。請參閱下方詳細資訊。<1></1>不過，您仍然可以執行此查詢。",
         "editor-modes": {
-          "label-builder": "",
-          "label-code": ""
+          "label-builder": "建立器",
+          "label-code": "代碼"
         },
         "label-dataset": "資料集",
         "label-filter": "篩選",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json
index ed2e1fd18d2..58f72d6205f 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Použít tento dotaz",
       "label-categories": "Kategorie",
       "label-query-results": "Výsledky dotazu: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Nelze vypsat všechny kategorie",
       "placeholder-all-categories": "Všechny kategorie",
       "placeholder-search-logs": "Hledat dotazy protokolů",
       "text-loading": "Načítání…"
@@ -166,8 +166,8 @@
       "tooltip-limit": "Omezte počet vrácených řádků (výchozí hodnota je 1 000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Opravdu chcete přepnout na Základní protokoly?",
+      "confirmText-confirm": "Potvrdit",
       "description-basic-logs-queries": "Dotazy na základní protokoly jsou zpoplatněny na základě množství naskenovaných dat.",
       "label-logs": "Protokoly",
       "title-basic-logs-queries": "Dotazy na základní protokoly",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Tlačítko Spustit dotaz protokolů Azure",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Přepnutím na nástroj pro tvorbu zahodíte aktuální dotaz KQL a vymažete editor KQL. Opravdu chcete pokračovat?",
+      "body-switching-to-kql": "Přepnutím na KQL zahodíte aktuální nastavení nástroje pro tvorbu. Opravdu chcete pokračovat?",
       "button-kick-start-your-query": "Spustit dotaz",
       "button-run-query": "Spustit dotaz",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Přepnout na {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Nástroj pro tvorbu",
+        "label-kql": "KQL"
       },
       "label-service": "Služba",
       "placeholder-service": "Služba…",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json
index 7bd9f8ad1ff..f24676b8164 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Diese Abfrage nutzen",
       "label-categories": "Kategorien",
       "label-query-results": "Abfrageergebnisse: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Es können nicht alle Kategorien aufgelistet werden",
       "placeholder-all-categories": "Alle Kategorien",
       "placeholder-search-logs": "Logs-Abfragen durchsuchen",
       "text-loading": "Wird geladen ..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "Beschränken Sie die Zahl der zurückgegebenen Zeilen (Standard ist 1000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Sind Sie sicher, dass Sie zu Basic-Logs wechseln möchten?",
+      "confirmText-confirm": "Bestätigen",
       "description-basic-logs-queries": "Für Abfragen von Basis-Logs fallen Kosten an, je nach der Menge der gescannten Daten.",
       "label-logs": "Logs",
       "title-basic-logs-queries": "Abfragen von Basis-Logs",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure-Logs starten Ihre Abfrage-Schaltfläche",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Wenn Sie zum Builder wechseln, wird Ihre aktuelle KQL-Abfrage verworfen und der KQL-Editor gelöscht. Sind Sie sicher?",
+      "body-switching-to-kql": "Wenn Sie zu KQL wechseln, werden Ihre aktuellen Builder-Einstellungen verworfen. Sind Sie sicher?",
       "button-kick-start-your-query": "Starten Sie Ihre Abfrage",
       "button-run-query": "Abfrage ausführen",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Wechseln zu {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Builder",
+        "label-kql": "KQL"
       },
       "label-service": "Dienst",
       "placeholder-service": "Dienst …",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json
index 79719488e92..c5ac9312355 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Utilizar esta consulta",
       "label-categories": "Categorías",
       "label-query-results": "Resultados de la consulta: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "No se pueden enumerar todas las categorías",
       "placeholder-all-categories": "Todas las categorías",
       "placeholder-search-logs": "Buscar consultas de logs",
       "text-loading": "Cargando..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "Restrinja el número de filas devueltas (el valor predeterminado es 1000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "¿Seguro que quieres cambiar a Logs básicos?",
+      "confirmText-confirm": "Confirmar",
       "description-basic-logs-queries": "Las consultas de logs básicos incurren en un coste basado en la cantidad de datos escaneados.",
       "label-logs": "Logs",
       "title-basic-logs-queries": "Consultas de logs básicos",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Los logs de Azure inician su botón de consulta",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Cambiar al modo Constructor descartará tu consulta KQL actual y se borrará el editor KQL. ¿Quieres continuar?",
+      "body-switching-to-kql": "Cambiar a KQL descartará la configuración actual del constructor. ¿Quieres continuar?",
       "button-kick-start-your-query": "Inicie su consulta",
       "button-run-query": "Ejecutar consulta",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Cambiar a {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Constructor",
+        "label-kql": "KQL"
       },
       "label-service": "Servicio",
       "placeholder-service": "Servicio...",
@@ -239,7 +239,7 @@
       "title-error-occurred": "Se ha producido un error al solicitar recursos de Azure Monitor"
     },
     "scope-selector": {
-      "label": ""
+      "label": "Alcance"
     },
     "search": {
       "aria-label-resource-search": "Búsqueda de recursos",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json
index 427f2535fe4..833019fa5cf 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Utiliser cette requête",
       "label-categories": "Catégories",
       "label-query-results": "Résultats de la requête : {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Impossible d’afficher toutes les catégories",
       "placeholder-all-categories": "Toutes les catégories",
       "placeholder-search-logs": "Rechercher des requêtes de journaux",
       "text-loading": "Chargement en cours..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "Limitez le nombre de lignes renvoyées (la valeur par défaut est 1 000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Voulez-vous vraiment passer aux journaux de base ?",
+      "confirmText-confirm": "Confirmer",
       "description-basic-logs-queries": "Les requêtes de journaux de base entraînent des coûts en fonction de la quantité de données analysées.",
       "label-logs": "Journaux",
       "title-basic-logs-queries": "Requêtes de journaux de base",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Bouton Lancer votre requête des journaux Azure",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Passer en mode Builder supprimera votre requête KQL actuelle et réinitialisera l’éditeur KQL. Voulez-vous continuer ?",
+      "body-switching-to-kql": "Passer en mode KQL supprimera vos paramètres Builder actuels. Voulez-vous continuer ?",
       "button-kick-start-your-query": "Lancer votre requête",
       "button-run-query": "Exécuter la requête",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Passer en mode {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Builder",
+        "label-kql": "KQL"
       },
       "label-service": "Service",
       "placeholder-service": "Service...",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json
index f2ebab0cfa7..9b643a7e78f 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Használja ezt a lekérdezést",
       "label-categories": "Kategóriák",
       "label-query-results": "Lekérdezés eredményei: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Nem lehet felsorolni az összes kategóriát",
       "placeholder-all-categories": "Összes kategória",
       "placeholder-search-logs": "Naplólekérdezések keresése",
       "text-loading": "Betöltés…"
@@ -166,8 +166,8 @@
       "tooltip-limit": "A visszaadott sorok számának korlátozása (az alapértelmezett érték az 1000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Biztosan átvált az alapvető naplókra?",
+      "confirmText-confirm": "Megerősítés",
       "description-basic-logs-queries": "Az Alapvető naplók lekérdezései a beolvasott adatok mennyiségétől függően költséget eredményeznek.",
       "label-logs": "Naplók",
       "title-basic-logs-queries": "Alapvető naplók lekérdezései",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure-naplók előbeállításos lekérdezése gomb",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "A szerkesztő módra váltás elveti az aktuális KQL-lekérdezést és törli a KQL-szerkesztőben lévő tartalmat. Biztosan folytatja?",
+      "body-switching-to-kql": "A KQL-re váltás elveti az aktuális szerkesztő beállításait. Biztosan folytatja?",
       "button-kick-start-your-query": "Előbeállításos lekérdezés",
       "button-run-query": "Lekérdezés futtatása",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Váltás erre: {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Építő",
+        "label-kql": "KQL"
       },
       "label-service": "Szolgáltatás",
       "placeholder-service": "Szolgáltatás…",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json
index ee9028509bc..781003a08f1 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Gunakan kueri ini",
       "label-categories": "Kategori",
       "label-query-results": "Hasil kueri: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Tidak dapat mencantumkan semua kategori",
       "placeholder-all-categories": "Semua kategori",
       "placeholder-search-logs": "Pencarian kueri Log",
       "text-loading": "Memuat..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "Batasi jumlah baris yang dikembalikan (default-nya adalah 1000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Yakin ingin beralih ke Log Dasar?",
+      "confirmText-confirm": "Konfirmasi",
       "description-basic-logs-queries": "Kueri Log Dasar dikenakan biaya berdasarkan jumlah data yang dipindai.",
       "label-logs": "Log",
       "title-basic-logs-queries": "Kueri Log Dasar",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Tombol kueri untuk memulai menggunakan log Azure",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Beralih ke Builder akan membuang kueri KQL Anda saat ini dan menghapus editor KQL. Anda yakin?",
+      "body-switching-to-kql": "Beralih ke KQL akan membuang pengaturan pembangun Anda saat ini. Anda yakin?",
       "button-kick-start-your-query": "Mulai kueri Anda",
       "button-run-query": "Jalankan kueri",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Beralih ke {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Pembangun",
+        "label-kql": "KQL"
       },
       "label-service": "Layanan",
       "placeholder-service": "Melayani...",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json
index cea4008d964..7d06a77a681 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Utilizza questa query",
       "label-categories": "Categorie",
       "label-query-results": "Risultati della query: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Impossibile elencare tutte le categorie",
       "placeholder-all-categories": "Tutte le categorie",
       "placeholder-search-logs": "Cerca query dei registri",
       "text-loading": "Caricamento in corso..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "Limita il numero di righe restituite (il valore predefinito è 1000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Vuoi davvero passare ai registri di base?",
+      "confirmText-confirm": "Conferma",
       "description-basic-logs-queries": "Le query dei registri di base comportano un costo in base alla quantità di dati analizzati.",
       "label-logs": "Registri",
       "title-basic-logs-queries": "Query sui registri di base",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "I registri di Azure avviano il pulsante della query",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Il passaggio a Builder eliminerà la query KQL corrente e cancellerà l'editor KQL. Vuoi davvero continuare?",
+      "body-switching-to-kql": "Il passaggio a KQL annullerà le impostazioni correnti del generatore. Vuoi davvero continuare?",
       "button-kick-start-your-query": "Avvia la query",
       "button-run-query": "Esegui query",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Passa a {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Builder",
+        "label-kql": "KQL"
       },
       "label-service": "Servizio",
       "placeholder-service": "Servizio...",
@@ -239,7 +239,7 @@
       "title-error-occurred": "Si è verificato un errore durante la richiesta di risorse da Azure Monitor"
     },
     "scope-selector": {
-      "label": ""
+      "label": "Ambito"
     },
     "search": {
       "aria-label-resource-search": "Ricerca delle risorse",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json
index c005a2e6c4a..c27a32f7b89 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "このクエリを使用",
       "label-categories": "カテゴリ－",
       "label-query-results": "クエリ結果：{{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "すべてのカテゴリを一覧表示できません",
       "placeholder-all-categories": "すべてのカテゴリー",
       "placeholder-search-logs": "ログクエリを検索",
       "text-loading": "読み込み中..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "返される行数を制限します（デフォルトは1000）。"
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "基本ログに切り替えてもよろしいですか？",
+      "confirmText-confirm": "確認",
       "description-basic-logs-queries": "基本ログクエリを使用すると、スキャンされたデータ量に基づいてコストが発生します。",
       "label-logs": "ログ",
       "title-basic-logs-queries": "基本ログクエリ",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azureログのクエリ開始ボタン",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "ビルダーに切り替えると、現在のKQLクエリが破棄され、KQLエディターがクリアされます。よろしいですか？",
+      "body-switching-to-kql": "KQLに切り替えると、現在のビルダー設定が破棄されます。よろしいですか？",
       "button-kick-start-your-query": "クエリを開始",
       "button-run-query": "クエリの実行",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "{{newMode}}に切り替える",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "ビルダー",
+        "label-kql": "KQL"
       },
       "label-service": "サービス",
       "placeholder-service": "サービス...",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json
index 1c5f2a6a834..cd3052d880f 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "이 쿼리 사용",
       "label-categories": "범주",
       "label-query-results": "쿼리 결과: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "일부 카테고리를 나열할 수 없습니다",
       "placeholder-all-categories": "모든 범주",
       "placeholder-search-logs": "로그 쿼리 검색",
       "text-loading": "로딩 중..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "반환되는 행 수를 제한합니다(기본값은 1000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "기본 로그로 전환하시겠어요?",
+      "confirmText-confirm": "확인",
       "description-basic-logs-queries": "기본 로그 쿼리는 스캔된 데이터 양에 따라 비용이 발생합니다.",
       "label-logs": "로그",
       "title-basic-logs-queries": "기본 로그 쿼리",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure 로그 쿼리 시작 버튼",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "빌더로 전환하면 현재 KQL 쿼리가 취소되고 KQL 편집기가 지워집니다. 정말 진행하시겠어요?",
+      "body-switching-to-kql": "KQL로 전환하면 현재 빌더 설정이 취소됩니다. 정말 진행하시겠어요?",
       "button-kick-start-your-query": "쿼리 시작하기",
       "button-run-query": "쿼리 실행",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "{{newMode}} 모드로 전환",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "빌더",
+        "label-kql": "KQL"
       },
       "label-service": "서비스",
       "placeholder-service": "서비스...",
@@ -239,7 +239,7 @@
       "title-error-occurred": "Azure Monitor에서 리소스를 요청하는 동안 오류가 발생했습니다."
     },
     "scope-selector": {
-      "label": ""
+      "label": "범위"
     },
     "search": {
       "aria-label-resource-search": "리소스 검색",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json
index 930c043a9b9..661eb964287 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Gebruik deze query",
       "label-categories": "Categorieën",
       "label-query-results": "Resultaten van query: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Kan niet alle categorieën weergeven",
       "placeholder-all-categories": "Alle categorieën",
       "placeholder-search-logs": "Querylogboeken zoeken",
       "text-loading": "Laden..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "Beperk het aantal geretourneerde rijen (standaard is 1000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Weet je zeker dat je wilt overschakelen naar Basislogs?",
+      "confirmText-confirm": "Bevestigen",
       "description-basic-logs-queries": "Basislogquery's brengen kosten met zich mee op basis van de hoeveelheid gescande gegevens.",
       "label-logs": "Logs",
       "title-basic-logs-queries": "Basislogquery's",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Knop Start query met Azure-logboeken",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Als je overschakelt naar Bouwer, wordt je huidige KQL-query verwijderd en wordt de KQL-editor gewist. Weet je het zeker?",
+      "body-switching-to-kql": "Als je overschakelt naar KQL, worden je huidige bouwerinstellingen verwijderd. Weet je het zeker?",
       "button-kick-start-your-query": "Start je query",
       "button-run-query": "Query uitvoeren",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Overschakelen naar {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Bouwer",
+        "label-kql": "KQL"
       },
       "label-service": "Service",
       "placeholder-service": "Service...",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json
index 136aee9a605..8c9b8dc62fd 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Użyj tego zapytania",
       "label-categories": "Kategorie",
       "label-query-results": "Wyniki zapytania: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Nie można wyświetlić wszystkich kategorii",
       "placeholder-all-categories": "Wszystkie kategorie",
       "placeholder-search-logs": "Wyszukaj zapytania dotyczące dzienników",
       "text-loading": "Ładowanie…"
@@ -166,8 +166,8 @@
       "tooltip-limit": "Ogranicz liczbę zwracanych wierszy (domyślnie 1000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Czy na pewno chcesz przełączyć się na logi podstawowe?",
+      "confirmText-confirm": "Potwierdź",
       "description-basic-logs-queries": "Zapytania dotyczące podstawowych dzienników wiążą się z kosztami w zależności od ilości przeskanowanych danych.",
       "label-logs": "Logi",
       "title-basic-logs-queries": "Zapytania dotyczące podstawowych dzienników",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Przycisk Uruchom zapytanie dotyczący dzienników Azure",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Przełączenie na tryb konstruktora spowoduje odrzucenie bieżącego zapytania KQL i usunięcie danych z edytora KQL. Czy na pewno?",
+      "body-switching-to-kql": "Przełączenie na KQL spowoduje odrzucenie bieżących ustawień konstruktora. Czy na pewno?",
       "button-kick-start-your-query": "Uruchom zapytanie",
       "button-run-query": "Uruchom zapytanie",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Przełącz na {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Konstruktor",
+        "label-kql": "KQL"
       },
       "label-service": "Usługa",
       "placeholder-service": "Usługa…",
@@ -239,7 +239,7 @@
       "title-error-occurred": "Podczas wysyłania żądania zasobów do narzędzia Azure Monitor wystąpił błąd"
     },
     "scope-selector": {
-      "label": ""
+      "label": "Zakres"
     },
     "search": {
       "aria-label-resource-search": "Wyszukiwanie zasobów",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json
index c58be15b5ab..7151f702cdc 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Usar esta consulta",
       "label-categories": "Categorias",
       "label-query-results": "Resultados da consulta: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Não é possível listar todas as categorias",
       "placeholder-all-categories": "Todas as categorias",
       "placeholder-search-logs": "Fazer buscas nas consultas de logs",
       "text-loading": "Carregando..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "Restrinja a quantidade de linhas retornadas (o valor padrão é 1.000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Tem certeza de que deseja mudar para os registros básicos?",
+      "confirmText-confirm": "Confirmar",
       "description-basic-logs-queries": "As consultas de logs básicos incorrem em custos com base na quantidade de dados verificados.",
       "label-logs": "Logs",
       "title-basic-logs-queries": "Consultas de logs básicos",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Botão de iniciar consulta de logs do Azure",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Mudar para o construtor descartará sua consulta KQL atual e limpará o editor KQL. Tem certeza de que deseja continuar?",
+      "body-switching-to-kql": "Mudar para o KQL descartará suas configurações atuais do construtor. Tem certeza de que deseja continuar?",
       "button-kick-start-your-query": "Iniciar sua consulta",
       "button-run-query": "Executar consulta",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Alternar para {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Construtor",
+        "label-kql": "KQL"
       },
       "label-service": "Serviço",
       "placeholder-service": "Serviço...",
@@ -239,7 +239,7 @@
       "title-error-occurred": "Ocorreu um erro ao solicitar recursos do Azure Monitor"
     },
     "scope-selector": {
-      "label": ""
+      "label": "Escopo"
     },
     "search": {
       "aria-label-resource-search": "Pesquisa de recursos",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json
index ad6c46ddfa6..4524ee2ca02 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Utilizar esta consulta",
       "label-categories": "Categorias",
       "label-query-results": "Resultados da consulta: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Não é possível listar todas as categorias",
       "placeholder-all-categories": "Todas as categorias",
       "placeholder-search-logs": "Pesquisar consultas de registos",
       "text-loading": "A carregar..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "Restrinja o número de linhas devolvidas (a predefinição é 1000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Tem a certeza de que pretende mudar para Registos básicos?",
+      "confirmText-confirm": "Confirmar",
       "description-basic-logs-queries": "As consultas de registos básicos incorrem em custos com base na quantidade de dados lidos.",
       "label-logs": "Registos",
       "title-basic-logs-queries": "Consultas de registos básicos",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Botão de início de consulta de registos do Azure",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Mudar para o Construtor descartará a sua consulta KQL atual e limpará o editor KQL. Tem a certeza?",
+      "body-switching-to-kql": "Mudar para KQL descartará as suas definições atuais do construtor. Tem a certeza?",
       "button-kick-start-your-query": "Dê início à sua consulta",
       "button-run-query": "Executar consulta",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Mudar para {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Construtor",
+        "label-kql": "KQL"
       },
       "label-service": "Serviço",
       "placeholder-service": "Serviço...",
@@ -239,7 +239,7 @@
       "title-error-occurred": "Ocorreu um erro ao solicitar recursos do Azure Monitor"
     },
     "scope-selector": {
-      "label": ""
+      "label": "Âmbito"
     },
     "search": {
       "aria-label-resource-search": "Pesquisa de recursos",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json
index 626eea08ed4..554aea0ab0b 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Использовать запрос",
       "label-categories": "Категории",
       "label-query-results": "Результатов запроса: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Невозможно перечислить все категории",
       "placeholder-all-categories": "Все категории",
       "placeholder-search-logs": "Поиск запросов журналов",
       "text-loading": "Загрузка…"
@@ -166,8 +166,8 @@
       "tooltip-limit": "Установите ограничение по количеству возвращаемых строк (по умолчанию — 1000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Действительно перейти на базовые журналы?",
+      "confirmText-confirm": "Подтвердить",
       "description-basic-logs-queries": "Запросы базовых журналов являются платными. Затраты зависят от объема сканируемых данных.",
       "label-logs": "Журналы",
       "title-basic-logs-queries": "Запросы базовых журналов",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Кнопка запуска запроса журналов Azure",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Переключение на конструктор приведет к отмене текущего KQL-запроса и очистке редактора KQL. Вы уверены?",
+      "body-switching-to-kql": "Переключение на KQL приведет к отмене текущих настроек конструктора. Вы уверены?",
       "button-kick-start-your-query": "Запустить запрос",
       "button-run-query": "Выполнить запрос",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Переключиться на {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Конструктор",
+        "label-kql": "KQL"
       },
       "label-service": "Служба",
       "placeholder-service": "Служба...",
@@ -239,7 +239,7 @@
       "title-error-occurred": "Ошибка при запросе ресурсов из Azure Monitor"
     },
     "scope-selector": {
-      "label": ""
+      "label": "Область"
     },
     "search": {
       "aria-label-resource-search": "Поиск ресурсов",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json
index 8000fd88592..87d0ccd5cc0 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Använd denna fråga",
       "label-categories": "Kategorier",
       "label-query-results": "Resultat av fråga: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Det gick inte att lista alla kategorier",
       "placeholder-all-categories": "Alla kategorier",
       "placeholder-search-logs": "Sök loggfrågor",
       "text-loading": "Laddar …"
@@ -166,8 +166,8 @@
       "tooltip-limit": "Begränsa antalet rader som returneras (standard är 1 000)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Är du säker på att du vill byta till grundläggande loggar?",
+      "confirmText-confirm": "Bekräfta",
       "description-basic-logs-queries": "Grundläggande loggfrågor medför kostnader baserat på mängden data som skannas.",
       "label-logs": "Loggar",
       "title-basic-logs-queries": "Grundläggande loggfrågor",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Knapp för att kickstarta Azure-loggfrågor",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Om du byter till Builder kommer din nuvarande KQL-förfrågan att kasseras och KQL-redigeraren att rensas. Är du säker på att du vill göra det?",
+      "body-switching-to-kql": "Om du byter till KQL kommer dina nuvarande byggarinställningar att kasseras. Är du säker?",
       "button-kick-start-your-query": "Kickstarta din fråga",
       "button-run-query": "Kör fråga",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Byt till {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Builder",
+        "label-kql": "KQL"
       },
       "label-service": "Service",
       "placeholder-service": "Service …",
@@ -239,7 +239,7 @@
       "title-error-occurred": "Ett fel uppstod vid begäran av resurser från Azure Monitor"
     },
     "scope-selector": {
-      "label": ""
+      "label": "Omfattning"
     },
     "search": {
       "aria-label-resource-search": "Resurssökning",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json
index 12fe56fed24..a74be5fdce8 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "Bu sorguyu kullanın",
       "label-categories": "Kategoriler",
       "label-query-results": "Sorgu sonuçları: {{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "Tüm kategoriler listelenemiyor",
       "placeholder-all-categories": "Tüm kategoriler",
       "placeholder-search-logs": "Günlük sorgusu ara",
       "text-loading": "Yükleniyor..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "Döndürülen satır sayısını kısıtlayın (varsayılan 1000'dir)."
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "Temel Günlüklere geçmek istediğinizden emin misiniz?",
+      "confirmText-confirm": "Onayla",
       "description-basic-logs-queries": "Temel Günlük sorguları, taranan veri miktarına bağlı olarak maliyet doğurur.",
       "label-logs": "Günlük kayıtları",
       "title-basic-logs-queries": "Temel Günlük Sorguları",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure günlükleri sorgu hızlı başlatma düğmesi",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "Oluşturucuya geçmek, mevcut KQL sorgunuzu siler ve KQL düzenleyicisini temizler. Emin misiniz?",
+      "body-switching-to-kql": "KQL'ye geçmek, mevcut oluşturucu ayarlarınızı siler. Emin misiniz?",
       "button-kick-start-your-query": "Sorgunuzu hızlı başlatın",
       "button-run-query": "Sorgu çalıştır",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "Şuna geç: {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "Oluşturucu",
+        "label-kql": "KQL"
       },
       "label-service": "Hizmet",
       "placeholder-service": "Hizmet...",
@@ -239,7 +239,7 @@
       "title-error-occurred": "Azure Monitor'dan kaynaklar istenirken bir hata oluştu"
     },
     "scope-selector": {
-      "label": ""
+      "label": "Kapsam"
     },
     "search": {
       "aria-label-resource-search": "Kaynak arama",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json
index 610b1e8f659..c049cd7d9d9 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "使用此查询",
       "label-categories": "类别",
       "label-query-results": "查询结果：{{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "无法列出所有类别",
       "placeholder-all-categories": "所有类别",
       "placeholder-search-logs": "在日志查询中搜索",
       "text-loading": "加载中..."
@@ -166,8 +166,8 @@
       "tooltip-limit": "限制返回的行数（默认为 1000）。"
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "您确定要切换到基本日志吗？",
+      "confirmText-confirm": "确认",
       "description-basic-logs-queries": "基本日志查询根据扫描的数据量产生费用。",
       "label-logs": "日志",
       "title-basic-logs-queries": "基本日志查询",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure 日志启动查询按钮",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "切换到构建器将丢弃当前的 KQL 查询并清除 KQL 编辑器。您确定吗？",
+      "body-switching-to-kql": "切换到 KQL 将丢弃当前的构建器设置。您确定吗？",
       "button-kick-start-your-query": "启动您的查询",
       "button-run-query": "运行查询",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "切换到 {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "构建器",
+        "label-kql": "KQL"
       },
       "label-service": "服务",
       "placeholder-service": "服务...",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json
index a4adbd76c1c..0dcf1fb2e9b 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json
@@ -52,7 +52,7 @@
       "button-use-query": "使用此查詢",
       "label-categories": "分類",
       "label-query-results": "查詢結果：{{numResults}}",
-      "noOptionsMessage-unable-to-list-categories": "",
+      "noOptionsMessage-unable-to-list-categories": "無法列出所有類別",
       "placeholder-all-categories": "所有分類",
       "placeholder-search-logs": "搜尋「紀錄查詢」",
       "text-loading": "正在載入…"
@@ -166,8 +166,8 @@
       "tooltip-limit": "限制傳回的列數（預設為 1000）。"
     },
     "logs-management": {
-      "body-basic-logs-queries": "",
-      "confirmText-confirm": "",
+      "body-basic-logs-queries": "確定要切換至基本紀錄嗎？",
+      "confirmText-confirm": "確認",
       "description-basic-logs-queries": "基本紀錄查詢會根據掃描的資料量產生費用。",
       "label-logs": "紀錄",
       "title-basic-logs-queries": "基本紀錄查詢",
@@ -203,14 +203,14 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure 紀錄會啟動您的查詢按鈕",
-      "body-switching-to-builder": "",
-      "body-switching-to-kql": "",
+      "body-switching-to-builder": "切換到建立器將捨棄您目前的 KQL 查詢並清除 KQL 編輯器。您確定嗎？",
+      "body-switching-to-kql": "切換到 KQL 將捨棄您目前的建立器設定。您確定嗎？",
       "button-kick-start-your-query": "啟動您的查詢",
       "button-run-query": "執行查詢",
-      "confirmText-switch-to": "",
+      "confirmText-switch-to": "切換到 {{newMode}}",
       "editor-modes": {
-        "label-builder": "",
-        "label-kql": ""
+        "label-builder": "建立器",
+        "label-kql": "KQL"
       },
       "label-service": "服務",
       "placeholder-service": "服務…",
diff --git a/public/locales/cs-CZ/grafana.json b/public/locales/cs-CZ/grafana.json
index 47a483b5485..664774758dc 100644
--- a/public/locales/cs-CZ/grafana.json
+++ b/public/locales/cs-CZ/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Některé funkce jsou stabilní (GA) a povolené ve výchozím nastavení, zatímco některé funkce jsou v současné době ve fázi předběžné beta verze, připravené k implementaci.",
       "confirm-modal-body-2": "Před provedením úprav doporučujeme porozumět důsledkům každé změny funkce.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Uložit změny",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Obecná dostupnost",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Odstranit organizaci",
-      "confirmText-delete": "",
+      "confirmText-delete": "Odstranit",
       "title-delete": "Odstranit"
     },
     "anon-users": {
       "not-found": "Nebyli nalezeni žádní anonymní uživatelé."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Opravdu chcete vynutit odhlášení ze všech zařízení?",
+      "confirmText-confirm-logout": "Potvrdit odhlášení",
+      "confirmText-force-logout": "Vynutit odhlášení",
       "title-force-logout-from-all-devices": "Vynutit odhlášení ze všech zařízení"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Uložit"
     },
     "edit-org": {
       "access-denied": "Nemáte oprávnění k prohlížení uživatelů v této organizaci. Chcete-li aktualizovat tuto organizaci, obraťte se na správce serveru.",
@@ -216,11 +216,11 @@
       "not-editable": "Tuto uživatelskou roli nelze upravovat, protože je synchronizována s vaším poskytovatelem ověření. Podrobnosti najdete v <1>dokumentaci k ověření Grafana</1>."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Opravdu chcete odstranit uživatele {{user}}?",
       "columns": {
         "aria-label-role": "Role"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Odstranit",
       "delete-aria-label": "Odstranit uživatele: {{name}}",
       "title-delete": "Odstranit"
     },
@@ -252,7 +252,7 @@
       "info-description": "Tato systémová nastavení jsou definována v grafana.ini nebo custom.ini (nebo přepsána v proměnných ENV). Chcete-li je změnit, musíte restartovat Grafanu."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Potvrdit odebrání"
     },
     "upgrade-info": {
       "title": "Licence Enterprise"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Změnit",
-      "confirmText-change": "",
+      "confirmText-change": "Změnit",
       "grafana-admin-key": "Správce Grafana",
       "grafana-admin-no": "Ne",
       "grafana-admin-yes": "Ano",
       "title": "Oprávnění"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Opravdu chcete odstranit tohoto uživatele?",
+      "body-disable": "Opravdu chcete deaktivovat tohoto uživatele?",
+      "confirmText-delete-user": "Odstranit uživatele",
+      "confirmText-disable-user": "Deaktivovat uživatele",
       "delete-button": "Odstranit uživatele",
       "disable-button": "Deaktivovat uživatele",
       "edit-button": "Upravit",
@@ -331,7 +331,7 @@
       "title-disable-user": "Zakázat uživatele"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Uložit"
     },
     "user-sessions": {
       "browser-column": "Prohlížeč a operační systém",
@@ -382,12 +382,12 @@
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Tlačítko AI pro pravidlo výstrahy se nepodařilo načíst",
+        "feedback-button": "Tlačítko AI pro zpětnou vazbu se nepodařilo načíst",
+        "improve-annotations-button": "Tlačítko AI pro zlepšení vysvětlivek se nepodařilo načíst",
+        "improve-labels-button": "Tlačítko AI pro zlepšení štítků se nepodařilo načíst",
+        "template-button": "Tlačítko AI pro šablonu se nepodařilo načíst",
+        "triage-button": "Tlačítko AI pro třídění se nepodařilo načíst"
       }
     },
     "alert": {
@@ -501,7 +501,7 @@
       "title-muting-grouping-and-timings": "Ztlumení, seskupení a časování"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nebyly nalezeny žádné zdroje dat"
     },
     "alert-menu": {
       "copy-link": "Kopírovat odkaz",
@@ -527,7 +527,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Pravidlo výstrahy"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -595,7 +595,7 @@
       "view-configuration": "Zobrazit konfiguraci"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Ano, obnovit konfiguraci",
       "gma-manual-configuration-description": "Interní konfiguraci správce výstrah Grafana nelze ručně změnit. Chcete-li změnit tuto konfiguraci, upravte jednotlivé zdroje přes uživatelské rozhraní.",
       "gma-manual-configuration-is-not-supported": "Ruční změny konfigurace nejsou podporovány",
       "message": {
@@ -610,13 +610,13 @@
       "title-resetting-alertmanager-configuration": "Probíhá obnovení konfigurace správce výstrah"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Opravdu chcete obnovit konfiguraci na tuto verzi? Veškeré neuložené změny budou ztraceny.",
       "columns": {
         "compare": "Porovnat",
         "restore": "Obnovit",
         "text-latest": "Nejnovější"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Ano, obnovit konfiguraci",
       "loading": "Načítání…",
       "no-previous-configurations": "Žádné předchozí konfigurace",
       "this-might-take-a-while": "Může to chvíli trvat…",
@@ -896,10 +896,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Další akce pro kontaktní bod „{{contactPointName}}“",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Odstranit",
       "button-edit": "Upravit",
       "button-view": "Zobrazit",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Exportovat",
       "export-label-export": "Exportovat",
       "label-delete": "Odstranit",
       "label-manage-permissions": "Spravovat oprávnění",
@@ -1438,7 +1438,7 @@
       "label-disable-resolved-message": "Zakázat vyřešenou zprávu"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Načítání skupin…",
       "message": {
         "must-be-a-positive-integer": "Musí být kladné celé číslo.",
         "must-enter-a-group-name": "Musíte zadat název skupiny"
@@ -1535,7 +1535,7 @@
       "group-loading-error": "Chyba při načítání skupiny",
       "interval": "Interval",
       "namespace": "Jmenný prostor",
-      "new": "",
+      "new": "Nové",
       "title": {
         "back": ""
       }
@@ -1567,7 +1567,7 @@
     },
     "group-loader": {
       "group-load-failed": "Nepodařilo se načíst pravidla ze skupiny {{ groupName }} v jmenném prostoru {{ namespaceName }}",
-      "no-rules": ""
+      "no-rules": "V této skupině nebyla nalezena žádná pravidla"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "Probíhá odstranění skupiny"
@@ -1899,10 +1899,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nebyly nalezeny žádné zdroje dat"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Opravdu chcete odstranit „{{muteTiming}}“?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Zakázáno",
@@ -2156,10 +2156,10 @@
         "conflict": "Strom zásad oznamování byl aktualizován jiným uživatelem.",
         "error-code": "Chybová zpráva: „{{error}}“",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Nelze přidat nebo aktualizovat směrování: při sloučení matcherů {{-matchers}} dojde ke konfliktu s externím směrovacím stromem. To by způsobilo nedosažitelnost směrování."
         },
         "suffix": "Aktualizujte stránku a zkuste to znovu.",
-        "title": ""
+        "title": "Nepodařilo se přidat nebo aktualizovat zásadu oznamování"
       },
       "n-more-policies_one": "{{count}} další zásady",
       "n-more-policies_few": "{{count}} další zásady",
@@ -2217,7 +2217,7 @@
     "query-and-expressions-step": {
       "add-query": "Přidat dotaz",
       "body-queries-expressions-configured": "Vytvořte alespoň jeden dotaz nebo výraz, na který chcete být upozorněni",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Deaktivovat",
       "expressions": "Výrazy",
       "loading-data-sources": "Načítání zdrojů dat…",
       "manipulate-returned-queries-other-operations": "Spravujte data získaná z dotazů pomocí matematických a dalších operací.",
@@ -2271,7 +2271,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Pravidlo nahrávání"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Nelze načíst editor dotazů, důvod: {{errorMessage}}"
@@ -2291,7 +2291,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Pro zkopírované pravidlo budete muset nastavit novou hodnotící skupinu, protože původní skupina byla zajištěna a nelze ji použít pro pravidla vytvořená v uživatelském rozhraní.",
       "body-not-provisioned": "Nové pravidlo <1>nebude</1> označeno jako zajištěné pravidlo.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Kopírovat",
       "title-copy-provisioned-alert-rule": "Kopírovat zajištěné pravidlo výstrahy"
     },
     "redirect-to-rule-viewer": {
@@ -2517,7 +2517,7 @@
       "new-alert-rule": "Nové pravidlo výstrahy",
       "new-datasource-recording-rule": "Nové pravidlo nahrávání zdroje dat",
       "new-grafana-recording-rule": "Nové pravidlo nahrávání Grafany",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Nové pravidlo výstrahy pro export",
       "pagination": {
         "next-page": "Zobrazit více…"
       },
@@ -2697,7 +2697,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Správci výstrah"
       }
     },
     "settings-content": {
@@ -2835,7 +2835,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Obnovit náhled",
-      "empty-state": "",
+      "empty-state": "Pro zobrazení náhledu přidejte obsah šablony",
       "label-preview": "Náhled",
       "refresh": "Obnovit"
     },
@@ -2854,7 +2854,7 @@
       "loading": "Načítání…",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Vyberte šablonu oznámení"
         },
         "label": {
           "select-notification-template": "Vyberte šablonu oznámení"
@@ -2882,8 +2882,8 @@
     },
     "templates-table": {
       "actions": "Akce",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Opravdu chcete odstranit skupinu šablon „{{template}}“?",
+      "confirmText-yes-delete": "Ano, odstranit",
       "no-templates-defined": "Nejsou definovány žádné šablony.",
       "template-group": "Skupina šablony",
       "title-delete-template-group": "Odstranit skupinu šablon"
@@ -2938,7 +2938,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Správa pravidel výstrah, pravidel záznamu a intervalu vyhodnocování"
       }
     },
     "to-gma": {
@@ -3018,7 +3018,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Ano, odstranit"
       }
     },
     "use-delete-policy-modal": {
@@ -3178,7 +3178,7 @@
       "annotation": "Anotace",
       "first-value": "První hodnota",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Neznámé názvy polí"
     },
     "empty-state": {
       "button-title": "Přidat dotaz na vysvětlivky",
@@ -3188,12 +3188,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Pokud je toto pole definováno, bude vysvětlivka považována za rozsah",
+        "results-split-on-comma": "Výsledky budou odděleny čárkou (,)"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}, nebo prvním textovým polem",
+        "time-or-the-first-field": "{{defaultField}}, nebo prvním časovým polem"
       }
     },
     "standard-annotation-query-editor": {
@@ -3271,9 +3271,9 @@
       "define-allowed-teams-ids-label": "Definovat povolená ID týmů",
       "display-name-description": "Zobrazí se na přihlašovací stránce jako „Přihlásit se přes…“. Užitečné, pokud používáte více než jednoho poskytovatele identity nebo protokoly SSO.",
       "display-name-label": "Zobrazované jméno",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Parametr pro označení oblasti uživatele v instanci Azure AD / Entra ID a zjednodušení procesu přihlášení.",
+      "domain-hint-label": "Nápověda k doméně",
+      "domain-hint-valid-domain": "Toto pole musí být platná doména.",
       "email-attribute-name-description": "Název klíče, který se použije pro vyhledání e-mailu uživatele v mapě atributů ID tokenu OAuth2.",
       "email-attribute-name-label": "Název atributu e-mailu",
       "email-attribute-path-description": "Výraz JMESPath, který se použije pro vyhledání e-mailu uživatele z informací o uživateli.",
@@ -3290,11 +3290,11 @@
       "id-token-attribute-name-label": "Název atributu ID tokenu",
       "login-attribute-path-description": "Výraz JMESPath, který se použije pro vyhledání přihlašovacích údajů uživatele z tokenu ID uživatele.",
       "login-attribute-path-label": "Cesta atributu přihlášení",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Souhlas",
+      "login-prompt-description": "Označuje typ interakce uživatele při přihlášení pomocí IdP.",
+      "login-prompt-label": "Výzva k přihlášení",
+      "login-prompt-login": "Přihlášení",
+      "login-prompt-select-account": "Vyberte účet",
       "managed-identity-client-id-description": "ID klienta spravované identity federovaných identifikačních údajů vaší aplikace OAuth2.",
       "managed-identity-client-id-label": "ID klienta spravované identity FIC",
       "name-attribute-path-description": "Výraz JMESPath, který se použije pro vyhledání uživatelského jména z tokenu ID uživatele.\nToto jméno bude použito jako zobrazované jméno uživatele.",
@@ -3330,7 +3330,7 @@
       "team-ids-github": "Celočíselný seznam ID týmů.",
       "team-ids-label": "ID týmů",
       "team-ids-numbers": "ID týmů musí být čísla.",
-      "team-ids-other": "",
+      "team-ids-other": "Řetězcový seznam ID týmů.",
       "team-ids-placeholder": "Zadejte ID týmů a stiskněte klávesu Enter pro přidání",
       "teams-url-description": "Adresa URL použitá k dotazu na ID týmů. Pokud není nastavena, výchozí hodnota je /teams.",
       "teams-url-description-oauth": "Pokud nakonfigurujete „{{ teamsURLLabel }}“, musíte také nakonfigurovat „{{ teamIDsAttributePathLabel }}“.",
@@ -3374,7 +3374,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Obnovit výchozí hodnoty"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Obnovit",
       "disable": "Zakázat",
       "disabling": "Probíhá zakazování…",
       "discard": "Zahodit",
@@ -3394,7 +3394,7 @@
       "text-badge-not-enabled": "Není povoleno"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM je momentálně ve vývoji a není doporučeno ho používat v produkčním prostředí. Používejte ho opatrně a počítejte s možnými změnami."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "Koncový bod .well-known / openid-configuration pro vašeho poskytovatele identity",
@@ -3512,8 +3512,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Hromadné odstranění přidělených prostředků",
+      "bulk-move-provisioned-resources": "Hromadné přesunutí přidělených prostředků",
       "cancel-button": "Zrušit",
       "confirmation-text": "Odstranit",
       "delete-button": "Odstranit",
@@ -3532,8 +3532,8 @@
       "move-modal-title": "Přesunout",
       "moving": "Probíhá přesouvání…",
       "new-folder-name-required-phrase": "Název složky je povinný.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Vybrali jste přidělené i nepřidělené zdroje. Tyto zdroje nelze zpracovat společně. Vyberte pouze přidělené nebo nepřidělené zdroje a zkuste to znovu.",
+      "selected-mix-resources-modal-title": "Byly vybrány smíšené typy zdrojů"
     },
     "actions": {
       "button-to-recently-deleted": "Nedávno odstraněné"
@@ -3546,27 +3546,27 @@
       "this-folder-is-empty": "Tato složka je prázdná"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_few": "",
-      "failed-alert_many": "",
-      "failed-alert_other": ""
+      "all-deleted": "Všechny zdroje byly úspěšně odstraněny",
+      "all-moved": "Všechny zdroje byly úspěšně přesunuty",
+      "button-done": "Hotovo",
+      "progress-title": "Úspěch",
+      "failed-alert_one": "Počet selhaných položek: {{count}}",
+      "failed-alert_few": "Počet selhaných položek: {{count}}",
+      "failed-alert_many": "Počet selhaných položek: {{count}}",
+      "failed-alert_other": "Počet selhaných položek: {{count}}"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Zrušit",
+      "button-delete": "Odstranit",
+      "button-deleting": "Probíhá odstraňování…",
+      "delete-warning": "Tímto se smažou vybrané složky a všechny jejich podsložky. Celkem to ovlivní:",
+      "error-path-not-found": "Cesta nebyla nalezena"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Zrušit",
+      "button-move": "Přesunout",
+      "button-moving": "Probíhá přesouvání…",
+      "deleting": "Odstraňování",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3574,14 +3574,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Obsah souboru nebyl nalezen",
+      "error-path-not-found": "Cesta nebyla nalezena",
+      "error-target-folder-path-missing": "Chybí cesta k cílové složce",
+      "error-title": "Chyba cílové složky",
+      "move-warning": "Tímto se přesunou vybrané složky a všechny jejich podsložky. Celkem to ovlivní:",
+      "moving": "V pohybu",
+      "progress": "Průběh: {{current}} z {{total}}",
+      "target-folder": "Cílová složka"
     },
     "counts": {
       "alertRule_one": "{{count}} pravidlo výstrahy",
@@ -3622,7 +3622,7 @@
       "button-delete": "Odstranit",
       "button-deleting": "Probíhá odstraňování…",
       "delete-warning": "Tímto odstraníte tuto složku a všechny následné složky. Celkově to ovlivní:",
-      "success-message": ""
+      "success-message": "Složka byla úspěšně odstraněna"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Nelze načíst informace o následovníkovi"
@@ -3647,7 +3647,7 @@
       "empty-message": "Nebyly nalezeny žádné složky",
       "error-title": "Chyba při načítání složek",
       "non-folder-item": "Bez složky {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "Nástěnky",
       "search-placeholder": "Vyhledat složky",
       "unknown-error": "Neznámá chyba"
     },
@@ -3676,7 +3676,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Zadejte název složky",
       "label-folder-name": "Název složky",
       "text-pull-request-created": "Byl vytvořen pull request se změnami v této složce:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "Vaše složka bude vytvořena pod názvem {{folderName}}",
       "title-pull-request-created": "Pull request byl vytvořen",
       "title-this-repository-is-read-only": "Toto úložiště je jen pro čtení"
     },
@@ -3795,7 +3795,7 @@
     "category-selected-connection": "Vybrané připojení",
     "category-selected-element": "Vybraný prvek ({{element}})",
     "category-size": "Velikost",
-    "category-tooltip": "",
+    "category-tooltip": "Popisek",
     "cloud-item": {
       "category-cloud": "Cloud",
       "label": {
@@ -4039,10 +4039,10 @@
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Režim popisku",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Deaktivováno",
+        "label-enabled": "Povoleno"
       }
     },
     "tree-navigation-editor": {
@@ -4411,7 +4411,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Spustit dotaz"
     }
   },
   "dashboard": {
@@ -4574,7 +4574,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Pokračovat"
         },
         "title": {
           "proceed-to-external-site": "Přejít na externí stránku?"
@@ -4680,11 +4680,11 @@
     },
     "edit-actions": {
       "add": "Přidat {{typeName}}",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
+      "add-conditional-rule": "Přidat pravidlo {{ruleDescription}}",
+      "duplicate-panel": "Duplikovat panel",
+      "edit-query-result-rule": "Změnit pravidlo výsledku dotazu",
+      "edit-template-variable-rule": "Změnit pravidlo proměnné šablony",
+      "edit-time-range-rule": "Změnit pravidlo časového rozsahu",
       "move": "Přesunout {{typeName}}",
       "panel-background": "Změnit pozadí panelu",
       "panel-description": "Změnit popis panelu",
@@ -4699,7 +4699,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Nástěnka",
-        "element": "",
+        "element": "Prvek",
         "local-variable": "Lokální proměnná",
         "multiple-elements": "Více prvků",
         "multiple-elements-delete-text": "Opravdu chcete odstranit tyto prvky?",
@@ -4781,10 +4781,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Exportovat nástěnku"
       },
       "menu": {
-        "label": ""
+        "label": "Exportovat nabídku nástěnky"
       }
     },
     "fetch-dashboard": {
@@ -4806,9 +4806,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Výchozí",
+          "shared-crosshair": "Sdílený křížek",
+          "shared-tooltip": "Sdílený popisek"
         }
       }
     },
@@ -4861,14 +4861,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Neposílat data vysvětlivek do následujících panelů",
+        "annotation-panels-support-annotations": "Odeslat data vysvětlivek do všech panelů, které podporují vysvětlivky",
+        "annotations-explicitly-listed-panels": "Odeslat vysvětlivky do výslovně uvedených panelů"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Všechny panely",
+        "all-panels-except": "Všechny panely kromě",
+        "selected-panels": "Vybrané panely"
       }
     },
     "get-panel-frame-category": {
@@ -5132,7 +5132,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Opravdu chcete obnovit nástěnku na verzi {{version}}? Veškeré neuložené změny budou ztraceny.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Ano, obnovit na verzi {{version}}",
       "title-restore-version": "Obnovit verzi"
     },
     "row-options-button": {
@@ -5184,7 +5184,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Nástěnka byla uložena"
     },
     "save-dashboard-as-button": {
       "save-as": "Uložit jako"
@@ -5220,7 +5220,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Ve vybrané složce už existuje nástěnka se stejným názvem.<1></1><2>Chcete přesto tuto nástěnku uložit?</2>",
       "body-version-mismatch": "Tuto nástěnku aktualizoval jiný uživatel<1></1><2>Chcete přesto tuto nástěnku uložit?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Uložit a přepsat",
       "title-name-exists": "Konflikt",
       "title-version-mismatch": "Konflikt"
     },
@@ -5417,9 +5417,9 @@
       "label-apply-transformation-to": "Použít transformaci na"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Upozorňujeme, že odstranění jedné transformace může narušit ostatní transformace. Pokud je k dispozici pouze jedna transformace, vrátíte se zpět na hlavní obrazovku výběru.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Odstranit",
         "title-debug": "Ladění",
         "title-disable-transformation": "Zakázat transformaci",
         "title-filter": "Filtrovat",
@@ -5440,16 +5440,16 @@
       "placeholder-search-for-transformation": "Hledat transformaci",
       "show-images": "Zobrazit obrázky",
       "title-add-another-transformation": "Přidejte další transformaci",
-      "view-all": ""
+      "view-all": "Zobrazit vše"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Odstraněním všech transformací se vrátíte na hlavní obrazovku výběru."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Přidejte další transformaci"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Odstranit vše",
       "delete-all-transformations": "Odstranit všechny transformace",
       "title-delete-all-transformations": "Odstranit všechny transformace?",
       "tooltip-clear-search": "Vymazat vyhledávání",
@@ -5479,16 +5479,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Změnit popis proměnné"
       },
       "hide": {
-        "action": ""
+        "action": "Změnit možnost skrytí proměnné"
       },
       "label": {
-        "action": ""
+        "action": "Změnit štítek proměnné"
       },
       "name": {
-        "action": ""
+        "action": "Změnit název proměnné"
       }
     },
     "version-history-comparison": {
@@ -5500,7 +5500,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Přepnout výběr verze {{version}}",
       "date": "Datum",
-      "name-latest": "",
+      "name-latest": "Nejnovější",
       "notes": "Poznámky",
       "restore": "Obnovit",
       "updated-by": "Aktualizoval/a",
@@ -5578,7 +5578,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Zadejte rozměry ve formátu CSV: {{name}}, {{value}}",
       "label-data-source": "Zdroj dat",
       "label-use-static-key-dimensions": "Použít dimenze statického klíče",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Povolit vlastní hodnoty"
     },
     "add-to-dashboard": {
       "message": {
@@ -5652,7 +5652,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Odvolat veřejnou adresu URL"
       },
       "title": {
         "revoke-public-url": "Odvolat veřejnou adresu URL"
@@ -5665,7 +5665,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Vlastní možnosti",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Hodnoty oddělené čárkou",
       "selection-options": "Možnosti výběru"
     },
     "dashboard-edit-pane-renderer": {
@@ -5686,8 +5686,8 @@
       "label-with-tags": "S tagy",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Nástěnky",
+          "link": "Odkaz"
         }
       },
       "placeholder-open-dashboard": "Otevřít nástěnku"
@@ -5730,8 +5730,8 @@
       "data-source-options": "Možnosti zdroje dat",
       "description-instance-name-filter": "Filtr regulárních výrazů, pro které můžete vybrat instance zdroje dat v seznamu hodnot proměnných. Ponechte prázdné pro vše.",
       "example-instance-name-filter": "Příklad: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Filtr názvu instance",
+      "name-type": "Typ",
       "selection-options": "Možnosti výběru"
     },
     "default-grid-layout-manager": {
@@ -5747,7 +5747,7 @@
       "delete-action": "Odstranit nástěnku",
       "deleting": "Probíhá odstranění…",
       "drawer-title": "Odstranit zajištěnou nástěnku",
-      "success-message": ""
+      "success-message": "Nástěnka byla úspěšně odstraněna"
     },
     "description-label": {
       "description": "Popis"
@@ -5776,15 +5776,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Upravitelné",
+          "readonly": "Jen pro čtení"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Výchozí",
+          "shared-crosshair": "Sdílený křížek",
+          "shared-tooltip": "Sdílený popisek"
         }
       }
     },
@@ -5796,36 +5796,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Přidat filtry klíčů/hodnot za chodu",
+        "dynamically-switch-source-multiple-panels": "Dynamicky přepínat zdroj dat pro více panelů",
+        "group": "Přidat klíče do skupiny za chodu",
+        "hidden-constant-variable": "Skrytá konstantní proměnná, užitečná pro metrické předpony na nástěnkách, které chcete sdílet",
+        "users-enter-arbitrary-strings-textbox": "Uživatelé mohou do textového pole zadat libovolné řetězce znaků",
+        "values-are-static-and-defined-manually": "Hodnoty jsou statické a definované ručně",
+        "values-fetched-source-query": "Hodnoty jsou načteny z dotazu na zdroj dat",
+        "values-timespans": "Hodnoty jsou časové úseky, např. 1 minuta, 1 hodina, 1 den"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Filtry ad hoc",
+        "constant": "Konstantní",
+        "custom": "Vlastní",
+        "data-source": "Zdroj dat",
+        "group-by": "Seskupit podle",
+        "interval": "Interval",
+        "query": "Dotaz",
+        "textbox": "Textové pole"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Neposílat data vysvětlivek do následujících panelů",
+        "annotation-panels-support-annotations": "Odeslat data vysvětlivek do všech panelů, které podporují vysvětlivky",
+        "annotations-explicitly-listed-panels": "Odeslat vysvětlivky do výslovně uvedených panelů"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Všechny panely",
+        "all-panels-except": "Všechny panely kromě",
+        "selected-panels": "Vybrané panely"
       }
     },
     "get-panel-frame-options": {
@@ -5853,7 +5853,7 @@
       "group-by-options": "Možnosti Seřadit podle",
       "label-data-source": "Zdroj dat",
       "label-use-static-group-by-dimensions": "Použít rozměry statické skupiny",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Povolit vlastní hodnoty"
     },
     "help-wizard": {
       "copy-to-clipboard": "Kopírovat do schránky",
@@ -5889,14 +5889,14 @@
       "apply": "Použít"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Dynamicky vypočítá interval vydělením časového rozsahu zadaným počtem",
       "description-calculated-value-below-threshold": "Vypočtená hodnota neklesne pod tuto prahovou hodnotu",
       "description-step-count": "Kolikrát by měl být aktuální časový rozsah rozdělen pro výpočet hodnoty",
       "interval-options": "Možnosti intervalu",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Automatická možnost",
+      "name-min-interval": "Min. interval",
+      "name-step-count": "Počet kroků",
+      "name-values": "Hodnoty"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5919,19 +5919,19 @@
       "usage-count_other": "Použito na {{count}} nástěnkách"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Chyba při přesouvání nástěnky",
+      "api-error": "Nástěnku se nepodařilo přesunout",
+      "cancel-action": "Zrušit",
+      "current-file-not-found": "Aktuální soubor nástěnky se nepodařilo najít",
+      "drawer-title": "Přesunout zajištěnou nástěnku",
+      "file-load-error": "Chyba při načítání nástěnky",
+      "loading-file-data": "Načítání dat nástěnky",
+      "move-action": "Přesunout nástěnku",
+      "move-read-only-message": "Tuto nástěnku nelze přesunout přímo z Grafany, protože úložiště je jen pro čtení. Chcete-li tuto nástěnku přesunout, přesuňte soubor v úložišti Git.",
+      "moving": "Probíhá přesouvání…",
+      "success-message": "Nástěnka byla úspěšně přesunuta",
+      "target-path-label": "Cílová cesta",
+      "title-this-repository-is-read-only": "Toto úložiště je jen pro čtení"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Ve vybrané složce už existuje nástěnka se stejným názvem. Chcete přesto tuto nástěnku uložit?",
@@ -5939,7 +5939,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Pokračovat"
       },
       "title": {
         "proceed-to-external-site": "Přejít na externí stránku?"
@@ -5976,8 +5976,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Přidejte další transformaci",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Odstraněním všech transformací se vrátíte na hlavní obrazovku výběru.",
+      "confirmText-delete-all": "Odstranit vše",
       "delete-all-transformations": "Odstranit všechny transformace",
       "title-delete-all-transformations": "Odstranit všechny transformace?"
     },
@@ -6030,13 +6030,13 @@
       "description-examples": "Pojmenované skupiny zachycení lze použít k oddělení zobrazovaného textu a hodnoty (<1>viz příklady</1>).",
       "description-optional": "Volitelné, pokud chcete extrahovat část názvu řady nebo segmentu uzlu metriky.",
       "label-data-source": "Zdroj dat",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Statické možnosti třídění",
       "label-target-data-source": "Cílový zdroj dat",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Použít statické možnosti",
+      "name-regex": "Regulární výraz",
       "query-options": "Možnosti dotazu",
       "selection-options": "Možnosti výběru",
-      "static-options-legend": ""
+      "static-options-legend": "Statické možnosti"
     },
     "resource-export": {
       "label": {
@@ -6049,7 +6049,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Opravdu chcete obnovit nástěnku na verzi {{version}}? Veškeré neuložené změny budou ztraceny.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Ano, obnovit na verzi {{version}}",
       "title-restore-version": "Obnovit verzi"
     },
     "save-button": {
@@ -6068,7 +6068,7 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Nástěnku se nepodařilo uložit"
       },
-      "required": ""
+      "required": "Povinné"
     },
     "save-dashboard-drawer": {
       "tabs": {
@@ -6095,8 +6095,8 @@
         "title-someone-else-has-updated-this-dashboard": "Tuto nástěnku aktualizoval jiný uživatel",
         "would-still-dashboard": "Chcete přesto tuto nástěnku uložit?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "Vzhledem k omezením v novém schématu nástěnky (V2) budou panely knihovny během externího exportu převedeny na běžné panely s vloženým obsahem.",
+      "schema-v2-library-panels-export-title": "Panely knihovny budou převedeny na běžné panely",
       "title-dashboard-drastically-changed": "Nástěnka byla nevratně změněna"
     },
     "save-dashboard-form-common-options": {
@@ -6145,10 +6145,10 @@
       "description-enables-multiple-values-selected": "Umožňuje vybrat více hodnot současně",
       "description-enables-option-include-variables": "Povoluje možnost zahrnout všechny hodnoty",
       "description-enables-users-custom-values": "Umožňuje uživatelům přidávat vlastní hodnoty do seznamu",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Povolit vlastní hodnoty",
+      "name-custom-all-value": "Vlastní pro všechny hodnoty",
+      "name-include-all-option": "Zahrnout možnost Vše",
+      "name-multi-value": "Více hodnot"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Přepnout nabídku sdílení"
@@ -6169,7 +6169,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Výchozí hodnota"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(volitelné)",
@@ -6194,8 +6194,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Pokud tento panel odpojíte, budete jej moci upravovat, aniž by to mělo vliv na ostatní nástěnky. Jakmile však provedete změnu, nebudete moci vrátit panel do původního stavu, ve kterém byl k dispozici pro opakované použití.",
+      "confirmText-yes-unlink": "Ano, odpojit",
       "title-really-unlink-panel": "Opravdu chcete tento panel odpojit?"
     },
     "unsaved-changes-modal": {
@@ -6213,7 +6213,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Nástěnka byla uložena"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Na tuto proměnnou neodkazuje žádná proměnná ani nástěnka.",
@@ -6225,15 +6225,15 @@
       "aria-label-variable-editor-form": "Formulář editoru proměnné",
       "back-to-list": "Zpět na seznam",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Odstranit proměnnou"
       },
       "delete": "Odstranit",
       "description-optional-display-name": "Nepovinné zobrazované jméno",
       "description-template-variable-characters": "Název proměnné šablony. (max. 50 znaků)",
       "general": "Obecné",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Popis",
+      "name-label": "Štítek",
+      "name-name": "Název",
       "placeholder-descriptive-text": "Popisný text",
       "placeholder-label-name": "Název štítku",
       "placeholder-variable-name": "Název proměnné",
@@ -6248,8 +6248,8 @@
       "variable": "Proměnná"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Opravdu chcete odstranit: {{variable}}?",
+      "confirmText-delete-variable": "Odstranit proměnnou",
       "title-delete-variable": "Odstranit proměnnou",
       "tooltip-duplicate-variable": "Duplikovat proměnnou",
       "tooltip-remove-variable": "Odebrat proměnnou"
@@ -6257,15 +6257,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Štítek",
+          "nothing": "Žádné",
+          "variable": "Proměnná"
         }
       },
       "label": "Skrýt"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Typ proměnné"
     },
     "variable-usages-button": {
       "title-show-usages": "Zobrazuje se použití pro: {{variableId}}",
@@ -6293,7 +6293,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Přepnout výběr verze {{version}}",
       "date": "Datum",
-      "name-latest": "",
+      "name-latest": "Nejnovější",
       "notes": "Poznámky",
       "restore": "Obnovit",
       "updated-by": "Aktualizoval/a",
@@ -6684,7 +6684,7 @@
     },
     "color-dimension-editor": {
       "label-fixed-color": "Pevná barva",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Nebyla nalezena žádná pole"
     },
     "file-dropzone-custom-children": {
       "upload": "Nahrát"
@@ -6723,7 +6723,7 @@
       },
       "label-limit": "Limit",
       "label-value": "Hodnota",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Nebyla nalezena žádná pole",
       "scalar-options": {
         "description-clamped": "Použít hodnoty pole, upnuté na max. a min.",
         "description-mod": "Použít hodnoty pole, mod z max.",
@@ -6734,13 +6734,13 @@
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Fixní hodnota"
         }
       },
       "label-max": "Max.",
       "label-min": "Min.",
       "label-value": "Hodnota",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Nebyla nalezena žádná pole"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
@@ -6850,6 +6850,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Události",
@@ -7122,7 +7123,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Načítání…"
     },
     "prev": "Předch.",
     "queryless-apps-extensions": {
@@ -7309,7 +7310,7 @@
           "start-time": "Čas zahájení:"
         }
       },
-      "share-span": "",
+      "share-span": "Sdílet",
       "warnings": "Varování"
     },
     "span-filters": {
@@ -7319,8 +7320,8 @@
       "aria-label-select-service-name-operator": "Vyberte operátor názvu služby",
       "aria-label-select-span-name": "Vyberte název rozsahu",
       "aria-label-select-span-name-operator": "Vyberte operátor názvu rozsahu",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Vyberte maximální dobu trvání",
+      "ariaLabel-select-min-span-duration": "Vyberte minimální dobu trvání rozsahu",
       "label-collapse": "Filtry rozsahu",
       "label-duration": "Doba trvání",
       "label-service-name": "Název služby",
@@ -7392,23 +7393,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Doba trvání",
+      "export-started": "Export zahájen",
+      "give-feedback": "Zpětná vazba",
+      "link-copied": "Odkaz byl zkopírován do schránky",
+      "path": "Cesta",
+      "route": "Trasa",
+      "services": "Služby",
+      "share": "Sdílet",
+      "share-copy-link": "Kopírovat odkaz",
+      "share-export-json": "Exportovat jako JSON",
+      "share-tooltip": "Sdílet trasování",
+      "start-time": "Čas zahájení",
+      "target": "Cíl",
+      "title-share-thoughts-about-tracing-grafana": "Podělte se o svůj názor na trasování v Grafaně.",
+      "tooltip-url": "{{route}} nebo {{url}} nebo {{target}} nebo {{path}}",
+      "trace-id": "ID trasování",
+      "url": "Adresa URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Tlačítko Vymazat filtry",
@@ -7508,7 +7509,7 @@
       "when": "KDY"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Spusťte SQL v dialektu MySQL na tabulkách vrácených z vašich zdrojů dat. Dotazy na zdroje dat (tj. „A“, „B“) jsou k dispozici jako tabulky a jsou odkazovány podle názvu dotazu. Pole jsou k dispozici jako sloupce, jak jsou vráceny ze zdroje dat.",
       "label-operation": "Činnost"
     },
     "math": {
@@ -7539,7 +7540,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Vymazat složky",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Nebyly nalezeny žádné složky",
     "select-aria-label": "Filtr složky",
     "select-placeholder": "Filtrovat podle složky"
   },
@@ -7613,51 +7614,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Gazetteer nebyl nalezen",
+      "warning-no-geometry": "nelze najít geometrii",
+      "warning-select-geohash": "Vyberte pole geohash",
+      "warning-select-lat-long": "Vyberte pole pro zeměpisnou šířku a délku",
+      "warning-select-lookup": "Vyberte vyhledávací pole",
+      "warning-unable-to-find": "Nelze najít pole umístění"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nebyla nalezena žádná pole řetězců"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nebyla nalezena žádná číselná pole"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nebyla nalezena žádná číselná pole"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nebyla nalezena žádná pole řetězců"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Gazetteer",
+      "name-geohash-field": "Pole geohash",
+      "name-latitude-field": "Pole zeměpisné šířky",
+      "name-location-mode": "Režim polohy",
+      "name-longitude-field": "Pole zeměpisné délky",
+      "name-lookup-field": "Pole vyhledávání"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Automaticky identifikovat údaje o umístění na základě výchozích názvů polí",
+        "description-coords": "Zadejte pole pro zeměpisnou šířku a délku",
+        "description-geohash": "Zadejte pole geohash",
+        "description-lookup": "Zadejte pole Gazetteer a vyhledávání",
+        "label-auto": "Auto.",
+        "label-coords": "Souřadnice",
+        "label-geohash": "Geohash",
+        "label-lookup": "Vyhledávání"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Vrstva základní mapy",
+    "category-map-controls": "Ovládací prvky mapy",
+    "category-map-layers": "Vrstvy mapy",
+    "category-map-view": "Mapa",
     "coordinates-map-view-editor": {
       "label-latitude": "Zeměpisná šířka",
       "label-longitude": "Zeměpisná délka"
@@ -7666,15 +7667,15 @@
       "center": "Střed:",
       "zoom": "Přiblížení:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Toto umístění se zobrazí při prvním načtení panelu.",
+    "description-mouse-wheel-zoom": "Povolit ovládání přiblížení pomocí kolečka myši",
+    "description-no-repeat": "Zabránit opakování mapy v horizontálním směru",
+    "description-share-view": "Použijte stejné zobrazení na více panelech.  Poznámka: Může být nutné znovu načíst nástěnku.",
+    "description-show-attribution": "Zobrazit informace o přiřazení zdroje mapy v pravém dolním rohu",
+    "description-show-debug": "Zobrazit informace o mapě",
+    "description-show-measure": "Zobrazit nástroje pro měření na mapě",
+    "description-show-scale": "Uveďte měřítko mapy",
+    "description-show-zoom": "Zobrazit tlačítka pro ovládání přiblížení v levém horním rohu",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Vrstva"
@@ -7698,12 +7699,12 @@
       "aria-label-add-geomap-style-rule": "Přidat pravidlo stylu geomapy"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Základní vrstva",
+      "description-display-tooltip": "Zobrazit popisek pro vrstvu",
+      "name-data": "Data",
+      "name-display-tooltip": "Zobrazit popisek",
+      "name-layer-type": "Typ vrstvy",
+      "name-opacity": "Neprůhlednost"
     },
     "layers-editor": {
       "label-add-layer": "Přidat vrstvu",
@@ -7716,9 +7717,9 @@
       "use-current-map-settings": "Použít aktuální nastavení mapy"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Zobrazit legendu mapy",
+      "name-show-legend": "Zobrazit legendu",
+      "name-styles": "Styly"
     },
     "markers-legend": {
       "title-symbol": "Symbol"
@@ -7727,27 +7728,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Zobrazit nástroje pro měření"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Počáteční zobrazení",
+    "name-mouse-wheel-zoom": "Přiblížení pomocí kolečka myši",
+    "name-no-repeat": "Žádné opakování mapy",
+    "name-share-view": "Sdílet zobrazení",
+    "name-show-attribution": "Zobrazit atributy",
+    "name-show-debug": "Zobrazit ladění",
+    "name-show-measure": "Zobrazit nástroje pro měření",
+    "name-show-scale": "Zobrazit měřítko",
+    "name-show-zoom": "Zobrazit ovládání přiblížení",
+    "name-tooltip": "Popisek",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Nebyla nalezena žádná pole řetězce"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "Vrstvu základní mapy konfiguruje správce serveru."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Střed",
+        "label-left": "Vlevo",
+        "label-right": "Vpravo"
       },
       "label-align": "Zarovnat",
       "label-baseline": "Základní linie",
@@ -7763,12 +7764,12 @@
       "label-text-label": "Štítek textu",
       "label-x-offset": "Posun X",
       "label-y-offset": "Posun Y",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Vyberte symbol",
+      "placeholderText-select-symbol-or-add-text": "Vyberte symbol nebo přidejte textový štítek",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Dolní",
+        "label-center": "Střed",
+        "label-top": "Horní"
       }
     },
     "style-rule-editor": {
@@ -7782,13 +7783,13 @@
       "placeholder-value": "hodnota"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Zobrazit vyskakovací okno při najetí",
+      "description-none": "Zobrazit obsah po kliknutí, ne při najetí",
+      "label-details": "Podrobnosti",
+      "label-none": "Žádné"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Vrstva {{name}}"
     }
   },
   "get-enterprise": {
@@ -7908,400 +7909,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Stopa/sek²",
+            "name-g-unit": "Jednotka G",
+            "name-meters-sec": "Metr/sek²"
           },
-          "name": ""
+          "name": "Zrychlení"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Obloukové minuty",
+            "name-arc-seconds": "Obloukové sekundy",
+            "name-degrees": "Stupně (°)",
+            "name-gradian": "Gradian",
+            "name-radians": "Radiány"
           },
-          "name": ""
+          "name": "Úhel"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Akry (ac)",
+            "name-hectares": "Hektary (ha)",
+            "name-square-feet": "Čtvereční stopy (st²)",
+            "name-square-meters": "Čtvereční metry (m²)",
+            "name-square-miles": "Čtvereční míle (mi²)"
           },
-          "name": ""
+          "name": "Oblast"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Zap./Vyp.",
+            "name-true-false": "Pravda/Nepravda",
+            "name-yes-no": "Ano/Ne"
           },
-          "name": ""
+          "name": "Booleovská hodnota"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "Výpočet"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "gram na metr krychlový (g/m³)",
+            "name-g-nm3": "gram na normální metr krychlový (g/Nm³)",
+            "name-mg-dl": "miligramy na decilitr (mg/dl)",
+            "name-mg-m3": "miligram na metr krychlový (mg/m³)",
+            "name-mg-nm3": "miligram na normální metr krychlový (mg/Nm³)",
+            "name-mmol-l": "milimoly na litr (mmol/l)",
+            "name-ng-m3": "nanogram na metr krychlový (ng/m³)",
+            "name-ng-nm3": "nanogram na normální metr krychlový (ng/Nm³)",
+            "name-ppb": "částice na miliardu (ppb)",
+            "name-ppm": "částice na milion (ppm)",
+            "name-ug-m3": "mikrogram na metr krychlový (μg/m³)",
+            "name-ug-nm3": "mikrogram na normální metr krychlový (μg/Nm³)"
           },
-          "name": ""
+          "name": "Koncentrace"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Bulharský lev (BGN)",
+            "name-brl": "Reál (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "Švýcarský frank (CHF)",
+            "name-czk": "Česká koruna (Kč)",
+            "name-dkk": "Dánská koruna (kr)",
+            "name-eur": "Euro (€)",
+            "name-gbp": "Libry (£)",
+            "name-idr": "Indonéská rupie (Rp)",
+            "name-ils": "Izraelský nový šekel (₪)",
+            "name-inr": "Indická rupie (₹)",
+            "name-isk": "Islandská koruna (kr)",
+            "name-jpy": "Jen (¥)",
+            "name-krw": "Jihokorejský won (₩)",
+            "name-mbtc": "Milli Bitcoin (฿)",
+            "name-myr": "Malajsijský ringgit (RM)",
+            "name-nok": "Norská koruna (kr)",
+            "name-php": "Filipínské peso (PHP)",
+            "name-pln": "Polský zlotý (PLN)",
+            "name-pyg": "Guaraní (₲)",
+            "name-rub": "Rubl (₽)",
+            "name-sek": "Švédská koruna (kr)",
+            "name-try": "Turecká lira (₺)",
+            "name-uah": "Hřivna (₴)",
+            "name-ubtc": "Micro Bitcoin (฿)",
+            "name-usd": "Dolar ($)",
+            "name-uyu": "Uruguayské peso (UYU)",
+            "name-vnd": "Vietnamský dong (VND)",
+            "name-xpf": "CFP frank (XPF)",
+            "name-zar": "Jihoafrický rand (R)"
           },
-          "name": ""
+          "name": "Měna"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bity (IEC)",
+            "name-bits-si": "bity (SI)",
+            "name-bytes-iec": "bajty (IEC)",
+            "name-bytes-si": "bajty (SI)",
+            "name-gibibytes": "gibibajty",
+            "name-gigabytes": "gigabajty",
+            "name-kibibytes": "kibibajty",
+            "name-kilobytes": "kilobajty",
+            "name-mebibytes": "mebibajty",
+            "name-megabytes": "megabajty",
+            "name-pebibytes": "pebibajty",
+            "name-petabytes": "petabajty",
+            "name-tebibytes": "tebibajty",
+            "name-terabytes": "terabajty"
           },
-          "name": ""
+          "name": "Data"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bity/s (IEC)",
+            "name-bits-sec-si": "bity/s (SI)",
+            "name-bytes-sec-iec": "bajty/s (IEC)",
+            "name-bytes-sec-si": "bajty/s (SI)",
+            "name-gibibits-sec": "gibibity/s",
+            "name-gibibytes-sec": "gibibajty/s",
+            "name-gigabits-sec": "gigabity/s",
+            "name-gigabytes-sec": "gigabajty/s",
+            "name-kibibits-sec": "kibibity/s",
+            "name-kibibytes-sec": "kibibajty/s",
+            "name-kilobits-sec": "kilobity/s",
+            "name-kilobytes-sec": "kilobajty/s",
+            "name-mebibits-sec": "mebibity/s",
+            "name-mebibytes-sec": "mebibajty/s",
+            "name-megabits-sec": "megabity/s",
+            "name-megabytes-sec": "megabajty/s",
+            "name-packets-sec": "pakety/s",
+            "name-pebibits-sec": "pebibity/s",
+            "name-pebibytes-sec": "pebibajty/s",
+            "name-petabits-sec": "petabity/s",
+            "name-petabytes-sec": "petabajty/s",
+            "name-tebibits-sec": "tebibity/s",
+            "name-tebibytes-sec": "tebibajty/s",
+            "name-terabits-sec": "terabity/s",
+            "name-terabytes-sec": "terabajty/s"
           },
-          "name": ""
+          "name": "Rychlost přenosu dat"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Výchozí datum a čas",
+            "name-datetime-iso": "Datum a čas ISO",
+            "name-datetime-iso-no-date": "Datum a čas ISO (bez data, pokud je dnes)",
+            "name-datetime-local": "Místní datum a čas",
+            "name-datetime-local-no-date": "Místní datum a čas (žádné datum, pokud je dnes)",
+            "name-datetime-us": "Datum a čas USA",
+            "name-datetime-us-no-date": "Datum a čas USA (bez data, pokud je dnes)",
+            "name-from-now": "Od této chvíle"
           },
-          "name": ""
+          "name": "Datum a čas"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Ampér (A)",
+            "name-ampere-hour": "Ampérhodina (Ah)",
+            "name-decibel-milliwatt": "Decibel-milliwatt (dBm)",
+            "name-electron-volt": "Elektronvolt (eV)",
+            "name-farad": "Farad (F)",
+            "name-femtofarad": "Femtofarad (fF)",
+            "name-gigawatt": "Gigawatt (GW)",
+            "name-henry": "Henry (H)",
+            "name-joule": "Joule (J)",
+            "name-kiloampere": "Kiloampér (kA)",
+            "name-kiloampere-hour": "Kiloampérhodina (kAh)",
+            "name-kiloohm": "Kiloohm (kΩ)",
+            "name-kilovolt": "Kilovolt (kV)",
+            "name-kilovolt-ampere": "Kilovoltampér (kVA)",
+            "name-kilovolt-ampere-reactive": "Reaktivní kilovoltampér (kVAr)",
+            "name-kilowatt": "Kilowatt (kW)",
+            "name-kilowatt-hour": "Kilowatthodina (kWh)",
+            "name-kilowatt-min": "Kilowattminuta (kWm)",
+            "name-lumens": "Lumeny (Lm)",
+            "name-megaohm": "Megaohm (MΩ)",
+            "name-megawatt": "Megawatt (MW)",
+            "name-megawatt-hour": "Megawatthodina (MWh)",
+            "name-microfarad": "Mikrofarad (µF)",
+            "name-microhenry": "Mikrohenry (µH)",
+            "name-milliampere": "Miliampér (mA)",
+            "name-milliampere-hour": "Miliampérhodina (mAh)",
+            "name-millihenry": "Millihenry (mH)",
+            "name-milliohm": "Miliohm (mΩ)",
+            "name-millivolt": "Milivolt (mV)",
+            "name-milliwatt": "Milliwatt (mW)",
+            "name-nanofarad": "Nanofarad (nF)",
+            "name-ohm": "Ohm (Ω)",
+            "name-picofarad": "Pikofarad (pF)",
+            "name-volt": "Volt (V)",
+            "name-volt-ampere": "Voltampér (VA)",
+            "name-volt-ampere-reactive": "Reaktivní voltampér (VAr)",
+            "name-watt": "Watt (W)",
+            "name-watt-hour": "Watthodina (Wh)",
+            "name-watt-hour-per-kg": "Watthodina na kilogram (Wh/kg)",
+            "name-watt-square-meter": "Watt na metr čtvereční (W/m²)"
           },
-          "name": ""
+          "name": "Energie"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Kubické stopy / min (cfm)",
+            "name-cubic-feet-sec": "Kubické stopy / sek (cfs)",
+            "name-cubic-meters-sec": "Kubické metry / sek (cms)",
+            "name-gallons-min": "Galony/min (gal/min)",
+            "name-litre-hour": "Litr/hodina",
+            "name-litre-min": "Litry/min (l/min)",
+            "name-lux": "Lux (lx)",
+            "name-millilitre-min": "mililitr/min (ml/min)"
           },
-          "name": ""
+          "name": "Průtok"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Kilonewtonmetry (kNm)",
+            "name-kilonewtons": "Kilonewtony (kN)",
+            "name-newton-meters": "Newtonmetry (Nm)",
+            "name-newtons": "Newtony (N)"
           },
-          "name": ""
+          "name": "Síla"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "exahashe/sek",
+            "name-gigahashes-sec": "gigahashe/sek",
+            "name-hashes-sec": "hashe/sek",
+            "name-kilohashes-sec": "kilohashe/sek",
+            "name-megahashes-sec": "megahashe/sek",
+            "name-petahashes-sec": "petahashe/sek",
+            "name-terahashes-sec": "terahashe/sek"
           },
-          "name": ""
+          "name": "Rychlost hashování"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "stopy (ft)",
+            "name-inch": "Palce (in)",
+            "name-kilometer": "kilometr (km)",
+            "name-meter": "metr (m)",
+            "name-mile": "míle (mi)",
+            "name-millimeter": "milimetr (mm)"
           },
-          "name": ""
+          "name": "Délka"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "gram (g)",
+            "name-kilogram": "kilogram (kg)",
+            "name-metric-ton": "metrická tuna (t)",
+            "name-milligram": "miligram (mg)",
+            "name-pound": "libra (lb)"
           },
-          "name": ""
+          "name": "Hmotnost"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Kandela (cd)",
+            "name-decibel": "Decibel",
+            "name-hexadecimal": "Hexadecimální",
+            "name-hexadecimal-0x": "Hexadecimální (0x)",
+            "name-humidity": "Vlhkost (%H)",
+            "name-locale": "Formát lokálního nastavení",
+            "name-number": "Číslo",
+            "name-percent-1": "Procento (0,0–1,0)",
+            "name-percent-100": "Procento (0–100)",
+            "name-pixels": "Pixely",
+            "name-scientific": "Vědecký zápis",
+            "name-short": "krátké",
+            "name-si-short": "SI krátké",
+            "name-string": "Řetězec"
           },
-          "name": ""
+          "name": "Různé"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Bary",
+            "name-hectopascals": "Hektopascaly",
+            "name-inches-mercury": "Palce rtuti",
+            "name-kilobars": "Kilobary",
+            "name-kilopascals": "Kilopascaly",
+            "name-millibars": "Milibary",
+            "name-pascals": "Pascaly",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Tlak"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Becquerel (Bq)",
+            "name-curie": "curie (Ci)",
+            "name-exposure": "Expozice (C/kg)",
+            "name-gray": "Gray (Gy)",
+            "name-microsievert": "mikrosievert (µSv)",
+            "name-microsievert-hour": "mikrosievert/hodina (µSv/h)",
+            "name-millisievert": "milisievert (mSv)",
+            "name-millisievert-hour": "milisievert/hodina (mSv/h)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "roentgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/hodina (Sv/h)"
           },
-          "name": ""
+          "name": "Záření"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Stupně za sekundu (°/s)",
+            "name-gigahertz": "Gigahertz (GHz)",
+            "name-hertz": "Hertz (Hz)",
+            "name-kilohertz": "Kilohertz (kHz)",
+            "name-megahertz": "Megahertz (MHz)",
+            "name-radians-sec": "Radiány za sekundu (rad/s)",
+            "name-rpm": "Otáčky za minutu (ot/min)"
           },
-          "name": ""
+          "name": "Rychlost otáčení"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsius (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Teplota"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "počet/min (cpm)",
+            "name-counts-sec": "počet/s (cps)",
+            "name-events-min": "události/min (epm)",
+            "name-events-sec": "události/s (eps)",
+            "name-io-ops-sec": "I/O operace/s (iops)",
+            "name-messages-min": "zprávy/min (mpm)",
+            "name-messages-sec": "zprávy/s (mps)",
+            "name-ops-min": "operace/min (opm)",
+            "name-ops-sec": "operace/s (ops)",
+            "name-reads-min": "četnost/min (rpm)",
+            "name-reads-sec": "četnost/s (rps)",
+            "name-records-min": "záznamy/min (rpm)",
+            "name-records-sec": "záznamy/s (rps)",
+            "name-requests-min": "požadavky/min (rpm)",
+            "name-requests-sec": "požadavky/s (rps)",
+            "name-rows-min": "řádky/min (rpm)",
+            "name-rows-sec": "řádky/s (rps)",
+            "name-writes-min": "zápisy/min (wpm)",
+            "name-writes-sec": "zápisy/s (wps)"
           },
-          "name": ""
+          "name": "Propustnost"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "hodiny (ms)",
+            "name-clock-s": "hodiny (s)",
+            "name-days": "dny (d)",
+            "name-duration-dhms": "doba trvání (d hh:mm:ss)",
+            "name-duration-hms": "doba trvání (hh:mm:ss)",
+            "name-duration-ms": "doba trvání (ms)",
+            "name-duration-s": "doba trvání (s)",
+            "name-hertz": "Hertz (1/s)",
+            "name-hours": "hodiny (h)",
+            "name-microseconds": "mikrosekundy (µs)",
+            "name-milliseconds": "milisekundy (ms)",
+            "name-minutes": "minuty (m)",
+            "name-nanoseconds": "nanosekundy (ns)",
+            "name-seconds": "sekundy (s)",
+            "name-timeticks": "Časové značky (s/100)"
           },
-          "name": ""
+          "name": "Čas"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "kilometry/hodina (km/h)",
+            "name-knot": "uzel (kn)",
+            "name-meters-second": "metry za sekundu (m/s)",
+            "name-miles-hour": "míle/hodina (mph)"
           },
-          "name": ""
+          "name": "Rychlost"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "decimetr krychlový",
+            "name-cubic-meter": "metr krychlový",
+            "name-gallons": "galony",
+            "name-litre": "litr (l)",
+            "name-millilitre": "mililitr (ml)",
+            "name-normal-cubic-meter": "Normální metr krychlový"
           },
-          "name": ""
+          "name": "Objem"
         }
       }
     }
@@ -8430,7 +8431,7 @@
       "option": "možnost"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Otevřít náhled obrázku"
     },
     "cascader": {
       "clear-button": "Vymazat výběr"
@@ -8444,9 +8445,9 @@
       "aria-label-selected-color": "{{colorLabel}} barva"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Odstranit",
       "cancel": "Zrušit",
-      "confirmText-delete": ""
+      "confirmText-delete": "Odstranit"
     },
     "confirm-content": {
       "placeholder": "Napište „{{confirmPromptText}}“ pro potvrzení"
@@ -8551,56 +8552,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "Duben",
+        "label-august": "Srpen",
+        "label-december": "Prosinec",
+        "label-february": "Únor",
+        "label-january": "Leden",
+        "label-july": "Červenec",
+        "label-june": "Červen",
+        "label-march": "Březen",
+        "label-may": "Květen",
+        "label-november": "Listopad",
+        "label-october": "Říjen",
+        "label-september": "Září"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Předevčírem",
+        "last-1-hour": "Poslední 1 hodina",
+        "last-1-year": "Poslední 1 rok",
+        "last-12-hours": "Posledních 12 hodin",
+        "last-15-mins": "Posledních 15 minut",
+        "last-2-days": "Poslední 2 dny",
+        "last-2-years": "Poslední 2 roky",
+        "last-24-hours": "Posledních 24 hodin",
+        "last-3-hours": "Poslední 3 hodiny",
+        "last-30-days": "Posledních 30 dní",
+        "last-30-mins": "Posledních 30 minut",
+        "last-5-mins": "Posledních 5 minut",
+        "last-5-years": "Posledních 5 let",
+        "last-6-hours": "Posledních 6 hodin",
+        "last-6-months": "Za posledních 6 měsíců",
+        "last-7-days": "Posledních 7 dní",
+        "last-90-days": "Posledních 90 dní",
+        "previous-fiscal-quarter": "Předchozí fiskální čtvrtletí",
+        "previous-fiscal-year": "Předchozí fiskální rok",
+        "previous-month": "Předchozí měsíc",
+        "previous-week": "Předchozí týden",
+        "previous-year": "Předchozí rok",
+        "this-day-last-week": "Tento den minulý týden",
+        "this-fiscal-quarter": "Toto fiskální čtvrtletí",
+        "this-fiscal-quarter-so-far": "Dosud pro toto fiskální čtvrtletí",
+        "this-fiscal-year": "Tento fiskální rok",
+        "this-fiscal-year-so-far": "Dosud pro tento fiskální rok",
+        "this-month": "Tento měsíc",
+        "this-month-so-far": "Dosud pro tento měsíc",
+        "this-week": "Tento týden",
+        "this-week-so-far": "Dosud pro tento týden",
+        "this-year": "Tento rok",
+        "this-year-so-far": "Letos dosud",
+        "today": "Dnes",
+        "today-so-far": "Dosud pro dnešní den",
+        "yesterday": "Včera"
       }
     },
     "drawer": {
@@ -8651,18 +8652,18 @@
         "placeholder": "Vyberte pole"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Booleovská hodnota",
+        "label-enum": "Výčet",
+        "label-number": "Číslo",
+        "label-other": "Ostatní",
+        "label-string": "Řetězec",
+        "label-time": "Čas",
+        "label-traces": "Stopy"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Snímky ({{framesCount}}): {{framesNames}}",
+        "label": "Dotaz: {{refId}}",
+        "label-missing-ref-id": "Dotaz: (chybí refId)"
       },
       "name-field-name-by-regex-matcher": "Pole s názvem odpovídajícím regulárnímu výrazu",
       "name-fields-by-query": "Pole vrácená dotazem",
@@ -8696,8 +8697,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "přepnout sbalení panelu",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Lišta načítání panelu",
+      "ariaLabel-panel-status": "Stav panelu",
       "tooltip-cancel": "Zrušit dotaz",
       "tooltip-cancel-loading": "Zrušit dotaz",
       "tooltip-stop-streaming": "Zastavit streamování",
@@ -8766,12 +8767,12 @@
       "inspect-drawer-title": "Zkontrolovat hodnotu",
       "inspect-menu-label": "Zkontrolovat hodnotu",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Žádná data"
       },
       "no-values-label": "Žádné hodnoty",
       "pagination-summary": "{{itemsRangeStart}} – {{displayedEnd}} z {{numRows}} řádků",
       "sparkline": {
-        "no-data": ""
+        "no-data": "žádné údaje"
       }
     },
     "tags": {
@@ -8779,7 +8780,7 @@
     },
     "tags-input": {
       "add": "Přidat",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Nový štítek (pro přidání stiskněte klávesu Enter)",
       "remove": "Odebrat tag: {{name}}"
     },
     "time-sync-button": {
@@ -8872,14 +8873,14 @@
       "footer-add-annotation": "Přidat vysvětlivku",
       "footer-click-to-action": "Klikněte pro {{actionTitle}}",
       "footer-click-to-navigate": "Klikněte pro otevření {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Filtrovat podle hodnoty „{{value}}“",
       "timestamp": "Časová známka"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Výchozí",
+      "weekStarts-label-monday": "Pondělí",
+      "weekStarts-label-saturday": "Sobota",
+      "weekStarts-label-sunday": "Neděle"
     }
   },
   "graph": {
@@ -9263,8 +9264,8 @@
       "title-create-library-panel": "Vytvořit panel knihovny"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Změnit",
+      "confirmText-replace": "Nahradit"
     },
     "confirm": {
       "delete-panel": "Chcete tento panel odstranit?"
@@ -9291,7 +9292,7 @@
       "usage-count_other": "Použito na {{count}} nástěnkách"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Hledat podle názvu, popisu nebo názvu složky"
     },
     "loading-indicator": {
       "loading-library-panel": "Načítání panelu knihovny…"
@@ -9511,7 +9512,7 @@
       "close": "Zavřít podrobnosti protokolu",
       "copy-shortlink": "Kopírovat krátký odkaz",
       "copy-to-clipboard": "Kopírovat do schránky",
-      "displayed-fields-section": "",
+      "displayed-fields-section": "Uspořádat zobrazená pole",
       "fields": {
         "adhoc-statistics": "Ad-hoc statistiky",
         "copy-value-to-clipboard": "Zkopírovat hodnotu do schránky",
@@ -9524,25 +9525,25 @@
       },
       "fields-section": "Pole",
       "hide-log-line": "Skrýt řádek protokolu",
-      "inline-mode": "",
+      "inline-mode": "Zobrazit v řádku",
       "links-section": "Odkazy",
-      "log-line-field": "",
+      "log-line-field": "Řádek protokolu",
       "log-line-section": "Řádek protokolu",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
+      "move-displayed-field-down": "Přesunout dolů",
+      "move-displayed-field-up": "Přesunout nahoru",
       "no-details": "Žádná pole k zobrazení.",
-      "open-assistant": "",
+      "open-assistant": "Vysvětlit tento řádek protokolu v asistentovi",
       "pin-line": "Připnout protokol",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "remove-displayed-field": "Odebrat pole",
+      "remove-log": "Odebrat protokol",
+      "scroll-to-logline": "Posunout na řádek protokolu",
       "search": {
         "no-results": "Žádné výsledky k zobrazení."
       },
       "search-placeholder": "Hledat názvy a hodnoty polí",
       "show-context": "Zobrazit kontext",
       "show-log-line": "Zobrazit řádek protokolu",
-      "sidebar-mode": "",
+      "sidebar-mode": "Ukotvit vpravo",
       "unpin-line": "Odepnout protokol"
     },
     "log-line-menu": {
@@ -9550,9 +9551,9 @@
       "copy-log": "Kopírovat řádek protokolu",
       "hide-details": "Zobrazit podrobnosti protokolu",
       "icon-label": "Nabídka protokolu",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Řádek protokolu",
+      "log-line-explainer": "Stručně vysvětlete tento řádek protokolu",
+      "open-assistant": "Vysvětlit tento řádek protokolu v asistentovi",
       "pin-to-outline": "Připnout protokol",
       "show-context": "Zobrazit kontext",
       "show-details": "Skrýt podrobnosti protokolu",
@@ -9658,10 +9659,10 @@
     },
     "name-common-labels": "Běžné štítky",
     "name-deduplication": "Deduplikace",
-    "name-details-mode": "",
+    "name-details-mode": "Režim panelu Podrobnosti protokolu",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "Vedle sebe",
+      "label-sidebar": "Postranní panel"
     },
     "name-enable-infinite-scrolling": "Povolit nekonečné posouvání",
     "name-enable-log-details": "Povolit podrobnosti protokolu",
@@ -9758,8 +9759,8 @@
       "updated-on": "Aktualizováno dne"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Opravdu chcete odstranit „{{snapshotToRemove}}“?",
+      "confirmText-delete": "Odstranit",
       "title-delete": "Odstranit"
     },
     "unthemed-dashboard-import": {
@@ -9771,14 +9772,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "Název je povinný",
+      "message-reserved-name": "Toto je vyhrazený název a nelze jej použít pro složku.",
+      "message-same-name": "Nástěnka nebo složka se stejným názvem už existuje",
+      "message-same-name-general": "Ve všeobecné složce už existuje složka nebo nástěnka se stejným názvem"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Nebyly nalezeny žádné možnosti"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9928,8 +9929,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Bylo dosaženo maximálního počtu skupin pravidel výstrah: Odstraňte některé skupiny pravidel výstrah nebo upgradujte svůj plán a zkuste to znovu.",
+        "alert-rules-quota-reached": "Bylo dosaženo maximálního počtu pravidel výstrah: Odstraňte některá pravidla výstrah nebo upgradujte svůj plán a zkuste to znovu.",
         "dashboard-already-managed": "Nástěnku už zajišťuje a spravuje Grafana v cloudové instanci. Doporučujeme používat zajištěnou nástěnku. Pokud si přesto přejete zkopírovat nástěnku do cloudové instance, změňte ID nástěnky v JSON nástěnky, uložte nový snímek a nahrajte ji znovu.",
         "datasource-already-managed": "Zdroj dat už zajišťuje a spravuje Grafana v cloudové instanci. Pokud se jedná o jiný zdroj, nastavte jiné UID a zkuste to znovu.",
         "datasource-invalid-url": "Existuje zdroj dat s neplatnou adresou URL. Zadejte platnou adresu URL a zkuste to znovu.",
@@ -10399,7 +10400,7 @@
     "invite-user": {
       "invite-button": "Pozvat",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Pozvat uživatele"
     },
     "item": {
       "add-bookmark": "Přidat do záložek",
@@ -10628,7 +10629,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Nebyly nalezeny žádné organizace",
     "select-placeholder": "Vyberte organizaci"
   },
   "page": {
@@ -10851,7 +10852,7 @@
         "permission": "Nemáte oprávnění pro zobrazení této stránky.",
         "title-access-denied": "Přístup nebyl povolen"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Plugin se nepodařilo načíst",
       "no-root-app-page-component-found": "Nebyla nalezena žádná kořenová komponenta stránky aplikace"
     },
     "browse": {
@@ -10895,7 +10896,7 @@
         "update-status-text": "pluginy byly aktualizovány"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Opravdu chcete přejít na nižší verzi {{version}}? Za běžných okolností byste to neměli dělat",
         "downgrade-confirm": "Přejít na nižší verzi",
         "downgrade-title": "Přejít na nižší verzi pluginu"
       }
@@ -10950,8 +10951,8 @@
       "message": "Nebyly nalezeny žádné pluginy"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Další podrobnosti o chybě najdete v konzole.",
+      "extension-error-alert-title": "Rozšíření se nepodařilo načíst: „{{pluginId}}/{{extensionTitle}}“"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10988,8 +10989,8 @@
     "install-controls-button": {
       "title-uninstall-modal": "Odinstalovat plugin {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Opravdu chcete odinstalovat tento plugin?",
+        "confirmText-confirm": "Potvrdit"
       }
     },
     "install-controls-warning": {
@@ -11007,6 +11008,9 @@
       "label-plugin-id": "ID pluginu",
       "label-severity": "Závažnost"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Tento plugin nebyl nalezen. Zkontrolujte správnost adresy URL nebo <1></1>přejděte do <3>katalogu pluginů</3>.",
       "title-plugin-not-found": "Plugin nebyl nalezen"
@@ -11163,29 +11167,29 @@
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Tento zdroj je za větví v úložišti {{repoType}}.",
+      "not-saved": "Zbytek uživatelů Grafany ve vaší organizaci bude i nadále vidět aktuální verzi uloženou do nakonfigurované výchozí větve, dokud nebude tato větev sloučena",
+      "open-in-repo-button": "Otevřít v úložišti {{repoType}}",
+      "open-pull-request-in-repo": "Otevřít žádost o stažení v úložišti {{repoType}}",
+      "view-in-repo-button": "Zobrazte si ji v úložišti {{repoType}}, kde uvidíte nejnovější změny.",
+      "view-pull-request-in-repo": "Zobrazit žádost o stažení v úložišti {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "Ve větvi úložiště {{repoType}} byl vytvořen nový zdroj.",
+    "title-loaded-pull-request-in-repo": "Tento zdroj je načten z větve, kterou jste právě vytvořili v úložišti {{repoType}}, a je viditelný pouze pro vás"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Zdroj byl úspěšně uložen",
+  "provisioned-resource-request-handler-dashboard": "Nástěnka byla úspěšně uložena",
+  "provisioned-resource-request-handler-folder": "Složka úspěšně vytvořena",
   "provisioning": {
     "banner": {
       "message": "Tato funkce je v současné době v aktivním vývoji. Pro nejlepší zážitek a nejnovější vylepšení doporučujeme použít <2>noční sestavení</2> Grafany."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Větev, která bude použita pro zajištění",
+      "branch-label": "Větev",
+      "branch-required": "Větev je povinná",
+      "path-description": "Volitelná cesta k dílčímu adresáři v rámci úložiště",
+      "path-label": "Cesta",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11194,18 +11198,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Umožňuje uživatelům zvolit, zda při ukládání změn otevřít žádost o stažení. Pokud úložiště neumožňuje přímé změny v hlavní větvi, může být žádost o stažení stále vyžadována.",
+      "pr-workflow-label": "Povolit možnost žádost o stažení při ukládání",
+      "token-description": "Heslo aplikace Bitbucket s oprávněními k úložišti",
+      "token-label": "Heslo aplikace",
+      "token-required": "Je vyžadován token Bitbucket",
+      "token-user-description": "Uživatelské jméno, které bude použito pro přístup k úložišti pomocí hesla aplikace",
+      "token-user-label": "Uživatelské jméno",
+      "token-user-required": "Uživatelské jméno je povinné",
+      "url-description": "Adresa URL úložiště Bitbucket",
+      "url-label": "Adresa URL úložiště",
+      "url-pattern": "Musí být platná adresa URL úložiště Bitbucket",
+      "url-required": "Adresa URL úložiště je povinná"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Pojmenujte jasně toto připojení k úložišti",
@@ -11216,18 +11220,18 @@
       "label-display-name": "Zobrazované jméno",
       "placeholder-my-repository-connection": "Moje připojení k úložišti",
       "text-loading-resource-information": "Načítání informací o zdroji…",
-      "dashboards-count_one": "",
-      "dashboards-count_few": "",
-      "dashboards-count_many": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} nástěnka",
+      "dashboards-count_few": "{{count}} nástěnka",
+      "dashboards-count_many": "{{count}} nástěnka",
+      "dashboards-count_other": "{{count}} nástěnka",
       "files-count_one": "Počet souborů: {{count}}",
       "files-count_few": "Počet souborů: {{count}}",
       "files-count_many": "Počet souborů: {{count}}",
       "files-count_other": "Počet souborů: {{count}}",
-      "folders-count_one": "",
-      "folders-count_few": "",
-      "folders-count_many": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} složka",
+      "folders-count_few": "{{count}} složka",
+      "folders-count_many": "{{count}} složka",
+      "folders-count_other": "{{count}} složka"
     },
     "check-repository": {
       "check": "Kontrola"
@@ -11301,7 +11305,7 @@
       "title-instant-updates-requests-webhooks": "Okamžité aktualizace a pull requesty pomocí webhooků.",
       "title-visual-previews-in-pull-requests": "Vizuální náhledy v pull requestech s vykreslením obrázků"
     },
-    "error-title-default": "",
+    "error-title-default": "Chyba",
     "expanded-row": {
       "job-specification": "Specifikace úlohy",
       "summary": "Shrnutí"
@@ -11310,8 +11314,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Nastavit povinné přepínače funkcí"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Spravujte nástěnky jako kód v Git a automaticky zajišťujte aktualizace",
+      "manage-your-dashboards-with-remote-provisioning": "Začínáme se synchronizací Git",
       "store-dashboards-in-version-controlled-storage": "Ukládejte nástěnky do úložiště s pevně nastavenou verzí pro lepší organizaci a sledování historie"
     },
     "file-history-page": {
@@ -11332,16 +11336,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Přidá náhled obrázku změn nástěnky v pull requestech. Obrázky nástěnek Grafana budou sdíleny ve vašem úložišti Git a uvidí je každý, kdo má přístup k úložišti.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Vytvořte odkazy na náhledy pro žádosti o stažení",
       "description-image-rendering": "Vyžaduje vykreslení obrázků. <2>Nastavit vykreslování obrázků</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(vyžaduje <2>vykreslování obrázků</2> a povolený veřejný přístup)",
       "description-read-only": "Zdroje nelze upravovat přes Grafanu.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Jak často synchronizovat změny z úložiště",
+      "error-sync-interval-required": "Je vyžadován interval synchronizace",
       "label-enable-previews": "Povolit náhledy nástěnek v pull requestech",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Generovat náhledy nástěnky",
       "label-read-only": "Jen pro čtení",
-      "label-sync-interval": ""
+      "label-sync-interval": "Interval synchronizace (sekundy)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Vašemu dotazu neodpovídají žádné výsledky",
@@ -11373,46 +11377,46 @@
       "subtitle-provisioning-feature": "Zobrazujte a spravujte vazby zajištění"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Větev, která bude použita pro zajištění",
+      "branch-label": "Větev",
+      "branch-required": "Větev je povinná",
+      "path-description": "Volitelná cesta k dílčímu adresáři v rámci úložiště",
+      "path-label": "Cesta",
+      "pr-workflow-description": "Umožňuje uživatelům zvolit, zda při ukládání změn otevřít žádost o stažení. Pokud úložiště neumožňuje přímé změny v hlavní větvi, může být žádost o stažení stále vyžadována.",
+      "pr-workflow-label": "Povolit možnost žádost o stažení při ukládání",
+      "token-description": "Přístupový token nebo heslo úložiště Git",
+      "token-label": "Přístupový token",
+      "token-required": "Token Git je povinný",
+      "token-user-description": "Uživatelské jméno, které bude použito pro přístup k úložišti pomocí přístupového tokenu",
+      "token-user-label": "Uživatelské jméno",
+      "token-user-required": "Uživatelské jméno je povinné",
+      "url-description": "Adresa URL úložiště Git",
+      "url-label": "Adresa URL úložiště",
+      "url-pattern": "Musí být platná adresa URL úložiště Git",
+      "url-required": "Adresa URL úložiště je povinná"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Větev, která bude použita pro zajištění",
+      "branch-label": "Větev",
+      "branch-required": "Větev je povinná",
+      "path-description": "Volitelná cesta k dílčímu adresáři v rámci úložiště",
+      "path-label": "Cesta",
+      "pr-workflow-description": "Umožňuje uživatelům zvolit, zda při ukládání změn otevřít žádost o stažení. Pokud úložiště neumožňuje přímé změny v hlavní větvi, může být žádost o stažení stále vyžadována.",
+      "pr-workflow-label": "Povolit možnost žádost o stažení při ukládání",
+      "token-description": "Osobní přístupový token GitHub s oprávněními k úložišti",
+      "token-label": "Osobní přístupový token",
+      "token-required": "Je vyžadován token GitHub",
+      "url-description": "Adresa URL úložiště GitHub",
+      "url-label": "Adresa URL úložiště",
+      "url-pattern": "Musí být platná adresa URL úložiště GitHub",
+      "url-required": "Adresa URL úložiště je povinná"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Větev, která bude použita pro zajištění",
+      "branch-label": "Větev",
+      "branch-required": "Větev je povinná",
+      "path-description": "Volitelná cesta k dílčímu adresáři v rámci úložiště",
+      "path-label": "Cesta",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11421,15 +11425,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Umožňuje uživatelům zvolit, zda při ukládání změn otevřít žádost o sloučení. Pokud úložiště neumožňuje přímé změny v hlavní větvi, může být žádost o sloučení stále vyžadována.",
+      "pr-workflow-label": "Povolit možnost žádosti o sloučení při ukládání",
+      "token-description": "Přístupový token projektu GitLab s oprávněními k úložišti",
+      "token-label": "Přístupový token projektu",
+      "token-required": "Je vyžadován token GitLab",
+      "url-description": "Adresa URL úložiště GitLab",
+      "url-label": "Adresa URL úložiště",
+      "url-pattern": "Musí být platná adresa URL úložiště GitLab",
+      "url-required": "Adresa URL úložiště je povinná"
     },
     "history-view": {
       "not-found": "Nenalezeno"
@@ -11457,18 +11461,18 @@
       "starting": "Spouštění…",
       "status": {
         "title-error-running-job": "Chyba při spouštění úlohy",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Úloha byla úspěšně dokončena",
+        "title-warning-running-job": "Úloha byla dokončena s varováními"
       },
       "summary": "Shrnutí",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Chyba při načítání aktivní úlohy"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Cesta k úložišti v místním souborovém systému",
+      "path-label": "Cesta k úložišti",
+      "path-required": "Cesta k úložišti je povinná"
     },
     "mode-options": {
       "folder": {
@@ -11494,7 +11498,7 @@
     },
     "repository-actions": {
       "settings": "Nastavení",
-      "source-code": ""
+      "source-code": "Zdrojový kód"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11560,22 +11564,22 @@
       "title-queued-for-deletion": "Zařazeno do fronty k odstranění"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Vyberte poskytovatele:",
+      "configure-file": "Konfigurovat zajištění souborů",
+      "configure-with-provider": "Konfigurovat pomocí {{ provider }}",
+      "provider-not-listed": "Pokud váš poskytovatel není uveden:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Připojit k úložištím Bitbucket",
+      "github": "GitHub",
+      "github-description": "Připojit k úložištím GitHub",
+      "gitlab": "GitLab",
+      "gitlab-description": "Připojit k úložištím GitLab",
+      "local": "Místní",
+      "local-description": "Konfigurovat zajištění souborů",
+      "pure-git": "Pouze Git",
+      "pure-git-description": "Připojit k jakémukoli úložišti Git"
     },
     "resource-view": {
       "base": "Základ",
@@ -11606,11 +11610,11 @@
       "label-current-step": "Aktuální krok",
       "label-pending-step": "Nevyřízený krok"
     },
-    "success-title-default": "",
+    "success-title-default": "Úspěch",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Nepodařilo se spustit úlohu",
+      "error-no-repository-name": "Nebyl zadán žádný název úložiště",
+      "error-starting-job": "Chyba při spouštění úlohy"
     },
     "sync-repository": {
       "body-edit-configuration": "Upravit konfiguraci",
@@ -11638,7 +11642,7 @@
       "go-to": "Přejít na",
       "make-sure": "Nezapomeňte zahrnout tato oprávnění"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Varování",
     "wizard": {
       "alert-point-1": "Během tohoto procesu nebude možné vytvářet, upravovat ani odstraňovat zdroje. V posledním kroku zmizí.",
       "alert-point-2": "Po zajištění se zdroje znovu zobrazí a budou spravovány prostřednictvím externího úložiště.",
@@ -11648,10 +11652,10 @@
       "button-next": "Dokončit",
       "button-start": "Zahájit synchronizaci",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Tímto odstraníte konfiguraci úložiště a přijdete o veškerý pokrok. Opravdu chcete zahodit změny?",
+        "confirm": "Ano, zahodit",
+        "dismiss": "Pokračovat v práci",
+        "title": "Zahodit nastavení úložiště?"
       },
       "step-bootstrap": "Vyberte, co chcete synchronizovat",
       "step-connect": "Připojit",
@@ -11667,7 +11671,7 @@
     "wizard-content": {
       "button-cancel": "Zrušit",
       "button-cancelling": "Probíhá zrušení…",
-      "button-previous": "",
+      "button-previous": "Předchozí",
       "button-submitting": "Odesílání…",
       "error-instance-repository-exists": "Instance úložiště už existuje"
     }
@@ -12076,7 +12080,7 @@
         "recommended": "Doporučeno",
         "results": "Výsledky"
       },
-      "search": ""
+      "search": "Hledat {{parentTitle}}"
     }
   },
   "search": {
@@ -12157,7 +12161,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Nebyly nalezeny žádné účty služeb",
     "select-aria-label": "Volič účtu služby",
     "select-placeholder": "Začněte psát a vyhledejte účty služeb"
   },
@@ -12203,10 +12207,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Přidat token účtu služby",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Opravdu chcete odstranit tento účet služby?",
+      "body-disable-service-account": "Opravdu chcete deaktivovat tento účet služby?",
+      "confirmText-delete-service-account": "Odstranit účet služby",
+      "confirmText-disable-service-account": "Deaktivovat účet služby",
       "delete-service-account": "Odstranit účet služby",
       "disable-service-account": "Zakázat účet služby",
       "enable-service-account": "Povolit účet služby",
@@ -12233,7 +12237,7 @@
       "used-by": "Používá"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Uložit",
       "edit": "Upravit"
     },
     "service-account-role-row": {
@@ -12247,18 +12251,18 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Přidat účet služby",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Opravdu chcete odstranit {{serviceAccountName}}?",
+      "body-disable-service-account": "Opravdu chcete deaktivovat „{{accountToDisable}}“?",
+      "confirmText-delete": "Odstranit",
+      "confirmText-disable-service-account": "Deaktivovat účet služby",
       "placeholder-search-service-account-by-name": "Hledat účet služby podle názvu",
       "sub-title": "Účty služeb a jejich tokeny lze použít k autentizaci pomocí API Grafany. Další informace najdete v naší <2>dokumentaci.</2>",
       "title-delete-service-account": "Odstranit účet služby",
       "title-disable-service-account": "Zakázat účet služby",
-      "body-delete_one": "",
-      "body-delete_few": "",
-      "body-delete_many": "",
-      "body-delete_other": ""
+      "body-delete_one": "Opravdu chcete odstranit {{serviceAccountName}} a doprovodné tokeny ({{count}})?",
+      "body-delete_few": "Opravdu chcete odstranit {{serviceAccountName}} a doprovodné tokeny ({{count}})?",
+      "body-delete_many": "Opravdu chcete odstranit {{serviceAccountName}} a doprovodné tokeny ({{count}})?",
+      "body-delete_other": "Opravdu chcete odstranit {{serviceAccountName}} a doprovodné tokeny ({{count}})?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Platnost tokenu vypršela",
@@ -12272,7 +12276,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Exportovat jako obrázek",
       "export-json-title": "Exportovat jako JSON",
       "share-externally-title": "Sdílet externě",
       "share-internally-title": "Sdílet interně",
@@ -12309,17 +12313,17 @@
       "view-button-yaml": "Zobrazit YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Akce exportu obrázku",
+      "cancel-button": "Zrušit",
+      "download-button": "Stáhnout obrázek",
+      "error-title": "Obrázek se nepodařilo vygenerovat",
+      "generate-button": "Generovat obrázek",
+      "generating": "Generování obrázku…",
+      "info-text": "Uložit tuto nástěnku jako obrázek",
+      "preview": "Náhled",
+      "preview-aria": "Náhled generovaného obrázku",
+      "preview-region": "Náhled obrázku",
+      "title": "Exportovat jako obrázek"
     },
     "library": {
       "info": "Vytvořit panel knihovny."
@@ -12329,7 +12333,7 @@
       "info-text": "Vytvořte přímý odkaz na tuto nástěnku nebo panel přizpůsobený možnostmi dole.",
       "link-url": "Odkaz adresy URL",
       "render-alert": "Plugin pro renderování obrázků není nainstalován",
-      "render-instructions": "",
+      "render-instructions": "Chcete-li vyrenderovat obrázek, musíte si nainstalovat <2>plugin Grafana pro renderování obrázků</2>. Chcete-li nainstalovat plugin, obraťte se na správce Grafany.",
       "rendered-image": "Přímý odkaz na vyrenderovaný obrázek",
       "save-alert": "Nástěnka není uložena",
       "save-dashboard": "Chcete-li vyrenderovat obrázek panelu, musíte nejprve uložit nástěnku.",
@@ -12397,11 +12401,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Uložte nástěnku, aby bylo možné generovat obrázky",
+    "download-disabled-help": "Nejprve vygenerujte obrázek, abyste povolili stahování",
+    "error-title": "Obrázek se nepodařilo vygenerovat",
     "form": {
-      "label": ""
+      "label": "Nastavení obrázku panelu"
     },
     "preview": {
       "title": "Náhled panelu"
@@ -12718,17 +12722,17 @@
       "label-small": "Malé"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Akce",
+      "auto": "Auto.",
+      "color-background": "Barevné pozadí",
+      "color-text": "Barevný text",
+      "data-links": "Propojení dat",
+      "gauge": "Měřidlo",
+      "image": "Obrázek",
+      "json": "Zobrazení JSON",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Pilulka",
+      "sparkline": "Sparkline"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "Pokud je vybrán, celý řádek bude barevný jako tato buňka.",
@@ -12757,7 +12761,7 @@
     "description-count-rows": "Zobrazit jeden počet pro všechny datové řádky",
     "description-fields": "Vyberte pole, která by měla být vypočtena",
     "description-min-column-width": "Minimální šířka pro automatickou změnu velikosti sloupce",
-    "description-wrap-header-text": "",
+    "description-wrap-header-text": "Povoluje zalomení textu pro záhlaví sloupců",
     "image-cell-options-editor": {
       "description-alt-text": "Alternativní text, který se zobrazí, pokud nelze zobrazit obrázek, nebo pro uživatele, kteří používají čtečku obrazovky",
       "description-title-text": "Text, který se zobrazí po najetí kurzoru na obrázek",
@@ -12841,7 +12845,7 @@
     "tag-option-label": "Možnost tagu"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Nebyly nalezeny žádné týmy",
     "select-aria-label": "Volič týmu",
     "select-placeholder": "Vyberte tým"
   },
@@ -13145,15 +13149,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Binární operace",
+          "reduce-row": "Zmenšit řádek",
+          "row-index": "Index řádku",
+          "unary-operation": "Unární operace"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Kumulativní funkce",
+        "window-functions": "Funkce okna"
       },
       "label-alias": "Přezdívka",
       "label-mode": "Režim",
@@ -13171,9 +13175,9 @@
       "label-name": "Název",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Kopírovat název snímku do názvu pole",
+          "ignore-the-frame-name": "Ignorovat název snímku",
+          "label-frame": "Přidat štítek s názvem snímku"
         }
       },
       "placeholder-frame": "Obrazový rám"
@@ -13186,9 +13190,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Přidat transformátor typu pole konverze",
       "aria-label-remove-convert-field-type-transformer": "Odebrat transformátor typu pole konverze",
-      "convert-field-type": "",
+      "convert-field-type": "Převést typ pole",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Převést pole na zadaný typ pole."
       },
       "label": {
         "browser": "Prohlížeč",
@@ -13201,11 +13205,11 @@
       "label-join-with": "Propojit s",
       "label-set-timezone": "Nastavit časové pásmo",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Převést typ pole"
       },
       "placeholder-type": "Typ",
       "tags": {
-        "format-field": ""
+        "format-field": "Formátovat pole"
       },
       "tooltip-explicit-separator-joining-array-values": "Použít explicitní oddělovač při spojování hodnot polí",
       "tooltip-input-format": "Zadejte formát vstupního pole, aby Grafana mohla správně analyzovat řetězec data.",
@@ -13231,13 +13235,13 @@
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Zkombinujte všechna pole do jednoho snímku."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Spojit pole"
         },
         "tags": {
-          "combine": ""
+          "combine": "Kombinovat"
         }
       }
     },
@@ -13252,11 +13256,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Analyzujte pole z obsahu (JSON, štítky atd.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Vyberte pole"
         }
       },
       "label-delimiter": "Oddělovač",
@@ -13265,7 +13269,7 @@
       "label-replace-all-fields": "Nahradit všechna pole",
       "label-source": "Zdroj",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Extrahovat pole"
       },
       "placeholder-auto": "Automaticky",
       "placeholder-select-delimiter": "Vyberte oddělovač…",
@@ -13276,20 +13280,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Použít hodnotu pole k vyhledání zemí, států nebo letišť."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nebyla nalezena žádná textová pole"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Vyberte textové pole"
         }
       },
       "label-field": "Pole",
       "label-lookup": "Vyhledávání",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Vyhledat pole ze zdroje"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13300,23 +13304,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Odebrat části výsledků dotazu pomocí vzoru regulárního výrazu."
       },
       "label-from-variable": "Z proměnné",
       "label-identifier": "Identifikátor",
       "label-use-variable": "Použít proměnnou",
       "label-variable": "Proměnná",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Filtrovat pole podle názvu"
       },
       "placeholder-regular-expression-pattern": "Vzor regulárního výrazu"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Odebrat řádky z dat na základě původního dotazu"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Filtrovat data podle dotazu"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13330,33 +13334,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Přidejte podmínku",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Odebrat řádky z výsledků dotazu pomocí uživatelem definovaných filtrů."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Porovnat vše",
+          "match-any": "Porovnat libovolné"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Vyloučit",
+          "include": "Zahrnout"
         }
       },
       "label-conditions": "Podmínky",
       "label-filter-type": "Typ filtru",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Filtrovat data podle hodnot"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nebyla nalezena žádná textová pole"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Vyberte textové pole"
         }
       },
       "label-field": "Pole",
@@ -13365,10 +13369,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Manipulovat s formátováním řetězcových polí."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Formátovací řetězec"
       }
     },
     "format-time-transfomer-editor": {
@@ -13380,66 +13384,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Nastavte výstupní formát časového pole"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Formátovat čas"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Použít hodnoty řádků k výpočtu nového pole."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Přidat pole z výpočtu"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Nastavte jednotku, minimum, maximum a další."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Konfigurace z výsledků dotazu"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Generovat data teplotní mapy ze zdrojových dat."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Vytvořit teplotní mapu"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Srovnejte označené výsledky do tabulky spojené štítky."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Spojit podle štítků"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Rozdělte datovou sadu o jednom snímku na více řad."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Rozdělení podle hodnot"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Převést každý řádek na pole s dynamickou konfigurací."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Řádky do polí"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Použijte prostorové operace na výsledky dotazu."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Prostorové operace"
       }
     },
     "get-timezone-options": {
@@ -13471,8 +13475,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Spočítat",
+          "group-by": "Seskupit podle"
         }
       },
       "placeholder-ignored": "Ignorováno",
@@ -13480,42 +13484,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Seskupit data podle hodnoty pole a vytvořit agregovaná data."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Seskupit podle"
       },
       "title-calc-alert": "Výpočty nebudou mít vliv, pokud nebudou seskupena žádná pole"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Seskupit data podle hodnoty pole a vytvořit vnořené tabulky se seskupenými daty."
       },
       "description-show-field-names": "Pokud je povoleno, vnořené tabulky zobrazí názvy polí jako záhlaví tabulky",
       "label-show-field-names-in-nested-tables": "Zobrazit názvy polí ve vnořených tabulkách",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Seskupit do vnořených tabulek"
       },
       "title-calc-alert": "Výpočty nebudou mít vliv, pokud nebudou seskupena žádná pole."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Shrnout a reorganizovat data na základě tří polí."
       },
       "label-cell-value": "Hodnota buňky",
       "label-column": "Sloupec",
       "label-empty-value": "Prázdná hodnota",
       "label-row": "Řádek",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Seskupení do matrice"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Vypočítat histogram ze vstupních dat."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Histogram"
       },
       "placeholder-auto": "Automaticky",
       "placeholder-default": "Výchozí hodnota: 30",
@@ -13527,14 +13531,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Sloučit řádky ze 2 a více tabulek na základě souvisejícího pole."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Spojit podle pole"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Povinné",
       "info": {
         "input-contain-labels": "Vstup neobsahuje žádné štítky",
         "no-input-or-labels-found": "Nebyl nalezen žádný vstup (nebo štítky)",
@@ -13558,8 +13562,8 @@
       "label-value-field-name": "Název pole hodnoty",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Sloupce",
+          "rows": "Řádky"
         }
       },
       "placeholder-optional-select-label": "Vybrat štítek (nepovinné)",
@@ -13567,18 +13571,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Seskupte řady podle času a vraťte štítky nebo značky jako pole."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Štítky k polím"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Omezit počet zobrazených položek."
       },
       "name": {
-        "limit": ""
+        "limit": "Limit"
       },
       "placeholder-value-or-variable": "Hodnota nebo proměnná"
     },
@@ -13591,11 +13595,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Sloučit více řad. Hodnoty budou sloučeny do jednoho řádku."
       },
       "merge-effect-applied-single-frame": "Sloučení nemá žádný vliv při použití na jeden snímek.",
       "name": {
-        "merge": ""
+        "merge": "Sloučit řady/tabulky"
       }
     },
     "multi-info": {
@@ -13607,14 +13611,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Změňte pořadí, skryjte nebo přejmenujte pole."
       },
       "field-order": "Pořadí pole",
       "field-order-auto": "Automaticky",
       "field-order-manual": "Manuálně",
       "first-frame-warning": "Uspořádání polí funguje jenom s jedním snímkem. Nejprve zvažte použití transformace spojení nebo filtrování vstupu.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Uspořádat pole podle názvu"
       }
     },
     "partion-by-values-editor": {
@@ -13642,10 +13646,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Roztažení datových rámců z širokého formátu do dlouhého formátu."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Připravit časové řady"
       }
     },
     "prepare-time-series-editor": {
@@ -13653,26 +13657,26 @@
       "label-info": "Info",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Převést každý rámec do dlouhého formátu"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Dlouhé časové řady"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Vytvoří nový rámec pro každý pár čas/číslo"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Časové řady s více rámci"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Vytvoří jeden rámec spojený časem"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Rozsáhlé časové řady"
         }
       }
     },
@@ -13687,7 +13691,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Zredukovat všechny řádky nebo datové body na jednu hodnotu (např. maximum, průměr)."
       },
       "label-calculations": "Výpočty",
       "label-include-time": "Zahrnout čas",
@@ -13704,7 +13708,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Zredukovat"
       },
       "placeholder-choose-stat": "Vyberte statistiku"
     },
@@ -13714,18 +13718,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Vytvořte nový datový rámec obsahující hodnoty předpovězené statistickým modelem."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Trendová linie"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Krychlový",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Kvadratický",
         "quartic": "Čtvrtého stupně",
-        "quintic": "Pátého stupně"
+        "quintic": "Pátého stupně",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "titul",
       "label-model-type": "Typ modelu",
@@ -13740,16 +13749,17 @@
       },
       "regression": "regrese",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Regresní analýza"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Počet bodů X, Y k předpovědi"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Přejmenovat části výsledků dotazu pomocí regulárního výrazu a náhradního vzoru."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Přejmenovat pole podle regulárního výrazu"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13763,33 +13773,33 @@
       "label-mode": "Režim",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Zkombinovat data ze dvou tabulek vždy, když se v polích společných pro obě tabulky vyskytují shodné hodnoty.",
+          "join-on-a-field": "Spojit hodnotu pole s duplicitními hodnotami. Neefektivní vnější spojení nejlépe použitelné pro tabulková data (jako SQL).",
+          "keep-all-rows": "Ponechat všechny řádky z jakékoli tabulky s hodnotou. Spojení na různých hodnotách polí. Efektivní a nejlépe použitelné pro časové řady."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Vnitřní",
+          "outer-tabular": "Vnější (tabulkové)",
+          "outer-time-series": "Vnější (časové řady)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Sloučit více řad. Čas návratu, metrika a hodnoty jako řádek."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Řady na řádky"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Seřadit pole v rámci."
       },
       "label-field": "Pole",
       "label-reverse": "Dozadu",
       "name": {
-        "sort-by": ""
+        "sort-by": "Řadit podle"
       },
       "placeholder-select-field": "Vyberte pole"
     },
@@ -13812,13 +13822,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Převést data časových řad na řádky tabulky, aby je bylo možné zobrazit ve formátu tabulky nebo sparkline."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "Transformace časové řady do tabulky vyžaduje alespoň jeden rámec časové řady. V současné době žádný nemáte."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Časové řady do tabulky"
       }
     },
     "time-series-table-transform-editor": {
@@ -13836,15 +13846,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Transponujte datový rámec."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Transponovat"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Otočit",
+        "transform": "Transformovat",
+        "translate": "Přeložit"
       }
     },
     "unary-operation-editor": {
@@ -13853,13 +13863,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Vypočítat nová pole",
+        "combine": "Kombinovat",
+        "create-new-visualization": "Vytvořit novou vizualizaci",
+        "filter": "Filtrovat",
+        "perform-spatial-operations": "Provést prostorové operace",
+        "reformat": "Přeformátovat",
+        "reorder-and-rename": "Změnit pořadí a přejmenovat"
       },
       "special-value-options": {
         "description": {
@@ -13930,7 +13940,7 @@
     "title": "Organizace"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Nebyli nalezeni žádní uživatelé",
     "select-aria-label": "Volič uživatelů",
     "select-placeholder": "Začněte psát a vyhledejte uživatele"
   },
@@ -14016,8 +14026,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Opravdu chcete odstranit proměnnou „{{variableToDelete}}“?",
+      "confirmText-delete": "Odstranit",
       "title-delete-variable": "Odstranit proměnnou"
     },
     "create-ad-hoc-variable-adapter": {
@@ -14067,33 +14077,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Jak třídit hodnoty této proměnné",
-      "name-sort": "",
+      "name-sort": "Třídit",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Abecedně (vzestupně)",
+          "alphabetical-caseinsensitive-asc": "Abecedně (bez rozlišení malých a velkých písmen, vzestupně)",
+          "alphabetical-caseinsensitive-desc": "Abecedně (bez rozlišení malých a velkých písmen, sestupně)",
+          "alphabetical-desc": "Abecedně (sestupně)",
+          "disabled": "Deaktivováno",
+          "natural-asc": "Přirozeně (vzestupně)",
+          "natural-desc": "Přirozeně (sestupně)",
+          "numerical-asc": "Číselně (vzestupně)",
+          "numerical-desc": "Číselně (sestupně)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Přidat možnost",
+      "description": "Přidat vlastní možnosti k výsledkům dotazu",
+      "label-placeholder": "zobrazit štítek",
+      "remove-option-button-label": "Odebrat možnost",
+      "value-placeholder": "hodnota, výchozí prázdný řetězec"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Jak třídit statické možnosti s výsledky dotazu"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Výchozí hodnota",
       "placeholder-default-value-if-any": "výchozí hodnota, pokud existuje",
       "text-options": "Možnosti textu"
     },
@@ -14122,8 +14132,8 @@
       "description-optional-display-name": "Nepovinné zobrazované jméno",
       "description-template-variable-characters": "Název proměnné šablony. (max. 50 znaků)",
       "general": "Obecné",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Štítek",
+      "name-name": "Název",
       "placeholder-descriptive-text": "Popisný text",
       "placeholder-label-name": "Název štítku",
       "placeholder-variable-name": "Název proměnné",
@@ -14139,13 +14149,13 @@
       "tooltip-remove-variable": "Odebrat proměnnou"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Popis"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Přepnout všechny hodnoty"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Vyberte typ proměnné"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Zobrazit použití"
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 538de115260..a8269502d11 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Einige Funktionen sind stabil (GA) und standardmäßig aktiviert, während andere zurzeit in ihrer vorläufigen Beta-Phase sind und für eine frühzeitige Anwendung verfügbar sind.",
       "confirm-modal-body-2": "Wir raten Ihnen, die Auswirkungen jeder Funktionsänderung zu kennen, bevor Sie Änderungen vornehmen.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Änderungen speichern",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Allgemeine Verfügbarkeit",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Organisation löschen",
-      "confirmText-delete": "",
+      "confirmText-delete": "Löschen",
       "title-delete": "Löschen"
     },
     "anon-users": {
       "not-found": "Keine anonymen Benutzer gefunden."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Möchten Sie die Abmeldung von allen Geräten wirklich erzwingen?",
+      "confirmText-confirm-logout": "Abmeldung bestätigen",
+      "confirmText-force-logout": "Abmeldung erzwingen",
       "title-force-logout-from-all-devices": "Abmeldung von allen Geräten erzwingen"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Speichern"
     },
     "edit-org": {
       "access-denied": "Sie sind nicht berechtigt, Benutzer in dieser Organisation anzuzeigen. Wenden Sie sich an Ihren Serveradministrator, um diese Organisation zu aktualisieren.",
@@ -216,11 +216,11 @@
       "not-editable": "Die Rolle dieses Benutzers kann nicht bearbeitet werden, da sie von Ihrem Authentifizierungsanbieter synchronisiert wird. Weitere Informationen finden Sie in den <1>Grafana-Authentifizierungsdokumenten</1>."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Sind Sie sicher, dass Sie den Nutzer {{user}} löschen möchten?",
       "columns": {
         "aria-label-role": "Rolle"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Löschen",
       "delete-aria-label": "Nutzer löschen: {{name}}",
       "title-delete": "Löschen"
     },
@@ -252,7 +252,7 @@
       "info-description": "Diese Systemeinstellungen werden in grafana.ini oder custom.ini definiert (oder in ENV-Variablen überschrieben). Um diese zu ändern, müssen Sie Grafana jetzt neu starten."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Entfernung bestätigen"
     },
     "upgrade-info": {
       "title": "Enterprise-Lizenz"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Ändern",
-      "confirmText-change": "",
+      "confirmText-change": "Ändern",
       "grafana-admin-key": "Grafana-Admin",
       "grafana-admin-no": "Nein",
       "grafana-admin-yes": "Ja",
       "title": "Berechtigungen"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Sind Sie sicher, dass Sie diesen Nutzer löschen möchten?",
+      "body-disable": "Sind Sie sicher, dass Sie diesen Nutzer deaktivieren möchten?",
+      "confirmText-delete-user": "Nutzer löschen",
+      "confirmText-disable-user": "Nutzer deaktivieren",
       "delete-button": "Benutzer löschen",
       "disable-button": "Benutzer deaktivieren",
       "edit-button": "Bearbeiten",
@@ -331,7 +331,7 @@
       "title-disable-user": "Nutzer deaktivieren"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Speichern"
     },
     "user-sessions": {
       "browser-column": "Browser und Betriebssystem",
@@ -382,12 +382,12 @@
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Die Schaltfläche für KI-Warnregeln wurde nicht geladen",
+        "feedback-button": "Die Schaltfläche für KI-Feedback wurde nicht geladen",
+        "improve-annotations-button": "Die Schaltfläche zur Verbesserung der Anmerkungen mit KI wurde nicht geladen",
+        "improve-labels-button": "Die Schaltfläche zur Verbesserung der Labels mit KI wurde nicht geladen",
+        "template-button": "Die Schaltfläche für KI-Vorlagen wurde nicht geladen",
+        "triage-button": "Die Schaltfläche für die KI-Triage wurde nicht geladen"
       }
     },
     "alert": {
@@ -493,7 +493,7 @@
       "title-muting-grouping-and-timings": "Stummschaltung, Gruppierung und Zeitsteuerung"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Keine Datenquellen gefunden"
     },
     "alert-menu": {
       "copy-link": "Link kopieren",
@@ -519,7 +519,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Warnregel"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -587,7 +587,7 @@
       "view-configuration": "Konfiguration anzeigen"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Ja, Konfiguration zurücksetzen",
       "gma-manual-configuration-description": "Die interne Grafana-Alertmanager-Konfiguration kann nicht manuell geändert werden. Bearbeiten Sie die individuellen Ressourcen über die Benutzeroberfläche, um diese Konfiguration zu ändern.",
       "gma-manual-configuration-is-not-supported": "Manuelle Konfigurationsänderungen werden nicht unterstützt",
       "message": {
@@ -602,13 +602,13 @@
       "title-resetting-alertmanager-configuration": "Alertmanager-Konfiguration wird zurückgesetzt"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Möchten Sie die Konfiguration wirklich auf diese Version zurücksetzen? Alle nicht gespeicherten Änderungen gehen verloren.",
       "columns": {
         "compare": "Vergleichen",
         "restore": "Wiederherstellen",
         "text-latest": "Neueste"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Ja, Konfiguration zurücksetzen",
       "loading": "Wird geladen ...",
       "no-previous-configurations": "Keine vorherigen Konfigurationen",
       "this-might-take-a-while": "Dies kann eine Weile dauern ...",
@@ -888,10 +888,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Weitere Aktionen für Kontaktpunkt „{{contactPointName}}“",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Löschen",
       "button-edit": "Bearbeiten",
       "button-view": "Anzeigen",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Exportieren",
       "export-label-export": "Exportieren",
       "label-delete": "Löschen",
       "label-manage-permissions": "Berechtigungen verwalten",
@@ -1426,7 +1426,7 @@
       "label-disable-resolved-message": "Nachricht zur Behebung deaktivieren"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Gruppen werden geladen …",
       "message": {
         "must-be-a-positive-integer": "Muss eine positive ganze Zahl sein.",
         "must-enter-a-group-name": "Es muss ein Gruppenname eingegeben werden"
@@ -1523,7 +1523,7 @@
       "group-loading-error": "Fehler beim Laden der Gruppe",
       "interval": "Intervall",
       "namespace": "Namensraum",
-      "new": "",
+      "new": "Neu",
       "title": {
         "back": ""
       }
@@ -1555,7 +1555,7 @@
     },
     "group-loader": {
       "group-load-failed": "Die Regeln der Gruppe {{ groupName }} in {{ namespaceName }} konnten nicht geladen werden",
-      "no-rules": ""
+      "no-rules": "In dieser Gruppe wurden keine Regeln gefunden"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "Die Gruppe wird gelöscht"
@@ -1885,10 +1885,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Keine Datenquellen gefunden"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Sind Sie sicher, dass Sie „{{muteTiming}}“ löschen möchten?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Deaktiviert",
@@ -2140,10 +2140,10 @@
         "conflict": "Der Benachrichtigungsrichtlinienbaum wurde von einem anderen Benutzer aktualisiert.",
         "error-code": "Fehlermeldung: „{{error}}“",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Die Route kann nicht hinzugefügt oder aktualisiert werden: Wenn wir die Matcher {{-matchers}} verbinden, widersprechen Matcher einer externen Routing-Struktur. Dadurch wäre die Route nicht erreichbar."
         },
         "suffix": "Bitte aktualisieren Sie die Seite und versuchen Sie es erneut.",
-        "title": ""
+        "title": "Benachrichtigungsrichtlinie konnte nicht hinzugefügt oder aktualisiert werden"
       },
       "n-more-policies_one": "{{count}} zusätzliche Richtlinie",
       "n-more-policies_other": "{{count}} zusätzliche Richtlinien"
@@ -2199,7 +2199,7 @@
     "query-and-expressions-step": {
       "add-query": "Abfrage hinzufügen",
       "body-queries-expressions-configured": "Erstellen Sie mindestens eine Abfrage oder einen Ausdruck für eine Warnung",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Deaktivieren",
       "expressions": "Ausdrücke",
       "loading-data-sources": "Datenquellen werden geladen ...",
       "manipulate-returned-queries-other-operations": "Manipulieren Sie Daten, die von Abfragen mit mathematischen und anderen Operationen zurückgegeben werden.",
@@ -2253,7 +2253,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Aufnahmeregel"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Der Abfrage-Editor konnte nicht geladen werden wegen: {{errorMessage}}"
@@ -2273,7 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Sie müssen eine neue Bewertungsgruppe für die kopierte Regel festlegen, da die ursprüngliche bereitgestellt wurde und nicht für Regeln genutzt werden kann, die in der Benutzeroberfläche erstellt werden.",
       "body-not-provisioned": "Die neue Regel wird <1>nicht</1> als bereitgestellte Regel gekennzeichnet.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Kopieren",
       "title-copy-provisioned-alert-rule": "Bereitgestellte Warnregel kopieren"
     },
     "redirect-to-rule-viewer": {
@@ -2497,7 +2497,7 @@
       "new-alert-rule": "Neue Warnregel",
       "new-datasource-recording-rule": "Neue Datenquelle-Aufnahmeregel",
       "new-grafana-recording-rule": "Neue Grafana-Aufnahmeregel",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Neue Warnregel zu exportieren",
       "pagination": {
         "next-page": "Mehr anzeigen …"
       },
@@ -2671,7 +2671,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Warnungsmanager"
       }
     },
     "settings-content": {
@@ -2809,7 +2809,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Vorschau aktualisieren",
-      "empty-state": "",
+      "empty-state": "Fügen Sie Vorlageninhalte hinzu, um eine Vorschau anzuzeigen",
       "label-preview": "Vorschau",
       "refresh": "Aktualisieren"
     },
@@ -2828,7 +2828,7 @@
       "loading": "Wird geladen ...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Benachrichtigungsvorlage auswählen"
         },
         "label": {
           "select-notification-template": "Benachrichtigungsvorlage auswählen"
@@ -2856,8 +2856,8 @@
     },
     "templates-table": {
       "actions": "Aktionen",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Sind Sie sicher, dass Sie die Vorlagengruppe „{{template}}“ löschen möchten?",
+      "confirmText-yes-delete": "Ja, löschen",
       "no-templates-defined": "Keine Vorlagen festgelegt.",
       "template-group": "Vorlagengruppe",
       "title-delete-template-group": "Vorlagengruppe löschen"
@@ -2912,7 +2912,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Verwalten Sie Warnregeln, Aufnahmeregeln und das Bewertungsintervall"
       }
     },
     "to-gma": {
@@ -2992,7 +2992,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Ja, löschen"
       }
     },
     "use-delete-policy-modal": {
@@ -3152,7 +3152,7 @@
       "annotation": "Anmerkung",
       "first-value": "Erster Wert",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Unbekannte Feldnamen"
     },
     "empty-state": {
       "button-title": "Anmerkungsabfrage hinzufügen",
@@ -3162,12 +3162,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Wenn dieses Feld festgelegt ist, wird die Anmerkung als ein Bereich behandelt",
+        "results-split-on-comma": "Die Ergebnisse werden durch Komma (,) getrennt"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}, oder das erste Textfeld",
+        "time-or-the-first-field": "{{defaultField}}, oder das erste Zeitfeld"
       }
     },
     "standard-annotation-query-editor": {
@@ -3245,9 +3245,9 @@
       "define-allowed-teams-ids-label": "Erlaubte Team-IDs festlegen",
       "display-name-description": "Wird auf der Anmeldeseite als „Anmelden mit …“ angezeigt. Hilfreich, wenn Sie mehr als einen Identitätsanbieter oder SSO-Protokolle nutzen.",
       "display-name-label": "Anzeigename",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Parameter zur Angabe des Bereichs des Nutzers im Azure AD/Entra ID-Tenant und zur Optimierung des Anmeldeprozesses.",
+      "domain-hint-label": "Domain-Hinweis",
+      "domain-hint-valid-domain": "Dieses Feld muss eine gültige Domain sein.",
       "email-attribute-name-description": "Name des Keys, der für die Nutzer-E-Mail-Suche in der Attributzuordnung des OAuth2-ID-Tokens verwendet wird.",
       "email-attribute-name-label": "E-Mail-Attributname",
       "email-attribute-path-description": "JMESPath-Ausdruck, der für die Nutzer-E-Mail-Suche aus den Nutzerinformationen verwendet wird.",
@@ -3264,11 +3264,11 @@
       "id-token-attribute-name-label": "ID-Token-Attributname",
       "login-attribute-path-description": "JMESPath-Ausdruck, der für die Nutzer-Login-Suche aus dem Nutzer-ID-Token verwendet wird.",
       "login-attribute-path-label": "Anmeldeattributpfad",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Einverständnis",
+      "login-prompt-description": "Gibt die Art der Nutzerinteraktion an, wenn sich der Nutzer mit dem IdP anmeldet.",
+      "login-prompt-label": "Anmeldeaufforderung",
+      "login-prompt-login": "Anmelden",
+      "login-prompt-select-account": "Account auswählen",
       "managed-identity-client-id-description": "Die Client-ID zur verwalteten Identität der Verbundidentitäts-Anmeldedaten Ihrer OAuth2-App.",
       "managed-identity-client-id-label": "Client-ID der FIC-verwalteten Identität",
       "name-attribute-path-description": "JMESPath-Ausdruck, der für die Nutzername-Suche aus dem Nutzer-ID-Token verwendet wird. \nDieser Name wird als Anzeigename des Nutzers verwendet.",
@@ -3304,7 +3304,7 @@
       "team-ids-github": "Integer-Liste der Team-IDs.",
       "team-ids-label": "Team-IDs",
       "team-ids-numbers": "Team-IDs müssen Zahlen sein.",
-      "team-ids-other": "",
+      "team-ids-other": "String-Liste der Team-IDs.",
       "team-ids-placeholder": "Geben Sie Team-IDs ein und drücken Sie zum Hinzufügen die Eingabetaste",
       "teams-url-description": "Die URL, die für die Abfrage von Team-IDs verwendet wird. Wenn dies nicht festgelegt ist, lautet der Standardwert /teams.",
       "teams-url-description-oauth": "Wenn Sie „{{ teamsURLLabel }}“ konfigurieren, müssen Sie auch „{{ teamIDsAttributePathLabel }}“ konfigurieren.",
@@ -3348,7 +3348,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Auf Standardwerte zurücksetzen"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Zurücksetzen",
       "disable": "Deaktivieren",
       "disabling": "Wird deaktiviert …",
       "discard": "Verwerfen",
@@ -3368,7 +3368,7 @@
       "text-badge-not-enabled": "Nicht aktiviert"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM befindet sich zurzeit in der Entwicklung und wird nicht für den Produktionseinsatz empfohlen. Bitte nutzen Sie es mit Vorsicht und rechnen Sie mit möglichen Änderungen."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "Der Endpunkt .well-known/openid-configuration für Ihren IdP",
@@ -3486,8 +3486,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Bereitgestellte Ressourcen massenweise löschen",
+      "bulk-move-provisioned-resources": "Bereitgestellte Ressourcen massenweise verschieben",
       "cancel-button": "Abbrechen",
       "confirmation-text": "Löschen",
       "delete-button": "Löschen",
@@ -3506,8 +3506,8 @@
       "move-modal-title": "Verschieben",
       "moving": "Verschieben...",
       "new-folder-name-required-phrase": "Ordnername ist erforderlich.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Sie haben sowohl bereitgestellte als auch nicht bereitgestellte Ressourcen ausgewählt. Diese können nicht zusammen verarbeitet werden. Bitte wählen Sie nur bereitgestellte Ressourcen oder nur nicht bereitgestellte Ressourcen aus und versuchen Sie es dann erneut.",
+      "selected-mix-resources-modal-title": "Gemischte Ressourcentypen ausgewählt"
     },
     "actions": {
       "button-to-recently-deleted": "Kürzlich gelöscht"
@@ -3520,25 +3520,25 @@
       "this-folder-is-empty": "Dieser Ordner ist leer"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_other": ""
+      "all-deleted": "Alle Ressourcen wurden erfolgreich gelöscht",
+      "all-moved": "Alle Ressourcen wurden erfolgreich verschoben",
+      "button-done": "Fertig",
+      "progress-title": "Erfolg",
+      "failed-alert_one": "{{count}} Elemente fehlgeschlagen",
+      "failed-alert_other": "{{count}} Elemente fehlgeschlagen"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Abbrechen",
+      "button-delete": "Löschen",
+      "button-deleting": "Wird gelöscht …",
+      "delete-warning": "Dadurch werden ausgewählte Ordner und deren Unterordner gelöscht. Insgesamt betrifft dies:",
+      "error-path-not-found": "Pfad nicht gefunden"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Abbrechen",
+      "button-move": "Verschieben",
+      "button-moving": "Wird verschoben ...",
+      "deleting": "Wird gelöscht",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,14 +3546,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Dateiinhalt nicht gefunden",
+      "error-path-not-found": "Pfad nicht gefunden",
+      "error-target-folder-path-missing": "Zielordnerpfad fehlt",
+      "error-title": "Zielordnerfehler",
+      "move-warning": "Dadurch werden ausgewählte Ordner und deren Unterordner verschoben. Insgesamt betrifft dies:",
+      "moving": "Wird verschoben",
+      "progress": "Fortschritt: {{current}} von {{total}}",
+      "target-folder": "Zielordner"
     },
     "counts": {
       "alertRule_one": "{{count}} Alarmierungsregel",
@@ -3584,7 +3584,7 @@
       "button-delete": "Löschen",
       "button-deleting": "Wird gelöscht …",
       "delete-warning": "Dadurch werden dieser und alle untergeordneten Ordner gelöscht. Insgesamt betrifft dies:",
-      "success-message": ""
+      "success-message": "Ordner erfolgreich gelöscht"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Nachfolgerinformationen können nicht abgerufen werden"
@@ -3609,7 +3609,7 @@
       "empty-message": "Keine Ordner gefunden",
       "error-title": "Fehler beim Laden der Ordner",
       "non-folder-item": "{{itemKind}} {{itemUID}} nicht im Ordner enthalten",
-      "root-title": "",
+      "root-title": "Dashboards",
       "search-placeholder": "Ordner suchen",
       "unknown-error": "Unbekannter Fehler"
     },
@@ -3638,7 +3638,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Ordnernamen eingeben",
       "label-folder-name": "Ordnername",
       "text-pull-request-created": "Ein Pull-Request wurde erstellt, mit Änderungen an diesem Ordner:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "Ihr Ordner wird erstellt als {{folderName}}",
       "title-pull-request-created": "Pull-Request erstellt",
       "title-this-repository-is-read-only": "Dieses Repository ist schreibgeschützt"
     },
@@ -3757,7 +3757,7 @@
     "category-selected-connection": "Ausgewählte Verbindung",
     "category-selected-element": "Ausgewähltes Element ({{element}})",
     "category-size": "Größe",
-    "category-tooltip": "",
+    "category-tooltip": "Tooltip",
     "cloud-item": {
       "category-cloud": "Cloud",
       "label": {
@@ -4001,10 +4001,10 @@
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Tooltip-Modus",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Deaktiviert",
+        "label-enabled": "Aktiviert"
       }
     },
     "tree-navigation-editor": {
@@ -4373,7 +4373,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Abfrage ausführen"
     }
   },
   "dashboard": {
@@ -4536,7 +4536,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Fortfahren"
         },
         "title": {
           "proceed-to-external-site": "Weiter zu externer Seite?"
@@ -4642,11 +4642,11 @@
     },
     "edit-actions": {
       "add": "{{typeName}} hinzufügen",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
+      "add-conditional-rule": "Hinzufügen von {{ruleDescription}}-Regel",
+      "duplicate-panel": "Panel duplizieren",
+      "edit-query-result-rule": "Regel für Abfrageergebnis ändern",
+      "edit-template-variable-rule": "Regel für Vorlagenvariable ändern",
+      "edit-time-range-rule": "Regel für Zeitbereich ändern",
       "move": "Verschieben von {{typeName}}",
       "panel-background": "Panel-Hintergrund ändern",
       "panel-description": "Panel-Beschreibung ändern",
@@ -4661,7 +4661,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Dashboard",
-        "element": "",
+        "element": "Element",
         "local-variable": "Lokale Variable",
         "multiple-elements": "Mehrere Elemente",
         "multiple-elements-delete-text": "Sind Sie sicher, dass Sie diese Elemente löschen möchten?",
@@ -4743,10 +4743,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Dashboard exportieren"
       },
       "menu": {
-        "label": ""
+        "label": "Dashboardmenü exportieren"
       }
     },
     "fetch-dashboard": {
@@ -4768,9 +4768,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Standard",
+          "shared-crosshair": "Freigegebenes Fadenkreuz",
+          "shared-tooltip": "Freigegebener Tooltip"
         }
       }
     },
@@ -4823,14 +4823,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Keine Anmerkungsdaten an die folgenden Panels senden",
+        "annotation-panels-support-annotations": "Anmerkungsdaten an alle Panels senden, die Anmerkungen unterstützen",
+        "annotations-explicitly-listed-panels": "Anmerkungen an die explizit aufgelisteten Panels senden"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Alle Panels",
+        "all-panels-except": "Alle Panels außer",
+        "selected-panels": "Ausgewählte Panels"
       }
     },
     "get-panel-frame-category": {
@@ -5092,7 +5092,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Sind Sie sicher, dass Sie das Dashboard auf die Version {{version}} zurücksetzen möchten? Alle nicht gespeicherten Änderungen gehen verloren.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Ja, auf Version {{version}} zurücksetzen",
       "title-restore-version": "Version wiederherstellen"
     },
     "row-options-button": {
@@ -5144,7 +5144,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Dashboard gespeichert"
     },
     "save-dashboard-as-button": {
       "save-as": "Speichern unter"
@@ -5180,7 +5180,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Ein Dashboard mit demselben Namen im ausgewählten Ordner existiert bereits.<1></1><2>Möchten Sie dieses Dashboard trotzdem speichern?</2>",
       "body-version-mismatch": "Eine andere Person hat dieses Dashboard aktualisiert<1></1><2>Möchten Sie dieses Dashboard trotzdem speichern?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Speichern und überschreiben",
       "title-name-exists": "Widerspruch",
       "title-version-mismatch": "Widerspruch"
     },
@@ -5377,9 +5377,9 @@
       "label-apply-transformation-to": "Transformation anwenden auf"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Beachten Sie, dass das Entfernen einer Transformation andere beschädigen kann. Wenn nur eine einzige Transformation vorliegt, kehren Sie zum Hauptauswahlbildschirm zurück.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Löschen",
         "title-debug": "Debuggen",
         "title-disable-transformation": "Transformation deaktivieren",
         "title-filter": "Filter",
@@ -5400,16 +5400,16 @@
       "placeholder-search-for-transformation": "Nach Transformation suchen",
       "show-images": "Bilder anzeigen",
       "title-add-another-transformation": "Weitere Transformation hinzufügen",
-      "view-all": ""
+      "view-all": "Alles anzeigen"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Wenn Sie alle Transformationen löschen, kehren Sie zum Hauptauswahlbildschirm zurück."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Weitere Transformation hinzufügen"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Alles löschen",
       "delete-all-transformations": "Alle Transformationen löschen",
       "title-delete-all-transformations": "Alle Transformationen löschen?",
       "tooltip-clear-search": "Suche löschen",
@@ -5439,16 +5439,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Variablenbeschreibung ändern"
       },
       "hide": {
-        "action": ""
+        "action": "Option zum Ausblenden von Variablen ändern"
       },
       "label": {
-        "action": ""
+        "action": "Variablenlabel ändern"
       },
       "name": {
-        "action": ""
+        "action": "Variablennamen ändern"
       }
     },
     "version-history-comparison": {
@@ -5460,7 +5460,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Auswahl der Version {{version}} umschalten",
       "date": "Datum",
-      "name-latest": "",
+      "name-latest": "Neuestes",
       "notes": "Anmerkungen",
       "restore": "Wiederherstellen",
       "updated-by": "Aktualisiert von",
@@ -5538,7 +5538,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Dimensionen als CSV angeben: {{name}}, {{value}}",
       "label-data-source": "Datenquelle",
       "label-use-static-key-dimensions": "Statische Key-Dimensionen verwenden",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Benutzerdefinierte Werte zulassen"
     },
     "add-to-dashboard": {
       "message": {
@@ -5612,7 +5612,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Öffentliche URL widerrufen"
       },
       "title": {
         "revoke-public-url": "Öffentliche URL widerrufen"
@@ -5625,7 +5625,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Benutzerdefinierte Optionen",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Werte werden durch Komma getrennt",
       "selection-options": "Auswahloptionen"
     },
     "dashboard-edit-pane-renderer": {
@@ -5646,8 +5646,8 @@
       "label-with-tags": "Mit Tags",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Dashboards",
+          "link": "Link"
         }
       },
       "placeholder-open-dashboard": "Dashboard öffnen"
@@ -5690,8 +5690,8 @@
       "data-source-options": "Datenquellenoptionen",
       "description-instance-name-filter": "Regex-Filter, für den Datenquelleninstanzen aus der Liste der Variablenwerte ausgewählt werden sollen. Für alle leer lassen.",
       "example-instance-name-filter": "Beispiel: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Instanznamenfilter",
+      "name-type": "Typ",
       "selection-options": "Auswahloptionen"
     },
     "default-grid-layout-manager": {
@@ -5707,7 +5707,7 @@
       "delete-action": "Dashboard löschen",
       "deleting": "Löschen...",
       "drawer-title": "Bereitgestelltes Dashboard löschen",
-      "success-message": ""
+      "success-message": "Dashboard erfolgreich gelöscht"
     },
     "description-label": {
       "description": "Beschreibung"
@@ -5736,15 +5736,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Editierbar",
+          "readonly": "Schreibgeschützt"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Standard",
+          "shared-crosshair": "Freigegebenes Fadenkreuz",
+          "shared-tooltip": "Freigegebener Tooltip"
         }
       }
     },
@@ -5756,36 +5756,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Fügen Sie spontan Schlüssel/Wert-Filter hinzu",
+        "dynamically-switch-source-multiple-panels": "Dynamisches Wechseln der Datenquelle für mehrere Panels",
+        "group": "Fügen Sie spontan Schlüssel zum Gruppieren hinzu",
+        "hidden-constant-variable": "Eine ausgeblendete konstante Variable, nützlich für metrische Präfixe in Dashboards, die Sie teilen möchten",
+        "users-enter-arbitrary-strings-textbox": "Nutzer können beliebige Zeichenfolgen in ein Textfeld eingeben",
+        "values-are-static-and-defined-manually": "Werte sind statisch und manuell festgelegt",
+        "values-fetched-source-query": "Werte werden über eine Datenquellenabfrage abgerufen",
+        "values-timespans": "Werte sind Zeitspannen, z. B. 1 m, 1 h, 1 T"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Ad-hoc-Filter",
+        "constant": "Konstant",
+        "custom": "Benutzerdefiniert",
+        "data-source": "Datenquelle",
+        "group-by": "Gruppieren nach",
+        "interval": "Intervall",
+        "query": "Abfrage",
+        "textbox": "Textfeld"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Keine Anmerkungsdaten an die folgenden Panels senden",
+        "annotation-panels-support-annotations": "Anmerkungsdaten an alle Panels senden, die Anmerkungen unterstützen",
+        "annotations-explicitly-listed-panels": "Anmerkungen an die explizit aufgelisteten Panels senden"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Alle Panels",
+        "all-panels-except": "Alle Panels außer",
+        "selected-panels": "Ausgewählte Panels"
       }
     },
     "get-panel-frame-options": {
@@ -5813,7 +5813,7 @@
       "group-by-options": "Nach Optionen gruppieren",
       "label-data-source": "Datenquelle",
       "label-use-static-group-by-dimensions": "Statische Gruppen-Dimensionen verwenden",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Benutzerdefinierte Werte zulassen"
     },
     "help-wizard": {
       "copy-to-clipboard": "In die Zwischenablage kopieren",
@@ -5849,14 +5849,14 @@
       "apply": "Anwenden"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Berechnet dynamisch das Intervall, indem der Zeitbereich durch die angegebene Anzahl dividiert wird",
       "description-calculated-value-below-threshold": "Der berechnete Wert wird diesen Schwellenwert nicht unterschreiten",
       "description-step-count": "Wie oft der aktuelle Zeitbereich zur Berechnung des Werts geteilt werden soll",
       "interval-options": "Intervalloptionen",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Automatische Option",
+      "name-min-interval": "Min. Intervall",
+      "name-step-count": "Schrittzähler",
+      "name-values": "Werte"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5877,19 +5877,19 @@
       "usage-count_other": "Verwendet bei {{count}} Dashboards"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Fehler beim Verschieben des Dashboards",
+      "api-error": "Dashboard konnte nicht verschoben werden",
+      "cancel-action": "Abbrechen",
+      "current-file-not-found": "Die aktuelle Dashboard-Datei konnte nicht gefunden werden",
+      "drawer-title": "Bereitgestelltes Dashboard verschieben",
+      "file-load-error": "Fehler beim Laden des Dashboards",
+      "loading-file-data": "Daten des Dashboards werden geladen",
+      "move-action": "Dashboard verschieben",
+      "move-read-only-message": "Dieses Dashboard kann nicht direkt von Grafana aus verschoben werden, da das Repository schreibgeschützt ist. Um dieses Dashboard zu verschieben, verschieben Sie die Datei bitte in Ihrem Git-Repository.",
+      "moving": "Wird verschoben ...",
+      "success-message": "Dashboard erfolgreich verschoben",
+      "target-path-label": "Zielpfad",
+      "title-this-repository-is-read-only": "Dieses Repository ist schreibgeschützt"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Ein Dashboard mit demselben Namen im ausgewählten Ordner existiert bereits. Möchten Sie dieses Dashboard trotzdem speichern?",
@@ -5897,7 +5897,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Fortfahren"
       },
       "title": {
         "proceed-to-external-site": "Weiter zu externer Seite?"
@@ -5934,8 +5934,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Weitere Transformation hinzufügen",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Wenn Sie alle Transformationen löschen, kehren Sie zum Hauptauswahlbildschirm zurück.",
+      "confirmText-delete-all": "Alles löschen",
       "delete-all-transformations": "Alle Transformationen löschen",
       "title-delete-all-transformations": "Alle Transformationen löschen?"
     },
@@ -5988,13 +5988,13 @@
       "description-examples": "Mithilfe von benannten Erfassungsgruppen können der Anzeigetext und der Wert getrennt werden (<1>siehe Beispiele</1>).",
       "description-optional": "Optional, wenn Sie einen Teil eines Reihennamens oder eines metrischen Knotensegments extrahieren möchten.",
       "label-data-source": "Datenquelle",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Sortierung der statischen Optionen",
       "label-target-data-source": "Zieldatenquelle",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Statische Optionen nutzen",
+      "name-regex": "Regex",
       "query-options": "Abfrageoptionen",
       "selection-options": "Auswahloptionen",
-      "static-options-legend": ""
+      "static-options-legend": "Statische Optionen"
     },
     "resource-export": {
       "label": {
@@ -6007,7 +6007,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Sind Sie sicher, dass Sie das Dashboard auf die Version {{version}} zurücksetzen möchten? Alle nicht gespeicherten Änderungen gehen verloren.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Ja, auf Version {{version}} zurücksetzen",
       "title-restore-version": "Version wiederherstellen"
     },
     "save-button": {
@@ -6026,7 +6026,7 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Dashboard konnte nicht gespeichert werden"
       },
-      "required": ""
+      "required": "Erforderlich"
     },
     "save-dashboard-drawer": {
       "tabs": {
@@ -6053,8 +6053,8 @@
         "title-someone-else-has-updated-this-dashboard": "Eine andere Person hat dieses Dashboard aktualisiert",
         "would-still-dashboard": "Möchten Sie dieses Dashboard trotzdem speichern?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "Aufgrund von Einschränkungen im neuen Dashboard-Schema (V2) werden Bibliotheks-Panels während des externen Exports in reguläre Panels mit eingebetteten Inhalten umgewandelt.",
+      "schema-v2-library-panels-export-title": "Bibliotheks-Panels werden in reguläre Panels umgewandelt",
       "title-dashboard-drastically-changed": "Dashboard irreversibel geändert"
     },
     "save-dashboard-form-common-options": {
@@ -6101,10 +6101,10 @@
       "description-enables-multiple-values-selected": "Ermöglicht die gleichzeitige Auswahl mehrerer Werte",
       "description-enables-option-include-variables": "Aktiviert eine Option, mit der alle Werte einbezogen werden",
       "description-enables-users-custom-values": "Ermöglicht Nutzern, individuelle Werte zur Liste hinzuzufügen",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Benutzerdefinierte Werte zulassen",
+      "name-custom-all-value": "Alle Werte benutzerdefiniert",
+      "name-include-all-option": "Option „Alle einschließen“",
+      "name-multi-value": "Mehrwertig"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Freigabe-Menü umschalten"
@@ -6125,7 +6125,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Standardwert"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(optional)",
@@ -6150,8 +6150,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Wenn Sie die Verknüpfung dieses Panels aufheben, können Sie es bearbeiten, ohne dass dies Auswirkungen auf andere Dashboards hat. Sobald Sie jedoch eine Änderung vornehmen, können Sie nicht mehr zum ursprünglichen wiederverwendbaren Panel zurückkehren.",
+      "confirmText-yes-unlink": "Ja, Verknüpfung aufheben",
       "title-really-unlink-panel": "Möchten Sie die Verknüpfung dieses Panels wirklich aufheben?"
     },
     "unsaved-changes-modal": {
@@ -6169,7 +6169,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Dashboard gespeichert"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Diese Variable wird von keiner Variable bzw. keinem Dashboard referenziert.",
@@ -6181,15 +6181,15 @@
       "aria-label-variable-editor-form": "Variablen-Editor-Formular",
       "back-to-list": "Zurück zur Liste",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Variable löschen"
       },
       "delete": "Löschen",
       "description-optional-display-name": "Optionaler Anzeigename",
       "description-template-variable-characters": "Der Name der Vorlagenvariable. (Max. 50 Zeichen)",
       "general": "Allgemein",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Beschreibung",
+      "name-label": "Label",
+      "name-name": "Name",
       "placeholder-descriptive-text": "Beschreibender Text",
       "placeholder-label-name": "Label-Name",
       "placeholder-variable-name": "Variablenname",
@@ -6204,8 +6204,8 @@
       "variable": "Variable"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Möchten Sie Folgendes wirklich löschen: {{variable}}?",
+      "confirmText-delete-variable": "Variable löschen",
       "title-delete-variable": "Variable löschen",
       "tooltip-duplicate-variable": "Variable duplizieren",
       "tooltip-remove-variable": "Variable entfernen"
@@ -6213,15 +6213,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Label",
+          "nothing": "Nichts",
+          "variable": "Variable"
         }
       },
       "label": "Ausblenden"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Variablentyp"
     },
     "variable-usages-button": {
       "title-show-usages": "Nutzungen angezeigt für: {{variableId}}",
@@ -6249,7 +6249,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Auswahl der Version {{version}} umschalten",
       "date": "Datum",
-      "name-latest": "",
+      "name-latest": "Neuestes",
       "notes": "Anmerkungen",
       "restore": "Wiederherstellen",
       "updated-by": "Aktualisiert von",
@@ -6640,7 +6640,7 @@
     },
     "color-dimension-editor": {
       "label-fixed-color": "Feste Farbe",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Keine Felder gefunden"
     },
     "file-dropzone-custom-children": {
       "upload": "Hochladen"
@@ -6679,7 +6679,7 @@
       },
       "label-limit": "Limit",
       "label-value": "Wert",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Keine Felder gefunden",
       "scalar-options": {
         "description-clamped": "Feldwerte verwenden, auf max. und min. begrenzt",
         "description-mod": "Feldwerte verwenden, Modulo von max.",
@@ -6690,13 +6690,13 @@
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Fester Wert"
         }
       },
       "label-max": "Max.",
       "label-min": "Min.",
       "label-value": "Wert",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Keine Felder gefunden"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
@@ -6806,6 +6806,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Ereignisse",
@@ -7078,7 +7079,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Wird geladen …"
     },
     "prev": "Zurück",
     "queryless-apps-extensions": {
@@ -7265,7 +7266,7 @@
           "start-time": "Startzeit:"
         }
       },
-      "share-span": "",
+      "share-span": "Teilen",
       "warnings": "Warnungen"
     },
     "span-filters": {
@@ -7275,8 +7276,8 @@
       "aria-label-select-service-name-operator": "Dienstnamen-Operator auswählen",
       "aria-label-select-span-name": "Spannen-Name auswählen",
       "aria-label-select-span-name-operator": "Spannen-Namen-Operator auswählen",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Dauer der max. Spanne auswählen",
+      "ariaLabel-select-min-span-duration": "Dauer der min. Spanne auswählen",
       "label-collapse": "Spannenfilter",
       "label-duration": "Dauer",
       "label-service-name": "Dienstname",
@@ -7348,23 +7349,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Dauer",
+      "export-started": "Export gestartet",
+      "give-feedback": "Feedback",
+      "link-copied": "Link in die Zwischenablage kopiert",
+      "path": "Pfad",
+      "route": "Route",
+      "services": "Dienstleistungen",
+      "share": "Teilen",
+      "share-copy-link": "Link kopieren",
+      "share-export-json": "Als JSON exportieren",
+      "share-tooltip": "Trace teilen",
+      "start-time": "Startzeitpunkt",
+      "target": "Ziel",
+      "title-share-thoughts-about-tracing-grafana": "Sagen Sie Ihre Meinung zum Tracing in Grafana.",
+      "tooltip-url": "{{route}} oder {{url}} oder {{target}} oder {{path}}",
+      "trace-id": "Trace-ID",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Schaltfläche „Filter löschen“",
@@ -7464,7 +7465,7 @@
       "when": "WANN"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Führen Sie MySQL-Dialekt-SQL für die von Ihren Datenquellen zurückgegebenen Tabellen aus. Datenquellenabfragen (z. B. „A“, „B“) sind als Tabellen verfügbar und werden durch den Abfragenamen referenziert. Felder sind als Spalten verfügbar, wie von der Datenquelle zurückgegeben.",
       "label-operation": "Operation"
     },
     "math": {
@@ -7495,7 +7496,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Ordner löschen",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Keine Ordner gefunden",
     "select-aria-label": "Ordnerfilter",
     "select-placeholder": "Nach Ordner filtern"
   },
@@ -7569,51 +7570,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Gazetteer nicht gefunden",
+      "warning-no-geometry": "Geometrie konnte nicht gefunden werden",
+      "warning-select-geohash": "Geohash-Feld auswählen",
+      "warning-select-lat-long": "Breiten-/Längengradfelder auswählen",
+      "warning-select-lookup": "Nachschlagefeld auswählen",
+      "warning-unable-to-find": "Standortfelder konnten nicht gefunden werden"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Keine Zeichenfolgenfelder gefunden"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Keine numerischen Felder gefunden"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Keine numerischen Felder gefunden"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Keine Zeichenfolgenfelder gefunden"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Gazetteer",
+      "name-geohash-field": "Geohash-Feld",
+      "name-latitude-field": "Breitengradfeld",
+      "name-location-mode": "Standortmodus",
+      "name-longitude-field": "Längengradfeld",
+      "name-lookup-field": "Nachschlagefeld"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Standortdaten automatisch anhand von Standard-Feldnamen identifizieren",
+        "description-coords": "Breiten- und Längengradfelder angeben",
+        "description-geohash": "Geohash-Feld angeben",
+        "description-lookup": "Gazetteer und Nachschlagefeld angeben",
+        "label-auto": "Auto",
+        "label-coords": "Koordinaten",
+        "label-geohash": "Geohash",
+        "label-lookup": "Suche"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Basiskarten-Layer",
+    "category-map-controls": "Kartensteuerung",
+    "category-map-layers": "Layer zuordnen",
+    "category-map-view": "Kartenansicht",
     "coordinates-map-view-editor": {
       "label-latitude": "Breite",
       "label-longitude": "Länge"
@@ -7622,15 +7623,15 @@
       "center": "Mitte:",
       "zoom": "Zoom:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Dieser Standort wird angezeigt, wenn das Panel erstmals geladen wird.",
+    "description-mouse-wheel-zoom": "Zoomsteuerung über Mausrad aktivieren",
+    "description-no-repeat": "Verhindern, dass sich die Karte horizontal wiederholt",
+    "description-share-view": "Nutzen Sie die gleiche Ansicht für mehrere Panels. Hinweis: Dies erfordert möglicherweise ein erneutes Laden des Dashboards.",
+    "description-show-attribution": "Kartenquellen-Attributionsinformationen unten rechts anzeigen",
+    "description-show-debug": "Karteninformationen anzeigen",
+    "description-show-measure": "Tools für Messungen auf der Karte anzeigen",
+    "description-show-scale": "Kartenmaßstab angeben",
+    "description-show-zoom": "Zoom-Steuerelemente in der oberen linken Ecke anzeigen",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Layer"
@@ -7654,12 +7655,12 @@
       "aria-label-add-geomap-style-rule": "Geomap-Stilregel hinzufügen"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Basislayer",
+      "description-display-tooltip": "Tooltip für Layer anzeigen",
+      "name-data": "Daten",
+      "name-display-tooltip": "Tooltip anzeigen",
+      "name-layer-type": "Layer-Typ",
+      "name-opacity": "Opazität"
     },
     "layers-editor": {
       "label-add-layer": "Layer hinzufügen",
@@ -7672,9 +7673,9 @@
       "use-current-map-settings": "Aktuelle Karteneinstellungen verwenden"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Kartenlegende anzeigen",
+      "name-show-legend": "Legende anzeigen",
+      "name-styles": "Stile"
     },
     "markers-legend": {
       "title-symbol": "Symbol"
@@ -7683,27 +7684,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Messtools anzeigen"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Erste Ansicht",
+    "name-mouse-wheel-zoom": "Mausrad-Zoom",
+    "name-no-repeat": "Keine Kartenwiederholung",
+    "name-share-view": "Ansicht teilen",
+    "name-show-attribution": "Zuordnung anzeigen",
+    "name-show-debug": "Debug anzeigen",
+    "name-show-measure": "Messtools anzeigen",
+    "name-show-scale": "Maßstab anzeigen",
+    "name-show-zoom": "Zoom-Steuerung anzeigen",
+    "name-tooltip": "Tooltip",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Keine Zeichenfolgenfelder gefunden"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "Der Basiskarten-Layer wird vom Serveradministrator konfiguriert."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Mitte",
+        "label-left": "Links",
+        "label-right": "Rechts"
       },
       "label-align": "Ausrichten",
       "label-baseline": "Basislinie",
@@ -7719,12 +7720,12 @@
       "label-text-label": "Text-Label",
       "label-x-offset": "X-Versatz",
       "label-y-offset": "Y-Versatz",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Symbol auswählen",
+      "placeholderText-select-symbol-or-add-text": "Wählen Sie ein Symbol aus oder fügen Sie ein Textlabel hinzu",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Unten",
+        "label-center": "Mitte",
+        "label-top": "Oben"
       }
     },
     "style-rule-editor": {
@@ -7738,13 +7739,13 @@
       "placeholder-value": "Wert"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Pop-up bei Hover anzeigen",
+      "description-none": "Inhalt bei Klick anzeigen, nicht bei Hover",
+      "label-details": "Details",
+      "label-none": "Keine"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Layer {{name}}"
     }
   },
   "get-enterprise": {
@@ -7864,400 +7865,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Fuß/Sek²",
+            "name-g-unit": "G-Einheit",
+            "name-meters-sec": "Meter/Sek²"
           },
-          "name": ""
+          "name": "Beschleunigung"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Bogenminuten",
+            "name-arc-seconds": "Bogensekunden",
+            "name-degrees": "Grad (°)",
+            "name-gradian": "Gon",
+            "name-radians": "Radianten"
           },
-          "name": ""
+          "name": "Winkel"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Acres (ac)",
+            "name-hectares": "Hektar (ha)",
+            "name-square-feet": "Quadratfuß (ft²)",
+            "name-square-meters": "Quadratmeter (m²)",
+            "name-square-miles": "Quadratmeilen (mi²)"
           },
-          "name": ""
+          "name": "Bereich"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Ein/Aus",
+            "name-true-false": "Wahr/Falsch",
+            "name-yes-no": "Ja/Nein"
           },
-          "name": ""
+          "name": "Boolesch"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "Berechnung"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "Gramm pro Kubikmeter (g/m³)",
+            "name-g-nm3": "Gramm pro Normkubikmeter (g/Nm³)",
+            "name-mg-dl": "Milligramm pro Deziliter (mg/dl)",
+            "name-mg-m3": "Milligramm pro Kubikmeter (mg/m³)",
+            "name-mg-nm3": "Milligramm pro Normkubikmeter (mg/Nm³)",
+            "name-mmol-l": "Millimol pro Liter (mmol/l)",
+            "name-ng-m3": "Nanogramm pro Kubikmeter (ng/m³)",
+            "name-ng-nm3": "Nanogramm pro Normkubikmeter (ng/Nm³)",
+            "name-ppb": "Teile pro Milliarde (ppb)",
+            "name-ppm": "Teile pro Million (ppm)",
+            "name-ug-m3": "Mikrogramm pro Kubikmeter (μg/m³)",
+            "name-ug-nm3": "Mikrogramm pro Normkubikmeter (μg/Nm³)"
           },
-          "name": ""
+          "name": "Konzentration"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Bulgarische Lew (BGN)",
+            "name-brl": "Real (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "Schweizer Franken (CHF)",
+            "name-czk": "Tschechische Krone (CZK)",
+            "name-dkk": "Dänische Krone (kr)",
+            "name-eur": "Euro (€)",
+            "name-gbp": "Pfund (£)",
+            "name-idr": "Indonesische Rupiah (Rp)",
+            "name-ils": "Neuer israelischer Schekel (₪)",
+            "name-inr": "Indische Rupie (₹)",
+            "name-isk": "Isländische Krone (kr)",
+            "name-jpy": "Yen (¥)",
+            "name-krw": "Südkoreanischer Won (₩)",
+            "name-mbtc": "Milli Bitcoin (฿)",
+            "name-myr": "Malaysischer Ringgit (RM)",
+            "name-nok": "Norwegische Krone (kr)",
+            "name-php": "Philippinischer Peso (PHP)",
+            "name-pln": "Polnischer Złoty (PLN)",
+            "name-pyg": "Guaraní (₲)",
+            "name-rub": "Rubel (₽)",
+            "name-sek": "Schwedische Krone (kr)",
+            "name-try": "Türkische Lira (₺)",
+            "name-uah": "Hrywnja (₴)",
+            "name-ubtc": "Micro Bitcoin (฿)",
+            "name-usd": "Dollar ($)",
+            "name-uyu": "Uruguayischer Peso (UYU)",
+            "name-vnd": "Vietnamesischer Dong (VND)",
+            "name-xpf": "CFP-Franc (XPF)",
+            "name-zar": "Südafrikanischer Rand (R)"
           },
-          "name": ""
+          "name": "Währung"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "Bits (IEC)",
+            "name-bits-si": "Bits (SI)",
+            "name-bytes-iec": "Bytes (IEC)",
+            "name-bytes-si": "Bytes (SI)",
+            "name-gibibytes": "Gibibytes",
+            "name-gigabytes": "Gigabytes",
+            "name-kibibytes": "Kibibytes",
+            "name-kilobytes": "Kilobytes",
+            "name-mebibytes": "Mebibytes",
+            "name-megabytes": "Megabytes",
+            "name-pebibytes": "Pebibytes",
+            "name-petabytes": "Petabytes",
+            "name-tebibytes": "Tebibytes",
+            "name-terabytes": "Terabytes"
           },
-          "name": ""
+          "name": "Daten"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "Bits/Sek. (IEC)",
+            "name-bits-sec-si": "Bits/Sek. (SI)",
+            "name-bytes-sec-iec": "Bytes/Sek. (IEC)",
+            "name-bytes-sec-si": "Bytes/Sek. (SI)",
+            "name-gibibits-sec": "Gibibits/Sek.",
+            "name-gibibytes-sec": "Gibibytes/Sek.",
+            "name-gigabits-sec": "Gigabits/Sek.",
+            "name-gigabytes-sec": "Gigabytes/Sek.",
+            "name-kibibits-sec": "Kibibits/Sek.",
+            "name-kibibytes-sec": "Kibibytes/Sek.",
+            "name-kilobits-sec": "Kilobits/Sek.",
+            "name-kilobytes-sec": "Kilobytes/Sek.",
+            "name-mebibits-sec": "Mebibits/Sek.",
+            "name-mebibytes-sec": "Mebibytes/Sek.",
+            "name-megabits-sec": "Megabits/Sek.",
+            "name-megabytes-sec": "Megabytes/Sek.",
+            "name-packets-sec": "Pakete/Sek.",
+            "name-pebibits-sec": "Pebibits/Sek.",
+            "name-pebibytes-sec": "Pebibytes/Sek.",
+            "name-petabits-sec": "Petabits/Sek.",
+            "name-petabytes-sec": "Petabytes/Sek.",
+            "name-tebibits-sec": "Tebibits/Sek.",
+            "name-tebibytes-sec": "Tebibytes/Sek.",
+            "name-terabits-sec": "Terabits/Sek.",
+            "name-terabytes-sec": "Terabytes/Sek."
           },
-          "name": ""
+          "name": "Datenrate"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Datetime-Standard",
+            "name-datetime-iso": "Datetime ISO",
+            "name-datetime-iso-no-date": "Datetime ISO (Kein Datum, wenn heute)",
+            "name-datetime-local": "Datetime local",
+            "name-datetime-local-no-date": "Datetime local (Kein Datum, wenn heute)",
+            "name-datetime-us": "Datetime US",
+            "name-datetime-us-no-date": "Datetime US (Kein Datum, wenn heute)",
+            "name-from-now": "Ab jetzt"
           },
-          "name": ""
+          "name": "Datum und Uhrzeit"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Ampere (A)",
+            "name-ampere-hour": "Amperestunde (Ah)",
+            "name-decibel-milliwatt": "Dezibel-Milliwatt (dBm)",
+            "name-electron-volt": "Elektronenvolt (eV)",
+            "name-farad": "Farad (F)",
+            "name-femtofarad": "Femtofarad (fF)",
+            "name-gigawatt": "Gigawatt (GW)",
+            "name-henry": "Henry (H)",
+            "name-joule": "Joule (J)",
+            "name-kiloampere": "Kiloampere (kA)",
+            "name-kiloampere-hour": "Kiloampere-Stunde (kAh)",
+            "name-kiloohm": "Kiloohm (kΩ)",
+            "name-kilovolt": "Kilovolt (kV)",
+            "name-kilovolt-ampere": "Kilovolt-Ampere (kVA)",
+            "name-kilovolt-ampere-reactive": "Kilovolt-Ampere reaktiv (kVAr)",
+            "name-kilowatt": "Kilowatt (kW)",
+            "name-kilowatt-hour": "Kilowattstunde (kWh)",
+            "name-kilowatt-min": "Kilowattminute (kWm)",
+            "name-lumens": "Lumen (lm)",
+            "name-megaohm": "Megaohm (MΩ)",
+            "name-megawatt": "Megawatt (MW)",
+            "name-megawatt-hour": "Megawattstunde (MWh)",
+            "name-microfarad": "Mikrofarad (µF)",
+            "name-microhenry": "Mikrohenry (µH)",
+            "name-milliampere": "Milliampere (mA)",
+            "name-milliampere-hour": "Milliampere-Stunde (mAh)",
+            "name-millihenry": "Millihenry (mH)",
+            "name-milliohm": "Milliohm (mΩ)",
+            "name-millivolt": "Millivolt (mV)",
+            "name-milliwatt": "Milliwatt (mW)",
+            "name-nanofarad": "Nanofarad (nF)",
+            "name-ohm": "Ohm (Ω)",
+            "name-picofarad": "Picofarad (pF)",
+            "name-volt": "Volt (V)",
+            "name-volt-ampere": "Volt-Ampere (VA)",
+            "name-volt-ampere-reactive": "Volt-Ampere reaktiv (VAr)",
+            "name-watt": "Watt (W)",
+            "name-watt-hour": "Wattstunde (Wh)",
+            "name-watt-hour-per-kg": "Wattstunde pro Kilogramm (Wh/kg)",
+            "name-watt-square-meter": "Watt pro Quadratmeter (W/m²)"
           },
-          "name": ""
+          "name": "Energie"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Kubikfuß/min (cfm)",
+            "name-cubic-feet-sec": "Kubikfuß/Sek. (cfs)",
+            "name-cubic-meters-sec": "Kubikmeter/Sek. (cms)",
+            "name-gallons-min": "Gallonen/min (gpm)",
+            "name-litre-hour": "Liter/Stunde",
+            "name-litre-min": "Liter/min (L/min)",
+            "name-lux": "Lux (lx)",
+            "name-millilitre-min": "Milliliter/min (ml/min)"
           },
-          "name": ""
+          "name": "Flow"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Kilonewtonmeter (kNm)",
+            "name-kilonewtons": "Kilonewton (kN)",
+            "name-newton-meters": "Newtonmeter (Nm)",
+            "name-newtons": "Newton (N)"
           },
-          "name": ""
+          "name": "Kraft"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "Exahashes/Sek.",
+            "name-gigahashes-sec": "Gigahashes/Sek.",
+            "name-hashes-sec": "Hashes/Sek.",
+            "name-kilohashes-sec": "Kilohashes/Sek.",
+            "name-megahashes-sec": "Megahashes/Sek.",
+            "name-petahashes-sec": "Petahashes/Sek.",
+            "name-terahashes-sec": "Terahashes/Sek."
           },
-          "name": ""
+          "name": "Hash-Rate"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "Fuß (ft)",
+            "name-inch": "Zoll (in)",
+            "name-kilometer": "Kilometer (km)",
+            "name-meter": "Meter (m)",
+            "name-mile": "Meile (mi)",
+            "name-millimeter": "Millimeter (mm)"
           },
-          "name": ""
+          "name": "Länge"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "Gramm (g)",
+            "name-kilogram": "Kilogramm (kg)",
+            "name-metric-ton": "Metrische Tonne (t)",
+            "name-milligram": "Milligramm (mg)",
+            "name-pound": "Pfund (lb)"
           },
-          "name": ""
+          "name": "Masse"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Candela (cd)",
+            "name-decibel": "Dezibel",
+            "name-hexadecimal": "Hexadezimal",
+            "name-hexadecimal-0x": "Hexadezimal (0x)",
+            "name-humidity": "Feuchtigkeit (%H)",
+            "name-locale": "Lokales Format",
+            "name-number": "Nummer",
+            "name-percent-1": "Prozent (0,0–1,0)",
+            "name-percent-100": "Prozent (0–100)",
+            "name-pixels": "Pixel",
+            "name-scientific": "Wissenschaftliche Schreibweise",
+            "name-short": "kurz",
+            "name-si-short": "SI kurz",
+            "name-string": "Zeichenfolge"
           },
-          "name": ""
+          "name": "Sonst."
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Balken",
+            "name-hectopascals": "Hektopascal",
+            "name-inches-mercury": "Zoll Quecksilbersäule",
+            "name-kilobars": "Kilobar",
+            "name-kilopascals": "Kilopascal",
+            "name-millibars": "Millibar",
+            "name-pascals": "Pascal",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Druck"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Becquerel (Bq)",
+            "name-curie": "Curie (Ci)",
+            "name-exposure": "Exposition (C/kg)",
+            "name-gray": "Gray (Gy)",
+            "name-microsievert": "Mikrosievert (µSv)",
+            "name-microsievert-hour": "Mikrosievert/Stunde (µSv/h)",
+            "name-millisievert": "Millisievert (mSv)",
+            "name-millisievert-hour": "Millisievert/Stunde (mSv/h)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "Röntgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/Stunde (Sv/h)"
           },
-          "name": ""
+          "name": "Strahlung"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Grad pro Sekunde (°/s)",
+            "name-gigahertz": "Gigahertz (GHz)",
+            "name-hertz": "Hertz (Hz)",
+            "name-kilohertz": "Kilohertz (kHz)",
+            "name-megahertz": "Megahertz (MHz)",
+            "name-radians-sec": "Radianten pro Sekunde (rad/s)",
+            "name-rpm": "Umdrehungen pro Minute (U/min)"
           },
-          "name": ""
+          "name": "Drehzahl"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsius (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Temperatur"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "Zählungen/Min. (cpm)",
+            "name-counts-sec": "Zählungen/Sek. (cps)",
+            "name-events-min": "Ereignisse/Min. (epm)",
+            "name-events-sec": "Ereignisse/Sek. (eps)",
+            "name-io-ops-sec": "E/A-Operationen/Sek. (iops)",
+            "name-messages-min": "Nachrichten/Min. (mpm)",
+            "name-messages-sec": "Nachrichten/Sek. (mps)",
+            "name-ops-min": "Operationen/Min. (opm)",
+            "name-ops-sec": "Operationen/Sek. (ops)",
+            "name-reads-min": "Lesevorgänge/Min. (rpm)",
+            "name-reads-sec": "Lesevorgänge/Sek. (rps)",
+            "name-records-min": "Datensätze/Min. (rpm)",
+            "name-records-sec": "Datensätze/Sek. (rps)",
+            "name-requests-min": "Anfragen/Min. (rpm)",
+            "name-requests-sec": "Anfragen/Sek. (rps)",
+            "name-rows-min": "Zeilen/Min. (rpm)",
+            "name-rows-sec": "Zeilen/Sek. (rps)",
+            "name-writes-min": "Schreibvorgänge/Min. (wpm)",
+            "name-writes-sec": "Schreibvorgänge/Sek. (wps)"
           },
-          "name": ""
+          "name": "Durchsatz"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "Uhr (ms)",
+            "name-clock-s": "Uhr (s)",
+            "name-days": "Tage (d)",
+            "name-duration-dhms": "Dauer (d hh:mm:ss)",
+            "name-duration-hms": "Dauer (hh:mm:ss)",
+            "name-duration-ms": "Dauer (ms)",
+            "name-duration-s": "Dauer (s)",
+            "name-hertz": "Hertz (1/s)",
+            "name-hours": "Stunden (h)",
+            "name-microseconds": "Mikrosekunden (µs)",
+            "name-milliseconds": "Millisekunden (ms)",
+            "name-minutes": "Minuten (m)",
+            "name-nanoseconds": "Nanosekunden (ns)",
+            "name-seconds": "Sekunden (s)",
+            "name-timeticks": "Timeticks (s/100)"
           },
-          "name": ""
+          "name": "Zeit"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "Kilometer/Stunde (km/h)",
+            "name-knot": "Knoten (kn)",
+            "name-meters-second": "Meter/Sekunde m/s",
+            "name-miles-hour": "Meilen/Stunde (mph)"
           },
-          "name": ""
+          "name": "Geschwindigkeit"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "Kubikdezimeter",
+            "name-cubic-meter": "Kubikmeter",
+            "name-gallons": "Gallonen",
+            "name-litre": "Liter (l)",
+            "name-millilitre": "Milliliter (ml)",
+            "name-normal-cubic-meter": "Normkubikmeter"
           },
-          "name": ""
+          "name": "Volumen"
         }
       }
     }
@@ -8386,7 +8387,7 @@
       "option": "Option"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Bildvorschau öffnen"
     },
     "cascader": {
       "clear-button": "Auswahl löschen"
@@ -8400,9 +8401,9 @@
       "aria-label-selected-color": "{{colorLabel}} Farbe"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Löschen",
       "cancel": "Abbrechen",
-      "confirmText-delete": ""
+      "confirmText-delete": "Löschen"
     },
     "confirm-content": {
       "placeholder": "Geben Sie zur Bestätigung „{{confirmPromptText}}“ ein"
@@ -8507,56 +8508,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "April",
+        "label-august": "August",
+        "label-december": "Dezember",
+        "label-february": "Februar",
+        "label-january": "Januar",
+        "label-july": "Juli",
+        "label-june": "Juni",
+        "label-march": "März",
+        "label-may": "Mai",
+        "label-november": "November",
+        "label-october": "Oktober",
+        "label-september": "September"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Vorgestern",
+        "last-1-hour": "Letzte 1 Stunde",
+        "last-1-year": "Letztes Jahr",
+        "last-12-hours": "Letzte 12 Stunden",
+        "last-15-mins": "Letzte 15 Minuten",
+        "last-2-days": "Letzte 2 Tage",
+        "last-2-years": "Letzte 2 Jahre",
+        "last-24-hours": "Letzte 24 Stunden",
+        "last-3-hours": "Letzte 3 Stunden",
+        "last-30-days": "Letzte 30 Tage",
+        "last-30-mins": "Letzte 30 Minuten",
+        "last-5-mins": "Letzte 5 Minuten",
+        "last-5-years": "Letzte 5 Jahre",
+        "last-6-hours": "Letzte 6 Stunden",
+        "last-6-months": "Letzte 6 Monate",
+        "last-7-days": "Letzte 7 Tage",
+        "last-90-days": "Letzte 90 Tage",
+        "previous-fiscal-quarter": "Vorheriges Geschäftsquartal",
+        "previous-fiscal-year": "Vorheriges Geschäftsjahr",
+        "previous-month": "Vorheriger Monat",
+        "previous-week": "Vorherige Woche",
+        "previous-year": "Vorheriges Jahr",
+        "this-day-last-week": "Dieser Tag letzte Woche",
+        "this-fiscal-quarter": "Dieses Geschäftsquartal",
+        "this-fiscal-quarter-so-far": "Dieses Geschäftsquartal bisher",
+        "this-fiscal-year": "Dieses Geschäftsjahr",
+        "this-fiscal-year-so-far": "Dieses Geschäftsjahr bisher",
+        "this-month": "Dieser Monat",
+        "this-month-so-far": "Dieser Monat bisher",
+        "this-week": "Diese Woche",
+        "this-week-so-far": "Diese Woche bisher",
+        "this-year": "Dieses Jahr",
+        "this-year-so-far": "Dieses Jahr bisher",
+        "today": "Heute",
+        "today-so-far": "Heute bisher",
+        "yesterday": "Gestern"
       }
     },
     "drawer": {
@@ -8607,18 +8608,18 @@
         "placeholder": "Feld auswählen"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Boolesch",
+        "label-enum": "Enum",
+        "label-number": "Nummer",
+        "label-other": "Sonstiges",
+        "label-string": "Zeichenfolge",
+        "label-time": "Zeit",
+        "label-traces": "Traces"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Frames ({{framesCount}}): {{framesNames}}",
+        "label": "Abfrage: {{refId}}",
+        "label-missing-ref-id": "Abfrage: (fehlende refId)"
       },
       "name-field-name-by-regex-matcher": "Felder mit Namen, die Regex entsprechen",
       "name-fields-by-query": "Von der Abfrage zurückgegebene Felder",
@@ -8652,8 +8653,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "Einklappen des Panels einschalten",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Panel-Ladebalken",
+      "ariaLabel-panel-status": "Panel-Status",
       "tooltip-cancel": "Abfrage abbrechen",
       "tooltip-cancel-loading": "Abfrage abbrechen",
       "tooltip-stop-streaming": "Streaming anhalten",
@@ -8722,12 +8723,12 @@
       "inspect-drawer-title": "Wert prüfen",
       "inspect-menu-label": "Wert prüfen",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Keine Daten"
       },
       "no-values-label": "Keine Werte",
       "pagination-summary": "{{itemsRangeStart}}–{{displayedEnd}} von {{numRows}} Zeilen",
       "sparkline": {
-        "no-data": ""
+        "no-data": "Keine Daten"
       }
     },
     "tags": {
@@ -8735,7 +8736,7 @@
     },
     "tags-input": {
       "add": "Hinzufügen",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Neues Tag (Eingabetaste zum Hinzufügen)",
       "remove": "Tag entfernen: {{name}}"
     },
     "time-sync-button": {
@@ -8828,14 +8829,14 @@
       "footer-add-annotation": "Anmerkung hinzufügen",
       "footer-click-to-action": "Klicken, um zu {{actionTitle}}",
       "footer-click-to-navigate": "Zum Öffnen von {{linkTitle}} klicken",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Filtern nach „{{value}}“",
       "timestamp": "Zeitstempel"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Standard",
+      "weekStarts-label-monday": "Montag",
+      "weekStarts-label-saturday": "Samstag",
+      "weekStarts-label-sunday": "Sonntag"
     }
   },
   "graph": {
@@ -9215,8 +9216,8 @@
       "title-create-library-panel": "Bibliotheksleiste erstellen"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Ändern",
+      "confirmText-replace": "Ersetzen"
     },
     "confirm": {
       "delete-panel": "Möchten Sie dieses Panel löschen?"
@@ -9241,7 +9242,7 @@
       "usage-count_other": "Verwendet bei {{count}} Dashboards"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Suche nach Name, Beschreibung oder Ordnername"
     },
     "loading-indicator": {
       "loading-library-panel": "Bibliotheks-Panel wird geladen ..."
@@ -9451,7 +9452,7 @@
       "close": "Logdetails schließen",
       "copy-shortlink": "Shortlink kopieren",
       "copy-to-clipboard": "In die Zwischenablage kopieren",
-      "displayed-fields-section": "",
+      "displayed-fields-section": "Angezeigte Felder organisieren",
       "fields": {
         "adhoc-statistics": "Ad-hoc-Statistiken",
         "copy-value-to-clipboard": "Wert in die Zwischenablage kopieren",
@@ -9464,25 +9465,25 @@
       },
       "fields-section": "Felder",
       "hide-log-line": "Log-Linie ausblenden",
-      "inline-mode": "",
+      "inline-mode": "Inline anzeigen",
       "links-section": "Links",
-      "log-line-field": "",
+      "log-line-field": "Log-Zeile",
       "log-line-section": "Log-Linie",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
+      "move-displayed-field-down": "Nach unten",
+      "move-displayed-field-up": "Nach oben",
       "no-details": "Keine anzuzeigenden Felder.",
-      "open-assistant": "",
+      "open-assistant": "Erklären Sie diese Log-Zeile in Assistant",
       "pin-line": "Log anheften",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "remove-displayed-field": "Feld entfernen",
+      "remove-log": "Log entfernen",
+      "scroll-to-logline": "Zur Logzeile scrollen",
       "search": {
         "no-results": "Keine anzuzeigenden Ergebnisse."
       },
       "search-placeholder": "Feldnamen und Werte durchsuchen",
       "show-context": "Kontext anzeigen",
       "show-log-line": "Log-Linie anzeigen",
-      "sidebar-mode": "",
+      "sidebar-mode": "Rechts verankern",
       "unpin-line": "Log nicht mehr anheften"
     },
     "log-line-menu": {
@@ -9490,9 +9491,9 @@
       "copy-log": "Protokollzeile kopieren",
       "hide-details": "Logdetails anzeigen",
       "icon-label": "Protokollmenü",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Log-Zeile",
+      "log-line-explainer": "Erklären Sie diese Log-Zeile auf prägnante Weise",
+      "open-assistant": "Erklären Sie diese Log-Zeile in Assistant",
       "pin-to-outline": "Protokoll anheften",
       "show-context": "Kontext anzeigen",
       "show-details": "Logdetails ausblenden",
@@ -9598,10 +9599,10 @@
     },
     "name-common-labels": "Allgemeine Labels",
     "name-deduplication": "Deduplizierung",
-    "name-details-mode": "",
+    "name-details-mode": "Panel-Modus für Log-Details",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "Inline",
+      "label-sidebar": "Seitenleiste"
     },
     "name-enable-infinite-scrolling": "Unbegrenztes Scrollen aktivieren",
     "name-enable-log-details": "Log-Details aktivieren",
@@ -9698,8 +9699,8 @@
       "updated-on": "Aktualisiert am"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Sind Sie sich sicher, dass Sie „{{snapshotToRemove}}“ löschen möchten?",
+      "confirmText-delete": "Löschen",
       "title-delete": "Löschen"
     },
     "unthemed-dashboard-import": {
@@ -9711,14 +9712,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "Name ist erforderlich",
+      "message-reserved-name": "Dies ist ein reservierter Name und kann nicht für einen Ordner verwendet werden.",
+      "message-same-name": "Ein Dashboard oder ein Ordner mit demselben Namen existiert bereits",
+      "message-same-name-general": "Ein Ordner oder Dashboard im allgemeinen Ordner mit demselben Namen existiert bereits"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Keine Optionen gefunden"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9868,8 +9869,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Maximale Anzahl von Warnregelgruppen erreicht: Löschen Sie einige Warnregelgruppen oder nehmen Sie ein Upgrade Ihres Plans vor und versuchen Sie es erneut.",
+        "alert-rules-quota-reached": "Maximale Anzahl von Warnregeln erreicht: Löschen Sie einige Warnregeln oder nehmen Sie ein Upgrade Ihres Plans vor und versuchen Sie es erneut.",
         "dashboard-already-managed": "Das Dashboard wird bereits von Grafana in der Cloud-Instanz bereitgestellt und verwaltet. Wir empfehlen, in Zukunft das bereitgestellte Dashboard zu verwenden. Wenn Sie das Dashboard weiterhin in die Cloud-Instanz kopieren möchten, ändern Sie bitte die Dashboard-ID im Dashboard-JSON, speichern Sie einen neuen Snapshot und laden Sie ihn erneut hoch.",
         "datasource-already-managed": "Die Datenquelle wird bereits von Grafana in der Cloud-Instanz bereitgestellt und verwaltet. Wenn es sich dabei um eine andere Ressource handelt, legen Sie bitte eine andere UID fest und versuchen Sie es erneut.",
         "datasource-invalid-url": "Es gibt eine Datenquelle mit einer ungültigen URL. Geben Sie eine gültige URL an und versuchen Sie es erneut.",
@@ -10337,9 +10338,9 @@
       "aria-label": "Hilfe"
     },
     "invite-user": {
-      "invite-button": "",
+      "invite-button": "Einladen",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Nutzer einladen"
     },
     "item": {
       "add-bookmark": "Zu Lesezeichen hinzufügen",
@@ -10562,7 +10563,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Keine Organisationen gefunden",
     "select-placeholder": "Organisation auswählen"
   },
   "page": {
@@ -10785,7 +10786,7 @@
         "permission": "Sie haben keine Berechtigung, diese Seite anzuzeigen.",
         "title-access-denied": "Zugriff verweigert"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Das Plugin konnte nicht geladen werden",
       "no-root-app-page-component-found": "Keine Root-App-Seitenkomponente gefunden"
     },
     "browse": {
@@ -10829,7 +10830,7 @@
         "update-status-text": "Plugins aktualisiert"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Möchten Sie wirklich auf die Version {{version}} downgraden? Dies sollten Sie normalerweise nicht tun",
         "downgrade-confirm": "Herabstufen",
         "downgrade-title": "Plugin-Version herabstufen"
       }
@@ -10884,8 +10885,8 @@
       "message": "Keine Plugins gefunden"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Siehe Konsole für weitere Details zum Fehler.",
+      "extension-error-alert-title": "Die Erweiterung konnte nicht geladen werden: „{{pluginId}}/{{extensionTitle}}“"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10922,8 +10923,8 @@
     "install-controls-button": {
       "title-uninstall-modal": "Deinstallieren von {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Sind Sie sicher, dass Sie dieses Plugin deinstallieren möchten?",
+        "confirmText-confirm": "Bestätigen"
       }
     },
     "install-controls-warning": {
@@ -10941,6 +10942,9 @@
       "label-plugin-id": "Plugin-ID",
       "label-severity": "Schweregrad"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Das Plugin kann nicht gefunden werden. Bitte überprüfen Sie, ob die URL korrekt ist oder <1></1>gehen Sie zum <3>Plugin-Katalog</3>.",
       "title-plugin-not-found": "Plugin nicht gefunden"
@@ -11097,29 +11101,29 @@
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Diese Ressource ist hinter dem Branch in {{repoType}}.",
+      "not-saved": "Die übrigen Nutzer von Grafana in Ihrem Unternehmen sehen weiterhin die aktuelle Version, die im konfigurierten Standard-Branch gespeichert ist, bis dieser Branch zusammengeführt wird",
+      "open-in-repo-button": "Öffnen in {{repoType}}",
+      "open-pull-request-in-repo": "Pull-Request öffnen in {{repoType}}",
+      "view-in-repo-button": "Zeigen Sie es in {{repoType}} an, um die letzten Änderungen zu sehen.",
+      "view-pull-request-in-repo": "Pull-Request anzeigen in {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "Eine neue Ressource wurde in einem Branch in {{repoType}} erstellt.",
+    "title-loaded-pull-request-in-repo": "Diese Ressource wird aus dem Branch geladen, den Sie gerade in {{repoType}} erstellt haben, und ist nur für Sie sichtbar"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Ressource erfolgreich gespeichert",
+  "provisioned-resource-request-handler-dashboard": "Dashboard erfolgreich gespeichert",
+  "provisioned-resource-request-handler-folder": "Der Ordner wurde erfolgreich erstellt",
   "provisioning": {
     "banner": {
       "message": "Diese Funktion befindet sich momentan in der aktiven Entwicklung. Für die bestmögliche Nutzererfahrung und die neuesten Verbesserungen empfehlen wir die Nutzung von <2>Nightly Build</2> von Grafana."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Der für die Bereitstellung verwendete Branch",
+      "branch-label": "Branch",
+      "branch-required": "Branch erforderlich",
+      "path-description": "Optionaler Unterverzeichnispfad innerhalb des Repositorys",
+      "path-label": "Pfad",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11128,18 +11132,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Ermöglicht Nutzern die Auswahl, ob beim Speichern von Änderungen ein Pull-Request geöffnet werden soll. Wenn das Repository keine direkten Änderungen am Hauptbranch zulässt, könnte dennoch ein Pull-Request erforderlich sein.",
+      "pr-workflow-label": "Pull-Request-Option beim Speichern aktivieren",
+      "token-description": "Bitbucket-App-Passwort mit Repository-Berechtigungen",
+      "token-label": "App-Passwort",
+      "token-required": "Bitbucket-Token erforderlich",
+      "token-user-description": "Der Benutzername, der für den Zugriff auf das Repository mit dem App-Passwort verwendet wird",
+      "token-user-label": "Benutzername",
+      "token-user-required": "Benutzername erforderlich",
+      "url-description": "Die Bitbucket-Repository-URL",
+      "url-label": "Repository-URL",
+      "url-pattern": "Muss eine gültige Bitbucket-Repository-URL sein",
+      "url-required": "Repository-URL erforderlich"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Fügen Sie einen eindeutigen Namen für diese Repository-Verbindung hinzu",
@@ -11150,12 +11154,12 @@
       "label-display-name": "Anzeigename",
       "placeholder-my-repository-connection": "Meine Repository-Verbindung",
       "text-loading-resource-information": "Ressourceninformationen werden geladen ...",
-      "dashboards-count_one": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} Dashboard",
+      "dashboards-count_other": "{{count}} Dashboard",
       "files-count_one": "{{count}} Dateien",
       "files-count_other": "{{count}} Dateien",
-      "folders-count_one": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} Ordner",
+      "folders-count_other": "{{count}} Ordner"
     },
     "check-repository": {
       "check": "Überprüfen"
@@ -11229,7 +11233,7 @@
       "title-instant-updates-requests-webhooks": "Sofortige Updates und Pull-Requests mit Webhooks.",
       "title-visual-previews-in-pull-requests": "Visuelle Vorschauen in Pull-Requests mit Bildwiedergabe"
     },
-    "error-title-default": "",
+    "error-title-default": "Fehler",
     "expanded-row": {
       "job-specification": "Auftragsspezifikation",
       "summary": "Zusammenfassung"
@@ -11238,8 +11242,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Benötigte Funktionsschalter einrichten"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Verwalten Sie Dashboards als Code in Git und stellen Sie Updates automatisch bereit",
+      "manage-your-dashboards-with-remote-provisioning": "Erste Schritte mit Git Sync",
       "store-dashboards-in-version-controlled-storage": "Speichern Sie Dashboards im versionskontrollierten Speicher für eine bessere Organisation und Verlaufsverfolgung"
     },
     "file-history-page": {
@@ -11260,16 +11264,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Fügt eine Bildvorschau der Dashboard-Änderungen bei Pull-Requests hinzu. Bilder Ihrer Grafana-Dashboards werden in Ihrem Git-Repository bereitgestellt und sind für jede Person mit Repository-Zugriff sichtbar.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Erstellen Sie Vorschau-Links für Pull-Requests",
       "description-image-rendering": "Erfordert Bild-Rendering. <2>Bild-Rendering einrichten</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(erfordert <2>Image Rendering</2> und aktivierten öffentlichen Zugriff)",
       "description-read-only": "Ressourcen können über Grafana nicht geändert werden.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Wie oft Änderungen aus dem Repository synchronisiert werden sollen",
+      "error-sync-interval-required": "Synchronisierungsintervall erforderlich",
       "label-enable-previews": "Dashboard-Vorschau in Pull-Requests aktivieren",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Dashboard-Vorschauen generieren",
       "label-read-only": "Nur lesen",
-      "label-sync-interval": ""
+      "label-sync-interval": "Synchronisierungsintervall (Sekunden)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Keine passenden Ergebnisse zu Ihrer Abfrage",
@@ -11301,46 +11305,46 @@
       "subtitle-provisioning-feature": "Sehen und verwalten Sie Ihre Bereitstellungsverbindungen"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Der für die Bereitstellung verwendete Branch",
+      "branch-label": "Branch",
+      "branch-required": "Branch erforderlich",
+      "path-description": "Optionaler Unterverzeichnispfad innerhalb des Repositorys",
+      "path-label": "Pfad",
+      "pr-workflow-description": "Ermöglicht Nutzern die Auswahl, ob beim Speichern von Änderungen ein Pull-Request geöffnet werden soll. Wenn das Repository keine direkten Änderungen am Hauptbranch zulässt, könnte dennoch ein Pull-Request erforderlich sein.",
+      "pr-workflow-label": "Pull-Request-Option beim Speichern aktivieren",
+      "token-description": "Zugriffstoken oder Passwort für das Git-Repository",
+      "token-label": "Zugriffstoken",
+      "token-required": "Git-Token erforderlich",
+      "token-user-description": "Der Benutzername, der für den Zugriff auf das Repository mit dem Zugriffstoken verwendet wird",
+      "token-user-label": "Benutzername",
+      "token-user-required": "Benutzername erforderlich",
+      "url-description": "Die Git-Repository-URL",
+      "url-label": "Repository-URL",
+      "url-pattern": "Muss eine gültige Git-Repository-URL sein",
+      "url-required": "Repository-URL erforderlich"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Der für die Bereitstellung verwendete Branch",
+      "branch-label": "Branch",
+      "branch-required": "Branch erforderlich",
+      "path-description": "Optionaler Unterverzeichnispfad innerhalb des Repositorys",
+      "path-label": "Pfad",
+      "pr-workflow-description": "Ermöglicht Nutzern die Auswahl, ob beim Speichern von Änderungen ein Pull-Request geöffnet werden soll. Wenn das Repository keine direkten Änderungen am Hauptbranch zulässt, könnte dennoch ein Pull-Request erforderlich sein.",
+      "pr-workflow-label": "Pull-Request-Option beim Speichern aktivieren",
+      "token-description": "Persönliches Zugriffstoken für GitHub mit Repository-Berechtigungen",
+      "token-label": "Persönliches Zugriffstoken",
+      "token-required": "GitHub-Token erforderlich",
+      "url-description": "Die GitHub-Repository-URL",
+      "url-label": "Repository-URL",
+      "url-pattern": "Muss eine gültige GitHub-Repository-URL sein",
+      "url-required": "Repository-URL erforderlich"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Der für die Bereitstellung verwendete Branch",
+      "branch-label": "Branch",
+      "branch-required": "Branch erforderlich",
+      "path-description": "Optionaler Unterverzeichnispfad innerhalb des Repositorys",
+      "path-label": "Pfad",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11349,15 +11353,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Ermöglicht Nutzern die Auswahl, ob beim Speichern von Änderungen ein Merge-Request geöffnet werden soll. Wenn das Repository keine direkten Änderungen am Hauptbranch zulässt, könnte dennoch ein Merge-Request erforderlich sein.",
+      "pr-workflow-label": "Merge-Request-Option beim Speichern aktivieren",
+      "token-description": "Projektzugriffstoken für GitLab mit Repository-Berechtigungen",
+      "token-label": "Projektzugriffstoken",
+      "token-required": "GitLab-Token erforderlich",
+      "url-description": "Die GitLab-Repository-URL",
+      "url-label": "Repository-URL",
+      "url-pattern": "Muss eine gültige GitLab-Repository-URL sein",
+      "url-required": "Repository-URL erforderlich"
     },
     "history-view": {
       "not-found": "Nicht gefunden"
@@ -11385,18 +11389,18 @@
       "starting": "Wird gestartet ...",
       "status": {
         "title-error-running-job": "Fehler bei der Ausführung des Auftrags",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Auftrag erfolgreich abgeschlossen",
+        "title-warning-running-job": "Auftrag wurde mit Warnungen abgeschlossen"
       },
       "summary": "Zusammenfassung",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Fehler beim Abrufen des aktiven Auftrags"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Lokaler Dateisystempfad zum Repository",
+      "path-label": "Repository-Pfad",
+      "path-required": "Repository-Pfad erforderlich"
     },
     "mode-options": {
       "folder": {
@@ -11422,7 +11426,7 @@
     },
     "repository-actions": {
       "settings": "Einstellungen",
-      "source-code": ""
+      "source-code": "Quellcode"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11488,22 +11492,22 @@
       "title-queued-for-deletion": "Zum Löschen in die Warteschlange gestellt"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Wählen Sie einen Provider:",
+      "configure-file": "Dateibereitstellung konfigurieren",
+      "configure-with-provider": "Konfigurieren mit {{ provider }}",
+      "provider-not-listed": "Wenn Ihr Provider nicht aufgelistet ist:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Mit Bitbucket-Repositorys verbinden",
+      "github": "GitHub",
+      "github-description": "Mit GitHub-Repositorys verbinden",
+      "gitlab": "GitLab",
+      "gitlab-description": "Mit GitLab-Repositorys verbinden",
+      "local": "Lokal",
+      "local-description": "Dateibereitstellung konfigurieren",
+      "pure-git": "Pure Git",
+      "pure-git-description": "Mit beliebigem Git-Repository verbinden"
     },
     "resource-view": {
       "base": "Basis",
@@ -11534,11 +11538,11 @@
       "label-current-step": "Aktueller Schritt",
       "label-pending-step": "Ausstehender Schritt"
     },
-    "success-title-default": "",
+    "success-title-default": "Erfolg",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Auftrag konnte nicht gestartet werden",
+      "error-no-repository-name": "Kein Repository-Name angegeben",
+      "error-starting-job": "Fehler beim Starten des Auftrags"
     },
     "sync-repository": {
       "body-edit-configuration": "Konfiguration bearbeiten",
@@ -11566,7 +11570,7 @@
       "go-to": "Weiter zu",
       "make-sure": "Achten Sie darauf, dass diese Berechtigungen berücksichtigt werden"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Warnung",
     "wizard": {
       "alert-point-1": "Während dieses Vorgangs können keine Ressourcen erstellt, bearbeitet oder gelöscht werden. Im letzten Schritt werden sie entfernt.",
       "alert-point-2": "Sobald die Bereitstellung abgeschlossen ist, werden die Ressourcen wieder angezeigt und über einen externen Speicher verwaltet.",
@@ -11576,10 +11580,10 @@
       "button-next": "Fertigstellen",
       "button-start": "Synchronisierung starten",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Dadurch wird die Repository-Konfiguration gelöscht und Sie verlieren alle Fortschritte. Sind Sie sicher, dass Sie Ihre Änderungen verwerfen möchten?",
+        "confirm": "Ja, verwerfen",
+        "dismiss": "Arbeit fortsetzen",
+        "title": "Repository-Einrichtung verwerfen?"
       },
       "step-bootstrap": "Wählen Sie aus, was synchronisiert wird",
       "step-connect": "Verbinden",
@@ -11595,7 +11599,7 @@
     "wizard-content": {
       "button-cancel": "Abbrechen",
       "button-cancelling": "Abbrechen ...",
-      "button-previous": "",
+      "button-previous": "Zurück",
       "button-submitting": "Übertragen …",
       "error-instance-repository-exists": "Das Instanz-Repository existiert bereits"
     }
@@ -11996,7 +12000,7 @@
         "recommended": "Empfohlen",
         "results": "Ergebnisse"
       },
-      "search": ""
+      "search": "Suchen nach {{parentTitle}}"
     }
   },
   "search": {
@@ -12077,7 +12081,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Keine Dienst-Accounts gefunden",
     "select-aria-label": "Dienstkontoauswahl",
     "select-placeholder": "Tippen Sie, um nach Dienstkonten zu suchen"
   },
@@ -12123,10 +12127,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Dienstkonto-Token hinzufügen",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Sind Sie sicher, dass Sie diesen Dienst-Account löschen möchten?",
+      "body-disable-service-account": "Sind Sie sicher, dass Sie diesen Dienst-Account deaktivieren möchten?",
+      "confirmText-delete-service-account": "Dienst-Account löschen",
+      "confirmText-disable-service-account": "Dienst-Account deaktivieren",
       "delete-service-account": "Dienstkonto löschen",
       "disable-service-account": "Dienstkonto deaktivieren",
       "enable-service-account": "Dienstkonto aktivieren",
@@ -12153,7 +12157,7 @@
       "used-by": "Genutzt von"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Speichern",
       "edit": "Bearbeiten"
     },
     "service-account-role-row": {
@@ -12167,16 +12171,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Dienstkonto hinzufügen",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Sind Sie sicher, dass Sie {{serviceAccountName}} löschen möchten?",
+      "body-disable-service-account": "Sind Sie sicher, dass Sie „{{accountToDisable}}“ deaktivieren möchten?",
+      "confirmText-delete": "Löschen",
+      "confirmText-disable-service-account": "Dienst-Account deaktivieren",
       "placeholder-search-service-account-by-name": "Dienstkonto nach Namen suchen",
       "sub-title": "Dienstkonten und ihre Token können für die Authentifizierung gegenüber der Grafana-API verwendet werden. Erfahren Sie mehr in unserer <2>Dokumentation.</2>",
       "title-delete-service-account": "Dienstkonto löschen",
       "title-disable-service-account": "Dienstkonto deaktivieren",
-      "body-delete_one": "",
-      "body-delete_other": ""
+      "body-delete_one": "Sind Sie sicher, dass Sie {{serviceAccountName}} und {{count}} zugehörige Token löschen möchten?",
+      "body-delete_other": "Sind Sie sicher, dass Sie {{serviceAccountName}} und {{count}} zugehörige Token löschen möchten?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Dieser Token ist abgelaufen",
@@ -12190,7 +12194,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Als Bild exportieren",
       "export-json-title": "Als JSON exportieren",
       "share-externally-title": "Extern teilen",
       "share-internally-title": "Intern teilen",
@@ -12227,17 +12231,17 @@
       "view-button-yaml": "YAML anzeigen"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Bildexportaktionen",
+      "cancel-button": "Abbrechen",
+      "download-button": "Bild herunterladen",
+      "error-title": "Bild konnte nicht erstellt werden",
+      "generate-button": "Bild erstellen",
+      "generating": "Bild wird erstellt …",
+      "info-text": "Dieses Dashboard als Bild speichern",
+      "preview": "Vorschau",
+      "preview-aria": "Vorschau des erstellten Bildes",
+      "preview-region": "Bildvorschau",
+      "title": "Als Bild exportieren"
     },
     "library": {
       "info": "Bibliotheks-Panel erstellen."
@@ -12247,7 +12251,7 @@
       "info-text": "Erstelle einen direkten Link zu diesem Dashboard oder Panel mit den folgenden angepassten Optionen.",
       "link-url": "Link-URL",
       "render-alert": "Bild-Render-Plug-in nicht installiert",
-      "render-instructions": "",
+      "render-instructions": "Um ein Bild zu rendern, müssen Sie das <2>Grafana Image Renderer Plugin</2> installieren. Bitte kontaktieren Sie Ihren Grafana-Administrator, um das Plugin zu installieren.",
       "rendered-image": "Direktlink zum gerenderten Bild",
       "save-alert": "Dashboard nicht gespeichert",
       "save-dashboard": "Um ein Panel-Bild zu rendern, muss zuerst das Dashboard gespeichert werden.",
@@ -12315,11 +12319,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Speichern Sie das Dashboard, um die Bilderstellung zu aktivieren",
+    "download-disabled-help": "Erstellen Sie zuerst ein Bild, um den Download zu aktivieren",
+    "error-title": "Bild konnte nicht erstellt werden",
     "form": {
-      "label": ""
+      "label": "Panel-Bildeinstellungen"
     },
     "preview": {
       "title": "Panel-Vorschau"
@@ -12634,17 +12638,17 @@
       "label-small": "Klein"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Aktionen",
+      "auto": "Auto",
+      "color-background": "Farbiger Hintergrund",
+      "color-text": "Farbiger Text",
+      "data-links": "Datenlinks",
+      "gauge": "Anzeige",
+      "image": "Bild",
+      "json": "JSON-Ansicht",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Pill",
+      "sparkline": "Sparkline"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "Wenn dies ausgewählt ist, wird die gesamte Zeile so eingefärbt, wie es diese Zelle wäre.",
@@ -12673,7 +12677,7 @@
     "description-count-rows": "Eine einzelne Anzahl für alle Datenzeilen anzeigen",
     "description-fields": "Wählen Sie die Felder aus, die berechnet werden sollen",
     "description-min-column-width": "Die Mindestbreite für die automatische Größenänderung der Spalte",
-    "description-wrap-header-text": "",
+    "description-wrap-header-text": "Aktiviert den Textumbruch für Spaltenüberschriften",
     "image-cell-options-editor": {
       "description-alt-text": "Alternativer Text, der angezeigt wird, wenn ein Bild nicht angezeigt werden kann, oder für Nutzer, die einen Screenreader verwenden",
       "description-title-text": "Text, der angezeigt wird, wenn über dem Bild der Mauszeiger bewegt wird",
@@ -12757,7 +12761,7 @@
     "tag-option-label": "Tag-Option"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Keine Teams gefunden",
     "select-aria-label": "Team-Picker",
     "select-placeholder": "Wählen Sie ein Team"
   },
@@ -13061,15 +13065,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Binäre Operation",
+          "reduce-row": "Zeile reduzieren",
+          "row-index": "Zeilenindex",
+          "unary-operation": "Unäre Operation"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Kumulative Funktionen",
+        "window-functions": "Fensterfunktionen"
       },
       "label-alias": "Alias",
       "label-mode": "Modus",
@@ -13087,9 +13091,9 @@
       "label-name": "Name",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Frame-Name in Feldname kopieren",
+          "ignore-the-frame-name": "Frame-Namen ignorieren",
+          "label-frame": "Label mit dem Frame-Namen hinzufügen"
         }
       },
       "placeholder-frame": "Frame"
@@ -13102,9 +13106,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Transformator für „Feldtyp konvertieren“ hinzufügen",
       "aria-label-remove-convert-field-type-transformer": "Transformator für „Feldtyp konvertieren“ entfernen",
-      "convert-field-type": "",
+      "convert-field-type": "Feldtyp konvertieren",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Feld in einen bestimmten Feldtyp konvertieren."
       },
       "label": {
         "browser": "Browser",
@@ -13117,11 +13121,11 @@
       "label-join-with": "Verbinden mit",
       "label-set-timezone": "Zeitzone festlegen",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Feldtyp konvertieren"
       },
       "placeholder-type": "Typ",
       "tags": {
-        "format-field": ""
+        "format-field": "Feld formatieren"
       },
       "tooltip-explicit-separator-joining-array-values": "Verwenden Sie ein explizites Trennzeichen, wenn Sie Array-Werte verbinden",
       "tooltip-input-format": "Geben Sie das Format des Eingabefelds an, damit Grafana den Datumsstring korrekt parsen kann.",
@@ -13147,13 +13151,13 @@
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Kombinieren Sie alle Felder in einem einzigen Frame."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Felder konkatenieren"
         },
         "tags": {
-          "combine": ""
+          "combine": "Kombinieren"
         }
       }
     },
@@ -13168,11 +13172,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Parsen Sie Felder von Inhalten (JSON, Labels usw.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Feld auswählen"
         }
       },
       "label-delimiter": "Trennzeichen",
@@ -13181,7 +13185,7 @@
       "label-replace-all-fields": "Alle Felder ersetzen",
       "label-source": "Quelle",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Felder extrahieren"
       },
       "placeholder-auto": "Auto",
       "placeholder-select-delimiter": "Trennzeichen wählen ...",
@@ -13192,20 +13196,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Nutzen Sie einen Feldwert für die Suche nach Ländern, Staaten oder Flughäfen."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Keine Textfelder gefunden"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Textfeld auswählen"
         }
       },
       "label-field": "Feld",
       "label-lookup": "Suche",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Felder aus Ressource suchen"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13216,23 +13220,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Entfernen Sie mit einem Regex-Muster Teile der Abfrageergebnisse."
       },
       "label-from-variable": "Von Variable",
       "label-identifier": "Kennung",
       "label-use-variable": "Variable verwenden",
       "label-variable": "Variable",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Felder nach Name filtern"
       },
       "placeholder-regular-expression-pattern": "Reguläres Ausdrucksmuster"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Entfernen Sie Zeilen aus den Daten, basierend auf der Ursprungsabfrage"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Daten nach Abfrage filtern"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13246,33 +13250,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Bedingung hinzufügen",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Entfernen Sie mit benutzerdefinierten Filtern Zeilen aus den Abfrageergebnissen."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Alle anpassen",
+          "match-any": "Einzeln anpassen"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Ausschließen",
+          "include": "Einschließen"
         }
       },
       "label-conditions": "Bedingungen",
       "label-filter-type": "Filtertyp",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Daten nach Werten filtern"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Keine Textfelder gefunden"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Textfeld auswählen"
         }
       },
       "label-field": "Feld",
@@ -13281,10 +13285,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Formatierung von Zeichenfolgenfeldern manipulieren."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Format Zeichenfolge"
       }
     },
     "format-time-transfomer-editor": {
@@ -13296,66 +13300,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Legen Sie das Ausgabeformat eines Zeitfelds fest"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Format Zeit"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Nutzen Sie die Zeilenwerte für die Berechnung eines neuen Felds."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Feld aus Berechnung hinzufügen"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Legen Sie Einheit, Min, Max und mehr fest."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Konfiguration aus Abfrageergebnissen"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Generieren Sie Heatmap-Daten aus Quelldaten."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Heatmap erstellen"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Glätten Sie markierte Ergebnisse in einer Tabelle, verbunden durch Labels."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Nach Labels verbinden"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Teilen Sie einen Ein-Frame-Datensatz in mehrere Reihen auf."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Nach Werten partitionieren"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Konvertieren Sie jede Zeile in ein Feld mit dynamischer Konfiguration."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Zeilen zu Feldern"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Wenden Sie räumliche Operationen auf Abfrageergebnisse an."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Räumliche Operationen"
       }
     },
     "get-timezone-options": {
@@ -13387,8 +13391,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Berechnen",
+          "group-by": "Gruppieren nach"
         }
       },
       "placeholder-ignored": "Ignoriert",
@@ -13396,42 +13400,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Gruppieren Sie Daten nach einem Feldwert und erstellen Sie aggregierte Daten."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Gruppieren nach"
       },
       "title-calc-alert": "Berechnungen haben keine Auswirkung, wenn keine Felder gruppiert werden"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Gruppieren Sie Daten nach einem Feldwert und erstellen Sie verschachtelte Tabellen mit den gruppierten Daten."
       },
       "description-show-field-names": "Wenn dies aktiviert ist, werden verschachtelte Tabellen Feldnamen als Tabellenüberschrift anzeigen",
       "label-show-field-names-in-nested-tables": "Feldnamen in verschachtelten Tabellen anzeigen",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Zu verschachtelten Tabellen gruppieren"
       },
       "title-calc-alert": "Berechnungen haben keine Auswirkung, wenn keine Felder gruppiert werden."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Summieren und reorganisieren Sie Daten basierend auf drei Feldern."
       },
       "label-cell-value": "Zellenwert",
       "label-column": "Spalte",
       "label-empty-value": "Leerer Wert",
       "label-row": "Zeile",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Gruppierung zu Matrix"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Berechnen Sie ein Histogramm aus Eingabedaten."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Histogramm"
       },
       "placeholder-auto": "Auto",
       "placeholder-default": "Standard: 30",
@@ -13443,14 +13447,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Kombinieren Sie Zeilen von 2+ Tabellen, basierend auf einem zugehörigen Feld."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Durch Feld verbinden"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Erforderlich",
       "info": {
         "input-contain-labels": "Die Eingabe enthält keine Labels",
         "no-input-or-labels-found": "Keine Eingabe (oder Labels) gefunden",
@@ -13474,8 +13478,8 @@
       "label-value-field-name": "Wertefeldname",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Spalten",
+          "rows": "Zeilen"
         }
       },
       "placeholder-optional-select-label": "(Optional) Label auswählen",
@@ -13483,18 +13487,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Gruppieren Sie Reihen nach Zeit und geben Sie Labels oder Tags als Felder zurück."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Labels zu Feldern"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Begrenzen Sie die Anzahl der angezeigten Elemente."
       },
       "name": {
-        "limit": ""
+        "limit": "Limit"
       },
       "placeholder-value-or-variable": "Wert oder Variable"
     },
@@ -13507,11 +13511,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Fügen Sie mehrere Reihen zusammen. Werte werden zu einer Zeile kombiniert."
       },
       "merge-effect-applied-single-frame": "Zusammenführen hat keine Auswirkung bei Anwendung auf einen einzelnen Frame.",
       "name": {
-        "merge": ""
+        "merge": "Reihen/Tabellen zusammenfügen"
       }
     },
     "multi-info": {
@@ -13523,14 +13527,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Felder neu anordnen, ausblenden oder umbenennen."
       },
       "field-order": "Feldreihenfolge",
       "field-order-auto": "Auto",
       "field-order-manual": "Manuell",
       "first-frame-warning": "Felder organisieren funktioniert nur mit einem einzelnen Frame. Überlegen Sie, zunächst eine Join-Transformation anzuwenden oder die Eingabe zu filtern.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Felder nach Name organisieren"
       }
     },
     "partion-by-values-editor": {
@@ -13558,10 +13562,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Datenframes vom breiten Format in das lange Format ausdehnen."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Zeitreihen vorbereiten"
       }
     },
     "prepare-time-series-editor": {
@@ -13569,26 +13573,26 @@
       "label-info": "Info",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Jeden Frame in langes Format umwandeln"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Lange Zeitreihen"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Erstellt einen neuen Frame für jedes Zeit-/Zahlenpaar"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Zeitreihen mit mehreren Frames"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Erstellt einen einzelnen Frame, durch Zeit verbunden"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Breite Zeitreihen"
         }
       }
     },
@@ -13603,7 +13607,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Reduzieren Sie alle Zeilen oder Datenpunkte auf einen einzelnen Wert (z. B. Maximal- oder Mittelwert)."
       },
       "label-calculations": "Berechnungen",
       "label-include-time": "Zeit einbeziehen",
@@ -13620,7 +13624,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Reduzieren"
       },
       "placeholder-choose-stat": "Statistik auswählen"
     },
@@ -13630,18 +13634,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Erstellen Sie einen neuen Datenframe mit Prognosewerten eines statistischen Modells."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Trendlinie"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Kubisch",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Quadratisch",
         "quartic": "Quartisch",
-        "quintic": "Quintisch"
+        "quintic": "Quintisch",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Grad",
       "label-model-type": "Modelltyp",
@@ -13656,16 +13665,17 @@
       },
       "regression": "Regression",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Regressionsanalyse"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Anzahl der zu prognostizierenden X-, Y-Punkte"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Benennen Sie Teile der Abfrageergebnisse mit einem regulären Ausdruck und Ersatzmuster um."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Felder nach Regex umbenennen"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13679,33 +13689,33 @@
       "label-mode": "Modus",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Kombinieren Sie Daten aus zwei Tabellen, wenn in einem gemeinsamen Feld beider Tabellen übereinstimmende Werte sind.",
+          "join-on-a-field": "Verbinden Sie einen Feldwert mit duplizierten Werten. Nicht performante äußere Verknüpfung, die am besten für tabellarische (SQL-ähnliche) Daten verwendet wird.",
+          "keep-all-rows": "Behalten Sie alle Zeilen aus einer Tabelle mit einem Wert. Verbinden Sie verschiedene Feldwerte. Performant und am besten für Zeitreihen geeignet."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Innen",
+          "outer-tabular": "Außen (tabellarisch)",
+          "outer-time-series": "Außen (Zeitreihen)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Fügen Sie mehrere Reihen zusammen. Zeit, Metrik und Werte werden als Zeile zurückgegeben."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Reihen zu Zeilen"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Sortieren Sie Felder in einem Frame."
       },
       "label-field": "Feld",
       "label-reverse": "Rückwärts",
       "name": {
-        "sort-by": ""
+        "sort-by": "Sortieren nach"
       },
       "placeholder-select-field": "Feld auswählen"
     },
@@ -13728,13 +13738,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Konvertieren Sie Zeitreihendaten in Tabellenzeilen, sodass sie im Tabellen- oder Sparkline-Format angezeigt werden können."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "Die Transformation von Zeitreihen in Tabellen erfordert mindestens einen Zeitreihen-Frame, um zu funktionieren. Sie haben zurzeit keinen."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Zeitreihen zu Tabelle"
       }
     },
     "time-series-table-transform-editor": {
@@ -13752,15 +13762,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Transponieren Sie den Datenframe."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Transponieren"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Schwenken",
+        "transform": "Transformieren",
+        "translate": "Übersetzen"
       }
     },
     "unary-operation-editor": {
@@ -13769,13 +13779,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Neue Felder berechnen",
+        "combine": "Kombinieren",
+        "create-new-visualization": "Neue Visualisierung erstellen",
+        "filter": "Filtern",
+        "perform-spatial-operations": "Räumliche Operationen durchführen",
+        "reformat": "Neu formatieren",
+        "reorder-and-rename": "Neu anordnen und umbenennen"
       },
       "special-value-options": {
         "description": {
@@ -13846,7 +13856,7 @@
     "title": "Organisationen"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Keine Nutzer gefunden",
     "select-aria-label": "Nutzerauswahl",
     "select-placeholder": "Tippen Sie, um nach einem Nutzer zu suchen"
   },
@@ -13932,8 +13942,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Sind Sie sicher, dass Sie die Variable „{{variableToDelete}}“ löschen möchten?",
+      "confirmText-delete": "Löschen",
       "title-delete-variable": "Variable löschen"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13983,33 +13993,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Wie die Werte dieser Variable sortiert werden",
-      "name-sort": "",
+      "name-sort": "Sortieren",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Alphabetisch (aufsteigend)",
+          "alphabetical-caseinsensitive-asc": "Alphabetisch (schreibungsunabhängig, aufsteigend)",
+          "alphabetical-caseinsensitive-desc": "Alphabetisch (schreibungsunabhängig, absteigend)",
+          "alphabetical-desc": "Alphabetisch (absteigend)",
+          "disabled": "Deaktiviert",
+          "natural-asc": "Natürlich (aufsteigend)",
+          "natural-desc": "Natürlich (absteigend)",
+          "numerical-asc": "Numerisch (aufsteigend)",
+          "numerical-desc": "Numerisch (absteigend)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Option hinzufügen",
+      "description": "Fügen Sie neben den Abfrageergebnissen benutzerdefinierte Optionen hinzu",
+      "label-placeholder": "Label anzeigen",
+      "remove-option-button-label": "Option entfernen",
+      "value-placeholder": "Wert, standardmäßig leere Zeichenfolge"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "So sortieren Sie statische Optionen mit Abfrageergebnissen"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Standardwert",
       "placeholder-default-value-if-any": "Standardwert, falls vorhanden",
       "text-options": "Textoptionen"
     },
@@ -14038,8 +14048,8 @@
       "description-optional-display-name": "Optionaler Anzeigename",
       "description-template-variable-characters": "Der Name der Vorlagenvariable. (Max. 50 Zeichen)",
       "general": "Allgemein",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Label",
+      "name-name": "Name",
       "placeholder-descriptive-text": "Beschreibender Text",
       "placeholder-label-name": "Label-Name",
       "placeholder-variable-name": "Variablenname",
@@ -14055,13 +14065,13 @@
       "tooltip-remove-variable": "Variable entfernen"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Beschreibung"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Zwischen allen Werten schalten"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Variablentyp auswählen"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Nutzungen anzeigen"
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index 5160034287c..53931415e45 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Algunas características son estables (GA) y están habilitadas de forma predeterminada, mientras que otras se encuentran actualmente en su fase beta preliminar, disponibles para su adopción temprana.",
       "confirm-modal-body-2": "Aconsejamos comprender las implicaciones de cada cambio de característica antes de realizar modificaciones.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Guardar cambios",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Disponibilidad general",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Eliminar organización",
-      "confirmText-delete": "",
+      "confirmText-delete": "Eliminar",
       "title-delete": "Eliminar"
     },
     "anon-users": {
       "not-found": "No se han encontrado usuarios anónimos."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "¿Seguro que quieres forzar el cierre de sesión en todos los dispositivos?",
+      "confirmText-confirm-logout": "Confirmar cierre de sesión",
+      "confirmText-force-logout": "Forzar cierre de sesión",
       "title-force-logout-from-all-devices": "Forzar cierre de sesión en todos los dispositivos"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Guardar"
     },
     "edit-org": {
       "access-denied": "No tienes permiso para ver a los usuarios de esta organización. Para actualizar esta organización, ponte en contacto con el administrador del servidor.",
@@ -119,10 +119,10 @@
       "users-heading": "Usuarios de la organización"
     },
     "enterprise-auth-features-card": {
-      "dismiss": "",
-      "heading": "",
-      "learn-more-link": "",
-      "text": ""
+      "dismiss": "Descartar",
+      "heading": "Autenticación empresarial",
+      "learn-more-link": "Más información",
+      "text": "Gestione usuarios, equipos y permisos automáticamente con <1>SAML</1>, <3>SCIM</3>, <6>LDAP</6> y <8>RBAC</8>, disponibles en Grafana Cloud y Enterprise."
     },
     "feature-listing": {
       "title-auditing": "Auditoría",
@@ -216,11 +216,11 @@
       "not-editable": "La función de este usuario no puede editarse porque está sincronizada con tu proveedor de autenticación. Consulta los <1>documentos de autenticación de Grafana</1> para obtener más información."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "¿Seguro que quieres eliminar al usuario {{user}}?",
       "columns": {
         "aria-label-role": "Rol"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Eliminar",
       "delete-aria-label": "Eliminar usuario: {{name}}",
       "title-delete": "Eliminar"
     },
@@ -252,7 +252,7 @@
       "info-description": "Estos ajustes del sistema están definidos en grafana.ini o custom.ini (o anulados en variables ENV). Para modificarlos, actualmente es necesario reiniciar Grafana."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Confirmar eliminación"
     },
     "upgrade-info": {
       "title": "Licencia Enterprise"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Cambiar",
-      "confirmText-change": "",
+      "confirmText-change": "Cambiar",
       "grafana-admin-key": "Administrador de Grafana",
       "grafana-admin-no": "No",
       "grafana-admin-yes": "Sí",
       "title": "Permisos"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "¿Seguro que quieres eliminar a este usuario?",
+      "body-disable": "¿Seguro que quieres deshabilitar a este usuario?",
+      "confirmText-delete-user": "Eliminar usuario",
+      "confirmText-disable-user": "Deshabilitar usuario",
       "delete-button": "Eliminar usuario",
       "disable-button": "Deshabilitar usuario",
       "edit-button": "Editar",
@@ -331,7 +331,7 @@
       "title-disable-user": "Deshabilitar usuario"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Guardar"
     },
     "user-sessions": {
       "browser-column": "Navegador y sistema operativo",
@@ -374,20 +374,20 @@
       "am-active-timing-select-label-active-timings": "Tiempos de actividad"
     },
     "ad": {
-      "close": "",
-      "learn-more": ""
+      "close": "Cerrar",
+      "learn-more": "Más información"
     },
     "add-button": {
       "add-more": "Añadir más"
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "No se ha podido cargar el botón de regla de alerta de IA",
+        "feedback-button": "No se ha podido cargar el botón de comentarios con IA",
+        "improve-annotations-button": "No se ha podido cargar el botón de mejora de notas con IA",
+        "improve-labels-button": "No se ha podido cargar el botón de mejora de etiquetas con IA",
+        "template-button": "No se ha podido cargar el botón de plantilla de IA",
+        "triage-button": "No se ha podido cargar el botón de clasificación con IA"
       }
     },
     "alert": {
@@ -405,12 +405,12 @@
       "missing-series-resolve": "Faltan evaluaciones de series para resolver",
       "no-annotations": "Sin anotaciones",
       "notification-configuration": {
-        "active-timings": "",
+        "active-timings": "Intervalos de tiempo activos",
         "contact-point": "Punto de contacto",
         "group-by": "Agrupar por",
-        "group-title": "",
+        "group-title": "Configuración de notificaciones",
         "mute-timings": "Tiempos de silencio",
-        "timing-options": ""
+        "timing-options": "Tiempos"
       },
       "pending-period": "Periodo pendiente",
       "rule": "Regla",
@@ -493,7 +493,7 @@
       "title-muting-grouping-and-timings": "Silencio, agrupación y temporización"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "No se han encontrado fuentes de datos"
     },
     "alert-menu": {
       "copy-link": "Copiar enlace",
@@ -519,7 +519,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Regla de alerta"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -587,7 +587,7 @@
       "view-configuration": "Ver configuración"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Sí, restablecer la configuración",
       "gma-manual-configuration-description": "La configuración interna de Grafana Alertmanager no se puede cambiar manualmente. Para cambiar esta configuración, edita los recursos individuales a través de la interfaz de usuario.",
       "gma-manual-configuration-is-not-supported": "No se admiten cambios de configuración manual",
       "message": {
@@ -602,13 +602,13 @@
       "title-resetting-alertmanager-configuration": "Restableciendo la configuración de Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "¿Seguro que quieres restaurar la configuración a esta versión? Todos los cambios no guardados se perderán.",
       "columns": {
         "compare": "Comparar",
         "restore": "Restaurar",
         "text-latest": "Recientes"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Sí, restaurar la configuración",
       "loading": "Cargando...",
       "no-previous-configurations": "No hay configuraciones anteriores",
       "this-might-take-a-while": "Este proceso puede llevar un tiempo...",
@@ -888,10 +888,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Más acciones para el punto de contacto «{{contactPointName}}»",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Eliminar",
       "button-edit": "Editar",
       "button-view": "Vista",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Exportar",
       "export-label-export": "Exportar",
       "label-delete": "Eliminar",
       "label-manage-permissions": "Gestionar permisos",
@@ -964,7 +964,7 @@
     },
     "contactPoints": {
       "validation": {
-        "notFound": ""
+        "notFound": "No se ha podido encontrar el punto de contacto «{{contactPoint}}»"
       }
     },
     "continue-matching-indicator": {
@@ -973,7 +973,7 @@
     "copy-to-clipboard": "Copiar «{{label}}» al portapapeles",
     "create-metadata": {
       "label": {
-        "contact-point": "",
+        "contact-point": "Las notificaciones se envían a",
         "dashboard": "Panel de control",
         "dashboard-and-panel": "Dashboard y panel",
         "evaluation-interval": "Intervalo de evaluación",
@@ -1121,7 +1121,7 @@
       "content-show-all-errors": "Mostrar todos los errores"
     },
     "errors": {
-      "failedWith": ""
+      "failedWith": "{{-config}} falló con {{status}}: {{-message}}"
     },
     "evaluate-every-validation-options": {
       "message": {
@@ -1426,7 +1426,7 @@
       "label-disable-resolved-message": "Deshabilitar mensaje resuelto"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Cargando grupos...",
       "message": {
         "must-be-a-positive-integer": "El valor debe ser un número entero positivo.",
         "must-enter-a-group-name": "Debe introducirse un nombre del grupo"
@@ -1523,7 +1523,7 @@
       "group-loading-error": "Error al cargar el grupo",
       "interval": "Intervalo",
       "namespace": "Nombre del espacio",
-      "new": "",
+      "new": "Nuevo",
       "title": {
         "back": ""
       }
@@ -1555,7 +1555,7 @@
     },
     "group-loader": {
       "group-load-failed": "Error al cargar las reglas del grupo {{ groupName }} en {{ namespaceName }}",
-      "no-rules": ""
+      "no-rules": "No se han encontrado reglas en este grupo"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "El grupo se está eliminando"
@@ -1572,20 +1572,20 @@
       }
     },
     "home": {
-      "irm-card-description": "",
-      "irm-card-item-1": "",
-      "irm-card-item-2": "",
-      "irm-card-item-3": "",
-      "irm-card-item-4": "",
-      "irm-card-title": "",
+      "irm-card-description": "Unifique la respuesta de guardia, las alertas y los incidentes con Grafana Cloud IRM.",
+      "irm-card-item-1": "Gestione los horarios de guardia con su calendario o Terraform.",
+      "irm-card-item-2": "Responda a los incidentes a través de la web, la aplicación, Slack u otros canales.",
+      "irm-card-item-3": "Identifique las causas raíz con Grafana SIFT, que funciona con IA.",
+      "irm-card-item-4": "Analice incidentes pasados para mejorar la respuesta y la resiliencia.",
+      "irm-card-title": "Respuesta y gestión de incidentes",
       "label-get-started": "Empezar",
       "label-insights": "Información",
-      "synthetic-monitoring-card-description": "",
-      "synthetic-monitoring-card-item-1": "",
-      "synthetic-monitoring-card-item-2": "",
-      "synthetic-monitoring-card-item-3": "",
-      "synthetic-monitoring-card-item-4": "",
-      "synthetic-monitoring-card-title": ""
+      "synthetic-monitoring-card-description": "Supervise los flujos de usuarios críticos, los sitios web y las API externamente, desde ubicaciones en todo el mundo.",
+      "synthetic-monitoring-card-item-1": "Simule recorridos de usuario de extremo a extremo con comprobaciones del navegador.",
+      "synthetic-monitoring-card-item-2": "Ejecute comprobaciones de ping, DNS, HTTP/S y TCP en cada capa de la red.",
+      "synthetic-monitoring-card-item-3": "Utilice más de 20 sondas globales o sondas privadas detrás de su cortafuegos.",
+      "synthetic-monitoring-card-item-4": "Realice un seguimiento de los SLO con alertas integradas al estilo Prometheus directamente desde la interfaz de usuario.",
+      "synthetic-monitoring-card-title": "Supervisión sintética"
     },
     "import-to-gma": {
       "action-button": "Importar",
@@ -1599,7 +1599,7 @@
         "no-rules-body-yaml": "No hay reglas que importar. Seleccione un archivo YAML distinto.",
         "no-rules-title": "No hay reglas para importar",
         "not-using-rules-managed-by-integrations-or-plugins": {
-          "text": "",
+          "text": "Las reglas gestionadas por integraciones o complementos no deben importarse a las gestionadas por Grafana.",
           "title": "Información"
         },
         "plugin-rules-warning": {
@@ -1885,10 +1885,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "No se han encontrado fuentes de datos"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "¿Seguro que quieres eliminar «{{muteTiming}}»?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Desactivado",
@@ -1979,7 +1979,7 @@
     },
     "notification-policies-filter": {
       "label-search-by-contact-point": "Buscar por punto de contacto",
-      "placeholder-search-by-contact-point": "",
+      "placeholder-search-by-contact-point": "Elija un punto de contacto",
       "search-query-input-placeholder-search": "Buscar"
     },
     "notification-policies-list": {
@@ -2140,10 +2140,10 @@
         "conflict": "Otro usuario ha actualizado el árbol de políticas de notificación.",
         "error-code": "Mensaje de error: «{{error}}»",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "No se puede añadir o actualizar la ruta: los comparadores entrarán en conflicto con un árbol de enrutamiento externo si fusionamos los comparadores {{-matchers}}. Esto haría que la ruta fuera inaccesible."
         },
         "suffix": "Actualiza la página y vuelve a intentarlo.",
-        "title": ""
+        "title": "Error al añadir o actualizar la política de notificación"
       },
       "n-more-policies_one": "{{count}} políticas adicionales",
       "n-more-policies_other": "{{count}} políticas adicionales"
@@ -2199,7 +2199,7 @@
     "query-and-expressions-step": {
       "add-query": "Añadir consulta",
       "body-queries-expressions-configured": "Crea al menos una consulta o expresión sobre la que alertar",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Desactivar",
       "expressions": "Expresiones",
       "loading-data-sources": "Cargando fuentes de datos...",
       "manipulate-returned-queries-other-operations": "Manipula los datos devueltos por las consultas con operaciones matemáticas y de otro tipo.",
@@ -2253,7 +2253,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Registrando regla"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "No se ha podido cargar el editor de consultas debido a: {{errorMessage}}"
@@ -2273,7 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Deberás establecer un nuevo grupo de evaluación para la regla copiada porque el original se ha aprovisionado y no se puede usar para las reglas creadas en la interfaz de usuario.",
       "body-not-provisioned": "La nueva regla <1>no</1> se marcará como una regla aprovisionada.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Copiar",
       "title-copy-provisioned-alert-rule": "Copiar regla de alerta aprovisionada"
     },
     "redirect-to-rule-viewer": {
@@ -2492,12 +2492,12 @@
         "new-badge": "¡Nuevo!",
         "text": "Importar a las reglas gestionadas por Grafana"
       },
-      "loading-more-groups": "",
+      "loading-more-groups": "Cargando más grupos...",
       "more": "Más",
       "new-alert-rule": "Nueva regla de alerta",
       "new-datasource-recording-rule": "Nueva regla de registro de fuente de datos",
       "new-grafana-recording-rule": "Nueva regla de registro de Grafana",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Nueva regla de alerta para la exportación",
       "pagination": {
         "next-page": "Mostrar más..."
       },
@@ -2671,7 +2671,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Administradores de alertas"
       }
     },
     "settings-content": {
@@ -2809,7 +2809,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Actualizar vista previa",
-      "empty-state": "",
+      "empty-state": "Añade contenido de plantilla para ver la vista previa",
       "label-preview": "Vista previa",
       "refresh": "Actualizar"
     },
@@ -2828,7 +2828,7 @@
       "loading": "Cargando...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Seleccionar plantilla de notificación"
         },
         "label": {
           "select-notification-template": "Seleccionar plantilla de notificación"
@@ -2856,8 +2856,8 @@
     },
     "templates-table": {
       "actions": "Acciones",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "¿Seguro que quieres eliminar el grupo de plantillas «{{template}}»?",
+      "confirmText-yes-delete": "Sí, eliminar",
       "no-templates-defined": "No hay plantillas definidas.",
       "template-group": "Grupo de plantillas",
       "title-delete-template-group": "Eliminar grupo de plantillas"
@@ -2912,7 +2912,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Gestionar reglas de alerta, reglas de registro e intervalo de evaluación"
       }
     },
     "to-gma": {
@@ -2992,7 +2992,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Sí, eliminar"
       }
     },
     "use-delete-policy-modal": {
@@ -3046,51 +3046,51 @@
     }
   },
   "alertlist": {
-    "category-alert-state-filter": "",
-    "category-filter": "",
-    "category-options": "",
-    "descriptino-alerts-linked-to-dashboard": "",
-    "description-alert-instance-label": "",
-    "description-alert-name": "",
-    "description-datasource": "",
-    "description-folder": "",
-    "description-group-by": "",
-    "description-group-mode": "",
-    "description-max-items": "",
-    "description-show-inactive-alerts": "",
-    "description-sort-order": "",
-    "description-view-mode": "",
+    "category-alert-state-filter": "Filtro de estado de alerta",
+    "category-filter": "Filtro",
+    "category-options": "Opciones",
+    "descriptino-alerts-linked-to-dashboard": "Mostrar solo las alertas vinculadas a este dashboard",
+    "description-alert-instance-label": "Filtrar instancias de alerta mediante la consulta de etiquetas, por ejemplo: {severity=\"critical\", instance=~\"cluster-us-.+\"}",
+    "description-alert-name": "Filtrar por alertas que contengan este texto",
+    "description-datasource": "Filtrar de la fuente de alerta",
+    "description-folder": "Filtrar por alertas en la carpeta seleccionada (solo para reglas de alerta gestionadas por Grafana)",
+    "description-group-by": "Filtrar alertas mediante la consulta de etiquetas",
+    "description-group-mode": "Cómo se deben agrupar las instancias de alerta",
+    "description-max-items": "Máximo de alertas que se muestran",
+    "description-show-inactive-alerts": "Incluir reglas de alerta que tengan 0 (cero) instancias. Debido a que estas reglas no tienen instancias, permanecen ocultas si se configura el filtro de etiqueta de instancia de alerta.",
+    "description-sort-order": "Orden de clasificación de alertas e instancias de alerta",
+    "description-view-mode": "Alternar entre la vista de lista y la vista de estadísticas",
     "group-by": {
       "aria-label-group-by-label-keys": "agrupar por claves de etiqueta",
       "placeholder-group-by": "Agrupar por"
     },
     "group-mode-options": {
-      "label-custom-grouping": "",
-      "label-default-grouping": ""
+      "label-custom-grouping": "Agrupación personalizada",
+      "label-default-grouping": "Agrupación predeterminada"
     },
-    "name-alert-instance-label": "",
-    "name-alert-name": "",
-    "name-alerts-linked-to-dashboard": "",
-    "name-datasource": "",
-    "name-error": "",
-    "name-firing": "",
-    "name-folder": "",
-    "name-group-by": "",
-    "name-group-mode": "",
-    "name-max-items": "",
-    "name-no-data": "",
-    "name-normal": "",
-    "name-pending": "",
-    "name-recovering": "",
-    "name-show-inactive-alerts": "",
-    "name-sort-order": "",
-    "name-view-mode": "",
+    "name-alert-instance-label": "Etiqueta de instancia de alerta",
+    "name-alert-name": "Nombre de la alerta",
+    "name-alerts-linked-to-dashboard": "Alertas vinculadas a este dashboard",
+    "name-datasource": "Fuente de datos",
+    "name-error": "Error",
+    "name-firing": "Alertas/Activación",
+    "name-folder": "Carpeta",
+    "name-group-by": "Agrupar por",
+    "name-group-mode": "Modo de grupo",
+    "name-max-items": "Máx. de elementos",
+    "name-no-data": "Sin datos",
+    "name-normal": "Normal",
+    "name-pending": "Pendiente",
+    "name-recovering": "En recuperación",
+    "name-show-inactive-alerts": "Mostrar alertas con 0 instancias",
+    "name-sort-order": "Criterio de ordenación",
+    "name-view-mode": "Modo de visualización",
     "sort-order-options": {
-      "label-alphabetical-asc": "",
-      "label-alphabetical-desc": "",
-      "label-importance": "",
-      "label-time-asc": "",
-      "label-time-desc": ""
+      "label-alphabetical-asc": "Alfabético (asc.)",
+      "label-alphabetical-desc": "Alfabético (desc.)",
+      "label-importance": "Importancia",
+      "label-time-asc": "Hora (asc.)",
+      "label-time-desc": "Hora (desc.)"
     },
     "ungrouped-mode-view": {
       "active-for": "durante <1>{{duration}}</1>",
@@ -3106,8 +3106,8 @@
       "title-permission-required": "Permiso obligatorio"
     },
     "view-mode-options": {
-      "label-list": "",
-      "label-stat": ""
+      "label-list": "Lista",
+      "label-stat": "Estadística"
     }
   },
   "annolist": {
@@ -3120,31 +3120,31 @@
     "annotation-list-item": {
       "tooltip-created-by": "Creado por:<1></1> {{email}}"
     },
-    "category-annotation-query": "",
-    "category-display": "",
-    "category-link-behaviour": "",
-    "description-tags": "",
+    "category-annotation-query": "Consulta de anotaciones",
+    "category-display": "Mostrar",
+    "category-link-behaviour": "Comportamiento del enlace",
+    "description-tags": "Hacer coincidir etiquetas de anotación",
     "link-target-options": {
-      "label-dashboard": "",
-      "label-panel": ""
+      "label-dashboard": "Dashboard",
+      "label-panel": "Panel"
     },
-    "name-limit": "",
-    "name-link-target": "",
-    "name-query-filter": "",
-    "name-show-tags": "",
-    "name-show-time": "",
-    "name-show-user": "",
-    "name-tags": "",
-    "name-time-after": "",
-    "name-time-before": "",
-    "name-time-range": "",
+    "name-limit": "Límite",
+    "name-link-target": "Destino del enlace",
+    "name-query-filter": "Filtro de consulta",
+    "name-show-tags": "Mostrar las etiquetas",
+    "name-show-time": "Mostrar la hora",
+    "name-show-user": "Mostrar el usuario",
+    "name-tags": "Etiquetas",
+    "name-time-after": "Hora después",
+    "name-time-before": "Hora antes",
+    "name-time-range": "Intervalo de tiempo",
     "query-filter-options": {
-      "label-all-dashboards": "",
-      "label-this-dashboard": ""
+      "label-all-dashboards": "Todos los dashboard",
+      "label-this-dashboard": "Este dashboard"
     },
     "time-range-options": {
-      "label-none": "",
-      "label-this-dashboard": ""
+      "label-none": "Ninguno",
+      "label-this-dashboard": "Este dashboard"
     }
   },
   "annotations": {
@@ -3152,7 +3152,7 @@
       "annotation": "Notas",
       "first-value": "Primer valor",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Nombres de campo desconocidos"
     },
     "empty-state": {
       "button-title": "Añadir consulta de anotación",
@@ -3162,12 +3162,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Cuando se define este campo, la anotación se tratará como un rango",
+        "results-split-on-comma": "Los resultados se dividirán con comas (,)"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}, o el primer campo de texto",
+        "time-or-the-first-field": "{{defaultField}}, o el primer campo de tiempo"
       }
     },
     "standard-annotation-query-editor": {
@@ -3245,9 +3245,9 @@
       "define-allowed-teams-ids-label": "Definir ID de equipos permitidos",
       "display-name-description": "Se mostrará en la página de inicio de sesión como «Iniciar sesión con...». Resulta útil si utiliza más de un proveedor de identidad o protocolos SSO.",
       "display-name-label": "Nombre para mostrar",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Parámetro para indicar el ámbito del usuario en el inquilino de Azure AD/Entra ID y agilizar el proceso de inicio de sesión.",
+      "domain-hint-label": "Sugerencia de dominio",
+      "domain-hint-valid-domain": "Este campo debe ser un dominio válido.",
       "email-attribute-name-description": "Nombre de la clave que se utilizará para la búsqueda de correo electrónico del usuario dentro del mapa de atributos del token de identificación OAuth2.",
       "email-attribute-name-label": "Nombre del atributo de correo electrónico",
       "email-attribute-path-description": "Expresión JMESPath que se utilizará para la búsqueda de correo electrónico del usuario a partir de la información del usuario.",
@@ -3264,11 +3264,11 @@
       "id-token-attribute-name-label": "Nombre del atributo del token de ID",
       "login-attribute-path-description": "Expresión JMESPath que se utilizará para la búsqueda de inicios de sesión del usuario a partir del token de ID de usuario.",
       "login-attribute-path-label": "Ruta del atributo de inicio de sesión",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Aceptar",
+      "login-prompt-description": "Indica el tipo de interacción del usuario cuando este inicia sesión con el IdP.",
+      "login-prompt-label": "Aviso de inicio de sesión",
+      "login-prompt-login": "Iniciar sesión",
+      "login-prompt-select-account": "Seleccionar cuenta",
       "managed-identity-client-id-description": "El ID de cliente de identidad administrada de la credencial de identidad federada de su aplicación OAuth2.",
       "managed-identity-client-id-label": "ID de cliente de identidad gestionada de FIC",
       "name-attribute-path-description": "Expresión JMESPath que se utilizará para la búsqueda de nombres de usuario a partir del token de ID de usuario. \nEste nombre se utilizará como nombre para mostrar del usuario.",
@@ -3304,7 +3304,7 @@
       "team-ids-github": "Lista de números enteros de ID de equipo.",
       "team-ids-label": "ID de equipo",
       "team-ids-numbers": "Los ID de equipo deben ser números.",
-      "team-ids-other": "",
+      "team-ids-other": "Lista de cadenas de los ID de equipo.",
       "team-ids-placeholder": "Introduzca los ID de equipo y pulse Intro para añadirlos",
       "teams-url-description": "La URL utilizada para consultar los ID de equipo. Si no se establece, el valor predeterminado es /teams.",
       "teams-url-description-oauth": "Si configura «{{ teamsURLLabel }}», también debe configurar «{{ teamIDsAttributePathLabel }}».",
@@ -3339,8 +3339,8 @@
       }
     },
     "provider-card": {
-      "saml-learn-more": "",
-      "scim-learn-more": "",
+      "saml-learn-more": "Inicio de sesión único (SSO) con SAML.",
+      "scim-learn-more": " Sincronizar usuarios y equipos con SCIM.",
       "text-badge-enabled": "Activado",
       "text-badge-not-enabled": "No habilitada"
     },
@@ -3348,7 +3348,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Restablecer a los valores predeterminados"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Restablecer",
       "disable": "Deshabilitar",
       "disabling": "Deshabilitando...",
       "discard": "Descartar",
@@ -3368,7 +3368,7 @@
       "text-badge-not-enabled": "No habilitada"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM se encuentra actualmente en fase de desarrollo y no se recomienda para su uso en producción. Úsalo con precaución y ten en cuenta que puede sufrir cambios."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "El punto final .well-known/openid-configuration para tu IdP",
@@ -3380,99 +3380,99 @@
   },
   "bar-chart": {
     "warn": {
-      "missing-numeric": "",
-      "missing-series": ""
+      "missing-numeric": "No se han encontrado campos numéricos",
+      "missing-series": "Los gráficos de barras requieren un campo de cadena o de tiempo"
     }
   },
   "barchart": {
     "config": {
-      "category-thresholds": "",
-      "description-color-by-field": "",
-      "description-x-label-max-length": "",
-      "name-bar-radius": "",
-      "name-bar-width": "",
-      "name-color-by-field": "",
-      "name-fill-opacity": "",
-      "name-full-highlight": "",
-      "name-gradient-mode": "",
-      "name-group-width": "",
-      "name-line-width": "",
-      "name-orientation": "",
-      "name-rotate-x-labels": "",
-      "name-show-thresholds": "",
-      "name-show-values": "",
-      "name-stacking": "",
-      "name-transform": "",
-      "name-x-axis": "",
-      "name-x-label-max-length": "",
-      "name-x-label-min-spacing": "",
+      "category-thresholds": "Umbrales",
+      "description-color-by-field": "Utilice el valor del color de un campo hermano para colorear cada valor de la barra.",
+      "description-x-label-max-length": "Las etiquetas del eje X se truncarán a la longitud proporcionada",
+      "name-bar-radius": "Radio de la barra",
+      "name-bar-width": "Ancho de barra",
+      "name-color-by-field": "Color por campo",
+      "name-fill-opacity": "Opacidad de relleno",
+      "name-full-highlight": "Resaltar el área completa al pasar el ratón por encima",
+      "name-gradient-mode": "Modo degradado",
+      "name-group-width": "Ancho del grupo",
+      "name-line-width": "Espesor de la línea",
+      "name-orientation": "Orientación",
+      "name-rotate-x-labels": "Rotar etiquetas de marca del eje x",
+      "name-show-thresholds": "Mostrar umbrales",
+      "name-show-values": "Mostrar valores",
+      "name-stacking": "Apilamiento",
+      "name-transform": "Transformar",
+      "name-x-axis": "Eje X",
+      "name-x-label-max-length": "Longitud máxima de la etiqueta de marca del eje X",
+      "name-x-label-min-spacing": "Espaciado mínimo de las etiquetas del eje X",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-line-vertical": ""
+        "label-auto": "Auto",
+        "label-horizontal": "Horizontal",
+        "label-line-vertical": "Vertical"
       },
-      "placeholder-x-axis": "",
-      "placeholder-x-label-max-length": "",
+      "placeholder-x-axis": "Primer campo de cadena o de tiempo",
+      "placeholder-x-label-max-length": "Ninguno",
       "show-values-options": {
-        "label-always": "",
-        "label-auto": "",
-        "label-never": ""
+        "label-always": "Siempre",
+        "label-auto": "Auto",
+        "label-never": "Nunca"
       },
       "transform-options": {
-        "description-constant": "",
-        "description-negative-y": "",
-        "label-constant": "",
-        "label-negative-y": ""
+        "description-constant": "El primer valor se mostrará como una línea constante",
+        "description-negative-y": "Voltear los resultados a valores negativos en el eje y",
+        "label-constant": "Constante",
+        "label-negative-y": "Y negativa"
       }
     },
     "tick-spacing-editor": {
       "content-require-space-from-the-right-side": "Requerir espacio desde el lado derecho",
       "gaps-options": {
-        "description-large": "",
-        "description-medium": "",
-        "description-none": "",
-        "description-small": "",
-        "label-large": "",
-        "label-medium": "",
-        "label-none": "",
-        "label-small": ""
+        "description-large": "Requerir {{spacing}} de espaciado",
+        "description-medium": "Requerir {{spacing}} de espaciado",
+        "description-none": "Mostrar todas las marcas de verificación",
+        "description-small": "Requerir {{spacing}} de espaciado",
+        "label-large": "Grande",
+        "label-medium": "Medio",
+        "label-none": "Ninguno",
+        "label-small": "Pequeño"
       },
       "label-rtl": "Derecha a izquierda"
     }
   },
   "bargauge": {
     "bar-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Auto",
+      "label-manual": "Manual"
     },
-    "category-bar-gauge": "",
-    "description-max-height": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-show-unfilled-area": "",
+    "category-bar-gauge": "Medidor de barra",
+    "description-max-height": "Altura máxima de fila (orientación horizontal)",
+    "description-min-height": "Altura mínima de fila (orientación horizontal)",
+    "description-min-width": "Ancho mínimo de columna (orientación vertical)",
+    "description-show-unfilled-area": "Cuando se habilita, renderiza la región sin rellenar en gris",
     "display-mode-options": {
-      "label-basic": "",
-      "label-gradient": "",
-      "label-retro": ""
+      "label-basic": "Básico",
+      "label-gradient": "Gradiente",
+      "label-retro": "LCD retro"
     },
-    "name-bar-size": "",
-    "name-display-mode": "",
-    "name-max-height": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-name-placement": "",
+    "name-bar-size": "Tamaño de barra",
+    "name-display-mode": "Modo de visualización",
+    "name-max-height": "Altura máx.",
+    "name-min-height": "Altura mín.",
+    "name-min-width": "Anchura mín.",
+    "name-name-placement": "Colocación del nombre",
     "name-placement-options": {
-      "label-auto": "",
-      "label-hidden": "",
-      "label-left": "",
-      "label-top": ""
+      "label-auto": "Auto",
+      "label-hidden": "Oculto",
+      "label-left": "Izquierda",
+      "label-top": "Arriba"
     },
-    "name-show-unfilled-area": "",
-    "name-value-display": "",
+    "name-show-unfilled-area": "Mostrar área sin rellenar",
+    "name-value-display": "Visualización del valor",
     "value-display-options": {
-      "label-hidden": "",
-      "label-text-color": "",
-      "label-value-color": ""
+      "label-hidden": "Oculto",
+      "label-text-color": "Color de texto",
+      "label-value-color": "Color de valor"
     }
   },
   "bookmarks-page": {
@@ -3486,8 +3486,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Eliminar en bloque los recursos aprovisionados",
+      "bulk-move-provisioned-resources": "Mover en bloque los recursos aprovisionados",
       "cancel-button": "Cancelar",
       "confirmation-text": "Eliminar",
       "delete-button": "Eliminar",
@@ -3496,7 +3496,7 @@
       "delete-modal-restore-dashboards-text": "Esta acción eliminará las carpetas seleccionadas de inmediato, pero los paneles de control seleccionados se marcarán para su eliminación en 30 días. El administrador de tu organización puede restaurar los paneles de control en cualquier momento antes de que transcurran los 30 días. Las carpetas no se pueden restaurar.",
       "delete-modal-text": "Esta acción eliminará el siguiente contenido:",
       "delete-modal-title": "Eliminar",
-      "delete-provisioned-folder": "",
+      "delete-provisioned-folder": "Eliminar carpeta aprovisionada",
       "deleting": "Eliminando...",
       "manage-permissions-button": "Gestionar permisos",
       "move-button": "Mover",
@@ -3506,8 +3506,8 @@
       "move-modal-title": "Mover",
       "moving": "Moviendo...",
       "new-folder-name-required-phrase": "Se requiere el nombre de la carpeta.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Has seleccionado recursos aprovisionados y no aprovisionados. No se pueden procesar juntos. Selecciona solo recursos aprovisionados o solo recursos no aprovisionados e inténtalo de nuevo.",
+      "selected-mix-resources-modal-title": "Tipos de recursos mixtos seleccionados"
     },
     "actions": {
       "button-to-recently-deleted": "Eliminados recientemente"
@@ -3520,25 +3520,25 @@
       "this-folder-is-empty": "Esta carpeta está vacía"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_other": ""
+      "all-deleted": "Todos los recursos se han eliminado correctamente",
+      "all-moved": "Todos los recursos se han movido correctamente",
+      "button-done": "Hecho",
+      "progress-title": "Completado",
+      "failed-alert_one": "{{count}} elementos fallidos",
+      "failed-alert_other": "{{count}} elementos fallidos"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Cancelar",
+      "button-delete": "Eliminar",
+      "button-deleting": "Eliminando...",
+      "delete-warning": "Esto eliminará las carpetas seleccionadas y sus subcarpetas. En total, esto afectará a:",
+      "error-path-not-found": "Ruta no encontrada"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Cancelar",
+      "button-move": "Mover",
+      "button-moving": "Moviendo...",
+      "deleting": "Eliminando",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,14 +3546,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Contenido de archivo no encontrado",
+      "error-path-not-found": "Ruta no encontrada",
+      "error-target-folder-path-missing": "Falta la ruta de la carpeta de destino",
+      "error-title": "Error de carpeta de destino",
+      "move-warning": "Esto moverá las carpetas seleccionadas y sus subcarpetas. En total, esto afectará a:",
+      "moving": "Moviendo",
+      "progress": "Progreso: {{current}} de {{total}}",
+      "target-folder": "Carpeta de destino"
     },
     "counts": {
       "alertRule_one": "{{count}} regla de alerta",
@@ -3579,12 +3579,12 @@
       "read-only-message": ""
     },
     "delete-provisioned-folder-form": {
-      "api-error": "",
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "success-message": ""
+      "api-error": "Error al eliminar la carpeta",
+      "button-cancel": "Cancelar",
+      "button-delete": "Eliminar",
+      "button-deleting": "Eliminando...",
+      "delete-warning": "Esto eliminará esta carpeta y todas sus derivadas. En total, esto afectará a:",
+      "success-message": "Carpeta eliminada correctamente"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "No se puede recuperar la información descendiente"
@@ -3609,7 +3609,7 @@
       "empty-message": "No se ha encontrado ninguna carpeta",
       "error-title": "Error al cargar las carpetas",
       "non-folder-item": "{{itemKind}} {{itemUID}} no es una carpeta",
-      "root-title": "",
+      "root-title": "Dashboards",
       "search-placeholder": "Buscar carpetas",
       "unknown-error": "Error desconocido"
     },
@@ -3638,7 +3638,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Introducir el nombre de la carpeta",
       "label-folder-name": "Nombre de la carpeta",
       "text-pull-request-created": "Se ha creado una solicitud de extracción con cambios en esta carpeta:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "Tu carpeta se creará con el nombre {{folderName}}",
       "title-pull-request-created": "Solicitud de extracción creada",
       "title-this-repository-is-read-only": "Este repositorio es de solo lectura"
     },
@@ -3647,52 +3647,52 @@
       "text": "No se han encontrado resultados para tu consulta"
     },
     "restore": {
-      "success": ""
+      "success": "Dashboard {{name}} restaurado"
     },
     "text-this-repository-is-read-only": "Si tienes acceso directo al destino, copia el JSON y pégalo allí.",
     "trash-state-manager": {
       "label": {
-        "alphabetically-az": "",
-        "alphabetically-za": ""
+        "alphabetically-az": "Alfabéticamente (A-Z)",
+        "alphabetically-za": "Alfabéticamente (Z-A)"
       }
     }
   },
   "candlestick": {
     "additional-fields-options": {
-      "label-ignore": "",
-      "label-include": ""
+      "label-ignore": "Ignorar",
+      "label-include": "Incluye"
     },
     "candle-style-options": {
-      "label-candles": "",
-      "label-ohlc-bars": ""
+      "label-candles": "Velas",
+      "label-ohlc-bars": "Barras OHLC"
     },
-    "category-candlestick": "",
+    "category-candlestick": "Candelabro",
     "color-strategy-options": {
-      "label-since-open": "",
-      "label-since-prior-close": ""
+      "label-since-open": "Desde la apertura",
+      "label-since-prior-close": "Desde el cierre anterior"
     },
-    "description-additional-fields": "",
-    "description-close": "",
-    "description-high": "",
-    "description-low": "",
-    "description-open": "",
-    "description-volume": "",
+    "description-additional-fields": "Utilice las opciones de series temporales estándar para configurar cualquier campo no asignado anteriormente",
+    "description-close": "Valor al final del periodo",
+    "description-high": "Valor máximo dentro del periodo",
+    "description-low": "Valor mínimo dentro del periodo",
+    "description-open": "Valor al inicio del periodo",
+    "description-volume": "Recuento de muestras dentro del periodo",
     "mode-options": {
-      "label-both": "",
-      "label-candles": "",
-      "label-volume": ""
+      "label-both": "Ambas",
+      "label-candles": "Velas",
+      "label-volume": "Volumen"
     },
-    "name-additional-fields": "",
-    "name-candle-style": "",
-    "name-close": "",
-    "name-color-strategy": "",
-    "name-down-color": "",
-    "name-high": "",
-    "name-low": "",
-    "name-mode": "",
-    "name-open": "",
-    "name-up-color": "",
-    "name-volume": ""
+    "name-additional-fields": "Campos adicionales",
+    "name-candle-style": "Estilo de vela",
+    "name-close": "Cerrar",
+    "name-color-strategy": "Estrategia de color",
+    "name-down-color": "Color descendente",
+    "name-high": "Alto",
+    "name-low": "Bajo",
+    "name-mode": "Modo",
+    "name-open": "Abrir",
+    "name-up-color": "Color ascendente",
+    "name-volume": "Volumen"
   },
   "canvas": {
     "apieditor": {
@@ -3707,18 +3707,18 @@
       }
     },
     "button-item": {
-      "category-button": "",
+      "category-button": "Botón",
       "label": {
         "center": "Centro",
         "left": "Izquierda",
         "right": "Derecha"
       },
-      "name-align-text": "",
-      "name-api": "",
-      "name-style": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
+      "name-align-text": "Alinear texto",
+      "name-api": "API",
+      "name-style": "Estilo",
+      "name-text": "Texto",
+      "name-text-color": "Color de texto",
+      "name-text-size": "Tamaño de texto",
       "placeholder": {
         "auto": "Auto"
       }
@@ -3745,21 +3745,21 @@
         }
       }
     },
-    "category-arrow-direction": "",
-    "category-background": "",
-    "category-border": "",
-    "category-canvas": "",
-    "category-color": "",
-    "category-data-links": "",
-    "category-line-style": "",
-    "category-metric-value": "",
-    "category-radius": "",
-    "category-selected-connection": "",
-    "category-selected-element": "",
-    "category-size": "",
-    "category-tooltip": "",
+    "category-arrow-direction": "Dirección de flecha",
+    "category-background": "Fondo",
+    "category-border": "Borde",
+    "category-canvas": "Lienzo",
+    "category-color": "Color",
+    "category-data-links": "Enlaces de datos y acciones",
+    "category-line-style": "Estilo de línea",
+    "category-metric-value": "Valor métrico",
+    "category-radius": "Radio",
+    "category-selected-connection": "Conexión seleccionada",
+    "category-selected-element": "Elemento seleccionado ({{element}})",
+    "category-size": "Tamaño",
+    "category-tooltip": "Descripción emergente",
     "cloud-item": {
-      "category-cloud": "",
+      "category-cloud": "Nube",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -3768,47 +3768,47 @@
         "right": "Derecha",
         "top": "Superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinear texto",
+      "name-text": "Texto",
+      "name-text-color": "Color de texto",
+      "name-text-size": "Tamaño de texto",
+      "name-vertical-align": "Alineación vertical",
       "placeholder": {
         "auto": "Auto"
       }
     },
-    "description-experimental-types": "",
-    "description-inline-editing": "",
-    "description-pan-zoom": "",
+    "description-experimental-types": "Habilitar la selección de tipos de elementos experimentales",
+    "description-inline-editing": "Habilitar la edición del panel directamente",
+    "description-pan-zoom": "Habilitar desplazamiento y zoom",
     "direction-options": {
-      "label-both": "",
-      "label-forward": "",
-      "label-none": "",
-      "label-reverse": ""
+      "label-both": "Ambas",
+      "label-forward": "Adelante",
+      "label-none": "Ninguno",
+      "label-reverse": "Atrás"
     },
     "drone-front-item": {
-      "category-drone-front": "",
-      "name-roll-angle": ""
+      "category-drone-front": "Frente del dron",
+      "name-roll-angle": "Ángulo de alabeo"
     },
     "drone-side-item": {
-      "category-drone-side": "",
-      "name-pitch-angle": ""
+      "category-drone-side": "Lado del dron",
+      "name-pitch-angle": "Ángulo de inclinación"
     },
     "drone-top-item": {
-      "category-drone-top": "",
-      "name-back-left-rotor-rpm": "",
-      "name-back-right-rotor-rpm": "",
-      "name-front-left-rotor-rpm": "",
-      "name-front-right-rotor-rpm": "",
-      "name-yaw-angle": ""
+      "category-drone-top": "Parte superior del dron",
+      "name-back-left-rotor-rpm": "RPM del rotor trasero izquierdo",
+      "name-back-right-rotor-rpm": "RPM del rotor trasero derecho",
+      "name-front-left-rotor-rpm": "RPM del rotor delantero izquierdo",
+      "name-front-right-rotor-rpm": "RPM del rotor delantero derecho",
+      "name-yaw-angle": "Ángulo de guiñada"
     },
     "element-editor": {
-      "category-layout": "",
-      "description-unsupported": "",
-      "name-quick-placement": ""
+      "category-layout": "Diseño",
+      "description-unsupported": "El tipo de elemento seleccionado no es compatible con la configuración actual. Habilite los tipos de elementos avanzados.",
+      "name-quick-placement": "Colocación rápida"
     },
     "ellipse-item": {
-      "category-ellipse": "",
+      "category-ellipse": "Elipse",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -3817,50 +3817,50 @@
         "right": "Derecha",
         "top": "Superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinear texto",
+      "name-text": "Texto",
+      "name-text-color": "Color de texto",
+      "name-text-size": "Tamaño de texto",
+      "name-vertical-align": "Alineación vertical",
       "placeholder": {
         "auto": "Auto"
       }
     },
     "icon-item": {
-      "category-icon": "",
-      "name-fill-color": "",
-      "name-svg-path": ""
+      "category-icon": "Icono",
+      "name-fill-color": "Color de relleno",
+      "name-svg-path": "Ruta SVG"
     },
     "inline-edit": {
       "canvas-inline-editor": "Editor en línea de Canvas",
       "tooltip-close-inline-editor": "Cerrar editor en línea"
     },
     "inline-edit-body": {
-      "category-selected-element": "",
+      "category-selected-element": "Elemento seleccionado ({{element}})",
       "label-add-item": "Añadir elemento",
       "please-select-an-element": "Seleccione un elemento"
     },
-    "label-actions": "",
-    "label-color": "",
-    "label-direction": "",
-    "label-image": "",
-    "label-image-size": "",
-    "label-line-style": "",
-    "label-links": "",
-    "label-radius": "",
-    "label-size": "",
-    "label-width": "",
+    "label-actions": "Acciones",
+    "label-color": "Color",
+    "label-direction": "Dirección",
+    "label-image": "Imagen",
+    "label-image-size": "Tamaño de imagen",
+    "label-line-style": "Estilo de línea",
+    "label-links": "Enlaces",
+    "label-radius": "Radio",
+    "label-size": "Tamaño",
+    "label-width": "Ancho",
     "layer-editor": {
-      "category-layer": "",
-      "category-layout": "",
-      "name-constraints": "",
-      "name-elements": ""
+      "category-layer": "Capa",
+      "category-layout": "Diseño",
+      "name-constraints": "Restricciones",
+      "name-elements": "Elementos"
     },
     "line-style-editor": {
       "label-animate": "Animar"
     },
     "line-style-options": {
-      "label-solid": ""
+      "label-solid": "Sólido"
     },
     "metric-value-item": {
       "label": {
@@ -3875,14 +3875,14 @@
         "auto": "Auto"
       }
     },
-    "name-align-text": "",
-    "name-color": "",
-    "name-experimental-types": "",
-    "name-inline-editing": "",
-    "name-pan-zoom": "",
-    "name-text": "",
-    "name-text-size": "",
-    "name-vertical-align": "",
+    "name-align-text": "Alinear texto",
+    "name-color": "Color de texto",
+    "name-experimental-types": "Tipos de elementos experimentales",
+    "name-inline-editing": "Edición en línea",
+    "name-pan-zoom": "Panorámica y zoom",
+    "name-text": "Texto",
+    "name-text-size": "Tamaño de texto",
+    "name-vertical-align": "Alineación vertical",
     "not-found-display": {
       "not-found": "<0>No se ha encontrado: </0><config />"
     },
@@ -3895,7 +3895,7 @@
       "zoom-scroll-wheel": "Zoom: rueda de desplazamiento del ratón"
     },
     "parallelogram-item": {
-      "category-parallelogram": "",
+      "category-parallelogram": "Paralelograma",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -3904,11 +3904,11 @@
         "right": "Derecha",
         "top": "Superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinear texto",
+      "name-text": "Texto",
+      "name-text-color": "Color de texto",
+      "name-text-size": "Tamaño de texto",
+      "name-vertical-align": "Alineación vertical",
       "placeholder": {
         "auto": "Auto"
       }
@@ -3921,21 +3921,21 @@
     },
     "placement-editor": {
       "horizontal-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-left-and-right": "",
-        "label-right": "",
-        "label-scale": ""
+        "label-center": "Centro",
+        "label-left": "Izquierda",
+        "label-left-and-right": "Izquierda y derecha",
+        "label-right": "Derecha",
+        "label-scale": "Escala"
       },
       "label-constraints": "Restricciones",
       "label-position": "Posición",
       "loading": "Cargando...",
       "vertical-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-scale": "",
-        "label-top": "",
-        "label-top-and-bottom": ""
+        "label-bottom": "Abajo",
+        "label-center": "Centro",
+        "label-scale": "Escala",
+        "label-top": "Por arriba",
+        "label-top-and-bottom": "Por arriba y por abajo"
       }
     },
     "quick-positioning": {
@@ -3947,7 +3947,7 @@
       "tooltip-align-vertical-centers": "Alinear en centros verticales"
     },
     "rectangle-item": {
-      "category-rectangle": "",
+      "category-rectangle": "Rectángulo",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -3956,33 +3956,33 @@
         "right": "Derecha",
         "top": "Superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinear texto",
+      "name-text": "Texto",
+      "name-text-color": "Color de texto",
+      "name-text-size": "Tamaño de texto",
+      "name-vertical-align": "Alineación vertical",
       "placeholder": {
         "auto": "Auto"
       }
     },
     "server-item": {
-      "category-server": "",
-      "name-blink-rate": "",
-      "name-bulb-color": "",
-      "name-status-color": "",
-      "name-type": "",
+      "category-server": "Servidor",
+      "name-blink-rate": "Frecuencia de parpadeo [hz] (0 = apagado)",
+      "name-bulb-color": "Color de la bombilla",
+      "name-status-color": "Color de estado",
+      "name-type": "Tipo",
       "type-options": {
-        "label-database": "",
-        "label-single": "",
-        "label-stack": "",
-        "label-terminal": ""
+        "label-database": "Base de datos",
+        "label-single": "Único",
+        "label-stack": "Pila",
+        "label-terminal": "Terminal"
       }
     },
     "text-display": {
       "double-click-to-set": "Haz doble clic para establecer el texto"
     },
     "text-item": {
-      "category-text": "",
+      "category-text": "Texto",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -3991,20 +3991,20 @@
         "right": "Derecha",
         "top": "Superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinear texto",
+      "name-text": "Texto",
+      "name-text-color": "Color de texto",
+      "name-text-size": "Tamaño de texto",
+      "name-vertical-align": "Alineación vertical",
       "placeholder": {
         "auto": "Auto"
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Modo descripción emergente",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Deshabilitado",
+        "label-enabled": "Habilitado"
       }
     },
     "tree-navigation-editor": {
@@ -4024,7 +4024,7 @@
       "tooltip-remove": "Eliminar"
     },
     "triangle-item": {
-      "category-triangle": "",
+      "category-triangle": "Triángulo",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -4033,18 +4033,18 @@
         "right": "Derecha",
         "top": "Superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinear texto",
+      "name-text": "Texto",
+      "name-text-color": "Color de texto",
+      "name-text-size": "Tamaño de texto",
+      "name-vertical-align": "Alineación vertical",
       "placeholder": {
         "auto": "Auto"
       }
     },
     "wind-turbine-item": {
-      "category-wind-turbine": "",
-      "name-rpm": ""
+      "category-wind-turbine": "Aerogenerador",
+      "name-rpm": "RPM"
     }
   },
   "carousel": {
@@ -4061,8 +4061,8 @@
   "close-button": {
     "tooltip": "Cerrar"
   },
-  "cloud-enterprise-feature-badge": "",
-  "cloud-feature-badge": "",
+  "cloud-enterprise-feature-badge": "Cloud y Enterprise",
+  "cloud-feature-badge": "Cloud",
   "combobox": {
     "async": {
       "error": "Se ha producido un error al cargar las opciones."
@@ -4373,7 +4373,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Ejecutar consulta"
     }
   },
   "dashboard": {
@@ -4536,7 +4536,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Proceder"
         },
         "title": {
           "proceed-to-external-site": "¿Dirigirse a un sitio externo?"
@@ -4633,7 +4633,7 @@
       }
     },
     "description": {
-      "action": ""
+      "action": "Cambiar descripción del dashboard"
     },
     "dynamic-config-value-editor": {
       "render-label": {
@@ -4642,17 +4642,17 @@
     },
     "edit-actions": {
       "add": "Añadir {{typeName}}",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
-      "move": "",
+      "add-conditional-rule": "Añadir regla {{ruleDescription}}",
+      "duplicate-panel": "Duplicar panel",
+      "edit-query-result-rule": "Cambiar regla de resultado de consulta",
+      "edit-template-variable-rule": "Cambiar regla de variable de plantilla",
+      "edit-time-range-rule": "Cambiar regla de intervalo de tiempo",
+      "move": "Mover {{typeName}}",
       "panel-background": "Cambiar fondo del panel",
       "panel-description": "Cambiar descripción del panel",
-      "panel-max-repeats-per-row": "",
+      "panel-max-repeats-per-row": "Máx. de repeticiones por fila",
       "panel-repeat-direction": "Repetir dirección",
-      "panel-repeat-variable": "",
+      "panel-repeat-variable": "Repetición del panel por",
       "panel-title": "Cambiar título del panel",
       "paste-panel": "Pegar panel",
       "remove": "Eliminar {{typeName}}",
@@ -4661,7 +4661,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Panel de control",
-        "element": "",
+        "element": "Elemento",
         "local-variable": "Variable local",
         "multiple-elements": "Múltiples elementos",
         "multiple-elements-delete-text": "¿Seguro que quieres eliminar estos elementos?",
@@ -4743,10 +4743,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Exportar dashboard"
       },
       "menu": {
-        "label": ""
+        "label": "Menú de exportación de dashboard"
       }
     },
     "fetch-dashboard": {
@@ -4768,9 +4768,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Predeterminado",
+          "shared-crosshair": "Retículo compartido",
+          "shared-tooltip": "Descripción emergente compartida"
         }
       }
     },
@@ -4787,7 +4787,7 @@
     "get-field-override-categories": {
       "label-add-field-override": "Añadir anulación de campo",
       "label-add-override-property": "Añadir propiedad de anulación",
-      "override-name": "",
+      "override-name": "Anular {{overrideNum}}",
       "title": {
         "add-button": "añadir botón"
       }
@@ -4823,14 +4823,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "No enviar datos de anotación a los siguientes paneles",
+        "annotation-panels-support-annotations": "Enviar los datos de anotación a todos los paneles que admitan anotaciones",
+        "annotations-explicitly-listed-panels": "Enviar las anotaciones a los paneles expresamente indicados"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Todos los paneles",
+        "all-panels-except": "Todos los paneles excepto",
+        "selected-panels": "Paneles seleccionados"
       }
     },
     "get-panel-frame-category": {
@@ -5016,7 +5016,7 @@
       "title-matched_other": "{{count}} coincidencias/{{totalCount}} opciones"
     },
     "outline": {
-      "repeated-item": "",
+      "repeated-item": "Repetir",
       "tree-item": {
         "empty": "(vacío)",
         "no-title": "<sin título>"
@@ -5092,7 +5092,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "¿Seguro que quieres restaurar el dashboard a la versión {{version}}? Todos los cambios no guardados se perderán.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Sí, restaurar a la versión {{version}}",
       "title-restore-version": "Restaurar versión"
     },
     "row-options-button": {
@@ -5144,7 +5144,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Dashboard guardado"
     },
     "save-dashboard-as-button": {
       "save-as": "Guardar como"
@@ -5174,13 +5174,13 @@
       "label-changes": "Cambios",
       "label-details": "Detalles",
       "title": "Guardar panel de control",
-      "title-copy": "",
-      "title-provisioned": ""
+      "title-copy": "Guardar copia del dashboard",
+      "title-provisioned": "Dashboard aprovisionado"
     },
     "save-dashboard-error-proxy": {
       "body-name-exists": "Ya existe un dashboard con el mismo nombre en la carpeta seleccionada.<1></1><2>¿Seguro que quieres guardar este dashboard?</2>",
       "body-version-mismatch": "Otra persona ha actualizado este dashboard<1></1><2>¿Seguro que quieres guardar este dashboard?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Guardar y sobrescribir",
       "title-name-exists": "Conflicto",
       "title-version-mismatch": "Conflicto"
     },
@@ -5253,7 +5253,7 @@
       }
     },
     "title": {
-      "action": ""
+      "action": "Cambiar título del panel de control"
     },
     "toolbar": {
       "add": "Añadir",
@@ -5377,9 +5377,9 @@
       "label-apply-transformation-to": "Aplicar transformación a"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Ten en cuenta que eliminar una transformación puede romper otras. Si solo hay una transformación, volverás a la pantalla de selección principal.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Eliminar",
         "title-debug": "Depuración",
         "title-disable-transformation": "Deshabilitar transformación",
         "title-filter": "Filtro",
@@ -5400,16 +5400,16 @@
       "placeholder-search-for-transformation": "Buscar transformación",
       "show-images": "Mostrar imágenes",
       "title-add-another-transformation": "Añadir otra transformación",
-      "view-all": ""
+      "view-all": "Ver todo"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Al eliminar todas las transformaciones, volverás a la pantalla de selección principal."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Añadir otra transformación"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Eliminar todo",
       "delete-all-transformations": "Eliminar todas las transformaciones",
       "title-delete-all-transformations": "¿Eliminar todas las transformaciones?",
       "tooltip-clear-search": "Borrar búsqueda",
@@ -5439,16 +5439,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Cambiar descripción de la variable"
       },
       "hide": {
-        "action": ""
+        "action": "Cambiar opción de ocultar variable"
       },
       "label": {
-        "action": ""
+        "action": "Cambiar etiqueta de variable"
       },
       "name": {
-        "action": ""
+        "action": "Cambiar nombre de variable"
       }
     },
     "version-history-comparison": {
@@ -5460,7 +5460,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar selección de versión {{version}}",
       "date": "Fecha",
-      "name-latest": "",
+      "name-latest": "Recientes",
       "notes": "Notas",
       "restore": "Restaurar",
       "updated-by": "Actualizada por",
@@ -5538,7 +5538,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Proporcionar dimensiones como CSV: {{name}}, {{value}}",
       "label-data-source": "Fuente de datos",
       "label-use-static-key-dimensions": "Usar dimensiones de clave estática",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Permitir valores personalizados"
     },
     "add-to-dashboard": {
       "message": {
@@ -5612,7 +5612,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Revocar URL pública"
       },
       "title": {
         "revoke-public-url": "Revocar URL pública"
@@ -5625,7 +5625,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opciones personalizadas",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Valores separados por comas",
       "selection-options": "Opciones de selección"
     },
     "dashboard-edit-pane-renderer": {
@@ -5646,8 +5646,8 @@
       "label-with-tags": "Con etiquetas",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Dashboards",
+          "link": "Enlace"
         }
       },
       "placeholder-open-dashboard": "Abrir panel"
@@ -5690,8 +5690,8 @@
       "data-source-options": "Opciones de fuente de datos",
       "description-instance-name-filter": "Filtro Regex para elegir las instancias de origen de datos en la lista de valores de variables. Déjalo vacío para todos.",
       "example-instance-name-filter": "Ejemplo: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Filtro de nombre de instancia",
+      "name-type": "Tipo",
       "selection-options": "Opciones de selección"
     },
     "default-grid-layout-manager": {
@@ -5702,12 +5702,12 @@
       }
     },
     "delete-provisioned-dashboard-form": {
-      "api-error": "",
+      "api-error": "Error al eliminar el panel de control",
       "cancel-action": "Cancelar",
       "delete-action": "Eliminar panel de control",
       "deleting": "Eliminando...",
-      "drawer-title": "",
-      "success-message": ""
+      "drawer-title": "Eliminar dashboard aprovisionado",
+      "success-message": "Dashboard eliminado correctamente"
     },
     "description-label": {
       "description": "Descripción"
@@ -5736,15 +5736,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Editable",
+          "readonly": "Solo lectura"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Predeterminado",
+          "shared-crosshair": "Retículo compartido",
+          "shared-tooltip": "Descripción emergente compartida"
         }
       }
     },
@@ -5756,36 +5756,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Añadir filtros de clave/valor sobre la marcha",
+        "dynamically-switch-source-multiple-panels": "Cambiar dinámicamente la fuente de datos para varios paneles",
+        "group": "Añadir claves para agrupar sobre la marcha",
+        "hidden-constant-variable": "Una variable constante oculta, útil para prefijos métricos en dashboards que quieras compartir",
+        "users-enter-arbitrary-strings-textbox": "Los usuarios pueden introducir cualquier cadena arbitraria en un cuadro de texto",
+        "values-are-static-and-defined-manually": "Los valores son estáticos y se definen manualmente",
+        "values-fetched-source-query": "Los valores se obtienen de una consulta de fuente de datos",
+        "values-timespans": "Los valores son intervalos de tiempo, por ejemplo: 1m, 1h, 1d"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Filtros «ad hoc»",
+        "constant": "Constante",
+        "custom": "Personalizado",
+        "data-source": "Fuente de datos",
+        "group-by": "Agrupar por",
+        "interval": "Intervalo",
+        "query": "Consulta",
+        "textbox": "Cuadro de texto"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "No enviar datos de anotación a los siguientes paneles",
+        "annotation-panels-support-annotations": "Enviar los datos de anotación a todos los paneles que admitan anotaciones",
+        "annotations-explicitly-listed-panels": "Enviar las anotaciones a los paneles expresamente indicados"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Todos los paneles",
+        "all-panels-except": "Todos los paneles excepto",
+        "selected-panels": "Paneles seleccionados"
       }
     },
     "get-panel-frame-options": {
@@ -5813,7 +5813,7 @@
       "group-by-options": "Agrupar por opciones",
       "label-data-source": "Fuente de datos",
       "label-use-static-group-by-dimensions": "Usar dimensiones de grupo estático",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Permitir valores personalizados"
     },
     "help-wizard": {
       "copy-to-clipboard": "Copiar al portapapeles",
@@ -5849,14 +5849,14 @@
       "apply": "Aplicar"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Calcula dinámicamente el intervalo dividiendo el intervalo de tiempo por el recuento especificado",
       "description-calculated-value-below-threshold": "El valor calculado no será inferior a este umbral",
       "description-step-count": "Cuántas veces se debe dividir el rango de tiempo actual para calcular el valor",
       "interval-options": "Opciones de intervalo",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Opción automática",
+      "name-min-interval": "Intervalo mínimo",
+      "name-step-count": "Recuento de pasos",
+      "name-values": "Valores"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5877,19 +5877,19 @@
       "usage-count_other": "Utilizado en {{count}} dashboards"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Error al mover el dashboard",
+      "api-error": "No se ha podido mover el dashboard",
+      "cancel-action": "Cancelar",
+      "current-file-not-found": "No se ha podido encontrar el archivo del dashboard actual",
+      "drawer-title": "Mover dashboard aprovisionado",
+      "file-load-error": "Error al cargar el dashboard",
+      "loading-file-data": "Cargando datos del dashboard",
+      "move-action": "Mover dashboard",
+      "move-read-only-message": "Este dashboard no se puede mover directamente desde Grafana porque el repositorio es de solo lectura. Para mover este dashboard, mueve el archivo en tu repositorio Git.",
+      "moving": "Moviendo...",
+      "success-message": "Dashboard movido correctamente",
+      "target-path-label": "Ruta de destino",
+      "title-this-repository-is-read-only": "Este repositorio es de solo lectura"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Ya existe un dashboard con el mismo nombre en la carpeta seleccionada. ¿Seguro que quieres guardar este dashboard?",
@@ -5897,7 +5897,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Proceder"
       },
       "title": {
         "proceed-to-external-site": "¿Dirigirse a un sitio externo?"
@@ -5912,7 +5912,7 @@
       }
     },
     "panel-data-alerting-tab": {
-      "tab-label": ""
+      "tab-label": "Alerta"
     },
     "panel-data-alerting-tab-rendered": {
       "alert": {
@@ -5923,19 +5923,19 @@
       "title-dashboard-not-saved": "Dashboard no guardado"
     },
     "panel-data-queries-tab": {
-      "tab-label": ""
+      "tab-label": "Consultas"
     },
     "panel-data-queries-tab-rendered": {
       "add-query": "Añadir consulta",
       "expression": "Expresión "
     },
     "panel-data-transformations-tab": {
-      "tab-label": ""
+      "tab-label": "Transformaciones"
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Añadir otra transformación",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Al eliminar todas las transformaciones, volverás a la pantalla de selección principal.",
+      "confirmText-delete-all": "Eliminar todo",
       "delete-all-transformations": "Eliminar todas las transformaciones",
       "title-delete-all-transformations": "¿Eliminar todas las transformaciones?"
     },
@@ -5988,13 +5988,13 @@
       "description-examples": "Los grupos de captura con nombre se pueden utilizar para separar el texto y el valor de la pantalla (<1>consulta los ejemplos</1>).",
       "description-optional": "Es opcional si quieres extraer parte del nombre de una serie o segmento de nodo métrico.",
       "label-data-source": "Fuente de datos",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Ordenar opciones estáticas",
       "label-target-data-source": "Fuente de datos de destino",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Usar opciones estáticas",
+      "name-regex": "RegEx",
       "query-options": "Opciones de consulta",
       "selection-options": "Opciones de selección",
-      "static-options-legend": ""
+      "static-options-legend": "Opciones estáticas"
     },
     "resource-export": {
       "label": {
@@ -6007,7 +6007,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "¿Seguro que quieres restaurar el dashboard a la versión {{version}}? Todos los cambios no guardados se perderán.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Sí, restaurar a la versión {{version}}",
       "title-restore-version": "Restaurar versión"
     },
     "save-button": {
@@ -6026,15 +6026,15 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Error al guardar el dashboard"
       },
-      "required": ""
+      "required": "Requerido"
     },
     "save-dashboard-drawer": {
       "tabs": {
         "label-changes": "Cambios",
         "label-details": "Detalles",
         "title": "Guardar panel de control",
-        "title-copy": "",
-        "title-provisioned": ""
+        "title-copy": "Guardar copia del dashboard",
+        "title-provisioned": "Dashboard aprovisionado"
       }
     },
     "save-dashboard-form": {
@@ -6053,8 +6053,8 @@
         "title-someone-else-has-updated-this-dashboard": "Otra persona ha actualizado este dashboard",
         "would-still-dashboard": "¿Seguro que quieres guardar este dashboard?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "Debido a las limitaciones del nuevo esquema del dashboard (V2), los paneles de la biblioteca se convertirán en paneles normales con contenido incrustado durante la exportación externa.",
+      "schema-v2-library-panels-export-title": "Los paneles de biblioteca se convertirán en paneles normales",
       "title-dashboard-drastically-changed": "El dashboard ha cambiado de forma irreversible"
     },
     "save-dashboard-form-common-options": {
@@ -6101,10 +6101,10 @@
       "description-enables-multiple-values-selected": "Permite seleccionar varios valores al mismo tiempo",
       "description-enables-option-include-variables": "Habilita una opción para incluir todos los valores",
       "description-enables-users-custom-values": "Permite a los usuarios añadir valores personalizados a la lista",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Permitir valores personalizados",
+      "name-custom-all-value": "Personalizar todos los valores",
+      "name-include-all-option": "Incluir la opción «Todo»",
+      "name-multi-value": "Multivalor"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Alternar menú de compartir"
@@ -6125,7 +6125,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Valor predeterminado"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opcional)",
@@ -6150,8 +6150,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Si desvinculas este panel, podrás editarlo sin que ello afecte a ningún otro dashboard. Sin embargo, una vez que realices un cambio, no podrás volver al panel reutilizable original.",
+      "confirmText-yes-unlink": "Sí, desvincular",
       "title-really-unlink-panel": "¿Seguro que quieres desvincular este panel?"
     },
     "unsaved-changes-modal": {
@@ -6169,7 +6169,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Dashboard guardado"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Esta variable no está referenciada por ninguna variable o dashboard.",
@@ -6181,15 +6181,15 @@
       "aria-label-variable-editor-form": "Formulario del editor de variables",
       "back-to-list": "Regresar a la lista",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Eliminar variable"
       },
       "delete": "Eliminar",
       "description-optional-display-name": "Nombre para mostrar opcional",
       "description-template-variable-characters": "El nombre de la variable de la plantilla. (Máx. 50 caracteres)",
       "general": "General",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Descripción",
+      "name-label": "Etiqueta",
+      "name-name": "Nombre",
       "placeholder-descriptive-text": "Texto descriptivo",
       "placeholder-label-name": "Nombre de la etiqueta",
       "placeholder-variable-name": "Nombre de la variable",
@@ -6204,8 +6204,8 @@
       "variable": "Variable"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "¿Seguro que quieres eliminar: {{variable}}?",
+      "confirmText-delete-variable": "Eliminar variable",
       "title-delete-variable": "Eliminar variable",
       "tooltip-duplicate-variable": "Duplicar variable",
       "tooltip-remove-variable": "Quitar variable"
@@ -6213,15 +6213,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Etiqueta",
+          "nothing": "Nada",
+          "variable": "Variable"
         }
       },
       "label": "Ocultar"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Tipo de variable"
     },
     "variable-usages-button": {
       "title-show-usages": "Mostrando usos para: {{variableId}}",
@@ -6249,7 +6249,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar selección de versión {{version}}",
       "date": "Fecha",
-      "name-latest": "",
+      "name-latest": "Recientes",
       "notes": "Notas",
       "restore": "Restaurar",
       "updated-by": "Actualizada por",
@@ -6356,18 +6356,18 @@
     }
   },
   "dashlist": {
-    "category-dashboard-list": "",
-    "name-folder": "",
-    "name-include-current-template-variables": "",
-    "name-include-current-time-range": "",
-    "name-max-items": "",
-    "name-query": "",
-    "name-recently-viewed": "",
-    "name-search": "",
-    "name-show-folder-names": "",
-    "name-show-headings": "",
-    "name-starred": "",
-    "name-tags": ""
+    "category-dashboard-list": "Lista de dashboards",
+    "name-folder": "Carpeta",
+    "name-include-current-template-variables": "Incluir los valores de las variables de la plantilla actual",
+    "name-include-current-time-range": "Incluir el rango de tiempo actual",
+    "name-max-items": "Máx. de elementos",
+    "name-query": "Consulta",
+    "name-recently-viewed": "Vistos recientemente",
+    "name-search": "Búsqueda",
+    "name-show-folder-names": "Mostrar nombres de carpetas",
+    "name-show-headings": "Mostrar encabezados",
+    "name-starred": "Destacado",
+    "name-tags": "Etiquetas"
   },
   "data-source-list": {
     "empty-state": {
@@ -6631,16 +6631,16 @@
   "dimensions": {
     "background-size-editor": {
       "options": {
-        "label-contain": "",
-        "label-cover": "",
-        "label-fill": "",
-        "label-original": "",
-        "label-tile": ""
+        "label-contain": "Contiene",
+        "label-cover": "Portada",
+        "label-fill": "Relleno",
+        "label-original": "Original",
+        "label-tile": "Segmentaciones de datos"
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": "",
-      "noOptionsMessage-no-fields-found": ""
+      "label-fixed-color": "Color fijo",
+      "noOptionsMessage-no-fields-found": "No se han encontrado campos"
     },
     "file-dropzone-custom-children": {
       "upload": "Subir"
@@ -6654,10 +6654,10 @@
       "placeholder-search": "Buscar"
     },
     "resource-dimension-editor": {
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Utilizar un resultado de campo de cadena",
+      "description-fixed": "Valor fijo",
       "label-field": "Campo",
-      "label-fixed": "",
+      "label-fixed": "Fijo",
       "label-mappings": "Mapeos",
       "label-source": "Fuente"
     },
@@ -6675,35 +6675,35 @@
     },
     "scalar-dimension-editor": {
       "fixed-value-options": {
-        "label-fixed-values": ""
+        "label-fixed-values": "Valor fijo"
       },
       "label-limit": "Límite",
       "label-value": "Valor",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "No se han encontrado campos",
       "scalar-options": {
-        "description-clamped": "",
-        "description-mod": "",
-        "label-clamped": "",
-        "label-mod": ""
+        "description-clamped": "Utilizar valores de campo, ajustados a un máx. y un mín.",
+        "description-mod": "Utilizar valores de campo, mod. a partir de máx.",
+        "label-clamped": "Ajustado",
+        "label-mod": "Mod."
       }
     },
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Valor fijo"
         }
       },
       "label-max": "Máx.",
       "label-min": "Mín.",
       "label-value": "Valor",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "No se han encontrado campos"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Mostrar valor de campo",
+      "description-fixed": "Valor fijo",
       "label-field": "Campo",
-      "label-fixed": "",
+      "label-fixed": "Fijo",
       "label-source": "Fuente",
       "label-template": "Plantilla",
       "label-value": "Valor"
@@ -6717,16 +6717,16 @@
       "description-percentage-means-thresholds-relative": "Porcentaje significa umbrales relativos a mín. y máx.",
       "modes": {
         "description": {
-          "threshold-based-percent-between-minmax": "",
-          "thresholds-based-absolute-values": ""
+          "threshold-based-percent-between-minmax": "Elegir el umbral en función del porcentaje entre mín./máx.",
+          "thresholds-based-absolute-values": "Elegir los umbrales en función de los valores absolutos"
         },
         "label": {
-          "absolute": "",
-          "percentage": ""
+          "absolute": "Absoluto",
+          "percentage": "Porcentaje"
         }
       },
       "thresholds-mode": "Modo de umbrales",
-      "value-base": ""
+      "value-base": "Base"
     },
     "urlpicker-tab": {
       "label-preview": "Vista previa"
@@ -6806,6 +6806,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Eventos",
@@ -7078,7 +7079,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Cargando..."
     },
     "prev": "Ant.",
     "queryless-apps-extensions": {
@@ -7265,7 +7266,7 @@
           "start-time": "Hora de comienzo:"
         }
       },
-      "share-span": "",
+      "share-span": "Compartir",
       "warnings": "Advertencias"
     },
     "span-filters": {
@@ -7275,8 +7276,8 @@
       "aria-label-select-service-name-operator": "Seleccionar operador de nombre de servicio",
       "aria-label-select-span-name": "Seleccionar nombre de intervalo",
       "aria-label-select-span-name-operator": "Seleccionar operador de nombre de intervalo",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Seleccionar duración máxima del intervalo",
+      "ariaLabel-select-min-span-duration": "Seleccionar duración mínima del intervalo",
       "label-collapse": "Filtros de intervalo",
       "label-duration": "Duración",
       "label-service-name": "Nombre de servicio",
@@ -7348,23 +7349,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Duración",
+      "export-started": "Exportación iniciada",
+      "give-feedback": "Comentarios",
+      "link-copied": "Enlace copiado al portapapeles",
+      "path": "Ruta",
+      "route": "Ruta",
+      "services": "Servicios",
+      "share": "Compartir",
+      "share-copy-link": "Copiar enlace",
+      "share-export-json": "Exportar como JSON",
+      "share-tooltip": "Compartir traza",
+      "start-time": "Fecha de inicio",
+      "target": "Destino",
+      "title-share-thoughts-about-tracing-grafana": "Comparte tu opinión sobre el trazado en Grafana.",
+      "tooltip-url": "{{route}} o {{url}} o {{target}} o {{path}}",
+      "trace-id": "ID de traza",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Botón para borrar filtros",
@@ -7464,7 +7465,7 @@
       "when": "CUÁNDO"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Ejecuta el dialecto SQL de MySQL en las tablas devueltas desde tus fuentes de datos. Las consultas de fuentes de datos (es decir, «A», «B») están disponibles como tablas y se hace referencia a ellas mediante el nombre de la consulta. Los campos están disponibles como columnas, tal y como se devuelven desde la fuente de datos.",
       "label-operation": "Operación"
     },
     "math": {
@@ -7495,7 +7496,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Borrar carpetas",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "No se han encontrado carpetas",
     "select-aria-label": "Filtro de carpeta",
     "select-placeholder": "Filtrar por carpeta"
   },
@@ -7544,23 +7545,23 @@
     "title": "¿Abandonar la página?"
   },
   "gauge": {
-    "category-gauge": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-neutral": "",
-    "description-show-threshold-labels": "",
-    "description-show-threshold-markers": "",
+    "category-gauge": "Medidor",
+    "description-min-height": "Altura mínima de fila (orientación horizontal)",
+    "description-min-width": "Ancho mínimo de columna (orientación vertical)",
+    "description-neutral": "Dejar vacío para usar mín. como punto neutro",
+    "description-show-threshold-labels": "Renderizar los valores de umbral alrededor de la barra de medición",
+    "description-show-threshold-markers": "Renderiza los umbrales como una barra exterior",
     "gauge-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Auto",
+      "label-manual": "Manual"
     },
-    "name-gauge-size": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-neutral": "",
-    "name-show-threshold-labels": "",
-    "name-show-threshold-markers": "",
-    "placeholder-neutral": ""
+    "name-gauge-size": "Tamaño del medidor",
+    "name-min-height": "Altura mín.",
+    "name-min-width": "Anchura mín.",
+    "name-neutral": "Neutral",
+    "name-show-threshold-labels": "Mostrar etiquetas de umbral",
+    "name-show-threshold-markers": "Mostrar marcadores de umbral",
+    "placeholder-neutral": "auto"
   },
   "gen-ai": {
     "apply-suggestion": "Aplicar",
@@ -7569,51 +7570,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "No se ha encontrado el nomenclátor",
+      "warning-no-geometry": "no se puede encontrar la geometría",
+      "warning-select-geohash": "Seleccionar campo de geohash",
+      "warning-select-lat-long": "Seleccionar campos de latitud/longitud",
+      "warning-select-lookup": "Seleccionar campo de búsqueda",
+      "warning-unable-to-find": "No se pueden encontrar los campos de ubicación"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "No se han encontrado campos de cadenas"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "No se han encontrado campos numéricos"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "No se han encontrado campos numéricos"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "No se han encontrado campos de cadenas"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Nomenclátor",
+      "name-geohash-field": "Campo de geohash",
+      "name-latitude-field": "Campo de latitud",
+      "name-location-mode": "Modo de ubicación",
+      "name-longitude-field": "Campo de longitud",
+      "name-lookup-field": "Campo de búsqueda"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Identificar automáticamente los datos de ubicación en función de los nombres de campo predeterminados",
+        "description-coords": "Especificar campos de latitud y longitud",
+        "description-geohash": "Especificar campo de geohash",
+        "description-lookup": "Especificar nomenclátor y campo de búsqueda",
+        "label-auto": "Automático",
+        "label-coords": "Coordenadas",
+        "label-geohash": "Geohash",
+        "label-lookup": "Búsqueda"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Capa de mapa base",
+    "category-map-controls": "Controles del mapa",
+    "category-map-layers": "Capas del mapa",
+    "category-map-view": "Vista de mapa",
     "coordinates-map-view-editor": {
       "label-latitude": "Latitud",
       "label-longitude": "Longitud"
@@ -7622,15 +7623,15 @@
       "center": "Centro:",
       "zoom": "Escala:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Esta ubicación se mostrará cuando se cargue el panel por primera vez.",
+    "description-mouse-wheel-zoom": "Habilitar el control del zoom a través de la rueda del ratón",
+    "description-no-repeat": "Evita que el mapa se repita horizontalmente",
+    "description-share-view": "Utiliza la misma vista en varios paneles. Nota: Es posible que sea necesario volver a cargar el dashboard.",
+    "description-show-attribution": "Mostrar la información de atribución de la fuente del mapa en la parte inferior derecha",
+    "description-show-debug": "Mostrar información del mapa",
+    "description-show-measure": "Mostrar herramientas para realizar mediciones en el mapa",
+    "description-show-scale": "Indicar la escala del mapa",
+    "description-show-zoom": "Mostrar los botones de control del zoom en la esquina superior izquierda",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Nivel"
@@ -7654,12 +7655,12 @@
       "aria-label-add-geomap-style-rule": "Añadir regla de estilo de geomapa"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Capa base",
+      "description-display-tooltip": "Mostrar la descripción emergente de la capa",
+      "name-data": "Datos",
+      "name-display-tooltip": "Mostrar descripción emergente",
+      "name-layer-type": "Tipo de capa",
+      "name-opacity": "Opacidad"
     },
     "layers-editor": {
       "label-add-layer": "Añadir capa",
@@ -7672,9 +7673,9 @@
       "use-current-map-settings": "Utilizar ajustes actuales de mapa"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Mostrar leyenda del mapa",
+      "name-show-legend": "Mostrar leyenda",
+      "name-styles": "Estilos"
     },
     "markers-legend": {
       "title-symbol": "Símbolo"
@@ -7683,27 +7684,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Mostrar herramientas de medición"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Vista inicial",
+    "name-mouse-wheel-zoom": "Zoom con la rueda del ratón",
+    "name-no-repeat": "Sin repetición de mapa",
+    "name-share-view": "Compartir vista",
+    "name-show-attribution": "Mostrar atribución",
+    "name-show-debug": "Mostrar depuración",
+    "name-show-measure": "Mostrar herramientas de medición",
+    "name-show-scale": "Mostrar escala",
+    "name-show-zoom": "Mostrar control de zoom",
+    "name-tooltip": "Descripción emergente",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "No se han encontrado campos de cadena"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "La capa del mapa base está configurada por el administrador del servidor."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Centro",
+        "label-left": "Izquierda",
+        "label-right": "Derecha"
       },
       "label-align": "Alinear",
       "label-baseline": "Punto de referencia",
@@ -7719,12 +7720,12 @@
       "label-text-label": "Etiqueta de texto",
       "label-x-offset": "Compensación X",
       "label-y-offset": "Compensación Y",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Seleccionar un símbolo",
+      "placeholderText-select-symbol-or-add-text": "Selecciona un símbolo o añade una etiqueta de texto",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Abajo",
+        "label-center": "Centro",
+        "label-top": "Arriba"
       }
     },
     "style-rule-editor": {
@@ -7738,13 +7739,13 @@
       "placeholder-value": "valor"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Mostrar ventana emergente al pasar el ratón por encima",
+      "description-none": "Mostrar el contenido al hacer clic, no al pasar el ratón por encima",
+      "label-details": "Detalles",
+      "label-none": "Ninguno"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Capa {{name}}"
     }
   },
   "get-enterprise": {
@@ -7864,400 +7865,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Pies/seg²",
+            "name-g-unit": "Unidad G",
+            "name-meters-sec": "Metros/seg²"
           },
-          "name": ""
+          "name": "Aceleración"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Minutos de arco",
+            "name-arc-seconds": "Segundos de arco",
+            "name-degrees": "Grados (°)",
+            "name-gradian": "Grado centesimal",
+            "name-radians": "Radianes"
           },
-          "name": ""
+          "name": "Ángulo"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Acres (ac)",
+            "name-hectares": "Hectáreas (ha)",
+            "name-square-feet": "Pies cuadrados (ft²)",
+            "name-square-meters": "Metros cuadrados (m²)",
+            "name-square-miles": "Millas cuadradas (mi²)"
           },
-          "name": ""
+          "name": "Superficie"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Encendido/apagado",
+            "name-true-false": "Verdadero/falso",
+            "name-yes-no": "Sí/no"
           },
-          "name": ""
+          "name": "Booleano"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "Computación"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "gramo por metro cúbico (g/m³)",
+            "name-g-nm3": "gramo por metro cúbico normal (g/Nm³)",
+            "name-mg-dl": "miligramos por decilitro (mg/dL)",
+            "name-mg-m3": "miligramo por metro cúbico (mg/m³)",
+            "name-mg-nm3": "miligramo por metro cúbico normal (mg/Nm³)",
+            "name-mmol-l": "milimoles por litro (mmol/L)",
+            "name-ng-m3": "nanogramo por metro cúbico (ng/m³)",
+            "name-ng-nm3": "nanogramo por metro cúbico normal (ng/Nm³)",
+            "name-ppb": "partes por mil millones (ppb)",
+            "name-ppm": "partes por millón (ppm)",
+            "name-ug-m3": "microgramo por metro cúbico (μg/m³)",
+            "name-ug-nm3": "microgramo por metro cúbico normal (μg/Nm³)"
           },
-          "name": ""
+          "name": "Concentración"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Lev búlgaro (BGN)",
+            "name-brl": "Real (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "Franco suizo (CHF)",
+            "name-czk": "Corona checa (CZK)",
+            "name-dkk": "Corona danesa (kr)",
+            "name-eur": "Euro (€)",
+            "name-gbp": "Libra esterlina (£)",
+            "name-idr": "Rupia indonesia (Rp)",
+            "name-ils": "Nuevo séquel israelí (₪)",
+            "name-inr": "Rupia india (₹)",
+            "name-isk": "Corona islandesa (kr)",
+            "name-jpy": "Yen (¥)",
+            "name-krw": "Won surcoreano (₩)",
+            "name-mbtc": "Milli Bitcoin (฿)",
+            "name-myr": "Ringgit de Malasia (RM)",
+            "name-nok": "Corona noruega (kr)",
+            "name-php": "Peso filipino (PHP)",
+            "name-pln": "Złoty polaco (PLN)",
+            "name-pyg": "Guaraní (₲)",
+            "name-rub": "Rublo (₽)",
+            "name-sek": "Corona sueca (kr)",
+            "name-try": "Lira turca (₺)",
+            "name-uah": "Hryvnia (₴)",
+            "name-ubtc": "Micro Bitcoin (฿)",
+            "name-usd": "Dólar ($)",
+            "name-uyu": "Peso uruguayo (UYU)",
+            "name-vnd": "Dong vietnamita (VND)",
+            "name-xpf": "Franco CFP (XPF)",
+            "name-zar": "Rand sudafricano (R)"
           },
-          "name": ""
+          "name": "Moneda"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bits(IEC)",
+            "name-bits-si": "bits(SI)",
+            "name-bytes-iec": "bytes(IEC)",
+            "name-bytes-si": "bytes(SI)",
+            "name-gibibytes": "gibibytes",
+            "name-gigabytes": "gigabytes",
+            "name-kibibytes": "kibibytes",
+            "name-kilobytes": "kilobytes",
+            "name-mebibytes": "mebibytes",
+            "name-megabytes": "megabytes",
+            "name-pebibytes": "pebibytes",
+            "name-petabytes": "petabytes",
+            "name-tebibytes": "tebibytes",
+            "name-terabytes": "terabytes"
           },
-          "name": ""
+          "name": "Datos"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bits/seg(IEC)",
+            "name-bits-sec-si": "bits/seg(SI)",
+            "name-bytes-sec-iec": "bytes/seg(IEC)",
+            "name-bytes-sec-si": "bytes/seg(SI)",
+            "name-gibibits-sec": "gibibits/seg",
+            "name-gibibytes-sec": "gibibytes/seg",
+            "name-gigabits-sec": "gigabits/seg",
+            "name-gigabytes-sec": "gigabytes/seg",
+            "name-kibibits-sec": "kibibits/seg",
+            "name-kibibytes-sec": "kibibytes/seg",
+            "name-kilobits-sec": "kilobits/seg",
+            "name-kilobytes-sec": "kilobytes/seg",
+            "name-mebibits-sec": "mebibits/seg",
+            "name-mebibytes-sec": "mebibytes/seg",
+            "name-megabits-sec": "megabits/seg",
+            "name-megabytes-sec": "megabytes/seg",
+            "name-packets-sec": "paquetes/seg",
+            "name-pebibits-sec": "pebibits/seg",
+            "name-pebibytes-sec": "pebibytes/seg",
+            "name-petabits-sec": "petabits/seg",
+            "name-petabytes-sec": "petabytes/seg",
+            "name-tebibits-sec": "tebibits/seg",
+            "name-tebibytes-sec": "tebibytes/seg",
+            "name-terabits-sec": "terabits/seg",
+            "name-terabytes-sec": "terabytes/seg"
           },
-          "name": ""
+          "name": "Velocidad de datos"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Fecha y hora predeterminadas",
+            "name-datetime-iso": "Fecha y hora ISO",
+            "name-datetime-iso-no-date": "Fecha y hora ISO (sin fecha si es hoy)",
+            "name-datetime-local": "Fecha y hora local",
+            "name-datetime-local-no-date": "Fecha y hora local (sin fecha si es hoy)",
+            "name-datetime-us": "Fecha y hora de EE. UU.",
+            "name-datetime-us-no-date": "Fecha y hora de EE. UU. (sin fecha si es hoy)",
+            "name-from-now": "Desde ahora"
           },
-          "name": ""
+          "name": "Fecha y hora"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Amperio (A)",
+            "name-ampere-hour": "Amperio-hora (Ah)",
+            "name-decibel-milliwatt": "Decibelio-milivatio (dBm)",
+            "name-electron-volt": "Electronvoltio (eV)",
+            "name-farad": "Faradio (F)",
+            "name-femtofarad": "Femtofaradio (fF)",
+            "name-gigawatt": "Gigavatio (GW)",
+            "name-henry": "Henrio (H)",
+            "name-joule": "Julio (J)",
+            "name-kiloampere": "Kiloamperio (kA)",
+            "name-kiloampere-hour": "Kiloamperio-hora (kAh)",
+            "name-kiloohm": "Kiloohmio (kΩ)",
+            "name-kilovolt": "Kilovoltio (kV)",
+            "name-kilovolt-ampere": "Kilovoltio-amperio (kVA)",
+            "name-kilovolt-ampere-reactive": "Kilovoltio-amperio reactivo (kVAr)",
+            "name-kilowatt": "Kilovatio (kW)",
+            "name-kilowatt-hour": "Kilovatio-hora (KWh)",
+            "name-kilowatt-min": "Kilovatio-min (kWm)",
+            "name-lumens": "Lúmenes (Lm)",
+            "name-megaohm": "Megaohmio (MΩ)",
+            "name-megawatt": "Megavatio (MW)",
+            "name-megawatt-hour": "Megavatio-hora (MWh)",
+            "name-microfarad": "Microfaradio (µF)",
+            "name-microhenry": "Microhenrio (µH)",
+            "name-milliampere": "Miliamperio (mA)",
+            "name-milliampere-hour": "Miliamperio-hora (mAh)",
+            "name-millihenry": "Milihenrio (mH)",
+            "name-milliohm": "Miliohmio (mΩ)",
+            "name-millivolt": "Milivoltio (mV)",
+            "name-milliwatt": "Milivatio (mW)",
+            "name-nanofarad": "Nanofaradio (nF)",
+            "name-ohm": "Ohmio (Ω)",
+            "name-picofarad": "Picofaradio (pF)",
+            "name-volt": "Voltio (V)",
+            "name-volt-ampere": "Voltio-amperio (VA)",
+            "name-volt-ampere-reactive": "Voltio-amperio reactivo (VAr)",
+            "name-watt": "Vatio (W)",
+            "name-watt-hour": "Vatio-hora (Wh)",
+            "name-watt-hour-per-kg": "Vatio-hora por kilogramo (Wh/kg)",
+            "name-watt-square-meter": "Vatios por metro cuadrado (W/m²)"
           },
-          "name": ""
+          "name": "Energía"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Pies cúbicos/min (cfm)",
+            "name-cubic-feet-sec": "Pies cúbicos/seg (cfs)",
+            "name-cubic-meters-sec": "Metros cúbicos/seg (cms)",
+            "name-gallons-min": "Galones/min (gpm)",
+            "name-litre-hour": "Litro/hora",
+            "name-litre-min": "Litro/min (L/min)",
+            "name-lux": "Lux (lx)",
+            "name-millilitre-min": "mililitro/min (mL/min)"
           },
-          "name": ""
+          "name": "Flujo"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Kilonewton-metros (kNm)",
+            "name-kilonewtons": "Kilonewtons (kN)",
+            "name-newton-meters": "Newton-metros (Nm)",
+            "name-newtons": "Newtons (N)"
           },
-          "name": ""
+          "name": "Forzar"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "exahashes/seg",
+            "name-gigahashes-sec": "gigahashes/seg",
+            "name-hashes-sec": "hashes/seg",
+            "name-kilohashes-sec": "kilohashes/seg",
+            "name-megahashes-sec": "megahashes/seg",
+            "name-petahashes-sec": "petahashes/seg",
+            "name-terahashes-sec": "terahashes/seg"
           },
-          "name": ""
+          "name": "Tasa de hash"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "pies (ft)",
+            "name-inch": "pulgada (in)",
+            "name-kilometer": "kilómetro (km)",
+            "name-meter": "metro (m)",
+            "name-mile": "milla (mi)",
+            "name-millimeter": "milímetro (mm)"
           },
-          "name": ""
+          "name": "Longitud"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "gramo (g)",
+            "name-kilogram": "kilogramo (kg)",
+            "name-metric-ton": "tonelada métrica (t)",
+            "name-milligram": "miligramo (mg)",
+            "name-pound": "libra (lb)"
           },
-          "name": ""
+          "name": "Masa"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Candela (cd)",
+            "name-decibel": "Decibelio",
+            "name-hexadecimal": "Hexadecimal",
+            "name-hexadecimal-0x": "Hexadecimal (0x)",
+            "name-humidity": "Humedad (%H)",
+            "name-locale": "Formato local",
+            "name-number": "Número",
+            "name-percent-1": "Porcentaje (0,0-1,0)",
+            "name-percent-100": "Porcentaje (0-100)",
+            "name-pixels": "Píxeles",
+            "name-scientific": "Notación científica",
+            "name-short": "corto",
+            "name-si-short": "SI corto",
+            "name-string": "Cadena"
           },
-          "name": ""
+          "name": "Varios"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Barras",
+            "name-hectopascals": "Hectopascales",
+            "name-inches-mercury": "Pulgadas de mercurio",
+            "name-kilobars": "Kilobares",
+            "name-kilopascals": "Kilopascales",
+            "name-millibars": "Milibares",
+            "name-pascals": "Pascales",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Presión"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Bequerelio (Bq)",
+            "name-curie": "curio (Ci)",
+            "name-exposure": "Exposición (C/kg)",
+            "name-gray": "Gray (Gy)",
+            "name-microsievert": "microsievert (µSv)",
+            "name-microsievert-hour": "microsievert/hora (µSv/h)",
+            "name-millisievert": "milisievert (mSv)",
+            "name-millisievert-hour": "milisievert/hora (mSv/h)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "roentgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/hora (Sv/h)"
           },
-          "name": ""
+          "name": "Radiación"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Grados por segundo (°/s)",
+            "name-gigahertz": "Gigahercio (GHz)",
+            "name-hertz": "Hercio (Hz)",
+            "name-kilohertz": "Kilohercio (kHz)",
+            "name-megahertz": "Megahercio (MHz)",
+            "name-radians-sec": "Radianes por segundo (rad/s)",
+            "name-rpm": "Revoluciones por minuto (rpm)"
           },
-          "name": ""
+          "name": "Velocidad de rotación"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsius (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Temperatura"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "recuentos/min (cpm)",
+            "name-counts-sec": "recuentos/seg (cps)",
+            "name-events-min": "eventos/min (epm)",
+            "name-events-sec": "eventos/seg (eps)",
+            "name-io-ops-sec": "Operaciones de E/S/seg (iops)",
+            "name-messages-min": "mensajes/min (mpm)",
+            "name-messages-sec": "mensajes/seg (mps)",
+            "name-ops-min": "operaciones/min (opm)",
+            "name-ops-sec": "operaciones/seg (ops)",
+            "name-reads-min": "lecturas/min (rpm)",
+            "name-reads-sec": "lecturas/seg (rps)",
+            "name-records-min": "registros/min (rpm)",
+            "name-records-sec": "registros/seg (rps)",
+            "name-requests-min": "solicitudes/min (rpm)",
+            "name-requests-sec": "solicitudes/seg (rps)",
+            "name-rows-min": "filas/min (rpm)",
+            "name-rows-sec": "filas/seg (rps)",
+            "name-writes-min": "escrituras/min (ppm)",
+            "name-writes-sec": "escrituras/seg (wps)"
           },
-          "name": ""
+          "name": "Rendimiento"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "reloj (ms)",
+            "name-clock-s": "reloj (s)",
+            "name-days": "días (d)",
+            "name-duration-dhms": "duración (d hh:mm:ss)",
+            "name-duration-hms": "duración (hh:mm:ss)",
+            "name-duration-ms": "duración (ms)",
+            "name-duration-s": "duración (s)",
+            "name-hertz": "Hercio (1/s)",
+            "name-hours": "horas (h)",
+            "name-microseconds": "microsegundos (µs)",
+            "name-milliseconds": "milisegundos (ms)",
+            "name-minutes": "minutos (m)",
+            "name-nanoseconds": "nanosegundos (ns)",
+            "name-seconds": "segundos (s)",
+            "name-timeticks": "Timeticks (s/100)"
           },
-          "name": ""
+          "name": "Hora"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "kilómetros/hora (km/h)",
+            "name-knot": "nudo (kn)",
+            "name-meters-second": "metros/segundo (m/s)",
+            "name-miles-hour": "millas/hora (mph)"
           },
-          "name": ""
+          "name": "Velocidad"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "decímetro cúbico",
+            "name-cubic-meter": "metro cúbico",
+            "name-gallons": "galones",
+            "name-litre": "litro (L)",
+            "name-millilitre": "mililitro (mL)",
+            "name-normal-cubic-meter": "Metro cúbico normal"
           },
-          "name": ""
+          "name": "Volumen"
         }
       }
     }
@@ -8300,85 +8301,85 @@
     },
     "builder": {
       "axis": {
-        "category-axis": "",
-        "color-label": "",
+        "category-axis": "Eje",
+        "color-label": "Color",
         "color-options": {
-          "label-series": "",
-          "label-text": ""
+          "label-series": "Series",
+          "label-text": "Texto"
         },
         "grid-line-options": {
-          "label-auto": "",
-          "label-off": "",
-          "label-on": ""
+          "label-auto": "Auto",
+          "label-off": "Apagado",
+          "label-on": "Encendido"
         },
-        "name-centered-zero": "",
-        "name-grid-lines": "",
-        "name-label": "",
-        "name-placement": "",
-        "name-scale": "",
-        "name-show-border": "",
-        "name-soft-max": "",
-        "name-soft-min": "",
-        "name-width": "",
-        "placeholder-label": "",
-        "placeholder-soft-max": "",
-        "placeholder-soft-min": "",
-        "placeholder-width": "",
+        "name-centered-zero": "Cero centrado",
+        "name-grid-lines": "Mostrar líneas de cuadrícula",
+        "name-label": "Etiqueta",
+        "name-placement": "Colocación",
+        "name-scale": "Escala",
+        "name-show-border": "Mostrar borde",
+        "name-soft-max": "Máx. suave",
+        "name-soft-min": "Mín. suave",
+        "name-width": "Ancho",
+        "placeholder-label": "Texto opcional",
+        "placeholder-soft-max": "Ver: Opciones estándar > Máx.",
+        "placeholder-soft-min": "Ver: Opciones estándar > Mín.",
+        "placeholder-width": "Auto",
         "scale-distribution-editor": {
           "distribution-options": {
-            "label-linear": "",
-            "label-log": "",
-            "label-symlog": ""
+            "label-linear": "Lineal",
+            "label-log": "Logarítmica",
+            "label-symlog": "Symlog"
           }
         }
       },
       "legend": {
-        "category": "",
-        "description-values": "",
+        "category": "Leyenda",
+        "description-values": "Seleccionar valores o cálculos para mostrar en la leyenda",
         "mode-options": {
-          "label-list": "",
-          "label-table": ""
+          "label-list": "Lista",
+          "label-table": "Tabla"
         },
-        "name-mode": "",
-        "name-placement": "",
-        "name-values": "",
-        "name-visibility": "",
-        "name-width": "",
+        "name-mode": "Modo",
+        "name-placement": "Colocación",
+        "name-values": "Valores",
+        "name-visibility": "Visibilidad",
+        "name-width": "Ancho",
         "placement-options": {
-          "label-bottom": "",
-          "label-right": ""
+          "label-bottom": "Abajo",
+          "label-right": "Derecha"
         }
       },
       "stacking": {
-        "name-stack-series": ""
+        "name-stack-series": "Series apiladas"
       },
       "text": {
-        "category-text-size": "",
-        "name-percent-change": "",
-        "name-title": "",
-        "name-value": "",
-        "placeholder-percent-change": "",
-        "placeholder-title": "",
-        "placeholder-value": ""
+        "category-text-size": "Tamaño de texto",
+        "name-percent-change": "Variación porcentual",
+        "name-title": "Título",
+        "name-value": "Valor",
+        "placeholder-percent-change": "Auto",
+        "placeholder-title": "Auto",
+        "placeholder-value": "Auto"
       },
       "tooltip": {
-        "category": "",
-        "description-hover-proximity": "",
+        "category": "Descripción emergente",
+        "description-hover-proximity": "Cómo de cerca debe estar el cursor de un punto para activar la descripción emergente, en píxeles",
         "modeOptions": {
-          "label-all": "",
-          "label-hidden": "",
-          "label-single": ""
+          "label-all": "Todo",
+          "label-hidden": "Oculto",
+          "label-single": "Único"
         },
-        "name-hide-zeros": "",
-        "name-hover-proximity": "",
-        "name-max-height": "",
-        "name-max-width": "",
-        "name-tooltip-mode": "",
-        "name-values-sort-order": "",
+        "name-hide-zeros": "Ocultar ceros",
+        "name-hover-proximity": "Proximidad del cursor",
+        "name-max-height": "Altura máx.",
+        "name-max-width": "Anchura máx.",
+        "name-tooltip-mode": "Modo descripción emergente",
+        "name-values-sort-order": "Orden de clasificación de valores",
         "sortOptions": {
-          "label-ascending": "",
-          "label-descending": "",
-          "label-none": ""
+          "label-ascending": "Ascendente",
+          "label-descending": "Descendente",
+          "label-none": "Ninguno"
         }
       }
     },
@@ -8386,7 +8387,7 @@
       "option": "opción"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Abrir vista previa de la imagen"
     },
     "cascader": {
       "clear-button": "Eliminar selección"
@@ -8400,9 +8401,9 @@
       "aria-label-selected-color": "{{colorLabel}} color"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Eliminar",
       "cancel": "Cancelar",
-      "confirmText-delete": ""
+      "confirmText-delete": "Eliminar"
     },
     "confirm-content": {
       "placeholder": "Escribe «{{confirmPromptText}}» para confirmar"
@@ -8507,56 +8508,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "Abril",
+        "label-august": "Agosto",
+        "label-december": "Diciembre",
+        "label-february": "Febrero",
+        "label-january": "Enero",
+        "label-july": "Julio",
+        "label-june": "Junio",
+        "label-march": "Marzo",
+        "label-may": "Mayo",
+        "label-november": "Noviembre",
+        "label-october": "Octubre",
+        "label-september": "Septiembre"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Anteayer",
+        "last-1-hour": "Última hora",
+        "last-1-year": "Último año",
+        "last-12-hours": "Últimas 12 horas",
+        "last-15-mins": "Últimos 15 minutos",
+        "last-2-days": "Últimos 2 días",
+        "last-2-years": "Últimos 2 años",
+        "last-24-hours": "Últimas 24 horas",
+        "last-3-hours": "Últimas 3 horas",
+        "last-30-days": "Últimos 30 días",
+        "last-30-mins": "Últimos 30 minutos",
+        "last-5-mins": "Últimos 5 minutos",
+        "last-5-years": "Últimos 5 años",
+        "last-6-hours": "Últimas 6 horas",
+        "last-6-months": "Últimos 6 meses",
+        "last-7-days": "Últimos 7 días",
+        "last-90-days": "Últimos 90 días",
+        "previous-fiscal-quarter": "Trimestre fiscal anterior",
+        "previous-fiscal-year": "Año fiscal anterior",
+        "previous-month": "Mes anterior",
+        "previous-week": "Semana anterior",
+        "previous-year": "Año anterior",
+        "this-day-last-week": "Este día de la semana pasada",
+        "this-fiscal-quarter": "Este trimestre fiscal",
+        "this-fiscal-quarter-so-far": "Este trimestre fiscal hasta ahora",
+        "this-fiscal-year": "Este año fiscal",
+        "this-fiscal-year-so-far": "Este año fiscal hasta ahora",
+        "this-month": "Este mes",
+        "this-month-so-far": "Este mes hasta ahora",
+        "this-week": "Esta semana",
+        "this-week-so-far": "Esta semana hasta ahora",
+        "this-year": "Este año",
+        "this-year-so-far": "Este año hasta ahora",
+        "today": "Hoy",
+        "today-so-far": "Hoy hasta ahora",
+        "yesterday": "Ayer"
       }
     },
     "drawer": {
@@ -8598,33 +8599,33 @@
       "tooltip-expand-all": "Expandir todas las filas"
     },
     "matchers-ui": {
-      "description-field-name-by-regex-matcher": "",
-      "description-fields-by-query": "",
-      "description-fields-with-name": "",
-      "description-fields-with-type": "",
-      "description-fields-with-value": "",
+      "description-field-name-by-regex-matcher": "Establecer propiedades para campos con nombres que coincidan con una expresión regular",
+      "description-fields-by-query": "Establecer propiedades para campos de una consulta específica",
+      "description-fields-with-name": "Establecer propiedades para un campo específico",
+      "description-fields-with-type": "Establecer propiedades para campos de un tipo específico (número, cadena, booleano)",
+      "description-fields-with-value": "Establecer propiedades para campos con condición de reductor",
       "field-name-picker": {
-        "placeholder": ""
+        "placeholder": "Seleccionar campo"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Booleano",
+        "label-enum": "Enumerado",
+        "label-number": "Número",
+        "label-other": "Otro",
+        "label-string": "Cadena",
+        "label-time": "Hora",
+        "label-traces": "Trazas"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Marcos ({{framesCount}}): {{framesNames}}",
+        "label": "Consulta: {{refId}}",
+        "label-missing-ref-id": "Consulta: (falta el ID de referencia)"
       },
-      "name-field-name-by-regex-matcher": "",
-      "name-fields-by-query": "",
-      "name-fields-with-name": "",
-      "name-fields-with-type": "",
-      "name-fields-with-value": ""
+      "name-field-name-by-regex-matcher": "Campos con nombre que coincide con la expresión regular",
+      "name-fields-by-query": "Campos devueltos por la consulta",
+      "name-fields-with-name": "Campos con nombre",
+      "name-fields-with-type": "Campos con tipo",
+      "name-fields-with-value": "Campos con valores"
     },
     "menu-item": {
       "keyboard-shortcut-label": "Método abreviado de teclado"
@@ -8652,8 +8653,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "alternar panel para contraer",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Barra de carga del panel",
+      "ariaLabel-panel-status": "Estado del panel",
       "tooltip-cancel": "Cancelar consulta",
       "tooltip-cancel-loading": "Cancelar consulta",
       "tooltip-stop-streaming": "Detener transmisión",
@@ -8722,12 +8723,12 @@
       "inspect-drawer-title": "Inspeccionar valor",
       "inspect-menu-label": "Inspeccionar valor",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Sin datos"
       },
       "no-values-label": "Sin valores",
       "pagination-summary": "{{itemsRangeStart}}-{{displayedEnd}} de {{numRows}} filas",
       "sparkline": {
-        "no-data": ""
+        "no-data": "no hay datos"
       }
     },
     "tags": {
@@ -8735,7 +8736,7 @@
     },
     "tags-input": {
       "add": "Añadir",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Nueva etiqueta (pulsa la tecla Intro para añadirla)",
       "remove": "Eliminar etiqueta: {{name}}"
     },
     "time-sync-button": {
@@ -8752,55 +8753,55 @@
       "config": {
         "get-graph-field-options": {
           "axis-placement": {
-            "description-auto": "",
-            "label-auto": "",
-            "label-hidden": "",
-            "label-left": "",
-            "label-right": ""
+            "description-auto": "Primer campo a la izquierda, todo lo demás a la derecha",
+            "label-auto": "Auto",
+            "label-hidden": "Oculto",
+            "label-left": "Izquierda",
+            "label-right": "Derecha"
           },
           "bar-alignment": {
-            "description-after": "",
-            "description-before": "",
-            "description-center": ""
+            "description-after": "Después",
+            "description-before": "Antes",
+            "description-center": "Centro"
           },
           "draw-style": {
-            "label-bars": "",
-            "label-lines": "",
-            "label-points": ""
+            "label-bars": "Barras",
+            "label-lines": "Líneas",
+            "label-points": "Puntos"
           },
           "fill-gradient": {
-            "description-hue": "",
-            "description-opacity": "",
-            "description-scheme": "",
-            "label-hue": "",
-            "label-none": "",
-            "label-opacity": "",
-            "label-scheme": ""
+            "description-hue": "Pequeño gradiente de tono de color",
+            "description-opacity": "Habilitar degradado de opacidad de relleno",
+            "description-scheme": "Utilizar el esquema de color para definir el gradiente",
+            "label-hue": "Tono",
+            "label-none": "Ninguno",
+            "label-opacity": "Opacidad",
+            "label-scheme": "Esquema"
           },
           "line-interpolation": {
-            "description-linear": "",
-            "description-smooth": "",
-            "description-step-after": "",
-            "description-step-before": ""
+            "description-linear": "Lineal",
+            "description-smooth": "Liso",
+            "description-step-after": "Paso siguiente",
+            "description-step-before": "Paso anterior"
           },
           "show-points": {
-            "description-auto": "",
-            "label-always": "",
-            "label-auto": "",
-            "label-never": ""
+            "description-auto": "Mostrar puntos cuando la densidad es baja",
+            "label-always": "Siempre",
+            "label-auto": "Auto",
+            "label-never": "Nunca"
           },
           "stacking": {
-            "label-100": "",
-            "label-normal": "",
-            "label-off": ""
+            "label-100": "100 %",
+            "label-normal": "Normal",
+            "label-off": "Apagado"
           },
           "thresholds-display-mode": {
-            "label-dashed-lines": "",
-            "label-filled-regions": "",
-            "label-filled-regions-and-dashed-lines": "",
-            "label-filled-regions-and-lines": "",
-            "label-lines": "",
-            "label-off": ""
+            "label-dashed-lines": "Como líneas (discontinuas)",
+            "label-filled-regions": "Como regiones rellenas",
+            "label-filled-regions-and-dashed-lines": "Como regiones rellenas y líneas (discontinuas)",
+            "label-filled-regions-and-lines": "Como regiones rellenas y líneas",
+            "label-lines": "Como líneas",
+            "label-off": "Apagado"
           }
         }
       }
@@ -8828,14 +8829,14 @@
       "footer-add-annotation": "Añadir anotación",
       "footer-click-to-action": "Haz clic para {{actionTitle}}",
       "footer-click-to-navigate": "Haz clic para abrir {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Filtrar por «{{value}}»",
       "timestamp": "Marca de tiempo"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Predeterminado",
+      "weekStarts-label-monday": "Lunes",
+      "weekStarts-label-saturday": "Sábado",
+      "weekStarts-label-sunday": "Domingo"
     }
   },
   "graph": {
@@ -8848,78 +8849,78 @@
   },
   "heatmap": {
     "calculate-from-data-options": {
-      "label-no": "",
-      "label-yes": ""
+      "label-no": "No",
+      "label-yes": "Sí"
     },
-    "category-cell-display": "",
-    "category-colors": "",
-    "category-exemplars": "",
-    "category-heatmap": "",
-    "category-legend": "",
-    "category-tooltip": "",
-    "category-y-axis": "",
+    "category-cell-display": "Visualización de la celda",
+    "category-colors": "Colores",
+    "category-exemplars": "Ejemplos",
+    "category-heatmap": "Mapa de calor",
+    "category-legend": "Leyenda",
+    "category-tooltip": "Descripción emergente",
+    "category-y-axis": "Eje Y",
     "mode-options": {
-      "label-opacity": "",
-      "label-scheme": ""
+      "label-opacity": "Opacidad",
+      "label-scheme": "Esquema"
     },
-    "name-axis-label": "",
-    "name-axis-width": "",
-    "name-calculate-from-data": "",
-    "name-cell-gap": "",
-    "name-color": "",
-    "name-decimals": "",
-    "name-end-color-at-value": "",
-    "name-exponent": "",
-    "name-hide-cells-gt": "",
-    "name-hide-cells-lt": "",
-    "name-max-height": "",
-    "name-max-value": "",
-    "name-max-width": "",
-    "name-min-value": "",
-    "name-mode": "",
-    "name-placement": "",
-    "name-reverse": "",
-    "name-scale": "",
-    "name-scheme": "",
-    "name-show-color-scale": "",
-    "name-show-histogram": "",
-    "name-show-legend": "",
-    "name-start-color-from-value": "",
-    "name-steps": "",
-    "name-tick-alignment": "",
-    "name-tooltip-mode": "",
-    "name-unit": "",
-    "name-value-name": "",
-    "name-y-axis-scale": "",
-    "placeholder-axis-label": "",
-    "placeholder-axis-width": "",
-    "placeholder-decimals": "",
-    "placeholder-end-color-at-value": "",
-    "placeholder-hide-cells-gt": "",
-    "placeholder-hide-cells-lt": "",
-    "placeholder-max-value": "",
-    "placeholder-min-value": "",
-    "placeholder-start-color-from-value": "",
-    "placeholder-value-name": "",
+    "name-axis-label": "Etiqueta del eje",
+    "name-axis-width": "Ancho del eje",
+    "name-calculate-from-data": "Calcular a partir de datos",
+    "name-cell-gap": "Espacio entre celdas",
+    "name-color": "Color",
+    "name-decimals": "Decimales",
+    "name-end-color-at-value": "Escala de color final en el valor",
+    "name-exponent": "Exponente",
+    "name-hide-cells-gt": "Ocultar celdas con valores >=",
+    "name-hide-cells-lt": "Ocultar celdas con valores <=",
+    "name-max-height": "Altura máx.",
+    "name-max-value": "Valor máx.",
+    "name-max-width": "Anchura máx.",
+    "name-min-value": "Valor mín.",
+    "name-mode": "Modo",
+    "name-placement": "Colocación",
+    "name-reverse": "Atrás",
+    "name-scale": "Escala",
+    "name-scheme": "Esquema",
+    "name-show-color-scale": "Mostrar escala de colores",
+    "name-show-histogram": "Mostrar histograma (eje Y)",
+    "name-show-legend": "Mostrar leyenda",
+    "name-start-color-from-value": "Escala de color inicial a partir del valor",
+    "name-steps": "Pasos",
+    "name-tick-alignment": "Alineación de marca de verificación",
+    "name-tooltip-mode": "Modo descripción emergente",
+    "name-unit": "Unidad",
+    "name-value-name": "Nombre del valor",
+    "name-y-axis-scale": "Escala del eje Y",
+    "placeholder-axis-label": "Auto",
+    "placeholder-axis-width": "Auto",
+    "placeholder-decimals": "Auto",
+    "placeholder-end-color-at-value": "Auto (máx.)",
+    "placeholder-hide-cells-gt": "Ninguno",
+    "placeholder-hide-cells-lt": "Ninguno",
+    "placeholder-max-value": "Auto",
+    "placeholder-min-value": "Auto",
+    "placeholder-start-color-from-value": "Auto (mín.)",
+    "placeholder-value-name": "Valor",
     "placement-options": {
-      "label-hidden": "",
-      "label-left": "",
-      "label-right": ""
+      "label-hidden": "Oculto",
+      "label-left": "Izquierda",
+      "label-right": "Derecha"
     },
     "scale-options": {
-      "label-exponential": "",
-      "label-linear": ""
+      "label-exponential": "Exponencial",
+      "label-linear": "Lineal"
     },
     "tick-alignment-options": {
-      "label-auto": "",
-      "label-bottom": "",
-      "label-middle": "",
-      "label-top": ""
+      "label-auto": "Auto",
+      "label-bottom": "Inferior (GE)",
+      "label-middle": "Medio",
+      "label-top": "Superior (LE)"
     },
     "tooltip-mode-options": {
-      "label-all": "",
-      "label-hidden": "",
-      "label-single": ""
+      "label-all": "Todo",
+      "label-hidden": "Oculto",
+      "label-single": "Único"
     }
   },
   "help-modal": {
@@ -8979,14 +8980,14 @@
     "troubleshooting-help": "Para solicitar ayuda con la resolución de problemas, envía una instantánea de este panel al equipo de asistencia técnica de Grafana Labs. La instantánea contiene los datos de respuesta a la consulta y la configuración del panel."
   },
   "histogram": {
-    "category-histogram": "",
+    "category-histogram": "Histograma ",
     "histogram-panel": {
       "no-histogram-found-in-response": "No se ha encontrado ningún histograma en la respuesta"
     },
-    "name-fill-opacity": "",
-    "name-gradient-mode": "",
-    "name-line-width": "",
-    "name-stacking": ""
+    "name-fill-opacity": "Opacidad de relleno",
+    "name-gradient-mode": "Modo degradado",
+    "name-line-width": "Espesor de la línea",
+    "name-stacking": "Apilamiento"
   },
   "inspector": {
     "inspect-data-tab": {
@@ -9215,8 +9216,8 @@
       "title-create-library-panel": "Crear panel de librería"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Cambiar",
+      "confirmText-replace": "Reemplazar"
     },
     "confirm": {
       "delete-panel": "¿Quieres eliminar este panel?"
@@ -9241,7 +9242,7 @@
       "usage-count_other": "Utilizado en {{count}} dashboards"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Buscar por nombre, descripción o nombre de carpeta"
     },
     "loading-indicator": {
       "loading-library-panel": "Cargando panel de la librería..."
@@ -9367,16 +9368,16 @@
     }
   },
   "logs": {
-    "category-logs": "",
+    "category-logs": "Logs",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Exacto",
+      "label-none": "Ninguno",
+      "label-numbers": "Números",
+      "label-signature": "Firma"
     },
-    "description-enable-infinite-scrolling": "",
-    "description-enable-syntax-highlighting": "",
-    "description-show-controls": "",
+    "description-enable-infinite-scrolling": "Experimental. Obtenga más resultados desplazándose hasta la parte inferior de la lista de logs.",
+    "description-enable-syntax-highlighting": "Utilice una gramática de color de sintaxis predefinida para resaltar las partes relevantes de las líneas de log",
+    "description-show-controls": "Mostrar controles para saltar a la última o primera línea de log y filtra por nivel de log",
     "fields": {
       "type": {
         "loki": {
@@ -9390,8 +9391,8 @@
       }
     },
     "font-size-options": {
-      "label-default": "",
-      "label-small": ""
+      "label-default": "Predeterminado",
+      "label-small": "Pequeño"
     },
     "get-dataframe-fields": {
       "vars": {
@@ -9447,64 +9448,64 @@
       "title-log-line": ""
     },
     "log-line-details": {
-      "clear-search": "",
-      "close": "",
-      "copy-shortlink": "",
-      "copy-to-clipboard": "",
-      "displayed-fields-section": "",
+      "clear-search": "Borrar",
+      "close": "Cerrar detalles del log",
+      "copy-shortlink": "Copiar enlace corto",
+      "copy-to-clipboard": "Copiar al portapapeles",
+      "displayed-fields-section": "Organizar los campos mostrados",
       "fields": {
-        "adhoc-statistics": "",
-        "copy-value-to-clipboard": "",
-        "filter-out": "",
-        "filter-out-query": "",
+        "adhoc-statistics": "Estadísticas específicas",
+        "copy-value-to-clipboard": "Copiar valor al portapapeles",
+        "filter-out": "Filtrar valor",
+        "filter-out-query": "Filtrar valor en la consulta {{query}}",
         "toggle-field-button": {
-          "field-instead-message": "",
-          "hide-this-field": ""
+          "field-instead-message": "Mostrar este campo en lugar del mensaje",
+          "hide-this-field": "Ocultar este campo"
         }
       },
-      "fields-section": "",
-      "hide-log-line": "",
-      "inline-mode": "",
-      "links-section": "",
-      "log-line-field": "",
-      "log-line-section": "",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
-      "no-details": "",
-      "open-assistant": "",
-      "pin-line": "",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "fields-section": "Campos",
+      "hide-log-line": "Ocultar línea de log",
+      "inline-mode": "Mostrar en línea",
+      "links-section": "Enlaces",
+      "log-line-field": "Línea de log",
+      "log-line-section": "Línea de log",
+      "move-displayed-field-down": "Bajar",
+      "move-displayed-field-up": "Subir",
+      "no-details": "No hay campos que mostrar.",
+      "open-assistant": "Explicar esta línea de log en el Asistente",
+      "pin-line": "Anclar log",
+      "remove-displayed-field": "Eliminar campo",
+      "remove-log": "Eliminar log",
+      "scroll-to-logline": "Desplazarse a la línea de log",
       "search": {
-        "no-results": ""
+        "no-results": "No hay resultados que mostrar."
       },
-      "search-placeholder": "",
-      "show-context": "",
-      "show-log-line": "",
-      "sidebar-mode": "",
-      "unpin-line": ""
+      "search-placeholder": "Buscar nombres y valores de campo",
+      "show-context": "Mostrar contexto",
+      "show-log-line": "Mostrar línea de log",
+      "sidebar-mode": "Anclar a la derecha",
+      "unpin-line": "Desanclar log"
     },
     "log-line-menu": {
       "copy-link": "Copiar enlace a la línea de registro",
       "copy-log": "Copiar línea de registro",
       "hide-details": "Mostrar detalles del log",
       "icon-label": "Menú de registro",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Línea de log",
+      "log-line-explainer": "Explicar esta línea de log de forma concisa",
+      "open-assistant": "Explicar esta línea de log en el Asistente",
       "pin-to-outline": "Anclar registro",
       "show-context": "Mostrar contexto",
       "show-details": "Ocultar detalles del log",
       "unpin-from-outline": "Desanclar registro"
     },
     "log-list-search": {
-      "close": "",
-      "filter": "",
-      "info": "",
-      "input-placeholder": "",
-      "next": "",
-      "prev": ""
+      "close": "Cerrar la búsqueda",
+      "filter": "Filtrar logs coincidentes",
+      "info": "Búsqueda en el lado del cliente de cadenas dentro de los logs mostrados. No debe confundirse con los filtros de consulta. Utilice este componente para buscar cadenas específicas en los resultados de sus logs.",
+      "input-placeholder": "Búsqueda en logs",
+      "next": "Resultado siguiente",
+      "prev": "Resultado anterior"
     },
     "log-row-context-modal": {
       "error-loading-log-more-logs": "Error al cargar más logs.",
@@ -9565,7 +9566,7 @@
       "escape-newlines": "Corregir las secuencias de tabulación y de nueva línea que escaparon incorrectamente en las líneas de log",
       "font-size-default": "Utilizar tamaño de fuente pequeño",
       "font-size-small": "Utilizar tamaño de fuente predeterminado",
-      "hide-search": "",
+      "hide-search": "Cerrar la búsqueda",
       "hide-timestamps": "Ocultar marcas de tiempo",
       "hide-unique-labels": "Ocultar etiquetas únicas",
       "newest-first": "Ordenado por los logs más nuevos primero: haga clic para mostrar los más antiguos primero",
@@ -9578,7 +9579,7 @@
       "scroll-top": "Desplazarse al inicio",
       "show-ms-timestamps": "",
       "show-ns-timestamps": "",
-      "show-search": "",
+      "show-search": "Resultado de la búsqueda en logs",
       "show-timestamps": "Mostrar marcas temporales",
       "show-unique-labels": "Mostrar etiquetas únicas",
       "unwrap-lines": "Desajustar líneas",
@@ -9596,26 +9597,26 @@
         "common-labels": "Etiquetas comunes:"
       }
     },
-    "name-common-labels": "",
-    "name-deduplication": "",
-    "name-details-mode": "",
+    "name-common-labels": "Etiquetas comunes",
+    "name-deduplication": "Desduplicación",
+    "name-details-mode": "Modo de panel de detalles de log",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "En línea",
+      "label-sidebar": "Barra lateral"
     },
-    "name-enable-infinite-scrolling": "",
-    "name-enable-log-details": "",
-    "name-enable-syntax-highlighting": "",
-    "name-font-size": "",
-    "name-order": "",
-    "name-prettify-json": "",
-    "name-show-controls": "",
+    "name-enable-infinite-scrolling": "Habilitar el desplazamiento infinito",
+    "name-enable-log-details": "Habilitar detalles de log",
+    "name-enable-syntax-highlighting": "Habilitar resaltado de sintaxis",
+    "name-font-size": "Tamaño de letra",
+    "name-order": "Orden",
+    "name-prettify-json": "Embellecer JSON",
+    "name-show-controls": "Mostrar controles",
     "name-time": "",
-    "name-unique-labels": "",
-    "name-wrap-lines": "",
+    "name-unique-labels": "Etiquetas únicas",
+    "name-wrap-lines": "Líneas de envoltura",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Nuevos primero",
+      "label-oldest-first": "Más antiguos primero"
     },
     "out-of-range-message": {
       "end-of-the-selected-time-range": "Fin del intervalo de tiempo seleccionado."
@@ -9630,7 +9631,7 @@
     "un-themed-log-details": {
       "aria-label-data-links": "Enlaces de datos",
       "aria-label-fields": "Campos",
-      "aria-label-line": "",
+      "aria-label-line": "Línea de log",
       "aria-label-log-level": "Nivel de log",
       "aria-label-no-details": "Sin detalles"
     },
@@ -9651,27 +9652,27 @@
     }
   },
   "logs-new": {
-    "category-logs": "",
+    "category-logs": "Logs",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Exacto",
+      "label-none": "Ninguno",
+      "label-numbers": "Números",
+      "label-signature": "Firma"
     },
-    "description-infinite-scrolling": "",
-    "description-show-controls": "",
-    "description-syntax-highlighting": "",
-    "name-deduplication": "",
-    "name-enable-log-details": "",
-    "name-infinite-scrolling": "",
-    "name-order": "",
-    "name-show-controls": "",
-    "name-syntax-highlighting": "",
-    "name-time": "",
-    "name-wrap-lines": "",
+    "description-infinite-scrolling": "Experimental. Obtenga más resultados desplazándose hasta la parte inferior de la lista de logs.",
+    "description-show-controls": "Mostrar controles para saltar a la última o primera línea de log y filtra por nivel de log",
+    "description-syntax-highlighting": "Utilice una gramática de color de sintaxis predefinida para resaltar las partes relevantes de las líneas de log",
+    "name-deduplication": "Desduplicación",
+    "name-enable-log-details": "Habilitar detalles de log",
+    "name-infinite-scrolling": "Habilitar el desplazamiento infinito",
+    "name-order": "Orden",
+    "name-show-controls": "Mostrar controles",
+    "name-syntax-highlighting": "Habilitar resaltado de sintaxis",
+    "name-time": "Hora",
+    "name-wrap-lines": "Líneas de envoltura",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Nuevos primero",
+      "label-oldest-first": "Más antiguos primero"
     }
   },
   "manage-dashbaords": {
@@ -9698,8 +9699,8 @@
       "updated-on": "Actualizado el"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "¿Seguro que quieres eliminar «{{snapshotToRemove}}»?",
+      "confirmText-delete": "Eliminar",
       "title-delete": "Eliminar"
     },
     "unthemed-dashboard-import": {
@@ -9711,14 +9712,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "El nombre es obligatorio",
+      "message-reserved-name": "Este es un nombre reservado y no se puede usar para una carpeta.",
+      "message-same-name": "Ya existe un dashboard o una carpeta con el mismo nombre",
+      "message-same-name-general": "Ya existe una carpeta o dashboard en la carpeta general con el mismo nombre"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "No se han encontrado opciones"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9868,8 +9869,8 @@
     "resource-details": {
       "dismiss-button": "Aceptar",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Se ha alcanzado el número máximo de grupos de reglas de alerta: elimina algunos grupos de reglas de alerta o actualiza tu plan e inténtalo de nuevo.",
+        "alert-rules-quota-reached": "Se ha alcanzado el número máximo de reglas de alerta: elimina algunas reglas de alerta o actualiza tu plan e inténtalo de nuevo.",
         "dashboard-already-managed": "El panel de control ya está aprovisionado y gestionado por Grafana en la instancia en la nube. A partir de ahora, recomendamos utilizar el panel de control proporcionado. Si todavía quieres copiar el panel de control a la instancia en la nube, cambia el ID del panel de control en el JSON del panel de control, guarda una nueva instantánea y vuelve a subirla.",
         "datasource-already-managed": "La fuente de datos ya está aprovisionada y gestionada por Grafana en la instancia en la nube. Si se trata de un recurso distinto, configura otro UID e inténtalo de nuevo.",
         "datasource-invalid-url": "Hay una fuente de datos que tiene una URL no válida. Proporciona una URL válida e inténtalo de nuevo.",
@@ -10337,9 +10338,9 @@
       "aria-label": "Ayuda"
     },
     "invite-user": {
-      "invite-button": "",
+      "invite-button": "Invitar",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Invitar a usuario"
     },
     "item": {
       "add-bookmark": "Añadir a marcadores",
@@ -10371,12 +10372,12 @@
     "rss-button": "Últimas entradas del blog"
   },
   "news": {
-    "category-news": "",
-    "description-show-image": "",
-    "description-url": "",
+    "category-news": "Noticias",
+    "description-show-image": "Controla si la imagen social (og:image) del elemento de noticias se muestra encima del contenido de texto",
+    "description-url": "Admite fuentes RSS y Atom",
     "link-title": "Ir al blog de Grafana Labs",
-    "name-show-image": "",
-    "name-url": "",
+    "name-show-image": "Mostrar imagen",
+    "name-url": "URL",
     "news-panel": {
       "body-error-loading-rss-feed": "Asegúrese de que la URL del feed sea correcta y de que CORS esté configurado correctamente en el servidor. Consulte la <2>documentación del panel de noticias.</2>",
       "loading": "Cargando...",
@@ -10385,27 +10386,27 @@
     "title": "Últimas entradas del blog"
   },
   "node-graph": {
-    "category-edges": "",
-    "category-node-graph": "",
-    "category-nodes": "",
+    "category-edges": "Bordes",
+    "category-node-graph": "Gráfico de nodos",
+    "category-nodes": "Nodos",
     "layout-algorithm-options": {
-      "description-force": "",
-      "description-grid": "",
-      "description-layered": "",
-      "label-force": "",
-      "label-grid": "",
-      "label-layered": ""
+      "description-force": "Utilizar un diseño dirigido por la fuerza",
+      "description-grid": "Utilizar un diseño de cuadrícula",
+      "description-layered": "Utilizar un diseño en capas",
+      "label-force": "Forzar",
+      "label-grid": "Cuadrícula",
+      "label-layered": "Capas"
     },
-    "name-arc-sections": "",
-    "name-layout-algorithm": "",
-    "name-main-stat-unit": "",
-    "name-secondary-stat-unit": "",
-    "name-zoom-mode": "",
+    "name-arc-sections": "Secciones de arco",
+    "name-layout-algorithm": "Algoritmo de diseño",
+    "name-main-stat-unit": "Unidad de estadística principal",
+    "name-secondary-stat-unit": "Unidad de estadística secundaria",
+    "name-zoom-mode": "Modo zoom",
     "zoom-mode-options": {
-      "description-cooperative": "",
-      "description-greedy": "",
-      "label-cooperative": "",
-      "label-greedy": ""
+      "description-cooperative": "Le permite desplazarse por la página con normalidad",
+      "description-greedy": "Reacciona a todos los gestos de zoom",
+      "label-cooperative": "Cooperativo",
+      "label-greedy": "Avaricioso"
     }
   },
   "nodeGraph": {
@@ -10484,40 +10485,40 @@
     },
     "registry": {
       "get-all-option-editors": {
-        "description-time-zone": "",
-        "name-time-zone": ""
+        "description-time-zone": "Selección de zona horaria",
+        "name-time-zone": "Zona horaria"
       },
       "standard-field-condigs": {
-        "category-data-links": ""
+        "category-data-links": "Enlaces de datos y acciones"
       },
       "standard-field-configs": {
-        "category": "",
-        "category-thresholds": "",
-        "category-value-mappings": "",
-        "description-display-name": "",
-        "description-field-min-max": "",
-        "description-max": "",
-        "description-min": "",
-        "description-no-value": "",
-        "description-value-mappings": "",
-        "name-actions": "",
-        "name-ad-hoc": "",
-        "name-color-scheme": "",
-        "name-data-links": "",
-        "name-decimals": "",
-        "name-display-name": "",
-        "name-field-min-max": "",
-        "name-max": "",
-        "name-min": "",
-        "name-no-value": "",
-        "name-thresholds": "",
-        "name-unit": "",
-        "name-value-mappings": "",
-        "placeholder-decimals": "",
-        "placeholder-display-name": "",
-        "placeholder-max": "",
-        "placeholder-min": "",
-        "placeholder-unit": ""
+        "category": "Opciones estándar",
+        "category-thresholds": "Umbrales",
+        "category-value-mappings": "Asignaciones de valores",
+        "description-display-name": "Cambiar el nombre del campo o de la serie",
+        "description-field-min-max": "Calcular mín. máx. por campo",
+        "description-max": "Dejar vacío para calcular en función de todos los valores",
+        "description-min": "Dejar vacío para calcular en función de todos los valores",
+        "description-no-value": "Qué mostrar cuando no hay valor",
+        "description-value-mappings": "Modificar el texto de visualización en función del valor introducido",
+        "name-actions": "Acciones",
+        "name-ad-hoc": "Filtrable «ad hoc»",
+        "name-color-scheme": "Esquema de colores",
+        "name-data-links": "Enlaces de datos",
+        "name-decimals": "Decimales",
+        "name-display-name": "Nombre para mostrar",
+        "name-field-min-max": "Campo mín./máx.",
+        "name-max": "Máx.",
+        "name-min": "Mín.",
+        "name-no-value": "Sin valor",
+        "name-thresholds": "Umbrales",
+        "name-unit": "Unidad",
+        "name-value-mappings": "Asignaciones de valores",
+        "placeholder-decimals": "auto",
+        "placeholder-display-name": "ninguno",
+        "placeholder-max": "auto",
+        "placeholder-min": "auto",
+        "placeholder-unit": "ninguno"
       }
     },
     "units": {
@@ -10562,7 +10563,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "No se han encontrado organizaciones",
     "select-placeholder": "Seleccionar organización"
   },
   "page": {
@@ -10626,13 +10627,13 @@
     },
     "panel-data-error-view": {
       "missing-value": {
-        "number": "",
-        "string": "",
-        "time": "",
-        "unknown": ""
+        "number": "A los datos les falta un campo numérico",
+        "string": "A los datos les falta un campo de cadena",
+        "time": "A los datos les falta un campo de tiempo",
+        "unknown": "No se pueden visualizar los datos"
       },
       "no-value": {
-        "default": ""
+        "default": "Sin datos"
       },
       "open-visualization-suggestions": "Abrir sugerencias de visualización",
       "switch-to-table": "Cambiar a tabla"
@@ -10672,25 +10673,25 @@
     "select-placeholder": "Filtro por tipo"
   },
   "piechart": {
-    "category-legend": "",
-    "category-pie-chart": "",
-    "description-labels": "",
-    "description-pie-chart-type": "",
+    "category-legend": "Leyenda",
+    "category-pie-chart": "Gráfico circular",
+    "description-labels": "Seleccione las etiquetas que se mostrarán en el gráfico circular",
+    "description-pie-chart-type": "Cómo se debe representar el gráfico circular",
     "labels-options": {
-      "label-name": "",
-      "label-percent": "",
-      "label-value": ""
+      "label-name": "Nombre",
+      "label-percent": "Porcentaje",
+      "label-value": "Valor"
     },
     "legend-values-options": {
-      "label-percent": "",
-      "label-value": ""
+      "label-percent": "Porcentaje",
+      "label-value": "Valor"
     },
-    "name-labels": "",
-    "name-legend-values": "",
-    "name-pie-chart-type": "",
+    "name-labels": "Etiquetas",
+    "name-legend-values": "Valores de la leyenda",
+    "name-pie-chart-type": "Tipo de gráfico circular",
     "pie-chart-type-options": {
-      "label-donut": "",
-      "label-pie": ""
+      "label-donut": "Anillo",
+      "label-pie": "Círculo"
     }
   },
   "playlist": {
@@ -10785,7 +10786,7 @@
         "permission": "No tienes permiso para ver esta página.",
         "title-access-denied": "Acceso denegado"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "No se ha podido cargar el complemento",
       "no-root-app-page-component-found": "No se ha encontrado ningún componente de página de la aplicación raíz"
     },
     "browse": {
@@ -10829,7 +10830,7 @@
         "update-status-text": "complementos actualizados"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "¿Seguro que quieres volver a la versión {{version}}? Esta acción no es recomendable",
         "downgrade-confirm": "Volver a versión anterior",
         "downgrade-title": "Volver a versión anterior del complemento"
       }
@@ -10884,8 +10885,8 @@
       "message": "No se ha encontrado ningún complemento"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Consulta la consola para obtener más detalles sobre el error.",
+      "extension-error-alert-title": "No se ha podido cargar la extensión: «{{pluginId}}/{{extensionTitle}}»"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10922,13 +10923,13 @@
     "install-controls-button": {
       "title-uninstall-modal": "Desinstalar {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "¿Seguro que quieres desinstalar este complemento?",
+        "confirmText-confirm": "Confirmar"
       }
     },
     "install-controls-warning": {
       "body-not-published": "Este plugin no está publicado en <2>grafana.com/plugins</2> y no se puede gestionar a través del catálogo.",
-      "enterprise-plugin-info": "",
+      "enterprise-plugin-info": "Este complemento solo está disponible en Grafana Cloud y Grafana Enterprise.",
       "learn-more": "Más información",
       "no-valid-grafana-enterprise-license-detected": "No se ha detectado ninguna licencia válida de Grafana Enterprise.",
       "title-dev-alert": "Esta es una compilación de desarrollo del plugin y no se puede desinstalar.",
@@ -10941,6 +10942,9 @@
       "label-plugin-id": "ID del plugin",
       "label-severity": "Gravedad"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "No se puede encontrar ese plugin. Comprueba que la URL sea correcta o <1></1>ve al <3>catálogo de plugins</3>.",
       "title-plugin-not-found": "Plugin no encontrado"
@@ -11086,40 +11090,40 @@
   },
   "provisioned-resource-form": {
     "save-or-delete-resource-shared-fields": {
-      "comment-placeholder-describe-changes-optional": "",
-      "description-branch-name-in-git-hub": "",
+      "comment-placeholder-describe-changes-optional": "Añada una nota para describir sus cambios (opcional)",
+      "description-branch-name-in-git-hub": "Nombre de la rama en GitHub",
       "description-inside-repository": "",
-      "label-branch": "",
-      "label-comment": "",
-      "label-path": "",
-      "label-workflow": ""
+      "label-branch": "Rama",
+      "label-comment": "Comentario",
+      "label-path": "Ruta",
+      "label-workflow": "Flujo de trabajo"
     }
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Este recurso se encuentra detrás de la rama en {{repoType}}.",
+      "not-saved": "El resto de usuarios de Grafana de tu organización seguirán viendo la versión actual guardada en la rama predeterminada configurada hasta que se fusione esta rama",
+      "open-in-repo-button": "Abrir en {{repoType}}",
+      "open-pull-request-in-repo": "Abrir solicitud de extracción en {{repoType}}",
+      "view-in-repo-button": "Consúltalo en {{repoType}} para ver los últimos cambios.",
+      "view-pull-request-in-repo": "Ver solicitud de extracción en {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "Se ha creado un nuevo recurso en una rama en {{repoType}}.",
+    "title-loaded-pull-request-in-repo": "Este recurso se carga desde la rama que acabas de crear en {{repoType}} y solo es visible para ti"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Recurso guardado correctamente",
+  "provisioned-resource-request-handler-dashboard": "Dashboard guardado correctamente",
+  "provisioned-resource-request-handler-folder": "Carpeta creada correctamente",
   "provisioning": {
     "banner": {
       "message": "Esta función se encuentra actualmente en desarrollo activo. Para obtener la mejor experiencia y las últimas mejoras, recomendamos utilizar la <2>compilación nocturna</2> de Grafana."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "La rama que se utilizará para el aprovisionamiento",
+      "branch-label": "Rama",
+      "branch-required": "La rama es obligatoria",
+      "path-description": "Ruta de subdirectorio opcional dentro del repositorio",
+      "path-label": "Ruta",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11128,18 +11132,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Permite a los usuarios elegir si desean abrir una solicitud de extracción al guardar los cambios. Si el repositorio no permite cambios directos en la rama principal, es posible que se siga requiriendo una solicitud de extracción.",
+      "pr-workflow-label": "Habilitar la opción de solicitud de extracción al guardar",
+      "token-description": "Contraseña de la aplicación Bitbucket con permisos de repositorio",
+      "token-label": "Contraseña de la aplicación",
+      "token-required": "El token de Bitbucket es obligatorio",
+      "token-user-description": "El nombre de usuario que se utilizará para acceder al repositorio con la contraseña de la aplicación",
+      "token-user-label": "Nombre de usuario",
+      "token-user-required": "El nombre de usuario es obligatorio",
+      "url-description": "La URL del repositorio de Bitbucket",
+      "url-label": "URL del repositorio",
+      "url-pattern": "Debe ser una URL de repositorio de Bitbucket válida",
+      "url-required": "La URL del repositorio es obligatoria"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Añade un nombre claro para esta conexión de repositorio",
@@ -11150,12 +11154,12 @@
       "label-display-name": "Nombre que mostrar",
       "placeholder-my-repository-connection": "Mi conexión de repositorio",
       "text-loading-resource-information": "Cargando información de recursos...",
-      "dashboards-count_one": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} dashboard",
+      "dashboards-count_other": "{{count}} dashboards",
       "files-count_one": "{{count}} archivos",
       "files-count_other": "{{count}} archivos",
-      "folders-count_one": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} carpeta",
+      "folders-count_other": "{{count}} carpetas"
     },
     "check-repository": {
       "check": "Verificar"
@@ -11229,7 +11233,7 @@
       "title-instant-updates-requests-webhooks": "Actualizaciones instantáneas y solicitudes de extracción con webhooks.",
       "title-visual-previews-in-pull-requests": "Vistas previas visuales en solicitudes de extracción con renderizado de imágenes"
     },
-    "error-title-default": "",
+    "error-title-default": "Error",
     "expanded-row": {
       "job-specification": "Especificación del trabajo",
       "summary": "Resumen"
@@ -11238,8 +11242,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Configurar los conmutadores de características necesarios"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Gestiona los dashboards como código en Git y aprovisiona las actualizaciones de forma automática",
+      "manage-your-dashboards-with-remote-provisioning": "Empezar con Git Sync",
       "store-dashboards-in-version-controlled-storage": "Almacena los dashboards en un almacenamiento controlado por versiones para mejorar la organización y el seguimiento del historial"
     },
     "file-history-page": {
@@ -11260,16 +11264,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Añade una vista previa de la imagen de los cambios del dashboard en las solicitudes de extracción. Las imágenes de tus paneles de Grafana se compartirán en tu repositorio Git y serán visibles para cualquier persona con acceso al repositorio.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Crear enlaces de vista previa para las solicitudes de extracción",
       "description-image-rendering": "Requiere renderizado de imágenes. <2>Configurar el renderizado de imágenes</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(requiere <2>renderizado de imágenes</2> y acceso público habilitado)",
       "description-read-only": "Los recursos no se pueden modificar a través de Grafana.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Con qué frecuencia se deben sincronizar los cambios del repositorio",
+      "error-sync-interval-required": "El intervalo de sincronización es obligatorio",
       "label-enable-previews": "Habilitar las vistas previas del dashboard en las solicitudes de extracción",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Generar vistas previas de dashboard",
       "label-read-only": "Solo lectura",
-      "label-sync-interval": ""
+      "label-sync-interval": "Intervalo de sincronización (segundos)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "No hay resultados que coincidan con tu consulta",
@@ -11301,46 +11305,46 @@
       "subtitle-provisioning-feature": "Ver y gestionar tus conexiones de aprovisionamiento"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "La rama que se utilizará para el aprovisionamiento",
+      "branch-label": "Rama",
+      "branch-required": "La rama es obligatoria",
+      "path-description": "Ruta de subdirectorio opcional dentro del repositorio",
+      "path-label": "Ruta",
+      "pr-workflow-description": "Permite a los usuarios elegir si desean abrir una solicitud de extracción al guardar los cambios. Si el repositorio no permite cambios directos en la rama principal, es posible que se siga requiriendo una solicitud de extracción.",
+      "pr-workflow-label": "Habilitar la opción de solicitud de extracción al guardar",
+      "token-description": "Token de acceso al repositorio Git o contraseña",
+      "token-label": "Token de acceso",
+      "token-required": "El token de Git es obligatorio",
+      "token-user-description": "El nombre de usuario que se utilizará para acceder al repositorio con el token de acceso",
+      "token-user-label": "Nombre de usuario",
+      "token-user-required": "El nombre de usuario es obligatorio",
+      "url-description": "La URL del repositorio Git",
+      "url-label": "URL del repositorio",
+      "url-pattern": "Debe ser una URL de repositorio Git válida",
+      "url-required": "La URL del repositorio es obligatoria"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "La rama que se utilizará para el aprovisionamiento",
+      "branch-label": "Rama",
+      "branch-required": "La rama es obligatoria",
+      "path-description": "Ruta de subdirectorio opcional dentro del repositorio",
+      "path-label": "Ruta",
+      "pr-workflow-description": "Permite a los usuarios elegir si desean abrir una solicitud de extracción al guardar los cambios. Si el repositorio no permite cambios directos en la rama principal, es posible que se siga requiriendo una solicitud de extracción.",
+      "pr-workflow-label": "Habilitar la opción de solicitud de extracción al guardar",
+      "token-description": "Token de acceso personal de GitHub con permisos de repositorio",
+      "token-label": "Token de acceso personal",
+      "token-required": "El token de GitHub es obligatorio",
+      "url-description": "La URL del repositorio de GitHub",
+      "url-label": "URL del repositorio",
+      "url-pattern": "Debe ser una URL de repositorio de GitHub válida",
+      "url-required": "La URL del repositorio es obligatoria"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "La rama que se utilizará para el aprovisionamiento",
+      "branch-label": "Rama",
+      "branch-required": "La rama es obligatoria",
+      "path-description": "Ruta de subdirectorio opcional dentro del repositorio",
+      "path-label": "Ruta",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11349,15 +11353,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Permite a los usuarios elegir si desean abrir una solicitud de fusión al guardar los cambios. Si el repositorio no permite cambios directos en la rama principal, es posible que se siga requiriendo una solicitud de fusión.",
+      "pr-workflow-label": "Habilitar la opción de solicitud de fusión al guardar",
+      "token-description": "Token de acceso al proyecto de GitLab con permisos de repositorio",
+      "token-label": "Token de acceso al proyecto",
+      "token-required": "El token de GitLab es obligatorio",
+      "url-description": "La URL del repositorio de GitLab",
+      "url-label": "URL del repositorio",
+      "url-pattern": "Debe ser una URL de repositorio de GitLab válida",
+      "url-required": "La URL del repositorio es obligatoria"
     },
     "history-view": {
       "not-found": "No encontrado"
@@ -11385,18 +11389,18 @@
       "starting": "Empezando...",
       "status": {
         "title-error-running-job": "Error al ejecutar el trabajo",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Trabajo completado con éxito",
+        "title-warning-running-job": "Trabajo completado con advertencias"
       },
       "summary": "Resumen",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Error al recuperar el trabajo activo"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Ruta del sistema de archivos local al repositorio",
+      "path-label": "Ruta del repositorio",
+      "path-required": "La ruta del repositorio es obligatoria"
     },
     "mode-options": {
       "folder": {
@@ -11422,7 +11426,7 @@
     },
     "repository-actions": {
       "settings": "Configuración",
-      "source-code": ""
+      "source-code": "Código fuente"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11488,22 +11492,22 @@
       "title-queued-for-deletion": "En cola para su eliminación"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Elige un proveedor:",
+      "configure-file": "Configurar el aprovisionamiento de archivos",
+      "configure-with-provider": "Configurar con {{ provider }}",
+      "provider-not-listed": "Si el proveedor no aparece en la lista:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Conectar a los repositorios de Bitbucket",
+      "github": "GitHub",
+      "github-description": "Conectar a los repositorios de GitHub",
+      "gitlab": "GitLab",
+      "gitlab-description": "Conectar a los repositorios de GitLab",
+      "local": "Local",
+      "local-description": "Configurar el aprovisionamiento de archivos",
+      "pure-git": "Git puro",
+      "pure-git-description": "Conectar a cualquier repositorio Git"
     },
     "resource-view": {
       "base": "Base",
@@ -11534,11 +11538,11 @@
       "label-current-step": "Paso actual",
       "label-pending-step": "Paso pendiente"
     },
-    "success-title-default": "",
+    "success-title-default": "Completado",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Error al iniciar el trabajo",
+      "error-no-repository-name": "No se proporcionó ningún nombre de repositorio",
+      "error-starting-job": "Error al iniciar el trabajo"
     },
     "sync-repository": {
       "body-edit-configuration": "Editar la configuración",
@@ -11566,7 +11570,7 @@
       "go-to": "Ir a",
       "make-sure": "Asegúrate de incluir estos permisos"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Advertencia",
     "wizard": {
       "alert-point-1": "Los recursos no se podrán crear, editar ni eliminar durante este proceso. En el último paso, desaparecerán.",
       "alert-point-2": "Una vez que se complete el aprovisionamiento, los recursos volverán a aparecer y se gestionarán a través de un almacenamiento externo.",
@@ -11576,10 +11580,10 @@
       "button-next": "Terminar",
       "button-start": "Iniciar la sincronización",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Esto eliminará la configuración del repositorio y se perderá todo el progreso. ¿Seguro que quieres descartar los cambios?",
+        "confirm": "Sí, descartar",
+        "dismiss": "Seguir trabajando",
+        "title": "¿Descartar la configuración del repositorio?"
       },
       "step-bootstrap": "Elegir qué sincronizar",
       "step-connect": "Conectarse",
@@ -11595,7 +11599,7 @@
     "wizard-content": {
       "button-cancel": "Cancelar",
       "button-cancelling": "Cancelando... ",
-      "button-previous": "",
+      "button-previous": "Anterior",
       "button-submitting": "Enviando...",
       "error-instance-repository-exists": "El repositorio de instancias ya existe"
     }
@@ -11996,7 +12000,7 @@
         "recommended": "Recomendado",
         "results": "Resultados"
       },
-      "search": ""
+      "search": "Buscar {{parentTitle}}"
     }
   },
   "search": {
@@ -12077,7 +12081,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "No se han encontrado cuentas de servicio",
     "select-aria-label": "Selector de cuentas de servicio",
     "select-placeholder": "Empieza a escribir para buscar cuentas de servicio"
   },
@@ -12123,10 +12127,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Añadir token de cuenta de servicio",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "¿Seguro que quieres eliminar esta cuenta de servicio?",
+      "body-disable-service-account": "¿Seguro que quieres deshabilitar esta cuenta de servicio?",
+      "confirmText-delete-service-account": "Eliminar cuenta de servicio",
+      "confirmText-disable-service-account": "Deshabilitar cuenta de servicio",
       "delete-service-account": "Eliminar cuenta de servicio",
       "disable-service-account": "Deshabilitar cuenta de servicio",
       "enable-service-account": "Habilitar cuenta de servicio",
@@ -12153,7 +12157,7 @@
       "used-by": "Usado por"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Guardar",
       "edit": "Editar"
     },
     "service-account-role-row": {
@@ -12167,16 +12171,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Añadir cuenta de servicio",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "¿Seguro que quieres eliminar {{serviceAccountName}}?",
+      "body-disable-service-account": "¿Seguro que quieres deshabilitar «{{accountToDisable}}»?",
+      "confirmText-delete": "Eliminar",
+      "confirmText-disable-service-account": "Deshabilitar cuenta de servicio",
       "placeholder-search-service-account-by-name": "Buscar cuenta de servicio por nombre",
       "sub-title": "Las cuentas de servicio y sus tokens se pueden utilizar para autenticarse en la API de Grafana. Encuentra más información en nuestra <2>documentación.</2>",
       "title-delete-service-account": "Eliminar cuenta de servicio",
       "title-disable-service-account": "Deshabilitar cuenta de servicio",
-      "body-delete_one": "",
-      "body-delete_other": ""
+      "body-delete_one": "¿Seguro que quieres eliminar {{serviceAccountName}} y {{count}} token asociado?",
+      "body-delete_other": "¿Seguro que quieres eliminar {{serviceAccountName}} y {{count}} tókenes asociados?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "El token ha caducado",
@@ -12190,7 +12194,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Exportar como imagen",
       "export-json-title": "Exportar como JSON",
       "share-externally-title": "Compartir externamente",
       "share-internally-title": "Compartir internamente",
@@ -12227,17 +12231,17 @@
       "view-button-yaml": "Ver YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Acciones de exportación de imágenes",
+      "cancel-button": "Cancelar",
+      "download-button": "Descargar imagen",
+      "error-title": "Error al generar imagen",
+      "generate-button": "Generar imagen",
+      "generating": "Generando imagen...",
+      "info-text": "Guardar este dashboard como una imagen",
+      "preview": "Vista previa",
+      "preview-aria": "Vista previa de la imagen generada",
+      "preview-region": "Vista previa de la imagen",
+      "title": "Exportar como imagen"
     },
     "library": {
       "info": "Cree un panel de librería."
@@ -12247,7 +12251,7 @@
       "info-text": "Cree un enlace directo a este panel de control o panel, personalizado con las siguientes opciones.",
       "link-url": "URL del enlace",
       "render-alert": "Complemento de renderizador de imagen no instalado",
-      "render-instructions": "",
+      "render-instructions": "Para renderizar una imagen, debes instalar el <2>complemento de renderizado de imágenes Grafana</2>. Ponte en contacto con tu administrador de Grafana para instalarlo.",
       "rendered-image": "Enlace directo a la imagen renderizada",
       "save-alert": "El panel de control no se ha guardado",
       "save-dashboard": "Para renderizar una imagen de panel, primero debe guardar el panel de control.",
@@ -12315,11 +12319,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Guarda el dashboard para habilitar la generación de imágenes",
+    "download-disabled-help": "Genera una imagen primero para habilitar la descarga",
+    "error-title": "Error al generar imagen",
     "form": {
-      "label": ""
+      "label": "Ajustes de imagen del panel"
     },
     "preview": {
       "title": "Vista previa del panel"
@@ -12480,112 +12484,112 @@
   },
   "stat": {
     "add-orientation-option": {
-      "description-orientation": "",
-      "name-orientation": "",
+      "description-orientation": "Orientación del diseño",
+      "name-orientation": "Orientación",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-vertical": ""
+        "label-auto": "Auto",
+        "label-horizontal": "Horizontal",
+        "label-vertical": "Vertical"
       }
     },
     "add-standard-data-reduce-options": {
-      "category-value-options": "",
-      "description-calculation": "",
-      "description-fields": "",
-      "description-limit": "",
-      "description-show": "",
+      "category-value-options": "Opciones de valor",
+      "description-calculation": "Elegir una función de reducción/cálculo",
+      "description-fields": "Seleccione los campos que deben incluirse en el panel",
+      "description-limit": "Número máx. de filas que se muestran",
+      "description-show": "Calcular un solo valor por columna o serie o mostrar cada fila",
       "fields-options": {
-        "label-all-fields": "",
-        "label-numeric-fields": ""
+        "label-all-fields": "Todos los campos",
+        "label-numeric-fields": "Campos numéricos"
       },
-      "name-calculation": "",
-      "name-fields": "",
-      "name-limit": "",
-      "name-show": "",
+      "name-calculation": "Cálculo",
+      "name-fields": "Campos",
+      "name-limit": "Límite",
+      "name-show": "Mostrar",
       "show-options": {
-        "label-all-values": "",
-        "label-calculate": ""
+        "label-all-values": "Todos los valores",
+        "label-calculate": "Calcular"
       }
     },
-    "category-stat-styles": "",
+    "category-stat-styles": "Estilos de estadísticas",
     "color-mode-options": {
-      "label-background-gradient": "",
-      "label-background-solid": "",
-      "label-none": "",
-      "label-value": ""
+      "label-background-gradient": "Fondo con gradiente",
+      "label-background-solid": "Fondo sólido",
+      "label-none": "Ninguno",
+      "label-value": "Valor"
     },
-    "description-graph-mode": "",
-    "description-text-mode": "",
+    "description-graph-mode": "Modo gráfico/sparkline del panel de estadísticas",
+    "description-text-mode": "Controlar si se muestra el nombre y el valor o solo el nombre",
     "graph-mode": {
       "options": {
-        "label-area": "",
-        "label-none": ""
+        "label-area": "Área",
+        "label-none": "Ninguno"
       }
     },
     "name-color-modcolor-mode-options": {
-      "label": ""
+      "label": "Modo de color"
     },
-    "name-graph-mode": "",
-    "name-show-percent-change": "",
-    "name-text-alignment": "",
-    "name-text-mode": "",
-    "name-wide-layout": "",
-    "percent-change-color-mode": "",
+    "name-graph-mode": "Modo gráfico",
+    "name-show-percent-change": "Mostrar cambio porcentual",
+    "name-text-alignment": "Alineación de texto",
+    "name-text-mode": "Modo texto",
+    "name-wide-layout": "Diseño ancho",
+    "percent-change-color-mode": "Modo de color de la variación porcentual",
     "percent-change-color-mode-options": {
-      "label-inverted": "",
-      "label-same-as-value": "",
-      "label-standard": ""
+      "label-inverted": "Invertido",
+      "label-same-as-value": "Igual que el valor",
+      "label-standard": "Estándar"
     },
     "text-alignment-options": {
-      "label-auto": "",
-      "label-center": ""
+      "label-auto": "Auto",
+      "label-center": "Centro"
     },
     "text-mode-options": {
-      "label-auto": "",
-      "label-name": "",
-      "label-none": "",
-      "label-value": "",
-      "label-value-and-name": ""
+      "label-auto": "Auto",
+      "label-name": "Nombre",
+      "label-none": "Ninguno",
+      "label-value": "Valor",
+      "label-value-and-name": "Valor y nombre"
     },
     "wide-layout-options": {
-      "label-off": "",
-      "label-on": ""
+      "label-off": "Apagado",
+      "label-on": "Encendido"
     }
   },
   "state-timeline": {
     "align-values-options": {
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-center": "Centro",
+      "label-left": "Izquierda",
+      "label-right": "Derecha"
     },
-    "category-state-timeline": "",
-    "name-align-values": "",
-    "name-connect-null-values": "",
-    "name-disconnect-values": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-merge-equal-consecutive-values": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-state-timeline": "Línea de tiempo del estado",
+    "name-align-values": "Alinear valores",
+    "name-connect-null-values": "Conectar valores nulos",
+    "name-disconnect-values": "Desconectar valores",
+    "name-fill-opacity": "Opacidad de relleno",
+    "name-line-width": "Espesor de la línea",
+    "name-merge-equal-consecutive-values": "Combinar valores consecutivos iguales",
+    "name-page-size": "Tamaño de la página (habilitar paginación)",
+    "name-row-height": "Altura de fila",
+    "name-show-values": "Mostrar valores",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Siempre",
+      "label-auto": "Auto",
+      "label-never": "Nunca"
     }
   },
   "status-history": {
-    "category-status-history": "",
-    "name-column-width": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-status-history": "Historial de estado",
+    "name-column-width": "Ancho de columna",
+    "name-fill-opacity": "Opacidad de relleno",
+    "name-line-width": "Espesor de la línea",
+    "name-page-size": "Tamaño de la página (habilitar paginación)",
+    "name-row-height": "Altura de fila",
+    "name-show-values": "Mostrar valores",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Siempre",
+      "label-auto": "Auto",
+      "label-never": "Nunca"
     },
     "status-history-panel": {
       "too-many-points_one": "Demasiados puntos para visualizar correctamente. <1></1>Actualice la consulta para devolver menos puntos. <3></3>({{count}} puntos recibidos)",
@@ -12625,26 +12629,26 @@
       "label-gauge-display-mode": "Modo de visualización del indicador",
       "label-value-display": "Visualización del valor"
     },
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Opciones de celda",
+    "category-table": "Tabla",
+    "category-table-footer": "Pie de tabla",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Grande",
+      "label-medium": "Medio",
+      "label-small": "Pequeño"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Acciones",
+      "auto": "Automático",
+      "color-background": "Fondo de color",
+      "color-text": "Texto de color",
+      "data-links": "Enlaces de datos",
+      "gauge": "Medidor",
+      "image": "Imagen",
+      "json": "Vista JSON",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Píldora",
+      "sparkline": "Minigráfico"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "Si se selecciona, toda la fila se coloreará como esta celda.",
@@ -12657,23 +12661,23 @@
       "wrap-text": "Ajustar texto"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Auto",
+      "label-center": "Centro",
+      "label-left": "Izquierda",
+      "label-right": "Derecha"
     },
     "container": {
       "content": "Mostrar demasiadas columnas en una sola tabla puede afectar al rendimiento y dificultar la lectura de los datos. Considera la posibilidad de afinar tus consultas.",
       "show-all-series": "Mostrar todas las columnas",
       "show-only-series": "Mostrando solo {{MAX_NUMBER_OF_COLUMNS}} columnas"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
-    "description-min-column-width": "",
-    "description-wrap-header-text": "",
+    "description-calculation": "Elegir una función de reducción/cálculo",
+    "description-cell-value-inspect": "Habilitar la inspección del valor de la celda en una ventana modal",
+    "description-column-filter": "Habilita/deshabilita los filtros de campo en la tabla",
+    "description-count-rows": "Mostrar un único recuento para todas las filas de datos",
+    "description-fields": "Seleccione los campos que deben calcularse",
+    "description-min-column-width": "El ancho mínimo para el cambio de tamaño automático de las columnas",
+    "description-wrap-header-text": "Habilita el ajuste de texto para los encabezados de columna",
     "image-cell-options-editor": {
       "description-alt-text": "Texto alternativo que se mostrará si no se puede visualizar una imagen o para los usuarios que utilizan un lector de pantalla",
       "description-title-text": "Texto que se mostrará cuando se pase el cursor por encima de la imagen",
@@ -12687,66 +12691,66 @@
       },
       "label-dynamic-height": ""
     },
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-paginations": "",
-    "name-fields": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "name-wrap-header-text": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": "",
+    "name-calculation": "Cálculo",
+    "name-cell-height": "Altura de celda",
+    "name-cell-type": "Tipo de celda",
+    "name-cell-value-inspect": "Inspección del valor de celda",
+    "name-column-alignment": "Alineación de la columna",
+    "name-column-filter": "Filtro de columna",
+    "name-column-width": "Ancho de columna",
+    "name-count-rows": "Contar filas",
+    "name-enable-paginations": "Habilitar paginación",
+    "name-fields": "Campos",
+    "name-hide-in-table": "Ocultar en la tabla",
+    "name-min-column-width": "Ancho mínimo de columna",
+    "name-show-table-footer": "Mostrar pie de tabla",
+    "name-show-table-header": "Mostrar encabezado de tabla",
+    "name-wrap-header-text": "Ajustar texto del encabezado",
+    "placeholder-column-width": "auto",
+    "placeholder-fields": "Todos los campos numéricos",
     "text-wrap-options": {
       "label-wrap-text": ""
     }
   },
   "table-new": {
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Opciones de celda",
+    "category-table": "Tabla",
+    "category-table-footer": "Pie de tabla",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Grande",
+      "label-medium": "Medio",
+      "label-small": "Pequeño"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Auto",
+      "label-center": "Centro",
+      "label-left": "Izquierda",
+      "label-right": "Derecha"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
+    "description-calculation": "Elegir una función de reducción/cálculo",
+    "description-cell-value-inspect": "Habilitar la inspección del valor de la celda en una ventana modal",
+    "description-column-filter": "Habilita/deshabilita los filtros de campo en la tabla",
+    "description-count-rows": "Mostrar un único recuento para todas las filas de datos",
+    "description-fields": "Seleccione los campos que deben calcularse",
     "description-frozen-columns": "",
-    "description-min-column-width": "",
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-pagination": "",
-    "name-fields": "",
+    "description-min-column-width": "El ancho mínimo para el cambio de tamaño automático de las columnas",
+    "name-calculation": "Cálculo",
+    "name-cell-height": "Altura de celda",
+    "name-cell-type": "Tipo de celda",
+    "name-cell-value-inspect": "Inspección del valor de celda",
+    "name-column-alignment": "Alineación de la columna",
+    "name-column-filter": "Filtro de columna",
+    "name-column-width": "Ancho de columna",
+    "name-count-rows": "Contar filas",
+    "name-enable-pagination": "Habilitar paginación",
+    "name-fields": "Campos",
     "name-frozen-columns": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": ""
+    "name-hide-in-table": "Ocultar en la tabla",
+    "name-min-column-width": "Ancho mínimo de columna",
+    "name-show-table-footer": "Mostrar pie de tabla",
+    "name-show-table-header": "Mostrar encabezado de tabla",
+    "placeholder-column-width": "auto",
+    "placeholder-fields": "Todos los campos numéricos"
   },
   "tag-filter": {
     "clear-button": "Borrar etiquetas",
@@ -12757,7 +12761,7 @@
     "tag-option-label": "Opción de etiqueta"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "No se han encontrado equipos",
     "select-aria-label": "Selector de equipo",
     "select-placeholder": "Seleccionar un equipo"
   },
@@ -12831,17 +12835,17 @@
     }
   },
   "text": {
-    "category-text": "",
+    "category-text": "Texto",
     "mode-options": {
-      "label-code": "",
-      "label-html": "",
-      "label-markdown": ""
+      "label-code": "Código",
+      "label-html": "HTML",
+      "label-markdown": "Markdown"
     },
-    "name-content": "",
-    "name-language": "",
-    "name-mode": "",
-    "name-show-line-numbers": "",
-    "name-show-mini-map": ""
+    "name-content": "Contenido",
+    "name-language": "Idioma",
+    "name-mode": "Modo",
+    "name-show-line-numbers": "Mostrar números de línea",
+    "name-show-mini-map": "Mostrar minimapa"
   },
   "theme-preview": {
     "breadcrumbs": {
@@ -12889,7 +12893,7 @@
       "apply-button": "Aplicar intervalo de tiempo",
       "default-error": "Introduce una fecha pasada o «{{now}}»",
       "fiscal-year": "Año fiscal: {{from}} - {{to}}",
-      "from-input": "",
+      "from-input": "Desde",
       "open-input-calendar": "Abrir calendario",
       "range-error": "«Desde» no puede ser posterior a «hasta»",
       "to-input": "Hasta"
@@ -12920,8 +12924,8 @@
   },
   "timeline": {
     "missing-field": {
-      "all": "",
-      "time": ""
+      "all": "No hay campos que se puedan representar gráficamente",
+      "time": "Los datos no tienen un campo de tiempo"
     }
   },
   "timeseries": {
@@ -12939,54 +12943,54 @@
       "tooltip-delete": "Eliminar",
       "tooltip-edit": "Editar"
     },
-    "category-axis": "",
+    "category-axis": "Eje",
     "config": {
       "get-graph-field-config": {
-        "aria-label-bar-width-factor": "",
-        "aria-label-fill-opacity": "",
-        "aria-label-line-width": "",
-        "aria-label-point-size": "",
-        "category-graph-styles": "",
-        "category-thresholds": "",
-        "name-bar-alignment": "",
-        "name-bar-width-factor": "",
-        "name-connect-nulls": "",
-        "name-disconnect-values": "",
-        "name-fill-below-to": "",
-        "name-fill-opacity": "",
-        "name-gradient-mode": "",
-        "name-line-interpolation": "",
-        "name-line-style": "",
-        "name-line-width": "",
-        "name-point-size": "",
-        "name-show-points": "",
-        "name-show-thresholds": "",
-        "name-style": "",
-        "name-transform": "",
+        "aria-label-bar-width-factor": "Factor de ancho de barra",
+        "aria-label-fill-opacity": "Opacidad de relleno",
+        "aria-label-line-width": "Espesor de la línea",
+        "aria-label-point-size": "Tamaño de punto",
+        "category-graph-styles": "Estilos de gráficos",
+        "category-thresholds": "Umbrales",
+        "name-bar-alignment": "Alineación de la barra",
+        "name-bar-width-factor": "Factor de ancho de barra",
+        "name-connect-nulls": "Conectar valores nulos",
+        "name-disconnect-values": "Desconectar valores",
+        "name-fill-below-to": "Rellenar a continuación para",
+        "name-fill-opacity": "Opacidad de relleno",
+        "name-gradient-mode": "Modo degradado",
+        "name-line-interpolation": "Interpolación de línea",
+        "name-line-style": "Estilo de línea",
+        "name-line-width": "Espesor de la línea",
+        "name-point-size": "Tamaño de punto",
+        "name-show-points": "Mostrar puntos",
+        "name-show-thresholds": "Mostrar umbrales",
+        "name-style": "Estilo",
+        "name-transform": "Transformar",
         "transform-options": {
-          "description-constant": "",
-          "description-style": "",
-          "label-constant": "",
-          "label-style": ""
+          "description-constant": "El primer valor se mostrará como una línea constante",
+          "description-style": "Voltear los resultados a valores negativos en el eje y",
+          "label-constant": "Constante",
+          "label-style": "Y negativa"
         }
       }
     },
     "insert-nulls-editor": {
       "disconnect-options": {
-        "label-never": "",
-        "label-threshold": ""
+        "label-never": "Nunca",
+        "label-threshold": "Umbral"
       }
     },
     "line-style-editor": {
       "line-fill-options": {
-        "label-dash": "",
-        "label-dots": "",
-        "label-solid": ""
+        "label-dash": "Raya",
+        "label-dots": "Puntos",
+        "label-solid": "Sólido"
       },
       "title-the-input-expects-a-segment-list": "La entrada espera una lista de segmentos",
       "tooltip-help": "Ayuda"
     },
-    "name-time-zone": "",
+    "name-time-zone": "Zona horaria",
     "nulls-threshold-input": {
       "placeholder-never": "Nunca"
     },
@@ -12996,9 +13000,9 @@
     },
     "span-nulls-editor": {
       "gaps-options": {
-        "label-always": "",
-        "label-never": "",
-        "label-threshold": ""
+        "label-always": "Siempre",
+        "label-never": "Nunca",
+        "label-threshold": "Umbral"
       }
     },
     "timezones-editor": {
@@ -13007,17 +13011,17 @@
     }
   },
   "traces": {
-    "category-span-filters": "",
-    "name-critical-path-only": "",
-    "name-find-in-trace": "",
-    "name-max-duration": "",
-    "name-min-duration": "",
-    "name-service-name": "",
-    "name-service-name-operator": "",
-    "name-show-matches-only": "",
-    "name-span-name": "",
-    "name-span-name-operator": "",
-    "name-tags": "",
+    "category-span-filters": "Filtros de intervalo",
+    "name-critical-path-only": "Mostrar solo la ruta crítica",
+    "name-find-in-trace": "Buscar en el rastro",
+    "name-max-duration": "Duración máx.",
+    "name-min-duration": "Duración mín.",
+    "name-service-name": "Nombre de servicio",
+    "name-service-name-operator": "Operador de nombre de servicio",
+    "name-show-matches-only": "Mostrar solo las coincidencias",
+    "name-span-name": "Nombre del intervalo",
+    "name-span-name-operator": "Operador de nombre de intervalo",
+    "name-tags": "Etiquetas",
     "traces-panel": {
       "no-data-found-in-response": "No se han encontrado datos en la respuesta"
     }
@@ -13032,20 +13036,20 @@
     "axis-editor": {
       "log-mode-options": {
         "description": {
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-size": "Dividir los cubos en función del tamaño"
         },
         "label": {
-          "split": ""
+          "split": "Dividir"
         }
       },
       "mode-options": {
         "description": {
-          "split-the-buckets-based-on-count": "",
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-count": "Dividir los cubos en función del recuento",
+          "split-the-buckets-based-on-size": "Dividir los cubos en función del tamaño"
         },
         "label": {
-          "count": "",
-          "size": ""
+          "count": "Recuento",
+          "size": "Tamaño"
         }
       },
       "placeholder-auto": "Auto"
@@ -13061,15 +13065,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Operación binaria",
+          "reduce-row": "Reducir fila",
+          "row-index": "Índice de fila",
+          "unary-operation": "Operación unaria"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Funciones acumulativas",
+        "window-functions": "Funciones de ventana"
       },
       "label-alias": "Alias",
       "label-mode": "Modo",
@@ -13077,9 +13081,9 @@
     },
     "calculate-heatmap": {
       "add-heatmap-calculation-options": {
-        "name-x-bucket": "",
-        "name-y-bucket": "",
-        "name-y-bucket-scale": ""
+        "name-x-bucket": "Cubo X",
+        "name-y-bucket": "Cubo Y",
+        "name-y-bucket-scale": "Escala de cubo Y"
       }
     },
     "concatenate-transformer-editor": {
@@ -13087,9 +13091,9 @@
       "label-name": "Nombre",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Copiar el nombre del marco al nombre del campo",
+          "ignore-the-frame-name": "Ignorar el nombre del marco",
+          "label-frame": "Añadir una etiqueta con el nombre del marco"
         }
       },
       "placeholder-frame": "Marco"
@@ -13102,9 +13106,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Añadir un convertidor de tipo de campo",
       "aria-label-remove-convert-field-type-transformer": "Quitar convertidor de tipo de campo",
-      "convert-field-type": "",
+      "convert-field-type": "Convertir tipo de campo",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Convierte un campo a un tipo de campo específico."
       },
       "label": {
         "browser": "Navegador",
@@ -13117,11 +13121,11 @@
       "label-join-with": "Unir con",
       "label-set-timezone": "Establecer zona horaria",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Convertir tipo de campo"
       },
       "placeholder-type": "Tipo",
       "tags": {
-        "format-field": ""
+        "format-field": "Formatear campo"
       },
       "tooltip-explicit-separator-joining-array-values": "Utilizar un separador explícito al unir valores de matriz",
       "tooltip-input-format": "Especifica el formato del campo de entrada para que Grafana pueda analizar correctamente la cadena de fecha.",
@@ -13140,20 +13144,20 @@
       "tooltip-enable": "Habilitar"
     },
     "draggable-sort-order": {
-      "asc": "",
-      "desc": "",
+      "asc": "ASC.",
+      "desc": "DESC.",
       "off": "Apagado"
     },
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Combinar todos los campos en un solo marco."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Concatenar campos"
         },
         "tags": {
-          "combine": ""
+          "combine": "Combinar"
         }
       }
     },
@@ -13168,11 +13172,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Analiza los campos del contenido (JSON, etiquetas, etc.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Seleccionar campo"
         }
       },
       "label-delimiter": "Delimitador",
@@ -13181,7 +13185,7 @@
       "label-replace-all-fields": "Reemplazar todos los campos",
       "label-source": "Fuente",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Extraer campos"
       },
       "placeholder-auto": "Auto",
       "placeholder-select-delimiter": "Seleccionar delimitador...",
@@ -13192,20 +13196,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Utiliza un valor de campo para buscar países, regiones o aeropuertos."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "No se han encontrado campos de texto"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Seleccionar campo de texto"
         }
       },
       "label-field": "Campo",
       "label-lookup": "Búsqueda",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Buscar campos del recurso"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13216,23 +13220,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Elimina partes de los resultados de la consulta utilizando un patrón de expresión regular."
       },
       "label-from-variable": "De la variable",
       "label-identifier": "Identificador",
       "label-use-variable": "Utilizar variable",
       "label-variable": "Variable",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Filtrar campos por nombre"
       },
       "placeholder-regular-expression-pattern": "Patrón de expresión regular"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Elimina filas de los datos en función de la consulta de origen."
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Filtrar datos por consulta"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13246,33 +13250,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Añadir condición",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Elimina filas de los resultados de la consulta utilizando filtros definidos por el usuario."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Coincidencia total",
+          "match-any": "Coincidencia parcial"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Excluir",
+          "include": "Incluir"
         }
       },
       "label-conditions": "Condiciones",
       "label-filter-type": "Tipo de filtro",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Filtrar datos por valores"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "No se han encontrado campos de texto"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Seleccionar campo de texto"
         }
       },
       "label-field": "Campo",
@@ -13281,10 +13285,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Manipula el formato de los campos de cadena."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Formatear cadena"
       }
     },
     "format-time-transfomer-editor": {
@@ -13296,66 +13300,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Establecer el formato de salida de un campo de tiempo"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Formatear tiempo"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Utiliza los valores de la fila para calcular un nuevo campo."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Añadir campo a partir del cálculo"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Establece la unidad, mín., máx. y otros."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Configuración a partir de los resultados de la consulta"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Genera datos de mapas de calor a partir de datos de origen."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Crear mapa de calor"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Aplana los resultados etiquetados en una tabla unidos por etiquetas."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Unir por etiquetas"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Divide un conjunto de datos de un marco en varias series."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Partición por valores"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Convertir cada fila en un campo con configuración dinámica."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Filas a campos"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Aplica operaciones espaciales a los resultados de la consulta."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Operaciones espaciales"
       }
     },
     "get-timezone-options": {
@@ -13387,8 +13391,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Calcular",
+          "group-by": "Agrupar por"
         }
       },
       "placeholder-ignored": "Ignorado",
@@ -13396,42 +13400,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Agrupa los datos por un valor de campo y crea datos agregados."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Agrupar por"
       },
       "title-calc-alert": "Los cálculos no tendrán efecto si no se agrupan campos"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Agrupa los datos por un valor de campo y crea tablas anidadas con los datos agrupados."
       },
       "description-show-field-names": "Si está habilitado, las tablas anidadas mostrarán los nombres de los campos como encabezado de la tabla",
       "label-show-field-names-in-nested-tables": "Mostrar nombres de campo en tablas anidadas",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Agrupar en tablas anidadas"
       },
       "title-calc-alert": "Los cálculos no tendrán efecto si no se agrupan campos."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Resume y reorganiza los datos basándose en tres campos."
       },
       "label-cell-value": "Valor de la celda",
       "label-column": "Columna",
       "label-empty-value": "Valor vacío",
       "label-row": "Fila",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Agrupar en matriz"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Calcula un histograma a partir de los datos de entrada."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Histograma"
       },
       "placeholder-auto": "Auto",
       "placeholder-default": "Predeterminado: 30",
@@ -13443,14 +13447,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Combina filas de más de 2 tablas, basándose en un campo relacionado."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Unir por campo"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Requerido",
       "info": {
         "input-contain-labels": "La entrada no contiene ninguna etiqueta",
         "no-input-or-labels-found": "No se han encontrado entradas (ni etiquetas)",
@@ -13474,8 +13478,8 @@
       "label-value-field-name": "Nombre del campo de valor",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Columnas",
+          "rows": "Filas"
         }
       },
       "placeholder-optional-select-label": "(Opcional) Seleccionar etiqueta",
@@ -13483,18 +13487,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Agrupa las series por tiempo y devuelve las etiquetas como campos."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Etiquetas a campos"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Limita el número de elementos mostrados."
       },
       "name": {
-        "limit": ""
+        "limit": "Limitar"
       },
       "placeholder-value-or-variable": "Valor o variable"
     },
@@ -13507,11 +13511,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Fusiona varias series. Los valores se combinarán en una sola fila."
       },
       "merge-effect-applied-single-frame": "La función Combinar no tiene ningún efecto cuando se aplica en un solo marco.",
       "name": {
-        "merge": ""
+        "merge": "Fusionar series/tablas"
       }
     },
     "multi-info": {
@@ -13523,14 +13527,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Reordena, oculta o cambia el nombre de los campos."
       },
-      "field-order": "",
+      "field-order": "Orden de campo",
       "field-order-auto": "Auto",
-      "field-order-manual": "",
+      "field-order-manual": "Manual",
       "first-frame-warning": "La función Organizar campos solo funciona con un solo marco. Considera la posibilidad de aplicar una transformación de unión o filtrar la entrada primero.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Organizar campos por nombre"
       }
     },
     "partion-by-values-editor": {
@@ -13558,10 +13562,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Estira los marcos de datos del formato a lo ancho al formato a lo largo."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Preparar series temporales"
       }
     },
     "prepare-time-series-editor": {
@@ -13569,26 +13573,26 @@
       "label-info": "Información",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Convertir cada marco a formato a lo largo"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Series temporales largas"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Crea un nuevo marco para cada par de tiempo/número"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Series temporales de múltiples marcos"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Crea un solo marco unido por tiempo"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Series temporales amplias"
         }
       }
     },
@@ -13603,7 +13607,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Reduce todas las filas o puntos de datos a un único valor (por ejemplo, máximo o media)."
       },
       "label-calculations": "Cálculos",
       "label-include-time": "Incluir hora",
@@ -13620,7 +13624,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Reducir"
       },
       "placeholder-choose-stat": "Elegir estadística"
     },
@@ -13630,18 +13634,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Crea un nuevo marco de datos que contenga los valores predichos por un modelo estadístico."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Línea de tendencia"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Cúbica",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Cuadrática",
         "quartic": "Cuártica",
-        "quintic": "Quíntica"
+        "quintic": "Quíntica",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Grado",
       "label-model-type": "Tipo de modelo",
@@ -13654,18 +13663,19 @@
           "polynomial": "Polinómica"
         }
       },
-      "regression": "",
+      "regression": "regresión",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Análisis de regresión"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Número de puntos X,Y para predecir"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Renombra partes de los resultados de la consulta utilizando una expresión regular y un patrón de sustitución."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Cambiar el nombre de los campos por expresión regular"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13679,33 +13689,33 @@
       "label-mode": "Modo",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Combina los datos de dos tablas siempre que haya valores coincidentes en campos comunes a ambas tablas.",
+          "join-on-a-field": "Une un valor de campo con valores duplicados. La unión externa no funcional es mejor para datos tabulares (estilo SQL).",
+          "keep-all-rows": "Conserva todas las filas de cualquier tabla con un valor. Une valores de campos distintos. Eficaz e ideal para series temporales."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Interior",
+          "outer-tabular": "Exterior (tabular)",
+          "outer-time-series": "Exterior (serie temporal)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Fusiona varias series. Devuelve el tiempo, la métrica y los valores como una fila."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Series a filas"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Ordenar campos en un marco."
       },
       "label-field": "Campo",
       "label-reverse": "Reverso",
       "name": {
-        "sort-by": ""
+        "sort-by": "Ordenar por"
       },
       "placeholder-select-field": "Seleccionar campo"
     },
@@ -13728,13 +13738,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Convierte datos de series temporales en filas de tabla para que puedan visualizarse en formato tabular o de minigráfico."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "La transformación de series temporales a tabla requiere al menos un marco de serie temporal para funcionar. Actualmente no tienes ninguno."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Series temporales a tabla"
       }
     },
     "time-series-table-transform-editor": {
@@ -13752,15 +13762,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Transpone el marco de datos."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Transponer"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Pivotar",
+        "transform": "Transformar",
+        "translate": "Traducir"
       }
     },
     "unary-operation-editor": {
@@ -13769,13 +13779,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Calcular campos nuevos",
+        "combine": "Combinar",
+        "create-new-visualization": "Crear visualización nueva",
+        "filter": "Filtro",
+        "perform-spatial-operations": "Realizar operaciones espaciales",
+        "reformat": "Reformatear",
+        "reorder-and-rename": "Reordenar y cambiar el nombre"
       },
       "special-value-options": {
         "description": {
@@ -13826,10 +13836,10 @@
     }
   },
   "trend": {
-    "category-x-axis": "",
-    "description-x-field": "",
-    "name-x-field": "",
-    "placeholder-x-field": ""
+    "category-x-axis": "Eje X",
+    "description-x-field": "Un valor numérico creciente",
+    "name-x-field": "Campo X",
+    "placeholder-x-field": "Primer valor numérico"
   },
   "upgrade-box": {
     "discovery-text": "¡Has descubierto una característica Pro!",
@@ -13846,7 +13856,7 @@
     "title": "Organizaciones"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "No se han encontrado usuarios",
     "select-aria-label": "Selector de usuario",
     "select-placeholder": "Comienza a escribir para buscar un usuario"
   },
@@ -13932,8 +13942,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "¿Seguro que quieres eliminar la variable «{{variableToDelete}}»?",
+      "confirmText-delete": "Eliminar",
       "title-delete-variable": "Eliminar variable"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13983,33 +13993,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Cómo ordenar los valores de esta variable",
-      "name-sort": "",
+      "name-sort": "Ordenar",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Alfabético (asc.)",
+          "alphabetical-caseinsensitive-asc": "Alfabético (no distingue entre mayúsculas y minúsculas, asc.)",
+          "alphabetical-caseinsensitive-desc": "Alfabético (no distingue entre mayúsculas y minúsculas, desc.)",
+          "alphabetical-desc": "Alfabético (desc.)",
+          "disabled": "Deshabilitado",
+          "natural-asc": "Natural (asc.)",
+          "natural-desc": "Natural (desc.)",
+          "numerical-asc": "Numérico (asc.)",
+          "numerical-desc": "Numérico (desc.)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Añadir opción",
+      "description": "Añadir opciones personalizadas además de los resultados de la consulta",
+      "label-placeholder": "etiqueta de visualización",
+      "remove-option-button-label": "Eliminar opción",
+      "value-placeholder": "valor, cadena vacía por defecto"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Cómo ordenar las opciones estáticas con los resultados de la consulta"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Valor predeterminado",
       "placeholder-default-value-if-any": "valor predeterminado, si lo hay",
       "text-options": "Opciones de texto"
     },
@@ -14038,8 +14048,8 @@
       "description-optional-display-name": "Nombre para mostrar opcional",
       "description-template-variable-characters": "El nombre de la variable de la plantilla. (Máx. 50 caracteres)",
       "general": "General",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Etiqueta",
+      "name-name": "Nombre",
       "placeholder-descriptive-text": "Texto descriptivo",
       "placeholder-label-name": "Nombre de la etiqueta",
       "placeholder-variable-name": "Nombre de la variable",
@@ -14055,13 +14065,13 @@
       "tooltip-remove-variable": "Quitar variable"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Descripción"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Alternar todos los valores"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Seleccionar tipo de variable"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Mostrar usos"
@@ -14092,20 +14102,20 @@
     }
   },
   "xychart": {
-    "category-xychart": "",
-    "name-fill-opacity": "",
-    "name-line-style": "",
-    "name-line-width": "",
-    "name-max-point-size": "",
-    "name-min-point-size": "",
-    "name-point-shape": "",
-    "name-point-size": "",
-    "name-point-stroke-width": "",
-    "name-series-mapping": "",
-    "name-show": "",
+    "category-xychart": "Gráfico XY",
+    "name-fill-opacity": "Opacidad de relleno",
+    "name-line-style": "Estilo de línea",
+    "name-line-width": "Espesor de la línea",
+    "name-max-point-size": "Tamaño de punto máx.",
+    "name-min-point-size": "Tamaño de punto mín.",
+    "name-point-shape": "Forma de punto",
+    "name-point-size": "Tamaño de punto",
+    "name-point-stroke-width": "Ancho de trazo de punto",
+    "name-series-mapping": "Asignación de series",
+    "name-show": "Mostrar",
     "point-shape-options": {
-      "label-circle": "",
-      "label-square": ""
+      "label-circle": "Círculo",
+      "label-square": "Cuadrado"
     },
     "series-editor": {
       "add-series": "Añadir serie",
@@ -14117,18 +14127,18 @@
       "label-y-field": "Campo Y",
       "placeholder-all-frames": "Todos los marcos",
       "placeholder-select-frame": "Seleccionar marco",
-      "placeholder-x-field": "",
-      "placeholder-y-field": "",
+      "placeholder-x-field": "Primer campo de número o de tiempo en cada marco",
+      "placeholder-y-field": "Campos de número restantes en cada marco",
       "tooltip-delete-series": "Eliminar serie"
     },
     "series-mapping-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Auto",
+      "label-manual": "Manual"
     },
     "show-options": {
-      "label-both": "",
-      "label-lines": "",
-      "label-points": ""
+      "label-both": "Ambas",
+      "label-lines": "Líneas",
+      "label-points": "Puntos"
     }
   }
 }
\ No newline at end of file
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index cbf876f9fde..7949ee8e771 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Certaines fonctionnalités sont stables (GA) et activées par défaut, tandis que d’autres sont actuellement dans leur phase bêta préliminaire, disponibles pour une adoption précoce.",
       "confirm-modal-body-2": "Nous vous conseillons de comprendre les implications de chaque changement de fonctionnalité avant d’apporter des modifications.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Enregistrer les modifications",
       "get-stage-cell": {
         "beta": "Bêta",
         "content-general-availability": "Disponibilité générale",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Supprimer l’organisation",
-      "confirmText-delete": "",
+      "confirmText-delete": "Supprimer",
       "title-delete": "Supprimer"
     },
     "anon-users": {
       "not-found": "Aucun utilisateur anonyme trouvé."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Voulez-vous vraiment forcer la déconnexion sur tous les appareils ?",
+      "confirmText-confirm-logout": "Confirmer la déconnexion",
+      "confirmText-force-logout": "Forcer la déconnexion",
       "title-force-logout-from-all-devices": "Forcer la déconnexion de tous les appareils"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Enregistrer"
     },
     "edit-org": {
       "access-denied": "Vous n'avez pas l'autorisation de consulter les utilisateurs de cette organisation. Pour mettre à jour cette organisation, contactez votre administrateur serveur.",
@@ -216,11 +216,11 @@
       "not-editable": "Le rôle de cet utilisateur n'est pas modifiable, car il est synchronisé à partir de votre fournisseur d'authentification. Reportez-vous à la <1>Documentation d'authentification de Grafana</1> pour en savoir plus."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Voulez-vous vraiment supprimer l’utilisateur {{user}} ?",
       "columns": {
         "aria-label-role": "Rôle"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Supprimer",
       "delete-aria-label": "Supprimer l’utilisateur : {{name}}",
       "title-delete": "Supprimer"
     },
@@ -252,7 +252,7 @@
       "info-description": "Ces paramètres système sont définis dans grafana.ini ou custom.ini (ou remplacés par des variables ENV). Pour les modifier, vous devez actuellement relancer Grafana."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Confirmer la suppression"
     },
     "upgrade-info": {
       "title": "Licence Enterprise"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Changer",
-      "confirmText-change": "",
+      "confirmText-change": "Modifier",
       "grafana-admin-key": "Administrateur Grafana",
       "grafana-admin-no": "Non",
       "grafana-admin-yes": "Oui",
       "title": "Autorisations"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Voulez-vous vraiment supprimer cet utilisateur ?",
+      "body-disable": "Voulez-vous vraiment désactiver cet utilisateur ?",
+      "confirmText-delete-user": "Supprimer l’utilisateur",
+      "confirmText-disable-user": "Désactiver l’utilisateur",
       "delete-button": "Supprimer l'utilisateur",
       "disable-button": "Désactiver l'utilisateur",
       "edit-button": "Modifier",
@@ -331,7 +331,7 @@
       "title-disable-user": "Désactiver l’utilisateur"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Enregistrer"
     },
     "user-sessions": {
       "browser-column": "Navigateur et système d'exploitation",
@@ -382,12 +382,12 @@
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Le bouton Règle d’alerte IA n’a pas pu être chargé",
+        "feedback-button": "Le bouton Commentaires IA n’a pas pu être chargé",
+        "improve-annotations-button": "Le bouton Améliorer les annotations IA n’a pas pu être chargé",
+        "improve-labels-button": "Le bouton Améliorer les étiquettes IA n’a pas pu être chargé",
+        "template-button": "Le bouton Modèle IA n’a pas pu être chargé",
+        "triage-button": "Le bouton Triage IA n’a pas pu être chargé"
       }
     },
     "alert": {
@@ -493,7 +493,7 @@
       "title-muting-grouping-and-timings": "Mise en sourdine, regroupement et horaires"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Aucune source de données trouvée"
     },
     "alert-menu": {
       "copy-link": "Copier le lien",
@@ -519,7 +519,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Règle d’alerte"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -587,7 +587,7 @@
       "view-configuration": "Afficher la configuration"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Oui, réinitialiser la configuration",
       "gma-manual-configuration-description": "La configuration interne de Grafana Alertmanager ne peut pas être modifiée manuellement. Pour modifier cette configuration, modifiez les ressources individuelles via l’interface utilisateur.",
       "gma-manual-configuration-is-not-supported": "Les modifications de configuration manuelles ne sont pas prises en charge",
       "message": {
@@ -602,13 +602,13 @@
       "title-resetting-alertmanager-configuration": "Réinitialisation de la configuration d’Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Voulez-vous vraiment restaurer cette version de la configuration ? Toutes les modifications non enregistrées seront perdues.",
       "columns": {
         "compare": "Comparer",
         "restore": "Restaurer",
         "text-latest": "Dernier"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Oui, restaurer la configuration",
       "loading": "Chargement en cours...",
       "no-previous-configurations": "Aucune configuration précédente",
       "this-might-take-a-while": "Cela peut prendre un certain temps...",
@@ -888,10 +888,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Plus d’actions pour le point de contact « {{contactPointName}} »",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Supprimer",
       "button-edit": "Modifier",
       "button-view": "Afficher",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Exporter",
       "export-label-export": "Exporter",
       "label-delete": "Supprimer",
       "label-manage-permissions": "Gérer les autorisations",
@@ -1426,7 +1426,7 @@
       "label-disable-resolved-message": "Désactiver le message résolu"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Chargement des groupes en cours…",
       "message": {
         "must-be-a-positive-integer": "Doit être un entier positif.",
         "must-enter-a-group-name": "Vous devez saisir un nom de groupe"
@@ -1523,7 +1523,7 @@
       "group-loading-error": "Erreur lors du chargement du groupe",
       "interval": "Intervalle",
       "namespace": "Namespace",
-      "new": "",
+      "new": "Nouveau",
       "title": {
         "back": ""
       }
@@ -1555,7 +1555,7 @@
     },
     "group-loader": {
       "group-load-failed": "Échec du chargement des règles du groupe {{ groupName }} dans {{ namespaceName }}",
-      "no-rules": ""
+      "no-rules": "Aucune règle trouvée dans ce groupe"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "Le groupe est en cours de suppression"
@@ -1885,10 +1885,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Aucune source de données trouvée"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Voulez-vous vraiment supprimer « {{muteTiming}} » ?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Désactivé",
@@ -2140,10 +2140,10 @@
         "conflict": "L'arborescence des politiques de notification a été mise à jour par un autre utilisateur.",
         "error-code": "Message d'erreur : « {{error}} »",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Impossible d’ajouter ou de mettre à jour la route : des conflits de correspondance existent avec un arbre de routage externe si les correspondances {{-matchers}} sont fusionnées. Cela rendrait la route inaccessible."
         },
         "suffix": "Actualisez la page, puis réessayez.",
-        "title": ""
+        "title": "Échec lors de l’ajout ou de la mise à jour de la politique de notification"
       },
       "n-more-policies_one": "{{count}} politiques supplémentaires",
       "n-more-policies_other": "{{count}} politiques supplémentaires"
@@ -2199,7 +2199,7 @@
     "query-and-expressions-step": {
       "add-query": "Ajouter une requête",
       "body-queries-expressions-configured": "Créer au moins une requête ou une expression pour laquelle une alerte doit être émise",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Désactiver",
       "expressions": "Expressions",
       "loading-data-sources": "Chargement des sources de données…",
       "manipulate-returned-queries-other-operations": "Manipulez les données renvoyées par les requêtes avec des opérations mathématiques et autres.",
@@ -2253,7 +2253,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Règle d’enregistrement"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Impossible de charger l’éditeur de requête en raison de : {{errorMessage}}"
@@ -2273,7 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Vous devrez définir un nouveau groupe d’évaluation pour la règle copiée, car la règle d’origine a été mise en service et ne peut pas être utilisée pour les règles créées dans l’interface utilisateur.",
       "body-not-provisioned": "La nouvelle règle <1>ne sera pas</1> marquée comme une règle mise en service.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Copier",
       "title-copy-provisioned-alert-rule": "Copier la règle d’alerte mise en service"
     },
     "redirect-to-rule-viewer": {
@@ -2497,7 +2497,7 @@
       "new-alert-rule": "Nouvelle règle d'alerte",
       "new-datasource-recording-rule": "Nouvelle règle d’enregistrement de source de données",
       "new-grafana-recording-rule": "Nouvelle règle d’enregistrement Grafana",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Nouvelle règle d’alerte pour l’exportation",
       "pagination": {
         "next-page": "Afficher plus..."
       },
@@ -2671,7 +2671,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Gestionnaires d’alerte"
       }
     },
     "settings-content": {
@@ -2809,7 +2809,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Actualiser l’aperçu",
-      "empty-state": "",
+      "empty-state": "Ajoutez du contenu de modèle pour afficher un aperçu",
       "label-preview": "Aperçu",
       "refresh": "Actualiser"
     },
@@ -2828,7 +2828,7 @@
       "loading": "Chargement en cours...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Sélectionner un modèle de notification"
         },
         "label": {
           "select-notification-template": "Sélectionner un modèle de notification"
@@ -2856,8 +2856,8 @@
     },
     "templates-table": {
       "actions": "Actions",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Voulez-vous vraiment supprimer le groupe de modèles « {{template}} » ?",
+      "confirmText-yes-delete": "Oui, supprimer",
       "no-templates-defined": "Aucun modèle défini.",
       "template-group": "Groupe de modèles",
       "title-delete-template-group": "Supprimer le groupe de modèles"
@@ -2912,7 +2912,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Gérer les règles d’alerte, les règles d’enregistrement et l’intervalle d’évaluation"
       }
     },
     "to-gma": {
@@ -2992,7 +2992,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Oui, supprimer"
       }
     },
     "use-delete-policy-modal": {
@@ -3152,7 +3152,7 @@
       "annotation": "Annotation",
       "first-value": "Première valeur",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Noms de champs inconnus"
     },
     "empty-state": {
       "button-title": "Ajouter une requête d'annotation",
@@ -3162,12 +3162,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Lorsque ce champ est défini, l’annotation sera interprétée comme une plage",
+        "results-split-on-comma": "Les résultats seront séparés par des virgules (,)"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}, ou le premier champ de texte",
+        "time-or-the-first-field": "{{defaultField}}, ou le premier champ de date/heure"
       }
     },
     "standard-annotation-query-editor": {
@@ -3245,9 +3245,9 @@
       "define-allowed-teams-ids-label": "Définir les ID des équipes autorisées",
       "display-name-description": "Sera affiché sur la page de connexion comme « Se connecter avec... ». Utile si vous utilisez plusieurs fournisseurs d’identité ou protocoles SSO.",
       "display-name-label": "Pseudo",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Paramètre permettant d’indiquer le domaine de l’utilisateur dans le locataire Azure AD/Entra ID pour simplifier le processus de connexion.",
+      "domain-hint-label": "Indice de domaine",
+      "domain-hint-valid-domain": "Ce champ doit contenir un domaine valide.",
       "email-attribute-name-description": "Nom de la clé à utiliser pour la recherche d’e-mail de l’utilisateur dans la carte d’attributs du jeton d’identification OAuth2.",
       "email-attribute-name-label": "Nom d’attribut de l’e-mail",
       "email-attribute-path-description": "Expression JMESPath à utiliser pour la recherche d’e-mail de l’utilisateur à partir des informations de l’utilisateur.",
@@ -3264,11 +3264,11 @@
       "id-token-attribute-name-label": "Nom d’attribut du jeton d’identification",
       "login-attribute-path-description": "Expression JMESPath à utiliser pour la recherche de connexion de l’utilisateur à partir du jeton d’identification de l’utilisateur.",
       "login-attribute-path-label": "Chemin d’attribut de connexion",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Consentement",
+      "login-prompt-description": "Indique le type d’interaction utilisateur lors de la connexion via le fournisseur d’identité (IdP).",
+      "login-prompt-label": "Invite de connexion",
+      "login-prompt-login": "Connexion",
+      "login-prompt-select-account": "Sélectionner un compte",
       "managed-identity-client-id-description": "L’ID du client de l’identité gérée de l’identifiant de l’identité fédérée de votre application OAuth2.",
       "managed-identity-client-id-label": "ID du client de l’identité gérée FIC",
       "name-attribute-path-description": "Expression JMESPath à utiliser pour la recherche de nom d’utilisateur à partir du jeton d’identification de l’utilisateur. \nCe nom sera utilisé comme nom d’affichage de l’utilisateur.",
@@ -3304,7 +3304,7 @@
       "team-ids-github": "Liste des ID d’équipe sous forme de nombres entiers.",
       "team-ids-label": "ID d’équipe",
       "team-ids-numbers": "Les ID d’équipe doivent être des nombres.",
-      "team-ids-other": "",
+      "team-ids-other": "Liste de chaînes de caractères correspondant aux identifiants d’équipe.",
       "team-ids-placeholder": "Saisissez les ID d’équipe et appuyez sur Entrée pour ajouter",
       "teams-url-description": "L’URL utilisée pour interroger les ID d’équipe. Si elle n’est pas définie, la valeur par défaut est /teams.",
       "teams-url-description-oauth": "Si vous configurez « {{ teamsURLLabel }} », vous devez également configurer « {{ teamIDsAttributePathLabel }} ».",
@@ -3348,7 +3348,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Rétablir les valeurs par défaut"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Réinitialiser",
       "disable": "Désactiver",
       "disabling": "Désactivation...",
       "discard": "Abandonner",
@@ -3368,7 +3368,7 @@
       "text-badge-not-enabled": "Non activé"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM est actuellement en développement et n’est pas recommandé pour un usage en production. Veuillez l’utiliser avec précaution et vous attendre à d’éventuels changements."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "Le point de terminaison .well-known/openid-configuration pour votre IdP",
@@ -3486,8 +3486,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Suppression groupée des ressources provisionnées",
+      "bulk-move-provisioned-resources": "Déplacement groupé des ressources provisionnées",
       "cancel-button": "Annuler",
       "confirmation-text": "Supprimer",
       "delete-button": "Supprimer",
@@ -3506,8 +3506,8 @@
       "move-modal-title": "Déplacer",
       "moving": "Déplacement...",
       "new-folder-name-required-phrase": "Vous devez saisir le nom du dossier.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Vous avez sélectionné à la fois des ressources provisionnées et non provisionnées. Ces deux types ne peuvent être traités simultanément. Veuillez sélectionner uniquement des ressources provisionnées ou uniquement des ressources non provisionnées, puis réessayer.",
+      "selected-mix-resources-modal-title": "Types de ressources incompatibles sélectionnés"
     },
     "actions": {
       "button-to-recently-deleted": "Récemment supprimé"
@@ -3520,25 +3520,25 @@
       "this-folder-is-empty": "Ce dossier est vide"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_other": ""
+      "all-deleted": "Toutes les ressources ont été supprimées avec succès",
+      "all-moved": "Toutes les ressources ont été déplacées avec succès",
+      "button-done": "Terminé",
+      "progress-title": "Succès",
+      "failed-alert_one": "{{count}} éléments ont échoué",
+      "failed-alert_other": "{{count}} éléments ont échoué"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Annuler",
+      "button-delete": "Supprimer",
+      "button-deleting": "Suppression en cours…",
+      "delete-warning": "Cette opération supprimera les dossiers sélectionnés ainsi que leur contenu. Au total, cela affectera :",
+      "error-path-not-found": "Chemin introuvable"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Annuler",
+      "button-move": "Déplacer",
+      "button-moving": "Déplacement en cours…",
+      "deleting": "Suppression en cours",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,14 +3546,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Contenu du fichier introuvable",
+      "error-path-not-found": "Chemin introuvable",
+      "error-target-folder-path-missing": "Le chemin du dossier de destination est manquant",
+      "error-title": "Erreur de dossier de destination",
+      "move-warning": "Cette opération déplacera les dossiers sélectionnés ainsi que leur contenu. Au total, cela affectera :",
+      "moving": "Déplacement en cours",
+      "progress": "Progression : {{current}} sur {{total}}",
+      "target-folder": "Dossier de destination"
     },
     "counts": {
       "alertRule_one": "{{count}} règle d'alerte",
@@ -3584,7 +3584,7 @@
       "button-delete": "Supprimer",
       "button-deleting": "Suppression en cours…",
       "delete-warning": "Cette opération supprimera ce dossier ainsi que tous ses éléments enfants. Au total, cela concernera :",
-      "success-message": ""
+      "success-message": "Dossier supprimé avec succès"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Impossible de récupérer les informations descendantes"
@@ -3609,7 +3609,7 @@
       "empty-message": "Aucun dossier trouvé",
       "error-title": "Impossible de charger les dossiers",
       "non-folder-item": "Non-dossier {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "Tableaux de bord",
       "search-placeholder": "Rechercher dans les dossiers",
       "unknown-error": "Erreur inconnue"
     },
@@ -3638,7 +3638,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Saisir le nom du dossier",
       "label-folder-name": "Nom du dossier",
       "text-pull-request-created": "Une demande de fusion a été créée avec des modifications dans ce dossier :",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "Votre dossier sera créé sous le nom {{folderName}}",
       "title-pull-request-created": "Demande de fusion créée",
       "title-this-repository-is-read-only": "Ce référentiel est en lecture seule"
     },
@@ -3757,7 +3757,7 @@
     "category-selected-connection": "Connexion sélectionnée",
     "category-selected-element": "Élément sélectionné ({{element}})",
     "category-size": "Taille",
-    "category-tooltip": "",
+    "category-tooltip": "Infobulle",
     "cloud-item": {
       "category-cloud": "Cloud",
       "label": {
@@ -4001,10 +4001,10 @@
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Mode infobulle",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Désactivé",
+        "label-enabled": "Activé"
       }
     },
     "tree-navigation-editor": {
@@ -4373,7 +4373,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Exécuter la requête"
     }
   },
   "dashboard": {
@@ -4536,7 +4536,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Continuer"
         },
         "title": {
           "proceed-to-external-site": "Accéder au site externe ?"
@@ -4642,11 +4642,11 @@
     },
     "edit-actions": {
       "add": "Ajouter {{typeName}}",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
+      "add-conditional-rule": "Ajouter la règle {{ruleDescription}}",
+      "duplicate-panel": "Dupliquer le panneau",
+      "edit-query-result-rule": "Modifier la règle de résultat de requête",
+      "edit-template-variable-rule": "Modifier la règle de variable de modèle",
+      "edit-time-range-rule": "Modifier la règle d’intervalle de temps",
       "move": "Déplacer {{typeName}}",
       "panel-background": "Modifier l’arrière-plan du panneau",
       "panel-description": "Modifier la description du panneau",
@@ -4661,7 +4661,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Tableau de bord",
-        "element": "",
+        "element": "Élément",
         "local-variable": "Variable locale",
         "multiple-elements": "Éléments multiples",
         "multiple-elements-delete-text": "Voulez-vous vraiment supprimer ces éléments ?",
@@ -4743,10 +4743,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Exporter le tableau de bord"
       },
       "menu": {
-        "label": ""
+        "label": "Menu d’exportation du tableau de bord"
       }
     },
     "fetch-dashboard": {
@@ -4768,9 +4768,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Par défaut",
+          "shared-crosshair": "Curseur partagé",
+          "shared-tooltip": "Infobulle partagée"
         }
       }
     },
@@ -4823,14 +4823,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Ne pas envoyer les données d’annotation aux panneaux suivants",
+        "annotation-panels-support-annotations": "Envoyer les données d’annotation à tous les panneaux compatibles",
+        "annotations-explicitly-listed-panels": "Envoyer les annotations uniquement aux panneaux spécifiés"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Tous les panneaux",
+        "all-panels-except": "Tous les panneaux sauf",
+        "selected-panels": "Panneaux sélectionnés"
       }
     },
     "get-panel-frame-category": {
@@ -5092,7 +5092,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Voulez-vous vraiment restaurer le tableau de bord dans sa version {{version}} ? Toutes les modifications non enregistrées seront perdues.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Oui, restaurer à la version {{version}}",
       "title-restore-version": "Restaurer la version"
     },
     "row-options-button": {
@@ -5144,7 +5144,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Tableau de bord enregistré"
     },
     "save-dashboard-as-button": {
       "save-as": "Enregistrer sous"
@@ -5180,7 +5180,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Un tableau de bord du même nom existe déjà dans le dossier sélectionné.<1></1><2>Voulez-vous vraiment enregistrer ce tableau de bord ?</2>",
       "body-version-mismatch": "Quelqu’un d’autre a mis à jour ce tableau de bord<1></1><2>Voulez-vous vraiment enregistrer ce tableau de bord ?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Enregistrer et écraser",
       "title-name-exists": "Conflits",
       "title-version-mismatch": "Conflits"
     },
@@ -5377,9 +5377,9 @@
       "label-apply-transformation-to": "Appliquer la transformation vers"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Remarque : la suppression d’une transformation peut en perturber d’autres. S’il n’en reste qu’une, vous serez redirigé vers l’écran principal de sélection.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Supprimer",
         "title-debug": "Déboguer",
         "title-disable-transformation": "Désactiver la transformation",
         "title-filter": "Filtrer",
@@ -5400,16 +5400,16 @@
       "placeholder-search-for-transformation": "Rechercher une transformation",
       "show-images": "Afficher les images",
       "title-add-another-transformation": "Ajouter une autre transformation",
-      "view-all": ""
+      "view-all": "Tout afficher"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "En supprimant toutes les transformations, vous serez redirigé vers l’écran principal de sélection."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Ajouter une autre transformation"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Tout supprimer",
       "delete-all-transformations": "Supprimer toutes les transformations",
       "title-delete-all-transformations": "Supprimer toutes les transformations ?",
       "tooltip-clear-search": "Effacer la recherche",
@@ -5439,16 +5439,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Modifier la description de la variable"
       },
       "hide": {
-        "action": ""
+        "action": "Modifier l’option de masquage de la variable"
       },
       "label": {
-        "action": ""
+        "action": "Modifier l’étiquette de la variable"
       },
       "name": {
-        "action": ""
+        "action": "Modifier le nom de la variable"
       }
     },
     "version-history-comparison": {
@@ -5460,7 +5460,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Basculer la sélection de la version {{version}}",
       "date": "Date",
-      "name-latest": "",
+      "name-latest": "Dernier",
       "notes": "Remarques",
       "restore": "Restaurer",
       "updated-by": "Mise à jour par",
@@ -5538,7 +5538,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Fournir les dimensions en tant que CSV : {{name}}, {{value}}",
       "label-data-source": "Source de données",
       "label-use-static-key-dimensions": "Utiliser des dimensions de clé statiques",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Autoriser les valeurs personnalisées"
     },
     "add-to-dashboard": {
       "message": {
@@ -5612,7 +5612,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Révoquer l’URL publique"
       },
       "title": {
         "revoke-public-url": "Désactiver l'URL publique"
@@ -5625,7 +5625,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Personnaliser les options",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Valeurs séparées par des virgules",
       "selection-options": "Options de sélection"
     },
     "dashboard-edit-pane-renderer": {
@@ -5646,8 +5646,8 @@
       "label-with-tags": "Avec les balises",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Tableaux de bord",
+          "link": "Lien"
         }
       },
       "placeholder-open-dashboard": "Ouvrir le tableau de bord"
@@ -5690,8 +5690,8 @@
       "data-source-options": "Options de source de données",
       "description-instance-name-filter": "Filtre Regex pour les instances de source de données à choisir dans la liste des valeurs de variable. Laisser vide pour tout.",
       "example-instance-name-filter": "Exemple : <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Filtre de nom d’instance",
+      "name-type": "Type",
       "selection-options": "Options de sélection"
     },
     "default-grid-layout-manager": {
@@ -5707,7 +5707,7 @@
       "delete-action": "Supprimer le tableau de bord",
       "deleting": "Suppression…",
       "drawer-title": "Supprimer le tableau de bord provisionné",
-      "success-message": ""
+      "success-message": "Tableau de bord supprimé avec succès"
     },
     "description-label": {
       "description": "Description"
@@ -5736,15 +5736,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Modifiable",
+          "readonly": "Lecture seule"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Par défaut",
+          "shared-crosshair": "Curseur partagé",
+          "shared-tooltip": "Infobulle partagée"
         }
       }
     },
@@ -5756,36 +5756,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Ajouter des filtres clé/valeur à la volée",
+        "dynamically-switch-source-multiple-panels": "Changer dynamiquement la source de données pour plusieurs panneaux",
+        "group": "Ajouter des clés de regroupement à la volée",
+        "hidden-constant-variable": "Une variable constante masquée, utile pour les préfixes de métriques dans des tableaux de bord à partager",
+        "users-enter-arbitrary-strings-textbox": "Les utilisateurs peuvent saisir des chaînes de caractères libres dans un champ de texte",
+        "values-are-static-and-defined-manually": "Les valeurs sont statiques et définies manuellement",
+        "values-fetched-source-query": "Les valeurs sont récupérées à partir d’une requête de source de données",
+        "values-timespans": "Les valeurs correspondent à des intervalles temporels, par exemple 1 m, 1 h, 1 j"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Filtres ad hoc",
+        "constant": "Constante",
+        "custom": "Personnalisée",
+        "data-source": "Source de données",
+        "group-by": "Regrouper par",
+        "interval": "Intervalle",
+        "query": "Requête",
+        "textbox": "Zone de texte"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Ne pas envoyer les données d’annotation aux panneaux suivants",
+        "annotation-panels-support-annotations": "Envoyer les données d’annotation à tous les panneaux compatibles",
+        "annotations-explicitly-listed-panels": "Envoyer les annotations uniquement aux panneaux spécifiés"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Tous les panneaux",
+        "all-panels-except": "Tous les panneaux sauf",
+        "selected-panels": "Panneaux sélectionnés"
       }
     },
     "get-panel-frame-options": {
@@ -5813,7 +5813,7 @@
       "group-by-options": "Regrouper par options",
       "label-data-source": "Source de données",
       "label-use-static-group-by-dimensions": "Utiliser les dimensions de groupe statiques",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Autoriser les valeurs personnalisées"
     },
     "help-wizard": {
       "copy-to-clipboard": "Copier dans le presse-papiers",
@@ -5849,14 +5849,14 @@
       "apply": "Appliquer"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Calcule dynamiquement l’intervalle en divisant la plage de temps par le nombre spécifié",
       "description-calculated-value-below-threshold": "La valeur calculée ne descendra pas en dessous de ce seuil",
       "description-step-count": "Le nombre de divisions requis de la plage temporelle actuelle pour calculer la valeur",
       "interval-options": "Options d’intervalle",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Option automatique",
+      "name-min-interval": "Intervalle minimal",
+      "name-step-count": "Nombre d’étapes",
+      "name-values": "Valeurs"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5877,19 +5877,19 @@
       "usage-count_other": "Utilisé sur {{count}} tableaux de bord"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Erreur lors du déplacement du tableau de bord",
+      "api-error": "Échec du déplacement du tableau de bord",
+      "cancel-action": "Annuler",
+      "current-file-not-found": "Le fichier du tableau de bord actuel est introuvable",
+      "drawer-title": "Déplacer un tableau de bord provisionné",
+      "file-load-error": "Erreur lors du chargement du tableau de bord",
+      "loading-file-data": "Chargement des données du tableau de bord",
+      "move-action": "Déplacer le tableau de bord",
+      "move-read-only-message": "Ce tableau de bord ne peut pas être déplacé directement depuis Grafana, car le dépôt est en lecture seule. Pour déplacer ce tableau de bord, déplacez le fichier directement dans votre dépôt Git.",
+      "moving": "Déplacement en cours…",
+      "success-message": "Tableau de bord déplacé avec succès",
+      "target-path-label": "Chemin de destination",
+      "title-this-repository-is-read-only": "Ce dépôt est en lecture seule"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Un tableau de bord du même nom existe déjà dans le dossier sélectionné. Voulez-vous toujours enregistrer ce tableau de bord ?",
@@ -5897,7 +5897,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Continuer"
       },
       "title": {
         "proceed-to-external-site": "Accéder au site externe ?"
@@ -5934,8 +5934,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Ajouter une autre transformation",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "En supprimant toutes les transformations, vous serez redirigé vers l’écran principal de sélection.",
+      "confirmText-delete-all": "Tout supprimer",
       "delete-all-transformations": "Supprimer toutes les transformations",
       "title-delete-all-transformations": "Supprimer toutes les transformations ?"
     },
@@ -5988,13 +5988,13 @@
       "description-examples": "Les groupes de capture nommés peuvent être utilisés pour séparer le texte d’affichage et la valeur (<1>voir les exemples</1>).",
       "description-optional": "Facultatif, si vous souhaitez extraire une partie d’un nom de série ou d’un segment de nœud de métrique.",
       "label-data-source": "Source de données",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Tri des options statiques",
       "label-target-data-source": "Source de données cible",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Utiliser des options statiques",
+      "name-regex": "Expression régulière",
       "query-options": "Options de recherche",
       "selection-options": "Options de sélection",
-      "static-options-legend": ""
+      "static-options-legend": "Options statiques"
     },
     "resource-export": {
       "label": {
@@ -6007,7 +6007,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Voulez-vous vraiment restaurer le tableau de bord dans sa version {{version}} ? Toutes les modifications non enregistrées seront perdues.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Oui, restaurer à la version {{version}}",
       "title-restore-version": "Restaurer la version"
     },
     "save-button": {
@@ -6026,7 +6026,7 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Échec de l’enregistrement du tableau de bord"
       },
-      "required": ""
+      "required": "Champ requis"
     },
     "save-dashboard-drawer": {
       "tabs": {
@@ -6053,8 +6053,8 @@
         "title-someone-else-has-updated-this-dashboard": "Quelqu’un d’autre a mis à jour ce tableau de bord",
         "would-still-dashboard": "Voulez-vous toujours enregistrer ce tableau de bord ?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "En raison des limitations du nouveau schéma de tableau de bord (V2), les panneaux issus de la bibliothèque seront convertis en panneaux classiques avec contenu intégré lors de l’exportation externe.",
+      "schema-v2-library-panels-export-title": "Les panneaux de bibliothèque seront convertis en panneaux classiques",
       "title-dashboard-drastically-changed": "Le tableau de bord a été modifié de manière irréversible"
     },
     "save-dashboard-form-common-options": {
@@ -6101,10 +6101,10 @@
       "description-enables-multiple-values-selected": "Permet de sélectionner plusieurs valeurs en même temps",
       "description-enables-option-include-variables": "Active une option pour inclure toutes les valeurs",
       "description-enables-users-custom-values": "Permet aux utilisateurs d’ajouter des valeurs personnalisées à la liste",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Autoriser les valeurs personnalisées",
+      "name-custom-all-value": "Valeur personnalisée pour Tout",
+      "name-include-all-option": "Inclure l’option Tout",
+      "name-multi-value": "Valeurs multiples"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Basculer le menu de partage"
@@ -6125,7 +6125,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Valeur par défaut"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(facultatif)",
@@ -6150,8 +6150,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Si vous dissociez ce panneau, vous pourrez le modifier sans impacter les autres tableaux de bord. Toutefois, toute modification sera définitive et il ne sera plus possible de le rattacher à son panneau réutilisable d’origine.",
+      "confirmText-yes-unlink": "Oui, dissocier",
       "title-really-unlink-panel": "Voulez-vous vraiment dissocier ce panneau ?"
     },
     "unsaved-changes-modal": {
@@ -6169,7 +6169,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Tableau de bord enregistré"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Cette variable n’est référencée par aucune variable ou aucun tableau de bord.",
@@ -6181,15 +6181,15 @@
       "aria-label-variable-editor-form": "Formulaire de l’éditeur de variables",
       "back-to-list": "Retour à la liste",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Supprimer la variable"
       },
       "delete": "Supprimer",
       "description-optional-display-name": "Nom d’affichage facultatif",
       "description-template-variable-characters": "Le nom de la variable du modèle. (50 caractères max)",
       "general": "Général",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Description",
+      "name-label": "Étiquette",
+      "name-name": "Nom",
       "placeholder-descriptive-text": "Texte de description",
       "placeholder-label-name": "Nom de l’étiquette",
       "placeholder-variable-name": "Nom de la variable",
@@ -6204,8 +6204,8 @@
       "variable": "Variable"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Voulez-vous vraiment supprimer : {{variable}} ?",
+      "confirmText-delete-variable": "Supprimer la variable",
       "title-delete-variable": "Supprimer la variable",
       "tooltip-duplicate-variable": "Dupliquer la variable",
       "tooltip-remove-variable": "Supprimer la variable"
@@ -6213,15 +6213,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Étiquette",
+          "nothing": "Aucune",
+          "variable": "Variable"
         }
       },
       "label": "Masquer"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Type de variable"
     },
     "variable-usages-button": {
       "title-show-usages": "Afficher les usages pour : {{variableId}}",
@@ -6249,7 +6249,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Basculer la sélection de la version {{version}}",
       "date": "Date",
-      "name-latest": "",
+      "name-latest": "Dernière",
       "notes": "Remarques",
       "restore": "Restaurer",
       "updated-by": "Mise à jour par",
@@ -6640,7 +6640,7 @@
     },
     "color-dimension-editor": {
       "label-fixed-color": "Couleur fixe",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Aucun champ trouvé"
     },
     "file-dropzone-custom-children": {
       "upload": "Charger"
@@ -6679,7 +6679,7 @@
       },
       "label-limit": "Limiter",
       "label-value": "Valeur",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Aucun champ trouvé",
       "scalar-options": {
         "description-clamped": "Utiliser les valeurs du champ, limitées entre le minimum et le maximum",
         "description-mod": "Utiliser les valeurs du champ, modulo maximum",
@@ -6690,13 +6690,13 @@
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Valeur fixe"
         }
       },
       "label-max": "Max",
       "label-min": "Min",
       "label-value": "Valeur",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Aucun champ trouvé"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
@@ -6806,6 +6806,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Événements",
@@ -7078,7 +7079,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Chargement en cours…"
     },
     "prev": "Précédent",
     "queryless-apps-extensions": {
@@ -7265,7 +7266,7 @@
           "start-time": "Heure de début :"
         }
       },
-      "share-span": "",
+      "share-span": "Partager",
       "warnings": "Avertissements"
     },
     "span-filters": {
@@ -7275,8 +7276,8 @@
       "aria-label-select-service-name-operator": "Sélectionner l’opérateur de nom de service",
       "aria-label-select-span-name": "Sélectionner le nom de la durée",
       "aria-label-select-span-name-operator": "Sélectionner l’opérateur de nom de la durée",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Sélectionner la durée maximale de segment",
+      "ariaLabel-select-min-span-duration": "Sélectionner la durée minimale de segment",
       "label-collapse": "Filtres de durée",
       "label-duration": "Durée",
       "label-service-name": "Nom du service",
@@ -7348,23 +7349,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Durée",
+      "export-started": "Exportation lancée",
+      "give-feedback": "Commentaires",
+      "link-copied": "Lien copié dans le presse-papiers",
+      "path": "Trajet",
+      "route": "Itinéraire",
+      "services": "Services",
+      "share": "Partager",
+      "share-copy-link": "Copier le lien",
+      "share-export-json": "Exporter au format JSON",
+      "share-tooltip": "Partager la trace",
+      "start-time": "Heure de début",
+      "target": "Cible",
+      "title-share-thoughts-about-tracing-grafana": "Partagez vos impressions sur les traces sur Grafana.",
+      "tooltip-url": "{{route}} ou {{url}} ou {{target}} ou {{path}}",
+      "trace-id": "Identifiant de trace",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Bouton Supprimer les filtres",
@@ -7464,7 +7465,7 @@
       "when": "QUAND"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Exécutez des requêtes SQL au format MySQL sur les tables retournées par vos sources de données. Les requêtes des sources (c’est-à-dire « A » et « B ») sont accessibles sous forme de tables et référencées par leur nom. Les champs sont disponibles sous forme de colonnes, tels que renvoyés par la source de données.",
       "label-operation": "Opération"
     },
     "math": {
@@ -7495,7 +7496,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Effacer les dossiers",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Aucun dossier trouvé",
     "select-aria-label": "Filtre de dossier",
     "select-placeholder": "Filtrer par dossier"
   },
@@ -7569,51 +7570,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Répertoire géographique introuvable",
+      "warning-no-geometry": "impossible de localiser la géométrie",
+      "warning-select-geohash": "Sélectionner le champ de géohachage",
+      "warning-select-lat-long": "Sélectionner les champs de latitude/longitude",
+      "warning-select-lookup": "Sélectionner le champ de correspondance",
+      "warning-unable-to-find": "Impossible de trouver les champs de localisation"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Aucun champ de type chaîne de caractères trouvé"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Aucun champ numérique trouvé"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Aucun champ numérique trouvé"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Aucun champ de type chaîne de caractères trouvé"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Répertoire géographique",
+      "name-geohash-field": "Champ de géohachage",
+      "name-latitude-field": "Champ de latitude",
+      "name-location-mode": "Mode de localisation",
+      "name-longitude-field": "Champ de longitude",
+      "name-lookup-field": "Champ de correspondance"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Identifier automatiquement les données de localisation à partir des noms de champ par défaut",
+        "description-coords": "Spécifier les champs de latitude et de longitude",
+        "description-geohash": "Spécifier un champ de géohachage",
+        "description-lookup": "Spécifier un répertoire géographique et un champ de correspondance",
+        "label-auto": "Auto",
+        "label-coords": "Coordonnées",
+        "label-geohash": "Géohachage",
+        "label-lookup": "Correspondance"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Calque de fond de carte",
+    "category-map-controls": "Contrôles de la carte",
+    "category-map-layers": "Calques de la carte",
+    "category-map-view": "Vue cartographique",
     "coordinates-map-view-editor": {
       "label-latitude": "Latitude",
       "label-longitude": "Longitude"
@@ -7622,15 +7623,15 @@
       "center": "Centre :",
       "zoom": "Zoom :"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Cet emplacement s’affichera au chargement initial du panneau.",
+    "description-mouse-wheel-zoom": "Activer le contrôle du zoom via la molette de la souris",
+    "description-no-repeat": "Empêcher la répétition horizontale de la carte",
+    "description-share-view": "Utiliser la même vue sur plusieurs panneaux. Remarque : cela peut nécessiter le rechargement du tableau de bord.",
+    "description-show-attribution": "Afficher les mentions de la source cartographique en bas à droite",
+    "description-show-debug": "Afficher les informations de la carte",
+    "description-show-measure": "Afficher les outils de mesure sur la carte",
+    "description-show-scale": "Indiquer l’échelle cartographique",
+    "description-show-zoom": "Afficher les boutons de contrôle du zoom dans le coin supérieur gauche",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Couche"
@@ -7654,12 +7655,12 @@
       "aria-label-add-geomap-style-rule": "Ajouter une règle de style de carte géographique"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Calque de base",
+      "description-display-tooltip": "Afficher l’infobulle du calque",
+      "name-data": "Données",
+      "name-display-tooltip": "Afficher l’infobulle",
+      "name-layer-type": "Type de calque",
+      "name-opacity": "Opacité"
     },
     "layers-editor": {
       "label-add-layer": "Ajouter une couche",
@@ -7672,9 +7673,9 @@
       "use-current-map-settings": "Utiliser les paramètres actuels de la carte"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Afficher la légende de la carte",
+      "name-show-legend": "Afficher la légende",
+      "name-styles": "Styles"
     },
     "markers-legend": {
       "title-symbol": "Symbole"
@@ -7683,27 +7684,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Afficher les outils de mesure"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Vue initiale",
+    "name-mouse-wheel-zoom": "Zoom à la molette",
+    "name-no-repeat": "Aucune répétition de la carte",
+    "name-share-view": "Partager la vue",
+    "name-show-attribution": "Afficher l’attribution",
+    "name-show-debug": "Afficher les outils de débogage",
+    "name-show-measure": "Afficher les outils de mesure",
+    "name-show-scale": "Afficher l’échelle",
+    "name-show-zoom": "Afficher le contrôle du zoom",
+    "name-tooltip": "Infobulle",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Aucun champ de type chaîne de caractères trouvé"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "La couche de la carte de base est configurée par l’administrateur du serveur."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Centre",
+        "label-left": "Gauche",
+        "label-right": "Droite"
       },
       "label-align": "Aligner",
       "label-baseline": "Valeur de référence",
@@ -7719,12 +7720,12 @@
       "label-text-label": "Étiquette de texte",
       "label-x-offset": "Décalage X",
       "label-y-offset": "Décalage Y",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Sélectionner un symbole",
+      "placeholderText-select-symbol-or-add-text": "Sélectionner un symbole ou ajouter une étiquette de texte",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Bas",
+        "label-center": "Centre",
+        "label-top": "Haut"
       }
     },
     "style-rule-editor": {
@@ -7738,13 +7739,13 @@
       "placeholder-value": "valeur"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Afficher la fenêtre contextuelle au survol",
+      "description-none": "Afficher le contenu au clic, pas au survol",
+      "label-details": "Détails",
+      "label-none": "Aucun"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Calque {{name}}"
     }
   },
   "get-enterprise": {
@@ -7864,400 +7865,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Pieds/s²",
+            "name-g-unit": "Unité G",
+            "name-meters-sec": "Mètres/s²"
           },
-          "name": ""
+          "name": "Accélération"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Minutes d’arc",
+            "name-arc-seconds": "Secondes d’arc",
+            "name-degrees": "Degrés (°)",
+            "name-gradian": "Grade",
+            "name-radians": "Radians"
           },
-          "name": ""
+          "name": "Angle"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Acres (ac)",
+            "name-hectares": "Hectares (ha)",
+            "name-square-feet": "Pieds carrés (pi²)",
+            "name-square-meters": "Mètres carrés (m²)",
+            "name-square-miles": "Miles carrés (mi²)"
           },
-          "name": ""
+          "name": "Surface"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Activé/désactivé",
+            "name-true-false": "Vrai/faux",
+            "name-yes-no": "Oui/non"
           },
-          "name": ""
+          "name": "Booléen"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "Calcul"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "gramme par mètre cube (g/m³)",
+            "name-g-nm3": "gramme par mètre cube normal (g/Nm³)",
+            "name-mg-dl": "milligrammes par décilitre (mg/dL)",
+            "name-mg-m3": "milligramme par mètre cube (mg/m³)",
+            "name-mg-nm3": "milligramme par mètre cube normal (mg/Nm³)",
+            "name-mmol-l": "millimoles par litre (mmol/L)",
+            "name-ng-m3": "nanogramme par mètre cube (ng/m³)",
+            "name-ng-nm3": "nanogramme par mètre cube normal (ng/Nm³)",
+            "name-ppb": "parties par milliard (ppb)",
+            "name-ppm": "parties par million (ppm)",
+            "name-ug-m3": "microgramme par mètre cube (μg/m³)",
+            "name-ug-nm3": "microgramme par mètre cube normal (μg/Nm³)"
           },
-          "name": ""
+          "name": "Concentration"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Lev bulgare (BGN)",
+            "name-brl": "Réal (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "Franc suisse (CHF)",
+            "name-czk": "Couronne tchèque (CZK)",
+            "name-dkk": "Couronne danoise (kr)",
+            "name-eur": "Euro (€)",
+            "name-gbp": "Livres sterling (£)",
+            "name-idr": "Roupie indonésienne (Rp)",
+            "name-ils": "Nouveau shekel israélien (₪)",
+            "name-inr": "Roupie indienne (₹)",
+            "name-isk": "Couronne islandaise (kr)",
+            "name-jpy": "Yen (¥)",
+            "name-krw": "Won sud-coréen (₩)",
+            "name-mbtc": "MilliBitcoin (m฿)",
+            "name-myr": "Ringgit malaisien (RM)",
+            "name-nok": "Couronne norvégienne (kr)",
+            "name-php": "Peso philippin (PHP)",
+            "name-pln": "Złoty polonais (PLN)",
+            "name-pyg": "Guaraní (₲)",
+            "name-rub": "Rouble (₽)",
+            "name-sek": "Couronne suédoise (kr)",
+            "name-try": "Livre turque (₺)",
+            "name-uah": "Hryvnia (₴)",
+            "name-ubtc": "MicroBitcoin (μ฿)",
+            "name-usd": "Dollar ($)",
+            "name-uyu": "Peso uruguayen (UYU)",
+            "name-vnd": "Dong vietnamien (VND)",
+            "name-xpf": "Franc CFP (XPF)",
+            "name-zar": "Rand sud-africain (R)"
           },
-          "name": ""
+          "name": "Devise"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bits (IEC)",
+            "name-bits-si": "bits (SI)",
+            "name-bytes-iec": "octets (IEC)",
+            "name-bytes-si": "octets (SI)",
+            "name-gibibytes": "gibioctets",
+            "name-gigabytes": "gigaoctets",
+            "name-kibibytes": "kibioctets",
+            "name-kilobytes": "kilooctets",
+            "name-mebibytes": "mébioctets",
+            "name-megabytes": "mégaoctets",
+            "name-pebibytes": "pébioctets",
+            "name-petabytes": "pétaoctets",
+            "name-tebibytes": "tébioctets",
+            "name-terabytes": "téraoctets"
           },
-          "name": ""
+          "name": "Données"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bits/s (IEC)",
+            "name-bits-sec-si": "bits/s (SI)",
+            "name-bytes-sec-iec": "octets/s (IEC)",
+            "name-bytes-sec-si": "octets/s (SI)",
+            "name-gibibits-sec": "gibibits/s",
+            "name-gibibytes-sec": "gibioctets/s",
+            "name-gigabits-sec": "gigabits/s",
+            "name-gigabytes-sec": "gigaoctets/s",
+            "name-kibibits-sec": "kibibits/s",
+            "name-kibibytes-sec": "kibioctets/s",
+            "name-kilobits-sec": "kilobits/s",
+            "name-kilobytes-sec": "kilooctets/s",
+            "name-mebibits-sec": "mébibits/s",
+            "name-mebibytes-sec": "mébioctets/s",
+            "name-megabits-sec": "mégabits/s",
+            "name-megabytes-sec": "mégaoctets/s",
+            "name-packets-sec": "paquets/s",
+            "name-pebibits-sec": "pébibits/s",
+            "name-pebibytes-sec": "pébioctets/s",
+            "name-petabits-sec": "pétabits/s",
+            "name-petabytes-sec": "pétaoctets/s",
+            "name-tebibits-sec": "tébibits/s",
+            "name-tebibytes-sec": "tébioctets/s",
+            "name-terabits-sec": "térabits/s",
+            "name-terabytes-sec": "téraoctets/s"
           },
-          "name": ""
+          "name": "Débit de données"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Date/heure par défaut",
+            "name-datetime-iso": "Date/heure ISO",
+            "name-datetime-iso-no-date": "Date/heure ISO (pas de date si aujourd’hui)",
+            "name-datetime-local": "Date/heure locale",
+            "name-datetime-local-no-date": "Date/heure locale (pas de date si aujourd’hui)",
+            "name-datetime-us": "Date/heure US",
+            "name-datetime-us-no-date": "Date/heure US (pas de date si aujourd’hui)",
+            "name-from-now": "Depuis maintenant"
           },
-          "name": ""
+          "name": "Date et heure"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Ampère (A)",
+            "name-ampere-hour": "Ampère-heure (Ah)",
+            "name-decibel-milliwatt": "Décibel-milliwatt (dBm)",
+            "name-electron-volt": "Électron-volt (eV)",
+            "name-farad": "Farad (F)",
+            "name-femtofarad": "Femtofarad (fF)",
+            "name-gigawatt": "Gigawatt (GW)",
+            "name-henry": "Henry (H)",
+            "name-joule": "Joule (J)",
+            "name-kiloampere": "Kiloampère (kA)",
+            "name-kiloampere-hour": "Kiloampère-heure (kAh)",
+            "name-kiloohm": "Kiloohm (kΩ)",
+            "name-kilovolt": "Kilovolt (kV)",
+            "name-kilovolt-ampere": "Kilovolt-ampère (kVA)",
+            "name-kilovolt-ampere-reactive": "Kilovolt-ampère réactif (kVAr)",
+            "name-kilowatt": "Kilowatt (kW)",
+            "name-kilowatt-hour": "Kilowatt-heure (kWh)",
+            "name-kilowatt-min": "Kilowatt-minute (kWm)",
+            "name-lumens": "Lumens (Lm)",
+            "name-megaohm": "Mégaohm (MΩ)",
+            "name-megawatt": "Mégawatt (MW)",
+            "name-megawatt-hour": "Mégawattheure (MWh)",
+            "name-microfarad": "Microfarad (µF)",
+            "name-microhenry": "Microhenry (µH)",
+            "name-milliampere": "Milliampère (mA)",
+            "name-milliampere-hour": "Milliampère-heure (mAh)",
+            "name-millihenry": "Millihenry (mH)",
+            "name-milliohm": "Milliohm (mΩ)",
+            "name-millivolt": "Millivolt (mV)",
+            "name-milliwatt": "Milliwatt (mW)",
+            "name-nanofarad": "Nanofarad (nF)",
+            "name-ohm": "Ohm (Ω)",
+            "name-picofarad": "Picofarad (pF)",
+            "name-volt": "Volt (V)",
+            "name-volt-ampere": "Volt-ampère (VA)",
+            "name-volt-ampere-reactive": "Volt-ampère réactif (VAr)",
+            "name-watt": "Watt (W)",
+            "name-watt-hour": "Wattheure (Wh)",
+            "name-watt-hour-per-kg": "Wattheure par kilogramme (Wh/kg)",
+            "name-watt-square-meter": "Watt par mètre carré (W/m²)"
           },
-          "name": ""
+          "name": "Énergie"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Pieds cubes/min (cfm)",
+            "name-cubic-feet-sec": "Pieds cubes/s (cfs)",
+            "name-cubic-meters-sec": "Mètres cubes/s (cms)",
+            "name-gallons-min": "Gallons/min (gpm)",
+            "name-litre-hour": "Litres/heure",
+            "name-litre-min": "Litres/min (L/min)",
+            "name-lux": "Lux (lx)",
+            "name-millilitre-min": "millilitres/min (mL/min)"
           },
-          "name": ""
+          "name": "Débit"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Kilonewton-mètres (kNm)",
+            "name-kilonewtons": "Kilonewtons (kN)",
+            "name-newton-meters": "Newton-mètre (Nm)",
+            "name-newtons": "Newton (N)"
           },
-          "name": ""
+          "name": "Force"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "exahashes/s",
+            "name-gigahashes-sec": "gigahashes/s",
+            "name-hashes-sec": "hashes/s",
+            "name-kilohashes-sec": "kilohashes/s",
+            "name-megahashes-sec": "megahashes/s",
+            "name-petahashes-sec": "petahashes/s",
+            "name-terahashes-sec": "terahashes/s"
           },
-          "name": ""
+          "name": "Taux de hachage"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "pieds (pi)",
+            "name-inch": "pouces (po)",
+            "name-kilometer": "kilomètre (km)",
+            "name-meter": "mètre (m)",
+            "name-mile": "mile (mi)",
+            "name-millimeter": "millimètre (mm)"
           },
-          "name": ""
+          "name": "Longueur"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "gramme (g)",
+            "name-kilogram": "kilogramme (kg)",
+            "name-metric-ton": "tonne métrique (t)",
+            "name-milligram": "milligramme (mg)",
+            "name-pound": "livre (lb)"
           },
-          "name": ""
+          "name": "Masse"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Candela (cd)",
+            "name-decibel": "Décibel",
+            "name-hexadecimal": "Hexadécimal",
+            "name-hexadecimal-0x": "Hexadécimal (0x)",
+            "name-humidity": "Humidité (%H)",
+            "name-locale": "Format local",
+            "name-number": "Nombre",
+            "name-percent-1": "Pourcentage (0,0-1,0)",
+            "name-percent-100": "Pourcentage (0-100)",
+            "name-pixels": "Pixels",
+            "name-scientific": "Notation scientifique",
+            "name-short": "abrégé",
+            "name-si-short": "abrégé SI",
+            "name-string": "Chaîne de caractères"
           },
-          "name": ""
+          "name": "Divers"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Bars",
+            "name-hectopascals": "Hectopascals",
+            "name-inches-mercury": "Pouces de mercure",
+            "name-kilobars": "Kilobars",
+            "name-kilopascals": "Kilopascals",
+            "name-millibars": "Millibars",
+            "name-pascals": "Pascals",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Pression"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Becquerel (Bq)",
+            "name-curie": "curie (Ci)",
+            "name-exposure": "Exposition (C/kg)",
+            "name-gray": "Gray (Gy)",
+            "name-microsievert": "microsievert (µSv)",
+            "name-microsievert-hour": "microsievert/heure (µSv/h)",
+            "name-millisievert": "millisievert (mSv)",
+            "name-millisievert-hour": "millisievert/heure (mSv/h)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "roentgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/heure (Sv/h)"
           },
-          "name": ""
+          "name": "Radiation"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Degrés par seconde (°/s)",
+            "name-gigahertz": "Gigahertz (GHz)",
+            "name-hertz": "Hertz (Hz)",
+            "name-kilohertz": "Kilohertz (kHz)",
+            "name-megahertz": "Mégahertz (MHz)",
+            "name-radians-sec": "Radians par seconde (rad/s)",
+            "name-rpm": "Tours par minute (tr/min)"
           },
-          "name": ""
+          "name": "Vitesse de rotation"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsius (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Température"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "comptes/minute (cpm)",
+            "name-counts-sec": "comptes/seconde (cps)",
+            "name-events-min": "événements/minute (epm)",
+            "name-events-sec": "événements/seconde (eps)",
+            "name-io-ops-sec": "opérations E/S par seconde (iops)",
+            "name-messages-min": "messages/minute (mpm)",
+            "name-messages-sec": "messages/seconde (mps)",
+            "name-ops-min": "opérations/minute (opm)",
+            "name-ops-sec": "opérations/seconde (ops)",
+            "name-reads-min": "lectures/minute (rpm)",
+            "name-reads-sec": "lectures/seconde (rps)",
+            "name-records-min": "enregistrements/minute (rpm)",
+            "name-records-sec": "enregistrements/seconde (rps)",
+            "name-requests-min": "requêtes/minute (rpm)",
+            "name-requests-sec": "requêtes/seconde (rps)",
+            "name-rows-min": "lignes/minute (rpm)",
+            "name-rows-sec": "lignes/seconde (rps)",
+            "name-writes-min": "écritures/minute (wpm)",
+            "name-writes-sec": "écritures/seconde (wps)"
           },
-          "name": ""
+          "name": "Débit"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "horloge (ms)",
+            "name-clock-s": "horloge (s)",
+            "name-days": "jours (j)",
+            "name-duration-dhms": "durée (j hh:mm:ss)",
+            "name-duration-hms": "durée (hh:mm:ss)",
+            "name-duration-ms": "durée (ms)",
+            "name-duration-s": "durée (s)",
+            "name-hertz": "Hertz (1/s)",
+            "name-hours": "heures (h)",
+            "name-microseconds": "microsecondes (µs)",
+            "name-milliseconds": "millisecondes (ms)",
+            "name-minutes": "minutes (m)",
+            "name-nanoseconds": "nanosecondes (ns)",
+            "name-seconds": "secondes (s)",
+            "name-timeticks": "Tics d’horloge (s/100)"
           },
-          "name": ""
+          "name": "Temps"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "kilomètres/heure (km/h)",
+            "name-knot": "nœuds (kn)",
+            "name-meters-second": "mètres/seconde (m/s)",
+            "name-miles-hour": "miles/heure (mph)"
           },
-          "name": ""
+          "name": "Vitesse"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "décimètre cube",
+            "name-cubic-meter": "mètre cube",
+            "name-gallons": "gallons",
+            "name-litre": "litre (L)",
+            "name-millilitre": "millilitre (mL)",
+            "name-normal-cubic-meter": "Mètre cube normal"
           },
-          "name": ""
+          "name": "Volume"
         }
       }
     }
@@ -8386,7 +8387,7 @@
       "option": "option"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Aperçu de l’image ouvert"
     },
     "cascader": {
       "clear-button": "Effacer la sélection"
@@ -8400,9 +8401,9 @@
       "aria-label-selected-color": "Couleur {{colorLabel}}"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Supprimer",
       "cancel": "Annuler",
-      "confirmText-delete": ""
+      "confirmText-delete": "Supprimer"
     },
     "confirm-content": {
       "placeholder": "Saisissez « {{confirmPromptText}} » pour confirmer"
@@ -8507,56 +8508,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "Avril",
+        "label-august": "Août",
+        "label-december": "Décembre",
+        "label-february": "Février",
+        "label-january": "Janvier",
+        "label-july": "Juillet",
+        "label-june": "Juin",
+        "label-march": "Mars",
+        "label-may": "Mai",
+        "label-november": "Novembre",
+        "label-october": "Octobre",
+        "label-september": "Septembre"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Avant-hier",
+        "last-1-hour": "Dernière heure",
+        "last-1-year": "Dernière année",
+        "last-12-hours": "12 dernières heures",
+        "last-15-mins": "15 dernières minutes",
+        "last-2-days": "2 derniers jours",
+        "last-2-years": "2 dernières années",
+        "last-24-hours": "24 dernières heures",
+        "last-3-hours": "3 dernières heures",
+        "last-30-days": "30 derniers jours",
+        "last-30-mins": "30 dernières minutes",
+        "last-5-mins": "5 dernières minutes",
+        "last-5-years": "5 dernières années",
+        "last-6-hours": "6 dernières heures",
+        "last-6-months": "6 derniers mois",
+        "last-7-days": "7 derniers jours",
+        "last-90-days": "90 derniers jours",
+        "previous-fiscal-quarter": "Trimestre fiscal précédent",
+        "previous-fiscal-year": "Exercice fiscal précédent",
+        "previous-month": "Mois précédent",
+        "previous-week": "Semaine précédente",
+        "previous-year": "Année précédente",
+        "this-day-last-week": "Ce jour-là, la semaine dernière",
+        "this-fiscal-quarter": "Trimestre fiscal en cours",
+        "this-fiscal-quarter-so-far": "Trimestre fiscal en cours (jusqu’à présent)",
+        "this-fiscal-year": "Exercice fiscal en cours",
+        "this-fiscal-year-so-far": "Exercice fiscal en cours (jusqu’à présent)",
+        "this-month": "Mois en cours",
+        "this-month-so-far": "Mois en cours (jusqu’à présent)",
+        "this-week": "Semaine en cours",
+        "this-week-so-far": "Semaine en cours (jusqu’à présent)",
+        "this-year": "Année en cours",
+        "this-year-so-far": "Année en cours (jusqu’à présent)",
+        "today": "Aujourd’hui",
+        "today-so-far": "Aujourd’hui (jusqu’à présent)",
+        "yesterday": "Hier"
       }
     },
     "drawer": {
@@ -8607,18 +8608,18 @@
         "placeholder": "Sélectionner un champ"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Booléen",
+        "label-enum": "Énumération",
+        "label-number": "Nombre",
+        "label-other": "Autre",
+        "label-string": "Chaîne de caractères",
+        "label-time": "Temps",
+        "label-traces": "Traces"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Images ({{framesCount}}) : {{framesNames}}",
+        "label": "Requête : {{refId}}",
+        "label-missing-ref-id": "Requête : (refId manquant)"
       },
       "name-field-name-by-regex-matcher": "Champs dont le nom correspond à une expression régulière",
       "name-fields-by-query": "Champs retournés par la requête",
@@ -8652,8 +8653,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "basculer pour réduire le panneau",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Barre de chargement du panneau",
+      "ariaLabel-panel-status": "État du panneau",
       "tooltip-cancel": "Annuler une requête",
       "tooltip-cancel-loading": "Annuler une requête",
       "tooltip-stop-streaming": "Arrêter la diffusion",
@@ -8722,12 +8723,12 @@
       "inspect-drawer-title": "Inspecter la valeur",
       "inspect-menu-label": "Inspecter la valeur",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Aucune donnée disponible"
       },
       "no-values-label": "Aucune valeur",
       "pagination-summary": "{{itemsRangeStart}} – {{displayedEnd}} sur {{numRows}} lignes",
       "sparkline": {
-        "no-data": ""
+        "no-data": "aucune donnée"
       }
     },
     "tags": {
@@ -8735,7 +8736,7 @@
     },
     "tags-input": {
       "add": "Ajouter",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Nouvelle étiquette (appuyez sur Entrée pour ajouter)",
       "remove": "Supprimer la balise : {{name}}"
     },
     "time-sync-button": {
@@ -8828,14 +8829,14 @@
       "footer-add-annotation": "Ajouter une annotation",
       "footer-click-to-action": "Cliquez pour {{actionTitle}}",
       "footer-click-to-navigate": "Cliquez pour ouvrir {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Filtrer par « {{value}} »",
       "timestamp": "Horodatage"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Par défaut",
+      "weekStarts-label-monday": "Lundi",
+      "weekStarts-label-saturday": "Samedi",
+      "weekStarts-label-sunday": "Dimanche"
     }
   },
   "graph": {
@@ -9215,8 +9216,8 @@
       "title-create-library-panel": "Créer un panneau Bibliothèque"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Modifier",
+      "confirmText-replace": "Remplacer"
     },
     "confirm": {
       "delete-panel": "Voulez-vous vraiment supprimer ce panneau ?"
@@ -9241,7 +9242,7 @@
       "usage-count_other": "Utilisé sur {{count}} tableaux de bord"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Rechercher par nom, description ou nom de dossier"
     },
     "loading-indicator": {
       "loading-library-panel": "Chargement du panneau de la bibliothèque..."
@@ -9451,7 +9452,7 @@
       "close": "Fermer les détails du log",
       "copy-shortlink": "Copier le lien court",
       "copy-to-clipboard": "Copier dans le presse-papiers",
-      "displayed-fields-section": "",
+      "displayed-fields-section": "Organiser les champs affichés",
       "fields": {
         "adhoc-statistics": "Statistiques ponctuelles",
         "copy-value-to-clipboard": "Copier la valeur dans le presse-papiers",
@@ -9464,25 +9465,25 @@
       },
       "fields-section": "Champs",
       "hide-log-line": "Masquer cette ligne de log",
-      "inline-mode": "",
+      "inline-mode": "Afficher en ligne",
       "links-section": "Liens",
-      "log-line-field": "",
+      "log-line-field": "Ligne de journal",
       "log-line-section": "Ligne de log",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
+      "move-displayed-field-down": "Déplacer vers le bas",
+      "move-displayed-field-up": "Déplacer vers le haut",
       "no-details": "Aucun champ à afficher.",
-      "open-assistant": "",
+      "open-assistant": "Expliquer cette ligne de journal dans Assistant",
       "pin-line": "Épingler ce log",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "remove-displayed-field": "Supprimer le champ",
+      "remove-log": "Supprimer le journal",
+      "scroll-to-logline": "Faire défiler jusqu’à la ligne du journal",
       "search": {
         "no-results": "Aucun résultat à afficher."
       },
       "search-placeholder": "Rechercher des noms de champs ou des valeurs",
       "show-context": "Afficher le contexte",
       "show-log-line": "Afficher la ligne de log",
-      "sidebar-mode": "",
+      "sidebar-mode": "Ancrer à droite",
       "unpin-line": "Désépingler ce log"
     },
     "log-line-menu": {
@@ -9490,9 +9491,9 @@
       "copy-log": "Copier la ligne de journal",
       "hide-details": "Afficher les détails du journal",
       "icon-label": "Menu du journal",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Ligne de journal",
+      "log-line-explainer": "Expliquer brièvement cette ligne de journal",
+      "open-assistant": "Expliquer cette ligne de journal dans Assistant",
       "pin-to-outline": "Épingler le journal",
       "show-context": "Afficher le contexte",
       "show-details": "Masquer les détails du journal",
@@ -9598,10 +9599,10 @@
     },
     "name-common-labels": "Étiquettes communes",
     "name-deduplication": "Déduplication",
-    "name-details-mode": "",
+    "name-details-mode": "Mode du panneau Détails du journal",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "En ligne",
+      "label-sidebar": "Barre latérale"
     },
     "name-enable-infinite-scrolling": "Activer le défilement infini",
     "name-enable-log-details": "Activer les détails du log",
@@ -9698,8 +9699,8 @@
       "updated-on": "Mise à niveau le"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Voulez-vous vraiment supprimer « {{snapshotToRemove}} » ?",
+      "confirmText-delete": "Supprimer",
       "title-delete": "Supprimer"
     },
     "unthemed-dashboard-import": {
@@ -9711,14 +9712,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "Le nom est requis",
+      "message-reserved-name": "Ce nom est réservé et ne peut pas être utilisé pour un dossier.",
+      "message-same-name": "Un tableau de bord ou un dossier portant le même nom existe déjà",
+      "message-same-name-general": "Un dossier ou un tableau de bord dans le dossier général portant le même nom existe déjà"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Aucune option trouvée"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9868,8 +9869,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Nombre maximal de groupes de règles d’alerte atteint : supprimez certains groupes ou mettez à niveau votre formule et réessayez.",
+        "alert-rules-quota-reached": "Nombre maximal de règles d’alerte atteint : supprimez certaines règles ou mettez à niveau votre formule et réessayez.",
         "dashboard-already-managed": "Le tableau de bord est déjà mis en service et géré par Grafana dans l'instance cloud. Nous vous recommandons d'utiliser le tableau de bord mis en service à l'avenir. Si vous souhaitez toujours copier le tableau de bord dans l'instance cloud, modifiez l'ID du tableau de bord dans le JSON du tableau de bord, puis enregistrez un nouvel instantané et téléchargez à nouveau.",
         "datasource-already-managed": "La source de données est déjà mise en service et gérée par Grafana dans l'instance cloud. S'il s'agit d'une ressource différente, définissez un autre UID et réessayez.",
         "datasource-invalid-url": "Il y a une source de données dont l'URL n'est pas valide. Fournissez une URL valide et réessayez.",
@@ -10339,7 +10340,7 @@
     "invite-user": {
       "invite-button": "Inviter",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Inviter un utilisateur"
     },
     "item": {
       "add-bookmark": "Ajouter aux signets",
@@ -10562,7 +10563,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Aucune organisation trouvée",
     "select-placeholder": "Sélectionner l’organisation"
   },
   "page": {
@@ -10785,7 +10786,7 @@
         "permission": "Vous n’avez pas l’autorisation requise pour consulter cette page.",
         "title-access-denied": "Accès refusé"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Échec du chargement du plugin",
       "no-root-app-page-component-found": "Aucun composant de page d’application racine trouvé"
     },
     "browse": {
@@ -10829,7 +10830,7 @@
         "update-status-text": "mise à jour des plugins"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Voulez-vous vraiment rétrograder vers la version {{version}} ? Ce n’est normalement pas recommandé",
         "downgrade-confirm": "Rétrograder de version",
         "downgrade-title": "Rétrograder à la version précédente du plugin"
       }
@@ -10884,8 +10885,8 @@
       "message": "Aucune extension trouvée"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Consultez la console pour plus de détails sur l’erreur.",
+      "extension-error-alert-title": "Échec du chargement de l’extension : « {{pluginId}}/{{extensionTitle}} »"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10922,8 +10923,8 @@
     "install-controls-button": {
       "title-uninstall-modal": "Désinstaller {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Voulez-vous vraiment désinstaller ce plugin ?",
+        "confirmText-confirm": "Confirmer"
       }
     },
     "install-controls-warning": {
@@ -10941,6 +10942,9 @@
       "label-plugin-id": "ID du plugin",
       "label-severity": "Gravité"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Ce plugin est introuvable. Veuillez vérifier que l’URL est correcte ou <1></1>accédez au <3>catalogue de plugins</3>.",
       "title-plugin-not-found": "Plugin introuvable"
@@ -11097,29 +11101,29 @@
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Cette ressource est en retard par rapport à la branche dans {{repoType}}.",
+      "not-saved": "Les autres utilisateurs Grafana de votre entreprise verront toujours la version actuelle enregistrée sur la branche par défaut configurée, jusqu’à ce que cette branche soit fusionnée",
+      "open-in-repo-button": "Ouvrir dans {{repoType}}",
+      "open-pull-request-in-repo": "Ouvrir une demande de tirage dans {{repoType}}",
+      "view-in-repo-button": "Affichez-la dans {{repoType}} pour consulter les dernières modifications.",
+      "view-pull-request-in-repo": "Afficher la demande de tirage dans {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "Une nouvelle ressource a été créée dans une branche dans {{repoType}}.",
+    "title-loaded-pull-request-in-repo": "Cette ressource est chargée depuis la branche que vous venez de créer dans {{repoType}} et elle est uniquement visible pour vous"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Ressource enregistrée avec succès",
+  "provisioned-resource-request-handler-dashboard": "Tableau de bord enregistré avec succès",
+  "provisioned-resource-request-handler-folder": "Dossier créé avec succès",
   "provisioning": {
     "banner": {
       "message": "Cette fonctionnalité est actuellement en cours de développement. Pour une expérience optimale et les dernières améliorations, nous vous recommandons d’utiliser la <2>compilation nocturne</2> de Grafana."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "La branche à utiliser pour l’approvisionnement",
+      "branch-label": "Branche",
+      "branch-required": "La branche est requise",
+      "path-description": "Chemin optionnel vers un sous-dossier dans le dépôt",
+      "path-label": "Chemin",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11128,18 +11132,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Permet aux utilisateurs de choisir s’ils souhaitent ouvrir une demande de tirage lors de l’enregistrement des modifications. Si le dépôt n’autorise pas les modifications directes sur la branche principale, une demande de tirage peut tout de même être nécessaire.",
+      "pr-workflow-label": "Activer l’option de demande de tirage à l’enregistrement",
+      "token-description": "Mot de passe d’application Bitbucket avec autorisations sur le dépôt",
+      "token-label": "Mot de passe d’application",
+      "token-required": "Le token Bitbucket est requis",
+      "token-user-description": "Le nom d’utilisateur qui sera utilisé pour accéder au dépôt avec le mot de passe d’application",
+      "token-user-label": "Nom d’utilisateur",
+      "token-user-required": "Le nom d’utilisateur est requis",
+      "url-description": "L’URL du dépôt Bitbucket",
+      "url-label": "URL du dépôt",
+      "url-pattern": "Doit être une URL de dépôt Bitbucket valide",
+      "url-required": "L’URL du dépôt est requise"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Ajoutez un nom clair pour cette connexion de référentiel",
@@ -11150,12 +11154,12 @@
       "label-display-name": "Pseudo",
       "placeholder-my-repository-connection": "Ma connexion au référentiel",
       "text-loading-resource-information": "Chargement des informations sur les ressources...",
-      "dashboards-count_one": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} tableau de bord",
+      "dashboards-count_other": "{{count}} tableau de bord",
       "files-count_one": "{{count}} fichiers",
       "files-count_other": "{{count}} fichiers",
-      "folders-count_one": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} dossier",
+      "folders-count_other": "{{count}} dossier"
     },
     "check-repository": {
       "check": "Vérifier"
@@ -11229,7 +11233,7 @@
       "title-instant-updates-requests-webhooks": "Mises à jour instantanées et demandes de fusion avec les webhooks.",
       "title-visual-previews-in-pull-requests": "Aperçus visuels dans les demandes de fusion avec rendu d’image"
     },
-    "error-title-default": "",
+    "error-title-default": "Erreur",
     "expanded-row": {
       "job-specification": "Description de la mission",
       "summary": "Synthèse"
@@ -11238,8 +11242,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Configurer les basculements de fonctionnalité requis"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Gérez les tableaux de bord as code sur Git et approvisionnez automatiquement les mises à jour",
+      "manage-your-dashboards-with-remote-provisioning": "Commencer avec Git Sync",
       "store-dashboards-in-version-controlled-storage": "Stockez les tableaux de bord dans un espace de stockage à gestion des versions pour une meilleure organisation et un meilleur suivi de l’historique"
     },
     "file-history-page": {
@@ -11260,16 +11264,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Ajoute un aperçu des images des modifications apportées au tableau de bord dans les demandes de fusion. Les images de vos tableaux de bord Grafana seront partagées dans votre référentiel Git et visibles par toute personne ayant accès au référentiel.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Créer des liens de prévisualisation pour les demandes de tirage",
       "description-image-rendering": "Nécessite un rendu d’image. <2>Configurer le rendu d’image</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(nécessite le <2>rendu d’images</2> et l’activation de l’accès public)",
       "description-read-only": "Les ressources ne peuvent pas être modifiées via Grafana.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Fréquence de synchronisation des changements depuis le dépôt",
+      "error-sync-interval-required": "L’intervalle de synchronisation est requis",
       "label-enable-previews": "Activer les aperçus du tableau de bord dans les demandes de fusion",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Générer des aperçus de tableaux de bord",
       "label-read-only": "Lecture seule",
-      "label-sync-interval": ""
+      "label-sync-interval": "Intervalle de synchronisation (secondes)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Aucun résultat ne correspond à votre requête",
@@ -11301,46 +11305,46 @@
       "subtitle-provisioning-feature": "Afficher et gérer vos connexions de mise en service"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "La branche à utiliser pour l’approvisionnement",
+      "branch-label": "Branche",
+      "branch-required": "La branche est requise",
+      "path-description": "Chemin optionnel vers un sous-dossier dans le dépôt",
+      "path-label": "Chemin",
+      "pr-workflow-description": "Permet aux utilisateurs de choisir s’ils souhaitent ouvrir une demande de tirage lors de l’enregistrement des modifications. Si le dépôt n’autorise pas les modifications directes sur la branche principale, une demande de tirage peut tout de même être nécessaire.",
+      "pr-workflow-label": "Activer l’option de demande de tirage à l’enregistrement",
+      "token-description": "Token d’accès ou mot de passe du dépôt Git",
+      "token-label": "Token d’accès",
+      "token-required": "Le token Git est requis",
+      "token-user-description": "Le nom d’utilisateur qui sera utilisé pour accéder au dépôt avec le token d’accès",
+      "token-user-label": "Nom d’utilisateur",
+      "token-user-required": "Le nom d’utilisateur est requis",
+      "url-description": "L’URL du dépôt Git",
+      "url-label": "URL du dépôt",
+      "url-pattern": "Doit être une URL de dépôt Git valide",
+      "url-required": "L’URL du dépôt est requise"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "La branche à utiliser pour l’approvisionnement",
+      "branch-label": "Branche",
+      "branch-required": "La branche est requise",
+      "path-description": "Chemin optionnel vers un sous-dossier dans le dépôt",
+      "path-label": "Chemin",
+      "pr-workflow-description": "Permet aux utilisateurs de choisir s’ils souhaitent ouvrir une demande de tirage lors de l’enregistrement des modifications. Si le dépôt n’autorise pas les modifications directes sur la branche principale, une demande de tirage peut tout de même être nécessaire.",
+      "pr-workflow-label": "Activer l’option de demande de tirage à l’enregistrement",
+      "token-description": "Token d’accès personnel GitHub avec autorisations sur le dépôt",
+      "token-label": "Token d’accès personnel",
+      "token-required": "Le token GitHub est requis",
+      "url-description": "L’URL du dépôt GitHub",
+      "url-label": "URL du dépôt",
+      "url-pattern": "Doit être une URL de dépôt GitHub valide",
+      "url-required": "L’URL du dépôt est requise"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "La branche à utiliser pour l’approvisionnement",
+      "branch-label": "Branche",
+      "branch-required": "La branche est requise",
+      "path-description": "Chemin optionnel vers un sous-dossier dans le dépôt",
+      "path-label": "Chemin",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11349,15 +11353,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Permet aux utilisateurs de choisir s’ils souhaitent ouvrir une demande de fusion à l’enregistrement. Si le dépôt n’autorise pas les modifications directes sur la branche principale, une demande de fusion peut tout de même être nécessaire.",
+      "pr-workflow-label": "Activer l’option de demande de fusion à l’enregistrement",
+      "token-description": "Token d’accès au projet GitLab avec autorisations sur le dépôt",
+      "token-label": "Token d’accès au projet",
+      "token-required": "Le token GitLab est requis",
+      "url-description": "L’URL du dépôt GitLab",
+      "url-label": "URL du dépôt",
+      "url-pattern": "Doit être une URL de dépôt GitLab valide",
+      "url-required": "L’URL du dépôt est requise"
     },
     "history-view": {
       "not-found": "Introuvable"
@@ -11385,18 +11389,18 @@
       "starting": "Démarrage...",
       "status": {
         "title-error-running-job": "Erreur lors de l’exécution de la mission",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Tâche terminée avec succès",
+        "title-warning-running-job": "Tâche terminée avec des avertissements"
       },
       "summary": "Synthèse",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Erreur lors de la récupération de la tâche active"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Chemin du système de fichiers local vers le dépôt",
+      "path-label": "Chemin du dépôt",
+      "path-required": "Le chemin du dépôt est requis"
     },
     "mode-options": {
       "folder": {
@@ -11422,7 +11426,7 @@
     },
     "repository-actions": {
       "settings": "Paramètres",
-      "source-code": ""
+      "source-code": "Code source"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11488,22 +11492,22 @@
       "title-queued-for-deletion": "Mis en attente pour suppression"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Choisir un fournisseur :",
+      "configure-file": "Configurer l’approvisionnement par fichier",
+      "configure-with-provider": "Configurer avec {{ provider }}",
+      "provider-not-listed": "Si votre fournisseur ne figure pas dans la liste :"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Se connecter aux dépôts Bitbucket",
+      "github": "GitHub",
+      "github-description": "Se connecter aux dépôts GitHub",
+      "gitlab": "GitLab",
+      "gitlab-description": "Se connecter aux dépôts GitLab",
+      "local": "Local",
+      "local-description": "Configurer l’approvisionnement par fichier",
+      "pure-git": "Pure Git",
+      "pure-git-description": "Se connecter à un quelconque dépôt Git"
     },
     "resource-view": {
       "base": "Base",
@@ -11534,11 +11538,11 @@
       "label-current-step": "Étape actuelle",
       "label-pending-step": "Étape en attente"
     },
-    "success-title-default": "",
+    "success-title-default": "Succès",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Échec du démarrage de la tâche",
+      "error-no-repository-name": "Nom du dépôt non fourni",
+      "error-starting-job": "Erreur lors du démarrage de la tâche"
     },
     "sync-repository": {
       "body-edit-configuration": "Modifier la configuration",
@@ -11566,7 +11570,7 @@
       "go-to": "Accéder à",
       "make-sure": "Assurez-vous d’inclure ces autorisations"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Avertissement",
     "wizard": {
       "alert-point-1": "Les ressources ne pourront pas être créées, modifiées ou supprimées pendant ce processus. Lors de la dernière étape, elles disparaîtront.",
       "alert-point-2": "Une fois la mise en service terminée, les ressources réapparaîtront et seront gérées via un stockage externe.",
@@ -11576,10 +11580,10 @@
       "button-next": "Terminer",
       "button-start": "Commencer la synchronisation",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Cette action supprimera la configuration du dépôt et vous perdrez toutes vos modifications. Voulez-vous vraiment annuler vos modifications ?",
+        "confirm": "Oui, annuler",
+        "dismiss": "Continuer",
+        "title": "Annuler la configuration du dépôt ?"
       },
       "step-bootstrap": "Choisir ce qui doit être synchronisé",
       "step-connect": "Connecter",
@@ -11595,7 +11599,7 @@
     "wizard-content": {
       "button-cancel": "Annuler",
       "button-cancelling": "Annulation...",
-      "button-previous": "",
+      "button-previous": "Précédent",
       "button-submitting": "Envoi…",
       "error-instance-repository-exists": "Le référentiel d’instances existe déjà"
     }
@@ -11996,7 +12000,7 @@
         "recommended": "Recommandé",
         "results": "Résultats"
       },
-      "search": ""
+      "search": "Rechercher {{parentTitle}}"
     }
   },
   "search": {
@@ -12077,7 +12081,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Aucun compte de service trouvé",
     "select-aria-label": "Sélecteur de compte de service",
     "select-placeholder": "Commencez à saisir du texte pour rechercher des comptes de service"
   },
@@ -12123,10 +12127,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Ajouter un jeton de compte de service",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Voulez-vous vraiment supprimer ce compte de service ?",
+      "body-disable-service-account": "Voulez-vous vraiment désactiver ce compte de service ?",
+      "confirmText-delete-service-account": "Supprimer le compte de service",
+      "confirmText-disable-service-account": "Désactiver le compte de service",
       "delete-service-account": "Supprimer le compte de service",
       "disable-service-account": "Désactiver le compte de service",
       "enable-service-account": "Activer le compte de service",
@@ -12153,7 +12157,7 @@
       "used-by": "Utilisé par"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Enregistrer",
       "edit": "Modifier"
     },
     "service-account-role-row": {
@@ -12167,16 +12171,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Ajouter un compte de service",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Voulez-vous vraiment supprimer {{serviceAccountName}} ?",
+      "body-disable-service-account": "Voulez-vous vraiment désactiver « {{accountToDisable}} » ?",
+      "confirmText-delete": "Supprimer",
+      "confirmText-disable-service-account": "Désactiver le compte de service",
       "placeholder-search-service-account-by-name": "Rechercher un compte de service par son nom",
       "sub-title": "Les comptes de service et leurs jetons peuvent être utilisés pour s’authentifier auprès de l’API Grafana. Pour en savoir plus, consultez notre <2>documentation.</2>",
       "title-delete-service-account": "Supprimer le compte de service",
       "title-disable-service-account": "Désactiver le compte de service",
-      "body-delete_one": "",
-      "body-delete_other": ""
+      "body-delete_one": "Voulez-vous vraiment supprimer {{serviceAccountName}} et les {{count}} tokens associés ?",
+      "body-delete_other": "Voulez-vous vraiment supprimer {{serviceAccountName}} et les {{count}} tokens associés ?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Ce jeton a expiré",
@@ -12190,7 +12194,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Exporter au format image",
       "export-json-title": "Exporter en tant que JSON",
       "share-externally-title": "Partager en externe",
       "share-internally-title": "Partager en interne",
@@ -12227,17 +12231,17 @@
       "view-button-yaml": "Afficher le fichier YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Actions d’exportation d’image",
+      "cancel-button": "Annuler",
+      "download-button": "Télécharger l’image",
+      "error-title": "Échec de la génération de l’image",
+      "generate-button": "Générer une image",
+      "generating": "Génération de l’image en cours…",
+      "info-text": "Enregistrer ce tableau de bord en tant qu’image",
+      "preview": "Aperçu",
+      "preview-aria": "Aperçu de l’image générée",
+      "preview-region": "Aperçu de l’image",
+      "title": "Exporter au format image"
     },
     "library": {
       "info": "Créer un panneau de bibliothèque."
@@ -12247,7 +12251,7 @@
       "info-text": "Créez un lien direct vers ce tableau de bord ou ce panneau, personnalisé avec les options ci-dessous.",
       "link-url": "Lien URL",
       "render-alert": "Plugin de rendu d'image non installé",
-      "render-instructions": "",
+      "render-instructions": "Pour afficher une image, vous devez installer le <2>plugin de rendu d’images Grafana</2>. Veuillez contacter votre administrateur Grafana pour installer le plugin.",
       "rendered-image": "Lien direct vers l'image dont il faut améliorer le rendu",
       "save-alert": "Le tableau de bord n'est pas enregistré",
       "save-dashboard": "Pour améliorer le rendu d'une image de panneau, vous devez d'abord enregistrer le tableau de bord.",
@@ -12315,11 +12319,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Enregistrez le tableau de bord pour activer la génération d’image",
+    "download-disabled-help": "Générez d’abord une image pour activer le téléchargement",
+    "error-title": "Échec de la génération de l’image",
     "form": {
-      "label": ""
+      "label": "Paramètres d’image du panneau"
     },
     "preview": {
       "title": "Aperçu du panneau"
@@ -12634,17 +12638,17 @@
       "label-small": "Petit"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Actions",
+      "auto": "Auto",
+      "color-background": "Arrière-plan coloré",
+      "color-text": "Texte coloré",
+      "data-links": "Liens de données",
+      "gauge": "Jauge",
+      "image": "Image",
+      "json": "Vue JSON",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Étiquette",
+      "sparkline": "Graphique sparkline"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "Si cette option est sélectionnée, toute la ligne sera colorée comme cette cellule.",
@@ -12673,7 +12677,7 @@
     "description-count-rows": "Afficher un seul total pour l’ensemble des lignes de données",
     "description-fields": "Sélectionner les champs à utiliser pour le calcul",
     "description-min-column-width": "La largeur minimale pour le redimensionnement automatique des colonnes",
-    "description-wrap-header-text": "",
+    "description-wrap-header-text": "Active le retour à la ligne automatique pour les en-têtes de colonne",
     "image-cell-options-editor": {
       "description-alt-text": "Texte alternatif qui sera affiché si une image ne peut pas être affichée ou pour les utilisateurs qui utilisent un lecteur d’écran",
       "description-title-text": "Texte qui sera affiché lorsque l’image est survolée par un curseur",
@@ -12757,7 +12761,7 @@
     "tag-option-label": "Option de balise"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Aucune équipe trouvée",
     "select-aria-label": "Sélecteur d’équipe",
     "select-placeholder": "Sélectionner une équipe"
   },
@@ -13061,15 +13065,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Opération binaire",
+          "reduce-row": "Réduire la ligne",
+          "row-index": "Index de la ligne",
+          "unary-operation": "Opération unaire"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Fonctions cumulatives",
+        "window-functions": "Fonctions de fenêtre"
       },
       "label-alias": "Pseudonyme",
       "label-mode": "Mode",
@@ -13087,9 +13091,9 @@
       "label-name": "Nom",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Copier le nom de l’élément dans le nom du champ",
+          "ignore-the-frame-name": "Ignorer le nom de l’élément",
+          "label-frame": "Ajouter une étiquette avec le nom de l’élément"
         }
       },
       "placeholder-frame": "Cadre"
@@ -13102,9 +13106,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Ajouter un transformateur de type de champ de conversion",
       "aria-label-remove-convert-field-type-transformer": "Supprimer le transformateur de type de champ de conversion",
-      "convert-field-type": "",
+      "convert-field-type": "Convertir le type de champ",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Convertissez un champ vers un type de champ spécifique."
       },
       "label": {
         "browser": "Navigateur",
@@ -13117,11 +13121,11 @@
       "label-join-with": "Unir avec",
       "label-set-timezone": "Définir le fuseau horaire",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Convertir le type de champ"
       },
       "placeholder-type": "Type",
       "tags": {
-        "format-field": ""
+        "format-field": "Formater le champ"
       },
       "tooltip-explicit-separator-joining-array-values": "Utiliser un séparateur explicite lorsque de l’association des valeurs de tableau",
       "tooltip-input-format": "Spécifiez le format du champ de saisie afin que Grafana puisse analyser correctement la chaîne de date.",
@@ -13147,13 +13151,13 @@
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Combinez tous les champs en une seule série."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Concaténer les champs"
         },
         "tags": {
-          "combine": ""
+          "combine": "Combiner"
         }
       }
     },
@@ -13168,11 +13172,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Extrayez des champs à partir du contenu (JSON, étiquettes, etc.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Sélectionner un champ"
         }
       },
       "label-delimiter": "Délimiteur",
@@ -13181,7 +13185,7 @@
       "label-replace-all-fields": "Remplacer tous les champs",
       "label-source": "Source",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Extraire des champs"
       },
       "placeholder-auto": "Auto",
       "placeholder-select-delimiter": "Sélectionner le délimiteur...",
@@ -13192,20 +13196,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Utilisez la valeur d’un champ pour rechercher des pays, des États ou des aéroports."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Aucun champ de texte trouvé"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Sélectionner un champ de texte"
         }
       },
       "label-field": "Champ",
       "label-lookup": "Recherche",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Rechercher des champs à partir d’une ressource"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13216,23 +13220,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Supprimez des parties des résultats de requête à l’aide d’un motif d’expression régulière."
       },
       "label-from-variable": "À partir de la variable",
       "label-identifier": "Identifiant",
       "label-use-variable": "Utiliser la variable",
       "label-variable": "Variable",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Filtrer les champs par nom"
       },
       "placeholder-regular-expression-pattern": "Modèle d’expression régulière"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Supprimer des lignes de données selon la requête d’origine"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Filtrer les données par requête"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13246,33 +13250,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Ajouter une condition",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Supprimez des lignes des résultats de requête en fonction de filtres définis par l’utilisateur."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Correspond à tous",
+          "match-any": "Correspond à un"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Exclure",
+          "include": "Inclure"
         }
       },
       "label-conditions": "Conditions",
       "label-filter-type": "Type de filtre",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Filtrer les données par valeurs"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Aucun champ de texte trouvé"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Sélectionner un champ de texte"
         }
       },
       "label-field": "Champ",
@@ -13281,10 +13285,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Manipulez le formatage des champs de type chaîne de caractères."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Formater la chaîne de caractères"
       }
     },
     "format-time-transfomer-editor": {
@@ -13296,66 +13300,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Définir le format de sortie d’un champ temporel"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Formater l’heure"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Utilisez les valeurs des lignes pour calculer un nouveau champ."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Ajouter un champ à partir d’un calcul"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Définissez l’unité, le minimum, le maximum et plus encore."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Configurer à partir des résultats de la requête"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Générez des données de carte thermique à partir des données sources."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Créer une carte thermique"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Aplatissez les résultats étiquetés dans un tableau lié par étiquettes."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Joindre par étiquettes"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Divisez un ensemble de données à une seule trame en plusieurs séries."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Partitionner par valeurs"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Convertissez chaque ligne en un champ avec configuration dynamique."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Convertir les lignes en champs"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Appliquez des opérations spatiales aux résultats de la requête."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Opérations spatiales"
       }
     },
     "get-timezone-options": {
@@ -13387,8 +13391,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Calculer",
+          "group-by": "Regrouper par"
         }
       },
       "placeholder-ignored": "Ignoré",
@@ -13396,42 +13400,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Regroupez les données selon la valeur d’un champ et créez des données agrégées."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Regrouper par"
       },
       "title-calc-alert": "Les calculs n’auront aucun effet si aucun champ n’est groupé"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Regroupez les données selon la valeur d’un champ et créez des tableaux imbriqués avec les données regroupées."
       },
       "description-show-field-names": "Si activés, les tableaux imbriqués afficheront les noms de champs comme en-tête de tableau",
       "label-show-field-names-in-nested-tables": "Afficher les noms de champs dans les tableaux imbriqués",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Regrouper en tableaux imbriqués"
       },
       "title-calc-alert": "Les calculs n’auront aucun effet si aucun champ n’est groupé."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Résumez et réorganisez les données à partir de trois champs."
       },
       "label-cell-value": "Valeur de cellule",
       "label-column": "Colonne",
       "label-empty-value": "Valeur nulle",
       "label-row": "Ligne",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Regrouper en matrice"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Calculez un histogramme à partir des données en entrée."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Histogramme"
       },
       "placeholder-auto": "Auto",
       "placeholder-default": "Par défaut : 30",
@@ -13443,14 +13447,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Combinez les lignes de 2 tables ou plus à partir d’un champ commun."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Joindre par champ"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Champ requis",
       "info": {
         "input-contain-labels": "L’entrée ne contient aucune étiquette",
         "no-input-or-labels-found": "Aucune entrée (ou étiquette) trouvée",
@@ -13474,8 +13478,8 @@
       "label-value-field-name": "Nom du champ de valeur",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Colonnes",
+          "rows": "Lignes"
         }
       },
       "placeholder-optional-select-label": "(Facultatif) Sélectionner l’étiquette",
@@ -13483,18 +13487,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Regroupez les séries par heure et renvoyez les étiquettes ou balises sous forme de champs."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Convertir les étiquettes en champs"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Limitez le nombre d’éléments affichés."
       },
       "name": {
-        "limit": ""
+        "limit": "Limiter"
       },
       "placeholder-value-or-variable": "Valeur ou variable"
     },
@@ -13507,11 +13511,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Fusionnez plusieurs séries. Les valeurs seront combinées en une seule ligne."
       },
       "merge-effect-applied-single-frame": "La fusion n’a aucun effet lorsqu’elle est appliquée sur une seule image.",
       "name": {
-        "merge": ""
+        "merge": "Fusionner les séries/tableaux"
       }
     },
     "multi-info": {
@@ -13523,14 +13527,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Réorganisez, masquez ou renommez les champs."
       },
       "field-order": "Ordre des champs",
       "field-order-auto": "Auto",
       "field-order-manual": "Manuel",
       "first-frame-warning": "L’organisation des champs ne fonctionne qu’avec un seul cadre. Envisagez d’appliquer une transformation d’union ou de filtrer d’abord les données d’entrée.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Organiser les champs par nom"
       }
     },
     "partion-by-values-editor": {
@@ -13558,10 +13562,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Convertissez les trames de données de format large en format long."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Préparer les séries chronologiques"
       }
     },
     "prepare-time-series-editor": {
@@ -13569,26 +13573,26 @@
       "label-info": "Infos",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Convertir chaque trame en format long"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Série chronologique longue"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Crée une nouvelle trame pour chaque paire temps/valeur"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Série chronologique multi-trames"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Crée une seule trame combinée par temps"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Séries chronologiques larges"
         }
       }
     },
@@ -13603,7 +13607,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Réduisent toutes les lignes ou points de données à une seule valeur (par exemple, max., moyenne)."
       },
       "label-calculations": "Calculs",
       "label-include-time": "Inclure l’heure",
@@ -13620,7 +13624,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Réduire"
       },
       "placeholder-choose-stat": "Choisir la statistique"
     },
@@ -13630,18 +13634,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Créez une nouvelle trame contenant des valeurs prédites par un modèle statistique."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Tendance"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Cubique",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Quadratique",
         "quartic": "Quartique",
-        "quintic": "Quintique"
+        "quintic": "Quintique",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Degré",
       "label-model-type": "Type de modèle",
@@ -13656,16 +13665,17 @@
       },
       "regression": "régression",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Analyse de régression"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Nombre de points X, Y à prédire"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Renommez des parties des résultats de la requête à l’aide d’une expression régulière et d’un modèle de remplacement."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Renommer les champs avec une expression régulière"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13679,33 +13689,33 @@
       "label-mode": "Mode",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Combinez les données de deux tables lorsque des valeurs correspondent dans un champ commun aux deux.",
+          "join-on-a-field": "Joignez sur une valeur de champ avec des doublons. Jointure externe non performante à utiliser de préférence avec des données tabulaires (type SQL).",
+          "keep-all-rows": "Conservez toutes les lignes de chaque table contenant une valeur. Joignez sur des valeurs de champ distinctes. Performant et recommandé pour les séries chronologiques."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Interne",
+          "outer-tabular": "Externe (tabulaire)",
+          "outer-time-series": "Externe (séries chronologiques)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Fusionnez plusieurs séries. Retournez le temps, la métrique et les valeurs sous forme de ligne."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Convertir la série en lignes"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Triez les champs dans une trame."
       },
       "label-field": "Champ",
       "label-reverse": "Inverser",
       "name": {
-        "sort-by": ""
+        "sort-by": "Trier par"
       },
       "placeholder-select-field": "Sélectionner le champ"
     },
@@ -13728,13 +13738,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Convertissez les données de séries chronologiques en lignes de tableau pour les afficher sous forme tabulaire ou en graphique sparkline."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "La transformation Série chronologique en tableau nécessite au moins une trame de série chronologique. Vous n’en avez actuellement aucune."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Convertir la série chronologique en tableau"
       }
     },
     "time-series-table-transform-editor": {
@@ -13752,15 +13762,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Transposez la trame de données."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Transposer"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Tableau croisé",
+        "transform": "Transformer",
+        "translate": "Traduire"
       }
     },
     "unary-operation-editor": {
@@ -13769,13 +13779,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Calculer de nouveaux champs",
+        "combine": "Combiner",
+        "create-new-visualization": "Créer une nouvelle visualisation",
+        "filter": "Filtrer",
+        "perform-spatial-operations": "Effectuer des opérations spatiales",
+        "reformat": "Reformater",
+        "reorder-and-rename": "Réorganiser et renommer"
       },
       "special-value-options": {
         "description": {
@@ -13846,7 +13856,7 @@
     "title": "Organisations"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Aucun utilisateur trouvé",
     "select-aria-label": "Sélecteur d’utilisateur",
     "select-placeholder": "Commencez à saisir du texte pour rechercher un utilisateur"
   },
@@ -13932,8 +13942,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Voulez-vous vraiment supprimer la variable « {{variableToDelete}} » ?",
+      "confirmText-delete": "Supprimer",
       "title-delete-variable": "Supprimer la variable"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13983,33 +13993,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Comment trier les valeurs de cette variable",
-      "name-sort": "",
+      "name-sort": "Trier",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Par ordre alphabétique (croissant)",
+          "alphabetical-caseinsensitive-asc": "Par ordre alphabétique (insensible à la casse, croissant)",
+          "alphabetical-caseinsensitive-desc": "Par ordre alphabétique (insensible à la casse, décroissant)",
+          "alphabetical-desc": "Par ordre alphabétique (décroissant)",
+          "disabled": "Désactivé",
+          "natural-asc": "Naturel (croissant)",
+          "natural-desc": "Naturel (décroissant)",
+          "numerical-asc": "Numérique (croissant)",
+          "numerical-desc": "Numérique (décroissant)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Ajouter une option",
+      "description": "Ajouter des options personnalisées en complément des résultats de la requête",
+      "label-placeholder": "afficher l’étiquette",
+      "remove-option-button-label": "Supprimer une option",
+      "value-placeholder": "valeur, chaîne de caractères vide par défaut"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Comment trier les options statiques avec les résultats de la requête"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Valeur par défaut",
       "placeholder-default-value-if-any": "valeur par défaut, le cas échéant",
       "text-options": "Options de texte"
     },
@@ -14038,8 +14048,8 @@
       "description-optional-display-name": "Nom d’affichage facultatif",
       "description-template-variable-characters": "Le nom de la variable du modèle. (50 caractères max)",
       "general": "Général",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Étiquette",
+      "name-name": "Nom",
       "placeholder-descriptive-text": "Texte de description",
       "placeholder-label-name": "Nom de l’étiquette",
       "placeholder-variable-name": "Nom de la variable",
@@ -14055,13 +14065,13 @@
       "tooltip-remove-variable": "Supprimer la variable"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Description"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Basculer toutes les valeurs"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Sélectionner le type de variable"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Afficher les usages"
diff --git a/public/locales/hu-HU/grafana.json b/public/locales/hu-HU/grafana.json
index 759bf87701b..b80b0776e1e 100644
--- a/public/locales/hu-HU/grafana.json
+++ b/public/locales/hu-HU/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Egyes funkciók stabilak (GA), és alapértelmezés szerint engedélyezve vannak, míg mások jelenleg előzetes béta fázisban vannak, és korai bevezetéshez állnak rendelkezésre.",
       "confirm-modal-body-2": "Javasoljuk, hogy a módosítások végrehajtása előtt ismerje meg az egyes funkciók módosításának következményeit.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Beállítások mentése",
       "get-stage-cell": {
         "beta": "Béta",
         "content-general-availability": "Általános elérhetőség",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Szervezet törlése",
-      "confirmText-delete": "",
+      "confirmText-delete": "Törlés",
       "title-delete": "Törlés"
     },
     "anon-users": {
       "not-found": "Nem található névtelen felhasználó."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Biztosan ki szeretne jelentkezni minden eszközről?",
+      "confirmText-confirm-logout": "Kijelentkezés megerősítése",
+      "confirmText-force-logout": "Kényszerített kijelentkezés",
       "title-force-logout-from-all-devices": "Kijelentkezés kényszerítése minden eszközön"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Mentés"
     },
     "edit-org": {
       "access-denied": "Nincs engedélye a felhasználók megtekintésére ebben a szervezetben. A szervezet frissítéséhez forduljon a kiszolgáló rendszergazdájához.",
@@ -216,11 +216,11 @@
       "not-editable": "Ennek a felhasználónak a szerepköre nem szerkeszthető, mert szinkronizálva van az Ön hitelesítési szolgáltatójával. További részletekért olvassa el a <1>Grafana hitelesítési dokumentációját</1>."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Biztosan törölni szeretné {{user}} felhasználót?",
       "columns": {
         "aria-label-role": "Szerepkör"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Törlés",
       "delete-aria-label": "Felhasználó törlése: {{name}}",
       "title-delete": "Törlés"
     },
@@ -252,7 +252,7 @@
       "info-description": "Ezek a rendszerbeállítások a grafana.ini vagy a custom.ini fájlban vannak meghatározva (vagy felülbírálva az ENV-változókban). Ezek módosításához jelenleg újra kell indítania a Grafanát."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Törlés megerősítése"
     },
     "upgrade-info": {
       "title": "Vállalati licenc"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Módosítás",
-      "confirmText-change": "",
+      "confirmText-change": "Módosítás",
       "grafana-admin-key": "Grafana-rendszergazda",
       "grafana-admin-no": "Nem",
       "grafana-admin-yes": "Igen",
       "title": "Engedélyek"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Biztosan törli ezt a felhasználót?",
+      "body-disable": "Biztosan le szeretné tiltani ezt a felhasználót?",
+      "confirmText-delete-user": "Felhasználó törlése",
+      "confirmText-disable-user": "Felhasználó letiltása",
       "delete-button": "Felhasználó törlése",
       "disable-button": "Felhasználó letiltása",
       "edit-button": "Szerkesztés",
@@ -331,7 +331,7 @@
       "title-disable-user": "Felhasználó letiltása"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Mentés"
     },
     "user-sessions": {
       "browser-column": "Böngésző és operációs rendszer",
@@ -382,12 +382,12 @@
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Nem sikerült betölteni az AI-alapú riasztási szabály gombját",
+        "feedback-button": "Nem sikerült betölteni az AI-alapú visszajelzés gombját",
+        "improve-annotations-button": "Nem sikerült betölteni az AI-alapú annotációjavító gombját",
+        "improve-labels-button": "Nem sikerült betölteni az AI-alapú címkejavító gombját",
+        "template-button": "Nem sikerült betölteni az AI-alapú sablon gombját",
+        "triage-button": "Nem sikerült betölteni az AI-alapú prioritási sorrend gombját"
       }
     },
     "alert": {
@@ -493,7 +493,7 @@
       "title-muting-grouping-and-timings": "Némítás, csoportosítás és időzítés"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nem található adatforrás"
     },
     "alert-menu": {
       "copy-link": "Hivatkozás másolása",
@@ -519,7 +519,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Riasztási szabály"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -587,7 +587,7 @@
       "view-configuration": "Nézet konfigurációja"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Igen, konfiguráció visszaállítása",
       "gma-manual-configuration-description": "A belső Grafana riasztáskezelő-konfiguráció manuálisan nem módosítható. A konfiguráció módosításához szerkessze az egyes erőforrásokat a felhasználói felületen keresztül.",
       "gma-manual-configuration-is-not-supported": "A manuális konfigurációs módosítások nem támogatottak",
       "message": {
@@ -602,13 +602,13 @@
       "title-resetting-alertmanager-configuration": "Riasztáskezelő konfigurációjának visszaállítása"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Biztosan vissza szeretné állítani a konfigurációt erre a verzióra? Minden nem mentett módosítás elvész.",
       "columns": {
         "compare": "Összehasonlítás",
         "restore": "Visszaállítás",
         "text-latest": "Legújabb"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Igen, konfiguráció visszaállítása",
       "loading": "Betöltés...",
       "no-previous-configurations": "Nincsenek előző konfigurációk",
       "this-might-take-a-while": "Ez hosszabb időt is igénybe vehet…",
@@ -888,10 +888,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "További műveletek a(z) „{{contactPointName}}” kapcsolattartási ponthoz",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Törlés",
       "button-edit": "Szerkesztés",
       "button-view": "Nézet",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Exportálás",
       "export-label-export": "Exportálás",
       "label-delete": "Törlés",
       "label-manage-permissions": "Engedélyek kezelése",
@@ -1426,7 +1426,7 @@
       "label-disable-resolved-message": "Megoldott üzenet letiltása"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Csoportok betöltése…",
       "message": {
         "must-be-a-positive-integer": "Pozitív egész számnak kell lennie.",
         "must-enter-a-group-name": "A csoportnév megadása kötelező"
@@ -1523,7 +1523,7 @@
       "group-loading-error": "Hiba a csoport betöltésekor",
       "interval": "Intervallum",
       "namespace": "Névtér",
-      "new": "",
+      "new": "Új",
       "title": {
         "back": ""
       }
@@ -1555,7 +1555,7 @@
     },
     "group-loader": {
       "group-load-failed": "A szabályok betöltése a(z) {{ groupName }} csoportból nem sikerült a(z) {{ namespaceName }} névtérben",
-      "no-rules": ""
+      "no-rules": "Nem találhatók szabályok ebben a csoportban"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "A csoport törlése folyamatban van"
@@ -1885,10 +1885,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nem található adatforrás"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Biztosan törölni szeretné a(z) „{{muteTiming}}” elemet?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Letiltva",
@@ -2140,10 +2140,10 @@
         "conflict": "Az értesítési házirendfáját egy másik felhasználó frissítette.",
         "error-code": "Hibaüzenet: „{{error}}”",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Nem lehet útvonalat hozzáadni vagy frissíteni: az illesztések ütköznek egy külső útválasztási fával, ha a(z) {{-matchers}} illesztéseket egyesítjük. Ez az útvonal elérhetetlenné válna."
         },
         "suffix": "Kérjük, frissítse az oldalt, és próbálkozzon újra.",
-        "title": ""
+        "title": "Nem sikerült értesítési szabályzatot hozzáadni vagy frissíteni"
       },
       "n-more-policies_one": "{{count}} további házirend",
       "n-more-policies_other": "{{count}} további házirend"
@@ -2199,7 +2199,7 @@
     "query-and-expressions-step": {
       "add-query": "Lekérdezés hozzáadása",
       "body-queries-expressions-configured": "Hozzon létre legalább egy lekérdezést vagy kifejezést, amelyre riasztást kap",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Deaktiválás",
       "expressions": "Kifejezések",
       "loading-data-sources": "Adatforrások betöltése…",
       "manipulate-returned-queries-other-operations": "A lekérdezésekből visszaadott adatok manipulálása matematikai és egyéb műveletekkel.",
@@ -2253,7 +2253,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Felvételi szabály"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Nem sikerült betölteni a lekérdezésszerkesztőt a következők miatt: {{errorMessage}}"
@@ -2273,7 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "A másolt szabályhoz új értékelési csoportot kell beállítania, mert az eredeti ki van építve, és nem használható a felhasználói felületen létrehozott szabályokhoz.",
       "body-not-provisioned": "Az új szabály <1>nem</1> lesz kiépített szabályként megjelölve.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Másolás",
       "title-copy-provisioned-alert-rule": "Kiépített riasztási szabály másolása"
     },
     "redirect-to-rule-viewer": {
@@ -2497,7 +2497,7 @@
       "new-alert-rule": "Új riasztási szabály",
       "new-datasource-recording-rule": "Új adatforrás-felvételkészítési szabály",
       "new-grafana-recording-rule": "Új Grafana-felvételkészítési szabály",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Új riasztási szabály exportáláshoz",
       "pagination": {
         "next-page": "Továbbiak megjelenítése…"
       },
@@ -2671,7 +2671,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Riasztáskezelők"
       }
     },
     "settings-content": {
@@ -2809,7 +2809,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Előnézet frissítése",
-      "empty-state": "",
+      "empty-state": "Adja hozzá a sablon tartalmát az előnézethez",
       "label-preview": "Előnézet",
       "refresh": "Frissítés"
     },
@@ -2828,7 +2828,7 @@
       "loading": "Betöltés...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Értesítési sablon kiválasztása"
         },
         "label": {
           "select-notification-template": "Értesítési sablon kiválasztása"
@@ -2856,8 +2856,8 @@
     },
     "templates-table": {
       "actions": "Műveletek",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Biztosan törölni szeretné a(z) „{{template}}” sabloncsoportot?",
+      "confirmText-yes-delete": "Igen, törlés",
       "no-templates-defined": "Nincs meghatározott sablon.",
       "template-group": "Sabloncsoport",
       "title-delete-template-group": "Sabloncsoport törlése"
@@ -2912,7 +2912,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Riasztási szabályok, rögzítési szabályok és kiértékelési intervallum kezelése"
       }
     },
     "to-gma": {
@@ -2992,7 +2992,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Igen, törlés"
       }
     },
     "use-delete-policy-modal": {
@@ -3152,7 +3152,7 @@
       "annotation": "Jegyzet",
       "first-value": "Első érték",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Ismeretlen mezőnevek"
     },
     "empty-state": {
       "button-title": "Jegyzetlekérdezés hozzáadása",
@@ -3162,12 +3162,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Ha ez a mező meg van adva, az annotáció tartományként lesz kezelve",
+        "results-split-on-comma": "Az eredmények vesszővel (,) lesznek elválasztva"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}, vagy az első szövegmező",
+        "time-or-the-first-field": "{{defaultField}}, vagy az első időmező"
       }
     },
     "standard-annotation-query-editor": {
@@ -3245,9 +3245,9 @@
       "define-allowed-teams-ids-label": "Engedélyezett csapatazonosítók meghatározása",
       "display-name-description": "A bejelentkezési oldalon „Bejelentkezés ezzel” felirattal jelenik meg. Hasznos, ha egynél több identitásszolgáltatót vagy SSO-protokollt használ.",
       "display-name-label": "Megjelenített név",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Paraméter, amely jelzi a felhasználó tartományát az Azure AD/Entra ID bérlőben, és egyszerűsíti a bejelentkezést.",
+      "domain-hint-label": "Tipp a domainhez",
+      "domain-hint-valid-domain": "Ebben a mezőben csak érvényes domain szerepelhet.",
       "email-attribute-name-description": "Az OAuth2-azonosítótoken attribútumtérképén belül a felhasználói e-mail-kereséshez használandó kulcs neve.",
       "email-attribute-name-label": "E-mail-attribútum neve",
       "email-attribute-path-description": "A felhasználói adatok alapján végzett felhasználói e-mail-kereséshez használandó JMESPath-kifejezés.",
@@ -3264,11 +3264,11 @@
       "id-token-attribute-name-label": "Azonosítótoken-attribútum neve",
       "login-attribute-path-description": "A felhasználói bejelentkezés felhasználói azonosítótoken alapján végzett kereséséhez használandó JMESPath-kifejezés.",
       "login-attribute-path-label": "Bejelentkezési attribútum útvonala",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Hozzájárulás",
+      "login-prompt-description": "Jelzi a felhasználói interakció típusát, amikor a felhasználó az IdP-vel jelentkezik be.",
+      "login-prompt-label": "Bejelentkezési felszólítás",
+      "login-prompt-login": "Bejelentkezés",
+      "login-prompt-select-account": "Számla kiválasztása",
       "managed-identity-client-id-description": "Az OAuth2-alkalmazás összevont identitáshitelesítő adatainak felügyelt identitáskliens-azonosítója.",
       "managed-identity-client-id-label": "FIC által felügyelt identitáskliens-azonosító",
       "name-attribute-path-description": "A felhasználónév felhasználói azonosítótoken alapján végzett kereséséhez használandó JMESPath-kifejezés. \nEz a név lesz a felhasználó megjelenített neve.",
@@ -3304,7 +3304,7 @@
       "team-ids-github": "Csapatazonosítók egész számos listája.",
       "team-ids-label": "Csapatazonosítók",
       "team-ids-numbers": "A csapatazonosítóknak számoknak kell lenniük.",
-      "team-ids-other": "",
+      "team-ids-other": "Csapatazonosítók karakterláncos listája.",
       "team-ids-placeholder": "Adja meg a csapatazonosítókat, és nyomja le az Enter billentyűt a hozzáadáshoz",
       "teams-url-description": "A csapatazonosítók lekérdezéséhez használt URL-cím. Ha nincs beállítva, az alapértelmezett érték a /teams.",
       "teams-url-description-oauth": "Ha konfigurálja a(z) „{{ teamsURLLabel }}” elemet, konfigurálni kell a(z) „{{ teamIDsAttributePathLabel }}” elemet is.",
@@ -3348,7 +3348,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Visszaállítás az alapértelmezett értékekre"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Visszaállítás",
       "disable": "Letiltás",
       "disabling": "Letiltás folyamatban…",
       "discard": "Elvetés",
@@ -3368,7 +3368,7 @@
       "text-badge-not-enabled": "Nem engedélyezett"
     },
     "scim-banner": {
-      "message": ""
+      "message": "A SCIM jelenleg fejlesztés alatt áll, ezért nem javasolt éles környezetben. Használja körültekintéssel, és számítson esetleges változásokra."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "Az identitásszolgáltató .well-known/openid-configuration végpontja",
@@ -3486,8 +3486,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Kiépített erőforrások csoportos törlése",
+      "bulk-move-provisioned-resources": "Kiépített erőforrások csoportos áthelyezése",
       "cancel-button": "Mégse",
       "confirmation-text": "Törlés",
       "delete-button": "Törlés",
@@ -3506,8 +3506,8 @@
       "move-modal-title": "Áthelyezés",
       "moving": "Áthelyezés...",
       "new-folder-name-required-phrase": "A mappa nevének megadása kötelező.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Kiépített és nem kiépített erőforrásokat is kijelölt. Ezeket nem lehet egyszerre feldolgozni. Kérjük, válasszon csak kiépített vagy csak nem kiépített erőforrásokat, majd próbálja újra.",
+      "selected-mix-resources-modal-title": "Vegyes erőforrástípusok lettek kiválasztva"
     },
     "actions": {
       "button-to-recently-deleted": "Nemrég törölt"
@@ -3520,25 +3520,25 @@
       "this-folder-is-empty": "A mappa üres"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_other": ""
+      "all-deleted": "Minden erőforrás sikeresen törölve lett",
+      "all-moved": "Minden erőforrás sikeresen áthelyezve",
+      "button-done": "Kész",
+      "progress-title": "Sikerült",
+      "failed-alert_one": "{{count}} sikertelen elem",
+      "failed-alert_other": "{{count}} sikertelen elem"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Mégse",
+      "button-delete": "Törlés",
+      "button-deleting": "Törlés...",
+      "delete-warning": "Ezzel a művelettel törli a kijelölt mappákat és minden almappájukat. Összességében ez a következőket érinti:",
+      "error-path-not-found": "Az elérési út nem található"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Mégse",
+      "button-move": "Áthelyezés",
+      "button-moving": "Áthelyezés...",
+      "deleting": "Törlés",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,14 +3546,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "A fájl tartalma nem található",
+      "error-path-not-found": "Az elérési út nem található",
+      "error-target-folder-path-missing": "A célmappa elérési útvonala hiányzik",
+      "error-title": "Célmappával kapcsolatos hiba",
+      "move-warning": "Ezzel a művelettel áthelyezi a kijelölt mappákat és minden almappájukat. Összességében ez a következőket érinti:",
+      "moving": "Mozgás",
+      "progress": "Haladás: {{total}}/{{current}}",
+      "target-folder": "Célmappa"
     },
     "counts": {
       "alertRule_one": "{{count}} riasztási szabály",
@@ -3584,7 +3584,7 @@
       "button-delete": "Törlés",
       "button-deleting": "Törlés...",
       "delete-warning": "Ez törli ezt a mappát és minden almappáját. Összességében ez a következőket érinti:",
-      "success-message": ""
+      "success-message": "A mappa törlése sikeres"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Nem lehet lekérni a leszármazott adatokat"
@@ -3609,7 +3609,7 @@
       "empty-message": "Nem található mappa",
       "error-title": "Hiba történt a mappák betöltésekor",
       "non-folder-item": "Nem mappa {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "Irányítópultok",
       "search-placeholder": "Mappák keresése",
       "unknown-error": "Ismeretlen hiba"
     },
@@ -3638,7 +3638,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Mappanév megadása",
       "label-folder-name": "Mappa neve",
       "text-pull-request-created": "A lekérési kérelem ennek a mappának a módosításával lett létrehozva:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "A mappa neve {{folderName}} lesz",
       "title-pull-request-created": "Lekérési kérelem létrehozva",
       "title-this-repository-is-read-only": "Ez az adattár csak olvasható"
     },
@@ -3757,7 +3757,7 @@
     "category-selected-connection": "Kiválasztott kapcsolat",
     "category-selected-element": "Kiválasztott elem ({{element}})",
     "category-size": "Méret",
-    "category-tooltip": "",
+    "category-tooltip": "Elemleírás",
     "cloud-item": {
       "category-cloud": "Felhő",
       "label": {
@@ -4001,10 +4001,10 @@
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Elemleírási mód",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Letiltva",
+        "label-enabled": "Engedélyezve"
       }
     },
     "tree-navigation-editor": {
@@ -4373,7 +4373,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Lekérdezés futtatása"
     }
   },
   "dashboard": {
@@ -4536,7 +4536,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Folytatás"
         },
         "title": {
           "proceed-to-external-site": "Tovább a külső webhelyre?"
@@ -4642,11 +4642,11 @@
     },
     "edit-actions": {
       "add": "{{typeName}} hozzáadása",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
+      "add-conditional-rule": "{{ruleDescription}} szabály hozzáadása",
+      "duplicate-panel": "Panel duplikálása",
+      "edit-query-result-rule": "Lekérdezési eredmény szabályának módosítása",
+      "edit-template-variable-rule": "Sablonváltozó szabályának módosítása",
+      "edit-time-range-rule": "Időtartomány szabályának módosítása",
       "move": "{{typeName}} áthelyezése",
       "panel-background": "Panel hátterének módosítása",
       "panel-description": "Panel leírásának módosítása",
@@ -4661,7 +4661,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Irányítópult",
-        "element": "",
+        "element": "Elem",
         "local-variable": "Helyi változó",
         "multiple-elements": "Több elem",
         "multiple-elements-delete-text": "Biztosan törli ezeket az elemeket?",
@@ -4743,10 +4743,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Irányítópult exportálása"
       },
       "menu": {
-        "label": ""
+        "label": "Irányítópult menüjének exportálása"
       }
     },
     "fetch-dashboard": {
@@ -4768,9 +4768,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Alapértelmezett",
+          "shared-crosshair": "Megosztott célkereszt",
+          "shared-tooltip": "Megosztott elemleírás"
         }
       }
     },
@@ -4823,14 +4823,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Ne küldjön jegyzetadatokat az alábbi paneleknek",
+        "annotation-panels-support-annotations": "Jegyzetadatok küldése minden olyan panelnek, amely támogatja a jegyzeteket",
+        "annotations-explicitly-listed-panels": "Jegyzetek küldése a kifejezetten megadott paneleknek"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Minden panel",
+        "all-panels-except": "Minden panel, kivéve",
+        "selected-panels": "Kijelölt panelek"
       }
     },
     "get-panel-frame-category": {
@@ -5092,7 +5092,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Biztosan visszaállítja az irányítópultot a(z) {{version}} verzióra? Az összes nem mentett módosítás elveszik.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Igen, visszaállítás erre a verzióra: {{version}}",
       "title-restore-version": "Verzió visszaállítása"
     },
     "row-options-button": {
@@ -5144,7 +5144,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Irányítópult elmentve"
     },
     "save-dashboard-as-button": {
       "save-as": "Mentés másként"
@@ -5180,7 +5180,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Egy irányítópult már létezik ugyanazzal a névvel a kijelölt mappában.<1></1><2>Biztosan menti ezt az irányítópultot?</2>",
       "body-version-mismatch": "Valaki más frissítette ezt az irányítópultot<1></1><2>Biztosan menti ezt az irányítópultot?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Mentés és felülírás",
       "title-name-exists": "Ütközés",
       "title-version-mismatch": "Ütközés"
     },
@@ -5377,9 +5377,9 @@
       "label-apply-transformation-to": "Transzformáció alkalmazása erre:"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Ne feledje, hogy egy transzformáció eltávolítása másokat is megszakíthat. Ha csak egy transzformáció van, visszakerül a fő kiválasztási képernyőre.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Törlés",
         "title-debug": "Hibakeresés",
         "title-disable-transformation": "Transzformáció letiltása",
         "title-filter": "Szűrő",
@@ -5400,16 +5400,16 @@
       "placeholder-search-for-transformation": "Transzformáció keresése",
       "show-images": "Képek megjelenítése",
       "title-add-another-transformation": "Másik transzformáció hozzáadása",
-      "view-all": ""
+      "view-all": "Összes megjelenítése"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Ha minden transzformációt töröl, visszakerül a fő kiválasztási képernyőre."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Másik transzformáció hozzáadása"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Összes törlése",
       "delete-all-transformations": "Összes transzformáció törlése",
       "title-delete-all-transformations": "Törli az összes transzformációt?",
       "tooltip-clear-search": "Keresés törlése",
@@ -5439,16 +5439,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Változó leírásának módosítása"
       },
       "hide": {
-        "action": ""
+        "action": "Változó elrejtési opciójának módosítása"
       },
       "label": {
-        "action": ""
+        "action": "Változócímke módosítása"
       },
       "name": {
-        "action": ""
+        "action": "Változónév módosítása"
       }
     },
     "version-history-comparison": {
@@ -5460,7 +5460,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Verzió kijelölésének ki- és bekapcsolása: {{version}}",
       "date": "Dátum",
-      "name-latest": "",
+      "name-latest": "Legújabb",
       "notes": "Megjegyzések",
       "restore": "Visszaállítás",
       "updated-by": "Frissítette:",
@@ -5538,7 +5538,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Méretek megadása CSV-ként: {{name}}, {{value}}",
       "label-data-source": "Adatforrás",
       "label-use-static-key-dimensions": "Statikus kulcsméretek használata",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Egyéni értékek engedélyezése"
     },
     "add-to-dashboard": {
       "message": {
@@ -5612,7 +5612,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Nyilvános URL-cím visszavonása"
       },
       "title": {
         "revoke-public-url": "Nyilvános URL-cím visszavonása"
@@ -5625,7 +5625,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Egyéni opciók",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Értékek vesszővel elválasztva",
       "selection-options": "Kijelölés beállításai"
     },
     "dashboard-edit-pane-renderer": {
@@ -5646,8 +5646,8 @@
       "label-with-tags": "Címkékkel",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Irányítópultok",
+          "link": "Hivatkozás"
         }
       },
       "placeholder-open-dashboard": "Irányítópult megnyitása"
@@ -5690,8 +5690,8 @@
       "data-source-options": "Adatforrás beállításai",
       "description-instance-name-filter": "Reguláris kifejezéses szűrő, amelyhez adatforráspéldányokat választhat a változóérték-listában. Hagyja üresen minden esetben.",
       "example-instance-name-filter": "Példa: <codeExample /> ",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Példánynévszűrő",
+      "name-type": "Típus",
       "selection-options": "Kijelölés beállításai"
     },
     "default-grid-layout-manager": {
@@ -5707,7 +5707,7 @@
       "delete-action": "Irányítópult törlése",
       "deleting": "Törlés...",
       "drawer-title": "Kiépített irányítópult törlése",
-      "success-message": ""
+      "success-message": "Irányítópult sikeresen törölve"
     },
     "description-label": {
       "description": "Leírás"
@@ -5736,15 +5736,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Szerkeszthető",
+          "readonly": "Csak olvasható"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Alapértelmezett",
+          "shared-crosshair": "Megosztott célkereszt",
+          "shared-tooltip": "Megosztott elemleírás"
         }
       }
     },
@@ -5756,36 +5756,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Kulcs-/értékszűrők hozzáadása menet közben",
+        "dynamically-switch-source-multiple-panels": "Adatforrás dinamikus váltása több panelhez",
+        "group": "Csoportosítási kulcsok hozzáadása menet közben",
+        "hidden-constant-variable": "Rejtett konstans változó, mely hasznos metrikai előtagokhoz a megosztani kívánt irányítópultokon",
+        "users-enter-arbitrary-strings-textbox": "A felhasználók tetszőleges szöveget írhatnak be egy szövegmezőbe",
+        "values-are-static-and-defined-manually": "Az értékek statikusak, és manuálisan vannak megadva",
+        "values-fetched-source-query": "Az értékek egy adatforrás-lekérdezéséből származnak",
+        "values-timespans": "Az értékek időtartamok, pl. 1 hónap, 1 óra, 1 nap"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Eseti szűrők",
+        "constant": "Konstans",
+        "custom": "Egyéni",
+        "data-source": "Adatforrás",
+        "group-by": "Csoportosítási szempont",
+        "interval": "Intervallum",
+        "query": "Lekérdezés",
+        "textbox": "Szövegdoboz"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Ne küldjön jegyzetadatokat az alábbi paneleknek",
+        "annotation-panels-support-annotations": "Jegyzetadatok küldése minden olyan panelnek, amely támogatja a jegyzeteket",
+        "annotations-explicitly-listed-panels": "Jegyzetek küldése a kifejezetten megadott paneleknek"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Minden panel",
+        "all-panels-except": "Minden panel, kivéve",
+        "selected-panels": "Kijelölt panelek"
       }
     },
     "get-panel-frame-options": {
@@ -5813,7 +5813,7 @@
       "group-by-options": "Csoportosítási beállítások",
       "label-data-source": "Adatforrás",
       "label-use-static-group-by-dimensions": "Statikus csoportméretek használata",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Egyéni értékek engedélyezése"
     },
     "help-wizard": {
       "copy-to-clipboard": "Másolás vágólapra",
@@ -5849,14 +5849,14 @@
       "apply": "Alkalmaz"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Dinamikusan kiszámítja az intervallumot úgy, hogy az időtartományt elosztja a megadott számmal",
       "description-calculated-value-below-threshold": "A számított érték nem csökkenhet e küszöbérték alá",
       "description-step-count": "Hányszor kell az aktuális időtartományt elosztani az érték kiszámításához?",
       "interval-options": "Intervallum beállításai",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Automatikus opció",
+      "name-min-interval": "Min. intervallum",
+      "name-step-count": "Lépésszám",
+      "name-values": "Értékek"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5877,19 +5877,19 @@
       "usage-count_other": "{{count}} irányítópulton használatos"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Hiba történt az irányítópult áthelyezésekor",
+      "api-error": "Nem sikerült áthelyezni az irányítópultot",
+      "cancel-action": "Mégse",
+      "current-file-not-found": "A jelenlegi irányítópultfájl nem található",
+      "drawer-title": "Kiépített irányítópult áthelyezése",
+      "file-load-error": "Hiba történt az irányítópult betöltésekor",
+      "loading-file-data": "Irányítópult adatainak betöltése",
+      "move-action": "Irányítópult áthelyezése",
+      "move-read-only-message": "Ez az irányítópult nem helyezhető át közvetlenül a Grafanából, mert az adattár csak olvasható. Az irányítópult áthelyezéséhez helyezze át a fájlt a Git-tárba.",
+      "moving": "Áthelyezés...",
+      "success-message": "Irányítópult sikeresen áthelyezve",
+      "target-path-label": "Célútvonal",
+      "title-this-repository-is-read-only": "Ez az adattár csak olvasható"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Egy irányítópult már létezik ugyanazzal a névvel a kijelölt mappában. Biztosan menti ezt az irányítópultot?",
@@ -5897,7 +5897,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Folytatás"
       },
       "title": {
         "proceed-to-external-site": "Tovább a külső webhelyre?"
@@ -5934,8 +5934,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Másik transzformáció hozzáadása",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Ha minden transzformációt töröl, visszakerül a fő kiválasztási képernyőre.",
+      "confirmText-delete-all": "Összes törlése",
       "delete-all-transformations": "Összes transzformáció törlése",
       "title-delete-all-transformations": "Törli az összes transzformációt?"
     },
@@ -5988,13 +5988,13 @@
       "description-examples": "Az elnevezett rögzítési csoportok felhasználhatók a megjelenített szöveg és érték elválasztására (<1>lásd a példákat</1>).",
       "description-optional": "Opcionális, ha egy sorozatnév vagy metrikai csomópontszegmens egy részét szeretné kinyerni.",
       "label-data-source": "Adatforrás",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Statikus opciók rendezése",
       "label-target-data-source": "Céladatforrás",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Statikus opciók használata",
+      "name-regex": "Reguláris kifejezés",
       "query-options": "Lekérdezési beállítások",
       "selection-options": "Kijelölés beállításai",
-      "static-options-legend": ""
+      "static-options-legend": "Statikus opciók"
     },
     "resource-export": {
       "label": {
@@ -6007,7 +6007,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Biztosan visszaállítja az irányítópultot a(z) {{version}} verzióra? Az összes nem mentett módosítás elveszik.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Igen, visszaállítás erre a verzióra: {{version}}",
       "title-restore-version": "Verzió visszaállítása"
     },
     "save-button": {
@@ -6026,7 +6026,7 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Az irányítópult mentése sikertelen volt"
       },
-      "required": ""
+      "required": "Kötelező"
     },
     "save-dashboard-drawer": {
       "tabs": {
@@ -6053,8 +6053,8 @@
         "title-someone-else-has-updated-this-dashboard": "Valaki más frissítette ezt az irányítópultot",
         "would-still-dashboard": "Biztosan menti ezt az irányítópultot?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "Az új irányítópult-séma (V2) korlátai miatt a könyvtárpanelek a külső exportálás során beágyazott tartalommal rendelkező normál panelekké alakulnak át.",
+      "schema-v2-library-panels-export-title": "A könyvtárpanelek normál panelekké lesznek konvertálva",
       "title-dashboard-drastically-changed": "Irányítópult visszafordíthatatlanul megváltoztatva"
     },
     "save-dashboard-form-common-options": {
@@ -6101,10 +6101,10 @@
       "description-enables-multiple-values-selected": "Lehetővé teszi több érték egyidejű kijelölését",
       "description-enables-option-include-variables": "Lehetővé teszi az összes érték belefoglalását",
       "description-enables-users-custom-values": "Lehetővé teszi a felhasználók számára, hogy egyéni értékeket adjanak a listához",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Egyéni értékek engedélyezése",
+      "name-custom-all-value": "Összes egyedi érték",
+      "name-include-all-option": "Összes belefoglalása lehetőség",
+      "name-multi-value": "Többértékű"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Menümegosztás ki- és bekapcsolása"
@@ -6125,7 +6125,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Alapértelmezett érték"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opcionális)",
@@ -6150,8 +6150,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Ha leválasztja ezt a panelt, szerkesztheti anélkül, hogy más irányítópultokat befolyásolna. Viszont a módosítás után már nem tudja visszaállítani az eredeti, újrahasznosítható panel állapotát.",
+      "confirmText-yes-unlink": "Igen, leválasztás",
       "title-really-unlink-panel": "Biztosan leválasztja ezt a panelt?"
     },
     "unsaved-changes-modal": {
@@ -6169,7 +6169,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Irányítópult elmentve"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Erre a változóra egyetlen változó vagy irányítópult sem hivatkozik.",
@@ -6181,15 +6181,15 @@
       "aria-label-variable-editor-form": "Változószerkesztő űrlap",
       "back-to-list": "Vissza a listához",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Változó törlése"
       },
       "delete": "Törlés",
       "description-optional-display-name": "Opcionális megjelenítendő név",
       "description-template-variable-characters": "A sablonváltozó neve. (Max. 50 karakter)",
       "general": "Általános",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Leírás",
+      "name-label": "Címke",
+      "name-name": "Név",
       "placeholder-descriptive-text": "Leírószöveg",
       "placeholder-label-name": "Címkenév",
       "placeholder-variable-name": "Változónév",
@@ -6204,8 +6204,8 @@
       "variable": "Változó"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Biztosan törölni kívánja ezt: {{variable}}?",
+      "confirmText-delete-variable": "Változó törlése",
       "title-delete-variable": "Változó törlése",
       "tooltip-duplicate-variable": "Duplikált változó",
       "tooltip-remove-variable": "Változó eltávolítása"
@@ -6213,15 +6213,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Címke",
+          "nothing": "Semmi",
+          "variable": "Változó"
         }
       },
       "label": "Elrejtés"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Változó típusa"
     },
     "variable-usages-button": {
       "title-show-usages": "Használat megjelenítése a következőhöz: {{variableId}}",
@@ -6249,7 +6249,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Verzió kijelölésének ki- és bekapcsolása: {{version}}",
       "date": "Dátum",
-      "name-latest": "",
+      "name-latest": "Legújabb",
       "notes": "Megjegyzések",
       "restore": "Visszaállítás",
       "updated-by": "Frissítette:",
@@ -6640,7 +6640,7 @@
     },
     "color-dimension-editor": {
       "label-fixed-color": "Rögzített szín",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Nem található mező"
     },
     "file-dropzone-custom-children": {
       "upload": "Feltöltés"
@@ -6679,7 +6679,7 @@
       },
       "label-limit": "Korlát",
       "label-value": "Érték",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Nem található mező",
       "scalar-options": {
         "description-clamped": "Mezőértékek használata, maximumhoz és minimumhoz kapcsolva",
         "description-mod": "Mezőértékek használata, mod. és max. között",
@@ -6690,13 +6690,13 @@
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Rögzített érték"
         }
       },
       "label-max": "Max.",
       "label-min": "Min.",
       "label-value": "Érték",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Nem található mező"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
@@ -6806,6 +6806,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Események",
@@ -7078,7 +7079,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Betöltés…"
     },
     "prev": "Előző",
     "queryless-apps-extensions": {
@@ -7265,7 +7266,7 @@
           "start-time": "Kezdés időpontja:"
         }
       },
-      "share-span": "",
+      "share-span": "Megosztás",
       "warnings": "Figyelmeztetések"
     },
     "span-filters": {
@@ -7275,8 +7276,8 @@
       "aria-label-select-service-name-operator": "Válasszon operátort a szolgáltatásnévhez",
       "aria-label-select-span-name": "Válasszon terjedelemnevet",
       "aria-label-select-span-name-operator": "Terjedelemnév operátor kijelölése",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Maximális időtartam kiválasztása",
+      "ariaLabel-select-min-span-duration": "Minimális időtartam kiválasztása",
       "label-collapse": "Terjedelemszűrők",
       "label-duration": "Időtartam",
       "label-service-name": "Szolgáltatásnév",
@@ -7348,23 +7349,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Időtartam",
+      "export-started": "Exportálás elindítva",
+      "give-feedback": "Visszajelzés",
+      "link-copied": "Hivatkozás a vágólapra másolva",
+      "path": "Útvonal",
+      "route": "Útvonal",
+      "services": "Szolgáltatások",
+      "share": "Megosztás",
+      "share-copy-link": "Hivatkozás másolása",
+      "share-export-json": "Exportálás JSON-fájlként",
+      "share-tooltip": "Nyomvonal megosztása",
+      "start-time": "Kezdési idő",
+      "target": "Cél",
+      "title-share-thoughts-about-tracing-grafana": "Ossza meg gondolatait a Grafanában elérhető nyomon követésről.",
+      "tooltip-url": "{{route}} vagy {{url}} vagy {{target}} vagy {{path}}",
+      "trace-id": "Nyomkövetési azonosító",
+      "url": "URL-cím"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Szűrők törlése gomb",
@@ -7464,7 +7465,7 @@
       "when": "WHEN"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Futtasson MySQL-dialektusú SQL-lekérdezéseket az adatforrásaiból készült táblázatokon. Az adatforrás-lekérdezések (pl. „A”, „B”) táblázatként érhetők el, és a lekérdezés nevével hivatkozhat rájuk. A mezők oszlopként jelennek meg, az adatforrás által visszaadott formában.",
       "label-operation": "Művelet"
     },
     "math": {
@@ -7495,7 +7496,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Mappák törlése",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Nem található mappa",
     "select-aria-label": "Mappaszűrő",
     "select-placeholder": "Szűrés mappa alapján"
   },
@@ -7569,51 +7570,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "A helységnévtár nem található",
+      "warning-no-geometry": "nem található a geometria",
+      "warning-select-geohash": "Geohash mező kiválasztása",
+      "warning-select-lat-long": "Szélességi/hosszúsági mezők kiválasztása",
+      "warning-select-lookup": "Keresőmező kiválasztása",
+      "warning-unable-to-find": "Nem található helymező"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nem található szöveges mező"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nem található numerikus mező"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nem található numerikus mező"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nem található szöveges mező"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Helységnévtár",
+      "name-geohash-field": "Geohash mező",
+      "name-latitude-field": "Szélességi mező",
+      "name-location-mode": "Helymód",
+      "name-longitude-field": "Hosszúsági mező",
+      "name-lookup-field": "Keresőmező"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Helyadatok automatikus felismerése az alapértelmezett mezőnevek alapján",
+        "description-coords": "Szélességi és hosszúsági mezők megadása",
+        "description-geohash": "Geohash mező megadása",
+        "description-lookup": "Helységnévtári és keresőmező megadása",
+        "label-auto": "Automatikus",
+        "label-coords": "Koordináták",
+        "label-geohash": "Geohash",
+        "label-lookup": "Keresés"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Alaptérképréteg",
+    "category-map-controls": "Térképvezérlők",
+    "category-map-layers": "Térképrétegek",
+    "category-map-view": "Térképnézet",
     "coordinates-map-view-editor": {
       "label-latitude": "Szélességi fok",
       "label-longitude": "Hosszúsági fok"
@@ -7622,15 +7623,15 @@
       "center": "Középre:",
       "zoom": "Nagyítás:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Ez a hely fog megjelenni a panel első betöltésekor.",
+    "description-mouse-wheel-zoom": "Egérgörgővel történő nagyítás engedélyezése",
+    "description-no-repeat": "A térkép vízszintes ismétlésének megakadályozása",
+    "description-share-view": "Ugyanaz a nézet több panelen keresztül. Megjegyzés: Ehhez lehetséges, hogy újra kell tölteni az irányítópultot.",
+    "description-show-attribution": "A térkép forrására vonatkozó attribútumadatok megjelenítése a jobb alsó sarokban",
+    "description-show-debug": "Térképadatok megjelenítése",
+    "description-show-measure": "A térképen történő mérésekhez szükséges eszközök megjelenítése",
+    "description-show-scale": "Térkép méretarányának jelzése",
+    "description-show-zoom": "Nagyítási vezérlőgombok megjelenítése a bal felső sarokban",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Réteg"
@@ -7654,12 +7655,12 @@
       "aria-label-add-geomap-style-rule": "Geomap-stílusszabály hozzáadása"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Alapréteg",
+      "description-display-tooltip": "A réteg elemleírásának megjelenítése",
+      "name-data": "Adatok",
+      "name-display-tooltip": "Elemleírás megjelenítése",
+      "name-layer-type": "Rétegtípus",
+      "name-opacity": "Átlátszóság"
     },
     "layers-editor": {
       "label-add-layer": "Réteg hozzáadása",
@@ -7672,9 +7673,9 @@
       "use-current-map-settings": "Aktuális térképbeállítások használata"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Térkép jelmagyarázatának megjelenítése",
+      "name-show-legend": "Jelmagyarázat megjelenítése",
+      "name-styles": "Stílus"
     },
     "markers-legend": {
       "title-symbol": "Szimbólum"
@@ -7683,27 +7684,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Mérőeszközök megjelenítése"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Kezdeti nézet",
+    "name-mouse-wheel-zoom": "Nagyítás az egérgörgővel",
+    "name-no-repeat": "Nincs térképismétlés",
+    "name-share-view": "Nézet megosztása",
+    "name-show-attribution": "Tulajdonság megjelenítése",
+    "name-show-debug": "Hibakeresés megjelenítése",
+    "name-show-measure": "Mérőeszközök megjelenítése",
+    "name-show-scale": "Méretarány megjelenítése",
+    "name-show-zoom": "Nagyításvezérlő megjelenítése",
+    "name-tooltip": "Elemleírás",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Nem található szöveges mező"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "Az alaptérkép rétegét a kiszolgáló rendszergazdája konfigurálja."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Középre",
+        "label-left": "Balra",
+        "label-right": "Jobbra"
       },
       "label-align": "Illesztés",
       "label-baseline": "Alapvonal",
@@ -7719,12 +7720,12 @@
       "label-text-label": "Szöveges címke",
       "label-x-offset": "X eltolás",
       "label-y-offset": "Y eltolás",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Válasszon egy szimbólumot",
+      "placeholderText-select-symbol-or-add-text": "Válasszon ki egy szimbólumot, vagy adjon hozzá egy szövegcímkét",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Lent",
+        "label-center": "Középre",
+        "label-top": "Felül"
       }
     },
     "style-rule-editor": {
@@ -7738,13 +7739,13 @@
       "placeholder-value": "érték"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Felugró ablak megjelenítése az egérmutató tartalom fölé mozgatásával",
+      "description-none": "Tartalom megjelenítése kattintással, nem pedig az egérmutató fölé mozgatásával",
+      "label-details": "Részletek",
+      "label-none": "Nincs"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Réteg: {{name}}"
     }
   },
   "get-enterprise": {
@@ -7864,400 +7865,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Láb/másodperc²",
+            "name-g-unit": "G-egység",
+            "name-meters-sec": "Méter/másodperc²"
           },
-          "name": ""
+          "name": "Gyorsulás"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Szögperc",
+            "name-arc-seconds": "Szögmásodperc",
+            "name-degrees": "Fok (°)",
+            "name-gradian": "Gradián",
+            "name-radians": "Radián"
           },
-          "name": ""
+          "name": "Szög"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Hold (ac)",
+            "name-hectares": "Hektár (ha)",
+            "name-square-feet": "Négyzetláb (ft²)",
+            "name-square-meters": "Négyzetméter (m²)",
+            "name-square-miles": "Négyzetmérföld (mi²)"
           },
-          "name": ""
+          "name": "Terület"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Be/ki",
+            "name-true-false": "Igaz/hamis",
+            "name-yes-no": "Igen/nem"
           },
-          "name": ""
+          "name": "Logikai változó"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/mp",
+            "name-flops": "FLOP/mp",
+            "name-gflops": "GFLOP/mp",
+            "name-mflops": "MFLOP/mp",
+            "name-pflops": "PFLOP/mp",
+            "name-tflops": "TFLOP/mp",
+            "name-yflops": "YFLOP/mp",
+            "name-zflops": "ZFLOP/mp"
           },
-          "name": ""
+          "name": "Számítási folyamat"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "gramm/köbméter (g/m³)",
+            "name-g-nm3": "gramm/normál köbméter (g/Nm³)",
+            "name-mg-dl": "milligramm/deciliter (mg/dl)",
+            "name-mg-m3": "milligramm/köbméter (mg/m³)",
+            "name-mg-nm3": "milligramm/normál köbméter (mg/Nm³)",
+            "name-mmol-l": "millimól/liter (mmol/l)",
+            "name-ng-m3": "nanogramm/köbméter (ng/m³)",
+            "name-ng-nm3": "nanogramm/normál köbméter (ng/Nm³)",
+            "name-ppb": "milliárdodrész (ppb)",
+            "name-ppm": "milliomodrész (ppm)",
+            "name-ug-m3": "mikrogramm/köbméter (μg/m³)",
+            "name-ug-nm3": "mikrogramm/normál köbméter (μg/Nm³)"
           },
-          "name": ""
+          "name": "Koncentráció"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Bolgár leva (BGN)",
+            "name-brl": "Brazil real (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "Svájci frank (CHF)",
+            "name-czk": "Cseh korona (CZK)",
+            "name-dkk": "Dán korona (kr)",
+            "name-eur": "Euró (€)",
+            "name-gbp": "Font (£)",
+            "name-idr": "Indonéz rúpia (Rp)",
+            "name-ils": "Izraeli új sékel (₪)",
+            "name-inr": "Indiai rúpia (₹)",
+            "name-isk": "Izlandi korona (kr)",
+            "name-jpy": "Japán jen (¥)",
+            "name-krw": "Dél-koreai von (₩)",
+            "name-mbtc": "Milli-Bitcoin (฿)",
+            "name-myr": "Maláj ringgit (RM)",
+            "name-nok": "Norvég korona (kr)",
+            "name-php": "Fülöp-szigeteki peso (PHP)",
+            "name-pln": "Lengyel złoty (PLN)",
+            "name-pyg": "Guaraní (₲)",
+            "name-rub": "Rubel (₽)",
+            "name-sek": "Svéd korona (kr)",
+            "name-try": "Török líra (₺)",
+            "name-uah": "Hrivnya (₴)",
+            "name-ubtc": "Mikro-Bitcoin (฿)",
+            "name-usd": "Dollár ($)",
+            "name-uyu": "Uruguayi peso (UYU)",
+            "name-vnd": "Vietnámi dong (VND)",
+            "name-xpf": "CFP frank (XPF)",
+            "name-zar": "Dél-afrikai rand (R)"
           },
-          "name": ""
+          "name": "Pénznem"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bit (IEC)",
+            "name-bits-si": "bit (SI)",
+            "name-bytes-iec": "bájt (IEC)",
+            "name-bytes-si": "bájt (SI)",
+            "name-gibibytes": "gibibájt",
+            "name-gigabytes": "gigabájt",
+            "name-kibibytes": "kibibájt",
+            "name-kilobytes": "kilobájt",
+            "name-mebibytes": "mebibájt",
+            "name-megabytes": "megabájt",
+            "name-pebibytes": "pebibájt",
+            "name-petabytes": "petabájt",
+            "name-tebibytes": "tebibájt",
+            "name-terabytes": "terabájt"
           },
-          "name": ""
+          "name": "Adatok"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bit/másodperc (IEC)",
+            "name-bits-sec-si": "bit/másodperc (SI)",
+            "name-bytes-sec-iec": "bájt/másodperc (IEC)",
+            "name-bytes-sec-si": "bájt/másodperc (SI)",
+            "name-gibibits-sec": "gibibit/másodperc",
+            "name-gibibytes-sec": "gibibájt/másodperc",
+            "name-gigabits-sec": "gigabit/másodperc",
+            "name-gigabytes-sec": "gigabájt/másodperc",
+            "name-kibibits-sec": "kibibit/másodperc",
+            "name-kibibytes-sec": "kibibájt/másodperc",
+            "name-kilobits-sec": "kilobit/másodperc",
+            "name-kilobytes-sec": "kilobájt/másodperc",
+            "name-mebibits-sec": "mebibit/másodperc",
+            "name-mebibytes-sec": "mebibájt/másodperc",
+            "name-megabits-sec": "megabit/másodperc",
+            "name-megabytes-sec": "megabájt/másodperc",
+            "name-packets-sec": "köteg/másodperc",
+            "name-pebibits-sec": "pebibit/másodperc",
+            "name-pebibytes-sec": "pebibájt/másodperc",
+            "name-petabits-sec": "petabit/másodperc",
+            "name-petabytes-sec": "petabájt/másodperc",
+            "name-tebibits-sec": "tebibit/másodperc",
+            "name-tebibytes-sec": "tebibájt/másodperc",
+            "name-terabits-sec": "terabit/másodperc",
+            "name-terabytes-sec": "terabájt/másodperc"
           },
-          "name": ""
+          "name": "Adatátviteli sebesség"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Alapértelmezett dátum és idő",
+            "name-datetime-iso": "ISO dátum és idő",
+            "name-datetime-iso-no-date": "ISO dátum és idő (nincs dátum, ha a mai napra esik)",
+            "name-datetime-local": "Helyi dátum és idő",
+            "name-datetime-local-no-date": "Helyi dátum és idő (nincs dátum, ha a mai napra esik)",
+            "name-datetime-us": "US dátum és idő",
+            "name-datetime-us-no-date": "US dátum és idő (nincs dátum, ha a mai napra esik)",
+            "name-from-now": "Mostantól"
           },
-          "name": ""
+          "name": "Dátum és idő"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Amper (A)",
+            "name-ampere-hour": "Amperóra (Ah)",
+            "name-decibel-milliwatt": "Decibel-milliwatt (dBm)",
+            "name-electron-volt": "Elektronvolt (eV)",
+            "name-farad": "Farad (F)",
+            "name-femtofarad": "Femtofarad (fF)",
+            "name-gigawatt": "Gigawatt (GW)",
+            "name-henry": "Henry (H)",
+            "name-joule": "Joule (J)",
+            "name-kiloampere": "Kiloamper (kA)",
+            "name-kiloampere-hour": "Kiloamperóra (kAh)",
+            "name-kiloohm": "Kiloohm (kΩ)",
+            "name-kilovolt": "Kilovolt (kV)",
+            "name-kilovolt-ampere": "Kilovoltamper (kVA)",
+            "name-kilovolt-ampere-reactive": "Kilovoltamper reaktív (kVAr)",
+            "name-kilowatt": "Kilowatt (kW)",
+            "name-kilowatt-hour": "Kilowattóra (kWh)",
+            "name-kilowatt-min": "Kilowattperc (kWm)",
+            "name-lumens": "Lumen (Lm)",
+            "name-megaohm": "Megaohm (MΩ)",
+            "name-megawatt": "Megawatt (MW)",
+            "name-megawatt-hour": "Megawattóra (MWh)",
+            "name-microfarad": "Mikrofarad (µF)",
+            "name-microhenry": "Mikrohenry (µH)",
+            "name-milliampere": "Milliamper (mA)",
+            "name-milliampere-hour": "Milliamperóra (mAh)",
+            "name-millihenry": "Millihenry (mH)",
+            "name-milliohm": "Milliohm (mΩ)",
+            "name-millivolt": "Millivolt (mV)",
+            "name-milliwatt": "Milliwatt (mW)",
+            "name-nanofarad": "Nanofarad (nF)",
+            "name-ohm": "Ohm (Ω)",
+            "name-picofarad": "Pikofarad (pF)",
+            "name-volt": "Volt (V)",
+            "name-volt-ampere": "Voltamper (VA)",
+            "name-volt-ampere-reactive": "Voltamper reaktív (VAr)",
+            "name-watt": "Watt (W)",
+            "name-watt-hour": "Wattóra (Wh)",
+            "name-watt-hour-per-kg": "Wattóra/kilogramm (Wh/kg)",
+            "name-watt-square-meter": "Watt/négyzetméter (W/m²)"
           },
-          "name": ""
+          "name": "Energia"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Köbláb/perc (cfm)",
+            "name-cubic-feet-sec": "Köbláb/másodperc (cfs)",
+            "name-cubic-meters-sec": "Köbméter/másodperc (cms)",
+            "name-gallons-min": "Gallon/perc (gpm)",
+            "name-litre-hour": "Liter/óra",
+            "name-litre-min": "Liter/perc (l/perc)",
+            "name-lux": "Lux (lx)",
+            "name-millilitre-min": "milliliter/perc (ml/perc)"
           },
-          "name": ""
+          "name": "Áramlás "
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Kilonewton-méter (kNm)",
+            "name-kilonewtons": "Kilonewton (kN)",
+            "name-newton-meters": "Newton-méter (Nm)",
+            "name-newtons": "Newton (N)"
           },
-          "name": ""
+          "name": "Erő"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "exahash/másodperc",
+            "name-gigahashes-sec": "gigahash/másodperc",
+            "name-hashes-sec": "hash/másodperc",
+            "name-kilohashes-sec": "kilohash/másodperc",
+            "name-megahashes-sec": "megahash/másodperc",
+            "name-petahashes-sec": "petahash/másodperc",
+            "name-terahashes-sec": "terahash/másodperc"
           },
-          "name": ""
+          "name": "Hash-arány"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "láb (ft)",
+            "name-inch": "hüvelyk (in)",
+            "name-kilometer": "kilométer (km)",
+            "name-meter": "méter (m)",
+            "name-mile": "mérföld (mi)",
+            "name-millimeter": "milliméter (mm)"
           },
-          "name": ""
+          "name": "Hossz"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "gramm (g)",
+            "name-kilogram": "kilogramm (kg)",
+            "name-metric-ton": "metrikus tonna (t)",
+            "name-milligram": "milligramm (mg)",
+            "name-pound": "font (lb)"
           },
-          "name": ""
+          "name": "Tömeg "
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Kandela (cd)",
+            "name-decibel": "Decibel",
+            "name-hexadecimal": "Hexadecimális",
+            "name-hexadecimal-0x": "Hexadecimális (0x)",
+            "name-humidity": "Páratartalom (%H)",
+            "name-locale": "Helyi formátum",
+            "name-number": "Szám",
+            "name-percent-1": "Százalék (0,0–1,0)",
+            "name-percent-100": "Százalék (0–100)",
+            "name-pixels": "Pixelek száma",
+            "name-scientific": "Tudományos jelölés",
+            "name-short": "rövid",
+            "name-si-short": "SI rövid",
+            "name-string": "felfűz"
           },
-          "name": ""
+          "name": "Egyebek"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Sávok",
+            "name-hectopascals": "Hektopascal",
+            "name-inches-mercury": "Hüvelyknyi higany",
+            "name-kilobars": "Kilobar",
+            "name-kilopascals": "Kilopascal",
+            "name-millibars": "Millibar",
+            "name-pascals": "Pascal",
+            "name-psi": "PSZÍ"
           },
-          "name": ""
+          "name": "Nyomás"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Becquerel (Bq)",
+            "name-curie": "curie (Ci)",
+            "name-exposure": "Expozíció (C/kg)",
+            "name-gray": "Gray (Gy)",
+            "name-microsievert": "mikrosievert (µSv)",
+            "name-microsievert-hour": "mikrosievert/óra (µSv/óra)",
+            "name-millisievert": "millisievert (mSv)",
+            "name-millisievert-hour": "millisievert/óra (mSv/óra)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "röntgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/óra (Sv/óra)"
           },
-          "name": ""
+          "name": "Sugárzás"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Fok/másodperc (°/mp)",
+            "name-gigahertz": "Gigahertz (GHz)",
+            "name-hertz": "Hertz (Hz)",
+            "name-kilohertz": "Kilohertz (kHz)",
+            "name-megahertz": "Megahertz (MHz)",
+            "name-radians-sec": "Radián/másodperc (rad/mp)",
+            "name-rpm": "Fordulatszám/perc (rpm)"
           },
-          "name": ""
+          "name": "Forgási sebesség"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsius (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Hőmérséklet"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "darab/perc (cpm)",
+            "name-counts-sec": "darab/másodperc (cps)",
+            "name-events-min": "esemény/perc (epm)",
+            "name-events-sec": "esemény/másodperc (eps)",
+            "name-io-ops-sec": "I/O művelet/másodperc (iops)",
+            "name-messages-min": "üzenet/perc (mpm)",
+            "name-messages-sec": "üzenet/másodperc (mps)",
+            "name-ops-min": "művelet/perc (opm)",
+            "name-ops-sec": "művelet/másodperc (ops)",
+            "name-reads-min": "olvasás/perc (rpm)",
+            "name-reads-sec": "olvasás/másodperc (rps)",
+            "name-records-min": "rekord/perc (rpm)",
+            "name-records-sec": "rekord/másodperc (rps)",
+            "name-requests-min": "kérés/perc (rpm)",
+            "name-requests-sec": "kérés/másodperc (rps)",
+            "name-rows-min": "sor/perc (rpm)",
+            "name-rows-sec": "sor/másodperc (rps)",
+            "name-writes-min": "írás/perc (wpm)",
+            "name-writes-sec": "írás/másodperc (wps)"
           },
-          "name": ""
+          "name": "Átmenőteljesítmény"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "óra (ms)",
+            "name-clock-s": "óra (mp)",
+            "name-days": "nap (n)",
+            "name-duration-dhms": "időtartam (n óó:pp:mm)",
+            "name-duration-hms": "időtartam (óó:pp:mm)",
+            "name-duration-ms": "időtartam (ms)",
+            "name-duration-s": "időtartam (mp)",
+            "name-hertz": "Hertz (1/mp)",
+            "name-hours": "óra (ó)",
+            "name-microseconds": "mikroszekundum (µs)",
+            "name-milliseconds": "milliszekundum (ms)",
+            "name-minutes": "perc (p)",
+            "name-nanoseconds": "nanoszekundum (ns)",
+            "name-seconds": "másodperc (mp)",
+            "name-timeticks": "Időjelzők (mp/100)"
           },
-          "name": ""
+          "name": "Idő"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "kilométer/óra (km/óra)",
+            "name-knot": "csomó (kn)",
+            "name-meters-second": "méter/másodperc (m/mp)",
+            "name-miles-hour": "mérföld/óra (mph)"
           },
-          "name": ""
+          "name": "Sebesség"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "köbdeciméter",
+            "name-cubic-meter": "köbméter",
+            "name-gallons": "gallon",
+            "name-litre": "liter (l)",
+            "name-millilitre": "milliliter (ml)",
+            "name-normal-cubic-meter": "Normál köbméter"
           },
-          "name": ""
+          "name": "Mennyiség"
         }
       }
     }
@@ -8386,7 +8387,7 @@
       "option": "opció"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Előnézeti kép megnyitása"
     },
     "cascader": {
       "clear-button": "Kijelölés törlése"
@@ -8400,9 +8401,9 @@
       "aria-label-selected-color": "{{colorLabel}} szín"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Törlés",
       "cancel": "Mégse",
-      "confirmText-delete": ""
+      "confirmText-delete": "Törlés"
     },
     "confirm-content": {
       "placeholder": "„{{confirmPromptText}}” beírása szükséges a megerősítéshez"
@@ -8507,56 +8508,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "Április",
+        "label-august": "Augusztus",
+        "label-december": "December",
+        "label-february": "Február",
+        "label-january": "Január",
+        "label-july": "Július",
+        "label-june": "Június",
+        "label-march": "Március",
+        "label-may": "Május",
+        "label-november": "November",
+        "label-october": "Október",
+        "label-september": "Szeptember"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Tegnapelőtt",
+        "last-1-hour": "Az elmúlt 1 óra",
+        "last-1-year": "Az elmúlt 1 év",
+        "last-12-hours": "Az elmúlt 12 óra",
+        "last-15-mins": "Az elmúlt 15 perc",
+        "last-2-days": "Az elmúlt 2 nap",
+        "last-2-years": "Az elmúlt 2 év",
+        "last-24-hours": "Az utóbbi 24 óra",
+        "last-3-hours": "Az elmúlt 3 óra",
+        "last-30-days": "Az elmúlt 30 nap",
+        "last-30-mins": "Az elmúlt 30 perc",
+        "last-5-mins": "Az elmúlt 5 perc",
+        "last-5-years": "Az elmúlt 5 év",
+        "last-6-hours": "Az elmúlt 6 óra",
+        "last-6-months": "Az elmúlt 6 hónap",
+        "last-7-days": "Az elmúlt 7 nap",
+        "last-90-days": "Az elmúlt 90 nap",
+        "previous-fiscal-quarter": "Az előző pénzügyi negyedév",
+        "previous-fiscal-year": "Az előző pénzügyi év",
+        "previous-month": "Előző hónap",
+        "previous-week": "Az előző hét",
+        "previous-year": "Az előző év",
+        "this-day-last-week": "A múlt héten ezen a napon",
+        "this-fiscal-quarter": "Ez a pénzügyi negyedév",
+        "this-fiscal-quarter-so-far": "Ebben a pénzügyi negyedévben eddig",
+        "this-fiscal-year": "Ez a pénzügyi év",
+        "this-fiscal-year-so-far": "Ebben a pénzügyi évben eddig",
+        "this-month": "Ez a hónap",
+        "this-month-so-far": "Ebben a hónapban eddig",
+        "this-week": "Ez a hét",
+        "this-week-so-far": "Ezen a héten eddig",
+        "this-year": "Az évben",
+        "this-year-so-far": "Ebben az évben eddig",
+        "today": "Ma",
+        "today-so-far": "Ma eddig",
+        "yesterday": "Tegnap"
       }
     },
     "drawer": {
@@ -8607,18 +8608,18 @@
         "placeholder": "Mező kijelölése"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Logikai változó",
+        "label-enum": "Felsorolás",
+        "label-number": "Szám",
+        "label-other": "Egyéb",
+        "label-string": "felfűz",
+        "label-time": "Idő",
+        "label-traces": "Nyomvonalak"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Keretek ({{framesCount}}): {{framesNames}}",
+        "label": "Lekérdezés: {{refId}}",
+        "label-missing-ref-id": "Lekérdezés: (hiányzó referenciaazonosító)"
       },
       "name-field-name-by-regex-matcher": "Reguláris kifejezésnek megfelelő nevű mezők",
       "name-fields-by-query": "A lekérdezés által visszaadott mezők",
@@ -8652,8 +8653,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "panel összecsukásának ki- és bekapcsolása",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Panel betöltési sávja",
+      "ariaLabel-panel-status": "Panel állapota",
       "tooltip-cancel": "A lekérdezés megszakítása",
       "tooltip-cancel-loading": "A lekérdezés megszakítása",
       "tooltip-stop-streaming": "Adatfolyam leállítása",
@@ -8722,12 +8723,12 @@
       "inspect-drawer-title": "Érték ellenőrzése",
       "inspect-menu-label": "Érték ellenőrzése",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Nincs adat"
       },
       "no-values-label": "Nincsenek értékek",
       "pagination-summary": "{{itemsRangeStart}} – {{displayedEnd}} / {{numRows}} sor",
       "sparkline": {
-        "no-data": ""
+        "no-data": "nincs adat"
       }
     },
     "tags": {
@@ -8735,7 +8736,7 @@
     },
     "tags-input": {
       "add": "Hozzáadás",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Új címke (nyomja le az Enter billentyűt a hozzáadáshoz)",
       "remove": "Címke eltávolítása: {{name}}"
     },
     "time-sync-button": {
@@ -8828,14 +8829,14 @@
       "footer-add-annotation": "Jegyzet hozzáadása",
       "footer-click-to-action": "Kattintson ehhez: {{actionTitle}}",
       "footer-click-to-navigate": "Kattintson a következő megnyitásához: {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Szűrés „{{value}}” szerint",
       "timestamp": "Időbélyeg"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Alapértelmezett",
+      "weekStarts-label-monday": "Hétfő",
+      "weekStarts-label-saturday": "Szombat",
+      "weekStarts-label-sunday": "Vasárnap"
     }
   },
   "graph": {
@@ -9215,8 +9216,8 @@
       "title-create-library-panel": "Könyvtárpanel létrehozása"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Módosítás",
+      "confirmText-replace": "Csere"
     },
     "confirm": {
       "delete-panel": "Biztosan törli ezt a panelt?"
@@ -9241,7 +9242,7 @@
       "usage-count_other": "{{count}} irányítópulton használatos"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Keresés név, leírás vagy mappa neve alapján"
     },
     "loading-indicator": {
       "loading-library-panel": "Könyvtárpanel betöltése…"
@@ -9451,7 +9452,7 @@
       "close": "Napló részleteinek bezárása",
       "copy-shortlink": "Rövid hivatkozás másolása",
       "copy-to-clipboard": "Másolás vágólapra",
-      "displayed-fields-section": "",
+      "displayed-fields-section": "Megjelenített mezők rendezése",
       "fields": {
         "adhoc-statistics": "Eseti statisztikák",
         "copy-value-to-clipboard": "Érték másolása a vágólapra",
@@ -9464,25 +9465,25 @@
       },
       "fields-section": "Mezők",
       "hide-log-line": "Naplósor elrejtése",
-      "inline-mode": "",
+      "inline-mode": "Megjelenítés sorban",
       "links-section": "Hivatkozások",
-      "log-line-field": "",
+      "log-line-field": "Naplósor",
       "log-line-section": "Naplósor",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
+      "move-displayed-field-down": "Mozgatás lefelé",
+      "move-displayed-field-up": "Mozgatás felfelé",
       "no-details": "Nincs megjeleníthető mező.",
-      "open-assistant": "",
+      "open-assistant": "Magyarázza el ezt a naplósort az Asszisztenssel",
       "pin-line": "Napló kitűzése",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "remove-displayed-field": "Mező eltávolítása",
+      "remove-log": "Napló eltávolítása",
+      "scroll-to-logline": "Görgetés a naplósorhoz",
       "search": {
         "no-results": "Nincs megjeleníthető találat."
       },
       "search-placeholder": "Mezőnevek és értékek keresése",
       "show-context": "Kontextus megjelenítése",
       "show-log-line": "Naplósor megjelenítése",
-      "sidebar-mode": "",
+      "sidebar-mode": "Jobbra rögzítés",
       "unpin-line": "Naplókitűzés feloldása"
     },
     "log-line-menu": {
@@ -9490,9 +9491,9 @@
       "copy-log": "Naplósor másolása",
       "hide-details": "Napló részleteinek megjelenítése",
       "icon-label": "Naplómenü",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Naplósor",
+      "log-line-explainer": "Magyarázza el ezt a naplósort tömören",
+      "open-assistant": "Magyarázza el ezt a naplósort az Asszisztenssel",
       "pin-to-outline": "Napló rögzítése",
       "show-context": "Kontextus megjelenítése",
       "show-details": "Napló részleteinek elrejtése",
@@ -9598,10 +9599,10 @@
     },
     "name-common-labels": "Közös címkék",
     "name-deduplication": "Duplikátumok törlése",
-    "name-details-mode": "",
+    "name-details-mode": "Napló részletei panel módban",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "Beágyazott",
+      "label-sidebar": "Oldalsáv"
     },
     "name-enable-infinite-scrolling": "Végtelen görgetés engedélyezése",
     "name-enable-log-details": "Napló részleteinek engedélyezése",
@@ -9698,8 +9699,8 @@
       "updated-on": "Frissítve:"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Biztosan törölni szeretné a(z) „{{snapshotToRemove}}” elemet?",
+      "confirmText-delete": "Törlés",
       "title-delete": "Törlés"
     },
     "unthemed-dashboard-import": {
@@ -9711,14 +9712,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "A név megadása kötelező",
+      "message-reserved-name": "Ez egy fenntartott név, ezért mappaként nem használható.",
+      "message-same-name": "Már létezik ilyen nevű irányítópult vagy mappa",
+      "message-same-name-general": "Az általános mappában már létezik ilyen nevű irányítópult vagy mappa"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Nem található beállítás"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9868,8 +9869,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Elérte a riasztási szabálycsoportok maximális számát: Töröljön néhány szabálycsoportot vagy frissítse előfizetését, majd próbálja újra.",
+        "alert-rules-quota-reached": "Elérte a riasztási szabályok maximális számát: Töröljön néhány riasztási szabályt, vagy váltson magasabb csomagra, és próbálkozzon újra.",
         "dashboard-already-managed": "Az irányítópultot a Grafana már kiépítette és felügyeli a felhőpéldányban. Javasoljuk, hogy a továbbiakban használja a kiépített irányítópultot. Ha továbbra is át szeretné másolni az irányítópultot a felhőpéldányba, akkor módosítsa az irányítópult azonosítóját az irányítópult JSON-fájljában, mentse az új pillanatképet, és töltse fel újra.",
         "datasource-already-managed": "Az adatforrást a Grafana már kiépítette és felügyeli a felhőpéldányban. Ha ez egy másik erőforrás, állítson be egy másik UID-t, és próbálkozzon újra.",
         "datasource-invalid-url": "Egy adatforrás érvénytelen URL-címmel rendelkezik. Adjon meg egy érvényes URL-címet, és próbálkozzon újra.",
@@ -10339,7 +10340,7 @@
     "invite-user": {
       "invite-button": "Meghívás",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Felhasználó meghívása"
     },
     "item": {
       "add-bookmark": "Hozzáadás könyvjelzőkhöz",
@@ -10562,7 +10563,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Nem található szervezet",
     "select-placeholder": "Szervezet kijelölése"
   },
   "page": {
@@ -10785,7 +10786,7 @@
         "permission": "Nincs engedélye az oldal megtekintésére.",
         "title-access-denied": "Hozzáférés megtagadva"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Nem sikerült betölteni a bővítményt",
       "no-root-app-page-component-found": "Nem található a gyökéralkalmazás oldalkomponense"
     },
     "browse": {
@@ -10829,7 +10830,7 @@
         "update-status-text": "frissített bővítmény"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Biztosan vissza szeretne váltani a(z) {{version}} verzióra? Általában nem javasolt visszaváltani.",
         "downgrade-confirm": "Visszalépés",
         "downgrade-title": "Visszalépés korábbi bővítményverzióra"
       }
@@ -10884,8 +10885,8 @@
       "message": "Nem található bővítmény"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "A hibával kapcsolatos további részletekért tekintse meg a konzolt.",
+      "extension-error-alert-title": "A következő bővítmény betöltése sikertelen volt: „{{pluginId}}/{{extensionTitle}}”"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10922,8 +10923,8 @@
     "install-controls-button": {
       "title-uninstall-modal": "{{plugin}} eltávolítása",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Biztosan eltávolítja ezt a bővítményt?",
+        "confirmText-confirm": "Megerősítés"
       }
     },
     "install-controls-warning": {
@@ -10941,6 +10942,9 @@
       "label-plugin-id": "Bővítményazonosító",
       "label-severity": "Súlyosság"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "A bővítmény nem található. Ellenőrizze, hogy helyes-e az URL-cím, vagy <1></1>lépjen a <3>bővítménykatalógusba</3>.",
       "title-plugin-not-found": "Nem található bővítmény"
@@ -11097,29 +11101,29 @@
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Ez az erőforrás a(z) {{repoType}} ág mögött van.",
+      "not-saved": "Amíg ez az ág össze nem lesz vonva, a szervezet többi Grafana-felhasználója továbbra is a konfigurált alapértelmezett ágba mentett aktuális verziót fogja látni",
+      "open-in-repo-button": "Megnyitás itt: {{repoType}}",
+      "open-pull-request-in-repo": "Összefésülési kérelem megnyitása itt: {{repoType}}",
+      "view-in-repo-button": "A legújabb változások megtekintéséhez nyissa meg a(z) {{repoType}} adattárban.",
+      "view-pull-request-in-repo": "Összefésülési kérelem megtekintése itt: {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "Új erőforrás lett létrehozva egy ágban itt: {{repoType}}.",
+    "title-loaded-pull-request-in-repo": "Ez az erőforrás a(z) {{repoType}} adattárban az imént létrehozott ágból töltődik be, és csak Ön láthatja"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Erőforrás sikeresen mentve",
+  "provisioned-resource-request-handler-dashboard": "Irányítópult sikeresen mentve",
+  "provisioned-resource-request-handler-folder": "A mappa létrehozása sikerült",
   "provisioning": {
     "banner": {
       "message": "Ez a funkció jelenleg aktív fejlesztés alatt áll. A legjobb élmény és a legújabb fejlesztések érdekében javasoljuk a Grafana <2>éjszakai buildjének</2> használatát."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "A kiépítéshez használandó ág",
+      "branch-label": "Ág",
+      "branch-required": "Az ág megadása kötelező",
+      "path-description": "Opcionális alkönyvtár elérési útvonala az adattáron belül",
+      "path-label": "Útvonal",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11128,18 +11132,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Lehetővé teszi a felhasználók számára, hogy kiválasszák, megnyitják-e az összefésülési kérelmet a módosítások mentésekor. Ha az adattár nem teszi lehetővé a főág közvetlen módosítását, akkor is szükség lehet összefésülési kérelemre.",
+      "pr-workflow-label": "Összefésülési kérelemopció engedélyezése mentéskor",
+      "token-description": "Bitbucket alkalmazás jelszava adattár-engedélyekkel",
+      "token-label": "Alkalmazásjelszó",
+      "token-required": "A Bitbucket token megadása kötelező",
+      "token-user-description": "Az alkalmazás jelszavával az adattár eléréséhez használt felhasználónév",
+      "token-user-label": "Felhasználónév",
+      "token-user-required": "A felhasználónév megadása kötelező",
+      "url-description": "A Bitbucket adattár URL-címe",
+      "url-label": "Adattár URL-címe",
+      "url-pattern": "Érvényes Bitbucket adattári URL-nek kell lennie",
+      "url-required": "Az adattár URL-címének megadása kötelező"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Adjon egy egyértelmű nevet ehhez az adattári kapcsolathoz",
@@ -11150,12 +11154,12 @@
       "label-display-name": "Megjelenített név",
       "placeholder-my-repository-connection": "Saját adattári kapcsolat",
       "text-loading-resource-information": "Erőforrás-információk betöltése…",
-      "dashboards-count_one": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} irányítópult",
+      "dashboards-count_other": "{{count}} irányítópult",
       "files-count_one": "{{count}} fájl",
       "files-count_other": "{{count}} fájl",
-      "folders-count_one": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} mappa",
+      "folders-count_other": "{{count}} mappa"
     },
     "check-repository": {
       "check": "Ellenőrzés"
@@ -11229,7 +11233,7 @@
       "title-instant-updates-requests-webhooks": "Azonnali frissítések és lekérések webkapcsokkal.",
       "title-visual-previews-in-pull-requests": "Vizuális előnézetek a lekérésekben képalkotással"
     },
-    "error-title-default": "",
+    "error-title-default": "Hiba",
     "expanded-row": {
       "job-specification": "Feladat részletei",
       "summary": "Összegzés"
@@ -11238,8 +11242,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Kötelező funkcióváltások beállítása"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Irányítópultok kezelése kódként a Gitben, és a kiépítés automatikus frissítése",
+      "manage-your-dashboards-with-remote-provisioning": "A Git-szinkronizálás használatának megkezdése",
       "store-dashboards-in-version-controlled-storage": "Tárolja az irányítópultokat verziókövetéses tárolóban a jobb rendszerezés és az előzmények nyomon követése érdekében"
     },
     "file-history-page": {
@@ -11260,16 +11264,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Hozzáadja az irányítópult változásainak előnézetét a lekérésekben. A Grafana-irányítópultok képei meg lesznek osztva a Git-tárban, és bárki számára láthatóak lesznek, aki hozzáféréssel rendelkezik az adattárhoz.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Előnézeti hivatkozások létrehozása az összefésülési kérelmekhez",
       "description-image-rendering": "Képalkotást igényel. <2>Állítsa be a képalkotást</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(<2>képalkotás</2> és nyilvános hozzáférés engedélyezése szükséges)",
       "description-read-only": "Az erőforrások nem módosíthatók a Grafanán keresztül.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Az adattárbeli változások szinkronizálásának gyakorisága",
+      "error-sync-interval-required": "A szinkronizálási intervallum megadása kötelező",
       "label-enable-previews": "Az irányítópult előnézeteinek engedélyezése a lekérésekben",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Irányítópult-előnézetek generálása",
       "label-read-only": "Csak olvasható",
-      "label-sync-interval": ""
+      "label-sync-interval": "Szinkronizálási intervallum (másodperc)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Nincs találat a lekérdezésre",
@@ -11301,46 +11305,46 @@
       "subtitle-provisioning-feature": "Kiépítési kapcsolatok megtekintése és kezelése"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "A kiépítéshez használandó ág",
+      "branch-label": "Ág",
+      "branch-required": "Az ág megadása kötelező",
+      "path-description": "Opcionális alkönyvtár elérési útvonala az adattáron belül",
+      "path-label": "Útvonal",
+      "pr-workflow-description": "Lehetővé teszi a felhasználók számára, hogy kiválasszák, megnyitják-e az összefésülési kérelmet a módosítások mentésekor. Ha az adattár nem teszi lehetővé a főág közvetlen módosítását, akkor is szükség lehet összefésülési kérelemre.",
+      "pr-workflow-label": "Összefésülési kérelemopció engedélyezése mentéskor",
+      "token-description": "Git-tár hozzáférési tokenje vagy jelszava",
+      "token-label": "Hozzáférési token",
+      "token-required": "A Git-token megadása kötelező",
+      "token-user-description": "A hozzáférési tokennel az adattár eléréséhez használt felhasználónév",
+      "token-user-label": "Felhasználónév",
+      "token-user-required": "A felhasználónév megadása kötelező",
+      "url-description": "A Git-adattár URL-címe",
+      "url-label": "Adattár URL-címe",
+      "url-pattern": "Érvényes Git adattári URL-nek kell lennie",
+      "url-required": "Az adattár URL-címének megadása kötelező"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "A kiépítéshez használandó ág",
+      "branch-label": "Ág",
+      "branch-required": "Az ág megadása kötelező",
+      "path-description": "Opcionális alkönyvtár elérési útvonala az adattáron belül",
+      "path-label": "Útvonal",
+      "pr-workflow-description": "Lehetővé teszi a felhasználók számára, hogy kiválasszák, megnyitják-e az összefésülési kérelmet a módosítások mentésekor. Ha az adattár nem teszi lehetővé a főág közvetlen módosítását, akkor is szükség lehet összefésülési kérelemre.",
+      "pr-workflow-label": "Összefésülési kérelemopció engedélyezése mentéskor",
+      "token-description": "GitHub személyes hozzáférési token adattár-engedélyekkel",
+      "token-label": "Személyes hozzáférési token",
+      "token-required": "A GitHub-token megadása kötelező",
+      "url-description": "A GitHub-adattár URL-címe",
+      "url-label": "Adattár URL-címe",
+      "url-pattern": "Érvényes GitHub adattári URL-nek kell lennie",
+      "url-required": "Az adattár URL-címének megadása kötelező"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "A kiépítéshez használandó ág",
+      "branch-label": "Ág",
+      "branch-required": "Az ág megadása kötelező",
+      "path-description": "Opcionális alkönyvtár elérési útvonala az adattáron belül",
+      "path-label": "Útvonal",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11349,15 +11353,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Lehetővé teszi a felhasználók számára, hogy kiválasszák, megnyitják-e az egyesítési kérelmet a módosítások mentésekor. Ha az adattár nem teszi lehetővé a főág közvetlen módosítását, akkor is szükség lehet egyesítési kérelemre.",
+      "pr-workflow-label": "Egyesítési kérelemre vonatkozó opció engedélyezése mentéskor",
+      "token-description": "GitLab projekthozzáférési token adattár-engedélyekkel",
+      "token-label": "Projekthozzáférési token",
+      "token-required": "A GitLab-token megadása kötelező",
+      "url-description": "A GitLab-adattár URL-címe",
+      "url-label": "Adattár URL-címe",
+      "url-pattern": "Érvényes GitLab adattári URL-nek kell lennie",
+      "url-required": "Az adattár URL-címének megadása kötelező"
     },
     "history-view": {
       "not-found": "Nem található"
@@ -11385,18 +11389,18 @@
       "starting": "Kezdés…",
       "status": {
         "title-error-running-job": "Hiba történt a feladat futtatásakor",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "A feladat sikeresen befejeződött",
+        "title-warning-running-job": "A feladat figyelmeztetésekkel befejeződött"
       },
       "summary": "Összegzés",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Hiba történt az aktív feladat lekérése során"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Helyi fájlrendszer elérési útja az adattárhoz",
+      "path-label": "Adattár elérési útja",
+      "path-required": "Az adattár elérési útvonalának megadása kötelező"
     },
     "mode-options": {
       "folder": {
@@ -11422,7 +11426,7 @@
     },
     "repository-actions": {
       "settings": "Beállítások",
-      "source-code": ""
+      "source-code": "Forráskód"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11488,22 +11492,22 @@
       "title-queued-for-deletion": "Törlésre vár"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Válasszon egy szolgáltatót:",
+      "configure-file": "Fájlkiépítés konfigurálása",
+      "configure-with-provider": "Konfigurálás a következővel: {{ provider }}",
+      "provider-not-listed": "Ha a szolgáltatója nem szerepel a listán:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Csatlakozás Bitbucket-adattárakhoz",
+      "github": "GitHub",
+      "github-description": "Csatlakozás GitHub-adattárakhoz",
+      "gitlab": "GitLab",
+      "gitlab-description": "Csatlakozás GitLab-adattárakhoz",
+      "local": "Helyi",
+      "local-description": "Fájlkiépítés konfigurálása",
+      "pure-git": "Pure Git",
+      "pure-git-description": "Csatlakozás bármely Git-adattárhoz"
     },
     "resource-view": {
       "base": "Alap",
@@ -11534,11 +11538,11 @@
       "label-current-step": "Jelenlegi lépés",
       "label-pending-step": "Függőben lévő lépés"
     },
-    "success-title-default": "",
+    "success-title-default": "Sikerült",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "A feladat indítása nem sikerült",
+      "error-no-repository-name": "Nincs megadva az adattár neve",
+      "error-starting-job": "Hiba a feladat indításakor"
     },
     "sync-repository": {
       "body-edit-configuration": "A konfiguráció szerkesztése",
@@ -11566,7 +11570,7 @@
       "go-to": "Tovább ide:",
       "make-sure": "Mindenképpen foglalja bele ezeket az engedélyeket"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Figyelmeztetés",
     "wizard": {
       "alert-point-1": "A folyamat során nem lehet erőforrásokat létrehozni, szerkeszteni vagy törölni. Az utolsó lépésben el fognak tűnni.",
       "alert-point-2": "A kiépítés befejezése után az erőforrások újra megjelennek, és külső tárolóeszközön keresztül kezelhetők.",
@@ -11576,10 +11580,10 @@
       "button-next": "Befejezés",
       "button-start": "Szinkronizálás indítása",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Ez törli az adattár konfigurációját, és az összes előrehaladás el fog veszni. Biztosan elveti a módosításokat?",
+        "confirm": "Igen, elvetés",
+        "dismiss": "Munkavégzés folytatása",
+        "title": "Elveti az adattár beállítását?"
       },
       "step-bootstrap": "Válassza ki, mit szeretne szinkronizálni",
       "step-connect": "Kapcsolódás",
@@ -11595,7 +11599,7 @@
     "wizard-content": {
       "button-cancel": "Mégse",
       "button-cancelling": "Megszakítás…",
-      "button-previous": "",
+      "button-previous": "Előző",
       "button-submitting": "Küldés…",
       "error-instance-repository-exists": "A példánytár már létezik"
     }
@@ -11996,7 +12000,7 @@
         "recommended": "Ajánlott",
         "results": "Eredmények"
       },
-      "search": ""
+      "search": "{{parentTitle}} keresése"
     }
   },
   "search": {
@@ -12077,7 +12081,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Nem található szolgáltatási fiók",
     "select-aria-label": "Szolgáltatási fiókválasztó",
     "select-placeholder": "Kezdjen el gépelni a szolgáltatási fiókok kereséséhez"
   },
@@ -12123,10 +12127,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Szolgáltatási fióktoken hozzáadása",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Biztosan törli ezt a szolgáltatási fiókot?",
+      "body-disable-service-account": "Biztosan le szeretné tiltani ezt a szolgáltatási fiókot?",
+      "confirmText-delete-service-account": "Szolgáltatási fiók törlése",
+      "confirmText-disable-service-account": "Szolgáltatási fiók letiltása",
       "delete-service-account": "Szolgáltatási fiók törlése",
       "disable-service-account": "Szolgáltatási fiók letiltása",
       "enable-service-account": "Szolgáltatási fiók engedélyezése",
@@ -12153,7 +12157,7 @@
       "used-by": "Felhasználta:"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Mentés",
       "edit": "Szerkesztés"
     },
     "service-account-role-row": {
@@ -12167,16 +12171,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Szolgáltatási fiók hozzáadása",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Biztosan törli a(z) {{serviceAccountName}} szolgáltatási fiókot?",
+      "body-disable-service-account": "Biztosan letiltja a(z) „{{accountToDisable}}” fiókot?",
+      "confirmText-delete": "Törlés",
+      "confirmText-disable-service-account": "Szolgáltatási fiók letiltása",
       "placeholder-search-service-account-by-name": "Szolgáltatási fiók keresése név alapján",
       "sub-title": "A szolgáltatási fiókok és tokenjeik felhasználhatók a Grafana API-val történő hitelesítésre. További információkat a <2>dokumentációnkban talál.</2>",
       "title-delete-service-account": "Szolgáltatási fiók törlése",
       "title-disable-service-account": "Szolgáltatási fiók letiltása",
-      "body-delete_one": "",
-      "body-delete_other": ""
+      "body-delete_one": "Biztosan törli a(z) {{serviceAccountName}} szolgáltatási fiókot és a(z) {{count}} hozzá kapcsolódó tokent?",
+      "body-delete_other": "Biztosan törli a(z) {{serviceAccountName}} szolgáltatási fiókot és a(z) {{count}} hozzá kapcsolódó tokent?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "A token lejárt",
@@ -12190,7 +12194,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Exportálás képként",
       "export-json-title": "Exportálás JSON-fájlként",
       "share-externally-title": "Külső megosztás",
       "share-internally-title": "Belső megosztás",
@@ -12227,17 +12231,17 @@
       "view-button-yaml": "YAML megtekintése"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Képexportálási műveletek",
+      "cancel-button": "Mégse",
+      "download-button": "Kép letöltése",
+      "error-title": "A kép generálása sikertelen volt",
+      "generate-button": "Kép generálása",
+      "generating": "Kép generálása...",
+      "info-text": "Irányítópult mentése képként",
+      "preview": "Előnézet",
+      "preview-aria": "Generált előnézeti kép",
+      "preview-region": "Előnézeti kép",
+      "title": "Exportálás képként"
     },
     "library": {
       "info": "Könyvtárpanel létrehozása."
@@ -12247,7 +12251,7 @@
       "info-text": "Létrehozhat egy közvetlen hivatkozást ehhez az irányítópulthoz vagy panelhez, az alábbi lehetőségekkel testreszabva.",
       "link-url": "Hivatkozás URL-címe",
       "render-alert": "Az Image Renderer bővítmény nincs telepítve",
-      "render-instructions": "",
+      "render-instructions": "Képek rendereléséhez telepítenie kell a <2>Grafana Image Renderer bővítményt</2>. Kérjük, vegye fel a kapcsolatot Grafana-rendszergazdájával a bővítmény telepítéséhez.",
       "rendered-image": "Renderelt kép közvetlen hivatkozása",
       "save-alert": "Az irányítópult nincs mentve",
       "save-dashboard": "Panelkép rendereléséhez először mentenie kell az irányítópultot.",
@@ -12315,11 +12319,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Mentse az irányítópultot a képgenerálás engedélyezéséhez",
+    "download-disabled-help": "A letöltés engedélyezéséhez először hozzon létre egy képet",
+    "error-title": "A kép generálása sikertelen volt",
     "form": {
-      "label": ""
+      "label": "Panel képbeállításai"
     },
     "preview": {
       "title": "Panel előnézete"
@@ -12634,17 +12638,17 @@
       "label-small": "Kicsi"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Műveletek",
+      "auto": "Automatikus",
+      "color-background": "Színes háttér",
+      "color-text": "Színes szöveg",
+      "data-links": "Adathivatkozások",
+      "gauge": "Mérőeszköz",
+      "image": "Kép",
+      "json": "JSON-nézet",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Lekerekített",
+      "sparkline": "Értékgörbe"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "Ha ki van választva, a teljes sor olyan színű lesz, mint ez a cella.",
@@ -12673,7 +12677,7 @@
     "description-count-rows": "Egyetlen szám megjelenítése az összes adatsorhoz",
     "description-fields": "Válassza ki a kiszámítandó mezőket",
     "description-min-column-width": "Az oszlop automatikus átméretezésének minimális szélessége",
-    "description-wrap-header-text": "",
+    "description-wrap-header-text": "Engedélyezi a szöveg tördelését az oszlopfejléceknél",
     "image-cell-options-editor": {
       "description-alt-text": "Helyettesítő szöveg, amely akkor jelenik meg, ha egy kép nem jeleníthető meg, és amely a képernyőolvasót használó felhasználóknak hasznos",
       "description-title-text": "Szöveg, amely akkor jelenik meg, amikor a kép fölé viszik a kurzort",
@@ -12757,7 +12761,7 @@
     "tag-option-label": "Címkézési opció"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Nem található csapat",
     "select-aria-label": "Csapatválasztó",
     "select-placeholder": "Csapat kijelölése"
   },
@@ -13061,15 +13065,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Bináris művelet",
+          "reduce-row": "Sor csökkentése",
+          "row-index": "Sorindex",
+          "unary-operation": "Egyváltozós művelet"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Kumulatív függvények",
+        "window-functions": "Ablakfüggvények"
       },
       "label-alias": "Alias",
       "label-mode": "Üzemmód",
@@ -13087,9 +13091,9 @@
       "label-name": "Név",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Keretnév másolása a mezőnévbe",
+          "ignore-the-frame-name": "A keretnév figyelmen kívül hagyása",
+          "label-frame": "Címke hozzáadása a keretnévvel"
         }
       },
       "placeholder-frame": "Keret"
@@ -13102,9 +13106,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Konvertálandó mezőtípusú transzformátor hozzáadása",
       "aria-label-remove-convert-field-type-transformer": "Konvertálandó mezőtípusú transzformátor eltávolítása",
-      "convert-field-type": "",
+      "convert-field-type": "Mezőtípus konvertálása",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Mező konvertálása egy megadott mezőtípusra."
       },
       "label": {
         "browser": "Böngésző",
@@ -13117,11 +13121,11 @@
       "label-join-with": "Csatlakozás ezzel:",
       "label-set-timezone": "Időzóna beállítása",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Mezőtípus konvertálása"
       },
       "placeholder-type": "Típus",
       "tags": {
-        "format-field": ""
+        "format-field": "Mező formázása"
       },
       "tooltip-explicit-separator-joining-array-values": "Explicit elválasztó használata tömbértékek egyesítésekor",
       "tooltip-input-format": "Adja meg a beviteli mező formátumát, hogy a Grafana helyesen tudja elemezni a dátumkarakterláncot.",
@@ -13147,13 +13151,13 @@
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Az összes mező egyesítése egyetlen keretbe."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Mezők összefűzése"
         },
         "tags": {
-          "combine": ""
+          "combine": "Egyesítés"
         }
       }
     },
@@ -13168,11 +13172,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Mezők elemzése a tartalomból (JSON, címkék stb.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Mező kijelölése"
         }
       },
       "label-delimiter": "Elválasztójel",
@@ -13181,7 +13185,7 @@
       "label-replace-all-fields": "Összes mező cseréje",
       "label-source": "Forrás",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Mezők kivonása"
       },
       "placeholder-auto": "Automatikus",
       "placeholder-select-delimiter": "Elválasztójel kijelölése…",
@@ -13192,20 +13196,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Mezőérték használata országok, államok vagy repülőterek kereséséhez."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nem található szövegmező"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Szövegmező kiválasztása"
         }
       },
       "label-field": "Mező",
       "label-lookup": "Keresés",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Mezők keresése az erőforrásban"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13216,23 +13220,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "A lekérdezési eredmények egyes részeinek eltávolítása regex-minta használatával."
       },
       "label-from-variable": "Változóból",
       "label-identifier": "Azonosító",
       "label-use-variable": "Változó használata",
       "label-variable": "Változó",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Mezők szűrése név alapján"
       },
       "placeholder-regular-expression-pattern": "A reguláris kifejezés mintája"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Sorok eltávolítása az adatokból a kezdeti lekérdezés alapján"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Adatok szűrése lekérdezés szerint"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13246,33 +13250,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Feltétel hozzáadása",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Sorok eltávolítása a lekérdezési eredményekből a felhasználó által definiált szűrők használatával."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Összes egyezése",
+          "match-any": "Bármely egyezése"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Kizárás",
+          "include": "Tartalmazza"
         }
       },
       "label-conditions": "Feltételek",
       "label-filter-type": "Szűrő típusa",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Adatok szűrése értékek alapján"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nem található szövegmező"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Szövegmező kiválasztása"
         }
       },
       "label-field": "Mező",
@@ -13281,10 +13285,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Karakterláncmezők formázásának módosítása."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Karakterlánc formázása"
       }
     },
     "format-time-transfomer-editor": {
@@ -13296,66 +13300,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Időmező kimeneti formátumának beállítása"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Idő formázása"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Használja a sorértékeket egy új mező kiszámításához."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Mező hozzáadása a számításból"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Állítsa be az egységet, a minimumot, a maximumot és az egyéb értékeket."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Konfigurálás a lekérdezési eredményekből"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Hőtérképadatok generálása a forrásadatokból."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Hőtérkép létrehozása"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "A címkézett eredményeket címkékkel összekapcsolt táblázatba rendezi."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Egyesítés címkék alapján"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Egykeretes adatkészlet felosztása több adatsorra."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Partíció értékek szerint"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Az egyes sorok konvertálása dinamikus konfigurációval rendelkező mezővé."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Sorok mezőkbe"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Térbeli műveletek alkalmazása a lekérdezési eredményekre."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Térbeli műveletek"
       }
     },
     "get-timezone-options": {
@@ -13387,8 +13391,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Számítás",
+          "group-by": "Csoportosítási szempont"
         }
       },
       "placeholder-ignored": "Mellőzve",
@@ -13396,42 +13400,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Csoportosítsa az adatokat egy mezőérték szerint, és hozzon létre összesített adatokat."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Csoportosítási szempont"
       },
       "title-calc-alert": "A számításoknak nem lesz hatásuk, ha nincsenek csoportosított mezők"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Csoportosítsa az adatokat egy mezőérték szerint, és hozzon létre beágyazott táblázatokat a csoportosított adatokkal."
       },
       "description-show-field-names": "Ha engedélyezve van, a beágyazott táblázatok a mezőneveket táblázatfejlécként jelenítik meg",
       "label-show-field-names-in-nested-tables": "Mezőnevek megjelenítése a beágyazott táblázatokban",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Csoportosítás beágyazott táblázatokba"
       },
       "title-calc-alert": "A számításoknak nem lesz hatásuk, ha a mezők nincsenek csoportosítva."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Adatok összegzése és átszervezése három mező alapján."
       },
       "label-cell-value": "Cellaérték",
       "label-column": "Oszlop",
       "label-empty-value": "Üres érték",
       "label-row": "Sor",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Csoportosítás mátrixba"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Számítson ki egy hisztogramot a bemeneti adatokból."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Hisztogram"
       },
       "placeholder-auto": "Automatikus",
       "placeholder-default": "Alapértelmezett: 30",
@@ -13443,14 +13447,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Két vagy több táblázat sorát egyesíti egy kapcsolódó mező alapján."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Egyesítés mező szerint"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Kötelező",
       "info": {
         "input-contain-labels": "A bemenet nem tartalmaz címkéket",
         "no-input-or-labels-found": "Nem található bemenet (vagy címke)",
@@ -13474,8 +13478,8 @@
       "label-value-field-name": "Értékmező neve",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Oszlopok",
+          "rows": "Sorok"
         }
       },
       "placeholder-optional-select-label": "(Opcionális) Címke kijelölése",
@@ -13483,18 +13487,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "A sorozatokat idő szerint csoportosítja, és címkéket ad vissza mezőként."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Címkék mezőkhöz"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "A megjelenített elemek számának korlátozása."
       },
       "name": {
-        "limit": ""
+        "limit": "Korlát"
       },
       "placeholder-value-or-variable": "Érték vagy változó"
     },
@@ -13507,11 +13511,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Több sorozat egyesítése. Az értékek egy sorba lesznek egyesítve."
       },
       "merge-effect-applied-single-frame": "Egyetlen keretre alkalmazva nincs hatása az egyesítésnek.",
       "name": {
-        "merge": ""
+        "merge": "Sorozatok/táblázatok egyesítése"
       }
     },
     "multi-info": {
@@ -13523,14 +13527,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Mezők átrendezése, elrejtése vagy átnevezése."
       },
       "field-order": "Mezőrendezés",
       "field-order-auto": "Automatikus",
       "field-order-manual": "Kézi",
       "first-frame-warning": "A mezők rendszerezése csak egyetlen kerettel működik. Először érdemes lehet egyesítési transzformációt alkalmazni, vagy szűrni a bemenetet.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Mezők rendezése név szerint"
       }
     },
     "partion-by-values-editor": {
@@ -13558,10 +13562,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Az adatkereteket széles formátumból hosszú formátumba alakítja."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Idősorok előkészítése"
       }
     },
     "prepare-time-series-editor": {
@@ -13569,26 +13573,26 @@
       "label-info": "Információ",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Minden keret átalakítása hosszú formátumba"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Hosszú idősor"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Új keretet hoz létre minden idő/szám párhoz"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Többkeretes idősor"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Egyetlen, idő szerint összekapcsolt keretet hoz létre"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Széles idősor"
         }
       }
     },
@@ -13603,7 +13607,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Az összes sor vagy adatpont egyetlen értékre csökkentése (pl. max, középérték)."
       },
       "label-calculations": "Számítások",
       "label-include-time": "Idővel együtt",
@@ -13620,7 +13624,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Csökkentés"
       },
       "placeholder-choose-stat": "Válasszon statisztikát"
     },
@@ -13630,18 +13634,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Hozzon létre egy új adatkeretet, amely egy statisztikai modell által előrejelzett értékeket tartalmaz."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Trendvonal"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Harmadfokú",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Másodfokú",
         "quartic": "Negyedfokú",
-        "quintic": "Ötödfokú"
+        "quintic": "Ötödfokú",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Fok",
       "label-model-type": "Modelltípus",
@@ -13656,16 +13665,17 @@
       },
       "regression": "regresszió",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Regressziószámítás"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Előre jelzendő X,Y pontok száma"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "A lekérdezési eredmények egyes részeinek átnevezése reguláris kifejezés és helyettesítési minta használatával."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Mezők átnevezése reguláris kifejezéssel"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13679,33 +13689,33 @@
       "label-mode": "Üzemmód",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Két táblázat adatainak kombinálása, ha a két táblázat közös mezőiben egyező értékek vannak.",
+          "join-on-a-field": "Duplikált értékekkel rendelkező mezőértékek alapján egyesít. A nem teljesítményorientált külső egyesítés leginkább táblázatos (SQL-szerű) adatokhoz használható.",
+          "keep-all-rows": "Minden táblázat összes sorát megtartja, amelynek van értéke. Összekapcsolja a különböző mezőértékeket. Teljesítményorientált, és leginkább idősorokhoz használható."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Belső",
+          "outer-tabular": "Külső (táblázatos)",
+          "outer-time-series": "Külső (idősor)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Több sorozatot egyesít. Időt, mérőszámot és értékeket ad vissza sorokként."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Sorozatok sorokká alakítása"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Mezők rendezése egy keretben."
       },
       "label-field": "Mező",
       "label-reverse": "Fordított",
       "name": {
-        "sort-by": ""
+        "sort-by": "Rendezés alapja"
       },
       "placeholder-select-field": "Mező kijelölése"
     },
@@ -13728,13 +13738,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Idősoradatok konvertálása táblázatsorokká, hogy táblázatos vagy értékgörbés formátumban lehessen megtekinteni őket."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "Az idősor táblázattá alakításához legalább egy idősorkeret szükséges. Jelenleg nincs ilyen."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Idősor táblázatba"
       }
     },
     "time-series-table-transform-editor": {
@@ -13752,15 +13762,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Adatkeret transzponálása."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Transzponálás"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Forgatás",
+        "transform": "Transzformáció",
+        "translate": "Fordítás"
       }
     },
     "unary-operation-editor": {
@@ -13769,13 +13779,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Új mezők kiszámítása",
+        "combine": "Egyesítés",
+        "create-new-visualization": "Új vizualizáció létrehozása",
+        "filter": "Szűrő",
+        "perform-spatial-operations": "Térbeli műveletek végrehajtása",
+        "reformat": "Formázás",
+        "reorder-and-rename": "Átrendezés és átnevezés"
       },
       "special-value-options": {
         "description": {
@@ -13846,7 +13856,7 @@
     "title": "Szervezetek"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Nincsenek felhasználók",
     "select-aria-label": "Felhasználóválasztó",
     "select-placeholder": "Kezdjen el gépelni a felhasználó kereséséhez"
   },
@@ -13932,8 +13942,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Biztosan törli a(z) „{{variableToDelete}}” változót?",
+      "confirmText-delete": "Törlés",
       "title-delete-variable": "Változó törlése"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13983,33 +13993,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Hogyan kell rendezni ennek a változónak az értékeit?",
-      "name-sort": "",
+      "name-sort": "Rendezés",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Betűrendben (növekvő)",
+          "alphabetical-caseinsensitive-asc": "Betűrendben (kis- és nagybetűk megkülönböztetése nélkül, növekvő)",
+          "alphabetical-caseinsensitive-desc": "Betűrendben (kis- és nagybetűk megkülönböztetése nélkül, csökkenő)",
+          "alphabetical-desc": "Betűrendben (csökkenő)",
+          "disabled": "Letiltva",
+          "natural-asc": "Természetes (növekvő)",
+          "natural-desc": "Természetes (csökkenő)",
+          "numerical-asc": "Numerikus (növekvő)",
+          "numerical-desc": "Numerikus (csökkenő)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Lehetőség hozzáadása",
+      "description": "Egyéni beállítások hozzáadása a lekérdezési eredmények mellett",
+      "label-placeholder": "címke megjelenítése",
+      "remove-option-button-label": "Opció eltávolítása",
+      "value-placeholder": "érték, alapértelmezett üres karakterlánc"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "A statikus opciók rendezésének módja a lekérdezési eredményekkel"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Alapértelmezett érték",
       "placeholder-default-value-if-any": "alapértelmezett érték, ha van",
       "text-options": "Szövegbeállítások"
     },
@@ -14038,8 +14048,8 @@
       "description-optional-display-name": "Opcionális megjelenítendő név",
       "description-template-variable-characters": "A sablonváltozó neve. (Max. 50 karakter)",
       "general": "Általános",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Címke",
+      "name-name": "Név",
       "placeholder-descriptive-text": "Leírószöveg",
       "placeholder-label-name": "Címkenév",
       "placeholder-variable-name": "Változónév",
@@ -14055,13 +14065,13 @@
       "tooltip-remove-variable": "Változó eltávolítása"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Leírás"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Összes érték ki- és bekapcsolása"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Változó típusának kiválasztása"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Használatok megjelenítése"
diff --git a/public/locales/id-ID/grafana.json b/public/locales/id-ID/grafana.json
index 8a28f512a8a..27aba8d5dee 100644
--- a/public/locales/id-ID/grafana.json
+++ b/public/locales/id-ID/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Beberapa fitur stabil (GA) dan diaktifkan secara default, sedangkan beberapa fitur lainnya saat ini dalam fase Beta awal, tersedia untuk penggunaan awal.",
       "confirm-modal-body-2": "Sebaiknya pahami implikasi dari setiap perubahan fitur sebelum melakukan modifikasi.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Simpan perubahan",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Ketersediaan umum",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Hapus org",
-      "confirmText-delete": "",
+      "confirmText-delete": "Hapus",
       "title-delete": "Hapus"
     },
     "anon-users": {
       "not-found": "Pengguna anonim tidak ditemukan."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Yakin ingin keluar dari semua perangkat secara paksa?",
+      "confirmText-confirm-logout": "Konfirmasi keluar",
+      "confirmText-force-logout": "Paksa keluar",
       "title-force-logout-from-all-devices": "Paksa keluar dari semua perangkat"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Simpan"
     },
     "edit-org": {
       "access-denied": "Anda tidak memiliki izin untuk melihat pengguna di organisasi ini. Untuk memperbarui organisasi ini, hubungi administrator server Anda.",
@@ -216,11 +216,11 @@
       "not-editable": "Peran pengguna ini tidak dapat diedit karena disinkronkan dari penyedia autentikasi Anda. Lihat <1> dokumen autentikasi Grafana </1> untuk detailnya."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Yakin ingin menghapus pengguna {{user}}?",
       "columns": {
         "aria-label-role": "Peran"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Hapus",
       "delete-aria-label": "Hapus pengguna: {{name}}",
       "title-delete": "Hapus"
     },
@@ -252,7 +252,7 @@
       "info-description": "Pengaturan sistem ini ditentukan dalam grafana.ini atau custom.ini (atau ditimpa dalam variabel ENV). Untuk mengubahnya, saat ini Anda perlu memulai ulang Grafana."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Konfirmasi penghapusan"
     },
     "upgrade-info": {
       "title": "Lisensi Enterprise"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Ubah",
-      "confirmText-change": "",
+      "confirmText-change": "Ubah",
       "grafana-admin-key": "Admin Grafana",
       "grafana-admin-no": "Tidak",
       "grafana-admin-yes": "Ya",
       "title": "Izin"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Yakin ingin menghapus pengguna ini?",
+      "body-disable": "Yakin ingin menonaktifkan pengguna ini?",
+      "confirmText-delete-user": "Hapus pengguna",
+      "confirmText-disable-user": "Nonaktifkan pengguna",
       "delete-button": "Hapus pengguna",
       "disable-button": "Nonaktifkan pengguna",
       "edit-button": "Edit",
@@ -331,7 +331,7 @@
       "title-disable-user": "Nonaktifkan pengguna"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Simpan"
     },
     "user-sessions": {
       "browser-column": "Browser dan OS",
@@ -382,12 +382,12 @@
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Tombol Aturan Peringatan AI gagal dimuat",
+        "feedback-button": "Tombol Umpan Balik AI gagal dimuat",
+        "improve-annotations-button": "Tombol Tingkatkan Anotasi AI gagal dimuat",
+        "improve-labels-button": "Tombol Tingkatkan Label AI gagal dimuat",
+        "template-button": "Tombol Templat AI gagal dimuat",
+        "triage-button": "Tombol Triase AI gagal dimuat"
       }
     },
     "alert": {
@@ -489,7 +489,7 @@
       "title-muting-grouping-and-timings": "Pembisuan, pengelompokan, dan pengaturan waktu"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Tidak ada sumber data yang ditemukan"
     },
     "alert-menu": {
       "copy-link": "Salin tautan",
@@ -515,7 +515,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Aturan peringatan"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -583,7 +583,7 @@
       "view-configuration": "Lihat konfigurasi"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Ya, reset konfigurasi",
       "gma-manual-configuration-description": "Konfigurasi internal Alertmanager Grafana tidak dapat diubah secara manual. Untuk mengubah konfigurasi ini, edit setiap sumber daya melalui UI.",
       "gma-manual-configuration-is-not-supported": "Perubahan konfigurasi manual tidak didukung",
       "message": {
@@ -598,13 +598,13 @@
       "title-resetting-alertmanager-configuration": "Mengatur ulang konfigurasi Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Yakin ingin memulihkan konfigurasi ke versi ini? Semua perubahan yang belum disimpan akan hilang.",
       "columns": {
         "compare": "Bandingkan",
         "restore": "Pulihkan",
         "text-latest": "Terkini"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Ya, pulihkan konfigurasi",
       "loading": "Memuat...",
       "no-previous-configurations": "Tidak ada konfigurasi sebelumnya",
       "this-might-take-a-while": "Harap tunggu...",
@@ -884,10 +884,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Tindakan lainnya untuk titik kontak \"{{contactPointName}}\"",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Hapus",
       "button-edit": "Edit",
       "button-view": "Lihat",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Ekspor",
       "export-label-export": "Ekspor",
       "label-delete": "Hapus",
       "label-manage-permissions": "Kelola izin",
@@ -1420,7 +1420,7 @@
       "label-disable-resolved-message": "Nonaktifkan pesan terselesaikan"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Memuat grup...",
       "message": {
         "must-be-a-positive-integer": "Harus berupa bilangan bulat positif.",
         "must-enter-a-group-name": "Harus memasukkan nama grup"
@@ -1517,7 +1517,7 @@
       "group-loading-error": "Kesalahan saat memuat grup",
       "interval": "Interval",
       "namespace": "Ruang nama",
-      "new": "",
+      "new": "Baru",
       "title": {
         "back": ""
       }
@@ -1549,7 +1549,7 @@
     },
     "group-loader": {
       "group-load-failed": "Gagal memuat aturan dari grup {{ groupName }} di {{ namespaceName }}",
-      "no-rules": ""
+      "no-rules": "Tidak ada aturan yang ditemukan di grup ini"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "Grup sedang dihapus"
@@ -1878,10 +1878,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Tidak ada sumber data yang ditemukan"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Yakin ingin menghapus \"{{muteTiming}}\"?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Dinonaktifkan",
@@ -2132,10 +2132,10 @@
         "conflict": "Pohon kebijakan pemberitahuan telah diperbarui oleh pengguna lain.",
         "error-code": "Pesan kesalahan: \"{{error}}\"",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Tidak dapat menambahkan atau memperbarui rute: pencocok bertentangan dengan pohon perutean eksternal jika kami menggabungkan pencocok {{-matchers}}. Ini akan membuat rute tidak dapat dijangkau."
         },
         "suffix": "Muat ulang halaman untuk mencoba lagi.",
-        "title": ""
+        "title": "Gagal menambahkan atau memperbarui kebijakan pemberitahuan"
       },
       "n-more-policies_other": "{{count}} kebijakan tambahan"
     },
@@ -2190,7 +2190,7 @@
     "query-and-expressions-step": {
       "add-query": "Tambahkan kueri",
       "body-queries-expressions-configured": "Buat setidaknya satu kueri atau pola untuk diperingatkan",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Nonaktifkan",
       "expressions": "Pola",
       "loading-data-sources": "Memuat sumber data...",
       "manipulate-returned-queries-other-operations": "Manipulasi data yang dikembalikan dari kueri dengan matematika dan operasi lainnya.",
@@ -2244,7 +2244,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Aturan pencatatan"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Tidak dapat memuat editor kueri karena: {{errorMessage}}"
@@ -2264,7 +2264,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Anda perlu mengatur grup evaluasi baru untuk aturan yang disalin karena grup evaluasi awal telah disediakan dan tidak dapat digunakan untuk aturan yang dibuat di UI.",
       "body-not-provisioned": "Aturan baru tidak <1>akan</1> ditandai sebagai aturan yang disediakan.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Salin",
       "title-copy-provisioned-alert-rule": "Salin aturan peringatan yang disediakan"
     },
     "redirect-to-rule-viewer": {
@@ -2487,7 +2487,7 @@
       "new-alert-rule": "Aturan peringatan baru",
       "new-datasource-recording-rule": "Aturan Perekaman sumber data baru",
       "new-grafana-recording-rule": "Aturan Perekaman Grafana baru",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Aturan peringatan baru untuk ekspor",
       "pagination": {
         "next-page": "Tampilkan lebih banyak..."
       },
@@ -2658,7 +2658,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Pengelola peringatan"
       }
     },
     "settings-content": {
@@ -2796,7 +2796,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Refresh pratinjau",
-      "empty-state": "",
+      "empty-state": "Tambahkan isi templat untuk melihat pratinjau",
       "label-preview": "Pratinjau",
       "refresh": "Muat ulang"
     },
@@ -2815,7 +2815,7 @@
       "loading": "Memuat...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Pilih templat notifikasi"
         },
         "label": {
           "select-notification-template": "Pilih templat pemberitahuan"
@@ -2843,8 +2843,8 @@
     },
     "templates-table": {
       "actions": "Tindakan",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Yakin ingin menghapus grup templat \"{{template}}\"?",
+      "confirmText-yes-delete": "Ya, hapus",
       "no-templates-defined": "Tidak ada templat yang ditentukan.",
       "template-group": "Grup templat",
       "title-delete-template-group": "Hapus grup templat"
@@ -2899,7 +2899,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Kelola aturan peringatan, aturan pencatatan, dan interval evaluasi"
       }
     },
     "to-gma": {
@@ -2979,7 +2979,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Ya, hapus"
       }
     },
     "use-delete-policy-modal": {
@@ -3139,7 +3139,7 @@
       "annotation": "Anotasi",
       "first-value": "Nilai pertama",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Nama bidang tidak diketahui"
     },
     "empty-state": {
       "button-title": "Tambahkan kueri anotasi",
@@ -3149,12 +3149,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Ketika bidang ini didefinisikan, anotasi akan diperlakukan sebagai rentang",
+        "results-split-on-comma": "Hasilnya akan dipisah koma (,)"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}, atau bidang teks pertama",
+        "time-or-the-first-field": "{{defaultField}}, atau bidang waktu pertama"
       }
     },
     "standard-annotation-query-editor": {
@@ -3232,9 +3232,9 @@
       "define-allowed-teams-ids-label": "Tentukan ID tim yang diizinkan",
       "display-name-description": "Akan ditampilkan di halaman login sebagai \"Masuk dengan ...\". Berguna jika Anda menggunakan lebih dari satu penyedia identitas atau protokol SSO.",
       "display-name-label": "Nama tampilan",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Parameter untuk menunjukkan domain pengguna di penyewa Azure AD/Entra ID dan menyederhanakan proses masuk.",
+      "domain-hint-label": "Petunjuk domain",
+      "domain-hint-valid-domain": "Bidang ini harus berupa domain yang valid.",
       "email-attribute-name-description": "Nama kunci yang akan digunakan untuk pencarian email pengguna dalam peta atribut token ID OAuth2.",
       "email-attribute-name-label": "Nama atribut email",
       "email-attribute-path-description": "Ekspresi JMESPath yang digunakan untuk pencarian email pengguna dari informasi pengguna.",
@@ -3251,11 +3251,11 @@
       "id-token-attribute-name-label": "Nama atribut token ID",
       "login-attribute-path-description": "Ekspresi JMESPath yang digunakan untuk pencarian login pengguna dari token ID pengguna.",
       "login-attribute-path-label": "Jalur atribut login",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Persetujuan",
+      "login-prompt-description": "Menunjukkan jenis interaksi pengguna saat pengguna masuk dengan IdP.",
+      "login-prompt-label": "Permintaan masuk",
+      "login-prompt-login": "Masuk",
+      "login-prompt-select-account": "Pilih akun",
       "managed-identity-client-id-description": "ID klien identitas terkelola dari kredensial identitas federasi pada aplikasi OAuth2 Anda.",
       "managed-identity-client-id-label": "ID klien identitas yang dikelola FIC",
       "name-attribute-path-description": "Ekspresi JMESPath yang digunakan untuk pencarian nama pengguna dari token ID pengguna.\nNama ini akan digunakan sebagai nama tampilan pengguna.",
@@ -3291,7 +3291,7 @@
       "team-ids-github": "Daftar bilangan bulat ID Tim.",
       "team-ids-label": "ID Tim",
       "team-ids-numbers": "ID Tim harus berupa angka.",
-      "team-ids-other": "",
+      "team-ids-other": "Daftar string ID Tim.",
       "team-ids-placeholder": "Masukkan ID Tim dan tekan Enter untuk menambahkan",
       "teams-url-description": "URL yang digunakan untuk kueri ID Tim. Jika tidak diatur, nilai defaultnya adalah /teams.",
       "teams-url-description-oauth": "Jika Anda mengonfigurasi \"{{ teamsURLLabel }}\", Anda juga harus mengonfigurasi \"{{ teamIDsAttributePathLabel }}\".",
@@ -3335,7 +3335,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Atur ulang ke nilai default"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Reset",
       "disable": "Nonaktifkan",
       "disabling": "Sedang menonaktifkan...",
       "discard": "Buang",
@@ -3355,7 +3355,7 @@
       "text-badge-not-enabled": "Tidak diaktifkan"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM saat ini sedang dalam pengembangan dan tidak disarankan untuk penggunaan produksi. Gunakan dengan hati-hati dan antisipasi kemungkinan perubahan."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "Endpoint .well known/openid-configuration untuk IdP Anda",
@@ -3473,8 +3473,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Hapus secara Massal Sumber Daya yang Disediakan",
+      "bulk-move-provisioned-resources": "Pindahkan secara Massal Sumber Daya yang Disediakan",
       "cancel-button": "Batalkan",
       "confirmation-text": "Hapus",
       "delete-button": "Hapus",
@@ -3493,8 +3493,8 @@
       "move-modal-title": "Pindahkan",
       "moving": "Memindahkan...",
       "new-folder-name-required-phrase": "Nama folder wajib diisi.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Anda telah memilih sumber daya yang disediakan dan tidak disediakan. Keduanya tidak dapat diproses sekaligus. Hanya pilih sumber daya yang disediakan atau hanya sumber daya yang tidak disediakan dan coba lagi.",
+      "selected-mix-resources-modal-title": "Jenis sumber daya campuran dipilih"
     },
     "actions": {
       "button-to-recently-deleted": "Baru dihapus"
@@ -3507,24 +3507,24 @@
       "this-folder-is-empty": "Folder ini kosong"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_other": ""
+      "all-deleted": "Semua sumber daya telah berhasil dihapus",
+      "all-moved": "Semua sumber daya telah berhasil dipindahkan",
+      "button-done": "Selesai",
+      "progress-title": "Berhasil",
+      "failed-alert_other": "{{count}} item gagal"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Batal",
+      "button-delete": "Hapus",
+      "button-deleting": "Menghapus...",
+      "delete-warning": "Ini akan menghapus folder yang dipilih dan turunannya. Secara keseluruhan, ini akan memengaruhi:",
+      "error-path-not-found": "Jalur tidak ditemukan"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Batal",
+      "button-move": "Pindahkan",
+      "button-moving": "Memindahkan...",
+      "deleting": "Menghapus",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3532,14 +3532,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Isi file tidak ditemukan",
+      "error-path-not-found": "Jalur tidak ditemukan",
+      "error-target-folder-path-missing": "Jalur folder target tidak ada",
+      "error-title": "Kesalahan Folder Target",
+      "move-warning": "Ini akan memindahkan folder yang dipilih dan turunannya. Secara keseluruhan, ini akan memengaruhi:",
+      "moving": "Memindahkan",
+      "progress": "Kemajuan: {{current}} dari {{total}}",
+      "target-folder": "Folder Target"
     },
     "counts": {
       "alertRule_other": "{{count}} aturan peringatan",
@@ -3565,7 +3565,7 @@
       "button-delete": "Hapus",
       "button-deleting": "Menghapus...",
       "delete-warning": "Ini akan menghapus folder ini dan semua subfoldernya. Secara keseluruhan, ini akan memengaruhi:",
-      "success-message": ""
+      "success-message": "Folder berhasil dihapus"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Tidak dapat mengambil informasi turunan"
@@ -3590,7 +3590,7 @@
       "empty-message": "Folder tidak ditemukan",
       "error-title": "Kesalahan saat memuat folder",
       "non-folder-item": "Non-folder {{itemKind}} {{itemUID}}  ",
-      "root-title": "",
+      "root-title": "Dasbor",
       "search-placeholder": "Cari folder",
       "unknown-error": "Kesalahan tidak diketahui"
     },
@@ -3619,7 +3619,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Masukkan nama folder",
       "label-folder-name": "Nama folder",
       "text-pull-request-created": "Permintaan pull telah dibuat dengan perubahan pada folder ini:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "Folder Anda akan dibuat sebagai {{folderName}}",
       "title-pull-request-created": "Permintaan pull dibuat",
       "title-this-repository-is-read-only": "Repositori ini hanya dapat dibaca"
     },
@@ -3738,7 +3738,7 @@
     "category-selected-connection": "Koneksi yang dipilih",
     "category-selected-element": "Elemen yang dipilih ({{element}})",
     "category-size": "Ukuran",
-    "category-tooltip": "",
+    "category-tooltip": "Tooltip",
     "cloud-item": {
       "category-cloud": "Cloud",
       "label": {
@@ -3982,10 +3982,10 @@
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Mode tooltip",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Dinonaktifkan",
+        "label-enabled": "Diaktifkan"
       }
     },
     "tree-navigation-editor": {
@@ -4354,7 +4354,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Jalankan kueri"
     }
   },
   "dashboard": {
@@ -4517,7 +4517,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Lanjutkan"
         },
         "title": {
           "proceed-to-external-site": "Lanjutkan ke situs eksternal?"
@@ -4623,11 +4623,11 @@
     },
     "edit-actions": {
       "add": "Tambahkan {{typeName}}",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
+      "add-conditional-rule": "Tambah aturan {{ruleDescription}}",
+      "duplicate-panel": "Duplikasikan panel",
+      "edit-query-result-rule": "Ubah aturan hasil kueri",
+      "edit-template-variable-rule": "Ubah aturan variabel templat",
+      "edit-time-range-rule": "Ubah aturan rentang waktu",
       "move": "Pindahkan {{typeName}}",
       "panel-background": "Ubah latar belakang panel",
       "panel-description": "Ubah deskripsi panel",
@@ -4642,7 +4642,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Dasbor",
-        "element": "",
+        "element": "Elemen",
         "local-variable": "Variabel lokal",
         "multiple-elements": "Beberapa elemen",
         "multiple-elements-delete-text": "Anda yakin ingin menghapus elemen ini?",
@@ -4724,10 +4724,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Ekspor dasbor"
       },
       "menu": {
-        "label": ""
+        "label": "Ekspor menu dasbor"
       }
     },
     "fetch-dashboard": {
@@ -4749,9 +4749,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Default",
+          "shared-crosshair": "Crosshair bersama",
+          "shared-tooltip": "Tooltip bersama"
         }
       }
     },
@@ -4804,14 +4804,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Jangan kirim data anotasi ke panel berikut",
+        "annotation-panels-support-annotations": "Kirim data anotasi ke semua panel yang mendukung anotasi",
+        "annotations-explicitly-listed-panels": "Kirim anotasi ke panel yang tercantum secara eksplisit"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Semua panel",
+        "all-panels-except": "Semua panel kecuali",
+        "selected-panels": "Panel yang dipilih"
       }
     },
     "get-panel-frame-category": {
@@ -5072,7 +5072,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Anda yakin ingin memulihkan dasbor ke versi {{version}}? Semua perubahan yang belum disimpan akan hilang.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Ya, pulihkan ke versi {{version}}",
       "title-restore-version": "Pulihkan versi"
     },
     "row-options-button": {
@@ -5124,7 +5124,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Dasbor disimpan"
     },
     "save-dashboard-as-button": {
       "save-as": "Simpan sebagai"
@@ -5160,7 +5160,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Dasbor dengan nama yang sama di folder yang dipilih sudah ada.<1></1><2>Apa Anda masih ingin menyimpan dasbor ini?</2>",
       "body-version-mismatch": "Orang lain telah memperbarui dasbor ini<1></1><2>Apa Anda masih ingin menyimpan dasbor ini?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Simpan dan timpa",
       "title-name-exists": "Konflik",
       "title-version-mismatch": "Konflik"
     },
@@ -5357,9 +5357,9 @@
       "label-apply-transformation-to": "Terapkan transformasi ke"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Perhatikan bahwa menghapus satu transformasi dapat merusak yang lain. Jika hanya ada satu transformasi, Anda akan kembali ke layar pemilihan utama.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Hapus",
         "title-debug": "Debug",
         "title-disable-transformation": "Nonaktifkan transformasi",
         "title-filter": "Filter",
@@ -5380,16 +5380,16 @@
       "placeholder-search-for-transformation": "Cari transformasi",
       "show-images": "Tampilkan gambar",
       "title-add-another-transformation": "Tambah transformasi lain",
-      "view-all": ""
+      "view-all": "Lihat semua"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Dengan menghapus semua transformasi, Anda akan kembali ke layar pilihan utama."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Tambah transformasi lain"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Hapus semua",
       "delete-all-transformations": "Hapus semua transformasi",
       "title-delete-all-transformations": "Hapus semua transformasi?",
       "tooltip-clear-search": "Hapus pencarian",
@@ -5419,16 +5419,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Ubah deskripsi variabel"
       },
       "hide": {
-        "action": ""
+        "action": "Ubah opsi sembunyikan variabel"
       },
       "label": {
-        "action": ""
+        "action": "Ubah label variabel"
       },
       "name": {
-        "action": ""
+        "action": "Ubah nama variabel"
       }
     },
     "version-history-comparison": {
@@ -5440,7 +5440,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alihkan tombol pemilihan versi {{version}}",
       "date": "Tanggal",
-      "name-latest": "",
+      "name-latest": "Terkini",
       "notes": "Catatan",
       "restore": "Pulihkan",
       "updated-by": "Diperbarui oleh",
@@ -5518,7 +5518,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Berikan dimensi sebagai CSV: {{name}}, {{value}}",
       "label-data-source": "Sumber data",
       "label-use-static-key-dimensions": "Gunakan dimensi kunci statis",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Izinkan nilai kustom"
     },
     "add-to-dashboard": {
       "message": {
@@ -5592,7 +5592,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Cabut URL publik"
       },
       "title": {
         "revoke-public-url": "Cabut URL publik"
@@ -5605,7 +5605,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opsi kustom",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Nilai dipisahkan dengan koma",
       "selection-options": "Opsi pemilihan"
     },
     "dashboard-edit-pane-renderer": {
@@ -5626,8 +5626,8 @@
       "label-with-tags": "Dengan tag",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Dasbor",
+          "link": "Tautan"
         }
       },
       "placeholder-open-dashboard": "Buka dasbor"
@@ -5670,8 +5670,8 @@
       "data-source-options": "Opsi sumber data",
       "description-instance-name-filter": "Filter regex untuk instans sumber data yang akan dipilih dalam daftar nilai variabel. Biarkan kosong untuk semua.",
       "example-instance-name-filter": "Contoh: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Filter nama instance",
+      "name-type": "Jenis",
       "selection-options": "Opsi pemilihan"
     },
     "default-grid-layout-manager": {
@@ -5687,7 +5687,7 @@
       "delete-action": "Hapus dasbor",
       "deleting": "Menghapus...",
       "drawer-title": "Hapus Dasbor yang Disediakan",
-      "success-message": ""
+      "success-message": "Dasbor berhasil dihapus"
     },
     "description-label": {
       "description": "Deskripsi"
@@ -5716,15 +5716,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Dapat diedit",
+          "readonly": "Baca saja"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Default",
+          "shared-crosshair": "Crosshair bersama",
+          "shared-tooltip": "Tooltip bersama"
         }
       }
     },
@@ -5736,36 +5736,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Tambahkan filter kunci/nilai dengan cepat",
+        "dynamically-switch-source-multiple-panels": "Beralih sumber data secara dinamis untuk beberapa panel",
+        "group": "Tambahkan kunci ke grup dengan cepat",
+        "hidden-constant-variable": "Variabel konstan tersembunyi, berguna untuk awalan metrik di dasbor yang ingin Anda bagikan",
+        "users-enter-arbitrary-strings-textbox": "Pengguna dapat memasukkan string acak apa pun dalam kotak teks",
+        "values-are-static-and-defined-manually": "Nilai bersifat statis dan ditentukan secara manual",
+        "values-fetched-source-query": "Nilai diambil dari kueri sumber data",
+        "values-timespans": "Nilai berupa rentang waktu, misalnya 1 mnt, 1 jam, 1 hari"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Filter ad hoc",
+        "constant": "Konstan",
+        "custom": "Kustom",
+        "data-source": "Sumber data",
+        "group-by": "Kelompokkan berdasarkan",
+        "interval": "Interval",
+        "query": "Kueri",
+        "textbox": "Kotak teks"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Jangan kirim data anotasi ke panel berikut",
+        "annotation-panels-support-annotations": "Kirim data anotasi ke semua panel yang mendukung anotasi",
+        "annotations-explicitly-listed-panels": "Kirim anotasi ke panel yang tercantum secara eksplisit"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Semua panel",
+        "all-panels-except": "Semua panel kecuali",
+        "selected-panels": "Panel yang dipilih"
       }
     },
     "get-panel-frame-options": {
@@ -5793,7 +5793,7 @@
       "group-by-options": "Kelompokkan berdasarkan opsi",
       "label-data-source": "Sumber data",
       "label-use-static-group-by-dimensions": "Gunakan dimensi grup statis",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Izinkan nilai kustom"
     },
     "help-wizard": {
       "copy-to-clipboard": "Salin ke papan klip",
@@ -5829,14 +5829,14 @@
       "apply": "Terapkan"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Menghitung interval secara dinamis dengan membagi rentang waktu dengan jumlah yang ditentukan",
       "description-calculated-value-below-threshold": "Nilai yang dihitung tidak akan berada di bawah ambang batas ini",
       "description-step-count": "Berapa kali rentang waktu saat ini harus dibagi untuk menghitung nilai",
       "interval-options": "Opsi interval",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Opsi otomatis",
+      "name-min-interval": "Interval minimum",
+      "name-step-count": "Jumlah langkah",
+      "name-values": "Nilai"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5856,19 +5856,19 @@
       "usage-count_other": "Digunakan pada {{count}} dasbor"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Kesalahan saat memindahkan dasbor",
+      "api-error": "Gagal memindahkan dasbor",
+      "cancel-action": "Batal",
+      "current-file-not-found": "File dasbor saat ini tidak dapat ditemukan",
+      "drawer-title": "Pindahkan Dasbor yang Disediakan",
+      "file-load-error": "Kesalahan saat memuat dasbor",
+      "loading-file-data": "Memuat data dasbor",
+      "move-action": "Pindahkan dasbor",
+      "move-read-only-message": "Dasbor ini tidak dapat dipindahkan langsung dari Grafana karena repositori bersifat baca-saja. Untuk memindahkan dasbor ini, pindahkan file di repositori Git Anda.",
+      "moving": "Memindahkan...",
+      "success-message": "Dasbor berhasil dipindahkan",
+      "target-path-label": "Jalur target",
+      "title-this-repository-is-read-only": "Repositori ini hanya dapat dibaca"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Dasbor dengan nama yang sama di folder yang dipilih sudah ada. Ingin tetap menyimpan dasbor ini?",
@@ -5876,7 +5876,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Lanjutkan"
       },
       "title": {
         "proceed-to-external-site": "Lanjutkan ke situs eksternal?"
@@ -5913,8 +5913,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Tambah transformasi lain",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Dengan menghapus semua transformasi, Anda akan kembali ke layar pilihan utama.",
+      "confirmText-delete-all": "Hapus semua",
       "delete-all-transformations": "Hapus semua transformasi",
       "title-delete-all-transformations": "Hapus semua transformasi?"
     },
@@ -5967,13 +5967,13 @@
       "description-examples": "Grup tangkapan bernama dapat digunakan untuk memisahkan teks tampilan dan nilai (<1>lihat contoh</1>).",
       "description-optional": "Opsional, jika Anda ingin mengekstrak bagian dari nama seri atau segmen node metrik.",
       "label-data-source": "Sumber data",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Urutan opsi statis",
       "label-target-data-source": "Sumber data target",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Gunakan opsi statis",
+      "name-regex": "Regex",
       "query-options": "Opsi kueri",
       "selection-options": "Opsi pemilihan",
-      "static-options-legend": ""
+      "static-options-legend": "Opsi statis"
     },
     "resource-export": {
       "label": {
@@ -5986,7 +5986,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Anda yakin ingin memulihkan dasbor ke versi {{version}}? Semua perubahan yang belum disimpan akan hilang.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Ya, pulihkan ke versi {{version}}",
       "title-restore-version": "Pulihkan versi"
     },
     "save-button": {
@@ -6005,7 +6005,7 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Gagal menyimpan dasbor"
       },
-      "required": ""
+      "required": "Wajib diisi"
     },
     "save-dashboard-drawer": {
       "tabs": {
@@ -6032,8 +6032,8 @@
         "title-someone-else-has-updated-this-dashboard": "Orang lain telah memperbarui dasbor ini",
         "would-still-dashboard": "Ingin tetap menyimpan dasbor ini?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "Karena keterbatasan dalam skema dasbor baru (V2), panel pustaka akan dikonversi menjadi panel reguler dengan konten yang disematkan selama ekspor eksternal.",
+      "schema-v2-library-panels-export-title": "Panel pustaka akan dikonversi menjadi panel reguler",
       "title-dashboard-drastically-changed": "Perubahan pada dasbor tidak dapat dipulihkan"
     },
     "save-dashboard-form-common-options": {
@@ -6079,10 +6079,10 @@
       "description-enables-multiple-values-selected": "Memungkinkan beberapa nilai untuk dipilih secara bersamaan",
       "description-enables-option-include-variables": "Mengaktifkan opsi untuk menyertakan semua nilai",
       "description-enables-users-custom-values": "Memungkinkan pengguna untuk menambahkan nilai kustom ke daftar",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Izinkan nilai kustom",
+      "name-custom-all-value": "Nilai kustom untuk semua",
+      "name-include-all-option": "Sertakan opsi Semua",
+      "name-multi-value": "Multi-nilai"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Alihkan menu bagikan"
@@ -6103,7 +6103,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Nilai default"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opsional)",
@@ -6128,8 +6128,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Jika tautan panel ini Anda putus, Anda akan dapat mengeditnya tanpa memengaruhi dasbor lain. Namun, setelah membuat perubahan, Anda tidak akan dapat kembali ke panel pakai ulang semula.",
+      "confirmText-yes-unlink": "Ya, putus tautan",
       "title-really-unlink-panel": "Anda yakin ingin memutus tautan panel ini?"
     },
     "unsaved-changes-modal": {
@@ -6147,7 +6147,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Dasbor disimpan"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Variabel ini tidak direferensikan oleh variabel atau dasbor apa pun.",
@@ -6159,15 +6159,15 @@
       "aria-label-variable-editor-form": "Formulir editor variabel",
       "back-to-list": "Kembali ke daftar",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Hapus variabel"
       },
       "delete": "Hapus",
       "description-optional-display-name": "Nama tampilan opsional",
       "description-template-variable-characters": "Nama variabel templat. (Maks. 50 karakter)",
       "general": "Umum",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Deskripsi",
+      "name-label": "Label",
+      "name-name": "Nama",
       "placeholder-descriptive-text": "Teks deskriptif",
       "placeholder-label-name": "Nama label",
       "placeholder-variable-name": "Nama variabel",
@@ -6182,8 +6182,8 @@
       "variable": "Variabel"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Yakin ingin menghapus: {{variable}}?",
+      "confirmText-delete-variable": "Hapus variabel",
       "title-delete-variable": "Hapus variabel",
       "tooltip-duplicate-variable": "Duplikatkan variabel",
       "tooltip-remove-variable": "Hapus variabel"
@@ -6191,15 +6191,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Label",
+          "nothing": "Tidak ada apa-apa",
+          "variable": "Variabel"
         }
       },
       "label": "Sembunyikan"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Jenis variabel"
     },
     "variable-usages-button": {
       "title-show-usages": "Menampilkan penggunaan untuk: {{variableId}}",
@@ -6227,7 +6227,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alihkan tombol pemilihan versi {{version}}",
       "date": "Tanggal",
-      "name-latest": "",
+      "name-latest": "Terkini",
       "notes": "Catatan",
       "restore": "Pulihkan",
       "updated-by": "Diperbarui oleh",
@@ -6618,7 +6618,7 @@
     },
     "color-dimension-editor": {
       "label-fixed-color": "Warna tetap",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Tidak ada bidang yang ditemukan"
     },
     "file-dropzone-custom-children": {
       "upload": "Unggah"
@@ -6657,7 +6657,7 @@
       },
       "label-limit": "Batas",
       "label-value": "Nilai",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Tidak ada bidang yang ditemukan",
       "scalar-options": {
         "description-clamped": "Gunakan nilai bidang, terbatas ke maks dan min",
         "description-mod": "Gunakan nilai bidang, mod dari maks",
@@ -6668,13 +6668,13 @@
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Nilai tetap"
         }
       },
       "label-max": "Maksimum",
       "label-min": "Minimum",
       "label-value": "Nilai",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Tidak ada bidang yang ditemukan"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
@@ -6784,6 +6784,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Event",
@@ -7056,7 +7057,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Memuat..."
     },
     "prev": "Sebelumnya",
     "queryless-apps-extensions": {
@@ -7243,7 +7244,7 @@
           "start-time": "Waktu Mulai:"
         }
       },
-      "share-span": "",
+      "share-span": "Bagikan",
       "warnings": "Peringatan"
     },
     "span-filters": {
@@ -7253,8 +7254,8 @@
       "aria-label-select-service-name-operator": "Pilih operator nama layanan",
       "aria-label-select-span-name": "Pilih nama rentang",
       "aria-label-select-span-name-operator": "Pilih operator nama rentang",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Pilih durasi rentang maksimum",
+      "ariaLabel-select-min-span-duration": "Pilih durasi rentang minimum",
       "label-collapse": "Filter Rentang",
       "label-duration": "Durasi",
       "label-service-name": "Nama layanan",
@@ -7326,23 +7327,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Durasi",
+      "export-started": "Ekspor dimulai",
+      "give-feedback": "Umpan balik",
+      "link-copied": "Tautan disalin ke papan klip",
+      "path": "Jalur",
+      "route": "Rute",
+      "services": "Jasa",
+      "share": "Bagikan",
+      "share-copy-link": "Salin tautan",
+      "share-export-json": "Ekspor sebagai JSON",
+      "share-tooltip": "Bagikan jejak",
+      "start-time": "Waktu mulai",
+      "target": "Target",
+      "title-share-thoughts-about-tracing-grafana": "Bagikan pendapat Anda tentang pelacakan di Grafana.",
+      "tooltip-url": "{{route}} atau {{url}} atau {{target}} atau {{path}}",
+      "trace-id": "ID Pelacakan",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Tombol hapus filter",
@@ -7442,7 +7443,7 @@
       "when": "KAPAN"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Jalankan SQL berformat MySQL terhadap tabel yang dikembalikan dari sumber data Anda. Kueri sumber data (yaitu \"A\", \"B\") tersedia sebagai tabel dan direferensikan oleh nama kueri. Bidang tersedia sebagai kolom, seperti yang dikembalikan dari sumber data.",
       "label-operation": "Pengoperasian"
     },
     "math": {
@@ -7473,7 +7474,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Hapus folder",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Folder tidak ditemukan",
     "select-aria-label": "Filter folder",
     "select-placeholder": "Filter berdasarkan folder"
   },
@@ -7547,51 +7548,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Gazetteer tidak ditemukan",
+      "warning-no-geometry": "tidak dapat menemukan geometri",
+      "warning-select-geohash": "Pilih bidang geohash",
+      "warning-select-lat-long": "Pilih bidang garis lintang/bujur",
+      "warning-select-lookup": "Pilih bidang pencarian",
+      "warning-unable-to-find": "Tidak dapat menemukan bidang lokasi"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Tidak ada bidang string yang ditemukan"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Tidak ada bidang numerik yang ditemukan"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Tidak ada bidang numerik yang ditemukan"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Tidak ada bidang string yang ditemukan"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Gazetteer",
+      "name-geohash-field": "Bidang Geohash",
+      "name-latitude-field": "Bidang garis lintang",
+      "name-location-mode": "Mode Lokasi",
+      "name-longitude-field": "Bidang garis bujur",
+      "name-lookup-field": "Bidang pencarian"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Identifikasi data lokasi secara otomatis berdasarkan nama bidang default",
+        "description-coords": "Tentukan bidang garis lintang dan bujur",
+        "description-geohash": "Tentukan bidang geohash",
+        "description-lookup": "Tentukan Gazetteer dan bidang pencarian",
+        "label-auto": "Otomatis",
+        "label-coords": "Koordinat",
+        "label-geohash": "Geohash",
+        "label-lookup": "Cari"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Lapisan peta dasar",
+    "category-map-controls": "Kontrol peta",
+    "category-map-layers": "Lapisan peta",
+    "category-map-view": "Tampilan peta",
     "coordinates-map-view-editor": {
       "label-latitude": "Garis Lintang",
       "label-longitude": "Garis Bujur"
@@ -7600,15 +7601,15 @@
       "center": "Pusat:",
       "zoom": "Zoom:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Lokasi ini akan ditampilkan saat panel pertama kali dimuat.",
+    "description-mouse-wheel-zoom": "Aktifkan kontrol zoom melalui roda mouse",
+    "description-no-repeat": "Cegah peta berulang secara horizontal",
+    "description-share-view": "Gunakan tampilan yang sama di beberapa panel.  Catatan: ini mungkin memerlukan pemuatan ulang dasbor.",
+    "description-show-attribution": "Tampilkan info atribusi sumber peta di kanan bawah",
+    "description-show-debug": "Tampilkan info peta",
+    "description-show-measure": "Tampilkan alat untuk melakukan pengukuran di peta",
+    "description-show-scale": "Tunjukkan skala peta",
+    "description-show-zoom": "Tampilkan tombol kontrol zoom di sudut kiri atas",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Layer"
@@ -7632,12 +7633,12 @@
       "aria-label-add-geomap-style-rule": "Tambahkan aturan gaya geomap"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Lapisan dasar",
+      "description-display-tooltip": "Tampilkan tooltip untuk lapisan",
+      "name-data": "Data",
+      "name-display-tooltip": "Tampilkan tooltip",
+      "name-layer-type": "Jenis layer",
+      "name-opacity": "Opasitas"
     },
     "layers-editor": {
       "label-add-layer": "Tambahkan layer",
@@ -7650,9 +7651,9 @@
       "use-current-map-settings": "Gunakan pengaturan peta saat ini"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Tampilkan legenda peta",
+      "name-show-legend": "Tampilkan keterangan",
+      "name-styles": "Gaya"
     },
     "markers-legend": {
       "title-symbol": "Simbol"
@@ -7661,27 +7662,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Tampilkan alat ukur"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Tampilan awal",
+    "name-mouse-wheel-zoom": "Zoom roda mouse",
+    "name-no-repeat": "Tidak ada peta yang berulang",
+    "name-share-view": "Bagikan tampilan",
+    "name-show-attribution": "Tampilkan atribusi",
+    "name-show-debug": "Tampilkan debug",
+    "name-show-measure": "Tampilkan alat ukur",
+    "name-show-scale": "Tampilkan skala",
+    "name-show-zoom": "Tampilkan kontrol zoom",
+    "name-tooltip": "Tooltip",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Tidak ada bidang string yang ditemukan"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "Layer peta dasar dikonfigurasi oleh admin server."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Pusat",
+        "label-left": "Kiri",
+        "label-right": "Kanan"
       },
       "label-align": "Ratakan",
       "label-baseline": "Baseline",
@@ -7697,12 +7698,12 @@
       "label-text-label": "Label teks",
       "label-x-offset": "Offset X",
       "label-y-offset": "Offset Y",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Pilih simbol",
+      "placeholderText-select-symbol-or-add-text": "Pilih simbol atau tambahkan label teks",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Bawah",
+        "label-center": "Pusat",
+        "label-top": "Atas"
       }
     },
     "style-rule-editor": {
@@ -7716,13 +7717,13 @@
       "placeholder-value": "nilai"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Tampilkan popup saat mengarahkan kursor",
+      "description-none": "Tampilkan konten saat diklik, bukan saat mengarahkan kursor",
+      "label-details": "Detail",
+      "label-none": "Tidak ada"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Lapisan {{name}}"
     }
   },
   "get-enterprise": {
@@ -7842,400 +7843,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Kaki/detik²",
+            "name-g-unit": "G unit",
+            "name-meters-sec": "Meter/detik²"
           },
-          "name": ""
+          "name": "Akselerasi"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Menit Busur",
+            "name-arc-seconds": "Detik Busur",
+            "name-degrees": "Derajat (°)",
+            "name-gradian": "Gradian",
+            "name-radians": "Radian"
           },
-          "name": ""
+          "name": "Sudut"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Ekar (ac)",
+            "name-hectares": "Hektare (ha)",
+            "name-square-feet": "Kaki Persegi (ft²)",
+            "name-square-meters": "Meter Persegi (m²)",
+            "name-square-miles": "Mil Persegi (mi²)"
           },
-          "name": ""
+          "name": "Luas"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Aktif/Nonaktif",
+            "name-true-false": "True/False",
+            "name-yes-no": "Ya/Tidak"
           },
-          "name": ""
+          "name": "Boolean"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/dtk",
+            "name-flops": "FLOP/dtk",
+            "name-gflops": "GFLOP/dtk",
+            "name-mflops": "MFLOP/dtk",
+            "name-pflops": "PFLOP/dtk",
+            "name-tflops": "TFLOP/dtk",
+            "name-yflops": "YFLOP/dtk",
+            "name-zflops": "ZFLOP/dtk"
           },
-          "name": ""
+          "name": "Komputasi"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "gram per meter kubik (g/m³)",
+            "name-g-nm3": "gram per meter kubik normal (g/Nm³)",
+            "name-mg-dl": "miligram per desiliter (mg/dL)",
+            "name-mg-m3": "miligram per meter kubik (mg/m³)",
+            "name-mg-nm3": "miligram per meter kubik normal (mg/Nm³)",
+            "name-mmol-l": "milimol per liter (mmol/L)",
+            "name-ng-m3": "nanogram per meter kubik (ng/m³)",
+            "name-ng-nm3": "nanogram per meter kubik normal (ng/Nm³)",
+            "name-ppb": "bagian per miliar (ppb)",
+            "name-ppm": "bagian per juta (ppm)",
+            "name-ug-m3": "mikrogram per meter kubik (μg/m³)",
+            "name-ug-nm3": "mikrogram per meter kubik normal (μg/Nm³)"
           },
-          "name": ""
+          "name": "Konsentrasi"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Lev Bulgaria (BGN)",
+            "name-brl": "Real (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "Franc Swiss (CHF)",
+            "name-czk": "Koruna Ceko (czk)",
+            "name-dkk": "Krone Denmark (kr)",
+            "name-eur": "Euro (€)",
+            "name-gbp": "Pounds (£)",
+            "name-idr": "Rupiah Indonesia (Rp)",
+            "name-ils": "Shekel Baru Israel (₪)",
+            "name-inr": "Rupee India (₹)",
+            "name-isk": "Króna Islandia (kr)",
+            "name-jpy": "Yen (¥)",
+            "name-krw": "Won Korea Selatan (₩)",
+            "name-mbtc": "Milli Bitcoin (฿)",
+            "name-myr": "Ringgit Malaysia (RM)",
+            "name-nok": "Krone Norwegia (kr)",
+            "name-php": "Peso Filipina (PHP)",
+            "name-pln": "Złoty Polandia (PLN)",
+            "name-pyg": "Guaraní (₲)",
+            "name-rub": "Rubel (₽)",
+            "name-sek": "Krona Swedia (kr)",
+            "name-try": "Lira Turki (₺)",
+            "name-uah": "Hryvnia (₴)",
+            "name-ubtc": "Micro Bitcoin (฿)",
+            "name-usd": "Dolar ($)",
+            "name-uyu": "Peso Uruguay (UYU)",
+            "name-vnd": "Dong Vietnam (VND)",
+            "name-xpf": "Franc CFP (XPF)",
+            "name-zar": "Rand Afrika Selatan (R)"
           },
-          "name": ""
+          "name": "Mata Uang"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bit (IEC)",
+            "name-bits-si": "bit (SI)",
+            "name-bytes-iec": "bita (IEC)",
+            "name-bytes-si": "bita (SI)",
+            "name-gibibytes": "gibibite",
+            "name-gigabytes": "gigabita",
+            "name-kibibytes": "kibibita",
+            "name-kilobytes": "kilobita",
+            "name-mebibytes": "mebibita",
+            "name-megabytes": "megabita",
+            "name-pebibytes": "pebibita",
+            "name-petabytes": "petabita",
+            "name-tebibytes": "tebibita",
+            "name-terabytes": "terabita"
           },
-          "name": ""
+          "name": "Data"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bit/dtk (IEC)",
+            "name-bits-sec-si": "bit/dtk (SI)",
+            "name-bytes-sec-iec": "bita/dtk (IEC)",
+            "name-bytes-sec-si": "bita/dtk (SI)",
+            "name-gibibits-sec": "gibibit/dtk",
+            "name-gibibytes-sec": "gibibita/dtk",
+            "name-gigabits-sec": "gigabit/dtk",
+            "name-gigabytes-sec": "gigabita/dtk",
+            "name-kibibits-sec": "kibibit/dtk",
+            "name-kibibytes-sec": "kibibita/dtk",
+            "name-kilobits-sec": "kilobit/dtk",
+            "name-kilobytes-sec": "kilobita/dtk",
+            "name-mebibits-sec": "mebibit/dtk",
+            "name-mebibytes-sec": "mebibita/dtk",
+            "name-megabits-sec": "megabit/dtk",
+            "name-megabytes-sec": "megabita/dtk",
+            "name-packets-sec": "paket/dtk",
+            "name-pebibits-sec": "pebibit/dtk",
+            "name-pebibytes-sec": "pebibita/dtk",
+            "name-petabits-sec": "petabit/dtk",
+            "name-petabytes-sec": "petabita/dtk",
+            "name-tebibits-sec": "tebibit/dtk",
+            "name-tebibytes-sec": "tebibita/dtk",
+            "name-terabits-sec": "terabit/dtk",
+            "name-terabytes-sec": "terabita/dtk"
           },
-          "name": ""
+          "name": "Laju data"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Default tanggal waktu",
+            "name-datetime-iso": "ISO tanggal waktu",
+            "name-datetime-iso-no-date": "ISO tanggal waktu (Tidak ada tanggal jika hari ini)",
+            "name-datetime-local": "Tanggal waktu lokal",
+            "name-datetime-local-no-date": "Tanggal waktu lokal (Tidak ada tanggal jika hari ini)",
+            "name-datetime-us": "Tanggal waktu AS",
+            "name-datetime-us-no-date": "Tanggal waktu AS (Tidak ada tanggal jika hari ini)",
+            "name-from-now": "Mulai Sekarang"
           },
-          "name": ""
+          "name": "Tanggal & Waktu"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Ampere (A)",
+            "name-ampere-hour": "Ampere-jam (Ah)",
+            "name-decibel-milliwatt": "Desibel-miliwatt (dBm)",
+            "name-electron-volt": "Elektron volt (eV)",
+            "name-farad": "Farad (F)",
+            "name-femtofarad": "Femtofarad (fF)",
+            "name-gigawatt": "Gigawatt (GW)",
+            "name-henry": "Henry (H)",
+            "name-joule": "Joule (J)",
+            "name-kiloampere": "Kiloampere (kA)",
+            "name-kiloampere-hour": "Kiloampere-jam (kAh)",
+            "name-kiloohm": "Kiloohm (kΩ)",
+            "name-kilovolt": "Kilovolt (kV)",
+            "name-kilovolt-ampere": "Kilovolt-Ampere (kVA)",
+            "name-kilovolt-ampere-reactive": "Kilovolt-Ampere reaktif (kVAr)",
+            "name-kilowatt": "Kilowatt (kW)",
+            "name-kilowatt-hour": "Kilowatt-jam (kWh)",
+            "name-kilowatt-min": "Kilowatt-menit (kWm)",
+            "name-lumens": "Lumen (Lm)",
+            "name-megaohm": "Megaohm (MΩ)",
+            "name-megawatt": "Megawatt (MW)",
+            "name-megawatt-hour": "Megawatt-jam (MWh)",
+            "name-microfarad": "Mikrofarad (µF)",
+            "name-microhenry": "Mikrohenry (µH)",
+            "name-milliampere": "Miliampere (mA)",
+            "name-milliampere-hour": "Miliampere-jam (mAh)",
+            "name-millihenry": "Millihenry (mH)",
+            "name-milliohm": "Milliohm (mΩ)",
+            "name-millivolt": "Milivolt (mV)",
+            "name-milliwatt": "Miliwatt (mW)",
+            "name-nanofarad": "Nanofarad (nF)",
+            "name-ohm": "Ohm (Ω)",
+            "name-picofarad": "Picofarad (pF)",
+            "name-volt": "Volt (V)",
+            "name-volt-ampere": "Volt-Ampere (VA)",
+            "name-volt-ampere-reactive": "Volt-Ampere reaktif (VAr)",
+            "name-watt": "Watt (W)",
+            "name-watt-hour": "Watt-jam (Wh)",
+            "name-watt-hour-per-kg": "Watt-jam per Kilogram (Wh/kg)",
+            "name-watt-square-meter": "Watt per meter persegi (W/m²)"
           },
-          "name": ""
+          "name": "Energi"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Kaki kubik/menit (cfm)",
+            "name-cubic-feet-sec": "Kaki kubik/dtk (cfs)",
+            "name-cubic-meters-sec": "Meter kubik/dtk (cms)",
+            "name-gallons-min": "Galon/mnt (gpm)",
+            "name-litre-hour": "Liter/jam",
+            "name-litre-min": "Liter/menit (L/menit)",
+            "name-lux": "Lux (lx)",
+            "name-millilitre-min": "miliLiter/mnt (mL/mnt)"
           },
-          "name": ""
+          "name": "Aliran"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Kilonewton-meter (kNm)",
+            "name-kilonewtons": "Kilonewton (kN)",
+            "name-newton-meters": "Newton-meter (Nm)",
+            "name-newtons": "Newton (N)"
           },
-          "name": ""
+          "name": "Gaya"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "exahash/dtk",
+            "name-gigahashes-sec": "gigahash/dtk",
+            "name-hashes-sec": "hash/dtk",
+            "name-kilohashes-sec": "kilohash/dtk",
+            "name-megahashes-sec": "megahash/dtk",
+            "name-petahashes-sec": "petahash/dtk",
+            "name-terahashes-sec": "terahash/dtk"
           },
-          "name": ""
+          "name": "Laju hash"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "kaki (ft)",
+            "name-inch": "inci (in)",
+            "name-kilometer": "kilometer (km)",
+            "name-meter": "meter (m)",
+            "name-mile": "mil (mi)",
+            "name-millimeter": "milimeter (mm)"
           },
-          "name": ""
+          "name": "Panjang"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "gram (g)",
+            "name-kilogram": "kilogram (kg)",
+            "name-metric-ton": "metrik ton (t)",
+            "name-milligram": "miligram (mg)",
+            "name-pound": "pon (lb)"
           },
-          "name": ""
+          "name": "Massa"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Kandela (cd)",
+            "name-decibel": "Desibel",
+            "name-hexadecimal": "Heksadesimal",
+            "name-hexadecimal-0x": "Heksadesimal (0x)",
+            "name-humidity": "Kelembapan (%H)",
+            "name-locale": "Format lokal",
+            "name-number": "Jumlah",
+            "name-percent-1": "Persen (0,0-1,0)",
+            "name-percent-100": "Persen (0-100)",
+            "name-pixels": "Piksel",
+            "name-scientific": "Notasi ilmiah",
+            "name-short": "pendek",
+            "name-si-short": "SI pendek",
+            "name-string": "Tali"
           },
-          "name": ""
+          "name": "Lain-lain"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Bilah",
+            "name-hectopascals": "Hektopascal",
+            "name-inches-mercury": "Inci merkuri",
+            "name-kilobars": "Kilobar",
+            "name-kilopascals": "Kilopascal",
+            "name-millibars": "Milibar",
+            "name-pascals": "Pascal",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Tekanan"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Becquerel (Bq)",
+            "name-curie": "curie (Ci)",
+            "name-exposure": "Paparan (C/kg)",
+            "name-gray": "Gray (Gy)",
+            "name-microsievert": "microSievert (µSv)",
+            "name-microsievert-hour": "microSievert/jam (µSv/h)",
+            "name-millisievert": "miliSievert (mSv)",
+            "name-millisievert-hour": "miliSievert/jam (mSv/jam)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "roentgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/jam (Sv/jam)"
           },
-          "name": ""
+          "name": "Radiasi"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Derajat per detik (°/dtk)",
+            "name-gigahertz": "Gigahertz (GHz)",
+            "name-hertz": "Hertz (Hz)",
+            "name-kilohertz": "Kilohertz (kHz)",
+            "name-megahertz": "Megahertz (MHz)",
+            "name-radians-sec": "Radian per detik (rad/dtk)",
+            "name-rpm": "Putaran per menit (rpm)"
           },
-          "name": ""
+          "name": "Kecepatan Rotasi"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsius (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Suhu"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "hitungan/menit (cpm)",
+            "name-counts-sec": "hitungan/dtk (cps)",
+            "name-events-min": "peristiwa/menit (epm)",
+            "name-events-sec": "peristiwa/dtk (eps)",
+            "name-io-ops-sec": "I/O ops/dtk (iops)",
+            "name-messages-min": "pesan/menit (mpm)",
+            "name-messages-sec": "pesan/dtk (mps)",
+            "name-ops-min": "ops/menit (opm)",
+            "name-ops-sec": "ops/dtk (ops)",
+            "name-reads-min": "baca/menit (rpm)",
+            "name-reads-sec": "baca/dtk (rps)",
+            "name-records-min": "rekaman/mnt (rpm)",
+            "name-records-sec": "rekaman/dtk (rps)",
+            "name-requests-min": "permintaan/mnt (rpm)",
+            "name-requests-sec": "permintaan/dtk (rps)",
+            "name-rows-min": "baris/mnt (rpm)",
+            "name-rows-sec": "baris/dtk (rps)",
+            "name-writes-min": "tulis/menit (wpm)",
+            "name-writes-sec": "tulis/dtk (wps)"
           },
-          "name": ""
+          "name": "Throughput"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "jam (mdtk)",
+            "name-clock-s": "jam (dtk)",
+            "name-days": "hari (h)",
+            "name-duration-dhms": "durasi (d hh:mm:ss)",
+            "name-duration-hms": "durasi (hh:mm:ss)",
+            "name-duration-ms": "durasi (mdtk)",
+            "name-duration-s": "durasi (dtk)",
+            "name-hertz": "Hertz (1/dtk)",
+            "name-hours": "jam (h)",
+            "name-microseconds": "mikrodetik (µs)",
+            "name-milliseconds": "milidetik (md)",
+            "name-minutes": "menit (m)",
+            "name-nanoseconds": "nanodetik (ndtk)",
+            "name-seconds": "detik (dtk)",
+            "name-timeticks": "Timeticks (s/100)"
           },
-          "name": ""
+          "name": "Waktu"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "kilometer/jam (km/jam)",
+            "name-knot": "knot (kn)",
+            "name-meters-second": "meter/detik (m/dtk)",
+            "name-miles-hour": "mil/jam (mph)"
           },
-          "name": ""
+          "name": "Kecepatan"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "desimeter kubik",
+            "name-cubic-meter": "meter kubik",
+            "name-gallons": "galon",
+            "name-litre": "liter (L)",
+            "name-millilitre": "mililiter (mL)",
+            "name-normal-cubic-meter": "Meter kubik normal"
           },
-          "name": ""
+          "name": "Volume"
         }
       }
     }
@@ -8364,7 +8365,7 @@
       "option": "opsi"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Buka pratinjau gambar"
     },
     "cascader": {
       "clear-button": "Hapus pilihan"
@@ -8378,9 +8379,9 @@
       "aria-label-selected-color": "warna {{colorLabel}}"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Hapus",
       "cancel": "Batalkan",
-      "confirmText-delete": ""
+      "confirmText-delete": "Hapus"
     },
     "confirm-content": {
       "placeholder": "Ketik \"{{confirmPromptText}}\" untuk mengonfirmasi"
@@ -8485,56 +8486,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "April",
+        "label-august": "Agustus",
+        "label-december": "Desember",
+        "label-february": "Februari",
+        "label-january": "Januari",
+        "label-july": "Juli",
+        "label-june": "Juni",
+        "label-march": "Maret",
+        "label-may": "Mei",
+        "label-november": "November",
+        "label-october": "Oktober",
+        "label-september": "September"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Selumbari",
+        "last-1-hour": "1 jam terakhir",
+        "last-1-year": "1 tahun terakhir",
+        "last-12-hours": "12 jam terakhir",
+        "last-15-mins": "15 menit terakhir",
+        "last-2-days": "2 hari terakhir",
+        "last-2-years": "2 tahun terakhir",
+        "last-24-hours": "24 jam terakhir",
+        "last-3-hours": "3 jam terakhir",
+        "last-30-days": "30 hari terakhir",
+        "last-30-mins": "30 menit terakhir",
+        "last-5-mins": "5 menit terakhir",
+        "last-5-years": "5 tahun terakhir",
+        "last-6-hours": "6 jam terakhir",
+        "last-6-months": "6 bulan terakhir",
+        "last-7-days": "7 hari terakhir",
+        "last-90-days": "90 hari terakhir",
+        "previous-fiscal-quarter": "Kuartal fiskal sebelumnya",
+        "previous-fiscal-year": "Tahun fiskal sebelumnya",
+        "previous-month": "Bulan sebelumnya",
+        "previous-week": "Minggu sebelumnya",
+        "previous-year": "Tahun sebelumnya",
+        "this-day-last-week": "Hari ini minggu lalu",
+        "this-fiscal-quarter": "Kuartal fiskal ini",
+        "this-fiscal-quarter-so-far": "Kuartal fiskal ini sejauh ini",
+        "this-fiscal-year": "Tahun fiskal ini",
+        "this-fiscal-year-so-far": "Tahun fiskal ini sejauh ini",
+        "this-month": "Bulan ini",
+        "this-month-so-far": "Bulan ini sejauh ini",
+        "this-week": "Minggu ini",
+        "this-week-so-far": "Minggu ini sejauh ini",
+        "this-year": "Tahun ini",
+        "this-year-so-far": "Tahun ini sejauh ini",
+        "today": "Hari ini",
+        "today-so-far": "Hari ini sejauh ini",
+        "yesterday": "Kemarin"
       }
     },
     "drawer": {
@@ -8585,18 +8586,18 @@
         "placeholder": "Pilih bidang"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Boolean",
+        "label-enum": "Enum",
+        "label-number": "Jumlah",
+        "label-other": "Lainnya",
+        "label-string": "Tali",
+        "label-time": "Waktu",
+        "label-traces": "Pelacakan"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Bingkai ({{framesCount}}): {{framesNames}}",
+        "label": "Kueri: {{refId}}",
+        "label-missing-ref-id": "Kueri: (refId tidak ada)"
       },
       "name-field-name-by-regex-matcher": "Bidang dengan nama yang cocok dengan regex",
       "name-fields-by-query": "Bidang yang dikembalikan oleh kueri",
@@ -8630,8 +8631,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "alihkan panel ciutkan",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Bilah pemuatan panel",
+      "ariaLabel-panel-status": "Status panel",
       "tooltip-cancel": "Batalkan kueri",
       "tooltip-cancel-loading": "Batalkan kueri",
       "tooltip-stop-streaming": "Hentikan streaming",
@@ -8700,12 +8701,12 @@
       "inspect-drawer-title": "Periksa nilai",
       "inspect-menu-label": "Periksa nilai",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Tidak ada data"
       },
       "no-values-label": "Tidak ada nilai",
       "pagination-summary": "{{itemsRangeStart}}—{{displayedEnd}} dari {{numRows}} baris",
       "sparkline": {
-        "no-data": ""
+        "no-data": "tidak ada data"
       }
     },
     "tags": {
@@ -8713,7 +8714,7 @@
     },
     "tags-input": {
       "add": "Tambahkan",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Tag baru (masukkan kunci untuk menambahkan)",
       "remove": "Hapus tag: {{name}}"
     },
     "time-sync-button": {
@@ -8806,14 +8807,14 @@
       "footer-add-annotation": "Tambahkan anotasi",
       "footer-click-to-action": "Klik untuk {{actionTitle}} ",
       "footer-click-to-navigate": "Klik untuk membuka {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Filter untuk '{{value}}'",
       "timestamp": "Stempel Waktu"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Default",
+      "weekStarts-label-monday": "Senin",
+      "weekStarts-label-saturday": "Sabtu",
+      "weekStarts-label-sunday": "Minggu"
     }
   },
   "graph": {
@@ -9191,8 +9192,8 @@
       "title-create-library-panel": "Buat panel pustaka"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Ubah",
+      "confirmText-replace": "Ganti"
     },
     "confirm": {
       "delete-panel": "Ingin menghapus panel ini?"
@@ -9216,7 +9217,7 @@
       "usage-count_other": "Digunakan pada {{count}} dasbor"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Cari berdasarkan nama, deskripsi, atau nama folder"
     },
     "loading-indicator": {
       "loading-library-panel": "Memuat panel pustaka..."
@@ -9421,7 +9422,7 @@
       "close": "Tutup detail log",
       "copy-shortlink": "Salin tautan pendek",
       "copy-to-clipboard": "Salin ke papan klip",
-      "displayed-fields-section": "",
+      "displayed-fields-section": "Susun bidang yang ditampilkan",
       "fields": {
         "adhoc-statistics": "Statistik ad-hoc",
         "copy-value-to-clipboard": "Salin nilai ke papan klip",
@@ -9434,25 +9435,25 @@
       },
       "fields-section": "Bidang",
       "hide-log-line": "Sembunyikan baris log",
-      "inline-mode": "",
+      "inline-mode": "Tampilkan sebaris",
       "links-section": "Tautan",
-      "log-line-field": "",
+      "log-line-field": "Baris log",
       "log-line-section": "Baris log",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
+      "move-displayed-field-down": "Pindahkan ke bawah",
+      "move-displayed-field-up": "Pindahkan ke atas",
       "no-details": "Tidak ada bidang untuk ditampilkan.",
-      "open-assistant": "",
+      "open-assistant": "Jelaskan baris log ini di Asisten",
       "pin-line": "Sematkan log",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "remove-displayed-field": "Hapus bidang",
+      "remove-log": "Hapus log",
+      "scroll-to-logline": "Gulir ke baris log",
       "search": {
         "no-results": "Tidak ada hasil untuk ditampilkan."
       },
       "search-placeholder": "Cari nama dan nilai bidang",
       "show-context": "Tampilkan konteks",
       "show-log-line": "Tampilkan baris log",
-      "sidebar-mode": "",
+      "sidebar-mode": "Jangkarkan ke kanan",
       "unpin-line": "Buka sematan log"
     },
     "log-line-menu": {
@@ -9460,9 +9461,9 @@
       "copy-log": "Salin baris log",
       "hide-details": "Tampilkan detail log",
       "icon-label": "Menu log",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Baris log",
+      "log-line-explainer": "Jelaskan baris log ini secara ringkas",
+      "open-assistant": "Jelaskan baris log ini di Asisten",
       "pin-to-outline": "Sematkan log",
       "show-context": "Tampilkan konteks",
       "show-details": "Sembunyikan detail log",
@@ -9568,10 +9569,10 @@
     },
     "name-common-labels": "Label umum",
     "name-deduplication": "Deduplikasi",
-    "name-details-mode": "",
+    "name-details-mode": "Mode panel Detail Log",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "sebaris",
+      "label-sidebar": "Bilah samping"
     },
     "name-enable-infinite-scrolling": "Aktifkan gulir tak terbatas",
     "name-enable-log-details": "Aktifkan detail log",
@@ -9668,8 +9669,8 @@
       "updated-on": "Diperbarui pada"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Yakin ingin mengahapus '{{snapshotToRemove}}'?",
+      "confirmText-delete": "Hapus",
       "title-delete": "Hapus"
     },
     "unthemed-dashboard-import": {
@@ -9681,14 +9682,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "Nama wajib diisi",
+      "message-reserved-name": "Ini adalah nama yang dicadangkan dan tidak dapat digunakan untuk folder.",
+      "message-same-name": "Dasbor atau folder dengan nama yang sama sudah ada",
+      "message-same-name-general": "Folder atau dasbor di folder umum dengan nama yang sama sudah ada"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Opsi tidak ditemukan"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9838,8 +9839,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Jumlah maksimum grup aturan peringatan tercapai: Hapus beberapa grup aturan peringatan atau tingkatkan paket Anda dan coba lagi.",
+        "alert-rules-quota-reached": "Jumlah maksimum aturan peringatan tercapai: Hapus beberapa aturan peringatan atau tingkatkan paket Anda dan coba lagi.",
         "dashboard-already-managed": "Dasbor sudah disediakan dan dikelola oleh Grafana di instans cloud. Sebaiknya gunakan dasbor yang disediakan ke depannya. Jika Anda masih ingin menyalin dasbor ke instans cloud, ubah ID dasbor di JSON dasbor, simpan snapshot baru, lalu unggah lagi.",
         "datasource-already-managed": "Dasbor sudah disediakan dan dikelola oleh Grafana di instans cloud. Jika ini adalah sumber daya yang berbeda, atur UID lain dan coba lagi.",
         "datasource-invalid-url": "Ada sumber data yang memiliki URL tidak valid. Berikan URL yang valid dan coba lagi.",
@@ -10309,7 +10310,7 @@
     "invite-user": {
       "invite-button": "Undang",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Undang pengguna"
     },
     "item": {
       "add-bookmark": "Tambahkan ke Bookmark",
@@ -10529,7 +10530,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Tidak ada organisasi yang ditemukan",
     "select-placeholder": "Pilih organisasi"
   },
   "page": {
@@ -10752,7 +10753,7 @@
         "permission": "Anda tidak memiliki izin untuk melihat halaman ini.",
         "title-access-denied": "Akses ditolak"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Plugin gagal dimuat",
       "no-root-app-page-component-found": "Tidak ada komponen halaman aplikasi root yang ditemukan"
     },
     "browse": {
@@ -10796,7 +10797,7 @@
         "update-status-text": "plugin diperbarui"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Yakin ingin menurunkan ke versi {{version}}? Anda biasanya tidak boleh melakukan ini",
         "downgrade-confirm": "Turunkan",
         "downgrade-title": "Turunkan versi plugin"
       }
@@ -10851,8 +10852,8 @@
       "message": "Tidak ada plugin yang ditemukan"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Periksa konsol untuk detail selengkapnya tentang kesalahan.",
+      "extension-error-alert-title": "Ekstensi gagal dimuat: \"{{pluginId}}/{{extensionTitle}}\""
     },
     "extensions-log-data-source": {
       "message": {
@@ -10889,8 +10890,8 @@
     "install-controls-button": {
       "title-uninstall-modal": "Hapus instalasi {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Yakin ingin menghapus instalan plugin ini?",
+        "confirmText-confirm": "Konfirmasi"
       }
     },
     "install-controls-warning": {
@@ -10908,6 +10909,9 @@
       "label-plugin-id": "ID Plugin",
       "label-severity": "Keparahan"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Plugin tersebut tidak dapat ditemukan. Silakan periksa apakah url sudah benar atau <1></1>buka <3>katalog plugin</3>.",
       "title-plugin-not-found": "Plugin tidak ditemukan"
@@ -11064,29 +11068,29 @@
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Sumber daya ini berada di belakang cabang di {{repoType}}.",
+      "not-saved": "Pengguna Grafana lainnya di organisasi Anda masih akan melihat versi saat ini yang disimpan ke cabang default yang dikonfigurasi hingga cabang ini digabungkan",
+      "open-in-repo-button": "Buka di {{repoType}}",
+      "open-pull-request-in-repo": "Buka permintaan penarikan di {{repoType}}",
+      "view-in-repo-button": "Lihat di {{repoType}} untuk melihat perubahan terbaru.",
+      "view-pull-request-in-repo": "Lihat permintaan penarikan di {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "Sumber daya baru telah dibuat di cabang di {{repoType}}.",
+    "title-loaded-pull-request-in-repo": "Sumber daya ini dimuat dari cabang yang baru saja Anda buat di {{repoType}} dan hanya dapat dilihat oleh Anda"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Sumber daya berhasil disimpan",
+  "provisioned-resource-request-handler-dashboard": "Dasbor berhasil disimpan",
+  "provisioned-resource-request-handler-folder": "Folder berhasil dibuat",
   "provisioning": {
     "banner": {
       "message": "Fitur ini saat ini sedang dalam pengembangan aktif. Untuk pengalaman terbaik dan peningkatan terbaru, kami merekomendasikan Anda untuk menggunakan <2>versi nightly </2> Grafana."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Cabang yang akan digunakan untuk penyediaan",
+      "branch-label": "Cabang",
+      "branch-required": "Cabang wajib diisi",
+      "path-description": "Jalur subdirektori opsional dalam repositori",
+      "path-label": "Jalur",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11095,18 +11099,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Memungkinkan pengguna untuk memilih apakah akan membuka permintaan penarikan saat menyimpan perubahan. Jika repositori tidak mengizinkan perubahan langsung ke cabang utama, permintaan penarikan mungkin tetap diperlukan.",
+      "pr-workflow-label": "Aktifkan opsi permintaan penarikan saat menyimpan",
+      "token-description": "Kata Sandi Aplikasi Bitbucket dengan izin repositori",
+      "token-label": "Kata Sandi Aplikasi",
+      "token-required": "Token Bitbucket diperlukan",
+      "token-user-description": "Nama pengguna yang akan digunakan untuk mengakses repositori dengan kata sandi aplikasi",
+      "token-user-label": "Nama pengguna",
+      "token-user-required": "Nama Pengguna wajib diisi",
+      "url-description": "URL repositori Bitbucket",
+      "url-label": "URL repositori",
+      "url-pattern": "Harus URL repositori Bitbucket yang valid",
+      "url-required": "URL repositori wajib diisi"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Tambahkan nama yang jelas untuk koneksi repositori ini",
@@ -11117,9 +11121,9 @@
       "label-display-name": "Nama tampilan",
       "placeholder-my-repository-connection": "Koneksi repositori saya",
       "text-loading-resource-information": "Memuat informasi sumber daya...",
-      "dashboards-count_other": "",
+      "dashboards-count_other": "{{count}} dasbor",
       "files-count_other": "{{count}} file",
-      "folders-count_other": ""
+      "folders-count_other": "{{count}} folder"
     },
     "check-repository": {
       "check": "Periksa"
@@ -11193,7 +11197,7 @@
       "title-instant-updates-requests-webhooks": "Pembaruan instan dan permintaan pull dengan webhook.",
       "title-visual-previews-in-pull-requests": "Pratinjau visual dalam permintaan pull dengan rendering gambar"
     },
-    "error-title-default": "",
+    "error-title-default": "Kesalahan",
     "expanded-row": {
       "job-specification": "Spesifikasi Pekerjaan",
       "summary": "Ringkasan"
@@ -11202,8 +11206,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Atur tombol fitur yang diwajibkan"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Kelola dasbor sebagai kode di Git dan sediakan pembaruan secara otomatis",
+      "manage-your-dashboards-with-remote-provisioning": "Mulai menggunakan Git Sync",
       "store-dashboards-in-version-controlled-storage": "Simpan dasbor di penyimpanan yang dikontrol versi untuk organisasi dan pelacakan riwayat yang lebih baik"
     },
     "file-history-page": {
@@ -11224,16 +11228,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Menambahkan pratinjau gambar dari perubahan dasbor di permintaan pull. Gambar dasbor Grafana Anda akan dibagikan di repositori Git Anda dan dapat dilihat oleh siapa saja yang memiliki akses repositori.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Buat tautan pratinjau untuk permintaan penarikan",
       "description-image-rendering": "Membutuhkan rendering gambar. <2>Atur rendering gambar</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(membutuhkan <2>rendering gambar</2> dan akses publik diaktifkan)",
       "description-read-only": "Sumber daya tidak dapat dimodifikasi melalui Grafana.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Frekuens menyinkronkan perubahan dari repositori",
+      "error-sync-interval-required": "Interval sinkronisasi wajib diisi",
       "label-enable-previews": "Aktifkan pratinjau dasbor dalam permintaan pull",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Buat Pratinjau Dasbor",
       "label-read-only": "Hanya baca",
-      "label-sync-interval": ""
+      "label-sync-interval": "Interval Sinkronisasi (detik)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Tidak ada hasil yang cocok dengan kueri Anda",
@@ -11265,46 +11269,46 @@
       "subtitle-provisioning-feature": "Lihat dan kelola koneksi penyediaan Anda"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Cabang yang akan digunakan untuk penyediaan",
+      "branch-label": "Cabang",
+      "branch-required": "Cabang wajib diisi",
+      "path-description": "Jalur subdirektori opsional dalam repositori",
+      "path-label": "Jalur",
+      "pr-workflow-description": "Memungkinkan pengguna untuk memilih apakah akan membuka permintaan penarikan saat menyimpan perubahan. Jika repositori tidak mengizinkan perubahan langsung ke cabang utama, permintaan penarikan mungkin tetap diperlukan.",
+      "pr-workflow-label": "Aktifkan opsi permintaan penarikan saat menyimpan",
+      "token-description": "Token atau kata sandi akses repositori Git",
+      "token-label": "Token Akses",
+      "token-required": "Token Git diperlukan",
+      "token-user-description": "Nama pengguna yang akan digunakan untuk mengakses repositori dengan token akses",
+      "token-user-label": "Nama pengguna",
+      "token-user-required": "Nama Pengguna wajib diisi",
+      "url-description": "URL repositori Git",
+      "url-label": "URL repositori",
+      "url-pattern": "Harus URL repositori Git yang valid",
+      "url-required": "URL repositori wajib diisi"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Cabang yang akan digunakan untuk penyediaan",
+      "branch-label": "Cabang",
+      "branch-required": "Cabang wajib diisi",
+      "path-description": "Jalur subdirektori opsional dalam repositori",
+      "path-label": "Jalur",
+      "pr-workflow-description": "Memungkinkan pengguna untuk memilih apakah akan membuka permintaan penarikan saat menyimpan perubahan. Jika repositori tidak mengizinkan perubahan langsung ke cabang utama, permintaan penarikan mungkin tetap diperlukan.",
+      "pr-workflow-label": "Aktifkan opsi permintaan penarikan saat menyimpan",
+      "token-description": "Token Akses Pribadi GitHub dengan izin repositori",
+      "token-label": "Token Akses Pribadi",
+      "token-required": "Token GitHub diperlukan",
+      "url-description": "URL repositori GitHub",
+      "url-label": "URL repositori",
+      "url-pattern": "Harus URL repositori GitHub yang valid",
+      "url-required": "URL repositori wajib diisi"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Cabang yang akan digunakan untuk penyediaan",
+      "branch-label": "Cabang",
+      "branch-required": "Cabang wajib diisi",
+      "path-description": "Jalur subdirektori opsional dalam repositori",
+      "path-label": "Jalur",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11313,15 +11317,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Memungkinkan pengguna untuk memilih apakah akan membuka permintaan penggabungan saat menyimpan perubahan. Jika repositori tidak mengizinkan perubahan langsung ke cabang utama, permintaan penggabungan mungkin tetap diperlukan.",
+      "pr-workflow-label": "Aktifkan opsi permintaan penggabungan saat menyimpan",
+      "token-description": "Token Akses Proyek GitLab dengan izin repositori",
+      "token-label": "Token Akses Proyek",
+      "token-required": "Token GitLab diperlukan",
+      "url-description": "URL repositori GitLab",
+      "url-label": "URL repositori",
+      "url-pattern": "Harus URL repositori GitLab yang valid",
+      "url-required": "URL repositori wajib diisi"
     },
     "history-view": {
       "not-found": "Tidak ditemukan"
@@ -11349,18 +11353,18 @@
       "starting": "Memulai...",
       "status": {
         "title-error-running-job": "Kesalahan saat menjalankan pekerjaan",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Pekerjaan berhasil diselesaikan",
+        "title-warning-running-job": "Pekerjaan selesai dengan peringatan"
       },
       "summary": "Ringkasan",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Kesalahan saat mengambil pekerjaan aktif"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Jalur sistem file lokal ke repositori",
+      "path-label": "Jalur Repositori",
+      "path-required": "Jalur repositori wajib diisi"
     },
     "mode-options": {
       "folder": {
@@ -11386,7 +11390,7 @@
     },
     "repository-actions": {
       "settings": "Pengaturan",
-      "source-code": ""
+      "source-code": "Kode sumber"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11452,22 +11456,22 @@
       "title-queued-for-deletion": "Diantrekan untuk dihapus"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Pilih penyedia:",
+      "configure-file": "Konfigurasikan penyediaan file",
+      "configure-with-provider": "Konfigurasikan dengan {{ provider }}",
+      "provider-not-listed": "Jika penyedia Anda tidak tercantum:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Hubungkan ke repositori Bitbucket",
+      "github": "GitHub",
+      "github-description": "Hubungkan ke repositori GitHub",
+      "gitlab": "GitLab",
+      "gitlab-description": "Hubungkan ke repositori GitLab",
+      "local": "Lokal",
+      "local-description": "Konfigurasikan penyediaan file",
+      "pure-git": "Pure Git",
+      "pure-git-description": "Hubungkan ke repositori Git mana pun"
     },
     "resource-view": {
       "base": "Dasar",
@@ -11498,11 +11502,11 @@
       "label-current-step": "Langkah saat ini",
       "label-pending-step": "Langkah tertunda"
     },
-    "success-title-default": "",
+    "success-title-default": "Berhasil",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Gagal memulai pekerjaan",
+      "error-no-repository-name": "Tidak ada nama repositori yang disediakan",
+      "error-starting-job": "Kesalahan saat memulai pekerjaan"
     },
     "sync-repository": {
       "body-edit-configuration": "Edit konfigurasi",
@@ -11530,7 +11534,7 @@
       "go-to": "Buka",
       "make-sure": "Pastikan Anda menyertakan izin ini"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Peringatan",
     "wizard": {
       "alert-point-1": "Sumber daya tidak akan dapat dibuat, diedit, atau dihapus selama proses ini. Pada langkah terakhir, sumber daya akan menghilang.",
       "alert-point-2": "Setelah penyediaan selesai, sumber daya akan muncul kembali dan dikelola melalui penyimpanan eksternal.",
@@ -11540,10 +11544,10 @@
       "button-next": "Selesai",
       "button-start": "Mulai sinkronisasi",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Ini akan menghapus konfigurasi repositori dan Anda akan kehilangan semua kemajuan. Yakin ingin membuang perubahan Anda?",
+        "confirm": "Ya, buang",
+        "dismiss": "Terus bekerja",
+        "title": "Buang penyiapan repositori?"
       },
       "step-bootstrap": "Pilih item yang akan disinkronkan",
       "step-connect": "Hubungkan",
@@ -11559,7 +11563,7 @@
     "wizard-content": {
       "button-cancel": "Batalkan",
       "button-cancelling": "Membatalkan...",
-      "button-previous": "",
+      "button-previous": "Sebelumnya",
       "button-submitting": "Mengirim...",
       "error-instance-repository-exists": "Repositori instans sudah ada"
     }
@@ -11956,7 +11960,7 @@
         "recommended": "Disarankan",
         "results": "Hasil"
       },
-      "search": ""
+      "search": "Cari {{parentTitle}}"
     }
   },
   "search": {
@@ -12037,7 +12041,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Akun layanan tidak ditemukan",
     "select-aria-label": "Pemilih akun layanan",
     "select-placeholder": "Mulai mengetik untuk mencari akun layanan"
   },
@@ -12083,10 +12087,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Tambahkan token akun layanan",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Yakin ingin menghapus akun layanan ini?",
+      "body-disable-service-account": "Yakin ingin menonaktifkan akun layanan ini?",
+      "confirmText-delete-service-account": "Hapus akun layanan",
+      "confirmText-disable-service-account": "Nonaktifkan akun layanan",
       "delete-service-account": "Hapus akun layanan",
       "disable-service-account": "Nonaktifkan akun layanan",
       "enable-service-account": "Aktifkan akun layanan",
@@ -12113,7 +12117,7 @@
       "used-by": "Digunakan oleh"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Simpan",
       "edit": "Edit"
     },
     "service-account-role-row": {
@@ -12127,15 +12131,15 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Tambahkan akun layanan",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Yakin ingin menghapus {{serviceAccountName}}?",
+      "body-disable-service-account": "Yakin ingin menonaktifkan '{{accountToDisable}}'?",
+      "confirmText-delete": "Hapus",
+      "confirmText-disable-service-account": "Nonaktifkan akun layanan",
       "placeholder-search-service-account-by-name": "Cari akun layanan berdasarkan nama",
       "sub-title": "Akun layanan dan tokennya dapat digunakan untuk mengautentikasi API Grafana. Cari tahu selengkapnya di <2>dokumentasi kami.</2>",
       "title-delete-service-account": "Hapus akun layanan",
       "title-disable-service-account": "Nonaktifkan akun layanan",
-      "body-delete_other": ""
+      "body-delete_other": "Yakin ingin menghapus {{serviceAccountName}} dan {{count}} token yang menyertainya?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Token ini telah kedaluwarsa",
@@ -12149,7 +12153,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Ekspor sebagai gambar",
       "export-json-title": "Ekspor sebagai JSON",
       "share-externally-title": "Bagikan secara eksternal",
       "share-internally-title": "Bagikan secara internal",
@@ -12186,17 +12190,17 @@
       "view-button-yaml": "Lihat YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Tindakan ekspor gambar",
+      "cancel-button": "Batal",
+      "download-button": "Unduh gambar",
+      "error-title": "Gagal membuat gambar",
+      "generate-button": "Buat gambar",
+      "generating": "Membuat gambar...",
+      "info-text": "Simpan dasbor ini sebagai gambar",
+      "preview": "Pratinjau",
+      "preview-aria": "Pratinjau gambar yang dibuat",
+      "preview-region": "Pratinjau gambar",
+      "title": "Ekspor sebagai gambar"
     },
     "library": {
       "info": "Buat panel pustaka."
@@ -12206,7 +12210,7 @@
       "info-text": "Buat tautan langsung ke dasbor atau panel ini, disesuaikan dengan opsi di bawah ini.",
       "link-url": "Tautkan URL",
       "render-alert": "Plugin perender gambar belum diinstal",
-      "render-instructions": "",
+      "render-instructions": "Untuk merender gambar, Anda harus menginstal <2>plugin perender gambar Grafana</2>. Hubungi administrator Grafana Anda untuk menginstal plugin.",
       "rendered-image": "Tautan langsung gambar yang dirender",
       "save-alert": "Dasbor tidak disimpan",
       "save-dashboard": "Untuk merender gambar panel, Anda harus menyimpan dasbor terlebih dahulu.",
@@ -12274,11 +12278,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Simpan dasbor untuk mengaktifkan pembuatan gambar",
+    "download-disabled-help": "Buat gambar terlebih dahulu untuk mengaktifkan unduhan",
+    "error-title": "Gagal membuat gambar",
     "form": {
-      "label": ""
+      "label": "Pengaturan gambar panel"
     },
     "preview": {
       "title": "Pratinjau panel"
@@ -12592,17 +12596,17 @@
       "label-small": "Kecil"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Tindakan",
+      "auto": "Otomatis",
+      "color-background": "Latar belakang berwarna",
+      "color-text": "Teks berwarna",
+      "data-links": "Tautan data",
+      "gauge": "Pengukur",
+      "image": "Gambar",
+      "json": "Tampilan JSON",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Pil",
+      "sparkline": "Sparkline"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "Jika dipilih, seluruh baris akan berwarna seperti sel ini.",
@@ -12631,7 +12635,7 @@
     "description-count-rows": "Tampilkan satu hitungan untuk semua baris data",
     "description-fields": "Pilih bidang yang harus dihitung",
     "description-min-column-width": "Lebar minimum untuk perubahan ukuran kolom otomatis",
-    "description-wrap-header-text": "",
+    "description-wrap-header-text": "Mengaktifkan pembungkusan teks untuk header kolom",
     "image-cell-options-editor": {
       "description-alt-text": "Teks alternatif yang akan ditampilkan jika gambar tidak dapat ditampilkan atau untuk pengguna yang menggunakan pembaca layar",
       "description-title-text": "Teks yang akan ditampilkan saat gambar diarahkan oleh kursor",
@@ -12715,7 +12719,7 @@
     "tag-option-label": "Opsi tag"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Tim tidak ditemukan",
     "select-aria-label": "Pemilih tim",
     "select-placeholder": "Pilih tim"
   },
@@ -13019,15 +13023,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Operasi biner",
+          "reduce-row": "Kurangi baris",
+          "row-index": "Indeks baris",
+          "unary-operation": "Operasi unary"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Fungsi kumulatif",
+        "window-functions": "Fungsi jendela"
       },
       "label-alias": "Alias",
       "label-mode": "Mode",
@@ -13045,9 +13049,9 @@
       "label-name": "Nama",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Salin nama bingkai ke nama bidang",
+          "ignore-the-frame-name": "Abaikan nama bingkai",
+          "label-frame": "Tambahkan label dengan nama bingkai"
         }
       },
       "placeholder-frame": "Frame"
@@ -13060,9 +13064,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Tambahkan transformer jenis bidang konversi",
       "aria-label-remove-convert-field-type-transformer": "Hapus transformer jenis bidang konversi",
-      "convert-field-type": "",
+      "convert-field-type": "Konversi tipe bidang",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Konversikan bidang ke jenis bidang yang ditentukan."
       },
       "label": {
         "browser": "Browser",
@@ -13075,11 +13079,11 @@
       "label-join-with": "Gabung dengan",
       "label-set-timezone": "Atur zona waktu",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Konversi tipe bidang"
       },
       "placeholder-type": "Jenis",
       "tags": {
-        "format-field": ""
+        "format-field": "Format bidang"
       },
       "tooltip-explicit-separator-joining-array-values": "Gunakan pemisah eksplisit saat menggabungkan nilai array",
       "tooltip-input-format": "Tentukan format bidang input sehingga Grafana dapat memproses string tanggal dengan benar.",
@@ -13105,13 +13109,13 @@
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Gabungkan semua bidang ke dalam satu bingkai."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Satukan bidang"
         },
         "tags": {
-          "combine": ""
+          "combine": "Gabungkan"
         }
       }
     },
@@ -13126,11 +13130,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Mengurai bidang dari konten (JSON, label, dll.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Pilih bidang"
         }
       },
       "label-delimiter": "Delimiter",
@@ -13139,7 +13143,7 @@
       "label-replace-all-fields": "Ganti semua bidang",
       "label-source": "Sumber",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Ekstrak bidang"
       },
       "placeholder-auto": "Auto",
       "placeholder-select-delimiter": "Pilih delimiter...",
@@ -13150,20 +13154,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Gunakan nilai bidang untuk mencari negara, negara bagian, atau bandara."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Tidak ada bidang teks yang ditemukan"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Pilih bidang teks"
         }
       },
       "label-field": "Bidang",
       "label-lookup": "Cari",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Cari bidang dari sumber daya"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13174,23 +13178,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Hapus bagian dari hasil kueri menggunakan pola regex."
       },
       "label-from-variable": "Dari variabel",
       "label-identifier": "Pengidentifikasi",
       "label-use-variable": "Gunakan variabel",
       "label-variable": "Variabel",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Filter bidang berdasarkan nama"
       },
       "placeholder-regular-expression-pattern": "Struktur pola reguler"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Hapus baris dari data berdasarkan kueri asal"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Filter data berdasarkan kueri"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13204,33 +13208,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Tambah ketentuan",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Hapus baris dari hasil kueri menggunakan filter yang ditentukan pengguna."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Cocokkan semua",
+          "match-any": "Cocokkan apa pun"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Kecualikan",
+          "include": "Meliputi"
         }
       },
       "label-conditions": "Syarat",
       "label-filter-type": "Jenis filter",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Filter data menurut nilai"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Tidak ada bidang teks yang ditemukan"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Pilih bidang teks"
         }
       },
       "label-field": "Bidang",
@@ -13239,10 +13243,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Manipulasi pemformatan bidang string."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Format string"
       }
     },
     "format-time-transfomer-editor": {
@@ -13254,66 +13258,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Atur format output dari bidang waktu"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Format waktu"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Gunakan nilai baris untuk menghitung bidang baru."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Tambahkan bidang dari perhitungan"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Atur satuan, min, maks, dan lainnya."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Konfigurasi dari hasil kueri"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Buat data peta panas dari data sumber."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Buat peta panas"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Ratakan hasil berlabel menjadi tabel yang digabungkan dengan label."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Gabungkan berdasarkan label"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Pisahkan kumpulan data satu bingkai menjadi beberapa rangkaian."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Partisi berdasarkan nilai"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Konversikan setiap baris menjadi bidang dengan konfigurasi dinamis."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Baris ke bidang"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Terapkan operasi spasial ke hasil kueri."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Operasi spasial"
       }
     },
     "get-timezone-options": {
@@ -13345,8 +13349,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Kalkulasi",
+          "group-by": "Kelompokkan berdasarkan"
         }
       },
       "placeholder-ignored": "Diabaikan",
@@ -13354,42 +13358,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Kelompokkan data berdasarkan nilai bidang dan buat data agregat."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Kelompokkan berdasarkan"
       },
       "title-calc-alert": "Perhitungan tidak akan berpengaruh jika tidak ada bidang yang dikelompokkan"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Kelompokkan data berdasarkan nilai bidang dan buat tabel bersarang dengan data yang dikelompokkan."
       },
       "description-show-field-names": "Jika tabel nested diaktifkan, akan menampilkan nama bidang sebagai header tabel",
       "label-show-field-names-in-nested-tables": "Tampilkan nama bidang dalam tabel nested",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Kelompokkan ke tabel bersarang"
       },
       "title-calc-alert": "Perhitungan tidak akan berpengaruh jika tidak ada bidang yang dikelompokkan."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Rangkum dan susun ulang data berdasarkan tiga bidang."
       },
       "label-cell-value": "Nilai cell",
       "label-column": "Kolom",
       "label-empty-value": "Nilai kosong",
       "label-row": "Baris",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Pengelompokan ke matriks"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Hitung histogram dari data input."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Histogram"
       },
       "placeholder-auto": "Auto",
       "placeholder-default": "Default: 30",
@@ -13401,14 +13405,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Gabungkan baris dari 2+ tabel, berdasarkan bidang terkait."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Gabungkan berdasarkan bidang"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Wajib diisi",
       "info": {
         "input-contain-labels": "Input tidak berisi label apa pun",
         "no-input-or-labels-found": "Tidak ada input (atau label) yang ditemukan",
@@ -13432,8 +13436,8 @@
       "label-value-field-name": "Nama bidang nilai",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Kolom",
+          "rows": "Baris"
         }
       },
       "placeholder-optional-select-label": "(Opsional) Pilih label",
@@ -13441,18 +13445,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Kelompokkan rangkaian berdasarkan waktu dan kembalikan label atau tag sebagai bidang."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Label ke bidang"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Batasi jumlah item yang ditampilkan."
       },
       "name": {
-        "limit": ""
+        "limit": "Batas"
       },
       "placeholder-value-or-variable": "Nilai atau variabel"
     },
@@ -13465,11 +13469,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Gabungkan beberapa rangkaian. Nilai akan digabungkan menjadi satu baris."
       },
       "merge-effect-applied-single-frame": "Penggabungan tidak berpengaruh ketika diterapkan pada single frame.",
       "name": {
-        "merge": ""
+        "merge": "Gabungkan rangkaian/tabel"
       }
     },
     "multi-info": {
@@ -13481,14 +13485,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Urutkan ulang, sembunyikan, atau ganti nama bidang."
       },
       "field-order": "Urutan bidang",
       "field-order-auto": "Auto",
       "field-order-manual": "Manual",
       "first-frame-warning": "Penataan bidang hanya berfungsi dengan satu frame. Pertimbangkan untuk menerapkan transformasi gabungan atau memfilter input terlebih dahulu.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Susun bidang berdasarkan nama"
       }
     },
     "partion-by-values-editor": {
@@ -13516,10 +13520,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Regangkan bingkai data dari format lebar ke format panjang."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Menyiapkan deret waktu"
       }
     },
     "prepare-time-series-editor": {
@@ -13527,26 +13531,26 @@
       "label-info": "Info",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Konversikan setiap bingkai ke format panjang"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Deret waktu format panjang"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Membuat bingkai baru untuk setiap pasangan waktu/angka"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Deret waktu multibingkai"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Membuat satu bingkai yang digabungkan berdasarkan waktu"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Deret waktu format lebar"
         }
       }
     },
@@ -13561,7 +13565,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Kurangi semua baris atau titik data menjadi satu nilai (misalnya, maks, rata-rata)."
       },
       "label-calculations": "Perhitungan",
       "label-include-time": "Sertakan waktu",
@@ -13578,7 +13582,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Kurangi"
       },
       "placeholder-choose-stat": "Pilih stat"
     },
@@ -13588,18 +13592,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Buat bingkai data baru yang berisi nilai yang diprediksi oleh model statistik."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Garis tren"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Kubik",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Kuadratik",
         "quartic": "Kuartik",
-        "quintic": "Kuintik"
+        "quintic": "Kuintik",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Derajat",
       "label-model-type": "Tipe model",
@@ -13614,16 +13623,17 @@
       },
       "regression": "regresi",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Analisis regresi"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Jumlah poin X,Y untuk diprediksi"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Ganti nama bagian dari hasil kueri menggunakan ekspresi reguler dan pola penggantian."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Ganti nama bidang berdasarkan regex"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13637,33 +13647,33 @@
       "label-mode": "Mode",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Gabungkan data dari dua tabel setiap kali ada nilai yang cocok di bidang yang umum untuk kedua tabel.",
+          "join-on-a-field": "Gabungkan pada nilai bidang dengan nilai duplikat. Gabungan luar yang kurang berkinerja paling baik digunakan untuk data tabular (seperti SQL).",
+          "keep-all-rows": "Simpan semua baris dari tabel mana pun dengan nilai. Gabungkan pada nilai bidang yang berbeda. Berkinerja baik dan paling baik digunakan untuk deret waktu."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Dalam",
+          "outer-tabular": "Luar (tabular)",
+          "outer-time-series": "Luar (deret waktu)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Gabungkan beberapa deret. Kembalikan waktu, metrik, dan nilai sebagai satu baris."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Deret ke baris"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Urutkan bidang dalam bingkai."
       },
       "label-field": "Bidang",
       "label-reverse": "Balik",
       "name": {
-        "sort-by": ""
+        "sort-by": "Urutkan berdasarkan"
       },
       "placeholder-select-field": "Pilih bidang"
     },
@@ -13686,13 +13696,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Ubah data deret waktu menjadi baris tabel sehingga dapat dilihat dalam format tabel atau sparkline."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "Transformasi deret waktu ke tabel membutuhkan setidaknya satu bingkai deret waktu untuk berfungsi. Saat ini Anda tidak memilikinya."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Deret waktu ke tabel"
       }
     },
     "time-series-table-transform-editor": {
@@ -13710,15 +13720,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Transposisi bingkai data."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Transposisi"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Pivot",
+        "transform": "Ubah",
+        "translate": "Terjemahkan"
       }
     },
     "unary-operation-editor": {
@@ -13727,13 +13737,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Hitung bidang baru",
+        "combine": "Gabungkan",
+        "create-new-visualization": "Buat visualisasi baru",
+        "filter": "Filter",
+        "perform-spatial-operations": "Lakukan operasi spasial",
+        "reformat": "Format Ulang",
+        "reorder-and-rename": "Urutkan ulang dan ganti nama"
       },
       "special-value-options": {
         "description": {
@@ -13804,7 +13814,7 @@
     "title": "Organisasi"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Pengguna tidak ditemukan",
     "select-aria-label": "Pemilih pengguna",
     "select-placeholder": "Mulai mengetik untuk mencari pengguna"
   },
@@ -13890,8 +13900,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Yakin ingin menghapus variabel \"{{variableToDelete}}\"?",
+      "confirmText-delete": "Hapus",
       "title-delete-variable": "Hapus variabel"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13941,33 +13951,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Cara mengurutkan nilai variabel ini",
-      "name-sort": "",
+      "name-sort": "Urutkan",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Sesuai abjad (naik)",
+          "alphabetical-caseinsensitive-asc": "Sesuai abjad (tidak peka huruf besar-kecil, naik)",
+          "alphabetical-caseinsensitive-desc": "Sesuai abjad (tidak peka huruf besar-kecil, turun)",
+          "alphabetical-desc": "Sesuai abjad (turun)",
+          "disabled": "Dinonaktifkan",
+          "natural-asc": "Asli (naik)",
+          "natural-desc": "Asli (turun)",
+          "numerical-asc": "Numerik (naik)",
+          "numerical-desc": "Numerik (turun)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Tambahkan opsi",
+      "description": "Tambahkan opsi kustom selain hasil kueri",
+      "label-placeholder": "tampilkan label",
+      "remove-option-button-label": "Hapus opsi",
+      "value-placeholder": "nilai, string kosong default"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Cara mengurutkan opsi statis dengan hasil kueri"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Nilai default",
       "placeholder-default-value-if-any": "nilai default, jika ada",
       "text-options": "Opsi teks"
     },
@@ -13996,8 +14006,8 @@
       "description-optional-display-name": "Nama tampilan opsional",
       "description-template-variable-characters": "Nama variabel templat. (Maks. 50 karakter)",
       "general": "Umum",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Label",
+      "name-name": "Nama",
       "placeholder-descriptive-text": "Teks deskriptif",
       "placeholder-label-name": "Nama label",
       "placeholder-variable-name": "Nama variabel",
@@ -14013,13 +14023,13 @@
       "tooltip-remove-variable": "Hapus variabel"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Deskripsi"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Alihkan tombol semua nilai"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Pilih jenis variabel"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Tampilkan penggunaan"
diff --git a/public/locales/it-IT/grafana.json b/public/locales/it-IT/grafana.json
index 5f7afb75cfc..e773a15a6b9 100644
--- a/public/locales/it-IT/grafana.json
+++ b/public/locales/it-IT/grafana.json
@@ -74,7 +74,7 @@
       "label-name": "Nome",
       "page-nav": {
         "subTitle": {
-          "manage-settings-roles-organization": ""
+          "manage-settings-roles-organization": "Gestisci le impostazioni e i ruoli utente per un'organizzazione."
         }
       },
       "render-missing-permission-message": {
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Alcune funzionalità sono stabili (GA) e attive per impostazione predefinita, mentre altre sono ancora in fase beta preliminare e disponibili su richiesta in anteprima.",
       "confirm-modal-body-2": "Si consiglia di comprendere le implicazioni di ogni modifica delle funzionalità prima di applicarle.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Salva modifiche",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Disponibilità generale",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Elimina org",
-      "confirmText-delete": "",
+      "confirmText-delete": "Elimina",
       "title-delete": "Elimina"
     },
     "anon-users": {
       "not-found": "Nessun utente anonimo trovato."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Vuoi davvero forzare la disconnessione da tutti i dispositivi?",
+      "confirmText-confirm-logout": "Conferma la disconnessione",
+      "confirmText-force-logout": "Forza la disconnessione",
       "title-force-logout-from-all-devices": "Forza la disconnessione da tutti i dispositivi"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Salva"
     },
     "edit-org": {
       "access-denied": "Non hai l'autorizzazione per vedere gli utenti in questa organizzazione. Per aggiornare questa organizzazione, contatta l'amministratore del server.",
@@ -119,10 +119,10 @@
       "users-heading": "Utenti dell'organizzazione"
     },
     "enterprise-auth-features-card": {
-      "dismiss": "",
-      "heading": "",
-      "learn-more-link": "",
-      "text": ""
+      "dismiss": "Chiudi",
+      "heading": "Autenticazione aziendale",
+      "learn-more-link": "Scopri di più",
+      "text": "Gestisci automaticamente utenti, team e autorizzazioni con <1>SAML</1>, <3>SCIM</3>, <6>LDAP</6> e <8>RBAC</8>, disponibili in Grafana Cloud ed Enterprise."
     },
     "feature-listing": {
       "title-auditing": "Verifiche",
@@ -216,11 +216,11 @@
       "not-editable": "Il ruolo di questo utente non è modificabile perché è sincronizzato dal provider di autenticazione. Fai riferimento ai <1>documenti di autenticazione Grafana</1> per i dettagli."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Vuoi davvero eliminare l'utente {{user}}?",
       "columns": {
         "aria-label-role": "Ruolo"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Elimina",
       "delete-aria-label": "Elimina utente: {{name}}",
       "title-delete": "Elimina"
     },
@@ -252,7 +252,7 @@
       "info-description": "Queste impostazioni di sistema sono definite in grafana.ini o custom.ini (o sovrascritte nelle variabili ENV). Per modificarle, al momento è necessario riavviare Grafana."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Conferma rimozione"
     },
     "upgrade-info": {
       "title": "Licenza Enterprise"
@@ -260,7 +260,7 @@
     "user-admin-page": {
       "page-nav": {
         "subTitle": {
-          "manage-settings-for-an-individual-user": ""
+          "manage-settings-for-an-individual-user": "Gestisci le impostazioni per un singolo utente."
         }
       }
     },
@@ -275,14 +275,14 @@
     },
     "user-list-admin-page-un-connected": {
       "label": {
-        "active-last-days": "",
+        "active-last-days": "Attivo negli ultimi 30 giorni",
         "all-users": "Tutti gli utenti"
       },
       "placeholder-search-login-email": "Cerca un utente usando i dati di accesso, l'email o il nome."
     },
     "user-list-anonymous-devices-page-un-connected": {
       "label": {
-        "active-last-days": ""
+        "active-last-days": "Attivo negli ultimi 30 giorni"
       },
       "placeholder-search-devices-by-ip-address": "Cerca dispositivi per indirizzo IP."
     },
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Modifica",
-      "confirmText-change": "",
+      "confirmText-change": "Modifica",
       "grafana-admin-key": "Amministratore Grafana",
       "grafana-admin-no": "No",
       "grafana-admin-yes": "Sì",
       "title": "Autorizzazioni"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Vuoi davvero eliminare questo utente?",
+      "body-disable": "Vuoi davvero disabilitare questo utente?",
+      "confirmText-delete-user": "Elimina utente",
+      "confirmText-disable-user": "Disabilita utente",
       "delete-button": "Elimina utente",
       "disable-button": "Disabilita utente",
       "edit-button": "Modifica",
@@ -331,7 +331,7 @@
       "title-disable-user": "Disabilita utente"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Salva"
     },
     "user-sessions": {
       "browser-column": "Browser e sistema operativo",
@@ -374,26 +374,26 @@
       "am-active-timing-select-label-active-timings": "Orari attivi"
     },
     "ad": {
-      "close": "",
-      "learn-more": ""
+      "close": "Chiudi",
+      "learn-more": "Scopri di più"
     },
     "add-button": {
       "add-more": "Aggiungi altro"
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Impossibile caricare il pulsante Regola avviso IA",
+        "feedback-button": "Impossibile caricare il pulsante Feedback IA",
+        "improve-annotations-button": "Impossibile caricare il pulsante Migliora annotazioni IA",
+        "improve-labels-button": "Impossibile caricare il pulsante Migliora etichette IA",
+        "template-button": "Impossibile caricare il pulsante Modello IA",
+        "triage-button": "Impossibile caricare il pulsante Triage IA"
       }
     },
     "alert": {
       "alert-state": "Stato avviso",
       "annotations": "Annotazioni",
-      "description-missing-series-evaluations": "",
+      "description-missing-series-evaluations": "Il numero di intervalli di valutazione consecutivi in cui una dimensione deve risultare mancante prima che l'istanza di avviso diventi obsoleta e venga quindi risolta ed eliminata automaticamente. Se vuoto, l'impostazione predefinita è 2.",
       "evaluation": "Valutazione",
       "evaluation-paused": "Valutazione degli avvisi attualmente sospesa",
       "evaluation-paused-description": "Le notifiche per questa regola non verranno attivate e non verranno create istanze di avviso fino a quando la regola non verrà riattivata.",
@@ -405,12 +405,12 @@
       "missing-series-resolve": "Valutazioni in serie mancanti da risolvere",
       "no-annotations": "Nessuna annotazione",
       "notification-configuration": {
-        "active-timings": "",
+        "active-timings": "Intervalli di tempo attivi",
         "contact-point": "Punto di contatto",
         "group-by": "Raggruppato per",
-        "group-title": "",
+        "group-title": "Configurazione delle notifiche",
         "mute-timings": "Orari di disattivazione dell'audio",
-        "timing-options": ""
+        "timing-options": "Tempi"
       },
       "pending-period": "Periodo di attesa",
       "rule": "Regola",
@@ -434,7 +434,7 @@
     "alert-group-alerts-table": {
       "columns": {
         "label": {
-          "instance-labels": "",
+          "instance-labels": "Etichette istanza",
           "notification-state": "Stato notifica"
         }
       },
@@ -493,7 +493,7 @@
       "title-muting-grouping-and-timings": "Disattivazione audio, raggruppamento e orari"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nessuna fonte dati trovata"
     },
     "alert-menu": {
       "copy-link": "Copia link",
@@ -504,11 +504,11 @@
     },
     "alert-missing-evaluations-to-stale": {
       "help-info": {
-        "link-text": "",
-        "text1": "",
-        "text2": "",
-        "text3": "",
-        "title": ""
+        "link-text": "Scopri di più sulle istanze di avviso obsolete",
+        "text1": "Un'istanza di avviso è considerata obsoleta se la query della regola di avviso restituisce dati, ma la dimensione (o serie) specifica per tale istanza di avviso risulta mancante per diversi intervalli di valutazione consecutivi.",
+        "text2": "Un'istanza di avviso obsoleta viene risolta e quindi eliminata.",
+        "text3": "Questa impostazione definisce quanti intervalli di valutazione consecutivi devono passare senza dati prima che un'istanza di avviso venga considerata obsoleta. Se vuoto, l'impostazione predefinita è 2.",
+        "title": "Istanze di avviso obsolete"
       }
     },
     "alert-recording-rule-form": {
@@ -519,7 +519,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Regola avviso"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -533,8 +533,8 @@
       "label-metric": "Metrica",
       "label-name": "Nome",
       "message": {
-        "must-enter-a-metric-name": "",
-        "must-enter-a-name": "",
+        "must-enter-a-metric-name": "Devi inserire un nome per la metrica",
+        "must-enter-a-name": "Devi inserire un nome",
         "please-select-a-data-source": "Seleziona un'origine di dati"
       },
       "metric-aria-label-metric": "metrica",
@@ -587,11 +587,11 @@
       "view-configuration": "Visualizza configurazione"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Sì, ripristina la configurazione",
       "gma-manual-configuration-description": "La configurazione interna di Grafana Alertmanager non può essere modificata manualmente. Per modificare questa configurazione, modifica le singole risorse tramite l'interfaccia utente.",
       "gma-manual-configuration-is-not-supported": "Modifiche alla configurazione manuale non supportate",
       "message": {
-        "configuration-cannot-be-empty": ""
+        "configuration-cannot-be-empty": "Il campo Configurazione non può essere vuoto"
       },
       "reset": "Ripristino",
       "reset-confirmation": "Desideri davvero ripristinare la configurazione per \"{{alertmanagerName}}\"? I punti di contatto e i criteri di notifica verranno ripristinati ai valori predefiniti.",
@@ -602,13 +602,13 @@
       "title-resetting-alertmanager-configuration": "Ripristino della configurazione di Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Vuoi davvero ripristinare la configurazione a questa versione? Tutte le modifiche non salvate andranno perse.",
       "columns": {
         "compare": "Confronta",
         "restore": "Ripristina",
         "text-latest": "Più recente"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Sì, ripristina la configurazione",
       "loading": "Caricamento in corso...",
       "no-previous-configurations": "Nessuna configurazione precedente",
       "this-might-take-a-while": "Potrebbe volerci un po' di tempo...",
@@ -685,7 +685,7 @@
       "label-default-contact-point": "Punto di contatto predefinito",
       "label-timing-options": "Opzioni di orario",
       "message": {
-        "required": ""
+        "required": "Obbligatorio."
       },
       "or": "oppure"
     },
@@ -709,7 +709,7 @@
       "label-value": "Valore",
       "matching-labels": "Etichette corrispondenti",
       "message": {
-        "required": ""
+        "required": "Obbligatorio."
       },
       "placeholder-label": "etichetta",
       "placeholder-value": "valore",
@@ -718,7 +718,7 @@
     },
     "annotation-header-field": {
       "message": {
-        "required": ""
+        "required": "Obbligatorio."
       }
     },
     "annotations": {
@@ -796,17 +796,17 @@
       "scene": {
         "labels-filter-variable": {
           "label": {
-            "labels": ""
+            "labels": "Etichette: "
           }
         },
         "transitions-from-filter-variable": {
           "label": {
-            "start-state": ""
+            "start-state": "Stato di avvio:"
           }
         },
         "transitions-to-filter-variable": {
           "label": {
-            "end-state": ""
+            "end-state": "Stato di fine:"
           }
         }
       }
@@ -856,7 +856,7 @@
       "description-pending-period": "Periodo durante il quale la condizione di soglia deve essere soddisfatta per attivare un avviso. Selezionando \"Nessuno\" si attiva l'avviso non appena viene soddisfatta la condizione.",
       "label-pending-period": "Periodo di attesa",
       "message": {
-        "must-be-a-positive-integer": ""
+        "must-be-a-positive-integer": "Deve essere un numero intero positivo."
       },
       "title-set-evaluation-behavior": "Imposta comportamento di valutazione"
     },
@@ -888,10 +888,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Altre azioni per il punto di contatto \"{{contactPointName}}\"",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Elimina",
       "button-edit": "Modifica",
       "button-view": "Visualizza",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Esporta",
       "export-label-export": "Esporta",
       "label-delete": "Elimina",
       "label-manage-permissions": "Gestisci autorizzazioni",
@@ -900,7 +900,7 @@
     "contact-point-selector": {
       "contact-point-picker-label-contact-point": "Punto di contatto",
       "message": {
-        "contact-point-is-required": ""
+        "contact-point-is-required": "Il punto di contatto è obbligatorio."
       },
       "title-failed-to-fetch-contact-points": "Impossibile recuperare i punti di contatto"
     },
@@ -964,7 +964,7 @@
     },
     "contactPoints": {
       "validation": {
-        "notFound": ""
+        "notFound": "Impossibile trovare il punto di contatto \"{{contactPoint}}\""
       }
     },
     "continue-matching-indicator": {
@@ -973,13 +973,13 @@
     "copy-to-clipboard": "Copia \"{{label}}\" negli appunti",
     "create-metadata": {
       "label": {
-        "contact-point": "",
+        "contact-point": "Le notifiche vengono inviate a",
         "dashboard": "Dashboard",
-        "dashboard-and-panel": "",
+        "dashboard-and-panel": "Dashboard e pannello",
         "evaluation-interval": "Intervallo di valutazione",
         "labels": "Etichette",
-        "metric-name": "",
-        "runbook-url": ""
+        "metric-name": "Nome metrica",
+        "runbook-url": "URL runbook"
       },
       "view-dashboard": "Visualizza dashboard",
       "view-panel": "Visualizza pannello"
@@ -1104,7 +1104,7 @@
     },
     "edit-mute-timing-page": {
       "text": {
-        "edit-time-interval": ""
+        "edit-time-interval": "Modifica intervallo di tempo"
       }
     },
     "editor": {
@@ -1121,11 +1121,11 @@
       "content-show-all-errors": "Mostra tutti gli errori"
     },
     "errors": {
-      "failedWith": ""
+      "failedWith": "{{-config}} non riuscita con {{status}}: {{-message}}"
     },
     "evaluate-every-validation-options": {
       "message": {
-        "required": ""
+        "required": "Obbligatorio."
       }
     },
     "evaluation-behavior-summary": {
@@ -1146,7 +1146,7 @@
       "description-group-name": "Un gruppo valuta tutte le sue regole sullo stesso intervallo di valutazione.",
       "description-often-rules-group-evaluated": "Con quale frequenza vengono valutate tutte le regole del gruppo.",
       "message": {
-        "required": ""
+        "required": "Obbligatorio."
       },
       "placeholder-enter-a-name": "Inserisci un nome",
       "title-new-evaluation-group": "Nuovo gruppo di valutazione"
@@ -1173,7 +1173,7 @@
     "existing-silence-editor-page": {
       "page-nav": {
         "text": {
-          "edit-silence": ""
+          "edit-silence": "Modifica silenzio"
         }
       }
     },
@@ -1185,7 +1185,7 @@
     },
     "export-new-grafana-rule-page": {
       "text": {
-        "export-new-grafana-rule": ""
+        "export-new-grafana-rule": "Esporta nuova regola di Grafana"
       }
     },
     "export-new-rule-button": {
@@ -1216,10 +1216,10 @@
     "feature-toggle-page": {
       "nav-model": {
         "subTitle": {
-          "enable-alerting-grafana-config": ""
+          "enable-alerting-grafana-config": "Per attivare gli avvisi, abilitali nella configurazione di Grafana"
         },
         "text": {
-          "alerting-is-not-enabled": ""
+          "alerting-is-not-enabled": "Gli avvisi non sono abilitati"
         }
       }
     },
@@ -1232,9 +1232,9 @@
       "api-provisioning": "Il formato {{name}} è valido solo per il provisioning API. <3>Scopri di più nella documentazione.</3>",
       "export-inline-doc": {
         "title": {
-          "apiprovisioning-format": "",
-          "fileprovisioning-format": "",
-          "terraformprovisioning-format": ""
+          "apiprovisioning-format": "Formato di provisioning API",
+          "fileprovisioning-format": "Formato di provisioning file",
+          "terraformprovisioning-format": "Formato di provisioning Terraform"
         }
       },
       "file-provisioning": "Il formato {{name}} è valido solo per il provisioning API. <3>Scopri di più nella documentazione.</3>",
@@ -1249,7 +1249,7 @@
         "alert-rule": "Regola avviso",
         "all": "Tutti",
         "error": "Errore",
-        "firing": "",
+        "firing": "In attivazione",
         "no-data": "Nessun dato",
         "normal": "Normale",
         "ok": "OK",
@@ -1287,7 +1287,7 @@
     "folder-selector": {
       "description-select-folder": "Seleziona una cartella in cui archiviare la regola.",
       "message": {
-        "select-a-folder": ""
+        "select-a-folder": "Seleziona una cartella"
       }
     },
     "folderAndGroup": {
@@ -1305,7 +1305,7 @@
     },
     "for-validation-options": {
       "message": {
-        "required": ""
+        "required": "Obbligatorio."
       }
     },
     "generate-alert-data-modal": {
@@ -1313,8 +1313,8 @@
       "add-alert-data-to-payload": "Aggiungi i dati di avviso al carico utile",
       "alert-options": {
         "label": {
-          "firing": "",
-          "resolved": ""
+          "firing": "In attivazione",
+          "resolved": "Risolto"
         }
       },
       "review-alert-payload": " Esamina i dati di avviso da aggiungere al carico utile:",
@@ -1322,30 +1322,30 @@
     },
     "get-alert-suggestions": {
       "documentation": {
-        "annotations-attached-alert": "",
-        "fingerprint-identify-alert": "",
-        "grafana-external-alertmanager": "",
-        "organization-alert": "",
-        "time-the-alert-started-firing": ""
+        "annotations-attached-alert": "Una serie di annotazioni collegate all'avviso.",
+        "fingerprint-identify-alert": "Impronta digitale che può essere utilizzata per identificare l'avviso.",
+        "grafana-external-alertmanager": "Link di ritorno a Grafana o Alertmanager esterno.",
+        "organization-alert": "L'ID dell'organizzazione proprietaria dell'avviso.",
+        "time-the-alert-started-firing": "Ora in cui l'avviso ha iniziato ad attivarsi."
       },
       "value": {
-        "labels-attached-alert": "",
-        "status-alert-firing-resolved": ""
+        "labels-attached-alert": "Una serie di etichette collegate all'avviso.",
+        "status-alert-firing-resolved": "Stato dell'avviso. Può essere \"in attivazione\" o \"risolto\""
       }
     },
     "get-cloud-scenes": {
       "title": {
-        "mimir-alertmanager": ""
+        "mimir-alertmanager": "Mimir Alertmanager"
       }
     },
     "get-global-suggestions": {
       "value": {
-        "an-array-containing-all-alerts": ""
+        "an-array-containing-all-alerts": "Un array contenente tutti gli avvisi"
       }
     },
     "get-grafana-alertmanager-scenes": {
       "title": {
-        "grafana-alertmanager": ""
+        "grafana-alertmanager": "Grafana Alertmanager"
       }
     },
     "get-grafana-managed-scenes": {
@@ -1356,16 +1356,16 @@
     "get-mimir-managed-rules-per-group-scenes": {
       "rule-group-handler": {
         "label": {
-          "rule-group": ""
+          "rule-group": "Gruppo di regole"
         }
       },
       "title": {
-        "mimirmanaged-alert-rules-per-rule-group": ""
+        "mimirmanaged-alert-rules-per-rule-group": "Regole di avviso gestite da Mimir per gruppo di regole"
       }
     },
     "get-mimir-managed-rules-scenes": {
       "title": {
-        "mimirmanaged-alert-rules": ""
+        "mimirmanaged-alert-rules": "Regole di avviso gestite da Mimir"
       }
     },
     "get-preview-results": {
@@ -1373,16 +1373,16 @@
     },
     "get-state-display-model": {
       "text": {
-        "alerting": "",
-        "error": "",
-        "firing": "",
-        "inactive": "",
-        "no-data": "",
+        "alerting": "AVVISI",
+        "error": "ERRORE",
+        "firing": "IN ATTIVAZIONE",
+        "inactive": "NON ATTIVO",
+        "no-data": "NESSUN DATO",
         "ok": "OK",
-        "paused": "",
-        "pending": "",
-        "recovering": "",
-        "unknown": ""
+        "paused": "IN PAUSA",
+        "pending": "IN SOSPESO",
+        "recovering": "IN RECUPERO",
+        "unknown": "SCONOSCIUTO"
       }
     },
     "getting-stared": {
@@ -1426,10 +1426,10 @@
       "label-disable-resolved-message": "Disabilita messaggio risolto"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Caricamento di gruppi in corso...",
       "message": {
-        "must-be-a-positive-integer": "",
-        "must-enter-a-group-name": ""
+        "must-be-a-positive-integer": "Deve essere un numero intero positivo.",
+        "must-enter-a-group-name": "Devi inserire un nome di gruppo"
       },
       "missing-series-resolve-placeholder": "Impostazione predefinita: 2",
       "or": "oppure",
@@ -1449,7 +1449,7 @@
     },
     "grafana-modify-export-page": {
       "text": {
-        "modify-export": ""
+        "modify-export": "Modifica esportazione"
       }
     },
     "grafana-mute-timing-exporter-preview": {
@@ -1505,7 +1505,7 @@
     "group-and-namespace-fields": {
       "group-picker-label-group": "Gruppo",
       "message": {
-        "required": ""
+        "required": "Obbligatorio."
       },
       "namespace-picker-label-namespace": "Namespace"
     },
@@ -1523,7 +1523,7 @@
       "group-loading-error": "Errore durante il caricamento del gruppo",
       "interval": "Intervallo",
       "namespace": "Namespace",
-      "new": "",
+      "new": "Nuovo",
       "title": {
         "back": ""
       }
@@ -1555,7 +1555,7 @@
     },
     "group-loader": {
       "group-load-failed": "Impossibile caricare le regole dal gruppo {{ groupName }} in {{ namespaceName }}",
-      "no-rules": ""
+      "no-rules": "Nessuna regola trovata in questo gruppo"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "Il gruppo è in fase di eliminazione"
@@ -1565,27 +1565,27 @@
     },
     "history-apidatasource": {
       "message": {
-        "data-source-is-working": ""
+        "data-source-is-working": "L'origine dati è in funzione"
       },
       "title": {
         "success": "Operazione riuscita"
       }
     },
     "home": {
-      "irm-card-description": "",
-      "irm-card-item-1": "",
-      "irm-card-item-2": "",
-      "irm-card-item-3": "",
-      "irm-card-item-4": "",
-      "irm-card-title": "",
+      "irm-card-description": "Unifica la reperibilità, gli avvisi e la risposta agli incidenti con Grafana Cloud IRM.",
+      "irm-card-item-1": "Gestisci i turni della reperibilità con il tuo calendario o Terraform.",
+      "irm-card-item-2": "Rispondi agli incidenti tramite web, app, Slack o altri canali.",
+      "irm-card-item-3": "Individua le cause principali con Grafana SIFT basato sull'IA.",
+      "irm-card-item-4": "Analizza gli incidenti passati per migliorare la risposta e la resilienza.",
+      "irm-card-title": "Risposta e gestione degli incidenti",
       "label-get-started": "Inizia subito",
       "label-insights": "Approfondimenti",
-      "synthetic-monitoring-card-description": "",
-      "synthetic-monitoring-card-item-1": "",
-      "synthetic-monitoring-card-item-2": "",
-      "synthetic-monitoring-card-item-3": "",
-      "synthetic-monitoring-card-item-4": "",
-      "synthetic-monitoring-card-title": ""
+      "synthetic-monitoring-card-description": "Monitora i flussi di utenti, i siti web e le API critici esternamente, da sedi globali.",
+      "synthetic-monitoring-card-item-1": "Simula i percorsi degli utenti end-to-end con i controlli del browser.",
+      "synthetic-monitoring-card-item-2": "Esegui controlli ping, DNS, HTTP/S e TCP a ogni livello di rete.",
+      "synthetic-monitoring-card-item-3": "Utilizza oltre 20 sonde globali o private dietro il tuo firewall.",
+      "synthetic-monitoring-card-item-4": "Tieni traccia degli SLO con avvisi integrati in stile Prometheus, direttamente dall'interfaccia utente.",
+      "synthetic-monitoring-card-title": "Monitoraggio sintetico"
     },
     "import-to-gma": {
       "action-button": "Importa",
@@ -1594,12 +1594,12 @@
       "confirm-modal": {
         "confirm": "Importa",
         "loading": "Caricamento in corso...",
-        "loading-body": "",
+        "loading-body": "Preparazione dei dati da importare. Questo potrebbe richiedere un po' di tempo...",
         "no-rules-body": "Non sono presenti regole da importare. Seleziona uno spazio dei nomi o un gruppo di regole diverso.",
-        "no-rules-body-yaml": "",
+        "no-rules-body-yaml": "Non sono presenti regole da importare. Seleziona un file yaml diverso.",
         "no-rules-title": "Nessuna regola da importare",
         "not-using-rules-managed-by-integrations-or-plugins": {
-          "text": "",
+          "text": "Le regole gestite da integrazioni o plug-in non devono essere importate nelle regole gestite da Grafana.",
           "title": "Informazioni"
         },
         "plugin-rules-warning": {
@@ -1611,7 +1611,7 @@
       },
       "datasource": {
         "help-info": {
-          "content": "",
+          "content": "Il menu a discesa mostra solo le origini dati Mimir o Loki che hanno l'API ruler disponibile.",
           "title": "Origine dei dati"
         },
         "label": "Sorgente dati",
@@ -1623,12 +1623,12 @@
         "label": "Gruppo"
       },
       "import-location-and-filters": "Importa posizione e filtri",
-      "import-source": "",
+      "import-source": "Importa origine",
       "namespace": {
         "description": "Digita per cercare uno spazio dei nomi esistente",
         "label": "Namespace"
       },
-      "pageTitle": "",
+      "pageTitle": "Importa regole di avviso",
       "pause": {
         "label": "Sospendi le regole di avviso importate"
       },
@@ -1637,10 +1637,10 @@
       },
       "recording-rules": "Regole di registrazione",
       "source": {
-        "datasource": "",
-        "datasource-description": "",
-        "yaml": "",
-        "yaml-description": ""
+        "datasource": "Regole gestite dall'origine dati esistente",
+        "datasource-description": "Importa regole da origini dati esistenti",
+        "yaml": "File YAML di Prometheus",
+        "yaml-description": "Importa regole da un file YAML di Prometheus."
       },
       "success": "Regole di avviso importate correttamente nelle regole gestite da Grafana.",
       "target-folder": {
@@ -1648,14 +1648,14 @@
         "label": "Cartella di destinazione"
       },
       "yaml": {
-        "description": "",
-        "label": "",
-        "required-message": "",
+        "description": "Seleziona un file YAML compatibile con Prometheus da importare",
+        "label": "File YAML di Prometheus",
+        "required-message": "Seleziona un file",
         "target-datasource": "Origine dati di destinazione",
-        "target-datasource-description": "",
-        "target-datasource-required": ""
+        "target-datasource-description": "Seleziona l'origine dati che verrà interrogata dalle regole importate. Assicurati che le metriche utilizzate nelle regole importate siano disponibili in questa origine dati.",
+        "target-datasource-required": "Seleziona un'origine dei dati di destinazione"
       },
-      "yaml-error": ""
+      "yaml-error": "Impossibile analizzare il file YAML: {{error}}"
     },
     "insights": {
       "monitor-status-of-system": "Monitora lo stato del tuo sistema",
@@ -1732,7 +1732,7 @@
     },
     "labels-without-suggestions": {
       "message": {
-        "required": ""
+        "required": "Obbligatorio."
       },
       "placeholder-key": "chiave",
       "placeholder-value": "valore"
@@ -1789,9 +1789,9 @@
     },
     "log-timeline-viewer": {
       "label": {
-        "firing": "",
-        "mixed": "",
-        "no-data": "",
+        "firing": "In attivazione",
+        "mixed": "Misto",
+        "no-data": "Nessun dato",
         "normal": "Normale",
         "pending": "In sospeso",
         "recovering": "Recupero in corso"
@@ -1799,7 +1799,7 @@
     },
     "loki-apidatasource": {
       "message": {
-        "data-source-is-working": ""
+        "data-source-is-working": "L'origine dati è in funzione"
       },
       "title": {
         "success": "Operazione riuscita"
@@ -1820,8 +1820,8 @@
     "manual-and-automatic-routing": {
       "routing-options": {
         "label": {
-          "select-contact-point": "",
-          "use-notification-policy": ""
+          "select-contact-point": "Seleziona punto di contatto",
+          "use-notification-policy": "Usa criterio di notifica"
         }
       }
     },
@@ -1843,7 +1843,7 @@
       "label-refine-affected-alerts": "Perfeziona gli avvisi interessati",
       "label-value": "Valore",
       "message": {
-        "required": ""
+        "required": "Obbligatorio."
       },
       "placeholder-label": "etichetta",
       "placeholder-value": "valore",
@@ -1880,22 +1880,22 @@
       "get-data-source-options": {
         "grouped-options": {
           "label": {
-            "data-sources-with-configured-alert-rules": "",
-            "other-data-sources": ""
+            "data-sources-with-configured-alert-rules": "Origini dati con regole di avviso configurate",
+            "other-data-sources": "Altre fonti di dati"
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nessuna fonte dati trovata"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Vuoi davvero eliminare \"{{muteTiming}}\"?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Disabilitato",
       "title-delete-mute-timing": "Elimina orario di disattivazione dell'audio"
     },
     "mute-timing-fields": {
-      "am-active-timing-select-description-active-timings": "",
+      "am-active-timing-select-description-active-timings": "Seleziona un intervallo di tempo per definire quando inviare notifiche per questa regola di avviso",
       "am-mute-timing-select-description-mute-timings": "Seleziona un intervallo di disattivazione dell'audio per definire quando non inviare notifiche per questa regola di avviso",
       "am-mute-timing-select-label-mute-timings": "Orari di disattivazione dell'audio"
     },
@@ -1955,7 +1955,7 @@
     },
     "new-mute-timing-page": {
       "text": {
-        "add-time-interval": ""
+        "add-time-interval": "Aggiungi intervallo di tempo"
       }
     },
     "new-rule-from-panel-button": {
@@ -1966,7 +1966,7 @@
     "new-silence-page": {
       "page-nav": {
         "subTitle": {
-          "configure-silences-notifications-particular-alert": ""
+          "configure-silences-notifications-particular-alert": "Configura i silenzi per arrestare le notifiche da una particolare regola di avviso"
         },
         "text": {
           "silence-alert-rule": "Silenzia regola di avviso"
@@ -1979,7 +1979,7 @@
     },
     "notification-policies-filter": {
       "label-search-by-contact-point": "Cerca per punto di contatto",
-      "placeholder-search-by-contact-point": "",
+      "placeholder-search-by-contact-point": "Scegli un punto di contatto",
       "search-query-input-placeholder-search": "Cerca"
     },
     "notification-policies-list": {
@@ -2140,10 +2140,10 @@
         "conflict": "L'albero di accesso alle notifiche è stato aggiornato da un altro utente.",
         "error-code": "Messaggio di errore: \"{{error}}\"",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Impossibile aggiungere o aggiornare il percorso: i matcher sono in conflitto con una struttura di routing esterna se abbiamo unito i matcher {{-matchers}}. Ciò renderebbe il percorso irraggiungibile."
         },
         "suffix": "Aggiorna la pagina e riprova.",
-        "title": ""
+        "title": "Impossibile aggiungere o aggiornare i criteri di notifica"
       },
       "n-more-policies_one": "{{count}} criterio aggiuntivo",
       "n-more-policies_other": "{{count}} criteri aggiuntivi"
@@ -2199,12 +2199,12 @@
     "query-and-expressions-step": {
       "add-query": "Aggiungi query",
       "body-queries-expressions-configured": "Crea almeno una query o un'espressione su cui ricevere un avviso",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Disattiva",
       "expressions": "Espressioni",
       "loading-data-sources": "Caricamento delle origini dei dati in corso...",
       "manipulate-returned-queries-other-operations": "Modifica i dati che trovi nelle query usando operazioni matematiche e di altro tipo.",
       "message": {
-        "a-valid-expression-is-required": ""
+        "a-valid-expression-is-required": "È richiesta un'espressione valida"
       },
       "no-compatible-sources": "Sembra che tu non abbia origini dei dati compatibili",
       "title-deactivate-advanced-options": "Disattiva opzioni avanzate",
@@ -2253,7 +2253,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Regola di registrazione"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Impossibile caricare l'editor di query a causa di: {{errorMessage}}"
@@ -2264,7 +2264,7 @@
     "recording-rules": {
       "description-target-data-source": "L'origine dei dati di Prometheus in cui archiviare le regole di registrazione",
       "label-target-data-source": "Origine dati di destinazione",
-      "target-data-source-required": ""
+      "target-data-source-required": "Seleziona un'origine dei dati di destinazione"
     },
     "recording-rules-name-space-and-group-step": {
       "description-select-namespace-group-recording": "Seleziona lo Spazio dei nomi e il Gruppo per la regola di registrazione.",
@@ -2273,7 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Sarà necessario impostare un nuovo gruppo di valutazione per la regola copiata perché quella originale è stata sottoposta a provisioning e non può essere utilizzata per le regole create nell'interfaccia utente.",
       "body-not-provisioned": "La nuova regola <1>non</1> sarà contrassegnata come regola con provisioning.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Copia",
       "title-copy-provisioned-alert-rule": "Copia la regola di avviso fornita"
     },
     "redirect-to-rule-viewer": {
@@ -2473,7 +2473,7 @@
     "rule-list": {
       "configure-datasource": "Configura",
       "ds-error": {
-        "title": ""
+        "title": "Impossibile caricare le regole per questa origine dati"
       },
       "ds-error-boundary": {
         "description": "Controlla la configurazione dell'origine dati. L'origine dati supporta l'API di Prometheus?",
@@ -2492,12 +2492,12 @@
         "new-badge": "Novità!",
         "text": "Importa nelle regole gestite da Grafana"
       },
-      "loading-more-groups": "",
+      "loading-more-groups": "Caricamento di più gruppi...",
       "more": "Altro",
       "new-alert-rule": "Nuova regola di avviso",
       "new-datasource-recording-rule": "Nuova regola di registrazione dell'origine dei dati",
       "new-grafana-recording-rule": "Nuova regola di registrazione Grafana",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Nuova regola di avviso per l'esportazione",
       "pagination": {
         "next-page": "Mostra altro…"
       },
@@ -2529,7 +2529,7 @@
       "expand-all": "Ingrandisci tutto"
     },
     "rule-list-v2": {
-      "import-to-gma": ""
+      "import-to-gma": "Importa regole di avviso"
     },
     "rule-modify-export": {
       "text-loading-the-rule": "Caricamento della regola in corso...",
@@ -2671,7 +2671,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Gestori avvisi"
       }
     },
     "settings-content": {
@@ -2715,7 +2715,7 @@
       "label-created-by": "Creato da",
       "label-duration": "Durata",
       "message": {
-        "required": ""
+        "required": "Obbligatorio."
       },
       "placeholder-whos-creating-the-silence": "Chi sta creando il silenzio",
       "save-silence": "Salva disattivazione audio",
@@ -2801,7 +2801,7 @@
       "label-template-group": "Gruppo modelli",
       "label-template-group-name": "Nome del gruppo di modelli",
       "message": {
-        "required": ""
+        "required": "Obbligatorio."
       },
       "new-template-name-placeholder-give-your-template-group-a-name": "Assegna un nome al gruppo di modelli",
       "title-error-saving-template": "Errore durante il salvataggio del modello",
@@ -2809,7 +2809,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Aggiorna anteprima",
-      "empty-state": "",
+      "empty-state": "Aggiungi il contenuto del modello per visualizzare l'anteprima",
       "label-preview": "Anteprima",
       "refresh": "Aggiorna"
     },
@@ -2828,10 +2828,10 @@
       "loading": "Caricamento in corso...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Seleziona il modello di notifica"
         },
         "label": {
-          "select-notification-template": ""
+          "select-notification-template": "Seleziona il modello di notifica"
         }
       },
       "tooltip-copy": "Copia il modello di notifica selezionato negli appunti. Puoi usarlo nella scheda personalizzata."
@@ -2856,8 +2856,8 @@
     },
     "templates-table": {
       "actions": "Azioni",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Vuoi davvero eliminare il gruppo di modelli \"{{template}}\"?",
+      "confirmText-yes-delete": "Sì, elimina",
       "no-templates-defined": "Nessun modello definito.",
       "template-group": "Gruppo modelli",
       "title-delete-template-group": "Elimina gruppo di modelli"
@@ -2912,7 +2912,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Gestisci le regole di avviso, le regole di registrazione e l'intervallo di valutazione"
       }
     },
     "to-gma": {
@@ -2945,8 +2945,8 @@
     "use-columns": {
       "columns": {
         "label": {
-          "alert-rule-targeted": "",
-          "alerts-silenced": "",
+          "alert-rule-targeted": "Regola di avviso mirata",
+          "alerts-silenced": "Avvisi silenziati",
           "health": "Stato",
           "matching-labels": "Etichette corrispondenti",
           "name": "Nome",
@@ -2971,8 +2971,8 @@
     "use-combined-labels": {
       "grouped-options": {
         "label": {
-          "from-alerts": "",
-          "from-system": ""
+          "from-alerts": "Da avvisi",
+          "from-system": "Da sistema"
         }
       }
     },
@@ -2992,7 +2992,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Sì, elimina"
       }
     },
     "use-delete-policy-modal": {
@@ -3020,7 +3020,7 @@
           "details": "Dettagli",
           "history": "Cronologia",
           "instances": "Istanze",
-          "query-and-conditions": "",
+          "query-and-conditions": "Query e condizioni",
           "versions": "Versioni"
         }
       }
@@ -3046,105 +3046,105 @@
     }
   },
   "alertlist": {
-    "category-alert-state-filter": "",
-    "category-filter": "",
-    "category-options": "",
-    "descriptino-alerts-linked-to-dashboard": "",
-    "description-alert-instance-label": "",
-    "description-alert-name": "",
-    "description-datasource": "",
-    "description-folder": "",
-    "description-group-by": "",
-    "description-group-mode": "",
-    "description-max-items": "",
-    "description-show-inactive-alerts": "",
-    "description-sort-order": "",
-    "description-view-mode": "",
+    "category-alert-state-filter": "Filtro stato avviso",
+    "category-filter": "Filtro",
+    "category-options": "Opzioni",
+    "descriptino-alerts-linked-to-dashboard": "Mostra solo gli avvisi collegati a questa dashboard",
+    "description-alert-instance-label": "Filtra le istanze di avviso utilizzando la query dell'etichetta, ad esempio: {severity=\"critical\", instance=~\"cluster-us-.+\"}",
+    "description-alert-name": "Filtra per avvisi contenenti questo testo",
+    "description-datasource": "Filtra dall'origine avviso",
+    "description-folder": "Filtra per avvisi nella cartella selezionata (solo per regole di avviso gestite da Grafana)",
+    "description-group-by": "Filtra gli avvisi utilizzando la query dell'etichetta",
+    "description-group-mode": "Come devono essere raggruppate le istanze di avviso",
+    "description-max-items": "Numero massimo di avvisi da visualizzare",
+    "description-show-inactive-alerts": "Includi regole di avviso che hanno 0 (zero) istanze. Poiché queste regole non hanno istanze, rimangono nascoste se è configurato il filtro dell'etichetta dell'istanza di Avviso.",
+    "description-sort-order": "Ordina gli avvisi e le istanze di avviso",
+    "description-view-mode": "Alterna le modalità di visualizzazione elenco e statistiche",
     "group-by": {
-      "aria-label-group-by-label-keys": "",
+      "aria-label-group-by-label-keys": "raggruppa per chiavi di etichetta",
       "placeholder-group-by": "Raggruppa per"
     },
     "group-mode-options": {
-      "label-custom-grouping": "",
-      "label-default-grouping": ""
+      "label-custom-grouping": "Raggruppamento personalizzato",
+      "label-default-grouping": "Raggruppamento predefinito"
     },
-    "name-alert-instance-label": "",
-    "name-alert-name": "",
-    "name-alerts-linked-to-dashboard": "",
-    "name-datasource": "",
-    "name-error": "",
-    "name-firing": "",
-    "name-folder": "",
-    "name-group-by": "",
-    "name-group-mode": "",
-    "name-max-items": "",
-    "name-no-data": "",
-    "name-normal": "",
-    "name-pending": "",
-    "name-recovering": "",
-    "name-show-inactive-alerts": "",
-    "name-sort-order": "",
-    "name-view-mode": "",
+    "name-alert-instance-label": "Etichetta istanza avviso",
+    "name-alert-name": "Nome avviso",
+    "name-alerts-linked-to-dashboard": "Avvisi collegati a questa dashboard",
+    "name-datasource": "Origine dati",
+    "name-error": "Errore",
+    "name-firing": "Avvisi/Attivazione",
+    "name-folder": "Cartella",
+    "name-group-by": "Raggruppa per",
+    "name-group-mode": "Modalità gruppo",
+    "name-max-items": "Numero massimo di elementi",
+    "name-no-data": "Nessun dato",
+    "name-normal": "Normale",
+    "name-pending": "In sospeso",
+    "name-recovering": "In fase di recupero",
+    "name-show-inactive-alerts": "Mostra avvisi con 0 istanze",
+    "name-sort-order": "Ordinamento",
+    "name-view-mode": "Modalità di visualizzazione",
     "sort-order-options": {
-      "label-alphabetical-asc": "",
-      "label-alphabetical-desc": "",
-      "label-importance": "",
-      "label-time-asc": "",
-      "label-time-desc": ""
+      "label-alphabetical-asc": "Alfabetico (asc)",
+      "label-alphabetical-desc": "Alfabetico (disc)",
+      "label-importance": "Importanza",
+      "label-time-asc": "Ora (asc)",
+      "label-time-desc": "Ora (disc)"
     },
     "ungrouped-mode-view": {
-      "active-for": "",
-      "aria-label-view-alert-rule": "",
-      "view-alert-rule": ""
+      "active-for": "per <1>{{duration}}</1>",
+      "aria-label-view-alert-rule": "Visualizza regola di avviso",
+      "view-alert-rule": "Visualizza regola di avviso"
     },
     "unified-alert-list": {
       "clear": "Cancella",
       "text-loading": "Caricamento in corso..."
     },
     "unified-alert-list-panel": {
-      "body-permission-required": "",
-      "title-permission-required": ""
+      "body-permission-required": "Siamo spiacenti, non disponi delle autorizzazioni necessarie per leggere le regole di avviso.",
+      "title-permission-required": "Autorizzazione richiesta"
     },
     "view-mode-options": {
-      "label-list": "",
-      "label-stat": ""
+      "label-list": "Elenco",
+      "label-stat": "Stat."
     }
   },
   "annolist": {
     "anno-list-panel": {
-      "aria-label-remove-filter": "",
-      "filter": "",
+      "aria-label-remove-filter": "Rimuovi filtro: {{filterToRemove}}",
+      "filter": "Filtro:",
       "loading": "Caricamento in corso...",
-      "no-annotations-found": ""
+      "no-annotations-found": "Nessuna annotazione trovata"
     },
     "annotation-list-item": {
-      "tooltip-created-by": ""
+      "tooltip-created-by": "Creazione di:<1></1> {{email}}"
     },
-    "category-annotation-query": "",
-    "category-display": "",
-    "category-link-behaviour": "",
-    "description-tags": "",
+    "category-annotation-query": "Query di annotazione",
+    "category-display": "Visualizza",
+    "category-link-behaviour": "Comportamento del link",
+    "description-tags": "Abbina i tag di annotazione",
     "link-target-options": {
-      "label-dashboard": "",
-      "label-panel": ""
+      "label-dashboard": "Dashboard",
+      "label-panel": "Pannello"
     },
-    "name-limit": "",
-    "name-link-target": "",
-    "name-query-filter": "",
-    "name-show-tags": "",
-    "name-show-time": "",
-    "name-show-user": "",
-    "name-tags": "",
-    "name-time-after": "",
-    "name-time-before": "",
-    "name-time-range": "",
+    "name-limit": "Limite",
+    "name-link-target": "Destinazione collegamento",
+    "name-query-filter": "Filtro di query",
+    "name-show-tags": "Mostra tag",
+    "name-show-time": "Mostra ora",
+    "name-show-user": "Mostra utente",
+    "name-tags": "Tag",
+    "name-time-after": "Tempo dopo",
+    "name-time-before": "Tempo prima",
+    "name-time-range": "Intervallo di tempo",
     "query-filter-options": {
-      "label-all-dashboards": "",
-      "label-this-dashboard": ""
+      "label-all-dashboards": "Tutte le dashboard",
+      "label-this-dashboard": "Questa dashboard"
     },
     "time-range-options": {
-      "label-none": "",
-      "label-this-dashboard": ""
+      "label-none": "Nessuno",
+      "label-this-dashboard": "Questa dashboard"
     }
   },
   "annotations": {
@@ -3152,7 +3152,7 @@
       "annotation": "Annotazioni",
       "first-value": "Primo valore",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Nomi di campi sconosciuti"
     },
     "empty-state": {
       "button-title": "Aggiungi query di annotazione",
@@ -3162,12 +3162,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Quando questo campo è definito, l'annotazione verrà trattata come un intervallo",
+        "results-split-on-comma": "I risultati saranno divisi in base a virgola (,)"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}} o il primo campo di testo",
+        "time-or-the-first-field": "{{defaultField}} o il primo campo temporale"
       }
     },
     "standard-annotation-query-editor": {
@@ -3245,9 +3245,9 @@
       "define-allowed-teams-ids-label": "Definisci gli ID dei team consentiti",
       "display-name-description": "Verrà visualizzato nella pagina di accesso come \"Accedi con...\". Utile se utilizzi più di un provider di identità o protocolli SSO.",
       "display-name-label": "Visualizza nome",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Parametro per indicare il dominio dell'utente nel tenant Azure AD/Entra ID e semplificare il processo di accesso.",
+      "domain-hint-label": "Suggerimento dominio",
+      "domain-hint-valid-domain": "Questo campo deve essere un dominio valido.",
       "email-attribute-name-description": "Nome della chiave da utilizzare per la ricerca dell'e-mail dell'utente all'interno della mappa degli attributi del token ID di OAuth2.",
       "email-attribute-name-label": "Nome attributo e-mail",
       "email-attribute-path-description": "Espressione JMESPath da utilizzare per la ricerca dell'e-mail dell'utente dalle informazioni dell'utente.",
@@ -3264,11 +3264,11 @@
       "id-token-attribute-name-label": "Nome attributo token ID",
       "login-attribute-path-description": "Espressione JMESPath da utilizzare per la ricerca dell'accesso utente dal token ID utente.",
       "login-attribute-path-label": "Percorso attributo di accesso",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Consenso",
+      "login-prompt-description": "Indica il tipo di interazione dell'utente quando accede con l'IdP.",
+      "login-prompt-label": "Richiesta di accesso",
+      "login-prompt-login": "Accedi",
+      "login-prompt-select-account": "Seleziona account",
       "managed-identity-client-id-description": "L'ID client dell'identità gestita della credenziale di identità federata della tua app OAuth2.",
       "managed-identity-client-id-label": "ID client identità gestita FIC",
       "name-attribute-path-description": "Espressione JMESPath da utilizzare per la ricerca del nome utente dal token ID utente. \nQuesto nome verrà visualizzato come nome dell'utente.",
@@ -3304,7 +3304,7 @@
       "team-ids-github": "Elenco intero di ID team.",
       "team-ids-label": "ID team",
       "team-ids-numbers": "Gli ID dei team devono essere numeri.",
-      "team-ids-other": "",
+      "team-ids-other": "Elenco di stringhe di ID team.",
       "team-ids-placeholder": "Inserisci gli ID dei team e premi Invio per aggiungerli",
       "teams-url-description": "L'URL utilizzato per eseguire query per gli ID dei team. Se non impostato, il valore predefinito è /teams.",
       "teams-url-description-oauth": "Se configuri \"{{ teamsURLLabel }}\", devi configurare anche \"{{ teamIDsAttributePathLabel }}\".",
@@ -3326,21 +3326,21 @@
       "use-refresh-token-label": "Usa token di aggiornamento",
       "validate-hosted-domain-description": "Se abilitata, Grafana abbinerà il dominio ospitato recuperato dal token ID Google all'elenco \"{{ allowedDomainsLabel }}\" specificato dall'utente.",
       "validate-hosted-domain-label": "Convalida dominio ospitato",
-      "workload-identity-token-file-description": "",
-      "workload-identity-token-file-label": "",
-      "workload-identity-token-file-required": ""
+      "workload-identity-token-file-description": "Il percorso del file al file token utilizzato per autenticarsi al provider OAuth2. È necessario solo quando l'autenticazione del client è impostata su \"workload_identity\". L'impostazione predefinita è /var/run/secrets/azure/tokens/azure-identity-token.",
+      "workload-identity-token-file-label": "file token {{ workloadIdentityLabel }}",
+      "workload-identity-token-file-required": "Questo campo deve essere impostato quando l'autenticazione del client è impostata su \"Workload identity\"."
     },
     "get-page-nav": {
       "subTitle": {
-        "configure-authentication-providers": ""
+        "configure-authentication-providers": "Configura i provider di autenticazione"
       },
       "text": {
         "authentication": "Autenticazione"
       }
     },
     "provider-card": {
-      "saml-learn-more": "",
-      "scim-learn-more": "",
+      "saml-learn-more": "Single Sign-On (SSO) con SAML.",
+      "scim-learn-more": " Sincronizza utenti e team con SCIM.",
       "text-badge-enabled": "Abilitato",
       "text-badge-not-enabled": "Non abilitato"
     },
@@ -3348,7 +3348,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Ripristina valori predefiniti"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Ripristina",
       "disable": "Disabilita",
       "disabling": "Disabilitazione in corso...",
       "discard": "Annulla",
@@ -3368,7 +3368,7 @@
       "text-badge-not-enabled": "Non abilitato"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM è attualmente in fase di sviluppo e non è consigliato per l'uso in produzione. Utilizzalo con cautela e prevedi potenziali modifiche."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "L'endpoint .well-known/openid-configuration per il tuo IdP",
@@ -3380,99 +3380,99 @@
   },
   "bar-chart": {
     "warn": {
-      "missing-numeric": "",
-      "missing-series": ""
+      "missing-numeric": "Nessun campo numerico trovato",
+      "missing-series": "I grafici a barre richiedono un campo stringa o ora"
     }
   },
   "barchart": {
     "config": {
-      "category-thresholds": "",
-      "description-color-by-field": "",
-      "description-x-label-max-length": "",
-      "name-bar-radius": "",
-      "name-bar-width": "",
-      "name-color-by-field": "",
-      "name-fill-opacity": "",
-      "name-full-highlight": "",
-      "name-gradient-mode": "",
-      "name-group-width": "",
-      "name-line-width": "",
-      "name-orientation": "",
-      "name-rotate-x-labels": "",
-      "name-show-thresholds": "",
-      "name-show-values": "",
-      "name-stacking": "",
-      "name-transform": "",
-      "name-x-axis": "",
-      "name-x-label-max-length": "",
-      "name-x-label-min-spacing": "",
+      "category-thresholds": "Soglie",
+      "description-color-by-field": "Utilizza il valore colore per un campo di pari livello per colorare ciascun valore della barra.",
+      "description-x-label-max-length": "Le etichette dell'asse X verranno troncate alla lunghezza fornita",
+      "name-bar-radius": "Raggio della barra",
+      "name-bar-width": "Larghezza barra",
+      "name-color-by-field": "Colore per campo",
+      "name-fill-opacity": "Opacità del riempimento",
+      "name-full-highlight": "Evidenzia l'area completa al passaggio del mouse",
+      "name-gradient-mode": "Modalità gradiente",
+      "name-group-width": "Larghezza gruppo",
+      "name-line-width": "Larghezza linea",
+      "name-orientation": "Orientamento",
+      "name-rotate-x-labels": "Ruota le etichette di spunta dell'asse x",
+      "name-show-thresholds": "Mostra soglie",
+      "name-show-values": "Mostra i valori",
+      "name-stacking": "Impilabile",
+      "name-transform": "Trasforma",
+      "name-x-axis": "Asse X",
+      "name-x-label-max-length": "Lunghezza massima dell'etichetta di spunta dell'asse X",
+      "name-x-label-min-spacing": "Spaziatura minima delle etichette dell'asse X",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-line-vertical": ""
+        "label-auto": "Automatico",
+        "label-horizontal": "Orizzontale",
+        "label-line-vertical": "Verticale"
       },
-      "placeholder-x-axis": "",
-      "placeholder-x-label-max-length": "",
+      "placeholder-x-axis": "Prima stringa o campo ora",
+      "placeholder-x-label-max-length": "Nessuno",
       "show-values-options": {
-        "label-always": "",
-        "label-auto": "",
-        "label-never": ""
+        "label-always": "Sempre",
+        "label-auto": "Automatico",
+        "label-never": "Mai"
       },
       "transform-options": {
-        "description-constant": "",
-        "description-negative-y": "",
-        "label-constant": "",
-        "label-negative-y": ""
+        "description-constant": "Il primo valore verrà mostrato come una linea costante",
+        "description-negative-y": "Capovolgi i risultati in valori negativi sull'asse y",
+        "label-constant": "Costante",
+        "label-negative-y": "Y negativo"
       }
     },
     "tick-spacing-editor": {
-      "content-require-space-from-the-right-side": "",
+      "content-require-space-from-the-right-side": "Richiedi spazio dal lato destro",
       "gaps-options": {
-        "description-large": "",
-        "description-medium": "",
-        "description-none": "",
-        "description-small": "",
-        "label-large": "",
-        "label-medium": "",
-        "label-none": "",
-        "label-small": ""
+        "description-large": "Richiedi spaziatura {{spacing}}",
+        "description-medium": "Richiedi spaziatura {{spacing}}",
+        "description-none": "Mostra tutti i segni di spunta",
+        "description-small": "Richiedi spaziatura {{spacing}}",
+        "label-large": "Grande",
+        "label-medium": "Media",
+        "label-none": "Nessuna",
+        "label-small": "Piccola"
       },
-      "label-rtl": ""
+      "label-rtl": "RTL"
     }
   },
   "bargauge": {
     "bar-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automatica",
+      "label-manual": "Manuale"
     },
-    "category-bar-gauge": "",
-    "description-max-height": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-show-unfilled-area": "",
+    "category-bar-gauge": "Indicatore a barre",
+    "description-max-height": "Altezza massima della riga (orientamento orizzontale)",
+    "description-min-height": "Altezza minima della riga (orientamento orizzontale)",
+    "description-min-width": "Larghezza minima della colonna (orientamento verticale)",
+    "description-show-unfilled-area": "Quando abilitata, rende grigia la regione non riempita",
     "display-mode-options": {
-      "label-basic": "",
-      "label-gradient": "",
-      "label-retro": ""
+      "label-basic": "Base",
+      "label-gradient": "Sfumatura",
+      "label-retro": "LCD retro"
     },
-    "name-bar-size": "",
-    "name-display-mode": "",
-    "name-max-height": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-name-placement": "",
+    "name-bar-size": "Dimensione barra",
+    "name-display-mode": "Modalità di visualizzazione",
+    "name-max-height": "Altezza massima",
+    "name-min-height": "Altezza minima",
+    "name-min-width": "Larghezza minima",
+    "name-name-placement": "Posizionamento del nome",
     "name-placement-options": {
-      "label-auto": "",
-      "label-hidden": "",
-      "label-left": "",
-      "label-top": ""
+      "label-auto": "Automatico",
+      "label-hidden": "Nascosto",
+      "label-left": "A sinistra",
+      "label-top": "In alto"
     },
-    "name-show-unfilled-area": "",
-    "name-value-display": "",
+    "name-show-unfilled-area": "Mostra area non riempita",
+    "name-value-display": "Visualizzazione del valore",
     "value-display-options": {
-      "label-hidden": "",
-      "label-text-color": "",
-      "label-value-color": ""
+      "label-hidden": "Nascosto",
+      "label-text-color": "Colore del testo",
+      "label-value-color": "Colore del valore"
     }
   },
   "bookmarks-page": {
@@ -3486,8 +3486,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Elimina in blocco le risorse fornite",
+      "bulk-move-provisioned-resources": "Sposta in blocco le risorse fornite",
       "cancel-button": "Annulla",
       "confirmation-text": "Elimina",
       "delete-button": "Elimina",
@@ -3496,7 +3496,7 @@
       "delete-modal-restore-dashboards-text": "Questa azione eliminerà immediatamente le cartelle selezionate, ma i dashboard selezionati verranno contrassegnati per l'eliminazione tra 30 giorni. L'amministratore dell'organizzazione può ripristinare i dashboard in qualsiasi momento prima della scadenza dei 30 giorni. Non è possibile ripristinare le cartelle.",
       "delete-modal-text": "Questa azione eliminerà il seguente contenuto:",
       "delete-modal-title": "Elimina",
-      "delete-provisioned-folder": "",
+      "delete-provisioned-folder": "Elimina cartella fornita",
       "deleting": "Eliminazione in corso...",
       "manage-permissions-button": "Gestisci autorizzazioni",
       "move-button": "Sposta",
@@ -3506,8 +3506,8 @@
       "move-modal-title": "Sposta",
       "moving": "Spostamento in corso...",
       "new-folder-name-required-phrase": "Il nome della cartella è obbligatorio.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Hai selezionato sia risorse sottoposte a provisioning che risorse non sottoposte a provisioning. Non possono essere elaborate insieme. Seleziona solo risorse sottoposte a provisioning o solo risorse non sottoposte a provisioning e riprova.",
+      "selected-mix-resources-modal-title": "Tipi di risorse miste selezionati"
     },
     "actions": {
       "button-to-recently-deleted": "Eliminati di recente"
@@ -3520,25 +3520,25 @@
       "this-folder-is-empty": "Questa cartella è vuota"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_other": ""
+      "all-deleted": "Tutte le risorse sono state eliminate correttamente",
+      "all-moved": "Tutte le risorse sono state spostate correttamente",
+      "button-done": "Fine",
+      "progress-title": "Operazione riuscita",
+      "failed-alert_one": "{{count}} elementi non riusciti",
+      "failed-alert_other": "{{count}} elementi non riusciti"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Annulla",
+      "button-delete": "Elimina",
+      "button-deleting": "Eliminazione in corso...",
+      "delete-warning": "Questa operazione eliminerà le cartelle selezionate e i relativi discendenti. In totale, questo influenzerà:",
+      "error-path-not-found": "Percorso non trovato"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Annulla",
+      "button-move": "Sposta",
+      "button-moving": "Spostamento in corso...",
+      "deleting": "Eliminazione",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,14 +3546,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Contenuto del file non trovato",
+      "error-path-not-found": "Percorso non trovato",
+      "error-target-folder-path-missing": "Percorso della cartella di destinazione mancante",
+      "error-title": "Errore cartella di destinazione",
+      "move-warning": "Questa operazione sposterà le cartelle selezionate e i relativi discendenti. In totale, questo influenzerà:",
+      "moving": "Spostamento",
+      "progress": "Avanzamento: {{current}} di {{total}}",
+      "target-folder": "Cartella di destinazione"
     },
     "counts": {
       "alertRule_one": "{{count}} regola di avviso",
@@ -3579,12 +3579,12 @@
       "read-only-message": ""
     },
     "delete-provisioned-folder-form": {
-      "api-error": "",
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "success-message": ""
+      "api-error": "Impossibile eliminare la cartella",
+      "button-cancel": "Annulla",
+      "button-delete": "Elimina",
+      "button-deleting": "Eliminazione in corso...",
+      "delete-warning": "Questa operazione eliminerà questa cartella e tutti i suoi discendenti. In totale, questo influenzerà:",
+      "success-message": "Cartella eliminata correttamente"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Impossibile recuperare le informazioni sui discendenti"
@@ -3609,7 +3609,7 @@
       "empty-message": "Nessuna cartella trovata",
       "error-title": "Errore durante il caricamento delle cartelle",
       "non-folder-item": "Non cartella {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "Dashboard",
       "search-placeholder": "Cerca cartelle",
       "unknown-error": "Errore sconosciuto"
     },
@@ -3638,7 +3638,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Inserisci nome cartella",
       "label-folder-name": "Nome cartella",
       "text-pull-request-created": "È stata creata una richiesta di pull con modifiche a questa cartella:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "La tua cartella verrà creata come {{folderName}}",
       "title-pull-request-created": "Richiesta di pull creata",
       "title-this-repository-is-read-only": "Questo repository è di sola lettura"
     },
@@ -3647,78 +3647,78 @@
       "text": "Nessun risultato trovato per la ricerca"
     },
     "restore": {
-      "success": ""
+      "success": "Dashboard {{name}} ripristinata"
     },
     "text-this-repository-is-read-only": "Se hai accesso diretto alla destinazione, copia il file JSON e incollalo lì.",
     "trash-state-manager": {
       "label": {
-        "alphabetically-az": "",
-        "alphabetically-za": ""
+        "alphabetically-az": "In ordine alfabetico (A-Z)",
+        "alphabetically-za": "In ordine alfabetico (Z-A)"
       }
     }
   },
   "candlestick": {
     "additional-fields-options": {
-      "label-ignore": "",
-      "label-include": ""
+      "label-ignore": "Ignora",
+      "label-include": "Includi"
     },
     "candle-style-options": {
-      "label-candles": "",
-      "label-ohlc-bars": ""
+      "label-candles": "Candele",
+      "label-ohlc-bars": "Barre OHLC"
     },
-    "category-candlestick": "",
+    "category-candlestick": "Grafico a candele",
     "color-strategy-options": {
-      "label-since-open": "",
-      "label-since-prior-close": ""
+      "label-since-open": "Da aperto",
+      "label-since-prior-close": "Dalla chiusura precedente"
     },
-    "description-additional-fields": "",
-    "description-close": "",
-    "description-high": "",
-    "description-low": "",
-    "description-open": "",
-    "description-volume": "",
+    "description-additional-fields": "Utilizza le opzioni standard delle serie temporali per configurare i campi non mappati sopra",
+    "description-close": "Valore a fine esercizio",
+    "description-high": "Valore massimo nel periodo",
+    "description-low": "Valore minimo nel periodo",
+    "description-open": "Valore a inizio esercizio",
+    "description-volume": "Conteggio campione nel periodo",
     "mode-options": {
-      "label-both": "",
-      "label-candles": "",
-      "label-volume": ""
+      "label-both": "Entrambe",
+      "label-candles": "Candele",
+      "label-volume": "Volume"
     },
-    "name-additional-fields": "",
-    "name-candle-style": "",
-    "name-close": "",
-    "name-color-strategy": "",
-    "name-down-color": "",
-    "name-high": "",
-    "name-low": "",
-    "name-mode": "",
-    "name-open": "",
-    "name-up-color": "",
-    "name-volume": ""
+    "name-additional-fields": "Campi aggiuntivi",
+    "name-candle-style": "Stile candela",
+    "name-close": "Chiudi",
+    "name-color-strategy": "Strategia colore",
+    "name-down-color": "Colore in basso",
+    "name-high": "Alto",
+    "name-low": "Basso",
+    "name-mode": "Modalità",
+    "name-open": "Aperto",
+    "name-up-color": "Colore in alto",
+    "name-volume": "Volume"
   },
   "canvas": {
     "apieditor": {
-      "label-endpoint": "",
-      "label-header-parameters": "",
+      "label-endpoint": "Endpoint",
+      "label-header-parameters": "Parametri intestazione",
       "label-method": "Metodo",
       "label-payload": "Carico utile",
       "label-query-parameters": "Parametri delle query",
       "render-test-apibutton": {
-        "test-api": "",
-        "title-test-api": ""
+        "test-api": "API di test",
+        "title-test-api": "API di test"
       }
     },
     "button-item": {
-      "category-button": "",
+      "category-button": "Pulsante",
       "label": {
-        "center": "",
-        "left": "",
-        "right": ""
+        "center": "Centro",
+        "left": "Sinistra",
+        "right": "Destra"
       },
-      "name-align-text": "",
-      "name-api": "",
-      "name-style": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
+      "name-align-text": "Allinea testo",
+      "name-api": "API",
+      "name-style": "Stile",
+      "name-text": "Testo",
+      "name-text-color": "Colore del testo",
+      "name-text-size": "Dimensione del testo",
       "placeholder": {
         "auto": "Automatico"
       }
@@ -3727,188 +3727,188 @@
       "label-variant": "Variante"
     },
     "canvas-context-menu": {
-      "close-editor": "",
-      "open-editor": "",
+      "close-editor": "Chiudi editor",
+      "open-editor": "Apri editor",
       "render-menu-items": {
         "add-item-menu-item": {
-          "label-add-item": ""
+          "label-add-item": "Aggiungi elemento"
         },
         "edit-element-menu-item": {
           "label-edit": "Modifica"
         },
-        "label-bring-to-front": "",
+        "label-bring-to-front": "Davanti al testo",
         "label-delete": "Elimina",
         "label-duplicate": "Duplica",
-        "label-send-to-back": "",
+        "label-send-to-back": "Dietro al testo",
         "set-background-menu-item": {
-          "label-set-background": ""
+          "label-set-background": "Imposta lo sfondo"
         }
       }
     },
-    "category-arrow-direction": "",
-    "category-background": "",
-    "category-border": "",
-    "category-canvas": "",
-    "category-color": "",
-    "category-data-links": "",
-    "category-line-style": "",
-    "category-metric-value": "",
-    "category-radius": "",
-    "category-selected-connection": "",
-    "category-selected-element": "",
-    "category-size": "",
-    "category-tooltip": "",
+    "category-arrow-direction": "Direzione della freccia",
+    "category-background": "Sfondo",
+    "category-border": "Bordo",
+    "category-canvas": "Tela",
+    "category-color": "Colore",
+    "category-data-links": "Collegamenti dati e azioni",
+    "category-line-style": "Stile linea",
+    "category-metric-value": "Valore metrica",
+    "category-radius": "Raggio",
+    "category-selected-connection": "Connessione selezionata",
+    "category-selected-element": "Elemento selezionato ({{element}})",
+    "category-size": "Dimensioni",
+    "category-tooltip": "Suggerimento",
     "cloud-item": {
-      "category-cloud": "",
+      "category-cloud": "Cloud",
       "label": {
-        "bottom": "",
-        "center": "",
-        "left": "",
-        "middle": "",
-        "right": "",
-        "top": ""
+        "bottom": "In basso",
+        "center": "Centro",
+        "left": "Sinistra",
+        "middle": "Centrale",
+        "right": "Destra",
+        "top": "In alto"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Allinea testo",
+      "name-text": "Testo",
+      "name-text-color": "Colore del testo",
+      "name-text-size": "Dimensione del testo",
+      "name-vertical-align": "Allineamento verticale",
       "placeholder": {
         "auto": "Automatico"
       }
     },
-    "description-experimental-types": "",
-    "description-inline-editing": "",
-    "description-pan-zoom": "",
+    "description-experimental-types": "Abilita la selezione di tipi di elementi sperimentali",
+    "description-inline-editing": "Abilita la modifica diretta del pannello",
+    "description-pan-zoom": "Abilita panoramica e zoom",
     "direction-options": {
-      "label-both": "",
-      "label-forward": "",
-      "label-none": "",
-      "label-reverse": ""
+      "label-both": "Entrambe",
+      "label-forward": "Inoltra",
+      "label-none": "Nessuno",
+      "label-reverse": "Inverti"
     },
     "drone-front-item": {
-      "category-drone-front": "",
-      "name-roll-angle": ""
+      "category-drone-front": "Parte anteriore del drone",
+      "name-roll-angle": "Angolo di rollio"
     },
     "drone-side-item": {
-      "category-drone-side": "",
-      "name-pitch-angle": ""
+      "category-drone-side": "Lato del drone",
+      "name-pitch-angle": "Angolo di beccheggio"
     },
     "drone-top-item": {
-      "category-drone-top": "",
-      "name-back-left-rotor-rpm": "",
-      "name-back-right-rotor-rpm": "",
-      "name-front-left-rotor-rpm": "",
-      "name-front-right-rotor-rpm": "",
-      "name-yaw-angle": ""
+      "category-drone-top": "Parte superiore del drone",
+      "name-back-left-rotor-rpm": "Giri/min rotore posteriore sinistro",
+      "name-back-right-rotor-rpm": "Giri/min rotore posteriore destro",
+      "name-front-left-rotor-rpm": "Giri/min rotore anteriore sinistro",
+      "name-front-right-rotor-rpm": "Giri/min rotore anteriore destro",
+      "name-yaw-angle": "Angolo di imbardata"
     },
     "element-editor": {
-      "category-layout": "",
-      "description-unsupported": "",
-      "name-quick-placement": ""
+      "category-layout": "Layout",
+      "description-unsupported": "Il tipo di elemento selezionato non è supportato dalle impostazioni correnti. Abilita i tipi di elementi avanzati.",
+      "name-quick-placement": "Posizionamento rapido"
     },
     "ellipse-item": {
-      "category-ellipse": "",
+      "category-ellipse": "Ellisse",
       "label": {
-        "bottom": "",
-        "center": "",
-        "left": "",
-        "middle": "",
-        "right": "",
-        "top": ""
+        "bottom": "In basso",
+        "center": "Centro",
+        "left": "Sinistra",
+        "middle": "Centrale",
+        "right": "Destra",
+        "top": "In alto"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Allinea testo",
+      "name-text": "Testo",
+      "name-text-color": "Colore del testo",
+      "name-text-size": "Dimensione del testo",
+      "name-vertical-align": "Allineamento verticale",
       "placeholder": {
         "auto": "Automatico"
       }
     },
     "icon-item": {
-      "category-icon": "",
-      "name-fill-color": "",
-      "name-svg-path": ""
+      "category-icon": "Icona",
+      "name-fill-color": "Colore riempimento",
+      "name-svg-path": "Percorso SVG"
     },
     "inline-edit": {
-      "canvas-inline-editor": "",
-      "tooltip-close-inline-editor": ""
+      "canvas-inline-editor": "Editor in linea Canvas",
+      "tooltip-close-inline-editor": "Chiudi editor in linea"
     },
     "inline-edit-body": {
-      "category-selected-element": "",
-      "label-add-item": "",
-      "please-select-an-element": ""
+      "category-selected-element": "Elemento selezionato ({{element}})",
+      "label-add-item": "Aggiungi elemento",
+      "please-select-an-element": "Seleziona un elemento"
     },
-    "label-actions": "",
-    "label-color": "",
-    "label-direction": "",
-    "label-image": "",
-    "label-image-size": "",
-    "label-line-style": "",
-    "label-links": "",
-    "label-radius": "",
-    "label-size": "",
-    "label-width": "",
+    "label-actions": "Azioni",
+    "label-color": "Colore",
+    "label-direction": "Direzione",
+    "label-image": "Immagine",
+    "label-image-size": "Dimensione immagine",
+    "label-line-style": "Stile linea",
+    "label-links": "Collegamenti",
+    "label-radius": "Raggio",
+    "label-size": "Dimensioni",
+    "label-width": "Larghezza",
     "layer-editor": {
-      "category-layer": "",
-      "category-layout": "",
-      "name-constraints": "",
-      "name-elements": ""
+      "category-layer": "Livelli",
+      "category-layout": "Layout",
+      "name-constraints": "Limitazioni",
+      "name-elements": "Elementi"
     },
     "line-style-editor": {
-      "label-animate": ""
+      "label-animate": "Anima"
     },
     "line-style-options": {
-      "label-solid": ""
+      "label-solid": "Linea continua"
     },
     "metric-value-item": {
       "label": {
-        "bottom": "",
-        "center": "",
-        "left": "",
-        "middle": "",
-        "right": "",
-        "top": ""
+        "bottom": "In basso",
+        "center": "Centro",
+        "left": "Sinistra",
+        "middle": "Centrale",
+        "right": "Destra",
+        "top": "In alto"
       },
       "placeholder": {
         "auto": "Automatico"
       }
     },
-    "name-align-text": "",
-    "name-color": "",
-    "name-experimental-types": "",
-    "name-inline-editing": "",
-    "name-pan-zoom": "",
-    "name-text": "",
-    "name-text-size": "",
-    "name-vertical-align": "",
+    "name-align-text": "Allinea testo",
+    "name-color": "Colore del testo",
+    "name-experimental-types": "Tipi di elementi sperimentali",
+    "name-inline-editing": "Modifica in linea",
+    "name-pan-zoom": "Panoramica e zoom",
+    "name-text": "Testo",
+    "name-text-size": "Dimensione del testo",
+    "name-vertical-align": "Allineamento verticale",
     "not-found-display": {
       "not-found": "<0>Non trovato: </0><config />"
     },
     "pan-zoom-help": {
-      "ctrl-right-mouse": "",
-      "middle-mouse": "",
-      "pan-title": "",
-      "reset-double-click": "",
-      "title-pan-and-zoom-controls": "",
-      "zoom-scroll-wheel": ""
+      "ctrl-right-mouse": "CTRL + pulsante destro del mouse",
+      "middle-mouse": "Pulsante centrale del mouse",
+      "pan-title": "Panoramica:",
+      "reset-double-click": "Reimposta: doppio clic",
+      "title-pan-and-zoom-controls": "Comandi di panoramica e zoom",
+      "zoom-scroll-wheel": "Zoom: rotella di scorrimento"
     },
     "parallelogram-item": {
-      "category-parallelogram": "",
+      "category-parallelogram": "Parallelogramma",
       "label": {
-        "bottom": "",
-        "center": "",
-        "left": "",
-        "middle": "",
-        "right": "",
-        "top": ""
+        "bottom": "In basso",
+        "center": "Centro",
+        "left": "Sinistra",
+        "middle": "Centrale",
+        "right": "Destra",
+        "top": "In alto"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Allinea testo",
+      "name-text": "Testo",
+      "name-text-color": "Colore del testo",
+      "name-text-size": "Dimensione del testo",
+      "name-vertical-align": "Allineamento verticale",
       "placeholder": {
         "auto": "Automatico"
       }
@@ -3921,100 +3921,100 @@
     },
     "placement-editor": {
       "horizontal-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-left-and-right": "",
-        "label-right": "",
-        "label-scale": ""
+        "label-center": "Centrale",
+        "label-left": "A sinistra",
+        "label-left-and-right": "A sinistra e a destra",
+        "label-right": "A destra",
+        "label-scale": "Scala"
       },
-      "label-constraints": "",
-      "label-position": "",
+      "label-constraints": "Limitazioni",
+      "label-position": "Posizione",
       "loading": "Caricamento in corso...",
       "vertical-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-scale": "",
-        "label-top": "",
-        "label-top-and-bottom": ""
+        "label-bottom": "In basso",
+        "label-center": "Centrale",
+        "label-scale": "Scala",
+        "label-top": "In alto",
+        "label-top-and-bottom": "In alto e in basso"
       }
     },
     "quick-positioning": {
-      "tooltip-align-bottom": "",
-      "tooltip-align-horizontal-centers": "",
-      "tooltip-align-left": "",
-      "tooltip-align-right": "",
-      "tooltip-align-top": "",
-      "tooltip-align-vertical-centers": ""
+      "tooltip-align-bottom": "Allinea in basso",
+      "tooltip-align-horizontal-centers": "Allinea orizzontalmente in centro",
+      "tooltip-align-left": "Allineato a sinistra",
+      "tooltip-align-right": "Allinea a destra",
+      "tooltip-align-top": "Allinea in alto",
+      "tooltip-align-vertical-centers": "Allinea verticalmente in centro"
     },
     "rectangle-item": {
-      "category-rectangle": "",
+      "category-rectangle": "Rettangolo",
       "label": {
-        "bottom": "",
-        "center": "",
-        "left": "",
-        "middle": "",
-        "right": "",
-        "top": ""
+        "bottom": "In basso",
+        "center": "Centro",
+        "left": "Sinistra",
+        "middle": "Centrale",
+        "right": "Destra",
+        "top": "In alto"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Allinea testo",
+      "name-text": "Testo",
+      "name-text-color": "Colore del testo",
+      "name-text-size": "Dimensione del testo",
+      "name-vertical-align": "Allineamento verticale",
       "placeholder": {
         "auto": "Automatico"
       }
     },
     "server-item": {
-      "category-server": "",
-      "name-blink-rate": "",
-      "name-bulb-color": "",
-      "name-status-color": "",
-      "name-type": "",
+      "category-server": "Server",
+      "name-blink-rate": "Frequenza di lampeggio [hz] (0 = spento)",
+      "name-bulb-color": "Colore lampadina",
+      "name-status-color": "Colore di stato",
+      "name-type": "Tipo",
       "type-options": {
-        "label-database": "",
-        "label-single": "",
-        "label-stack": "",
-        "label-terminal": ""
+        "label-database": "Database",
+        "label-single": "Singolo",
+        "label-stack": "Stack",
+        "label-terminal": "Terminale"
       }
     },
     "text-display": {
       "double-click-to-set": "Fai doppio clic per impostare il testo"
     },
     "text-item": {
-      "category-text": "",
+      "category-text": "Testo",
       "label": {
-        "bottom": "",
-        "center": "",
-        "left": "",
-        "middle": "",
-        "right": "",
-        "top": ""
+        "bottom": "In basso",
+        "center": "Centro",
+        "left": "Sinistra",
+        "middle": "Centrale",
+        "right": "Destra",
+        "top": "In alto"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Allinea testo",
+      "name-text": "Testo",
+      "name-text-color": "Colore del testo",
+      "name-text-size": "Dimensione del testo",
+      "name-vertical-align": "Allineamento verticale",
       "placeholder": {
         "auto": "Automatico"
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Modalità suggerimento",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Disabilitata",
+        "label-enabled": "Abilitata"
       }
     },
     "tree-navigation-editor": {
       "clear-selection": "Cancella selezione",
-      "frame-selection": "",
-      "label-add-item": "",
-      "missing-layer": "",
-      "no-settings": "",
+      "frame-selection": "Selezione del fotogramma",
+      "label-add-item": "Aggiungi elemento",
+      "missing-layer": "Livello mancante?",
+      "no-settings": "Nessuna impostazione",
       "switcher-icon": {
-        "title-node-icon": ""
+        "title-node-icon": "Icona nodo"
       }
     },
     "tree-node-title": {
@@ -4024,27 +4024,27 @@
       "tooltip-remove": "Rimuovi"
     },
     "triangle-item": {
-      "category-triangle": "",
+      "category-triangle": "Triangolo",
       "label": {
-        "bottom": "",
-        "center": "",
-        "left": "",
-        "middle": "",
-        "right": "",
-        "top": ""
+        "bottom": "In basso",
+        "center": "Centro",
+        "left": "Sinistra",
+        "middle": "Centrale",
+        "right": "Destra",
+        "top": "In alto"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Allinea testo",
+      "name-text": "Testo",
+      "name-text-color": "Colore del testo",
+      "name-text-size": "Dimensione del testo",
+      "name-vertical-align": "Allineamento verticale",
       "placeholder": {
         "auto": "Automatico"
       }
     },
     "wind-turbine-item": {
-      "category-wind-turbine": "",
-      "name-rpm": ""
+      "category-wind-turbine": "Turbina eolica",
+      "name-rpm": "Giri/min"
     }
   },
   "carousel": {
@@ -4061,8 +4061,8 @@
   "close-button": {
     "tooltip": "Chiudi"
   },
-  "cloud-enterprise-feature-badge": "",
-  "cloud-feature-badge": "",
+  "cloud-enterprise-feature-badge": "Cloud ed Enterprise",
+  "cloud-feature-badge": "Cloud",
   "combobox": {
     "async": {
       "error": "Si è verificato un errore nel caricamento delle opzioni."
@@ -4131,15 +4131,15 @@
         "label": {
           "all": "Tutti",
           "installed": "Installato",
-          "new-updates": ""
+          "new-updates": "Nuovi aggiornamenti"
         }
       },
       "label": {
-        "by-downloads": "",
-        "by-name-az": "",
-        "by-name-za": "",
-        "by-published-date": "",
-        "by-updated-date": ""
+        "by-downloads": "Per download",
+        "by-name-az": "Per nome (A-Z)",
+        "by-name-za": "Per nome (Z-A)",
+        "by-published-date": "Per data di pubblicazione",
+        "by-updated-date": "Per data di aggiornamento"
       }
     },
     "advisor-redirect-notice": {
@@ -4188,15 +4188,15 @@
     },
     "data-source-details-page": {
       "subTitle": {
-        "datasource-could-found": ""
+        "datasource-could-found": "Non è stato possibile trovare alcuna origine dati con questo ID."
       },
       "text": {
-        "unknown-datasource": ""
+        "unknown-datasource": "Origine dati sconosciuta"
       }
     },
     "new-data-source-page": {
       "subTitle": {
-        "choose-a-data-source-type": ""
+        "choose-a-data-source-type": "Scegli un tipo di sorgente dati"
       },
       "text": {
         "add-data-source": "Aggiungi origine dei dati"
@@ -4231,12 +4231,12 @@
     "use-data-source-settings-nav": {
       "node": {
         "subTitle": {
-          "data-source-error": ""
+          "data-source-error": "Errore dell'origine dati"
         }
       },
       "page-nav": {
         "text": {
-          "data-source-nav-node": ""
+          "data-source-nav-node": "Nodo di navigazione dell'origine dati"
         }
       }
     }
@@ -4373,7 +4373,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Esegui query"
     }
   },
   "dashboard": {
@@ -4536,10 +4536,10 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Procedi"
         },
         "title": {
-          "proceed-to-external-site": ""
+          "proceed-to-external-site": "Procedere al sito esterno?"
         }
       },
       "render-left-actions": {
@@ -4564,12 +4564,12 @@
     },
     "dashboard-slice": {
       "title": {
-        "dashboard-init-failed": ""
+        "dashboard-init-failed": "Inizializzazione dashboard non riuscita"
       }
     },
     "dashboard-srv": {
       "message": {
-        "edit-dashboard-json": ""
+        "edit-dashboard-json": "Modifica JSON dashboard"
       }
     },
     "dashboard-validation": {
@@ -4633,7 +4633,7 @@
       }
     },
     "description": {
-      "action": ""
+      "action": "Modifica la descrizione della dashboard"
     },
     "dynamic-config-value-editor": {
       "render-label": {
@@ -4641,27 +4641,27 @@
       }
     },
     "edit-actions": {
-      "add": "",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
-      "move": "",
-      "panel-background": "",
-      "panel-description": "",
-      "panel-max-repeats-per-row": "",
+      "add": "Aggiungi {{typeName}}",
+      "add-conditional-rule": "Aggiungi regola {{ruleDescription}}",
+      "duplicate-panel": "Duplica pannello",
+      "edit-query-result-rule": "Modifica regola del risultato della query",
+      "edit-template-variable-rule": "Modifica la regola della variabile del modello",
+      "edit-time-range-rule": "Modifica regola intervallo di tempo",
+      "move": "Sposta {{typeName}}",
+      "panel-background": "Modifica lo sfondo del pannello",
+      "panel-description": "Modifica la descrizione del pannello",
+      "panel-max-repeats-per-row": "Ripetizioni massime per riga",
       "panel-repeat-direction": "Ripeti la direzione",
-      "panel-repeat-variable": "",
-      "panel-title": "",
+      "panel-repeat-variable": "Ripetizione del pannello per",
+      "panel-title": "Modifica il titolo del pannello",
       "paste-panel": "Incolla pannello",
-      "remove": "",
-      "switch-layout": ""
+      "remove": "Rimuovi {{typeName}}",
+      "switch-layout": "Cambia layout"
     },
     "edit-pane": {
       "elements": {
         "dashboard": "Dashboard",
-        "element": "",
+        "element": "Elemento",
         "local-variable": "Variabile locale",
         "multiple-elements": "Elementi multipli",
         "multiple-elements-delete-text": "Desideri davvero eliminare questi elementi?",
@@ -4690,11 +4690,11 @@
           "values-placeholder": "1, 10, mykey: myvalue, myvalue, escaped, value"
         },
         "datasource-options": {
-          "name-filter": "",
-          "name-filter-description": "",
-          "name-filter-placeholder": "",
+          "name-filter": "Filtro nome",
+          "name-filter-description": "Filtro Regex per le istanze dell'origine dei dati da includere. Lascia vuoto per tutti.",
+          "name-filter-placeholder": "Esempio: /^prod/",
           "type": "Tipo",
-          "type-placeholder": ""
+          "type-placeholder": "Scegli un tipo di sorgente dati"
         },
         "description": "Descrizione",
         "description-placeholder": "Testo descrittivo",
@@ -4714,8 +4714,8 @@
           "category": "Seleziona opzioni",
           "custom-all-value": "Personalizza tutti i valori",
           "custom-all-value-description": "Un'espressione regolare con carattere jolly o un altro valore che sta per Tutti",
-          "include-all": "",
-          "include-all-description": "",
+          "include-all": "Includi tutti i valori",
+          "include-all-description": "Abilita una singola opzione che rappresenta tutti i valori",
           "multi-value": "Valori multipli"
         },
         "type-category": "Opzioni di {{type}}"
@@ -4743,15 +4743,15 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Esporta dashboard"
       },
       "menu": {
-        "label": ""
+        "label": "Esporta menu dashboard"
       }
     },
     "fetch-dashboard": {
       "message": {
-        "failed-to-fetch-dashboard": ""
+        "failed-to-fetch-dashboard": "Impossibile recuperare la dashboard"
       }
     },
     "gen-aihistory": {
@@ -4763,14 +4763,14 @@
       "editable-options": {
         "label": {
           "editable": "Modificabile",
-          "readonly": ""
+          "readonly": "Sola lettura"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Predefinito",
+          "shared-crosshair": "Mirino condiviso",
+          "shared-tooltip": "Suggerimento condiviso"
         }
       }
     },
@@ -4781,21 +4781,21 @@
     },
     "get-errors": {
       "message": {
-        "error-loading-data": ""
+        "error-loading-data": "Errore durante il caricamento dei dati"
       }
     },
     "get-field-override-categories": {
       "label-add-field-override": "Aggiungi sovrascrittura campo",
       "label-add-override-property": "Aggiungi proprietà di sovrascrittura",
-      "override-name": "",
+      "override-name": "Sovrascrivi {{overrideNum}}",
       "title": {
-        "add-button": ""
+        "add-button": "aggiungi pulsante"
       }
     },
     "get-library-panel-options-category": {
       "descriptor": {
         "title": {
-          "library-panel-options": ""
+          "library-panel-options": "Opzioni del pannello della libreria"
         }
       },
       "title": {
@@ -4806,7 +4806,7 @@
     "get-library-viz-panel-options-category": {
       "descriptor": {
         "title": {
-          "library-panel-options": ""
+          "library-panel-options": "Opzioni del pannello della libreria"
         }
       },
       "title": {
@@ -4816,21 +4816,21 @@
     },
     "get-panel-editor-tabs": {
       "text": {
-        "alert": "",
+        "alert": "Avviso",
         "query": "Query",
-        "transform-data": ""
+        "transform-data": "Trasforma dati"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Non inviare dati di annotazione ai seguenti pannelli",
+        "annotation-panels-support-annotations": "Invia i dati di annotazione a tutti i pannelli che supportano le annotazioni",
+        "annotations-explicitly-listed-panels": "Invia le annotazioni ai pannelli elencati esplicitamente"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Tutti i pannelli",
+        "all-panels-except": "Tutti i pannelli tranne",
+        "selected-panels": "Pannelli selezionati"
       }
     },
     "get-panel-frame-category": {
@@ -4858,7 +4858,7 @@
     },
     "get-panel-menu": {
       "text": {
-        "extensions": ""
+        "extensions": "Estensioni"
       }
     },
     "help-wizard": {
@@ -4884,7 +4884,7 @@
     },
     "init-dashboard": {
       "message": {
-        "failed-create-dashboard-model": ""
+        "failed-create-dashboard-model": "Creazione del modello di dashboard non riuscita"
       }
     },
     "inspect": {
@@ -4941,12 +4941,12 @@
     },
     "k8s-dashboard-api": {
       "title": {
-        "deleted": ""
+        "deleted": "eliminato"
       }
     },
     "k8s-dashboard-v2api": {
       "title": {
-        "deleted": ""
+        "deleted": "eliminato"
       }
     },
     "layout": {
@@ -4964,7 +4964,7 @@
     "legacy-dashboard-api": {
       "fetch-error": {
         "message": {
-          "dashboard-not-found": ""
+          "dashboard-not-found": "Dashboard non trovata"
         }
       }
     },
@@ -4990,14 +4990,14 @@
     "on-create-new-row": {
       "new-row": {
         "title": {
-          "row-title": ""
+          "row-title": "Titolo riga"
         }
       }
     },
     "on-create-new-widget-panel": {
       "new-panel": {
         "title": {
-          "widget-title": ""
+          "widget-title": "Titolo del widget"
         }
       }
     },
@@ -5016,7 +5016,7 @@
       "title-matched_other": "{{count}} corrispondente/{{totalCount}} opzioni"
     },
     "outline": {
-      "repeated-item": "",
+      "repeated-item": "Ripeti",
       "tree-item": {
         "empty": "(vuoto)",
         "no-title": "<nessun titolo>"
@@ -5067,17 +5067,17 @@
     },
     "remove-panel": {
       "text": {
-        "remove-panel": ""
+        "remove-panel": "Vuoi davvero rimuovere questo pannello?"
       },
       "title": {
-        "remove-panel": ""
+        "remove-panel": "Rimuovi pannello"
       }
     },
     "repeat-row-select": {
       "variable-options": {
         "label": {
-          "disable-repeating": "",
-          "no-template-variables-found": ""
+          "disable-repeating": "Disabilita ripetizione",
+          "no-template-variables-found": "Nessuna variabile del modello trovata"
         }
       }
     },
@@ -5085,14 +5085,14 @@
       "placeholder": "Scegli",
       "variable-options": {
         "label": {
-          "disable-repeating": "",
-          "no-template-variables-found": ""
+          "disable-repeating": "Disabilita ripetizione",
+          "no-template-variables-found": "Nessuna variabile del modello trovata"
         }
       }
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Desideri davvero ripristinare la dashboard alla versione {{version}}? Tutte le modifiche non salvate andranno perse.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Sì, ripristina alla versione {{version}}",
       "title-restore-version": "Ripristina versione"
     },
     "row-options-button": {
@@ -5144,7 +5144,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Dashboard salvata"
     },
     "save-dashboard-as-button": {
       "save-as": "Salva con nome"
@@ -5174,13 +5174,13 @@
       "label-changes": "Modifiche",
       "label-details": "Dettagli",
       "title": "Salva dashboard",
-      "title-copy": "",
-      "title-provisioned": ""
+      "title-copy": "Salva copia dalla dashboard",
+      "title-provisioned": "Dashboard configurata"
     },
     "save-dashboard-error-proxy": {
       "body-name-exists": "Esiste già una dashboard con lo stesso nome nella cartella selezionata.<1></1><2>Desideri comunque salvare questa dashboard?</2>",
       "body-version-mismatch": "Qualcun altro ha aggiornato questa dashboard<1></1><2>Desideri comunque salvare questa dashboard?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Salva e sovrascrivi",
       "title-name-exists": "Conflitto",
       "title-version-mismatch": "Conflitto"
     },
@@ -5213,14 +5213,14 @@
     },
     "support-snapshot-service": {
       "description": {
-        "dashboard-troubleshoot-visualization-issues": ""
+        "dashboard-troubleshoot-visualization-issues": "JSON dashboard utilizzato per risolvere i problemi di visualizzazione"
       },
       "label": {
-        "git-hub-comment": "",
-        "panel-support-snapshot": ""
+        "git-hub-comment": "Commento GitHub",
+        "panel-support-snapshot": "Snapshot di supporto del pannello"
       },
       "title": {
-        "copy-to-clipboard-failed": ""
+        "copy-to-clipboard-failed": "Copia negli appunti non riuscita"
       }
     },
     "tabs-layout": {
@@ -5253,7 +5253,7 @@
       }
     },
     "title": {
-      "action": ""
+      "action": "Modifica il titolo della dashboard"
     },
     "toolbar": {
       "add": "Aggiungi",
@@ -5377,9 +5377,9 @@
       "label-apply-transformation-to": "Applica la trasformazione a"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Tieni presente che la rimozione di una trasformazione può interromperne altre. Se è presente una sola trasformazione, tornerai alla schermata di selezione principale.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Elimina",
         "title-debug": "Esegui il debug",
         "title-disable-transformation": "Disabilita trasformazione",
         "title-filter": "Filtro",
@@ -5400,16 +5400,16 @@
       "placeholder-search-for-transformation": "Cerca trasformazione",
       "show-images": "Mostra immagini",
       "title-add-another-transformation": "Aggiungi un'altra trasformazione",
-      "view-all": ""
+      "view-all": "Visualizza tutto"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Eliminando tutte le trasformazioni, tornerai alla schermata di selezione principale."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Aggiungi un'altra trasformazione"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Elimina tutto",
       "delete-all-transformations": "Elimina tutte le trasformazioni",
       "title-delete-all-transformations": "Eliminare tutte le trasformazioni?",
       "tooltip-clear-search": "Azzera ricerca",
@@ -5439,16 +5439,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Modifica descrizione variabile"
       },
       "hide": {
-        "action": ""
+        "action": "Modifica l'opzione di occultamento della variabile"
       },
       "label": {
-        "action": ""
+        "action": "Modifica etichetta variabile"
       },
       "name": {
-        "action": ""
+        "action": "Modifica nome variabile"
       }
     },
     "version-history-comparison": {
@@ -5460,7 +5460,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Toggle di selezione della versione {{version}}",
       "date": "Data",
-      "name-latest": "",
+      "name-latest": "Più recente",
       "notes": "Note",
       "restore": "Ripristina",
       "updated-by": "Aggiornato da",
@@ -5481,12 +5481,12 @@
       "placeholder-search-for": "Cerca...",
       "radio-options": {
         "description": {
-          "reusable-panels-share-between-multiple-dashboards": ""
+          "reusable-panels-share-between-multiple-dashboards": "Pannelli riutilizzabili che puoi condividere tra più dashboard."
         },
         "label": {
           "library-panels": "Pannelli della libreria",
-          "suggestions": "",
-          "visualizations": ""
+          "suggestions": "Suggerimenti",
+          "visualizations": "Visualizzazioni"
         }
       },
       "title-close": "Chiudi"
@@ -5538,12 +5538,12 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Fornisci le dimensioni come CSV: {{name}}, {{value}}",
       "label-data-source": "Sorgente dati",
       "label-use-static-key-dimensions": "Usa dimensioni chiave statiche",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Consenti valori personalizzati"
     },
     "add-to-dashboard": {
       "message": {
-        "could-navigate-selected-dashboard-please-again": "",
-        "could-panel-dashboard-please-again": ""
+        "could-navigate-selected-dashboard-please-again": "Impossibile passare alla dashboard selezionata. Riprova.",
+        "could-panel-dashboard-please-again": "Impossibile aggiungere il pannello alla dashboard. Riprova."
       }
     },
     "add-to-dashboard-form": {
@@ -5612,7 +5612,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Revoca URL pubblico"
       },
       "title": {
         "revoke-public-url": "Revoca URL pubblico"
@@ -5625,7 +5625,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opzioni personalizzate",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Valori separati da virgola",
       "selection-options": "Seleziona opzioni"
     },
     "dashboard-edit-pane-renderer": {
@@ -5646,8 +5646,8 @@
       "label-with-tags": "Con tag",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Dashboard",
+          "link": "Collegamento"
         }
       },
       "placeholder-open-dashboard": "Apri dashboard"
@@ -5668,46 +5668,46 @@
     },
     "dashboard-scene": {
       "text": {
-        "edit-panel": "",
+        "edit-panel": "Modifica pannello",
         "view-panel": "Visualizza pannello"
       },
       "title": {
         "dashboard": "Dashboard",
-        "discard-changes-to-dashboard": ""
+        "discard-changes-to-dashboard": "Annullare le modifiche alla dashboard?"
       }
     },
     "dashboard-scene-page-state-manager": {
       "message": {
-        "dashboard-not-found": ""
+        "dashboard-not-found": "Dashboard non trovata"
       }
     },
     "dashboard-scene-page-state-manager-v2": {
       "message": {
-        "dashboard-not-found": ""
+        "dashboard-not-found": "Dashboard non trovata"
       }
     },
     "data-source-variable-form": {
       "data-source-options": "Opzioni dell'origine dei dati",
       "description-instance-name-filter": "Filtro Regex per le istanze di origine dei dati tra cui scegliere nell'elenco dei valori delle variabili. Lascia vuoto per tutti.",
       "example-instance-name-filter": "Esempio: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Filtro nome istanza",
+      "name-type": "Tipo",
       "selection-options": "Seleziona opzioni"
     },
     "default-grid-layout-manager": {
       "row": {
         "title": {
-          "row-title": ""
+          "row-title": "Titolo riga"
         }
       }
     },
     "delete-provisioned-dashboard-form": {
-      "api-error": "",
+      "api-error": "Impossibile eliminare la dashboard",
       "cancel-action": "Annulla",
       "delete-action": "Elimina dashboard",
       "deleting": "Eliminazione in corso...",
-      "drawer-title": "",
-      "success-message": ""
+      "drawer-title": "Elimina la dashboard configurata",
+      "success-message": "Dashboard eliminata correttamente"
     },
     "description-label": {
       "description": "Descrizione"
@@ -5724,10 +5724,10 @@
     },
     "embedded-dashboard-test-page": {
       "subTitle": {
-        "showing-dashboard-panel-tests-pie-chart": ""
+        "showing-dashboard-panel-tests-pie-chart": "Visualizzazione dashboard: test pannello – Grafico a torta"
       },
       "text": {
-        "embedding-dashboard": ""
+        "embedding-dashboard": "Incorporazione della dashboard"
       }
     },
     "empty-transformations-message": {
@@ -5736,56 +5736,56 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Modificabile",
+          "readonly": "Solo lettura"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Predefinito",
+          "shared-crosshair": "Mirino condiviso",
+          "shared-tooltip": "Suggerimento condiviso"
         }
       }
     },
     "get-edit-options": {
       "title": {
-        "column-options": "",
-        "row-height-options": ""
+        "column-options": "Opzioni della colonna",
+        "row-height-options": "Opzioni di altezza della riga"
       }
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Aggiungi filtri chiave/valore al volo",
+        "dynamically-switch-source-multiple-panels": "Cambia dinamicamente l'origine dati per più pannelli",
+        "group": "Aggiungi chiavi per raggruppare al volo",
+        "hidden-constant-variable": "Una variabile costante nascosta, utile per i prefissi metrici nelle dashboard che desideri condividere",
+        "users-enter-arbitrary-strings-textbox": "Gli utenti possono inserire qualsiasi stringa arbitraria in una casella di testo",
+        "values-are-static-and-defined-manually": "I valori sono statici e definiti manualmente",
+        "values-fetched-source-query": "I valori vengono recuperati da una query dell'origine dati",
+        "values-timespans": "I valori sono intervalli di tempo, ad esempio 1 m, 1 h, 1 g"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Filtri ad hoc",
+        "constant": "Costante",
+        "custom": "Personalizzazione",
+        "data-source": "Origine dei dati",
+        "group-by": "Raggruppa per",
+        "interval": "Intervallo",
+        "query": "Query",
+        "textbox": "Casella di testo"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Non inviare dati di annotazione ai seguenti pannelli",
+        "annotation-panels-support-annotations": "Invia i dati di annotazione a tutti i pannelli che supportano le annotazioni",
+        "annotations-explicitly-listed-panels": "Invia le annotazioni ai pannelli elencati esplicitamente"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Tutti i pannelli",
+        "all-panels-except": "Tutti i pannelli tranne",
+        "selected-panels": "Pannelli selezionati"
       }
     },
     "get-panel-frame-options": {
@@ -5803,17 +5803,17 @@
     },
     "get-workflow-options": {
       "label": {
-        "push-to-a-new-branch": ""
+        "push-to-a-new-branch": "Sposta in un nuovo ramo"
       }
     },
     "group-by-variable-form": {
-      "alert-not-supported": "",
+      "alert-not-supported": "Questa origine dati non supporta il raggruppamento per variabili",
       "description-enables-users-custom-values": "Consente agli utenti di aggiungere valori personalizzati all'elenco",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Fornisci le dimensioni come CSV: {{name}}, {{value}}",
       "group-by-options": "Raggruppa per opzioni",
       "label-data-source": "Sorgente dati",
       "label-use-static-group-by-dimensions": "Usa dimensioni di gruppo statiche",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Consenti valori personalizzati"
     },
     "help-wizard": {
       "copy-to-clipboard": "Copia negli appunti",
@@ -5849,14 +5849,14 @@
       "apply": "Applica"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Calcola dinamicamente l'intervallo dividendo l'intervallo di tempo per il conteggio specificato",
       "description-calculated-value-below-threshold": "Il valore calcolato non andrà al di sotto di questa soglia",
       "description-step-count": "Quante volte deve essere diviso l'intervallo di tempo corrente per calcolare il valore",
       "interval-options": "Opzioni di intervallo",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Opzione automatica",
+      "name-min-interval": "Intervallo minimo",
+      "name-step-count": "Conteggio passi",
+      "name-values": "Valori"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5877,19 +5877,19 @@
       "usage-count_other": "Utilizzato su {{count}} dashboard"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Errore durante lo spostamento della dashboard",
+      "api-error": "Impossibile spostare la dashboard",
+      "cancel-action": "Annulla",
+      "current-file-not-found": "Impossibile trovare il file della dashboard corrente",
+      "drawer-title": "Sposta la dashboard configurata",
+      "file-load-error": "Errore durante il caricamento della dashboard",
+      "loading-file-data": "Caricamento dati dashboard",
+      "move-action": "Sposta dashboard",
+      "move-read-only-message": "Questa dashboard non può essere spostata direttamente da Grafana perché il repository è di sola lettura. Per spostare questa dashboard, sposta il file nel repository Git.",
+      "moving": "Spostamento in corso...",
+      "success-message": "Dashboard spostata correttamente",
+      "target-path-label": "Percorso di destinazione",
+      "title-this-repository-is-read-only": "Questo repository è di sola lettura"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Esiste già una dashboard con lo stesso nome nella cartella selezionata. Desideri comunque salvare questa dashboard?",
@@ -5897,22 +5897,22 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Procedi"
       },
       "title": {
-        "proceed-to-external-site": ""
+        "proceed-to-external-site": "Procedere al sito esterno?"
       }
     },
     "on-remove-panel": {
       "text": {
-        "remove-panel": ""
+        "remove-panel": "Vuoi davvero rimuovere questo pannello?"
       },
       "title": {
-        "remove-panel": ""
+        "remove-panel": "Rimuovi pannello"
       }
     },
     "panel-data-alerting-tab": {
-      "tab-label": ""
+      "tab-label": "Avviso"
     },
     "panel-data-alerting-tab-rendered": {
       "alert": {
@@ -5923,19 +5923,19 @@
       "title-dashboard-not-saved": "La dashboard non è stata salvata"
     },
     "panel-data-queries-tab": {
-      "tab-label": ""
+      "tab-label": "Query"
     },
     "panel-data-queries-tab-rendered": {
       "add-query": "Aggiungi query",
       "expression": "Espressione "
     },
     "panel-data-transformations-tab": {
-      "tab-label": ""
+      "tab-label": "Trasformazioni"
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Aggiungi un'altra trasformazione",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Eliminando tutte le trasformazioni, tornerai alla schermata di selezione principale.",
+      "confirmText-delete-all": "Elimina tutto",
       "delete-all-transformations": "Elimina tutte le trasformazioni",
       "title-delete-all-transformations": "Eliminare tutte le trasformazioni?"
     },
@@ -5945,7 +5945,7 @@
     },
     "panel-editor": {
       "text": {
-        "edit-panel": ""
+        "edit-panel": "Modifica pannello"
       }
     },
     "panel-editor-renderer": {
@@ -5959,8 +5959,8 @@
     "panel-menu-behavior": {
       "async-func": {
         "text": {
-          "extensions": "",
-          "metrics-drilldown": ""
+          "extensions": "Estensioni",
+          "metrics-drilldown": "Drill-down metriche"
         }
       }
     },
@@ -5968,8 +5968,8 @@
       "placeholder-search-for": "Cerca...",
       "radio-options": {
         "label": {
-          "suggestions": "",
-          "visualizations": ""
+          "suggestions": "Suggerimenti",
+          "visualizations": "Visualizzazioni"
         }
       },
       "title-close": "Chiudi"
@@ -5988,26 +5988,26 @@
       "description-examples": "I gruppi di acquisizione con nome possono essere utilizzati per separare il testo e il valore di visualizzazione (<1>vedi esempi</1>).",
       "description-optional": "Facoltativo, se desideri estrarre parte di un nome di serie o di un segmento di nodo della metrica.",
       "label-data-source": "Sorgente dati",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Ordinamento opzioni statiche",
       "label-target-data-source": "Origine dati di destinazione",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Usa opzioni statiche",
+      "name-regex": "Regex",
       "query-options": "Opzioni query",
       "selection-options": "Seleziona opzioni",
-      "static-options-legend": ""
+      "static-options-legend": "Opzioni statiche"
     },
     "resource-export": {
       "label": {
-        "classic": "",
+        "classic": "Classico",
         "json": "JSON",
-        "v1-resource": "",
-        "v2-resource": "",
-        "yaml": ""
+        "v1-resource": "Risorsa V1",
+        "v2-resource": "Risorsa V2",
+        "yaml": "YAML"
       }
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Desideri davvero ripristinare la dashboard alla versione {{version}}? Tutte le modifiche non salvate andranno perse.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Sì, ripristina alla versione {{version}}",
       "title-restore-version": "Ripristina versione"
     },
     "save-button": {
@@ -6026,20 +6026,20 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Impossibile salvare la dashboard"
       },
-      "required": ""
+      "required": "Obbligatorio"
     },
     "save-dashboard-drawer": {
       "tabs": {
         "label-changes": "Modifiche",
         "label-details": "Dettagli",
         "title": "Salva dashboard",
-        "title-copy": "",
-        "title-provisioned": ""
+        "title-copy": "Salva copia dalla dashboard",
+        "title-provisioned": "Dashboard configurata"
       }
     },
     "save-dashboard-form": {
       "aria-label-message": "messaggio",
-      "body-dashboard-drastically-changed": "",
+      "body-dashboard-drastically-changed": "La dashboard verrà salvata utilizzando il nuovo schema sperimentale della dashboard Grafana. Questa azione non può essere annullata e potrebbe comportare la perdita irreversibile di dati. Ti consigliamo invece di salvare questa dashboard come copia. Se visualizzi questo messaggio in un ambiente di produzione, contatta l'assistenza per disabilitare la funzionalità.",
       "cancel-button": {
         "cancel": "Annulla"
       },
@@ -6053,9 +6053,9 @@
         "title-someone-else-has-updated-this-dashboard": "Qualcun altro ha aggiornato questa dashboard",
         "would-still-dashboard": "Desideri comunque salvare questa dashboard?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
-      "title-dashboard-drastically-changed": ""
+      "schema-v2-library-panels-export": "A causa delle limitazioni nel nuovo schema della dashboard (V2), i pannelli della libreria verranno convertiti in pannelli regolari con contenuto incorporato durante l'esportazione esterna.",
+      "schema-v2-library-panels-export-title": "I pannelli della libreria verranno convertiti in pannelli regolari",
+      "title-dashboard-drastically-changed": "Dashboard modificata in modo irreversibile"
     },
     "save-dashboard-form-common-options": {
       "save-refresh-description-current-refresh-default": "Imposterà l'aggiornamento corrente come nuovo valore predefinito",
@@ -6101,10 +6101,10 @@
       "description-enables-multiple-values-selected": "Consente di selezionare più valori contemporaneamente",
       "description-enables-option-include-variables": "Abilita un'opzione per includere tutti i valori",
       "description-enables-users-custom-values": "Consente agli utenti di aggiungere valori personalizzati all'elenco",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Consenti valori personalizzati",
+      "name-custom-all-value": "Personalizza tutti i valori",
+      "name-include-all-option": "Includi opzione Tutti",
+      "name-multi-value": "Valori multipli"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Attiva/disattiva il menu di condivisione"
@@ -6114,18 +6114,18 @@
     },
     "support-snapshot-service": {
       "description": {
-        "dashboard-troubleshoot-visualization-issues": ""
+        "dashboard-troubleshoot-visualization-issues": "JSON dashboard utilizzato per risolvere i problemi di visualizzazione"
       },
       "label": {
-        "git-hub-comment": "",
-        "panel-support-snapshot": ""
+        "git-hub-comment": "Commento GitHub",
+        "panel-support-snapshot": "Snapshot di supporto del pannello"
       },
       "title": {
-        "copy-to-clipboard-failed": ""
+        "copy-to-clipboard-failed": "Copia negli appunti non riuscita"
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Valore predefinito"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opzionale)",
@@ -6140,7 +6140,7 @@
     "transform-usages-to-network": {
       "result": {
         "label": {
-          "dashboard": ""
+          "dashboard": "dashboard"
         }
       }
     },
@@ -6150,8 +6150,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Se scolleghi questo pannello, potrai modificarlo senza influire sulle altre dashboard. Tuttavia, una volta apportata una modifica, non potrai ripristinare il pannello riutilizzabile originale.",
+      "confirmText-yes-unlink": "Sì, scollega",
       "title-really-unlink-panel": "Desideri davvero scollegare questo pannello?"
     },
     "unsaved-changes-modal": {
@@ -6169,7 +6169,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Dashboard salvata"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Questa variabile non è referenziata da nessuna variabile o dashboard.",
@@ -6181,15 +6181,15 @@
       "aria-label-variable-editor-form": "Modulo di modifica delle variabili",
       "back-to-list": "Torna all'elenco",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Elimina variabile"
       },
       "delete": "Elimina",
       "description-optional-display-name": "Nome visualizzato facoltativo",
       "description-template-variable-characters": "Il nome della variabile del modello. (Massimo 50 caratteri)",
       "general": "Generale",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Descrizione",
+      "name-label": "Etichetta",
+      "name-name": "Nome",
       "placeholder-descriptive-text": "Testo descrittivo",
       "placeholder-label-name": "Nome etichetta",
       "placeholder-variable-name": "Nome variabile",
@@ -6204,8 +6204,8 @@
       "variable": "Variabile"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Vuoi davvero eliminare: {{variable}}?",
+      "confirmText-delete-variable": "Elimina variabile",
       "title-delete-variable": "Elimina variabile",
       "tooltip-duplicate-variable": "Duplica variabile",
       "tooltip-remove-variable": "Rimuovi variabile"
@@ -6213,15 +6213,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Etichetta",
+          "nothing": "Niente",
+          "variable": "Variabile"
         }
       },
       "label": "Nascondi"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Tipo variabile"
     },
     "variable-usages-button": {
       "title-show-usages": "Mostra utilizzi per: {{variableId}}",
@@ -6249,7 +6249,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Toggle di selezione della versione {{version}}",
       "date": "Data",
-      "name-latest": "",
+      "name-latest": "Più recente",
       "notes": "Note",
       "restore": "Ripristina",
       "updated-by": "Aggiornato da",
@@ -6356,18 +6356,18 @@
     }
   },
   "dashlist": {
-    "category-dashboard-list": "",
-    "name-folder": "",
-    "name-include-current-template-variables": "",
-    "name-include-current-time-range": "",
-    "name-max-items": "",
-    "name-query": "",
-    "name-recently-viewed": "",
-    "name-search": "",
-    "name-show-folder-names": "",
-    "name-show-headings": "",
-    "name-starred": "",
-    "name-tags": ""
+    "category-dashboard-list": "Elenco dashboard",
+    "name-folder": "Cartella",
+    "name-include-current-template-variables": "Includi i valori delle variabili del modello corrente",
+    "name-include-current-time-range": "Includi l'intervallo di tempo corrente",
+    "name-max-items": "Numero massimo di elementi",
+    "name-query": "Query",
+    "name-recently-viewed": "Visti di recente",
+    "name-search": "Cerca",
+    "name-show-folder-names": "Mostra nomi cartelle",
+    "name-show-headings": "Mostra intestazioni",
+    "name-starred": "Preferiti",
+    "name-tags": "Tag"
   },
   "data-source-list": {
     "empty-state": {
@@ -6408,20 +6408,20 @@
   },
   "datagrid": {
     "add-column": {
-      "placeholder-column-name": ""
+      "placeholder-column-name": "Nome colonna"
     },
     "datagrid-context-menu": {
       "render-context-menu-items": {
-        "label-clear-column": "",
-        "label-clear-row": "",
-        "label-remove-all-data": "",
+        "label-clear-column": "Cancella colonna",
+        "label-clear-row": "Cancella riga",
+        "label-remove-all-data": "Elimina tutti i dati",
         "label-search": "Cerca..."
       },
       "render-header-menu-items": {
-        "label-clear-column": "",
-        "label-delete-column": "",
-        "label-rename-column": "",
-        "label-set-field-type": ""
+        "label-clear-column": "Cancella colonna",
+        "label-delete-column": "Elimina colonna",
+        "label-rename-column": "Rinomina colonna",
+        "label-set-field-type": "Imposta tipo di campo"
       }
     }
   },
@@ -6449,15 +6449,15 @@
     "build-categories": {
       "categories": {
         "title": {
-          "cloud": "",
-          "distributed-tracing": "",
+          "cloud": "Cloud",
+          "distributed-tracing": "Tracciamento distribuito",
           "enterprise-plugins": "Componenti aggiuntivi aziendali",
-          "industrial-io-t": "",
-          "logging-document-databases": "",
-          "others": "",
-          "profiling": "",
-          "sql": "",
-          "time-series-databases": ""
+          "industrial-io-t": "Industriale e IoT",
+          "logging-document-databases": "Registrazione e database di documenti",
+          "others": "Altri",
+          "profiling": "Profilazione",
+          "sql": "SQL",
+          "time-series-databases": "Database di serie temporali"
         }
       }
     },
@@ -6469,7 +6469,7 @@
       },
       "caching": {
         "text": {
-          "cache": ""
+          "cache": "Cache"
         }
       },
       "ds-permissions": {
@@ -6523,7 +6523,7 @@
     },
     "data-source-settings-reducer": {
       "message": {
-        "testing-could-couple-minutes": ""
+        "testing-could-couple-minutes": "Test in corso... potrebbe richiedere fino a un paio di minuti"
       }
     },
     "data-source-type-card": {
@@ -6546,41 +6546,41 @@
     },
     "get-enterprise-phantom-plugins": {
       "description": {
-        "adobe-analytics-datasource": "",
-        "app-dynamics-integration-and-data-source": "",
-        "atlassian-statuspage-datasource": "",
-        "aurora-data-source": "",
-        "azure-cosmos-db-datasource": "",
-        "azure-devops-datasource": "",
-        "catchpoint-datasource": "",
-        "cloudflare-datasource": "",
-        "cockroach-db-datasource": "",
-        "data-dog-integration-and-data-source": "",
-        "drone-datasource": "",
-        "git-lab-integration-and-datasource": "",
-        "honeycomb-integration-and-datasource": "",
-        "jira-integration-and-datasource": "",
-        "logic-monitor-devices-datasource": "",
-        "mongo-db-integration-and-data-source": "",
-        "netlify-datasource": "",
-        "new-relic-integration-and-data-source": "",
-        "pager-duty-datasource": "",
-        "salesforce-integration-and-datasource": "",
-        "sap-hana-integration-and-data-source": "",
-        "service-now-integration-and-data-source": "",
-        "signal-fx-integration-and-datasource": "",
-        "snowflake-integration-and-data-source": "",
-        "sumo-logic-integration-and-datasource": "",
-        "visualize-and-explore-dynatrace-data": "",
-        "visualize-and-explore-oracle-sql": "",
-        "visualize-and-explore-splunk-logs": "",
-        "wavefront-integration-and-data-source": "",
-        "zendesk-datasource": ""
+        "adobe-analytics-datasource": "Origine dati Adobe Analytics",
+        "app-dynamics-integration-and-data-source": "Integrazione e origine dati AppDynamics",
+        "atlassian-statuspage-datasource": "Origine dati Atlassian Statuspage",
+        "aurora-data-source": "Origine dati Aurora",
+        "azure-cosmos-db-datasource": "Origine dati Azure CosmosDB",
+        "azure-devops-datasource": "Origine dati Azure Devops",
+        "catchpoint-datasource": "Origine dati Catchpoint",
+        "cloudflare-datasource": "Origine dati Cloudflare",
+        "cockroach-db-datasource": "Origine dati CockroachDB",
+        "data-dog-integration-and-data-source": "Integrazione e origine dati DataDog",
+        "drone-datasource": "Origine dati Drone",
+        "git-lab-integration-and-datasource": "Integrazione e origine dati GitLab",
+        "honeycomb-integration-and-datasource": "Integrazione e origine dati Honeycomb",
+        "jira-integration-and-datasource": "Integrazione e origine dati Jira",
+        "logic-monitor-devices-datasource": "Origine dati dispositivi LogicMonitor",
+        "mongo-db-integration-and-data-source": "Integrazione e origine dati MongoDB",
+        "netlify-datasource": "Origine dati Netlify",
+        "new-relic-integration-and-data-source": "Integrazione e origine dati New Relic",
+        "pager-duty-datasource": "Origine dati PagerDuty",
+        "salesforce-integration-and-datasource": "Integrazione e origine dati Salesforce",
+        "sap-hana-integration-and-data-source": "Integrazione e origine dati SAP HANA®",
+        "service-now-integration-and-data-source": "Integrazione e origine dati ServiceNow",
+        "signal-fx-integration-and-datasource": "Integrazione e origine dati SignalFx",
+        "snowflake-integration-and-data-source": "Integrazione e origine dati Snowflake",
+        "sumo-logic-integration-and-datasource": "Integrazione e origine dati SumoLogic",
+        "visualize-and-explore-dynatrace-data": "Visualizza ed esplora i dati Dynatrace",
+        "visualize-and-explore-oracle-sql": "Visualizza ed esplora Oracle SQL",
+        "visualize-and-explore-splunk-logs": "Visualizza ed esplora i registri di Splunk",
+        "wavefront-integration-and-data-source": "Integrazione e origine dati Wavefront",
+        "zendesk-datasource": "Origine dati Zendesk"
       }
     },
     "get-grafana-cloud-phantom-plugin": {
       "description": {
-        "hosted-graphite-prometheus-and-loki": ""
+        "hosted-graphite-prometheus-and-loki": "Graphite, Prometheus e Loki in hosting"
       }
     },
     "new-data-source-view": {
@@ -6590,7 +6590,7 @@
     "update-data-source": {
       "error-info": {
         "message": {
-          "an-unexpected-error-occurred": ""
+          "an-unexpected-error-occurred": "Si è verificato un errore inatteso."
         }
       }
     },
@@ -6610,37 +6610,37 @@
   },
   "debug": {
     "cursor-view": {
-      "no-events-yet": ""
+      "no-events-yet": "Ancora nessun evento"
     },
     "render-info-viewer": {
-      "data-counter": "",
-      "elapsed-time": "",
+      "data-counter": "Dati: {{numDataChanges}} ",
+      "elapsed-time": "Tempo: {{elapsed}} ms",
       "field": "Campo",
-      "last": "",
-      "render-counter": "",
-      "schema-counter": "",
-      "title-reset-counters": "",
-      "tooltip-step-back": "",
+      "last": "Ultimo",
+      "render-counter": "Rendering: {{numRenders}} ",
+      "schema-counter": "Schema: {{numSchemaChanges}} ",
+      "title-reset-counters": "Reimposta contatori",
+      "tooltip-step-back": "Indietro",
       "type": "Tipo"
     },
     "state-view": {
-      "current-value": "",
-      "label-state-name": ""
+      "current-value": "Valore corrente: {{currentValue}} ",
+      "label-state-name": "Nome stato"
     }
   },
   "dimensions": {
     "background-size-editor": {
       "options": {
-        "label-contain": "",
-        "label-cover": "",
-        "label-fill": "",
-        "label-original": "",
-        "label-tile": ""
+        "label-contain": "Contieni",
+        "label-cover": "Copri",
+        "label-fill": "Riempi",
+        "label-original": "Originale",
+        "label-tile": "Mattonella"
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": "",
-      "noOptionsMessage-no-fields-found": ""
+      "label-fixed-color": "Colore fisso",
+      "noOptionsMessage-no-fields-found": "Nessun campo trovato"
     },
     "file-dropzone-custom-children": {
       "upload": "Carica"
@@ -6654,10 +6654,10 @@
       "placeholder-search": "Cerca"
     },
     "resource-dimension-editor": {
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Usa un risultato di campo stringa",
+      "description-fixed": "Valore fisso",
       "label-field": "Campo",
-      "label-fixed": "",
+      "label-fixed": "Fisso",
       "label-mappings": "Mappature",
       "label-source": "Origine"
     },
@@ -6675,35 +6675,35 @@
     },
     "scalar-dimension-editor": {
       "fixed-value-options": {
-        "label-fixed-values": ""
+        "label-fixed-values": "Valore fisso"
       },
       "label-limit": "Limite",
       "label-value": "Valore",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Nessun campo trovato",
       "scalar-options": {
-        "description-clamped": "",
-        "description-mod": "",
-        "label-clamped": "",
-        "label-mod": ""
+        "description-clamped": "Usa i valori dei campi, bloccati su massimo e minimo",
+        "description-mod": "Usa i valori dei campi, mod da max",
+        "label-clamped": "Bloccato",
+        "label-mod": "Mod"
       }
     },
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Valore fisso"
         }
       },
       "label-max": "Max",
       "label-min": "Min",
       "label-value": "Valore",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Nessun campo trovato"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Visualizza valore campo",
+      "description-fixed": "Valore fisso",
       "label-field": "Campo",
-      "label-fixed": "",
+      "label-fixed": "Fisso",
       "label-source": "Origine",
       "label-template": "Modello",
       "label-value": "Valore"
@@ -6717,16 +6717,16 @@
       "description-percentage-means-thresholds-relative": "Percentuale indica soglie relative a min e max",
       "modes": {
         "description": {
-          "threshold-based-percent-between-minmax": "",
-          "thresholds-based-absolute-values": ""
+          "threshold-based-percent-between-minmax": "Scegli la soglia in base alla percentuale tra min/max",
+          "thresholds-based-absolute-values": "Scegli le soglie in base ai valori assoluti"
         },
         "label": {
-          "absolute": "",
-          "percentage": ""
+          "absolute": "Assoluta",
+          "percentage": "Percentuale"
         }
       },
       "thresholds-mode": "Modalità soglie",
-      "value-base": ""
+      "value-base": "Base"
     },
     "urlpicker-tab": {
       "label-preview": "Anteprima"
@@ -6744,12 +6744,12 @@
       "set-color": "Imposta colore",
       "special-match-options": {
         "description": {
-          "boolean-false-values": "",
-          "boolean-true-values": "",
-          "empty-string": "",
-          "matches-against-number-na-n-not-a-number": "",
-          "matches-null-and-undefined-values": "",
-          "matches-null-undefined-and-na-n": ""
+          "boolean-false-values": "Valori booleani falsi",
+          "boolean-true-values": "Valori booleani veri",
+          "empty-string": "Stringa vuota",
+          "matches-against-number-na-n-not-a-number": "Corrispondenze con Number.NaN (non un numero)",
+          "matches-null-and-undefined-values": "Corrispondenze con valori null e non definiti",
+          "matches-null-undefined-and-na-n": "Corrispondenze con null, non definito e NaN"
         },
         "label": {
           "empty": "Vuoto"
@@ -6772,15 +6772,15 @@
       "label-add-a-new-mapping": "Aggiungi una nuova mappatura",
       "mapping-types": {
         "description": {
-          "match-a-numerical-range-of-values": "",
-          "match-a-regular-expression-with-replacement": "",
-          "match-a-specific-text-value": "",
-          "match-boolean-empty-values": ""
+          "match-a-numerical-range-of-values": "Abbina un intervallo numerico di valori",
+          "match-a-regular-expression-with-replacement": "Abbina un'espressione regolare con la sostituzione",
+          "match-a-specific-text-value": "Abbina un valore di testo specifico",
+          "match-boolean-empty-values": "Corrispondenza con valori null, NaN, booleani e vuoti"
         },
         "label": {
-          "range": "",
-          "regex": "",
-          "special": "",
+          "range": "Intervallo",
+          "regex": "Regex",
+          "special": "Speciale",
           "value": "Valore"
         }
       },
@@ -6806,9 +6806,10 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
-      "events": "",
+      "events": "Eventi",
       "footer": "Le marche temporali degli eventi sono relativi all'ora di inizio della traccia completa."
     },
     "accordian-references": {
@@ -6821,7 +6822,7 @@
     },
     "build-dashboard-panel-from-explore-state": {
       "title": {
-        "new-panel": ""
+        "new-panel": "Nuovo pannello"
       }
     },
     "clear": "Cancella",
@@ -6954,7 +6955,7 @@
     "get-field-links-for-explore": {
       "text": {
         "data": "Data",
-        "raw-value": ""
+        "raw-value": "Valore grezzo"
       }
     },
     "get-matches-metadata": {
@@ -6965,7 +6966,7 @@
         "tags": "Tag"
       },
       "title": {
-        "related-logs": "",
+        "related-logs": "Registri correlati",
         "session-for-this-span": "Sessione per questo intervallo"
       },
       "title-explore-metrics-for-this-span": "Esplora le metriche per questo intervallo",
@@ -7009,8 +7010,8 @@
     "logs-meta-row": {
       "download": "Scarica",
       "label": {
-        "deduplication-count": "",
-        "showing-only-selected-fields": ""
+        "deduplication-count": "Conteggio di deduplicazione",
+        "showing-only-selected-fields": "Visualizzazione solo dei campi selezionati"
       },
       "show-original-line": "Mostra riga originale"
     },
@@ -7078,7 +7079,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Caricamento in corso..."
     },
     "prev": "Prec.",
     "queryless-apps-extensions": {
@@ -7199,7 +7200,7 @@
     },
     "scoped-vars-from-span": {
       "text": {
-        "span": ""
+        "span": "Intervallo"
       }
     },
     "scoped-vars-from-tags": {
@@ -7247,25 +7248,25 @@
     },
     "span-detail": {
       "label": {
-        "kind": "",
-        "library-name": "",
-        "library-version": "",
+        "kind": "Tipo:",
+        "library-name": "Nome libreria:",
+        "library-version": "Versione libreria:",
         "status": "Stato:",
-        "status-message": "",
-        "trace-state": ""
+        "status-message": "Messaggio di stato:",
+        "trace-state": "Stato traccia:"
       },
       "label-resource-attributes": "Attributi risorsa",
       "label-span-attributes": "Attributi intervallo",
       "label-stack-trace": "Analisi stack",
       "overview-items": {
         "label": {
-          "child-count": "",
-          "duration": "",
-          "service": "",
-          "start-time": ""
+          "child-count": "Numero figli:",
+          "duration": "Durata:",
+          "service": "Assistenza:",
+          "start-time": "Ora di inizio:"
         }
       },
-      "share-span": "",
+      "share-span": "Condividi",
       "warnings": "Allarmi"
     },
     "span-filters": {
@@ -7275,8 +7276,8 @@
       "aria-label-select-service-name-operator": "Seleziona operatore nome servizio",
       "aria-label-select-span-name": "Seleziona nome intervallo",
       "aria-label-select-span-name-operator": "Seleziona l'operatore del nome dell'intervallo",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Seleziona la durata dell'intervallo massimo",
+      "ariaLabel-select-min-span-duration": "Seleziona la durata dell'intervallo minimo",
       "label-collapse": "Filtri intervallo",
       "label-duration": "Durata",
       "label-service-name": "Nome del servizio",
@@ -7348,23 +7349,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Durata",
+      "export-started": "Esportazione iniziata",
+      "give-feedback": "Feedback",
+      "link-copied": "Il link è stato copiato negli appunti",
+      "path": "Percorso",
+      "route": "Tratta",
+      "services": "Servizi",
+      "share": "Condividi",
+      "share-copy-link": "Copia link",
+      "share-export-json": "Esporta in formato JSON",
+      "share-tooltip": "Condividi traccia",
+      "start-time": "Ora di inizio",
+      "target": "Destinazione",
+      "title-share-thoughts-about-tracing-grafana": "Condividi i tuoi pensieri sul tracciamento in Grafana.",
+      "tooltip-url": "{{route}} o {{url}} o {{target}} o {{path}}",
+      "trace-id": "ID traccia",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Tasto Cancella filtri",
@@ -7385,10 +7386,10 @@
     },
     "unthemed-logs": {
       "description": {
-        "show-results-in-logs-visualisation": "",
-        "show-results-in-table-visualisation": "",
-        "show-results-newest-to-oldest": "",
-        "show-results-oldest-to-newest": ""
+        "show-results-in-logs-visualisation": "Mostra i risultati nella visualizzazione dei registri",
+        "show-results-in-table-visualisation": "Mostra i risultati nella visualizzazione della tabella",
+        "show-results-newest-to-oldest": "Mostra i risultati dal più recente al più vecchio",
+        "show-results-oldest-to-newest": "Mostra i risultati dal più vecchio al più recente"
       },
       "label": {
         "logs": "Registri",
@@ -7416,7 +7417,7 @@
       "create-focus-span-link": {
         "link": {
           "title": {
-            "deep-link-to-this-span": ""
+            "deep-link-to-this-span": "Link diretto a questo intervallo"
           }
         }
       }
@@ -7464,7 +7465,7 @@
       "when": "QUANDO"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Esegui SQL con dialetto MySQL sulle tabelle restituite dalle origini dati. Le query dell'origine dati (ad esempio \"A\", \"B\") sono disponibili come tabelle e sono referenziate tramite il nome della query. I campi sono disponibili come colonne, così come restituiti dall'origine dati.",
       "label-operation": "Operazione"
     },
     "math": {
@@ -7495,7 +7496,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Cancella cartelle",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Nessuna cartella trovata",
     "select-aria-label": "Filtro cartelle",
     "select-placeholder": "Filtra per cartella"
   },
@@ -7544,23 +7545,23 @@
     "title": "Abbandonare la pagina?"
   },
   "gauge": {
-    "category-gauge": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-neutral": "",
-    "description-show-threshold-labels": "",
-    "description-show-threshold-markers": "",
+    "category-gauge": "Calibro",
+    "description-min-height": "Altezza minima della riga (orientamento orizzontale)",
+    "description-min-width": "Larghezza minima della colonna (orientamento verticale)",
+    "description-neutral": "Lascia vuoto per utilizzare Min come punto neutro",
+    "description-show-threshold-labels": "Rendering dei valori di soglia attorno alla barra di misurazione",
+    "description-show-threshold-markers": "Rendering delle soglie come barra esterna",
     "gauge-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automatico",
+      "label-manual": "Manuale"
     },
-    "name-gauge-size": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-neutral": "",
-    "name-show-threshold-labels": "",
-    "name-show-threshold-markers": "",
-    "placeholder-neutral": ""
+    "name-gauge-size": "Dimensione del calibro",
+    "name-min-height": "Altezza minima",
+    "name-min-width": "Larghezza minima",
+    "name-neutral": "Normale",
+    "name-show-threshold-labels": "Mostra etichette di soglia",
+    "name-show-threshold-markers": "Mostra indicatori di soglia",
+    "placeholder-neutral": "automatico"
   },
   "gen-ai": {
     "apply-suggestion": "Applica",
@@ -7569,182 +7570,182 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Dizionario geografico non trovato",
+      "warning-no-geometry": "impossibile trovare la geometria",
+      "warning-select-geohash": "Seleziona campo geohash",
+      "warning-select-lat-long": "Seleziona i campi latitudine/longitudine",
+      "warning-select-lookup": "Seleziona campo di ricerca",
+      "warning-unable-to-find": "Impossibile trovare i campi di posizione"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nessun campo stringa trovato"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nessun campo numerico trovato"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nessun campo numerico trovato"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nessun campo stringa trovato"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Dizionario geografico",
+      "name-geohash-field": "Campo Geohash",
+      "name-latitude-field": "Campo latitudine",
+      "name-location-mode": "Modalità posizione",
+      "name-longitude-field": "Campo longitudine",
+      "name-lookup-field": "Campo di ricerca"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Identifica automaticamente i dati sulla posizione in base ai nomi dei campi predefiniti",
+        "description-coords": "Specifica i campi latitudine e longitudine",
+        "description-geohash": "Specifica il campo geohash",
+        "description-lookup": "Specifica dizionario geografico e campo di ricerca",
+        "label-auto": "Automatica",
+        "label-coords": "Coordinate",
+        "label-geohash": "Geohash",
+        "label-lookup": "Ricerca"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Livello mappa di base",
+    "category-map-controls": "Controlli della mappa",
+    "category-map-layers": "Livelli mappa",
+    "category-map-view": "Visualizzazione mappa",
     "coordinates-map-view-editor": {
-      "label-latitude": "",
-      "label-longitude": ""
+      "label-latitude": "Latitudine",
+      "label-longitude": "Longitudine"
     },
     "debug-overlay": {
-      "center": "",
-      "zoom": ""
+      "center": "Centro:",
+      "zoom": "Zoom:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Questa posizione verrà visualizzata al primo caricamento del pannello.",
+    "description-mouse-wheel-zoom": "Abilita il controllo dello zoom tramite la rotella del mouse",
+    "description-no-repeat": "Impedisci alla mappa di ripetersi orizzontalmente",
+    "description-share-view": "Utilizza la stessa visualizzazione su più pannelli. Nota: potrebbe essere necessario ricaricare la dashboard.",
+    "description-show-attribution": "Mostra le informazioni sull'attribuzione dell'origine della mappa in basso a destra",
+    "description-show-debug": "Mostra informazioni sulla mappa",
+    "description-show-measure": "Mostra gli strumenti per effettuare misurazioni sulla mappa",
+    "description-show-scale": "Indica la scala della mappa",
+    "description-show-zoom": "Mostra i pulsanti di controllo dello zoom nell'angolo in alto a sinistra",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
-        "label-layer": ""
+        "label-layer": "Livelli"
       },
       "label-data": "Data",
       "last-only-editor-fragment": {
-        "label-padding": "",
-        "tooltip-padding-relative-percent-beyond-extent": ""
+        "label-padding": "Riempimento",
+        "tooltip-padding-relative-percent-beyond-extent": "Imposta il riempimento interno in percentuale relativa oltre l'estensione dei dati"
       }
     },
     "frame-multi-selection-editor": {
-      "placeholder-change-filter": ""
+      "placeholder-change-filter": "Modifica filtro"
     },
     "frame-selection-editor": {
-      "placeholder-change-filter": ""
+      "placeholder-change-filter": "Modifica filtro"
     },
     "geomap-panel": {
-      "aria-label-map": ""
+      "aria-label-map": "Mappa navigabile"
     },
     "geomap-style-rules-editor": {
-      "aria-label-add-geomap-style-rule": ""
+      "aria-label-add-geomap-style-rule": "Aggiungi regola di stile geomappa"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Livello base",
+      "description-display-tooltip": "Mostra il suggerimento per il livello",
+      "name-data": "Dati",
+      "name-display-tooltip": "Visualizza suggerimento",
+      "name-layer-type": "Tipo di livello",
+      "name-opacity": "Opacità"
     },
     "layers-editor": {
-      "label-add-layer": "",
-      "no-layers": ""
+      "label-add-layer": "Aggiungi livello",
+      "no-layers": "Nessun livello?"
     },
     "map-view-editor": {
-      "label-max-zoom": "",
+      "label-max-zoom": "Zoom massimo",
       "label-view": "Visualizza",
       "label-zoom": "Zoom",
-      "use-current-map-settings": ""
+      "use-current-map-settings": "Usa le impostazioni correnti della mappa"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Mostra legenda della mappa",
+      "name-show-legend": "Mostra legenda",
+      "name-styles": "Stili"
     },
     "markers-legend": {
       "title-symbol": "Simbolo"
     },
     "measure-overlay": {
       "aria-label-close": "",
-      "tooltip-show-measure-tools": ""
+      "tooltip-show-measure-tools": "Mostra strumenti di misurazione"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Vista iniziale",
+    "name-mouse-wheel-zoom": "Zoom con la rotellina del mouse",
+    "name-no-repeat": "Nessuna ripetizione della mappa",
+    "name-share-view": "Condividi vista",
+    "name-show-attribution": "Mostra attribuzione",
+    "name-show-debug": "Mostra debug",
+    "name-show-measure": "Mostra strumenti di misurazione",
+    "name-show-scale": "Mostra scala",
+    "name-show-zoom": "Mostra controllo zoom",
+    "name-tooltip": "Suggerimento",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Nessun campo stringa trovato"
     },
     "plugin": {
-      "basemap-layer-configured-server-admin": ""
+      "basemap-layer-configured-server-admin": "Il livello della mappa di base è configurato dall'amministratore del server."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Centrale",
+        "label-left": "A sinistra",
+        "label-right": "A destra"
       },
-      "label-align": "",
-      "label-baseline": "",
+      "label-align": "Allinea",
+      "label-baseline": "Linea di base",
       "label-color": "Colore",
-      "label-fill-opacity": "",
-      "label-font-size": "",
-      "label-opacity": "",
-      "label-rotation-angle": "",
-      "label-size": "",
+      "label-fill-opacity": "Opacità del riempimento",
+      "label-font-size": "Dimensione carattere",
+      "label-opacity": "Opacità",
+      "label-rotation-angle": "Angolo di rotazione",
+      "label-size": "Dimensioni",
       "label-symbol": "Simbolo",
-      "label-symbol-horizontal-align": "",
-      "label-symbol-vertical-align": "",
-      "label-text-label": "",
-      "label-x-offset": "",
-      "label-y-offset": "",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "label-symbol-horizontal-align": "Allineamento orizzontale del simbolo",
+      "label-symbol-vertical-align": "Allineamento verticale del simbolo",
+      "label-text-label": "Etichetta testo",
+      "label-x-offset": "Offset X",
+      "label-y-offset": "Offset Y",
+      "placeholderText-select-symbol": "Seleziona un simbolo",
+      "placeholderText-select-symbol-or-add-text": "Seleziona un simbolo o aggiungi un'etichetta di testo",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "In basso",
+        "label-center": "Centrale",
+        "label-top": "In alto"
       }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Operatore di confronto",
-      "aria-label-comparison-value": "",
-      "aria-label-delete-style-rule": "",
-      "aria-label-feature-property": "",
+      "aria-label-comparison-value": "Valore di confronto",
+      "aria-label-delete-style-rule": "Elimina regola stile",
+      "aria-label-feature-property": "Proprietà funzionalità",
       "label-rule": "Regola",
-      "placeholder-feature-property": "",
-      "placeholder-numeric-value": "",
+      "placeholder-feature-property": "Proprietà funzionalità",
+      "placeholder-numeric-value": "Valore numerico",
       "placeholder-value": "valore"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Mostra popup al passaggio del mouse",
+      "description-none": "Mostra contenuti al clic, non al passaggio del mouse",
+      "label-details": "Dettagli",
+      "label-none": "Nessuno"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Livello {{name}}"
     }
   },
   "get-enterprise": {
@@ -7754,13 +7755,13 @@
   "gettingstarted": {
     "docs-card": {
       "complete": "completo",
-      "learn-how": ""
+      "learn-how": "Scopri come nella documentazione"
     },
     "getting-started": {
-      "aria-label-to-advanced-tutorials": "",
-      "aria-label-to-basic-tutorials": "",
-      "checking-completed-setup-steps": "",
-      "remove-this-panel": ""
+      "aria-label-to-advanced-tutorials": "Ai tutorial avanzati",
+      "aria-label-to-basic-tutorials": "Ai tutorial di base",
+      "checking-completed-setup-steps": "Verifica dei passaggi di configurazione completati",
+      "remove-this-panel": "Rimuovi questo pannello"
     },
     "tutorial-card": {
       "complete": "completo"
@@ -7786,7 +7787,7 @@
     "use-get-configuration-for-ui": {
       "get-connect-data-source-configuration": {
         "title": {
-          "connect-data-source": ""
+          "connect-data-source": "Collega origine dati"
         }
       },
       "title": {
@@ -7796,39 +7797,39 @@
     "use-get-essentials-configuration": {
       "essential-content": {
         "description": {
-          "configure-grafana-alerting": "",
-          "create-integration-alerting-contact-point": "",
-          "initialize-incident-plugin-declare-manage-incidents": "",
-          "practice-solving-an-incident": "",
-          "receive-alerts-oncall-notifications-within-environment": "",
-          "select-chat-ops-channels-to-route-notifications": ""
+          "configure-grafana-alerting": "Configura Grafana Alerting",
+          "create-integration-alerting-contact-point": "Crea un'integrazione IRM per un punto di contatto di avviso.",
+          "initialize-incident-plugin-declare-manage-incidents": "Inizializza il plugin Incident per dichiarare e gestire gli incidenti.",
+          "practice-solving-an-incident": "Esercitati a risolvere un incidente",
+          "receive-alerts-oncall-notifications-within-environment": "Ricevi avvisi e notifiche di chiamata all'interno del tuo ambiente di chat.",
+          "select-chat-ops-channels-to-route-notifications": "Seleziona i canali ChatOps per instradare le notifiche"
         },
         "label": {
           "add": "Aggiungi",
           "connect": "Connetti",
-          "initialize": "",
-          "select-integration": "",
-          "start-drill": ""
+          "initialize": "Inizializza",
+          "select-integration": "Seleziona integrazione",
+          "start-drill": "Avvia drill-down"
         },
         "title": {
-          "add-slack-notifications-to-irm-integrations": "",
-          "connect-alerting-to-irm": "",
-          "connect-irm-to-your-slack-workspace": "",
-          "connect-your-messaging-workspace-to-incident": "",
-          "connect-your-messaging-workspace-to-on-call": "",
-          "create-incident-drill": "",
+          "add-slack-notifications-to-irm-integrations": "Aggiungi notifiche Slack alle integrazioni IRM",
+          "connect-alerting-to-irm": "Collega gli avvisi a IRM",
+          "connect-irm-to-your-slack-workspace": "Collega IRM al tuo spazio di lavoro Slack",
+          "connect-your-messaging-workspace-to-incident": "Collega il tuo spazio di lavoro di messaggistica a Incident",
+          "connect-your-messaging-workspace-to-on-call": "Collega il tuo spazio di lavoro di messaggistica a OnCall",
+          "create-incident-drill": "Crea drill-down Incident",
           "detect": "Rileva",
-          "initialize-incident-plugin": "",
-          "messaging-workspace-channel-on-call-integration": "",
-          "respond": "",
-          "test-your-configuration": ""
+          "initialize-incident-plugin": "Inizializza il plug-in Incident",
+          "messaging-workspace-channel-on-call-integration": "Aggiungi il canale dello spazio di lavoro di messaggistica all'integrazione OnCall",
+          "respond": "Rispondi",
+          "test-your-configuration": "Testa la tua configurazione"
         }
       },
       "get-grafana-alerting-config-steps": {
         "description": {
-          "create-alert-monitor-system": "",
-          "create-on-call-integration-alerting-contact-point": "",
-          "create-slos-to-monitor-your-service": ""
+          "create-alert-monitor-system": "Crea una regola di avviso per monitorare il tuo sistema.",
+          "create-on-call-integration-alerting-contact-point": "Crea un'integrazione OnCall per un punto di contatto di avviso.",
+          "create-slos-to-monitor-your-service": "Crea SLO per monitorare la tua assistenza."
         },
         "label": {
           "connect": "Connetti",
@@ -7840,14 +7841,14 @@
             "edit": "Modifica"
           },
           "title": {
-            "update-default-contact-point": ""
+            "update-default-contact-point": "Aggiorna punto di contatto predefinito"
           }
         },
         "title": {
-          "connect-alerting-to-on-call": "",
-          "create-alert-rule": "",
-          "create-slo": "",
-          "enable-slo-alerting": ""
+          "connect-alerting-to-on-call": "Collega gli avvisi a OnCall",
+          "create-alert-rule": "Crea regola di avviso",
+          "create-slo": "Crea SLO",
+          "enable-slo-alerting": "Abilita avvisi SLO"
         }
       }
     }
@@ -7864,400 +7865,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Piedi/sec²",
+            "name-g-unit": "Unità G",
+            "name-meters-sec": "Metri/sec²"
           },
-          "name": ""
+          "name": "Accelerazione"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Minuti d'arco",
+            "name-arc-seconds": "Secondi d'arco",
+            "name-degrees": "Gradi (°)",
+            "name-gradian": "Gradiente",
+            "name-radians": "Radianti"
           },
-          "name": ""
+          "name": "Angolo"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Acri (ac)",
+            "name-hectares": "Ettari (ha)",
+            "name-square-feet": "Piedi quadrati (ft²)",
+            "name-square-meters": "Metri quadrati (m²)",
+            "name-square-miles": "Miglia quadrate (mi²)"
           },
-          "name": ""
+          "name": "Area"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Acceso/Spento",
+            "name-true-false": "Vero/Falso",
+            "name-yes-no": "Sì/No"
           },
-          "name": ""
+          "name": "Booleano"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "Calcolo"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "grammo per metro cubo (g/m³)",
+            "name-g-nm3": "grammo per metro cubo normale (g/Nm³)",
+            "name-mg-dl": "milligrammi per decilitro (mg/dL)",
+            "name-mg-m3": "milligrammo per metro cubo (mg/m³)",
+            "name-mg-nm3": "milligrammo per metro cubo normale (mg/Nm³)",
+            "name-mmol-l": "millimoli per litro (mmol/L)",
+            "name-ng-m3": "nanogrammo per metro cubo (ng/m³)",
+            "name-ng-nm3": "nanogrammo per metro cubo normale (ng/Nm³)",
+            "name-ppb": "parti per miliardo (ppb)",
+            "name-ppm": "parti per milione (ppm)",
+            "name-ug-m3": "microgrammo per metro cubo (μg/m³)",
+            "name-ug-nm3": "microgrammo per metro cubo normale (μg/Nm³)"
           },
-          "name": ""
+          "name": "Concentrazione"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Lev bulgaro (BGN)",
+            "name-brl": "Real (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "Franco svizzero (CHF)",
+            "name-czk": "Corona ceca (czk)",
+            "name-dkk": "Corona danese (kr)",
+            "name-eur": "Euro (€)",
+            "name-gbp": "Sterline (£)",
+            "name-idr": "Rupia indonesiana (Rp)",
+            "name-ils": "Nuovo shekel israeliano (₪)",
+            "name-inr": "Rupia indiana (₹)",
+            "name-isk": "Corona islandese (kr)",
+            "name-jpy": "Yen (¥)",
+            "name-krw": "Won sud-coreano (₩)",
+            "name-mbtc": "Milli Bitcoin (฿)",
+            "name-myr": "Ringgit malese (RM)",
+            "name-nok": "Corona norvegese (kr)",
+            "name-php": "Peso filippino (PHP)",
+            "name-pln": "Złoty polacco (PLN)",
+            "name-pyg": "Guaraní (₲)",
+            "name-rub": "Rubli (₽)",
+            "name-sek": "Corona svedese (kr)",
+            "name-try": "Lira turca (₺)",
+            "name-uah": "Grivnia ucraina (₴)",
+            "name-ubtc": "Micro Bitcoin (฿)",
+            "name-usd": "Dollari ($)",
+            "name-uyu": "Peso uruguaiano (UYU)",
+            "name-vnd": "Dong vietnamita (VND)",
+            "name-xpf": "Franco CFP (XPF)",
+            "name-zar": "Rand sudafricano (R)"
           },
-          "name": ""
+          "name": "Valuta"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bit (IEC)",
+            "name-bits-si": "bit (SI)",
+            "name-bytes-iec": "byte (IEC)",
+            "name-bytes-si": "byte (SI)",
+            "name-gibibytes": "gibibyte",
+            "name-gigabytes": "gigabyte",
+            "name-kibibytes": "kibibyte",
+            "name-kilobytes": "kilobyte",
+            "name-mebibytes": "mebibyte",
+            "name-megabytes": "megabyte",
+            "name-pebibytes": "pebibyte",
+            "name-petabytes": "petabyte",
+            "name-tebibytes": "tebibyte",
+            "name-terabytes": "terabyte"
           },
-          "name": ""
+          "name": "Dati"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bit/sec (IEC)",
+            "name-bits-sec-si": "bit/sec (SI)",
+            "name-bytes-sec-iec": "byte/sec (IEC)",
+            "name-bytes-sec-si": "byte/sec (SI)",
+            "name-gibibits-sec": "gibibit/sec",
+            "name-gibibytes-sec": "gibibyte/sec",
+            "name-gigabits-sec": "gigabit/sec",
+            "name-gigabytes-sec": "gigabyte/sec",
+            "name-kibibits-sec": "kibibit/sec",
+            "name-kibibytes-sec": "kibibyte/sec",
+            "name-kilobits-sec": "kilobit/sec",
+            "name-kilobytes-sec": "kilobyte/sec",
+            "name-mebibits-sec": "mebibit/sec",
+            "name-mebibytes-sec": "mebibyte/sec",
+            "name-megabits-sec": "megabit/sec",
+            "name-megabytes-sec": "megabyte/sec",
+            "name-packets-sec": "pacchetti/sec",
+            "name-pebibits-sec": "pebibit/sec",
+            "name-pebibytes-sec": "pebibyte/sec",
+            "name-petabits-sec": "petabit/sec",
+            "name-petabytes-sec": "petabyte/sec",
+            "name-tebibits-sec": "tebibit/sec",
+            "name-tebibytes-sec": "tebibyte/sec",
+            "name-terabits-sec": "terabit/sec",
+            "name-terabytes-sec": "terabyte/sec"
           },
-          "name": ""
+          "name": "Velocità dati"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Data e ora predefinite",
+            "name-datetime-iso": "Data e ora ISO",
+            "name-datetime-iso-no-date": "Data e ora ISO (nessuna data se oggi)",
+            "name-datetime-local": "Data e ora locale",
+            "name-datetime-local-no-date": "Data e ora locali (nessuna data se oggi)",
+            "name-datetime-us": "Data e ora USA",
+            "name-datetime-us-no-date": "Data e ora USA (nessuna data se oggi)",
+            "name-from-now": "Da adesso"
           },
-          "name": ""
+          "name": "Data e ora"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Ampere (A)",
+            "name-ampere-hour": "Ampere-ora (Ah)",
+            "name-decibel-milliwatt": "Decibel-milliwatt (dBm)",
+            "name-electron-volt": "Elettronvolt (eV)",
+            "name-farad": "Farad (F)",
+            "name-femtofarad": "Femtofarad (fF)",
+            "name-gigawatt": "Gigawatt (GW)",
+            "name-henry": "Henry (H)",
+            "name-joule": "Joule (J)",
+            "name-kiloampere": "Kiloampere (kA)",
+            "name-kiloampere-hour": "Kiloampere-ora (kAh)",
+            "name-kiloohm": "Kiloohm (kΩ)",
+            "name-kilovolt": "Kilovolt (kV)",
+            "name-kilovolt-ampere": "Kilovolt-Ampere (kVA)",
+            "name-kilovolt-ampere-reactive": "Kilovolt-Ampere reattivo (kVAr)",
+            "name-kilowatt": "Kilowatt (kW)",
+            "name-kilowatt-hour": "Kilowatt-ora (kWh)",
+            "name-kilowatt-min": "Kilowatt-min (kWm)",
+            "name-lumens": "Lumen (Lm)",
+            "name-megaohm": "Megaohm (MΩ)",
+            "name-megawatt": "Megawatt (MW)",
+            "name-megawatt-hour": "Megawattora (MWh)",
+            "name-microfarad": "Microfarad (µF)",
+            "name-microhenry": "Microhenry (µH)",
+            "name-milliampere": "Milliampere (mA)",
+            "name-milliampere-hour": "Milliampere-ora (mAh)",
+            "name-millihenry": "Millihenry (mH)",
+            "name-milliohm": "Milliohm (mΩ)",
+            "name-millivolt": "Millivolt (mV)",
+            "name-milliwatt": "Milliwatt (mW)",
+            "name-nanofarad": "Nanofarad (nF)",
+            "name-ohm": "Ohm (Ω)",
+            "name-picofarad": "Picofarad (pF)",
+            "name-volt": "Volt (V)",
+            "name-volt-ampere": "Volt-Ampere (VA)",
+            "name-volt-ampere-reactive": "Volt-Ampere reattivo (VAr)",
+            "name-watt": "Watt (W)",
+            "name-watt-hour": "Wattora (Wh)",
+            "name-watt-hour-per-kg": "Wattora per chilogrammo (Wh/kg)",
+            "name-watt-square-meter": "Watt per metro quadrato (W/m²)"
           },
-          "name": ""
+          "name": "Energia"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Piedi cubi/min (cfm)",
+            "name-cubic-feet-sec": "Piedi cubi/sec (cfs)",
+            "name-cubic-meters-sec": "Metri cubi/sec (cms)",
+            "name-gallons-min": "Galloni/min (gpm)",
+            "name-litre-hour": "Litro/ora",
+            "name-litre-min": "Litro/min (L/min)",
+            "name-lux": "Lux (lx)",
+            "name-millilitre-min": "millilitro/min (mL/min)"
           },
-          "name": ""
+          "name": "Flusso"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Kilonewton-metri (kNm)",
+            "name-kilonewtons": "Kilonewton (kN)",
+            "name-newton-meters": "Newton-metri (Nm)",
+            "name-newtons": "Newton (N)"
           },
-          "name": ""
+          "name": "Forza"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "exahash/sec",
+            "name-gigahashes-sec": "gigahash/sec",
+            "name-hashes-sec": "hash/sec",
+            "name-kilohashes-sec": "kilohash/sec",
+            "name-megahashes-sec": "megahash/sec",
+            "name-petahashes-sec": "petahash/sec",
+            "name-terahashes-sec": "terahash/sec"
           },
-          "name": ""
+          "name": "Tasso di hash"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "piedi (ft)",
+            "name-inch": "pollice (in)",
+            "name-kilometer": "chilometro (km)",
+            "name-meter": "metro (m)",
+            "name-mile": "miglio (mi)",
+            "name-millimeter": "millimetro (mm)"
           },
-          "name": ""
+          "name": "Lunghezza"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "grammo (g)",
+            "name-kilogram": "chilogrammo (kg)",
+            "name-metric-ton": "tonnellata metrica (t)",
+            "name-milligram": "milligrammo (mg)",
+            "name-pound": "libbra (lb)"
           },
-          "name": ""
+          "name": "Massa"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Candela (cd)",
+            "name-decibel": "Decibel",
+            "name-hexadecimal": "Esadecimale",
+            "name-hexadecimal-0x": "Esadecimale (0x)",
+            "name-humidity": "Umidità (%H)",
+            "name-locale": "Formato locale",
+            "name-number": "Numero",
+            "name-percent-1": "Percentuale (0,0-1,0)",
+            "name-percent-100": "Percentuale (0-100)",
+            "name-pixels": "Pixel",
+            "name-scientific": "Notazione scientifica",
+            "name-short": "corto",
+            "name-si-short": "SI breve",
+            "name-string": "Stringa"
           },
-          "name": ""
+          "name": "Varie"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Barre",
+            "name-hectopascals": "Ettopascal",
+            "name-inches-mercury": "Pollici di mercurio",
+            "name-kilobars": "Kilobar",
+            "name-kilopascals": "Kilopascal",
+            "name-millibars": "Millibar",
+            "name-pascals": "Pascal",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Pressione"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Becquerel (Bq)",
+            "name-curie": "curie (Ci)",
+            "name-exposure": "Esposizione (C/kg)",
+            "name-gray": "Gray (Gy)",
+            "name-microsievert": "microSievert (µSv)",
+            "name-microsievert-hour": "microSievert/ora (µSv/h)",
+            "name-millisievert": "milliSievert (mSv)",
+            "name-millisievert-hour": "milliSievert/ora (mSv/h)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "roentgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/ora (Sv/h)"
           },
-          "name": ""
+          "name": "Radiazione"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Gradi al secondo (°/s)",
+            "name-gigahertz": "Gigahertz (GHz)",
+            "name-hertz": "Hertz (Hz)",
+            "name-kilohertz": "Kilohertz (kHz)",
+            "name-megahertz": "Megahertz (MHz)",
+            "name-radians-sec": "Radianti al secondo (rad/s)",
+            "name-rpm": "Giri al minuto (rpm)"
           },
-          "name": ""
+          "name": "Velocità di rotazione"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsius (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Temperatura"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "conteggi/min (cpm)",
+            "name-counts-sec": "conteggi/sec (cps)",
+            "name-events-min": "eventi/min (epm)",
+            "name-events-sec": "eventi/sec (eps)",
+            "name-io-ops-sec": "Operazioni I/O/sec (iops)",
+            "name-messages-min": "messaggi/min (mpm)",
+            "name-messages-sec": "messaggi/sec (mps)",
+            "name-ops-min": "operazioni/min (opm)",
+            "name-ops-sec": "operazioni/sec (ops)",
+            "name-reads-min": "letture/min (rpm)",
+            "name-reads-sec": "letture/sec (rps)",
+            "name-records-min": "registrazioni/min (rpm)",
+            "name-records-sec": "registrazioni/sec (rps)",
+            "name-requests-min": "richieste/min (rpm)",
+            "name-requests-sec": "richieste/sec (rps)",
+            "name-rows-min": "righe/min (rpm)",
+            "name-rows-sec": "righe/sec (rps)",
+            "name-writes-min": "scritture/min (wpm)",
+            "name-writes-sec": "scritture/sec (wps)"
           },
-          "name": ""
+          "name": "Resa"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "clock (ms)",
+            "name-clock-s": "clock (s)",
+            "name-days": "giorni (d)",
+            "name-duration-dhms": "durata (d hh:mm:ss)",
+            "name-duration-hms": "durata (hh:mm:ss)",
+            "name-duration-ms": "durata (ms)",
+            "name-duration-s": "durata (s)",
+            "name-hertz": "Hertz (1/s)",
+            "name-hours": "ore (h)",
+            "name-microseconds": "microsecondi (µs)",
+            "name-milliseconds": "millisecondi (ms)",
+            "name-minutes": "minuti (m)",
+            "name-nanoseconds": "nanosecondi (ns)",
+            "name-seconds": "secondi (s)",
+            "name-timeticks": "Timeticks (s/100)"
           },
-          "name": ""
+          "name": "Tempo"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "chilometri/ora (km/h)",
+            "name-knot": "nodo (kn)",
+            "name-meters-second": "metri/secondo (m/s)",
+            "name-miles-hour": "miglia/ora (mph)"
           },
-          "name": ""
+          "name": "Velocità"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "decimetro cubo",
+            "name-cubic-meter": "metro cubo",
+            "name-gallons": "galloni",
+            "name-litre": "litro (L)",
+            "name-millilitre": "millilitro (mL)",
+            "name-normal-cubic-meter": "Metro cubo normale"
           },
-          "name": ""
+          "name": "Volume"
         }
       }
     }
@@ -8265,14 +8266,14 @@
   "grafana-ui": {
     "action-editor": {
       "button": {
-        "action-variables-title": "",
+        "action-variables-title": "Variabili di azione",
         "confirm": "Conferma",
         "confirm-action": "Conferma azione",
         "style": "Stile dei pulsanti",
         "variable-value-placeholder": "Valore"
       },
       "close": "Chiudi",
-      "continue": "",
+      "continue": "Continua",
       "inline": {
         "add-action": "Aggiungi azione",
         "edit-action": "Modifica azione"
@@ -8300,85 +8301,85 @@
     },
     "builder": {
       "axis": {
-        "category-axis": "",
-        "color-label": "",
+        "category-axis": "Asse",
+        "color-label": "Colore",
         "color-options": {
-          "label-series": "",
-          "label-text": ""
+          "label-series": "Serie",
+          "label-text": "Testo"
         },
         "grid-line-options": {
-          "label-auto": "",
-          "label-off": "",
-          "label-on": ""
+          "label-auto": "Automatico",
+          "label-off": "Spento",
+          "label-on": "Acceso"
         },
-        "name-centered-zero": "",
-        "name-grid-lines": "",
-        "name-label": "",
-        "name-placement": "",
-        "name-scale": "",
-        "name-show-border": "",
-        "name-soft-max": "",
-        "name-soft-min": "",
-        "name-width": "",
-        "placeholder-label": "",
-        "placeholder-soft-max": "",
-        "placeholder-soft-min": "",
-        "placeholder-width": "",
+        "name-centered-zero": "Zero centrato",
+        "name-grid-lines": "Mostra linee griglia",
+        "name-label": "Etichetta",
+        "name-placement": "Posizionamento",
+        "name-scale": "Scala",
+        "name-show-border": "Mostra bordo",
+        "name-soft-max": "Massimo flessibile",
+        "name-soft-min": "Minimo flessibile",
+        "name-width": "Larghezza",
+        "placeholder-label": "Testo facoltativo",
+        "placeholder-soft-max": "Vedi: Opzioni standard > Max",
+        "placeholder-soft-min": "Vedi: Opzioni standard > Min",
+        "placeholder-width": "Automatica",
         "scale-distribution-editor": {
           "distribution-options": {
-            "label-linear": "",
-            "label-log": "",
-            "label-symlog": ""
+            "label-linear": "Lineare",
+            "label-log": "Logaritmica",
+            "label-symlog": "Symlog"
           }
         }
       },
       "legend": {
-        "category": "",
-        "description-values": "",
+        "category": "Legenda",
+        "description-values": "Seleziona i valori o i calcoli da mostrare nella legenda",
         "mode-options": {
-          "label-list": "",
-          "label-table": ""
+          "label-list": "Elenco",
+          "label-table": "Tabella"
         },
-        "name-mode": "",
-        "name-placement": "",
-        "name-values": "",
-        "name-visibility": "",
-        "name-width": "",
+        "name-mode": "Modalità",
+        "name-placement": "Posizionamento",
+        "name-values": "Valori",
+        "name-visibility": "Visibilità",
+        "name-width": "Larghezza",
         "placement-options": {
-          "label-bottom": "",
-          "label-right": ""
+          "label-bottom": "In basso",
+          "label-right": "A destra"
         }
       },
       "stacking": {
-        "name-stack-series": ""
+        "name-stack-series": "Serie di stack"
       },
       "text": {
-        "category-text-size": "",
-        "name-percent-change": "",
-        "name-title": "",
-        "name-value": "",
-        "placeholder-percent-change": "",
-        "placeholder-title": "",
-        "placeholder-value": ""
+        "category-text-size": "Dimensione del testo",
+        "name-percent-change": "Variazione percentuale",
+        "name-title": "Titolo",
+        "name-value": "Valore",
+        "placeholder-percent-change": "Automatico",
+        "placeholder-title": "Automatico",
+        "placeholder-value": "Automatico"
       },
       "tooltip": {
-        "category": "",
-        "description-hover-proximity": "",
+        "category": "Suggerimento",
+        "description-hover-proximity": "Quanto deve essere vicino il cursore a un punto per attivare il suggerimento, in pixel",
         "modeOptions": {
-          "label-all": "",
-          "label-hidden": "",
-          "label-single": ""
+          "label-all": "Tutti",
+          "label-hidden": "Nascosto",
+          "label-single": "Singolo"
         },
-        "name-hide-zeros": "",
-        "name-hover-proximity": "",
-        "name-max-height": "",
-        "name-max-width": "",
-        "name-tooltip-mode": "",
-        "name-values-sort-order": "",
+        "name-hide-zeros": "Nascondi zeri",
+        "name-hover-proximity": "Prossimità del puntatore",
+        "name-max-height": "Altezza massima",
+        "name-max-width": "Larghezza massima",
+        "name-tooltip-mode": "Modalità suggerimento",
+        "name-values-sort-order": "Ordinamento dei valori",
         "sortOptions": {
-          "label-ascending": "",
-          "label-descending": "",
-          "label-none": ""
+          "label-ascending": "Crescente",
+          "label-descending": "Decrescente",
+          "label-none": "Nessuno"
         }
       }
     },
@@ -8386,7 +8387,7 @@
       "option": "opzione"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Apri anteprima immagine"
     },
     "cascader": {
       "clear-button": "Cancella selezione"
@@ -8400,9 +8401,9 @@
       "aria-label-selected-color": "Colore {{colorLabel}}"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Elimina",
       "cancel": "Annulla",
-      "confirmText-delete": ""
+      "confirmText-delete": "Elimina"
     },
     "confirm-content": {
       "placeholder": "Digita \"{{confirmPromptText}}\" per confermare"
@@ -8507,56 +8508,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "Aprile",
+        "label-august": "Agosto",
+        "label-december": "Dicembre",
+        "label-february": "Febbraio",
+        "label-january": "Gennaio",
+        "label-july": "Luglio",
+        "label-june": "Giugno",
+        "label-march": "Marzo",
+        "label-may": "Maggio",
+        "label-november": "Novembre",
+        "label-october": "Ottobre",
+        "label-september": "Settembre"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "L'altro ieri",
+        "last-1-hour": "Ultima ora",
+        "last-1-year": "Ultimo anno",
+        "last-12-hours": "Ultime 12 ore",
+        "last-15-mins": "Ultimi 15 minuti",
+        "last-2-days": "Ultimi 2 giorni",
+        "last-2-years": "Ultimi 2 anni",
+        "last-24-hours": "Ultime 24 ore",
+        "last-3-hours": "Ultime 3 ore",
+        "last-30-days": "Ultimi 30 giorni",
+        "last-30-mins": "Ultimi 30 minuti",
+        "last-5-mins": "Ultimi 5 minuti",
+        "last-5-years": "Ultimi 5 anni",
+        "last-6-hours": "Ultime 6 ore",
+        "last-6-months": "Ultimi 6 mesi",
+        "last-7-days": "Ultimi 7 giorni",
+        "last-90-days": "Ultimi 90 giorni",
+        "previous-fiscal-quarter": "Trimestre fiscale precedente",
+        "previous-fiscal-year": "Anno fiscale precedente",
+        "previous-month": "Mese precedente",
+        "previous-week": "Settimana precedente",
+        "previous-year": "Anno precedente",
+        "this-day-last-week": "Oggi la settimana scorsa",
+        "this-fiscal-quarter": "Questo trimestre fiscale",
+        "this-fiscal-quarter-so-far": "Questo trimestre fiscale finora",
+        "this-fiscal-year": "Questo anno fiscale",
+        "this-fiscal-year-so-far": "Questo anno fiscale finora",
+        "this-month": "Questo mese",
+        "this-month-so-far": "Questo mese finora",
+        "this-week": "Questa settimana",
+        "this-week-so-far": "Questa settimana finora",
+        "this-year": "Quest'anno",
+        "this-year-so-far": "Quest'anno finora",
+        "today": "Oggi",
+        "today-so-far": "Oggi finora",
+        "yesterday": "Ieri"
       }
     },
     "drawer": {
@@ -8598,33 +8599,33 @@
       "tooltip-expand-all": "Espandi tutte le righe"
     },
     "matchers-ui": {
-      "description-field-name-by-regex-matcher": "",
-      "description-fields-by-query": "",
-      "description-fields-with-name": "",
-      "description-fields-with-type": "",
-      "description-fields-with-value": "",
+      "description-field-name-by-regex-matcher": "Imposta le proprietà per i campi con nomi corrispondenti a un'espressione regolare",
+      "description-fields-by-query": "Imposta le proprietà per i campi da una query specifica",
+      "description-fields-with-name": "Imposta le proprietà per un campo specifico",
+      "description-fields-with-type": "Imposta le proprietà per i campi di un tipo specifico (numero, stringa, booleano)",
+      "description-fields-with-value": "Imposta le proprietà per i campi con condizione di riduzione",
       "field-name-picker": {
-        "placeholder": ""
+        "placeholder": "Seleziona campo"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Booleano",
+        "label-enum": "Enumerazione",
+        "label-number": "Numero",
+        "label-other": "Altro",
+        "label-string": "Stringa",
+        "label-time": "Tempo",
+        "label-traces": "Tracce"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Fotogrammi ({{framesCount}}): {{framesNames}}",
+        "label": "Query: {{refId}}",
+        "label-missing-ref-id": "Query: (refId mancante)"
       },
-      "name-field-name-by-regex-matcher": "",
-      "name-fields-by-query": "",
-      "name-fields-with-name": "",
-      "name-fields-with-type": "",
-      "name-fields-with-value": ""
+      "name-field-name-by-regex-matcher": "Campi con nome corrispondente all'espressione regolare",
+      "name-fields-by-query": "Campi restituiti dalla query",
+      "name-fields-with-name": "Campi con nome",
+      "name-fields-with-type": "Campi con tipo",
+      "name-fields-with-value": "Campi con valori"
     },
     "menu-item": {
       "keyboard-shortcut-label": "Tasti di scelta rapida"
@@ -8652,8 +8653,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "attiva/disattiva il pannello di riduzione",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Barra di caricamento del pannello",
+      "ariaLabel-panel-status": "Stato del pannello",
       "tooltip-cancel": "Annulla query",
       "tooltip-cancel-loading": "Annulla query",
       "tooltip-stop-streaming": "Interrompi streaming",
@@ -8722,12 +8723,12 @@
       "inspect-drawer-title": "Ispeziona valore",
       "inspect-menu-label": "Ispeziona valore",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Nessun dato"
       },
       "no-values-label": "Nessun valore",
       "pagination-summary": "{{itemsRangeStart}} - {{displayedEnd}} di {{numRows}} righe",
       "sparkline": {
-        "no-data": ""
+        "no-data": "nessun dato disponibile"
       }
     },
     "tags": {
@@ -8735,7 +8736,7 @@
     },
     "tags-input": {
       "add": "Aggiungi",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Nuovo tag (inserisci chiave da aggiungere)",
       "remove": "Rimuovi tag: {{name}}"
     },
     "time-sync-button": {
@@ -8752,55 +8753,55 @@
       "config": {
         "get-graph-field-options": {
           "axis-placement": {
-            "description-auto": "",
-            "label-auto": "",
-            "label-hidden": "",
-            "label-left": "",
-            "label-right": ""
+            "description-auto": "Primo campo a sinistra, tutto il resto a destra",
+            "label-auto": "Automatico",
+            "label-hidden": "Nascosto",
+            "label-left": "A sinistra",
+            "label-right": "A destra"
           },
           "bar-alignment": {
-            "description-after": "",
-            "description-before": "",
-            "description-center": ""
+            "description-after": "Dopo",
+            "description-before": "Prima",
+            "description-center": "Centrale"
           },
           "draw-style": {
-            "label-bars": "",
-            "label-lines": "",
-            "label-points": ""
+            "label-bars": "Barre",
+            "label-lines": "Linee",
+            "label-points": "Punti"
           },
           "fill-gradient": {
-            "description-hue": "",
-            "description-opacity": "",
-            "description-scheme": "",
-            "label-hue": "",
-            "label-none": "",
-            "label-opacity": "",
-            "label-scheme": ""
+            "description-hue": "Piccola sfumatura di colore",
+            "description-opacity": "Abilita sfumatura opacità di riempimento",
+            "description-scheme": "Usa la combinazione di colori per definire la sfumatura",
+            "label-hue": "Tonalità",
+            "label-none": "Nessuna",
+            "label-opacity": "Opacità",
+            "label-scheme": "Schema"
           },
           "line-interpolation": {
-            "description-linear": "",
-            "description-smooth": "",
-            "description-step-after": "",
-            "description-step-before": ""
+            "description-linear": "Lineare",
+            "description-smooth": "Fluida",
+            "description-step-after": "Passaggio dopo",
+            "description-step-before": "Passaggio prima"
           },
           "show-points": {
-            "description-auto": "",
-            "label-always": "",
-            "label-auto": "",
-            "label-never": ""
+            "description-auto": "Mostra i punti quando la densità è bassa",
+            "label-always": "Sempre",
+            "label-auto": "Automatico",
+            "label-never": "Mai"
           },
           "stacking": {
-            "label-100": "",
-            "label-normal": "",
-            "label-off": ""
+            "label-100": "100%",
+            "label-normal": "Normale",
+            "label-off": "Spento"
           },
           "thresholds-display-mode": {
-            "label-dashed-lines": "",
-            "label-filled-regions": "",
-            "label-filled-regions-and-dashed-lines": "",
-            "label-filled-regions-and-lines": "",
-            "label-lines": "",
-            "label-off": ""
+            "label-dashed-lines": "Come linee (tratteggiate)",
+            "label-filled-regions": "Come regioni riempite",
+            "label-filled-regions-and-dashed-lines": "Come regioni riempite e linee (tratteggiate)",
+            "label-filled-regions-and-lines": "Come regioni riempite e linee",
+            "label-lines": "Come linee",
+            "label-off": "Spento"
           }
         }
       }
@@ -8828,14 +8829,14 @@
       "footer-add-annotation": "Aggiungi annotazione",
       "footer-click-to-action": "Fai clic per {{actionTitle}}",
       "footer-click-to-navigate": "Fai clic per aprire {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Filtra per \"{{value}}\"",
       "timestamp": "Indicazione data/ora"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Predefinito",
+      "weekStarts-label-monday": "Lunedì",
+      "weekStarts-label-saturday": "Sabato",
+      "weekStarts-label-sunday": "Domenica"
     }
   },
   "graph": {
@@ -8848,78 +8849,78 @@
   },
   "heatmap": {
     "calculate-from-data-options": {
-      "label-no": "",
-      "label-yes": ""
+      "label-no": "No",
+      "label-yes": "Sì"
     },
-    "category-cell-display": "",
-    "category-colors": "",
-    "category-exemplars": "",
-    "category-heatmap": "",
-    "category-legend": "",
-    "category-tooltip": "",
-    "category-y-axis": "",
+    "category-cell-display": "Visualizzazione cella",
+    "category-colors": "Colori",
+    "category-exemplars": "Esempi",
+    "category-heatmap": "Mappa di calore",
+    "category-legend": "Legenda",
+    "category-tooltip": "Suggerimento",
+    "category-y-axis": "Asse Y",
     "mode-options": {
-      "label-opacity": "",
-      "label-scheme": ""
+      "label-opacity": "Opacità",
+      "label-scheme": "Schema"
     },
-    "name-axis-label": "",
-    "name-axis-width": "",
-    "name-calculate-from-data": "",
-    "name-cell-gap": "",
-    "name-color": "",
-    "name-decimals": "",
-    "name-end-color-at-value": "",
-    "name-exponent": "",
-    "name-hide-cells-gt": "",
-    "name-hide-cells-lt": "",
-    "name-max-height": "",
-    "name-max-value": "",
-    "name-max-width": "",
-    "name-min-value": "",
-    "name-mode": "",
-    "name-placement": "",
-    "name-reverse": "",
-    "name-scale": "",
-    "name-scheme": "",
-    "name-show-color-scale": "",
-    "name-show-histogram": "",
-    "name-show-legend": "",
-    "name-start-color-from-value": "",
-    "name-steps": "",
-    "name-tick-alignment": "",
-    "name-tooltip-mode": "",
-    "name-unit": "",
-    "name-value-name": "",
-    "name-y-axis-scale": "",
-    "placeholder-axis-label": "",
-    "placeholder-axis-width": "",
-    "placeholder-decimals": "",
-    "placeholder-end-color-at-value": "",
-    "placeholder-hide-cells-gt": "",
-    "placeholder-hide-cells-lt": "",
-    "placeholder-max-value": "",
-    "placeholder-min-value": "",
-    "placeholder-start-color-from-value": "",
-    "placeholder-value-name": "",
+    "name-axis-label": "Etichetta asse",
+    "name-axis-width": "Larghezza asse",
+    "name-calculate-from-data": "Calcola dai dati",
+    "name-cell-gap": "Spazio tra le celle",
+    "name-color": "Colore",
+    "name-decimals": "Decimali",
+    "name-end-color-at-value": "Termina scala di colori al valore",
+    "name-exponent": "Esponente",
+    "name-hide-cells-gt": "Nascondi celle con valori >=",
+    "name-hide-cells-lt": "Nascondi celle con valori <=",
+    "name-max-height": "Altezza massima",
+    "name-max-value": "Valore massimo",
+    "name-max-width": "Larghezza massima",
+    "name-min-value": "Valore minimo",
+    "name-mode": "Modalità",
+    "name-placement": "Posizionamento",
+    "name-reverse": "Inverti",
+    "name-scale": "Scala",
+    "name-scheme": "Schema",
+    "name-show-color-scale": "Mostra scala di colori",
+    "name-show-histogram": "Mostra istogramma (asse Y)",
+    "name-show-legend": "Mostra legenda",
+    "name-start-color-from-value": "Inizia scala di colori dal valore",
+    "name-steps": "Passaggi",
+    "name-tick-alignment": "Allineamento spunta",
+    "name-tooltip-mode": "Modalità suggerimento",
+    "name-unit": "Unità",
+    "name-value-name": "Nome del valore",
+    "name-y-axis-scale": "Scala asse Y",
+    "placeholder-axis-label": "Automatico",
+    "placeholder-axis-width": "Automatico",
+    "placeholder-decimals": "Automatico",
+    "placeholder-end-color-at-value": "Automatico (max)",
+    "placeholder-hide-cells-gt": "Nessuno",
+    "placeholder-hide-cells-lt": "Nessuno",
+    "placeholder-max-value": "Automatico",
+    "placeholder-min-value": "Automatico",
+    "placeholder-start-color-from-value": "Automatico (min)",
+    "placeholder-value-name": "Valore",
     "placement-options": {
-      "label-hidden": "",
-      "label-left": "",
-      "label-right": ""
+      "label-hidden": "Nascosto",
+      "label-left": "A sinistra",
+      "label-right": "A destra"
     },
     "scale-options": {
-      "label-exponential": "",
-      "label-linear": ""
+      "label-exponential": "Esponenziale",
+      "label-linear": "Lineare"
     },
     "tick-alignment-options": {
-      "label-auto": "",
-      "label-bottom": "",
-      "label-middle": "",
-      "label-top": ""
+      "label-auto": "Automatico",
+      "label-bottom": "In basso (GE)",
+      "label-middle": "Centrale",
+      "label-top": "In alto (LE)"
     },
     "tooltip-mode-options": {
-      "label-all": "",
-      "label-hidden": "",
-      "label-single": ""
+      "label-all": "Tutti",
+      "label-hidden": "Nascosto",
+      "label-single": "Singolo"
     }
   },
   "help-modal": {
@@ -8941,18 +8942,18 @@
       "duplicate-panel": "Duplica pannello",
       "exit-edit/setting-views": "Esci dalle viste di modifica/impostazione",
       "expand-all-rows": "Espandi tutte le righe",
-      "explore-panel": "",
+      "explore-panel": "Esplora pannello",
       "go-to-dashboards": "Vai ai dashboard",
       "go-to-explore": "Vai a Esplora",
       "go-to-home-dashboard": "Vai al dashboard principale",
       "go-to-profile": "Vai al profilo",
-      "inspect-panel": "",
+      "inspect-panel": "Ispeziona pannello",
       "make-time-range-permanent": "Rendi l'intervallo di tempo assoluto/permanente",
       "move-time-range-back": "Sposta indietro l'intervallo di tempo",
       "move-time-range-forward": "Sposta avanti l'intervallo di tempo",
       "open-search": "Apri ricerca",
-      "open-share-embed-drawer": "",
-      "open-share-link-drawer": "",
+      "open-share-embed-drawer": "Condividi incorporamento pannello",
+      "open-share-link-drawer": "Condividi link pannello",
       "open-shared-modal": "Condividi snapshot del pannello",
       "paste-time-range": "Incolla intervallo di tempo",
       "refresh-all-panels": "Aggiorna tutti i pannelli",
@@ -8979,14 +8980,14 @@
     "troubleshooting-help": "Per richiedere assistenza con la risoluzione dei problemi, invia un'istantanea di questo pannello al supporto tecnico di Grafana Labs. L'istantanea contiene i dati di risposta alla query e le impostazioni del pannello."
   },
   "histogram": {
-    "category-histogram": "",
+    "category-histogram": "Istogramma",
     "histogram-panel": {
-      "no-histogram-found-in-response": ""
+      "no-histogram-found-in-response": "Nessun istogramma trovato in risposta"
     },
-    "name-fill-opacity": "",
-    "name-gradient-mode": "",
-    "name-line-width": "",
-    "name-stacking": ""
+    "name-fill-opacity": "Opacità del riempimento",
+    "name-gradient-mode": "Modalità gradiente",
+    "name-line-width": "Larghezza linea",
+    "name-stacking": "Impilabile"
   },
   "inspector": {
     "inspect-data-tab": {
@@ -9038,7 +9039,7 @@
       "label-password": "Password",
       "label-username": "Nome utente",
       "message": {
-        "email-is-invalid": ""
+        "email-is-invalid": "L'e-mail non è valida"
       },
       "placeholder-name-optional": "Nome (opzionale)",
       "placeholder-password": "Password",
@@ -9215,8 +9216,8 @@
       "title-create-library-panel": "Crea pannello della libreria"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Modifica",
+      "confirmText-replace": "Sostituisci"
     },
     "confirm": {
       "delete-panel": "Desideri eliminare questo pannello?"
@@ -9241,7 +9242,7 @@
       "usage-count_other": "Utilizzato su {{count}} dashboard"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Cerca per nome, descrizione o nome della cartella"
     },
     "loading-indicator": {
       "loading-library-panel": "Caricamento del pannello della libreria in corso..."
@@ -9302,25 +9303,25 @@
       "title-dashboard-changed": "Dashboard modificata"
     },
     "live-channel-editor": {
-      "description-grafana-live": "",
+      "description-grafana-live": "Supporta flussi di eventi in tempo reale nel core di Grafana. Questa funzionalità è in fase di sviluppo avanzato. Le interfacce e le strutture potrebbero cambiare man mano che aumenta il livello di preparazione alla produzione.",
       "namespace": "Namespace",
       "path": "Percorso",
-      "placeholder-select-watchable-resource": "",
-      "scope": "",
-      "title-grafana-live": ""
+      "placeholder-select-watchable-resource": "Seleziona risorsa visualizzabile",
+      "scope": "Ambito",
+      "title-grafana-live": "Grafana Live"
     },
     "live-connection-warning": {
       "title-connection-to-server-is-lost": "Connessione al server persa..."
     },
     "live-panel": {
       "error": "Errore",
-      "grafana-requires-feature": "",
-      "panel-editor-channel": "",
-      "title-grafana-live": "",
-      "waiting-for-data": ""
+      "grafana-requires-feature": "Grafana Live richiede un contrassegno di funzionalità per essere eseguito",
+      "panel-editor-channel": "Usa l'editor del pannello per scegliere un canale",
+      "title-grafana-live": "Grafana Live",
+      "waiting-for-data": "In attesa di dati:"
     },
     "live-publish": {
-      "publish": ""
+      "publish": "Pubblica"
     }
   },
   "lock-icon": "icona lucchetto",
@@ -9367,16 +9368,16 @@
     }
   },
   "logs": {
-    "category-logs": "",
+    "category-logs": "Registri",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Esatto",
+      "label-none": "Nessuno",
+      "label-numbers": "Numeri",
+      "label-signature": "Firma"
     },
-    "description-enable-infinite-scrolling": "",
-    "description-enable-syntax-highlighting": "",
-    "description-show-controls": "",
+    "description-enable-infinite-scrolling": "Sperimentale. Richiedi più risultati scorrendo fino alla fine dell'elenco dei registri.",
+    "description-enable-syntax-highlighting": "Utilizza una grammatica di colorazione della sintassi predefinita per evidenziare le parti rilevanti delle righe del registro",
+    "description-show-controls": "Visualizza i controlli per passare all'ultima o alla prima riga del registro e filtra per livello di registro",
     "fields": {
       "type": {
         "loki": {
@@ -9390,8 +9391,8 @@
       }
     },
     "font-size-options": {
-      "label-default": "",
-      "label-small": ""
+      "label-default": "Predefinito",
+      "label-small": "Piccolo"
     },
     "get-dataframe-fields": {
       "vars": {
@@ -9447,64 +9448,64 @@
       "title-log-line": ""
     },
     "log-line-details": {
-      "clear-search": "",
-      "close": "",
-      "copy-shortlink": "",
-      "copy-to-clipboard": "",
-      "displayed-fields-section": "",
+      "clear-search": "Cancella",
+      "close": "Chiudi i dettagli del registro",
+      "copy-shortlink": "Copia shortlink",
+      "copy-to-clipboard": "Copia negli appunti",
+      "displayed-fields-section": "Organizza i campi visualizzati",
       "fields": {
-        "adhoc-statistics": "",
-        "copy-value-to-clipboard": "",
-        "filter-out": "",
-        "filter-out-query": "",
+        "adhoc-statistics": "Statistiche ad hoc",
+        "copy-value-to-clipboard": "Copia valore negli appunti",
+        "filter-out": "Escludi valore",
+        "filter-out-query": "Escludi valore nella query {{query}}",
         "toggle-field-button": {
-          "field-instead-message": "",
-          "hide-this-field": ""
+          "field-instead-message": "Mostra questo campo invece del messaggio",
+          "hide-this-field": "Nascondi questo campo"
         }
       },
-      "fields-section": "",
-      "hide-log-line": "",
-      "inline-mode": "",
-      "links-section": "",
-      "log-line-field": "",
-      "log-line-section": "",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
-      "no-details": "",
-      "open-assistant": "",
-      "pin-line": "",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "fields-section": "Campi",
+      "hide-log-line": "Nascondi riga registro",
+      "inline-mode": "Visualizza in linea",
+      "links-section": "Collegamenti",
+      "log-line-field": "Riga registro",
+      "log-line-section": "Riga registro",
+      "move-displayed-field-down": "Sposta in basso",
+      "move-displayed-field-up": "Sposta in alto",
+      "no-details": "Nessun campo da visualizzare.",
+      "open-assistant": "Spiega questa riga di registro in Assistant",
+      "pin-line": "Fissa registro",
+      "remove-displayed-field": "Rimuovi campo",
+      "remove-log": "Rimuovi registro",
+      "scroll-to-logline": "Scorri fino alla riga del registro",
       "search": {
-        "no-results": ""
+        "no-results": "Nessun risultato da visualizzare."
       },
-      "search-placeholder": "",
-      "show-context": "",
-      "show-log-line": "",
-      "sidebar-mode": "",
-      "unpin-line": ""
+      "search-placeholder": "Cerca nomi e valori dei campi",
+      "show-context": "Mostra contesto",
+      "show-log-line": "Mostra riga registro",
+      "sidebar-mode": "Ancoraggio a destra",
+      "unpin-line": "Sblocca registro"
     },
     "log-line-menu": {
       "copy-link": "Copia il link alla riga del registro",
       "copy-log": "Copia la riga del registro",
       "hide-details": "Mostra i dettagli del registro",
       "icon-label": "Menu registro",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Riga registro",
+      "log-line-explainer": "Spiega questa riga di registro in modo conciso",
+      "open-assistant": "Spiega questa riga di registro in Assistant",
       "pin-to-outline": "Fissa registro",
       "show-context": "Mostra contesto",
       "show-details": "Nascondi i dettagli del registro",
       "unpin-from-outline": "Sblocca registro"
     },
     "log-list-search": {
-      "close": "",
-      "filter": "",
-      "info": "",
-      "input-placeholder": "",
-      "next": "",
-      "prev": ""
+      "close": "Chiudi ricerca",
+      "filter": "Filtra i registri corrispondenti",
+      "info": "Ricerca lato client di stringhe all'interno dei registri visualizzati. Da non confondere con i filtri di query. Utilizza questo componente per cercare stringhe specifiche nei risultati del registro.",
+      "input-placeholder": "Cerca nei registri",
+      "next": "Risultato successivo",
+      "prev": "Risultato precedente"
     },
     "log-row-context-modal": {
       "error-loading-log-more-logs": "Errore durante il caricamento di altri registri.",
@@ -9540,7 +9541,7 @@
     },
     "log-series-to-logs-model": {
       "label": {
-        "total-bytes-processed": ""
+        "total-bytes-processed": "Byte totali elaborati"
       }
     },
     "logs": {
@@ -9563,9 +9564,9 @@
       },
       "enable-highlighting": "Abilita evidenziazione",
       "escape-newlines": "Correggi le sequenze di nuove righe e tabulazioni non corrette nelle righe del registro",
-      "font-size-default": "",
-      "font-size-small": "",
-      "hide-search": "",
+      "font-size-default": "Usa dimensione carattere piccola",
+      "font-size-small": "Usa dimensione carattere predefinita",
+      "hide-search": "Chiudi ricerca",
       "hide-timestamps": "Nascondi marca temporale",
       "hide-unique-labels": "Nascondi etichette univoche",
       "newest-first": "Ordine: prima i registri più recenti – Fai clic per mostrare prima i meno recenti",
@@ -9578,7 +9579,7 @@
       "scroll-top": "Scorri verso l'alto",
       "show-ms-timestamps": "",
       "show-ns-timestamps": "",
-      "show-search": "",
+      "show-search": "Cerca nel risultato dei registri",
       "show-timestamps": "Mostra marca temporale",
       "show-unique-labels": "Mostra etichette univoche",
       "unwrap-lines": "Rimuovi a capo",
@@ -9593,29 +9594,29 @@
     },
     "logs-panel": {
       "render-common-labels": {
-        "common-labels": ""
+        "common-labels": "Etichette comuni:"
       }
     },
-    "name-common-labels": "",
-    "name-deduplication": "",
-    "name-details-mode": "",
+    "name-common-labels": "Etichette comuni",
+    "name-deduplication": "Deduplicazione",
+    "name-details-mode": "Modalità pannello Dettagli registro",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "In linea",
+      "label-sidebar": "Barra laterale"
     },
-    "name-enable-infinite-scrolling": "",
-    "name-enable-log-details": "",
-    "name-enable-syntax-highlighting": "",
-    "name-font-size": "",
-    "name-order": "",
-    "name-prettify-json": "",
-    "name-show-controls": "",
+    "name-enable-infinite-scrolling": "Abilita lo scorrimento infinito",
+    "name-enable-log-details": "Abilita i dettagli del registro",
+    "name-enable-syntax-highlighting": "Attiva l'evidenziazione della sintassi",
+    "name-font-size": "Dimensione carattere",
+    "name-order": "Ordina",
+    "name-prettify-json": "Migliora JSON",
+    "name-show-controls": "Mostra controlli",
     "name-time": "",
-    "name-unique-labels": "",
-    "name-wrap-lines": "",
+    "name-unique-labels": "Etichette univoche",
+    "name-wrap-lines": "A capo",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Prima il più recente",
+      "label-oldest-first": "Prima il meno recente"
     },
     "out-of-range-message": {
       "end-of-the-selected-time-range": "Fine dell'intervallo di tempo selezionato."
@@ -9630,7 +9631,7 @@
     "un-themed-log-details": {
       "aria-label-data-links": "Collegamenti dati",
       "aria-label-fields": "Campi",
-      "aria-label-line": "",
+      "aria-label-line": "Riga registro",
       "aria-label-log-level": "Livello registro",
       "aria-label-no-details": "Nessun dettaglio"
     },
@@ -9651,27 +9652,27 @@
     }
   },
   "logs-new": {
-    "category-logs": "",
+    "category-logs": "Registri",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Esatto",
+      "label-none": "Nessuno",
+      "label-numbers": "Numeri",
+      "label-signature": "Firma"
     },
-    "description-infinite-scrolling": "",
-    "description-show-controls": "",
-    "description-syntax-highlighting": "",
-    "name-deduplication": "",
-    "name-enable-log-details": "",
-    "name-infinite-scrolling": "",
-    "name-order": "",
-    "name-show-controls": "",
-    "name-syntax-highlighting": "",
-    "name-time": "",
-    "name-wrap-lines": "",
+    "description-infinite-scrolling": "Sperimentale. Richiedi più risultati scorrendo fino alla fine dell'elenco dei registri.",
+    "description-show-controls": "Visualizza i controlli per passare all'ultima o alla prima riga del registro e filtra per livello di registro",
+    "description-syntax-highlighting": "Utilizza una grammatica di colorazione della sintassi predefinita per evidenziare le parti rilevanti delle righe del registro",
+    "name-deduplication": "Deduplicazione",
+    "name-enable-log-details": "Abilita i dettagli del registro",
+    "name-infinite-scrolling": "Abilita lo scorrimento infinito",
+    "name-order": "Ordina",
+    "name-show-controls": "Mostra controlli",
+    "name-syntax-highlighting": "Attiva l'evidenziazione della sintassi",
+    "name-time": "Tempo",
+    "name-wrap-lines": "A capo",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Prima il più recente",
+      "label-oldest-first": "Prima il meno recente"
     }
   },
   "manage-dashbaords": {
@@ -9698,27 +9699,27 @@
       "updated-on": "Aggiornato il"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Vuoi davvero eliminare \"{{snapshotToRemove}}\"?",
+      "confirmText-delete": "Elimina",
       "title-delete": "Elimina"
     },
     "unthemed-dashboard-import": {
       "subTitle": {
-        "import-dashboard-from-file-or-grafanacom": ""
+        "import-dashboard-from-file-or-grafanacom": "Importa dashboard da file o Grafana.com"
       },
       "text": {
         "import-dashboard": "Importa dashboard"
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "Il nome è obbligatorio",
+      "message-reserved-name": "Questo è un nome riservato e non può essere utilizzato per una cartella.",
+      "message-same-name": "Esiste già una dashboard o una cartella con lo stesso nome",
+      "message-same-name-general": "Esiste già una cartella o una dashboard nella cartella generale con lo stesso nome"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Nessuna opzione trovata"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9868,8 +9869,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Numero massimo di gruppi di regole di avviso raggiunto: elimina alcuni gruppi di regole di avviso o aggiorna il tuo piano e riprova.",
+        "alert-rules-quota-reached": "Numero massimo di regole di avviso raggiunto: elimina alcune regole di avviso o aggiorna il tuo piano e riprova.",
         "dashboard-already-managed": "Il dashboard è già stato predisposto e viene gestito da Grafana nell'istanza cloud. In futuro, ti consigliamo di utilizzare il dashboard con provisioning. Se desideri comunque copiare il dashboard nell'istanza cloud, modifica l'ID del dashboard nel JSON del dashboard, salva una nuova istantanea e carica di nuovo.",
         "datasource-already-managed": "L'origine dati è già stata predisposta e viene gestita da Grafana nell'istanza cloud. Se si tratta di una risorsa diversa, imposta un altro UID e riprova.",
         "datasource-invalid-url": "È presente un'origine dati con un URL non valido. Fornisci un URL valido e riprova.",
@@ -10270,7 +10271,7 @@
       "title": "Account di servizio"
     },
     "setup-guide": {
-      "title": ""
+      "title": "Guida introduttiva"
     },
     "shared-dashboard": {
       "subtitle": "Gestisci i dashboard condivisi esternamente della tua organizzazione",
@@ -10339,7 +10340,7 @@
     "invite-user": {
       "invite-button": "Invito",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Invita utente"
     },
     "item": {
       "add-bookmark": "Aggiungi a Segnalibri",
@@ -10371,67 +10372,67 @@
     "rss-button": "Ultime dal blog"
   },
   "news": {
-    "category-news": "",
-    "description-show-image": "",
-    "description-url": "",
+    "category-news": "Notizie",
+    "description-show-image": "Controlla se l'immagine social (og:image) dell'elemento notizie viene mostrata sopra il contenuto del testo",
+    "description-url": "Supporta feed RSS e Atom",
     "link-title": "Vai al blog di Grafana Labs",
-    "name-show-image": "",
-    "name-url": "",
+    "name-show-image": "Mostra immagine",
+    "name-url": "URL",
     "news-panel": {
-      "body-error-loading-rss-feed": "",
+      "body-error-loading-rss-feed": "Assicurati che l'URL del feed sia corretto e che CORS sia configurato correttamente sul server. Consulta la <2>Documentazione del pannello Notizie.</2>",
       "loading": "Caricamento in corso...",
-      "title-error-loading-rss-feed": ""
+      "title-error-loading-rss-feed": "Errore durante il caricamento del feed RSS"
     },
     "title": "Ultime dal blog"
   },
   "node-graph": {
-    "category-edges": "",
-    "category-node-graph": "",
-    "category-nodes": "",
+    "category-edges": "Bordi",
+    "category-node-graph": "Grafico dei nodi",
+    "category-nodes": "Nodi",
     "layout-algorithm-options": {
-      "description-force": "",
-      "description-grid": "",
-      "description-layered": "",
-      "label-force": "",
-      "label-grid": "",
-      "label-layered": ""
+      "description-force": "Usa un layout diretto dalla forza",
+      "description-grid": "Usa un layout a griglia",
+      "description-layered": "Usa un layout a livelli",
+      "label-force": "Forza",
+      "label-grid": "Griglia",
+      "label-layered": "A livelli"
     },
-    "name-arc-sections": "",
-    "name-layout-algorithm": "",
-    "name-main-stat-unit": "",
-    "name-secondary-stat-unit": "",
-    "name-zoom-mode": "",
+    "name-arc-sections": "Sezioni ad arco",
+    "name-layout-algorithm": "Algoritmo di layout",
+    "name-main-stat-unit": "Unità statistica principale",
+    "name-secondary-stat-unit": "Unità statistica secondaria",
+    "name-zoom-mode": "Modalità zoom",
     "zoom-mode-options": {
-      "description-cooperative": "",
-      "description-greedy": "",
-      "label-cooperative": "",
-      "label-greedy": ""
+      "description-cooperative": "Consente di scorrere la pagina normalmente",
+      "description-greedy": "Reagisce a tutti i gesti di zoom",
+      "label-cooperative": "Cooperativo",
+      "label-greedy": "Greedy"
     }
   },
   "nodeGraph": {
     "arc-options-editor": {
-      "add-arc": "",
-      "title-remove-arc": ""
+      "add-arc": "Aggiungi arco",
+      "title-remove-arc": "Rimuovi arco"
     },
     "edge": {
-      "aria-label-from-to": ""
+      "aria-label-from-to": "Bordo da: {{from}} a: {{to}}"
     },
     "edge-header": {
-      "label-source-target": ""
+      "label-source-target": "Origine → Destinazione"
     },
     "marker": {
-      "100-node-count": "",
-      "aria-label-hidden-marker": "",
+      "100-node-count": ">100 nodi",
+      "aria-label-hidden-marker": "Marcatore di nodi nascosti: {{marker}}",
       "node-count_one": "{{count}} nodi",
       "node-count_other": "{{count}} nodi"
     },
     "node": {
-      "aria-label-node-title": ""
+      "aria-label-node-title": "Nodo: {{nodeName}}"
     },
     "node-graph": {
-      "aria-label-layered-layout-performance-warning": "",
-      "aria-label-nodes-hidden-warning": "",
-      "computing-layout": "",
+      "aria-label-layered-layout-performance-warning": "Avviso sulle prestazioni del layout a livelli",
+      "aria-label-nodes-hidden-warning": "Avviso nodi nascosti",
+      "computing-layout": "Layout di calcolo",
       "no-data": "Nessun dato",
       "hidden-nodes_one": "<0></0> {{count}} nodi sono nascosti per motivi di prestazioni.",
       "hidden-nodes_other": "<0></0> {{count}} nodi sono nascosti per motivi di prestazioni.",
@@ -10439,17 +10440,17 @@
       "processed-nodes_other": "<0></0> Il layout a livelli potrebbe essere lento con {{count}} nodi."
     },
     "node-graph-panel": {
-      "no-data-found-in-response": ""
+      "no-data-found-in-response": "Nessun dato trovato in risposta"
     },
     "node-header": {
-      "label-subtitle": "",
+      "label-subtitle": "Sottotitolo",
       "label-title": "Titolo"
     },
     "view-controls": {
-      "hide-config": "",
-      "show-config": "",
-      "title-zoom-in": "",
-      "title-zoom-out": ""
+      "hide-config": "Nascondi configurazione",
+      "show-config": "Mostra configurazione",
+      "title-zoom-in": "Ingrandisci",
+      "title-zoom-out": "Rimpicciolisci"
     }
   },
   "notifications": {
@@ -10484,40 +10485,40 @@
     },
     "registry": {
       "get-all-option-editors": {
-        "description-time-zone": "",
-        "name-time-zone": ""
+        "description-time-zone": "Selezione del fuso orario",
+        "name-time-zone": "Fuso orario"
       },
       "standard-field-condigs": {
-        "category-data-links": ""
+        "category-data-links": "Collegamenti dati e azioni"
       },
       "standard-field-configs": {
-        "category": "",
-        "category-thresholds": "",
-        "category-value-mappings": "",
-        "description-display-name": "",
-        "description-field-min-max": "",
-        "description-max": "",
-        "description-min": "",
-        "description-no-value": "",
-        "description-value-mappings": "",
-        "name-actions": "",
-        "name-ad-hoc": "",
-        "name-color-scheme": "",
-        "name-data-links": "",
-        "name-decimals": "",
-        "name-display-name": "",
-        "name-field-min-max": "",
-        "name-max": "",
-        "name-min": "",
-        "name-no-value": "",
-        "name-thresholds": "",
-        "name-unit": "",
-        "name-value-mappings": "",
-        "placeholder-decimals": "",
-        "placeholder-display-name": "",
-        "placeholder-max": "",
-        "placeholder-min": "",
-        "placeholder-unit": ""
+        "category": "Opzioni standard",
+        "category-thresholds": "Soglie",
+        "category-value-mappings": "Mappature di valori",
+        "description-display-name": "Modifica il nome del campo o della serie",
+        "description-field-min-max": "Calcola min e max per campo",
+        "description-max": "Lascia vuoto per calcolare in base a tutti i valori",
+        "description-min": "Lascia vuoto per calcolare in base a tutti i valori",
+        "description-no-value": "Cosa mostrare quando non è presente un valore",
+        "description-value-mappings": "Modifica il testo visualizzato in base al valore inserito",
+        "name-actions": "Azioni",
+        "name-ad-hoc": "Filtrabile ad hoc",
+        "name-color-scheme": "Schema colori",
+        "name-data-links": "Collegamenti dati",
+        "name-decimals": "Decimali",
+        "name-display-name": "Visualizza nome",
+        "name-field-min-max": "Campo min/max",
+        "name-max": "Max",
+        "name-min": "Min",
+        "name-no-value": "Nessun valore",
+        "name-thresholds": "Soglie",
+        "name-unit": "Unità",
+        "name-value-mappings": "Mappature di valori",
+        "placeholder-decimals": "automatico",
+        "placeholder-display-name": "nessuno",
+        "placeholder-max": "automatico",
+        "placeholder-min": "automatico",
+        "placeholder-unit": "nessuno"
       }
     },
     "units": {
@@ -10533,7 +10534,7 @@
     },
     "org-details-page": {
       "title": {
-        "confirm-preferences-update": ""
+        "confirm-preferences-update": "Conferma aggiornamento preferenze"
       }
     },
     "org-profile": {
@@ -10557,12 +10558,12 @@
     "user-invite-page": {
       "sub-title": "Invia un invito o aggiungi un utente Grafana esistente all'organizzazione.<1> {{orgName}}</1>",
       "text": {
-        "invite-user": ""
+        "invite-user": "Invita un utente"
       }
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Nessuna organizzazione trovata",
     "select-placeholder": "Seleziona organizzazione"
   },
   "page": {
@@ -10574,7 +10575,7 @@
     "get-calculation-value-data-links-variable-suggestions": {
       "value-calc-var": {
         "label": {
-          "calculation-name": ""
+          "calculation-name": "Nome calcolo"
         }
       }
     },
@@ -10589,7 +10590,7 @@
       "text": {
         "data": "Data",
         "field": "Campo",
-        "series": "",
+        "series": "Serie",
         "value": "Valore"
       }
     },
@@ -10600,7 +10601,7 @@
     },
     "get-panel-links-variable-suggestions": {
       "label": {
-        "all-variables": ""
+        "all-variables": "Tutte le variabili"
       }
     },
     "header-menu": {
@@ -10626,13 +10627,13 @@
     },
     "panel-data-error-view": {
       "missing-value": {
-        "number": "",
-        "string": "",
-        "time": "",
-        "unknown": ""
+        "number": "Nei dati manca un campo numerico",
+        "string": "Nei dati manca un campo stringa",
+        "time": "Nei dati manca un campo temporale",
+        "unknown": "Impossibile visualizzare i dati"
       },
       "no-value": {
-        "default": ""
+        "default": "Nessun dato"
       },
       "open-visualization-suggestions": "Apri suggerimenti di visualizzazione",
       "switch-to-table": "Passa alla tabella"
@@ -10672,25 +10673,25 @@
     "select-placeholder": "Filtra per tipo"
   },
   "piechart": {
-    "category-legend": "",
-    "category-pie-chart": "",
-    "description-labels": "",
-    "description-pie-chart-type": "",
+    "category-legend": "Legenda",
+    "category-pie-chart": "Grafico a torta",
+    "description-labels": "Seleziona le etichette da visualizzare nel grafico a torta",
+    "description-pie-chart-type": "Come deve essere eseguito il rendering del grafico a torta",
     "labels-options": {
-      "label-name": "",
-      "label-percent": "",
-      "label-value": ""
+      "label-name": "Nome",
+      "label-percent": "Percentuale",
+      "label-value": "Valore"
     },
     "legend-values-options": {
-      "label-percent": "",
-      "label-value": ""
+      "label-percent": "Percentuale",
+      "label-value": "Valore"
     },
-    "name-labels": "",
-    "name-legend-values": "",
-    "name-pie-chart-type": "",
+    "name-labels": "Etichette",
+    "name-legend-values": "Valori legenda",
+    "name-pie-chart-type": "Tipo di grafico a torta",
     "pie-chart-type-options": {
-      "label-donut": "",
-      "label-pie": ""
+      "label-donut": "A ciambella",
+      "label-pie": "A torta"
     }
   },
   "playlist": {
@@ -10785,7 +10786,7 @@
         "permission": "Non disponi dell'autorizzazione per visualizzare questa pagina.",
         "title-access-denied": "Accesso negato"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Impossibile caricare il componente aggiuntivo",
       "no-root-app-page-component-found": "Non è stato trovato alcun componente della pagina dell'app principale"
     },
     "browse": {
@@ -10794,12 +10795,12 @@
         "label": {
           "all": "Tutti",
           "installed": "Installato",
-          "new-updates": ""
+          "new-updates": "Nuovi aggiornamenti"
         }
       },
       "label": {
         "all": "Tutti",
-        "applications": "",
+        "applications": "Applicazioni",
         "data-sources": "Fonti dei dati",
         "panels": "Pannelli"
       },
@@ -10829,7 +10830,7 @@
         "update-status-text": "plug-in aggiornati"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Vuoi davvero effettuare il downgrade alla versione {{version}}? Normalmente non dovresti farlo",
         "downgrade-confirm": "Effettua il downgrade",
         "downgrade-title": "Effettua il downgrade della versione del plug-in"
       }
@@ -10858,7 +10859,7 @@
         "dependencies": "Dipendenze",
         "documentation": "Documentazione",
         "downloads": "Download",
-        "from": "",
+        "from": "Da",
         "installedVersion": "Versione installata",
         "lastCommitDate": "Data dell'ultimo commit:",
         "latestReleaseDate": "Data dell'ultima versione:",
@@ -10884,8 +10885,8 @@
       "message": "Nessun plug-in trovato"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Controlla la console per maggiori dettagli sull'errore.",
+      "extension-error-alert-title": "Impossibile caricare l'estensione: \"{{pluginId}}/{{extensionTitle}}\""
     },
     "extensions-log-data-source": {
       "message": {
@@ -10900,7 +10901,7 @@
     },
     "get-feature-state-info": {
       "text": {
-        "alpha": "",
+        "alpha": "Alpha",
         "beta": "Beta",
         "deprecated": "Obsoleto"
       }
@@ -10922,13 +10923,13 @@
     "install-controls-button": {
       "title-uninstall-modal": "Disinstalla {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Vuoi davvero disinstallare questo plug-in?",
+        "confirmText-confirm": "Conferma"
       }
     },
     "install-controls-warning": {
       "body-not-published": "Questo componente aggiuntivo non è pubblicato su <2>grafana.com/plugins</2> e non può essere gestito tramite il catalogo.",
-      "enterprise-plugin-info": "",
+      "enterprise-plugin-info": "Questo plugin è disponibile solo in Grafana Cloud e Grafana Enterprise.",
       "learn-more": "Scopri di più",
       "no-valid-grafana-enterprise-license-detected": "Non è stata rilevata alcuna licenza Grafana Enterprise valida.",
       "title-dev-alert": "Questa è una versione di sviluppo del componente aggiuntivo e non può essere disinstallata.",
@@ -10941,6 +10942,9 @@
       "label-plugin-id": "ID componente aggiuntivo",
       "label-severity": "Gravità"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Impossibile trovare il componente aggiuntivo. Verifica che l'URL sia corretto o <1></1>vai al <3>catalogo dei componenti aggiuntivi</3>.",
       "title-plugin-not-found": "Componente aggiuntivo non trovato"
@@ -10969,10 +10973,10 @@
     "plugin-details-page": {
       "not-found-model": {
         "subTitle": {
-          "requested-belong-plugin": ""
+          "requested-belong-plugin": "L'ID richiesto non appartiene a nessun plug-in"
         },
         "text": {
-          "unknown-plugin": ""
+          "unknown-plugin": "Plug-in sconosciuto"
         }
       }
     },
@@ -11086,40 +11090,40 @@
   },
   "provisioned-resource-form": {
     "save-or-delete-resource-shared-fields": {
-      "comment-placeholder-describe-changes-optional": "",
-      "description-branch-name-in-git-hub": "",
+      "comment-placeholder-describe-changes-optional": "Aggiungi una nota per descrivere le modifiche (facoltativo)",
+      "description-branch-name-in-git-hub": "Nome del ramo in GitHub",
       "description-inside-repository": "",
-      "label-branch": "",
-      "label-comment": "",
-      "label-path": "",
-      "label-workflow": ""
+      "label-branch": "Ramo",
+      "label-comment": "Commento",
+      "label-path": "Percorso",
+      "label-workflow": "Flusso di lavoro"
     }
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Questa risorsa è dietro il ramo in {{repoType}}.",
+      "not-saved": "Il resto degli utenti Grafana nella tua organizzazione vedrà ancora la versione corrente salvata nel ramo predefinito configurato fino a quando questo ramo non verrà unito",
+      "open-in-repo-button": "Apri in {{repoType}}",
+      "open-pull-request-in-repo": "Apri richiesta pull in {{repoType}}",
+      "view-in-repo-button": "Visualizzala in {{repoType}} per vedere le ultime modifiche.",
+      "view-pull-request-in-repo": "Visualizza richiesta pull in {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "È stata creata una nuova risorsa in un ramo in {{repoType}}.",
+    "title-loaded-pull-request-in-repo": "Questa risorsa viene caricata dal ramo appena creato in {{repoType}} ed è visibile solo a te"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Risorsa salvata correttamente",
+  "provisioned-resource-request-handler-dashboard": "Dashboard salvata correttamente",
+  "provisioned-resource-request-handler-folder": "Cartella creata correttamente",
   "provisioning": {
     "banner": {
       "message": "Questa funzione è attualmente in fase di sviluppo attivo. Per un'esperienza ottimale e gli ultimi miglioramenti, consigliamo di utilizzare la <2>nightly build</2> di Grafana."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Il ramo da utilizzare per il provisioning",
+      "branch-label": "Ramo",
+      "branch-required": "Il ramo è obbligatorio",
+      "path-description": "Percorso della sottodirectory facoltativa all'interno del repository",
+      "path-label": "Percorso",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11128,18 +11132,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Consente agli utenti di scegliere se aprire una richiesta di pull durante il salvataggio delle modifiche. Se il repository non consente modifiche dirette al ramo principale, potrebbe essere comunque necessaria una richiesta di pull.",
+      "pr-workflow-label": "Abilita l'opzione di richiesta di pull durante il salvataggio",
+      "token-description": "Password dell'app Bitbucket con autorizzazioni del repository",
+      "token-label": "Password app",
+      "token-required": "Il token Bitbucket è obbligatorio",
+      "token-user-description": "Il nome utente che verrà utilizzato per accedere al repository con la password dell'app",
+      "token-user-label": "Nome utente",
+      "token-user-required": "Il nome utente è obbligatorio",
+      "url-description": "L'URL del repository Bitbucket",
+      "url-label": "URL repository",
+      "url-pattern": "Deve essere un URL di repository Bitbucket valido",
+      "url-required": "L'URL del repository è obbligatorio"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Aggiungi un nome semplice per questa connessione al repository",
@@ -11150,12 +11154,12 @@
       "label-display-name": "Nome visualizzato",
       "placeholder-my-repository-connection": "La mia connessione al repository",
       "text-loading-resource-information": "Caricamento delle informazioni sulle risorse in corso...",
-      "dashboards-count_one": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} dashboard",
+      "dashboards-count_other": "{{count}} dashboard",
       "files-count_one": "{{count}} file",
       "files-count_other": "{{count}} file",
-      "folders-count_one": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} cartella",
+      "folders-count_other": "{{count}} cartella"
     },
     "check-repository": {
       "check": "Verifica"
@@ -11191,7 +11195,7 @@
     },
     "connect-page": {
       "subTitle": {
-        "connect-external-storage-manage-resources": ""
+        "connect-external-storage-manage-resources": "Connettiti a una memoria esterna per gestire le tue risorse"
       }
     },
     "connect-repository-button": {
@@ -11210,10 +11214,10 @@
       "back-to-repositories": "Torna ai repository",
       "repository-config-exists-configuration": "Assicurati che la configurazione del repository esista nel file di configurazione.",
       "subTitle": {
-        "configure-repository-storing-resources": ""
+        "configure-repository-storing-resources": "Configura un repository per archiviare le tue risorse."
       },
       "text": {
-        "configure-repository": ""
+        "configure-repository": "Configura repository"
       }
     },
     "empty-state": {
@@ -11229,7 +11233,7 @@
       "title-instant-updates-requests-webhooks": "Aggiornamenti istantanei e richieste di pull con webhook.",
       "title-visual-previews-in-pull-requests": "Anteprime visive nelle richieste di pull con rendering delle immagini"
     },
-    "error-title-default": "",
+    "error-title-default": "Errore",
     "expanded-row": {
       "job-specification": "Specifiche dell'attività",
       "summary": "Indice"
@@ -11238,8 +11242,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Configura i toggle delle funzionalità necessarie"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Gestisci le dashboard come codice in Git e fornisci automaticamente gli aggiornamenti",
+      "manage-your-dashboards-with-remote-provisioning": "Inizia a usare la sincronizzazione Git",
       "store-dashboards-in-version-controlled-storage": "Archivia le dashboard in una memoria controllata dalla versione per una migliore organizzazione e monitoraggio della cronologia"
     },
     "file-history-page": {
@@ -11260,16 +11264,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Aggiunge un'anteprima dell'immagine delle modifiche alla dashboard nelle richieste di pull. Le immagini delle dashboard Grafana verranno condivise nel repository Git e saranno visibili a chiunque abbia accesso al repository.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Crea collegamenti di anteprima per le richieste di pull",
       "description-image-rendering": "Richiede il rendering dell'immagine. <2>Configura il rendering delle immagini</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(richiede <2>il rendering delle immagini</2> e l'accesso pubblico abilitato)",
       "description-read-only": "Le risorse non possono essere modificate tramite Grafana.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Con quale frequenza sincronizzare le modifiche dal repository",
+      "error-sync-interval-required": "L'intervallo di sincronizzazione è obbligatorio",
       "label-enable-previews": "Abilita le anteprime della dashboard nelle richieste di pull",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Genera anteprime della dashboard",
       "label-read-only": "Solo lettura",
-      "label-sync-interval": ""
+      "label-sync-interval": "Intervallo di sincronizzazione (secondi)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Nessun risultato corrisponde alla tua query",
@@ -11301,46 +11305,46 @@
       "subtitle-provisioning-feature": "Visualizza e gestisci le connessioni di provisioning"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Il ramo da utilizzare per il provisioning",
+      "branch-label": "Ramo",
+      "branch-required": "Il ramo è obbligatorio",
+      "path-description": "Percorso della sottodirectory facoltativa all'interno del repository",
+      "path-label": "Percorso",
+      "pr-workflow-description": "Consente agli utenti di scegliere se aprire una richiesta di pull durante il salvataggio delle modifiche. Se il repository non consente modifiche dirette al ramo principale, potrebbe essere comunque necessaria una richiesta di pull.",
+      "pr-workflow-label": "Abilita l'opzione di richiesta di pull durante il salvataggio",
+      "token-description": "Token o password di accesso al repository Git",
+      "token-label": "Token di accesso",
+      "token-required": "Il token Git è obbligatorio",
+      "token-user-description": "Il nome utente che verrà utilizzato per accedere al repository con il token di accesso",
+      "token-user-label": "Nome utente",
+      "token-user-required": "Il nome utente è obbligatorio",
+      "url-description": "L'URL del repository Git",
+      "url-label": "URL repository",
+      "url-pattern": "Deve essere un URL di repository Git valido",
+      "url-required": "L'URL del repository è obbligatorio"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Il ramo da utilizzare per il provisioning",
+      "branch-label": "Ramo",
+      "branch-required": "Il ramo è obbligatorio",
+      "path-description": "Percorso della sottodirectory facoltativa all'interno del repository",
+      "path-label": "Percorso",
+      "pr-workflow-description": "Consente agli utenti di scegliere se aprire una richiesta di pull durante il salvataggio delle modifiche. Se il repository non consente modifiche dirette al ramo principale, potrebbe essere comunque necessaria una richiesta di pull.",
+      "pr-workflow-label": "Abilita l'opzione di richiesta di pull durante il salvataggio",
+      "token-description": "Token di accesso personale GitHub con autorizzazioni del repository",
+      "token-label": "Token di accesso personale",
+      "token-required": "Il token GitHub è obbligatorio",
+      "url-description": "URL del repository GitHub",
+      "url-label": "URL repository",
+      "url-pattern": "Deve essere un URL di repository GitHub valido",
+      "url-required": "L'URL del repository è obbligatorio"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Il ramo da utilizzare per il provisioning",
+      "branch-label": "Ramo",
+      "branch-required": "Il ramo è obbligatorio",
+      "path-description": "Percorso della sottodirectory facoltativa all'interno del repository",
+      "path-label": "Percorso",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11349,15 +11353,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Consente agli utenti di scegliere se aprire una richiesta di merge durante il salvataggio delle modifiche. Se il repository non consente modifiche dirette al ramo principale, potrebbe essere comunque necessaria una richiesta di merge.",
+      "pr-workflow-label": "Abilita l'opzione di richiesta di merge durante il salvataggio",
+      "token-description": "Token di accesso al progetto GitLab con autorizzazioni del repository",
+      "token-label": "Token di accesso al progetto",
+      "token-required": "Il token GitLab è obbligatorio",
+      "url-description": "L'URL del repository GitLab",
+      "url-label": "URL repository",
+      "url-pattern": "Deve essere un URL di repository GitLab valido",
+      "url-required": "L'URL del repository è obbligatorio"
     },
     "history-view": {
       "not-found": "Non trovato"
@@ -11385,18 +11389,18 @@
       "starting": "Avvio in corso...",
       "status": {
         "title-error-running-job": "Errore durante l'esecuzione dell'attività",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Attività completata con successo",
+        "title-warning-running-job": "Attività completata con avvisi"
       },
       "summary": "Indice",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Errore durante il recupero dell'attività attiva"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Percorso del file system locale al repository",
+      "path-label": "Percorso repository",
+      "path-required": "Il percorso del repository è obbligatorio"
     },
     "mode-options": {
       "folder": {
@@ -11422,7 +11426,7 @@
     },
     "repository-actions": {
       "settings": "Impostazioni",
-      "source-code": ""
+      "source-code": "Codice sorgente"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11488,22 +11492,22 @@
       "title-queued-for-deletion": "In coda per l'eliminazione"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Scegli un provider:",
+      "configure-file": "Configura il provisioning dei file",
+      "configure-with-provider": "Configura con {{ provider }}",
+      "provider-not-listed": "Se il tuo provider non è elencato:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Connetti ai repository Bitbucket",
+      "github": "GitHub",
+      "github-description": "Connetti ai repository GitHub",
+      "gitlab": "GitLab",
+      "gitlab-description": "Connetti ai repository GitLab",
+      "local": "Locale",
+      "local-description": "Configura il provisioning dei file",
+      "pure-git": "Git puro",
+      "pure-git-description": "Connetti a qualsiasi repository Git"
     },
     "resource-view": {
       "base": "Base",
@@ -11511,15 +11515,15 @@
       "existing-dashboard": "Dashboard esistente",
       "history": "Cronologia",
       "message": {
-        "removed-from-repo-test-ui": "",
-        "updated-from-repo-test-ui": ""
+        "removed-from-repo-test-ui": "rimosso dall'interfaccia utente del test del repository",
+        "updated-from-repo-test-ui": "aggiornato dall'interfaccia utente del test del repository"
       },
       "repository": "Repository",
       "tab-info": {
         "label": {
-          "dry-run-result-after-apply": "",
-          "existing-from-grafana": "",
-          "file-from-repository": ""
+          "dry-run-result-after-apply": "Prova generale (risultato dopo l'applicazione)",
+          "existing-from-grafana": "Esistente (da Grafana)",
+          "file-from-repository": "File (dal repository)"
         }
       },
       "title-error-saving-file": "Errore nel salvataggio del file"
@@ -11534,11 +11538,11 @@
       "label-current-step": "Passaggio corrente",
       "label-pending-step": "Passaggio in sospeso"
     },
-    "success-title-default": "",
+    "success-title-default": "Operazione riuscita",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Impossibile avviare l'attività",
+      "error-no-repository-name": "Nessun nome di repository fornito",
+      "error-starting-job": "Errore durante l'avvio dell'attività"
     },
     "sync-repository": {
       "body-edit-configuration": "Modifica configurazione",
@@ -11566,7 +11570,7 @@
       "go-to": "Vai a",
       "make-sure": "Assicurati di includere queste autorizzazioni"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Attenzione",
     "wizard": {
       "alert-point-1": "Le risorse non potranno essere create, modificate o eliminate durante questo processo. Nell'ultimo passaggio, scompariranno.",
       "alert-point-2": "Una volta completato il provisioning, le risorse riappariranno e verranno gestite tramite la memoria esterna.",
@@ -11576,10 +11580,10 @@
       "button-next": "Fine",
       "button-start": "Inizia la sincronizzazione",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Questa operazione eliminerà la configurazione del repository e perderai tutti i progressi. Vuoi davvero eliminare le modifiche?",
+        "confirm": "Sì, elimina",
+        "dismiss": "Continua a lavorare",
+        "title": "Annullare la configurazione del repository?"
       },
       "step-bootstrap": "Scegli cosa sincronizzare",
       "step-connect": "Connetti",
@@ -11595,7 +11599,7 @@
     "wizard-content": {
       "button-cancel": "Annulla",
       "button-cancelling": "Annullamento in corso...",
-      "button-previous": "",
+      "button-previous": "Precedente",
       "button-submitting": "Invio in corso...",
       "error-instance-repository-exists": "Il repository delle istanze esiste già"
     }
@@ -11996,7 +12000,7 @@
         "recommended": "Consigliato",
         "results": "Risultati"
       },
-      "search": ""
+      "search": "Cerca {{parentTitle}}"
     }
   },
   "search": {
@@ -12014,8 +12018,8 @@
     "bluge-searcher": {
       "opts": {
         "label": {
-          "alphabetically-az": "",
-          "alphabetically-za": ""
+          "alphabetically-az": "In ordine alfabetico (A-Z)",
+          "alphabetically-za": "In ordine alfabetico (Z-A)"
         }
       }
     },
@@ -12050,8 +12054,8 @@
     "unified-searcher": {
       "opts": {
         "label": {
-          "alphabetically-az": "",
-          "alphabetically-za": ""
+          "alphabetically-az": "In ordine alfabetico (A-Z)",
+          "alphabetically-za": "In ordine alfabetico (Z-A)"
         }
       }
     }
@@ -12077,7 +12081,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Nessun account di servizio trovato",
     "select-aria-label": "Selettore account di servizio",
     "select-placeholder": "Inizia a digitare per cercare gli account di servizio"
   },
@@ -12123,16 +12127,16 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Aggiungi token dell'account di servizio",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Vuoi davvero eliminare questo account di servizio?",
+      "body-disable-service-account": "Vuoi davvero disabilitare questo account di servizio?",
+      "confirmText-delete-service-account": "Elimina account di servizio",
+      "confirmText-disable-service-account": "Disabilita account di servizio",
       "delete-service-account": "Elimina account di servizio",
       "disable-service-account": "Disabilita account di servizio",
       "enable-service-account": "Abilita account di servizio",
       "page-nav": {
         "subTitle": {
-          "manage-settings-individual-service-account": ""
+          "manage-settings-individual-service-account": "Gestisci le impostazioni per un singolo account di servizio."
         }
       },
       "title-delete-service-account": "Elimina account di servizio",
@@ -12153,7 +12157,7 @@
       "used-by": "Utilizzato da"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Salva",
       "edit": "Modifica"
     },
     "service-account-role-row": {
@@ -12167,16 +12171,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Aggiungi account di servizio",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Vuoi davvero eliminare {{serviceAccountName}}?",
+      "body-disable-service-account": "Vuoi davvero disabilitare \"{{accountToDisable}}\"?",
+      "confirmText-delete": "Elimina",
+      "confirmText-disable-service-account": "Disabilita account di servizio",
       "placeholder-search-service-account-by-name": "Cerca account di servizio per nome",
       "sub-title": "Gli account di servizio e i relativi token possono essere utilizzati per autenticarsi con l'API Grafana. Scopri di più nella nostra <2>documentazione.</2>",
       "title-delete-service-account": "Elimina account di servizio",
       "title-disable-service-account": "Disabilita account di servizio",
-      "body-delete_one": "",
-      "body-delete_other": ""
+      "body-delete_one": "Vuoi davvero eliminare {{serviceAccountName}} e {{count}} token associati?",
+      "body-delete_other": "Vuoi davvero eliminare {{serviceAccountName}} e {{count}} token associati?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Questo token è scaduto",
@@ -12190,7 +12194,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Esporta come immagine",
       "export-json-title": "Esporta in formato JSON",
       "share-externally-title": "Condividi esternamente",
       "share-internally-title": "Condividi internamente",
@@ -12227,17 +12231,17 @@
       "view-button-yaml": "Visualizza YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Azioni di esportazione immagini",
+      "cancel-button": "Annulla",
+      "download-button": "Scarica immagine",
+      "error-title": "Impossibile generare l'immagine",
+      "generate-button": "Genera immagine",
+      "generating": "Generazione immagine in corso...",
+      "info-text": "Salva questa dashboard come immagine",
+      "preview": "Anteprima",
+      "preview-aria": "Anteprima immagine generata",
+      "preview-region": "Anteprima immagine",
+      "title": "Esporta come immagine"
     },
     "library": {
       "info": "Crea il pannello della libreria."
@@ -12247,7 +12251,7 @@
       "info-text": "Crea un link diretto a questo dashboard o pannello, personalizzato con le opzioni seguenti.",
       "link-url": "Collega URL",
       "render-alert": "Plug-in del renderer di immagini non installato",
-      "render-instructions": "",
+      "render-instructions": "Per eseguire il rendering di un'immagine, è necessario installare il <2>plug-in del renderer di immagini Grafana</2>. Contatta l'amministratore di Grafana per installare il plug-in.",
       "rendered-image": "Immagine con rendering del collegamento diretto",
       "save-alert": "Il dashboard non è stato salvato",
       "save-dashboard": "Per eseguire il rendering di un'immagine del pannello, è necessario prima salvare il dashboard.",
@@ -12315,11 +12319,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Salva la dashboard per abilitare la generazione di immagini",
+    "download-disabled-help": "Genera prima un'immagine per abilitare il download",
+    "error-title": "Impossibile generare l'immagine",
     "form": {
-      "label": ""
+      "label": "Impostazioni immagine pannello"
     },
     "preview": {
       "title": "Anteprima pannello"
@@ -12480,112 +12484,112 @@
   },
   "stat": {
     "add-orientation-option": {
-      "description-orientation": "",
-      "name-orientation": "",
+      "description-orientation": "Orientamento del layout",
+      "name-orientation": "Orientamento",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-vertical": ""
+        "label-auto": "Automatico",
+        "label-horizontal": "Orizzontale",
+        "label-vertical": "Verticale"
       }
     },
     "add-standard-data-reduce-options": {
-      "category-value-options": "",
-      "description-calculation": "",
-      "description-fields": "",
-      "description-limit": "",
-      "description-show": "",
+      "category-value-options": "Opzioni valore",
+      "description-calculation": "Scegli una funzione/un calcolo di riduzione",
+      "description-fields": "Seleziona i campi da includere nel pannello",
+      "description-limit": "Numero massimo di righe da visualizzare",
+      "description-show": "Calcola un singolo valore per colonna o serie o mostra ogni riga",
       "fields-options": {
-        "label-all-fields": "",
-        "label-numeric-fields": ""
+        "label-all-fields": "Tutti i campi",
+        "label-numeric-fields": "Campi numerici"
       },
-      "name-calculation": "",
-      "name-fields": "",
-      "name-limit": "",
-      "name-show": "",
+      "name-calculation": "Calcolo",
+      "name-fields": "Campi",
+      "name-limit": "Limite",
+      "name-show": "Mostra",
       "show-options": {
-        "label-all-values": "",
-        "label-calculate": ""
+        "label-all-values": "Tutti i valori",
+        "label-calculate": "Calcola"
       }
     },
-    "category-stat-styles": "",
+    "category-stat-styles": "Stili statistiche",
     "color-mode-options": {
-      "label-background-gradient": "",
-      "label-background-solid": "",
-      "label-none": "",
-      "label-value": ""
+      "label-background-gradient": "Sfumatura sfondo",
+      "label-background-solid": "Sfondo tinta unita",
+      "label-none": "Nessuno",
+      "label-value": "Valore"
     },
-    "description-graph-mode": "",
-    "description-text-mode": "",
+    "description-graph-mode": "Grafico pannello statistiche/modalità sparkline",
+    "description-text-mode": "Controlla se vengono visualizzati nome e valore o solo il nome",
     "graph-mode": {
       "options": {
-        "label-area": "",
-        "label-none": ""
+        "label-area": "Area",
+        "label-none": "Nessuna"
       }
     },
     "name-color-modcolor-mode-options": {
-      "label": ""
+      "label": "Modalità colore"
     },
-    "name-graph-mode": "",
-    "name-show-percent-change": "",
-    "name-text-alignment": "",
-    "name-text-mode": "",
-    "name-wide-layout": "",
-    "percent-change-color-mode": "",
+    "name-graph-mode": "Modalità grafico",
+    "name-show-percent-change": "Mostra variazione percentuale",
+    "name-text-alignment": "Allineamento testo",
+    "name-text-mode": "Modalità testo",
+    "name-wide-layout": "Layout ampio",
+    "percent-change-color-mode": "Modalità colore variazione percentuale",
     "percent-change-color-mode-options": {
-      "label-inverted": "",
-      "label-same-as-value": "",
-      "label-standard": ""
+      "label-inverted": "Invertito",
+      "label-same-as-value": "Uguale al valore",
+      "label-standard": "Standard"
     },
     "text-alignment-options": {
-      "label-auto": "",
-      "label-center": ""
+      "label-auto": "Automatico",
+      "label-center": "Centrale"
     },
     "text-mode-options": {
-      "label-auto": "",
-      "label-name": "",
-      "label-none": "",
-      "label-value": "",
-      "label-value-and-name": ""
+      "label-auto": "Automatico",
+      "label-name": "Nome",
+      "label-none": "Nessuno",
+      "label-value": "Valore",
+      "label-value-and-name": "Valore e nome"
     },
     "wide-layout-options": {
-      "label-off": "",
-      "label-on": ""
+      "label-off": "Spento",
+      "label-on": "Acceso"
     }
   },
   "state-timeline": {
     "align-values-options": {
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-center": "Centrale",
+      "label-left": "A sinistra",
+      "label-right": "A destra"
     },
-    "category-state-timeline": "",
-    "name-align-values": "",
-    "name-connect-null-values": "",
-    "name-disconnect-values": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-merge-equal-consecutive-values": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-state-timeline": "Sequenza temporale dello stato",
+    "name-align-values": "Allinea valori",
+    "name-connect-null-values": "Collega valori nulli",
+    "name-disconnect-values": "Disconnetti valori",
+    "name-fill-opacity": "Opacità del riempimento",
+    "name-line-width": "Larghezza linea",
+    "name-merge-equal-consecutive-values": "Unisci valori consecutivi uguali",
+    "name-page-size": "Dimensione pagina (abilita impaginazione)",
+    "name-row-height": "Altezza riga",
+    "name-show-values": "Mostra i valori",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Sempre",
+      "label-auto": "Automatico",
+      "label-never": "Mai"
     }
   },
   "status-history": {
-    "category-status-history": "",
-    "name-column-width": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-status-history": "Cronologia dello stato",
+    "name-column-width": "Larghezza colonna",
+    "name-fill-opacity": "Opacità del riempimento",
+    "name-line-width": "Larghezza linea",
+    "name-page-size": "Dimensione pagina (abilita impaginazione)",
+    "name-row-height": "Altezza riga",
+    "name-show-values": "Mostra i valori",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Sempre",
+      "label-auto": "Automatico",
+      "label-never": "Mai"
     },
     "status-history-panel": {
       "too-many-points_one": "Troppi punti da visualizzare correttamente. <1></1>Aggiorna la query per restituire meno punti <3></3>({{count}} punti ricevuti)",
@@ -12601,7 +12605,7 @@
       "create": "Crea",
       "sub-title": "Scegli i componenti per il pacchetto di supporto. Il pacchetto di supporto sarà disponibile per 3 giorni dopo la creazione.",
       "text": {
-        "create-support-bundle": ""
+        "create-support-bundle": "Crea pacchetto di supporto"
       }
     },
     "support-bundles-unconnected": {
@@ -12618,67 +12622,67 @@
   },
   "table": {
     "auto-cell-options-editor": {
-      "description-wrap-text": "",
-      "label-wrap-text": ""
+      "description-wrap-text": "Se il testo selezionato verrà adattato alla larghezza del testo nella colonna configurata",
+      "label-wrap-text": "Testo a capo"
     },
     "bar-gauge-cell-options-editor": {
-      "label-gauge-display-mode": "",
-      "label-value-display": ""
+      "label-gauge-display-mode": "Modalità di visualizzazione del misuratore",
+      "label-value-display": "Visualizzazione del valore"
     },
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Opzioni cella",
+    "category-table": "Tabella",
+    "category-table-footer": "Piè di pagina tabella",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Grande",
+      "label-medium": "Media",
+      "label-small": "Piccola"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Azioni",
+      "auto": "Automatica",
+      "color-background": "Sfondo colorato",
+      "color-text": "Testo colorato",
+      "data-links": "Collegamenti dati",
+      "gauge": "Calibro",
+      "image": "Immagine",
+      "json": "Visualizzazione JSON",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Pill",
+      "sparkline": "Sparkline"
     },
     "color-background-cell-options-editor": {
-      "description-apply-to-entire-row": "",
-      "description-wrap-text": "",
+      "description-apply-to-entire-row": "Se selezionato, l'intera riga verrà colorata come questa cella.",
+      "description-wrap-text": "Se il testo selezionato verrà adattato alla larghezza del testo nella colonna configurata",
       "label": {
-        "text-alpha": ""
+        "text-alpha": "Alpha"
       },
-      "label-apply-to-entire-row": "",
-      "label-background-display-mode": "",
-      "wrap-text": ""
+      "label-apply-to-entire-row": "Applica a tutta la riga",
+      "label-background-display-mode": "Modalità di visualizzazione dello sfondo",
+      "wrap-text": "Testo a capo"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Automatica",
+      "label-center": "Centrale",
+      "label-left": "A sinistra",
+      "label-right": "A destra"
     },
     "container": {
       "content": "La visualizzazione di troppe colonne in una singola tabella può influire sulle prestazioni e rendere più difficile la lettura dei dati. Valuta di perfezionare le query.",
       "show-all-series": "Mostra tutte le colonne",
       "show-only-series": "Mostra solo {{MAX_NUMBER_OF_COLUMNS}} colonne"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
-    "description-min-column-width": "",
-    "description-wrap-header-text": "",
+    "description-calculation": "Scegli una funzione/un calcolo di riduzione",
+    "description-cell-value-inspect": "Abilita l'ispezione del valore della cella in una finestra modale",
+    "description-column-filter": "Abilita/disabilita i filtri di campo nella tabella",
+    "description-count-rows": "Visualizza un singolo conteggio per tutte le righe di dati",
+    "description-fields": "Seleziona i campi da calcolare",
+    "description-min-column-width": "La larghezza minima per il ridimensionamento automatico della colonna",
+    "description-wrap-header-text": "Abilita il ritorno a capo del testo per le intestazioni di colonna",
     "image-cell-options-editor": {
-      "description-alt-text": "",
-      "description-title-text": "",
-      "label-alt-text": "",
-      "label-title-text": ""
+      "description-alt-text": "Testo alternativo che verrà visualizzato se un'immagine non può essere visualizzata o per gli utenti che utilizzano un lettore di schermo",
+      "description-title-text": "Testo che verrà visualizzato quando si passa con il cursore sull'immagine",
+      "label-alt-text": "Testo alternativo",
+      "label-title-text": "Testo del titolo"
     },
     "markdown-cell-options-editor": {
       "description-dynamic-height": "",
@@ -12687,66 +12691,66 @@
       },
       "label-dynamic-height": ""
     },
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-paginations": "",
-    "name-fields": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "name-wrap-header-text": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": "",
+    "name-calculation": "Calcolo",
+    "name-cell-height": "Altezza cella",
+    "name-cell-type": "Tipo di cella",
+    "name-cell-value-inspect": "Ispezione del valore della cella",
+    "name-column-alignment": "Allineamento colonna",
+    "name-column-filter": "Filtro colonna",
+    "name-column-width": "Larghezza colonna",
+    "name-count-rows": "Conteggio righe",
+    "name-enable-paginations": "Abilita impaginazione",
+    "name-fields": "Campi",
+    "name-hide-in-table": "Nascondi nella tabella",
+    "name-min-column-width": "Larghezza minima colonna",
+    "name-show-table-footer": "Mostra piè di pagina tabella",
+    "name-show-table-header": "Mostra intestazione tabella",
+    "name-wrap-header-text": "Testo intestazione a capo",
+    "placeholder-column-width": "automatica",
+    "placeholder-fields": "Tutti i campi numerici",
     "text-wrap-options": {
       "label-wrap-text": ""
     }
   },
   "table-new": {
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Opzioni cella",
+    "category-table": "Tabella",
+    "category-table-footer": "Piè di pagina tabella",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Grande",
+      "label-medium": "Media",
+      "label-small": "Piccola"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Automatica",
+      "label-center": "Centrale",
+      "label-left": "A sinistra",
+      "label-right": "A destra"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
+    "description-calculation": "Scegli una funzione/un calcolo di riduzione",
+    "description-cell-value-inspect": "Abilita l'ispezione del valore della cella in una finestra modale",
+    "description-column-filter": "Abilita/disabilita i filtri di campo nella tabella",
+    "description-count-rows": "Visualizza un singolo conteggio per tutte le righe di dati",
+    "description-fields": "Seleziona i campi da calcolare",
     "description-frozen-columns": "",
-    "description-min-column-width": "",
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-pagination": "",
-    "name-fields": "",
+    "description-min-column-width": "La larghezza minima per il ridimensionamento automatico della colonna",
+    "name-calculation": "Calcolo",
+    "name-cell-height": "Altezza cella",
+    "name-cell-type": "Tipo di cella",
+    "name-cell-value-inspect": "Ispezione del valore della cella",
+    "name-column-alignment": "Allineamento colonna",
+    "name-column-filter": "Filtro colonna",
+    "name-column-width": "Larghezza colonna",
+    "name-count-rows": "Conteggio righe",
+    "name-enable-pagination": "Abilita impaginazione",
+    "name-fields": "Campi",
     "name-frozen-columns": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": ""
+    "name-hide-in-table": "Nascondi nella tabella",
+    "name-min-column-width": "Larghezza minima colonna",
+    "name-show-table-footer": "Mostra piè di pagina tabella",
+    "name-show-table-header": "Mostra intestazione tabella",
+    "placeholder-column-width": "automatico",
+    "placeholder-fields": "Tutti i campi numerici"
   },
   "tag-filter": {
     "clear-button": "Cancella tag",
@@ -12757,7 +12761,7 @@
     "tag-option-label": "Opzione tag"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Nessun team trovato",
     "select-aria-label": "Selettore team",
     "select-placeholder": "Seleziona un team"
   },
@@ -12765,7 +12769,7 @@
     "build-nav-model": {
       "nav-model": {
         "subTitle": {
-          "manage-members-and-settings": ""
+          "manage-members-and-settings": "Gestisci membri e impostazioni"
         },
         "text": {
           "settings": "Impostazioni"
@@ -12831,17 +12835,17 @@
     }
   },
   "text": {
-    "category-text": "",
+    "category-text": "Testo",
     "mode-options": {
-      "label-code": "",
-      "label-html": "",
-      "label-markdown": ""
+      "label-code": "Codice",
+      "label-html": "HTML",
+      "label-markdown": "Markdown"
     },
-    "name-content": "",
-    "name-language": "",
-    "name-mode": "",
-    "name-show-line-numbers": "",
-    "name-show-mini-map": ""
+    "name-content": "Contenuto",
+    "name-language": "Lingua",
+    "name-mode": "Modalità",
+    "name-show-line-numbers": "Mostra numeri di riga",
+    "name-show-mini-map": "Mostra mini mappa"
   },
   "theme-preview": {
     "breadcrumbs": {
@@ -12889,7 +12893,7 @@
       "apply-button": "Applica intervallo di tempo",
       "default-error": "Inserisci una data passata o \"{{now}}\"",
       "fiscal-year": "Anno fiscale: {{from}} - {{to}}",
-      "from-input": "",
+      "from-input": "Da",
       "open-input-calendar": "Apri calendario",
       "range-error": "\"Da\" non può essere successivo a \"A\"",
       "to-input": "A"
@@ -12907,7 +12911,7 @@
       "aria-role": "Selezione dell'intervallo di tempo",
       "default-title": "Intervalli di tempo",
       "example-title": "Esempi di intervalli di tempo",
-      "from-label": "",
+      "from-label": "Da",
       "from-to": "Da {{timeOptionFrom}} a {{timeOptionTo}}",
       "specify": "Specifica l'intervallo di tempo",
       "submit-button-label": "Pulsante di invio TimePicker",
@@ -12920,18 +12924,18 @@
   },
   "timeline": {
     "missing-field": {
-      "all": "",
-      "time": ""
+      "all": "Nessun campo rappresentabile graficamente",
+      "time": "I dati non hanno un campo temporale"
     }
   },
   "timeseries": {
     "annotation-editor2": {
       "add-annotation": "Aggiungi annotazione",
       "cancel": "Annulla",
-      "edit-annotation": "",
+      "edit-annotation": "Modifica annotazione",
       "label-description": "Descrizione",
       "label-tags": "Tag",
-      "placeholder-add-tags": "",
+      "placeholder-add-tags": "Aggiungi tag",
       "save": "Salva",
       "saving": "Salvataggio in corso"
     },
@@ -12939,87 +12943,87 @@
       "tooltip-delete": "Elimina",
       "tooltip-edit": "Modifica"
     },
-    "category-axis": "",
+    "category-axis": "Asse",
     "config": {
       "get-graph-field-config": {
-        "aria-label-bar-width-factor": "",
-        "aria-label-fill-opacity": "",
-        "aria-label-line-width": "",
-        "aria-label-point-size": "",
-        "category-graph-styles": "",
-        "category-thresholds": "",
-        "name-bar-alignment": "",
-        "name-bar-width-factor": "",
-        "name-connect-nulls": "",
-        "name-disconnect-values": "",
-        "name-fill-below-to": "",
-        "name-fill-opacity": "",
-        "name-gradient-mode": "",
-        "name-line-interpolation": "",
-        "name-line-style": "",
-        "name-line-width": "",
-        "name-point-size": "",
-        "name-show-points": "",
-        "name-show-thresholds": "",
-        "name-style": "",
-        "name-transform": "",
+        "aria-label-bar-width-factor": "Fattore larghezza barra",
+        "aria-label-fill-opacity": "Opacità del riempimento",
+        "aria-label-line-width": "Larghezza linea",
+        "aria-label-point-size": "Dimensione punto",
+        "category-graph-styles": "Stili grafico",
+        "category-thresholds": "Soglie",
+        "name-bar-alignment": "Allineamento barra",
+        "name-bar-width-factor": "Fattore larghezza barra",
+        "name-connect-nulls": "Collega valori nulli",
+        "name-disconnect-values": "Disconnetti valori",
+        "name-fill-below-to": "Riempi sotto a",
+        "name-fill-opacity": "Opacità del riempimento",
+        "name-gradient-mode": "Modalità gradiente",
+        "name-line-interpolation": "Interpolazione linea",
+        "name-line-style": "Stile linea",
+        "name-line-width": "Larghezza linea",
+        "name-point-size": "Dimensione punto",
+        "name-show-points": "Mostra punti",
+        "name-show-thresholds": "Mostra soglie",
+        "name-style": "Stile",
+        "name-transform": "Trasforma",
         "transform-options": {
-          "description-constant": "",
-          "description-style": "",
-          "label-constant": "",
-          "label-style": ""
+          "description-constant": "Il primo valore verrà mostrato come una linea costante",
+          "description-style": "Capovolgi i risultati in valori negativi sull'asse y",
+          "label-constant": "Costante",
+          "label-style": "Y negativo"
         }
       }
     },
     "insert-nulls-editor": {
       "disconnect-options": {
-        "label-never": "",
-        "label-threshold": ""
+        "label-never": "Mai",
+        "label-threshold": "Soglia"
       }
     },
     "line-style-editor": {
       "line-fill-options": {
-        "label-dash": "",
-        "label-dots": "",
-        "label-solid": ""
+        "label-dash": "Trattino",
+        "label-dots": "Punti",
+        "label-solid": "Linea continua"
       },
-      "title-the-input-expects-a-segment-list": "",
+      "title-the-input-expects-a-segment-list": "L'input prevede un elenco di segmenti",
       "tooltip-help": "Guida"
     },
-    "name-time-zone": "",
+    "name-time-zone": "Fuso orario",
     "nulls-threshold-input": {
       "placeholder-never": "Mai"
     },
     "outside-range-plugin": {
-      "data-outside-time-range": "",
-      "zoom-to-data": ""
+      "data-outside-time-range": "Dati al di fuori dell'intervallo di tempo",
+      "zoom-to-data": "Ingrandisci sui dati"
     },
     "span-nulls-editor": {
       "gaps-options": {
-        "label-always": "",
-        "label-never": "",
-        "label-threshold": ""
+        "label-always": "Sempre",
+        "label-never": "Mai",
+        "label-threshold": "Soglia"
       }
     },
     "timezones-editor": {
-      "tooltip-add-timezone": "",
-      "tooltip-remove-timezone": ""
+      "tooltip-add-timezone": "Aggiungi fuso orario",
+      "tooltip-remove-timezone": "Rimuovi fuso orario"
     }
   },
   "traces": {
-    "category-span-filters": "",
-    "name-critical-path-only": "",
-    "name-find-in-trace": "",
-    "name-max-duration": "",
-    "name-min-duration": "",
-    "name-service-name": "",
-    "name-service-name-operator": "",
-    "name-show-matches-only": "",
-    "name-span-name": "",
-    "name-span-name-operator": "",
-    "name-tags": "",
+    "category-span-filters": "Filtri intervallo",
+    "name-critical-path-only": "Mostra solo il percorso critico",
+    "name-find-in-trace": "Trova nella traccia",
+    "name-max-duration": "Durata massima",
+    "name-min-duration": "Durata minima",
+    "name-service-name": "Nome del servizio",
+    "name-service-name-operator": "Operatore del nome del servizio",
+    "name-show-matches-only": "Mostra solo corrispondenze",
+    "name-span-name": "Nome intervallo",
+    "name-span-name-operator": "Operatore del nome dell'intervallo",
+    "name-tags": "Tag",
     "traces-panel": {
-      "no-data-found-in-response": ""
+      "no-data-found-in-response": "Nessun dato trovato in risposta"
     }
   },
   "transformations": {
@@ -13032,20 +13036,20 @@
     "axis-editor": {
       "log-mode-options": {
         "description": {
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-size": "Dividi i bucket in base alle dimensioni"
         },
         "label": {
-          "split": ""
+          "split": "Dividi"
         }
       },
       "mode-options": {
         "description": {
-          "split-the-buckets-based-on-count": "",
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-count": "Dividi i bucket in base al conteggio",
+          "split-the-buckets-based-on-size": "Dividi i bucket in base alle dimensioni"
         },
         "label": {
-          "count": "",
-          "size": ""
+          "count": "Conta",
+          "size": "Dimensioni"
         }
       },
       "placeholder-auto": "Automatico"
@@ -13061,15 +13065,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Operazione binaria",
+          "reduce-row": "Riduci riga",
+          "row-index": "Indice riga",
+          "unary-operation": "Operazione unaria"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Funzioni cumulative",
+        "window-functions": "Funzioni finestra"
       },
       "label-alias": "Nome alternativo",
       "label-mode": "Modalità",
@@ -13077,9 +13081,9 @@
     },
     "calculate-heatmap": {
       "add-heatmap-calculation-options": {
-        "name-x-bucket": "",
-        "name-y-bucket": "",
-        "name-y-bucket-scale": ""
+        "name-x-bucket": "Bucket X",
+        "name-y-bucket": "Bucket Y",
+        "name-y-bucket-scale": "Scala bucket Y"
       }
     },
     "concatenate-transformer-editor": {
@@ -13087,9 +13091,9 @@
       "label-name": "Nome",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Copia il nome del frame nel nome del campo",
+          "ignore-the-frame-name": "Ignora il nome del frame",
+          "label-frame": "Aggiungi un'etichetta con il nome del frame"
         }
       },
       "placeholder-frame": "Fotogramma"
@@ -13102,13 +13106,13 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Aggiungi un trasformatore del tipo di campo di conversione",
       "aria-label-remove-convert-field-type-transformer": "Rimuovi il trasformatore del tipo di campo di conversione",
-      "convert-field-type": "",
+      "convert-field-type": "Converti tipo di campo",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Converti un campo in un tipo di campo specificato."
       },
       "label": {
         "browser": "Browser",
-        "utc": ""
+        "utc": "UTC"
       },
       "label-as": "come",
       "label-date-format": "Formato data",
@@ -13117,11 +13121,11 @@
       "label-join-with": "Unisci con",
       "label-set-timezone": "Imposta fuso orario",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Converti tipo di campo"
       },
       "placeholder-type": "Tipo",
       "tags": {
-        "format-field": ""
+        "format-field": "Formatta campo"
       },
       "tooltip-explicit-separator-joining-array-values": "Utilizza un separatore esplicito quando unisci i valori di un array",
       "tooltip-input-format": "Specifica il formato del campo di input in modo che Grafana possa analizzare correttamente la stringa della data.",
@@ -13140,20 +13144,20 @@
       "tooltip-enable": "Abilita"
     },
     "draggable-sort-order": {
-      "asc": "",
-      "desc": "",
+      "asc": "ASC",
+      "desc": "DESC",
       "off": "Off"
     },
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Combina tutti i campi in un unico frame."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Concatena campi"
         },
         "tags": {
-          "combine": ""
+          "combine": "Combina"
         }
       }
     },
@@ -13168,11 +13172,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Analizza i campi dal contenuto (JSON, etichette, ecc.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Seleziona campo"
         }
       },
       "label-delimiter": "Delimitatore",
@@ -13181,7 +13185,7 @@
       "label-replace-all-fields": "Sostituisci tutti i campi",
       "label-source": "Origine",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Estrai campi"
       },
       "placeholder-auto": "Automatico",
       "placeholder-select-delimiter": "Seleziona delimitatore...",
@@ -13192,20 +13196,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Utilizza un valore di campo per cercare paesi, stati o aeroporti."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nessun campo di testo trovato"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Seleziona campo di testo"
         }
       },
       "label-field": "Campo",
       "label-lookup": "Ricerca",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Cerca campi dalla risorsa"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13216,23 +13220,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Rimuovi parti dei risultati della query utilizzando un modello regex."
       },
       "label-from-variable": "Dalla variabile",
       "label-identifier": "Identificatore",
       "label-use-variable": "Utilizza variabile",
       "label-variable": "Variabile",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Filtra campi per nome"
       },
       "placeholder-regular-expression-pattern": "Modello di espressione regolare"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Rimuovi le righe dai dati in base alla query di origine"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Filtra i dati per query"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13246,33 +13250,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Aggiungi condizione",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Rimuovi le righe dai risultati della query utilizzando filtri definiti dall'utente."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Abbina tutto",
+          "match-any": "Abbina qualsiasi"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Escludi",
+          "include": "Includi"
         }
       },
       "label-conditions": "Condizioni",
       "label-filter-type": "Tipo di filtro",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Filtra i dati per valori"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nessun campo di testo trovato"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Seleziona campo di testo"
         }
       },
       "label-field": "Campo",
@@ -13281,10 +13285,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Manipola la formattazione dei campi stringa."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Formatta stringa"
       }
     },
     "format-time-transfomer-editor": {
@@ -13296,72 +13300,72 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Imposta il formato di output di un campo temporale"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Formatta ora"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Utilizza i valori di riga per calcolare un nuovo campo."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Aggiungi campo dal calcolo"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Imposta unità, min, max e altro ancora."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Configurazione dai risultati della query"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Genera dati di mappa di calore dai dati di origine."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Crea mappa di calore"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Appiattisci i risultati etichettati in una tabella unita da etichette."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Unisci per etichette"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Dividi un set di dati a frame singolo in più serie."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Partizione per valori"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Converti ogni riga in un campo con configurazione dinamica."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Righe a campi"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Applica operazioni spaziali ai risultati della query."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Operazioni spaziali"
       }
     },
     "get-timezone-options": {
       "label": {
         "browser": "Browser",
-        "utc": ""
+        "utc": "UTC"
       }
     },
     "get-tooltips": {
@@ -13369,10 +13373,10 @@
       "json-value": "Valore JSON:",
       "map-valid-paths": {
         "description": {
-          "extract-fields-from-object": "",
-          "extract-value": "",
-          "extract-value-first-element": "",
-          "extract-value-second-element": ""
+          "extract-fields-from-object": "=> estrai campi dall'oggetto",
+          "extract-value": "=> estrai <1>{{ value }}</1>",
+          "extract-value-first-element": "=> estrai <1>{{ value }}</1> primo elemento",
+          "extract-value-second-element": "=> estrai <1>{{ value }}</1> secondo elemento"
         }
       },
       "valid-paths": "Percorsi validi:"
@@ -13380,15 +13384,15 @@
     "get-transformer-option-pane": {
       "root": {
         "title": {
-          "root": ""
+          "root": "radice"
         }
       }
     },
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Calcola",
+          "group-by": "Raggruppa per"
         }
       },
       "placeholder-ignored": "Ignorato",
@@ -13396,42 +13400,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Raggruppa i dati in base a un valore di campo e crea dati aggregati."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Raggruppa per"
       },
       "title-calc-alert": "I calcoli non avranno alcun effetto se non sono presenti campi da raggruppare"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Raggruppa i dati in base a un valore di campo e crea tabelle nidificate con i dati raggruppati."
       },
       "description-show-field-names": "Se abilitato, le tabelle nidificate mostreranno i nomi dei campi come intestazione della tabella",
       "label-show-field-names-in-nested-tables": "Mostra i nomi dei campi nelle tabelle nidificate",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Raggruppa in tabelle nidificate"
       },
       "title-calc-alert": "I calcoli non avranno alcun effetto se non sono presenti campi da raggruppare."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Riepiloga e riorganizza i dati in base a tre campi."
       },
       "label-cell-value": "Valore cella",
       "label-column": "Colonna",
       "label-empty-value": "Valore vuoto",
       "label-row": "Riga",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Raggruppamento in matrice"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Calcola un istogramma dai dati di input."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Istogramma"
       },
       "placeholder-auto": "Automatico",
       "placeholder-default": "Impostazione predefinita: 30",
@@ -13443,14 +13447,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Combina le righe di 2 o più tabelle, in base a un campo correlato."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Unisci per campo"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Obbligatorio",
       "info": {
         "input-contain-labels": "Il dato inserito non contiene etichette",
         "no-input-or-labels-found": "Nessun inserimento (o etichetta) trovato",
@@ -13474,8 +13478,8 @@
       "label-value-field-name": "Nome campo valore",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Colonne",
+          "rows": "Righe"
         }
       },
       "placeholder-optional-select-label": "(Opzionale) Seleziona etichetta",
@@ -13483,18 +13487,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Raggruppa le serie per tempo e restituisci etichette o tag come campi."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Etichette a campi"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Limita il numero di elementi visualizzati."
       },
       "name": {
-        "limit": ""
+        "limit": "Limita"
       },
       "placeholder-value-or-variable": "Valore o variabile"
     },
@@ -13507,11 +13511,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Unisci più serie. I valori verranno combinati in un'unica riga."
       },
       "merge-effect-applied-single-frame": "L'unione non ha alcun effetto se applicata a un singolo fotogramma.",
       "name": {
-        "merge": ""
+        "merge": "Unisci serie/tabelle"
       }
     },
     "multi-info": {
@@ -13523,14 +13527,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Riordina, nascondi o rinomina i campi."
       },
-      "field-order": "",
+      "field-order": "Ordine dei campi",
       "field-order-auto": "Automatico",
-      "field-order-manual": "",
+      "field-order-manual": "Manuale",
       "first-frame-warning": "Organizza campi funziona solo con un singolo fotogramma. Valuta di applicare una trasformazione di unione o di filtrare prima l'inserimento.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Organizza i campi per nome"
       }
     },
     "partion-by-values-editor": {
@@ -13549,8 +13553,8 @@
       "label-select-field": "Seleziona campo",
       "naming-modes-options": {
         "label": {
-          "as-frame-name": "",
-          "as-label": ""
+          "as-frame-name": "Come nome del fotogramma",
+          "as-label": "Come etichetta"
         }
       },
       "partition-values-works-single-frame": "Partizione per valori funziona solo con un singolo fotogramma.",
@@ -13558,10 +13562,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Estendi i frame di dati dal formato largo al formato lungo."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Prepara serie temporali"
       }
     },
     "prepare-time-series-editor": {
@@ -13569,26 +13573,26 @@
       "label-info": "Informazioni",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Converti ogni frame in formato lungo"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Serie temporali lunghe"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Crea un nuovo frame per ogni coppia tempo/numero"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Serie temporali multi-frame"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Crea un singolo frame unito per tempo"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Serie temporali ampie"
         }
       }
     },
@@ -13603,7 +13607,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Riduci tutte le righe o i punti dati a un singolo valore (ad es. massimo, media)."
       },
       "label-calculations": "Calcoli",
       "label-include-time": "Includi l'ora",
@@ -13611,16 +13615,16 @@
       "label-mode": "Modalità",
       "modes": {
         "description": {
-          "collapse-field-single-value": "",
-          "create-table-series-value": ""
+          "collapse-field-single-value": "Comprimi ogni campo in un singolo valore",
+          "create-table-series-value": "Crea una tabella con una riga per ogni valore della serie"
         },
         "label": {
-          "reduce-fields": "",
-          "series-to-rows": ""
+          "reduce-fields": "Riduci i campi",
+          "series-to-rows": "Serie in righe"
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Riduci"
       },
       "placeholder-choose-stat": "Scegli stat"
     },
@@ -13630,18 +13634,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Crea un nuovo dataframe contenente i valori previsti da un modello statistico."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Linea di tendenza"
       }
     },
     "regression-transformer-editor": {
       "label": {
-        "cubic": "",
-        "quadratic": "",
-        "quartic": "",
-        "quintic": ""
+        "cubic": "Cubica",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
+        "quadratic": "Quadrata",
+        "quartic": "Quartica",
+        "quintic": "Quintica",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Grado",
       "label-model-type": "Tipo di modello",
@@ -13650,22 +13659,23 @@
       "label-y-field": "Campo Y",
       "model-type-options": {
         "label": {
-          "linear": "",
-          "polynomial": ""
+          "linear": "Lineare",
+          "polynomial": "Polinomiale"
         }
       },
-      "regression": "",
+      "regression": "regressione",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Analisi della regressione"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Numero di punti X, Y da prevedere"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Rinomina parti dei risultati della query utilizzando un'espressione regolare e un modello di sostituzione."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Rinomina i campi per regex"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13679,62 +13689,62 @@
       "label-mode": "Modalità",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Combina i dati di due tabelle ogni volta che ci sono valori corrispondenti in un campo comune a entrambe le tabelle.",
+          "join-on-a-field": "Unisci su un valore di campo con valori duplicati. Non performante outer join utilizzato al meglio per i dati tabulari (SQL like).",
+          "keep-all-rows": "Mantieni tutte le righe di qualsiasi tabella con un valore. Unisci su valori di campo distinti. Prestante e meglio utilizzato per le serie temporali."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Interno",
+          "outer-tabular": "Esterno (tabulare)",
+          "outer-time-series": "Esterno (serie temporali)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Unisci più serie. Restituisci tempo, metrica e valori come riga."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Serie a righe"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Ordina i campi in un frame."
       },
       "label-field": "Campo",
       "label-reverse": "Inverti",
       "name": {
-        "sort-by": ""
+        "sort-by": "Ordina per"
       },
       "placeholder-select-field": "Seleziona campo"
     },
     "supplier": {
       "description": {
-        "apply-spatial-operations-to-the-geometry": "",
-        "create-a-line-between-two-points": "",
-        "geometry-define-field-headingdistancearea": ""
+        "apply-spatial-operations-to-the-geometry": "Applica operazioni spaziali alla geometria",
+        "create-a-line-between-two-points": "Crea una linea tra due punti",
+        "geometry-define-field-headingdistancearea": "Usa la geometria per definire un nuovo campo (intestazione/distanza/area)"
       },
       "label": {
-        "area": "",
-        "as-line": "",
-        "calculate-value": "",
-        "distance": "",
-        "heading": "",
-        "line-builder": "",
-        "prepare-spatial-field": "",
-        "transform": ""
+        "area": "Area",
+        "as-line": "Come linea",
+        "calculate-value": "Calcola valore",
+        "distance": "Distanza",
+        "heading": "Intestazione",
+        "line-builder": "Generatore di linee",
+        "prepare-spatial-field": "Prepara campo spaziale",
+        "transform": "Trasforma"
       }
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Converti i dati delle serie temporali in righe di tabella in modo che possano essere visualizzati in formato tabulare o sparkline."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "La trasformazione da serie temporale a tabella richiede almeno un frame di serie temporale per funzionare. Al momento non ne hai."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Serie temporali in tabella"
       }
     },
     "time-series-table-transform-editor": {
@@ -13752,15 +13762,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Trasponi il dataframe."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Trasponi"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Ruota",
+        "transform": "Trasforma",
+        "translate": "Traduci"
       }
     },
     "unary-operation-editor": {
@@ -13769,13 +13779,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Calcola nuovi campi",
+        "combine": "Combina",
+        "create-new-visualization": "Crea nuova visualizzazione",
+        "filter": "Filtra",
+        "perform-spatial-operations": "Esegui operazioni spaziali",
+        "reformat": "Riformatta",
+        "reorder-and-rename": "Riordina e rinomina"
       },
       "special-value-options": {
         "description": {
@@ -13813,23 +13823,23 @@
       "tooltip-window-size-percent": "Imposta la dimensione della finestra come percentuale dei dati totali",
       "type-options": {
         "label": {
-          "centered": "",
-          "trailing": ""
+          "centered": "Centrato",
+          "trailing": "Inferiore"
         }
       },
       "window-size-mode-options": {
         "label": {
-          "fixed": "",
-          "percentage": ""
+          "fixed": "Fisso",
+          "percentage": "Percentuale"
         }
       }
     }
   },
   "trend": {
-    "category-x-axis": "",
-    "description-x-field": "",
-    "name-x-field": "",
-    "placeholder-x-field": ""
+    "category-x-axis": "Asse X",
+    "description-x-field": "Un valore numerico crescente",
+    "name-x-field": "Campo X",
+    "placeholder-x-field": "Primo valore numerico"
   },
   "upgrade-box": {
     "discovery-text": "Hai scoperto una funzionalità Pro!",
@@ -13846,7 +13856,7 @@
     "title": "Organizzazioni"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Nessun utente trovato",
     "select-aria-label": "Selettore utente",
     "select-placeholder": "Inizia a digitare per cercare l'utente"
   },
@@ -13932,33 +13942,33 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Vuoi davvero eliminare la variabile \"{{variableToDelete}}\"?",
+      "confirmText-delete": "Elimina",
       "title-delete-variable": "Elimina variabile"
     },
     "create-ad-hoc-variable-adapter": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": ""
+        "add-keyvalue-filters-on-the-fly": "Aggiungi filtri chiave/valore al volo."
       }
     },
     "create-custom-variable-adapter": {
       "description": {
-        "define-variable-values-manually": ""
+        "define-variable-values-manually": "Definisci manualmente i valori delle variabili"
       }
     },
     "create-interval-variable-adapter": {
       "description": {
-        "define-timespan-interval": ""
+        "define-timespan-interval": "Definisci un intervallo di tempo (ad esempio: {{timeIntervals}})"
       }
     },
     "create-query-variable-adapter": {
       "description": {
-        "variable-values-fetched-datasource-query": ""
+        "variable-values-fetched-datasource-query": "I valori delle variabili vengono recuperati da una query dell'origine dati"
       }
     },
     "data-source-variable-slice": {
       "text": {
-        "default": "",
+        "default": "predefinito",
         "no-data-sources-found": "Nessuna origine dati trovata"
       }
     },
@@ -13983,40 +13993,40 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Come ordinare i valori di questa variabile",
-      "name-sort": "",
+      "name-sort": "Ordina",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Alfabetico (asc)",
+          "alphabetical-caseinsensitive-asc": "Alfabetico (senza distinzione tra maiuscole e minuscole, asc)",
+          "alphabetical-caseinsensitive-desc": "Alfabetico (senza distinzione tra maiuscole e minuscole, disc)",
+          "alphabetical-desc": "Alfabetico (disc)",
+          "disabled": "Disabilitate",
+          "natural-asc": "Naturale (asc)",
+          "natural-desc": "Naturale (disc)",
+          "numerical-asc": "Numerico (asc)",
+          "numerical-desc": "Numerico (disc)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Aggiungi opzione",
+      "description": "Aggiungi opzioni personalizzate oltre ai risultati della query",
+      "label-placeholder": "visualizza etichetta",
+      "remove-option-button-label": "Rimuovi opzione",
+      "value-placeholder": "valore, stringa vuota predefinita"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Come ordinare le opzioni statiche con i risultati della query"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Valore predefinito",
       "placeholder-default-value-if-any": "valore predefinito, se presente",
       "text-options": "Opzioni testo"
     },
     "transform-usages-to-network": {
       "result": {
         "label": {
-          "dashboard": ""
+          "dashboard": "dashboard"
         }
       }
     },
@@ -14038,8 +14048,8 @@
       "description-optional-display-name": "Nome visualizzato facoltativo",
       "description-template-variable-characters": "Il nome della variabile del modello. (Massimo 50 caratteri)",
       "general": "Generale",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Etichetta",
+      "name-name": "Nome",
       "placeholder-descriptive-text": "Testo descrittivo",
       "placeholder-label-name": "Nome etichetta",
       "placeholder-variable-name": "Nome variabile",
@@ -14055,13 +14065,13 @@
       "tooltip-remove-variable": "Rimuovi variabile"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Descrizione"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Attiva/disattiva tutti i valori"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Seleziona il tipo di variabile"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Mostra utilizzi"
@@ -14088,47 +14098,47 @@
   "welcome": {
     "welcome-banner": {
       "need-help": "Hai bisogno di aiuto?",
-      "welcome-to-grafana": ""
+      "welcome-to-grafana": "Ti diamo il benvenuto in Grafana"
     }
   },
   "xychart": {
-    "category-xychart": "",
-    "name-fill-opacity": "",
-    "name-line-style": "",
-    "name-line-width": "",
-    "name-max-point-size": "",
-    "name-min-point-size": "",
-    "name-point-shape": "",
-    "name-point-size": "",
-    "name-point-stroke-width": "",
-    "name-series-mapping": "",
-    "name-show": "",
+    "category-xychart": "Grafico XY",
+    "name-fill-opacity": "Opacità del riempimento",
+    "name-line-style": "Stile linea",
+    "name-line-width": "Larghezza linea",
+    "name-max-point-size": "Dimensione massima del punto",
+    "name-min-point-size": "Dimensione minima del punto",
+    "name-point-shape": "Forma punto",
+    "name-point-size": "Dimensione punto",
+    "name-point-stroke-width": "Larghezza spessore punto",
+    "name-series-mapping": "Mappatura della serie",
+    "name-show": "Mostra",
     "point-shape-options": {
-      "label-circle": "",
-      "label-square": ""
+      "label-circle": "Cerchio",
+      "label-square": "Quadrato"
     },
     "series-editor": {
-      "add-series": "",
-      "aria-label-select-series": "",
-      "label-color-field": "",
+      "add-series": "Aggiungi serie",
+      "aria-label-select-series": "Seleziona serie {{seriesNum}}",
+      "label-color-field": "Campo Colore",
       "label-frame": "Fotogramma",
-      "label-size-field": "",
+      "label-size-field": "Campo Dimensioni",
       "label-x-field": "Campo X",
       "label-y-field": "Campo Y",
-      "placeholder-all-frames": "",
-      "placeholder-select-frame": "",
-      "placeholder-x-field": "",
-      "placeholder-y-field": "",
-      "tooltip-delete-series": ""
+      "placeholder-all-frames": "Tutti i fotogrammi",
+      "placeholder-select-frame": "Seleziona fotogramma",
+      "placeholder-x-field": "Primo campo numerico o temporale in ogni fotogramma",
+      "placeholder-y-field": "Campi numerici rimanenti in ogni fotogramma",
+      "tooltip-delete-series": "Elimina serie"
     },
     "series-mapping-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automatico",
+      "label-manual": "Manuale"
     },
     "show-options": {
-      "label-both": "",
-      "label-lines": "",
-      "label-points": ""
+      "label-both": "Entrambi",
+      "label-lines": "Linee",
+      "label-points": "Punti"
     }
   }
 }
\ No newline at end of file
diff --git a/public/locales/ja-JP/grafana.json b/public/locales/ja-JP/grafana.json
index 6920e43b39a..360ac869e8b 100644
--- a/public/locales/ja-JP/grafana.json
+++ b/public/locales/ja-JP/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "一部機能は安定版（GA）として標準で有効になっていますが、いくつかの機能は現在暫定的なベータ版の段階であり、早期導入することが可能です。",
       "confirm-modal-body-2": "変更する前に、各機能の変更がもたらす影響を理解することをお勧めします。",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "変更を保存",
       "get-stage-cell": {
         "beta": "ベータ版",
         "content-general-availability": "一般提供",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "組織を削除",
-      "confirmText-delete": "",
+      "confirmText-delete": "削除",
       "title-delete": "削除"
     },
     "anon-users": {
       "not-found": "匿名ユーザーは見つかりませんでした。"
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "すべてのデバイスから強制的にログアウトしてもよろしいですか？",
+      "confirmText-confirm-logout": "ログアウトを確認",
+      "confirmText-force-logout": "強制ログアウト",
       "title-force-logout-from-all-devices": "すべてのデバイスから強制ログアウトする"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "保存"
     },
     "edit-org": {
       "access-denied": "この組織のユーザーを表示する権限がありません。この組織を更新するには、サーバー管理者に連絡してください。",
@@ -216,11 +216,11 @@
       "not-editable": "このユーザーの役割は、認証プロバイダーから同期されているため編集できません。詳細については、<1>Grafana認証ドキュメント</1>を参照してください。"
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "{{user}}を削除してよろしいですか？",
       "columns": {
         "aria-label-role": "ロール"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "削除",
       "delete-aria-label": "ユーザーを削除：{{name}}",
       "title-delete": "削除"
     },
@@ -252,7 +252,7 @@
       "info-description": "これらのシステム設定は、grafana.iniまたはcustom.iniで定義されています（またはENV変数で上書きされています）。これらを変更するには、現在、Grafanaを再起動する必要があります。"
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "削除を確認する"
     },
     "upgrade-info": {
       "title": "エンタープライズライセンス"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "変更",
-      "confirmText-change": "",
+      "confirmText-change": "変更",
       "grafana-admin-key": "Grafana管理者",
       "grafana-admin-no": "いいえ",
       "grafana-admin-yes": "はい",
       "title": "権限"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "本当にこのユーザーを削除してもよろしいですか？",
+      "body-disable": "このユーザーを無効にしてもよろしいですか？",
+      "confirmText-delete-user": "ユーザーを削除",
+      "confirmText-disable-user": "ユーザーを無効化",
       "delete-button": "ユーザーの削除",
       "disable-button": "無効のユーザー",
       "edit-button": "編集",
@@ -331,7 +331,7 @@
       "title-disable-user": "ユーザーを無効化"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "保存"
     },
     "user-sessions": {
       "browser-column": "ブラウザとOS",
@@ -382,12 +382,12 @@
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "AIアラートルールボタンの読み込みに失敗しました",
+        "feedback-button": "AIフィードバックボタンの読み込みに失敗しました",
+        "improve-annotations-button": "AI注釈改善ボタンの読み込みに失敗しました",
+        "improve-labels-button": "AIラベル改善ボタンの読み込みに失敗しました",
+        "template-button": "AIテンプレートボタンの読み込みに失敗しました",
+        "triage-button": "AIトリアージボタンの読み込みに失敗しました"
       }
     },
     "alert": {
@@ -489,7 +489,7 @@
       "title-muting-grouping-and-timings": "ミュート、グループ化、タイミング"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "データソースが見つかりません"
     },
     "alert-menu": {
       "copy-link": "リンクをコピー",
@@ -515,7 +515,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "アラートルール"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -583,7 +583,7 @@
       "view-configuration": "設定を表示"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "はい、設定をリセットします",
       "gma-manual-configuration-description": "内部Grafana Alertmanager設定は手動で変更できません。この設定を変更するには、UI経由で個々のリソースを編集してください。",
       "gma-manual-configuration-is-not-supported": "手動構成の変更はサポートされていません",
       "message": {
@@ -598,13 +598,13 @@
       "title-resetting-alertmanager-configuration": "Alertmanager設定のリセット"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "設定をこのバージョンに復元してもよろしいですか？未保存の変更はすべて失われます。",
       "columns": {
         "compare": "比較",
         "restore": "復元",
         "text-latest": "最新"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "はい、構成を復元します",
       "loading": "読み込み中...",
       "no-previous-configurations": "以前の設定はありません",
       "this-might-take-a-while": "これには少し時間がかかります…",
@@ -884,10 +884,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "連絡先「{{contactPointName}}」のその他の操作",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "削除",
       "button-edit": "編集",
       "button-view": "表示",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "エクスポート",
       "export-label-export": "エクスポート",
       "label-delete": "削除",
       "label-manage-permissions": "権限を管理する",
@@ -1420,7 +1420,7 @@
       "label-disable-resolved-message": "解決済みメッセージを無効にする"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "グループを読み込み中...",
       "message": {
         "must-be-a-positive-integer": "正の整数で入力してください。",
         "must-enter-a-group-name": "グループ名の入力が必要です"
@@ -1517,7 +1517,7 @@
       "group-loading-error": "グループの読み込み中にエラーが発生しました",
       "interval": "間隔",
       "namespace": "名前空間",
-      "new": "",
+      "new": "新規",
       "title": {
         "back": ""
       }
@@ -1549,7 +1549,7 @@
     },
     "group-loader": {
       "group-load-failed": "{{ namespaceName }}の{{ groupName }}グループからルールを読み込めませんでした",
-      "no-rules": ""
+      "no-rules": "このグループにルールが見つかりません"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "グループを削除中です"
@@ -1878,10 +1878,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "データソースが見つかりません"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "「{{muteTiming}}」を削除してもよろしいですか？"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "無効",
@@ -2132,10 +2132,10 @@
         "conflict": "通知ポリシーツリーは別のユーザーによって更新されました。",
         "error-code": "エラーメッセージ：「{{error}}」",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "ルートを追加または更新できません：マッチャー、{{-matchers}}をマージすると、外部ルーティングツリーと競合し、このルートには到達できなくなります。"
         },
         "suffix": "ページを更新して、やり直してください。",
-        "title": ""
+        "title": "通知ポリシーの追加または更新に失敗しました"
       },
       "n-more-policies_other": "{{count}}件の追加のポリシー"
     },
@@ -2190,7 +2190,7 @@
     "query-and-expressions-step": {
       "add-query": "クエリを追加",
       "body-queries-expressions-configured": "アラート対象となるクエリまたは式を少なくとも1つ作成してください",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "無効化する",
       "expressions": "式",
       "loading-data-sources": "データソース読み込み中...",
       "manipulate-returned-queries-other-operations": "数式やその他の演算を使用してクエリから返されたデータを操作します。",
@@ -2244,7 +2244,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "記録ルール"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "次の理由によりクエリエディタを読み込めませんでした：{{errorMessage}}"
@@ -2264,7 +2264,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "元のルールはプロビジョニングされたもので、UI上で作成したルールには使用できないため、コピーしたルールには新しい評価グループを設定する必要があります。",
       "body-not-provisioned": "新しいルールはプロビジョニングされたルールとしてマーク<1>されません</1>。",
-      "confirmText-copy": "",
+      "confirmText-copy": "コピー",
       "title-copy-provisioned-alert-rule": "プロビジョニングされたアラートルールをコピー"
     },
     "redirect-to-rule-viewer": {
@@ -2487,7 +2487,7 @@
       "new-alert-rule": "新しいアラートルール",
       "new-datasource-recording-rule": "新しいデータソース記録ルール",
       "new-grafana-recording-rule": "新しいGrafana記録ルール",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "エクスポート用の新しいアラートルール",
       "pagination": {
         "next-page": "もっと見る..."
       },
@@ -2658,7 +2658,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "アラートマネージャー"
       }
     },
     "settings-content": {
@@ -2796,7 +2796,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "プレビューを更新",
-      "empty-state": "",
+      "empty-state": "プレビューを表示するには、テンプレートコンテンツを追加してください",
       "label-preview": "プレビュー",
       "refresh": "更新"
     },
@@ -2815,7 +2815,7 @@
       "loading": "読み込み中...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "通知テンプレートを選択"
         },
         "label": {
           "select-notification-template": "通知テンプレートを選択"
@@ -2843,8 +2843,8 @@
     },
     "templates-table": {
       "actions": "操作",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "テンプレートグループ「{{template}}」を削除してもよろしいですか？",
+      "confirmText-yes-delete": "はい、削除します",
       "no-templates-defined": "テンプレートがまだ定義されていません。",
       "template-group": "テンプレートグループ",
       "title-delete-template-group": "テンプレートグループを削除"
@@ -2899,7 +2899,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "アラートルール、記録ルール、評価間隔を管理する"
       }
     },
     "to-gma": {
@@ -2979,7 +2979,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "はい、削除します"
       }
     },
     "use-delete-policy-modal": {
@@ -3139,7 +3139,7 @@
       "annotation": "注釈",
       "first-value": "最初の値",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "不明なフィールド名"
     },
     "empty-state": {
       "button-title": "注釈クエリを追加",
@@ -3149,12 +3149,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "このフィールドが定義されると、注釈は範囲として扱われます",
+        "results-split-on-comma": "結果はカンマ (,) で分割されます"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}、または最初のテキストフィールド",
+        "time-or-the-first-field": "{{defaultField}}、または最初の時間フィールド"
       }
     },
     "standard-annotation-query-editor": {
@@ -3232,9 +3232,9 @@
       "define-allowed-teams-ids-label": "許可されたチームIDを定義する",
       "display-name-description": "ログインページに「...でサインイン」と表示されます。複数のIDプロバイダーまたはSSOプロトコルを使用する場合に役立ちます。",
       "display-name-label": "表示名",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Azure AD/Entra IDテナントでユーザーの領域を示し、ログインプロセスを合理化するためのパラメーター。",
+      "domain-hint-label": "ドメインヒント",
+      "domain-hint-valid-domain": "このフィールドには有効なドメインを入力する必要があります。",
       "email-attribute-name-description": "OAuth2 IDトークンの属性マップ内でユーザーメール検索に使用するキーの名前。",
       "email-attribute-name-label": "メール属性名",
       "email-attribute-path-description": "ユーザー情報からユーザーメールを検索する際に使用するJMESPath式。",
@@ -3251,11 +3251,11 @@
       "id-token-attribute-name-label": "IDトークン属性名",
       "login-attribute-path-description": "ユーザーIDトークンからのユーザーログイン検索に使用するJMESPath式。",
       "login-attribute-path-label": "ログイン属性パス",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "同意",
+      "login-prompt-description": "ユーザーがアイデンティティプロバイダー (IdP) でログインするときのユーザーインタラクションのタイプを示します。",
+      "login-prompt-label": "ログインプロンプト",
+      "login-prompt-login": "ログイン",
+      "login-prompt-select-account": "アカウントの選択",
       "managed-identity-client-id-description": "OAuth2アプリのフェデレーテッドID資格情報のマネージドIDクライアントID。",
       "managed-identity-client-id-label": "FICマネージドIDクライアントID",
       "name-attribute-path-description": "ユーザーIDトークンからのユーザー名検索に使用するJMESPath式。\nこの名前は、ユーザーの表示名として使用されます。",
@@ -3291,7 +3291,7 @@
       "team-ids-github": "チームIDの整数リスト。",
       "team-ids-label": "チームID",
       "team-ids-numbers": "チームIDは数字である必要があります。",
-      "team-ids-other": "",
+      "team-ids-other": "チームIDの文字列リスト。",
       "team-ids-placeholder": "チームIDを入力し、Enterキーを押して追加します",
       "teams-url-description": "チームIDを照会するために使用するURL。設定されていない場合、デフォルト値は/teamsです。",
       "teams-url-description-oauth": "「{{ teamsURLLabel }}」を設定する場合は、「{{ teamIDsAttributePathLabel }}」も設定する必要があります。",
@@ -3335,7 +3335,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "デフォルト値にリセット"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "リセット",
       "disable": "無効化",
       "disabling": "無効にしています...",
       "discard": "破棄",
@@ -3355,7 +3355,7 @@
       "text-badge-not-enabled": "有効になっていません"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIMは現在開発中であり、本番環境での使用は推奨されていません。ご注意ください。また、変更される可能性があります。"
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "IdPの.well-known/openid-configurationエンドポイント",
@@ -3473,8 +3473,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "プロビジョニングされたリソースの一括削除",
+      "bulk-move-provisioned-resources": "プロビジョニングされたリソースの一括移動",
       "cancel-button": "キャンセル",
       "confirmation-text": "削除",
       "delete-button": "削除",
@@ -3493,8 +3493,8 @@
       "move-modal-title": "移動",
       "moving": "移動中…",
       "new-folder-name-required-phrase": "フォルダ名が必要です。",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "プロビジョニング済みのリソースと未プロビジョニングのリソースの両方が選択されています。これらは同時に処理できません。プロビジョニングされたリソースのみまたはプロビジョニングされていないリソースのみを選択して、再試行してください。",
+      "selected-mix-resources-modal-title": "混在したリソースタイプが選択されました"
     },
     "actions": {
       "button-to-recently-deleted": "最近削除された"
@@ -3507,24 +3507,24 @@
       "this-folder-is-empty": "このフォルダは空です"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_other": ""
+      "all-deleted": "すべてのリソースが正常に削除されました",
+      "all-moved": "すべてのリソースが正常に移動されました",
+      "button-done": "完了",
+      "progress-title": "成功",
+      "failed-alert_other": "{{count}}件の項目が失敗しました"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "キャンセル",
+      "button-delete": "削除",
+      "button-deleting": "削除中…",
+      "delete-warning": "これにより、選択したフォルダとその子フォルダが削除されます。影響のある項目は次のとおりです。",
+      "error-path-not-found": "パスが見つかりませんでした"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "キャンセル",
+      "button-move": "移動",
+      "button-moving": "移動中…",
+      "deleting": "削除しています",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3532,14 +3532,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "ファイルコンテンツが見つかりません。",
+      "error-path-not-found": "パスが見つかりませんでした",
+      "error-target-folder-path-missing": "ターゲットフォルダパスが見つかりません",
+      "error-title": "ターゲットフォルダエラー",
+      "move-warning": "これにより、選択したフォルダとその子フォルダが移動されます。影響のある項目は次のとおりです。",
+      "moving": "移動中…",
+      "progress": "進捗状況：{{current}}/{{total}}",
+      "target-folder": "移動先フォルダ"
     },
     "counts": {
       "alertRule_other": "{{count}}件のアラートルール",
@@ -3565,7 +3565,7 @@
       "button-delete": "削除",
       "button-deleting": "削除中…",
       "delete-warning": "このフォルダとその下位のすべてのフォルダやコンテンツが削除されます。全部で、次に影響します: ",
-      "success-message": ""
+      "success-message": "フォルダが正常に削除されました"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "下位情報を取得できません"
@@ -3590,7 +3590,7 @@
       "empty-message": "フォルダが見つかりません",
       "error-title": "フォルダの読み込み中にエラーが発生しました",
       "non-folder-item": "非フォルダ {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "ダッシュボード",
       "search-placeholder": "フォルダを検索",
       "unknown-error": "不明なエラー"
     },
@@ -3619,7 +3619,7 @@
       "folder-name-input-placeholder-enter-folder-name": "フォルダ名を入力してください",
       "label-folder-name": "フォルダ名",
       "text-pull-request-created": "このフォルダへの変更を含むプルリクエストが作成されました。",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "フォルダは{{folderName}}として作成されます",
       "title-pull-request-created": "プルリクエストが作成されました",
       "title-this-repository-is-read-only": "このリポジトリは読み取り専用です"
     },
@@ -3738,7 +3738,7 @@
     "category-selected-connection": "選択した接続",
     "category-selected-element": "選択した要素（{{element}}）",
     "category-size": "サイズ",
-    "category-tooltip": "",
+    "category-tooltip": "ツールチップ",
     "cloud-item": {
       "category-cloud": "クラウド",
       "label": {
@@ -3982,10 +3982,10 @@
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "ツールチップモード",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "無効",
+        "label-enabled": "有効"
       }
     },
     "tree-navigation-editor": {
@@ -4354,7 +4354,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "クエリを実行"
     }
   },
   "dashboard": {
@@ -4517,7 +4517,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "続行"
         },
         "title": {
           "proceed-to-external-site": "外部サイトに移動しますか？"
@@ -4623,11 +4623,11 @@
     },
     "edit-actions": {
       "add": "{{typeName}}を追加",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
+      "add-conditional-rule": "{{ruleDescription}}ルールを追加",
+      "duplicate-panel": "パネルを複製",
+      "edit-query-result-rule": "クエリ結果ルールを変更",
+      "edit-template-variable-rule": "テンプレート変数ルールを変更",
+      "edit-time-range-rule": "時間範囲ルールを変更",
       "move": "{{typeName}}を移動",
       "panel-background": "パネルの背景を変更",
       "panel-description": "パネルの説明を変更",
@@ -4642,7 +4642,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "ダッシュボード",
-        "element": "",
+        "element": "要素",
         "local-variable": "ローカル変数",
         "multiple-elements": "複数の要素",
         "multiple-elements-delete-text": "これらの要素を削除してもよろしいですか？",
@@ -4724,10 +4724,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "ダッシュボードをエクスポート"
       },
       "menu": {
-        "label": ""
+        "label": "ダッシュボードをエクスポート"
       }
     },
     "fetch-dashboard": {
@@ -4749,9 +4749,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "デフォルト",
+          "shared-crosshair": "共有クロスヘア",
+          "shared-tooltip": "共有ツールチップ"
         }
       }
     },
@@ -4804,14 +4804,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "次のパネルに注釈データを送信しない",
+        "annotation-panels-support-annotations": "注釈をサポートするすべてのパネルに注釈データを送信",
+        "annotations-explicitly-listed-panels": "明示的にリストされたパネルに注釈を送信"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "すべてのパネル",
+        "all-panels-except": "次を除くすべてのパネル",
+        "selected-panels": "選択したパネル"
       }
     },
     "get-panel-frame-category": {
@@ -5072,7 +5072,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "ダッシュボードをバージョン{{version}}に復元してもよろしいですか？未保存の変更はすべて失われます。",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "バージョン{{version}}に復元",
       "title-restore-version": "バージョンの復元"
     },
     "row-options-button": {
@@ -5124,7 +5124,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "ダッシュボードが保存されました"
     },
     "save-dashboard-as-button": {
       "save-as": "名前を付けて保存"
@@ -5160,7 +5160,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "選択したフォルダには同じ名前のダッシュボードがすでに存在します。<1></1><2>このダッシュボードの保存を続行しますか？</2>",
       "body-version-mismatch": "他のユーザーがこのダッシュボードを更新しました<1></1><2>このダッシュボードを保存しますか？</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "保存して上書き",
       "title-name-exists": "競合",
       "title-version-mismatch": "競合"
     },
@@ -5357,9 +5357,9 @@
       "label-apply-transformation-to": "変換の適用先"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "1つの変換を削除すると、他の変換が破損する可能性があることに注意してください。変換が1つしかない場合は、メインの選択画面に戻ります。",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "削除",
         "title-debug": "デバッグ",
         "title-disable-transformation": "変換を無効化",
         "title-filter": "フィルタリング",
@@ -5380,16 +5380,16 @@
       "placeholder-search-for-transformation": "変換を検索",
       "show-images": "画像を表示",
       "title-add-another-transformation": "別の変換を追加",
-      "view-all": ""
+      "view-all": "すべて表示"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "すべての変換を削除すると、メインの選択画面に戻ります。"
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "別の変換を追加"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "すべて削除",
       "delete-all-transformations": "すべての変換を削除",
       "title-delete-all-transformations": "すべての変換を削除しますか？",
       "tooltip-clear-search": "検索結果をクリア",
@@ -5419,16 +5419,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "変数の説明を変更"
       },
       "hide": {
-        "action": ""
+        "action": "変数の非表示オプションを変更"
       },
       "label": {
-        "action": ""
+        "action": "変数ラベルを変更"
       },
       "name": {
-        "action": ""
+        "action": "変数名を変更"
       }
     },
     "version-history-comparison": {
@@ -5440,7 +5440,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "バージョン{{version}}の選択を切り替え",
       "date": "日付",
-      "name-latest": "",
+      "name-latest": "最新",
       "notes": "メモ",
       "restore": "復元",
       "updated-by": "更新者",
@@ -5518,7 +5518,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "CSV形式で次のように次元を指定：{{name}}, {{value}}",
       "label-data-source": "データソース",
       "label-use-static-key-dimensions": "静的キー次元を使用",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "カスタム値の入力を許可"
     },
     "add-to-dashboard": {
       "message": {
@@ -5592,7 +5592,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "公開URLを取り消す"
       },
       "title": {
         "revoke-public-url": "公開URLを取り消す"
@@ -5605,7 +5605,7 @@
     },
     "custom-variable-form": {
       "custom-options": "カスタムオプション",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "カンマ区切りの値",
       "selection-options": "選択オプション"
     },
     "dashboard-edit-pane-renderer": {
@@ -5626,8 +5626,8 @@
       "label-with-tags": "タグ付き",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "ダッシュボード",
+          "link": "リンク"
         }
       },
       "placeholder-open-dashboard": "ダッシュボードを開く"
@@ -5670,8 +5670,8 @@
       "data-source-options": "データソースオプション",
       "description-instance-name-filter": "変数値リストで選択するデータソースインスタンスの正規表現フィルター。すべての場合は、空欄にしてください。",
       "example-instance-name-filter": "例：<codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "インスタンス名フィルター",
+      "name-type": "タイプ",
       "selection-options": "選択オプション"
     },
     "default-grid-layout-manager": {
@@ -5687,7 +5687,7 @@
       "delete-action": "ダッシュボードを削除する",
       "deleting": "削除中…",
       "drawer-title": "プロビジョニングされたダッシュボードを削除",
-      "success-message": ""
+      "success-message": "ダッシュボードが正常に削除されました"
     },
     "description-label": {
       "description": "説明"
@@ -5716,15 +5716,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "編集可能",
+          "readonly": "読み取り専用"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "デフォルト",
+          "shared-crosshair": "共有クロスヘア",
+          "shared-tooltip": "共有ツールチップ"
         }
       }
     },
@@ -5736,36 +5736,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "即時にキー/値フィルターを追加",
+        "dynamically-switch-source-multiple-panels": "複数のパネルのデータソースを動的に切り替える",
+        "group": "即時にグループ化キーを追加",
+        "hidden-constant-variable": "共有するダッシュボードのメトリックプレフィックスに便利な非表示の定数変数",
+        "users-enter-arbitrary-strings-textbox": "ユーザーはテキストボックスに任意の文字列を入力できます",
+        "values-are-static-and-defined-manually": "値はスタティックであり、手動で定義されます",
+        "values-fetched-source-query": "値はデータソースクエリから取得されます",
+        "values-timespans": "値は時間範囲です。例：1m、1h、1d"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "アドホックフィルター",
+        "constant": "定数",
+        "custom": "カスタム",
+        "data-source": "データソース",
+        "group-by": "グループ化",
+        "interval": "間隔",
+        "query": "クエリ",
+        "textbox": "テキストボックス"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "次のパネルに注釈データを送信しない",
+        "annotation-panels-support-annotations": "注釈をサポートするすべてのパネルに注釈データを送信",
+        "annotations-explicitly-listed-panels": "明示的にリストされたパネルに注釈を送信"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "すべてのパネル",
+        "all-panels-except": "次を除くすべてのパネル",
+        "selected-panels": "選択したパネル"
       }
     },
     "get-panel-frame-options": {
@@ -5793,7 +5793,7 @@
       "group-by-options": "グループ化オプション",
       "label-data-source": "データソース",
       "label-use-static-group-by-dimensions": "静的グループ次元を使用",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "カスタム値の入力を許可"
     },
     "help-wizard": {
       "copy-to-clipboard": "クリップボードにコピー",
@@ -5829,14 +5829,14 @@
       "apply": "適用"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "指定した数で時間範囲を分割して、間隔を動的に計算します",
       "description-calculated-value-below-threshold": "計算値はこのしきい値を下回りません",
       "description-step-count": "値を計算するために現在の時間範囲を分割する回数",
       "interval-options": "間隔オプション",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "自動オプション",
+      "name-min-interval": "最小間隔",
+      "name-step-count": "ステップ数",
+      "name-values": "値"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5856,19 +5856,19 @@
       "usage-count_other": "{{count}}件のダッシュボードで使用中"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "ダッシュボードの移動中にエラーが発生しました",
+      "api-error": "ダッシュボードの移動に失敗しました",
+      "cancel-action": "キャンセル",
+      "current-file-not-found": "現在のダッシュボードファイルが見つかりませんでした",
+      "drawer-title": "プロビジョニング済みダッシュボードを移動",
+      "file-load-error": "ダッシュボードの読み込み中にエラーが発生しました",
+      "loading-file-data": "ダッシュボード読み込み中...",
+      "move-action": "ダッシュボードを移動",
+      "move-read-only-message": "読み取り専用リポジトリのため、このダッシュボードをGrafanaから直接移動することはできません。このダッシュボードを移動するには、Gitリポジトリ内のファイルを移動してください。",
+      "moving": "移動中…",
+      "success-message": "ダッシュボードが正常に移動しました",
+      "target-path-label": "ターゲットパス",
+      "title-this-repository-is-read-only": "このリポジトリは読み取り専用です"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "選択したフォルダに同じ名前のダッシュボードがすでに存在します。このダッシュボードの保存を続行しますか？",
@@ -5876,7 +5876,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "続行"
       },
       "title": {
         "proceed-to-external-site": "外部サイトに移動しますか？"
@@ -5913,8 +5913,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "別の変換を追加",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "すべての変換を削除すると、メインの選択画面に戻ります。",
+      "confirmText-delete-all": "すべて削除",
       "delete-all-transformations": "すべての変換を削除",
       "title-delete-all-transformations": "すべての変換を削除しますか？"
     },
@@ -5967,13 +5967,13 @@
       "description-examples": "名前付きキャプチャグループを使用すると、表示テキストと値を分けることができます（<1>例を参照</1>）。",
       "description-optional": "シリーズ名やメトリックノードセグメントの一部を抽出したい場合の任意設定です。",
       "label-data-source": "データソース",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "スタティックオプションの並び替え",
       "label-target-data-source": "ターゲットデータソース",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "スタティックオプションを使用",
+      "name-regex": "正規表現",
       "query-options": "クエリオプション",
       "selection-options": "選択オプション",
-      "static-options-legend": ""
+      "static-options-legend": "スタティックオプション"
     },
     "resource-export": {
       "label": {
@@ -5986,7 +5986,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "ダッシュボードをバージョン{{version}}に復元してもよろしいですか？未保存の変更はすべて失われます。",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "バージョン{{version}}に復元",
       "title-restore-version": "バージョンの復元"
     },
     "save-button": {
@@ -6005,7 +6005,7 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "ダッシュボードを保存できませんでした"
       },
-      "required": ""
+      "required": "必須"
     },
     "save-dashboard-drawer": {
       "tabs": {
@@ -6032,8 +6032,8 @@
         "title-someone-else-has-updated-this-dashboard": "他のユーザーがこのダッシュボードを更新しました",
         "would-still-dashboard": "このダッシュボードの保存を続行しますか？"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "新しいダッシュボードスキーマ (V2) の制限により、外部へエクスポートする際には、ライブラリパネルは埋め込みコンテンツ付きの通常のパネルに変換されます。",
+      "schema-v2-library-panels-export-title": "ライブラリパネルは通常のパネルに変換されます",
       "title-dashboard-drastically-changed": "ダッシュボードが不可逆的に変更されました"
     },
     "save-dashboard-form-common-options": {
@@ -6079,10 +6079,10 @@
       "description-enables-multiple-values-selected": "複数の値を同時に選択可能にします",
       "description-enables-option-include-variables": "すべての値を含めるオプションを有効にします",
       "description-enables-users-custom-values": "ユーザーがリストにカスタム値を追加できるようにします",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "カスタム値の入力を許可",
+      "name-custom-all-value": "「すべてを選択」時のカスタム値",
+      "name-include-all-option": "すべてのオプションを含める",
+      "name-multi-value": "複数値"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "共有メニューを切り替え"
@@ -6103,7 +6103,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "既定値"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "（任意）",
@@ -6128,8 +6128,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "このパネルのリンクを解除すると、他のダッシュボードに影響を与えずに編集できます。ただし、変更を加えると、元の再利用可能パネルには戻せなくなります。",
+      "confirmText-yes-unlink": "はい、リンクを解除します",
       "title-really-unlink-panel": "このパネルのリンクを解除してもよろしいですか？"
     },
     "unsaved-changes-modal": {
@@ -6147,7 +6147,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "ダッシュボードが保存されました"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "この変数はどの変数やダッシュボードからも参照されていません。",
@@ -6159,15 +6159,15 @@
       "aria-label-variable-editor-form": "変数エディタフォーム",
       "back-to-list": "一覧に戻る",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "変数を削除"
       },
       "delete": "削除",
       "description-optional-display-name": "表示名（任意）",
       "description-template-variable-characters": "テンプレート変数の名前（最大50文字）。",
       "general": "一般",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "説明",
+      "name-label": "ラベル",
+      "name-name": "名前",
       "placeholder-descriptive-text": "説明用のテキスト",
       "placeholder-label-name": "ラベル名",
       "placeholder-variable-name": "変数名",
@@ -6182,8 +6182,8 @@
       "variable": "変数"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "{{variable}}を削除してもよろしいですか？",
+      "confirmText-delete-variable": "変数を削除",
       "title-delete-variable": "変数を削除",
       "tooltip-duplicate-variable": "変数を複製",
       "tooltip-remove-variable": "変数を削除"
@@ -6191,15 +6191,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "ラベル",
+          "nothing": "なし",
+          "variable": "変数"
         }
       },
       "label": "非表示"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "変数タイプ"
     },
     "variable-usages-button": {
       "title-show-usages": "{{variableId}}の使用状況の表示",
@@ -6227,7 +6227,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "バージョン{{version}}の選択を切り替え",
       "date": "日付",
-      "name-latest": "",
+      "name-latest": "最新",
       "notes": "メモ",
       "restore": "復元",
       "updated-by": "更新者",
@@ -6618,7 +6618,7 @@
     },
     "color-dimension-editor": {
       "label-fixed-color": "固定色",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "フィールドが見つかりません"
     },
     "file-dropzone-custom-children": {
       "upload": "アップロード"
@@ -6657,7 +6657,7 @@
       },
       "label-limit": "制限",
       "label-value": "値",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "フィールドが見つかりません",
       "scalar-options": {
         "description-clamped": "最大値と最小値に固定されたフィールド値を使用",
         "description-mod": "最大値を法とした剰余値を使用",
@@ -6668,13 +6668,13 @@
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "固定値"
         }
       },
       "label-max": "最大",
       "label-min": "最小",
       "label-value": "値",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "フィールドが見つかりません"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
@@ -6784,6 +6784,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "イベント",
@@ -7056,7 +7057,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "読み込み中..."
     },
     "prev": "前へ",
     "queryless-apps-extensions": {
@@ -7243,7 +7244,7 @@
           "start-time": "開始時間:"
         }
       },
-      "share-span": "",
+      "share-span": "共有",
       "warnings": "警告"
     },
     "span-filters": {
@@ -7253,8 +7254,8 @@
       "aria-label-select-service-name-operator": "サービス名演算子を選択",
       "aria-label-select-span-name": "スパン名を選択",
       "aria-label-select-span-name-operator": "スパン名演算子を選択",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "最大スパン期間を選択",
+      "ariaLabel-select-min-span-duration": "最小スパン期間を選択",
       "label-collapse": "スパンフィルター",
       "label-duration": "継続時間",
       "label-service-name": "サービス名",
@@ -7326,23 +7327,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "期間",
+      "export-started": "エクスポートが開始されました",
+      "give-feedback": "フィードバック",
+      "link-copied": "リンクをクリップボードにコピーしました",
+      "path": "パス",
+      "route": "経路",
+      "services": "サービス",
+      "share": "共有",
+      "share-copy-link": "リンクをコピー",
+      "share-export-json": "JSONとしてエクスポート",
+      "share-tooltip": "トレースを共有",
+      "start-time": "開始時間",
+      "target": "ターゲット",
+      "title-share-thoughts-about-tracing-grafana": "Grafanaのトレース機能についてのご意見をお聞かせください。",
+      "tooltip-url": "{{route}}または{{url}}または{{target}}または{{path}}",
+      "trace-id": "トレースID",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "フィルターのクリアボタン",
@@ -7442,7 +7443,7 @@
       "when": "条件"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "データソースから返されたテーブルに対してMySQL形式のSQLを実行します。データソースクエリ (つまり「A」、「B」) はテーブルとして使用でき、クエリ名で参照されます。フィールドは、データソースから返される列として使用できます。",
       "label-operation": "操作"
     },
     "math": {
@@ -7473,7 +7474,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "フォルダをクリア",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "フォルダが見つかりません",
     "select-aria-label": "フォルダフィルター",
     "select-placeholder": "フォルダでフィルタリング"
   },
@@ -7547,51 +7548,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "地名辞典が見つかりません",
+      "warning-no-geometry": "ジオメトリが見つかりません",
+      "warning-select-geohash": "ジオハッシュフィールドを選択",
+      "warning-select-lat-long": "緯度/経度フィールドを選択",
+      "warning-select-lookup": "ルックアップフィールドを選択",
+      "warning-unable-to-find": "場所フィールドが見つかりません"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "文字列フィールドが見つかりません"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "数値フィールドが見つかりません"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "数値フィールドが見つかりません"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "文字列フィールドが見つかりません"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "地名辞典",
+      "name-geohash-field": "ジオハッシュフィールド",
+      "name-latitude-field": "緯度フィールド",
+      "name-location-mode": "ロケーションモード",
+      "name-longitude-field": "経度フィールド",
+      "name-lookup-field": "ルックアップフィールド"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "デフォルトのフィールド名に基づいて位置データを自動的に識別",
+        "description-coords": "緯度と経度のフィールドを指定",
+        "description-geohash": "ジオハッシュフィールドを指定",
+        "description-lookup": "地名辞典とルックアップフィールドを指定",
+        "label-auto": "自動",
+        "label-coords": "座標",
+        "label-geohash": "ジオハッシュ",
+        "label-lookup": "検索"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "ベースマップレイヤー",
+    "category-map-controls": "マップのコントロール",
+    "category-map-layers": "地図レイヤー",
+    "category-map-view": "地図表示",
     "coordinates-map-view-editor": {
       "label-latitude": "緯度",
       "label-longitude": "経度"
@@ -7600,15 +7601,15 @@
       "center": "中央:",
       "zoom": "ズーム:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "この位置は、パネルの初回読み込み時に表示されます。",
+    "description-mouse-wheel-zoom": "マウスホイールによるズームコントロールを有効にする",
+    "description-no-repeat": "マップの水平繰り返しを防止",
+    "description-share-view": "複数のパネルで同じビューを使用します。注：ダッシュボードの再読み込みが必要になる場合があります。",
+    "description-show-attribution": "右下にマップソースの帰属情報を表示",
+    "description-show-debug": "マップ情報を表示",
+    "description-show-measure": "マップ上で測定を行うためのツールを表示",
+    "description-show-scale": "マップの縮尺を示す",
+    "description-show-zoom": "左上隅にズームコントロールボタンを表示",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "レイヤー"
@@ -7632,12 +7633,12 @@
       "aria-label-add-geomap-style-rule": "ジオマップスタイルルールを追加"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "ベースレイヤー",
+      "description-display-tooltip": "レイヤーのツールチップを表示する",
+      "name-data": "データ",
+      "name-display-tooltip": "ツールチップを表示",
+      "name-layer-type": "レイヤーのタイプ",
+      "name-opacity": "不透明度"
     },
     "layers-editor": {
       "label-add-layer": "レイヤーを追加",
@@ -7650,9 +7651,9 @@
       "use-current-map-settings": "現在のマップ設定を使用"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "マップの凡例を表示",
+      "name-show-legend": "凡例を表示",
+      "name-styles": "スタイル"
     },
     "markers-legend": {
       "title-symbol": "シンボル"
@@ -7661,27 +7662,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "測定ツールを表示"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "初期ビュー",
+    "name-mouse-wheel-zoom": "マウスホイールズーム",
+    "name-no-repeat": "マップの繰り返しなし",
+    "name-share-view": "ビューを共有",
+    "name-show-attribution": "帰属情報を表示",
+    "name-show-debug": "デバッグを表示",
+    "name-show-measure": "測定ツールを表示",
+    "name-show-scale": "スケール表示",
+    "name-show-zoom": "ズームコントロールを表示",
+    "name-tooltip": "ツールチップ",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "文字列フィールドが見つかりません"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "ベースマップレイヤーはサーバー管理者によって設定されます。"
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "中央",
+        "label-left": "左",
+        "label-right": "右"
       },
       "label-align": "配置",
       "label-baseline": "ベースライン",
@@ -7697,12 +7698,12 @@
       "label-text-label": "テキストラベル",
       "label-x-offset": "Xオフセット",
       "label-y-offset": "Yオフセット",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "シンボルを選択",
+      "placeholderText-select-symbol-or-add-text": "シンボルを選択またはテキストラベルを追加",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "下",
+        "label-center": "中央",
+        "label-top": "上"
       }
     },
     "style-rule-editor": {
@@ -7716,13 +7717,13 @@
       "placeholder-value": "値"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "マウスオーバー時にポップアップを表示",
+      "description-none": "ホバーではなくクリックでコンテンツを表示する",
+      "label-details": "詳細",
+      "label-none": "なし"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "レイヤー、{{name}}"
     }
   },
   "get-enterprise": {
@@ -7842,400 +7843,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "フィート/秒²",
+            "name-g-unit": "G (重力加速度単位) ",
+            "name-meters-sec": "メートル/秒²"
           },
-          "name": ""
+          "name": "加速"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "角分",
+            "name-arc-seconds": "角秒",
+            "name-degrees": "度 (°) ",
+            "name-gradian": "グラディアン",
+            "name-radians": "ラジアン"
           },
-          "name": ""
+          "name": "角度"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "エーカー (ac) ",
+            "name-hectares": "ヘクタール (ha) ",
+            "name-square-feet": "平方フィート (ft²) ",
+            "name-square-meters": "平方メートル (m²) ",
+            "name-square-miles": "平方マイル (mi²) "
           },
-          "name": ""
+          "name": "面積"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "オン/オフ",
+            "name-true-false": "真/偽",
+            "name-yes-no": "はい/いいえ"
           },
-          "name": ""
+          "name": "真偽値"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/秒",
+            "name-flops": "FLOP/秒",
+            "name-gflops": "GFLOP/秒",
+            "name-mflops": "MFLOP/秒",
+            "name-pflops": "PFLOP/秒",
+            "name-tflops": "TFLOP/秒",
+            "name-yflops": "YFLOP/秒",
+            "name-zflops": "ZFLOP/秒"
           },
-          "name": ""
+          "name": "計算"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "グラム毎立方メートル (g/m³) ",
+            "name-g-nm3": "グラム毎標準立方メートル (g/Nm³) ",
+            "name-mg-dl": "ミリグラム/デシリットル (mg/dL) ",
+            "name-mg-m3": "ミリグラム毎立方メートル (mg/m³) ",
+            "name-mg-nm3": "1標準立方メートルあたりのミリグラム (mg/Nm³) ",
+            "name-mmol-l": "ミリモル/リットル (mmol/L)",
+            "name-ng-m3": "ナノグラム毎立方メートル (ng/m³)",
+            "name-ng-nm3": "ナノグラム/標準立方メートル (ng/Nm³)",
+            "name-ppb": "10億分の1 (ppb)",
+            "name-ppm": "100万分の1 (ppm)",
+            "name-ug-m3": "マイクログラム毎立方メートル (μg/m³)",
+            "name-ug-nm3": "標準立方メートルあたりのマイクログラム (μg/Nm³)"
           },
-          "name": ""
+          "name": "濃度"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "ブルガリア・レフ (BGN)",
+            "name-brl": "レアル (R$)",
+            "name-btc": "ビットコイン",
+            "name-chf": "スイス・フラン (CHF)",
+            "name-czk": "チェコ・コルナ (czk)",
+            "name-dkk": "デンマーク・クローネ (kr)",
+            "name-eur": "ユーロ (€)",
+            "name-gbp": "ポンド (£)",
+            "name-idr": "インドネシアルピア (Rp)",
+            "name-ils": "イスラエル新シェケル (₪)",
+            "name-inr": "インド・ルピー (₹)",
+            "name-isk": "アイスランド・クローナ (kr)",
+            "name-jpy": "円 (¥)",
+            "name-krw": "韓国ウォン (₩)",
+            "name-mbtc": "ミリビットコイン (฿)",
+            "name-myr": "マレーシア・リンギット (RM)",
+            "name-nok": "ノルウェー・クローネ (Kr.)",
+            "name-php": "フィリピン・ペソ (PHP)",
+            "name-pln": "ポーランド・ズウォティ (PLN)",
+            "name-pyg": "グアラニー (₲)",
+            "name-rub": "ロシアルーブル (₽)",
+            "name-sek": "スウェーデン・クローナ (kr)",
+            "name-try": "トルコ・リラ (₺)",
+            "name-uah": "ウクライナ・グリブナ (₴)",
+            "name-ubtc": "マイクロビットコイン (฿)",
+            "name-usd": "ドル ($)",
+            "name-uyu": "ウルグアイ・ペソ (UYU)",
+            "name-vnd": "ベトナム・ドン (VND)",
+            "name-xpf": "CFPフラン (XPF)",
+            "name-zar": "南アフリカ・ランド (R)"
           },
-          "name": ""
+          "name": "通貨"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "ビット (IEC)",
+            "name-bits-si": "ビット (SI)",
+            "name-bytes-iec": "バイト (IEC)",
+            "name-bytes-si": "バイト (SI)",
+            "name-gibibytes": "ギビバイト",
+            "name-gigabytes": "ギガバイト",
+            "name-kibibytes": "キロビバイト",
+            "name-kilobytes": "キロバイト",
+            "name-mebibytes": "メビバイト",
+            "name-megabytes": "メガバイト",
+            "name-pebibytes": "ペビバイト",
+            "name-petabytes": "ペタバイト",
+            "name-tebibytes": "テビバイト",
+            "name-terabytes": "テラバイト"
           },
-          "name": ""
+          "name": "データ"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "ビット/秒 (IEC)",
+            "name-bits-sec-si": "ビット/秒 (SI)",
+            "name-bytes-sec-iec": "バイト/秒 (IEC)",
+            "name-bytes-sec-si": "バイト/秒 (SI)",
+            "name-gibibits-sec": "ギビビット/秒",
+            "name-gibibytes-sec": "ギビバイト/秒",
+            "name-gigabits-sec": "ギガビット/秒",
+            "name-gigabytes-sec": "ギガバイト/秒",
+            "name-kibibits-sec": "キビビット/秒",
+            "name-kibibytes-sec": "キビバイト/秒",
+            "name-kilobits-sec": "キロビット/秒",
+            "name-kilobytes-sec": "キロバイト/秒",
+            "name-mebibits-sec": "メビビット/秒",
+            "name-mebibytes-sec": "メビバイト/秒",
+            "name-megabits-sec": "メガビット/秒",
+            "name-megabytes-sec": "メガバイト/秒",
+            "name-packets-sec": "パケット/秒",
+            "name-pebibits-sec": "ペビビット/秒",
+            "name-pebibytes-sec": "ペビバイト/秒",
+            "name-petabits-sec": "ペタビット/秒",
+            "name-petabytes-sec": "ペタバイト/秒",
+            "name-tebibits-sec": "テビビット/秒",
+            "name-tebibytes-sec": "テビバイト/秒",
+            "name-terabits-sec": "テラビット/秒",
+            "name-terabytes-sec": "テラバイト/秒"
           },
-          "name": ""
+          "name": "データレート"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "デフォルトの日時",
+            "name-datetime-iso": "ISO形式の日時",
+            "name-datetime-iso-no-date": "ISO形式の日時 (今日であれば日付なし)",
+            "name-datetime-local": "ローカル日時",
+            "name-datetime-local-no-date": "ローカル日時 (今日であれば日付なし)",
+            "name-datetime-us": "米国式日時",
+            "name-datetime-us-no-date": "米国式日時 (今日であれば日付なし)",
+            "name-from-now": "現在からの経過時間"
           },
-          "name": ""
+          "name": "日付と時刻"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "アンペア (A)",
+            "name-ampere-hour": "アンペア時 (Ah)",
+            "name-decibel-milliwatt": "デシベルミリワット (dBm)",
+            "name-electron-volt": "電子ボルト (eV)",
+            "name-farad": "ファラッド (F)",
+            "name-femtofarad": "フェムトファラッド (fF)",
+            "name-gigawatt": "ギガワット (GW)",
+            "name-henry": "ヘンリー (H)",
+            "name-joule": "ジュール (J)",
+            "name-kiloampere": "キロアンペア (kA)",
+            "name-kiloampere-hour": "キロアンペア時 (kAh)",
+            "name-kiloohm": "キロオーム (kΩ)",
+            "name-kilovolt": "キロボルト (kV)",
+            "name-kilovolt-ampere": "キロボルトアンペア (kVA)",
+            "name-kilovolt-ampere-reactive": "キロボルトアンペア無効電力 (kVAr)",
+            "name-kilowatt": "キロワット (kW)",
+            "name-kilowatt-hour": "キロワット時 (kWh)",
+            "name-kilowatt-min": "キロワット分 (kWm)",
+            "name-lumens": "ルーメン (Lm)",
+            "name-megaohm": "メガオーム (MΩ)",
+            "name-megawatt": "メガワット (MW)",
+            "name-megawatt-hour": "メガワット時 (MWh)",
+            "name-microfarad": "マイクロファラッド (µF)",
+            "name-microhenry": "マイクロヘンリー (µH)",
+            "name-milliampere": "ミリアンペア (mA)",
+            "name-milliampere-hour": "ミリアンペア時 (mAh)",
+            "name-millihenry": "ミリヘンリー (mH)",
+            "name-milliohm": "ミリオーム (mΩ)",
+            "name-millivolt": "ミリボルト (mV)",
+            "name-milliwatt": "ミリワット (mW)",
+            "name-nanofarad": "ナノファラッド (nF)",
+            "name-ohm": "オーム (Ω)",
+            "name-picofarad": "ピコファラッド (pF)",
+            "name-volt": "ボルト (V)",
+            "name-volt-ampere": "ボルトアンペア (VA)",
+            "name-volt-ampere-reactive": "ボルトアンペア無効電力 (VAr)",
+            "name-watt": "ワット (W)",
+            "name-watt-hour": "ワット時 (Wh)",
+            "name-watt-hour-per-kg": "キログラムあたりのワット時 (Wh/kg)",
+            "name-watt-square-meter": "平方メートルあたりのワット (W/m²)"
           },
-          "name": ""
+          "name": "エネルギー"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "立方フィート/分 (cfm)",
+            "name-cubic-feet-sec": "立方フィート/秒 (cfs)",
+            "name-cubic-meters-sec": "立方メートル/秒 (cms)",
+            "name-gallons-min": "ガロン/分 (gpm)",
+            "name-litre-hour": "リットル/時間",
+            "name-litre-min": "リットル/分 (L/min)",
+            "name-lux": "ルクス (lx)",
+            "name-millilitre-min": "ミリリットル/分 (mL/min)"
           },
-          "name": ""
+          "name": "流量"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "キロニュートンメートル(kNm)",
+            "name-kilonewtons": "キロニュートン (kN)",
+            "name-newton-meters": "ニュートンメートル (Nm)",
+            "name-newtons": "ニュートン (N)"
           },
-          "name": ""
+          "name": "力学"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "エクサハッシュ/秒",
+            "name-gigahashes-sec": "ギガハッシュ/秒",
+            "name-hashes-sec": "ハッシュ/秒",
+            "name-kilohashes-sec": "キロハッシュ/秒",
+            "name-megahashes-sec": "メガハッシュ/秒",
+            "name-petahashes-sec": "ペタハッシュ/秒",
+            "name-terahashes-sec": "テラハッシュ/秒"
           },
-          "name": ""
+          "name": "ハッシュレート"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "フィート (ft)",
+            "name-inch": "インチ (in)",
+            "name-kilometer": "キロメートル (km)",
+            "name-meter": "メートル (m)",
+            "name-mile": "マイル (mi)",
+            "name-millimeter": "ミリメートル(mm)"
           },
-          "name": ""
+          "name": "長さ"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "グラム (g)",
+            "name-kilogram": "キログラム (kg)",
+            "name-metric-ton": "メトリックトン (t)",
+            "name-milligram": "ミリグラム (mg)",
+            "name-pound": "ポンド (lb)"
           },
-          "name": ""
+          "name": "質量"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "カンデラ (cd)",
+            "name-decibel": "デシベル",
+            "name-hexadecimal": "16進数",
+            "name-hexadecimal-0x": "16進数 (0x)",
+            "name-humidity": "湿度 (%H)",
+            "name-locale": "ロケールの日付書式",
+            "name-number": "数値",
+            "name-percent-1": "パーセント (0.0-1.0)",
+            "name-percent-100": "パーセント (0〜100)",
+            "name-pixels": "ピクセル",
+            "name-scientific": "科学的表記",
+            "name-short": "ショート",
+            "name-si-short": "SI省略形",
+            "name-string": "文字列"
           },
-          "name": ""
+          "name": "その他"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "バー",
+            "name-hectopascals": "ヘクトパスカル",
+            "name-inches-mercury": "水銀柱インチ",
+            "name-kilobars": "キロバール",
+            "name-kilopascals": "キロパスカル",
+            "name-millibars": "ミリバール",
+            "name-pascals": "パスカル",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "圧力"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "ベクレル (Bq)",
+            "name-curie": "キュリー (Ci)",
+            "name-exposure": "照射線量 (C/kg)",
+            "name-gray": "グレイ (Gy)",
+            "name-microsievert": "マイクロシーベルト (µSv)",
+            "name-microsievert-hour": "マイクロシーベルト/時間 (µSv/h)",
+            "name-millisievert": "ミリシーベルト (mSv)",
+            "name-millisievert-hour": "ミリシーベルト/時間 (mSv/h)",
+            "name-rad": "ラド",
+            "name-rem": "レム",
+            "name-roentgen": "レントゲン (R)",
+            "name-sievert": "シーベルト (Sv)",
+            "name-sievert-hour": "シーベルト/時間 (Sv/h)"
           },
-          "name": ""
+          "name": "放射能"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "1秒あたりの度数 (°/秒)",
+            "name-gigahertz": "ギガヘルツ (GHz)",
+            "name-hertz": "ヘルツ (Hz)",
+            "name-kilohertz": "キロヘルツ (kHz)",
+            "name-megahertz": "メガヘルツ (MHz)",
+            "name-radians-sec": "ラジアン毎秒 (rad/s)",
+            "name-rpm": "回転数/分 (r/m)"
           },
-          "name": ""
+          "name": "回転速度"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "摂氏 (°C)",
+            "name-fahrenheit": "華氏 (°F)",
+            "name-kelvin": "ケルビン (K)"
           },
-          "name": ""
+          "name": "温度"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "カウント/分 (c/m)",
+            "name-counts-sec": "カウント/秒 (c/s)",
+            "name-events-min": "イベント/分 (e/m)",
+            "name-events-sec": "イベント/秒 (e/s)",
+            "name-io-ops-sec": "I/Oオペレーション/秒 (io/s)",
+            "name-messages-min": "メッセージ/分 (m/m)",
+            "name-messages-sec": "メッセージ/秒 (m/s)",
+            "name-ops-min": "オペレーション/分 (o/m)",
+            "name-ops-sec": "オペレーション/秒 (o/s)",
+            "name-reads-min": "読み取り/分 (r/m)",
+            "name-reads-sec": "読み取り/秒 (r/s)",
+            "name-records-min": "レコード/分 (r/m)",
+            "name-records-sec": "レコード/秒 (r/s)",
+            "name-requests-min": "リクエスト/分 (r/m)",
+            "name-requests-sec": "リクエスト/秒 (r/s)",
+            "name-rows-min": "行/分 (r/m)",
+            "name-rows-sec": "行/秒 (r/s)",
+            "name-writes-min": "書き込み/分 (w/m)",
+            "name-writes-sec": "書き込み/秒 (w/s)"
           },
-          "name": ""
+          "name": "スループット"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "クロック時間 (ミリ秒)",
+            "name-clock-s": "クロック時間",
+            "name-days": "日 (d)",
+            "name-duration-dhms": "期間 (d hh:mm:ss)",
+            "name-duration-hms": "期間 (hh:mm:ss)",
+            "name-duration-ms": "期間 (ms)",
+            "name-duration-s": "期間 (s)",
+            "name-hertz": "ヘルツ (1/秒)",
+            "name-hours": "時間 (h)",
+            "name-microseconds": "マイクロ秒 (µs)",
+            "name-milliseconds": "ミリ秒 (ms)",
+            "name-minutes": "分 (m)",
+            "name-nanoseconds": "ナノ秒 (ns)",
+            "name-seconds": "秒 (s)",
+            "name-timeticks": "タイムティック (1/100秒)"
           },
-          "name": ""
+          "name": "時間"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "キロメートル/時間 (km/h)",
+            "name-knot": "ノット (kn)",
+            "name-meters-second": "メートル/秒 (m/s)",
+            "name-miles-hour": "マイル/時間 (mph)"
           },
-          "name": ""
+          "name": "速度"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "立方デシメートル",
+            "name-cubic-meter": "立方メートル",
+            "name-gallons": "ガロン",
+            "name-litre": "リットル (L)",
+            "name-millilitre": "ミリリットル (mL)",
+            "name-normal-cubic-meter": "標準立方メートル"
           },
-          "name": ""
+          "name": "容量"
         }
       }
     }
@@ -8364,7 +8365,7 @@
       "option": "オプション"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "画像プレビュー"
     },
     "cascader": {
       "clear-button": "選択をクリア"
@@ -8378,9 +8379,9 @@
       "aria-label-selected-color": "{{colorLabel}}色"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "削除",
       "cancel": "キャンセル",
-      "confirmText-delete": ""
+      "confirmText-delete": "削除"
     },
     "confirm-content": {
       "placeholder": "「{{confirmPromptText}}」と入力して確認"
@@ -8485,56 +8486,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "4月",
+        "label-august": "8月",
+        "label-december": "12月",
+        "label-february": "2月",
+        "label-january": "1月",
+        "label-july": "7月",
+        "label-june": "6月",
+        "label-march": "3月",
+        "label-may": "5月",
+        "label-november": "11月",
+        "label-october": "10月",
+        "label-september": "9月"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "一昨日",
+        "last-1-hour": "過去1時間",
+        "last-1-year": "過去1年",
+        "last-12-hours": "過去12時間",
+        "last-15-mins": "過去15分間",
+        "last-2-days": "過去2日間",
+        "last-2-years": "過去2年間",
+        "last-24-hours": "過去24時間",
+        "last-3-hours": "過去3時間",
+        "last-30-days": "過去30日間",
+        "last-30-mins": "過去30分間",
+        "last-5-mins": "過去5分間",
+        "last-5-years": "過去５年間",
+        "last-6-hours": "過去6時間",
+        "last-6-months": "過去6か月間",
+        "last-7-days": "過去7日間",
+        "last-90-days": "過去90日間",
+        "previous-fiscal-quarter": "前四半期",
+        "previous-fiscal-year": "前年度",
+        "previous-month": "前月",
+        "previous-week": "前の週",
+        "previous-year": "前の年",
+        "this-day-last-week": "先週の同じ曜日",
+        "this-fiscal-quarter": "今四半期",
+        "this-fiscal-quarter-so-far": "今四半期の現在まで",
+        "this-fiscal-year": "今年度",
+        "this-fiscal-year-so-far": "今年度の累計",
+        "this-month": "今月",
+        "this-month-so-far": "今月の現在まで",
+        "this-week": "今週",
+        "this-week-so-far": "今週の現在まで",
+        "this-year": "今年",
+        "this-year-so-far": "今年の現在まで",
+        "today": "今日",
+        "today-so-far": "今日の現在まで",
+        "yesterday": "昨日"
       }
     },
     "drawer": {
@@ -8585,18 +8586,18 @@
         "placeholder": "フィールドを選択"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "真偽値",
+        "label-enum": "列挙",
+        "label-number": "数値",
+        "label-other": "その他",
+        "label-string": "文字列",
+        "label-time": "時間",
+        "label-traces": "トレース"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "フレーム ({{framesCount}})：{{framesNames}} ",
+        "label": "クエリ：{{refId}} ",
+        "label-missing-ref-id": "クエリ：(refIdなし)"
       },
       "name-field-name-by-regex-matcher": "名前が正規表現と一致するフィールド",
       "name-fields-by-query": "クエリによって返されるフィールド",
@@ -8630,8 +8631,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "パネルを折りたたむの切り替え",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "パネル読み込みバー",
+      "ariaLabel-panel-status": "パネルステータス",
       "tooltip-cancel": "クエリをキャンセル",
       "tooltip-cancel-loading": "クエリをキャンセル",
       "tooltip-stop-streaming": "ストリーミングを停止",
@@ -8700,12 +8701,12 @@
       "inspect-drawer-title": "値を検査",
       "inspect-menu-label": "値を検査",
       "nested-table": {
-        "no-data": ""
+        "no-data": "データなし"
       },
       "no-values-label": "値がありません",
       "pagination-summary": "{{itemsRangeStart}} - {{displayedEnd}}（{{numRows}}行）",
       "sparkline": {
-        "no-data": ""
+        "no-data": "データなし"
       }
     },
     "tags": {
@@ -8713,7 +8714,7 @@
     },
     "tags-input": {
       "add": "追加",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "新しいタグ (Enterキーで追加)",
       "remove": "タグ、{{name}}を削除"
     },
     "time-sync-button": {
@@ -8806,14 +8807,14 @@
       "footer-add-annotation": "注釈を追加",
       "footer-click-to-action": "クリックして{{actionTitle}}",
       "footer-click-to-navigate": "クリックして{{linkTitle}}を開く",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "{{value}}値でフィルタリング",
       "timestamp": "タイムスタンプ"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "デフォルト",
+      "weekStarts-label-monday": "月曜日",
+      "weekStarts-label-saturday": "土曜日",
+      "weekStarts-label-sunday": "日曜日"
     }
   },
   "graph": {
@@ -9191,8 +9192,8 @@
       "title-create-library-panel": "ライブラリパネルを作成"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "変更",
+      "confirmText-replace": "置換"
     },
     "confirm": {
       "delete-panel": "このパネルを削除しますか？"
@@ -9216,7 +9217,7 @@
       "usage-count_other": "{{count}}件のダッシュボードで使用中"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "名前、説明、またはフォルダ名で検索"
     },
     "loading-indicator": {
       "loading-library-panel": "ライブラリパネル読み込み中..."
@@ -9421,7 +9422,7 @@
       "close": "ログの詳細を閉じる",
       "copy-shortlink": "ショートリンクをコピー",
       "copy-to-clipboard": "クリップボードにコピー",
-      "displayed-fields-section": "",
+      "displayed-fields-section": "表示フィールドを整理",
       "fields": {
         "adhoc-statistics": "アドホック統計",
         "copy-value-to-clipboard": "値をクリップボードにコピー",
@@ -9434,25 +9435,25 @@
       },
       "fields-section": "フィールド",
       "hide-log-line": "ログ行を非表示",
-      "inline-mode": "",
+      "inline-mode": "インラインで表示",
       "links-section": "リンク",
-      "log-line-field": "",
+      "log-line-field": "ログ行",
       "log-line-section": "ログ行",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
+      "move-displayed-field-down": "下へ移動",
+      "move-displayed-field-up": "上へ移動",
       "no-details": "表示するフィールドがありません。",
-      "open-assistant": "",
+      "open-assistant": "アシスタントでこのログ行を説明",
       "pin-line": "ログをピン留め",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "remove-displayed-field": "フィールドを削除する",
+      "remove-log": "ログを削除",
+      "scroll-to-logline": "ログ行までスクロール",
       "search": {
         "no-results": "表示する結果がありません。"
       },
       "search-placeholder": "フィールド名と値を検索",
       "show-context": "コンテキストを表示",
       "show-log-line": "ログ行を表示",
-      "sidebar-mode": "",
+      "sidebar-mode": "右に固定",
       "unpin-line": "ログのピン留めを解除"
     },
     "log-line-menu": {
@@ -9460,9 +9461,9 @@
       "copy-log": "ログ行をコピー",
       "hide-details": "ログの詳細を表示",
       "icon-label": "ログメニュー",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "ログ行",
+      "log-line-explainer": "このログ行を簡潔に説明する",
+      "open-assistant": "アシスタントでこのログ行を説明",
       "pin-to-outline": "ログをピン留めする",
       "show-context": "コンテキストを表示",
       "show-details": "ログの詳細を非表示",
@@ -9568,10 +9569,10 @@
     },
     "name-common-labels": "共通ラベル",
     "name-deduplication": "重複排除",
-    "name-details-mode": "",
+    "name-details-mode": "ログ詳細パネルの表示モード",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "インライン表示",
+      "label-sidebar": "サイドバー"
     },
     "name-enable-infinite-scrolling": "無限スクロールを有効化",
     "name-enable-log-details": "ログの詳細を有効化",
@@ -9668,8 +9669,8 @@
       "updated-on": "更新日"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "「{{snapshotToRemove}}」を削除してもよろしいですか？",
+      "confirmText-delete": "削除",
       "title-delete": "削除"
     },
     "unthemed-dashboard-import": {
@@ -9681,14 +9682,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "名前を入力してください",
+      "message-reserved-name": "これは予約済みの名前であり、フォルダには使用できません。",
+      "message-same-name": "同じ名前のダッシュボードまたはフォルダがすでに存在します",
+      "message-same-name-general": "一般フォルダ内に同じ名前のフォルダまたはダッシュボードがすでに存在します"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "オプションが見つかりません"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9838,8 +9839,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "アラートルールグループの最大数に達しました。いくつかのアラートルールグループを削除するか、プランをアップグレードして再試行してください。",
+        "alert-rules-quota-reached": "アラートルールの最大数に達しました。アラートルールをいくつか削除するか、プランをアップグレードして再試行してください。",
         "dashboard-already-managed": "ダッシュボードは、クラウドインスタンスでGrafanaによってすでにプロビジョニングおよび管理されています。今後は、プロビジョニングされたダッシュボードの使用をお勧めします。それでもダッシュボードをクラウドインスタンスにコピーする場合は、ダッシュボードJSONでダッシュボードIDを変更し、新しいスナップショットを保存して再度アップロードしてください。",
         "datasource-already-managed": "ダッシュボードは、クラウドインスタンスでGrafanaによってすでにプロビジョニングおよび管理されています。これが別のリソースである場合は、別のUIDを設定して再試行してください。",
         "datasource-invalid-url": "URLが無効なデータソースがあります。有効なURLを入力して、再試行してください。",
@@ -10309,7 +10310,7 @@
     "invite-user": {
       "invite-button": "招待",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "ユーザーを招待"
     },
     "item": {
       "add-bookmark": "ブックマークに追加",
@@ -10529,7 +10530,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "組織が見つかりません",
     "select-placeholder": "組織を選択"
   },
   "page": {
@@ -10752,7 +10753,7 @@
         "permission": "このページを表示する権限がありません。",
         "title-access-denied": "アクセス拒否"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "プラグインの読み込みに失敗しました",
       "no-root-app-page-component-found": "ルートアプリのページコンポーネントが見つかりません"
     },
     "browse": {
@@ -10796,7 +10797,7 @@
         "update-status-text": "すべてのプラグインが更新されました"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "バージョン{{version}}にダウングレードしてもよろしいですか？ 通常、これを行うべきではありません",
         "downgrade-confirm": "ダウングレード",
         "downgrade-title": "プラグインのバージョンをダウングレードする"
       }
@@ -10851,8 +10852,8 @@
       "message": "プラグインが見つかりませんでした"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "エラーの詳細については、コンソールを確認してください。",
+      "extension-error-alert-title": "拡張機能の読み込みに失敗しました：「{{pluginId}}/{{extensionTitle}}」"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10889,8 +10890,8 @@
     "install-controls-button": {
       "title-uninstall-modal": "{{plugin}}をアンインストール ",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "このプラグインをアンインストールしますか？",
+        "confirmText-confirm": "確認"
       }
     },
     "install-controls-warning": {
@@ -10908,6 +10909,9 @@
       "label-plugin-id": "プラグインID",
       "label-severity": "重要度"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "プラグインが見つかりません。URLが正しいことを確認するか、<3>プラグインカタログ</3>にアクセスしてください。",
       "title-plugin-not-found": "プラグインが見つかりません"
@@ -11064,29 +11068,29 @@
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "このリソースは{{repoType}}内の該当ブランチよりも古いバージョンです。",
+      "not-saved": "このブランチがマージされるまで、組織内の他のGrafanaユーザーには、デフォルトブランチに保存された現在のバージョンが表示されます",
+      "open-in-repo-button": "{{repoType}}で開く",
+      "open-pull-request-in-repo": "{{repoType}}でプルリクエストを開く",
+      "view-in-repo-button": "{{repoType}}で表示して、最新の変更を確認してください。",
+      "view-pull-request-in-repo": "{{repoType}}でプルリクエストを表示する"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "{{repoType}}のブランチに新しいリソースが作成されました。",
+    "title-loaded-pull-request-in-repo": "このリソースは{{repoType}}で作成したブランチから読み込まれており、あなたにのみ表示されます"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "リソースが正常に保存されました",
+  "provisioned-resource-request-handler-dashboard": "ダッシュボードが正常に保存されました",
+  "provisioned-resource-request-handler-folder": "フォルダが正常に作成されました",
   "provisioning": {
     "banner": {
       "message": "この機能は現在開発中です。最高の体験と最新の改善を利用するには、Grafanaの<2>ナイトリービルド</2>の使用をお勧めします。"
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "プロビジョニングに使用するブランチ",
+      "branch-label": "ブランチ",
+      "branch-required": "ブランチが必要です",
+      "path-description": "リポジトリ内のオプションのサブディレクトリパス",
+      "path-label": "パス",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11095,18 +11099,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "変更保存時にプルリクエストを開くかどうかをユーザーが選択できます。メインブランチへの直接変更が許可されていないリポジトリでは、プルリクエストが必要になる場合があります。",
+      "pr-workflow-label": "保存時にプルリクエストオプションを有効にする",
+      "token-description": "リポジトリ権限を持つBitbucketアプリパスワード",
+      "token-label": "アプリパスワード",
+      "token-required": "Bitbucketトークンが必要です",
+      "token-user-description": "アプリパスワードでリポジトリにアクセスする際に使用するユーザー名",
+      "token-user-label": "ユーザー名",
+      "token-user-required": "ユーザー名が必要です",
+      "url-description": "BitbucketリポジトリURL",
+      "url-label": "リポジトリURL",
+      "url-pattern": "有効なBitbucketリポジトリURLを入力してください",
+      "url-required": "リポジトリURLが必要です"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "このリポジトリ接続にわかりやすい名前を追加します",
@@ -11117,9 +11121,9 @@
       "label-display-name": "表示名",
       "placeholder-my-repository-connection": "自分のリポジトリ接続",
       "text-loading-resource-information": "リソース情報読み込み中...",
-      "dashboards-count_other": "",
+      "dashboards-count_other": "{{count}}個のダッシュボード",
       "files-count_other": "{{count}}個のファイル",
-      "folders-count_other": ""
+      "folders-count_other": "{{count}}個のフォルダ"
     },
     "check-repository": {
       "check": "確認"
@@ -11193,7 +11197,7 @@
       "title-instant-updates-requests-webhooks": "Webhookによるリアルタイム更新とプルリクエスト。",
       "title-visual-previews-in-pull-requests": "画像レンダリングによるプルリクエストの視覚的プレビュー"
     },
-    "error-title-default": "",
+    "error-title-default": "エラー",
     "expanded-row": {
       "job-specification": "ジョブ仕様",
       "summary": "概要"
@@ -11202,8 +11206,8 @@
       "actions": {
         "set-up-required-feature-toggles": "必要な機能切り替えを設定"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Gitでコードとしてダッシュボードを管理し、更新を自動的にプロビジョニング",
+      "manage-your-dashboards-with-remote-provisioning": "Git Sync を使ってみる",
       "store-dashboards-in-version-controlled-storage": "バージョン管理されたストレージにダッシュボードを保存して、整理と履歴追跡を改善"
     },
     "file-history-page": {
@@ -11224,16 +11228,16 @@
     },
     "finish-step": {
       "description-enable-previews": "プルリクエストによるダッシュボードの変更の画像プレビューを追加します。Grafanaダッシュボードの画像はGitリポジトリで共有され、リポジトリにアクセスできる全ユーザーが閲覧できます。",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "プルリクエストのプレビューリンクを作成する",
       "description-image-rendering": "画像レンダリングが必要です。<2>画像レンダリングを設定</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(<2>画像レンダリング</2>と公開アクセスが有効になっている必要があります)",
       "description-read-only": "Grafanaではリソースを変更できません。",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "リポジトリからの変更を同期する頻度",
+      "error-sync-interval-required": "同期間隔が必要です",
       "label-enable-previews": "プルリクエストでダッシュボードのプレビューを有効にする",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "ダッシュボードプレビューを生成",
       "label-read-only": "読み出しのみ",
-      "label-sync-interval": ""
+      "label-sync-interval": "同期間隔 (秒)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "クエリに一致する結果なし",
@@ -11265,46 +11269,46 @@
       "subtitle-provisioning-feature": "プロビジョニング接続を表示・管理"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "プロビジョニングに使用するブランチ",
+      "branch-label": "ブランチ",
+      "branch-required": "ブランチが必要です",
+      "path-description": "リポジトリ内のオプションのサブディレクトリパス",
+      "path-label": "パス",
+      "pr-workflow-description": "変更保存時にプルリクエストを開くかどうかをユーザーが選択できます。メインブランチへの直接変更が許可されていないリポジトリでは、プルリクエストが必要になる場合があります。",
+      "pr-workflow-label": "保存時にプルリクエストオプションを有効にする",
+      "token-description": "Gitリポジトリのアクセストークンまたはパスワード",
+      "token-label": "アクセストークン",
+      "token-required": "Gitトークンが必要です",
+      "token-user-description": "アクセストークンでリポジトリにアクセスする際のユーザー名",
+      "token-user-label": "ユーザー名",
+      "token-user-required": "ユーザー名が必要です",
+      "url-description": "GitリポジトリURL",
+      "url-label": "リポジトリURL",
+      "url-pattern": "有効なGitリポジトリURLでなければなりません",
+      "url-required": "リポジトリURLが必要です"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "プロビジョニングに使用するブランチ",
+      "branch-label": "ブランチ",
+      "branch-required": "ブランチが必要です",
+      "path-description": "リポジトリ内のオプションのサブディレクトリパス",
+      "path-label": "パス",
+      "pr-workflow-description": "変更保存時にプルリクエストを開くかどうかをユーザーが選択できます。メインブランチへの直接変更が許可されていないリポジトリでは、プルリクエストが必要になる場合があります。",
+      "pr-workflow-label": "保存時にプルリクエストオプションを有効にする",
+      "token-description": "リポジトリ権限を持つGitHubパーソナルアクセストークン",
+      "token-label": "パーソナルアクセストークン",
+      "token-required": "GitHubトークンが必要です",
+      "url-description": "GitHubのリポジトリURL",
+      "url-label": "リポジトリURL",
+      "url-pattern": "有効なGitHubリポジトリURLでなければなりません",
+      "url-required": "リポジトリURLが必要です"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "プロビジョニングに使用するブランチ",
+      "branch-label": "ブランチ",
+      "branch-required": "ブランチが必要です",
+      "path-description": "リポジトリ内のオプションのサブディレクトリパス",
+      "path-label": "パス",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11313,15 +11317,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "変更を保存するときにマージリクエストを開くかどうかをユーザーが選択できるようにします。リポジトリがメインブランチへの直接変更を許可していない場合でも、マージリクエストが必要になる可能性があります。",
+      "pr-workflow-label": "保存時にマージリクエストオプションを有効にする",
+      "token-description": "リポジトリ権限を持つGitLabプロジェクトアクセストークン",
+      "token-label": "プロジェクトアクセストークン",
+      "token-required": "GitLabトークンが必要です",
+      "url-description": "GitLabリポジトリURL",
+      "url-label": "リポジトリURL",
+      "url-pattern": "有効なGitLabリポジトリURLでなければなりません",
+      "url-required": "リポジトリURLが必要です"
     },
     "history-view": {
       "not-found": "見つかりません"
@@ -11349,18 +11353,18 @@
       "starting": "開始中...",
       "status": {
         "title-error-running-job": "実行エラー",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "ジョブが正常に完了しました",
+        "title-warning-running-job": "ジョブが警告付きで完了しました"
       },
       "summary": "概要",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "アクティブなジョブの取得中にエラーが発生しました"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "リポジトリへのローカルファイルシステムパス",
+      "path-label": "リポジトリパス",
+      "path-required": "リポジトリパスが必要です"
     },
     "mode-options": {
       "folder": {
@@ -11386,7 +11390,7 @@
     },
     "repository-actions": {
       "settings": "設定",
-      "source-code": ""
+      "source-code": "ソースコード"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11452,22 +11456,22 @@
       "title-queued-for-deletion": "削除待ちリストに追加されました"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "プロバイダーを選択：",
+      "configure-file": "ファイルのプロビジョニングを設定",
+      "configure-with-provider": "{{ provider }}で設定",
+      "provider-not-listed": "プロバイダーがリストにない場合："
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Bitbucketリポジトリに接続",
+      "github": "GitHub",
+      "github-description": "GitHubリポジトリに接続",
+      "gitlab": "GitLab",
+      "gitlab-description": "GitLabリポジトリに接続",
+      "local": "ローカル",
+      "local-description": "ファイルのプロビジョニングを設定",
+      "pure-git": "Pure Git",
+      "pure-git-description": "任意のGitリポジトリに接続"
     },
     "resource-view": {
       "base": "ベース",
@@ -11498,11 +11502,11 @@
       "label-current-step": "現在のステップ",
       "label-pending-step": "保留中のステップ"
     },
-    "success-title-default": "",
+    "success-title-default": "成功",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "ジョブを開始できませんでした",
+      "error-no-repository-name": "リポジトリ名が指定されていません",
+      "error-starting-job": "ジョブ開始時のエラー"
     },
     "sync-repository": {
       "body-edit-configuration": "設定を編集",
@@ -11530,7 +11534,7 @@
       "go-to": "進む",
       "make-sure": "これらの権限を必ず含めてください"
     },
-    "warning-title-default": "",
+    "warning-title-default": "警告",
     "wizard": {
       "alert-point-1": "このプロセス中はリソースの作成、編集、削除を行えません。最後のステップになると、リソースが消えます。",
       "alert-point-2": "プロビジョニングが完了すると、リソースが再表示され、外部ストレージを通じて管理されます。",
@@ -11540,10 +11544,10 @@
       "button-next": "完了",
       "button-start": "同期を開始",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "この操作によりリポジトリの設定が削除され、すべての変更内容が失われます。本当に破棄してもよろしいですか？",
+        "confirm": "はい、破棄します",
+        "dismiss": "作業を続ける",
+        "title": "リポジトリの設定を破棄しますか？"
       },
       "step-bootstrap": "同期する内容を選択",
       "step-connect": "接続",
@@ -11559,7 +11563,7 @@
     "wizard-content": {
       "button-cancel": "キャンセル",
       "button-cancelling": "キャンセル中…",
-      "button-previous": "",
+      "button-previous": "前へ",
       "button-submitting": "送信中…",
       "error-instance-repository-exists": "インスタンスリポジトリはすでに存在します"
     }
@@ -11956,7 +11960,7 @@
         "recommended": "おすすめ",
         "results": "結果"
       },
-      "search": ""
+      "search": "{{parentTitle}}を検索"
     }
   },
   "search": {
@@ -12037,7 +12041,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "サービスアカウントが見つかりません",
     "select-aria-label": "サービスアカウント選択ツール",
     "select-placeholder": "サービスアカウントを検索するには入力を開始してください"
   },
@@ -12083,10 +12087,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "サービスアカウントトークンを追加",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "サービスアカウントを削除してもよろしいですか？",
+      "body-disable-service-account": "このサービスアカウントを無効にしてもよろしいですか？",
+      "confirmText-delete-service-account": "サービスアカウントを削除",
+      "confirmText-disable-service-account": "サービスアカウントを無効化",
       "delete-service-account": "サービスアカウントを削除",
       "disable-service-account": "サービスアカウントを無効化",
       "enable-service-account": "サービスアカウントを有効化",
@@ -12113,7 +12117,7 @@
       "used-by": "使用者"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "保存",
       "edit": "編集"
     },
     "service-account-role-row": {
@@ -12127,15 +12131,15 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "サービスアカウントを追加",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "{{serviceAccountName}}を削除してもよろしいですか？",
+      "body-disable-service-account": "「{{accountToDisable}}」を無効にしてもよろしいですか？",
+      "confirmText-delete": "削除",
+      "confirmText-disable-service-account": "サービスアカウントを無効化",
       "placeholder-search-service-account-by-name": "名前でサービスアカウントを検索",
       "sub-title": "サービスアカウントとそのトークンを使用して、Grafana APIに対する認証を行えます。詳細については<2>ドキュメント</2>をご覧ください",
       "title-delete-service-account": "サービスアカウントを削除",
       "title-disable-service-account": "サービスアカウントを無効化",
-      "body-delete_other": ""
+      "body-delete_other": "{{serviceAccountName}}と{{count}}個の関連トークンを削除してもよろしいですか？"
     },
     "token-expiration": {
       "content-this-token-has-expired": "このトークンは期限切れです",
@@ -12149,7 +12153,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "画像としてエクスポート",
       "export-json-title": "JSON形式でエクスポート",
       "share-externally-title": "外部と共有",
       "share-internally-title": "内部と共有",
@@ -12186,17 +12190,17 @@
       "view-button-yaml": "YAMLを表示"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "画像のエクスポート操作",
+      "cancel-button": "キャンセル",
+      "download-button": "画像をダウンロード",
+      "error-title": "画像を生成できませんでした",
+      "generate-button": "画像を生成する",
+      "generating": "画像を生成しています...",
+      "info-text": "このダッシュボードを画像として保存",
+      "preview": "プレビュー",
+      "preview-aria": "生成された画像のプレビュー",
+      "preview-region": "画像プレビュー",
+      "title": "画像としてエクスポート"
     },
     "library": {
       "info": "ライブラリパネルを作成します。"
@@ -12206,7 +12210,7 @@
       "info-text": "以下のオプションでカスタマイズした、このダッシュボードまたはパネルへの直接リンクを作成します。",
       "link-url": "URLをリンク",
       "render-alert": "画像レンダラープラグインがインストールされていません",
-      "render-instructions": "",
+      "render-instructions": "画像をレンダリングするには、<2>Grafana画像レンダラープラグイン</2>をインストールする必要があります。プラグインをインストールするには、Grafana管理者にお問い合わせください。",
       "rendered-image": "レンダリングされた画像への直接リンク",
       "save-alert": "ダッシュボードは保存されていません",
       "save-dashboard": "パネル画像をレンダリングするには、最初にダッシュボードを保存する必要があります。",
@@ -12274,11 +12278,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "ダッシュボードを保存して画像生成を有効にする",
+    "download-disabled-help": "画像を先に生成してからダウンロードしてください",
+    "error-title": "画像を生成できませんでした",
     "form": {
-      "label": ""
+      "label": "パネル画像設定"
     },
     "preview": {
       "title": "パネルプレビュー"
@@ -12592,17 +12596,17 @@
       "label-small": "小"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "アクション",
+      "auto": "自動",
+      "color-background": "色付きの背景",
+      "color-text": "色付きテキスト",
+      "data-links": "データリンク",
+      "gauge": "ゲージ",
+      "image": "画像",
+      "json": "JSONビュー",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "ピル",
+      "sparkline": "スパークライン"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "選択されている場合、行全体がこのセルと同じ色で表示されます。",
@@ -12631,7 +12635,7 @@
     "description-count-rows": "すべてのデータ行の単一カウントを表示",
     "description-fields": "計算するフィールドを選択",
     "description-min-column-width": "列の自動サイズ変更の最小幅",
-    "description-wrap-header-text": "",
+    "description-wrap-header-text": "列ヘッダーのテキスト折り返しを有効にする",
     "image-cell-options-editor": {
       "description-alt-text": "画像が表示できない場合やスクリーンリーダーを使用するユーザーのために表示される代替テキスト",
       "description-title-text": "画像にカーソルを合わせたときに表示されるテキスト",
@@ -12715,7 +12719,7 @@
     "tag-option-label": "タグオプション"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "チームが見つかりません",
     "select-aria-label": "チームの選択ツール",
     "select-placeholder": "チームを選択"
   },
@@ -13019,15 +13023,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "二項演算",
+          "reduce-row": "行の削減",
+          "row-index": "行インデックス",
+          "unary-operation": "単項演算"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "累積関数",
+        "window-functions": "ウィンドウ関数"
       },
       "label-alias": "エイリアス",
       "label-mode": "モード",
@@ -13045,9 +13049,9 @@
       "label-name": "名前",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "フレーム名をフィールド名にコピー",
+          "ignore-the-frame-name": "フレーム名を使用しない",
+          "label-frame": "フレーム名でラベルを追加"
         }
       },
       "placeholder-frame": "フレーム"
@@ -13060,9 +13064,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "フィールドタイプ変換機能を追加",
       "aria-label-remove-convert-field-type-transformer": "フィールドタイプ変換機能を削除",
-      "convert-field-type": "",
+      "convert-field-type": "フィールドタイプを変換",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "フィールドを指定されたフィールドタイプに変換します。"
       },
       "label": {
         "browser": "ブラウザ",
@@ -13075,11 +13079,11 @@
       "label-join-with": "結合先",
       "label-set-timezone": "タイムゾーンを設定",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "フィールドタイプを変換"
       },
       "placeholder-type": "タイプ",
       "tags": {
-        "format-field": ""
+        "format-field": "フィールドをフォーマット"
       },
       "tooltip-explicit-separator-joining-array-values": "配列値を結合する際に明示的な区切り文字を使用",
       "tooltip-input-format": "Grafanaが日付文字列を正しく解析できるよう、入力フィールドの形式を指定してください。",
@@ -13105,13 +13109,13 @@
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "すべてのフィールドを単一フレームに結合します。"
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "フィールドを連結"
         },
         "tags": {
-          "combine": ""
+          "combine": "結合"
         }
       }
     },
@@ -13126,11 +13130,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "コンテンツ (JSON、ラベルなど) からフィールドを解析します。"
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "フィールドを選択"
         }
       },
       "label-delimiter": "区切り文字",
@@ -13139,7 +13143,7 @@
       "label-replace-all-fields": "すべてのフィールドを置き換え",
       "label-source": "送信元",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "フィールドを抽出"
       },
       "placeholder-auto": "自動",
       "placeholder-select-delimiter": "区切り文字を選択...",
@@ -13150,20 +13154,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "フィールド値を使用して、国、州、または空港を検索します。"
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "テキストフィールドが見つかりません"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "テキストフィールドを選択"
         }
       },
       "label-field": "フィールド",
       "label-lookup": "検索",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "リソースからフィールドを検索"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13174,23 +13178,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "正規表現パターンを使用して、クエリ結果の一部を削除します。"
       },
       "label-from-variable": "変数から",
       "label-identifier": "識別子",
       "label-use-variable": "変数を使用",
       "label-variable": "変数",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "名前でフィールドをフィルタリング"
       },
       "placeholder-regular-expression-pattern": "正規表現パターン"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "元のクエリに基づいてデータから行を削除"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "クエリでデータをフィルタリング"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13204,33 +13208,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "条件を追加",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "ユーザー定義のフィルターを使用して、クエリ結果から行を削除します。"
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "すべて一致",
+          "match-any": "いずれか一致"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "除外する",
+          "include": "含める"
         }
       },
       "label-conditions": "条件",
       "label-filter-type": "フィルタータイプ",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "値でデータをフィルタリング"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "テキストフィールドが見つかりません"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "テキストフィールドを選択"
         }
       },
       "label-field": "フィールド",
@@ -13239,10 +13243,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "文字列フィールドの書式設定を操作します。"
       },
       "name": {
-        "format-string": ""
+        "format-string": "文字列をフォーマット"
       }
     },
     "format-time-transfomer-editor": {
@@ -13254,66 +13258,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "時間フィールドの出力形式を設定する"
       },
       "name": {
-        "format-time": ""
+        "format-time": "時間のフォーマット"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "行の値を使用して新しいフィールドを計算します。"
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "計算からフィールドを追加"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "単位、最小値、最大値などを設定します。"
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "クエリ結果からの構成"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "ソースデータからヒートマップデータを生成します。"
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "ヒートマップを作成"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "ラベル付きの結果を、ラベルで結合されたテーブルに平坦化します。"
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "ラベルで結合"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "1フレームのデータセットを複数の系列に分割します。"
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "値によるパーティション分割"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "各行を動的構成のフィールドに変換します。"
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "行をフィールドに"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "クエリ結果に空間演算を適用します。"
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "空間演算"
       }
     },
     "get-timezone-options": {
@@ -13345,8 +13349,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "計算",
+          "group-by": "グループ化"
         }
       },
       "placeholder-ignored": "無視",
@@ -13354,42 +13358,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "フィールド値でデータをグループ化し、集計データを作成します。"
       },
       "name": {
-        "group-by": ""
+        "group-by": "グループ化"
       },
       "title-calc-alert": "グループ化されているフィールドがない場合、計算は効果がありません"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "フィールド値でデータをグループ化し、グループ化されたデータでネストされたテーブルを作成します。"
       },
       "description-show-field-names": "有効にすると、入れ子になったテーブルではフィールド名がテーブルヘッダーとして表示されます",
       "label-show-field-names-in-nested-tables": "ネストされたテーブルにフィールド名を表示",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "ネストされたテーブルとしてグループ化"
       },
       "title-calc-alert": "グループ化されているフィールドがない場合、計算は効果がありません。"
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "3つのフィールドに基づいてデータを要約して再編成します。"
       },
       "label-cell-value": "セルの値：",
       "label-column": "列",
       "label-empty-value": "空の値",
       "label-row": "行",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "マトリックス形式でグループ化"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "入力データからヒストグラムを計算します。"
       },
       "name": {
-        "histogram": ""
+        "histogram": "ヒストグラム"
       },
       "placeholder-auto": "自動",
       "placeholder-default": "デフォルト：30",
@@ -13401,14 +13405,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "関連フィールドに基づいて、2つ以上のテーブルの行を結合します。"
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "フィールドで結合"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "必須",
       "info": {
         "input-contain-labels": "入力にラベルが含まれていません",
         "no-input-or-labels-found": "入力（またはラベル）が見つかりません",
@@ -13432,8 +13436,8 @@
       "label-value-field-name": "値フィールド名",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "列",
+          "rows": "行"
         }
       },
       "placeholder-optional-select-label": "（任意）ラベルを選択",
@@ -13441,18 +13445,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "時系列をグループ化し、ラベルやタグをフィールドとして返します。"
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "ラベルをフィールドに"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "表示項目数を制限"
       },
       "name": {
-        "limit": ""
+        "limit": "制限"
       },
       "placeholder-value-or-variable": "値または変数"
     },
@@ -13465,11 +13469,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "複数の系列をマージします。値は1行にまとめられます。"
       },
       "merge-effect-applied-single-frame": "単一フレームに適用した場合、マージは効果がありません。",
       "name": {
-        "merge": ""
+        "merge": "系列/テーブルをマージ"
       }
     },
     "multi-info": {
@@ -13481,14 +13485,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "フィールドの並べ替え、非表示、または名前の変更。"
       },
       "field-order": "フィールド順序",
       "field-order-auto": "自動",
       "field-order-manual": "手動",
       "first-frame-warning": "フィールドの整理は単一フレームでのみ機能します。最初に変換の結合を適用するか、入力をフィルタリングすることを検討してください。",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "名前でフィールドを整理"
       }
     },
     "partion-by-values-editor": {
@@ -13516,10 +13520,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "データフレームをワイド形式からロング形式に変換します。"
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "時系列を準備"
       }
     },
     "prepare-time-series-editor": {
@@ -13527,26 +13531,26 @@
       "label-info": "情報",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "各フレームをロング形式に変換"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "ロング時系列"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "時間/数値のペアごとに新しいフレームを作成します"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "マルチフレーム時系列"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "時間で結合された単一フレームを作成します"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "ワイド時系列"
         }
       }
     },
@@ -13561,7 +13565,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "すべての行またはデータポイントを単一の値 (最大値、平均値など) に集約します。"
       },
       "label-calculations": "計算",
       "label-include-time": "時間を含める",
@@ -13578,7 +13582,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "集約"
       },
       "placeholder-choose-stat": "統計を選択"
     },
@@ -13588,18 +13592,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "統計モデルによって予測された値を含む新しいデータフレームを作成します。"
       },
       "name": {
-        "trendline": ""
+        "trendline": "トレンドライン"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "3次",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "2次",
         "quartic": "4次",
-        "quintic": "5次"
+        "quintic": "5次",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "次数",
       "label-model-type": "モデルタイプ",
@@ -13614,16 +13623,17 @@
       },
       "regression": "回帰",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "回帰分析"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "予測するX、Yポイント数"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "正規表現と置換パターンを使用して、クエリ結果の一部の名前を変更します。"
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "正規表現でフィールドの名前を変更"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13637,33 +13647,33 @@
       "label-mode": "モード",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "両テーブルの共通フィールドに一致する値がある場合、データを結合します。",
+          "join-on-a-field": "重複した値を持つフィールド値を結合します。パフォーマンスの低い外部結合は、表形式 (SQLのような) データに最適です。",
+          "keep-all-rows": "値を持つテーブルのすべての行を保持します。異なるフィールド値で結合します。パフォーマンスが高く、時系列に最適です。"
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "内部",
+          "outer-tabular": "外部 (表形式)",
+          "outer-time-series": "外部 (時系列)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "複数の系列をマージします。時間、メトリック、値を行として返します。"
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "系列を行に変換"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "フレーム内のフィールドを並べ替えます。"
       },
       "label-field": "フィールド",
       "label-reverse": "反転",
       "name": {
-        "sort-by": ""
+        "sort-by": "並べ替え"
       },
       "placeholder-select-field": "フィールドを選択"
     },
@@ -13686,13 +13696,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "時系列データをテーブル行に変換して、テーブル形式またはスパークライン形式で表示できるようにします。"
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "時系列からテーブルへの変換を機能させるには、少なくとも1つの時系列フレームが必要です。現在、フレームはありません。"
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "時系列からテーブルへ"
       }
     },
     "time-series-table-transform-editor": {
@@ -13710,15 +13720,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "データフレームを転置します。"
       },
       "name": {
-        "transpose": ""
+        "transpose": "転置"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "ピボット",
+        "transform": "変換",
+        "translate": "翻訳"
       }
     },
     "unary-operation-editor": {
@@ -13727,13 +13737,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "新しいフィールドを計算",
+        "combine": "結合",
+        "create-new-visualization": "新しい視覚化を作成",
+        "filter": "フィルター",
+        "perform-spatial-operations": "空間演算を実行",
+        "reformat": "フォーマット",
+        "reorder-and-rename": "並べ替えと名前変更"
       },
       "special-value-options": {
         "description": {
@@ -13804,7 +13814,7 @@
     "title": "組織"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "ユーザーが見つかりません",
     "select-aria-label": "ユーザー選択ツール",
     "select-placeholder": "ユーザーを検索するには入力を開始してください"
   },
@@ -13890,8 +13900,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "変数「{{variableToDelete}}」を削除してもよろしいですか？",
+      "confirmText-delete": "削除",
       "title-delete-variable": "変数を削除"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13941,33 +13951,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "この変数の値を並べ替える方法",
-      "name-sort": "",
+      "name-sort": "並べ替え",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "アルファベット順 (昇順)",
+          "alphabetical-caseinsensitive-asc": "アルファベット順 (大文字と小文字を区別しない、昇順)",
+          "alphabetical-caseinsensitive-desc": "アルファベット順 (大文字と小文字を区別しない、降順)",
+          "alphabetical-desc": "アルファベット順 (降順)",
+          "disabled": "無効",
+          "natural-asc": "自然順 (昇順)",
+          "natural-desc": "自然順 (降順)",
+          "numerical-asc": "数値 (昇順)",
+          "numerical-desc": "数値 (降順)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "オプションを追加",
+      "description": "クエリ結果に加えてカスタムオプションを追加",
+      "label-placeholder": "ラベルを表示",
+      "remove-option-button-label": "オプションの削除",
+      "value-placeholder": "値 (デフォルト：空の文字列) "
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "クエリ結果とスタティックオプションの並び替え方法"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "既定値",
       "placeholder-default-value-if-any": "デフォルト値（ある場合）",
       "text-options": "テキストオプション"
     },
@@ -13996,8 +14006,8 @@
       "description-optional-display-name": "表示名（任意）",
       "description-template-variable-characters": "テンプレート変数の名前（最大50文字）。",
       "general": "一般",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "ラベル",
+      "name-name": "名前",
       "placeholder-descriptive-text": "説明用のテキスト",
       "placeholder-label-name": "ラベル名",
       "placeholder-variable-name": "変数名",
@@ -14013,13 +14023,13 @@
       "tooltip-remove-variable": "変数を削除"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "説明"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "すべての値を切り替え"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "変数タイプを選択"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "使用状況を表示"
diff --git a/public/locales/ko-KR/grafana.json b/public/locales/ko-KR/grafana.json
index 2000fc6489a..16f880b5743 100644
--- a/public/locales/ko-KR/grafana.json
+++ b/public/locales/ko-KR/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "일부 기능은 안정적이며(GA 단계) 기본적으로 활성화되어 있지만, 일부 기능은 현재 예비 베타 단계에 있으며 조기 도입이 가능하도록 제공하고 있습니다.",
       "confirm-modal-body-2": "변경 사항을 적용하기 전에 각 기능의 변경이 어떤 영향을 미칠지 파악하는 것이 좋습니다.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "변경 사항 저장",
       "get-stage-cell": {
         "beta": "베타",
         "content-general-availability": "정식 제공",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "조직 삭제",
-      "confirmText-delete": "",
+      "confirmText-delete": "삭제",
       "title-delete": "삭제"
     },
     "anon-users": {
       "not-found": "익명의 사용자를 찾을 수 없습니다."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "정말 모든 장치에서 강제 로그아웃하시겠어요?",
+      "confirmText-confirm-logout": "로그아웃 확인",
+      "confirmText-force-logout": "강제 로그아웃",
       "title-force-logout-from-all-devices": "모든 장치에서 강제 로그아웃"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "저장"
     },
     "edit-org": {
       "access-denied": "이 조직의 사용자를 볼 수 있는 권한이 없습니다. 이 조직을 업데이트하려면 서버 관리자에게 문의하세요.",
@@ -119,10 +119,10 @@
       "users-heading": "조직 사용자"
     },
     "enterprise-auth-features-card": {
-      "dismiss": "",
-      "heading": "",
-      "learn-more-link": "",
-      "text": ""
+      "dismiss": "닫기",
+      "heading": "엔터프라이즈 인증",
+      "learn-more-link": "자세히 알아보기",
+      "text": "Grafana Cloud 및 Enterprise에서 사용할 수 있는 <1>SAML</1>, <3>SCIM</3>, <6>LDAP</6>, <8>RBAC</8>를 사용하여 사용자, 팀, 권한을 자동으로 관리합니다."
     },
     "feature-listing": {
       "title-auditing": "감사",
@@ -216,11 +216,11 @@
       "not-editable": "이 사용자의 역할은 인증 제공자에서 동기화되었기 때문에 편집할 수 없습니다. 자세한 내용은 <1>Grafana 인증 문서</1>를 참고하세요."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "정말 사용자 {{user}}을(를) 삭제하시겠어요?",
       "columns": {
         "aria-label-role": "역할"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "삭제",
       "delete-aria-label": "사용자 삭제: {{name}}",
       "title-delete": "삭제"
     },
@@ -252,7 +252,7 @@
       "info-description": "이러한 시스템 설정은 grafana.ini 또는 custom.ini에 정의되어 있습니다(또는 ENV 변수에서 덮어쓰기됩니다). 현재 이를 변경하려면 Grafana를 다시 시작해야 합니다."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "제거 확인"
     },
     "upgrade-info": {
       "title": "Enterprise 라이선스"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "변경",
-      "confirmText-change": "",
+      "confirmText-change": "변경",
       "grafana-admin-key": "Grafana 관리자",
       "grafana-admin-no": "아니요",
       "grafana-admin-yes": "네",
       "title": "권한"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "정말 이 사용자를 삭제하시겠어요?",
+      "body-disable": "정말 이 사용자를 비활성화하시겠어요?",
+      "confirmText-delete-user": "사용자 삭제",
+      "confirmText-disable-user": "사용자 비활성화",
       "delete-button": "사용자 삭제",
       "disable-button": "사용자 비활성화",
       "edit-button": "편집",
@@ -331,7 +331,7 @@
       "title-disable-user": "사용자 비활성화"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "저장"
     },
     "user-sessions": {
       "browser-column": "브라우저 및 OS",
@@ -374,20 +374,20 @@
       "am-active-timing-select-label-active-timings": "활성 타이밍"
     },
     "ad": {
-      "close": "",
-      "learn-more": ""
+      "close": "닫기",
+      "learn-more": "자세히 알아보기"
     },
     "add-button": {
       "add-more": "더 추가하기"
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "AI 경고 규칙 버튼을 로드하지 못했습니다",
+        "feedback-button": "AI 피드백 버튼을 로드하지 못했습니다",
+        "improve-annotations-button": "AI 주석 개선 버튼을 로드하지 못했습니다",
+        "improve-labels-button": "AI 레이블 개선 버튼을 로드하지 못했습니다",
+        "template-button": "AI 템플릿 버튼을 로드하지 못했습니다",
+        "triage-button": "AI 분류 버튼을 로드하지 못했습니다"
       }
     },
     "alert": {
@@ -405,12 +405,12 @@
       "missing-series-resolve": "경고를 해제하는 데 필요한 시리즈 평가 누락 횟수",
       "no-annotations": "주석 없음",
       "notification-configuration": {
-        "active-timings": "",
+        "active-timings": "활성 시간 간격",
         "contact-point": "연락처",
         "group-by": "그룹화 기준",
-        "group-title": "",
+        "group-title": "알림 설정",
         "mute-timings": "알림 비활성화 타이밍",
-        "timing-options": ""
+        "timing-options": "타이밍"
       },
       "pending-period": "보류 기간",
       "rule": "규칙",
@@ -489,7 +489,7 @@
       "title-muting-grouping-and-timings": "알림 비활성화, 그룹화 및 타이밍"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "데이터 소스를 찾을 수 없습니다"
     },
     "alert-menu": {
       "copy-link": "링크 복사",
@@ -515,7 +515,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "경고 규칙"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -583,7 +583,7 @@
       "view-configuration": "구성 보기"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "네, 구성을 초기화해 주세요",
       "gma-manual-configuration-description": "내부 Grafana Alertmanager 구성은 수동으로 변경할 수 없습니다. 이 구성을 변경하려면 UI를 통해 개별 리소스를 편집하세요.",
       "gma-manual-configuration-is-not-supported": "수동 구성 변경은 지원되지 않음",
       "message": {
@@ -598,13 +598,13 @@
       "title-resetting-alertmanager-configuration": "Alertmanager 구성 재설정 중"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "정말 구성을 이 버전으로 복구하시겠어요? 저장하지 않은 변경 사항은 모두 손실됩니다.",
       "columns": {
         "compare": "비교",
         "restore": "복구",
         "text-latest": "최근"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "네, 구성을 복구해 주세요",
       "loading": "로딩 중...",
       "no-previous-configurations": "이전 구성 없음",
       "this-might-take-a-while": "다소 시간이 걸릴 수 있습니다...",
@@ -884,10 +884,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "'{{contactPointName}}' 연락처에 대한 추가 동작",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "삭제",
       "button-edit": "편집",
       "button-view": "보기",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "내보내기",
       "export-label-export": "내보내기",
       "label-delete": "삭제",
       "label-manage-permissions": "권한 관리",
@@ -958,7 +958,7 @@
     },
     "contactPoints": {
       "validation": {
-        "notFound": ""
+        "notFound": "'연락처({{contactPoint}})'를 찾을 수 없습니다."
       }
     },
     "continue-matching-indicator": {
@@ -967,7 +967,7 @@
     "copy-to-clipboard": "'{{label}}'을(를) 클립보드로 복사",
     "create-metadata": {
       "label": {
-        "contact-point": "",
+        "contact-point": "알림 전송처:",
         "dashboard": "대시보드",
         "dashboard-and-panel": "대시보드 및 패널",
         "evaluation-interval": "평가 간격",
@@ -1115,7 +1115,7 @@
       "content-show-all-errors": "모든 오류 표시"
     },
     "errors": {
-      "failedWith": ""
+      "failedWith": "{{status}}(으)로 인해 {{-config}} 실패: {{-message}}"
     },
     "evaluate-every-validation-options": {
       "message": {
@@ -1420,7 +1420,7 @@
       "label-disable-resolved-message": "해제 메시지 비활성화"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "그룹 로딩 중...",
       "message": {
         "must-be-a-positive-integer": "양의 정수여야 합니다.",
         "must-enter-a-group-name": "그룹 이름을 입력해야 합니다."
@@ -1517,7 +1517,7 @@
       "group-loading-error": "그룹 로딩 중 오류 발생",
       "interval": "간격",
       "namespace": "네임스페이스",
-      "new": "",
+      "new": "신규",
       "title": {
         "back": ""
       }
@@ -1549,7 +1549,7 @@
     },
     "group-loader": {
       "group-load-failed": "{{ namespaceName }}의 {{ groupName }} 그룹에서 규칙 로딩 실패",
-      "no-rules": ""
+      "no-rules": "이 그룹에서 규칙을 찾을 수 없습니다"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "그룹을 삭제하는 중입니다"
@@ -1566,20 +1566,20 @@
       }
     },
     "home": {
-      "irm-card-description": "",
-      "irm-card-item-1": "",
-      "irm-card-item-2": "",
-      "irm-card-item-3": "",
-      "irm-card-item-4": "",
-      "irm-card-title": "",
+      "irm-card-description": "Grafana Cloud IRM으로 대기, 경보, 인시던트 대응을 통합합니다.",
+      "irm-card-item-1": "캘린더나 Terraform으로 대기 일정을 관리합니다.",
+      "irm-card-item-2": "웹, 앱, Slack 또는 기타 채널을 통해 인시던트에 대응합니다.",
+      "irm-card-item-3": "AI 기반 Grafana SIFT로 근본 원인을 정확히 파악합니다.",
+      "irm-card-item-4": "과거 인시던트를 분석하여 대응 및 복원력을 개선합니다.",
+      "irm-card-title": "인시던트 대응 및 관리",
       "label-get-started": "시작하기",
       "label-insights": "인사이트",
-      "synthetic-monitoring-card-description": "",
-      "synthetic-monitoring-card-item-1": "",
-      "synthetic-monitoring-card-item-2": "",
-      "synthetic-monitoring-card-item-3": "",
-      "synthetic-monitoring-card-item-4": "",
-      "synthetic-monitoring-card-title": ""
+      "synthetic-monitoring-card-description": "글로벌 위치에서 중요한 사용자 흐름, 웹사이트, API를 외부에서 모니터링합니다.",
+      "synthetic-monitoring-card-item-1": "브라우저 검사를 통해 엔드투엔드 사용자 여정을 시뮬레이션합니다.",
+      "synthetic-monitoring-card-item-2": "모든 네트워크 계층에서 ping, DNS, HTTP/S, TCP 검사를 실행합니다.",
+      "synthetic-monitoring-card-item-3": "이용하시는 방화벽 뒤에서 20개 이상의 글로벌 프로브 또는 비공개 프로브를 사용합니다.",
+      "synthetic-monitoring-card-item-4": "UI에서 바로 Prometheus 유형의 기본 제공 경보로 SLO를 추적합니다.",
+      "synthetic-monitoring-card-title": "종합 모니터링"
     },
     "import-to-gma": {
       "action-button": "가져오기",
@@ -1593,7 +1593,7 @@
         "no-rules-body-yaml": "가져올 규칙이 없습니다. 다른 yaml 파일을 선택해 주세요.",
         "no-rules-title": "가져올 규칙 없음",
         "not-using-rules-managed-by-integrations-or-plugins": {
-          "text": "",
+          "text": "통합이나 플러그인으로 관리되는 규칙을 Grafana 관리 규칙으로 가져와서는 안 됩니다.",
           "title": "정보"
         },
         "plugin-rules-warning": {
@@ -1878,10 +1878,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "데이터 소스를 찾을 수 없습니다"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "정말 \"{{muteTiming}}\"을(를) 삭제하시겠어요?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "비활성화됨",
@@ -1972,7 +1972,7 @@
     },
     "notification-policies-filter": {
       "label-search-by-contact-point": "연락처로 검색",
-      "placeholder-search-by-contact-point": "",
+      "placeholder-search-by-contact-point": "연락처 선택",
       "search-query-input-placeholder-search": "검색"
     },
     "notification-policies-list": {
@@ -2132,10 +2132,10 @@
         "conflict": "알림 정책 트리가 다른 사용자에 의해 업데이트되었습니다.",
         "error-code": "오류 메시지: '{{error}}'",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "라우트를 추가하거나 업데이트할 수 없습니다. {{-matchers}} 일치 조건을 병합하면 일치 조건이 외부 라우팅 트리와 충돌하여 해당 라우트에 접근할 수 없게 됩니다."
         },
         "suffix": "페이지를 새로고침한 후 다시 시도해 주세요.",
-        "title": ""
+        "title": "알림 정책을 추가하거나 업데이트하지 못했습니다"
       },
       "n-more-policies_other": "추가 정책 {{count}}개"
     },
@@ -2190,7 +2190,7 @@
     "query-and-expressions-step": {
       "add-query": "쿼리 추가",
       "body-queries-expressions-configured": "경고할 쿼리 또는 표현식을 하나 이상 생성합니다",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "비활성화",
       "expressions": "표현식",
       "loading-data-sources": "데이터 소스 로딩 중...",
       "manipulate-returned-queries-other-operations": "쿼리에서 반환된 데이터를 수학 및 기타 연산으로 조작합니다.",
@@ -2244,7 +2244,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "기록 규칙"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "{{errorMessage}}(으)로 인해 쿼리 편집기를 로딩할 수 없습니다"
@@ -2264,7 +2264,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "원본 규칙이 프로비저닝되어 UI에서 생성된 규칙에 사용할 수 없으므로 복사한 규칙에 대한 새 평가 그룹을 설정해야 합니다.",
       "body-not-provisioned": "새 규칙은 프로비저닝된 규칙으로 표시되지 <1>않습니다</1>.",
-      "confirmText-copy": "",
+      "confirmText-copy": "복사",
       "title-copy-provisioned-alert-rule": "프로비저닝된 경고 규칙 복사"
     },
     "redirect-to-rule-viewer": {
@@ -2482,12 +2482,12 @@
         "new-badge": "새 기능!",
         "text": "Grafana 관리 규칙으로 가져오기"
       },
-      "loading-more-groups": "",
+      "loading-more-groups": "더 많은 그룹 불러오는 중...",
       "more": "더 보기",
       "new-alert-rule": "새 경고 규칙",
       "new-datasource-recording-rule": "새 데이터 소스 기록 규칙",
       "new-grafana-recording-rule": "새 Grafana 기록 규칙",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "내보내기용 새 경고 규칙",
       "pagination": {
         "next-page": "더 보기..."
       },
@@ -2658,7 +2658,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "경고 관리자"
       }
     },
     "settings-content": {
@@ -2796,7 +2796,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "미리 보기 새로 고침",
-      "empty-state": "",
+      "empty-state": "미리 보기를 보려면 템플릿 내용을 추가하세요",
       "label-preview": "미리보기",
       "refresh": "새로 고침"
     },
@@ -2815,7 +2815,7 @@
       "loading": "로딩 중...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "알림 템플릿 선택"
         },
         "label": {
           "select-notification-template": "알림 템플릿 선택"
@@ -2843,8 +2843,8 @@
     },
     "templates-table": {
       "actions": "작업",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "정말 \"{{template}}\" 템플릿 그룹을 삭제하시겠어요?",
+      "confirmText-yes-delete": "네, 삭제해 주세요",
       "no-templates-defined": "정의된 템플릿이 없습니다.",
       "template-group": "템플릿 그룹",
       "title-delete-template-group": "템플릿 그룹 삭제"
@@ -2899,7 +2899,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "경고 규칙, 기록 규칙 및 평가 간격 관리"
       }
     },
     "to-gma": {
@@ -2979,7 +2979,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "네, 삭제해 주세요"
       }
     },
     "use-delete-policy-modal": {
@@ -3033,51 +3033,51 @@
     }
   },
   "alertlist": {
-    "category-alert-state-filter": "",
-    "category-filter": "",
-    "category-options": "",
-    "descriptino-alerts-linked-to-dashboard": "",
-    "description-alert-instance-label": "",
-    "description-alert-name": "",
-    "description-datasource": "",
-    "description-folder": "",
-    "description-group-by": "",
-    "description-group-mode": "",
-    "description-max-items": "",
-    "description-show-inactive-alerts": "",
-    "description-sort-order": "",
-    "description-view-mode": "",
+    "category-alert-state-filter": "경보 상태 필터",
+    "category-filter": "필터",
+    "category-options": "옵션",
+    "descriptino-alerts-linked-to-dashboard": "이 대시보드에 연결된 경보만 표시",
+    "description-alert-instance-label": "레이블 쿼리를 사용하여 경보 인스턴스를 필터링합니다. 예: {severity=\"critical\", instance=~\"cluster-us-.+\"}",
+    "description-alert-name": "이 텍스트가 포함된 경보를 필터링하기",
+    "description-datasource": "경보 소스에서 필터링하기",
+    "description-folder": "선택한 폴더의 경보(Grafana 관리 경보 규칙에만 해당)를 필터링하기",
+    "description-group-by": "레이블 쿼리를 사용하여 경보 필터링하기",
+    "description-group-mode": "경보 인스턴스를 그룹화하는 방법",
+    "description-max-items": "표시할 경보 최대 한도",
+    "description-show-inactive-alerts": "인스턴스가 0(영)인 경보 규칙을 포함합니다. 이러한 규칙에는 인스턴스가 없으므로, 경보 인스턴스 레이블 필터가 구성된 경우 숨겨진 상태로 유지됩니다.",
+    "description-sort-order": "경보 및 경보 인스턴스 순서 정렬하기",
+    "description-view-mode": "목록 보기와 통계 보기 간 전환",
     "group-by": {
       "aria-label-group-by-label-keys": "레이블 키별로 그룹화",
       "placeholder-group-by": "그룹화 기준"
     },
     "group-mode-options": {
-      "label-custom-grouping": "",
-      "label-default-grouping": ""
+      "label-custom-grouping": "맞춤 그룹화",
+      "label-default-grouping": "기본 그룹화"
     },
-    "name-alert-instance-label": "",
-    "name-alert-name": "",
-    "name-alerts-linked-to-dashboard": "",
-    "name-datasource": "",
-    "name-error": "",
-    "name-firing": "",
-    "name-folder": "",
-    "name-group-by": "",
-    "name-group-mode": "",
-    "name-max-items": "",
-    "name-no-data": "",
-    "name-normal": "",
-    "name-pending": "",
-    "name-recovering": "",
-    "name-show-inactive-alerts": "",
-    "name-sort-order": "",
-    "name-view-mode": "",
+    "name-alert-instance-label": "경보 인스턴스 레이블",
+    "name-alert-name": "경보 이름",
+    "name-alerts-linked-to-dashboard": "이 대시보드에 연결된 경보",
+    "name-datasource": "데이터 소스",
+    "name-error": "오류",
+    "name-firing": "경보/발동 중",
+    "name-folder": "폴더",
+    "name-group-by": "그룹화 기준",
+    "name-group-mode": "그룹 모드",
+    "name-max-items": "항목 최대 한도",
+    "name-no-data": "데이터 없음",
+    "name-normal": "정상",
+    "name-pending": "보류 중",
+    "name-recovering": "복구 중",
+    "name-show-inactive-alerts": "인스턴스가 0개인 경보 표시",
+    "name-sort-order": "정렬 순서",
+    "name-view-mode": "보기 모드",
     "sort-order-options": {
-      "label-alphabetical-asc": "",
-      "label-alphabetical-desc": "",
-      "label-importance": "",
-      "label-time-asc": "",
-      "label-time-desc": ""
+      "label-alphabetical-asc": "알파벳순(오름차순)",
+      "label-alphabetical-desc": "알파벳순(내림차순)",
+      "label-importance": "중요",
+      "label-time-asc": "시간(오름차순)",
+      "label-time-desc": "시간(내림차순)"
     },
     "ungrouped-mode-view": {
       "active-for": "<1>{{duration}}</1> 동안 지속",
@@ -3093,8 +3093,8 @@
       "title-permission-required": "권한이 필요합니다."
     },
     "view-mode-options": {
-      "label-list": "",
-      "label-stat": ""
+      "label-list": "목록",
+      "label-stat": "통계"
     }
   },
   "annolist": {
@@ -3107,31 +3107,31 @@
     "annotation-list-item": {
       "tooltip-created-by": "작성자:<1></1> {{email}} "
     },
-    "category-annotation-query": "",
-    "category-display": "",
-    "category-link-behaviour": "",
-    "description-tags": "",
+    "category-annotation-query": "주석 쿼리",
+    "category-display": "디스플레이",
+    "category-link-behaviour": "링크 동작",
+    "description-tags": "주석 태그 매칭",
     "link-target-options": {
-      "label-dashboard": "",
-      "label-panel": ""
+      "label-dashboard": "대시보드",
+      "label-panel": "패널"
     },
-    "name-limit": "",
-    "name-link-target": "",
-    "name-query-filter": "",
-    "name-show-tags": "",
-    "name-show-time": "",
-    "name-show-user": "",
-    "name-tags": "",
-    "name-time-after": "",
-    "name-time-before": "",
-    "name-time-range": "",
+    "name-limit": "한도",
+    "name-link-target": "링크 대상",
+    "name-query-filter": "쿼리 필터",
+    "name-show-tags": "태그 표시",
+    "name-show-time": "시간 표시",
+    "name-show-user": "사용자 표시",
+    "name-tags": "태그",
+    "name-time-after": "다음 이후 시간:",
+    "name-time-before": "다음 이전 시간:",
+    "name-time-range": "시간 범위",
     "query-filter-options": {
-      "label-all-dashboards": "",
-      "label-this-dashboard": ""
+      "label-all-dashboards": "모든 대시보드",
+      "label-this-dashboard": "이 대시보드"
     },
     "time-range-options": {
-      "label-none": "",
-      "label-this-dashboard": ""
+      "label-none": "없음",
+      "label-this-dashboard": "이 대시보드"
     }
   },
   "annotations": {
@@ -3139,7 +3139,7 @@
       "annotation": "주석",
       "first-value": "첫 번째 값",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "알 수 없는 필드 이름"
     },
     "empty-state": {
       "button-title": "주석 쿼리 추가",
@@ -3149,12 +3149,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "이 필드를 정의하면 주석이 범위로 처리됩니다",
+        "results-split-on-comma": "결과는 쉼표(,)로 분할됩니다"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}} 또는 첫 번째 텍스트 필드",
+        "time-or-the-first-field": "{{defaultField}} 또는 첫 번째 시간 필드"
       }
     },
     "standard-annotation-query-editor": {
@@ -3232,9 +3232,9 @@
       "define-allowed-teams-ids-label": "허용된 팀 ID 정의",
       "display-name-description": "로그인 페이지에 '다음으로 로그인'으로 표시됩니다. 두 개 이상의 ID 제공자 또는 SSO 프로토콜을 사용하는 경우 유용합니다.",
       "display-name-label": "표시 이름",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Azure AD/Entra ID 테넌트에서 사용자의 영역을 나타내고 로그인 프로세스를 간소화하는 매개변수입니다.",
+      "domain-hint-label": "도메인 힌트",
+      "domain-hint-valid-domain": "이 필드는 유효한 도메인이어야 합니다.",
       "email-attribute-name-description": "OAuth2 ID 토큰의 속성 맵 내에서 사용자 이메일 조회에 사용할 키의 이름입니다.",
       "email-attribute-name-label": "이메일 속성 이름",
       "email-attribute-path-description": "사용자 정보에서 사용자 이메일 조회에 사용할 JMESPath 표현식입니다.",
@@ -3251,11 +3251,11 @@
       "id-token-attribute-name-label": "ID 토큰 속성 이름",
       "login-attribute-path-description": "사용자 ID 토큰에서 사용자 로그인 조회에 사용할 JMESPath 표현식입니다.",
       "login-attribute-path-label": "로그인 속성 경로",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "동의",
+      "login-prompt-description": "사용자가 IdP로 로그인할 때 어떤 유형의 사용자 상호 작용이 있었는지 보여줍니다.",
+      "login-prompt-label": "로그인 프롬프트",
+      "login-prompt-login": "로그인",
+      "login-prompt-select-account": "계정 선택",
       "managed-identity-client-id-description": "OAuth2 앱의 페더레이션 ID 자격 증명의 관리 ID 클라이언트 ID입니다.",
       "managed-identity-client-id-label": "FIC 관리 ID 클라이언트 ID",
       "name-attribute-path-description": "사용자 ID 토큰에서 사용자 이름 조회에 사용할 JMESPath 표현식입니다.이 이름은 사용자의 표시 이름으로 사용됩니다.",
@@ -3291,7 +3291,7 @@
       "team-ids-github": "팀 ID의 정수 목록입니다.",
       "team-ids-label": "팀 ID",
       "team-ids-numbers": "팀 ID는 숫자여야 합니다.",
-      "team-ids-other": "",
+      "team-ids-other": "팀 ID의 문자열 목록입니다.",
       "team-ids-placeholder": "팀 ID를 입력하고 엔터 키를 눌러 추가",
       "teams-url-description": "팀 ID에 대한 쿼리에 사용되는 URL입니다. 설정하지 않으면 기본값은 /teams입니다.",
       "teams-url-description-oauth": "\"{{ teamsURLLabel }}\"을(를) 구성하는 경우, \"{{ teamIDsAttributePathLabel }}\"도 구성해야 합니다.",
@@ -3326,8 +3326,8 @@
       }
     },
     "provider-card": {
-      "saml-learn-more": "",
-      "scim-learn-more": "",
+      "saml-learn-more": "SAML을 사용한 싱글 사인온(SSO).",
+      "scim-learn-more": " 사용자와 팀을 SCIM과 동기화합니다.",
       "text-badge-enabled": "활성화됨",
       "text-badge-not-enabled": "활성화되지 않음"
     },
@@ -3335,7 +3335,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "기본값으로 재설정"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "초기화",
       "disable": "비활성화",
       "disabling": "비활성화 중...",
       "discard": "무시",
@@ -3355,7 +3355,7 @@
       "text-badge-not-enabled": "활성화되지 않음"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM은 현재 개발 중인 기능으로, 프로덕션 환경에서 사용하는 것을 권장하지 않습니다. 사용 시 주의해야 하며 향후 변경 사항이 있을 수 있습니다."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "사용하는 IdP의 .well-known/openid-configuration 엔드포인트",
@@ -3367,99 +3367,99 @@
   },
   "bar-chart": {
     "warn": {
-      "missing-numeric": "",
-      "missing-series": ""
+      "missing-numeric": "숫자 필드를 찾을 수 없습니다",
+      "missing-series": "막대 차트에는 문자열 또는 시간 필드가 필요합니다"
     }
   },
   "barchart": {
     "config": {
-      "category-thresholds": "",
-      "description-color-by-field": "",
-      "description-x-label-max-length": "",
-      "name-bar-radius": "",
-      "name-bar-width": "",
-      "name-color-by-field": "",
-      "name-fill-opacity": "",
-      "name-full-highlight": "",
-      "name-gradient-mode": "",
-      "name-group-width": "",
-      "name-line-width": "",
-      "name-orientation": "",
-      "name-rotate-x-labels": "",
-      "name-show-thresholds": "",
-      "name-show-values": "",
-      "name-stacking": "",
-      "name-transform": "",
-      "name-x-axis": "",
-      "name-x-label-max-length": "",
-      "name-x-label-min-spacing": "",
+      "category-thresholds": "임계값",
+      "description-color-by-field": "형제 필드의 색상 값을 사용하여 각 막대 값에 색상을 지정합니다.",
+      "description-x-label-max-length": "X축 레이블은 입력된 길이로 잘립니다",
+      "name-bar-radius": "막대 반경",
+      "name-bar-width": "막대 너비",
+      "name-color-by-field": "필드별 색상",
+      "name-fill-opacity": "채우기 불투명도",
+      "name-full-highlight": "마우스를 올리면 전체 영역 강조 표시",
+      "name-gradient-mode": "그라데이션 모드",
+      "name-group-width": "그룹 너비",
+      "name-line-width": "선 너비",
+      "name-orientation": "방향",
+      "name-rotate-x-labels": "x축 눈금 레이블 회전",
+      "name-show-thresholds": "임계값 표시",
+      "name-show-values": "값 표시",
+      "name-stacking": "스태킹",
+      "name-transform": "변환",
+      "name-x-axis": "X축",
+      "name-x-label-max-length": "X축 눈금 레이블 최대 길이",
+      "name-x-label-min-spacing": "X축 레이블 최소 간격",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-line-vertical": ""
+        "label-auto": "자동",
+        "label-horizontal": "가로",
+        "label-line-vertical": "세로"
       },
-      "placeholder-x-axis": "",
-      "placeholder-x-label-max-length": "",
+      "placeholder-x-axis": "첫 번째 문자열 또는 시간 필드",
+      "placeholder-x-label-max-length": "없음",
       "show-values-options": {
-        "label-always": "",
-        "label-auto": "",
-        "label-never": ""
+        "label-always": "항상",
+        "label-auto": "자동",
+        "label-never": "기록 없음"
       },
       "transform-options": {
-        "description-constant": "",
-        "description-negative-y": "",
-        "label-constant": "",
-        "label-negative-y": ""
+        "description-constant": "첫 번째 값은 상수 선으로 표시됩니다",
+        "description-negative-y": "결과를 Y축에서 음수 값으로 반전합니다",
+        "label-constant": "상수",
+        "label-negative-y": "Y 음수 값"
       }
     },
     "tick-spacing-editor": {
       "content-require-space-from-the-right-side": "오른쪽에서 공간이 필요합니다.",
       "gaps-options": {
-        "description-large": "",
-        "description-medium": "",
-        "description-none": "",
-        "description-small": "",
-        "label-large": "",
-        "label-medium": "",
-        "label-none": "",
-        "label-small": ""
+        "description-large": "{{spacing}} 간격 필요",
+        "description-medium": "{{spacing}} 간격 필요",
+        "description-none": "체크 표시 모두 표시",
+        "description-small": "{{spacing}} 간격 필요",
+        "label-large": "대",
+        "label-medium": "중",
+        "label-none": "없음",
+        "label-small": "소"
       },
       "label-rtl": "RTL"
     }
   },
   "bargauge": {
     "bar-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "자동",
+      "label-manual": "수동"
     },
-    "category-bar-gauge": "",
-    "description-max-height": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-show-unfilled-area": "",
+    "category-bar-gauge": "막대 게이지",
+    "description-max-height": "행 최대 높이(가로 방향)",
+    "description-min-height": "행 최소 높이(가로 방향)",
+    "description-min-width": "열 최소 너비(세로 방향)",
+    "description-show-unfilled-area": "활성화하면 채워지지 않은 영역이 회색으로 렌더링됩니다",
     "display-mode-options": {
-      "label-basic": "",
-      "label-gradient": "",
-      "label-retro": ""
+      "label-basic": "베이직",
+      "label-gradient": "그라데이션",
+      "label-retro": "레트로 LCD"
     },
-    "name-bar-size": "",
-    "name-display-mode": "",
-    "name-max-height": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-name-placement": "",
+    "name-bar-size": "막대 크기",
+    "name-display-mode": "디스플레이 모드",
+    "name-max-height": "최대 높이",
+    "name-min-height": "최소 높이",
+    "name-min-width": "최소 너비",
+    "name-name-placement": "이름 배치",
     "name-placement-options": {
-      "label-auto": "",
-      "label-hidden": "",
-      "label-left": "",
-      "label-top": ""
+      "label-auto": "자동",
+      "label-hidden": "숨김",
+      "label-left": "왼쪽",
+      "label-top": "상단"
     },
-    "name-show-unfilled-area": "",
-    "name-value-display": "",
+    "name-show-unfilled-area": "미채움 영역 표시",
+    "name-value-display": "값 표시",
     "value-display-options": {
-      "label-hidden": "",
-      "label-text-color": "",
-      "label-value-color": ""
+      "label-hidden": "숨김",
+      "label-text-color": "텍스트 색상",
+      "label-value-color": "색상 값"
     }
   },
   "bookmarks-page": {
@@ -3473,8 +3473,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "프로비저닝된 리소스 일괄 삭제",
+      "bulk-move-provisioned-resources": "프로비저닝된 리소스 일괄 이동",
       "cancel-button": "취소",
       "confirmation-text": "삭제",
       "delete-button": "삭제",
@@ -3483,7 +3483,7 @@
       "delete-modal-restore-dashboards-text": "이 작업을 수행하면 선택한 폴더가 즉시 삭제되지만 선택한 대시보드는 30일 후에 삭제 대상으로 표시됩니다. 조직 관리자는 30일이 만료되기 전에 언제든지 대시보드를 복구할 수 있습니다. 폴더를 복구할 수 없습니다.",
       "delete-modal-text": "이 작업을 수행하면 다음 콘텐츠가 삭제됩니다.",
       "delete-modal-title": "삭제",
-      "delete-provisioned-folder": "",
+      "delete-provisioned-folder": "프로비저닝된 폴더 삭제",
       "deleting": "삭제 중…",
       "manage-permissions-button": "권한 관리",
       "move-button": "이동",
@@ -3493,8 +3493,8 @@
       "move-modal-title": "이동",
       "moving": "이동 중...",
       "new-folder-name-required-phrase": "폴더 이름은 필수 입력 항목입니다.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "프로비저닝된 리소스와 프로비저닝되지 않은 리소스를 모두 선택하셨습니다. 이 두 가지는 함께 처리할 수 없습니다. 프로비저닝된 리소스만 또는 프로비저닝되지 않은 리소스만 선택한 후 다시 시도해 주세요.",
+      "selected-mix-resources-modal-title": "혼합 리소스 유형 선택됨"
     },
     "actions": {
       "button-to-recently-deleted": "최근에 삭제됨"
@@ -3507,24 +3507,24 @@
       "this-folder-is-empty": "이 폴더는 비어 있습니다"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_other": ""
+      "all-deleted": "모든 리소스가 성공적으로 삭제되었습니다",
+      "all-moved": "모든 리소스가 성공적으로 이동되었습니다",
+      "button-done": "완료됨",
+      "progress-title": "성공",
+      "failed-alert_other": "{{count}}개 항목 실패"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "취소",
+      "button-delete": "삭제",
+      "button-deleting": "삭제 중…",
+      "delete-warning": "이렇게 하면 선택하신 폴더와 하위 폴더가 삭제되며, 전체적으로 다음에 영향을 미칩니다.",
+      "error-path-not-found": "경로를 찾을 수 없습니다"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "취소",
+      "button-move": "이동",
+      "button-moving": "이동 중...",
+      "deleting": "삭제 중",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3532,14 +3532,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "파일 내용을 찾을 수 없습니다",
+      "error-path-not-found": "경로를 찾을 수 없습니다",
+      "error-target-folder-path-missing": "대상 폴더 경로가 누락되었습니다",
+      "error-title": "대상 폴더 오류",
+      "move-warning": "이렇게 하면 선택하신 폴더와 하위 폴더가 이동되며, 전체적으로 다음에 영향을 미칩니다.",
+      "moving": "이동 중",
+      "progress": "진행 상태: {{current}}/{{total}}",
+      "target-folder": "대상 폴더"
     },
     "counts": {
       "alertRule_other": "경고 규칙 {{count}}개",
@@ -3560,12 +3560,12 @@
       "read-only-message": ""
     },
     "delete-provisioned-folder-form": {
-      "api-error": "",
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "success-message": ""
+      "api-error": "폴더를 삭제하지 못했습니다",
+      "button-cancel": "취소",
+      "button-delete": "삭제",
+      "button-deleting": "삭제 중…",
+      "delete-warning": "이 작업을 수행하면 이 폴더와 모든 하위 폴더가 삭제됩니다. 이는 전체적으로 다음에 영향을 미칩니다.",
+      "success-message": "폴더가 삭제되었습니다"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "하위 정보를 검색할 수 없습니다"
@@ -3590,7 +3590,7 @@
       "empty-message": "폴더를 찾을 수 없음",
       "error-title": "폴더 로딩 중 오류 발생",
       "non-folder-item": "비폴더 {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "대시보드",
       "search-placeholder": "폴더 검색",
       "unknown-error": "알 수 없는 오류"
     },
@@ -3619,7 +3619,7 @@
       "folder-name-input-placeholder-enter-folder-name": "폴더 이름 입력",
       "label-folder-name": "폴더 이름",
       "text-pull-request-created": "이 폴더에 대한 변경 사항을 포함하는 풀 요청이 생성되었습니다.",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "{{folderName}}(이)라는 이름으로 폴더가 생성됩니다",
       "title-pull-request-created": "풀 요청 생성됨",
       "title-this-repository-is-read-only": "이 리포지토리는 읽기 전용입니다."
     },
@@ -3628,52 +3628,52 @@
       "text": "쿼리에 대해 찾은 결과 없음"
     },
     "restore": {
-      "success": ""
+      "success": "{{name}} 대시보드 복원됨"
     },
     "text-this-repository-is-read-only": "대상에 직접 액세스할 수 있는 경우 JSON을 복사하여 붙여넣으세요.",
     "trash-state-manager": {
       "label": {
-        "alphabetically-az": "",
-        "alphabetically-za": ""
+        "alphabetically-az": "알파벳순(A~Z)",
+        "alphabetically-za": "알파벳순(Z~A)"
       }
     }
   },
   "candlestick": {
     "additional-fields-options": {
-      "label-ignore": "",
-      "label-include": ""
+      "label-ignore": "무시",
+      "label-include": "포함"
     },
     "candle-style-options": {
-      "label-candles": "",
-      "label-ohlc-bars": ""
+      "label-candles": "캔들",
+      "label-ohlc-bars": "OHLC 막대"
     },
-    "category-candlestick": "",
+    "category-candlestick": "캔들스틱",
     "color-strategy-options": {
-      "label-since-open": "",
-      "label-since-prior-close": ""
+      "label-since-open": "개설 이후",
+      "label-since-prior-close": "이전 마감 이후"
     },
-    "description-additional-fields": "",
-    "description-close": "",
-    "description-high": "",
-    "description-low": "",
-    "description-open": "",
-    "description-volume": "",
+    "description-additional-fields": "위에 매핑되지 않은 필드를 구성하려면 표준 시계열 옵션을 사용합니다",
+    "description-close": "기간 종료 시점의 값",
+    "description-high": "기간 내 최대 값",
+    "description-low": "기간 내 최소 값",
+    "description-open": "기간 시작 시점의 값",
+    "description-volume": "기간 내 샘플 개수",
     "mode-options": {
-      "label-both": "",
-      "label-candles": "",
-      "label-volume": ""
+      "label-both": "둘 다",
+      "label-candles": "캔들",
+      "label-volume": "양"
     },
-    "name-additional-fields": "",
-    "name-candle-style": "",
-    "name-close": "",
-    "name-color-strategy": "",
-    "name-down-color": "",
-    "name-high": "",
-    "name-low": "",
-    "name-mode": "",
-    "name-open": "",
-    "name-up-color": "",
-    "name-volume": ""
+    "name-additional-fields": "추가 필드",
+    "name-candle-style": "캔들 유형",
+    "name-close": "닫기",
+    "name-color-strategy": "색상 전략",
+    "name-down-color": "색 조정(아래로)",
+    "name-high": "높음",
+    "name-low": "낮음",
+    "name-mode": "모드",
+    "name-open": "들어가기",
+    "name-up-color": "색 조정(위로)",
+    "name-volume": "양"
   },
   "canvas": {
     "apieditor": {
@@ -3688,18 +3688,18 @@
       }
     },
     "button-item": {
-      "category-button": "",
+      "category-button": "버튼",
       "label": {
         "center": "중앙",
         "left": "왼쪽",
         "right": "오른쪽"
       },
-      "name-align-text": "",
-      "name-api": "",
-      "name-style": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
+      "name-align-text": "텍스트 정렬",
+      "name-api": "API",
+      "name-style": "스타일",
+      "name-text": "텍스트",
+      "name-text-color": "텍스트 색상",
+      "name-text-size": "글자 크기",
       "placeholder": {
         "auto": "자동"
       }
@@ -3726,21 +3726,21 @@
         }
       }
     },
-    "category-arrow-direction": "",
-    "category-background": "",
-    "category-border": "",
-    "category-canvas": "",
-    "category-color": "",
-    "category-data-links": "",
-    "category-line-style": "",
-    "category-metric-value": "",
-    "category-radius": "",
-    "category-selected-connection": "",
-    "category-selected-element": "",
-    "category-size": "",
-    "category-tooltip": "",
+    "category-arrow-direction": "화살표 방향",
+    "category-background": "배경",
+    "category-border": "테두리",
+    "category-canvas": "캔버스",
+    "category-color": "색상",
+    "category-data-links": "데이터 링크 및 작업",
+    "category-line-style": "선 유형",
+    "category-metric-value": "메트릭 값",
+    "category-radius": "반경",
+    "category-selected-connection": "선택한 연결",
+    "category-selected-element": "선택한 요소({{element}}개)",
+    "category-size": "크기",
+    "category-tooltip": "툴팁",
     "cloud-item": {
-      "category-cloud": "",
+      "category-cloud": "클라우드",
       "label": {
         "bottom": "하단",
         "center": "중앙",
@@ -3749,47 +3749,47 @@
         "right": "오른쪽",
         "top": "상단"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "텍스트 정렬",
+      "name-text": "텍스트",
+      "name-text-color": "텍스트 색상",
+      "name-text-size": "글자 크기",
+      "name-vertical-align": "수직 정렬",
       "placeholder": {
         "auto": "자동"
       }
     },
-    "description-experimental-types": "",
-    "description-inline-editing": "",
-    "description-pan-zoom": "",
+    "description-experimental-types": "실험적 요소 유형 선택 활성화",
+    "description-inline-editing": "패널 직접 편집 활성화",
+    "description-pan-zoom": "이동 및 확대/축소 활성화",
     "direction-options": {
-      "label-both": "",
-      "label-forward": "",
-      "label-none": "",
-      "label-reverse": ""
+      "label-both": "둘 다",
+      "label-forward": "앞으로",
+      "label-none": "없음",
+      "label-reverse": "되돌리기"
     },
     "drone-front-item": {
-      "category-drone-front": "",
-      "name-roll-angle": ""
+      "category-drone-front": "드론 전면",
+      "name-roll-angle": "롤 각도"
     },
     "drone-side-item": {
-      "category-drone-side": "",
-      "name-pitch-angle": ""
+      "category-drone-side": "드론 측면",
+      "name-pitch-angle": "피치 각도"
     },
     "drone-top-item": {
-      "category-drone-top": "",
-      "name-back-left-rotor-rpm": "",
-      "name-back-right-rotor-rpm": "",
-      "name-front-left-rotor-rpm": "",
-      "name-front-right-rotor-rpm": "",
-      "name-yaw-angle": ""
+      "category-drone-top": "드론 상단",
+      "name-back-left-rotor-rpm": "후면 왼쪽 회전체 RPM",
+      "name-back-right-rotor-rpm": "후면 오른쪽 회전체 RPM",
+      "name-front-left-rotor-rpm": "전면 왼쪽 회전체 RPM",
+      "name-front-right-rotor-rpm": "전면 오른쪽 회전체 RPM",
+      "name-yaw-angle": "요각"
     },
     "element-editor": {
-      "category-layout": "",
-      "description-unsupported": "",
-      "name-quick-placement": ""
+      "category-layout": "레이아웃",
+      "description-unsupported": "선택한 요소 유형은 현재 설정에서 지원되지 않습니다. 고급 요소 유형을 사용하도록 설정해 주세요.",
+      "name-quick-placement": "신속한 배치"
     },
     "ellipse-item": {
-      "category-ellipse": "",
+      "category-ellipse": "타원",
       "label": {
         "bottom": "하단",
         "center": "중앙",
@@ -3798,50 +3798,50 @@
         "right": "오른쪽",
         "top": "상단"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "텍스트 정렬",
+      "name-text": "텍스트",
+      "name-text-color": "텍스트 색상",
+      "name-text-size": "글자 크기",
+      "name-vertical-align": "수직 정렬",
       "placeholder": {
         "auto": "자동"
       }
     },
     "icon-item": {
-      "category-icon": "",
-      "name-fill-color": "",
-      "name-svg-path": ""
+      "category-icon": "아이콘",
+      "name-fill-color": "색상 채우기",
+      "name-svg-path": "SVG 경로"
     },
     "inline-edit": {
       "canvas-inline-editor": "캔버스 인라인 편집기",
       "tooltip-close-inline-editor": "인라인 편집기 닫기"
     },
     "inline-edit-body": {
-      "category-selected-element": "",
+      "category-selected-element": "선택한 요소({{element}}개)",
       "label-add-item": "항목 추가",
       "please-select-an-element": "요인을 선택해 주세요."
     },
-    "label-actions": "",
-    "label-color": "",
-    "label-direction": "",
-    "label-image": "",
-    "label-image-size": "",
-    "label-line-style": "",
-    "label-links": "",
-    "label-radius": "",
-    "label-size": "",
-    "label-width": "",
+    "label-actions": "작업",
+    "label-color": "색상",
+    "label-direction": "방향",
+    "label-image": "이미지",
+    "label-image-size": "이미지 크기",
+    "label-line-style": "선 유형",
+    "label-links": "링크",
+    "label-radius": "반경",
+    "label-size": "크기",
+    "label-width": "너비",
     "layer-editor": {
-      "category-layer": "",
-      "category-layout": "",
-      "name-constraints": "",
-      "name-elements": ""
+      "category-layer": "계층",
+      "category-layout": "레이아웃",
+      "name-constraints": "제약 사항",
+      "name-elements": "요소"
     },
     "line-style-editor": {
       "label-animate": "애니메이션"
     },
     "line-style-options": {
-      "label-solid": ""
+      "label-solid": "단색"
     },
     "metric-value-item": {
       "label": {
@@ -3856,14 +3856,14 @@
         "auto": "자동"
       }
     },
-    "name-align-text": "",
-    "name-color": "",
-    "name-experimental-types": "",
-    "name-inline-editing": "",
-    "name-pan-zoom": "",
-    "name-text": "",
-    "name-text-size": "",
-    "name-vertical-align": "",
+    "name-align-text": "텍스트 정렬",
+    "name-color": "텍스트 색상",
+    "name-experimental-types": "실험적 요소 유형",
+    "name-inline-editing": "인라인 편집",
+    "name-pan-zoom": "이동 및 확대/축소",
+    "name-text": "텍스트",
+    "name-text-size": "글자 크기",
+    "name-vertical-align": "수직 정렬",
     "not-found-display": {
       "not-found": "<0>찾을 수 없음: </0><config />"
     },
@@ -3876,7 +3876,7 @@
       "zoom-scroll-wheel": "확대/축소: 스크롤 휠"
     },
     "parallelogram-item": {
-      "category-parallelogram": "",
+      "category-parallelogram": "평행 사변형",
       "label": {
         "bottom": "하단",
         "center": "중앙",
@@ -3885,11 +3885,11 @@
         "right": "오른쪽",
         "top": "상단"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "텍스트 정렬",
+      "name-text": "텍스트",
+      "name-text-color": "텍스트 색상",
+      "name-text-size": "글자 크기",
+      "name-vertical-align": "수직 정렬",
       "placeholder": {
         "auto": "자동"
       }
@@ -3902,21 +3902,21 @@
     },
     "placement-editor": {
       "horizontal-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-left-and-right": "",
-        "label-right": "",
-        "label-scale": ""
+        "label-center": "중앙",
+        "label-left": "왼쪽",
+        "label-left-and-right": "왼쪽 및 오른쪽",
+        "label-right": "오른쪽",
+        "label-scale": "스케일"
       },
       "label-constraints": "제약 사항",
       "label-position": "위치",
       "loading": "로딩 중...",
       "vertical-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-scale": "",
-        "label-top": "",
-        "label-top-and-bottom": ""
+        "label-bottom": "하단",
+        "label-center": "중앙",
+        "label-scale": "스케일",
+        "label-top": "상단",
+        "label-top-and-bottom": "상단 및 하단"
       }
     },
     "quick-positioning": {
@@ -3928,7 +3928,7 @@
       "tooltip-align-vertical-centers": "수직 중앙 정렬"
     },
     "rectangle-item": {
-      "category-rectangle": "",
+      "category-rectangle": "직사각형",
       "label": {
         "bottom": "하단",
         "center": "중앙",
@@ -3937,33 +3937,33 @@
         "right": "오른쪽",
         "top": "상단"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "텍스트 정렬",
+      "name-text": "텍스트",
+      "name-text-color": "텍스트 색상",
+      "name-text-size": "글자 크기",
+      "name-vertical-align": "수직 정렬",
       "placeholder": {
         "auto": "자동"
       }
     },
     "server-item": {
-      "category-server": "",
-      "name-blink-rate": "",
-      "name-bulb-color": "",
-      "name-status-color": "",
-      "name-type": "",
+      "category-server": "서버",
+      "name-blink-rate": "깜박임 속도[hz] (0 = 꺼짐)",
+      "name-bulb-color": "전구 색상",
+      "name-status-color": "상태 색상",
+      "name-type": "유형",
       "type-options": {
-        "label-database": "",
-        "label-single": "",
-        "label-stack": "",
-        "label-terminal": ""
+        "label-database": "데이터베이스",
+        "label-single": "단일",
+        "label-stack": "스택",
+        "label-terminal": "터미널"
       }
     },
     "text-display": {
       "double-click-to-set": "두 번 클릭하여 텍스트 설정"
     },
     "text-item": {
-      "category-text": "",
+      "category-text": "텍스트",
       "label": {
         "bottom": "하단",
         "center": "중앙",
@@ -3972,20 +3972,20 @@
         "right": "오른쪽",
         "top": "상단"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "텍스트 정렬",
+      "name-text": "텍스트",
+      "name-text-color": "텍스트 색상",
+      "name-text-size": "글자 크기",
+      "name-vertical-align": "수직 정렬",
       "placeholder": {
         "auto": "자동"
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "툴팁 모드",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "비활성화됨",
+        "label-enabled": "활성화됨"
       }
     },
     "tree-navigation-editor": {
@@ -4005,7 +4005,7 @@
       "tooltip-remove": "제거"
     },
     "triangle-item": {
-      "category-triangle": "",
+      "category-triangle": "삼각형",
       "label": {
         "bottom": "하단",
         "center": "중앙",
@@ -4014,18 +4014,18 @@
         "right": "오른쪽",
         "top": "상단"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "텍스트 정렬",
+      "name-text": "텍스트",
+      "name-text-color": "텍스트 색상",
+      "name-text-size": "글자 크기",
+      "name-vertical-align": "수직 정렬",
       "placeholder": {
         "auto": "자동"
       }
     },
     "wind-turbine-item": {
-      "category-wind-turbine": "",
-      "name-rpm": ""
+      "category-wind-turbine": "풍력 터빈",
+      "name-rpm": "RPM"
     }
   },
   "carousel": {
@@ -4042,8 +4042,8 @@
   "close-button": {
     "tooltip": "닫기"
   },
-  "cloud-enterprise-feature-badge": "",
-  "cloud-feature-badge": "",
+  "cloud-enterprise-feature-badge": "클라우드 및 엔터프라이즈",
+  "cloud-feature-badge": "클라우드",
   "combobox": {
     "async": {
       "error": "옵션을 불러오는 중에 오류가 발생했습니다."
@@ -4354,7 +4354,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "쿼리 실행"
     }
   },
   "dashboard": {
@@ -4517,7 +4517,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "진행"
         },
         "title": {
           "proceed-to-external-site": "외부 사이트로 이동하시겠어요?"
@@ -4614,7 +4614,7 @@
       }
     },
     "description": {
-      "action": ""
+      "action": "대시보드 설명 변경"
     },
     "dynamic-config-value-editor": {
       "render-label": {
@@ -4623,17 +4623,17 @@
     },
     "edit-actions": {
       "add": "{{typeName}} 추가",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
-      "move": "",
+      "add-conditional-rule": "{{ruleDescription}} 규칙 추가",
+      "duplicate-panel": "패널 복제",
+      "edit-query-result-rule": "쿼리 결과 규칙 변경",
+      "edit-template-variable-rule": "템플릿 변수 규칙 변경",
+      "edit-time-range-rule": "시간 범위 규칙 변경",
+      "move": "{{typeName}} 이동",
       "panel-background": "패널 배경 변경",
       "panel-description": "패널 설명 변경",
-      "panel-max-repeats-per-row": "",
+      "panel-max-repeats-per-row": "행당 최대 반복 횟수",
       "panel-repeat-direction": "반복 방향",
-      "panel-repeat-variable": "",
+      "panel-repeat-variable": "패널 반복 기준",
       "panel-title": "패널 제목 변경",
       "paste-panel": "패널 붙여넣기",
       "remove": "{{typeName}} 제거",
@@ -4642,7 +4642,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "대시보드",
-        "element": "",
+        "element": "요소",
         "local-variable": "로컬 변수",
         "multiple-elements": "여러 요소",
         "multiple-elements-delete-text": "정말 이 요소를 삭제하시겠어요?",
@@ -4724,10 +4724,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "대시보드 내보내기"
       },
       "menu": {
-        "label": ""
+        "label": "대시보드 메뉴 내보내기"
       }
     },
     "fetch-dashboard": {
@@ -4749,9 +4749,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "기본값",
+          "shared-crosshair": "공유 십자선",
+          "shared-tooltip": "공유 툴팁"
         }
       }
     },
@@ -4768,7 +4768,7 @@
     "get-field-override-categories": {
       "label-add-field-override": "필드 재정의 추가",
       "label-add-override-property": "재정의 속성 추가",
-      "override-name": "",
+      "override-name": "{{overrideNum}} 재정의",
       "title": {
         "add-button": "버튼 추가"
       }
@@ -4804,14 +4804,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "다음 패널에 주석 데이터를 전송하지 않습니다",
+        "annotation-panels-support-annotations": "주석을 지원하는 모든 패널에 주석 데이터를 전송합니다",
+        "annotations-explicitly-listed-panels": "명시적으로 지정된 패널에 주석을 전송합니다"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "모든 패널",
+        "all-panels-except": "다음을 제외한 모든 패널",
+        "selected-panels": "선택한 패널"
       }
     },
     "get-panel-frame-category": {
@@ -4996,7 +4996,7 @@
       "title-matched_other": "{{totalCount}}개 옵션 중 {{count}}개 일치함"
     },
     "outline": {
-      "repeated-item": "",
+      "repeated-item": "반복",
       "tree-item": {
         "empty": "(비어 있음)",
         "no-title": "<제목 없음>"
@@ -5072,7 +5072,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "정말 대시보드를 {{version}} 버전으로 복원하시겠어요? 저장하지 않은 변경 사항은 모두 손실됩니다.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "네, {{version}} 버전으로 복구해 주세요",
       "title-restore-version": "버전 복구"
     },
     "row-options-button": {
@@ -5124,7 +5124,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "대시보드가 저장되었습니다"
     },
     "save-dashboard-as-button": {
       "save-as": "다음 이름으로 저장"
@@ -5154,13 +5154,13 @@
       "label-changes": "변경 사항",
       "label-details": "세부 정보",
       "title": "대시보드 저장",
-      "title-copy": "",
-      "title-provisioned": ""
+      "title-copy": "대시보드 복사본 저장",
+      "title-provisioned": "프로비저닝된 대시보드"
     },
     "save-dashboard-error-proxy": {
       "body-name-exists": "선택한 폴더에 동일한 이름의 대시보드가 이미 존재합니다.<1></1><2>그래도 이 대시보드를 저장하시겠어요?</2>",
       "body-version-mismatch": "다른 사람이 이 대시보드를 업데이트했습니다<1></1><2>그래도 이 대시보드를 저장하시겠어요?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "저장 및 덮어쓰기",
       "title-name-exists": "충돌",
       "title-version-mismatch": "충돌"
     },
@@ -5233,7 +5233,7 @@
       }
     },
     "title": {
-      "action": ""
+      "action": "대시보드 제목 변경"
     },
     "toolbar": {
       "add": "추가",
@@ -5357,9 +5357,9 @@
       "label-apply-transformation-to": "변환 적용 대상"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "하나의 변환을 제거하면 다른 변환이 제대로 작동하지 않을 수 있습니다. 변환이 하나만 있는 경우 기본 선택 화면으로 돌아갑니다.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "삭제",
         "title-debug": "디버그",
         "title-disable-transformation": "변환 비활성화",
         "title-filter": "필터",
@@ -5380,16 +5380,16 @@
       "placeholder-search-for-transformation": "변환 검색",
       "show-images": "이미지 표시",
       "title-add-another-transformation": "다른 변환 추가",
-      "view-all": ""
+      "view-all": "모두 보기"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "모든 변환을 삭제하면 기본 선택 화면으로 돌아갑니다."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "다른 변환 추가"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "전체 삭제",
       "delete-all-transformations": "모든 변환 삭제",
       "title-delete-all-transformations": "모든 변환을 삭제하시겠어요?",
       "tooltip-clear-search": "검색 초기화",
@@ -5419,16 +5419,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "변수 설명 변경"
       },
       "hide": {
-        "action": ""
+        "action": "변수 숨기기 옵션 변경"
       },
       "label": {
-        "action": ""
+        "action": "변수 레이블 변경"
       },
       "name": {
-        "action": ""
+        "action": "변수 이름 변경"
       }
     },
     "version-history-comparison": {
@@ -5440,7 +5440,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "{{version}} 버전 선택 토글",
       "date": "날짜",
-      "name-latest": "",
+      "name-latest": "최근",
       "notes": "메모",
       "restore": "복구",
       "updated-by": "업데이트한 사용자",
@@ -5518,7 +5518,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "차원에 대한 다음 정보를 CSV로 제공: {{name}}, {{value}}",
       "label-data-source": "데이터 소스",
       "label-use-static-key-dimensions": "고정 키 차원 사용",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "사용자 지정 값 허용"
     },
     "add-to-dashboard": {
       "message": {
@@ -5592,7 +5592,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "공개 URL 철회"
       },
       "title": {
         "revoke-public-url": "공개 URL 철회"
@@ -5605,7 +5605,7 @@
     },
     "custom-variable-form": {
       "custom-options": "사용자 지정 옵션",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "쉼표로 구분된 값",
       "selection-options": "선택 옵션"
     },
     "dashboard-edit-pane-renderer": {
@@ -5626,8 +5626,8 @@
       "label-with-tags": "태그 포함",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "대시보드",
+          "link": "링크"
         }
       },
       "placeholder-open-dashboard": "대시보드 열기"
@@ -5670,8 +5670,8 @@
       "data-source-options": "데이터 소스 옵션",
       "description-instance-name-filter": "변수 값 목록에서 어떤 데이터 소스 인스턴스를 선택할지에 대한 정규 표현식 필터입니다. 모두 비워 둡니다.",
       "example-instance-name-filter": "예시: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "인스턴스 이름 필터",
+      "name-type": "유형",
       "selection-options": "선택 옵션"
     },
     "default-grid-layout-manager": {
@@ -5682,12 +5682,12 @@
       }
     },
     "delete-provisioned-dashboard-form": {
-      "api-error": "",
+      "api-error": "대시보드 삭제 실패",
       "cancel-action": "취소",
       "delete-action": "대시보드 삭제",
       "deleting": "삭제 중…",
-      "drawer-title": "",
-      "success-message": ""
+      "drawer-title": "프로비저닝된 대시보드 삭제",
+      "success-message": "대시보드가 성공적으로 삭제되었습니다"
     },
     "description-label": {
       "description": "설명"
@@ -5716,15 +5716,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "편집 가능",
+          "readonly": "읽기 전용"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "기본값",
+          "shared-crosshair": "공유 십자선",
+          "shared-tooltip": "공유 툴팁"
         }
       }
     },
@@ -5736,36 +5736,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "실시간으로 키/값 필터를 추가합니다",
+        "dynamically-switch-source-multiple-panels": "여러 패널의 데이터 소스를 동적으로 전환합니다",
+        "group": "실시간으로 그룹화에 사용할 키를 추가합니다",
+        "hidden-constant-variable": "공유하려는 대시보드의 메트릭 접두사에 유용한, 숨겨진 상수형 변수",
+        "users-enter-arbitrary-strings-textbox": "사용자는 텍스트 상자에 임의의 문자열을 입력할 수 있습니다",
+        "values-are-static-and-defined-manually": "값은 정적이며 수동으로 정의됩니다",
+        "values-fetched-source-query": "값은 데이터 소스 쿼리에서 가져옵니다",
+        "values-timespans": "값은 시간 범위입니다(예: 1분, 1시간, 1일)"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "임시 필터",
+        "constant": "상수",
+        "custom": "사용자 지정",
+        "data-source": "데이터 소스",
+        "group-by": "그룹화 기준",
+        "interval": "간격",
+        "query": "쿼리",
+        "textbox": "텍스트 상자"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "다음 패널에 주석 데이터를 전송하지 않습니다",
+        "annotation-panels-support-annotations": "주석을 지원하는 모든 패널에 주석 데이터를 전송합니다",
+        "annotations-explicitly-listed-panels": "명시적으로 지정된 패널에 주석을 전송합니다"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "모든 패널",
+        "all-panels-except": "다음을 제외한 모든 패널",
+        "selected-panels": "선택한 패널"
       }
     },
     "get-panel-frame-options": {
@@ -5793,7 +5793,7 @@
       "group-by-options": "옵션을 기준으로 그룹화",
       "label-data-source": "데이터 소스",
       "label-use-static-group-by-dimensions": "고정 그룹 차원 사용",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "사용자 지정 값 허용"
     },
     "help-wizard": {
       "copy-to-clipboard": "클립보드로 복사",
@@ -5829,14 +5829,14 @@
       "apply": "적용"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "시간 범위를 지정된 수로 나누어 동적으로 간격을 계산합니다.",
       "description-calculated-value-below-threshold": "계산된 값은 이 임계값 아래로 내려가지 않습니다",
       "description-step-count": "값을 계산하기 위해 현재 시간 범위를 나눌 횟수",
       "interval-options": "간격 옵션",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "자동 옵션",
+      "name-min-interval": "최소 간격",
+      "name-step-count": "단계 수",
+      "name-values": "값"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5856,19 +5856,19 @@
       "usage-count_other": "{{count}}개의 대시보드에서 사용됨"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "대시보드 이동 중 오류 발생",
+      "api-error": "대시보드를 이동하지 못했습니다",
+      "cancel-action": "취소",
+      "current-file-not-found": "현재 대시보드 파일을 찾을 수 없습니다",
+      "drawer-title": "프로비저닝된 대시보드 이동",
+      "file-load-error": "대시보드 로딩 중 오류 발생",
+      "loading-file-data": "대시보드 데이터 로딩 중",
+      "move-action": "대시보드 이동",
+      "move-read-only-message": "리포지토리가 읽기 전용이므로 이 대시보드를 Grafana에서 직접 이동할 수 없습니다. 이 대시보드를 이동하려면 Git 리포지토리에서 파일을 이동하세요.",
+      "moving": "이동 중...",
+      "success-message": "대시보드가 성공적으로 이동되었습니다",
+      "target-path-label": "대상 경로",
+      "title-this-repository-is-read-only": "이 리포지토리는 읽기 전용입니다"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "선택한 폴더에 동일한 이름의 대시보드가 이미 존재합니다. 그래도 이 대시보드를 저장하시겠어요?",
@@ -5876,7 +5876,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "진행"
       },
       "title": {
         "proceed-to-external-site": "외부 사이트로 이동하시겠어요?"
@@ -5891,7 +5891,7 @@
       }
     },
     "panel-data-alerting-tab": {
-      "tab-label": ""
+      "tab-label": "경보"
     },
     "panel-data-alerting-tab-rendered": {
       "alert": {
@@ -5902,19 +5902,19 @@
       "title-dashboard-not-saved": "대시보드 저장되지 않음"
     },
     "panel-data-queries-tab": {
-      "tab-label": ""
+      "tab-label": "쿼리"
     },
     "panel-data-queries-tab-rendered": {
       "add-query": "쿼리 추가",
       "expression": "표현식 "
     },
     "panel-data-transformations-tab": {
-      "tab-label": ""
+      "tab-label": "변환"
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "다른 변환 추가",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "모든 변환을 삭제하면 기본 선택 화면으로 돌아갑니다.",
+      "confirmText-delete-all": "전체 삭제",
       "delete-all-transformations": "모든 변환 삭제",
       "title-delete-all-transformations": "모든 변환을 삭제하시겠어요?"
     },
@@ -5967,13 +5967,13 @@
       "description-examples": "이름을 지정한 캡처 그룹을 사용하여 표시 텍스트와 값을 분리할 수 있습니다(<1>예시 참고</1>).",
       "description-optional": "선택 사항, 시리즈 이름 또는 메트릭 노드 세그먼트의 일부를 추출하려는 경우.",
       "label-data-source": "데이터 소스",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "정적 옵션 정렬",
       "label-target-data-source": "대상 데이터 소스",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "정적 옵션 사용",
+      "name-regex": "정규식",
       "query-options": "쿼리 옵션",
       "selection-options": "선택 옵션",
-      "static-options-legend": ""
+      "static-options-legend": "정적 옵션"
     },
     "resource-export": {
       "label": {
@@ -5986,7 +5986,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "정말 대시보드를 {{version}} 버전으로 복원하시겠어요? 저장하지 않은 변경 사항은 모두 손실됩니다.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "네, {{version}} 버전으로 복구해 주세요",
       "title-restore-version": "버전 복구"
     },
     "save-button": {
@@ -6005,15 +6005,15 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "대시보드 저장 실패"
       },
-      "required": ""
+      "required": "필수 항목"
     },
     "save-dashboard-drawer": {
       "tabs": {
         "label-changes": "변경 사항",
         "label-details": "세부 정보",
         "title": "대시보드 저장",
-        "title-copy": "",
-        "title-provisioned": ""
+        "title-copy": "대시보드 복사본 저장",
+        "title-provisioned": "프로비저닝된 대시보드"
       }
     },
     "save-dashboard-form": {
@@ -6032,8 +6032,8 @@
         "title-someone-else-has-updated-this-dashboard": "다른 사람이 이 대시보드를 업데이트했습니다",
         "would-still-dashboard": "그래도 이 대시보드를 저장하시겠어요?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "새 대시보드 스키마(V2)의 제한으로 인해, 라이브러리 패널을 외부로 내보낼 때 임베드된 콘텐츠가 있는 일반 패널로 변환됩니다.",
+      "schema-v2-library-panels-export-title": "라이브러리 패널이 일반 패널로 변환됩니다",
       "title-dashboard-drastically-changed": "대시보드가 되돌릴 수 없게 변경됨"
     },
     "save-dashboard-form-common-options": {
@@ -6079,10 +6079,10 @@
       "description-enables-multiple-values-selected": "여러 값을 동시에 선택할 수 있도록 합니다",
       "description-enables-option-include-variables": "모든 값을 포함하는 옵션 활성화",
       "description-enables-users-custom-values": "사용자가 목록에 사용자 지정 값을 추가할 수 있습니다",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "사용자 지정 값 허용",
+      "name-custom-all-value": "모든 값 사용자 지정",
+      "name-include-all-option": "모든 옵션 포함",
+      "name-multi-value": "다중-값"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "공유 메뉴 토글"
@@ -6103,7 +6103,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "기본값"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(선택 사항)",
@@ -6128,8 +6128,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "이 패널의 연결을 해제하면 다른 대시보드에 영향을 주지 않고 편집할 수 있습니다. 그러나 일단 변경하면 원래의 재사용 가능한 패널로 되돌릴 수 없습니다.",
+      "confirmText-yes-unlink": "네, 연결을 해제해 주세요",
       "title-really-unlink-panel": "정말 이 패널의 연결을 해제하시겠어요?"
     },
     "unsaved-changes-modal": {
@@ -6147,7 +6147,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "대시보드가 저장되었습니다"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "이 변수는 어떤 변수나 대시보드에서도 참조되지 않습니다.",
@@ -6159,15 +6159,15 @@
       "aria-label-variable-editor-form": "변수 편집기 양식",
       "back-to-list": "목록으로 돌아가기",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "변수 삭제"
       },
       "delete": "삭제",
       "description-optional-display-name": "표시 이름(선택 사항)",
       "description-template-variable-characters": "템플릿 변수의 이름입니다. (최대 50자)",
       "general": "일반",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "설명",
+      "name-label": "레이블",
+      "name-name": "이름",
       "placeholder-descriptive-text": "설명 텍스트",
       "placeholder-label-name": "라벨 이름",
       "placeholder-variable-name": "변수 이름",
@@ -6182,8 +6182,8 @@
       "variable": "변수"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "정말 {{variable}}을(를) 삭제하시겠어요?",
+      "confirmText-delete-variable": "변수 삭제",
       "title-delete-variable": "변수 삭제",
       "tooltip-duplicate-variable": "변수 복제",
       "tooltip-remove-variable": "변수 제거"
@@ -6191,15 +6191,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "레이블",
+          "nothing": "아무것도 없음",
+          "variable": "변수"
         }
       },
       "label": "숨기기"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "변수 유형"
     },
     "variable-usages-button": {
       "title-show-usages": "다음 변수의 사용처 표시 중: {{variableId}}",
@@ -6227,7 +6227,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "{{version}} 버전 선택 토글",
       "date": "날짜",
-      "name-latest": "",
+      "name-latest": "최근",
       "notes": "메모",
       "restore": "복구",
       "updated-by": "업데이트한 사용자",
@@ -6334,18 +6334,18 @@
     }
   },
   "dashlist": {
-    "category-dashboard-list": "",
-    "name-folder": "",
-    "name-include-current-template-variables": "",
-    "name-include-current-time-range": "",
-    "name-max-items": "",
-    "name-query": "",
-    "name-recently-viewed": "",
-    "name-search": "",
-    "name-show-folder-names": "",
-    "name-show-headings": "",
-    "name-starred": "",
-    "name-tags": ""
+    "category-dashboard-list": "대시보드 목록",
+    "name-folder": "폴더",
+    "name-include-current-template-variables": "현재 템플릿 변수 값 포함",
+    "name-include-current-time-range": "현재 시간 범위 포함",
+    "name-max-items": "항목 최대 한도",
+    "name-query": "쿼리",
+    "name-recently-viewed": "최근 뷰",
+    "name-search": "검색",
+    "name-show-folder-names": "폴더 이름 표시",
+    "name-show-headings": "제목 표시",
+    "name-starred": "별표 표시됨",
+    "name-tags": "태그"
   },
   "data-source-list": {
     "empty-state": {
@@ -6609,16 +6609,16 @@
   "dimensions": {
     "background-size-editor": {
       "options": {
-        "label-contain": "",
-        "label-cover": "",
-        "label-fill": "",
-        "label-original": "",
-        "label-tile": ""
+        "label-contain": "포함",
+        "label-cover": "표지",
+        "label-fill": "채우기",
+        "label-original": "원본",
+        "label-tile": "타일"
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": "",
-      "noOptionsMessage-no-fields-found": ""
+      "label-fixed-color": "고정 색상",
+      "noOptionsMessage-no-fields-found": "필드를 찾을 수 없습니다"
     },
     "file-dropzone-custom-children": {
       "upload": "업로드"
@@ -6632,10 +6632,10 @@
       "placeholder-search": "검색"
     },
     "resource-dimension-editor": {
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "문자열 필드 결과 사용",
+      "description-fixed": "고정값",
       "label-field": "필드",
-      "label-fixed": "",
+      "label-fixed": "수정됨",
       "label-mappings": "매핑",
       "label-source": "소스"
     },
@@ -6653,35 +6653,35 @@
     },
     "scalar-dimension-editor": {
       "fixed-value-options": {
-        "label-fixed-values": ""
+        "label-fixed-values": "고정값"
       },
       "label-limit": "제한",
       "label-value": "값",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "필드를 찾을 수 없습니다",
       "scalar-options": {
-        "description-clamped": "",
-        "description-mod": "",
-        "label-clamped": "",
-        "label-mod": ""
+        "description-clamped": "최대 및 최소로 고정된 필드 값 사용",
+        "description-mod": "필드 값 사용, 최대 값에서 수정",
+        "label-clamped": "고정됨",
+        "label-mod": "모드"
       }
     },
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "고정값"
         }
       },
       "label-max": "최대",
       "label-min": "최소",
       "label-value": "값",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "필드를 찾을 수 없습니다"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "필드 값 표시",
+      "description-fixed": "고정값",
       "label-field": "필드",
-      "label-fixed": "",
+      "label-fixed": "수정됨",
       "label-source": "소스",
       "label-template": "템플릿",
       "label-value": "값"
@@ -6695,16 +6695,16 @@
       "description-percentage-means-thresholds-relative": "백분율은 최소 및 최대에 대한 임계값을 의미합니다",
       "modes": {
         "description": {
-          "threshold-based-percent-between-minmax": "",
-          "thresholds-based-absolute-values": ""
+          "threshold-based-percent-between-minmax": "최소/최대 사이의 백분율을 기준으로 임계값를 지정합니다",
+          "thresholds-based-absolute-values": "절대값을 기준으로 임계값를 선택합니다"
         },
         "label": {
-          "absolute": "",
-          "percentage": ""
+          "absolute": "절대적인",
+          "percentage": "비율"
         }
       },
       "thresholds-mode": "임계값 모드",
-      "value-base": ""
+      "value-base": "베이스"
     },
     "urlpicker-tab": {
       "label-preview": "미리보기"
@@ -6784,6 +6784,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "이벤트",
@@ -7056,7 +7057,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "로딩 중..."
     },
     "prev": "이전",
     "queryless-apps-extensions": {
@@ -7243,7 +7244,7 @@
           "start-time": "시작 시간:"
         }
       },
-      "share-span": "",
+      "share-span": "공유",
       "warnings": "경고"
     },
     "span-filters": {
@@ -7253,8 +7254,8 @@
       "aria-label-select-service-name-operator": "서비스 이름 연산자 선택",
       "aria-label-select-span-name": "스팬 이름 선택",
       "aria-label-select-span-name-operator": "스팬 이름 연산자 선택",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "최대 스팬 기간 선택",
+      "ariaLabel-select-min-span-duration": "최소 스팬 기간 선택",
       "label-collapse": "스팬 필터",
       "label-duration": "지속 시간",
       "label-service-name": "서비스 이름",
@@ -7326,23 +7327,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "지속 시간",
+      "export-started": "내보내기가 시작되었습니다",
+      "give-feedback": "피드백",
+      "link-copied": "클립보드에 링크 복사되었습니다",
+      "path": "경로",
+      "route": "라우트",
+      "services": "서비스",
+      "share": "공유",
+      "share-copy-link": "링크 복사",
+      "share-export-json": "JSON으로 내보내기",
+      "share-tooltip": "트레이스 공유",
+      "start-time": "시작 시간",
+      "target": "대상",
+      "title-share-thoughts-about-tracing-grafana": "Grafana에서 트레이싱에 대한 의견을 공유하세요.",
+      "tooltip-url": "{{route}} 또는 {{url}} 또는 {{target}} 또는 {{path}}",
+      "trace-id": "트레이스 ID",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "필터 지우기 버튼",
@@ -7442,7 +7443,7 @@
       "when": "다음과 같은 때"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "데이터 소스에서 반환된 테이블에 대해 MySQL 방언 SQL을 실행합니다. 데이터 소스 쿼리(예: \"A\", \"B\")는 테이블로 사용할 수 있으며 query-name으로 참조됩니다. 필드는 데이터 소스에서 반환된 그대로 열로 사용할 수 있습니다.",
       "label-operation": "연산"
     },
     "math": {
@@ -7473,7 +7474,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "폴더 비우기",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "폴더를 찾을 수 없습니다",
     "select-aria-label": "폴더 필터",
     "select-placeholder": "폴더별로 필터링"
   },
@@ -7522,23 +7523,23 @@
     "title": "페이지에서 나가시겠어요?"
   },
   "gauge": {
-    "category-gauge": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-neutral": "",
-    "description-show-threshold-labels": "",
-    "description-show-threshold-markers": "",
+    "category-gauge": "게이지",
+    "description-min-height": "행 최소 높이(가로 방향)",
+    "description-min-width": "열 최소 너비(세로 방향)",
+    "description-neutral": "'최소'를 중립점으로 사용하려면 비워둡니다",
+    "description-show-threshold-labels": "게이지 막대 주변에 임계값 렌더링",
+    "description-show-threshold-markers": "임계값을 바깥쪽 막대로 렌더링",
     "gauge-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "자동",
+      "label-manual": "수동"
     },
-    "name-gauge-size": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-neutral": "",
-    "name-show-threshold-labels": "",
-    "name-show-threshold-markers": "",
-    "placeholder-neutral": ""
+    "name-gauge-size": "게이지 크기",
+    "name-min-height": "최소 높이",
+    "name-min-width": "최소 너비",
+    "name-neutral": "중간임",
+    "name-show-threshold-labels": "임계값 레이블 표시",
+    "name-show-threshold-markers": "임계값 마커 표시",
+    "placeholder-neutral": "자동"
   },
   "gen-ai": {
     "apply-suggestion": "적용",
@@ -7547,51 +7548,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "지명 사전을 찾을 수 없습니다",
+      "warning-no-geometry": "지오메트리를 찾을 수 없습니다",
+      "warning-select-geohash": "지오해시 필드 선택",
+      "warning-select-lat-long": "위도/경도 필드 선택",
+      "warning-select-lookup": "조회 필드 선택",
+      "warning-unable-to-find": "위치 필드를 찾을 수 없습니다"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "문자열 필드를 찾을 수 없습니다"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "숫자 필드를 찾을 수 없습니다"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "숫자 필드를 찾을 수 없습니다"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "문자열 필드를 찾을 수 없습니다"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "지명 사전",
+      "name-geohash-field": "지오해시 필드",
+      "name-latitude-field": "위도 필드",
+      "name-location-mode": "위치 모드",
+      "name-longitude-field": "경도 필드",
+      "name-lookup-field": "조회 필드"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "기본 필드 이름을 토대로 위치 데이터를 자동으로 식별합니다",
+        "description-coords": "위도 및 경도 필드 지정",
+        "description-geohash": "지오해시 필드 지정",
+        "description-lookup": "지명 사전 및 조회 필드 지정",
+        "label-auto": "자동",
+        "label-coords": "좌표",
+        "label-geohash": "지오해시",
+        "label-lookup": "조회"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "베이스맵 레이어",
+    "category-map-controls": "지도 제어",
+    "category-map-layers": "지도 레이어",
+    "category-map-view": "지도 보기",
     "coordinates-map-view-editor": {
       "label-latitude": "위도",
       "label-longitude": "경도"
@@ -7600,15 +7601,15 @@
       "center": "중앙:",
       "zoom": "확대/축소:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "이 위치는 패널이 처음 로드될 때 표시됩니다.",
+    "description-mouse-wheel-zoom": "마우스 휠을 통한 확대/축소 제어 활성화",
+    "description-no-repeat": "지도가 가로로 반복되지 않도록 합니다",
+    "description-share-view": "여러 패널에서 동일한 보기를 사용합니다.  참고: 이 경우 대시보드를 다시 로드해야 할 수 있습니다.",
+    "description-show-attribution": "오른쪽 하단에 지도 소스 속성 정보 표시",
+    "description-show-debug": "지도 정보 표시",
+    "description-show-measure": "지도에 측정 도구 표시",
+    "description-show-scale": "지도 배율 표시",
+    "description-show-zoom": "왼쪽 상단에 확대/축소 제어 버튼 표시",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "레이어"
@@ -7632,12 +7633,12 @@
       "aria-label-add-geomap-style-rule": "지오맵(GeoMap) 스타일 규칙 추가하기"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "베이스 레이어",
+      "description-display-tooltip": "레이어에 대한 툴팁 표시",
+      "name-data": "데이터",
+      "name-display-tooltip": "툴팁 표시",
+      "name-layer-type": "레이어 유형",
+      "name-opacity": "투명도"
     },
     "layers-editor": {
       "label-add-layer": "레이어 추가",
@@ -7650,9 +7651,9 @@
       "use-current-map-settings": "현재 지도 설정 사용"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "지도 범례 표시",
+      "name-show-legend": "범례 보기",
+      "name-styles": "스타일"
     },
     "markers-legend": {
       "title-symbol": "기호"
@@ -7661,27 +7662,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "측정 도구 표시"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "초기 보기",
+    "name-mouse-wheel-zoom": "마우스 휠 확대/축소",
+    "name-no-repeat": "지도 반복 없음",
+    "name-share-view": "보기 공유",
+    "name-show-attribution": "속성 표시",
+    "name-show-debug": "디버그 표시",
+    "name-show-measure": "측정 도구 표시",
+    "name-show-scale": "배율 표시",
+    "name-show-zoom": "확대/축소 제어 표시",
+    "name-tooltip": "툴팁",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "문자열 필드를 찾을 수 없습니다"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "베이스맵 레이어는 서버 관리자가 구성합니다."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "중앙",
+        "label-left": "왼쪽",
+        "label-right": "오른쪽"
       },
       "label-align": "정렬",
       "label-baseline": "베이스라인",
@@ -7697,12 +7698,12 @@
       "label-text-label": "텍스트 레이블",
       "label-x-offset": "X축 상쇄",
       "label-y-offset": "Y축 상쇄",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "기호 선택",
+      "placeholderText-select-symbol-or-add-text": "기호를 선택하거나 텍스트 레이블을 추가하세요",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "하단",
+        "label-center": "중앙",
+        "label-top": "상단"
       }
     },
     "style-rule-editor": {
@@ -7716,13 +7717,13 @@
       "placeholder-value": "값"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "마우스를 올리면 팝업 표시",
+      "description-none": "클릭하여 내용 표시, 마우스를 올릴 때는 표시하지 않음",
+      "label-details": "세부 정보",
+      "label-none": "없음"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "{{name}} 레이어"
     }
   },
   "get-enterprise": {
@@ -7842,400 +7843,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "피트/초²",
+            "name-g-unit": "G 단위",
+            "name-meters-sec": "미터/초²"
           },
-          "name": ""
+          "name": "가속도"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "분각",
+            "name-arc-seconds": "초각",
+            "name-degrees": "도(°)",
+            "name-gradian": "그라디안",
+            "name-radians": "라디안"
           },
-          "name": ""
+          "name": "각도"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "에이커(ac)",
+            "name-hectares": "헥타르(ha)",
+            "name-square-feet": "제곱피트(ft²)",
+            "name-square-meters": "제곱미터(m²)",
+            "name-square-miles": "제곱마일(mi²)"
           },
-          "name": ""
+          "name": "면적"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "켜기 / 끄기",
+            "name-true-false": "참 / 거짓",
+            "name-yes-no": "네 / 아니요"
           },
-          "name": ""
+          "name": "불리언"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "계산"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "세제곱미터당 그램(g/m³)",
+            "name-g-nm3": "표준 세제곱미터당 그램(g/Nm³)",
+            "name-mg-dl": "데시리터당 밀리그램(mg/dL)",
+            "name-mg-m3": "세제곱미터당 밀리그램(mg/m³)",
+            "name-mg-nm3": "표준 세제곱미터당 밀리그램(mg/Nm³)",
+            "name-mmol-l": "리터당 밀리몰(mmol/L)",
+            "name-ng-m3": "세제곱미터당 나노그램(ng/m³)",
+            "name-ng-nm3": "표준 세제곱미터당 나노그램(ng/Nm³)",
+            "name-ppb": "십억분율(ppb)",
+            "name-ppm": "백만분율(ppm)",
+            "name-ug-m3": "세제곱미터당 마이크로그램(μg/m³)",
+            "name-ug-nm3": "표준 세제곱미터당 마이크로그램(μg/Nm³)"
           },
-          "name": ""
+          "name": "농도"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "불가리아 레프(BGN)",
+            "name-brl": "헤알(R$)",
+            "name-btc": "비트코인(฿)",
+            "name-chf": "스위스 프랑(CHF)",
+            "name-czk": "체코 코루나(czk)",
+            "name-dkk": "덴마크 크로네(kr)",
+            "name-eur": "유로(€)",
+            "name-gbp": "파운드(£)",
+            "name-idr": "인도네시아 루피아(Rp)",
+            "name-ils": "이스라엘 신 셰켈(₪)",
+            "name-inr": "인도 루피(£)",
+            "name-isk": "아이슬란드 크로나(kr)",
+            "name-jpy": "엔(¥)",
+            "name-krw": "대한민국 원(₩)",
+            "name-mbtc": "밀리 비트코인(฿)",
+            "name-myr": "말레이시아 링깃(RM)",
+            "name-nok": "노르웨이 크로네(kr)",
+            "name-php": "필리핀 페소(PHP)",
+            "name-pln": "폴란드 즐로티(PLN)",
+            "name-pyg": "과라니(₲)",
+            "name-rub": "루블(₽)",
+            "name-sek": "스웨덴 크로네(kr)",
+            "name-try": "터키 리라(₺)",
+            "name-uah": "그리브냐(₴)",
+            "name-ubtc": "마이크로 비트코인(฿)",
+            "name-usd": "달러($)",
+            "name-uyu": "우루과이 페소(UYU)",
+            "name-vnd": "베트남 동(VND)",
+            "name-xpf": "CFP 프랑(XPF)",
+            "name-zar": "남아프리카 랜드(R)"
           },
-          "name": ""
+          "name": "통화"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "비트(IEC)",
+            "name-bits-si": "비트(SI)",
+            "name-bytes-iec": "바이트(IEC)",
+            "name-bytes-si": "바이트(SI)",
+            "name-gibibytes": "기비바이트",
+            "name-gigabytes": "기가바이트",
+            "name-kibibytes": "키비바이트",
+            "name-kilobytes": "킬로바이트",
+            "name-mebibytes": "메비바이트",
+            "name-megabytes": "메가바이트",
+            "name-pebibytes": "페비바이트",
+            "name-petabytes": "페타바이트",
+            "name-tebibytes": "테비바이트",
+            "name-terabytes": "테라바이트"
           },
-          "name": ""
+          "name": "데이터"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "비트/초(IEC)",
+            "name-bits-sec-si": "비트/초(SI)",
+            "name-bytes-sec-iec": "바이트/초(IEC)",
+            "name-bytes-sec-si": "바이트/초(SI)",
+            "name-gibibits-sec": "기비비트/초",
+            "name-gibibytes-sec": "기비바이트/초",
+            "name-gigabits-sec": "기가비트/초",
+            "name-gigabytes-sec": "기가바이트/초",
+            "name-kibibits-sec": "키비비트/초",
+            "name-kibibytes-sec": "키비바이트/초",
+            "name-kilobits-sec": "킬로비트/초",
+            "name-kilobytes-sec": "킬로바이트/초",
+            "name-mebibits-sec": "메비비트/초",
+            "name-mebibytes-sec": "메비바이트/초",
+            "name-megabits-sec": "메가비트/초",
+            "name-megabytes-sec": "메가바이트/초",
+            "name-packets-sec": "패킷/초",
+            "name-pebibits-sec": "페비비트/초",
+            "name-pebibytes-sec": "페비바이트/초",
+            "name-petabits-sec": "페타비트/초",
+            "name-petabytes-sec": "페타바이트/초",
+            "name-tebibits-sec": "테비비트/초",
+            "name-tebibytes-sec": "테비바이트/초",
+            "name-terabits-sec": "테라비트/초",
+            "name-terabytes-sec": "테라바이트/초"
           },
-          "name": ""
+          "name": "데이터 속도"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "날짜 시간 기본값",
+            "name-datetime-iso": "날짜 시간 ISO",
+            "name-datetime-iso-no-date": "날짜 시간 ISO(오늘인 경우 날짜 없음)",
+            "name-datetime-local": "현지 날짜 시간",
+            "name-datetime-local-no-date": "현지 날짜 시간(오늘인 경우 날짜 없음)",
+            "name-datetime-us": "미국 날짜 시간",
+            "name-datetime-us-no-date": "미국 날짜 시간(오늘인 경우 날짜 없음)",
+            "name-from-now": "지금부터"
           },
-          "name": ""
+          "name": "날짜 및 시간"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "암페어(A)",
+            "name-ampere-hour": "암페어-시간(Ah)",
+            "name-decibel-milliwatt": "데시벨-밀리와트(dBm)",
+            "name-electron-volt": "전자볼트(eV)",
+            "name-farad": "패럿(F)",
+            "name-femtofarad": "펨토패럿(fF)",
+            "name-gigawatt": "기가와트(GW)",
+            "name-henry": "헨리(H)",
+            "name-joule": "줄(J)",
+            "name-kiloampere": "킬로암페어(kA)",
+            "name-kiloampere-hour": "킬로암페어-시간(kAh)",
+            "name-kiloohm": "킬로옴(kΩ)",
+            "name-kilovolt": "킬로볼트(kV)",
+            "name-kilovolt-ampere": "킬로볼트-암페어(kVA)",
+            "name-kilovolt-ampere-reactive": "킬로볼트-암페어 무효 전력(kVAr)",
+            "name-kilowatt": "킬로와트(kW)",
+            "name-kilowatt-hour": "킬로와트시(kWh)",
+            "name-kilowatt-min": "킬로와트분(kWm)",
+            "name-lumens": "루멘(Lm)",
+            "name-megaohm": "메가옴(MΩ)",
+            "name-megawatt": "메가와트(MW)",
+            "name-megawatt-hour": "메가와트시(MWh)",
+            "name-microfarad": "마이크로패럿(µF)",
+            "name-microhenry": "마이크로헨리(µH)",
+            "name-milliampere": "밀리암페어(mA)",
+            "name-milliampere-hour": "밀리암페어시(mAh)",
+            "name-millihenry": "밀리헨리(mH)",
+            "name-milliohm": "밀리옴(mΩ)",
+            "name-millivolt": "밀리볼트(mV)",
+            "name-milliwatt": "밀리와트(mW)",
+            "name-nanofarad": "나노패럿(nF)",
+            "name-ohm": "옴(Ω)",
+            "name-picofarad": "피코패럿(pF)",
+            "name-volt": "볼트(V)",
+            "name-volt-ampere": "볼트-암페어(VA)",
+            "name-volt-ampere-reactive": "볼트-암페어 무효 전력(VAr)",
+            "name-watt": "WATT(W)",
+            "name-watt-hour": "와트시(Wh)",
+            "name-watt-hour-per-kg": "킬로그램당 와트시(Wh/kg)",
+            "name-watt-square-meter": "제곱미터당 와트(W/m²)"
           },
-          "name": ""
+          "name": "에너지"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "세제곱피트/분(cfm)",
+            "name-cubic-feet-sec": "세제곱피트/초(cfs)",
+            "name-cubic-meters-sec": "세제곱미터/초(cms)",
+            "name-gallons-min": "갤런/분(gpm)",
+            "name-litre-hour": "리터/시간",
+            "name-litre-min": "리터/분(L/min)",
+            "name-lux": "럭스(lx)",
+            "name-millilitre-min": "밀리리터/분(mL/min)"
           },
-          "name": ""
+          "name": "유량"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "킬로뉴턴-미터(kNm)",
+            "name-kilonewtons": "킬로뉴턴(kN)",
+            "name-newton-meters": "뉴턴-미터(Nm)",
+            "name-newtons": "뉴턴(N)"
           },
-          "name": ""
+          "name": "힘"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "엑사해시/초",
+            "name-gigahashes-sec": "기가해시/초",
+            "name-hashes-sec": "해시/초",
+            "name-kilohashes-sec": "킬로해시/초",
+            "name-megahashes-sec": "메가해시/초",
+            "name-petahashes-sec": "페타해시/초",
+            "name-terahashes-sec": "테라해시/초"
           },
-          "name": ""
+          "name": "해시 레이트"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "피트(ft)",
+            "name-inch": "인치(in)",
+            "name-kilometer": "킬로미터(km)",
+            "name-meter": "미터(m)",
+            "name-mile": "마일(mi)",
+            "name-millimeter": "밀리미터(mm)"
           },
-          "name": ""
+          "name": "길이"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "그램(g)",
+            "name-kilogram": "킬로그램(kg)",
+            "name-metric-ton": "미터톤(t)",
+            "name-milligram": "밀리그램(mg)",
+            "name-pound": "파운드(lb)"
           },
-          "name": ""
+          "name": "질량"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "칸델라(cd)",
+            "name-decibel": "데시벨",
+            "name-hexadecimal": "16진수",
+            "name-hexadecimal-0x": "16진수(0x)",
+            "name-humidity": "습도(%H)",
+            "name-locale": "로케일 형식",
+            "name-number": "숫자",
+            "name-percent-1": "백분율(0.0~1.0)",
+            "name-percent-100": "백분율(0~100)",
+            "name-pixels": "픽셀",
+            "name-scientific": "과학적 표기법",
+            "name-short": "축약 형식",
+            "name-si-short": "SI 축약 형식",
+            "name-string": "문자열"
           },
-          "name": ""
+          "name": "기타"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "바(압력 단위)",
+            "name-hectopascals": "헥토파스칼",
+            "name-inches-mercury": "수은주 인치",
+            "name-kilobars": "킬로바",
+            "name-kilopascals": "킬로파스칼",
+            "name-millibars": "밀리바",
+            "name-pascals": "파스칼",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "압력"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "베크렐(Bq)",
+            "name-curie": "퀴리(Ci)",
+            "name-exposure": "조사선량(C/kg)",
+            "name-gray": "그레이(Gy)",
+            "name-microsievert": "마이크로시버트(µSv)",
+            "name-microsievert-hour": "마이크로시버트/시간(µSv/h)",
+            "name-millisievert": "밀리시버트(mSv)",
+            "name-millisievert-hour": "밀리시버트/시간(mSv/h)",
+            "name-rad": "래드",
+            "name-rem": "렘",
+            "name-roentgen": "뢴트겐(R)",
+            "name-sievert": "시버트(Sv)",
+            "name-sievert-hour": "시버트/시간(Sv/h)"
           },
-          "name": ""
+          "name": "방사선"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "초당 도(°/s)",
+            "name-gigahertz": "기가헤르츠(GHz)",
+            "name-hertz": "헤르츠(Hz)",
+            "name-kilohertz": "킬로헤르츠(kHz)",
+            "name-megahertz": "메가헤르츠(MHz)",
+            "name-radians-sec": "초당 라디안(rad/s)",
+            "name-rpm": "분당 회전수(rpm)"
           },
-          "name": ""
+          "name": "회전 속도"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "섭씨(°C)",
+            "name-fahrenheit": "화씨(°F)",
+            "name-kelvin": "켈빈(K)"
           },
-          "name": ""
+          "name": "온도"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "계수/분(cpm)",
+            "name-counts-sec": "계수/초(cps)",
+            "name-events-min": "이벤트/분(epm)",
+            "name-events-sec": "이벤트/초(eps)",
+            "name-io-ops-sec": "I/O 작업/초(iops)",
+            "name-messages-min": "메시지/분(mpm)",
+            "name-messages-sec": "메시지/초(mps)",
+            "name-ops-min": "처리 작업/분(opm)",
+            "name-ops-sec": "처리 작업/초(ops)",
+            "name-reads-min": "읽기/분(rpm)",
+            "name-reads-sec": "읽기/초(rps)",
+            "name-records-min": "레코드/분(rpm)",
+            "name-records-sec": "레코드/초(rps)",
+            "name-requests-min": "요청/분(rpm)",
+            "name-requests-sec": "요청/초(rps)",
+            "name-rows-min": "행/분(rpm)",
+            "name-rows-sec": "행/초(rps)",
+            "name-writes-min": "쓰기/분(wpm)",
+            "name-writes-sec": "쓰기/초(wps)"
           },
-          "name": ""
+          "name": "처리량"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "클럭(ms)",
+            "name-clock-s": "클럭(s)",
+            "name-days": "일(d)",
+            "name-duration-dhms": "지속 시간(d hh:mm:ss)",
+            "name-duration-hms": "지속 시간(hh:mm:ss)",
+            "name-duration-ms": "지속 시간(ms)",
+            "name-duration-s": "지속 시간(초)",
+            "name-hertz": "헤르츠(1/s)",
+            "name-hours": "시간(h)",
+            "name-microseconds": "마이크로초(µs)",
+            "name-milliseconds": "밀리초(ms)",
+            "name-minutes": "분(m)",
+            "name-nanoseconds": "나노초(ns)",
+            "name-seconds": "초(s)",
+            "name-timeticks": "타임틱(s/100)"
           },
-          "name": ""
+          "name": "시간"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "킬로미터/시간(km/h)",
+            "name-knot": "노트(kn)",
+            "name-meters-second": "미터/초(m/s)",
+            "name-miles-hour": "마일/시간(mph)"
           },
-          "name": ""
+          "name": "속도"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "세제곱데시미터",
+            "name-cubic-meter": "세제곱미터",
+            "name-gallons": "갤런",
+            "name-litre": "리터(L)",
+            "name-millilitre": "밀리리터(mL)",
+            "name-normal-cubic-meter": "표준 세제곱미터"
           },
-          "name": ""
+          "name": "부피"
         }
       }
     }
@@ -8278,85 +8279,85 @@
     },
     "builder": {
       "axis": {
-        "category-axis": "",
-        "color-label": "",
+        "category-axis": "축",
+        "color-label": "색상",
         "color-options": {
-          "label-series": "",
-          "label-text": ""
+          "label-series": "계열",
+          "label-text": "텍스트"
         },
         "grid-line-options": {
-          "label-auto": "",
-          "label-off": "",
-          "label-on": ""
+          "label-auto": "자동",
+          "label-off": "끄기",
+          "label-on": "켜기"
         },
-        "name-centered-zero": "",
-        "name-grid-lines": "",
-        "name-label": "",
-        "name-placement": "",
-        "name-scale": "",
-        "name-show-border": "",
-        "name-soft-max": "",
-        "name-soft-min": "",
-        "name-width": "",
-        "placeholder-label": "",
-        "placeholder-soft-max": "",
-        "placeholder-soft-min": "",
-        "placeholder-width": "",
+        "name-centered-zero": "중앙 정렬된 0",
+        "name-grid-lines": "눈금선 표시",
+        "name-label": "레이블",
+        "name-placement": "배치",
+        "name-scale": "스케일",
+        "name-show-border": "테두리 표시",
+        "name-soft-max": "소프트 최대",
+        "name-soft-min": "소프트 최소",
+        "name-width": "너비",
+        "placeholder-label": "텍스트(선택 사항)",
+        "placeholder-soft-max": "참조: 표준 옵션 > 최대",
+        "placeholder-soft-min": "참조: 표준 옵션 > 최소",
+        "placeholder-width": "자동",
         "scale-distribution-editor": {
           "distribution-options": {
-            "label-linear": "",
-            "label-log": "",
-            "label-symlog": ""
+            "label-linear": "직선형",
+            "label-log": "로그",
+            "label-symlog": "심로그"
           }
         }
       },
       "legend": {
-        "category": "",
-        "description-values": "",
+        "category": "범례",
+        "description-values": "범례에 표시할 값 또는 계산 선택",
         "mode-options": {
-          "label-list": "",
-          "label-table": ""
+          "label-list": "목록",
+          "label-table": "테이블"
         },
-        "name-mode": "",
-        "name-placement": "",
-        "name-values": "",
-        "name-visibility": "",
-        "name-width": "",
+        "name-mode": "모드",
+        "name-placement": "배치",
+        "name-values": "값",
+        "name-visibility": "보이기/숨기기",
+        "name-width": "너비",
         "placement-options": {
-          "label-bottom": "",
-          "label-right": ""
+          "label-bottom": "하단",
+          "label-right": "오른쪽"
         }
       },
       "stacking": {
-        "name-stack-series": ""
+        "name-stack-series": "스택 계열"
       },
       "text": {
-        "category-text-size": "",
-        "name-percent-change": "",
-        "name-title": "",
-        "name-value": "",
-        "placeholder-percent-change": "",
-        "placeholder-title": "",
-        "placeholder-value": ""
+        "category-text-size": "글자 크기",
+        "name-percent-change": "비율 변화",
+        "name-title": "제목",
+        "name-value": "값",
+        "placeholder-percent-change": "자동",
+        "placeholder-title": "자동",
+        "placeholder-value": "자동"
       },
       "tooltip": {
-        "category": "",
-        "description-hover-proximity": "",
+        "category": "도구 설명",
+        "description-hover-proximity": "도구 설명을 트리거하려면 커서가 포인트에 얼마나 가까이 있어야 하는지(픽셀 단위)",
         "modeOptions": {
-          "label-all": "",
-          "label-hidden": "",
-          "label-single": ""
+          "label-all": "전체",
+          "label-hidden": "숨김",
+          "label-single": "단일"
         },
-        "name-hide-zeros": "",
-        "name-hover-proximity": "",
-        "name-max-height": "",
-        "name-max-width": "",
-        "name-tooltip-mode": "",
-        "name-values-sort-order": "",
+        "name-hide-zeros": "0 숨기기",
+        "name-hover-proximity": "마우스 커서 올리기 근접성",
+        "name-max-height": "최대 높이",
+        "name-max-width": "최대 너비",
+        "name-tooltip-mode": "도구 설명 모드",
+        "name-values-sort-order": "값 정렬 순서",
         "sortOptions": {
-          "label-ascending": "",
-          "label-descending": "",
-          "label-none": ""
+          "label-ascending": "오름차순",
+          "label-descending": "내림차순",
+          "label-none": "없음"
         }
       }
     },
@@ -8364,7 +8365,7 @@
       "option": "옵션"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "이미지 미리 보기 열기"
     },
     "cascader": {
       "clear-button": "선택 초기화"
@@ -8378,9 +8379,9 @@
       "aria-label-selected-color": "{{colorLabel}} 색상"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "삭제",
       "cancel": "취소",
-      "confirmText-delete": ""
+      "confirmText-delete": "삭제"
     },
     "confirm-content": {
       "placeholder": "확인하려면 '{{confirmPromptText}}'을(를) 입력하세요."
@@ -8485,56 +8486,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "4월",
+        "label-august": "8월",
+        "label-december": "12월",
+        "label-february": "2월",
+        "label-january": "1월",
+        "label-july": "7월",
+        "label-june": "6월",
+        "label-march": "3월",
+        "label-may": "5월",
+        "label-november": "11월",
+        "label-october": "10월",
+        "label-september": "9월"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "그저께",
+        "last-1-hour": "최근 1시간",
+        "last-1-year": "최근 1년",
+        "last-12-hours": "최근 12시간",
+        "last-15-mins": "최근 15분",
+        "last-2-days": "최근 2일",
+        "last-2-years": "최근 2년",
+        "last-24-hours": "최근 24시간",
+        "last-3-hours": "최근 3시간",
+        "last-30-days": "최근 30일",
+        "last-30-mins": "최근 30분",
+        "last-5-mins": "최근 5분",
+        "last-5-years": "최근 5년",
+        "last-6-hours": "최근 6시간",
+        "last-6-months": "최근 6개월",
+        "last-7-days": "최근 7일",
+        "last-90-days": "최근 90일",
+        "previous-fiscal-quarter": "이전 회계 분기",
+        "previous-fiscal-year": "이전 회계 연도",
+        "previous-month": "지난 달",
+        "previous-week": "지난주",
+        "previous-year": "작년",
+        "this-day-last-week": "지난주 오늘",
+        "this-fiscal-quarter": "이번 회계 분기",
+        "this-fiscal-quarter-so-far": "이번 회계 분기 현재까지",
+        "this-fiscal-year": "이번 회계 연도",
+        "this-fiscal-year-so-far": "이번 회계 연도 현재까지",
+        "this-month": "이번 달",
+        "this-month-so-far": "이번 달 현재까지",
+        "this-week": "이번 주",
+        "this-week-so-far": "이번 주 현재까지",
+        "this-year": "올해",
+        "this-year-so-far": "올해 현재까지",
+        "today": "오늘",
+        "today-so-far": "오늘 현재까지",
+        "yesterday": "어제"
       }
     },
     "drawer": {
@@ -8576,33 +8577,33 @@
       "tooltip-expand-all": "모든 행 펼치기"
     },
     "matchers-ui": {
-      "description-field-name-by-regex-matcher": "",
-      "description-fields-by-query": "",
-      "description-fields-with-name": "",
-      "description-fields-with-type": "",
-      "description-fields-with-value": "",
+      "description-field-name-by-regex-matcher": "정규식과 일치하는 이름을 가진 필드에 대한 속성 설정",
+      "description-fields-by-query": "특정 쿼리의 필드에 대한 속성 설정",
+      "description-fields-with-name": "특정 필드에 대한 속성 설정",
+      "description-fields-with-type": "특정 유형(숫자, 문자열, 부울)의 필드에 대한 속성 설정",
+      "description-fields-with-value": "감속기 조건이 있는 필드에 대한 속성 설정",
       "field-name-picker": {
-        "placeholder": ""
+        "placeholder": "필드 선택"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "불리언",
+        "label-enum": "열거형",
+        "label-number": "숫자",
+        "label-other": "기타",
+        "label-string": "문자열",
+        "label-time": "시간",
+        "label-traces": "트레이스"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "프레임({{framesCount}}개): {{framesNames}}",
+        "label": "쿼리: {{refId}}",
+        "label-missing-ref-id": "쿼리: (refId 누락)"
       },
-      "name-field-name-by-regex-matcher": "",
-      "name-fields-by-query": "",
-      "name-fields-with-name": "",
-      "name-fields-with-type": "",
-      "name-fields-with-value": ""
+      "name-field-name-by-regex-matcher": "정규식과 일치하는 이름이 있는 필드",
+      "name-fields-by-query": "쿼리에 의해 반환된 필드",
+      "name-fields-with-name": "이름이 있는 필드",
+      "name-fields-with-type": "유형이 있는 필드",
+      "name-fields-with-value": "값이 있는 필드"
     },
     "menu-item": {
       "keyboard-shortcut-label": "키보드 단축키"
@@ -8630,8 +8631,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "패널 접기 토글",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "패널 로딩 표시줄",
+      "ariaLabel-panel-status": "패널 상태",
       "tooltip-cancel": "쿼리 취소",
       "tooltip-cancel-loading": "쿼리 취소",
       "tooltip-stop-streaming": "스트리밍 중지",
@@ -8700,12 +8701,12 @@
       "inspect-drawer-title": "값 검사",
       "inspect-menu-label": "값 검사",
       "nested-table": {
-        "no-data": ""
+        "no-data": "데이터 없음"
       },
       "no-values-label": "값 없음",
       "pagination-summary": "{{numRows}}개의 행 중에서 {{itemsRangeStart}}~{{displayedEnd}}",
       "sparkline": {
-        "no-data": ""
+        "no-data": "데이터 없음"
       }
     },
     "tags": {
@@ -8713,7 +8714,7 @@
     },
     "tags-input": {
       "add": "추가",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "새 태그(엔터 키를 눌러 추가하세요)",
       "remove": "태그 제거: {{name}}"
     },
     "time-sync-button": {
@@ -8730,55 +8731,55 @@
       "config": {
         "get-graph-field-options": {
           "axis-placement": {
-            "description-auto": "",
-            "label-auto": "",
-            "label-hidden": "",
-            "label-left": "",
-            "label-right": ""
+            "description-auto": "첫 번째 필드는 왼쪽에, 나머지 모두는 오른쪽에",
+            "label-auto": "자동",
+            "label-hidden": "숨김",
+            "label-left": "왼쪽",
+            "label-right": "오른쪽"
           },
           "bar-alignment": {
-            "description-after": "",
-            "description-before": "",
-            "description-center": ""
+            "description-after": "이후",
+            "description-before": "이전",
+            "description-center": "중앙"
           },
           "draw-style": {
-            "label-bars": "",
-            "label-lines": "",
-            "label-points": ""
+            "label-bars": "막대",
+            "label-lines": "선",
+            "label-points": "포인트"
           },
           "fill-gradient": {
-            "description-hue": "",
-            "description-opacity": "",
-            "description-scheme": "",
-            "label-hue": "",
-            "label-none": "",
-            "label-opacity": "",
-            "label-scheme": ""
+            "description-hue": "작은 색상 색조 그라데이션",
+            "description-opacity": "불투명도 그라데이션 채우기 활성화",
+            "description-scheme": "색상 구성표를 사용하여 그라데이션 정의",
+            "label-hue": "색조",
+            "label-none": "없음",
+            "label-opacity": "투명도",
+            "label-scheme": "체계"
           },
           "line-interpolation": {
-            "description-linear": "",
-            "description-smooth": "",
-            "description-step-after": "",
-            "description-step-before": ""
+            "description-linear": "직선형",
+            "description-smooth": "부드러움",
+            "description-step-after": "다음 이후 단계",
+            "description-step-before": "다음 이전 단계"
           },
           "show-points": {
-            "description-auto": "",
-            "label-always": "",
-            "label-auto": "",
-            "label-never": ""
+            "description-auto": "밀도가 낮을 때 포인트 표시",
+            "label-always": "항상",
+            "label-auto": "자동",
+            "label-never": "기록 없음"
           },
           "stacking": {
-            "label-100": "",
-            "label-normal": "",
-            "label-off": ""
+            "label-100": "100%",
+            "label-normal": "정상",
+            "label-off": "끄기"
           },
           "thresholds-display-mode": {
-            "label-dashed-lines": "",
-            "label-filled-regions": "",
-            "label-filled-regions-and-dashed-lines": "",
-            "label-filled-regions-and-lines": "",
-            "label-lines": "",
-            "label-off": ""
+            "label-dashed-lines": "선(점선)으로",
+            "label-filled-regions": "채워진 영역으로",
+            "label-filled-regions-and-dashed-lines": "채워진 영역 및 선(점선)으로",
+            "label-filled-regions-and-lines": "채워진 영역 및 선으로",
+            "label-lines": "선으로",
+            "label-off": "끄기"
           }
         }
       }
@@ -8806,14 +8807,14 @@
       "footer-add-annotation": "주석 추가",
       "footer-click-to-action": "클릭하여 {{actionTitle}} 작업 수행",
       "footer-click-to-navigate": "클릭하여 {{linkTitle}} 열기",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "'{{value}}'으(로) 필터링",
       "timestamp": "시간 기록"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "기본값",
+      "weekStarts-label-monday": "월요일",
+      "weekStarts-label-saturday": "토요일",
+      "weekStarts-label-sunday": "일요일"
     }
   },
   "graph": {
@@ -8826,78 +8827,78 @@
   },
   "heatmap": {
     "calculate-from-data-options": {
-      "label-no": "",
-      "label-yes": ""
+      "label-no": "아니요",
+      "label-yes": "예"
     },
-    "category-cell-display": "",
-    "category-colors": "",
-    "category-exemplars": "",
-    "category-heatmap": "",
-    "category-legend": "",
-    "category-tooltip": "",
-    "category-y-axis": "",
+    "category-cell-display": "셀 표시",
+    "category-colors": "색상",
+    "category-exemplars": "예제",
+    "category-heatmap": "히트맵",
+    "category-legend": "범례",
+    "category-tooltip": "도구 설명",
+    "category-y-axis": "Y축",
     "mode-options": {
-      "label-opacity": "",
-      "label-scheme": ""
+      "label-opacity": "투명도",
+      "label-scheme": "체계"
     },
-    "name-axis-label": "",
-    "name-axis-width": "",
-    "name-calculate-from-data": "",
-    "name-cell-gap": "",
-    "name-color": "",
-    "name-decimals": "",
-    "name-end-color-at-value": "",
-    "name-exponent": "",
-    "name-hide-cells-gt": "",
-    "name-hide-cells-lt": "",
-    "name-max-height": "",
-    "name-max-value": "",
-    "name-max-width": "",
-    "name-min-value": "",
-    "name-mode": "",
-    "name-placement": "",
-    "name-reverse": "",
-    "name-scale": "",
-    "name-scheme": "",
-    "name-show-color-scale": "",
-    "name-show-histogram": "",
-    "name-show-legend": "",
-    "name-start-color-from-value": "",
-    "name-steps": "",
-    "name-tick-alignment": "",
-    "name-tooltip-mode": "",
-    "name-unit": "",
-    "name-value-name": "",
-    "name-y-axis-scale": "",
-    "placeholder-axis-label": "",
-    "placeholder-axis-width": "",
-    "placeholder-decimals": "",
-    "placeholder-end-color-at-value": "",
-    "placeholder-hide-cells-gt": "",
-    "placeholder-hide-cells-lt": "",
-    "placeholder-max-value": "",
-    "placeholder-min-value": "",
-    "placeholder-start-color-from-value": "",
-    "placeholder-value-name": "",
+    "name-axis-label": "축 레이블",
+    "name-axis-width": "축 너비",
+    "name-calculate-from-data": "데이터에서 계산",
+    "name-cell-gap": "셀 간격",
+    "name-color": "색상",
+    "name-decimals": "소수(decimal)",
+    "name-end-color-at-value": "다음 값에서 색상 스케일 끝내기:",
+    "name-exponent": "지수",
+    "name-hide-cells-gt": "값이 다음 이상(>=)인 셀 숨기기",
+    "name-hide-cells-lt": "값이 다음 이하(<=)인 셀 숨기기",
+    "name-max-height": "최대 높이",
+    "name-max-value": "최대 값",
+    "name-max-width": "최대 너비",
+    "name-min-value": "최소 값",
+    "name-mode": "모드",
+    "name-placement": "배치",
+    "name-reverse": "되돌리기",
+    "name-scale": "스케일",
+    "name-scheme": "체계",
+    "name-show-color-scale": "색상 스케일 표시",
+    "name-show-histogram": "히스토그램 표시(Y축)",
+    "name-show-legend": "범례 보기",
+    "name-start-color-from-value": "다음 값에서 색상 스케일 시작:",
+    "name-steps": "단계",
+    "name-tick-alignment": "눈금 정렬",
+    "name-tooltip-mode": "도구 설명 모드",
+    "name-unit": "단위",
+    "name-value-name": "값 이름",
+    "name-y-axis-scale": "Y축 스케일",
+    "placeholder-axis-label": "자동",
+    "placeholder-axis-width": "자동",
+    "placeholder-decimals": "자동",
+    "placeholder-end-color-at-value": "자동(최대)",
+    "placeholder-hide-cells-gt": "없음",
+    "placeholder-hide-cells-lt": "없음",
+    "placeholder-max-value": "자동",
+    "placeholder-min-value": "자동",
+    "placeholder-start-color-from-value": "자동(최소)",
+    "placeholder-value-name": "값",
     "placement-options": {
-      "label-hidden": "",
-      "label-left": "",
-      "label-right": ""
+      "label-hidden": "숨김",
+      "label-left": "왼쪽",
+      "label-right": "오른쪽"
     },
     "scale-options": {
-      "label-exponential": "",
-      "label-linear": ""
+      "label-exponential": "지수",
+      "label-linear": "직선형"
     },
     "tick-alignment-options": {
-      "label-auto": "",
-      "label-bottom": "",
-      "label-middle": "",
-      "label-top": ""
+      "label-auto": "자동",
+      "label-bottom": "하단(GE)",
+      "label-middle": "중앙",
+      "label-top": "상단(LE)"
     },
     "tooltip-mode-options": {
-      "label-all": "",
-      "label-hidden": "",
-      "label-single": ""
+      "label-all": "전체",
+      "label-hidden": "숨김",
+      "label-single": "단일"
     }
   },
   "help-modal": {
@@ -8957,14 +8958,14 @@
     "troubleshooting-help": "문제 해결 지원을 요청하려면 이 패널의 스냅샷을 Grafana Labs 기술 지원팀에 보내세요. 스냅샷에는 쿼리 응답 데이터와 패널 설정이 포함되어야 합니다."
   },
   "histogram": {
-    "category-histogram": "",
+    "category-histogram": "히스토그램",
     "histogram-panel": {
       "no-histogram-found-in-response": "응답에서 히스토그램을 찾을 수 없습니다."
     },
-    "name-fill-opacity": "",
-    "name-gradient-mode": "",
-    "name-line-width": "",
-    "name-stacking": ""
+    "name-fill-opacity": "채우기 불투명도",
+    "name-gradient-mode": "그라데이션 모드",
+    "name-line-width": "선 너비",
+    "name-stacking": "스태킹"
   },
   "inspector": {
     "inspect-data-tab": {
@@ -9191,8 +9192,8 @@
       "title-create-library-panel": "라이브러리 패널 생성"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "변경",
+      "confirmText-replace": "교체"
     },
     "confirm": {
       "delete-panel": "이 패널을 삭제하시겠어요?"
@@ -9216,7 +9217,7 @@
       "usage-count_other": "{{count}}개의 대시보드에서 사용됨"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "이름, 설명 또는 폴더 이름으로 검색"
     },
     "loading-indicator": {
       "loading-library-panel": "라이브러리 패널 로딩 중..."
@@ -9340,16 +9341,16 @@
     }
   },
   "logs": {
-    "category-logs": "",
+    "category-logs": "로그",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "정확한",
+      "label-none": "없음",
+      "label-numbers": "숫자",
+      "label-signature": "서명"
     },
-    "description-enable-infinite-scrolling": "",
-    "description-enable-syntax-highlighting": "",
-    "description-show-controls": "",
+    "description-enable-infinite-scrolling": "실험적. 로그 목록 하단으로 스크롤하여 더 많은 결과를 요청합니다.",
+    "description-enable-syntax-highlighting": "사전 정의된 구문 색상 문법을 사용하여 로그 라인의 관련 부분을 강조 표시합니다",
+    "description-show-controls": "마지막 또는 첫 번째 로그 라인으로 이동하는 컨트롤과 로그 단계별 필터를 표시합니다",
     "fields": {
       "type": {
         "loki": {
@@ -9360,8 +9361,8 @@
       }
     },
     "font-size-options": {
-      "label-default": "",
-      "label-small": ""
+      "label-default": "기본값",
+      "label-small": "소"
     },
     "get-dataframe-fields": {
       "vars": {
@@ -9417,64 +9418,64 @@
       "title-log-line": ""
     },
     "log-line-details": {
-      "clear-search": "",
-      "close": "",
-      "copy-shortlink": "",
-      "copy-to-clipboard": "",
-      "displayed-fields-section": "",
+      "clear-search": "초기화",
+      "close": "로그 세부 정보 닫기",
+      "copy-shortlink": "단축 링크 복사",
+      "copy-to-clipboard": "클립보드로 복사",
+      "displayed-fields-section": "표시된 필드 구성",
       "fields": {
-        "adhoc-statistics": "",
-        "copy-value-to-clipboard": "",
-        "filter-out": "",
-        "filter-out-query": "",
+        "adhoc-statistics": "즉석 통계",
+        "copy-value-to-clipboard": "값을 클립보드로 복사",
+        "filter-out": "값 필터링하여 제외",
+        "filter-out-query": "{{query}} 쿼리에서 값을 필터링하여 제외",
         "toggle-field-button": {
-          "field-instead-message": "",
-          "hide-this-field": ""
+          "field-instead-message": "메시지 대신 이 필드 표시",
+          "hide-this-field": "이 필드 숨기기"
         }
       },
-      "fields-section": "",
-      "hide-log-line": "",
-      "inline-mode": "",
-      "links-section": "",
-      "log-line-field": "",
-      "log-line-section": "",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
-      "no-details": "",
-      "open-assistant": "",
-      "pin-line": "",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "fields-section": "필드",
+      "hide-log-line": "로그 라인 숨기기",
+      "inline-mode": "인라인 표시",
+      "links-section": "링크",
+      "log-line-field": "로그 라인",
+      "log-line-section": "로그 선",
+      "move-displayed-field-down": "아래로 이동",
+      "move-displayed-field-up": "위로 이동",
+      "no-details": "표시할 필드가 없습니다.",
+      "open-assistant": "Assistant에서 이 로그 라인 설명",
+      "pin-line": "로그 고정",
+      "remove-displayed-field": "필드 제거",
+      "remove-log": "로그 제거",
+      "scroll-to-logline": "로그 라인으로 스크롤",
       "search": {
-        "no-results": ""
+        "no-results": "표시할 결과가 없습니다."
       },
-      "search-placeholder": "",
-      "show-context": "",
-      "show-log-line": "",
-      "sidebar-mode": "",
-      "unpin-line": ""
+      "search-placeholder": "필드 이름 및 값 검색",
+      "show-context": "맥락 보기",
+      "show-log-line": "로그 라인 표시",
+      "sidebar-mode": "오른쪽에 고정",
+      "unpin-line": "로그 고정 해제"
     },
     "log-line-menu": {
       "copy-link": "링크를 로그 라인에 복사",
       "copy-log": "로그 라인 복사",
       "hide-details": "로그 세부 정보 표시",
       "icon-label": "로그 메뉴",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "로그 라인",
+      "log-line-explainer": "이 로그 라인에 대한 간략한 설명",
+      "open-assistant": "Assistant에서 이 로그 라인 설명",
       "pin-to-outline": "로그 고정",
       "show-context": "맥락 보기",
       "show-details": "로그 세부 정보 숨기기",
       "unpin-from-outline": "로그 고정 해제"
     },
     "log-list-search": {
-      "close": "",
-      "filter": "",
-      "info": "",
-      "input-placeholder": "",
-      "next": "",
-      "prev": ""
+      "close": "검색 닫기",
+      "filter": "일치하는 로그 필터링",
+      "info": "표시된 로그 내에서 문자열을 클라이언트 측에서 검색합니다. 쿼리 필터와 혼동하지 마세요. 이 구성 요소를 사용하여 로그 결과에서 특정 문자열을 검색합니다.",
+      "input-placeholder": "로그에서 검색",
+      "next": "다음 결과",
+      "prev": "이전 결과"
     },
     "log-row-context-modal": {
       "error-loading-log-more-logs": "더 많은 로그를 로딩하는 중 오류 발생",
@@ -9535,7 +9536,7 @@
       "escape-newlines": "로그 줄에서 잘못된 줄 바꿈 및 탭 시퀀스 수정",
       "font-size-default": "작은 글꼴 크기 사용",
       "font-size-small": "기본 글꼴 크기 사용",
-      "hide-search": "",
+      "hide-search": "검색 닫기",
       "hide-timestamps": "타임스탬프 숨기기",
       "hide-unique-labels": "고유 라벨 숨기기",
       "newest-first": "최신 로그순으로 정렬 - 클릭하여 오래된 로그순으로 표시",
@@ -9548,7 +9549,7 @@
       "scroll-top": "맨 위로 스크롤",
       "show-ms-timestamps": "",
       "show-ns-timestamps": "",
-      "show-search": "",
+      "show-search": "로그 결과에서 검색",
       "show-timestamps": "타임스탬프 표시",
       "show-unique-labels": "고유 라벨 표시",
       "unwrap-lines": "줄 바꿈 제거",
@@ -9566,26 +9567,26 @@
         "common-labels": "일반 레이블:"
       }
     },
-    "name-common-labels": "",
-    "name-deduplication": "",
-    "name-details-mode": "",
+    "name-common-labels": "일반 레이블",
+    "name-deduplication": "중복 제거",
+    "name-details-mode": "로그 세부 정보 패널 모드",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "인라인",
+      "label-sidebar": "사이드바"
     },
-    "name-enable-infinite-scrolling": "",
-    "name-enable-log-details": "",
-    "name-enable-syntax-highlighting": "",
-    "name-font-size": "",
-    "name-order": "",
-    "name-prettify-json": "",
-    "name-show-controls": "",
+    "name-enable-infinite-scrolling": "무한 스크롤 활성화",
+    "name-enable-log-details": "로그 세부 정보 활성화",
+    "name-enable-syntax-highlighting": "구문 강조 표시 활성화",
+    "name-font-size": "글자 크기",
+    "name-order": "순서",
+    "name-prettify-json": "JSON을 보기 좋게 정리",
+    "name-show-controls": "컨트롤 표시",
     "name-time": "",
-    "name-unique-labels": "",
-    "name-wrap-lines": "",
+    "name-unique-labels": "고유 레이블",
+    "name-wrap-lines": "줄 바꿈",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "최신순",
+      "label-oldest-first": "오래된 순"
     },
     "out-of-range-message": {
       "end-of-the-selected-time-range": "선택한 시간 범위의 끝입니다."
@@ -9600,7 +9601,7 @@
     "un-themed-log-details": {
       "aria-label-data-links": "데이터 링크",
       "aria-label-fields": "필드",
-      "aria-label-line": "",
+      "aria-label-line": "로그 선",
       "aria-label-log-level": "로그 수준",
       "aria-label-no-details": "세부 정보 없음"
     },
@@ -9621,27 +9622,27 @@
     }
   },
   "logs-new": {
-    "category-logs": "",
+    "category-logs": "로그",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "정확한",
+      "label-none": "없음",
+      "label-numbers": "숫자",
+      "label-signature": "서명"
     },
-    "description-infinite-scrolling": "",
-    "description-show-controls": "",
-    "description-syntax-highlighting": "",
-    "name-deduplication": "",
-    "name-enable-log-details": "",
-    "name-infinite-scrolling": "",
-    "name-order": "",
-    "name-show-controls": "",
-    "name-syntax-highlighting": "",
-    "name-time": "",
-    "name-wrap-lines": "",
+    "description-infinite-scrolling": "실험적. 로그 목록 하단으로 스크롤하여 더 많은 결과를 요청합니다.",
+    "description-show-controls": "마지막 또는 첫 번째 로그 라인으로 이동하는 컨트롤과 로그 단계별 필터를 표시합니다",
+    "description-syntax-highlighting": "사전 정의된 구문 색상 문법을 사용하여 로그 라인의 관련 부분을 강조 표시합니다",
+    "name-deduplication": "중복 제거",
+    "name-enable-log-details": "로그 세부 정보 활성화",
+    "name-infinite-scrolling": "무한 스크롤 활성화",
+    "name-order": "순서",
+    "name-show-controls": "컨트롤 표시",
+    "name-syntax-highlighting": "구문 강조 표시 활성화",
+    "name-time": "시간",
+    "name-wrap-lines": "줄 바꿈",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "최신순",
+      "label-oldest-first": "오래된 순"
     }
   },
   "manage-dashbaords": {
@@ -9668,8 +9669,8 @@
       "updated-on": "업데이트 날짜"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "정말 '{{snapshotToRemove}}'을(를) 삭제하시겠어요?",
+      "confirmText-delete": "삭제",
       "title-delete": "삭제"
     },
     "unthemed-dashboard-import": {
@@ -9681,14 +9682,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "이름은 필수 입력 항목입니다",
+      "message-reserved-name": "이 이름은 예약어이므로 폴더에 사용할 수 없습니다.",
+      "message-same-name": "동일한 이름의 대시보드 또는 폴더가 이미 존재합니다",
+      "message-same-name-general": "일반 폴더에 동일한 이름의 폴더 또는 대시보드가 이미 존재합니다"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "옵션을 찾을 수 없습니다"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9838,8 +9839,8 @@
     "resource-details": {
       "dismiss-button": "확인",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "최대 경고 규칙 그룹 수에 도달했습니다. 경고 규칙 그룹 몇 개를 삭제하거나 요금제를 업그레이드한 후 다시 시도해 주세요.",
+        "alert-rules-quota-reached": "최대 경고 규칙 수에 도달했습니다. 경고 규칙 몇 개를 삭제하거나 요금제를 업그레이드한 후 다시 시도해 주세요.",
         "dashboard-already-managed": "대시보드가 이미 클라우드 인스턴스에서 Grafana에 의해 프로비저닝 및 관리되고 있습니다. 앞으로 프로비저닝된 대시보드를 사용하는 것이 좋습니다. 대시보드를 클라우드 인스턴스에 복사하려는 경우, 대시보드 JSON에서 대시보드 ID를 변경하고 새 스냅샷을 저장한 다음 다시 업로드하세요.",
         "datasource-already-managed": "데이터 소스가 이미 클라우드 인스턴스에서 Grafana에 의해 프로비저닝 및 관리되고 있습니다. 다른 리소스인 경우 다른 UID를 설정하고 다시 시도하세요.",
         "datasource-invalid-url": "잘못된 URL을 가진 데이터 소스가 있습니다. 유효한 URL을 입력하고 다시 시도해 주세요.",
@@ -10309,7 +10310,7 @@
     "invite-user": {
       "invite-button": "초대",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "사용자 초대"
     },
     "item": {
       "add-bookmark": "북마크에 추가",
@@ -10341,12 +10342,12 @@
     "rss-button": "블로그 최근 글"
   },
   "news": {
-    "category-news": "",
-    "description-show-image": "",
-    "description-url": "",
+    "category-news": "뉴스",
+    "description-show-image": "뉴스 항목 소셜(og:이미지) 이미지를 텍스트 콘텐츠 위에 표시할지 여부를 제어합니다",
+    "description-url": "RSS 및 Atom 피드 지원",
     "link-title": "Grafana Labs 블로그로 이동",
-    "name-show-image": "",
-    "name-url": "",
+    "name-show-image": "이미지 표시",
+    "name-url": "URL",
     "news-panel": {
       "body-error-loading-rss-feed": "피드 URL이 정확한지, 서버에서 CORS가 올바르게 구성되었는지 확인하세요. <2>뉴스 패널 문서를 참조하세요.</2>",
       "loading": "로딩 중...",
@@ -10355,27 +10356,27 @@
     "title": "블로그 최근 글"
   },
   "node-graph": {
-    "category-edges": "",
-    "category-node-graph": "",
-    "category-nodes": "",
+    "category-edges": "가장자리",
+    "category-node-graph": "노드 그래프",
+    "category-nodes": "노드",
     "layout-algorithm-options": {
-      "description-force": "",
-      "description-grid": "",
-      "description-layered": "",
-      "label-force": "",
-      "label-grid": "",
-      "label-layered": ""
+      "description-force": "힘 지향 레이아웃 사용",
+      "description-grid": "그리드 레이아웃 사용",
+      "description-layered": "계층형 레이아웃 사용",
+      "label-force": "Force",
+      "label-grid": "그리드",
+      "label-layered": "계층형"
     },
-    "name-arc-sections": "",
-    "name-layout-algorithm": "",
-    "name-main-stat-unit": "",
-    "name-secondary-stat-unit": "",
-    "name-zoom-mode": "",
+    "name-arc-sections": "아크 섹션",
+    "name-layout-algorithm": "레이아웃 알고리즘",
+    "name-main-stat-unit": "주요 통계 단위",
+    "name-secondary-stat-unit": "보조 통계 단위",
+    "name-zoom-mode": "확대/축소 모드",
     "zoom-mode-options": {
-      "description-cooperative": "",
-      "description-greedy": "",
-      "label-cooperative": "",
-      "label-greedy": ""
+      "description-cooperative": "페이지를 정상적으로 스크롤할 수 있습니다",
+      "description-greedy": "모든 확대/축소 제스처에 반응합니다",
+      "label-cooperative": "확대 모드 옵션 – 조화 모드",
+      "label-greedy": "확대 모드 옵션 – 꽉 차게"
     }
   },
   "nodeGraph": {
@@ -10451,40 +10452,40 @@
     },
     "registry": {
       "get-all-option-editors": {
-        "description-time-zone": "",
-        "name-time-zone": ""
+        "description-time-zone": "시간대 선택",
+        "name-time-zone": "시간대"
       },
       "standard-field-condigs": {
-        "category-data-links": ""
+        "category-data-links": "데이터 링크 및 작업"
       },
       "standard-field-configs": {
-        "category": "",
-        "category-thresholds": "",
-        "category-value-mappings": "",
-        "description-display-name": "",
-        "description-field-min-max": "",
-        "description-max": "",
-        "description-min": "",
-        "description-no-value": "",
-        "description-value-mappings": "",
-        "name-actions": "",
-        "name-ad-hoc": "",
-        "name-color-scheme": "",
-        "name-data-links": "",
-        "name-decimals": "",
-        "name-display-name": "",
-        "name-field-min-max": "",
-        "name-max": "",
-        "name-min": "",
-        "name-no-value": "",
-        "name-thresholds": "",
-        "name-unit": "",
-        "name-value-mappings": "",
-        "placeholder-decimals": "",
-        "placeholder-display-name": "",
-        "placeholder-max": "",
-        "placeholder-min": "",
-        "placeholder-unit": ""
+        "category": "표준 옵션",
+        "category-thresholds": "임계값",
+        "category-value-mappings": "값 매핑",
+        "description-display-name": "필드 또는 계열 이름 변경",
+        "description-field-min-max": "필드당 최소 최대값 계산",
+        "description-max": "모든 값을 기준으로 계산하려면 비워둡니다",
+        "description-min": "모든 값을 기준으로 계산하려면 비워둡니다",
+        "description-no-value": "값이 없을 때 표시할 항목",
+        "description-value-mappings": "입력 값에 따라 표시할 텍스트 수정",
+        "name-actions": "작업",
+        "name-ad-hoc": "임시 필터링 가능",
+        "name-color-scheme": "색상 구성표",
+        "name-data-links": "데이터 링크",
+        "name-decimals": "소수(decimal)",
+        "name-display-name": "표시 이름",
+        "name-field-min-max": "필드 최소/최대",
+        "name-max": "최대",
+        "name-min": "최소",
+        "name-no-value": "값 없음",
+        "name-thresholds": "임계값",
+        "name-unit": "단위",
+        "name-value-mappings": "값 매핑",
+        "placeholder-decimals": "자동",
+        "placeholder-display-name": "없음",
+        "placeholder-max": "자동",
+        "placeholder-min": "자동",
+        "placeholder-unit": "없음"
       }
     },
     "units": {
@@ -10529,7 +10530,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "조직을 찾을 수 없습니다",
     "select-placeholder": "조직 선택"
   },
   "page": {
@@ -10593,13 +10594,13 @@
     },
     "panel-data-error-view": {
       "missing-value": {
-        "number": "",
-        "string": "",
-        "time": "",
-        "unknown": ""
+        "number": "데이터에 숫자 필드가 없습니다",
+        "string": "데이터에 문자열 필드가 없습니다",
+        "time": "데이터에 시간 필드가 없습니다",
+        "unknown": "데이터를 시각화할 수 없음"
       },
       "no-value": {
-        "default": ""
+        "default": "데이터 없음"
       },
       "open-visualization-suggestions": "시각화 제안 열기",
       "switch-to-table": "표로 전환"
@@ -10639,25 +10640,25 @@
     "select-placeholder": "유형을 기준으로 필터링"
   },
   "piechart": {
-    "category-legend": "",
-    "category-pie-chart": "",
-    "description-labels": "",
-    "description-pie-chart-type": "",
+    "category-legend": "범례",
+    "category-pie-chart": "원형 차트",
+    "description-labels": "원형 차트에 표시할 레이블을 선택합니다",
+    "description-pie-chart-type": "원형 차트 렌더링 방식",
     "labels-options": {
-      "label-name": "",
-      "label-percent": "",
-      "label-value": ""
+      "label-name": "이름",
+      "label-percent": "백분율",
+      "label-value": "값"
     },
     "legend-values-options": {
-      "label-percent": "",
-      "label-value": ""
+      "label-percent": "백분율",
+      "label-value": "값"
     },
-    "name-labels": "",
-    "name-legend-values": "",
-    "name-pie-chart-type": "",
+    "name-labels": "레이블",
+    "name-legend-values": "범례 값",
+    "name-pie-chart-type": "원형 차트 유형",
     "pie-chart-type-options": {
-      "label-donut": "",
-      "label-pie": ""
+      "label-donut": "도넛",
+      "label-pie": "원형"
     }
   },
   "playlist": {
@@ -10752,7 +10753,7 @@
         "permission": "이 페이지를 볼 수 있는 권한이 없습니다.",
         "title-access-denied": "액세스 거부됨"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "플러그인을 로드하지 못했습니다",
       "no-root-app-page-component-found": "루트 앱 페이지 구성 요소를 찾을 수 없습니다"
     },
     "browse": {
@@ -10796,7 +10797,7 @@
         "update-status-text": "플러그인 업데이트 완료"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "정말 {{version}} 버전으로 다운그레이드하시겠어요? 일반적으로 권장하지 않는 작업입니다",
         "downgrade-confirm": "다운그레이드",
         "downgrade-title": "플러그인 버전 다운그레이드"
       }
@@ -10825,7 +10826,7 @@
         "dependencies": "종속 관계",
         "documentation": "문서",
         "downloads": "다운로드",
-        "from": "",
+        "from": "최저",
         "installedVersion": "설치된 버전",
         "lastCommitDate": "마지막 담당 날짜:",
         "latestReleaseDate": "최신 릴리스 날짜:",
@@ -10851,8 +10852,8 @@
       "message": "찾은 플러그인 없음"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "오류에 대한 자세한 내용은 콘솔을 확인하세요.",
+      "extension-error-alert-title": "\"{{pluginId}}/{{extensionTitle}}\" 확장 프로그램을 로드하지 못했습니다"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10889,13 +10890,13 @@
     "install-controls-button": {
       "title-uninstall-modal": "{{plugin}} 제거",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "정말 이 플러그인을 제거하시겠어요?",
+        "confirmText-confirm": "확인"
       }
     },
     "install-controls-warning": {
       "body-not-published": "이 플러그인은 <2>grafana.com/plugins</2>에 게시되어 있지 않으며 카탈로그를 통해 관리할 수 없습니다.",
-      "enterprise-plugin-info": "",
+      "enterprise-plugin-info": "이 플러그인은 Grafana Cloud 및 Grafana Enterprise에서만 사용할 수 있습니다.",
       "learn-more": "자세히 알아보기",
       "no-valid-grafana-enterprise-license-detected": "유효한 Grafana Enterprise 라이선스가 감지되지 않았습니다.",
       "title-dev-alert": "이것은 플러그인의 개발용 빌드이며 제거할 수 없습니다.",
@@ -10908,6 +10909,9 @@
       "label-plugin-id": "플러그인 ID",
       "label-severity": "심각도"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "해당 플러그인을 찾을 수 없습니다. URL이 올바른지 확인하거나 <1></1><3>플러그인 카탈로그</3>로 이동하세요.",
       "title-plugin-not-found": "플러그인을 찾을 수 없습니다"
@@ -11053,40 +11057,40 @@
   },
   "provisioned-resource-form": {
     "save-or-delete-resource-shared-fields": {
-      "comment-placeholder-describe-changes-optional": "",
-      "description-branch-name-in-git-hub": "",
+      "comment-placeholder-describe-changes-optional": "변경 사항을 설명하는 메모 추가(선택 사항)",
+      "description-branch-name-in-git-hub": "GitHub의 브랜치 이름",
       "description-inside-repository": "",
-      "label-branch": "",
-      "label-comment": "",
-      "label-path": "",
-      "label-workflow": ""
+      "label-branch": "브랜치",
+      "label-comment": "댓글",
+      "label-path": "경로",
+      "label-workflow": "워크플로"
     }
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "이 리소스는 {{repoType}}의 브랜치보다 이전 상태입니다.",
+      "not-saved": "이 브랜치가 머지될 때까지 조직의 다른 Grafana 사용자에게는 구성된 기본 브랜치에 저장된 현재 버전이 계속 표시됩니다",
+      "open-in-repo-button": "{{repoType}}에서 열기",
+      "open-pull-request-in-repo": "{{repoType}}에서 풀 요청 열기",
+      "view-in-repo-button": "최신 변경 사항은 {{repoType}}에서 확인하세요.",
+      "view-pull-request-in-repo": "{{repoType}}에서 풀 요청 보기"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "{{repoType}}의 브랜치에 새 리소스가 생성되었습니다.",
+    "title-loaded-pull-request-in-repo": "이 리소스는 방금 {{repoType}}에 생성한 브랜치에서 로드되며 본인만 볼 수 있습니다"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "리소스가 성공적으로 저장되었습니다",
+  "provisioned-resource-request-handler-dashboard": "대시보드가 성공적으로 저장되었습니다",
+  "provisioned-resource-request-handler-folder": "폴더가 성공적으로 생성되었습니다",
   "provisioning": {
     "banner": {
       "message": "이 기능은 현재 적극적으로 개발 중입니다. 최상의 경험과 최신 개선 사항 적용을 위해 Grafana의 <2>야간 빌드</2>를 사용하는 것이 좋습니다."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "프로비저닝에 사용할 브랜치",
+      "branch-label": "브랜치",
+      "branch-required": "브랜치는 필수 항목입니다",
+      "path-description": "리포지토리 내의 하위 디렉터리 경로(선택 사항)",
+      "path-label": "경로",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11095,18 +11099,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "사용자가 변경 사항을 저장할 때 풀 요청을 열 것인지 여부를 선택할 수 있습니다. 리포지토리에서 메인 브랜치에 대한 직접 변경을 허용하지 않는 경우에도 풀 요청이 필요할 수 있습니다.",
+      "pr-workflow-label": "저장 시 풀 요청 옵션 활성화",
+      "token-description": "리포지토리 권한이 있는 Bitbucket 앱 비밀번호",
+      "token-label": "앱 비밀번호",
+      "token-required": "Bitbucket 토큰은 필수 항목입니다",
+      "token-user-description": "앱 비밀번호로 리포지토리에 액세스하는 데 사용할 사용자 이름",
+      "token-user-label": "사용자 이름",
+      "token-user-required": "사용자 이름은 필수 항목입니다",
+      "url-description": "Bitbucket 리포지토리 URL",
+      "url-label": "리포지토리 URL",
+      "url-pattern": "유효한 Bitbucket 리포지토리 URL이어야 합니다",
+      "url-required": "리포지토리 URL은 필수 항목입니다"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "이 리포지토리 연결에 대해 알기 쉬운 이름 추가",
@@ -11117,9 +11121,9 @@
       "label-display-name": "표시 이름",
       "placeholder-my-repository-connection": "내 리포지토리 연결",
       "text-loading-resource-information": "리소스 정보 로딩 중...",
-      "dashboards-count_other": "",
+      "dashboards-count_other": "대시보드 {{count}}개",
       "files-count_other": "파일 {{count}}개",
-      "folders-count_other": ""
+      "folders-count_other": "폴더 {{count}}개"
     },
     "check-repository": {
       "check": "확인"
@@ -11193,7 +11197,7 @@
       "title-instant-updates-requests-webhooks": "웹훅을 통한 즉시 업데이트 및 풀 요청.",
       "title-visual-previews-in-pull-requests": "이미지 렌더링을 통해 풀 요청을 시각적으로 미리 보기"
     },
-    "error-title-default": "",
+    "error-title-default": "오류",
     "expanded-row": {
       "job-specification": "작업 사양",
       "summary": "요약"
@@ -11202,8 +11206,8 @@
       "actions": {
         "set-up-required-feature-toggles": "필수 기능 토글 설정"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Git에서 코드로 대시보드를 관리하고 업데이트를 자동으로 프로비저닝합니다",
+      "manage-your-dashboards-with-remote-provisioning": "Git 동기화 시작하기",
       "store-dashboards-in-version-controlled-storage": "버전이 관리되는 스토리지에 대시보드를 저장하여 조직 및 기록 추적 기능 향상"
     },
     "file-history-page": {
@@ -11224,16 +11228,16 @@
     },
     "finish-step": {
       "description-enable-previews": "풀 요청에서 대시보드 변경 사항의 이미지 미리 보기를 추가합니다. Grafana 대시보드의 이미지는 Git 리포지토리에서 공유되며 리포지토리 액세스 권한이 있는 모든 사용자가 볼 수 있습니다.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "풀 요청에 대한 미리 보기 링크 생성",
       "description-image-rendering": "이미지 렌더링이 필요합니다. <2>이미지 렌더링 설정</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(<2>이미지 렌더링</2> 및 공개 액세스가 활성화되어야 함)",
       "description-read-only": "Grafana를 통해 리소스를 수정할 수 없습니다.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "리포지토리의 변경 사항을 동기화하는 빈도",
+      "error-sync-interval-required": "동기화 간격은 필수 입력 항목입니다",
       "label-enable-previews": "풀 요청에서 대시보드 미리 보기 활성화",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "대시보드 미리 보기 생성",
       "label-read-only": "읽기 전용",
-      "label-sync-interval": ""
+      "label-sync-interval": "동기화 간격(초)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "쿼리와 일치하는 결과가 없습니다",
@@ -11265,46 +11269,46 @@
       "subtitle-provisioning-feature": "프로비저닝 연결 보기 및 관리"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "프로비저닝에 사용할 브랜치",
+      "branch-label": "브랜치",
+      "branch-required": "브랜치는 필수 항목입니다",
+      "path-description": "리포지토리 내의 하위 디렉터리 경로(선택 사항)",
+      "path-label": "경로",
+      "pr-workflow-description": "사용자가 변경 사항을 저장할 때 풀 요청을 열 것인지 여부를 선택할 수 있습니다. 리포지토리에서 메인 브랜치에 대한 직접 변경을 허용하지 않는 경우에도 풀 요청이 필요할 수 있습니다.",
+      "pr-workflow-label": "저장 시 풀 요청 옵션 활성화",
+      "token-description": "Git 리포지토리 액세스 토큰 또는 비밀번호",
+      "token-label": "액세스 토큰",
+      "token-required": "Git 토큰은 필수 항목입니다",
+      "token-user-description": "액세스 토큰을 사용하여 리포지토리에 액세스하는 데 사용할 사용자 이름",
+      "token-user-label": "사용자 이름",
+      "token-user-required": "사용자 이름은 필수 항목입니다",
+      "url-description": "Git 리포지토리 URL",
+      "url-label": "리포지토리 URL",
+      "url-pattern": "유효한 Git 리포지토리 URL이어야 합니다",
+      "url-required": "리포지토리 URL은 필수 항목입니다"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "프로비저닝에 사용할 브랜치",
+      "branch-label": "브랜치",
+      "branch-required": "브랜치는 필수 항목입니다",
+      "path-description": "리포지토리 내의 하위 디렉터리 경로(선택 사항)",
+      "path-label": "경로",
+      "pr-workflow-description": "사용자가 변경 사항을 저장할 때 풀 요청을 열 것인지 여부를 선택할 수 있습니다. 리포지토리에서 메인 브랜치에 대한 직접 변경을 허용하지 않는 경우에도 풀 요청이 필요할 수 있습니다.",
+      "pr-workflow-label": "저장 시 풀 요청 옵션 활성화",
+      "token-description": "리포지토리 권한이 있는 GitHub 개인 액세스 토큰",
+      "token-label": "개인 액세스 토큰",
+      "token-required": "GitHub 토큰은 필수 항목입니다",
+      "url-description": "GitHub 리포지토리 URL",
+      "url-label": "리포지토리 URL",
+      "url-pattern": "유효한 GitHub 리포지토리 URL이어야 합니다",
+      "url-required": "리포지토리 URL은 필수 항목입니다"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "프로비저닝에 사용할 브랜치",
+      "branch-label": "브랜치",
+      "branch-required": "브랜치는 필수 항목입니다",
+      "path-description": "리포지토리 내의 하위 디렉터리 경로(선택 사항)",
+      "path-label": "경로",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11313,15 +11317,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "사용자가 변경 사항을 저장할 때 머지 요청을 열 것인지 여부를 선택할 수 있습니다. 리포지토리에서 메인 브랜치에 대한 직접 변경을 허용하지 않는 경우에도 머지 요청이 필요할 수 있습니다.",
+      "pr-workflow-label": "저장 시 머지 요청 옵션 활성화",
+      "token-description": "리포지토리 권한이 있는 GitLab 프로젝트 액세스 토큰",
+      "token-label": "프로젝트 액세스 토큰",
+      "token-required": "GitLab 토큰은 필수 항목입니다",
+      "url-description": "GitLab 리포지토리 URL",
+      "url-label": "리포지토리 URL",
+      "url-pattern": "유효한 GitLab 리포지토리 URL이어야 합니다",
+      "url-required": "리포지토리 URL은 필수 항목입니다"
     },
     "history-view": {
       "not-found": "찾을 수 없음"
@@ -11349,18 +11353,18 @@
       "starting": "시작하는 중...",
       "status": {
         "title-error-running-job": "작업 실행 중 오류 발생",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "작업이 성공적으로 완료되었습니다",
+        "title-warning-running-job": "작업이 경고와 함께 완료되었습니다"
       },
       "summary": "요약",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "활성 작업을 가져오는 중에 오류 발생"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "리포지토리에 대한 로컬 파일 시스템 경로",
+      "path-label": "리포지토리 경로",
+      "path-required": "리포지토리 경로는 필수 항목입니다"
     },
     "mode-options": {
       "folder": {
@@ -11386,7 +11390,7 @@
     },
     "repository-actions": {
       "settings": "설정",
-      "source-code": ""
+      "source-code": "소스 코드"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11452,22 +11456,22 @@
       "title-queued-for-deletion": "삭제 대기열에 추가됨"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "제공자 선택:",
+      "configure-file": "파일 프로비저닝 구성",
+      "configure-with-provider": "{{ provider }}(으)로 구성",
+      "provider-not-listed": "제공자가 목록에 없는 경우:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Bitbucket 리포지토리에 연결",
+      "github": "GitHub",
+      "github-description": "GitHub 리포지토리에 연결",
+      "gitlab": "GitLab",
+      "gitlab-description": "GitLab 리포지토리에 연결",
+      "local": "로컬",
+      "local-description": "파일 프로비저닝 구성",
+      "pure-git": "Git으로만 구성",
+      "pure-git-description": "모든 Git 리포지토리에 연결"
     },
     "resource-view": {
       "base": "베이스",
@@ -11498,11 +11502,11 @@
       "label-current-step": "현재 단계",
       "label-pending-step": "보류 중인 단계"
     },
-    "success-title-default": "",
+    "success-title-default": "성공",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "작업을 시작하지 못했습니다",
+      "error-no-repository-name": "제공된 리포지토리 이름 없음",
+      "error-starting-job": "작업 시작 중 오류 발생"
     },
     "sync-repository": {
       "body-edit-configuration": "구성 편집",
@@ -11530,7 +11534,7 @@
       "go-to": "다음으로 이동",
       "make-sure": "반드시 이러한 권한을 포함하세요"
     },
-    "warning-title-default": "",
+    "warning-title-default": "경고",
     "wizard": {
       "alert-point-1": "이 프로세스 중에는 리소스를 생성, 편집 또는 삭제할 수 없습니다. 마지막 단계에서는 리소스가 표시되지 않습니다.",
       "alert-point-2": "프로비저닝이 완료되면 리소스가 다시 표시되고 외부 스토리지를 통해 관리됩니다.",
@@ -11540,10 +11544,10 @@
       "button-next": "완료",
       "button-start": "동기화 시작",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "이렇게 하면 리포지토리 구성이 삭제되고 지금까지의 작업 내용이 모두 사라집니다. 정말 변경 사항을 취소하시겠어요?",
+        "confirm": "네, 취소해 주세요",
+        "dismiss": "계속 작업하기",
+        "title": "리포지토리 설정을 취소하시겠어요?"
       },
       "step-bootstrap": "동기화할 항목 선택",
       "step-connect": "연결",
@@ -11559,7 +11563,7 @@
     "wizard-content": {
       "button-cancel": "취소",
       "button-cancelling": "취소 중...",
-      "button-previous": "",
+      "button-previous": "이전",
       "button-submitting": "제출 중…",
       "error-instance-repository-exists": "인스턴스 리포지토리가 이미 존재합니다"
     }
@@ -11956,7 +11960,7 @@
         "recommended": "권장",
         "results": "결과"
       },
-      "search": ""
+      "search": "{{parentTitle}} 검색"
     }
   },
   "search": {
@@ -12037,7 +12041,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "서비스 계정을 찾을 수 없습니다",
     "select-aria-label": "서비스 계정 선택기",
     "select-placeholder": "입력하여 서비스 계정 검색"
   },
@@ -12083,10 +12087,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "서비스 계정 토큰 추가",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "정말 이 서비스 계정을 삭제하시겠어요?",
+      "body-disable-service-account": "정말 이 서비스 계정을 비활성화하시겠어요?",
+      "confirmText-delete-service-account": "서비스 계정 삭제",
+      "confirmText-disable-service-account": "서비스 계정 비활성화",
       "delete-service-account": "서비스 계정 삭제",
       "disable-service-account": "서비스 계정 비활성화",
       "enable-service-account": "서비스 계정 활성화",
@@ -12113,7 +12117,7 @@
       "used-by": "사용자"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "저장",
       "edit": "편집"
     },
     "service-account-role-row": {
@@ -12127,15 +12131,15 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "서비스 계정 추가",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "정말 {{serviceAccountName}}을(를) 삭제하시겠어요?",
+      "body-disable-service-account": "정말 '{{accountToDisable}}'을(를) 비활성화하시겠어요?",
+      "confirmText-delete": "삭제",
+      "confirmText-disable-service-account": "서비스 계정 비활성화",
       "placeholder-search-service-account-by-name": "이름으로 서비스 계정 검색",
       "sub-title": "서비스 계정과 해당 계정의 토큰을 사용하여 Grafana API에 대한 인증을 수행할 수 있습니다. 자세한 내용은 Grafana의 <2>문서</2>",
       "title-delete-service-account": "서비스 계정 삭제",
       "title-disable-service-account": "서비스 계정 비활성화",
-      "body-delete_other": ""
+      "body-delete_other": "정말 {{serviceAccountName}} 및 {{count}}개의 관련 토큰을 삭제하시겠어요?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "이 토큰은 만료되었습니다",
@@ -12149,7 +12153,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "이미지로 내보내기",
       "export-json-title": "JSON으로 내보내기",
       "share-externally-title": "외부 공유",
       "share-internally-title": "내부 공유",
@@ -12186,17 +12190,17 @@
       "view-button-yaml": "YAML 보기"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "이미지 내보내기 작업",
+      "cancel-button": "취소",
+      "download-button": "이미지 다운로드",
+      "error-title": "이미지를 생성하지 못했습니다",
+      "generate-button": "이미지 생성",
+      "generating": "이미지 생성 중...",
+      "info-text": "이 대시보드를 이미지로 저장",
+      "preview": "미리 보기",
+      "preview-aria": "생성된 이미지 미리 보기",
+      "preview-region": "이미지 미리 보기",
+      "title": "이미지로 내보내기"
     },
     "library": {
       "info": "라이브러리 패널을 생성합니다."
@@ -12206,7 +12210,7 @@
       "info-text": "아래 옵션으로 사용자 정의된 이 대시보드 또는 패널에 대한 직접 링크를 생성합니다.",
       "link-url": "링크 URL",
       "render-alert": "이미지 렌더러 플러그인 미설치",
-      "render-instructions": "",
+      "render-instructions": "이미지를 렌더링하려면 <2>Grafana 이미지 렌더러 플러그인</2>을 설치해야 합니다. 플러그인을 설치하려면 Grafana 관리자에게 문의하세요.",
       "rendered-image": "렌더링된 이미지에 직접 연결",
       "save-alert": "대시보드 저장되지 않음",
       "save-dashboard": "패널 이미지를 렌더링하려면 먼저 대시보드를 저장해야 합니다.",
@@ -12274,11 +12278,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "대시보드를 저장하여 이미지 생성을 활성화하세요",
+    "download-disabled-help": "먼저 이미지를 생성하여 다운로드를 활성화하세요",
+    "error-title": "이미지를 생성하지 못했습니다",
     "form": {
-      "label": ""
+      "label": "패널 이미지 설정"
     },
     "preview": {
       "title": "패널 미리 보기"
@@ -12439,112 +12443,112 @@
   },
   "stat": {
     "add-orientation-option": {
-      "description-orientation": "",
-      "name-orientation": "",
+      "description-orientation": "레이아웃 방향",
+      "name-orientation": "방향",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-vertical": ""
+        "label-auto": "자동",
+        "label-horizontal": "가로",
+        "label-vertical": "세로"
       }
     },
     "add-standard-data-reduce-options": {
-      "category-value-options": "",
-      "description-calculation": "",
-      "description-fields": "",
-      "description-limit": "",
-      "description-show": "",
+      "category-value-options": "값 옵션",
+      "description-calculation": "감속기 함수/계산 선택",
+      "description-fields": "패널에 포함되어야 하는 필드 선택",
+      "description-limit": "표시할 최대 행 수",
+      "description-show": "열 또는 계열별로 단일 값을 계산하거나 각 행을 표시합니다",
       "fields-options": {
-        "label-all-fields": "",
-        "label-numeric-fields": ""
+        "label-all-fields": "모든 필드",
+        "label-numeric-fields": "숫자 필드"
       },
-      "name-calculation": "",
-      "name-fields": "",
-      "name-limit": "",
-      "name-show": "",
+      "name-calculation": "계산",
+      "name-fields": "필드",
+      "name-limit": "한도",
+      "name-show": "표시",
       "show-options": {
-        "label-all-values": "",
-        "label-calculate": ""
+        "label-all-values": "모든 값",
+        "label-calculate": "계산"
       }
     },
-    "category-stat-styles": "",
+    "category-stat-styles": "통계 유형",
     "color-mode-options": {
-      "label-background-gradient": "",
-      "label-background-solid": "",
-      "label-none": "",
-      "label-value": ""
+      "label-background-gradient": "배경 그라데이션",
+      "label-background-solid": "배경 단색",
+      "label-none": "없음",
+      "label-value": "값"
     },
-    "description-graph-mode": "",
-    "description-text-mode": "",
+    "description-graph-mode": "통계 패널 그래프/스파크라인 모드",
+    "description-text-mode": "이름과 값을 표시할지, 아니면 이름만 표시할지 제어합니다",
     "graph-mode": {
       "options": {
-        "label-area": "",
-        "label-none": ""
+        "label-area": "영역",
+        "label-none": "없음"
       }
     },
     "name-color-modcolor-mode-options": {
-      "label": ""
+      "label": "색상 모드"
     },
-    "name-graph-mode": "",
-    "name-show-percent-change": "",
-    "name-text-alignment": "",
-    "name-text-mode": "",
-    "name-wide-layout": "",
-    "percent-change-color-mode": "",
+    "name-graph-mode": "그래프 모드",
+    "name-show-percent-change": "비율 변화 표시",
+    "name-text-alignment": "문자 정렬",
+    "name-text-mode": "텍스트 모드",
+    "name-wide-layout": "와이드 레이아웃",
+    "percent-change-color-mode": "색상 모드 비율 변화",
     "percent-change-color-mode-options": {
-      "label-inverted": "",
-      "label-same-as-value": "",
-      "label-standard": ""
+      "label-inverted": "반전됨",
+      "label-same-as-value": "값과 동일",
+      "label-standard": "표준"
     },
     "text-alignment-options": {
-      "label-auto": "",
-      "label-center": ""
+      "label-auto": "자동",
+      "label-center": "중앙"
     },
     "text-mode-options": {
-      "label-auto": "",
-      "label-name": "",
-      "label-none": "",
-      "label-value": "",
-      "label-value-and-name": ""
+      "label-auto": "자동",
+      "label-name": "이름",
+      "label-none": "없음",
+      "label-value": "값",
+      "label-value-and-name": "값 및 이름"
     },
     "wide-layout-options": {
-      "label-off": "",
-      "label-on": ""
+      "label-off": "끄기",
+      "label-on": "켜기"
     }
   },
   "state-timeline": {
     "align-values-options": {
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-center": "중앙",
+      "label-left": "왼쪽",
+      "label-right": "오른쪽"
     },
-    "category-state-timeline": "",
-    "name-align-values": "",
-    "name-connect-null-values": "",
-    "name-disconnect-values": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-merge-equal-consecutive-values": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-state-timeline": "상태 타임라인",
+    "name-align-values": "값 정렬",
+    "name-connect-null-values": "null 값 연결",
+    "name-disconnect-values": "값 연결 해제",
+    "name-fill-opacity": "채우기 불투명도",
+    "name-line-width": "선 너비",
+    "name-merge-equal-consecutive-values": "동일한 연속 값 병합",
+    "name-page-size": "페이지 크기(페이지 매김 사용)",
+    "name-row-height": "행 높이",
+    "name-show-values": "값 표시",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "항상",
+      "label-auto": "자동",
+      "label-never": "기록 없음"
     }
   },
   "status-history": {
-    "category-status-history": "",
-    "name-column-width": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-status-history": "상태 기록",
+    "name-column-width": "열 너비",
+    "name-fill-opacity": "채우기 불투명도",
+    "name-line-width": "선 너비",
+    "name-page-size": "페이지 크기(페이지 매김 사용)",
+    "name-row-height": "행 높이",
+    "name-show-values": "값 표시",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "항상",
+      "label-auto": "자동",
+      "label-never": "기록 없음"
     },
     "status-history-panel": {
       "too-many-points_other": "포인트가 너무 많아 제대로 시각화할 수 없습니다. <1></1>포인트를 더 적게 반환하도록 쿼리를 업데이트합니다. <3></3>({{count}}포인트 수신됨)"
@@ -12583,26 +12587,26 @@
       "label-gauge-display-mode": "게이지 표시 모드",
       "label-value-display": "값 표시"
     },
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "셀 옵션",
+    "category-table": "테이블",
+    "category-table-footer": "테이블 바닥글",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "대",
+      "label-medium": "중",
+      "label-small": "소"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "작업",
+      "auto": "자동",
+      "color-background": "색상 적용된 배경",
+      "color-text": "색상 적용된 텍스트",
+      "data-links": "데이터 링크",
+      "gauge": "게이지",
+      "image": "이미지",
+      "json": "JSON 보기",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "캡슐",
+      "sparkline": "스파크라인"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "선택하면 전체 행이 이 셀과 같은 색으로 표시됩니다.",
@@ -12615,23 +12619,23 @@
       "wrap-text": "자동 줄바꿈"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "자동",
+      "label-center": "중앙",
+      "label-left": "왼쪽",
+      "label-right": "오른쪽"
     },
     "container": {
       "content": "하나의 표에 열을 너무 많이 표시하면 성능에 영향을 주고 데이터를 읽기 힘들어질 수 있습니다. 쿼리를 좁혀 보세요.",
       "show-all-series": "모든 열 표시",
       "show-only-series": "{{MAX_NUMBER_OF_COLUMNS}}개 열만 표시 중"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
-    "description-min-column-width": "",
-    "description-wrap-header-text": "",
+    "description-calculation": "감속기 함수/계산 선택",
+    "description-cell-value-inspect": "모달 창에서 셀 값 검사 활성화",
+    "description-column-filter": "테이블에서 필드 필터 활성화/비활성화",
+    "description-count-rows": "모든 데이터 행에 대한 단일 개수 표시",
+    "description-fields": "계산해야 하는 필드 선택",
+    "description-min-column-width": "열 자동 크기 조정을 위한 최소 너비",
+    "description-wrap-header-text": "열 헤더에 텍스트 줄 바꿈 사용",
     "image-cell-options-editor": {
       "description-alt-text": "이미지를 표시할 수 없거나 화면 리더를 이용하는 사용자를 위해 표시되는 대체 텍스트",
       "description-title-text": "이미지에 커서를 가져갔을 때 표시되는 텍스트",
@@ -12645,66 +12649,66 @@
       },
       "label-dynamic-height": ""
     },
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-paginations": "",
-    "name-fields": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "name-wrap-header-text": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": "",
+    "name-calculation": "계산",
+    "name-cell-height": "셀 높이",
+    "name-cell-type": "셀 유형",
+    "name-cell-value-inspect": "셀 값 점검",
+    "name-column-alignment": "열 정렬",
+    "name-column-filter": "열 필터",
+    "name-column-width": "열 너비",
+    "name-count-rows": "행 개수 계산",
+    "name-enable-paginations": "페이지네이션 활성화",
+    "name-fields": "필드",
+    "name-hide-in-table": "테이블에서 숨기기",
+    "name-min-column-width": "열 최소 너비",
+    "name-show-table-footer": "테이블 바닥글 표시",
+    "name-show-table-header": "테이블 머리말 표시",
+    "name-wrap-header-text": "머리말 텍스트 줄 바꿈",
+    "placeholder-column-width": "자동",
+    "placeholder-fields": "모든 숫자 필드",
     "text-wrap-options": {
       "label-wrap-text": ""
     }
   },
   "table-new": {
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "셀 옵션",
+    "category-table": "테이블",
+    "category-table-footer": "테이블 바닥글",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "대",
+      "label-medium": "중",
+      "label-small": "소"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "자동",
+      "label-center": "중앙",
+      "label-left": "왼쪽",
+      "label-right": "오른쪽"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
+    "description-calculation": "감속기 함수/계산 선택",
+    "description-cell-value-inspect": "모달 창에서 셀 값 검사 활성화",
+    "description-column-filter": "테이블에서 필드 필터 활성화/비활성화",
+    "description-count-rows": "모든 데이터 행에 대한 단일 개수 표시",
+    "description-fields": "계산해야 하는 필드 선택",
     "description-frozen-columns": "",
-    "description-min-column-width": "",
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-pagination": "",
-    "name-fields": "",
+    "description-min-column-width": "열 자동 크기 조정을 위한 최소 너비",
+    "name-calculation": "계산",
+    "name-cell-height": "셀 높이",
+    "name-cell-type": "셀 유형",
+    "name-cell-value-inspect": "셀 값 점검",
+    "name-column-alignment": "열 정렬",
+    "name-column-filter": "열 필터",
+    "name-column-width": "열 너비",
+    "name-count-rows": "행 개수 계산",
+    "name-enable-pagination": "페이지네이션 활성화",
+    "name-fields": "필드",
     "name-frozen-columns": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": ""
+    "name-hide-in-table": "테이블에서 숨기기",
+    "name-min-column-width": "열 최소 너비",
+    "name-show-table-footer": "테이블 바닥글 표시",
+    "name-show-table-header": "테이블 머리말 표시",
+    "placeholder-column-width": "자동",
+    "placeholder-fields": "모든 숫자 필드"
   },
   "tag-filter": {
     "clear-button": "태그 지우기",
@@ -12715,7 +12719,7 @@
     "tag-option-label": "태그 옵션"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "팀을 찾을 수 없습니다",
     "select-aria-label": "팀 선택기",
     "select-placeholder": "팀 선택"
   },
@@ -12789,17 +12793,17 @@
     }
   },
   "text": {
-    "category-text": "",
+    "category-text": "텍스트",
     "mode-options": {
-      "label-code": "",
-      "label-html": "",
-      "label-markdown": ""
+      "label-code": "코드",
+      "label-html": "HTML",
+      "label-markdown": "마크다운"
     },
-    "name-content": "",
-    "name-language": "",
-    "name-mode": "",
-    "name-show-line-numbers": "",
-    "name-show-mini-map": ""
+    "name-content": "콘텐츠",
+    "name-language": "언어",
+    "name-mode": "모드",
+    "name-show-line-numbers": " 번호 표시",
+    "name-show-mini-map": "미니 지도 표시"
   },
   "theme-preview": {
     "breadcrumbs": {
@@ -12847,7 +12851,7 @@
       "apply-button": "시간 범위 적용",
       "default-error": "과거 날짜 또는 '{{now}}'을(를) 입력하세요",
       "fiscal-year": "회계 연도: {{from}} - {{to}}",
-      "from-input": "",
+      "from-input": "최저",
       "open-input-calendar": "캘린더 열기",
       "range-error": "'시작 시간'은 '종료 시간' 이후일 수 없습니다.",
       "to-input": "종료 시간"
@@ -12865,7 +12869,7 @@
       "aria-role": "시간 범위 선택",
       "default-title": "시간 범위",
       "example-title": "시간 범위 예시",
-      "from-label": "",
+      "from-label": "최저",
       "from-to": "{{timeOptionFrom}}~{{timeOptionTo}}",
       "specify": "시간 범위 지정",
       "submit-button-label": "시간 선택기 제출 버튼",
@@ -12878,8 +12882,8 @@
   },
   "timeline": {
     "missing-field": {
-      "all": "",
-      "time": ""
+      "all": "그래프로 표시할 수 있는 필드 없음",
+      "time": "데이터에 시간 필드가 없습니다"
     }
   },
   "timeseries": {
@@ -12897,54 +12901,54 @@
       "tooltip-delete": "삭제",
       "tooltip-edit": "편집"
     },
-    "category-axis": "",
+    "category-axis": "축",
     "config": {
       "get-graph-field-config": {
-        "aria-label-bar-width-factor": "",
-        "aria-label-fill-opacity": "",
-        "aria-label-line-width": "",
-        "aria-label-point-size": "",
-        "category-graph-styles": "",
-        "category-thresholds": "",
-        "name-bar-alignment": "",
-        "name-bar-width-factor": "",
-        "name-connect-nulls": "",
-        "name-disconnect-values": "",
-        "name-fill-below-to": "",
-        "name-fill-opacity": "",
-        "name-gradient-mode": "",
-        "name-line-interpolation": "",
-        "name-line-style": "",
-        "name-line-width": "",
-        "name-point-size": "",
-        "name-show-points": "",
-        "name-show-thresholds": "",
-        "name-style": "",
-        "name-transform": "",
+        "aria-label-bar-width-factor": "막대 너비 계수",
+        "aria-label-fill-opacity": "채우기 불투명도",
+        "aria-label-line-width": "선 너비",
+        "aria-label-point-size": "포인트 크기",
+        "category-graph-styles": "그래프 유형",
+        "category-thresholds": "임계값",
+        "name-bar-alignment": "막대 정렬",
+        "name-bar-width-factor": "막대 너비 계수",
+        "name-connect-nulls": "null 값 연결",
+        "name-disconnect-values": "값 연결 해제",
+        "name-fill-below-to": "다음으로 아래를 채우기",
+        "name-fill-opacity": "채우기 불투명도",
+        "name-gradient-mode": "그라데이션 모드",
+        "name-line-interpolation": "선 보간",
+        "name-line-style": "선 유형",
+        "name-line-width": "선 너비",
+        "name-point-size": "포인트 크기",
+        "name-show-points": "포인트 표시",
+        "name-show-thresholds": "임계값 표시",
+        "name-style": "스타일",
+        "name-transform": "변환",
         "transform-options": {
-          "description-constant": "",
-          "description-style": "",
-          "label-constant": "",
-          "label-style": ""
+          "description-constant": "첫 번째 값은 상수 선으로 표시됩니다",
+          "description-style": "결과를 Y축에서 음수 값으로 반전합니다",
+          "label-constant": "상수",
+          "label-style": "Y 음수 값"
         }
       }
     },
     "insert-nulls-editor": {
       "disconnect-options": {
-        "label-never": "",
-        "label-threshold": ""
+        "label-never": "기록 없음",
+        "label-threshold": "임계값"
       }
     },
     "line-style-editor": {
       "line-fill-options": {
-        "label-dash": "",
-        "label-dots": "",
-        "label-solid": ""
+        "label-dash": "대시",
+        "label-dots": "점",
+        "label-solid": "단색"
       },
       "title-the-input-expects-a-segment-list": "입력 시 세그먼트 목록이 필요합니다",
       "tooltip-help": "도움말"
     },
-    "name-time-zone": "",
+    "name-time-zone": "시간대",
     "nulls-threshold-input": {
       "placeholder-never": "무기한"
     },
@@ -12954,9 +12958,9 @@
     },
     "span-nulls-editor": {
       "gaps-options": {
-        "label-always": "",
-        "label-never": "",
-        "label-threshold": ""
+        "label-always": "항상",
+        "label-never": "기록 없음",
+        "label-threshold": "임계값"
       }
     },
     "timezones-editor": {
@@ -12965,17 +12969,17 @@
     }
   },
   "traces": {
-    "category-span-filters": "",
-    "name-critical-path-only": "",
-    "name-find-in-trace": "",
-    "name-max-duration": "",
-    "name-min-duration": "",
-    "name-service-name": "",
-    "name-service-name-operator": "",
-    "name-show-matches-only": "",
-    "name-span-name": "",
-    "name-span-name-operator": "",
-    "name-tags": "",
+    "category-span-filters": "범위 필터",
+    "name-critical-path-only": "중요 경로만 표시",
+    "name-find-in-trace": "추적에서 찾기",
+    "name-max-duration": "최대 지속 시간",
+    "name-min-duration": "최소 지속 시간",
+    "name-service-name": "서비스 이름",
+    "name-service-name-operator": "서비스 이름 연산자",
+    "name-show-matches-only": "일치 항목만 표시",
+    "name-span-name": "스팬 이름",
+    "name-span-name-operator": "스팬 이름 연산자",
+    "name-tags": "태그",
     "traces-panel": {
       "no-data-found-in-response": "응답에서 데이터를 찾을 수 없습니다."
     }
@@ -12990,20 +12994,20 @@
     "axis-editor": {
       "log-mode-options": {
         "description": {
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-size": "크기를 기준으로 버킷 분할"
         },
         "label": {
-          "split": ""
+          "split": "분할"
         }
       },
       "mode-options": {
         "description": {
-          "split-the-buckets-based-on-count": "",
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-count": "개수를 기준으로 버킷 분할",
+          "split-the-buckets-based-on-size": "크기를 기준으로 버킷 분할"
         },
         "label": {
-          "count": "",
-          "size": ""
+          "count": "개수",
+          "size": "크기"
         }
       },
       "placeholder-auto": "자동"
@@ -13019,15 +13023,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "이항 연산",
+          "reduce-row": "행 줄이기",
+          "row-index": "행 인덱스",
+          "unary-operation": "단항 연산"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "누적 함수",
+        "window-functions": "윈도우 함수"
       },
       "label-alias": "별칭",
       "label-mode": "모드",
@@ -13035,9 +13039,9 @@
     },
     "calculate-heatmap": {
       "add-heatmap-calculation-options": {
-        "name-x-bucket": "",
-        "name-y-bucket": "",
-        "name-y-bucket-scale": ""
+        "name-x-bucket": "X 버킷",
+        "name-y-bucket": "Y 버킷",
+        "name-y-bucket-scale": "Y 버킷 스케일"
       }
     },
     "concatenate-transformer-editor": {
@@ -13045,9 +13049,9 @@
       "label-name": "이름",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "프레임 이름을 필드 이름에 복사",
+          "ignore-the-frame-name": "프레임 이름 무시",
+          "label-frame": "프레임 이름을 레이블로 추가"
         }
       },
       "placeholder-frame": "프레임"
@@ -13060,9 +13064,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "변환 필드 유형 변환기 추가",
       "aria-label-remove-convert-field-type-transformer": "변환 필드 유형 변환기 제거",
-      "convert-field-type": "",
+      "convert-field-type": "필드 유형 변환",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "필드를 지정된 필드 유형으로 변환합니다."
       },
       "label": {
         "browser": "브라우저",
@@ -13075,11 +13079,11 @@
       "label-join-with": "조인 대상",
       "label-set-timezone": "시간대 설정",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "필드 유형 변환"
       },
       "placeholder-type": "유형",
       "tags": {
-        "format-field": ""
+        "format-field": "필드 형식 지정"
       },
       "tooltip-explicit-separator-joining-array-values": "배열 값을 조인할 때 명시적인 구분 기호를 사용합니다",
       "tooltip-input-format": "Grafana가 날짜 문자열을 올바르게 분석할 수 있도록 입력 필드의 형식을 지정하세요.",
@@ -13098,20 +13102,20 @@
       "tooltip-enable": "활성화"
     },
     "draggable-sort-order": {
-      "asc": "",
-      "desc": "",
+      "asc": "오름차순(ASC)",
+      "desc": "내림차순(DESC)",
       "off": "끄기"
     },
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "모든 필드를 단일 프레임으로 결합합니다."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "필드 연결"
         },
         "tags": {
-          "combine": ""
+          "combine": "결합"
         }
       }
     },
@@ -13126,11 +13130,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "콘텐츠(JSON, 레이블 등)의 필드를 파싱합니다."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "필드 선택"
         }
       },
       "label-delimiter": "구분 기호",
@@ -13139,7 +13143,7 @@
       "label-replace-all-fields": "모든 필드 교체",
       "label-source": "소스",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "필드 추출"
       },
       "placeholder-auto": "자동",
       "placeholder-select-delimiter": "구분 기호 선택...",
@@ -13150,20 +13154,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "필드 값을 사용하여 국가, 주 또는 공항을 조회합니다."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "텍스트 필드를 찾을 수 없습니다"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "텍스트 필드 선택"
         }
       },
       "label-field": "필드",
       "label-lookup": "조회",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "리소스에서 필드 조회"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13174,23 +13178,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "정규식 패턴을 사용하여 쿼리 결과의 일부를 제거합니다."
       },
       "label-from-variable": "변수에서",
       "label-identifier": "식별자",
       "label-use-variable": "변수 사용",
       "label-variable": "변수",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "이름으로 필드 필터링"
       },
       "placeholder-regular-expression-pattern": "정규 표현식 패턴"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "원본 쿼리를 토대로 데이터에서 행 제거"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "쿼리로 데이터 필터링"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13204,33 +13208,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "조건 추가",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "사용자 정의 필터를 사용하여 쿼리 결과에서 행을 제거합니다."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "모두 일치",
+          "match-any": "부분 일치"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "제외",
+          "include": "포함"
         }
       },
       "label-conditions": "조건",
       "label-filter-type": "필터 유형",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "값으로 데이터 필터링"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "텍스트 필드를 찾을 수 없습니다"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "텍스트 필드 선택"
         }
       },
       "label-field": "필드",
@@ -13239,10 +13243,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "문자열 필드 서식을 조작합니다."
       },
       "name": {
-        "format-string": ""
+        "format-string": "문자열 형식 지정"
       }
     },
     "format-time-transfomer-editor": {
@@ -13254,66 +13258,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "시간 필드의 출력 형식 설정"
       },
       "name": {
-        "format-time": ""
+        "format-time": "시간 형식 지정"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "행 값을 사용하여 새 필드를 계산합니다."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "계산을 통해 필드 추가"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "단위, 최소, 최대 등을 설정합니다."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "쿼리 결과를 바탕으로 구성"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "소스 데이터에서 히트맵 데이터를 생성합니다."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "히트맵 생성"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "레이블이 지정된 결과의 중첩 구조를 해소하고, 이를 레이블을 기준으로 하나의 테이블로 결합합니다."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "레이블을 기준으로 조인"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "단일 프레임 데이터 세트를 여러 계열로 분할합니다."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "값을 기준으로 분할"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "동적 구성으로 각 행을 필드로 변환합니다."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "행을 필드로"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "쿼리 결과에 공간 연산을 적용합니다."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "공간 연산"
       }
     },
     "get-timezone-options": {
@@ -13345,8 +13349,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "계산",
+          "group-by": "그룹화 기준"
         }
       },
       "placeholder-ignored": "무시됨",
@@ -13354,42 +13358,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "필드 값을 기준으로 데이터를 그룹화하고 집계 데이터를 생성합니다."
       },
       "name": {
-        "group-by": ""
+        "group-by": "그룹화 기준"
       },
       "title-calc-alert": "그룹화된 필드가 없는 경우 계산이 영향을 미치지 않습니다"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "필드 값을 기준으로 데이터를 그룹화하고 그룹화된 데이터로 중첩 테이블을 생성합니다."
       },
       "description-show-field-names": "활성화하면 중첩 테이블의 필드 이름이 테이블 헤더에 표시됩니다",
       "label-show-field-names-in-nested-tables": "중첩된 테이블에 필드 이름 표시",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "중첩 테이블로 그룹화"
       },
       "title-calc-alert": "그룹화된 필드가 없는 경우 계산이 영향을 미치지 않습니다."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "세 개의 필드를 기준으로 데이터를 요약하고 재구성합니다."
       },
       "label-cell-value": "셀 값",
       "label-column": "열",
       "label-empty-value": "빈 값",
       "label-row": "행",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "행렬로 그룹화"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "입력 데이터를 토대로 히스토그램을 계산합니다."
       },
       "name": {
-        "histogram": ""
+        "histogram": "히스토그램"
       },
       "placeholder-auto": "자동",
       "placeholder-default": "기본값: 30",
@@ -13401,14 +13405,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "관련 필드를 기준으로 2개 이상의 테이블에서 행을 결합합니다."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "필드를 기준으로 조인"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "필수 항목",
       "info": {
         "input-contain-labels": "입력에 라벨이 포함되어 있지 않습니다",
         "no-input-or-labels-found": "입력(또는 라벨)을 찾을 수 없습니다",
@@ -13432,8 +13436,8 @@
       "label-value-field-name": "값 필드 이름",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "열",
+          "rows": "행"
         }
       },
       "placeholder-optional-select-label": "라벨 선택(선택 사항)",
@@ -13441,18 +13445,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "계열을 시간 기준으로 그룹화하고 레이블 또는 태그를 필드로 반환합니다."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "레이블을 필드로"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "표시되는 항목 수를 제한합니다."
       },
       "name": {
-        "limit": ""
+        "limit": "한도"
       },
       "placeholder-value-or-variable": "값 또는 변수"
     },
@@ -13465,11 +13469,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "여러 계열을 병합합니다. 값은 하나의 행으로 결합됩니다."
       },
       "merge-effect-applied-single-frame": "단일 프레임에 병합을 적용하면 아무런 효과가 없습니다.",
       "name": {
-        "merge": ""
+        "merge": "계열/테이블 병합"
       }
     },
     "multi-info": {
@@ -13481,14 +13485,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "필드의 순서를 바꾸거나, 필드를 숨기거나, 필드 이름을 변경합니다."
       },
-      "field-order": "",
+      "field-order": "필드 순서",
       "field-order-auto": "자동",
-      "field-order-manual": "",
+      "field-order-manual": "수동",
       "first-frame-warning": "필드 정리는 단일 프레임에서만 가능합니다. 먼저 조인 변환을 적용하거나 입력을 필터링하는 것이 좋습니다.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "이름으로 필드 구성"
       }
     },
     "partion-by-values-editor": {
@@ -13516,10 +13520,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "데이터 프레임을 와이드 형식에서 롱 형식으로 늘립니다."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "시계열 준비"
       }
     },
     "prepare-time-series-editor": {
@@ -13527,26 +13531,26 @@
       "label-info": "정보",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "각 프레임을 롱 형식으로 변환"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "롱 형식 시계열"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "각 시간/숫자 쌍에 대한 새 프레임 생성"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "다중 프레임 시계열"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "시간을 기준으로 조인한 단일 프레임 생성"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "와이드 형식 시계열"
         }
       }
     },
@@ -13561,7 +13565,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "모든 행 또는 데이터 포인트를 하나의 값(예: 최대값, 평균값)으로 축약합니다."
       },
       "label-calculations": "계산",
       "label-include-time": "시간 포함",
@@ -13578,7 +13582,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "축약"
       },
       "placeholder-choose-stat": "통계 선택"
     },
@@ -13588,18 +13592,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "통계 모델이 예측한 값을 포함하는 새 데이터 프레임을 생성합니다."
       },
       "name": {
-        "trendline": ""
+        "trendline": "추세선"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "입방",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "이차",
         "quartic": "사차",
-        "quintic": "오차"
+        "quintic": "오차",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "차수",
       "label-model-type": "모델 유형",
@@ -13612,18 +13621,19 @@
           "polynomial": "다항식"
         }
       },
-      "regression": "",
+      "regression": "회귀",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "회귀 분석"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "예측할 X, Y 포인트 수"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "정규식 및 대체 패턴을 사용하여 쿼리 결과의 일부 이름을 변경합니다."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "정규식으로 필드 이름 변경"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13637,33 +13647,33 @@
       "label-mode": "모드",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "두 테이블의 공통 필드에 일치하는 값이 있을 때마다 두 테이블의 데이터를 결합합니다.",
+          "join-on-a-field": "값이 중복된 필드 값을 기준으로 조인합니다. 성능이 좋지 않은 외부 조인이며, SQL과 비슷한 테이블 형식 데이터에 가장 적합합니다.",
+          "keep-all-rows": "값이 있는 테이블의 모든 행을 유지합니다. 고유한 필드 값을 기준으로 조인하며, 시계열에 가장 적합합니다."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "이너 조인",
+          "outer-tabular": "아우터 조인(테이블형)",
+          "outer-time-series": "아우터 조인(시계열)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "여러 계열을 병합합니다. 시간, 메트릭, 값을 행으로 반환합니다."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "계열에서 행으로"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "프레임에서 필드를 정렬합니다."
       },
       "label-field": "필드",
       "label-reverse": "되돌리기",
       "name": {
-        "sort-by": ""
+        "sort-by": "정렬 기준"
       },
       "placeholder-select-field": "필드 선택"
     },
@@ -13686,13 +13696,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "시계열 데이터를 테이블 행으로 변환하여 테이블 형식이나 스파크라인 형식으로 확인할 수 있도록 합니다."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "시계열을 테이블로 변환하려면 하나 이상의 시계열 프레임이 필요합니다. 현재 시계열 프레임이 없습니다."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "시계열을 테이블로"
       }
     },
     "time-series-table-transform-editor": {
@@ -13710,15 +13720,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "데이터 프레임을 전치합니다."
       },
       "name": {
-        "transpose": ""
+        "transpose": "전치"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "피벗",
+        "transform": "변환",
+        "translate": "치환"
       }
     },
     "unary-operation-editor": {
@@ -13727,13 +13737,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "새 필드 계산",
+        "combine": "결합",
+        "create-new-visualization": "새 시각화 생성",
+        "filter": "필터",
+        "perform-spatial-operations": "공간 연산 수행",
+        "reformat": "형식 재지정",
+        "reorder-and-rename": "순서 변경 및 이름 변경"
       },
       "special-value-options": {
         "description": {
@@ -13784,10 +13794,10 @@
     }
   },
   "trend": {
-    "category-x-axis": "",
-    "description-x-field": "",
-    "name-x-field": "",
-    "placeholder-x-field": ""
+    "category-x-axis": "X축",
+    "description-x-field": "증가하는 수치",
+    "name-x-field": "X 필드",
+    "placeholder-x-field": "첫 번째 숫자 값"
   },
   "upgrade-box": {
     "discovery-text": "Pro 기능을 발견하셨군요!",
@@ -13804,7 +13814,7 @@
     "title": "조직"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "사용자를 찾을 수 없습니다",
     "select-aria-label": "사용자 선택기",
     "select-placeholder": "입력하여 사용자 검색"
   },
@@ -13890,8 +13900,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "정말 \"{{variableToDelete}}\" 변수를 삭제하시겠어요?",
+      "confirmText-delete": "삭제",
       "title-delete-variable": "변수 삭제"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13941,33 +13951,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "이 변수의 값을 정렬하는 방법",
-      "name-sort": "",
+      "name-sort": "정렬",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "알파벳순(오름차순)",
+          "alphabetical-caseinsensitive-asc": "알파벳순(대소문자 구분 없이 오름차순)",
+          "alphabetical-caseinsensitive-desc": "알파벳순(대소문자 구분 없이 내림차순)",
+          "alphabetical-desc": "알파벳순(내림차순)",
+          "disabled": "비활성화됨",
+          "natural-asc": "자연순(오름차순)",
+          "natural-desc": "자연순(내림차순)",
+          "numerical-asc": "숫자순(오름차순)",
+          "numerical-desc": "숫자(내림차순)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "옵션 추가",
+      "description": "쿼리 결과 외에 사용자 지정 옵션 추가",
+      "label-placeholder": "표시 레이블",
+      "remove-option-button-label": "옵션 제거",
+      "value-placeholder": "값, 기본 빈 문자열"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "쿼리 결과로 정적 옵션을 정렬하는 방법"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "기본값",
       "placeholder-default-value-if-any": "기본값(있는 경우)",
       "text-options": "텍스트 옵션"
     },
@@ -13996,8 +14006,8 @@
       "description-optional-display-name": "표시 이름(선택 사항)",
       "description-template-variable-characters": "템플릿 변수의 이름입니다. (최대 50자)",
       "general": "일반",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "레이블",
+      "name-name": "이름",
       "placeholder-descriptive-text": "설명 텍스트",
       "placeholder-label-name": "라벨 이름",
       "placeholder-variable-name": "변수 이름",
@@ -14013,13 +14023,13 @@
       "tooltip-remove-variable": "변수 제거"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "설명"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "모든 값 토글"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "변수 유형 선택"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "사용처 표시"
@@ -14050,20 +14060,20 @@
     }
   },
   "xychart": {
-    "category-xychart": "",
-    "name-fill-opacity": "",
-    "name-line-style": "",
-    "name-line-width": "",
-    "name-max-point-size": "",
-    "name-min-point-size": "",
-    "name-point-shape": "",
-    "name-point-size": "",
-    "name-point-stroke-width": "",
-    "name-series-mapping": "",
-    "name-show": "",
+    "category-xychart": "XY 차트",
+    "name-fill-opacity": "채우기 불투명도",
+    "name-line-style": "선 유형",
+    "name-line-width": "선 너비",
+    "name-max-point-size": "포인트 최대 크기",
+    "name-min-point-size": "포인트 최소 크기",
+    "name-point-shape": "포인트 형태",
+    "name-point-size": "포인트 크기",
+    "name-point-stroke-width": "포인트 스트로크 너비",
+    "name-series-mapping": "계열 매핑",
+    "name-show": "표시",
     "point-shape-options": {
-      "label-circle": "",
-      "label-square": ""
+      "label-circle": "원형",
+      "label-square": "정사각형"
     },
     "series-editor": {
       "add-series": "계열 추가",
@@ -14075,18 +14085,18 @@
       "label-y-field": "Y 필드",
       "placeholder-all-frames": "모든 프레임",
       "placeholder-select-frame": "프레임 선택",
-      "placeholder-x-field": "",
-      "placeholder-y-field": "",
+      "placeholder-x-field": "각 프레임의 첫 번째 숫자 또는 시간 필드",
+      "placeholder-y-field": "각 프레임의 나머지 숫자 필드",
       "tooltip-delete-series": "계열 삭제"
     },
     "series-mapping-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "자동",
+      "label-manual": "수동"
     },
     "show-options": {
-      "label-both": "",
-      "label-lines": "",
-      "label-points": ""
+      "label-both": "둘 다",
+      "label-lines": "선",
+      "label-points": "포인트"
     }
   }
 }
\ No newline at end of file
diff --git a/public/locales/nl-NL/grafana.json b/public/locales/nl-NL/grafana.json
index 493cbe1b05f..2e56446af01 100644
--- a/public/locales/nl-NL/grafana.json
+++ b/public/locales/nl-NL/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Sommige functies zijn stabiel (GA) en standaard ingeschakeld, terwijl sommige zich momenteel in de voorlopige bètafase bevinden en beschikbaar zijn voor vroege adoptie.",
       "confirm-modal-body-2": "We raden aan om de implicaties van elke functiewijziging te begrijpen voordat je wijzigingen aanbrengt.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Wijzigingen opslaan",
       "get-stage-cell": {
         "beta": "Bèta",
         "content-general-availability": "Algemene beschikbaarheid",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Organisatie verwijderen",
-      "confirmText-delete": "",
+      "confirmText-delete": "Verwijderen",
       "title-delete": "Verwijderen"
     },
     "anon-users": {
       "not-found": "Geen anonieme gebruikers gevonden."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Weet je zeker dat je afmelden van alle apparaten wilt forceren?",
+      "confirmText-confirm-logout": "Afmelden bevestigen",
+      "confirmText-force-logout": "Afmelden forceren",
       "title-force-logout-from-all-devices": "Uitloggen van alle apparaten forceren"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Opslaan"
     },
     "edit-org": {
       "access-denied": "Je hebt geen toestemming om gebruikers in deze organisatie te zien. Neem contact op met je serverbeheerder om deze organisatie bij te werken.",
@@ -216,11 +216,11 @@
       "not-editable": "De rol van deze gebruiker kan niet worden bewerkt omdat deze is gesynchroniseerd met je authenticatieprovider. Raadpleeg de <1>Grafana-authenticatiedocumenten </1> voor meer informatie."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Weet je zeker dat je gebruiker {{user}} wilt verwijderen?",
       "columns": {
         "aria-label-role": "Rol"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Verwijderen",
       "delete-aria-label": "Gebruiker verwijderen: {{name}}",
       "title-delete": "Verwijderen"
     },
@@ -252,7 +252,7 @@
       "info-description": "Deze systeeminstellingen worden gedefinieerd in grafana.ini of custom.ini (of overschreven in ENV-variabelen). Om deze te wijzigen moet je Grafana momenteel opnieuw opstarten."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Bevestig verwijderen"
     },
     "upgrade-info": {
       "title": "Enterprise-licentie"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Wijzigen",
-      "confirmText-change": "",
+      "confirmText-change": "Wijzigen",
       "grafana-admin-key": "Grafana-beheerder",
       "grafana-admin-no": "Nee",
       "grafana-admin-yes": "Ja",
       "title": "Toestemmingen"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Weet je zeker dat je deze gebruiker wilt verwijderen?",
+      "body-disable": "Weet je zeker dat je deze gebruiker wilt deactiveren?",
+      "confirmText-delete-user": "Gebruiker verwijderen",
+      "confirmText-disable-user": "Gebruiker deactiveren",
       "delete-button": "Gebruiker verwijderen",
       "disable-button": "Gebruiker uitschakelen",
       "edit-button": "Bewerken",
@@ -331,7 +331,7 @@
       "title-disable-user": "Gebruiker uitschakelen"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Opslaan"
     },
     "user-sessions": {
       "browser-column": "Browser en besturingssysteem",
@@ -382,12 +382,12 @@
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "De knop AI-waarschuwingsregel kan niet worden geladen",
+        "feedback-button": "De knop AI-feedback kan niet worden geladen",
+        "improve-annotations-button": "De knop AI-annotaties verbeteren kan niet worden geladen",
+        "improve-labels-button": "De knop AI-labels verbeteren kan niet worden geladen",
+        "template-button": "De knop AI-sjabloon kan niet worden geladen",
+        "triage-button": "De knop AI-triage kan niet worden geladen"
       }
     },
     "alert": {
@@ -493,7 +493,7 @@
       "title-muting-grouping-and-timings": "Dempen, groeperen en timings"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Geen gegevensbronnen gevonden"
     },
     "alert-menu": {
       "copy-link": "Link kopiëren",
@@ -519,7 +519,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Waarschuwingsregel"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -587,7 +587,7 @@
       "view-configuration": "Configuratie bekijken"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Ja, instellingen terugzetten",
       "gma-manual-configuration-description": "De interne Grafana Alertmanager-configuratie kan niet handmatig worden gewijzigd. Bewerk de individuele bronnen via de gebruikersinterface om deze configuratie te wijzigen.",
       "gma-manual-configuration-is-not-supported": "Handmatige configuratiewijzigingen worden niet ondersteund",
       "message": {
@@ -602,13 +602,13 @@
       "title-resetting-alertmanager-configuration": "Configuratie van Alertmanager opnieuw instellen"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Weet je zeker dat je de configuratie naar deze versie wilt herstellen? Alle niet opgeslagen wijzigingen zullen verloren gaan.",
       "columns": {
         "compare": "Vergelijken",
         "restore": "Herstellen",
         "text-latest": "Nieuwste"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Ja, configuratie herstellen",
       "loading": "Bezig met laden ...",
       "no-previous-configurations": "Geen eerdere configuraties",
       "this-might-take-a-while": "Dit kan even duren...",
@@ -888,10 +888,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Meer acties voor contactpunt '{{contactPointName}}'",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Verwijderen",
       "button-edit": "Bewerken",
       "button-view": "Weergave",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Exporteren",
       "export-label-export": "Exporteren",
       "label-delete": "Verwijderen",
       "label-manage-permissions": "Toestemmingen beheren",
@@ -1426,7 +1426,7 @@
       "label-disable-resolved-message": "Opgelost bericht uitschakelen"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Groepen laden...",
       "message": {
         "must-be-a-positive-integer": "Moet een positief geheel getal zijn.",
         "must-enter-a-group-name": "Een groepsnaam is vereist"
@@ -1523,7 +1523,7 @@
       "group-loading-error": "Er is een fout opgetreden bij het laden van de groep",
       "interval": "Interval",
       "namespace": "Namespace",
-      "new": "",
+      "new": "Nieuw",
       "title": {
         "back": ""
       }
@@ -1555,7 +1555,7 @@
     },
     "group-loader": {
       "group-load-failed": "Kan regels uit groep {{ groupName }} in {{ namespaceName }} niet laden",
-      "no-rules": ""
+      "no-rules": "Geen regels gevonden in deze groep"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "De groep wordt verwijderd"
@@ -1885,10 +1885,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Geen gegevensbronnen gevonden"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Weet je zeker dat je '{{muteTiming}}' wilt verwijderen?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Uitgeschakeld",
@@ -2140,10 +2140,10 @@
         "conflict": "Een andere gebruiker heeft wijzigingen aangebracht in de structuur van het notificatiebeleid.",
         "error-code": "Foutmelding: '{{error}}'",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Kan route niet toevoegen of bijwerken: matchers conflicteren met een externe routeringsstructuur als we matchers {{-matchers}} samenvoegen. Dit zou de route onbereikbaar maken."
         },
         "suffix": "Vernieuw de pagina en probeer het opnieuw.",
-        "title": ""
+        "title": "Kan meldingsbeleid niet toevoegen of bijwerken"
       },
       "n-more-policies_one": "{{count}} aanvullend beleid",
       "n-more-policies_other": "{{count}} aanvullend beleid"
@@ -2199,7 +2199,7 @@
     "query-and-expressions-step": {
       "add-query": "Query toevoegen",
       "body-queries-expressions-configured": "Maak ten minste één query of expressie om te worden gewaarschuwd",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Deactiveren",
       "expressions": "Expressie",
       "loading-data-sources": "Gegevensbronnen laden...",
       "manipulate-returned-queries-other-operations": "Manipuleer gegevens die worden geretourneerd uit query's met wiskundige en andere bewerkingen.",
@@ -2253,7 +2253,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Opnameregel"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Kon querybewerker niet laden vanwege: {{errorMessage}}"
@@ -2273,7 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Je moet een nieuwe evaluatiegroep instellen voor de gekopieerde regel omdat de oorspronkelijke is geprovisioneerd en niet kan worden gebruikt voor regels die in de gebruikersinterface zijn gemaakt.",
       "body-not-provisioned": "De nieuwe regel wordt <1>niet</1> gemarkeerd als een ingestelde regel.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Kopiëren",
       "title-copy-provisioned-alert-rule": "Provisioned waarschuwingsregel kopiëren"
     },
     "redirect-to-rule-viewer": {
@@ -2497,7 +2497,7 @@
       "new-alert-rule": "Nieuwe waarschuwingsregel",
       "new-datasource-recording-rule": "Nieuwe gegevensbron voor opnameregel",
       "new-grafana-recording-rule": "Nieuwe Grafana-opnameregel",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Nieuwe waarschuwingsregel voor export",
       "pagination": {
         "next-page": "Meer weergeven..."
       },
@@ -2671,7 +2671,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Waarschuwingsmanagers"
       }
     },
     "settings-content": {
@@ -2809,7 +2809,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Voorbeeld vernieuwen",
-      "empty-state": "",
+      "empty-state": "Sjablooninhoud toevoegen om voorbeeld te zien",
       "label-preview": "Voorbeeld",
       "refresh": "Vernieuwen"
     },
@@ -2828,7 +2828,7 @@
       "loading": "Bezig met laden ...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Meldingssjabloon selecteren"
         },
         "label": {
           "select-notification-template": "Meldingssjabloon selecteren"
@@ -2856,8 +2856,8 @@
     },
     "templates-table": {
       "actions": "Acties",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Weet je zeker dat je sjabloongroep '{{template}}' wilt verwijderen?",
+      "confirmText-yes-delete": "Ja, verwijderen",
       "no-templates-defined": "Geen sjablonen gedefinieerd.",
       "template-group": "Sjabloongroep",
       "title-delete-template-group": "Sjabloongroep verwijderen"
@@ -2912,7 +2912,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Waarschuwingsregels, opnameregels en evaluatie-interval beheren"
       }
     },
     "to-gma": {
@@ -2992,7 +2992,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Ja, verwijderen"
       }
     },
     "use-delete-policy-modal": {
@@ -3152,7 +3152,7 @@
       "annotation": "Opmerking",
       "first-value": "Eerste waarde",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Onbekende veldnamen"
     },
     "empty-state": {
       "button-title": "Annotatiequery toevoegen",
@@ -3162,12 +3162,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Wanneer dit veld is gedefinieerd, wordt de annotatie behandeld als een bereik",
+        "results-split-on-comma": "De resultaten worden gesplitst op komma (,)"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}, of het eerste tekstveld",
+        "time-or-the-first-field": "{{defaultField}}, of het eerste tijdveld"
       }
     },
     "standard-annotation-query-editor": {
@@ -3245,9 +3245,9 @@
       "define-allowed-teams-ids-label": "Toegestane team-id's definiëren",
       "display-name-description": "Wordt weergegeven op de inlogpagina als 'Aanmelden met ...'. Handig als je meer dan één identiteitsprovider of SSO-protocol gebruikt.",
       "display-name-label": "Weergavenaam",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Parameter om het domein van de gebruiker in de Azure AD/Entra ID-tenant aan te geven en het inlogproces te stroomlijnen.",
+      "domain-hint-label": "Domeinhint",
+      "domain-hint-valid-domain": "Dit veld moet een geldig domein zijn.",
       "email-attribute-name-description": "Naam van de sleutel die moet worden gebruikt voor het opzoeken van gebruikers-e-mails in de attribuutkaart van het OAuth2 ID-token.",
       "email-attribute-name-label": "Naam e-mailattribuut",
       "email-attribute-path-description": "JMESPath-expressie om te gebruiken voor het opzoeken van gebruikers-e-mails uit de gebruikersinformatie.",
@@ -3264,11 +3264,11 @@
       "id-token-attribute-name-label": "Naam id-tokenattribuut",
       "login-attribute-path-description": "JMESPath-expressie om te gebruiken voor het opzoeken van gebruikersaanmeldingen uit het gebruikers-id-token.",
       "login-attribute-path-label": "Pad inlogattribuut",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Toestemming ",
+      "login-prompt-description": "Geeft het type gebruikersinteractie aan wanneer de gebruiker inlogt met de IdP.",
+      "login-prompt-label": "Login prompt",
+      "login-prompt-login": "Inloggen",
+      "login-prompt-select-account": "Selecteer account",
       "managed-identity-client-id-description": "De beheerde identiteitsclient-id van de federatieve identiteitsreferentie van je OAuth2-app.",
       "managed-identity-client-id-label": "FIC-beheerde identiteitsclient-id",
       "name-attribute-path-description": "JMESPath-expressie om te gebruiken voor het opzoeken van gebruikersaanmeldingen uit het gebruikers-id-token.\nDeze naam wordt gebruikt als de weergavenaam van de gebruiker.",
@@ -3304,7 +3304,7 @@
       "team-ids-github": "Gehele lijst van team-id's.",
       "team-ids-label": "Team-id's",
       "team-ids-numbers": "Team-id's moeten cijfers zijn.",
-      "team-ids-other": "",
+      "team-ids-other": "Tekenreekslijst met team-id's.",
       "team-ids-placeholder": "Voer team-id's in en druk op Enter om toe te voegen",
       "teams-url-description": "De URL die wordt gebruikt om naar team-id's te zoeken. Indien niet ingesteld, is de standaardwaarde /teams.",
       "teams-url-description-oauth": "Als je '{{ teamsURLLabel }}' configureert, moet je ook '{{ teamIDsAttributePathLabel }}' configureren.",
@@ -3348,7 +3348,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Terugzetten naar standaardwaarden"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Resetten",
       "disable": "Uitschakelen",
       "disabling": "Uitschakelen...",
       "discard": "Negeren",
@@ -3368,7 +3368,7 @@
       "text-badge-not-enabled": "Niet ingeschakeld"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM is momenteel in ontwikkeling en wordt niet aanbevolen voor gebruik in productieomgevingen. Gebruik met voorzichtigheid; wijzigingen zijn mogelijk."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "Het .well-known/openid-configuration endpoint voor je IdP",
@@ -3486,8 +3486,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Bulkverwijdering van toegewezen resources",
+      "bulk-move-provisioned-resources": "Bulkverplaats toegewezen resources",
       "cancel-button": "Annuleren",
       "confirmation-text": "Verwijderen",
       "delete-button": "Verwijderen",
@@ -3506,8 +3506,8 @@
       "move-modal-title": "Verplaatsen",
       "moving": "Bezig met verplaatsen ...",
       "new-folder-name-required-phrase": "Mapnaam is vereist.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Je hebt zowel toegewezen als niet-toegewezen bronnen geselecteerd. Deze kunnen niet samen worden verwerkt. Selecteer alleen toegewezen bronnen of alleen niet-toegewezen bronnen en probeer het opnieuw.",
+      "selected-mix-resources-modal-title": "Gemengde brontypes geselecteerd"
     },
     "actions": {
       "button-to-recently-deleted": "Onlangs verwijderd"
@@ -3520,25 +3520,25 @@
       "this-folder-is-empty": "Deze map is leeg"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_other": ""
+      "all-deleted": "Alle bronnen zijn verwijderd",
+      "all-moved": "Alle bronnen zijn verplaatst",
+      "button-done": "Gereed",
+      "progress-title": "Succes",
+      "failed-alert_one": "{{count}} items mislukt",
+      "failed-alert_other": "{{count}} items mislukt"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Annuleren",
+      "button-delete": "Verwijderen",
+      "button-deleting": "Bezig met verwijderen...",
+      "delete-warning": "Hiermee worden geselecteerde mappen en hun afgeleiden verwijderd. In totaal heeft dit invloed op:",
+      "error-path-not-found": "Pad niet gevonden"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Annuleren",
+      "button-move": "Verplaatsen",
+      "button-moving": "Bezig met verplaatsen...",
+      "deleting": "Verwijderen",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,14 +3546,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Bestandcontent niet gevonden",
+      "error-path-not-found": "Pad niet gevonden",
+      "error-target-folder-path-missing": "Pad naar doelmap ontbreekt",
+      "error-title": "Fout in doelmap",
+      "move-warning": "Hiermee worden geselecteerde mappen en hun afgeleiden verwijderd. In totaal heeft dit invloed op:",
+      "moving": "Verplaatsen",
+      "progress": "Voortgang: {{current}} van {{total}}",
+      "target-folder": "Doelmap"
     },
     "counts": {
       "alertRule_one": "{{count}} waarschuwingsregel",
@@ -3584,7 +3584,7 @@
       "button-delete": "Verwijderen",
       "button-deleting": "Bezig met verwijderen...",
       "delete-warning": "Hiermee worden deze map en alle onderliggende mappen verwijderd. In totaal heeft dit invloed op:",
-      "success-message": ""
+      "success-message": "Map is verwijderd"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Kan afgeleide informatie niet ophalen"
@@ -3609,7 +3609,7 @@
       "empty-message": "Geen mappen gevonden",
       "error-title": "Fout bij laden van mappen",
       "non-folder-item": "Niet-map {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "Dashboards",
       "search-placeholder": "Mappen doorzoeken",
       "unknown-error": "Onbekende fout"
     },
@@ -3638,7 +3638,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Mapnaam invoeren",
       "label-folder-name": "Mapnaam",
       "text-pull-request-created": "Er is een pull request gemaakt met wijzigingen in deze map:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "Je map wordt gemaakt als {{folderName}} ",
       "title-pull-request-created": "Pull request is aangemaakt",
       "title-this-repository-is-read-only": "Deze repository is alleen-lezen"
     },
@@ -3757,7 +3757,7 @@
     "category-selected-connection": "Geselecteerde verbinding",
     "category-selected-element": "Geselecteerd element ({{element}})",
     "category-size": "Grootte",
-    "category-tooltip": "",
+    "category-tooltip": "Tooltip",
     "cloud-item": {
       "category-cloud": "Cloud",
       "label": {
@@ -4001,10 +4001,10 @@
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Tooltip-modus",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Uitgeschakeld",
+        "label-enabled": "Ingeschakeld"
       }
     },
     "tree-navigation-editor": {
@@ -4373,7 +4373,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Query uitvoeren"
     }
   },
   "dashboard": {
@@ -4536,7 +4536,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Doorgaan"
         },
         "title": {
           "proceed-to-external-site": "Doorgaan naar externe site?"
@@ -4642,11 +4642,11 @@
     },
     "edit-actions": {
       "add": "{{typeName}} toevoegen",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
+      "add-conditional-rule": "Regel {{ruleDescription}} toevoegen",
+      "duplicate-panel": "Paneel dupliceren",
+      "edit-query-result-rule": "Regel voor queryresultaat wijzigen",
+      "edit-template-variable-rule": "Regel voor sjabloonvariabele wijzigen",
+      "edit-time-range-rule": "Regel voor tijdsbereik wijzigen",
       "move": "{{typeName}} verplaatsen ",
       "panel-background": "Paneelachtergrond wijzigen",
       "panel-description": "Paneelbeschrijving wijzigen",
@@ -4661,7 +4661,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Dashboard",
-        "element": "",
+        "element": "Element",
         "local-variable": "Lokale variabele",
         "multiple-elements": "Meerdere elementen",
         "multiple-elements-delete-text": "Weet je zeker dat je deze elementen wilt verwijderen?",
@@ -4743,10 +4743,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Dashboard exporteren"
       },
       "menu": {
-        "label": ""
+        "label": "Dashboardmenu exporteren"
       }
     },
     "fetch-dashboard": {
@@ -4768,9 +4768,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Standaard",
+          "shared-crosshair": "Gedeeld richtkruis",
+          "shared-tooltip": "Gedeelde tooltip"
         }
       }
     },
@@ -4823,14 +4823,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Stuur geen annotatiegegevens naar de volgende panelen",
+        "annotation-panels-support-annotations": "Stuur de annotatiegegevens naar alle panelen die annotaties ondersteunen",
+        "annotations-explicitly-listed-panels": "Stuur de annotaties naar de expliciet vermelde panelen"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Alle panelen",
+        "all-panels-except": "Alle panelen behalve",
+        "selected-panels": "Geselecteerde panelen"
       }
     },
     "get-panel-frame-category": {
@@ -5092,7 +5092,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Weet je zeker dat je het dashboard naar versie {{version}} wilt herstellen? Alle niet opgeslagen wijzigingen zullen verloren gaan.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Herstellen naar versie {{version}}",
       "title-restore-version": "Versie herstellen"
     },
     "row-options-button": {
@@ -5144,7 +5144,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Dashboard opgeslagen"
     },
     "save-dashboard-as-button": {
       "save-as": "Opslaan als"
@@ -5180,7 +5180,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Er bestaat al een dashboard met dezelfde naam in de geselecteerde map.<1></1><2>Wil je dit dashboard nog steeds opslaan?</2>",
       "body-version-mismatch": "Iemand anders heeft dit dashboard bijgewerkt<1></1><2>Wil je dit dashboard nog steeds opslaan?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Opslaan en overschrijven",
       "title-name-exists": "Conflict",
       "title-version-mismatch": "Conflict"
     },
@@ -5377,9 +5377,9 @@
       "label-apply-transformation-to": "Transformatie toepassen op"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Let op: het verwijderen van één transformatie kan invloed hebben op andere. Als er maar één transformatie is, keer je terug naar het hoofdselectiescherm.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Verwijderen",
         "title-debug": "Fouten opsporen",
         "title-disable-transformation": "Transformatie uitschakelen",
         "title-filter": "Filter",
@@ -5400,16 +5400,16 @@
       "placeholder-search-for-transformation": "Transformatie zoeken",
       "show-images": "Afbeeldingen weergeven",
       "title-add-another-transformation": "Nog een transformatie toevoegen",
-      "view-all": ""
+      "view-all": "Alles bekijken"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Door alle transformaties te verwijderen, ga je terug naar het hoofdselectiescherm."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Nog een transformatie toevoegen"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Alles verwijderen",
       "delete-all-transformations": "Alle transformaties verwijderen",
       "title-delete-all-transformations": "Alle transformaties verwijderen?",
       "tooltip-clear-search": "Zoekopdracht wissen",
@@ -5439,16 +5439,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Variabelebeschrijving wijzigen"
       },
       "hide": {
-        "action": ""
+        "action": "Optie variabele verbergen wijzigen"
       },
       "label": {
-        "action": ""
+        "action": "Label variabele wijzigen"
       },
       "name": {
-        "action": ""
+        "action": "Naam variabele wijzigen"
       }
     },
     "version-history-comparison": {
@@ -5460,7 +5460,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Selectie van versie {{version}} in-/uitschakelen",
       "date": "Datum",
-      "name-latest": "",
+      "name-latest": "Nieuwste",
       "notes": "Opmerkingen",
       "restore": "Herstellen",
       "updated-by": "Bijgewerkt door",
@@ -5538,7 +5538,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Geef afmetingen op als csv: {{name}}, {{value}}",
       "label-data-source": "Gegevensbron",
       "label-use-static-key-dimensions": "Gebruik statische sleutelafmetingen",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Aangepaste waarden toestaan"
     },
     "add-to-dashboard": {
       "message": {
@@ -5612,7 +5612,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Openbare URL intrekken"
       },
       "title": {
         "revoke-public-url": "Openbare URL intrekken"
@@ -5625,7 +5625,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Aangepaste opties",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Waarden gescheiden door komma",
       "selection-options": "Selectiemogelijkheden"
     },
     "dashboard-edit-pane-renderer": {
@@ -5646,8 +5646,8 @@
       "label-with-tags": "Met labels",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Dashboards",
+          "link": "Koppelen"
         }
       },
       "placeholder-open-dashboard": "Dashboard openen"
@@ -5690,8 +5690,8 @@
       "data-source-options": "Opties voor gegevensbronnen",
       "description-instance-name-filter": "Regex-filter voor welke gegevensbroninstanties uit de lijst met variabele waarden moet worden gekozen. Laat leeg voor alles.",
       "example-instance-name-filter": "Voorbeeld: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Instantienaamfilter",
+      "name-type": "Type",
       "selection-options": "Selectiemogelijkheden"
     },
     "default-grid-layout-manager": {
@@ -5707,7 +5707,7 @@
       "delete-action": "Dashboard verwijderen",
       "deleting": "Bezig met verwijderen ...",
       "drawer-title": "Kan provisioned dashboard niet verwijderen",
-      "success-message": ""
+      "success-message": "Dashboard is verwijderd"
     },
     "description-label": {
       "description": "Beschrijving"
@@ -5736,15 +5736,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Bewerkbaar",
+          "readonly": "Alleen-lezen"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Standaard",
+          "shared-crosshair": "Gedeeld richtkruis",
+          "shared-tooltip": "Gedeelde tooltip"
         }
       }
     },
@@ -5756,36 +5756,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Voeg direct sleutel-/waardefilters toe",
+        "dynamically-switch-source-multiple-panels": "Schakel dynamisch tussen gegevensbronnen voor meerdere panelen",
+        "group": "Voeg direct sleutels toe om te groeperen",
+        "hidden-constant-variable": "Een verborgen constante variabele, handig voor metrische voorvoegsels in dashboards die je wilt delen",
+        "users-enter-arbitrary-strings-textbox": "Gebruikers kunnen willekeurige strings invoeren in een tekstvak",
+        "values-are-static-and-defined-manually": "Waarden zijn statisch en handmatig gedefinieerd",
+        "values-fetched-source-query": "Waarden worden opgehaald uit een gegevensbronquery",
+        "values-timespans": "Waarden zijn tijdsperioden, bijv. 1 min, 1 u, 1 d"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Ad-hocfilters",
+        "constant": "Constant",
+        "custom": "Aangepast",
+        "data-source": "Gegevensbron",
+        "group-by": "Groeperen op",
+        "interval": "Interval",
+        "query": "Query",
+        "textbox": "Tekstvak"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Stuur geen annotatiegegevens naar de volgende panelen",
+        "annotation-panels-support-annotations": "Stuur de annotatiegegevens naar alle panelen die annotaties ondersteunen",
+        "annotations-explicitly-listed-panels": "Stuur de annotaties naar de expliciet vermelde panelen"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Alle panelen",
+        "all-panels-except": "Alle panelen behalve",
+        "selected-panels": "Geselecteerde panelen"
       }
     },
     "get-panel-frame-options": {
@@ -5813,7 +5813,7 @@
       "group-by-options": "Groeperen op opties",
       "label-data-source": "Gegevensbron",
       "label-use-static-group-by-dimensions": "Gebruik statische groepsafmetingen",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Aangepaste waarden toestaan"
     },
     "help-wizard": {
       "copy-to-clipboard": "Kopiëren naar klembord",
@@ -5849,14 +5849,14 @@
       "apply": "Toepassen"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Berekent het interval dynamisch door het tijdsbereik te delen door het opgegeven aantal",
       "description-calculated-value-below-threshold": "De berekende waarde zal niet onder deze drempelwaarde komen",
       "description-step-count": "Hoe vaak het huidige tijdbereik moet worden verdeeld om de waarde te berekenen",
       "interval-options": "Opties voor intervallen",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Automatische optie",
+      "name-min-interval": "Min. interval",
+      "name-step-count": "Stappentelling",
+      "name-values": "Waarden"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5877,19 +5877,19 @@
       "usage-count_other": "Gebruikt op {{count}} dashboards"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Fout bij verplaatsen van dashboard",
+      "api-error": "Kan dashboard niet verplaatsen",
+      "cancel-action": "Annuleren",
+      "current-file-not-found": "Huidig dashboardbestand kon niet worden gevonden",
+      "drawer-title": "Geprovisioneerd dashboard",
+      "file-load-error": "Er is een fout opgetreden bij het laden van het dashboard",
+      "loading-file-data": "Dashboarddata laden...",
+      "move-action": "Dashboard verplaatsen",
+      "move-read-only-message": "Dit dashboard kan niet rechtstreeks uit Grafana worden verplaatst omdat de repository alleen-lezen is. Verplaats het bestand in je Git-repository om dit dashboard te verplaatsen.",
+      "moving": "Bezig met verplaatsen...",
+      "success-message": "Dashboard is verplaatst",
+      "target-path-label": "Doelpad",
+      "title-this-repository-is-read-only": "Deze repository is alleen-lezen"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Er bestaat al een dashboard met dezelfde naam in de geselecteerde map. Wil je dit dashboard nog steeds opslaan?",
@@ -5897,7 +5897,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Doorgaan"
       },
       "title": {
         "proceed-to-external-site": "Doorgaan naar externe site?"
@@ -5934,8 +5934,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Nog een transformatie toevoegen",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Door alle transformaties te verwijderen, ga je terug naar het hoofdselectiescherm.",
+      "confirmText-delete-all": "Alles verwijderen",
       "delete-all-transformations": "Alle transformaties verwijderen",
       "title-delete-all-transformations": "Alle transformaties verwijderen?"
     },
@@ -5988,13 +5988,13 @@
       "description-examples": "Benoemde opnamegroepen kunnen worden gebruikt om de weergavetekst en -waarde te scheiden (<1>zie voorbeelden</1>).",
       "description-optional": "Optioneel, als je een deel van een serienaam of metrisch knooppuntsegment wilt extraheren.",
       "label-data-source": "Gegevensbron",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Statische opties sorteren",
       "label-target-data-source": "Doelgegevensbron",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Statische opties gebruiken",
+      "name-regex": "Regex",
       "query-options": "Opties voor query's",
       "selection-options": "Selectiemogelijkheden",
-      "static-options-legend": ""
+      "static-options-legend": "Statische opties"
     },
     "resource-export": {
       "label": {
@@ -6007,7 +6007,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Weet je zeker dat je het dashboard naar versie {{version}} wilt herstellen? Alle niet opgeslagen wijzigingen zullen verloren gaan.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Herstellen naar versie {{version}}",
       "title-restore-version": "Versie herstellen"
     },
     "save-button": {
@@ -6026,7 +6026,7 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Kan dashboard niet opslaan"
       },
-      "required": ""
+      "required": "Vereist"
     },
     "save-dashboard-drawer": {
       "tabs": {
@@ -6053,8 +6053,8 @@
         "title-someone-else-has-updated-this-dashboard": "Iemand anders heeft dit dashboard bijgewerkt",
         "would-still-dashboard": "Wil je dit dashboard nog steeds opslaan?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "Vanwege beperkingen in het nieuwe dashboardschema (V2) worden bibliotheekpanelen tijdens externe export geconverteerd naar reguliere panelen met ingesloten inhoud.",
+      "schema-v2-library-panels-export-title": "Bibliotheekpanelen worden omgezet naar reguliere panelen",
       "title-dashboard-drastically-changed": "Dashboard onomkeerbaar gewijzigd"
     },
     "save-dashboard-form-common-options": {
@@ -6101,10 +6101,10 @@
       "description-enables-multiple-values-selected": "Maakt het mogelijk om meerdere waarden tegelijkertijd te selecteren",
       "description-enables-option-include-variables": "Schakelt een optie in om alle waarden op te nemen",
       "description-enables-users-custom-values": "Stelt gebruikers in staat om aangepaste waarden aan de lijst toe te voegen",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Aangepaste waarden toestaan",
+      "name-custom-all-value": "Alle aangepaste waarde",
+      "name-include-all-option": "Optie Alles opnemen",
+      "name-multi-value": "Meerdere waarden"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Menu delen in-/uitschakelen"
@@ -6125,7 +6125,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Standaardwaarde"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(optioneel)",
@@ -6150,8 +6150,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Als je dit paneel ontkoppelt, kun je het bewerken zonder andere dashboards te beïnvloeden. Zodra je echter een wijziging aanbrengt, kun je niet meer terugkeren naar het oorspronkelijke herbruikbare paneel.",
+      "confirmText-yes-unlink": "Ja, ontkoppelen",
       "title-really-unlink-panel": "Wil je dit paneel echt ontkoppelen?"
     },
     "unsaved-changes-modal": {
@@ -6169,7 +6169,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Dashboard opgeslagen"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Er wordt door geen enkele variabele of dashboard naar deze variabele verwezen.",
@@ -6181,15 +6181,15 @@
       "aria-label-variable-editor-form": "Formulier variabele bewerker",
       "back-to-list": "Terug naar lijst",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Variabele verwijderen"
       },
       "delete": "Verwijderen",
       "description-optional-display-name": "Optionele weergavenaam",
       "description-template-variable-characters": "De naam van de sjabloonvariabele. (Max. 50 tekens)",
       "general": "Algemeen",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Beschrijving",
+      "name-label": "Label",
+      "name-name": "Naam",
       "placeholder-descriptive-text": "Omschrijving",
       "placeholder-label-name": "Labelnaam",
       "placeholder-variable-name": "Naam variabele",
@@ -6204,8 +6204,8 @@
       "variable": "Variabele"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Weet je zeker dat je {{variable}} wilt verwijderen?",
+      "confirmText-delete-variable": "Variabele verwijderen",
       "title-delete-variable": "Variabele verwijderen",
       "tooltip-duplicate-variable": "Variabele dupliceren",
       "tooltip-remove-variable": "Variabele verwijderen"
@@ -6213,15 +6213,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Label",
+          "nothing": "Niets",
+          "variable": "Variabele"
         }
       },
       "label": "Verbergen"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Type variabele"
     },
     "variable-usages-button": {
       "title-show-usages": "Gebruik weergeven voor: {{variableId}}",
@@ -6249,7 +6249,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Selectie van versie {{version}} in-/uitschakelen",
       "date": "Datum",
-      "name-latest": "",
+      "name-latest": "Nieuwste",
       "notes": "Opmerkingen",
       "restore": "Herstellen",
       "updated-by": "Bijgewerkt door",
@@ -6640,7 +6640,7 @@
     },
     "color-dimension-editor": {
       "label-fixed-color": "Vaste kleur",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Geen velden gevonden"
     },
     "file-dropzone-custom-children": {
       "upload": "Uploaden"
@@ -6679,7 +6679,7 @@
       },
       "label-limit": "Limiet",
       "label-value": "Waarde",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Geen velden gevonden",
       "scalar-options": {
         "description-clamped": "Gebruik veldwaarden, vastgeklemd op max en min",
         "description-mod": "Gebruik veldwaarden, mod van max",
@@ -6690,13 +6690,13 @@
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Vaste waarde"
         }
       },
       "label-max": "Max.",
       "label-min": "Min.",
       "label-value": "Waarde",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Geen velden gevonden"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
@@ -6806,6 +6806,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Evenementen",
@@ -7078,7 +7079,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Laden..."
     },
     "prev": "Vorige",
     "queryless-apps-extensions": {
@@ -7265,7 +7266,7 @@
           "start-time": "Starttijd:"
         }
       },
-      "share-span": "",
+      "share-span": "Delen",
       "warnings": "Waarschuwingen"
     },
     "span-filters": {
@@ -7275,8 +7276,8 @@
       "aria-label-select-service-name-operator": "Servicenaam operator selecteren",
       "aria-label-select-span-name": "Selecteer een spannaam",
       "aria-label-select-span-name-operator": " Operator voor een spannaam selecteren",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Selecteer een maximale spanduur",
+      "ariaLabel-select-min-span-duration": "Selecteer een minimale spanduur",
       "label-collapse": "Spanfilters",
       "label-duration": "Duur",
       "label-service-name": "Servicenaam",
@@ -7348,23 +7349,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Duur",
+      "export-started": "Exporteren gestart",
+      "give-feedback": "Feedback",
+      "link-copied": "Link gekopieerd naar het klembord",
+      "path": "Path",
+      "route": "Route",
+      "services": "Diensten",
+      "share": "Delen",
+      "share-copy-link": "Link kopiëren",
+      "share-export-json": "Exporteren als JSON",
+      "share-tooltip": "Spoor delen",
+      "start-time": "Begintijd",
+      "target": "Doel",
+      "title-share-thoughts-about-tracing-grafana": "Deel je mening over tracing in Grafana.",
+      "tooltip-url": "{{route}} of {{url}} of {{target}} of {{path}}",
+      "trace-id": "Tracering-id",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Knop Filters wissen",
@@ -7464,7 +7465,7 @@
       "when": "WANNEER"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Voer SQL in MySQL-dialect uit op de tabellen die zijn opgehaald uit je gegevensbronnen. Query’s uit gegevensbronnen (zoals \"A\", \"B\") zijn beschikbaar als tabellen en kunnen worden aangeroepen via de querynaam. Velden zijn beschikbaar als kolommen, zoals geretourneerd door de gegevensbron.",
       "label-operation": "Werking"
     },
     "math": {
@@ -7495,7 +7496,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Mappen wissen",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Geen mappen gevonden",
     "select-aria-label": "Mapfilter",
     "select-placeholder": "Filteren op map"
   },
@@ -7569,51 +7570,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Geografische index niet gevonden",
+      "warning-no-geometry": "kan geometrie niet vinden",
+      "warning-select-geohash": "Geohash-veld selecteren",
+      "warning-select-lat-long": "Selecteer breedte-/lengtegraadvelden",
+      "warning-select-lookup": "Selecteer opzoekveld",
+      "warning-unable-to-find": "Kan locatievelden niet vinden"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Geen stringvelden gevonden"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Geen numerieke velden gevonden"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Geen numerieke velden gevonden"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Geen stringvelden gevonden"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Geografische index",
+      "name-geohash-field": "Geohash-veld",
+      "name-latitude-field": "Breedtegraadveld",
+      "name-location-mode": "Locatiemodus",
+      "name-longitude-field": "Lengtegraadveld",
+      "name-lookup-field": "Opzoekveld"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Identificeer automatisch locatiegegevens op basis van standaard veldnamen",
+        "description-coords": "Geef breedte- en lengtegraadvelden op",
+        "description-geohash": "Geohash-veld opgeven",
+        "description-lookup": "Geografische index en opzoekveld opgeven",
+        "label-auto": "Automatisch",
+        "label-coords": "Coördinaten",
+        "label-geohash": "Geohash",
+        "label-lookup": "Opzoeken"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Basiskaartlaag",
+    "category-map-controls": "Kaartbesturingselementen",
+    "category-map-layers": "Kaartlagen",
+    "category-map-view": "Kaartweergave",
     "coordinates-map-view-editor": {
       "label-latitude": "Breedtegraad",
       "label-longitude": "Lengtegraad"
@@ -7622,15 +7623,15 @@
       "center": "Midden:",
       "zoom": "Zoom:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Deze locatie wordt weergegeven wanneer het paneel voor het eerst wordt geladen.",
+    "description-mouse-wheel-zoom": "Zoombesturing via muiswiel inschakelen",
+    "description-no-repeat": "Voorkom dat de kaart horizontaal wordt herhaald",
+    "description-share-view": "Gebruik dezelfde weergave op meerdere panelen.  Let op: Hiervoor moet het dashboard mogelijk opnieuw worden geladen.",
+    "description-show-attribution": "De kaartbrontoewijzingsinformatie rechtsonder weergeven",
+    "description-show-debug": "Kaartinformatie weergeven",
+    "description-show-measure": "Tools voor het maken van metingen op de kaart weergeven",
+    "description-show-scale": "Kaartschaal aangeven",
+    "description-show-zoom": "Zoomknoppen in de linkerbovenhoek weergeven",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Laag"
@@ -7654,12 +7655,12 @@
       "aria-label-add-geomap-style-rule": "Geomap-stijlregel toevoegen"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Achtergrondlaag",
+      "description-display-tooltip": "Tooltip voor laag weergeven",
+      "name-data": "Gegevens",
+      "name-display-tooltip": "Tooltip weergeven",
+      "name-layer-type": "Laagtype",
+      "name-opacity": "Transparantie"
     },
     "layers-editor": {
       "label-add-layer": "Laag toevoegen",
@@ -7672,9 +7673,9 @@
       "use-current-map-settings": "Huidige kaartinstellingen gebruiken"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Kaartlegenda weergeven",
+      "name-show-legend": "Legenda weergeven",
+      "name-styles": "Stijlen"
     },
     "markers-legend": {
       "title-symbol": "Symbool"
@@ -7683,27 +7684,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Meetinstrumenten weergeven"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Beginweergave",
+    "name-mouse-wheel-zoom": "Muiswielzoom",
+    "name-no-repeat": "Geen kaart herhalen",
+    "name-share-view": "Weergave delen",
+    "name-show-attribution": "Toewijzing weergeven",
+    "name-show-debug": "Debuggen weergeven",
+    "name-show-measure": "Meetinstrumenten weergeven",
+    "name-show-scale": "Toon schaal",
+    "name-show-zoom": "Zoomknop weergeven",
+    "name-tooltip": "Tooltip",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Geen stringvelden gevonden"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "De basiskaartlaag wordt geconfigureerd door de serverbeheerder."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Midden",
+        "label-left": "Links",
+        "label-right": "Rechts"
       },
       "label-align": "Uitlijning",
       "label-baseline": "Uitgangswaarde",
@@ -7719,12 +7720,12 @@
       "label-text-label": "Labeltekst",
       "label-x-offset": "X offset",
       "label-y-offset": "Y offset",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Selecteer een symbool",
+      "placeholderText-select-symbol-or-add-text": "Selecteer een symbool of voeg een tekstlabel toe",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Onderaan",
+        "label-center": "Midden",
+        "label-top": "Boven"
       }
     },
     "style-rule-editor": {
@@ -7738,13 +7739,13 @@
       "placeholder-value": "waarde"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Pop-up tonen bij hoveren",
+      "description-none": "Inhoud weergeven bij klikken, niet bij hoveren",
+      "label-details": "Details",
+      "label-none": "Geen"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Laag {{name}}"
     }
   },
   "get-enterprise": {
@@ -7864,400 +7865,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Voet/sec²",
+            "name-g-unit": "G-eenheid",
+            "name-meters-sec": "Meter/sec²"
           },
-          "name": ""
+          "name": "Versnelling"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Boogminuten",
+            "name-arc-seconds": "Boogseconden",
+            "name-degrees": "Graden (°)",
+            "name-gradian": "Gradiaan",
+            "name-radians": "Radialen"
           },
-          "name": ""
+          "name": "Hoek"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Acres (ac)",
+            "name-hectares": "Hectare (ha)",
+            "name-square-feet": "Vierkante voet (ft²)",
+            "name-square-meters": "Vierkante meter (m²)",
+            "name-square-miles": "Vierkante mijl (mi²)"
           },
-          "name": ""
+          "name": "Omgeving"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Aan / Uit",
+            "name-true-false": "Waar/Onwaar",
+            "name-yes-no": "Ja / Nee"
           },
-          "name": ""
+          "name": "Boolean"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "Berekening"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "gram per kubieke meter (g/m³)",
+            "name-g-nm3": "gram per normale kubieke meter (g/Nm³)",
+            "name-mg-dl": "milligram per deciliter (mg/dl)",
+            "name-mg-m3": "milligram per kubieke meter (mg/m³)",
+            "name-mg-nm3": "milligram per normale kubieke meter (mg/Nm³)",
+            "name-mmol-l": "millimol per liter (mmol/l)",
+            "name-ng-m3": "nanogram per kubieke meter (ng/m³)",
+            "name-ng-nm3": "nanogram per normale kubieke meter (ng/Nm³)",
+            "name-ppb": "delen per miljard (ppb)",
+            "name-ppm": "delen per miljoen (PPM)",
+            "name-ug-m3": "microgram per kubieke meter (μg/m³)",
+            "name-ug-nm3": "microgram per normale kubieke meter (μg/Nm³)"
           },
-          "name": ""
+          "name": "Concentratie"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Bulgaarse lev (BGN)",
+            "name-brl": "Real (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "Zwitserse frank (CHF)",
+            "name-czk": "Tsjechische kroon (CZK)",
+            "name-dkk": "Deense kroon (kr)",
+            "name-eur": "Euro (€)",
+            "name-gbp": "Pond (£)",
+            "name-idr": "Indonesische roepia (Rp)",
+            "name-ils": "Israëlische nieuwe shekel (₪)",
+            "name-inr": "Indiase roepie (₹)",
+            "name-isk": "IJslandse kroon (kr)",
+            "name-jpy": "Yen (¥)",
+            "name-krw": "Zuid-Koreaanse won (₩)",
+            "name-mbtc": "Milli Bitcoin (฿)",
+            "name-myr": "Maleisische ringgit (RM)",
+            "name-nok": "Noorse kroon (kr)",
+            "name-php": "Filipijnse peso (PHP)",
+            "name-pln": "Poolse złoty (PLN)",
+            "name-pyg": "Guaraní (₲)",
+            "name-rub": "Roebels (₽)",
+            "name-sek": "Zweedse kroon (kr)",
+            "name-try": "Turkse lira (₺)",
+            "name-uah": "Hryvnias (₴)",
+            "name-ubtc": "Micro Bitcoin (฿)",
+            "name-usd": "Dollar ($)",
+            "name-uyu": "Uruguayaanse peso (UYU)",
+            "name-vnd": "Vietnamese dong (VND)",
+            "name-xpf": "CFP-frank (XPF)",
+            "name-zar": "Zuid Afrikaanse rand (R)"
           },
-          "name": ""
+          "name": "Valuta"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bits(IEC)",
+            "name-bits-si": "bits(SI)",
+            "name-bytes-iec": "bytes(IEC)",
+            "name-bytes-si": "bytes(SI)",
+            "name-gibibytes": "gibibytes",
+            "name-gigabytes": "gigabytes",
+            "name-kibibytes": "kibibytes",
+            "name-kilobytes": "kilobytes",
+            "name-mebibytes": "mebibytes",
+            "name-megabytes": "Megabytes",
+            "name-pebibytes": "pebibytes",
+            "name-petabytes": "petabytes",
+            "name-tebibytes": "tebibytes",
+            "name-terabytes": "terabytes"
           },
-          "name": ""
+          "name": "Gegevens"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bits/sec(IEC)",
+            "name-bits-sec-si": "bits/sec(SI)",
+            "name-bytes-sec-iec": "bytes/sec(IEC)",
+            "name-bytes-sec-si": "bytes/sec(SI)",
+            "name-gibibits-sec": "gibibits/sec",
+            "name-gibibytes-sec": "gibibytes/sec",
+            "name-gigabits-sec": "gigabits/sec",
+            "name-gigabytes-sec": "gigabytes/sec",
+            "name-kibibits-sec": "kibibits/sec",
+            "name-kibibytes-sec": "kibibytes/sec",
+            "name-kilobits-sec": "kilobits/sec",
+            "name-kilobytes-sec": "kilobytes/sec",
+            "name-mebibits-sec": "mebibits/sec",
+            "name-mebibytes-sec": "mebibytes/sec",
+            "name-megabits-sec": "megabits/sec",
+            "name-megabytes-sec": "megabytes/sec",
+            "name-packets-sec": "pakketten/sec",
+            "name-pebibits-sec": "pebibits/sec",
+            "name-pebibytes-sec": "pebibytes/sec",
+            "name-petabits-sec": "petabits/sec",
+            "name-petabytes-sec": "petabytes/sec",
+            "name-tebibits-sec": "tebibits/sec",
+            "name-tebibytes-sec": "tebibytes/sec",
+            "name-terabits-sec": "terabits/sec",
+            "name-terabytes-sec": "terabytes/sec"
           },
-          "name": ""
+          "name": "Datasnelheid"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Datum/tijd standaard",
+            "name-datetime-iso": "Datum/tijd ISO",
+            "name-datetime-iso-no-date": "Datum/tijd ISO (geen datum indien vandaag)",
+            "name-datetime-local": "Datum/tijd lokaal",
+            "name-datetime-local-no-date": "Datum/tijd lokaal (geen datum indien vandaag)",
+            "name-datetime-us": "Datum/tijd VS",
+            "name-datetime-us-no-date": "Datum/tijd VS (geen datum indien vandaag)",
+            "name-from-now": "Vanaf nu"
           },
-          "name": ""
+          "name": "Datum en tijd"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Ampère (A)",
+            "name-ampere-hour": "Ampère-uur (Ah)",
+            "name-decibel-milliwatt": "Decibel-milliwatt (dBm)",
+            "name-electron-volt": "Elektronvolt (eV)",
+            "name-farad": "Farad (F)",
+            "name-femtofarad": "Femtofarad (fF)",
+            "name-gigawatt": "Gigawatt (GW)",
+            "name-henry": "Henry (H)",
+            "name-joule": "Joule (J)",
+            "name-kiloampere": "Kiloampère (kA)",
+            "name-kiloampere-hour": "Kiloampère-uur (kAh)",
+            "name-kiloohm": "Kiloohm (kΩ)",
+            "name-kilovolt": "Kilovolt (kV)",
+            "name-kilovolt-ampere": "Kilovolt-Ampère (kVA)",
+            "name-kilovolt-ampere-reactive": "Kilovolt-Ampère reactief (kVAr)",
+            "name-kilowatt": "Kilowatt (kW)",
+            "name-kilowatt-hour": "Kilowattuur (kWh)",
+            "name-kilowatt-min": "Kilowatt-min (kWm)",
+            "name-lumens": "Lumen (Lm)",
+            "name-megaohm": "Megaohm (MΩ)",
+            "name-megawatt": "Megawatt (MW)",
+            "name-megawatt-hour": "Megawattuur (MWh)",
+            "name-microfarad": "Microfarad (µF)",
+            "name-microhenry": "Microhenry (µH)",
+            "name-milliampere": "Milliampère (mA)",
+            "name-milliampere-hour": "Milliampère-uur (mAh)",
+            "name-millihenry": "Millihenry (mH)",
+            "name-milliohm": "Milliohm (mΩ)",
+            "name-millivolt": "Millivolt (mV)",
+            "name-milliwatt": "Milliwatt (mW)",
+            "name-nanofarad": "Nanofarad (nF)",
+            "name-ohm": "Ohm (Ω)",
+            "name-picofarad": "Picofarad (pF)",
+            "name-volt": "Volt (V)",
+            "name-volt-ampere": "Volt-Ampère (VA)",
+            "name-volt-ampere-reactive": "Volt-Ampère reactief (VAr)",
+            "name-watt": "Watt (W)",
+            "name-watt-hour": "Wattuur (Wh)",
+            "name-watt-hour-per-kg": "Wattuur per kilogram (Wh/kg)",
+            "name-watt-square-meter": "Watt per vierkante meter (W/m²)"
           },
-          "name": ""
+          "name": "Energie"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Kubieke voet/min (cfm)",
+            "name-cubic-feet-sec": "Kubieke voet/sec (cfs)",
+            "name-cubic-meters-sec": "Kubieke meter/sec (cms)",
+            "name-gallons-min": "Gallons/min (gpm)",
+            "name-litre-hour": "Liter/uur",
+            "name-litre-min": "Liter/min (L/min)",
+            "name-lux": "Lux (lx)",
+            "name-millilitre-min": "milliliter/min (mL/min)"
           },
-          "name": ""
+          "name": "Flow"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Kilonewton-meters (kNm)",
+            "name-kilonewtons": "Kilonewtons (kN)",
+            "name-newton-meters": "Newtonmeter (Nm)",
+            "name-newtons": "Newton (N)"
           },
-          "name": ""
+          "name": "Kracht"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "exahashes/sec",
+            "name-gigahashes-sec": "gigahashes/sec",
+            "name-hashes-sec": "hashes/sec",
+            "name-kilohashes-sec": "kilohashes/sec",
+            "name-megahashes-sec": "megahashes/sec",
+            "name-petahashes-sec": "petahashes/sec",
+            "name-terahashes-sec": "terahashes/sec"
           },
-          "name": ""
+          "name": "Hash-snelheid"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "voet (ft)",
+            "name-inch": "inch (in)",
+            "name-kilometer": "kilometer (km)",
+            "name-meter": "meter (m)",
+            "name-mile": "mijl (mi)",
+            "name-millimeter": "millimeter (mm)"
           },
-          "name": ""
+          "name": "Lengte"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "gram (g)",
+            "name-kilogram": "kilogram (kg)",
+            "name-metric-ton": "metrische ton (t)",
+            "name-milligram": "milligram (mg)",
+            "name-pound": "pond (lb)"
           },
-          "name": ""
+          "name": "Gewicht"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Candela (cd)",
+            "name-decibel": "Decibel",
+            "name-hexadecimal": "Hexadecimaal",
+            "name-hexadecimal-0x": "Hexadecimaal (0x)",
+            "name-humidity": "Vochtigheid (%H)",
+            "name-locale": "Lokale opmaak",
+            "name-number": "Nummer",
+            "name-percent-1": "Procent (0,0-1,0)",
+            "name-percent-100": "Procent (0-100)",
+            "name-pixels": "Pixels",
+            "name-scientific": "Wetenschappelijke notatie",
+            "name-short": "kort",
+            "name-si-short": "SI kort",
+            "name-string": "Snaar"
           },
-          "name": ""
+          "name": "Divers"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Staven",
+            "name-hectopascals": "Hectopascal",
+            "name-inches-mercury": "Inches of kwik",
+            "name-kilobars": "Kilobar",
+            "name-kilopascals": "Kilopascal",
+            "name-millibars": "Millibar",
+            "name-pascals": "Pascal",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Druk"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Becquerel (Bq)",
+            "name-curie": "curie (Ci)",
+            "name-exposure": "Blootstelling (C/kg)",
+            "name-gray": "Gray (Gy)",
+            "name-microsievert": "microSievert (µSv)",
+            "name-microsievert-hour": "microSievert/uur (µSv/u)",
+            "name-millisievert": "milliSievert (mSv)",
+            "name-millisievert-hour": "milliSievert/uur (mSv/u)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "roentgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/uur (Sv/u)"
           },
-          "name": ""
+          "name": "Straling"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Graden per seconde (°/s)",
+            "name-gigahertz": "Gigahertz (GHz)",
+            "name-hertz": "Hertz (Hz)",
+            "name-kilohertz": "Kilohertz (kHz)",
+            "name-megahertz": "Megahertz (MHz)",
+            "name-radians-sec": "Radiaal per seconde (rad/s)",
+            "name-rpm": "Omwentelingen per minuut (rpm)"
           },
-          "name": ""
+          "name": "Draaisnelheid"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsius (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Temperatuur"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "tellingen/min (cpm)",
+            "name-counts-sec": "tellingen/sec (cps)",
+            "name-events-min": "gebeurtenissen/min (epm)",
+            "name-events-sec": "gebeurtenissen/sec (eps)",
+            "name-io-ops-sec": "I/O ops/sec (iops)",
+            "name-messages-min": "berichten/min (mpm)",
+            "name-messages-sec": "berichten/sec (mps)",
+            "name-ops-min": "ops/min (opm)",
+            "name-ops-sec": "ops/sec (ops)",
+            "name-reads-min": "lezingen/min (rpm)",
+            "name-reads-sec": "lezingen/sec (rps)",
+            "name-records-min": "opnames/min (rpm)",
+            "name-records-sec": "opnames/sec (rps)",
+            "name-requests-min": "verzoeken/min (rpm)",
+            "name-requests-sec": "verzoeken/sec (rps)",
+            "name-rows-min": "rijen/min (rpm)",
+            "name-rows-sec": "rijen/sec (rps)",
+            "name-writes-min": "schrijven/min (wpm)",
+            "name-writes-sec": "schrijven/sec (wps)"
           },
-          "name": ""
+          "name": "Doorvoer "
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "klok (ms)",
+            "name-clock-s": "klok (s)",
+            "name-days": "dagen (d)",
+            "name-duration-dhms": "duur (d uu:mm:ss)",
+            "name-duration-hms": "duur (uu:mm:ss)",
+            "name-duration-ms": "duur (ms)",
+            "name-duration-s": "duur (s)",
+            "name-hertz": "Hertz (1/s)",
+            "name-hours": "uren (h)",
+            "name-microseconds": "microseconden (µs)",
+            "name-milliseconds": "milliseconden (ms)",
+            "name-minutes": "minuten (m)",
+            "name-nanoseconds": "nanoseconden (ns)",
+            "name-seconds": "seconden (s)",
+            "name-timeticks": "Timeticks (s/100)"
           },
-          "name": ""
+          "name": "Tijd"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "kilometer/uur (km/u)",
+            "name-knot": "knoop (kn)",
+            "name-meters-second": "meter per seconde (m/s):",
+            "name-miles-hour": "mijl/uur (mph)"
           },
-          "name": ""
+          "name": "Snelheid"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "kubieke decimeter",
+            "name-cubic-meter": "kubieke meter",
+            "name-gallons": "gallons",
+            "name-litre": "liter (l)",
+            "name-millilitre": "milliliter (ml)",
+            "name-normal-cubic-meter": "Normale kubieke meter"
           },
-          "name": ""
+          "name": "Volume"
         }
       }
     }
@@ -8386,7 +8387,7 @@
       "option": "optie"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Voorbeeld afbeelding openen"
     },
     "cascader": {
       "clear-button": "Selectie wissen"
@@ -8400,9 +8401,9 @@
       "aria-label-selected-color": "Kleur {{colorLabel}}"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Verwijderen",
       "cancel": "Annuleren",
-      "confirmText-delete": ""
+      "confirmText-delete": "Verwijderen"
     },
     "confirm-content": {
       "placeholder": "Type '{{confirmPromptText}}' om te bevestigen"
@@ -8507,56 +8508,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "April",
+        "label-august": "Augustus",
+        "label-december": "December",
+        "label-february": "Februari",
+        "label-january": "Januari",
+        "label-july": "Juli",
+        "label-june": "Juni",
+        "label-march": "Maart",
+        "label-may": "Mei",
+        "label-november": "November",
+        "label-october": "Oktober",
+        "label-september": "september"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Eergisteren",
+        "last-1-hour": "Afgelopen uur",
+        "last-1-year": "Afgelopen jaar",
+        "last-12-hours": "Afgelopen 12 uur",
+        "last-15-mins": "Afgelopen 15 minuten",
+        "last-2-days": "Afgelopen 2 dagen",
+        "last-2-years": "Afgelopen 2 jaar",
+        "last-24-hours": "Laatste 24 uur",
+        "last-3-hours": "Afgelopen 3 uur",
+        "last-30-days": "Afgelopen 30 dagen",
+        "last-30-mins": "Afgelopen 30 minuten",
+        "last-5-mins": "Afgelopen 5 minuten",
+        "last-5-years": "Afgelopen 5 jaar",
+        "last-6-hours": "Afgelopen 6 uur",
+        "last-6-months": "Afgelopen 6 maanden",
+        "last-7-days": "Afgelopen 7 dagen",
+        "last-90-days": "Afgelopen 90 dagen",
+        "previous-fiscal-quarter": "Vorig fiscaal kwartaal",
+        "previous-fiscal-year": "Vorig fiscaal jaar",
+        "previous-month": "Vorige maand",
+        "previous-week": "Vorige week",
+        "previous-year": "Vorig jaar",
+        "this-day-last-week": "Deze dag vorige week",
+        "this-fiscal-quarter": "Dit fiscaal kwartaal",
+        "this-fiscal-quarter-so-far": "Dit fiscaal kwartaal tot nu toe",
+        "this-fiscal-year": "Dit fiscale jaar",
+        "this-fiscal-year-so-far": "Dit fiscale jaar tot nu toe",
+        "this-month": "Deze maand",
+        "this-month-so-far": "Deze maand tot nu toe",
+        "this-week": "Deze week",
+        "this-week-so-far": "Deze week tot nu toe",
+        "this-year": "Dit jaar",
+        "this-year-so-far": "Dit jaar tot nu toe",
+        "today": "Vandaag",
+        "today-so-far": "Vandaag tot nu toe",
+        "yesterday": "Gisteren"
       }
     },
     "drawer": {
@@ -8607,18 +8608,18 @@
         "placeholder": "Veld selecteren"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Boolean",
+        "label-enum": "Enumeratie",
+        "label-number": "Nummer",
+        "label-other": "Overige",
+        "label-string": "Snaar",
+        "label-time": "Tijd",
+        "label-traces": "Sporen"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Frames ({{framesCount}}): {{framesNames}}",
+        "label": "Vraag: {{refId}}",
+        "label-missing-ref-id": "Vraag: (ontbrekende refId)"
       },
       "name-field-name-by-regex-matcher": "Velden met naam die overeenkomen met regex",
       "name-fields-by-query": "Velden opgehaald via de query",
@@ -8652,8 +8653,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "paneel in-/uitklappen",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Laadbalk van paneel",
+      "ariaLabel-panel-status": "Paneelstatus",
       "tooltip-cancel": "Query annuleren",
       "tooltip-cancel-loading": "Query annuleren",
       "tooltip-stop-streaming": "Streamen stoppen",
@@ -8722,12 +8723,12 @@
       "inspect-drawer-title": "Waarde inspecteren",
       "inspect-menu-label": "Waarde inspecteren",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Geen gegevens"
       },
       "no-values-label": "Geen waarden",
       "pagination-summary": "{{itemsRangeStart}} - {{displayedEnd}} van {{numRows}} rijen",
       "sparkline": {
-        "no-data": ""
+        "no-data": "geen gegevens"
       }
     },
     "tags": {
@@ -8735,7 +8736,7 @@
     },
     "tags-input": {
       "add": "Toevoegen",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Nieuw label (enter-toets om toe te voegen)",
       "remove": "Label verwijderen: {{name}}"
     },
     "time-sync-button": {
@@ -8828,14 +8829,14 @@
       "footer-add-annotation": "Annotatie toevoegen",
       "footer-click-to-action": "Klik om te {{actionTitle}}",
       "footer-click-to-navigate": "Klik om {{linkTitle}} te openen",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Filteren op '{{value}}'",
       "timestamp": "Tijdstempel"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Standaard",
+      "weekStarts-label-monday": "Maandag",
+      "weekStarts-label-saturday": "Zaterdag",
+      "weekStarts-label-sunday": "Zondag"
     }
   },
   "graph": {
@@ -9215,8 +9216,8 @@
       "title-create-library-panel": "Bibliotheekpaneel aanmaken"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Wijzigen",
+      "confirmText-replace": "Vervangen"
     },
     "confirm": {
       "delete-panel": "Wil je dit paneel verwijderen?"
@@ -9241,7 +9242,7 @@
       "usage-count_other": "Gebruikt op {{count}} dashboards"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Zoeken op naam, beschrijving of mapnaam"
     },
     "loading-indicator": {
       "loading-library-panel": "Bibliotheekpaneel laden..."
@@ -9451,7 +9452,7 @@
       "close": "Logboekdetails sluiten",
       "copy-shortlink": "Snelkoppeling kopiëren",
       "copy-to-clipboard": "Kopiëren naar klembord",
-      "displayed-fields-section": "",
+      "displayed-fields-section": "Weergegeven velden ordenen",
       "fields": {
         "adhoc-statistics": "Ad-hocstatistieken",
         "copy-value-to-clipboard": "Waarde naar klembord kopiëren",
@@ -9464,25 +9465,25 @@
       },
       "fields-section": "Velden",
       "hide-log-line": "Logregel verbergen",
-      "inline-mode": "",
+      "inline-mode": "Inline weergave",
       "links-section": "Links",
-      "log-line-field": "",
+      "log-line-field": "Logregel",
       "log-line-section": "Logregel",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
+      "move-displayed-field-down": "Naar beneden verplaatsen",
+      "move-displayed-field-up": "Naar boven verplaatsen",
       "no-details": "Weer te geven velden.",
-      "open-assistant": "",
+      "open-assistant": "Leg deze logregel uit in Assistent",
       "pin-line": "Logboek vastzetten",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "remove-displayed-field": "Veld verwijderen",
+      "remove-log": "Log verwijderen",
+      "scroll-to-logline": "Naar logregel scrollen",
       "search": {
         "no-results": "Geen resultaten om weer te geven."
       },
       "search-placeholder": "Zoekveldnamen en -waarden",
       "show-context": "Context tonen",
       "show-log-line": "Logregel weergeven",
-      "sidebar-mode": "",
+      "sidebar-mode": "Anker naar rechts",
       "unpin-line": "Log vastzetten ongedaan maken"
     },
     "log-line-menu": {
@@ -9490,9 +9491,9 @@
       "copy-log": "Logboekregel kopiëren",
       "hide-details": "Logboekdetails weergeven",
       "icon-label": "Logboekmenu",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Logregel",
+      "log-line-explainer": "Leg deze logregel op een beknopte manier uit",
+      "open-assistant": "Leg deze logregel uit in Assistent",
       "pin-to-outline": "Logboek vastzetten",
       "show-context": "Context tonen",
       "show-details": "Logboekdetails verbergen",
@@ -9598,10 +9599,10 @@
     },
     "name-common-labels": "Gemeenschappelijke labels",
     "name-deduplication": "Dedupliceren",
-    "name-details-mode": "",
+    "name-details-mode": "Paneelmodus logdetails",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "Inline",
+      "label-sidebar": "Sidebar"
     },
     "name-enable-infinite-scrolling": "Oneindig scrollen mogelijk maken",
     "name-enable-log-details": "Logboekdetails inschakelen",
@@ -9698,8 +9699,8 @@
       "updated-on": "Bijgewerkt op"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Weet je zeker dat je '{{snapshotToRemove}}' wilt verwijderen?",
+      "confirmText-delete": "Verwijderen",
       "title-delete": "Verwijderen"
     },
     "unthemed-dashboard-import": {
@@ -9711,14 +9712,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "Naam is vereist",
+      "message-reserved-name": "Dit is een gereserveerde naam en kan niet worden gebruikt voor een map.",
+      "message-same-name": "Er bestaat al een dashboard of een map met dezelfde naam",
+      "message-same-name-general": "Er bestaat al een map of dashboard in de algemene map met dezelfde naam"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Geen opties gevonden"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9868,8 +9869,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Maximale aantal waarschuwingsregelgroepen bereikt: verwijder enkele waarschuwingsregelgroepen of upgrade je abonnement en probeer het opnieuw.",
+        "alert-rules-quota-reached": "Maximale aantal waarschuwingsregels bereikt: verwijder enkele waarschuwingsregels of upgrade je abonnement en probeer het opnieuw.",
         "dashboard-already-managed": "Dashboard is al provisioned en beheerd door Grafana in de cloudinstantie. We raden je aan om voortaan het provisioned dashboard te gebruiken. Als je het dashboard nog steeds naar de cloud-instantie wilt kopiëren, wijzig dan het dashboard-ID in het dashboard-JSON, sla een nieuw snapshot op en upload opnieuw.",
         "datasource-already-managed": "Dashboard is al provisioned en beheerd door Grafana in de cloudinstantie. Als dit een andere bron is, stel dan een andere UID in en probeer het opnieuw.",
         "datasource-invalid-url": "Er is een gegevensbron met een ongeldige URL. Geef een geldige URL op en probeer het opnieuw.",
@@ -10339,7 +10340,7 @@
     "invite-user": {
       "invite-button": "Uitnodigen",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Gebruiker uitnodigen"
     },
     "item": {
       "add-bookmark": "Toevoegen aan bladwijzers",
@@ -10562,7 +10563,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Geen organisaties gevonden",
     "select-placeholder": "Organisatie selecteren"
   },
   "page": {
@@ -10785,7 +10786,7 @@
         "permission": "Je hebt geen toegangsrechten tot deze pagina.",
         "title-access-denied": "Toegang geweigerd"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "De plug-in kan niet worden geladen",
       "no-root-app-page-component-found": "Geen paginacomponent voor hoofdapp gevonden"
     },
     "browse": {
@@ -10829,7 +10830,7 @@
         "update-status-text": "plug-ins zijn bijgewerkt"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Weet je echt zeker dat je wilt downgraden naar versie {{version}}? Normaal gesproken zou je dit niet moeten doen",
         "downgrade-confirm": "Downgraden",
         "downgrade-title": "Plug-inversie downgraden"
       }
@@ -10884,8 +10885,8 @@
       "message": "Geen plug-ins gevonden"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Controleer de console voor meer informatie over de fout.",
+      "extension-error-alert-title": "De extensie kan niet worden geladen: '{{pluginId}}/{{extensionTitle}}'"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10922,8 +10923,8 @@
     "install-controls-button": {
       "title-uninstall-modal": "{{plugin}} verwijderen",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Weet je zeker dat je deze plugin wilt verwijderen?",
+        "confirmText-confirm": "Bevestigen"
       }
     },
     "install-controls-warning": {
@@ -10941,6 +10942,9 @@
       "label-plugin-id": "Plug-in-id",
       "label-severity": "Ernst"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Deze plug-in is niet gevonden. Controleer of de URL correct is of <1></1>ga naar de <3>plug-incatalogus</3>.",
       "title-plugin-not-found": "Plug-in niet gevonden"
@@ -11097,29 +11101,29 @@
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Deze bron bevindt zich achter de tak in {{repoType}}.",
+      "not-saved": "De rest van de Grafana-gebruikers in je organisatie ziet nog steeds de huidige versie die is opgeslagen in de geconfigureerde standaardtak totdat deze tak is samengevoegd",
+      "open-in-repo-button": "Openen in {{repoType}}",
+      "open-pull-request-in-repo": "Pull-verzoek openen in {{repoType}}",
+      "view-in-repo-button": "Bekijk het in {{repoType}} om de laatste wijzigingen te zien.",
+      "view-pull-request-in-repo": "Pull-verzoek bekijken in {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "Er is een nieuwe bron gemaakt in een tak in {{repoType}}.",
+    "title-loaded-pull-request-in-repo": "Deze bron wordt geladen vanuit de tak die je zojuist hebt gemaakt in {{repoType}} en is alleen zichtbaar voor jou"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Bron is opgeslagen",
+  "provisioned-resource-request-handler-dashboard": "Dashboard is opgeslagen",
+  "provisioned-resource-request-handler-folder": "Map is gemaakt",
   "provisioning": {
     "banner": {
       "message": "Er wordt momenteel actief gewerkt aan de ontwikkeling van deze functie. Voor de beste ervaring en de nieuwste verbeteringen raden we je aan om de <2>nachtelijke versie</2> van Grafana te gebruiken."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "De tak die moet worden gebruikt voor provisioning",
+      "branch-label": "Vestiging",
+      "branch-required": "Tak is vereist",
+      "path-description": "Optioneel pad naar submap in de repository",
+      "path-label": "Path",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11128,18 +11132,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Hiermee kunnen gebruikers kiezen of ze een pull-verzoek willen openen bij het opslaan van wijzigingen. Als de repository geen directe wijzigingen in de hoofdtak toestaat, kan er nog steeds een pull-verzoek nodig zijn.",
+      "pr-workflow-label": "De optie pull-verzoek inschakelen bij opslaan",
+      "token-description": "Bitbucket-appwachtwoord met repository-toestemmingen",
+      "token-label": "Wachtwoord voor de app",
+      "token-required": "Bitbucket-token is vereist",
+      "token-user-description": "De gebruikersnaam die zal worden gebruikt om toegang te krijgen tot de repository met het app-wachtwoord",
+      "token-user-label": "Gebruikersnaam",
+      "token-user-required": "Gebruikersnaam is vereist",
+      "url-description": "De Bitbucket-repository-URL",
+      "url-label": "Repository-URL",
+      "url-pattern": "Moet een geldige Bitbucket-repository-URL zijn",
+      "url-required": "Repository-URL is vereist"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Voeg een duidelijke naam toe voor deze repository-verbinding",
@@ -11150,12 +11154,12 @@
       "label-display-name": "Weergavenaam",
       "placeholder-my-repository-connection": "Mijn repository-verbinding",
       "text-loading-resource-information": "Broninformatie laden...",
-      "dashboards-count_one": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} dashboard",
+      "dashboards-count_other": "{{count}} dashboard",
       "files-count_one": "{{count}} bestanden",
       "files-count_other": "{{count}} bestanden",
-      "folders-count_one": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} map",
+      "folders-count_other": "{{count}} map"
     },
     "check-repository": {
       "check": "Controleer"
@@ -11229,7 +11233,7 @@
       "title-instant-updates-requests-webhooks": "Directe updates en pull requests met webhooks.",
       "title-visual-previews-in-pull-requests": "Visuele voorbeelden in pull requests met beeldweergave"
     },
-    "error-title-default": "",
+    "error-title-default": "Fout",
     "expanded-row": {
       "job-specification": "Taakbeschrijving",
       "summary": "Samenvatting"
@@ -11238,8 +11242,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Vereiste functieschakelaars instellen"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Beheer dashboards als code in GitHub en verstrek updates automatisch",
+      "manage-your-dashboards-with-remote-provisioning": "Aan de slag met Git-synchronisatie",
       "store-dashboards-in-version-controlled-storage": "Sla dashboards op in versiegecontroleerde opslag voor betere organisatie en het bijhouden van de geschiedenis"
     },
     "file-history-page": {
@@ -11260,16 +11264,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Voegt een afbeeldingsvoorbeeld toe van dashboardwijzigingen in pull requests. Afbeeldingen van je Grafana-dashboards worden gedeeld in je Git-repository en zijn zichtbaar voor iedereen met toegang tot de repository.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Voorbeeldlinks maken voor pull-verzoeken",
       "description-image-rendering": "Vereist beeldweergave. <2>Beeldweergave instellen</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(vereist <2>afbeeldingsweergave</2> en ingeschakelde openbare toegang)",
       "description-read-only": "Bronnen kunnen niet worden gewijzigd via Grafana.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Hoe vaak wijzigingen uit de repository moeten worden gesynchroniseerd",
+      "error-sync-interval-required": "Synchronisatie-interval is vereist",
       "label-enable-previews": "Dashboardvoorbeelden inschakelen in pull requests",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Dashboardvoorbeeldweergaven genereren",
       "label-read-only": "Alleen lezen",
-      "label-sync-interval": ""
+      "label-sync-interval": "Synchronisatie-interval (seconden)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Geen resultaten die overeenkomen met je query",
@@ -11301,46 +11305,46 @@
       "subtitle-provisioning-feature": "Je provisioningverbindingen bekijken en beheren"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "De tak die moet worden gebruikt voor provisioning",
+      "branch-label": "Vestiging",
+      "branch-required": "Tak is vereist",
+      "path-description": "Optioneel pad naar submap in de repository",
+      "path-label": "Path",
+      "pr-workflow-description": "Hiermee kunnen gebruikers kiezen of ze een pull-verzoek willen openen bij het opslaan van wijzigingen. Als de repository geen directe wijzigingen in de hoofdtak toestaat, kan er nog steeds een pull-verzoek nodig zijn.",
+      "pr-workflow-label": "De optie pull-verzoek inschakelen bij opslaan",
+      "token-description": "Toegangstoken of wachtwoord voor Git-repository",
+      "token-label": "Toegangstoken",
+      "token-required": "Git-token is vereist",
+      "token-user-description": "De gebruikersnaam die zal worden gebruikt om toegang te krijgen tot de repository met het toegangstoken",
+      "token-user-label": "Gebruikersnaam",
+      "token-user-required": "Gebruikersnaam is vereist",
+      "url-description": "De Git-repository-URL",
+      "url-label": "Repository-URL",
+      "url-pattern": "Moet een geldige Git-repository-URL zijn",
+      "url-required": "Repository-URL is vereist"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "De tak die moet worden gebruikt voor provisioning",
+      "branch-label": "Vestiging",
+      "branch-required": "Tak is vereist",
+      "path-description": "Optioneel pad naar submap in de repository",
+      "path-label": "Path",
+      "pr-workflow-description": "Hiermee kunnen gebruikers kiezen of ze een pull-verzoek willen openen bij het opslaan van wijzigingen. Als de repository geen directe wijzigingen in de hoofdtak toestaat, kan er nog steeds een pull-verzoek nodig zijn.",
+      "pr-workflow-label": "De optie pull-verzoek inschakelen bij opslaan",
+      "token-description": "Persoonlijk toegangstoken GitHub met repository-toestemmingen",
+      "token-label": "Personal Access Token",
+      "token-required": "GitHub-token is vereist",
+      "url-description": "De GitHub-repository-URL",
+      "url-label": "Repository-URL",
+      "url-pattern": "Moet een geldige GitHub-repository-URL zijn",
+      "url-required": "Repository-URL is vereist"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "De tak die moet worden gebruikt voor provisioning",
+      "branch-label": "Vestiging",
+      "branch-required": "Tak is vereist",
+      "path-description": "Optioneel pad naar submap in de repository",
+      "path-label": "Path",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11349,15 +11353,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Hiermee kunnen gebruikers kiezen of ze een pull request willen openen bij het opslaan van wijzigingen. Als de repository geen directe wijzigingen in de hoofdtak toestaat, kan er nog steeds een pull request nodig zijn.",
+      "pr-workflow-label": "De optie Verzoek tot samenvoegen inschakelen bij opslaan",
+      "token-description": "Toegangstoken GitLab-project met repository-toestemmingen",
+      "token-label": "Projecttoegangstoken",
+      "token-required": "GitLab-token is vereist",
+      "url-description": "De GitLab-repository-URL",
+      "url-label": "Repository-URL",
+      "url-pattern": "Moet een geldige GitLab-repository-URL zijn",
+      "url-required": "Repository-URL is vereist"
     },
     "history-view": {
       "not-found": "Niet gevonden"
@@ -11385,18 +11389,18 @@
       "starting": "Starten...",
       "status": {
         "title-error-running-job": "Er is een fout opgetreden bij het uitvoeren van de taak",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Taak is voltooid",
+        "title-warning-running-job": "Taak voltooid met waarschuwingen"
       },
       "summary": "Samenvatting",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Fout bij ophalen van actieve taak"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Lokaal bestandssysteempad naar de repository",
+      "path-label": "Repository-pad",
+      "path-required": "Repository-pad is vereist"
     },
     "mode-options": {
       "folder": {
@@ -11422,7 +11426,7 @@
     },
     "repository-actions": {
       "settings": "Instellingen",
-      "source-code": ""
+      "source-code": "Broncode"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11488,22 +11492,22 @@
       "title-queued-for-deletion": "In de wachtrij voor verwijdering"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Kies een provider:",
+      "configure-file": "Bestandsprovisioning configureren",
+      "configure-with-provider": "Configureren met {{ provider }}",
+      "provider-not-listed": "Als je provider niet in de lijst staat:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Verbinden met Bitbucket-repositories",
+      "github": "GitHub",
+      "github-description": "Verbinden met GitHub-repositories",
+      "gitlab": "GitLab",
+      "gitlab-description": "Verbinden met GitLab-repositories",
+      "local": "Lokaal",
+      "local-description": "Bestandsprovisioning configureren",
+      "pure-git": "Pure Git",
+      "pure-git-description": "Verbinden met elke Git-repository"
     },
     "resource-view": {
       "base": "Basis",
@@ -11534,11 +11538,11 @@
       "label-current-step": "Huidige stap",
       "label-pending-step": "Stap in afwachting"
     },
-    "success-title-default": "",
+    "success-title-default": "Succes",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Kan taak niet starten",
+      "error-no-repository-name": "Geen repository-naam opgegeven",
+      "error-starting-job": "Er is een fout opgetreden bij het starten van de taak"
     },
     "sync-repository": {
       "body-edit-configuration": "De configuratie bewerken",
@@ -11566,7 +11570,7 @@
       "go-to": "Ga naar",
       "make-sure": "Zorg ervoor dat je deze toestemmingen opneemt"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Waarschuwing",
     "wizard": {
       "alert-point-1": "Bronnen kunnen tijdens dit proces niet worden gemaakt, bewerkt of verwijderd. In de laatste stap verdwijnen ze.",
       "alert-point-2": "Zodra de provisioning is voltooid, verschijnen bronnen weer en worden ze beheerd via externe opslag.",
@@ -11576,10 +11580,10 @@
       "button-next": "Voltooien",
       "button-start": "Synchronisatie starten",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Hiermee wordt de repository-configuratie verwijderd en verlies je alle voortgang. Weet je zeker dat je je wijzigingen wilt negeren?",
+        "confirm": "Ja, verwijderen",
+        "dismiss": "Blijf werken",
+        "title": "Repository-instellingen verwijderen?"
       },
       "step-bootstrap": "Kies wat je wilt synchroniseren",
       "step-connect": "Verbinden",
@@ -11595,7 +11599,7 @@
     "wizard-content": {
       "button-cancel": "Annuleren",
       "button-cancelling": "Annuleren…",
-      "button-previous": "",
+      "button-previous": "Vorige",
       "button-submitting": "Indienen...",
       "error-instance-repository-exists": "Er bestaat al een instantierepository"
     }
@@ -11996,7 +12000,7 @@
         "recommended": "Aanbevolen",
         "results": "Resultaten"
       },
-      "search": ""
+      "search": "{{parentTitle}} doorzoeken"
     }
   },
   "search": {
@@ -12077,7 +12081,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Geen serviceaccounts gevonden",
     "select-aria-label": "Serviceaccountkiezer",
     "select-placeholder": "Begin met typen om naar serviceaccounts te zoeken"
   },
@@ -12123,10 +12127,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Serviceaccounttoken toevoegen",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Ben je zeker dat je deze service wilt verwijderen?",
+      "body-disable-service-account": "Ben je zeker dat je deze service wilt uitschakelen?",
+      "confirmText-delete-service-account": "Serviceaccount verwijderen",
+      "confirmText-disable-service-account": "Serviceaccount uitschakelen",
       "delete-service-account": "Serviceaccount verwijderen",
       "disable-service-account": "Serviceaccount uitschakelen",
       "enable-service-account": "Serviceaccount inschakelen",
@@ -12153,7 +12157,7 @@
       "used-by": "Gebruikt door"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Opslaan",
       "edit": "Bewerken"
     },
     "service-account-role-row": {
@@ -12167,16 +12171,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Serviceaccount toevoegen",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Weet je zeker dat je {{serviceAccountName}} wilt verwijderen?",
+      "body-disable-service-account": "Weet je zeker dat je '{{accountToDisable}}' wilt uitschakelen?",
+      "confirmText-delete": "Verwijderen",
+      "confirmText-disable-service-account": "Serviceaccount uitschakelen",
       "placeholder-search-service-account-by-name": "Serviceaccount zoeken op naam",
       "sub-title": "Serviceaccounts en hun tokens kunnen worden gebruikt om te verifiëren tegen de Grafana API. Lees meer in onze <2>documentatie</2>.</2>",
       "title-delete-service-account": "Serviceaccount verwijderen",
       "title-disable-service-account": "Serviceaccount uitschakelen",
-      "body-delete_one": "",
-      "body-delete_other": ""
+      "body-delete_one": "Weet je zeker dat je {{serviceAccountName}} en {{count}} bijbehorende tokens wilt verwijderen?",
+      "body-delete_other": "Weet je zeker dat je {{serviceAccountName}} en {{count}} bijbehorende tokens wilt verwijderen?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Dit token is verlopen",
@@ -12190,7 +12194,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Exporteren als afbeelding",
       "export-json-title": "Exporteren als JSON",
       "share-externally-title": "Extern delen",
       "share-internally-title": "Intern delen",
@@ -12227,17 +12231,17 @@
       "view-button-yaml": "YAML weergeven"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Acties voor afbeeldingsexport",
+      "cancel-button": "Annuleren",
+      "download-button": "Afbeelding downloaden",
+      "error-title": "Kan afbeelding niet genereren",
+      "generate-button": "Afbeelding genereren",
+      "generating": "Bezig met het genereren van afbeelding...",
+      "info-text": "Dit dashboard opslaan als een afbeelding",
+      "preview": "Voorbeeld",
+      "preview-aria": "Voorbeeld van gegenereerde afbeelding",
+      "preview-region": "Afbeeldingsvoorbeeld",
+      "title": "Exporteren als afbeelding"
     },
     "library": {
       "info": "Bibliotheekpaneel aanmaken."
@@ -12247,7 +12251,7 @@
       "info-text": "Maak een directe link naar dit dashboard of paneel, aangepast met de onderstaande opties.",
       "link-url": "Link-URL",
       "render-alert": "Afbeeldingweergave-plug-in niet geïnstalleerd",
-      "render-instructions": "",
+      "render-instructions": "Om een afbeelding weer te geven, moet je de <2>Grafana- afbeeldingsweergave-plug-in </2> installeren. Neem contact op met je Grafana-beheerder om de plug-in te installeren.",
       "rendered-image": "Directe link naar gerenderde afbeelding",
       "save-alert": "Dashboard is niet opgeslagen",
       "save-dashboard": "Om een paneelafbeelding weer te geven, moet je eerst het dashboard opslaan.",
@@ -12315,11 +12319,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Sla het dashboard op om het genereren van afbeeldingen in te schakelen",
+    "download-disabled-help": "Genereer eerst een afbeelding om downloaden in te schakelen",
+    "error-title": "Kan afbeelding niet genereren",
     "form": {
-      "label": ""
+      "label": "Instellingen voor paneelafbeeldingen"
     },
     "preview": {
       "title": "Voorbeeld van paneel"
@@ -12634,17 +12638,17 @@
       "label-small": "Klein"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Acties",
+      "auto": "Automatisch",
+      "color-background": "Gekleurde achtergrond",
+      "color-text": "Gekleurde tekst",
+      "data-links": "Gegevenslinks",
+      "gauge": "Meter",
+      "image": "Afbeelding",
+      "json": "JSON-weergave",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Pill",
+      "sparkline": "Sparkline"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "Indien geselecteerd, wordt de hele rij gekleurd zoals deze cel zou zijn.",
@@ -12673,7 +12677,7 @@
     "description-count-rows": "Een enkele telling weergeven voor alle gegevensrijen",
     "description-fields": "Selecteer de velden die moeten worden berekend",
     "description-min-column-width": "De minimale breedte voor het automatisch aanpassen van de kolomgrootte",
-    "description-wrap-header-text": "",
+    "description-wrap-header-text": "Schakelt tekstterugloop in voor kolomkoppen",
     "image-cell-options-editor": {
       "description-alt-text": "Alternatieve tekst die wordt weergegeven als een afbeelding niet kan worden weergegeven of voor gebruikers die een schermlezer gebruiken",
       "description-title-text": "Tekst die wordt weergegeven wanneer de afbeelding wordt aangeraakt door een cursor",
@@ -12757,7 +12761,7 @@
     "tag-option-label": "Labeloptie"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Er zijn geen teams gevonden",
     "select-aria-label": "Teamkiezer",
     "select-placeholder": "Selecteer een team"
   },
@@ -13061,15 +13065,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Binaire bewerking",
+          "reduce-row": "Rij verkleinen",
+          "row-index": "Rij-index",
+          "unary-operation": "Unaire bewerking"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Cumulatieve functies",
+        "window-functions": "Schermfuncties"
       },
       "label-alias": "Alias",
       "label-mode": "Modus",
@@ -13087,9 +13091,9 @@
       "label-name": "Naam",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Kopieer framenaam naar veldnaam",
+          "ignore-the-frame-name": "Negeer de framenaam",
+          "label-frame": "Voeg een label toe met de framenaam"
         }
       },
       "placeholder-frame": "Frame"
@@ -13102,9 +13106,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Transformator omgezet veldtype toevoegen",
       "aria-label-remove-convert-field-type-transformer": "Transformator omgezet veldtype verwijderen",
-      "convert-field-type": "",
+      "convert-field-type": "Type veld converteren",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Een veld converteren naar een gespecificeerd veldtype."
       },
       "label": {
         "browser": "Browser",
@@ -13117,11 +13121,11 @@
       "label-join-with": "Meedoen met",
       "label-set-timezone": "Tijdzone instellen",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Type veld converteren"
       },
       "placeholder-type": "Type",
       "tags": {
-        "format-field": ""
+        "format-field": "Veld opmaken"
       },
       "tooltip-explicit-separator-joining-array-values": "Gebruik een expliciet scheidingsteken bij het samenvoegen van reekswaarden",
       "tooltip-input-format": "Geef de indeling van het invoerveld op, zodat Grafana de datumreeks correct kan parseren.",
@@ -13147,13 +13151,13 @@
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Combineer alle velden in één frame."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Velden samenvoegen"
         },
         "tags": {
-          "combine": ""
+          "combine": "Samenvoegen"
         }
       }
     },
@@ -13168,11 +13172,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Velden uit inhoud parseren (JSON, labels, enz.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Veld selecteren"
         }
       },
       "label-delimiter": "Scheidingsteken",
@@ -13181,7 +13185,7 @@
       "label-replace-all-fields": "Alle velden vervangen",
       "label-source": "Bron",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Velden extraheren"
       },
       "placeholder-auto": "Automatisch",
       "placeholder-select-delimiter": "Selecteer het scheidingsteken...",
@@ -13192,20 +13196,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Gebruik een veldwaarde om landen, staten of luchthavens op te zoeken."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Geen tekstvelden gevonden"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Tekstveld selecteren"
         }
       },
       "label-field": "Veld",
       "label-lookup": "Opzoeken",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Velden opzoeken uit bron"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13216,23 +13220,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Verwijder delen van de zoekresultaten met behulp van een regex-patroon."
       },
       "label-from-variable": "Van variabele",
       "label-identifier": "Identificatie",
       "label-use-variable": "Gebruik variabele",
       "label-variable": "Variabele",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Velden filteren op naam"
       },
       "placeholder-regular-expression-pattern": "Regulier expressiepatroon"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Verwijder rijen uit de gegevens op basis van de oorspronkelijke query"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Gegevens filteren op query"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13246,33 +13250,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Voorwaarde toevoegen",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Verwijder rijen uit de zoekresultaten met behulp van door de gebruiker gedefinieerde filters."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Voldoe aan alle voorwaarden",
+          "match-any": "Voldoe aan een van de voorwaarden"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Uitsluiten",
+          "include": "Opnemen"
         }
       },
       "label-conditions": "Voorwaarden",
       "label-filter-type": "Type filteren",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Filteren op waarden"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Geen tekstvelden gevonden"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Tekstveld selecteren"
         }
       },
       "label-field": "Veld",
@@ -13281,10 +13285,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Opmaak van stringvelden manipuleren."
       },
       "name": {
-        "format-string": ""
+        "format-string": "String opmaken"
       }
     },
     "format-time-transfomer-editor": {
@@ -13296,66 +13300,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Stel de uitvoerindeling van een tijdveld in"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Tijd opmaken"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Gebruik de rijwaarden om een nieuw veld te berekenen."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Veld toevoegen uit berekening"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Stel eenheid, min, max en meer in."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Configuratie van queryresultaten"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Genereer heatmapgegevens uit brongegevens."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Heatmap aanmaken"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Gelabelde resultaten afvlakken in een tabel die wordt samengevoegd door labels."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Samenvoegen op labels"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Een dataset met één frame in meerdere reeksen splitsen."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Partitie op waarden"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Elke rij omzetten in een veld met dynamische configuratie."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Rijen naar velden"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Ruimtelijke bewerkingen toepassen op zoekresultaten."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Ruimtelijke bewerkingen"
       }
     },
     "get-timezone-options": {
@@ -13387,8 +13391,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Berekenen",
+          "group-by": "Groeperen op"
         }
       },
       "placeholder-ignored": "Genegeerd",
@@ -13396,42 +13400,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Groepeer gegevens op een veldwaarde en maak geaggregeerde gegevens."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Groeperen op"
       },
       "title-calc-alert": "Berekeningen hebben geen effect als er geen velden worden gegroepeerd"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Groepeer gegevens op een veldwaarde en maak geneste tabellen met de gegroepeerde gegevens."
       },
       "description-show-field-names": "Indien ingeschakeld, geven geneste tabellen veldnamen weer als een tabelkoptekst",
       "label-show-field-names-in-nested-tables": "Veldnamen weergeven in geneste tabellen",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Groeperen naar geneste tabellen"
       },
       "title-calc-alert": "Berekeningen hebben geen effect als er geen velden worden gegroepeerd."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Vat gegevens samen en reorganiseer ze op basis van drie velden."
       },
       "label-cell-value": "Celwaarde",
       "label-column": "Kolom",
       "label-empty-value": "Lege waarde",
       "label-row": "Rij",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Groeperen naar matrix"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Bereken een histogram op basis van invoergegevens."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Histogram"
       },
       "placeholder-auto": "Automatisch",
       "placeholder-default": "Standaard: 30",
@@ -13443,14 +13447,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Combineer rijen uit meer dan 2 tabellen, op basis van een gerelateerd veld."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Samenvoegen op veld"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Vereist",
       "info": {
         "input-contain-labels": "De invoer bevat geen labels",
         "no-input-or-labels-found": "Geen invoer (of labels) gevonden",
@@ -13474,8 +13478,8 @@
       "label-value-field-name": "Naam waardeveld",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Kolommen",
+          "rows": "Rijen"
         }
       },
       "placeholder-optional-select-label": "(Optioneel) Label selecteren",
@@ -13483,18 +13487,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Groepeer reeksen op tijd en retourneringslabels of -tags als velden."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Labels naar velden"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Beperk het aantal weergegeven items."
       },
       "name": {
-        "limit": ""
+        "limit": "Limiet"
       },
       "placeholder-value-or-variable": "Waarde of variabele"
     },
@@ -13507,11 +13511,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Meerdere reeksen samenvoegen. Waarden worden gecombineerd in één rij."
       },
       "merge-effect-applied-single-frame": "Samenvoegen heeft geen effect wanneer toegepast op een enkel frame.",
       "name": {
-        "merge": ""
+        "merge": "Reeksen/tabellen samenvoegen"
       }
     },
     "multi-info": {
@@ -13523,14 +13527,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Velden opnieuw ordenen, verbergen of hernoemen."
       },
       "field-order": "Veldvolgorde",
       "field-order-auto": "Automatisch",
       "field-order-manual": "Handmatig",
       "first-frame-warning": "Velden organiseren werkt alleen met een enkel frame. Overweeg om eerst een verbindingstransformatie toe te passen of de invoer te filteren.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Velden ordenen op naam"
       }
     },
     "partion-by-values-editor": {
@@ -13558,10 +13562,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Rek gegevensframes uit van het brede formaat naar het lange formaat."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Tijdreeksen voorbereiden"
       }
     },
     "prepare-time-series-editor": {
@@ -13569,26 +13573,26 @@
       "label-info": "Info",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Elk frame omzetten naar lang formaat"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Lange tijdreeksen"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Maakt een nieuw frame voor elk tijd/nummerpaar"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Tijdreeksen met meerdere frames"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Maakt een enkel frame samengevoegd door tijd"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Brede tijdreeksen"
         }
       }
     },
@@ -13603,7 +13607,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Verklein alle rijen of gegevenspunten tot één enkele waarde (bijv. max, gemiddelde)."
       },
       "label-calculations": "Berekeningen",
       "label-include-time": "Inclusief tijd",
@@ -13620,7 +13624,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Verkleinen"
       },
       "placeholder-choose-stat": "Statistieken kiezen"
     },
@@ -13630,18 +13634,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Maak een nieuw gegevensframe met waarden die worden voorspeld door een statistisch model."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Trendlijn"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Kubiek",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Vierkant",
         "quartic": "Kwartisch",
-        "quintic": "Vijfvoudig"
+        "quintic": "Vijfvoudig",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Graad",
       "label-model-type": "Modeltype",
@@ -13656,16 +13665,17 @@
       },
       "regression": "regressie",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Regressieanalyse"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Aantal X-,Y-punten om te voorspellen"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Hernoem delen van de zoekresultaten met behulp van een reguliere expressie en vervangingspatroon."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Velden hernoemen met regex"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13679,33 +13689,33 @@
       "label-mode": "Modus",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Combineer gegevens uit twee tabellen wanneer er overeenkomende waarden zijn in velden die beide tabellen gemeen hebben.",
+          "join-on-a-field": "Voeg samen op een veldwaarde met dubbele waarden. Niet-presterende outer join wordt het beste gebruikt voor tabelgegevens (zoals SQL).",
+          "keep-all-rows": "Bewaar alle rijen van elke tabel met een waarde. Voeg verschillende veldwaarden samen. Performant en het beste gebruikt voor tijdreeksen."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Intern",
+          "outer-tabular": "Buitenste (tabelvormig)",
+          "outer-time-series": "Buitenste (tijdreeks)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Meerdere reeksen samenvoegen. Retourneer tijd, statistiek en waarden als een rij."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Reeksen naar rijen"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Velden in een frame sorteren."
       },
       "label-field": "Veld",
       "label-reverse": "Omkeren",
       "name": {
-        "sort-by": ""
+        "sort-by": "Sorteren op"
       },
       "placeholder-select-field": "Veld selecteren"
     },
@@ -13728,13 +13738,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Converteer tijdreeksgegevens naar tabelrijen, zodat ze kunnen worden bekeken in tabel- of sparkline-indeling."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "De transformatie van tijdreeks naar tabel vereist ten minste één tijdreeksframe om te functioneren. Je hebt er momenteel geen."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Tijdreeks naar tabel"
       }
     },
     "time-series-table-transform-editor": {
@@ -13752,15 +13762,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Transponeer het gegevensframe."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Transponeren"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Roteren",
+        "transform": "Transformeren",
+        "translate": "Vertalen"
       }
     },
     "unary-operation-editor": {
@@ -13769,13 +13779,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Nieuwe velden berekenen",
+        "combine": "Samenvoegen",
+        "create-new-visualization": "Nieuwe visualisatie aanmaken",
+        "filter": "Filter",
+        "perform-spatial-operations": "Ruimtelijke bewerkingen uitvoeren",
+        "reformat": "Opnieuw formatteren",
+        "reorder-and-rename": "Opnieuw ordenen en hernoemen"
       },
       "special-value-options": {
         "description": {
@@ -13846,7 +13856,7 @@
     "title": "Organisaties"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Geen gebruikers gevonden",
     "select-aria-label": "Gebruikerskiezer",
     "select-placeholder": "Begin te typen om te zoeken naar gebruiker"
   },
@@ -13932,8 +13942,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Weet je zeker dat je variabele '{{variableToDelete}}' wilt verwijderen?",
+      "confirmText-delete": "Verwijderen",
       "title-delete-variable": "Variabele verwijderen"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13983,33 +13993,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "De waarden van deze variabele sorteren",
-      "name-sort": "",
+      "name-sort": "Sorteren",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Alfabetisch (oplopend)",
+          "alphabetical-caseinsensitive-asc": "Alfabetisch (hoofdletterongevoelig, oplopend)",
+          "alphabetical-caseinsensitive-desc": "Alfabetisch (hoofdletterongevoelig, aflopend)",
+          "alphabetical-desc": "Alfabetisch (aflopend)",
+          "disabled": "Uitgeschakeld",
+          "natural-asc": "Natuurlijk (oplopend)",
+          "natural-desc": "Natuurlijk (aflopend)",
+          "numerical-asc": "Numeriek (oplopend)",
+          "numerical-desc": "Numeriek (aflopend)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Optie toevoegen",
+      "description": "Aangepaste opties toevoegen naast zoekresultaten",
+      "label-placeholder": "label weergeven",
+      "remove-option-button-label": "Optie verwijderen",
+      "value-placeholder": "waarde, standaard lege string"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Statische opties sorteren met zoekresultaten"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Standaardwaarde",
       "placeholder-default-value-if-any": "standaardwaarde, indien aanwezig",
       "text-options": "Tekstopties"
     },
@@ -14038,8 +14048,8 @@
       "description-optional-display-name": "Optionele weergavenaam",
       "description-template-variable-characters": "De naam van de sjabloonvariabele. (Max. 50 tekens)",
       "general": "Algemeen",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Label",
+      "name-name": "Naam",
       "placeholder-descriptive-text": "Omschrijving",
       "placeholder-label-name": "Labelnaam",
       "placeholder-variable-name": "Naam variabele",
@@ -14055,13 +14065,13 @@
       "tooltip-remove-variable": "Variabele verwijderen"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Beschrijving"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Alle waarden in-/uitschakelen"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Selecteer type variabele"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Gebruik weergeven"
diff --git a/public/locales/pl-PL/grafana.json b/public/locales/pl-PL/grafana.json
index ab1ca2aad14..405bba36e8f 100644
--- a/public/locales/pl-PL/grafana.json
+++ b/public/locales/pl-PL/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Niektóre funkcje są stabilne (GA) i domyślnie włączone, podczas gdy inne są obecnie we wstępnej fazie beta i dostępne do wczesnego wdrożenia.",
       "confirm-modal-body-2": "Przed wprowadzeniem modyfikacji zalecamy przeanalizowanie konsekwencji każdej zmiany funkcji.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Zapisz zmiany",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Ogólna dostępność",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Usuń organizację",
-      "confirmText-delete": "",
+      "confirmText-delete": "Usuń",
       "title-delete": "Usuń"
     },
     "anon-users": {
       "not-found": "Nie znaleziono użytkowników anonimowych."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Czy na pewno chcesz wymusić wylogowanie ze wszystkich urządzeń?",
+      "confirmText-confirm-logout": "Potwierdź wylogowanie",
+      "confirmText-force-logout": "Wymuś wylogowanie",
       "title-force-logout-from-all-devices": "Wymuś wylogowanie ze wszystkich urządzeń"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Zapisz"
     },
     "edit-org": {
       "access-denied": "Nie masz uprawnień do wyświetlania użytkowników w tej organizacji. Aby zaktualizować tę organizację, skontaktuj się z administratorem serwera.",
@@ -119,10 +119,10 @@
       "users-heading": "Użytkownicy organizacji"
     },
     "enterprise-auth-features-card": {
-      "dismiss": "",
-      "heading": "",
-      "learn-more-link": "",
-      "text": ""
+      "dismiss": "Odrzuć",
+      "heading": "Uwierzytelnianie – Enterprise",
+      "learn-more-link": "Dowiedz się więcej",
+      "text": "Automatycznie zarządzaj użytkownikami, zespołami i uprawnieniami za pomocą <1>SAML</1>, <3>SCIM</3>, <6>LDAP</6> i <8>RBAC</8> – dostępnych w Grafana Cloud i Enterprise."
     },
     "feature-listing": {
       "title-auditing": "Audyty",
@@ -216,11 +216,11 @@
       "not-editable": "Nie można edytować roli tego użytkownika, ponieważ synchronizuje ją dostawca autoryzacji. Szczegółowe informacje znajdziesz w <1> dokumentach uwierzytelniających usługi Grafana</1>."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Czy na pewno chcesz usunąć użytkownika {{user}}?",
       "columns": {
         "aria-label-role": "Rola"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Usuń",
       "delete-aria-label": "Usuń użytkownika: {{name}}",
       "title-delete": "Usuń"
     },
@@ -252,7 +252,7 @@
       "info-description": "Te ustawienia systemowe są zdefiniowane w pliku grafana.ini lub custom.ini (lub nadpisane w zmiennych ENV). Aby je zmienić, obecnie należy ponownie uruchomić usługę Grafana."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Potwierdź usunięcie"
     },
     "upgrade-info": {
       "title": "Licencja Enterprise"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Zmień",
-      "confirmText-change": "",
+      "confirmText-change": "Zmień",
       "grafana-admin-key": "Administrator usługi Grafana",
       "grafana-admin-no": "Nie",
       "grafana-admin-yes": "Tak",
       "title": "Uprawnienia"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Czy na pewno chcesz usunąć tego użytkownika?",
+      "body-disable": "Czy na pewno chcesz wyłączyć tego użytkownika?",
+      "confirmText-delete-user": "Usuń użytkownika",
+      "confirmText-disable-user": "Wyłącz użytkownika",
       "delete-button": "Usuń użytkownika",
       "disable-button": "Wyłącz użytkownika",
       "edit-button": "Edytuj",
@@ -331,7 +331,7 @@
       "title-disable-user": "Wyłącz użytkownika"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Zapisz"
     },
     "user-sessions": {
       "browser-column": "Przeglądarka i system operacyjny",
@@ -374,20 +374,20 @@
       "am-active-timing-select-label-active-timings": "Aktywne harmonogramy"
     },
     "ad": {
-      "close": "",
-      "learn-more": ""
+      "close": "Zamknij",
+      "learn-more": "Dowiedz się więcej"
     },
     "add-button": {
       "add-more": "Dodaj więcej"
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Nie udało się załadować przycisku reguły alertu AI",
+        "feedback-button": "Nie udało się załadować przycisku opinii AI",
+        "improve-annotations-button": "Nie udało się załadować przycisku poprawiania adnotacji za pomocą AI",
+        "improve-labels-button": "Nie udało się załadować przycisku poprawiania etykiet za pomocą AI",
+        "template-button": "Nie udało się załadować przycisku szablonu AI",
+        "triage-button": "Nie udało się załadować przycisku triażu AI"
       }
     },
     "alert": {
@@ -405,12 +405,12 @@
       "missing-series-resolve": "Brak ocen serii do rozwiązania",
       "no-annotations": "Brak komentarzy",
       "notification-configuration": {
-        "active-timings": "",
+        "active-timings": "Aktywne przedziały czasowe",
         "contact-point": "Punkt kontaktowy",
         "group-by": "Grupowanie wg:",
-        "group-title": "",
+        "group-title": "Konfiguracja powiadomień",
         "mute-timings": "Harmonogramy wyciszenia",
-        "timing-options": ""
+        "timing-options": "Harmonogramy"
       },
       "pending-period": "Okres oczekiwania",
       "rule": "Reguła",
@@ -501,7 +501,7 @@
       "title-muting-grouping-and-timings": "Wyciszanie, grupowanie i harmonogramy"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nie znaleziono źródeł danych"
     },
     "alert-menu": {
       "copy-link": "Kopiuj link",
@@ -527,7 +527,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Reguła alertu"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -595,7 +595,7 @@
       "view-configuration": "Wyświetl konfigurację"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Tak, zresetuj konfigurację",
       "gma-manual-configuration-description": "Nie można ręcznie zmienić wewnętrznej konfiguracji menedżera alertów Grafany. Aby zmienić tę konfigurację, edytuj poszczególne zasoby z poziomu interfejsu użytkownika.",
       "gma-manual-configuration-is-not-supported": "Ręczne zmiany konfiguracji nie są obsługiwane",
       "message": {
@@ -610,13 +610,13 @@
       "title-resetting-alertmanager-configuration": "Resetowanie konfiguracji menedżera alertów"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Czy na pewno chcesz przywrócić tę wersję konfiguracji? Wszystkie niezapisane zmiany zostaną utracone.",
       "columns": {
         "compare": "Porównaj",
         "restore": "Przywróć",
         "text-latest": "Najnowsze"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Tak, przywróć konfigurację",
       "loading": "Ładowanie…",
       "no-previous-configurations": "Brak wcześniejszych konfiguracji",
       "this-might-take-a-while": "Może to chwilę potrwać…",
@@ -896,10 +896,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Więcej działań dla punktu kontaktu „{{contactPointName}}”",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Usuń",
       "button-edit": "Edytuj",
       "button-view": "Wyświetl",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Eksportuj",
       "export-label-export": "Eksport",
       "label-delete": "Usuń",
       "label-manage-permissions": "Zarządzaj uprawnieniami",
@@ -976,7 +976,7 @@
     },
     "contactPoints": {
       "validation": {
-        "notFound": ""
+        "notFound": "Nie znaleziono punktu kontaktowego „{{contactPoint}}”"
       }
     },
     "continue-matching-indicator": {
@@ -985,7 +985,7 @@
     "copy-to-clipboard": "Kopiuj „{{label}}” do schowka",
     "create-metadata": {
       "label": {
-        "contact-point": "",
+        "contact-point": "Powiadomienia są dostarczane do",
         "dashboard": "Pulpit",
         "dashboard-and-panel": "Pulpit i panel",
         "evaluation-interval": "Interwał oceny",
@@ -1133,7 +1133,7 @@
       "content-show-all-errors": "Pokaż wszystkie błędy"
     },
     "errors": {
-      "failedWith": ""
+      "failedWith": "{{-config}} – niepowodzenie ze statusem {{status}}: {{-message}}"
     },
     "evaluate-every-validation-options": {
       "message": {
@@ -1438,7 +1438,7 @@
       "label-disable-resolved-message": "Wyłącz rozwiązaną wiadomość"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Ładowanie grup…",
       "message": {
         "must-be-a-positive-integer": "Musi to być dodatnia liczba całkowita.",
         "must-enter-a-group-name": "Należy podać nazwę grupy"
@@ -1535,7 +1535,7 @@
       "group-loading-error": "Błąd podczas ładowania grupy",
       "interval": "Interwał",
       "namespace": "Przestrzeń nazw",
-      "new": "",
+      "new": "Nowa",
       "title": {
         "back": ""
       }
@@ -1567,7 +1567,7 @@
     },
     "group-loader": {
       "group-load-failed": "Nie udało się wczytać reguł z grupy {{ groupName }} w przestrzeni nazw {{ namespaceName }}",
-      "no-rules": ""
+      "no-rules": "Nie znaleziono reguł w tej grupie"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "Trwa usuwanie grupy"
@@ -1584,20 +1584,20 @@
       }
     },
     "home": {
-      "irm-card-description": "",
-      "irm-card-item-1": "",
-      "irm-card-item-2": "",
-      "irm-card-item-3": "",
-      "irm-card-item-4": "",
-      "irm-card-title": "",
+      "irm-card-description": "Ujednolić dyżury, alerty i sposoby reagowania na incydenty dzięki Grafana Cloud IRM.",
+      "irm-card-item-1": "Zarządzaj harmonogramami dyżurów za pomocą kalendarza lub Terraform.",
+      "irm-card-item-2": "Reaguj na incydenty za pośrednictwem sieci, aplikacji, Slacka lub innych kanałów.",
+      "irm-card-item-3": "Określaj przyczyny źródłowe dzięki asystentowi Grafana SIFT opartemu na AI.",
+      "irm-card-item-4": "Analizuj wcześniejsze incydenty, aby poprawić reagowanie i odporność.",
+      "irm-card-title": "Reagowanie na incydenty i zarządzanie nimi",
       "label-get-started": "Rozpocznij",
       "label-insights": "Analizy",
-      "synthetic-monitoring-card-description": "",
-      "synthetic-monitoring-card-item-1": "",
-      "synthetic-monitoring-card-item-2": "",
-      "synthetic-monitoring-card-item-3": "",
-      "synthetic-monitoring-card-item-4": "",
-      "synthetic-monitoring-card-title": ""
+      "synthetic-monitoring-card-description": "Monitoruj krytyczne przepływy użytkowników, strony internetowe i interfejsy API zewnętrznie z globalnych lokalizacji.",
+      "synthetic-monitoring-card-item-1": "Symuluj kompleksowe ścieżki użytkowników za pomocą testów w przeglądarce.",
+      "synthetic-monitoring-card-item-2": "Uruchamiaj testy ping, DNS, HTTP/S i TCP w każdej warstwie sieci.",
+      "synthetic-monitoring-card-item-3": "Używaj ponad 20 globalnych lub prywatnych sond za zaporą sieciową.",
+      "synthetic-monitoring-card-item-4": "Śledź SLO za pomocą wbudowanych alertów w stylu systemu Prometheus – bezpośrednio z interfejsu użytkownika.",
+      "synthetic-monitoring-card-title": "Monitorowanie syntetyczne"
     },
     "import-to-gma": {
       "action-button": "Importuj",
@@ -1611,7 +1611,7 @@
         "no-rules-body-yaml": "Brak reguł do zaimportowania. Wybierz inny plik YAML.",
         "no-rules-title": "Brak reguł do zaimportowania",
         "not-using-rules-managed-by-integrations-or-plugins": {
-          "text": "",
+          "text": "Reguły zarządzane przez integracje lub wtyczki nie powinny być importowane do reguł zarządzanych przez Grafanę.",
           "title": "Informacje"
         },
         "plugin-rules-warning": {
@@ -1899,10 +1899,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nie znaleziono źródeł danych"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Czy na pewno chcesz usunąć „{{muteTiming}}”?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Wyłączone",
@@ -1993,7 +1993,7 @@
     },
     "notification-policies-filter": {
       "label-search-by-contact-point": "Szukaj według punktu kontaktu",
-      "placeholder-search-by-contact-point": "",
+      "placeholder-search-by-contact-point": "Wybierz punkt kontaktowy",
       "search-query-input-placeholder-search": "Szukaj"
     },
     "notification-policies-list": {
@@ -2156,10 +2156,10 @@
         "conflict": "Inny użytkownik zaktualizował drzewo zbiorów zasad dot. powiadamiania.",
         "error-code": "Komunikat o błędzie: „{{error}}”",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Nie można dodać ani zaktualizować trasy: dopasowywanie będzie w konflikcie z zewnętrznym drzewem routingu, jeśli kryteria {{-matchers}} zostaną scalone. Spowoduje to, że trasa będzie nieosiągalna."
         },
         "suffix": "Odśwież stronę i spróbuj ponownie.",
-        "title": ""
+        "title": "Nie udało się dodać lub zaktualizować zasad dotyczących powiadomień"
       },
       "n-more-policies_one": "{{count}} dodatkowy zbiór zasad",
       "n-more-policies_few": "{{count}} dodatkowe zbiory zasad",
@@ -2217,7 +2217,7 @@
     "query-and-expressions-step": {
       "add-query": "Dodaj zapytanie",
       "body-queries-expressions-configured": "Utwórz co najmniej jedno zapytanie lub wyrażenie, które będzie powodować wyświetlenie alertu",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Wyłącz",
       "expressions": "Wyrażenia",
       "loading-data-sources": "Wczytywanie źródeł danych…",
       "manipulate-returned-queries-other-operations": "Manipulowanie danymi zwracanymi z zapytań za pomocą działań matematycznych i innych operacji.",
@@ -2271,7 +2271,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Reguła rejestracji"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Nie udało się załadować edytora zapytań. Powód: {{errorMessage}}"
@@ -2291,7 +2291,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Konieczne będzie ustawienie nowej grupy oceny dla skopiowanej reguły, ponieważ oryginalna grupa została aprowizowana i nie można jej użyć w przypadku reguł utworzonych w interfejsie użytkownika.",
       "body-not-provisioned": "Nowa reguła <1>nie</1> zostanie oznaczona jako reguła po aprowizacji.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Kopiuj",
       "title-copy-provisioned-alert-rule": "Kopiuj regułę aprowizowanego alertu"
     },
     "redirect-to-rule-viewer": {
@@ -2512,12 +2512,12 @@
         "new-badge": "Nowość!",
         "text": "Importuj do reguł zarządzanych przez usługę Grafana"
       },
-      "loading-more-groups": "",
+      "loading-more-groups": "Ładowanie kolejnych grup…",
       "more": "Więcej",
       "new-alert-rule": "Nowa reguła alertu",
       "new-datasource-recording-rule": "Nowa reguła rejestracji źródła danych",
       "new-grafana-recording-rule": "Nowa reguła rejestracji w usłudze Grafana",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Nowa reguła alertu dla eksportu",
       "pagination": {
         "next-page": "Pokaż więcej…"
       },
@@ -2697,7 +2697,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Menedżery alertów"
       }
     },
     "settings-content": {
@@ -2835,7 +2835,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Odśwież podgląd",
-      "empty-state": "",
+      "empty-state": "Dodaj zawartość do szablonu, aby zobaczyć podgląd",
       "label-preview": "Podgląd",
       "refresh": "Odśwież"
     },
@@ -2854,7 +2854,7 @@
       "loading": "Ładowanie…",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Wybierz szablon powiadomienia"
         },
         "label": {
           "select-notification-template": "Wybierz szablon powiadomienia"
@@ -2882,8 +2882,8 @@
     },
     "templates-table": {
       "actions": "Działania",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Czy na pewno chcesz usunąć grupę szablonów „{{template}}”?",
+      "confirmText-yes-delete": "Tak, usuń",
       "no-templates-defined": "Nie zdefiniowano szablonów.",
       "template-group": "Grupa szablonów",
       "title-delete-template-group": "Usuń grupę szablonów"
@@ -2938,7 +2938,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Zarządzaj regułami alertów, regułami rejestrowania i odstępem czasu oceny"
       }
     },
     "to-gma": {
@@ -3018,7 +3018,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Tak, usuń"
       }
     },
     "use-delete-policy-modal": {
@@ -3072,51 +3072,51 @@
     }
   },
   "alertlist": {
-    "category-alert-state-filter": "",
-    "category-filter": "",
-    "category-options": "",
-    "descriptino-alerts-linked-to-dashboard": "",
-    "description-alert-instance-label": "",
-    "description-alert-name": "",
-    "description-datasource": "",
-    "description-folder": "",
-    "description-group-by": "",
-    "description-group-mode": "",
-    "description-max-items": "",
-    "description-show-inactive-alerts": "",
-    "description-sort-order": "",
-    "description-view-mode": "",
+    "category-alert-state-filter": "Filtr stanu alertu",
+    "category-filter": "Filtr",
+    "category-options": "Opcje",
+    "descriptino-alerts-linked-to-dashboard": "Pokaż tylko alerty powiązane z tym pulpitem",
+    "description-alert-instance-label": "Filtruj wystąpienia alertów za pomocą zapytania o etykiety, np.: {severity=\"critical\", instance=~\"cluster-us-.+\"}",
+    "description-alert-name": "Filtruj alerty zawierające ten tekst",
+    "description-datasource": "Filtruj ze źródła alertów",
+    "description-folder": "Filtruj alerty w wybranym folderze (tylko dla reguł alertów zarządzanych przez Grafanę)",
+    "description-group-by": "Filtruj alerty za pomocą zapytania o etykiety",
+    "description-group-mode": "Jak należy grupować instancje alertów",
+    "description-max-items": "Maksymalna liczba wyświetlanych alertów",
+    "description-show-inactive-alerts": "Uwzględnij reguły alertów, które mają 0 (zero) wystąpień. Te reguły nie mają wystąpień, więc pozostają ukryte, jeśli skonfigurowano filtr etykiet wystąpień alertu.",
+    "description-sort-order": "Kolejność sortowania alertów i wystąpień alertów",
+    "description-view-mode": "Przełącz między widokiem listy i widokiem statystycznym",
     "group-by": {
       "aria-label-group-by-label-keys": "grupuj według kluczy etykiet",
       "placeholder-group-by": "Grupuj według"
     },
     "group-mode-options": {
-      "label-custom-grouping": "",
-      "label-default-grouping": ""
+      "label-custom-grouping": "Grupowanie niestandardowe",
+      "label-default-grouping": "Grupowanie domyślne"
     },
-    "name-alert-instance-label": "",
-    "name-alert-name": "",
-    "name-alerts-linked-to-dashboard": "",
-    "name-datasource": "",
-    "name-error": "",
-    "name-firing": "",
-    "name-folder": "",
-    "name-group-by": "",
-    "name-group-mode": "",
-    "name-max-items": "",
-    "name-no-data": "",
-    "name-normal": "",
-    "name-pending": "",
-    "name-recovering": "",
-    "name-show-inactive-alerts": "",
-    "name-sort-order": "",
-    "name-view-mode": "",
+    "name-alert-instance-label": "Etykieta instancji alertu",
+    "name-alert-name": "Nazwa alertu",
+    "name-alerts-linked-to-dashboard": "Alerty powiązane z tym pulpitem",
+    "name-datasource": "Źródło danych",
+    "name-error": "Błąd",
+    "name-firing": "Alerty / Uruchamianie",
+    "name-folder": "Folder",
+    "name-group-by": "Grupuj według",
+    "name-group-mode": "Tryb grupowy",
+    "name-max-items": "Maks. liczba elementów",
+    "name-no-data": "Brak danych",
+    "name-normal": "Normalny",
+    "name-pending": "Oczekujący",
+    "name-recovering": "Przywracanie",
+    "name-show-inactive-alerts": "Pokaż alerty bez wystąpień",
+    "name-sort-order": "Kolejność sortowania",
+    "name-view-mode": "Tryb widoku",
     "sort-order-options": {
-      "label-alphabetical-asc": "",
-      "label-alphabetical-desc": "",
-      "label-importance": "",
-      "label-time-asc": "",
-      "label-time-desc": ""
+      "label-alphabetical-asc": "Alfabetycznie (rosnąco)",
+      "label-alphabetical-desc": "Alfabetycznie (malejąco)",
+      "label-importance": "Ważność",
+      "label-time-asc": "Czas (rosnąco)",
+      "label-time-desc": "Czas (malejąco)"
     },
     "ungrouped-mode-view": {
       "active-for": "przez <1>{{duration}}</1>",
@@ -3132,8 +3132,8 @@
       "title-permission-required": "Wymagane uprawnienia"
     },
     "view-mode-options": {
-      "label-list": "",
-      "label-stat": ""
+      "label-list": "Lista",
+      "label-stat": "Statystyka"
     }
   },
   "annolist": {
@@ -3146,31 +3146,31 @@
     "annotation-list-item": {
       "tooltip-created-by": "Utworzone przez:<1></1> {{email}}"
     },
-    "category-annotation-query": "",
-    "category-display": "",
-    "category-link-behaviour": "",
-    "description-tags": "",
+    "category-annotation-query": "Zapytanie dotyczące adnotacji",
+    "category-display": "Wyświetl",
+    "category-link-behaviour": "Zachowanie linku",
+    "description-tags": "Dopasuj tagi adnotacji",
     "link-target-options": {
-      "label-dashboard": "",
-      "label-panel": ""
+      "label-dashboard": "Pulpit",
+      "label-panel": "Panel"
     },
-    "name-limit": "",
-    "name-link-target": "",
-    "name-query-filter": "",
-    "name-show-tags": "",
-    "name-show-time": "",
-    "name-show-user": "",
-    "name-tags": "",
-    "name-time-after": "",
-    "name-time-before": "",
-    "name-time-range": "",
+    "name-limit": "Limit",
+    "name-link-target": "Cel powiązania",
+    "name-query-filter": "Filtr zapytań",
+    "name-show-tags": "Pokaż tagi",
+    "name-show-time": "Pokaż czas",
+    "name-show-user": "Pokaż użytkownika",
+    "name-tags": "Tagi",
+    "name-time-after": "Czas po",
+    "name-time-before": "Czas przed",
+    "name-time-range": "Zakres czasu",
     "query-filter-options": {
-      "label-all-dashboards": "",
-      "label-this-dashboard": ""
+      "label-all-dashboards": "Wszystkie pulpity",
+      "label-this-dashboard": "Ten pulpit"
     },
     "time-range-options": {
-      "label-none": "",
-      "label-this-dashboard": ""
+      "label-none": "Brak",
+      "label-this-dashboard": "Ten pulpit"
     }
   },
   "annotations": {
@@ -3178,7 +3178,7 @@
       "annotation": "Adnotacja",
       "first-value": "Pierwsza wartość",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Nieznane nazwy pól"
     },
     "empty-state": {
       "button-title": "Dodaj zapytanie do komentarza",
@@ -3188,12 +3188,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Po zdefiniowaniu tego pola adnotacja będzie traktowana jako zakres",
+        "results-split-on-comma": "Wyniki zostaną rozdzielone w miejscach przecinków (,)"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}} lub pierwsze pole tekstowe",
+        "time-or-the-first-field": "{{defaultField}} lub pierwsze pole czasu"
       }
     },
     "standard-annotation-query-editor": {
@@ -3271,9 +3271,9 @@
       "define-allowed-teams-ids-label": "Zdefiniuj dozwolone identyfikatory zespołów",
       "display-name-description": "Nazwa będzie się wyświetlać na stronie logowania jako część tekstu „Zaloguj się za pomocą...”. To przydatne, jeśli korzystasz z więcej niż jednego dostawcy tożsamości lub protokołów SSO.",
       "display-name-label": "Nazwa wyświetlana",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Parametr wskazujący dziedzinę użytkownika w dzierżawie Azure AD/Entra ID i usprawniający proces logowania.",
+      "domain-hint-label": "Wskazówka dotycząca domeny",
+      "domain-hint-valid-domain": "To pole musi zawierać prawidłową domenę.",
       "email-attribute-name-description": "Nazwa klucza używanego do wyszukiwania adresu e-mail użytkownika w mapie atrybutów tokena OAuth2 ID.",
       "email-attribute-name-label": "Nazwa atrybutu adresu e-mail",
       "email-attribute-path-description": "Wyrażenie JMESPath używane do wyszukiwania adresu e-mail użytkownika na podstawie danych użytkownika.",
@@ -3290,11 +3290,11 @@
       "id-token-attribute-name-label": "Nazwa atrybutu tokena identyfikatora",
       "login-attribute-path-description": "Wyrażenie JMESPath używane do wyszukiwania loginu na podstawie tokena identyfikatora użytkownika.",
       "login-attribute-path-label": "Ścieżka atrybutu loginu",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Zgoda",
+      "login-prompt-description": "Wskazuje rodzaj interakcji użytkownika, gdy użytkownik loguje się za pomocą IdP.",
+      "login-prompt-label": "Monit o zalogowanie",
+      "login-prompt-login": "Logowanie",
+      "login-prompt-select-account": "Wybierz konto",
       "managed-identity-client-id-description": "Identyfikator klienta tożsamości zarządzanej w poświadczeniach tożsamości federacyjnej Twojej aplikacji OAuth2.",
       "managed-identity-client-id-label": "Identyfikator klienta tożsamości zarządzanej FIC",
       "name-attribute-path-description": "Wyrażenie JMESPath używane do wyszukiwania nazwy użytkownika na podstawie tokena identyfikatora użytkownika. \nTa nazwa będzie używana jako nazwa wyświetlana użytkownika.",
@@ -3330,7 +3330,7 @@
       "team-ids-github": "Lista identyfikatorów zespołów w postaci liczb całkowitych.",
       "team-ids-label": "Identyfikatory zespołów",
       "team-ids-numbers": "Identyfikatory zespołów muszą być liczbami.",
-      "team-ids-other": "",
+      "team-ids-other": "Lista identyfikatorów zespołów w postaci ciągów.",
       "team-ids-placeholder": "Wprowadź identyfikatory zespołów i naciśnij klawisz Enter, aby je dodać",
       "teams-url-description": "Adres URL używany do wyszukiwania identyfikatorów zespołów. Jeśli nie jest ustawiony, wartością domyślną jest /teams.",
       "teams-url-description-oauth": "Jeśli skonfigurujesz „{{ teamsURLLabel }}”, musisz również skonfigurować „{{ teamIDsAttributePathLabel }}”.",
@@ -3365,8 +3365,8 @@
       }
     },
     "provider-card": {
-      "saml-learn-more": "",
-      "scim-learn-more": "",
+      "saml-learn-more": "Logowanie jednokrotne (SSO) za pomocą SAML.",
+      "scim-learn-more": "Synchronizuj użytkowników i zespoły za pomocą SCIM.",
       "text-badge-enabled": "Włączone",
       "text-badge-not-enabled": "Niewłączone"
     },
@@ -3374,7 +3374,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Zresetuj do wartości domyślnych"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Zresetuj",
       "disable": "Wyłącz",
       "disabling": "Wyłączanie…",
       "discard": "Odrzuć",
@@ -3394,7 +3394,7 @@
       "text-badge-not-enabled": "Niewłączone"
     },
     "scim-banner": {
-      "message": ""
+      "message": "Standard SCIM jest obecnie w trakcie rozwoju i nie jest zalecany do użytku produkcyjnego. Należy stosować go ostrożnie i spodziewać się potencjalnych zmian."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "Punkt końcowy konfiguracji .well-known/openid-configuration dla Twojego dostawcy tożsamości",
@@ -3406,99 +3406,99 @@
   },
   "bar-chart": {
     "warn": {
-      "missing-numeric": "",
-      "missing-series": ""
+      "missing-numeric": "Nie znaleziono pól numerycznych",
+      "missing-series": "Wykresy słupkowe wymagają pola ciągu lub czasu"
     }
   },
   "barchart": {
     "config": {
-      "category-thresholds": "",
-      "description-color-by-field": "",
-      "description-x-label-max-length": "",
-      "name-bar-radius": "",
-      "name-bar-width": "",
-      "name-color-by-field": "",
-      "name-fill-opacity": "",
-      "name-full-highlight": "",
-      "name-gradient-mode": "",
-      "name-group-width": "",
-      "name-line-width": "",
-      "name-orientation": "",
-      "name-rotate-x-labels": "",
-      "name-show-thresholds": "",
-      "name-show-values": "",
-      "name-stacking": "",
-      "name-transform": "",
-      "name-x-axis": "",
-      "name-x-label-max-length": "",
-      "name-x-label-min-spacing": "",
+      "category-thresholds": "Progi",
+      "description-color-by-field": "Użyj wartości koloru dla pola siostrzanego, aby pokolorować każdą wartość słupka.",
+      "description-x-label-max-length": "Etykiety osi X zostaną obcięte do podanej długości",
+      "name-bar-radius": "Promień słupka",
+      "name-bar-width": "Szerokość słupka",
+      "name-color-by-field": "Koloruj według pola",
+      "name-fill-opacity": "Nieprzezroczystość wypełnienia",
+      "name-full-highlight": "Podświetl cały obszar po najechaniu kursorem",
+      "name-gradient-mode": "Tryb gradientu",
+      "name-group-width": "Szerokość grupy",
+      "name-line-width": "Szerokość linii",
+      "name-orientation": "Orientacja",
+      "name-rotate-x-labels": "Obróć etykiety znaczników osi x",
+      "name-show-thresholds": "Pokaż progi",
+      "name-show-values": "Pokaż wartości",
+      "name-stacking": "Układanie",
+      "name-transform": "Przekształć",
+      "name-x-axis": "Oś X",
+      "name-x-label-max-length": "Maksymalna długość etykiety znacznika osi X",
+      "name-x-label-min-spacing": "Minimalny odstęp między etykietami na osi X",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-line-vertical": ""
+        "label-auto": "Automatycznie",
+        "label-horizontal": "Poziomo",
+        "label-line-vertical": "Pionowo"
       },
-      "placeholder-x-axis": "",
-      "placeholder-x-label-max-length": "",
+      "placeholder-x-axis": "Pierwszy ciąg znaków lub pole czasu",
+      "placeholder-x-label-max-length": "Brak",
       "show-values-options": {
-        "label-always": "",
-        "label-auto": "",
-        "label-never": ""
+        "label-always": "Zawsze",
+        "label-auto": "Automatycznie",
+        "label-never": "Nigdy"
       },
       "transform-options": {
-        "description-constant": "",
-        "description-negative-y": "",
-        "label-constant": "",
-        "label-negative-y": ""
+        "description-constant": "Pierwsza wartość zostanie wyświetlona jako linia stała",
+        "description-negative-y": "Odwróć wyniki na wartości ujemne na osi Y",
+        "label-constant": "Stała",
+        "label-negative-y": "Ujemna oś Y"
       }
     },
     "tick-spacing-editor": {
       "content-require-space-from-the-right-side": "Wymagaj spacji po prawej stronie",
       "gaps-options": {
-        "description-large": "",
-        "description-medium": "",
-        "description-none": "",
-        "description-small": "",
-        "label-large": "",
-        "label-medium": "",
-        "label-none": "",
-        "label-small": ""
+        "description-large": "Wymagaj odstępu {{spacing}}",
+        "description-medium": "Wymagaj odstępu {{spacing}}",
+        "description-none": "Pokaż wszystkie znaczniki",
+        "description-small": "Wymagaj odstępu {{spacing}}",
+        "label-large": "Duży",
+        "label-medium": "Średni",
+        "label-none": "Brak",
+        "label-small": "Mały"
       },
       "label-rtl": "RTL"
     }
   },
   "bargauge": {
     "bar-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automatycznie",
+      "label-manual": "Ręcznie"
     },
-    "category-bar-gauge": "",
-    "description-max-height": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-show-unfilled-area": "",
+    "category-bar-gauge": "Wskaźnik słupkowy",
+    "description-max-height": "Maksymalna wysokość wiersza (orientacja pozioma)",
+    "description-min-height": "Minimalna wysokość wiersza (orientacja pozioma)",
+    "description-min-width": "Minimalna szerokość kolumny (orientacja pionowa)",
+    "description-show-unfilled-area": "Po włączeniu tej opcji niewypełniony obszar jest wyświetlany na szaro",
     "display-mode-options": {
-      "label-basic": "",
-      "label-gradient": "",
-      "label-retro": ""
+      "label-basic": "Podstawowy",
+      "label-gradient": "Gradient",
+      "label-retro": "Retro LCD"
     },
-    "name-bar-size": "",
-    "name-display-mode": "",
-    "name-max-height": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-name-placement": "",
+    "name-bar-size": "Rozmiar słupka",
+    "name-display-mode": "Tryb wyświetlania",
+    "name-max-height": "Maks. wysokość",
+    "name-min-height": "Min. wysokość",
+    "name-min-width": "Min. szerokość",
+    "name-name-placement": "Umiejscowienie nazwy",
     "name-placement-options": {
-      "label-auto": "",
-      "label-hidden": "",
-      "label-left": "",
-      "label-top": ""
+      "label-auto": "Automatycznie",
+      "label-hidden": "Ukryte",
+      "label-left": "Po lewej",
+      "label-top": "U góry"
     },
-    "name-show-unfilled-area": "",
-    "name-value-display": "",
+    "name-show-unfilled-area": "Pokaż niewypełniony obszar",
+    "name-value-display": "Wyświetlanie wartości",
     "value-display-options": {
-      "label-hidden": "",
-      "label-text-color": "",
-      "label-value-color": ""
+      "label-hidden": "Ukryte",
+      "label-text-color": "Kolor tekstu",
+      "label-value-color": "Kolor wartości"
     }
   },
   "bookmarks-page": {
@@ -3512,8 +3512,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Zbiorcze usuwanie zasobów aprowizowanych",
+      "bulk-move-provisioned-resources": "Zbiorcze przenoszenie zasobów aprowizowanych",
       "cancel-button": "Anuluj",
       "confirmation-text": "Usuń",
       "delete-button": "Usuń",
@@ -3522,7 +3522,7 @@
       "delete-modal-restore-dashboards-text": "To działanie spowoduje natychmiastowe usunięcie wybranych folderów, ale wybrane pulpity zostaną oznaczone do usunięcia za 30 dni. Administrator organizacji może przywrócić pulpity w dowolnym momencie przed upływem 30 dni. Nie można przywrócić folderów.",
       "delete-modal-text": "To działanie spowoduje usunięcie następującej zawartości:",
       "delete-modal-title": "Usuń",
-      "delete-provisioned-folder": "",
+      "delete-provisioned-folder": "Usuń przydzielony folder",
       "deleting": "Usuwanie…",
       "manage-permissions-button": "Zarządzaj uprawnieniami",
       "move-button": "Przenieś",
@@ -3532,8 +3532,8 @@
       "move-modal-title": "Przenieś",
       "moving": "Przenoszenie…",
       "new-folder-name-required-phrase": "Wymagana jest nazwa folderu.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Wybrano zarówno zasoby udostępnione, jak i nieudostępnione. Nie można ich przetwarzać razem. Wybierz tylko zasoby udostępnione lub tylko zasoby nieudostępnione i spróbuj ponownie.",
+      "selected-mix-resources-modal-title": "Wybrano mieszane typy zasobów"
     },
     "actions": {
       "button-to-recently-deleted": "Ostatnio usunięte"
@@ -3546,27 +3546,27 @@
       "this-folder-is-empty": "Ten folder jest pusty"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_few": "",
-      "failed-alert_many": "",
-      "failed-alert_other": ""
+      "all-deleted": "Wszystkie zasoby zostały usunięte",
+      "all-moved": "Wszystkie zasoby zostały przeniesione",
+      "button-done": "Gotowe",
+      "progress-title": "Powodzenie",
+      "failed-alert_one": "{{count}} element zakończył się niepowodzeniem",
+      "failed-alert_few": "{{count}} elementy zakończyły się niepowodzeniem",
+      "failed-alert_many": "{{count}} elementów zakończyło się niepowodzeniem",
+      "failed-alert_other": "{{count}} elementu zakończyło się niepowodzeniem"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Anuluj",
+      "button-delete": "Usuń",
+      "button-deleting": "Usuwanie…",
+      "delete-warning": "Spowoduje to usunięcie wybranych folderów i ich elementów podrzędnych. Wpłynie to na następujące elementy:",
+      "error-path-not-found": "Nie znaleziono ścieżki"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Anuluj",
+      "button-move": "Przenieś",
+      "button-moving": "Przenoszenie…",
+      "deleting": "Usuwanie",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3574,14 +3574,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Nie znaleziono treści pliku",
+      "error-path-not-found": "Nie znaleziono ścieżki",
+      "error-target-folder-path-missing": "Brak ścieżki do folderu docelowego",
+      "error-title": "Błąd folderu docelowego",
+      "move-warning": "Spowoduje to przeniesienie wybranych folderów i ich elementów podrzędnych. Wpłynie to na następujące elementy:",
+      "moving": "Przenoszenie",
+      "progress": "Postęp: {{current}} z {{total}}",
+      "target-folder": "Folder docelowy"
     },
     "counts": {
       "alertRule_one": "{{count}} reguła alertu",
@@ -3617,12 +3617,12 @@
       "read-only-message": ""
     },
     "delete-provisioned-folder-form": {
-      "api-error": "",
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "success-message": ""
+      "api-error": "Nie udało się usunąć folderu",
+      "button-cancel": "Anuluj",
+      "button-delete": "Usuń",
+      "button-deleting": "Usuwanie…",
+      "delete-warning": "Spowoduje to usunięcie folderu i elementów po nim dziedziczących. Łącznie wpłynie to na następujące elementy:",
+      "success-message": "Folder został usunięty"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Nie można pobrać informacji o elemencie potomnym"
@@ -3647,7 +3647,7 @@
       "empty-message": "Nie znaleziono folderów",
       "error-title": "Błąd podczas ładowania folderów",
       "non-folder-item": "Element {{itemKind}} {{itemUID}} poza folderem",
-      "root-title": "",
+      "root-title": "Pulpity",
       "search-placeholder": "Przeszukaj foldery",
       "unknown-error": "Nieznany błąd"
     },
@@ -3676,7 +3676,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Podaj nazwę folderu",
       "label-folder-name": "Nazwa folderu",
       "text-pull-request-created": "Utworzono żądanie pull ze zmianami w tym folderze:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "Zostanie utworzony folder o nazwie {{folderName}}",
       "title-pull-request-created": "Utworzono żądanie pull",
       "title-this-repository-is-read-only": "To repozytorium jest tylko do odczytu"
     },
@@ -3685,52 +3685,52 @@
       "text": "Nie znaleziono wyników dla tego zapytania"
     },
     "restore": {
-      "success": ""
+      "success": "Przywrócono pulpit {{name}}"
     },
     "text-this-repository-is-read-only": "Jeśli masz bezpośredni dostęp do celu, skopiuj kod JSON i wklej go tam.",
     "trash-state-manager": {
       "label": {
-        "alphabetically-az": "",
-        "alphabetically-za": ""
+        "alphabetically-az": "Alfabetycznie (A–Z)",
+        "alphabetically-za": "Alfabetycznie (Z–A)"
       }
     }
   },
   "candlestick": {
     "additional-fields-options": {
-      "label-ignore": "",
-      "label-include": ""
+      "label-ignore": "Ignoruj",
+      "label-include": "Dołącz"
     },
     "candle-style-options": {
-      "label-candles": "",
-      "label-ohlc-bars": ""
+      "label-candles": "Świece",
+      "label-ohlc-bars": "Słupki OHLC"
     },
-    "category-candlestick": "",
+    "category-candlestick": "Świeca",
     "color-strategy-options": {
-      "label-since-open": "",
-      "label-since-prior-close": ""
+      "label-since-open": "Od otwarcia",
+      "label-since-prior-close": "Od poprzedniego zamknięcia"
     },
-    "description-additional-fields": "",
-    "description-close": "",
-    "description-high": "",
-    "description-low": "",
-    "description-open": "",
-    "description-volume": "",
+    "description-additional-fields": "Użyj standardowych opcji szeregów czasowych, aby skonfigurować pola niezmapowane powyżej",
+    "description-close": "Stan na koniec okresu",
+    "description-high": "Maksymalna wartość w okresie",
+    "description-low": "Minimalna wartość w okresie",
+    "description-open": "Stan na początek okresu",
+    "description-volume": "Liczba próbek w okresie",
     "mode-options": {
-      "label-both": "",
-      "label-candles": "",
-      "label-volume": ""
+      "label-both": "Oba",
+      "label-candles": "Świece",
+      "label-volume": "Wolumen"
     },
-    "name-additional-fields": "",
-    "name-candle-style": "",
-    "name-close": "",
-    "name-color-strategy": "",
-    "name-down-color": "",
-    "name-high": "",
-    "name-low": "",
-    "name-mode": "",
-    "name-open": "",
-    "name-up-color": "",
-    "name-volume": ""
+    "name-additional-fields": "Dodatkowe pola",
+    "name-candle-style": "Styl świecy",
+    "name-close": "Zamknij",
+    "name-color-strategy": "Strategia kolorów",
+    "name-down-color": "Dolny kolor",
+    "name-high": "Wysoki",
+    "name-low": "Niski",
+    "name-mode": "Tryb",
+    "name-open": "Otwórz",
+    "name-up-color": "Górny kolor",
+    "name-volume": "Wolumen"
   },
   "canvas": {
     "apieditor": {
@@ -3745,18 +3745,18 @@
       }
     },
     "button-item": {
-      "category-button": "",
+      "category-button": "Przycisk",
       "label": {
         "center": "Wyśrodkuj",
         "left": "Po lewej",
         "right": "Po prawej"
       },
-      "name-align-text": "",
-      "name-api": "",
-      "name-style": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
+      "name-align-text": "Wyrównaj tekst",
+      "name-api": "API",
+      "name-style": "Styl",
+      "name-text": "Tekst",
+      "name-text-color": "Kolor tekstu",
+      "name-text-size": "Rozmiar tekstu",
       "placeholder": {
         "auto": "Automatycznie"
       }
@@ -3783,21 +3783,21 @@
         }
       }
     },
-    "category-arrow-direction": "",
-    "category-background": "",
-    "category-border": "",
-    "category-canvas": "",
-    "category-color": "",
-    "category-data-links": "",
-    "category-line-style": "",
-    "category-metric-value": "",
-    "category-radius": "",
-    "category-selected-connection": "",
-    "category-selected-element": "",
-    "category-size": "",
-    "category-tooltip": "",
+    "category-arrow-direction": "Kierunek strzałki",
+    "category-background": "Tło",
+    "category-border": "Obramowanie",
+    "category-canvas": "Kanwa",
+    "category-color": "Kolor",
+    "category-data-links": "Połączenia danych i działania",
+    "category-line-style": "Styl linii",
+    "category-metric-value": "Wartość metryczna",
+    "category-radius": "Promień",
+    "category-selected-connection": "Wybrane połączenie",
+    "category-selected-element": "Wybrany element ({{element}})",
+    "category-size": "Rozmiar",
+    "category-tooltip": "Podpowiedź",
     "cloud-item": {
-      "category-cloud": "",
+      "category-cloud": "Cloud",
       "label": {
         "bottom": "Na dole",
         "center": "Wyśrodkuj",
@@ -3806,47 +3806,47 @@
         "right": "Po prawej",
         "top": "U góry"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Wyrównaj tekst",
+      "name-text": "Tekst",
+      "name-text-color": "Kolor tekstu",
+      "name-text-size": "Rozmiar tekstu",
+      "name-vertical-align": "Wyrównanie w pionie",
       "placeholder": {
         "auto": "Automatycznie"
       }
     },
-    "description-experimental-types": "",
-    "description-inline-editing": "",
-    "description-pan-zoom": "",
+    "description-experimental-types": "Włącz wybór eksperymentalnych typów elementów",
+    "description-inline-editing": "Włącz bezpośrednią edycję panelu",
+    "description-pan-zoom": "Włącz przesuwanie i powiększanie",
     "direction-options": {
-      "label-both": "",
-      "label-forward": "",
-      "label-none": "",
-      "label-reverse": ""
+      "label-both": "Oba",
+      "label-forward": "Do przodu",
+      "label-none": "Brak",
+      "label-reverse": "Odwróć"
     },
     "drone-front-item": {
-      "category-drone-front": "",
-      "name-roll-angle": ""
+      "category-drone-front": "Dron – przód",
+      "name-roll-angle": "Kąt wznoszenia"
     },
     "drone-side-item": {
-      "category-drone-side": "",
-      "name-pitch-angle": ""
+      "category-drone-side": "Dron – bok",
+      "name-pitch-angle": "Nachylenie łopat"
     },
     "drone-top-item": {
-      "category-drone-top": "",
-      "name-back-left-rotor-rpm": "",
-      "name-back-right-rotor-rpm": "",
-      "name-front-left-rotor-rpm": "",
-      "name-front-right-rotor-rpm": "",
-      "name-yaw-angle": ""
+      "category-drone-top": "Dron – góra",
+      "name-back-left-rotor-rpm": "Obroty tylnego lewego wirnika",
+      "name-back-right-rotor-rpm": "Obroty tylnego prawego wirnika",
+      "name-front-left-rotor-rpm": "Obroty przedniego lewego wirnika",
+      "name-front-right-rotor-rpm": "Obroty przedniego prawego wirnika",
+      "name-yaw-angle": "Kąt odchylenia"
     },
     "element-editor": {
-      "category-layout": "",
-      "description-unsupported": "",
-      "name-quick-placement": ""
+      "category-layout": "Układ",
+      "description-unsupported": "Wybrany typ elementu nie jest obsługiwany przez obecne ustawienia. Włącz zaawansowane typy elementów.",
+      "name-quick-placement": "Szybkie umiejscowienie"
     },
     "ellipse-item": {
-      "category-ellipse": "",
+      "category-ellipse": "Elipsa",
       "label": {
         "bottom": "Na dole",
         "center": "Wyśrodkuj",
@@ -3855,50 +3855,50 @@
         "right": "Po prawej",
         "top": "U góry"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Wyrównaj tekst",
+      "name-text": "Tekst",
+      "name-text-color": "Kolor tekstu",
+      "name-text-size": "Rozmiar tekstu",
+      "name-vertical-align": "Wyrównanie w pionie",
       "placeholder": {
         "auto": "Automatycznie"
       }
     },
     "icon-item": {
-      "category-icon": "",
-      "name-fill-color": "",
-      "name-svg-path": ""
+      "category-icon": "Ikona",
+      "name-fill-color": "Kolor wypełnienia",
+      "name-svg-path": "Ścieżka SVG"
     },
     "inline-edit": {
       "canvas-inline-editor": "Wbudowany edytor kanwy",
       "tooltip-close-inline-editor": "Zamknij wbudowany edytor"
     },
     "inline-edit-body": {
-      "category-selected-element": "",
+      "category-selected-element": "Wybrany element ({{element}})",
       "label-add-item": "Dodaj element",
       "please-select-an-element": "Wybierz element"
     },
-    "label-actions": "",
-    "label-color": "",
-    "label-direction": "",
-    "label-image": "",
-    "label-image-size": "",
-    "label-line-style": "",
-    "label-links": "",
-    "label-radius": "",
-    "label-size": "",
-    "label-width": "",
+    "label-actions": "Działania",
+    "label-color": "Kolor",
+    "label-direction": "Kierunek",
+    "label-image": "Obraz",
+    "label-image-size": "Rozmiar obrazu",
+    "label-line-style": "Styl linii",
+    "label-links": "Linki",
+    "label-radius": "Promień",
+    "label-size": "Rozmiar",
+    "label-width": "Szerokość",
     "layer-editor": {
-      "category-layer": "",
-      "category-layout": "",
-      "name-constraints": "",
-      "name-elements": ""
+      "category-layer": "Warstwa",
+      "category-layout": "Układ",
+      "name-constraints": "Ograniczenia",
+      "name-elements": "Elementy"
     },
     "line-style-editor": {
       "label-animate": "Animacja"
     },
     "line-style-options": {
-      "label-solid": ""
+      "label-solid": "Stan stały"
     },
     "metric-value-item": {
       "label": {
@@ -3913,14 +3913,14 @@
         "auto": "Automatycznie"
       }
     },
-    "name-align-text": "",
-    "name-color": "",
-    "name-experimental-types": "",
-    "name-inline-editing": "",
-    "name-pan-zoom": "",
-    "name-text": "",
-    "name-text-size": "",
-    "name-vertical-align": "",
+    "name-align-text": "Wyrównaj tekst",
+    "name-color": "Kolor tekstu",
+    "name-experimental-types": "Eksperymentalne typy elementów",
+    "name-inline-editing": "Edycja bezpośrednia",
+    "name-pan-zoom": "Przesuwanie i powiększanie",
+    "name-text": "Tekst",
+    "name-text-size": "Rozmiar tekstu",
+    "name-vertical-align": "Wyrównanie w pionie",
     "not-found-display": {
       "not-found": "<0>Nie znaleziono: </0><config />"
     },
@@ -3933,7 +3933,7 @@
       "zoom-scroll-wheel": "Powiększenie: kółko myszy"
     },
     "parallelogram-item": {
-      "category-parallelogram": "",
+      "category-parallelogram": "Równoległobok",
       "label": {
         "bottom": "Na dole",
         "center": "Wyśrodkuj",
@@ -3942,11 +3942,11 @@
         "right": "Po prawej",
         "top": "U góry"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Wyrównaj tekst",
+      "name-text": "Tekst",
+      "name-text-color": "Kolor tekstu",
+      "name-text-size": "Rozmiar tekstu",
+      "name-vertical-align": "Wyrównanie w pionie",
       "placeholder": {
         "auto": "Automatycznie"
       }
@@ -3959,21 +3959,21 @@
     },
     "placement-editor": {
       "horizontal-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-left-and-right": "",
-        "label-right": "",
-        "label-scale": ""
+        "label-center": "Pośrodku",
+        "label-left": "Po lewej",
+        "label-left-and-right": "Lewa i prawa",
+        "label-right": "Po prawej",
+        "label-scale": "Skala"
       },
       "label-constraints": "Ograniczenia",
       "label-position": "Pozycja",
       "loading": "Ładowanie…",
       "vertical-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-scale": "",
-        "label-top": "",
-        "label-top-and-bottom": ""
+        "label-bottom": "Na dole",
+        "label-center": "Pośrodku",
+        "label-scale": "Skala",
+        "label-top": "U góry",
+        "label-top-and-bottom": "Góra i dół"
       }
     },
     "quick-positioning": {
@@ -3985,7 +3985,7 @@
       "tooltip-align-vertical-centers": "Wyrównaj do środka w pionie"
     },
     "rectangle-item": {
-      "category-rectangle": "",
+      "category-rectangle": "Prostokąt",
       "label": {
         "bottom": "Na dole",
         "center": "Wyśrodkuj",
@@ -3994,33 +3994,33 @@
         "right": "Po prawej",
         "top": "U góry"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Wyrównaj tekst",
+      "name-text": "Tekst",
+      "name-text-color": "Kolor tekstu",
+      "name-text-size": "Rozmiar tekstu",
+      "name-vertical-align": "Wyrównanie w pionie",
       "placeholder": {
         "auto": "Automatycznie"
       }
     },
     "server-item": {
-      "category-server": "",
-      "name-blink-rate": "",
-      "name-bulb-color": "",
-      "name-status-color": "",
-      "name-type": "",
+      "category-server": "Serwer",
+      "name-blink-rate": "Częstotliwość migania [Hz] (0 = wyłączone)",
+      "name-bulb-color": "Kolor światła",
+      "name-status-color": "Kolor statusu",
+      "name-type": "Typ",
       "type-options": {
-        "label-database": "",
-        "label-single": "",
-        "label-stack": "",
-        "label-terminal": ""
+        "label-database": "Baza danych",
+        "label-single": "Pojedyncza",
+        "label-stack": "Stos",
+        "label-terminal": "Terminal"
       }
     },
     "text-display": {
       "double-click-to-set": "Kliknij dwukrotnie, aby ustawić tekst"
     },
     "text-item": {
-      "category-text": "",
+      "category-text": "Tekst",
       "label": {
         "bottom": "Na dole",
         "center": "Wyśrodkuj",
@@ -4029,20 +4029,20 @@
         "right": "Po prawej",
         "top": "U góry"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Wyrównaj tekst",
+      "name-text": "Tekst",
+      "name-text-color": "Kolor tekstu",
+      "name-text-size": "Rozmiar tekstu",
+      "name-vertical-align": "Wyrównanie w pionie",
       "placeholder": {
         "auto": "Automatycznie"
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Tryb podpowiedzi",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Wyłączony",
+        "label-enabled": "Włączony"
       }
     },
     "tree-navigation-editor": {
@@ -4062,7 +4062,7 @@
       "tooltip-remove": "Usuń"
     },
     "triangle-item": {
-      "category-triangle": "",
+      "category-triangle": "Trójkąt",
       "label": {
         "bottom": "Na dole",
         "center": "Wyśrodkuj",
@@ -4071,18 +4071,18 @@
         "right": "Po prawej",
         "top": "U góry"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Wyrównaj tekst",
+      "name-text": "Tekst",
+      "name-text-color": "Kolor tekstu",
+      "name-text-size": "Rozmiar tekstu",
+      "name-vertical-align": "Wyrównanie w pionie",
       "placeholder": {
         "auto": "Automatycznie"
       }
     },
     "wind-turbine-item": {
-      "category-wind-turbine": "",
-      "name-rpm": ""
+      "category-wind-turbine": "Turbina wiatrowa",
+      "name-rpm": "Obr./min"
     }
   },
   "carousel": {
@@ -4099,8 +4099,8 @@
   "close-button": {
     "tooltip": "Zamknij"
   },
-  "cloud-enterprise-feature-badge": "",
-  "cloud-feature-badge": "",
+  "cloud-enterprise-feature-badge": "Cloud i Enterprise",
+  "cloud-feature-badge": "Cloud",
   "combobox": {
     "async": {
       "error": "Podczas ładowania opcji wystąpił błąd."
@@ -4411,7 +4411,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Uruchom zapytanie"
     }
   },
   "dashboard": {
@@ -4574,7 +4574,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Kontynuuj"
         },
         "title": {
           "proceed-to-external-site": "Przejść do witryny zewnętrznej?"
@@ -4671,7 +4671,7 @@
       }
     },
     "description": {
-      "action": ""
+      "action": "Zmień opis pulpitu"
     },
     "dynamic-config-value-editor": {
       "render-label": {
@@ -4680,17 +4680,17 @@
     },
     "edit-actions": {
       "add": "Dodaj: {{typeName}}",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
-      "move": "",
+      "add-conditional-rule": "Dodaj regułę {{ruleDescription}}",
+      "duplicate-panel": "Duplikuj panel",
+      "edit-query-result-rule": "Zmień regułę wyniku zapytania",
+      "edit-template-variable-rule": "Zmień regułę zmiennej szablonu",
+      "edit-time-range-rule": "Zmień regułę zakresu czasu",
+      "move": "Przenieś {{typeName}}",
       "panel-background": "Zmień tło panelu",
       "panel-description": "Zmień opis panelu",
-      "panel-max-repeats-per-row": "",
+      "panel-max-repeats-per-row": "Maks. liczba powtórzeń na wiersz",
       "panel-repeat-direction": "Powtórz kierunek",
-      "panel-repeat-variable": "",
+      "panel-repeat-variable": "Powtórz panel wg",
       "panel-title": "Zmień tytuł panelu",
       "paste-panel": "Wklej panel",
       "remove": "Usuń: {{typeName}}",
@@ -4699,7 +4699,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Pulpit",
-        "element": "",
+        "element": "Element",
         "local-variable": "Zmienna lokalna",
         "multiple-elements": "Wiele elementów",
         "multiple-elements-delete-text": "Czy na pewno chcesz usunąć te elementy?",
@@ -4781,10 +4781,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Eksportuj pulpit"
       },
       "menu": {
-        "label": ""
+        "label": "Menu eksportu pulpitu"
       }
     },
     "fetch-dashboard": {
@@ -4806,9 +4806,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Domyślne",
+          "shared-crosshair": "Udostępniony krzyżyk",
+          "shared-tooltip": "Udostępniona podpowiedź"
         }
       }
     },
@@ -4825,7 +4825,7 @@
     "get-field-override-categories": {
       "label-add-field-override": "Dodaj zastąpienie pola",
       "label-add-override-property": "Dodaj zastąpienie właściwości",
-      "override-name": "",
+      "override-name": "Zastąp {{overrideNum}}",
       "title": {
         "add-button": "dodaj przycisk"
       }
@@ -4861,14 +4861,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Nie wysyłaj danych adnotacji do następujących paneli",
+        "annotation-panels-support-annotations": "Wyślij dane adnotacji do wszystkich paneli, które obsługują adnotacje",
+        "annotations-explicitly-listed-panels": "Wyślij adnotacje do wyraźnie wymienionych paneli"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Wszystkie panele",
+        "all-panels-except": "Wszystkie panele z wyjątkiem",
+        "selected-panels": "Wybrane panele"
       }
     },
     "get-panel-frame-category": {
@@ -5056,7 +5056,7 @@
       "title-matched_other": "Dopasowano {{count}}/{{totalCount}} opcji"
     },
     "outline": {
-      "repeated-item": "",
+      "repeated-item": "Powtórz",
       "tree-item": {
         "empty": "(puste)",
         "no-title": "<bez tytułu>"
@@ -5132,7 +5132,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Czy na pewno chcesz przywrócić pulpit w wersji {{version}}? Wszystkie niezapisane zmiany zostaną utracone.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Tak, przywróć wersję {{version}}",
       "title-restore-version": "Przywróć wersję"
     },
     "row-options-button": {
@@ -5184,7 +5184,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Pulpit został zapisany"
     },
     "save-dashboard-as-button": {
       "save-as": "Zapisz jako"
@@ -5214,13 +5214,13 @@
       "label-changes": "Zmiany",
       "label-details": "Szczegóły",
       "title": "Zapisz pulpit",
-      "title-copy": "",
-      "title-provisioned": ""
+      "title-copy": "Zapisz kopię pulpitu",
+      "title-provisioned": "Pulpit aprowizowany"
     },
     "save-dashboard-error-proxy": {
       "body-name-exists": "W wybranym folderze istnieje już pulpit o tej samej nazwie.<1></1><2>Czy nadal chcesz zapisać ten pulpit?</2>",
       "body-version-mismatch": "Ktoś inny zaktualizował ten pulpit<1></1><2>Czy nadal chcesz zapisać ten pulpit?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Zapisz i zastąp",
       "title-name-exists": "Konflikt",
       "title-version-mismatch": "Konflikt"
     },
@@ -5293,7 +5293,7 @@
       }
     },
     "title": {
-      "action": ""
+      "action": "Zmień tytuł pulpitu"
     },
     "toolbar": {
       "add": "Dodaj",
@@ -5417,9 +5417,9 @@
       "label-apply-transformation-to": "Zastosuj transformację do"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Pamiętaj, że usunięcie jednej transformacji może spowodować uszkodzenie innych. Jeśli istnieje tylko jedna transformacja, powrócisz do głównego ekranu wyboru.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Usuń",
         "title-debug": "Debugowanie",
         "title-disable-transformation": "Wyłącz transformację",
         "title-filter": "Filtr",
@@ -5440,16 +5440,16 @@
       "placeholder-search-for-transformation": "Szukaj transformacji",
       "show-images": "Pokaż obrazki",
       "title-add-another-transformation": "Dodaj inną transformację",
-      "view-all": ""
+      "view-all": "Wyświetl wszystko"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Po usunięciu wszystkich transformacji nastąpi powrót do głównego ekranu wyboru."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Dodaj inną transformację"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Usuń wszystkie",
       "delete-all-transformations": "Usuń wszystkie transformacje",
       "title-delete-all-transformations": "Usunąć wszystkie transformacje?",
       "tooltip-clear-search": "Wyczyść wyszukiwanie",
@@ -5479,16 +5479,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Zmień opis zmiennej"
       },
       "hide": {
-        "action": ""
+        "action": "Zmień opcję ukrywania zmiennej"
       },
       "label": {
-        "action": ""
+        "action": "Zmień etykietę zmiennej"
       },
       "name": {
-        "action": ""
+        "action": "Zmień nazwę zmiennej"
       }
     },
     "version-history-comparison": {
@@ -5500,7 +5500,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Przełącz wybór wersji {{version}}",
       "date": "Data",
-      "name-latest": "",
+      "name-latest": "Najnowsze",
       "notes": "Uwagi",
       "restore": "Przywróć",
       "updated-by": "Zaktualizowane przez",
@@ -5578,7 +5578,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Podaj wymiary jako wartości rozdzielone przecinkami: {{name}}, {{value}}",
       "label-data-source": "Źródło danych",
       "label-use-static-key-dimensions": "Użyj statycznych wymiarów klucza",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Zezwalaj na wartości niestandardowe"
     },
     "add-to-dashboard": {
       "message": {
@@ -5652,7 +5652,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Cofnij upublicznienie adresu URL"
       },
       "title": {
         "revoke-public-url": "Cofnij upublicznienie URL"
@@ -5665,7 +5665,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opcje niestandardowe",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Wartości rozdzielone przecinkami",
       "selection-options": "Opcje wyboru"
     },
     "dashboard-edit-pane-renderer": {
@@ -5686,8 +5686,8 @@
       "label-with-tags": "Z tagami",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Pulpity",
+          "link": "Link"
         }
       },
       "placeholder-open-dashboard": "Otwórz pulpit"
@@ -5730,8 +5730,8 @@
       "data-source-options": "Opcje źródła danych",
       "description-instance-name-filter": "Filtr wyrażeń regularnych, w przypadku których instancje źródeł danych należy wybrać z listy wartości zmiennych. Pozostaw puste dla wszystkich.",
       "example-instance-name-filter": "Przykład: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Filtr nazwy instancji",
+      "name-type": "Typ",
       "selection-options": "Opcje wyboru"
     },
     "default-grid-layout-manager": {
@@ -5742,12 +5742,12 @@
       }
     },
     "delete-provisioned-dashboard-form": {
-      "api-error": "",
+      "api-error": "Nie udało się usunąć pulpitu",
       "cancel-action": "Anuluj",
       "delete-action": "Usuń pulpit",
       "deleting": "Usuwanie…",
-      "drawer-title": "",
-      "success-message": ""
+      "drawer-title": "Usuń pulpit aprowizowany",
+      "success-message": "Pulpit został usunięty"
     },
     "description-label": {
       "description": "Opis"
@@ -5776,15 +5776,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Możliwość edycji",
+          "readonly": "Tylko do odczytu"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Domyślny",
+          "shared-crosshair": "Udostępniony krzyżyk",
+          "shared-tooltip": "Udostępniona podpowiedź"
         }
       }
     },
@@ -5796,36 +5796,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Dodaj filtry par klucz-wartość w czasie rzeczywistym",
+        "dynamically-switch-source-multiple-panels": "Dynamiczne przełączanie źródła danych dla wielu paneli",
+        "group": "Dodaj klucze do grupowania w czasie rzeczywistym",
+        "hidden-constant-variable": "Ukryta zmienna stała, przydatna do prefiksów metrycznych w przypadku pulpitów, które chcesz udostępnić",
+        "users-enter-arbitrary-strings-textbox": "Użytkownicy mogą wprowadzać dowolne ciągi w polu tekstowym",
+        "values-are-static-and-defined-manually": "Wartości są statyczne i definiowane ręcznie",
+        "values-fetched-source-query": "Wartości są pobierane z zapytania dotyczącego źródła danych",
+        "values-timespans": "Wartości to przedziały czasowe, np. 1m, 1h, 1d"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Filtry ad hoc",
+        "constant": "Stała",
+        "custom": "Niestandardowa",
+        "data-source": "Źródło danych",
+        "group-by": "Grupuj według",
+        "interval": "Odstęp czasu",
+        "query": "Zapytanie",
+        "textbox": "Pole tekstowe"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Nie wysyłaj danych adnotacji do następujących paneli",
+        "annotation-panels-support-annotations": "Wyślij dane adnotacji do wszystkich paneli, które obsługują adnotacje",
+        "annotations-explicitly-listed-panels": "Wyślij adnotacje do wyraźnie wymienionych paneli"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Wszystkie panele",
+        "all-panels-except": "Wszystkie panele z wyjątkiem",
+        "selected-panels": "Wybrane panele"
       }
     },
     "get-panel-frame-options": {
@@ -5853,7 +5853,7 @@
       "group-by-options": "Grupuj według opcji",
       "label-data-source": "Źródło danych",
       "label-use-static-group-by-dimensions": "Użyj statycznych wymiarów grupy",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Zezwalaj na wartości niestandardowe"
     },
     "help-wizard": {
       "copy-to-clipboard": "Kopiuj do schowka",
@@ -5889,14 +5889,14 @@
       "apply": "Zastosuj"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Dynamicznie oblicza odstęp czasu, dzieląc zakres przez określoną liczbę",
       "description-calculated-value-below-threshold": "Obliczona wartość nie spadnie poniżej tego progu",
       "description-step-count": "Ile razy należy podzielić bieżący zakres czasu, aby obliczyć wartość",
       "interval-options": "Opcje odstępu czasu",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Opcja automatyczna",
+      "name-min-interval": "Minimalny odstęp czasu",
+      "name-step-count": "Liczba kroków",
+      "name-values": "Wartości"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5919,19 +5919,19 @@
       "usage-count_other": "Używane na {{count}} pulpitach"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Błąd podczas przenoszenia pulpitu",
+      "api-error": "Nie udało się przenieść pulpitu",
+      "cancel-action": "Anuluj",
+      "current-file-not-found": "Nie znaleziono bieżącego pliku pulpitu",
+      "drawer-title": "Przenoszenie pulpitu aprowizowanego",
+      "file-load-error": "Błąd wczytywania pulpitu",
+      "loading-file-data": "Wczytywanie danych pulpitu",
+      "move-action": "Przenieś pulpit",
+      "move-read-only-message": "Nie można przenieść tego pulpitu bezpośrednio z Grafany, ponieważ repozytorium jest tylko do odczytu. Aby przenieść ten pulpit, przenieś plik w repozytorium Git.",
+      "moving": "Przenoszenie…",
+      "success-message": "Pulpit został przeniesiony",
+      "target-path-label": "Ścieżka docelowa",
+      "title-this-repository-is-read-only": "To repozytorium jest tylko do odczytu"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "W wybranym folderze istnieje już pulpit o tej samej nazwie. Czy nadal chcesz zapisać ten pulpit?",
@@ -5939,7 +5939,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Kontynuuj"
       },
       "title": {
         "proceed-to-external-site": "Przejść do witryny zewnętrznej?"
@@ -5954,7 +5954,7 @@
       }
     },
     "panel-data-alerting-tab": {
-      "tab-label": ""
+      "tab-label": "Alert"
     },
     "panel-data-alerting-tab-rendered": {
       "alert": {
@@ -5965,19 +5965,19 @@
       "title-dashboard-not-saved": "Nie zapisano pulpitu"
     },
     "panel-data-queries-tab": {
-      "tab-label": ""
+      "tab-label": "Zapytania"
     },
     "panel-data-queries-tab-rendered": {
       "add-query": "Dodaj zapytanie",
       "expression": "Wyrażenie "
     },
     "panel-data-transformations-tab": {
-      "tab-label": ""
+      "tab-label": "Transformacje"
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Dodaj inną transformację",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Po usunięciu wszystkich transformacji nastąpi powrót do głównego ekranu wyboru.",
+      "confirmText-delete-all": "Usuń wszystkie",
       "delete-all-transformations": "Usuń wszystkie transformacje",
       "title-delete-all-transformations": "Usunąć wszystkie transformacje?"
     },
@@ -6030,13 +6030,13 @@
       "description-examples": "Nazwane grupy rejestracji mogą być używane do oddzielania wyświetlanego tekstu i wartości (<1>patrz przykłady</1>).",
       "description-optional": "Opcjonalnie pozwalają wyodrębnić część nazwy serii lub segmentu węzła metryki.",
       "label-data-source": "Źródło danych",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Sortowanie opcji statycznych",
       "label-target-data-source": "Docelowe źródło danych",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Użyj opcji statycznych",
+      "name-regex": "Wyrażenie regularne",
       "query-options": "Opcje zapytania",
       "selection-options": "Opcje wyboru",
-      "static-options-legend": ""
+      "static-options-legend": "Opcje statyczne"
     },
     "resource-export": {
       "label": {
@@ -6049,7 +6049,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Czy na pewno chcesz przywrócić pulpit w wersji {{version}}? Wszystkie niezapisane zmiany zostaną utracone.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Tak, przywróć wersję {{version}}",
       "title-restore-version": "Przywróć wersję"
     },
     "save-button": {
@@ -6068,15 +6068,15 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Nie udało się zapisać pulpitu"
       },
-      "required": ""
+      "required": "Wymagane"
     },
     "save-dashboard-drawer": {
       "tabs": {
         "label-changes": "Zmiany",
         "label-details": "Szczegóły",
         "title": "Zapisz pulpit",
-        "title-copy": "",
-        "title-provisioned": ""
+        "title-copy": "Zapisz kopię pulpitu",
+        "title-provisioned": "Pulpit aprowizowany"
       }
     },
     "save-dashboard-form": {
@@ -6095,8 +6095,8 @@
         "title-someone-else-has-updated-this-dashboard": "Ktoś inny zaktualizował ten pulpit",
         "would-still-dashboard": "Czy nadal chcesz zapisać ten pulpit?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "Ze względu na ograniczenia w nowym schemacie pulpitu (V2) podczas eksportu zewnętrznego panele biblioteki zostaną przekonwertowane na zwykłe panele z osadzoną zawartością.",
+      "schema-v2-library-panels-export-title": "Panele biblioteki zostaną przekonwertowane na zwykłe panele",
       "title-dashboard-drastically-changed": "Pulpit został nieodwracalnie zmieniony"
     },
     "save-dashboard-form-common-options": {
@@ -6145,10 +6145,10 @@
       "description-enables-multiple-values-selected": "Umożliwia wybór wielu wartości jednocześnie",
       "description-enables-option-include-variables": "Włącza opcję uwzględniania wszystkich wartości",
       "description-enables-users-custom-values": "Umożliwia użytkownikom dodawanie niestandardowych wartości do listy",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Zezwalaj na wartości niestandardowe",
+      "name-custom-all-value": "Niestandardowe – wszystkie wartości",
+      "name-include-all-option": "Opcja Uwzględnij wszystkie",
+      "name-multi-value": "Wiele wartości"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Przełącz menu udostępniania"
@@ -6169,7 +6169,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Domyślna wartość"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opcjonalnie)",
@@ -6194,8 +6194,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Jeśli odłączysz ten panel, będzie można go edytować bez wpływu na inne pulpity nawigacyjne. Jednak po dokonaniu zmiany nie będzie można przywrócić oryginalnego panelu wielokrotnego użytku.",
+      "confirmText-yes-unlink": "Tak, odłącz",
       "title-really-unlink-panel": "Czy na pewno chcesz odłączyć ten panel?"
     },
     "unsaved-changes-modal": {
@@ -6213,7 +6213,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Pulpit został zapisany"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Do tej zmiennej nie odwołuje się żadna zmienna ani pulpit.",
@@ -6225,15 +6225,15 @@
       "aria-label-variable-editor-form": "Formularz edytora zmiennych",
       "back-to-list": "Powrót do listy",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Usuń zmienną"
       },
       "delete": "Usuń",
       "description-optional-display-name": "Opcjonalna nazwa wyświetlana",
       "description-template-variable-characters": "Nazwa zmiennej szablonu. (maks. 50 znaków)",
       "general": "Ogólne",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Opis",
+      "name-label": "Etykieta",
+      "name-name": "Nazwa",
       "placeholder-descriptive-text": "Tekst opisowy",
       "placeholder-label-name": "Nazwa etykiety",
       "placeholder-variable-name": "Nazwa zmiennej",
@@ -6248,8 +6248,8 @@
       "variable": "Zmienna"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Czy na pewno chcesz usunąć zmienną {{variable}}?",
+      "confirmText-delete-variable": "Usuń zmienną",
       "title-delete-variable": "Usuń zmienną",
       "tooltip-duplicate-variable": "Duplikuj zmienną",
       "tooltip-remove-variable": "Usuń zmienną"
@@ -6257,15 +6257,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Etykieta",
+          "nothing": "Nic",
+          "variable": "Zmienna"
         }
       },
       "label": "Ukryj"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Typ zmiennej"
     },
     "variable-usages-button": {
       "title-show-usages": "Pokazuje użycie dla: {{variableId}}",
@@ -6293,7 +6293,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Przełącz wybór wersji {{version}}",
       "date": "Data",
-      "name-latest": "",
+      "name-latest": "Najnowsze",
       "notes": "Uwagi",
       "restore": "Przywróć",
       "updated-by": "Zaktualizowane przez",
@@ -6400,18 +6400,18 @@
     }
   },
   "dashlist": {
-    "category-dashboard-list": "",
-    "name-folder": "",
-    "name-include-current-template-variables": "",
-    "name-include-current-time-range": "",
-    "name-max-items": "",
-    "name-query": "",
-    "name-recently-viewed": "",
-    "name-search": "",
-    "name-show-folder-names": "",
-    "name-show-headings": "",
-    "name-starred": "",
-    "name-tags": ""
+    "category-dashboard-list": "Lista pulpitów",
+    "name-folder": "Folder",
+    "name-include-current-template-variables": "Uwzględnij bieżące wartości zmiennych szablonu",
+    "name-include-current-time-range": "Uwzględnij bieżący zakres czasu",
+    "name-max-items": "Maks. liczba elementów",
+    "name-query": "Zapytanie",
+    "name-recently-viewed": "Ostatnio wyświetlane",
+    "name-search": "Szukaj",
+    "name-show-folder-names": "Pokaż nazwy folderów",
+    "name-show-headings": "Pokaż nagłówki",
+    "name-starred": "Oznaczone gwiazdką",
+    "name-tags": "Tagi"
   },
   "data-source-list": {
     "empty-state": {
@@ -6675,16 +6675,16 @@
   "dimensions": {
     "background-size-editor": {
       "options": {
-        "label-contain": "",
-        "label-cover": "",
-        "label-fill": "",
-        "label-original": "",
-        "label-tile": ""
+        "label-contain": "Zawiera",
+        "label-cover": "Pokrywa się",
+        "label-fill": "Wypełnienie",
+        "label-original": "Oryginał",
+        "label-tile": "Kafelek"
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": "",
-      "noOptionsMessage-no-fields-found": ""
+      "label-fixed-color": "Stały kolor",
+      "noOptionsMessage-no-fields-found": "Nie znaleziono pól"
     },
     "file-dropzone-custom-children": {
       "upload": "Prześlij"
@@ -6698,10 +6698,10 @@
       "placeholder-search": "Szukaj"
     },
     "resource-dimension-editor": {
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Użyj wyniku pola ciągu",
+      "description-fixed": "Stała wartość",
       "label-field": "Pole",
-      "label-fixed": "",
+      "label-fixed": "Stałe",
       "label-mappings": "Mapowania",
       "label-source": "Źródło"
     },
@@ -6719,35 +6719,35 @@
     },
     "scalar-dimension-editor": {
       "fixed-value-options": {
-        "label-fixed-values": ""
+        "label-fixed-values": "Stała wartość"
       },
       "label-limit": "Limit",
       "label-value": "Wartość",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Nie znaleziono pól",
       "scalar-options": {
-        "description-clamped": "",
-        "description-mod": "",
-        "label-clamped": "",
-        "label-mod": ""
+        "description-clamped": "Użyj wartości pól zablokowanych do maksimum i minimum",
+        "description-mod": "Użyj wartości pola, mod z maks.",
+        "label-clamped": "Zablokowane",
+        "label-mod": "Mod"
       }
     },
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Stała wartość"
         }
       },
       "label-max": "Maks.",
       "label-min": "Min.",
       "label-value": "Wartość",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Nie znaleziono pól"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Wyświetl wartość pola",
+      "description-fixed": "Stała wartość",
       "label-field": "Pole",
-      "label-fixed": "",
+      "label-fixed": "Stałe",
       "label-source": "Źródło",
       "label-template": "Szablon",
       "label-value": "Wartość"
@@ -6761,16 +6761,16 @@
       "description-percentage-means-thresholds-relative": "Wartości procentowe oznaczają progi względem wartości minimalnej i maksymalnej",
       "modes": {
         "description": {
-          "threshold-based-percent-between-minmax": "",
-          "thresholds-based-absolute-values": ""
+          "threshold-based-percent-between-minmax": "Wybierz próg na podstawie procentu między min./maks.",
+          "thresholds-based-absolute-values": "Wybierz progi na podstawie wartości bezwzględnych"
         },
         "label": {
-          "absolute": "",
-          "percentage": ""
+          "absolute": "Wartość bezwzględna",
+          "percentage": "Procent"
         }
       },
       "thresholds-mode": "Tryb progów",
-      "value-base": ""
+      "value-base": "Podstawa"
     },
     "urlpicker-tab": {
       "label-preview": "Podgląd"
@@ -6850,6 +6850,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Zdarzenia",
@@ -7122,7 +7123,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Ładowanie…"
     },
     "prev": "Wstecz",
     "queryless-apps-extensions": {
@@ -7309,7 +7310,7 @@
           "start-time": "Czas rozpoczęcia:"
         }
       },
-      "share-span": "",
+      "share-span": "Udostępnij",
       "warnings": "Ostrzeżenia"
     },
     "span-filters": {
@@ -7319,8 +7320,8 @@
       "aria-label-select-service-name-operator": "Wybierz operator nazwy usługi",
       "aria-label-select-span-name": "Wybierz nazwę zakresu",
       "aria-label-select-span-name-operator": "Wybierz operator nazwy zakresu",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Wybierz maksymalny czas trwania zakresu",
+      "ariaLabel-select-min-span-duration": "Wybierz minimalny czas trwania zakresu",
       "label-collapse": "Filtry zakresu",
       "label-duration": "Czas trwania",
       "label-service-name": "Nazwa usługi",
@@ -7392,23 +7393,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Czas trwania",
+      "export-started": "Rozpoczęto eksportowanie",
+      "give-feedback": "Opinie",
+      "link-copied": "Skopiowano link do schowka",
+      "path": "Ścieżka",
+      "route": "Trasa",
+      "services": "Usługi",
+      "share": "Udostępnij",
+      "share-copy-link": "Kopiuj link",
+      "share-export-json": "Eksportuj jako JSON",
+      "share-tooltip": "Udostępnij ślad",
+      "start-time": "Godzina rozpoczęcia",
+      "target": "Cel",
+      "title-share-thoughts-about-tracing-grafana": "Podziel się swoimi przemyśleniami na temat śledzenia w usłudze Grafana.",
+      "tooltip-url": "{{route}} lub {{url}} lub {{target}} lub {{path}}",
+      "trace-id": "Identyfikator śledzenia",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Przycisk Wyczyść filtry",
@@ -7508,7 +7509,7 @@
       "when": "KIEDY"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Uruchom zapytanie SQL w dialekcie MySQL na tabelach zwróconych ze źródeł danych. Zapytania do źródeł danych (tj. „A”, „B”) są dostępne jako tabele i odnosi się do nich nazwa zapytania. Pola są dostępne jako kolumny zwracane ze źródła danych.",
       "label-operation": "Operacja"
     },
     "math": {
@@ -7539,7 +7540,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Wyczyść foldery",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Nie znaleziono folderów",
     "select-aria-label": "Filtr folderów",
     "select-placeholder": "Filtruj wg folderu"
   },
@@ -7588,23 +7589,23 @@
     "title": "Opuścić stronę?"
   },
   "gauge": {
-    "category-gauge": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-neutral": "",
-    "description-show-threshold-labels": "",
-    "description-show-threshold-markers": "",
+    "category-gauge": "Wskaźnik",
+    "description-min-height": "Minimalna wysokość wiersza (orientacja pozioma)",
+    "description-min-width": "Minimalna szerokość kolumny (orientacja pionowa)",
+    "description-neutral": "Pozostaw puste, aby użyć wartości minimalnej jako punktu neutralnego",
+    "description-show-threshold-labels": "Renderuj wartości progowe wokół paska wskaźnika",
+    "description-show-threshold-markers": "Renderuje progi jako pasek zewnętrzny",
     "gauge-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automatycznie",
+      "label-manual": "Ręcznie"
     },
-    "name-gauge-size": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-neutral": "",
-    "name-show-threshold-labels": "",
-    "name-show-threshold-markers": "",
-    "placeholder-neutral": ""
+    "name-gauge-size": "Rozmiar wskaźnika",
+    "name-min-height": "Min. wysokość",
+    "name-min-width": "Min. szerokość",
+    "name-neutral": "Neutralne",
+    "name-show-threshold-labels": "Pokaż etykiety progów",
+    "name-show-threshold-markers": "Pokaż znaczniki progów",
+    "placeholder-neutral": "automatycznie"
   },
   "gen-ai": {
     "apply-suggestion": "Zastosuj",
@@ -7613,51 +7614,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Nie znaleziono nazw geograficznych",
+      "warning-no-geometry": "nie udało się znaleźć geometrii",
+      "warning-select-geohash": "Wybierz pole geohash",
+      "warning-select-lat-long": "Wybierz pola szerokości/długości geograficznej",
+      "warning-select-lookup": "Wybierz pole wyszukiwania",
+      "warning-unable-to-find": "Nie udało się znaleźć pól lokalizacji"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nie znaleziono pól ciągów"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nie znaleziono pól numerycznych"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nie znaleziono pól numerycznych"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nie znaleziono pól ciągów"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Gazeter",
+      "name-geohash-field": "Pole geohash",
+      "name-latitude-field": "Pole szerokości geograficznej",
+      "name-location-mode": "Tryb lokalizacji",
+      "name-longitude-field": "Pole długości geograficznej",
+      "name-lookup-field": "Pole wyszukiwania"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Automatycznie identyfikuj dane o lokalizacji na podstawie domyślnych nazw pól",
+        "description-coords": "Określ pola szerokości i długości geograficznej",
+        "description-geohash": "Określ pole geohash",
+        "description-lookup": "Określ gazeter i pole wyszukiwania",
+        "label-auto": "Automatycznie",
+        "label-coords": "Współrzędne",
+        "label-geohash": "Geohash",
+        "label-lookup": "Wyszukiwanie"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Warstwa mapy bazowej",
+    "category-map-controls": "Sterowanie mapą",
+    "category-map-layers": "Warstwy mapy",
+    "category-map-view": "Widok mapy",
     "coordinates-map-view-editor": {
       "label-latitude": "Szerokość geograficzna",
       "label-longitude": "Długość geograficzna"
@@ -7666,15 +7667,15 @@
       "center": "Środek:",
       "zoom": "Powiększenie:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Ta lokalizacja zostanie wyświetlona po pierwszym załadowaniu panelu.",
+    "description-mouse-wheel-zoom": "Włącz sterowanie powiększeniem za pomocą kółka myszy",
+    "description-no-repeat": "Zapobiegaj powtarzaniu się mapy w poziomie",
+    "description-share-view": "Użyj tego samego widoku w wielu panelach. Uwaga: może to wymagać ponownego załadowania pulpitu.",
+    "description-show-attribution": "Pokaż informacje o źródle mapy w prawym dolnym rogu",
+    "description-show-debug": "Pokaż informacje o mapie",
+    "description-show-measure": "Pokaż narzędzia do wykonywania pomiarów na mapie",
+    "description-show-scale": "Wskaż skalę mapy",
+    "description-show-zoom": "Pokaż przyciski sterowania powiększeniem w lewym górnym rogu",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Warstwa"
@@ -7698,12 +7699,12 @@
       "aria-label-add-geomap-style-rule": "Dodaj regułę stylu geomapy"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Warstwa bazowa",
+      "description-display-tooltip": "Pokaż podpowiedź dla warstwy",
+      "name-data": "Dane",
+      "name-display-tooltip": "Wyświetl podpowiedź",
+      "name-layer-type": "Typ warstwy",
+      "name-opacity": "Nieprzezroczystość"
     },
     "layers-editor": {
       "label-add-layer": "Dodaj warstwę",
@@ -7716,9 +7717,9 @@
       "use-current-map-settings": "Użyj bieżących ustawień mapy"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Pokaż legendę mapy",
+      "name-show-legend": "Pokaż legendę",
+      "name-styles": "Style"
     },
     "markers-legend": {
       "title-symbol": "Symbol"
@@ -7727,27 +7728,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Pokaż narzędzia pomiarowe"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Widok początkowy",
+    "name-mouse-wheel-zoom": "Powiększanie kółkiem myszy",
+    "name-no-repeat": "Brak powtarzania mapy",
+    "name-share-view": "Udostępnij widok",
+    "name-show-attribution": "Pokaż atrybucję",
+    "name-show-debug": "Pokaż debugowanie",
+    "name-show-measure": "Pokaż narzędzia pomiarowe",
+    "name-show-scale": "Pokaż skalę",
+    "name-show-zoom": "Pokaż sterowanie powiększeniem",
+    "name-tooltip": "Podpowiedź",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Nie znaleziono pól ciągów"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "Warstwa mapy bazowej jest konfigurowana przez administratora serwera."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Środek",
+        "label-left": "Po lewej",
+        "label-right": "Po prawej"
       },
       "label-align": "Wyrównanie",
       "label-baseline": "Linia bazowa",
@@ -7763,12 +7764,12 @@
       "label-text-label": "Etykieta tekstowa",
       "label-x-offset": "Przesunięcie względem osi X",
       "label-y-offset": "Przesunięcie względem osi Y",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Wybierz symbol",
+      "placeholderText-select-symbol-or-add-text": "Wybierz symbol lub dodaj etykietę tekstową",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Na dole",
+        "label-center": "Pośrodku",
+        "label-top": "U góry"
       }
     },
     "style-rule-editor": {
@@ -7782,13 +7783,13 @@
       "placeholder-value": "wartość"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Pokaż wyskakujące okienko po najechaniu kursorem",
+      "description-none": "Pokaż zawartość po kliknięciu, a nie po najechaniu kursorem",
+      "label-details": "Szczegóły",
+      "label-none": "Brak"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Warstwa {{name}}"
     }
   },
   "get-enterprise": {
@@ -7908,400 +7909,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "stopy/s²",
+            "name-g-unit": "Jednostka przyspieszenia",
+            "name-meters-sec": "metry/s²"
           },
-          "name": ""
+          "name": "Przyspieszenie"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "minuty kątowe",
+            "name-arc-seconds": "sekundy kątowe",
+            "name-degrees": "stopnie (°)",
+            "name-gradian": "grad",
+            "name-radians": "radiany"
           },
-          "name": ""
+          "name": "Kąt"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "akry (ac)",
+            "name-hectares": "hektary (ha)",
+            "name-square-feet": "stopy kwadratowe (ft²)",
+            "name-square-meters": "metry kwadratowe (m²)",
+            "name-square-miles": "mile kwadratowe (mi²)"
           },
-          "name": ""
+          "name": "Obszar"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Wł./Wył.",
+            "name-true-false": "Prawda/Fałsz",
+            "name-yes-no": "Tak/Nie"
           },
-          "name": ""
+          "name": "Wartość logiczna"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "Obliczenie"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "gram na metr sześcienny (g/m³)",
+            "name-g-nm3": "gram na normalny metr sześcienny (g/Nm³)",
+            "name-mg-dl": "miligramy na decylitr (mg/dl)",
+            "name-mg-m3": "miligram na metr sześcienny (mg/m³)",
+            "name-mg-nm3": "miligram na normalny metr sześcienny (mg/Nm³)",
+            "name-mmol-l": "milimole na litr (mmol/l)",
+            "name-ng-m3": "nanogram na metr sześcienny (ng/m³)",
+            "name-ng-nm3": "nanogram na normalny metr sześcienny (ng/Nm³)",
+            "name-ppb": "części na miliard (ppb)",
+            "name-ppm": "części na milion (ppm)",
+            "name-ug-m3": "mikrogram na metr sześcienny (μg/m³)",
+            "name-ug-nm3": "mikrogram na normalny metr sześcienny (μg/Nm³)"
           },
-          "name": ""
+          "name": "Stężenie"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "lew bułgarski (BGN)",
+            "name-brl": "real (BRL)",
+            "name-btc": "Bitcoin (BTC)",
+            "name-chf": "frank szwajcarski (CHF)",
+            "name-czk": "korona czeska (CZK)",
+            "name-dkk": "korona duńska (DKK)",
+            "name-eur": "euro (EUR)",
+            "name-gbp": "funt szterling (GBP)",
+            "name-idr": "rupia indonezyjska (IDR)",
+            "name-ils": "nowy izraelski szekel (ILS)",
+            "name-inr": "rupia indyjska (INR)",
+            "name-isk": "korona islandzka (ISK)",
+            "name-jpy": "jen japoński (JPY)",
+            "name-krw": "won południowokoreański (KRW)",
+            "name-mbtc": "Milli Bitcoin (mBTC)",
+            "name-myr": "ringgit malezyjski (MYR)",
+            "name-nok": "korona norweska (NOK)",
+            "name-php": "peso filipińskie (PHP)",
+            "name-pln": "polski złoty (PLN)",
+            "name-pyg": "guaraní (PYG)",
+            "name-rub": "rubel (RUB)",
+            "name-sek": "korona szwedzka (SEK)",
+            "name-try": "lira turecka (TRY)",
+            "name-uah": "hrywna (UAH)",
+            "name-ubtc": "Micro Bitcoin (μBTC)",
+            "name-usd": "dolar amerykański (USD)",
+            "name-uyu": "peso urugwajskie (UYU)",
+            "name-vnd": "dong wietnamski (VND)",
+            "name-xpf": "frank CFP (XPF)",
+            "name-zar": "rand południowoafrykański (ZAR)"
           },
-          "name": ""
+          "name": "Waluta"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bity (IEC)",
+            "name-bits-si": "bity (SI)",
+            "name-bytes-iec": "bajty (IEC)",
+            "name-bytes-si": "bajty (SI)",
+            "name-gibibytes": "gibibajty",
+            "name-gigabytes": "gigabajty",
+            "name-kibibytes": "kibibajty",
+            "name-kilobytes": "kilobajty",
+            "name-mebibytes": "mebibajty",
+            "name-megabytes": "megabajty",
+            "name-pebibytes": "pebibajty",
+            "name-petabytes": "petabajty",
+            "name-tebibytes": "tebibajty",
+            "name-terabytes": "terabajty"
           },
-          "name": ""
+          "name": "Dane"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bity/s (IEC)",
+            "name-bits-sec-si": "bity/s (SI)",
+            "name-bytes-sec-iec": "bajty/s (IEC)",
+            "name-bytes-sec-si": "bajty/s (SI)",
+            "name-gibibits-sec": "gibibity/s",
+            "name-gibibytes-sec": "gibibajty/s",
+            "name-gigabits-sec": "gigabity/s",
+            "name-gigabytes-sec": "gigabajty/s",
+            "name-kibibits-sec": "kibibity/s",
+            "name-kibibytes-sec": "kibibajty/s",
+            "name-kilobits-sec": "kilobity/s",
+            "name-kilobytes-sec": "kilobajty/s",
+            "name-mebibits-sec": "mebibity/s",
+            "name-mebibytes-sec": "mebibajty/s",
+            "name-megabits-sec": "megabity/s",
+            "name-megabytes-sec": "megabajty/s",
+            "name-packets-sec": "pakiety/s",
+            "name-pebibits-sec": "pebibity/s",
+            "name-pebibytes-sec": "pebibajty/s",
+            "name-petabits-sec": "petabity/s",
+            "name-petabytes-sec": "petabajty/s",
+            "name-tebibits-sec": "tebibity/s",
+            "name-tebibytes-sec": "tebibajty/s",
+            "name-terabits-sec": "terabity/s",
+            "name-terabytes-sec": "terabajty/s"
           },
-          "name": ""
+          "name": "Szybkość transmisji danych"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Domyślna data i godzina",
+            "name-datetime-iso": "Data i godzina (ISO)",
+            "name-datetime-iso-no-date": "Data i godzina ISO (brak daty, jeśli dzisiaj)",
+            "name-datetime-local": "Data i godzina lokalna",
+            "name-datetime-local-no-date": "Data i godzina lokalna (brak daty, jeśli dzisiaj)",
+            "name-datetime-us": "Data i godzina (USA)",
+            "name-datetime-us-no-date": "Data i godzina w USA (brak daty, jeśli dzisiaj)",
+            "name-from-now": "Od teraz"
           },
-          "name": ""
+          "name": "Data i godzina"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "amper (A)",
+            "name-ampere-hour": "amperogodzina (Ah)",
+            "name-decibel-milliwatt": "decybel miliwat (dBm)",
+            "name-electron-volt": "elektronowolt (eV)",
+            "name-farad": "farad (F)",
+            "name-femtofarad": "femtofarad (fF)",
+            "name-gigawatt": "gigawat (GW)",
+            "name-henry": "henr (H)",
+            "name-joule": "dżul (J)",
+            "name-kiloampere": "kiloamper (kA)",
+            "name-kiloampere-hour": "kiloamperogodzina (kAh)",
+            "name-kiloohm": "kiloom (kΩ)",
+            "name-kilovolt": "kilowolt (kV)",
+            "name-kilovolt-ampere": "kilowoltamper (kVA)",
+            "name-kilovolt-ampere-reactive": "kilowoltamper reaktywny (kVAr)",
+            "name-kilowatt": "kilowat (kW)",
+            "name-kilowatt-hour": "kilowatogodzina (kWh)",
+            "name-kilowatt-min": "kilowatominuta (kWm)",
+            "name-lumens": "lumen (Lm)",
+            "name-megaohm": "megaom (MΩ)",
+            "name-megawatt": "megawat (MW)",
+            "name-megawatt-hour": "megawatogodzina (MWh)",
+            "name-microfarad": "mikrofarad (µF)",
+            "name-microhenry": "mikrohenr (µH)",
+            "name-milliampere": "miliamper (mA)",
+            "name-milliampere-hour": "miliamperogodzina (mAh)",
+            "name-millihenry": "milihenr (mH)",
+            "name-milliohm": "miliom (mΩ)",
+            "name-millivolt": "miliwolt (mV)",
+            "name-milliwatt": "miliwat (mW)",
+            "name-nanofarad": "nanofarad (nF)",
+            "name-ohm": "om (Ω)",
+            "name-picofarad": "pikofarad (pF)",
+            "name-volt": "wolt (V)",
+            "name-volt-ampere": "woltoamper (VA)",
+            "name-volt-ampere-reactive": "woltoamper reaktywny (VAr)",
+            "name-watt": "wat (W)",
+            "name-watt-hour": "watogodzina (Wh)",
+            "name-watt-hour-per-kg": "watogodzina na kilogram (Wh/kg)",
+            "name-watt-square-meter": "wat na metr kwadratowy (W/m²)"
           },
-          "name": ""
+          "name": "Energia"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "stopy sześcienne/min (cfm)",
+            "name-cubic-feet-sec": "stopy sześcienne/s (cfs)",
+            "name-cubic-meters-sec": "metry sześcienne/s (cms)",
+            "name-gallons-min": "galony/min (gpm)",
+            "name-litre-hour": "litry/godz.",
+            "name-litre-min": "litry/min (l/min)",
+            "name-lux": "luks (lx)",
+            "name-millilitre-min": "mililitry/min (ml/min)"
           },
-          "name": ""
+          "name": "Przepływ"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "kiloniutonometry (kNm)",
+            "name-kilonewtons": "kiloniutony (kN)",
+            "name-newton-meters": "niutonometry (Nm)",
+            "name-newtons": "niutony (N)"
           },
-          "name": ""
+          "name": "Siła"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "eksahashe/s",
+            "name-gigahashes-sec": "gigahashe/s",
+            "name-hashes-sec": "hashe/s",
+            "name-kilohashes-sec": "kilohashe/s",
+            "name-megahashes-sec": "megahashe/s",
+            "name-petahashes-sec": "petahashe/s",
+            "name-terahashes-sec": "terahashe/s"
           },
-          "name": ""
+          "name": "Tempo hashowania"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "stopy (ft)",
+            "name-inch": "cal (in)",
+            "name-kilometer": "kilometr (km)",
+            "name-meter": "metr (m)",
+            "name-mile": "mila (mi)",
+            "name-millimeter": "milimetr (mm)"
           },
-          "name": ""
+          "name": "Długość"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "gram (g)",
+            "name-kilogram": "kilogram (kg)",
+            "name-metric-ton": "tona metryczna (t)",
+            "name-milligram": "miligram (mg)",
+            "name-pound": "funt (lb)"
           },
-          "name": ""
+          "name": "Masa"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "kandela (cd)",
+            "name-decibel": "decybel",
+            "name-hexadecimal": "szesnastkowy",
+            "name-hexadecimal-0x": "szesnastkowy (0x)",
+            "name-humidity": "wilgotność (%H)",
+            "name-locale": "Format lokalny",
+            "name-number": "Liczba",
+            "name-percent-1": "procent (0,0–1,0)",
+            "name-percent-100": "procent (0–100)",
+            "name-pixels": "piksele",
+            "name-scientific": "Notacja naukowa",
+            "name-short": "krótki",
+            "name-si-short": "SI krótki",
+            "name-string": "Ciąg tekstowy"
           },
-          "name": ""
+          "name": "Różne"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "bary",
+            "name-hectopascals": "hektopaskale",
+            "name-inches-mercury": "cale słupa rtęci",
+            "name-kilobars": "kilobary",
+            "name-kilopascals": "kilopaskale",
+            "name-millibars": "milibary",
+            "name-pascals": "paskale",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Ciśnienie"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "bekerel (Bq)",
+            "name-curie": "kiur (Ci)",
+            "name-exposure": "ekspozycja (C/kg)",
+            "name-gray": "grej (Gy)",
+            "name-microsievert": "mikrosiwert (µSv)",
+            "name-microsievert-hour": "mikrosiwert/godz. (µSv/h)",
+            "name-millisievert": "milisiwert (mSv)",
+            "name-millisievert-hour": "milisiwert/godz. (mSv/h)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "rentgen (R)",
+            "name-sievert": "siwert (Sv)",
+            "name-sievert-hour": "siwert/godz. (Sv/h)"
           },
-          "name": ""
+          "name": "Promieniowanie"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "stopnie na sekundę (°/s)",
+            "name-gigahertz": "gigaherc (GHz)",
+            "name-hertz": "herc (Hz)",
+            "name-kilohertz": "kilohertz (kHz)",
+            "name-megahertz": "megaherc (MHz)",
+            "name-radians-sec": "radiany na sekundę (rad/s)",
+            "name-rpm": "obroty na minutę"
           },
-          "name": ""
+          "name": "Prędkość obrotowa"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsjusz (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (k)"
           },
-          "name": ""
+          "name": "Temperatura"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "liczba/min (cpm)",
+            "name-counts-sec": "liczba/s (cps)",
+            "name-events-min": "zdarzenia/min (epm)",
+            "name-events-sec": "zdarzenia/s (eps)",
+            "name-io-ops-sec": "operacje we/wy na sekundę (IOPS)",
+            "name-messages-min": "komunikaty/min (mpm)",
+            "name-messages-sec": "komunikaty/s (mps)",
+            "name-ops-min": "operacje/min (opm)",
+            "name-ops-sec": "operacje/s (ops)",
+            "name-reads-min": "odczyty/min (rpm)",
+            "name-reads-sec": "odczyty/s (rps)",
+            "name-records-min": "rekordy/min (rpm)",
+            "name-records-sec": "rekordy/s (rps)",
+            "name-requests-min": "żądania/min (rpm)",
+            "name-requests-sec": "żądania/s (rps)",
+            "name-rows-min": "wiersze/min (rpm)",
+            "name-rows-sec": "wiersze/s (rps)",
+            "name-writes-min": "zapisy/min (wpm)",
+            "name-writes-sec": "zapisy/s (wps)"
           },
-          "name": ""
+          "name": "Przepustowość"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "zegar (ms)",
+            "name-clock-s": "zegar (s)",
+            "name-days": "dni (d)",
+            "name-duration-dhms": "czas trwania (d gg:mm:ss)",
+            "name-duration-hms": "czas trwania (gg:mm:ss)",
+            "name-duration-ms": "czas trwania (ms)",
+            "name-duration-s": "czas trwania (s)",
+            "name-hertz": "herc (1/s)",
+            "name-hours": "godziny (godz.)",
+            "name-microseconds": "mikrosekundy (µs)",
+            "name-milliseconds": "milisekundy (ms)",
+            "name-minutes": "minuty (min)",
+            "name-nanoseconds": "nanosekundy (ns)",
+            "name-seconds": "sekundy (s)",
+            "name-timeticks": "cykle zegara (s/100)"
           },
-          "name": ""
+          "name": "Czas"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "kilometry na godzinę (km/h)",
+            "name-knot": "węzeł (kn)",
+            "name-meters-second": "metry na sekundę (m/s)",
+            "name-miles-hour": "mile na godzinę (mph)"
           },
-          "name": ""
+          "name": "Prędkość"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "decymetr sześcienny",
+            "name-cubic-meter": "metr sześcienny",
+            "name-gallons": "galon",
+            "name-litre": "litr (l)",
+            "name-millilitre": "mililitr (ml)",
+            "name-normal-cubic-meter": "normalny metr sześcienny"
           },
-          "name": ""
+          "name": "Objętość"
         }
       }
     }
@@ -8344,85 +8345,85 @@
     },
     "builder": {
       "axis": {
-        "category-axis": "",
-        "color-label": "",
+        "category-axis": "Oś",
+        "color-label": "Kolor",
         "color-options": {
-          "label-series": "",
-          "label-text": ""
+          "label-series": "Szereg",
+          "label-text": "Tekst"
         },
         "grid-line-options": {
-          "label-auto": "",
-          "label-off": "",
-          "label-on": ""
+          "label-auto": "Automatycznie",
+          "label-off": "Wył.",
+          "label-on": "Wł."
         },
-        "name-centered-zero": "",
-        "name-grid-lines": "",
-        "name-label": "",
-        "name-placement": "",
-        "name-scale": "",
-        "name-show-border": "",
-        "name-soft-max": "",
-        "name-soft-min": "",
-        "name-width": "",
-        "placeholder-label": "",
-        "placeholder-soft-max": "",
-        "placeholder-soft-min": "",
-        "placeholder-width": "",
+        "name-centered-zero": "Wyśrodkowane zero",
+        "name-grid-lines": "Pokaż linie siatki",
+        "name-label": "Etykieta",
+        "name-placement": "Położenie",
+        "name-scale": "Skala",
+        "name-show-border": "Pokaż obramowanie",
+        "name-soft-max": "Maks. miękki",
+        "name-soft-min": "Min. miękki",
+        "name-width": "Szerokość",
+        "placeholder-label": "Opcjonalny tekst",
+        "placeholder-soft-max": "Zobacz: Opcje standardowe > Maks.",
+        "placeholder-soft-min": "Zobacz: Opcje standardowe > Min.",
+        "placeholder-width": "Automatycznie",
         "scale-distribution-editor": {
           "distribution-options": {
-            "label-linear": "",
-            "label-log": "",
-            "label-symlog": ""
+            "label-linear": "Liniowa",
+            "label-log": "Logarytmiczna",
+            "label-symlog": "Symlog"
           }
         }
       },
       "legend": {
-        "category": "",
-        "description-values": "",
+        "category": "Legenda",
+        "description-values": "Wybierz wartości lub obliczenia do wyświetlenia w legendzie",
         "mode-options": {
-          "label-list": "",
-          "label-table": ""
+          "label-list": "Lista",
+          "label-table": "Tabela"
         },
-        "name-mode": "",
-        "name-placement": "",
-        "name-values": "",
-        "name-visibility": "",
-        "name-width": "",
+        "name-mode": "Tryb",
+        "name-placement": "Położenie",
+        "name-values": "Wartości",
+        "name-visibility": "Widoczność",
+        "name-width": "Szerokość",
         "placement-options": {
-          "label-bottom": "",
-          "label-right": ""
+          "label-bottom": "Na dole",
+          "label-right": "Po prawej"
         }
       },
       "stacking": {
-        "name-stack-series": ""
+        "name-stack-series": "Łączenie szeregów"
       },
       "text": {
-        "category-text-size": "",
-        "name-percent-change": "",
-        "name-title": "",
-        "name-value": "",
-        "placeholder-percent-change": "",
-        "placeholder-title": "",
-        "placeholder-value": ""
+        "category-text-size": "Rozmiar tekstu",
+        "name-percent-change": "Procent zmiany",
+        "name-title": "Tytuł",
+        "name-value": "Wartość",
+        "placeholder-percent-change": "Automatycznie",
+        "placeholder-title": "Automatycznie",
+        "placeholder-value": "Automatycznie"
       },
       "tooltip": {
-        "category": "",
-        "description-hover-proximity": "",
+        "category": "Podpowiedź",
+        "description-hover-proximity": "Jak blisko punktu musi znajdować się kursor, aby wyświetlić podpowiedź (w pikselach)",
         "modeOptions": {
-          "label-all": "",
-          "label-hidden": "",
-          "label-single": ""
+          "label-all": "Wszystkie",
+          "label-hidden": "Ukryte",
+          "label-single": "Pojedyncza"
         },
-        "name-hide-zeros": "",
-        "name-hover-proximity": "",
-        "name-max-height": "",
-        "name-max-width": "",
-        "name-tooltip-mode": "",
-        "name-values-sort-order": "",
+        "name-hide-zeros": "Ukryj zera",
+        "name-hover-proximity": "Bliskość najechania kursorem",
+        "name-max-height": "Maks. wysokość",
+        "name-max-width": "Maks. szerokość",
+        "name-tooltip-mode": "Tryb podpowiedzi",
+        "name-values-sort-order": "Kolejność sortowania wartości",
         "sortOptions": {
-          "label-ascending": "",
-          "label-descending": "",
-          "label-none": ""
+          "label-ascending": "Rosnąco",
+          "label-descending": "Malejąco",
+          "label-none": "Brak"
         }
       }
     },
@@ -8430,7 +8431,7 @@
       "option": "opcja"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Otwórz podgląd obrazu"
     },
     "cascader": {
       "clear-button": "Usuń zaznaczone"
@@ -8444,9 +8445,9 @@
       "aria-label-selected-color": "Kolor {{colorLabel}}"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Usuń",
       "cancel": "Anuluj",
-      "confirmText-delete": ""
+      "confirmText-delete": "Usuń"
     },
     "confirm-content": {
       "placeholder": "Wpisz „{{confirmPromptText}}”, aby potwierdzić"
@@ -8551,56 +8552,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "kwiecień",
+        "label-august": "sierpień",
+        "label-december": "grudzień",
+        "label-february": "luty",
+        "label-january": "styczeń",
+        "label-july": "lipiec",
+        "label-june": "czerwiec",
+        "label-march": "marzec",
+        "label-may": "maj",
+        "label-november": "listopad",
+        "label-october": "październik",
+        "label-september": "wrzesień"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Przedwczoraj",
+        "last-1-hour": "Ostatnia godzina",
+        "last-1-year": "Ostatni rok",
+        "last-12-hours": "Ostatnie 12 godzin",
+        "last-15-mins": "Ostatnie 15 minut",
+        "last-2-days": "Ostatnie 2 dni",
+        "last-2-years": "Ostatnie 2 lata",
+        "last-24-hours": "Ostatnie 24 godziny",
+        "last-3-hours": "Ostatnie 3 godziny",
+        "last-30-days": "Ostatnie 30 dni",
+        "last-30-mins": "Ostatnie 30 minut",
+        "last-5-mins": "Ostatnie 5 minut",
+        "last-5-years": "Ostatnie 5 lat",
+        "last-6-hours": "Ostatnie 6 godzin",
+        "last-6-months": "Ostatnie 6 miesięcy",
+        "last-7-days": "Ostatnie 7 dni",
+        "last-90-days": "Ostatnie 90 dni",
+        "previous-fiscal-quarter": "Poprzedni kwartał podatkowy",
+        "previous-fiscal-year": "Poprzedni rok podatkowy",
+        "previous-month": "Poprzedni miesiąc",
+        "previous-week": "Poprzedni tydzień",
+        "previous-year": "Poprzedni rok",
+        "this-day-last-week": "Ten dzień w poprzednim tygodniu",
+        "this-fiscal-quarter": "Bieżący kwartał podatkowy",
+        "this-fiscal-quarter-so-far": "Bieżący kwartał podatkowy do tej pory",
+        "this-fiscal-year": "Bieżący rok podatkowy",
+        "this-fiscal-year-so-far": "Bieżący rok podatkowy do tej pory",
+        "this-month": "Bieżący miesiąc",
+        "this-month-so-far": "Bieżący miesiąc do tej pory",
+        "this-week": "Bieżący tydzień",
+        "this-week-so-far": "Bieżący tydzień do tej pory",
+        "this-year": "Bieżący rok",
+        "this-year-so-far": "Bieżący rok do tej pory",
+        "today": "Dzisiaj",
+        "today-so-far": "Dzisiaj do tej pory",
+        "yesterday": "Wczoraj"
       }
     },
     "drawer": {
@@ -8642,33 +8643,33 @@
       "tooltip-expand-all": "Rozwiń wszystkie wiersze"
     },
     "matchers-ui": {
-      "description-field-name-by-regex-matcher": "",
-      "description-fields-by-query": "",
-      "description-fields-with-name": "",
-      "description-fields-with-type": "",
-      "description-fields-with-value": "",
+      "description-field-name-by-regex-matcher": "Ustaw właściwości pól o nazwach pasujących do wyrażenia regularnego",
+      "description-fields-by-query": "Ustaw właściwości pól z określonego zapytania",
+      "description-fields-with-name": "Ustaw właściwości dla określonego pola",
+      "description-fields-with-type": "Ustaw właściwości pól określonego typu (liczba, ciąg, wartość logiczna)",
+      "description-fields-with-value": "Ustaw właściwości pól z warunkiem reduktora",
       "field-name-picker": {
-        "placeholder": ""
+        "placeholder": "Wybierz pole"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Wartość logiczna",
+        "label-enum": "Wyliczenie",
+        "label-number": "Liczba",
+        "label-other": "Inne",
+        "label-string": "Ciąg tekstowy",
+        "label-time": "Czas",
+        "label-traces": "Ślady"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Ramki ({{framesCount}}): {{framesNames}}",
+        "label": "Zapytanie: {{refId}}",
+        "label-missing-ref-id": "Zapytanie: (brak identyfikatora odniesienia)"
       },
-      "name-field-name-by-regex-matcher": "",
-      "name-fields-by-query": "",
-      "name-fields-with-name": "",
-      "name-fields-with-type": "",
-      "name-fields-with-value": ""
+      "name-field-name-by-regex-matcher": "Pola z nazwą pasującą do wyrażenia regularnego",
+      "name-fields-by-query": "Pola zwrócone przez zapytanie",
+      "name-fields-with-name": "Pola z nazwą",
+      "name-fields-with-type": "Pola z typem",
+      "name-fields-with-value": "Pola z wartościami"
     },
     "menu-item": {
       "keyboard-shortcut-label": "Skrót klawiaturowy"
@@ -8696,8 +8697,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "przełącznik zwinięcia panelu",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Pasek ładowania panelu",
+      "ariaLabel-panel-status": "Status panelu",
       "tooltip-cancel": "Anuluj zapytanie",
       "tooltip-cancel-loading": "Anuluj zapytanie",
       "tooltip-stop-streaming": "Zatrzymaj strumieniowanie",
@@ -8766,12 +8767,12 @@
       "inspect-drawer-title": "Sprawdź wartość",
       "inspect-menu-label": "Sprawdź wartość",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Brak danych"
       },
       "no-values-label": "Brak wartości",
       "pagination-summary": "{{itemsRangeStart}}–{{displayedEnd}} z {{numRows}} wierszy",
       "sparkline": {
-        "no-data": ""
+        "no-data": "b.d."
       }
     },
     "tags": {
@@ -8779,7 +8780,7 @@
     },
     "tags-input": {
       "add": "Dodaj",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Nowy tag (wprowadź klucz, aby dodać)",
       "remove": "Usuń znacznik: {{name}}"
     },
     "time-sync-button": {
@@ -8796,55 +8797,55 @@
       "config": {
         "get-graph-field-options": {
           "axis-placement": {
-            "description-auto": "",
-            "label-auto": "",
-            "label-hidden": "",
-            "label-left": "",
-            "label-right": ""
+            "description-auto": "Pierwsze pole po lewej, reszta po prawej",
+            "label-auto": "Automatycznie",
+            "label-hidden": "Ukryte",
+            "label-left": "Po lewej",
+            "label-right": "Po prawej"
           },
           "bar-alignment": {
-            "description-after": "",
-            "description-before": "",
-            "description-center": ""
+            "description-after": "Po",
+            "description-before": "Przed",
+            "description-center": "Pośrodku"
           },
           "draw-style": {
-            "label-bars": "",
-            "label-lines": "",
-            "label-points": ""
+            "label-bars": "Paski",
+            "label-lines": "Linie",
+            "label-points": "Punkty"
           },
           "fill-gradient": {
-            "description-hue": "",
-            "description-opacity": "",
-            "description-scheme": "",
-            "label-hue": "",
-            "label-none": "",
-            "label-opacity": "",
-            "label-scheme": ""
+            "description-hue": "Mały gradient odcienia koloru",
+            "description-opacity": "Włącz gradient nieprzezroczystości wypełnienia",
+            "description-scheme": "Użyj schematu kolorów, aby zdefiniować gradient",
+            "label-hue": "Barwa",
+            "label-none": "Brak",
+            "label-opacity": "Nieprzezroczystość",
+            "label-scheme": "Schemat"
           },
           "line-interpolation": {
-            "description-linear": "",
-            "description-smooth": "",
-            "description-step-after": "",
-            "description-step-before": ""
+            "description-linear": "Liniowe",
+            "description-smooth": "Wygładzanie",
+            "description-step-after": "Krok po",
+            "description-step-before": "Krok przed"
           },
           "show-points": {
-            "description-auto": "",
-            "label-always": "",
-            "label-auto": "",
-            "label-never": ""
+            "description-auto": "Pokaż punkty, gdy gęstość jest niska",
+            "label-always": "Zawsze",
+            "label-auto": "Automatycznie",
+            "label-never": "Nigdy"
           },
           "stacking": {
-            "label-100": "",
-            "label-normal": "",
-            "label-off": ""
+            "label-100": "100%",
+            "label-normal": "Normalny",
+            "label-off": "Wył."
           },
           "thresholds-display-mode": {
-            "label-dashed-lines": "",
-            "label-filled-regions": "",
-            "label-filled-regions-and-dashed-lines": "",
-            "label-filled-regions-and-lines": "",
-            "label-lines": "",
-            "label-off": ""
+            "label-dashed-lines": "Jako linie (przerywane)",
+            "label-filled-regions": "Jako wypełnione obszary",
+            "label-filled-regions-and-dashed-lines": "Jako wypełnione obszary i linie (przerywane)",
+            "label-filled-regions-and-lines": "Jako wypełnione obszary i linie",
+            "label-lines": "Jako linie",
+            "label-off": "Wył."
           }
         }
       }
@@ -8872,14 +8873,14 @@
       "footer-add-annotation": "Dodaj komentarz",
       "footer-click-to-action": "Kliknij, aby podjąć działanie: {{actionTitle}}",
       "footer-click-to-navigate": "Kliknij, aby otworzyć {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Filtruj wg wartości „{{value}}”",
       "timestamp": "Znacznik czasu"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Domyślny",
+      "weekStarts-label-monday": "poniedziałek",
+      "weekStarts-label-saturday": "sobota",
+      "weekStarts-label-sunday": "niedziela"
     }
   },
   "graph": {
@@ -8892,78 +8893,78 @@
   },
   "heatmap": {
     "calculate-from-data-options": {
-      "label-no": "",
-      "label-yes": ""
+      "label-no": "Nie",
+      "label-yes": "Tak"
     },
-    "category-cell-display": "",
-    "category-colors": "",
-    "category-exemplars": "",
-    "category-heatmap": "",
-    "category-legend": "",
-    "category-tooltip": "",
-    "category-y-axis": "",
+    "category-cell-display": "Wyświetlanie komórki",
+    "category-colors": "Kolory",
+    "category-exemplars": "Przykłady",
+    "category-heatmap": "Mapa cieplna",
+    "category-legend": "Legenda",
+    "category-tooltip": "Podpowiedź",
+    "category-y-axis": "Oś Y",
     "mode-options": {
-      "label-opacity": "",
-      "label-scheme": ""
+      "label-opacity": "Nieprzezroczystość",
+      "label-scheme": "Schemat"
     },
-    "name-axis-label": "",
-    "name-axis-width": "",
-    "name-calculate-from-data": "",
-    "name-cell-gap": "",
-    "name-color": "",
-    "name-decimals": "",
-    "name-end-color-at-value": "",
-    "name-exponent": "",
-    "name-hide-cells-gt": "",
-    "name-hide-cells-lt": "",
-    "name-max-height": "",
-    "name-max-value": "",
-    "name-max-width": "",
-    "name-min-value": "",
-    "name-mode": "",
-    "name-placement": "",
-    "name-reverse": "",
-    "name-scale": "",
-    "name-scheme": "",
-    "name-show-color-scale": "",
-    "name-show-histogram": "",
-    "name-show-legend": "",
-    "name-start-color-from-value": "",
-    "name-steps": "",
-    "name-tick-alignment": "",
-    "name-tooltip-mode": "",
-    "name-unit": "",
-    "name-value-name": "",
-    "name-y-axis-scale": "",
-    "placeholder-axis-label": "",
-    "placeholder-axis-width": "",
-    "placeholder-decimals": "",
-    "placeholder-end-color-at-value": "",
-    "placeholder-hide-cells-gt": "",
-    "placeholder-hide-cells-lt": "",
-    "placeholder-max-value": "",
-    "placeholder-min-value": "",
-    "placeholder-start-color-from-value": "",
-    "placeholder-value-name": "",
+    "name-axis-label": "Etykieta osi",
+    "name-axis-width": "Szerokość osi",
+    "name-calculate-from-data": "Oblicz na podstawie danych",
+    "name-cell-gap": "Odstęp między komórkami",
+    "name-color": "Kolor",
+    "name-decimals": "Miejsca dziesiętne",
+    "name-end-color-at-value": "Zakończ skalę kolorów przy wartości",
+    "name-exponent": "Wykładnik",
+    "name-hide-cells-gt": "Ukryj komórki z wartościami >=",
+    "name-hide-cells-lt": "Ukryj komórki z wartościami <=",
+    "name-max-height": "Maks. wysokość",
+    "name-max-value": "Maks. wartość",
+    "name-max-width": "Maks. szerokość",
+    "name-min-value": "Wartość minimalna",
+    "name-mode": "Tryb",
+    "name-placement": "Położenie",
+    "name-reverse": "Odwróć",
+    "name-scale": "Skala",
+    "name-scheme": "Schemat",
+    "name-show-color-scale": "Pokaż skalę kolorów",
+    "name-show-histogram": "Pokaż histogram (oś Y)",
+    "name-show-legend": "Pokaż legendę",
+    "name-start-color-from-value": "Rozpocznij skalę kolorów od wartości",
+    "name-steps": "Kroki",
+    "name-tick-alignment": "Wyrównanie znaczników",
+    "name-tooltip-mode": "Tryb podpowiedzi",
+    "name-unit": "Jednostka",
+    "name-value-name": "Nazwa wartości",
+    "name-y-axis-scale": "Skala osi Y",
+    "placeholder-axis-label": "Automatycznie",
+    "placeholder-axis-width": "Automatycznie",
+    "placeholder-decimals": "Automatycznie",
+    "placeholder-end-color-at-value": "Automatycznie (maks.)",
+    "placeholder-hide-cells-gt": "Brak",
+    "placeholder-hide-cells-lt": "Brak",
+    "placeholder-max-value": "Automatycznie",
+    "placeholder-min-value": "Automatycznie",
+    "placeholder-start-color-from-value": "Automatycznie (min.)",
+    "placeholder-value-name": "Wartość",
     "placement-options": {
-      "label-hidden": "",
-      "label-left": "",
-      "label-right": ""
+      "label-hidden": "Ukryte",
+      "label-left": "Po lewej",
+      "label-right": "Po prawej"
     },
     "scale-options": {
-      "label-exponential": "",
-      "label-linear": ""
+      "label-exponential": "Wykładnicze",
+      "label-linear": "Liniowe"
     },
     "tick-alignment-options": {
-      "label-auto": "",
-      "label-bottom": "",
-      "label-middle": "",
-      "label-top": ""
+      "label-auto": "Automatycznie",
+      "label-bottom": "Dół (GE)",
+      "label-middle": "W połowie",
+      "label-top": "Góra (LE)"
     },
     "tooltip-mode-options": {
-      "label-all": "",
-      "label-hidden": "",
-      "label-single": ""
+      "label-all": "Wszystkie",
+      "label-hidden": "Ukryte",
+      "label-single": "Pojedyncza"
     }
   },
   "help-modal": {
@@ -9023,14 +9024,14 @@
     "troubleshooting-help": "Aby poprosić o pomoc w rozwiązywaniu problemów, wyślij migawkę tego panelu do działu pomocy technicznej Grafana Labs. Migawka zawiera dane odpowiedzi na zapytanie i ustawienia panelu."
   },
   "histogram": {
-    "category-histogram": "",
+    "category-histogram": "Histogram",
     "histogram-panel": {
       "no-histogram-found-in-response": "Nie znaleziono histogramu w odpowiedzi"
     },
-    "name-fill-opacity": "",
-    "name-gradient-mode": "",
-    "name-line-width": "",
-    "name-stacking": ""
+    "name-fill-opacity": "Nieprzezroczystość wypełnienia",
+    "name-gradient-mode": "Tryb gradientu",
+    "name-line-width": "Szerokość linii",
+    "name-stacking": "Układanie"
   },
   "inspector": {
     "inspect-data-tab": {
@@ -9263,8 +9264,8 @@
       "title-create-library-panel": "Utwórz panel biblioteki"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Zmień",
+      "confirmText-replace": "Zastąp"
     },
     "confirm": {
       "delete-panel": "Czy chcesz usunąć ten panel?"
@@ -9291,7 +9292,7 @@
       "usage-count_other": "Używane na {{count}} pulpitu"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Szukaj według nazwy, opisu lub nazwy folderu"
     },
     "loading-indicator": {
       "loading-library-panel": "Wczytywanie panelu biblioteki…"
@@ -9421,16 +9422,16 @@
     }
   },
   "logs": {
-    "category-logs": "",
+    "category-logs": "Logi",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Dokładnie",
+      "label-none": "Brak",
+      "label-numbers": "Liczby",
+      "label-signature": "Podpis"
     },
-    "description-enable-infinite-scrolling": "",
-    "description-enable-syntax-highlighting": "",
-    "description-show-controls": "",
+    "description-enable-infinite-scrolling": "Eksperymentalne. Poproś o więcej wyników, przewijając do dołu listy logów.",
+    "description-enable-syntax-highlighting": "Użyj wstępnie zdefiniowanej gramatyki kolorowania składni, aby wyróżnić odpowiednie części wierszy logów",
+    "description-show-controls": "Wyświetlaj elementy sterujące, aby przejść do ostatniego lub pierwszego wiersza logu, i filtruj według poziomu logów",
     "fields": {
       "type": {
         "loki": {
@@ -9450,8 +9451,8 @@
       }
     },
     "font-size-options": {
-      "label-default": "",
-      "label-small": ""
+      "label-default": "Domyślny",
+      "label-small": "Mały"
     },
     "get-dataframe-fields": {
       "vars": {
@@ -9507,64 +9508,64 @@
       "title-log-line": ""
     },
     "log-line-details": {
-      "clear-search": "",
-      "close": "",
-      "copy-shortlink": "",
-      "copy-to-clipboard": "",
-      "displayed-fields-section": "",
+      "clear-search": "Wyczyść",
+      "close": "Zamknij szczegóły logu",
+      "copy-shortlink": "Kopiuj krótki link",
+      "copy-to-clipboard": "Kopiuj do schowka",
+      "displayed-fields-section": "Uporządkuj wyświetlane pola",
       "fields": {
-        "adhoc-statistics": "",
-        "copy-value-to-clipboard": "",
-        "filter-out": "",
-        "filter-out-query": "",
+        "adhoc-statistics": "Statystyki ad hoc",
+        "copy-value-to-clipboard": "Kopiuj wartość do schowka",
+        "filter-out": "Odfiltruj wartość",
+        "filter-out-query": "Odfiltruj wartość w zapytaniu {{query}}",
         "toggle-field-button": {
-          "field-instead-message": "",
-          "hide-this-field": ""
+          "field-instead-message": "Pokaż to pole zamiast komunikatu",
+          "hide-this-field": "Ukryj to pole"
         }
       },
-      "fields-section": "",
-      "hide-log-line": "",
-      "inline-mode": "",
-      "links-section": "",
-      "log-line-field": "",
-      "log-line-section": "",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
-      "no-details": "",
-      "open-assistant": "",
-      "pin-line": "",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "fields-section": "Pola",
+      "hide-log-line": "Ukryj wiersz logu",
+      "inline-mode": "Wyświetl bezpośrednio",
+      "links-section": "Linki",
+      "log-line-field": "Wiersz logu",
+      "log-line-section": "Wiersz logu",
+      "move-displayed-field-down": "Przesuń w dół",
+      "move-displayed-field-up": "Przesuń do góry",
+      "no-details": "Brak pól do wyświetlenia.",
+      "open-assistant": "Wyjaśnij ten wiersz logu w Asystencie",
+      "pin-line": "Przypnij log",
+      "remove-displayed-field": "Usuń pole",
+      "remove-log": "Usuń log",
+      "scroll-to-logline": "Przewiń do wiersza logu",
       "search": {
-        "no-results": ""
+        "no-results": "Brak wyników do wyświetlenia."
       },
-      "search-placeholder": "",
-      "show-context": "",
-      "show-log-line": "",
-      "sidebar-mode": "",
-      "unpin-line": ""
+      "search-placeholder": "Wyszukaj nazwy i wartości pól",
+      "show-context": "Pokaż kontekst",
+      "show-log-line": "Pokaż wiersz logu",
+      "sidebar-mode": "Zakotwicz po prawej",
+      "unpin-line": "Odepnij log"
     },
     "log-line-menu": {
       "copy-link": "Kopiuj link do wiersza logu",
       "copy-log": "Kopiuj wiersz logu",
       "hide-details": "Pokaż szczegóły dziennika",
       "icon-label": "Menu logu",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Wiersz logu",
+      "log-line-explainer": "Wyjaśnij ten wiersz logu w zwięzły sposób",
+      "open-assistant": "Wyjaśnij ten wiersz logu w Asystencie",
       "pin-to-outline": "Przypnij log",
       "show-context": "Pokaż kontekst",
       "show-details": "Ukryj szczegóły dziennika",
       "unpin-from-outline": "Odepnij log"
     },
     "log-list-search": {
-      "close": "",
-      "filter": "",
-      "info": "",
-      "input-placeholder": "",
-      "next": "",
-      "prev": ""
+      "close": "Zamknij wyszukiwanie",
+      "filter": "Filtruj pasujące logi",
+      "info": "Wyszukiwanie po stronie klienta ciągów w wyświetlanych logach. Nie należy tego mylić z filtrami zapytań. Użyj tego komponentu, aby wyszukać określone ciągi w wynikach logów.",
+      "input-placeholder": "Szukaj w logach",
+      "next": "Następny wynik",
+      "prev": "Poprzedni wynik"
     },
     "log-row-context-modal": {
       "error-loading-log-more-logs": "Błąd podczas wczytywania większej liczby wpisów.",
@@ -9625,7 +9626,7 @@
       "escape-newlines": "Napraw nieprawidłowe sekwencje znaków nowego wiersza i tabulacji we wpisach logów",
       "font-size-default": "Użyj małego rozmiaru czcionki",
       "font-size-small": "Użyj domyślnego rozmiaru czcionki",
-      "hide-search": "",
+      "hide-search": "Zamknij wyszukiwanie",
       "hide-timestamps": "Ukryj znaczniki czasu",
       "hide-unique-labels": "Ukryj unikalne etykiety",
       "newest-first": "Sortowanie od najnowszych wpisów dziennika – kliknij, aby wyświetlić najpierw najstarsze",
@@ -9638,7 +9639,7 @@
       "scroll-top": "Przewiń w górę",
       "show-ms-timestamps": "",
       "show-ns-timestamps": "",
-      "show-search": "",
+      "show-search": "Wynik wyszukiwania w logach",
       "show-timestamps": "Pokaż znaczniki czasu",
       "show-unique-labels": "Pokaż unikalne etykiety",
       "unwrap-lines": "Nie zawijaj wierszy",
@@ -9656,26 +9657,26 @@
         "common-labels": "Typowe etykiety:"
       }
     },
-    "name-common-labels": "",
-    "name-deduplication": "",
-    "name-details-mode": "",
+    "name-common-labels": "Częste etykiety",
+    "name-deduplication": "Deduplikacja",
+    "name-details-mode": "Tryb panelu szczegółów dziennika",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "Bezpośrednio",
+      "label-sidebar": "Pasek boczny"
     },
-    "name-enable-infinite-scrolling": "",
-    "name-enable-log-details": "",
-    "name-enable-syntax-highlighting": "",
-    "name-font-size": "",
-    "name-order": "",
-    "name-prettify-json": "",
-    "name-show-controls": "",
+    "name-enable-infinite-scrolling": "Włącz nieskończone przewijanie",
+    "name-enable-log-details": "Włącz szczegóły logu",
+    "name-enable-syntax-highlighting": "Włącz podświetlanie składni",
+    "name-font-size": "Rozmiar czcionki",
+    "name-order": "Kolejność",
+    "name-prettify-json": "Formatowanie JSON",
+    "name-show-controls": "Pokaż kontrolki",
     "name-time": "",
-    "name-unique-labels": "",
-    "name-wrap-lines": "",
+    "name-unique-labels": "Unikalne etykiety",
+    "name-wrap-lines": "Zawijaj wiersze",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Od najnowszych",
+      "label-oldest-first": "Od najstarszych"
     },
     "out-of-range-message": {
       "end-of-the-selected-time-range": "Koniec wybranego zakresu czasu."
@@ -9690,7 +9691,7 @@
     "un-themed-log-details": {
       "aria-label-data-links": "Połączenia danych",
       "aria-label-fields": "Pola",
-      "aria-label-line": "",
+      "aria-label-line": "Wiersz logu",
       "aria-label-log-level": "Poziom logów",
       "aria-label-no-details": "Brak szczegółów"
     },
@@ -9711,27 +9712,27 @@
     }
   },
   "logs-new": {
-    "category-logs": "",
+    "category-logs": "Logi",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Dokładnie",
+      "label-none": "Brak",
+      "label-numbers": "Liczby",
+      "label-signature": "Podpis"
     },
-    "description-infinite-scrolling": "",
-    "description-show-controls": "",
-    "description-syntax-highlighting": "",
-    "name-deduplication": "",
-    "name-enable-log-details": "",
-    "name-infinite-scrolling": "",
-    "name-order": "",
-    "name-show-controls": "",
-    "name-syntax-highlighting": "",
-    "name-time": "",
-    "name-wrap-lines": "",
+    "description-infinite-scrolling": "Eksperymentalne. Poproś o więcej wyników, przewijając do dołu listy logów.",
+    "description-show-controls": "Wyświetlaj elementy sterujące, aby przejść do ostatniego lub pierwszego wiersza logu, i filtruj według poziomu logów",
+    "description-syntax-highlighting": "Użyj wstępnie zdefiniowanej gramatyki kolorowania składni, aby wyróżnić odpowiednie części wierszy logów",
+    "name-deduplication": "Deduplikacja",
+    "name-enable-log-details": "Włącz szczegóły logu",
+    "name-infinite-scrolling": "Włącz nieskończone przewijanie",
+    "name-order": "Kolejność",
+    "name-show-controls": "Pokaż kontrolki",
+    "name-syntax-highlighting": "Włącz podświetlanie składni",
+    "name-time": "Czas",
+    "name-wrap-lines": "Zawijaj wiersze",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Od najnowszych",
+      "label-oldest-first": "Od najstarszych"
     }
   },
   "manage-dashbaords": {
@@ -9758,8 +9759,8 @@
       "updated-on": "Data aktualizacji"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Czy na pewno chcesz usunąć „{{snapshotToRemove}}”?",
+      "confirmText-delete": "Usuń",
       "title-delete": "Usuń"
     },
     "unthemed-dashboard-import": {
@@ -9771,14 +9772,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "Nazwa jest wymagana",
+      "message-reserved-name": "Ta nazwa jest zarezerwowana i nie można jej użyć dla folderu.",
+      "message-same-name": "Pulpit lub folder o tej samej nazwie już istnieje",
+      "message-same-name-general": "W folderze ogólnym istnieje już folder lub pulpit o tej samej nazwie"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Nie znaleziono opcji"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9928,8 +9929,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Osiągnięto maksymalną liczbę grup reguł alertów: usuń niektóre grupy reguł alertów lub przejdź na wyższy plan i spróbuj ponownie.",
+        "alert-rules-quota-reached": "Osiągnięto maksymalną liczbę reguł alertów: usuń niektóre reguły alertów lub przejdź na wyższy plan i spróbuj ponownie.",
         "dashboard-already-managed": "Pulpit jest już skonfigurowany w usłudze Grafana i zarządzany z jej poziomu w instancji w chmurze. Zalecamy korzystanie z pulpitu skonfigurowanego. Jeśli nadal chcesz skopiować pulpit do instancji w chmurze, zmień identyfikator pulpitu w jego pliku JSON, zapisz nową migawkę i prześlij ponownie.",
         "datasource-already-managed": "Źródło danych jest już skonfigurowane w usłudze Grafana i zarządzane z jej poziomu w instancji w chmurze. Jeśli jest to inny zasób, ustaw inny UID i spróbuj ponownie.",
         "datasource-invalid-url": "Istnieje źródło danych, które ma nieprawidłowy adres URL. Podaj prawidłowy adres URL i spróbuj ponownie.",
@@ -10399,7 +10400,7 @@
     "invite-user": {
       "invite-button": "Zaproś",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Zaproś użytkownika"
     },
     "item": {
       "add-bookmark": "Dodaj do zakładek",
@@ -10431,12 +10432,12 @@
     "rss-button": "Najnowsze na blogu"
   },
   "news": {
-    "category-news": "",
-    "description-show-image": "",
-    "description-url": "",
+    "category-news": "Aktualności",
+    "description-show-image": "Kontroluje, czy obraz społecznościowy (og:image) elementu wiadomości jest wyświetlany nad treścią tekstową",
+    "description-url": "Obsługuje kanały RSS i Atom",
     "link-title": "Przejdź na bloga Grafana Labs",
-    "name-show-image": "",
-    "name-url": "",
+    "name-show-image": "Pokaż obraz",
+    "name-url": "URL",
     "news-panel": {
       "body-error-loading-rss-feed": "Upewnij się, że adres URL kanału jest poprawny, a CORS jest poprawnie skonfigurowany na serwerze. Zobacz <2>dokumentację panelu Wiadomości.</2>",
       "loading": "Ładowanie…",
@@ -10445,27 +10446,27 @@
     "title": "Najnowsze na blogu"
   },
   "node-graph": {
-    "category-edges": "",
-    "category-node-graph": "",
-    "category-nodes": "",
+    "category-edges": "Krawędzie",
+    "category-node-graph": "Wykres węzłowy",
+    "category-nodes": "Węzły",
     "layout-algorithm-options": {
-      "description-force": "",
-      "description-grid": "",
-      "description-layered": "",
-      "label-force": "",
-      "label-grid": "",
-      "label-layered": ""
+      "description-force": "Użyj układu zależnego od siły",
+      "description-grid": "Użyj układu siatki",
+      "description-layered": "Użyj układu warstwowego",
+      "label-force": "Siła",
+      "label-grid": "Siatka",
+      "label-layered": "Warstwowy"
     },
-    "name-arc-sections": "",
-    "name-layout-algorithm": "",
-    "name-main-stat-unit": "",
-    "name-secondary-stat-unit": "",
-    "name-zoom-mode": "",
+    "name-arc-sections": "Sekcje łukowe",
+    "name-layout-algorithm": "Algorytm układu",
+    "name-main-stat-unit": "Główna jednostka statystyczna",
+    "name-secondary-stat-unit": "Jednostka statystyki drugorzędnej",
+    "name-zoom-mode": "Tryb powiększenia",
     "zoom-mode-options": {
-      "description-cooperative": "",
-      "description-greedy": "",
-      "label-cooperative": "",
-      "label-greedy": ""
+      "description-cooperative": "Umożliwia normalne przewijanie strony",
+      "description-greedy": "Reaguje na wszystkie gesty powiększania",
+      "label-cooperative": "Współpracujący",
+      "label-greedy": "Chciwy"
     }
   },
   "nodeGraph": {
@@ -10550,40 +10551,40 @@
     },
     "registry": {
       "get-all-option-editors": {
-        "description-time-zone": "",
-        "name-time-zone": ""
+        "description-time-zone": "Wybór strefy czasowej",
+        "name-time-zone": "Strefa czasowa"
       },
       "standard-field-condigs": {
-        "category-data-links": ""
+        "category-data-links": "Połączenia danych i działania"
       },
       "standard-field-configs": {
-        "category": "",
-        "category-thresholds": "",
-        "category-value-mappings": "",
-        "description-display-name": "",
-        "description-field-min-max": "",
-        "description-max": "",
-        "description-min": "",
-        "description-no-value": "",
-        "description-value-mappings": "",
-        "name-actions": "",
-        "name-ad-hoc": "",
-        "name-color-scheme": "",
-        "name-data-links": "",
-        "name-decimals": "",
-        "name-display-name": "",
-        "name-field-min-max": "",
-        "name-max": "",
-        "name-min": "",
-        "name-no-value": "",
-        "name-thresholds": "",
-        "name-unit": "",
-        "name-value-mappings": "",
-        "placeholder-decimals": "",
-        "placeholder-display-name": "",
-        "placeholder-max": "",
-        "placeholder-min": "",
-        "placeholder-unit": ""
+        "category": "Opcje standardowe",
+        "category-thresholds": "Progi",
+        "category-value-mappings": "Mapowania wartości",
+        "description-display-name": "Zmień nazwę pola lub szeregu",
+        "description-field-min-max": "Oblicz min./maks. na pole",
+        "description-max": "Pozostaw puste, aby obliczyć na podstawie wszystkich wartości",
+        "description-min": "Pozostaw puste, aby obliczyć na podstawie wszystkich wartości",
+        "description-no-value": "Co pokazać, gdy nie ma wartości",
+        "description-value-mappings": "Zmodyfikuj wyświetlany tekst na podstawie wartości wejściowej",
+        "name-actions": "Działania",
+        "name-ad-hoc": "Możliwość filtrowania ad hoc",
+        "name-color-scheme": "Schemat kolorów",
+        "name-data-links": "Połączenia danych",
+        "name-decimals": "Miejsca dziesiętne",
+        "name-display-name": "Nazwa wyświetlana",
+        "name-field-min-max": "Pole min./maks.",
+        "name-max": "Maks.",
+        "name-min": "Min.",
+        "name-no-value": "Brak wartości",
+        "name-thresholds": "Progi",
+        "name-unit": "Jednostka",
+        "name-value-mappings": "Mapowania wartości",
+        "placeholder-decimals": "automatycznie",
+        "placeholder-display-name": "brak",
+        "placeholder-max": "automatycznie",
+        "placeholder-min": "automatycznie",
+        "placeholder-unit": "brak"
       }
     },
     "units": {
@@ -10628,7 +10629,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Nie znaleziono organizacji",
     "select-placeholder": "Wybierz organizację"
   },
   "page": {
@@ -10692,13 +10693,13 @@
     },
     "panel-data-error-view": {
       "missing-value": {
-        "number": "",
-        "string": "",
-        "time": "",
-        "unknown": ""
+        "number": "W danych brakuje pola liczbowego",
+        "string": "W danych brakuje pola ciągu",
+        "time": "W danych brakuje pola czasu",
+        "unknown": "Nie można zwizualizować danych"
       },
       "no-value": {
-        "default": ""
+        "default": "Brak danych"
       },
       "open-visualization-suggestions": "Otwórz sugestie dotyczące wizualizacji",
       "switch-to-table": "Przełącz na tabelę"
@@ -10738,25 +10739,25 @@
     "select-placeholder": "Filtruj wg typu"
   },
   "piechart": {
-    "category-legend": "",
-    "category-pie-chart": "",
-    "description-labels": "",
-    "description-pie-chart-type": "",
+    "category-legend": "Legenda",
+    "category-pie-chart": "Wykres kołowy",
+    "description-labels": "Wybierz etykiety, które mają być wyświetlane na wykresie kołowym",
+    "description-pie-chart-type": "Jak powinien być renderowany wykres kołowy",
     "labels-options": {
-      "label-name": "",
-      "label-percent": "",
-      "label-value": ""
+      "label-name": "Nazwa",
+      "label-percent": "Procent",
+      "label-value": "Wartość"
     },
     "legend-values-options": {
-      "label-percent": "",
-      "label-value": ""
+      "label-percent": "Procent",
+      "label-value": "Wartość"
     },
-    "name-labels": "",
-    "name-legend-values": "",
-    "name-pie-chart-type": "",
+    "name-labels": "Etykiety",
+    "name-legend-values": "Wartości legendy",
+    "name-pie-chart-type": "Wykres kołowy",
     "pie-chart-type-options": {
-      "label-donut": "",
-      "label-pie": ""
+      "label-donut": "Pierścieniowy",
+      "label-pie": "Kołowy"
     }
   },
   "playlist": {
@@ -10851,7 +10852,7 @@
         "permission": "Nie masz uprawnień do wyświetlenia tej strony.",
         "title-access-denied": "Odmowa dostępu"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Nie udało się załadować wtyczki",
       "no-root-app-page-component-found": "Nie znaleziono komponentu strony głównej aplikacji"
     },
     "browse": {
@@ -10895,7 +10896,7 @@
         "update-status-text": "wtyczki są aktualne"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Czy na pewno chcesz przejść na starszą wersję {{version}}? To działanie nie jest zwykle zalecane",
         "downgrade-confirm": "Przejście na starszą wersję",
         "downgrade-title": "Użyj starszej wersji wtyczki"
       }
@@ -10924,7 +10925,7 @@
         "dependencies": "Zależności",
         "documentation": "Dokumentacja",
         "downloads": "Do pobrania",
-        "from": "",
+        "from": "Od",
         "installedVersion": "Zainstalowana wersja",
         "lastCommitDate": "Data ostatniego zatwierdzenia:",
         "latestReleaseDate": "Data wydania najnowszej wersji:",
@@ -10950,8 +10951,8 @@
       "message": "Nie znaleziono wtyczek"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Więcej informacji o błędzie znajdziesz w konsoli.",
+      "extension-error-alert-title": "Nie udało się załadować rozszerzenia: „{{pluginId}}/{{extensionTitle}}”"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10988,13 +10989,13 @@
     "install-controls-button": {
       "title-uninstall-modal": "Odinstaluj wtyczkę {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Czy na pewno chcesz odinstalować tę wtyczkę?",
+        "confirmText-confirm": "Potwierdź"
       }
     },
     "install-controls-warning": {
       "body-not-published": "Ta wtyczka nie została opublikowana na stronie <2>grafana.com/plugins</2> i nie można nią zarządzać za pośrednictwem katalogu.",
-      "enterprise-plugin-info": "",
+      "enterprise-plugin-info": "Ta wtyczka jest dostępna tylko w Grafana Cloud i Grafana Enterprise.",
       "learn-more": "Dowiedz się więcej",
       "no-valid-grafana-enterprise-license-detected": "Nie wykryto ważnej licencji Grafana Enterprise.",
       "title-dev-alert": "Jest to wersja rozwojowa wtyczki i nie można jej odinstalować.",
@@ -11007,6 +11008,9 @@
       "label-plugin-id": "Identyfikator wtyczki",
       "label-severity": "Istotność"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Nie można znaleźć wtyczki. Sprawdź, czy adres URL jest poprawny, lub <1></1>przejdź do <3>katalogu wtyczek</3>.",
       "title-plugin-not-found": "Nie znaleziono wtyczki"
@@ -11152,40 +11156,40 @@
   },
   "provisioned-resource-form": {
     "save-or-delete-resource-shared-fields": {
-      "comment-placeholder-describe-changes-optional": "",
-      "description-branch-name-in-git-hub": "",
+      "comment-placeholder-describe-changes-optional": "Dodaj notatkę, aby opisać zmiany (opcjonalnie)",
+      "description-branch-name-in-git-hub": "Nazwa gałęzi w GitHub",
       "description-inside-repository": "",
-      "label-branch": "",
-      "label-comment": "",
-      "label-path": "",
-      "label-workflow": ""
+      "label-branch": "Gałąź",
+      "label-comment": "Uwagi",
+      "label-path": "Ścieżka",
+      "label-workflow": "Przepływ pracy"
     }
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Ten zasób znajduje się za gałęzią w repozytorium {{repoType}}.",
+      "not-saved": "Pozostali użytkownicy Grafany w Twojej organizacji nadal będą widzieć bieżącą wersję zapisaną w skonfigurowanej gałęzi domyślnej, dopóki ta gałąź nie zostanie scalona",
+      "open-in-repo-button": "Otwórz w repozytorium {{repoType}}",
+      "open-pull-request-in-repo": "Otwórz żądanie pull w repozytorium {{repoType}}",
+      "view-in-repo-button": "Wyświetl w repozytorium {{repoType}}, aby zobaczyć najnowsze zmiany.",
+      "view-pull-request-in-repo": "Wyświetl żądanie pull w repozytorium {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "Utworzono nowy zasób w gałęzi w repozytorium {{repoType}}.",
+    "title-loaded-pull-request-in-repo": "Ten zasób został wczytany z gałęzi, która właśnie została przez ciebie utworzona w repozytorium {{repoType}}, i jest widoczny tylko dla ciebie"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Zasób został zapisany",
+  "provisioned-resource-request-handler-dashboard": "Pulpit został zapisany",
+  "provisioned-resource-request-handler-folder": "Folder został utworzony",
   "provisioning": {
     "banner": {
       "message": "Ta funkcja jest obecnie aktywnie rozwijana. Aby uzyskać najlepsze wrażenia i najnowsze ulepszenia, zalecamy korzystanie z <2>nocnej kompilacji</2> aplikacji Grafana."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Gałąź używana do aprowizacji",
+      "branch-label": "Gałąź",
+      "branch-required": "Gałąź jest wymagana",
+      "path-description": "Opcjonalna ścieżka podkatalogu w repozytorium",
+      "path-label": "Ścieżka",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11194,18 +11198,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Pozwala użytkownikom wybrać, czy otworzyć żądanie pull podczas zapisywania zmian. Jeśli repozytorium nie zezwala na bezpośrednie zmiany w głównej gałęzi, nadal może być wymagane żądanie pull.",
+      "pr-workflow-label": "Włącz opcję żądania pull podczas zapisywania",
+      "token-description": "Hasło aplikacji Bitbucket z uprawnieniami do repozytorium",
+      "token-label": "Hasło aplikacji",
+      "token-required": "Wymagany jest token Bitbucket",
+      "token-user-description": "Nazwa użytkownika, która będzie używana do uzyskiwania dostępu do repozytorium za pomocą hasła aplikacji",
+      "token-user-label": "Nazwa użytkownika",
+      "token-user-required": "Nazwa użytkownika jest wymagana",
+      "url-description": "Adres URL repozytorium Bitbucket",
+      "url-label": "Adres URL repozytorium",
+      "url-pattern": "Musi to być prawidłowy adres URL repozytorium Bitbucket",
+      "url-required": "Adres URL repozytorium jest wymagany"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Dodaj zrozumiałą nazwę tego połączenia z repozytorium",
@@ -11216,18 +11220,18 @@
       "label-display-name": "Nazwa wyświetlana",
       "placeholder-my-repository-connection": "Połączenie z moim repozytorium",
       "text-loading-resource-information": "Wczytywanie informacji o zasobach…",
-      "dashboards-count_one": "",
-      "dashboards-count_few": "",
-      "dashboards-count_many": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} pulpit",
+      "dashboards-count_few": "{{count}} pulpitu",
+      "dashboards-count_many": "{{count}} pulpitu",
+      "dashboards-count_other": "{{count}} pulpitu",
       "files-count_one": "{{count}} plik",
       "files-count_few": "{{count}} pliki",
       "files-count_many": "{{count}} plików",
       "files-count_other": "{{count}} pliku",
-      "folders-count_one": "",
-      "folders-count_few": "",
-      "folders-count_many": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} folder",
+      "folders-count_few": "{{count}} folderu",
+      "folders-count_many": "{{count}} folderu",
+      "folders-count_other": "{{count}} folderu"
     },
     "check-repository": {
       "check": "Sprawdźmy."
@@ -11301,7 +11305,7 @@
       "title-instant-updates-requests-webhooks": "Błyskawiczne aktualizacje i żądania pull dzięki webhookom.",
       "title-visual-previews-in-pull-requests": "Podglądy wizualne w żądaniach pull z renderowaniem obrazów"
     },
-    "error-title-default": "",
+    "error-title-default": "Błąd",
     "expanded-row": {
       "job-specification": "Specyfikacja zadania",
       "summary": "Podsumowanie"
@@ -11310,8 +11314,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Skonfiguruj wymagane przełączniki funkcji"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Zarządzaj pulpitami jako kodem w usłudze Git i automatycznie aprowizuj aktualizacje",
+      "manage-your-dashboards-with-remote-provisioning": "Rozpocznij pracę z synchronizacją z usługą Git",
       "store-dashboards-in-version-controlled-storage": "Przechowuj pulpity nawigacyjne w pamięci z kontrolą wersji, aby zapewnić lepszą organizację i śledzenie historii zmian"
     },
     "file-history-page": {
@@ -11332,16 +11336,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Dodaje podgląd obrazu zmian pulpitu w żądaniach pull. Obrazy pulpitów Grafany zostaną udostępnione w repozytorium Git i będą widoczne dla każdego, kto ma do niego dostęp.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Utwórz linki podglądu dla żądań pull",
       "description-image-rendering": "Wymaga renderowania obrazów. <2>Skonfiguruj renderowanie obrazów</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(wymaga <2>renderowania obrazów</2> i włączonego dostępu publicznego)",
       "description-read-only": "Zasobów nie można modyfikować za pośrednictwem usługi Grafana.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Jak często synchronizować zmiany z repozytorium",
+      "error-sync-interval-required": "Odstęp czasu synchronizacji jest wymagany",
       "label-enable-previews": "Włącz podglądy pulpitu w żądaniach pull",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Generuj podglądy pulpitu",
       "label-read-only": "Tylko do odczytu",
-      "label-sync-interval": ""
+      "label-sync-interval": "Odstęp czasu synchronizacji (sekundy)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Brak wyników pasujących do zapytania",
@@ -11373,46 +11377,46 @@
       "subtitle-provisioning-feature": "Wyświetlaj połączenia aprowizacyjne i nimi zarządzaj"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Gałąź używana do aprowizacji",
+      "branch-label": "Gałąź",
+      "branch-required": "Gałąź jest wymagana",
+      "path-description": "Opcjonalna ścieżka podkatalogu w repozytorium",
+      "path-label": "Ścieżka",
+      "pr-workflow-description": "Pozwala użytkownikom wybrać, czy otworzyć żądanie pull podczas zapisywania zmian. Jeśli repozytorium nie zezwala na bezpośrednie zmiany w głównej gałęzi, nadal może być wymagane żądanie pull.",
+      "pr-workflow-label": "Włącz opcję żądania pull podczas zapisywania",
+      "token-description": "Token dostępu lub hasło do repozytorium Git",
+      "token-label": "Token dostępu",
+      "token-required": "Wymagany jest token Git",
+      "token-user-description": "Nazwa użytkownika, która będzie używana do uzyskiwania dostępu do repozytorium za pomocą tokena dostępu",
+      "token-user-label": "Nazwa użytkownika",
+      "token-user-required": "Nazwa użytkownika jest wymagana",
+      "url-description": "Adres URL repozytorium Git",
+      "url-label": "Adres URL repozytorium",
+      "url-pattern": "Musi to być prawidłowy adres URL repozytorium Git",
+      "url-required": "Adres URL repozytorium jest wymagany"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Gałąź używana do aprowizacji",
+      "branch-label": "Gałąź",
+      "branch-required": "Gałąź jest wymagana",
+      "path-description": "Opcjonalna ścieżka podkatalogu w repozytorium",
+      "path-label": "Ścieżka",
+      "pr-workflow-description": "Pozwala użytkownikom wybrać, czy otworzyć żądanie pull podczas zapisywania zmian. Jeśli repozytorium nie zezwala na bezpośrednie zmiany w głównej gałęzi, nadal może być wymagane żądanie pull.",
+      "pr-workflow-label": "Włącz opcję żądania pull podczas zapisywania",
+      "token-description": "Osobisty token dostępu GitHub z uprawnieniami do repozytorium",
+      "token-label": "Osobisty token dostępu",
+      "token-required": "Wymagany jest token GitHub",
+      "url-description": "Adres URL repozytorium GitHub",
+      "url-label": "Adres URL repozytorium",
+      "url-pattern": "Musi to być prawidłowy adres URL repozytorium GitHub",
+      "url-required": "Adres URL repozytorium jest wymagany"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Gałąź używana do aprowizacji",
+      "branch-label": "Gałąź",
+      "branch-required": "Gałąź jest wymagana",
+      "path-description": "Opcjonalna ścieżka podkatalogu w repozytorium",
+      "path-label": "Ścieżka",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11421,15 +11425,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Pozwala użytkownikom wybrać, czy otworzyć żądanie scalenia podczas zapisywania zmian. Jeśli repozytorium nie zezwala na bezpośrednie zmiany w głównej gałęzi, nadal może być wymagane żądanie scalenia.",
+      "pr-workflow-label": "Włącz opcję żądania scalenia podczas zapisywania",
+      "token-description": "Token dostępu do projektu GitLab z uprawnieniami do repozytorium",
+      "token-label": "Token dostępu do projektu",
+      "token-required": "Wymagany jest token GitLab",
+      "url-description": "Adres URL repozytorium GitLab",
+      "url-label": "Adres URL repozytorium",
+      "url-pattern": "Musi to być prawidłowy adres URL repozytorium GitLab",
+      "url-required": "Adres URL repozytorium jest wymagany"
     },
     "history-view": {
       "not-found": "Nie znaleziono"
@@ -11457,18 +11461,18 @@
       "starting": "Uruchamianie…",
       "status": {
         "title-error-running-job": "Błąd uruchamiania zadania",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Zadanie zakończone pomyślnie",
+        "title-warning-running-job": "Zadanie ukończone z ostrzeżeniami"
       },
       "summary": "Podsumowanie",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Błąd podczas pobierania aktywnego zadania"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Ścieżka do repozytorium w lokalnym systemie plików",
+      "path-label": "Ścieżka do repozytorium",
+      "path-required": "Ścieżka do repozytorium jest wymagana"
     },
     "mode-options": {
       "folder": {
@@ -11494,7 +11498,7 @@
     },
     "repository-actions": {
       "settings": "Ustawienia",
-      "source-code": ""
+      "source-code": "Kod źródłowy"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11560,22 +11564,22 @@
       "title-queued-for-deletion": "Dodano do kolejki do usunięcia"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Wybierz dostawcę:",
+      "configure-file": "Skonfiguruj aprowizację plików",
+      "configure-with-provider": "Skonfiguruj przy użyciu dostawcy {{ provider }}",
+      "provider-not-listed": "Jeśli dostawcy nie ma na liście:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Połącz z repozytoriami Bitbucket",
+      "github": "GitHub",
+      "github-description": "Połącz z repozytoriami GitHub",
+      "gitlab": "GitLab",
+      "gitlab-description": "Połącz z repozytoriami GitLab",
+      "local": "Lokalnie",
+      "local-description": "Skonfiguruj aprowizację plików",
+      "pure-git": "Czysty Git",
+      "pure-git-description": "Połącz z dowolnym repozytorium Git"
     },
     "resource-view": {
       "base": "Podstawa",
@@ -11606,11 +11610,11 @@
       "label-current-step": "Aktualny krok",
       "label-pending-step": "Oczekujący krok"
     },
-    "success-title-default": "",
+    "success-title-default": "Powodzenie",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Nie udało się uruchomić zadania",
+      "error-no-repository-name": "Nie wprowadzono nazwy repozytorium",
+      "error-starting-job": "Błąd uruchamiania zadania"
     },
     "sync-repository": {
       "body-edit-configuration": "Edytuj konfigurację",
@@ -11638,7 +11642,7 @@
       "go-to": "Przejdź do",
       "make-sure": "Pamiętaj, aby uwzględnić te uprawnienia"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Ostrzeżenie",
     "wizard": {
       "alert-point-1": "Podczas tego procesu nie będzie można tworzyć, edytować ani usuwać zasobów. W ostatnim kroku zasoby znikną.",
       "alert-point-2": "Po zakończeniu aprowizacji zasoby pojawią się ponownie i będą zarządzane za pośrednictwem zewnętrznej pamięci masowej.",
@@ -11648,10 +11652,10 @@
       "button-next": "Zakończ",
       "button-start": "Rozpocznij synchronizację",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Spowoduje to usunięcie konfiguracji repozytorium i utracisz wszystkie postępy. Czy na pewno chcesz odrzucić zmiany?",
+        "confirm": "Tak, odrzuć",
+        "dismiss": "Pracuj dalej",
+        "title": "Odrzucić konfigurację repozytorium?"
       },
       "step-bootstrap": "Wybierz, co chcesz zsynchronizować",
       "step-connect": "Połącz",
@@ -11667,7 +11671,7 @@
     "wizard-content": {
       "button-cancel": "Anuluj",
       "button-cancelling": "Anulowanie…",
-      "button-previous": "",
+      "button-previous": "Wstecz",
       "button-submitting": "Zgłaszanie…",
       "error-instance-repository-exists": "Repozytorium instancji już istnieje"
     }
@@ -12076,7 +12080,7 @@
         "recommended": "Zalecane",
         "results": "Wyniki"
       },
-      "search": ""
+      "search": "Szukaj: {{parentTitle}}"
     }
   },
   "search": {
@@ -12157,7 +12161,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Nie znaleziono kont usług",
     "select-aria-label": "Selektor konta usługi",
     "select-placeholder": "Zacznij pisać, aby wyszukać konta usług"
   },
@@ -12203,10 +12207,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Dodaj token konta usługi",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Czy na pewno chcesz usunąć to konto usługi?",
+      "body-disable-service-account": "Czy na pewno chcesz wyłączyć to konto usługi?",
+      "confirmText-delete-service-account": "Usuń konto usługi",
+      "confirmText-disable-service-account": "Wyłącz konto usługi",
       "delete-service-account": "Usuń konto usługi",
       "disable-service-account": "Wyłącz konto usługi",
       "enable-service-account": "Włącz konto usługi",
@@ -12233,7 +12237,7 @@
       "used-by": "Używane przez"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Zapisz",
       "edit": "Edytuj"
     },
     "service-account-role-row": {
@@ -12247,18 +12251,18 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Dodaj konto usługi",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Czy na pewno chcesz usunąć konto {{serviceAccountName}}?",
+      "body-disable-service-account": "Czy na pewno chcesz wyłączyć konto „{{accountToDisable}}”?",
+      "confirmText-delete": "Usuń",
+      "confirmText-disable-service-account": "Wyłącz konto usługi",
       "placeholder-search-service-account-by-name": "Wyszukaj konto usługi według nazwy",
       "sub-title": "Konta usług i ich tokeny mogą być używane do uwierzytelniania w interfejsie API Grafana. Więcej informacji znajdziesz w <2>dokumentacji.</2>",
       "title-delete-service-account": "Usuń konto usługi",
       "title-disable-service-account": "Wyłącz konto usługi",
-      "body-delete_one": "",
-      "body-delete_few": "",
-      "body-delete_many": "",
-      "body-delete_other": ""
+      "body-delete_one": "Czy na pewno chcesz usunąć konto {{serviceAccountName}} i {{count}} towarzyszący token?",
+      "body-delete_few": "Czy na pewno chcesz usunąć konto {{serviceAccountName}} i {{count}} towarzyszące tokeny?",
+      "body-delete_many": "Czy na pewno chcesz usunąć konto {{serviceAccountName}} i {{count}} towarzyszących tokenów?",
+      "body-delete_other": "Czy na pewno chcesz usunąć konto {{serviceAccountName}} i {{count}} towarzyszącego tokena?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Token stracił ważność",
@@ -12272,7 +12276,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Eksportuj jako obraz",
       "export-json-title": "Eksportowanie jako JSON",
       "share-externally-title": "Udostępnij na zewnątrz",
       "share-internally-title": "Udostępnij wewnętrznie",
@@ -12309,17 +12313,17 @@
       "view-button-yaml": "Wyświetl kod YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Działania związane z eksportowaniem obrazu",
+      "cancel-button": "Anuluj",
+      "download-button": "Pobierz obraz",
+      "error-title": "Nie udało się wygenerować obrazu",
+      "generate-button": "Wygeneruj obraz",
+      "generating": "Generowanie obrazu…",
+      "info-text": "Zapisz ten pulpit jako obraz",
+      "preview": "Podgląd",
+      "preview-aria": "Podgląd wygenerowanego obrazu",
+      "preview-region": "Podgląd obrazu",
+      "title": "Eksportuj jako obraz"
     },
     "library": {
       "info": "Utwórz panel biblioteki."
@@ -12329,7 +12333,7 @@
       "info-text": "Utwórz bezpośredni link do tego pulpitu lub panelu, dostosowany za pomocą poniższych opcji.",
       "link-url": "Link URL",
       "render-alert": "Nie zainstalowano wtyczki renderowania obrazów",
-      "render-instructions": "",
+      "render-instructions": "Aby wyrenderować obraz, musisz zainstalować <2>wtyczkę do renderowania obrazów w Grafanie</2>. Skontaktuj się z administratorem usługi Grafana, aby zainstalować wtyczkę.",
       "rendered-image": "Obraz renderowany z bezpośredniego linku",
       "save-alert": "Nie zapisano pulpitu",
       "save-dashboard": "Aby wyrenderować obraz panelu, musisz najpierw zapisać pulpit.",
@@ -12397,11 +12401,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Zapisz pulpit, aby włączyć generowanie obrazu",
+    "download-disabled-help": "Najpierw wygeneruj obraz, aby umożliwić jego pobieranie",
+    "error-title": "Nie udało się wygenerować obrazu",
     "form": {
-      "label": ""
+      "label": "Ustawienia obrazu panelu"
     },
     "preview": {
       "title": "Podgląd panelu"
@@ -12562,112 +12566,112 @@
   },
   "stat": {
     "add-orientation-option": {
-      "description-orientation": "",
-      "name-orientation": "",
+      "description-orientation": "Orientacja układu",
+      "name-orientation": "Orientacja",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-vertical": ""
+        "label-auto": "Automatycznie",
+        "label-horizontal": "Poziomo",
+        "label-vertical": "Pionowo"
       }
     },
     "add-standard-data-reduce-options": {
-      "category-value-options": "",
-      "description-calculation": "",
-      "description-fields": "",
-      "description-limit": "",
-      "description-show": "",
+      "category-value-options": "Opcje wartości",
+      "description-calculation": "Wybierz funkcję reduktora / obliczenia",
+      "description-fields": "Wybierz pola, które powinny być uwzględnione w panelu",
+      "description-limit": "Liczba wierszy do wyświetlenia",
+      "description-show": "Oblicz pojedynczą wartość na kolumnę lub serię lub pokaż każdy wiersz",
       "fields-options": {
-        "label-all-fields": "",
-        "label-numeric-fields": ""
+        "label-all-fields": "Wszystkie pola",
+        "label-numeric-fields": "Pola numeryczne"
       },
-      "name-calculation": "",
-      "name-fields": "",
-      "name-limit": "",
-      "name-show": "",
+      "name-calculation": "Obliczenie",
+      "name-fields": "Pola",
+      "name-limit": "Limit",
+      "name-show": "Pokaż",
       "show-options": {
-        "label-all-values": "",
-        "label-calculate": ""
+        "label-all-values": "Wszystkie wartości",
+        "label-calculate": "Oblicz"
       }
     },
-    "category-stat-styles": "",
+    "category-stat-styles": "Style statystyk",
     "color-mode-options": {
-      "label-background-gradient": "",
-      "label-background-solid": "",
-      "label-none": "",
-      "label-value": ""
+      "label-background-gradient": "Gradient w tle",
+      "label-background-solid": "Jednolite tło",
+      "label-none": "Brak",
+      "label-value": "Wartość"
     },
-    "description-graph-mode": "",
-    "description-text-mode": "",
+    "description-graph-mode": "Wykres panelu statystycznego / tryb sparkline",
+    "description-text-mode": "Kontroluj, czy wyświetlana jest nazwa i wartość, czy tylko nazwa",
     "graph-mode": {
       "options": {
-        "label-area": "",
-        "label-none": ""
+        "label-area": "Obszar",
+        "label-none": "Brak"
       }
     },
     "name-color-modcolor-mode-options": {
-      "label": ""
+      "label": "Tryb koloru"
     },
-    "name-graph-mode": "",
-    "name-show-percent-change": "",
-    "name-text-alignment": "",
-    "name-text-mode": "",
-    "name-wide-layout": "",
-    "percent-change-color-mode": "",
+    "name-graph-mode": "Tryb wykresu",
+    "name-show-percent-change": "Pokaż procent zmian",
+    "name-text-alignment": "Wyrównanie tekstu",
+    "name-text-mode": "Tryb tekstowy",
+    "name-wide-layout": "Szeroki układ",
+    "percent-change-color-mode": "Tryb koloru zmiany procentowej",
     "percent-change-color-mode-options": {
-      "label-inverted": "",
-      "label-same-as-value": "",
-      "label-standard": ""
+      "label-inverted": "Inwersja",
+      "label-same-as-value": "Taki sam jak wartość",
+      "label-standard": "Standardowy"
     },
     "text-alignment-options": {
-      "label-auto": "",
-      "label-center": ""
+      "label-auto": "Automatycznie",
+      "label-center": "Pośrodku"
     },
     "text-mode-options": {
-      "label-auto": "",
-      "label-name": "",
-      "label-none": "",
-      "label-value": "",
-      "label-value-and-name": ""
+      "label-auto": "Automatycznie",
+      "label-name": "Nazwa",
+      "label-none": "Brak",
+      "label-value": "Wartość",
+      "label-value-and-name": "Wartość i nazwa"
     },
     "wide-layout-options": {
-      "label-off": "",
-      "label-on": ""
+      "label-off": "Wył.",
+      "label-on": "Wł."
     }
   },
   "state-timeline": {
     "align-values-options": {
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-center": "Pośrodku",
+      "label-left": "Po lewej",
+      "label-right": "Po prawej"
     },
-    "category-state-timeline": "",
-    "name-align-values": "",
-    "name-connect-null-values": "",
-    "name-disconnect-values": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-merge-equal-consecutive-values": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-state-timeline": "Oś czasu stanu",
+    "name-align-values": "Wyrównaj wartości",
+    "name-connect-null-values": "Połącz wartości zerowe",
+    "name-disconnect-values": "Odłącz wartości",
+    "name-fill-opacity": "Nieprzezroczystość wypełnienia",
+    "name-line-width": "Szerokość linii",
+    "name-merge-equal-consecutive-values": "Połącz równe wartości kolejne",
+    "name-page-size": "Rozmiar strony (włącz paginację)",
+    "name-row-height": "Wysokość wiersza",
+    "name-show-values": "Pokaż wartości",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Zawsze",
+      "label-auto": "Automatycznie",
+      "label-never": "Nigdy"
     }
   },
   "status-history": {
-    "category-status-history": "",
-    "name-column-width": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-status-history": "Historia stanu",
+    "name-column-width": "Szerokość kolumny",
+    "name-fill-opacity": "Nieprzezroczystość wypełnienia",
+    "name-line-width": "Szerokość linii",
+    "name-page-size": "Rozmiar strony (włącz paginację)",
+    "name-row-height": "Wysokość wiersza",
+    "name-show-values": "Pokaż wartości",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Zawsze",
+      "label-auto": "Automatycznie",
+      "label-never": "Nigdy"
     },
     "status-history-panel": {
       "too-many-points_one": "Zbyt wiele punktów, aby można było prawidłowo je zwizualizować. <1></1>Zaktualizuj zapytanie, aby zwróciło mniej punktów. <3></3>(Otrzymano {{count}} punktu)",
@@ -12709,26 +12713,26 @@
       "label-gauge-display-mode": "Tryb wyświetlania wskaźników",
       "label-value-display": "Wyświetlanie wartości"
     },
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Opcje komórki",
+    "category-table": "Tabela",
+    "category-table-footer": "Stopka tabeli",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Duża",
+      "label-medium": "Średnia",
+      "label-small": "Mała"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Działania",
+      "auto": "Automatycznie",
+      "color-background": "Kolorowe tło",
+      "color-text": "Kolorowy tekst",
+      "data-links": "Połączenia danych",
+      "gauge": "Wskaźnik",
+      "image": "Obraz",
+      "json": "Widok JSON",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Pigułka",
+      "sparkline": "Sparkline"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "W przypadku zaznaczenia cały wiersz będzie kolorowy, tak jak ta komórka.",
@@ -12741,23 +12745,23 @@
       "wrap-text": "Zawijaj tekst"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Automatycznie",
+      "label-center": "Pośrodku",
+      "label-left": "Po lewej",
+      "label-right": "Po prawej"
     },
     "container": {
       "content": "Pokazanie zbyt wielu kolumn w jednej tabeli może wpłynąć na wydajność i utrudnić odczyt danych. Rozważ doprecyzowanie zapytań.",
       "show-all-series": "Pokaż wszystkie kolumny",
       "show-only-series": "Pokazuje liczbę kolumn: {{MAX_NUMBER_OF_COLUMNS}}"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
-    "description-min-column-width": "",
-    "description-wrap-header-text": "",
+    "description-calculation": "Wybierz funkcję reduktora / obliczenia",
+    "description-cell-value-inspect": "Włącz kontrolę wartości komórki w oknie modalnym",
+    "description-column-filter": "Włącza/wyłącza filtry pól w tabeli",
+    "description-count-rows": "Wyświetl pojedynczą liczbę dla wszystkich wierszy danych",
+    "description-fields": "Wybierz pola, które powinny być obliczone",
+    "description-min-column-width": "Minimalna szerokość dla automatycznej zmiany rozmiaru kolumny",
+    "description-wrap-header-text": "Włącza zawijanie tekstu w nagłówkach kolumn",
     "image-cell-options-editor": {
       "description-alt-text": "Alternatywny tekst wyświetlany, jeśli obraz nie może być wyświetlony, lub w przypadku użytkowników korzystających z czytnika ekranu",
       "description-title-text": "Tekst wyświetlany po najechaniu kursorem na obraz",
@@ -12771,66 +12775,66 @@
       },
       "label-dynamic-height": ""
     },
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-paginations": "",
-    "name-fields": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "name-wrap-header-text": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": "",
+    "name-calculation": "Obliczenie",
+    "name-cell-height": "Wysokość komórki",
+    "name-cell-type": "Typ komórki",
+    "name-cell-value-inspect": "Sprawdź wartość komórki",
+    "name-column-alignment": "Wyrównanie kolumn",
+    "name-column-filter": "Filtr kolumn",
+    "name-column-width": "Szerokość kolumny",
+    "name-count-rows": "Policz wiersze",
+    "name-enable-paginations": "Włącz paginację",
+    "name-fields": "Pola",
+    "name-hide-in-table": "Ukryj w tabeli",
+    "name-min-column-width": "Minimalna szerokość kolumny",
+    "name-show-table-footer": "Pokaż stopkę tabeli",
+    "name-show-table-header": "Pokaż nagłówek tabeli",
+    "name-wrap-header-text": "Zawijaj tekst nagłówka",
+    "placeholder-column-width": "automatycznie",
+    "placeholder-fields": "Wszystkie pola numeryczne",
     "text-wrap-options": {
       "label-wrap-text": ""
     }
   },
   "table-new": {
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Opcje komórki",
+    "category-table": "Tabela",
+    "category-table-footer": "Stopka tabeli",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Duża",
+      "label-medium": "Średnia",
+      "label-small": "Mała"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Automatycznie",
+      "label-center": "Pośrodku",
+      "label-left": "Po lewej",
+      "label-right": "Po prawej"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
+    "description-calculation": "Wybierz funkcję reduktora / obliczenia",
+    "description-cell-value-inspect": "Włącz kontrolę wartości komórki w oknie modalnym",
+    "description-column-filter": "Włącza/wyłącza filtry pól w tabeli",
+    "description-count-rows": "Wyświetl pojedynczą liczbę dla wszystkich wierszy danych",
+    "description-fields": "Wybierz pola, które powinny być obliczone",
     "description-frozen-columns": "",
-    "description-min-column-width": "",
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-pagination": "",
-    "name-fields": "",
+    "description-min-column-width": "Minimalna szerokość dla automatycznej zmiany rozmiaru kolumny",
+    "name-calculation": "Obliczenie",
+    "name-cell-height": "Wysokość komórki",
+    "name-cell-type": "Typ komórki",
+    "name-cell-value-inspect": "Sprawdź wartość komórki",
+    "name-column-alignment": "Wyrównanie kolumn",
+    "name-column-filter": "Filtr kolumn",
+    "name-column-width": "Szerokość kolumny",
+    "name-count-rows": "Policz wiersze",
+    "name-enable-pagination": "Włącz paginację",
+    "name-fields": "Pola",
     "name-frozen-columns": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": ""
+    "name-hide-in-table": "Ukryj w tabeli",
+    "name-min-column-width": "Minimalna szerokość kolumny",
+    "name-show-table-footer": "Pokaż stopkę tabeli",
+    "name-show-table-header": "Pokaż nagłówek tabeli",
+    "placeholder-column-width": "automatycznie",
+    "placeholder-fields": "Wszystkie pola numeryczne"
   },
   "tag-filter": {
     "clear-button": "Wyczyść znaczniki",
@@ -12841,7 +12845,7 @@
     "tag-option-label": "Opcja tagu"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Nie znaleziono zespołów",
     "select-aria-label": "Selektor zespołu",
     "select-placeholder": "Wybierz zespół"
   },
@@ -12915,17 +12919,17 @@
     }
   },
   "text": {
-    "category-text": "",
+    "category-text": "Tekst",
     "mode-options": {
-      "label-code": "",
-      "label-html": "",
-      "label-markdown": ""
+      "label-code": "Kod",
+      "label-html": "HTML",
+      "label-markdown": "Markdown"
     },
-    "name-content": "",
-    "name-language": "",
-    "name-mode": "",
-    "name-show-line-numbers": "",
-    "name-show-mini-map": ""
+    "name-content": "Zawartość",
+    "name-language": "Język",
+    "name-mode": "Tryb",
+    "name-show-line-numbers": "Pokaż numerację wierszy",
+    "name-show-mini-map": "Pokaż minimapę"
   },
   "theme-preview": {
     "breadcrumbs": {
@@ -12973,7 +12977,7 @@
       "apply-button": "Zastosuj zakres czasu",
       "default-error": "Podaj datę z przeszłości lub wybierz „{{now}}”",
       "fiscal-year": "Rok podatkowy: {{from}} – {{to}}",
-      "from-input": "",
+      "from-input": "Od",
       "open-input-calendar": "Otwórz kalendarz",
       "range-error": "Wartość „Od” nie może następować po wartości „Do”",
       "to-input": "Do"
@@ -12991,7 +12995,7 @@
       "aria-role": "Wybór zakresu czasu",
       "default-title": "Zakresy czasu",
       "example-title": "Przykładowe zakresy czasu",
-      "from-label": "",
+      "from-label": "Od",
       "from-to": "{{timeOptionFrom}} do {{timeOptionTo}}",
       "specify": "Określ zakres czasu",
       "submit-button-label": "Przycisk przesyłania TimePicker",
@@ -13004,8 +13008,8 @@
   },
   "timeline": {
     "missing-field": {
-      "all": "",
-      "time": ""
+      "all": "Brak pól do przedstawienia na wykresie",
+      "time": "Dane nie mają pola czasu"
     }
   },
   "timeseries": {
@@ -13023,54 +13027,54 @@
       "tooltip-delete": "Usuń",
       "tooltip-edit": "Edytuj"
     },
-    "category-axis": "",
+    "category-axis": "Oś",
     "config": {
       "get-graph-field-config": {
-        "aria-label-bar-width-factor": "",
-        "aria-label-fill-opacity": "",
-        "aria-label-line-width": "",
-        "aria-label-point-size": "",
-        "category-graph-styles": "",
-        "category-thresholds": "",
-        "name-bar-alignment": "",
-        "name-bar-width-factor": "",
-        "name-connect-nulls": "",
-        "name-disconnect-values": "",
-        "name-fill-below-to": "",
-        "name-fill-opacity": "",
-        "name-gradient-mode": "",
-        "name-line-interpolation": "",
-        "name-line-style": "",
-        "name-line-width": "",
-        "name-point-size": "",
-        "name-show-points": "",
-        "name-show-thresholds": "",
-        "name-style": "",
-        "name-transform": "",
+        "aria-label-bar-width-factor": "Współczynnik szerokości słupka",
+        "aria-label-fill-opacity": "Nieprzezroczystość wypełnienia",
+        "aria-label-line-width": "Szerokość linii",
+        "aria-label-point-size": "Rozmiar punktu",
+        "category-graph-styles": "Style wykresów",
+        "category-thresholds": "Progi",
+        "name-bar-alignment": "Wyrównanie słupków",
+        "name-bar-width-factor": "Współczynnik szerokości słupka",
+        "name-connect-nulls": "Połącz wartości zerowe",
+        "name-disconnect-values": "Odłącz wartości",
+        "name-fill-below-to": "Wypełnij poniżej do",
+        "name-fill-opacity": "Nieprzezroczystość wypełnienia",
+        "name-gradient-mode": "Tryb gradientu",
+        "name-line-interpolation": "Interpolacja liniowa",
+        "name-line-style": "Styl linii",
+        "name-line-width": "Szerokość linii",
+        "name-point-size": "Rozmiar punktu",
+        "name-show-points": "Pokaż punkty",
+        "name-show-thresholds": "Pokaż progi",
+        "name-style": "Styl",
+        "name-transform": "Przekształć",
         "transform-options": {
-          "description-constant": "",
-          "description-style": "",
-          "label-constant": "",
-          "label-style": ""
+          "description-constant": "Pierwsza wartość zostanie wyświetlona jako linia stała",
+          "description-style": "Odwróć wyniki na wartości ujemne na osi Y",
+          "label-constant": "Stała",
+          "label-style": "Ujemna oś Y"
         }
       }
     },
     "insert-nulls-editor": {
       "disconnect-options": {
-        "label-never": "",
-        "label-threshold": ""
+        "label-never": "Nigdy",
+        "label-threshold": "Próg"
       }
     },
     "line-style-editor": {
       "line-fill-options": {
-        "label-dash": "",
-        "label-dots": "",
-        "label-solid": ""
+        "label-dash": "Myślnik",
+        "label-dots": "Kropki",
+        "label-solid": "Ciągła"
       },
       "title-the-input-expects-a-segment-list": "Dane wejściowe powinny być listą segmentów",
       "tooltip-help": "Pomoc"
     },
-    "name-time-zone": "",
+    "name-time-zone": "Strefa czasowa",
     "nulls-threshold-input": {
       "placeholder-never": "Nigdy"
     },
@@ -13080,9 +13084,9 @@
     },
     "span-nulls-editor": {
       "gaps-options": {
-        "label-always": "",
-        "label-never": "",
-        "label-threshold": ""
+        "label-always": "Zawsze",
+        "label-never": "Nigdy",
+        "label-threshold": "Próg"
       }
     },
     "timezones-editor": {
@@ -13091,17 +13095,17 @@
     }
   },
   "traces": {
-    "category-span-filters": "",
-    "name-critical-path-only": "",
-    "name-find-in-trace": "",
-    "name-max-duration": "",
-    "name-min-duration": "",
-    "name-service-name": "",
-    "name-service-name-operator": "",
-    "name-show-matches-only": "",
-    "name-span-name": "",
-    "name-span-name-operator": "",
-    "name-tags": "",
+    "category-span-filters": "Filtry zakresu",
+    "name-critical-path-only": "Pokaż tylko ścieżkę krytyczną",
+    "name-find-in-trace": "Znajdź w śladzie",
+    "name-max-duration": "Maks. czas trwania",
+    "name-min-duration": "Min. czas trwania",
+    "name-service-name": "Nazwa usługi",
+    "name-service-name-operator": "Operator nazwy usługi",
+    "name-show-matches-only": "Pokaż tylko dopasowania",
+    "name-span-name": "Nazwa zakresu",
+    "name-span-name-operator": "Operator nazwy zakresu",
+    "name-tags": "Tagi",
     "traces-panel": {
       "no-data-found-in-response": "Nie znaleziono danych w odpowiedzi"
     }
@@ -13116,20 +13120,20 @@
     "axis-editor": {
       "log-mode-options": {
         "description": {
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-size": "Podziel zasobniki na podstawie rozmiaru"
         },
         "label": {
-          "split": ""
+          "split": "Podziel"
         }
       },
       "mode-options": {
         "description": {
-          "split-the-buckets-based-on-count": "",
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-count": "Podziel zasobniki na podstawie liczby",
+          "split-the-buckets-based-on-size": "Podziel zasobniki na podstawie rozmiaru"
         },
         "label": {
-          "count": "",
-          "size": ""
+          "count": "Liczba",
+          "size": "Rozmiar"
         }
       },
       "placeholder-auto": "Automatycznie"
@@ -13145,15 +13149,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Działanie dwuargumentowe",
+          "reduce-row": "Zredukuj wiersz",
+          "row-index": "Indeks wiersza",
+          "unary-operation": "Działanie jednoargumentowe"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Funkcje skumulowane",
+        "window-functions": "Funkcje okna"
       },
       "label-alias": "Alias",
       "label-mode": "Tryb",
@@ -13161,9 +13165,9 @@
     },
     "calculate-heatmap": {
       "add-heatmap-calculation-options": {
-        "name-x-bucket": "",
-        "name-y-bucket": "",
-        "name-y-bucket-scale": ""
+        "name-x-bucket": "Zasobnik X",
+        "name-y-bucket": "Zasobnik Y",
+        "name-y-bucket-scale": "Skala zasobnika Y"
       }
     },
     "concatenate-transformer-editor": {
@@ -13171,9 +13175,9 @@
       "label-name": "Nazwa",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Skopiuj nazwę ramki do nazwy pola",
+          "ignore-the-frame-name": "Zignoruj nazwę ramki",
+          "label-frame": "Dodaj etykietę z nazwą ramki"
         }
       },
       "placeholder-frame": "Ramka"
@@ -13186,9 +13190,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Dodaj transformator typu Konwersja pól",
       "aria-label-remove-convert-field-type-transformer": "Usuń transformator typu Konwersja pól",
-      "convert-field-type": "",
+      "convert-field-type": "Konwertuj typ pola",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Konwertuj pole na określony typ pola."
       },
       "label": {
         "browser": "Przeglądarka",
@@ -13201,11 +13205,11 @@
       "label-join-with": "Połącz za pomocą",
       "label-set-timezone": "Ustaw strefę czasową",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Konwertuj typ pola"
       },
       "placeholder-type": "Typ",
       "tags": {
-        "format-field": ""
+        "format-field": "Formatuj pole"
       },
       "tooltip-explicit-separator-joining-array-values": "Podczas łączenia wartości tablic należy używać jawnego separatora",
       "tooltip-input-format": "Określ format pola wejściowego, aby usługa Grafana mogła poprawnie przetwarzać ciąg daty.",
@@ -13224,20 +13228,20 @@
       "tooltip-enable": "Włącz"
     },
     "draggable-sort-order": {
-      "asc": "",
-      "desc": "",
+      "asc": "ROSNĄCO",
+      "desc": "MALEJĄCO",
       "off": "Wył."
     },
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Połącz wszystkie pola w jedną ramkę."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Złącz pola"
         },
         "tags": {
-          "combine": ""
+          "combine": "Połącz"
         }
       }
     },
@@ -13252,11 +13256,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Przetwarzaj pola z treści (JSON, etykiety itp.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Wybierz pole"
         }
       },
       "label-delimiter": "Znak rozdzielający",
@@ -13265,7 +13269,7 @@
       "label-replace-all-fields": "Zastąp wszystkie pola",
       "label-source": "Źródło",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Wyodrębnij pola"
       },
       "placeholder-auto": "Automatycznie",
       "placeholder-select-delimiter": "Wybierz znak rozdzielający…",
@@ -13276,20 +13280,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Użyj wartości pola, aby wyszukać kraje, stany lub lotniska."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nie znaleziono pól tekstowych"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Wybierz pole tekstowe"
         }
       },
       "label-field": "Pole",
       "label-lookup": "Wyszukiwanie",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Wyszukaj pola z zasobu"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13300,23 +13304,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Usuń części wyników zapytania za pomocą wzorca wyrażeń regularnych."
       },
       "label-from-variable": "Ze zmiennej",
       "label-identifier": "Identyfikator",
       "label-use-variable": "Użyj zmiennej",
       "label-variable": "Zmienna",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Filtruj pola według nazwy"
       },
       "placeholder-regular-expression-pattern": "Wzorzec wyrażenia regularnego"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Usuń wiersze z danych na podstawie zapytania o pochodzenie"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Filtruj dane według zapytania"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13330,33 +13334,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Dodaj warunek",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Usuń wiersze z wyników zapytania za pomocą filtrów zdefiniowanych przez użytkownika."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Zgodność: całkowita",
+          "match-any": "Zgodność: dowolna"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Wyklucz",
+          "include": "Uwzględnij"
         }
       },
       "label-conditions": "Warunki",
       "label-filter-type": "Typ filtra",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Filtruj dane według wartości"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nie znaleziono pól tekstowych"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Wybierz pole tekstowe"
         }
       },
       "label-field": "Pole",
@@ -13365,10 +13369,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Manipuluj formatowaniem pól ciągów."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Formatuj ciąg"
       }
     },
     "format-time-transfomer-editor": {
@@ -13380,66 +13384,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Ustaw format wyjściowy pola czasu"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Formatuj czas"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Użyj wartości wiersza, aby obliczyć nowe pole."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Dodaj pole z obliczenia"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Ustaw jednostkę, wartość minimalną, maksymalną i inne."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Konfiguracja z wyników zapytania"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Wygeneruj dane mapy intensywności z danych źródłowych."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Utwórz mapę intensywności"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Spłaszcz oznaczone wyniki w tabelę połączoną według etykiet."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Połącz według etykiet"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Podziel zestaw danych z jednej ramki na wiele serii."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Podziel według wartości"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Konwertuj każdy wiersz na pole z dynamiczną konfiguracją."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Wiersze do pól"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Zastosuj operacje przestrzenne do wyników zapytania."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Operacje przestrzenne"
       }
     },
     "get-timezone-options": {
@@ -13471,8 +13475,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Oblicz",
+          "group-by": "Grupuj według"
         }
       },
       "placeholder-ignored": "Ignorowane",
@@ -13480,42 +13484,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Grupuj dane według wartości pola i twórz dane zagregowane."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Grupuj według"
       },
       "title-calc-alert": "Obliczenia nie będą miały żadnego wpływu, jeśli nie zostaną pogrupowane żadne pola"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Grupuj dane według wartości pola i twórz tabele zagnieżdżone z pogrupowanymi danymi."
       },
       "description-show-field-names": "Jeśli ta opcja jest włączona, w tabelach zagnieżdżonych nazwy pól będą wyświetlać się jako nagłówki tabeli",
       "label-show-field-names-in-nested-tables": "Pokaż nazwy pól w tabelach zagnieżdżonych",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Grupuj w tabelach zagnieżdżonych"
       },
       "title-calc-alert": "Obliczenia nie będą miały żadnego wpływu, jeśli nie zostaną pogrupowane żadne pola."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Podsumuj i reorganizuj dane na podstawie trzech pól."
       },
       "label-cell-value": "Wartość komórki",
       "label-column": "Kolumna",
       "label-empty-value": "Pusta wartość",
       "label-row": "Wiersz",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Grupowanie do macierzy"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Oblicz histogram na podstawie danych wejściowych."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Histogram"
       },
       "placeholder-auto": "Automatycznie",
       "placeholder-default": "Domyślnie: 30",
@@ -13527,14 +13531,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Połącz wiersze z co najmniej 2 tabel na podstawie powiązanego pola."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Połącz według pola"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Wymagane",
       "info": {
         "input-contain-labels": "Dane wejściowe nie zawierają żadnych etykiet",
         "no-input-or-labels-found": "Nie znaleziono danych wejściowych (lub etykiet)",
@@ -13558,8 +13562,8 @@
       "label-value-field-name": "Nazwa pola wartości",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Kolumny",
+          "rows": "Wiersze"
         }
       },
       "placeholder-optional-select-label": "(Opcjonalnie) Wybierz etykietę",
@@ -13567,18 +13571,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Grupuj serie według czasu i zwróć etykiety lub tagi jako pola."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Etykiety do pól"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Ogranicz liczbę wyświetlanych elementów."
       },
       "name": {
-        "limit": ""
+        "limit": "Limit"
       },
       "placeholder-value-or-variable": "Wartość lub zmienna"
     },
@@ -13591,11 +13595,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Scal wiele serii. Wartości zostaną połączone w jeden wiersz."
       },
       "merge-effect-applied-single-frame": "Scalanie nie ma żadnych skutków po zastosowaniu do pojedynczej ramki.",
       "name": {
-        "merge": ""
+        "merge": "Scal szeregi/tabele"
       }
     },
     "multi-info": {
@@ -13607,14 +13611,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Zmień kolejność, ukryj lub zmień nazwy pól."
       },
-      "field-order": "",
+      "field-order": "Kolejność pól",
       "field-order-auto": "Automatycznie",
-      "field-order-manual": "",
+      "field-order-manual": "Ręcznie",
       "first-frame-warning": "Organizowanie pól działa tylko w przypadku pojedynczej ramki. Rozważ najpierw zastosowanie transformacji połączenia lub odfiltrowanie danych wejściowych.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Uporządkuj pola według nazwy"
       }
     },
     "partion-by-values-editor": {
@@ -13642,10 +13646,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Rozciągnij ramki danych z szerokiego formatu do długiego formatu."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Przygotuj szereg czasowy"
       }
     },
     "prepare-time-series-editor": {
@@ -13653,26 +13657,26 @@
       "label-info": "Informacje",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Konwertuj każdą ramkę na format długi"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Długi szereg czasowy"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Tworzy nową ramkę dla każdej pary czas/liczba"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Wieloklatkowe szeregi czasowe"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Tworzy pojedynczą ramkę połączoną na podstawie czasu"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Szeroki szereg czasowy"
         }
       }
     },
@@ -13687,7 +13691,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Ogranicz wszystkie wiersze lub punkty danych do jednej wartości (np. maks., średnia)."
       },
       "label-calculations": "Obliczenia",
       "label-include-time": "Uwzględnij czas",
@@ -13704,7 +13708,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Zmniejszenie"
       },
       "placeholder-choose-stat": "Wybierz statystyki"
     },
@@ -13714,18 +13718,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Utwórz nową ramkę danych zawierającą wartości przewidywane przez model statystyczny."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Linia trendu"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Sześcienna",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Kwadratowa",
         "quartic": "4. stopnia",
-        "quintic": "5. stopnia"
+        "quintic": "5. stopnia",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Stopień",
       "label-model-type": "Typ modelu",
@@ -13738,18 +13747,19 @@
           "polynomial": "Wielomian"
         }
       },
-      "regression": "",
+      "regression": "regresja",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Analiza regresji"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Liczba punktów X,Y do prognozowania"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Zmień nazwy części wyników zapytania za pomocą wyrażenia regularnego i wzorca zastępowania."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Zmień nazwy pól według wyrażenia regularnego"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13763,33 +13773,33 @@
       "label-mode": "Tryb",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Połącz dane z dwóch tabel, gdy w polach wspólnych dla obu tabel znajdują się pasujące wartości.",
+          "join-on-a-field": "Połącz na podstawie wartości pola ze zduplikowanymi wartościami. Niewydajne łączenie zewnętrzne najlepiej nadaje się do danych tabelarycznych (podobnych do SQL).",
+          "keep-all-rows": "Zachowaj wszystkie wiersze z wartościami z dowolnej tabeli. Połącz na podstawie różnych wartości pól. Wydajne i najlepiej nadaje się do szeregów czasowych."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Wewnętrzne",
+          "outer-tabular": "Zewnętrzne (tabelaryczne)",
+          "outer-time-series": "Zewnętrzne (szeregi czasowe)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Scal wiele szeregów. Zwraca czas, metrykę i wartości jako wiersz."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Szeregi do wierszy"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Sortuj pola w ramce."
       },
       "label-field": "Pole",
       "label-reverse": "Odwróć",
       "name": {
-        "sort-by": ""
+        "sort-by": "Sortuj według"
       },
       "placeholder-select-field": "Wybierz pole"
     },
@@ -13812,13 +13822,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Konwertuj dane szeregów czasowych na wiersze tabeli, aby można je było wyświetlić w formacie tabelarycznym lub Sparkline."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "Transformacja szeregu czasowego do tabeli wymaga co najmniej jednej ramki szeregu czasowego. Obecnie nie masz żadnej."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Szereg czasowy do tabeli"
       }
     },
     "time-series-table-transform-editor": {
@@ -13836,15 +13846,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Transponuj ramkę danych."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Transpozycja"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Przestaw",
+        "transform": "Przekształć",
+        "translate": "Tłumacz"
       }
     },
     "unary-operation-editor": {
@@ -13853,13 +13863,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Oblicz nowe pola",
+        "combine": "Połącz",
+        "create-new-visualization": "Utwórz nową wizualizację",
+        "filter": "Filtr",
+        "perform-spatial-operations": "Wykonaj operacje przestrzenne",
+        "reformat": "Formatuj ponownie",
+        "reorder-and-rename": "Zmień kolejność i zmień nazwę"
       },
       "special-value-options": {
         "description": {
@@ -13910,10 +13920,10 @@
     }
   },
   "trend": {
-    "category-x-axis": "",
-    "description-x-field": "",
-    "name-x-field": "",
-    "placeholder-x-field": ""
+    "category-x-axis": "Oś X",
+    "description-x-field": "Rosnąca wartość numeryczna",
+    "name-x-field": "Pole X",
+    "placeholder-x-field": "Pierwsza wartość numeryczna"
   },
   "upgrade-box": {
     "discovery-text": "Udało Ci się odkryć funkcję Pro.",
@@ -13930,7 +13940,7 @@
     "title": "Organizacje"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Nie znaleziono użytkowników",
     "select-aria-label": "Selektor użytkownika",
     "select-placeholder": "Zacznij pisać, aby wyszukać użytkownika"
   },
@@ -14016,8 +14026,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Czy na pewno chcesz usunąć zmienną „{{variableToDelete}}”?",
+      "confirmText-delete": "Usuń",
       "title-delete-variable": "Usuń zmienną"
     },
     "create-ad-hoc-variable-adapter": {
@@ -14067,33 +14077,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Jak sortować wartości tej zmiennej",
-      "name-sort": "",
+      "name-sort": "Sortuj",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Alfabetycznie (rosnąco)",
+          "alphabetical-caseinsensitive-asc": "Alfabetycznie (bez rozróżniania wielkości liter, rosnąco)",
+          "alphabetical-caseinsensitive-desc": "Alfabetycznie (bez rozróżniania wielkości liter, malejąco)",
+          "alphabetical-desc": "Alfabetycznie (malejąco)",
+          "disabled": "Wyłączone",
+          "natural-asc": "Naturalnie (rosnąco)",
+          "natural-desc": "Naturalnie (malejąco)",
+          "numerical-asc": "Numerycznie (rosnąco)",
+          "numerical-desc": "Numerycznie (malejąco)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Dodaj opcję",
+      "description": "Dodaj opcje niestandardowe oprócz wyników zapytania",
+      "label-placeholder": "wyświetl etykietę",
+      "remove-option-button-label": "Usuń opcję",
+      "value-placeholder": "wartość, domyślnie pusty ciąg"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Jak sortować opcje statyczne na podstawie wyników zapytania"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Domyślna wartość",
       "placeholder-default-value-if-any": "wartość domyślna, jeśli istnieje",
       "text-options": "Opcje tekstu"
     },
@@ -14122,8 +14132,8 @@
       "description-optional-display-name": "Opcjonalna nazwa wyświetlana",
       "description-template-variable-characters": "Nazwa zmiennej szablonu. (maks. 50 znaków)",
       "general": "Ogólne",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Etykieta",
+      "name-name": "Nazwa",
       "placeholder-descriptive-text": "Tekst opisowy",
       "placeholder-label-name": "Nazwa etykiety",
       "placeholder-variable-name": "Nazwa zmiennej",
@@ -14139,13 +14149,13 @@
       "tooltip-remove-variable": "Usuń zmienną"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Opis"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Przełącz wszystkie wartości"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Wybierz typ zmiennej"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Wyświetl użycie"
@@ -14176,20 +14186,20 @@
     }
   },
   "xychart": {
-    "category-xychart": "",
-    "name-fill-opacity": "",
-    "name-line-style": "",
-    "name-line-width": "",
-    "name-max-point-size": "",
-    "name-min-point-size": "",
-    "name-point-shape": "",
-    "name-point-size": "",
-    "name-point-stroke-width": "",
-    "name-series-mapping": "",
-    "name-show": "",
+    "category-xychart": "Wykres XY",
+    "name-fill-opacity": "Nieprzezroczystość wypełnienia",
+    "name-line-style": "Styl linii",
+    "name-line-width": "Szerokość linii",
+    "name-max-point-size": "Maks. rozmiar punktu",
+    "name-min-point-size": "Min. rozmiar punktu",
+    "name-point-shape": "Kształt punktu",
+    "name-point-size": "Rozmiar punktu",
+    "name-point-stroke-width": "Szerokość obrysu punktu",
+    "name-series-mapping": "Mapowanie szeregu",
+    "name-show": "Pokaż",
     "point-shape-options": {
-      "label-circle": "",
-      "label-square": ""
+      "label-circle": "Okrąg",
+      "label-square": "Kwadrat"
     },
     "series-editor": {
       "add-series": "Dodaj szereg",
@@ -14201,18 +14211,18 @@
       "label-y-field": "Pole Y",
       "placeholder-all-frames": "Wszystkie ramki",
       "placeholder-select-frame": "Wybierz ramkę",
-      "placeholder-x-field": "",
-      "placeholder-y-field": "",
+      "placeholder-x-field": "Pierwsze pole liczby lub czasu w każdej ramce",
+      "placeholder-y-field": "Pozostałe pola liczbowe w każdej ramce",
       "tooltip-delete-series": "Usuń szereg"
     },
     "series-mapping-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automatycznie",
+      "label-manual": "Ręcznie"
     },
     "show-options": {
-      "label-both": "",
-      "label-lines": "",
-      "label-points": ""
+      "label-both": "Oba",
+      "label-lines": "Linie",
+      "label-points": "Punkty"
     }
   }
 }
\ No newline at end of file
diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json
index b5763fbf26b..223843336b4 100644
--- a/public/locales/pt-BR/grafana.json
+++ b/public/locales/pt-BR/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Alguns recursos estão estáveis (GA) e habilitados por padrão, enquanto outros estão atualmente em fase Beta preliminar, disponíveis para acesso antecipado.",
       "confirm-modal-body-2": "Aconselhamos que você entenda o que cada mudança de recurso pode causar antes de fazer alterações.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Salvar alterações",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Disponibilidade geral",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Excluir org.",
-      "confirmText-delete": "",
+      "confirmText-delete": "Excluir",
       "title-delete": "Excluir"
     },
     "anon-users": {
       "not-found": "Nenhum usuário anônimo encontrado."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Tem certeza de que deseja forçar o logout de todos os dispositivos?",
+      "confirmText-confirm-logout": "Confirmar logout ",
+      "confirmText-force-logout": "Forçar logout",
       "title-force-logout-from-all-devices": "Forçar desconexão de todos os dispositivos"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Salvar"
     },
     "edit-org": {
       "access-denied": "Você não tem permissão para ver usuários nesta organização. Para atualizar esta organização, entre em contato com o administrador do servidor.",
@@ -119,10 +119,10 @@
       "users-heading": "Usuários da organização"
     },
     "enterprise-auth-features-card": {
-      "dismiss": "",
-      "heading": "",
-      "learn-more-link": "",
-      "text": ""
+      "dismiss": "Ignorar",
+      "heading": "Autenticação empresarial",
+      "learn-more-link": "Saiba mais",
+      "text": "Gerencie usuários, equipes e permissões automaticamente com <1>SAML</1>, <3>SCIM</3>, <6>LDAP</6> e <8>RBAC</8>, disponíveis na Grafana Cloud e na Grafana Enterprise."
     },
     "feature-listing": {
       "title-auditing": "Auditoria",
@@ -216,11 +216,11 @@
       "not-editable": "Não é possível editar a função deste usuário porque ela está sincronizada com seu provedor de autenticação. Consulte os <1>Documentos de autenticação da Grafana</1> para saber mais."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Tem certeza de que deseja excluir o usuário {{user}}?",
       "columns": {
         "aria-label-role": "Função"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Excluir",
       "delete-aria-label": "Excluir usuário: {{name}}",
       "title-delete": "Excluir"
     },
@@ -252,7 +252,7 @@
       "info-description": "Essas configurações do sistema são definidas em grafana.ini ou custom.ini (ou substituídas em variáveis ENV). Para alterá-las, você precisa reiniciar o Grafana."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Confirmar exclusão"
     },
     "upgrade-info": {
       "title": "Licença Enterprise"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Alterar",
-      "confirmText-change": "",
+      "confirmText-change": "Alterar",
       "grafana-admin-key": "Administrador da Grafana",
       "grafana-admin-no": "Não",
       "grafana-admin-yes": "Sim",
       "title": "Permissões"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Tem certeza de que deseja excluir este usuário?",
+      "body-disable": "Tem certeza de que deseja desativar este usuário?",
+      "confirmText-delete-user": "Excluir usuário",
+      "confirmText-disable-user": "Desativar usuário",
       "delete-button": "Excluir usuário",
       "disable-button": "Desativar usuário",
       "edit-button": "Editar",
@@ -331,7 +331,7 @@
       "title-disable-user": "Desativar usuário"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Salvar"
     },
     "user-sessions": {
       "browser-column": "Navegador e sistema operacional",
@@ -374,20 +374,20 @@
       "am-active-timing-select-label-active-timings": "Ativar cronogramas"
     },
     "ad": {
-      "close": "",
-      "learn-more": ""
+      "close": "Fechar",
+      "learn-more": "Saiba mais"
     },
     "add-button": {
       "add-more": "Adicionar mais"
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Falha ao carregar o botão de regra de alerta de IA",
+        "feedback-button": "Falha ao carregar o botão de feedback de IA",
+        "improve-annotations-button": "Falha ao carregar o botão de melhoria de anotações de IA",
+        "improve-labels-button": "Falha ao carregar o botão de melhoria de rótulos de IA",
+        "template-button": "Falha ao carregar o botão de modelo de IA",
+        "triage-button": "Falha ao carregar o botão de triagem de IA"
       }
     },
     "alert": {
@@ -405,12 +405,12 @@
       "missing-series-resolve": "Avaliações de série ausentes para resolver",
       "no-annotations": "Sem anotações",
       "notification-configuration": {
-        "active-timings": "",
+        "active-timings": "Intervalos de tempo ativos",
         "contact-point": "Ponto de contato",
         "group-by": "Agrupado por",
-        "group-title": "",
+        "group-title": "Configuração de notificações",
         "mute-timings": "Cronogramas de silenciamento",
-        "timing-options": ""
+        "timing-options": "Tempos"
       },
       "pending-period": "Período pendente",
       "rule": "Regra",
@@ -493,7 +493,7 @@
       "title-muting-grouping-and-timings": "Silenciamento, agrupamento e cronogramas"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nenhuma fonte de dados encontrada"
     },
     "alert-menu": {
       "copy-link": "Copiar link",
@@ -519,7 +519,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Regra de alerta"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -587,7 +587,7 @@
       "view-configuration": "Ver configuração"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Sim, redefinir configurações",
       "gma-manual-configuration-description": "A configuração interna do Grafana Alertmanager não pode ser alterada manualmente. Para alterar essa configuração, edite os recursos individuais por meio da interface do usuário.",
       "gma-manual-configuration-is-not-supported": "Não se permite fazer alterações de configuração manual",
       "message": {
@@ -602,13 +602,13 @@
       "title-resetting-alertmanager-configuration": "Redefinindo a configuração do Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Tem certeza de que deseja restaurar a configuração para esta versão? Todas as alterações não salvas serão perdidas.",
       "columns": {
         "compare": "Comparar",
         "restore": "Restaurar",
         "text-latest": "Mais recentes"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Sim, restaurar configuração",
       "loading": "Carregando...",
       "no-previous-configurations": "Sem configurações anteriores",
       "this-might-take-a-while": "Isso pode demorar um pouco…",
@@ -888,10 +888,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Mais ações para o ponto de contato \"{{contactPointName}}\"",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Excluir",
       "button-edit": "Editar",
       "button-view": "Visualizar",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Exportar",
       "export-label-export": "Exportar",
       "label-delete": "Excluir",
       "label-manage-permissions": "Gerenciar permissões",
@@ -964,7 +964,7 @@
     },
     "contactPoints": {
       "validation": {
-        "notFound": ""
+        "notFound": "Não foi possível encontrar o ponto de contato \"{{contactPoint}}\""
       }
     },
     "continue-matching-indicator": {
@@ -973,7 +973,7 @@
     "copy-to-clipboard": "Copiar \"{{label}}\" para a área de transferência",
     "create-metadata": {
       "label": {
-        "contact-point": "",
+        "contact-point": "As notificações são entregues a",
         "dashboard": "Painel de controle",
         "dashboard-and-panel": "Painel de controle e painel",
         "evaluation-interval": "Intervalo de avaliação",
@@ -1121,7 +1121,7 @@
       "content-show-all-errors": "Exibir todos os erros"
     },
     "errors": {
-      "failedWith": ""
+      "failedWith": "{{-config}} apresentou falha com o status {{status}}: {{-message}}"
     },
     "evaluate-every-validation-options": {
       "message": {
@@ -1426,7 +1426,7 @@
       "label-disable-resolved-message": "Desativar mensagem resolvida"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Carregando grupos…",
       "message": {
         "must-be-a-positive-integer": "Deve ser um número inteiro positivo.",
         "must-enter-a-group-name": "É necessário inserir um nome de grupo"
@@ -1523,7 +1523,7 @@
       "group-loading-error": "Erro ao carregar o grupo",
       "interval": "Intervalo",
       "namespace": "Nomenclatura",
-      "new": "",
+      "new": "Novo",
       "title": {
         "back": ""
       }
@@ -1555,7 +1555,7 @@
     },
     "group-loader": {
       "group-load-failed": "Falha ao carregar regras do grupo {{ groupName }} em {{ namespaceName }}",
-      "no-rules": ""
+      "no-rules": "Nenhuma regra encontrada neste grupo"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "O grupo está sendo excluído"
@@ -1572,20 +1572,20 @@
       }
     },
     "home": {
-      "irm-card-description": "",
-      "irm-card-item-1": "",
-      "irm-card-item-2": "",
-      "irm-card-item-3": "",
-      "irm-card-item-4": "",
-      "irm-card-title": "",
+      "irm-card-description": "Unifique a resposta a plantões, alertas e incidentes com o Grafana Cloud IRM.",
+      "irm-card-item-1": "Gerencie agendamentos de plantão com seu calendário ou com o Terraform.",
+      "irm-card-item-2": "Responda a incidentes pela web, aplicativo, Slack ou por outros canais.",
+      "irm-card-item-3": "Identifique as principais causas com o Grafana SIFT com IA.",
+      "irm-card-item-4": "Analise incidentes anteriores para aprimorar a resposta e a resiliência.",
+      "irm-card-title": "Resposta e gestão de incidentes",
       "label-get-started": "Primeiros passos",
       "label-insights": "Insights",
-      "synthetic-monitoring-card-description": "",
-      "synthetic-monitoring-card-item-1": "",
-      "synthetic-monitoring-card-item-2": "",
-      "synthetic-monitoring-card-item-3": "",
-      "synthetic-monitoring-card-item-4": "",
-      "synthetic-monitoring-card-title": ""
+      "synthetic-monitoring-card-description": "Monitore fluxos críticos de usuários, sites e APIs de forma externa, a partir de locais globais.",
+      "synthetic-monitoring-card-item-1": "Simule jornadas de usuário de ponta a ponta com verificações de navegador.",
+      "synthetic-monitoring-card-item-2": "Execute verificações de ping, DNS, HTTP/S e TCP em cada camada de rede.",
+      "synthetic-monitoring-card-item-3": "Use mais de 20 sondagens globais ou privadas por trás do seu firewall.",
+      "synthetic-monitoring-card-item-4": "Acompanhe os SLOs com alertas integrados parecidos com os do Prometheus, diretamente pela interface do usuário.",
+      "synthetic-monitoring-card-title": "Monitoramento sintético"
     },
     "import-to-gma": {
       "action-button": "Importar",
@@ -1599,7 +1599,7 @@
         "no-rules-body-yaml": "Não há regras para importar. Selecione outro arquivo yaml.",
         "no-rules-title": "Nenhuma regra para importar",
         "not-using-rules-managed-by-integrations-or-plugins": {
-          "text": "",
+          "text": "As regras gerenciadas por integrações ou plug-ins não devem ser importadas para as regras gerenciadas pela Grafana.",
           "title": "Informações"
         },
         "plugin-rules-warning": {
@@ -1885,10 +1885,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nenhuma fonte de dados encontrada"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Tem certeza de que deseja excluir \"{{muteTiming}}\"?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Desativado",
@@ -1979,7 +1979,7 @@
     },
     "notification-policies-filter": {
       "label-search-by-contact-point": "Pesquisar por ponto de contato",
-      "placeholder-search-by-contact-point": "",
+      "placeholder-search-by-contact-point": "Escolha um ponto de contato",
       "search-query-input-placeholder-search": "Pesquisar"
     },
     "notification-policies-list": {
@@ -2140,10 +2140,10 @@
         "conflict": "A árvore de políticas de notificação foi atualizada por outro usuário.",
         "error-code": "Mensagem de erro: \"{{error}}\"",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Não é possível adicionar ou atualizar a rota: os operadores de correspondência entram em conflito com uma árvore de roteamento externa se mesclamos os operadores de correspondência {{-matchers}}. Isso tornaria a rota inacessível."
         },
         "suffix": "Atualize a página e tente novamente.",
-        "title": ""
+        "title": "Falha ao adicionar ou atualizar a política de notificação"
       },
       "n-more-policies_one": "{{count}} política adicional",
       "n-more-policies_other": "{{count}} políticas adicionais"
@@ -2199,7 +2199,7 @@
     "query-and-expressions-step": {
       "add-query": "Adicionar consulta",
       "body-queries-expressions-configured": "Crie pelo menos uma consulta ou expressão para receber alertas",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Desativar",
       "expressions": "Expressões",
       "loading-data-sources": "Carregando fontes de dados…",
       "manipulate-returned-queries-other-operations": "Manipule os dados que retornaram das consultas usando operações matemáticas e outras operações.",
@@ -2253,7 +2253,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Regra de registro"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Não foi possível carregar o editor de consultas devido a: {{errorMessage}}"
@@ -2273,7 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Você precisará definir um novo grupo de avaliação para a regra copiada, pois o original foi provisionado e não pode ser usado para regras criadas na interface do usuário.",
       "body-not-provisioned": "A nova regra <1>não</1> será marcada como uma regra provisionada.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Copiar",
       "title-copy-provisioned-alert-rule": "Copiar regra de alerta provisionada"
     },
     "redirect-to-rule-viewer": {
@@ -2492,12 +2492,12 @@
         "new-badge": "Novidade!",
         "text": "Importar para as regras gerenciadas pela Grafana"
       },
-      "loading-more-groups": "",
+      "loading-more-groups": "Carregando mais grupos…",
       "more": "Mais",
       "new-alert-rule": "Nova regra de alerta",
       "new-datasource-recording-rule": "Nova regra de registro de fonte de dados",
       "new-grafana-recording-rule": "Nova regra de registro da Grafana",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Nova regra de alerta para exportação",
       "pagination": {
         "next-page": "Exibir mais…"
       },
@@ -2671,7 +2671,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Gerentes de alerta"
       }
     },
     "settings-content": {
@@ -2809,7 +2809,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Atualizar a pré-visualização",
-      "empty-state": "",
+      "empty-state": "Adicione conteúdos do modelo para ver a prévia",
       "label-preview": "Visualizar",
       "refresh": "Atualizar"
     },
@@ -2828,7 +2828,7 @@
       "loading": "Carregando...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Selecionar modelo de notificação"
         },
         "label": {
           "select-notification-template": "Selecionar modelo de notificação"
@@ -2856,8 +2856,8 @@
     },
     "templates-table": {
       "actions": "Ações",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Tem certeza de que deseja excluir o grupo de modelos \"{{template}}\"?",
+      "confirmText-yes-delete": "Sim, excluir",
       "no-templates-defined": "Nenhum modelo definido.",
       "template-group": "Grupo de modelos",
       "title-delete-template-group": "Excluir grupo de modelos"
@@ -2912,7 +2912,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Gerenciar regras de alerta, regras de registro e intervalo de avaliação"
       }
     },
     "to-gma": {
@@ -2992,7 +2992,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Sim, excluir"
       }
     },
     "use-delete-policy-modal": {
@@ -3046,51 +3046,51 @@
     }
   },
   "alertlist": {
-    "category-alert-state-filter": "",
-    "category-filter": "",
-    "category-options": "",
-    "descriptino-alerts-linked-to-dashboard": "",
-    "description-alert-instance-label": "",
-    "description-alert-name": "",
-    "description-datasource": "",
-    "description-folder": "",
-    "description-group-by": "",
-    "description-group-mode": "",
-    "description-max-items": "",
-    "description-show-inactive-alerts": "",
-    "description-sort-order": "",
-    "description-view-mode": "",
+    "category-alert-state-filter": "Filtro de estado de alerta",
+    "category-filter": "Filtro",
+    "category-options": "Opções",
+    "descriptino-alerts-linked-to-dashboard": "Mostrar apenas alertas vinculados a este painel",
+    "description-alert-instance-label": "Filtrar instâncias de alerta usando consulta de rótulos. Por exemplo: {severity=\"critical\", instance=~\"cluster-us-.+\"}",
+    "description-alert-name": "Filtrar alertas que contenham este texto",
+    "description-datasource": "Filtrar a partir da fonte do alerta",
+    "description-folder": "Filtrar alertas na pasta selecionada (apenas para regras de alerta gerenciadas pela Grafana)",
+    "description-group-by": "Filtrar alertas usando a consulta por rótulos",
+    "description-group-mode": "Como as instâncias de alerta devem ser agrupadas",
+    "description-max-items": "Máximo de alertas a serem exibidos",
+    "description-show-inactive-alerts": "Incluem regras de alerta que tenham 0 (zero) instâncias. Como essas regras não têm instâncias, elas permanecem ocultas se o filtro de rótulo de instância de alerta estiver configurado.",
+    "description-sort-order": "Ordem de classificação de alertas e instâncias de alerta",
+    "description-view-mode": "Alternar entre a visualização de lista e a visualização de estatísticas",
     "group-by": {
       "aria-label-group-by-label-keys": "agrupar por chaves de rótulo",
       "placeholder-group-by": "Agrupar por"
     },
     "group-mode-options": {
-      "label-custom-grouping": "",
-      "label-default-grouping": ""
+      "label-custom-grouping": "Agrupamento personalizado",
+      "label-default-grouping": "Agrupamento padrão"
     },
-    "name-alert-instance-label": "",
-    "name-alert-name": "",
-    "name-alerts-linked-to-dashboard": "",
-    "name-datasource": "",
-    "name-error": "",
-    "name-firing": "",
-    "name-folder": "",
-    "name-group-by": "",
-    "name-group-mode": "",
-    "name-max-items": "",
-    "name-no-data": "",
-    "name-normal": "",
-    "name-pending": "",
-    "name-recovering": "",
-    "name-show-inactive-alerts": "",
-    "name-sort-order": "",
-    "name-view-mode": "",
+    "name-alert-instance-label": "Rótulo da instância de alerta",
+    "name-alert-name": "Nome do alerta",
+    "name-alerts-linked-to-dashboard": "Alertas vinculados a este painel",
+    "name-datasource": "Fonte de dados",
+    "name-error": "Erro",
+    "name-firing": "Em alerta/ativo",
+    "name-folder": "Pasta",
+    "name-group-by": "Agrupar por",
+    "name-group-mode": "Modo de grupo",
+    "name-max-items": "Itens máximos",
+    "name-no-data": "Sem dados",
+    "name-normal": "Normal",
+    "name-pending": "Pendente",
+    "name-recovering": "Em recuperação",
+    "name-show-inactive-alerts": "Mostrar alertas com 0 instâncias",
+    "name-sort-order": "Ordenar",
+    "name-view-mode": "Modo de visualização",
     "sort-order-options": {
-      "label-alphabetical-asc": "",
-      "label-alphabetical-desc": "",
-      "label-importance": "",
-      "label-time-asc": "",
-      "label-time-desc": ""
+      "label-alphabetical-asc": "Ordem alfabética (asc.)",
+      "label-alphabetical-desc": "Ordem alfabética (desc.)",
+      "label-importance": "Relevância",
+      "label-time-asc": "Hora (asc.)",
+      "label-time-desc": "Hora (desc.)"
     },
     "ungrouped-mode-view": {
       "active-for": "durante <1>{{duration}}</1>",
@@ -3106,8 +3106,8 @@
       "title-permission-required": "Permissão necessária"
     },
     "view-mode-options": {
-      "label-list": "",
-      "label-stat": ""
+      "label-list": "Lista",
+      "label-stat": "Estatística"
     }
   },
   "annolist": {
@@ -3120,31 +3120,31 @@
     "annotation-list-item": {
       "tooltip-created-by": "Criado por:<1></1> {{email}}"
     },
-    "category-annotation-query": "",
-    "category-display": "",
-    "category-link-behaviour": "",
-    "description-tags": "",
+    "category-annotation-query": "Consulta de anotação",
+    "category-display": "Exibição",
+    "category-link-behaviour": "Comportamento do link",
+    "description-tags": "Corresponder etiquetas de anotação",
     "link-target-options": {
-      "label-dashboard": "",
-      "label-panel": ""
+      "label-dashboard": "Painel de controle",
+      "label-panel": "Painel"
     },
-    "name-limit": "",
-    "name-link-target": "",
-    "name-query-filter": "",
-    "name-show-tags": "",
-    "name-show-time": "",
-    "name-show-user": "",
-    "name-tags": "",
-    "name-time-after": "",
-    "name-time-before": "",
-    "name-time-range": "",
+    "name-limit": "Limite",
+    "name-link-target": "Destino do link",
+    "name-query-filter": "Filtro de consulta",
+    "name-show-tags": "Mostrar tags",
+    "name-show-time": "Mostrar hora",
+    "name-show-user": "Mostrar usuário",
+    "name-tags": "Tags",
+    "name-time-after": "Horário após",
+    "name-time-before": "Horário antes",
+    "name-time-range": "Intervalo de tempo",
     "query-filter-options": {
-      "label-all-dashboards": "",
-      "label-this-dashboard": ""
+      "label-all-dashboards": "Todos os painéis",
+      "label-this-dashboard": "Este painel"
     },
     "time-range-options": {
-      "label-none": "",
-      "label-this-dashboard": ""
+      "label-none": "Nenhum",
+      "label-this-dashboard": "Este painel"
     }
   },
   "annotations": {
@@ -3152,7 +3152,7 @@
       "annotation": "Anotação",
       "first-value": "Primeiro valor",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Nomes de campos desconhecidos"
     },
     "empty-state": {
       "button-title": "Adicionar consulta de anotação",
@@ -3162,12 +3162,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Quando este campo for definido, a anotação será tratada como um intervalo",
+        "results-split-on-comma": "Os resultados serão divididos por vírgula (,)"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}, ou o primeiro campo de texto",
+        "time-or-the-first-field": "{{defaultField}}, ou o primeiro campo de tempo"
       }
     },
     "standard-annotation-query-editor": {
@@ -3245,9 +3245,9 @@
       "define-allowed-teams-ids-label": "Definir IDs das equipes permitidas",
       "display-name-description": "Será exibido na página de login como \"Entrar com...\". É uma opção conveniente caso você use mais de um provedor de identidade ou protocolos SSO.",
       "display-name-label": "Nome de exibição",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Parâmetro para indicar o âmbito do usuário no locatário do Azure AD/Entra ID e agilizar o processo de login.",
+      "domain-hint-label": "Dica de domínio",
+      "domain-hint-valid-domain": "Este campo deve ser um domínio válido.",
       "email-attribute-name-description": "Nome da chave a ser usada para a consulta de e-mail do usuário no mapa de atributos do token de ID OAuth2.",
       "email-attribute-name-label": "Nome do atributo de e-mail",
       "email-attribute-path-description": "Expressão JMESPath a ser usada para a consulta de e-mail do usuário a partir das informações do usuário.",
@@ -3264,11 +3264,11 @@
       "id-token-attribute-name-label": "Nome do atributo do token de ID",
       "login-attribute-path-description": "Expressão JMESPath a ser usada para a consulta de login do usuário a partir do token de ID do usuário.",
       "login-attribute-path-label": "Caminho do atributo de login",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Consentimento ",
+      "login-prompt-description": "Indica o tipo de interação do usuário quando o usuário faz login com o IdP.",
+      "login-prompt-label": "Solicitação de login",
+      "login-prompt-login": "Login",
+      "login-prompt-select-account": "Selecionar conta",
       "managed-identity-client-id-description": "O ID do cliente de identidade gerenciada da credencial de identidade federada (FIC) do seu aplicativo OAuth2.",
       "managed-identity-client-id-label": "ID do cliente de identidade gerenciada da FIC",
       "name-attribute-path-description": "Expressão JMESPath a ser usada para a consulta de nome de usuário a partir do token de ID do usuário. \nEste nome será usado como o nome de exibição do usuário.",
@@ -3304,7 +3304,7 @@
       "team-ids-github": "Lista de números inteiros de IDs de equipe.",
       "team-ids-label": "IDs de equipe",
       "team-ids-numbers": "Os IDs de equipe devem ser números.",
-      "team-ids-other": "",
+      "team-ids-other": "Lista de strings de IDs de equipe.",
       "team-ids-placeholder": "Insira os IDs de equipe e pressione Enter para adicioná-los",
       "teams-url-description": "A URL usada para consultar IDs de equipe. Se não for definido, o valor padrão é /teams.",
       "teams-url-description-oauth": "Se você configurar \"{{ teamsURLLabel }}\", também será necessário configurar \"{{ teamIDsAttributePathLabel }}\".",
@@ -3339,8 +3339,8 @@
       }
     },
     "provider-card": {
-      "saml-learn-more": "",
-      "scim-learn-more": "",
+      "saml-learn-more": "Login único (SSO) com SAML.",
+      "scim-learn-more": " Sincronize usuários e equipes com o SCIM.",
       "text-badge-enabled": "Ativado",
       "text-badge-not-enabled": "Não ativado"
     },
@@ -3348,7 +3348,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Redefinir para os valores padrão"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Redefinir",
       "disable": "Desativar",
       "disabling": "Desabilitando...",
       "discard": "Descartar",
@@ -3368,7 +3368,7 @@
       "text-badge-not-enabled": "Não ativado"
     },
     "scim-banner": {
-      "message": ""
+      "message": "Atualmente, o SCIM se encontra em desenvolvimento, por isso, não é recomendável seu uso para produção. Use-o com cautela e leve em conta a possibilidade de ocorrer alterações."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "O endpoint .well-known/openid-configuration para seu IdP",
@@ -3380,99 +3380,99 @@
   },
   "bar-chart": {
     "warn": {
-      "missing-numeric": "",
-      "missing-series": ""
+      "missing-numeric": "Nenhum campo numérico encontrado",
+      "missing-series": "Os gráficos de barras exigem um campo de string ou de tempo"
     }
   },
   "barchart": {
     "config": {
-      "category-thresholds": "",
-      "description-color-by-field": "",
-      "description-x-label-max-length": "",
-      "name-bar-radius": "",
-      "name-bar-width": "",
-      "name-color-by-field": "",
-      "name-fill-opacity": "",
-      "name-full-highlight": "",
-      "name-gradient-mode": "",
-      "name-group-width": "",
-      "name-line-width": "",
-      "name-orientation": "",
-      "name-rotate-x-labels": "",
-      "name-show-thresholds": "",
-      "name-show-values": "",
-      "name-stacking": "",
-      "name-transform": "",
-      "name-x-axis": "",
-      "name-x-label-max-length": "",
-      "name-x-label-min-spacing": "",
+      "category-thresholds": "Limites",
+      "description-color-by-field": "Use o valor de cor em um campo relacionado para colorir cada valor de barra.",
+      "description-x-label-max-length": "Os rótulos do eixo X serão encurtados de acordo com o comprimento fornecido",
+      "name-bar-radius": "Raio da barra",
+      "name-bar-width": "Largura da barra",
+      "name-color-by-field": "Cor por campo",
+      "name-fill-opacity": "Opacidade do preenchimento",
+      "name-full-highlight": "Destacar a área completa ao passar o cursor",
+      "name-gradient-mode": "Modo de gradiente",
+      "name-group-width": "Largura do grupo",
+      "name-line-width": "Largura da linha",
+      "name-orientation": "Orientação",
+      "name-rotate-x-labels": "Girar rótulos de marcação do eixo X",
+      "name-show-thresholds": "Mostrar limites",
+      "name-show-values": "Mostrar valores",
+      "name-stacking": "Empilhamento",
+      "name-transform": "Transformar",
+      "name-x-axis": "Eixo X",
+      "name-x-label-max-length": "Comprimento máximo do rótulo de marcação do eixo X",
+      "name-x-label-min-spacing": "Espaçamento mínimo dos rótulos do eixo X",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-line-vertical": ""
+        "label-auto": "Automático",
+        "label-horizontal": "Horizontal",
+        "label-line-vertical": "Vertical"
       },
-      "placeholder-x-axis": "",
-      "placeholder-x-label-max-length": "",
+      "placeholder-x-axis": "Primeiro campo de string ou de tempo",
+      "placeholder-x-label-max-length": "Nenhum",
       "show-values-options": {
-        "label-always": "",
-        "label-auto": "",
-        "label-never": ""
+        "label-always": "Sempre",
+        "label-auto": "Automático",
+        "label-never": "Nunca"
       },
       "transform-options": {
-        "description-constant": "",
-        "description-negative-y": "",
-        "label-constant": "",
-        "label-negative-y": ""
+        "description-constant": "O primeiro valor será exibido como uma linha constante",
+        "description-negative-y": "Inverter os resultados para valores negativos no eixo y",
+        "label-constant": "Constante",
+        "label-negative-y": "Y negativo"
       }
     },
     "tick-spacing-editor": {
       "content-require-space-from-the-right-side": "Exigir espaço do lado direito",
       "gaps-options": {
-        "description-large": "",
-        "description-medium": "",
-        "description-none": "",
-        "description-small": "",
-        "label-large": "",
-        "label-medium": "",
-        "label-none": "",
-        "label-small": ""
+        "description-large": "Exigir espaçamento {{spacing}}",
+        "description-medium": "Exigir espaçamento {{spacing}}",
+        "description-none": "Mostrar todas as marcas de escala",
+        "description-small": "Exigir espaçamento {{spacing}}",
+        "label-large": "Grande",
+        "label-medium": "Médio",
+        "label-none": "Nenhum",
+        "label-small": "Pequeno"
       },
       "label-rtl": "Da direita para esquerda"
     }
   },
   "bargauge": {
     "bar-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automático",
+      "label-manual": "Manual"
     },
-    "category-bar-gauge": "",
-    "description-max-height": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-show-unfilled-area": "",
+    "category-bar-gauge": "Medidor de barra",
+    "description-max-height": "Altura máxima da linha (orientação horizontal)",
+    "description-min-height": "Altura mínima da linha (orientação horizontal)",
+    "description-min-width": "Largura mínima da coluna (orientação vertical)",
+    "description-show-unfilled-area": "Quando ativado, gera a região não preenchida na cor cinza",
     "display-mode-options": {
-      "label-basic": "",
-      "label-gradient": "",
-      "label-retro": ""
+      "label-basic": "Básico",
+      "label-gradient": "Gradiente",
+      "label-retro": "LCD retrô"
     },
-    "name-bar-size": "",
-    "name-display-mode": "",
-    "name-max-height": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-name-placement": "",
+    "name-bar-size": "Tamanho da barra",
+    "name-display-mode": "Modo de exibição",
+    "name-max-height": "Altura máxima",
+    "name-min-height": "Altura mínima",
+    "name-min-width": "Largura mínima",
+    "name-name-placement": "Posicionamento do nome",
     "name-placement-options": {
-      "label-auto": "",
-      "label-hidden": "",
-      "label-left": "",
-      "label-top": ""
+      "label-auto": "Automático",
+      "label-hidden": "Oculto",
+      "label-left": "Esquerda",
+      "label-top": "Superior"
     },
-    "name-show-unfilled-area": "",
-    "name-value-display": "",
+    "name-show-unfilled-area": "Mostrar área não preenchida",
+    "name-value-display": "Exibição de valor",
     "value-display-options": {
-      "label-hidden": "",
-      "label-text-color": "",
-      "label-value-color": ""
+      "label-hidden": "Oculto",
+      "label-text-color": "Cor do texto",
+      "label-value-color": "Cor do valor"
     }
   },
   "bookmarks-page": {
@@ -3486,8 +3486,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Excluir recursos provisionados em massa",
+      "bulk-move-provisioned-resources": "Mover recursos provisionados em massa",
       "cancel-button": "Cancelar",
       "confirmation-text": "Excluir",
       "delete-button": "Excluir",
@@ -3496,7 +3496,7 @@
       "delete-modal-restore-dashboards-text": "Esta ação excluirá as pastas selecionadas imediatamente, mas os painéis de controle selecionados serão marcados para exclusão em 30 dias. O administrador da sua organização pode restaurar os painéis de controle a qualquer momento antes do término do prazo de 30 dias. As pastas não podem ser restauradas.",
       "delete-modal-text": "Esta ação apagará o seguinte conteúdo:",
       "delete-modal-title": "Excluir",
-      "delete-provisioned-folder": "",
+      "delete-provisioned-folder": "Excluir pasta provisionada",
       "deleting": "Excluindo...",
       "manage-permissions-button": "Gerenciar permissões",
       "move-button": "Mover",
@@ -3506,8 +3506,8 @@
       "move-modal-title": "Mover",
       "moving": "Movendo...",
       "new-folder-name-required-phrase": "O nome da pasta é obrigatório.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Você selecionou recursos provisionados e não provisionados. Não éo possível processá-los juntos. Selecione apenas um dos tipos de recurso e tente novamente.",
+      "selected-mix-resources-modal-title": "Tipos de recursos mistos selecionados"
     },
     "actions": {
       "button-to-recently-deleted": "Excluídos recentemente"
@@ -3520,25 +3520,25 @@
       "this-folder-is-empty": "Esta pasta está vazia"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_other": ""
+      "all-deleted": "Todos os recursos foram excluídos com sucesso",
+      "all-moved": "Todos os recursos foram movidos com sucesso",
+      "button-done": "Concluído",
+      "progress-title": "Sucesso",
+      "failed-alert_one": "{{count}} itens falharam",
+      "failed-alert_other": "{{count}} itens falharam"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Cancelar",
+      "button-delete": "Excluir",
+      "button-deleting": "Excluindo…",
+      "delete-warning": "Isso excluirá as pastas selecionadas e as subpastas delas. No total, isso afetará:",
+      "error-path-not-found": "Diretório não encontrado"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Cancelar",
+      "button-move": "Mover",
+      "button-moving": "Movendo…",
+      "deleting": "Excluindo",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,14 +3546,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Conteúdo do arquivo não encontrado",
+      "error-path-not-found": "Diretório não encontrado",
+      "error-target-folder-path-missing": "O diretório da pasta de destino está ausente",
+      "error-title": "Erro na pasta de destino",
+      "move-warning": "Isso moverá as pastas selecionadas e as subpastas delas. No total, isso afetará:",
+      "moving": "Movendo",
+      "progress": "Progresso: {{current}} de {{total}}",
+      "target-folder": "Pasta de destino"
     },
     "counts": {
       "alertRule_one": "{{count}} regra de alerta",
@@ -3579,12 +3579,12 @@
       "read-only-message": ""
     },
     "delete-provisioned-folder-form": {
-      "api-error": "",
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "success-message": ""
+      "api-error": "Falha ao excluir pasta",
+      "button-cancel": "Cancelar",
+      "button-delete": "Excluir",
+      "button-deleting": "Excluindo…",
+      "delete-warning": "Essa ação excluirá esta pasta e todos os elementos contidos nela. No total, isso afetará:",
+      "success-message": "Pasta excluída com sucesso"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Não é possível recuperar informações de elementos subordinados"
@@ -3609,7 +3609,7 @@
       "empty-message": "Nenhuma pasta encontrada",
       "error-title": "Erro ao carregar pastas",
       "non-folder-item": "{{itemKind}} {{itemUID}} não é uma pasta",
-      "root-title": "",
+      "root-title": "Painéis de controle",
       "search-placeholder": "Buscar pastas",
       "unknown-error": "Erro desconhecido"
     },
@@ -3638,7 +3638,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Digitar o nome da pasta",
       "label-folder-name": "Nome da pasta",
       "text-pull-request-created": "Uma solicitação de extração foi criada com alterações nesta pasta:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "Sua pasta será criada como {{folderName}}",
       "title-pull-request-created": "Solicitação de extração criada",
       "title-this-repository-is-read-only": "Este repositório é somente leitura"
     },
@@ -3647,52 +3647,52 @@
       "text": "Nenhum resultado encontrado para sua consulta"
     },
     "restore": {
-      "success": ""
+      "success": "Painel {{name}} restaurado"
     },
     "text-this-repository-is-read-only": "Se você tiver acesso direto ao destino, copie o JSON e cole-o lá.",
     "trash-state-manager": {
       "label": {
-        "alphabetically-az": "",
-        "alphabetically-za": ""
+        "alphabetically-az": "Em ordem alfabética (A–Z)",
+        "alphabetically-za": "Em ordem alfabética (Z–A)"
       }
     }
   },
   "candlestick": {
     "additional-fields-options": {
-      "label-ignore": "",
-      "label-include": ""
+      "label-ignore": "Ignorar",
+      "label-include": "Incluir"
     },
     "candle-style-options": {
-      "label-candles": "",
-      "label-ohlc-bars": ""
+      "label-candles": "Velas",
+      "label-ohlc-bars": "Barras OHLC"
     },
-    "category-candlestick": "",
+    "category-candlestick": "Castiçal",
     "color-strategy-options": {
-      "label-since-open": "",
-      "label-since-prior-close": ""
+      "label-since-open": "Desde a abertura",
+      "label-since-prior-close": "Desde o fechamento anterior"
     },
-    "description-additional-fields": "",
-    "description-close": "",
-    "description-high": "",
-    "description-low": "",
-    "description-open": "",
-    "description-volume": "",
+    "description-additional-fields": "Use opções de séries temporais padrão para configurar quaisquer campos não mapeados acima",
+    "description-close": "Valor no final do período",
+    "description-high": "Valor máximo dentro do período",
+    "description-low": "Valor mínimo dentro do período",
+    "description-open": "Valor no início do período",
+    "description-volume": "Contagem de amostras dentro do período",
     "mode-options": {
-      "label-both": "",
-      "label-candles": "",
-      "label-volume": ""
+      "label-both": "Ambos",
+      "label-candles": "Velas",
+      "label-volume": "Volume"
     },
-    "name-additional-fields": "",
-    "name-candle-style": "",
-    "name-close": "",
-    "name-color-strategy": "",
-    "name-down-color": "",
-    "name-high": "",
-    "name-low": "",
-    "name-mode": "",
-    "name-open": "",
-    "name-up-color": "",
-    "name-volume": ""
+    "name-additional-fields": "Campos adicionais",
+    "name-candle-style": "Estilo de vela",
+    "name-close": "Fechar",
+    "name-color-strategy": "Estratégia de cores",
+    "name-down-color": "Cor de baixa",
+    "name-high": "Alto",
+    "name-low": "Baixo",
+    "name-mode": "Modo",
+    "name-open": "Abrir",
+    "name-up-color": "Cor de alta",
+    "name-volume": "Volume"
   },
   "canvas": {
     "apieditor": {
@@ -3707,18 +3707,18 @@
       }
     },
     "button-item": {
-      "category-button": "",
+      "category-button": "Botão",
       "label": {
         "center": "Centro",
         "left": "Esquerda",
         "right": "Direita"
       },
-      "name-align-text": "",
-      "name-api": "",
-      "name-style": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
+      "name-align-text": "Alinhar texto",
+      "name-api": "API",
+      "name-style": "Estilo",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
       "placeholder": {
         "auto": "Automático"
       }
@@ -3745,21 +3745,21 @@
         }
       }
     },
-    "category-arrow-direction": "",
-    "category-background": "",
-    "category-border": "",
-    "category-canvas": "",
-    "category-color": "",
-    "category-data-links": "",
-    "category-line-style": "",
-    "category-metric-value": "",
-    "category-radius": "",
-    "category-selected-connection": "",
-    "category-selected-element": "",
-    "category-size": "",
-    "category-tooltip": "",
+    "category-arrow-direction": "Direção da seta",
+    "category-background": "Fundo",
+    "category-border": "Borda",
+    "category-canvas": "Tela",
+    "category-color": "Cor",
+    "category-data-links": "Links de dados e ações",
+    "category-line-style": "Estilo de linha",
+    "category-metric-value": "Valor métrico",
+    "category-radius": "Raio",
+    "category-selected-connection": "Conexão selecionada",
+    "category-selected-element": "Elemento selecionado ({{element}})",
+    "category-size": "Tamanho",
+    "category-tooltip": "Dica de uso",
     "cloud-item": {
-      "category-cloud": "",
+      "category-cloud": "Nuvem",
       "label": {
         "bottom": "Parte inferior",
         "center": "Centro",
@@ -3768,47 +3768,47 @@
         "right": "Direita",
         "top": "Parte superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automático"
       }
     },
-    "description-experimental-types": "",
-    "description-inline-editing": "",
-    "description-pan-zoom": "",
+    "description-experimental-types": "Ativar seleção de tipos de elementos experimentais",
+    "description-inline-editing": "Ativar a edição do painel diretamente",
+    "description-pan-zoom": "Ativar navegação e zoom",
     "direction-options": {
-      "label-both": "",
-      "label-forward": "",
-      "label-none": "",
-      "label-reverse": ""
+      "label-both": "Ambos",
+      "label-forward": "Para frente",
+      "label-none": "Nenhum",
+      "label-reverse": "Reverso"
     },
     "drone-front-item": {
-      "category-drone-front": "",
-      "name-roll-angle": ""
+      "category-drone-front": "Frente do drone",
+      "name-roll-angle": "Ângulo de rolagem"
     },
     "drone-side-item": {
-      "category-drone-side": "",
-      "name-pitch-angle": ""
+      "category-drone-side": "Lateral do drone",
+      "name-pitch-angle": "Ângulo de inclinação"
     },
     "drone-top-item": {
-      "category-drone-top": "",
-      "name-back-left-rotor-rpm": "",
-      "name-back-right-rotor-rpm": "",
-      "name-front-left-rotor-rpm": "",
-      "name-front-right-rotor-rpm": "",
-      "name-yaw-angle": ""
+      "category-drone-top": "Parte superior do drone",
+      "name-back-left-rotor-rpm": "RPM do rotor traseiro esquerdo",
+      "name-back-right-rotor-rpm": "RPM do rotor traseiro direito",
+      "name-front-left-rotor-rpm": "RPM do rotor dianteiro esquerdo",
+      "name-front-right-rotor-rpm": "RPM do rotor dianteiro direito",
+      "name-yaw-angle": "Ângulo de guinada"
     },
     "element-editor": {
-      "category-layout": "",
-      "description-unsupported": "",
-      "name-quick-placement": ""
+      "category-layout": "Layout",
+      "description-unsupported": "O tipo de elemento selecionado não é compatível com as configurações atuais. Ative os tipos de elementos avançados.",
+      "name-quick-placement": "Posicionamento rápido"
     },
     "ellipse-item": {
-      "category-ellipse": "",
+      "category-ellipse": "Elipse",
       "label": {
         "bottom": "Parte inferior",
         "center": "Centro",
@@ -3817,50 +3817,50 @@
         "right": "Direita",
         "top": "Parte superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automático"
       }
     },
     "icon-item": {
-      "category-icon": "",
-      "name-fill-color": "",
-      "name-svg-path": ""
+      "category-icon": "Ícone",
+      "name-fill-color": "Cor de preenchimento",
+      "name-svg-path": "Caminho SVG"
     },
     "inline-edit": {
       "canvas-inline-editor": "Editor integrado do Canvas",
       "tooltip-close-inline-editor": "Fechar editor integrado"
     },
     "inline-edit-body": {
-      "category-selected-element": "",
+      "category-selected-element": "Elemento selecionado ({{element}})",
       "label-add-item": "Adicionar item",
       "please-select-an-element": "Selecione um elemento"
     },
-    "label-actions": "",
-    "label-color": "",
-    "label-direction": "",
-    "label-image": "",
-    "label-image-size": "",
-    "label-line-style": "",
-    "label-links": "",
-    "label-radius": "",
-    "label-size": "",
-    "label-width": "",
+    "label-actions": "Ações",
+    "label-color": "Cor",
+    "label-direction": "Direção",
+    "label-image": "Imagem",
+    "label-image-size": "Tamanho da imagem",
+    "label-line-style": "Estilo de linha",
+    "label-links": "Links",
+    "label-radius": "Raio",
+    "label-size": "Tamanho",
+    "label-width": "Largura",
     "layer-editor": {
-      "category-layer": "",
-      "category-layout": "",
-      "name-constraints": "",
-      "name-elements": ""
+      "category-layer": "Camada",
+      "category-layout": "Layout",
+      "name-constraints": "Restrições",
+      "name-elements": "Elementos"
     },
     "line-style-editor": {
       "label-animate": "Animar"
     },
     "line-style-options": {
-      "label-solid": ""
+      "label-solid": "Sólido"
     },
     "metric-value-item": {
       "label": {
@@ -3875,14 +3875,14 @@
         "auto": "Automático"
       }
     },
-    "name-align-text": "",
-    "name-color": "",
-    "name-experimental-types": "",
-    "name-inline-editing": "",
-    "name-pan-zoom": "",
-    "name-text": "",
-    "name-text-size": "",
-    "name-vertical-align": "",
+    "name-align-text": "Alinhar texto",
+    "name-color": "Cor do texto",
+    "name-experimental-types": "Tipos de elementos experimentais",
+    "name-inline-editing": "Edição em linha",
+    "name-pan-zoom": "Panorâmica e zoom",
+    "name-text": "Texto",
+    "name-text-size": "Tamanho do texto",
+    "name-vertical-align": "Alinhamento vertical",
     "not-found-display": {
       "not-found": "<0>Não encontrado: </0><config />"
     },
@@ -3895,7 +3895,7 @@
       "zoom-scroll-wheel": "Zoom: botão de rolagem"
     },
     "parallelogram-item": {
-      "category-parallelogram": "",
+      "category-parallelogram": "Paralelogramo",
       "label": {
         "bottom": "Parte inferior",
         "center": "Centro",
@@ -3904,11 +3904,11 @@
         "right": "Direita",
         "top": "Parte superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automático"
       }
@@ -3921,21 +3921,21 @@
     },
     "placement-editor": {
       "horizontal-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-left-and-right": "",
-        "label-right": "",
-        "label-scale": ""
+        "label-center": "Centro",
+        "label-left": "Esquerda",
+        "label-left-and-right": "Esquerda e direita",
+        "label-right": "Direita",
+        "label-scale": "Escala"
       },
       "label-constraints": "Restrições",
       "label-position": "Posição",
       "loading": "Carregando...",
       "vertical-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-scale": "",
-        "label-top": "",
-        "label-top-and-bottom": ""
+        "label-bottom": "Inferior",
+        "label-center": "Centro",
+        "label-scale": "Escala",
+        "label-top": "Superior",
+        "label-top-and-bottom": "Superior e inferior"
       }
     },
     "quick-positioning": {
@@ -3947,7 +3947,7 @@
       "tooltip-align-vertical-centers": "Alinhar nos centros verticais"
     },
     "rectangle-item": {
-      "category-rectangle": "",
+      "category-rectangle": "Retângulo",
       "label": {
         "bottom": "Parte inferior",
         "center": "Centro",
@@ -3956,33 +3956,33 @@
         "right": "Direita",
         "top": "Parte superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automático"
       }
     },
     "server-item": {
-      "category-server": "",
-      "name-blink-rate": "",
-      "name-bulb-color": "",
-      "name-status-color": "",
-      "name-type": "",
+      "category-server": "Servidor",
+      "name-blink-rate": "Taxa de intermitência [hz] (0 = desligado)",
+      "name-bulb-color": "Cor da lâmpada",
+      "name-status-color": "Cor do status",
+      "name-type": "Tipo",
       "type-options": {
-        "label-database": "",
-        "label-single": "",
-        "label-stack": "",
-        "label-terminal": ""
+        "label-database": "Banco de dados",
+        "label-single": "Única",
+        "label-stack": "Pilha",
+        "label-terminal": "Terminal"
       }
     },
     "text-display": {
       "double-click-to-set": "Clique duas vezes para definir o texto"
     },
     "text-item": {
-      "category-text": "",
+      "category-text": "Texto",
       "label": {
         "bottom": "Parte inferior",
         "center": "Centro",
@@ -3991,20 +3991,20 @@
         "right": "Direita",
         "top": "Parte superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automático"
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Modo de dica de uso",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Desativado",
+        "label-enabled": "Ativado"
       }
     },
     "tree-navigation-editor": {
@@ -4024,7 +4024,7 @@
       "tooltip-remove": "Remover"
     },
     "triangle-item": {
-      "category-triangle": "",
+      "category-triangle": "Triangulo",
       "label": {
         "bottom": "Parte inferior",
         "center": "Centro",
@@ -4033,18 +4033,18 @@
         "right": "Direita",
         "top": "Parte superior"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automático"
       }
     },
     "wind-turbine-item": {
-      "category-wind-turbine": "",
-      "name-rpm": ""
+      "category-wind-turbine": "Turbina eólica",
+      "name-rpm": "RPM"
     }
   },
   "carousel": {
@@ -4061,8 +4061,8 @@
   "close-button": {
     "tooltip": "Fechar"
   },
-  "cloud-enterprise-feature-badge": "",
-  "cloud-feature-badge": "",
+  "cloud-enterprise-feature-badge": "Cloud e Enterprise",
+  "cloud-feature-badge": "Nuvem",
   "combobox": {
     "async": {
       "error": "Ocorreu um erro ao carregar as opções."
@@ -4373,7 +4373,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Executar consulta"
     }
   },
   "dashboard": {
@@ -4536,7 +4536,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Prosseguir"
         },
         "title": {
           "proceed-to-external-site": "Deseja prosseguir para o site externo?"
@@ -4633,7 +4633,7 @@
       }
     },
     "description": {
-      "action": ""
+      "action": "Alterar descrição do painel"
     },
     "dynamic-config-value-editor": {
       "render-label": {
@@ -4642,17 +4642,17 @@
     },
     "edit-actions": {
       "add": "Adicionar {{typeName}}",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
-      "move": "",
+      "add-conditional-rule": "Adicionar regra {{ruleDescription}}",
+      "duplicate-panel": "Duplicar painel",
+      "edit-query-result-rule": "Alterar regra de resultado da consulta",
+      "edit-template-variable-rule": "Alterar regra de variável do modelo",
+      "edit-time-range-rule": "Alterar regra de intervalo de tempo",
+      "move": "Mover {{typeName}}",
       "panel-background": "Alterar plano de fundo do painel",
       "panel-description": "Alterar descrição do painel",
-      "panel-max-repeats-per-row": "",
+      "panel-max-repeats-per-row": "Máximo de repetições por linha",
       "panel-repeat-direction": "Repetir direção",
-      "panel-repeat-variable": "",
+      "panel-repeat-variable": "Repetição do painel por",
       "panel-title": "Alterar título do painel",
       "paste-panel": "Colar painel",
       "remove": "Remover {{typeName}}",
@@ -4661,7 +4661,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Painel de controle",
-        "element": "",
+        "element": "Elemento",
         "local-variable": "Variável local",
         "multiple-elements": "Vários elementos",
         "multiple-elements-delete-text": "Tem certeza de que deseja excluir estes elementos?",
@@ -4743,10 +4743,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Exportar painel de controle"
       },
       "menu": {
-        "label": ""
+        "label": "Exportar menu de painel de controle"
       }
     },
     "fetch-dashboard": {
@@ -4768,9 +4768,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Padrão",
+          "shared-crosshair": "Mira compartilhada",
+          "shared-tooltip": "Dica de ferramenta compartilhada"
         }
       }
     },
@@ -4787,7 +4787,7 @@
     "get-field-override-categories": {
       "label-add-field-override": "Adicionar substituição de campo",
       "label-add-override-property": "Adicionar propriedade de substituição",
-      "override-name": "",
+      "override-name": "Substituir {{overrideNum}}",
       "title": {
         "add-button": "adicionar botão"
       }
@@ -4823,14 +4823,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Não enviar dados de anotação para os seguintes painéis",
+        "annotation-panels-support-annotations": "Enviar os dados de anotação para todos os painéis que são compatíveis com anotações",
+        "annotations-explicitly-listed-panels": "Enviar as anotações para os painéis explicitamente listados"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Todos os painéis",
+        "all-panels-except": "Todos os painéis, exceto",
+        "selected-panels": "Painéis selecionados"
       }
     },
     "get-panel-frame-category": {
@@ -5016,7 +5016,7 @@
       "title-matched_other": "Opções correspondentes: {{count}}/{{totalCount}}"
     },
     "outline": {
-      "repeated-item": "",
+      "repeated-item": "Repetido",
       "tree-item": {
         "empty": "(vazio)",
         "no-title": "<sem título>"
@@ -5092,7 +5092,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Tem certeza de que deseja restaurar o painel para a versão {{version}}? Todas as alterações não salvas serão perdidas.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Sim, restaurar para a versão {{version}}",
       "title-restore-version": "Restaurar versão"
     },
     "row-options-button": {
@@ -5144,7 +5144,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Painel de controle salvo"
     },
     "save-dashboard-as-button": {
       "save-as": "Salvar como"
@@ -5174,13 +5174,13 @@
       "label-changes": "Alterações",
       "label-details": "Detalhes",
       "title": "Salvar painel de controle",
-      "title-copy": "",
-      "title-provisioned": ""
+      "title-copy": "Salvar cópia do painel",
+      "title-provisioned": "Painel provisionado"
     },
     "save-dashboard-error-proxy": {
       "body-name-exists": "Já existe um painel com o mesmo nome na pasta selecionada.<1></1><2>Deseja salvar este painel mesmo assim?</2>",
       "body-version-mismatch": "Outra pessoa atualizou este painel<1></1><2>Deseja salvar este painel mesmo assim?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Salvar e substituir",
       "title-name-exists": "Conflito",
       "title-version-mismatch": "Conflito"
     },
@@ -5253,7 +5253,7 @@
       }
     },
     "title": {
-      "action": ""
+      "action": "Alterar título do painel"
     },
     "toolbar": {
       "add": "Adicionar",
@@ -5377,9 +5377,9 @@
       "label-apply-transformation-to": "Aplicar transformação a"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Observe que remover uma transformação pode quebrar outras. Se houver apenas uma única transformação, você voltará para a tela de seleção principal.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Excluir",
         "title-debug": "Depurar",
         "title-disable-transformation": "Desativar transformação",
         "title-filter": "Filtro",
@@ -5400,16 +5400,16 @@
       "placeholder-search-for-transformation": "Pesquisar por transformação",
       "show-images": "Exibir imagens",
       "title-add-another-transformation": "Adicionar outra transformação",
-      "view-all": ""
+      "view-all": "Ver tudo"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Ao excluir todas as transformações, você voltará para a tela de seleção principal."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Adicionar outra transformação"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Excluir tudo",
       "delete-all-transformations": "Excluir todas as transformações",
       "title-delete-all-transformations": "Deseja excluir todas as transformações?",
       "tooltip-clear-search": "Limpar pesquisa",
@@ -5439,16 +5439,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Alterar descrição da variável"
       },
       "hide": {
-        "action": ""
+        "action": "Alterar opção de ocultar variável"
       },
       "label": {
-        "action": ""
+        "action": "Alterar rótulo da variável"
       },
       "name": {
-        "action": ""
+        "action": "Alterar nome da variável"
       }
     },
     "version-history-comparison": {
@@ -5460,7 +5460,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar seleção da versão {{version}}",
       "date": "Data",
-      "name-latest": "",
+      "name-latest": "Mais recente",
       "notes": "Observações",
       "restore": "Restaurar",
       "updated-by": "Atualizado por",
@@ -5538,7 +5538,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Forneça dimensões como CSV: {{name}}, {{value}}",
       "label-data-source": "Fonte de dados",
       "label-use-static-key-dimensions": "Usar dimensões de chave estática",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Permitir valores personalizados"
     },
     "add-to-dashboard": {
       "message": {
@@ -5612,7 +5612,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Revogar URL público"
       },
       "title": {
         "revoke-public-url": "Revogar URL público"
@@ -5625,7 +5625,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opções personalizadas",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Valores separados por vírgula",
       "selection-options": "Opções de seleção"
     },
     "dashboard-edit-pane-renderer": {
@@ -5646,8 +5646,8 @@
       "label-with-tags": "Com tags",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Painéis de controle",
+          "link": "Link"
         }
       },
       "placeholder-open-dashboard": "Abrir o painel"
@@ -5690,8 +5690,8 @@
       "data-source-options": "Opções de fonte de dados",
       "description-instance-name-filter": "Filtro Regex para as instâncias de fonte de dados a serem escolhidas na lista de valores de variáveis. Deixe em branco para todos.",
       "example-instance-name-filter": "Exemplo: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Filtro de nome de instância",
+      "name-type": "Tipo",
       "selection-options": "Opções de seleção"
     },
     "default-grid-layout-manager": {
@@ -5702,12 +5702,12 @@
       }
     },
     "delete-provisioned-dashboard-form": {
-      "api-error": "",
+      "api-error": "Falha ao excluir o painel",
       "cancel-action": "Cancelar",
       "delete-action": "Excluir painel de controle",
       "deleting": "Excluindo...",
-      "drawer-title": "",
-      "success-message": ""
+      "drawer-title": "Excluir painel provisionado",
+      "success-message": "Painel de controle excluído com sucesso"
     },
     "description-label": {
       "description": "Descrição"
@@ -5736,15 +5736,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Editável",
+          "readonly": "Somente leitura"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Padrão",
+          "shared-crosshair": "Mira compartilhada",
+          "shared-tooltip": "Dica de ferramenta compartilhada"
         }
       }
     },
@@ -5756,36 +5756,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Adicionar filtros de chave/valor em tempo real",
+        "dynamically-switch-source-multiple-panels": "Alternar dinamicamente a fonte de dados para vários painéis",
+        "group": "Adicionar chaves para agrupar em tempo real",
+        "hidden-constant-variable": "Uma variável constante oculta, útil para prefixos métricos em painéis de controle que você deseja compartilhar",
+        "users-enter-arbitrary-strings-textbox": "Os usuários podem inserir qualquer string arbitrária em uma caixa de texto",
+        "values-are-static-and-defined-manually": "Os valores são estáticos e definidos manualmente",
+        "values-fetched-source-query": "Os valores são obtidos a partir de uma consulta de fonte de dados",
+        "values-timespans": "Os valores são intervalos de tempo. Por exemplo: 1m, 1h, 1d"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Filtros ad hoc",
+        "constant": "Constante",
+        "custom": "Personalizado",
+        "data-source": "Fonte de dados",
+        "group-by": "Agrupar por",
+        "interval": "Intervalo",
+        "query": "Consulta",
+        "textbox": "Caixa de texto"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Não enviar dados de anotação para os seguintes painéis",
+        "annotation-panels-support-annotations": "Enviar os dados de anotação para todos os painéis que são compatíveis com anotações",
+        "annotations-explicitly-listed-panels": "Enviar as anotações para os painéis explicitamente listados"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Todos os painéis",
+        "all-panels-except": "Todos os painéis, exceto",
+        "selected-panels": "Painéis selecionados"
       }
     },
     "get-panel-frame-options": {
@@ -5813,7 +5813,7 @@
       "group-by-options": "Agrupar por opções",
       "label-data-source": "Fonte de dados",
       "label-use-static-group-by-dimensions": "Usar dimensões de grupo estático",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Permitir valores personalizados"
     },
     "help-wizard": {
       "copy-to-clipboard": "Copiar para a área de transferência",
@@ -5849,14 +5849,14 @@
       "apply": "Aplicar"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Calcula dinamicamente o intervalo ao dividir o intervalo de tempo pela contagem especificada",
       "description-calculated-value-below-threshold": "O valor calculado não ficará abaixo desse limite",
       "description-step-count": "Quantas vezes o intervalo de tempo atual deve ser dividido para calcular o valor",
       "interval-options": "Opções de intervalo",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Opção automática",
+      "name-min-interval": "Intervalo mínimo",
+      "name-step-count": "Contagem de passos",
+      "name-values": "Valores"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5877,19 +5877,19 @@
       "usage-count_other": "Usado em {{count}} painéis"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Erro ao mover o painel de controle",
+      "api-error": "Falha ao mover o painel de controle",
+      "cancel-action": "Cancelar",
+      "current-file-not-found": "Não foi possível encontrar o arquivo do painel de controle atual",
+      "drawer-title": "Mover painel de controle provisionado",
+      "file-load-error": "Erro ao carregar o painel de controle",
+      "loading-file-data": "Carregando dados do painel de controle",
+      "move-action": "Mover painel de controle",
+      "move-read-only-message": "Este painel de controle não pode ser movido diretamente do Grafana porque o repositório é somente leitura. Para mover este painel de controle, mova o arquivo no seu repositório Git.",
+      "moving": "Movendo…",
+      "success-message": "Painel de controle movido com sucesso",
+      "target-path-label": "Caminho de destino",
+      "title-this-repository-is-read-only": "Este repositório é somente leitura"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Já existe um painel com o mesmo nome na pasta selecionada. Deseja salvar este painel mesmo assim?",
@@ -5897,7 +5897,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Prosseguir"
       },
       "title": {
         "proceed-to-external-site": "Deseja prosseguir para o site externo?"
@@ -5912,7 +5912,7 @@
       }
     },
     "panel-data-alerting-tab": {
-      "tab-label": ""
+      "tab-label": "Alerta"
     },
     "panel-data-alerting-tab-rendered": {
       "alert": {
@@ -5923,19 +5923,19 @@
       "title-dashboard-not-saved": "O painel não foi salvo"
     },
     "panel-data-queries-tab": {
-      "tab-label": ""
+      "tab-label": "Consultas"
     },
     "panel-data-queries-tab-rendered": {
       "add-query": "Adicionar consulta",
       "expression": "Expressão "
     },
     "panel-data-transformations-tab": {
-      "tab-label": ""
+      "tab-label": "Transformações"
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Adicionar outra transformação",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Ao excluir todas as transformações, você voltará para a tela de seleção principal.",
+      "confirmText-delete-all": "Excluir tudo",
       "delete-all-transformations": "Excluir todas as transformações",
       "title-delete-all-transformations": "Deseja excluir todas as transformações?"
     },
@@ -5988,13 +5988,13 @@
       "description-examples": "Os grupos de captura nomeados podem ser usados para separar o texto e o valor de exibição (<1>ver exemplos</1>).",
       "description-optional": "Opcional, se você quiser extrair parte de um nome de série ou segmento de node de métrica.",
       "label-data-source": "Fonte de dados",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Classificação de opções estáticas",
       "label-target-data-source": "Fonte de dados de destino",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Usar opções estáticas",
+      "name-regex": "Regex",
       "query-options": "Opções de consulta",
       "selection-options": "Opções de seleção",
-      "static-options-legend": ""
+      "static-options-legend": "Opções estáticas"
     },
     "resource-export": {
       "label": {
@@ -6007,7 +6007,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Tem certeza de que deseja restaurar o painel para a versão {{version}}? Todas as alterações não salvas serão perdidas.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Sim, restaurar para a versão {{version}}",
       "title-restore-version": "Restaurar versão"
     },
     "save-button": {
@@ -6026,15 +6026,15 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Falha ao salvar o painel"
       },
-      "required": ""
+      "required": "Obrigatório"
     },
     "save-dashboard-drawer": {
       "tabs": {
         "label-changes": "Alterações",
         "label-details": "Detalhes",
         "title": "Salvar painel de controle",
-        "title-copy": "",
-        "title-provisioned": ""
+        "title-copy": "Salvar cópia do painel",
+        "title-provisioned": "Painel provisionado"
       }
     },
     "save-dashboard-form": {
@@ -6053,8 +6053,8 @@
         "title-someone-else-has-updated-this-dashboard": "Outra pessoa atualizou este painel",
         "would-still-dashboard": "Deseja salvar este painel mesmo assim?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "Devido a limitações no novo esquema de painel de controle (V2), os painéis da biblioteca serão convertidos em painéis regulares com conteúdo incorporado durante a exportação externa.",
+      "schema-v2-library-panels-export-title": "Os painéis da biblioteca serão convertidos em painéis regulares",
       "title-dashboard-drastically-changed": "Painel alterado de forma irreversível"
     },
     "save-dashboard-form-common-options": {
@@ -6101,10 +6101,10 @@
       "description-enables-multiple-values-selected": "Permite que vários valores sejam selecionados ao mesmo tempo",
       "description-enables-option-include-variables": "Ativa uma opção para incluir todos os valores",
       "description-enables-users-custom-values": "Permite que os usuários adicionem valores personalizados à lista",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Permitir valores personalizados",
+      "name-custom-all-value": "Personalizar todos os valores",
+      "name-include-all-option": "Opção Incluir tudo",
+      "name-multi-value": "Multivalor"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Alternar menu de compartilhamento"
@@ -6125,7 +6125,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Valor padrão"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opcional)",
@@ -6150,8 +6150,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Se você desvincular este painel, poderá editá-lo sem afetar nenhum outro painel de controle. No entanto, depois de fazer uma alteração, você não poderá reverter para o painel reutilizável original.",
+      "confirmText-yes-unlink": "Sim, desvincular",
       "title-really-unlink-panel": "Tem certeza de que deseja desvincular este painel?"
     },
     "unsaved-changes-modal": {
@@ -6169,7 +6169,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Painel de controle salvo"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Esta variável não é referenciada por nenhuma variável ou painel.",
@@ -6181,15 +6181,15 @@
       "aria-label-variable-editor-form": "Formulário do editor de variáveis",
       "back-to-list": "Voltar para a lista",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Excluir variável"
       },
       "delete": "Excluir",
       "description-optional-display-name": "Nome de exibição opcional",
       "description-template-variable-characters": "O nome da variável do modelo. (Até 50 caracteres)",
       "general": "Geral",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Descrição",
+      "name-label": "Rótulo",
+      "name-name": "Nome",
       "placeholder-descriptive-text": "Texto descritivo",
       "placeholder-label-name": "Nome do rótulo",
       "placeholder-variable-name": "Nome da variável",
@@ -6204,8 +6204,8 @@
       "variable": "Variável"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Tem certeza de que deseja excluir: {{variable}}?",
+      "confirmText-delete-variable": "Excluir variável",
       "title-delete-variable": "Excluir variável",
       "tooltip-duplicate-variable": "Duplicar variável",
       "tooltip-remove-variable": "Remover variável"
@@ -6213,15 +6213,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Rótulo",
+          "nothing": "Nada",
+          "variable": "Variável"
         }
       },
       "label": "Ocultar"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Tipo de variável"
     },
     "variable-usages-button": {
       "title-show-usages": "Mostrando usos para: {{variableId}}",
@@ -6249,7 +6249,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar seleção da versão {{version}}",
       "date": "Data",
-      "name-latest": "",
+      "name-latest": "Mais recente",
       "notes": "Observações",
       "restore": "Restaurar",
       "updated-by": "Atualizado por",
@@ -6356,18 +6356,18 @@
     }
   },
   "dashlist": {
-    "category-dashboard-list": "",
-    "name-folder": "",
-    "name-include-current-template-variables": "",
-    "name-include-current-time-range": "",
-    "name-max-items": "",
-    "name-query": "",
-    "name-recently-viewed": "",
-    "name-search": "",
-    "name-show-folder-names": "",
-    "name-show-headings": "",
-    "name-starred": "",
-    "name-tags": ""
+    "category-dashboard-list": "Lista de painéis",
+    "name-folder": "Pasta",
+    "name-include-current-template-variables": "Incluir valores das variáveis do modelo atual",
+    "name-include-current-time-range": "Incluir intervalo de tempo atual",
+    "name-max-items": "Itens máximos",
+    "name-query": "Consulta",
+    "name-recently-viewed": "Visto recentemente",
+    "name-search": "Buscar",
+    "name-show-folder-names": "Mostrar nomes de pastas",
+    "name-show-headings": "Exibir títulos",
+    "name-starred": "Favoritos",
+    "name-tags": "Tags"
   },
   "data-source-list": {
     "empty-state": {
@@ -6631,16 +6631,16 @@
   "dimensions": {
     "background-size-editor": {
       "options": {
-        "label-contain": "",
-        "label-cover": "",
-        "label-fill": "",
-        "label-original": "",
-        "label-tile": ""
+        "label-contain": "Conteúdo",
+        "label-cover": "Capa",
+        "label-fill": "Preencher",
+        "label-original": "Original",
+        "label-tile": "Mosaico"
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": "",
-      "noOptionsMessage-no-fields-found": ""
+      "label-fixed-color": "Cor fixa",
+      "noOptionsMessage-no-fields-found": "Nenhum campo encontrado"
     },
     "file-dropzone-custom-children": {
       "upload": "Carregar"
@@ -6654,10 +6654,10 @@
       "placeholder-search": "Pesquisar"
     },
     "resource-dimension-editor": {
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Usar um resultado de campo de string",
+      "description-fixed": "Valor fixo",
       "label-field": "Campo",
-      "label-fixed": "",
+      "label-fixed": "Fixo",
       "label-mappings": "Mapeamentos",
       "label-source": "Fonte"
     },
@@ -6675,35 +6675,35 @@
     },
     "scalar-dimension-editor": {
       "fixed-value-options": {
-        "label-fixed-values": ""
+        "label-fixed-values": "Valor fixo"
       },
       "label-limit": "Limite",
       "label-value": "Valor",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Nenhum campo encontrado",
       "scalar-options": {
-        "description-clamped": "",
-        "description-mod": "",
-        "label-clamped": "",
-        "label-mod": ""
+        "description-clamped": "Usar valores de campo, fixados em máximo e mínimo",
+        "description-mod": "Usar valores de campo, módulo a partir do máximo",
+        "label-clamped": "Fixado",
+        "label-mod": "Módulo"
       }
     },
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Valor fixo"
         }
       },
       "label-max": "Máx.",
       "label-min": "Mín.",
       "label-value": "Valor",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Nenhum campo encontrado"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Exibir valor do campo",
+      "description-fixed": "Valor fixo",
       "label-field": "Campo",
-      "label-fixed": "",
+      "label-fixed": "Fixo",
       "label-source": "Fonte",
       "label-template": "Modelo",
       "label-value": "Valor"
@@ -6717,16 +6717,16 @@
       "description-percentage-means-thresholds-relative": "Porcentagem significa limites em relação ao mínimo e máximo",
       "modes": {
         "description": {
-          "threshold-based-percent-between-minmax": "",
-          "thresholds-based-absolute-values": ""
+          "threshold-based-percent-between-minmax": "Escolha o limite com base na porcentagem entre mínimo/máximo",
+          "thresholds-based-absolute-values": "Escolha os limites com base nos valores absolutos"
         },
         "label": {
-          "absolute": "",
-          "percentage": ""
+          "absolute": "Absoluto",
+          "percentage": "Porcentagem"
         }
       },
       "thresholds-mode": "Modo de limites",
-      "value-base": ""
+      "value-base": "Base"
     },
     "urlpicker-tab": {
       "label-preview": "Visualizar"
@@ -6806,6 +6806,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Eventos",
@@ -7078,7 +7079,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Carregando…"
     },
     "prev": "Anterior",
     "queryless-apps-extensions": {
@@ -7265,7 +7266,7 @@
           "start-time": "Horário de início:"
         }
       },
-      "share-span": "",
+      "share-span": "Compartilhar",
       "warnings": "Avisos"
     },
     "span-filters": {
@@ -7275,8 +7276,8 @@
       "aria-label-select-service-name-operator": "Selecionar operador de nome do serviço",
       "aria-label-select-span-name": "Selecionar nome do intervalo",
       "aria-label-select-span-name-operator": "Selecione o operador de nome de intervalo",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Selecionar duração máxima do intervalo",
+      "ariaLabel-select-min-span-duration": "Selecionar duração mínima do intervalo",
       "label-collapse": "Filtros de intervalo",
       "label-duration": "Duração",
       "label-service-name": "Nome do serviço",
@@ -7348,23 +7349,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Duração",
+      "export-started": "Exportação iniciada",
+      "give-feedback": "Feedback",
+      "link-copied": "Link copiado para a área de transferência",
+      "path": "Caminho",
+      "route": "Rota",
+      "services": "Serviços",
+      "share": "Compartilhar",
+      "share-copy-link": "Copiar link",
+      "share-export-json": "Exportar como JSON",
+      "share-tooltip": "Compartilhar traço",
+      "start-time": "Horário de início",
+      "target": "Destino",
+      "title-share-thoughts-about-tracing-grafana": "Compartilhe sua opinião sobre os traços no Grafana.",
+      "tooltip-url": "{{route}} ou {{url}} ou {{target}} ou {{path}}",
+      "trace-id": "ID do traço",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Botão para limpar filtros",
@@ -7464,7 +7465,7 @@
       "when": "QUANDO"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Execute o dialeto SQL do MySQL nas tabelas retornadas das suas fontes de dados. As consultas de fonte de dados (ou seja, \"A\", \"B\") estão disponíveis como tabelas e são referenciadas por nome de consulta. Os campos estão disponíveis como colunas, conforme retornados da fonte de dados.",
       "label-operation": "Operação"
     },
     "math": {
@@ -7495,7 +7496,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Limpar pastas",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Nenhuma pasta encontrada",
     "select-aria-label": "Filtro de pasta",
     "select-placeholder": "Filtrar por pasta"
   },
@@ -7544,23 +7545,23 @@
     "title": "Deseja sair da página?"
   },
   "gauge": {
-    "category-gauge": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-neutral": "",
-    "description-show-threshold-labels": "",
-    "description-show-threshold-markers": "",
+    "category-gauge": "Medidor",
+    "description-min-height": "Altura mínima da linha (orientação horizontal)",
+    "description-min-width": "Largura mínima da coluna (orientação vertical)",
+    "description-neutral": "Deixar em branco para usar o mínimo como ponto neutro",
+    "description-show-threshold-labels": "Gerar os valores de limite em torno da barra de medição",
+    "description-show-threshold-markers": "Gera os limites como uma barra externa",
     "gauge-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automático",
+      "label-manual": "Manual"
     },
-    "name-gauge-size": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-neutral": "",
-    "name-show-threshold-labels": "",
-    "name-show-threshold-markers": "",
-    "placeholder-neutral": ""
+    "name-gauge-size": "Tamanho do medidor",
+    "name-min-height": "Altura mínima",
+    "name-min-width": "Largura mínima",
+    "name-neutral": "Neutro",
+    "name-show-threshold-labels": "Mostrar rótulos de limite",
+    "name-show-threshold-markers": "Mostrar marcadores de limite",
+    "placeholder-neutral": "automático"
   },
   "gen-ai": {
     "apply-suggestion": "Aplicar",
@@ -7569,51 +7570,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Nomenclador não encontrado",
+      "warning-no-geometry": "não foi possível encontrar a geometria",
+      "warning-select-geohash": "Selecionar campo de geohash",
+      "warning-select-lat-long": "Selecionar campos de latitude/longitude",
+      "warning-select-lookup": "Selecionar campo de consulta",
+      "warning-unable-to-find": "Não foi possível encontrar os campos de localização"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nenhum campo de string encontrado"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nenhum campo numérico encontrado"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nenhum campo numérico encontrado"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nenhum campo de string encontrado"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Nomenclador",
+      "name-geohash-field": "Campo de geohash",
+      "name-latitude-field": "Campo de latitude",
+      "name-location-mode": "Modo de localização",
+      "name-longitude-field": "Campo de longitude",
+      "name-lookup-field": "Campo de consulta"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Identificar automaticamente os dados de localização com base nos nomes de campos padrão",
+        "description-coords": "Especificar os campos de latitude e longitude",
+        "description-geohash": "Especificar campo de geohash",
+        "description-lookup": "Especificar nomenclador e campo de consulta",
+        "label-auto": "Automático",
+        "label-coords": "Coordenadas",
+        "label-geohash": "Geohash",
+        "label-lookup": "Consulta"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Camada do mapa de base",
+    "category-map-controls": "Controles do mapa",
+    "category-map-layers": "Camadas do mapa",
+    "category-map-view": "Visualização do mapa",
     "coordinates-map-view-editor": {
       "label-latitude": "Latitude",
       "label-longitude": "Longitude"
@@ -7622,15 +7623,15 @@
       "center": "Centro:",
       "zoom": "Zoom:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Este local será exibido quando o painel for carregado pela primeira vez.",
+    "description-mouse-wheel-zoom": "Ativar o controle de zoom por meio do botão de rolagem do mouse",
+    "description-no-repeat": "Impedir que o mapa se repita horizontalmente",
+    "description-share-view": "Usa a mesma visualização em vários painéis. Observação: isso pode exigir que o painel de controle seja recarregado.",
+    "description-show-attribution": "Mostrar as informações de atribuição da fonte do mapa no canto inferior direito",
+    "description-show-debug": "Mostrar informações do mapa",
+    "description-show-measure": "Mostrar ferramentas para fazer medições no mapa",
+    "description-show-scale": "Indicar a escala do mapa",
+    "description-show-zoom": "Mostrar botões de controle de zoom no canto superior esquerdo",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Camada"
@@ -7654,12 +7655,12 @@
       "aria-label-add-geomap-style-rule": "Adicionar regra de estilo de mapa geográfico"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Camada de base",
+      "description-display-tooltip": "Mostrar a dica de ferramenta para a camada",
+      "name-data": "Dados",
+      "name-display-tooltip": "Exibir dica de ferramenta",
+      "name-layer-type": "Tipo de camada",
+      "name-opacity": "Opacidade"
     },
     "layers-editor": {
       "label-add-layer": "Adicionar camada",
@@ -7672,9 +7673,9 @@
       "use-current-map-settings": "Usar as configurações atuais do mapa"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Mostrar legenda do mapa",
+      "name-show-legend": "Mostrar legenda",
+      "name-styles": "Estilos"
     },
     "markers-legend": {
       "title-symbol": "Símbolo"
@@ -7683,27 +7684,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Exibir ferramentas de medição"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Visualização inicial",
+    "name-mouse-wheel-zoom": "Zoom com o botão de rolagem do mouse",
+    "name-no-repeat": "Nenhuma repetição de mapa",
+    "name-share-view": "Compartilhar visualização",
+    "name-show-attribution": "Mostrar atribuição",
+    "name-show-debug": "Mostrar depuração",
+    "name-show-measure": "Exibir ferramentas de medição",
+    "name-show-scale": "Mostrar escala",
+    "name-show-zoom": "Mostrar controle de zoom",
+    "name-tooltip": "Dica de uso",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Nenhum campo de string encontrado"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "A camada do mapa base é configurada pelo administrador do servidor."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Centro",
+        "label-left": "Esquerda",
+        "label-right": "Direita"
       },
       "label-align": "Alinhar",
       "label-baseline": "Referência",
@@ -7719,12 +7720,12 @@
       "label-text-label": "Rótulo do texto",
       "label-x-offset": "Desvio em X",
       "label-y-offset": "Desvio em Y",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Selecione um símbolo",
+      "placeholderText-select-symbol-or-add-text": "Selecione um símbolo ou adicione um rótulo de texto",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Inferior",
+        "label-center": "Centro",
+        "label-top": "Superior"
       }
     },
     "style-rule-editor": {
@@ -7738,13 +7739,13 @@
       "placeholder-value": "valor"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Mostrar pop-up ao passar o cursor do mouse",
+      "description-none": "Mostrar conteúdo ao clicar, não ao passar o cursor do mouse",
+      "label-details": "Detalhes",
+      "label-none": "Nenhum"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Camada {{name}}"
     }
   },
   "get-enterprise": {
@@ -7864,400 +7865,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Pés/seg²",
+            "name-g-unit": "Unidade G",
+            "name-meters-sec": "Metros/seg²"
           },
-          "name": ""
+          "name": "Aceleração"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Minutos de arco",
+            "name-arc-seconds": "Segundos de arco",
+            "name-degrees": "Graus (°)",
+            "name-gradian": "Gradiano",
+            "name-radians": "Radianos"
           },
-          "name": ""
+          "name": "Ângulo"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Acres (ac)",
+            "name-hectares": "Hectares (ha)",
+            "name-square-feet": "Pés quadrados (ft²)",
+            "name-square-meters": "Metros quadrados (m²)",
+            "name-square-miles": "Milhas quadradas (mi²)"
           },
-          "name": ""
+          "name": "Área"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Ligado / Desligado",
+            "name-true-false": "Verdadeiro / Falso",
+            "name-yes-no": "Sim / Não"
           },
-          "name": ""
+          "name": "Booleano"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "Computação"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "grama por metro cúbico (g/m³)",
+            "name-g-nm3": "grama por metro cúbico normal (g/Nm³)",
+            "name-mg-dl": "miligramas por decilitro (mg/dL)",
+            "name-mg-m3": "miligrama por metro cúbico (mg/m³)",
+            "name-mg-nm3": "miligrama por metro cúbico normal (mg/Nm³)",
+            "name-mmol-l": "milimoles por litro (mmol/L)",
+            "name-ng-m3": "nanograma por metro cúbico (ng/m³)",
+            "name-ng-nm3": "nanograma por metro cúbico normal (ng/Nm³)",
+            "name-ppb": "partes por bilhão (ppb)",
+            "name-ppm": "partes por milhão (ppm)",
+            "name-ug-m3": "micrograma por metro cúbico (μg/m³)",
+            "name-ug-nm3": "micrograma por metro cúbico normal (μg/Nm³)"
           },
-          "name": ""
+          "name": "Concentração"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Lev búlgaro (BGN)",
+            "name-brl": "Real (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "Franco suíço (CHF)",
+            "name-czk": "Coroa tcheca (CZK)",
+            "name-dkk": "Coroa dinamarquesa (kr)",
+            "name-eur": "Euro (€)",
+            "name-gbp": "Libra esterlina (£)",
+            "name-idr": "Rupia indonésia (Rp)",
+            "name-ils": "Novo shekel israelense (₪)",
+            "name-inr": "Rúpia indiana (₹)",
+            "name-isk": "Coroa islandesa (kr)",
+            "name-jpy": "Iene (¥)",
+            "name-krw": "Won sul-coreano (₩)",
+            "name-mbtc": "Milli Bitcoin (฿)",
+            "name-myr": "Ringgit malaio (RM)",
+            "name-nok": "Coroa norueguesa (kr)",
+            "name-php": "Peso filipino (PHP)",
+            "name-pln": "Złoty polonês (PLN)",
+            "name-pyg": "Guarani (₲)",
+            "name-rub": "Rublos (₽)",
+            "name-sek": "Coroa sueca (kr)",
+            "name-try": "Lira turca (₺)",
+            "name-uah": "Grívnia (₴)",
+            "name-ubtc": "Micro Bitcoin (฿)",
+            "name-usd": "Dólares ($)",
+            "name-uyu": "Peso uruguaio (UYU)",
+            "name-vnd": "Dong vietnamita (VND)",
+            "name-xpf": "Franco CFP (XPF)",
+            "name-zar": "Rand sul-africano (R)"
           },
-          "name": ""
+          "name": "Moeda"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bits (IEC)",
+            "name-bits-si": "bits (SI)",
+            "name-bytes-iec": "bytes (IEC)",
+            "name-bytes-si": "bytes (SI)",
+            "name-gibibytes": "gibibytes",
+            "name-gigabytes": "gigabytes",
+            "name-kibibytes": "kibibytes",
+            "name-kilobytes": "kilobytes",
+            "name-mebibytes": "mebibytes",
+            "name-megabytes": "megabytes",
+            "name-pebibytes": "pebibytes",
+            "name-petabytes": "petabytes",
+            "name-tebibytes": "tebibytes",
+            "name-terabytes": "terabytes"
           },
-          "name": ""
+          "name": "Dados"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bits/seg (IEC)",
+            "name-bits-sec-si": "bits/seg (SI)",
+            "name-bytes-sec-iec": "bytes/seg (IEC)",
+            "name-bytes-sec-si": "bytes/seg (SI)",
+            "name-gibibits-sec": "gibibits/seg",
+            "name-gibibytes-sec": "gibibytes/seg",
+            "name-gigabits-sec": "gigabits/seg",
+            "name-gigabytes-sec": "gigabytes/seg",
+            "name-kibibits-sec": "kibibits/seg",
+            "name-kibibytes-sec": "kibibytes/seg",
+            "name-kilobits-sec": "kilobits/seg",
+            "name-kilobytes-sec": "kilobytes/seg",
+            "name-mebibits-sec": "mebibits/seg",
+            "name-mebibytes-sec": "mebibytes/seg",
+            "name-megabits-sec": "megabits/seg",
+            "name-megabytes-sec": "megabytes/seg",
+            "name-packets-sec": "packets/seg",
+            "name-pebibits-sec": "pebibits/seg",
+            "name-pebibytes-sec": "pebibytes/seg",
+            "name-petabits-sec": "petabits/seg",
+            "name-petabytes-sec": "petabytes/seg",
+            "name-tebibits-sec": "tebibits/seg",
+            "name-tebibytes-sec": "tebibytes/seg",
+            "name-terabits-sec": "terabits/seg",
+            "name-terabytes-sec": "terabytes/seg"
           },
-          "name": ""
+          "name": "Taxa de dados"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Data e hora padrão",
+            "name-datetime-iso": "Data e hora ISO",
+            "name-datetime-iso-no-date": "Data e hora ISO (sem data se for hoje)",
+            "name-datetime-local": "Data e hora local",
+            "name-datetime-local-no-date": "Data e hora local (sem data se for hoje)",
+            "name-datetime-us": "Data e hora dos Estados Unidos",
+            "name-datetime-us-no-date": "Data e hora dos Estados Unidos (sem data se for hoje)",
+            "name-from-now": "A partir de agora"
           },
-          "name": ""
+          "name": "Data e hora"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Ampere (A)",
+            "name-ampere-hour": "Ampere-hora (Ah)",
+            "name-decibel-milliwatt": "Decibel-milliwatt (dBm)",
+            "name-electron-volt": "Elétron-volt (eV)",
+            "name-farad": "Farad (F)",
+            "name-femtofarad": "Femtofarad (fF)",
+            "name-gigawatt": "Gigawatt (GW)",
+            "name-henry": "Henry (H)",
+            "name-joule": "Joule (J)",
+            "name-kiloampere": "Quiloampere (kA)",
+            "name-kiloampere-hour": "Quiloampere-hora (kAh)",
+            "name-kiloohm": "Quiloohm (kΩ)",
+            "name-kilovolt": "Quilovolt (kV)",
+            "name-kilovolt-ampere": "Quilovolt-ampere (kVA)",
+            "name-kilovolt-ampere-reactive": "Quilovolt-ampere reativo (kVAr)",
+            "name-kilowatt": "Quilowatt (kW)",
+            "name-kilowatt-hour": "Quilowatt-hora (kWh)",
+            "name-kilowatt-min": "Quilowatt-min (kWm)",
+            "name-lumens": "Lúmens (lm)",
+            "name-megaohm": "Megaohm (MΩ)",
+            "name-megawatt": "Megawatt (MW)",
+            "name-megawatt-hour": "Megawatt-hora (MWh)",
+            "name-microfarad": "Microfarad (µF)",
+            "name-microhenry": "Microhenry (µH)",
+            "name-milliampere": "Miliampere (mA)",
+            "name-milliampere-hour": "Miliampere-hora (mAh)",
+            "name-millihenry": "Milihenry (mH)",
+            "name-milliohm": "Miliohm (mΩ)",
+            "name-millivolt": "Milivolt (mV)",
+            "name-milliwatt": "Miliwatt (mW)",
+            "name-nanofarad": "Nanofarad (nF)",
+            "name-ohm": "Ohm (Ω)",
+            "name-picofarad": "Picofarad (pF)",
+            "name-volt": "Volt [V]",
+            "name-volt-ampere": "Volt-ampere (VA)",
+            "name-volt-ampere-reactive": "Volt-ampere reativo (VAr)",
+            "name-watt": "Watt (W)",
+            "name-watt-hour": "Watt-hora (Wh)",
+            "name-watt-hour-per-kg": "Watt-hora por quilograma (Wh/kg)",
+            "name-watt-square-meter": "Watt por metro quadrado (W/m²)"
           },
-          "name": ""
+          "name": "Energia"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Pés cúbicos/min (cfm)",
+            "name-cubic-feet-sec": "Pés cúbicos/seg (cfs)",
+            "name-cubic-meters-sec": "Metros cúbicos/seg (cms)",
+            "name-gallons-min": "Galões/min (gpm)",
+            "name-litre-hour": "Litro/hora",
+            "name-litre-min": "Litro/min (L/min)",
+            "name-lux": "Lux (lx)",
+            "name-millilitre-min": "Mililitro/min (mL/min)"
           },
-          "name": ""
+          "name": "Fluxo"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Quilonewton-metros (kNm)",
+            "name-kilonewtons": "Quilonewtons (kN)",
+            "name-newton-meters": "Newton-metros (Nm)",
+            "name-newtons": "Newtons (N)"
           },
-          "name": ""
+          "name": "Força"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "exahashes/seg",
+            "name-gigahashes-sec": "gigahashes/seg",
+            "name-hashes-sec": "hashes/seg",
+            "name-kilohashes-sec": "quilohashes/seg",
+            "name-megahashes-sec": "megahashes/seg",
+            "name-petahashes-sec": "petahashes/seg",
+            "name-terahashes-sec": "terahashes/seg"
           },
-          "name": ""
+          "name": "Taxa de hash"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "pés (ft)",
+            "name-inch": "polegada (in)",
+            "name-kilometer": "quilômetro (km)",
+            "name-meter": "metro (m)",
+            "name-mile": "milha (mi)",
+            "name-millimeter": "milímetro (mm)"
           },
-          "name": ""
+          "name": "Comprimento"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "grama (g)",
+            "name-kilogram": "quilograma (kg)",
+            "name-metric-ton": "tonelada métrica (t)",
+            "name-milligram": "miligrama (mg)",
+            "name-pound": "libra (lb)"
           },
-          "name": ""
+          "name": "Massa"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Candela (cd)",
+            "name-decibel": "Decibel",
+            "name-hexadecimal": "Hexadecimal ",
+            "name-hexadecimal-0x": "Hexadecimal (0x)",
+            "name-humidity": "Umidade (%H)",
+            "name-locale": "Formato local",
+            "name-number": "Número",
+            "name-percent-1": "Percentual (0,0-1,0)",
+            "name-percent-100": "Percentual (0-100)",
+            "name-pixels": "Pixels",
+            "name-scientific": "Notação científica",
+            "name-short": "curto",
+            "name-si-short": "SI curto",
+            "name-string": "String"
           },
-          "name": ""
+          "name": "Misc."
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Barras",
+            "name-hectopascals": "Hectopascais",
+            "name-inches-mercury": "Polegadas de mercúrio",
+            "name-kilobars": "Quilobares",
+            "name-kilopascals": "Quilopascais",
+            "name-millibars": "Milibares",
+            "name-pascals": "Pascais",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Pressão"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Becquerel (Bq)",
+            "name-curie": "curie (Ci)",
+            "name-exposure": "Exposição (C/kg)",
+            "name-gray": "Gray (Gy)",
+            "name-microsievert": "microSievert (µSv)",
+            "name-microsievert-hour": "microSievert/hora (µSv/h)",
+            "name-millisievert": "miliSievert (mSv)",
+            "name-millisievert-hour": "milliSievert/hora (mSv/h)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "roentgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/hora (Sv/h)"
           },
-          "name": ""
+          "name": "Radiação"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Graus por segundo (°/s)",
+            "name-gigahertz": "Gigahertz (GHz)",
+            "name-hertz": "Hertz (Hz)",
+            "name-kilohertz": "Quilohertz (kHz)",
+            "name-megahertz": "Megahertz (MHz)",
+            "name-radians-sec": "Radianos por segundo (rad/s)",
+            "name-rpm": "Rotações por minuto (rpm)"
           },
-          "name": ""
+          "name": "Velocidade de rotação"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsius (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Temperatura"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "contagens/min (cpm)",
+            "name-counts-sec": "contagens/seg (cps)",
+            "name-events-min": "eventos/min (epm)",
+            "name-events-sec": "eventos/seg (eps)",
+            "name-io-ops-sec": "I/O ops/seg (iops)",
+            "name-messages-min": "mensagens/min (mpm)",
+            "name-messages-sec": "mensagens/seg (mps)",
+            "name-ops-min": "ops/min (opm)",
+            "name-ops-sec": "ops/seg (ops)",
+            "name-reads-min": "leituras/min (rpm)",
+            "name-reads-sec": "leituras/seg (rps)",
+            "name-records-min": "registros/min (rpm)",
+            "name-records-sec": "registros/seg (rps)",
+            "name-requests-min": "solicitações/min (rpm)",
+            "name-requests-sec": "solicitações/seg (rps)",
+            "name-rows-min": "fileiras/min (rpm)",
+            "name-rows-sec": "fileiras/seg (rps)",
+            "name-writes-min": "escritas/min (wpm)",
+            "name-writes-sec": "escritas/seg (wps)"
           },
-          "name": ""
+          "name": "Produtividade"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "relógio (ms)",
+            "name-clock-s": "relógio (s)",
+            "name-days": "dias (d)",
+            "name-duration-dhms": "duração (d hh:mm:ss)",
+            "name-duration-hms": "duração (hh:mm:ss)",
+            "name-duration-ms": "duração (ms)",
+            "name-duration-s": "duração (s)",
+            "name-hertz": "Hertz (1/s)",
+            "name-hours": "horas (h)",
+            "name-microseconds": "microssegundos (µs)",
+            "name-milliseconds": "milissegundos (ms)",
+            "name-minutes": "minutos (m)",
+            "name-nanoseconds": "nanossegundos (ns)",
+            "name-seconds": "segundos (s)",
+            "name-timeticks": "Tiques (s/100)"
           },
-          "name": ""
+          "name": "Tempo"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "quilômetros/hora (km/h)",
+            "name-knot": "nó (kn)",
+            "name-meters-second": "metros/segundo (m/s)",
+            "name-miles-hour": "milhas/hora (mph)"
           },
-          "name": ""
+          "name": "Velocidade"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "decímetro cúbico",
+            "name-cubic-meter": "metro cúbico",
+            "name-gallons": "galões",
+            "name-litre": "litro (L)",
+            "name-millilitre": "mililitro (mL)",
+            "name-normal-cubic-meter": "Metro cúbico normal"
           },
-          "name": ""
+          "name": "Volume"
         }
       }
     }
@@ -8300,85 +8301,85 @@
     },
     "builder": {
       "axis": {
-        "category-axis": "",
-        "color-label": "",
+        "category-axis": "Eixo",
+        "color-label": "Cor",
         "color-options": {
-          "label-series": "",
-          "label-text": ""
+          "label-series": "Série",
+          "label-text": "Texto"
         },
         "grid-line-options": {
-          "label-auto": "",
-          "label-off": "",
-          "label-on": ""
+          "label-auto": "Automático",
+          "label-off": "Desativado",
+          "label-on": "Ativado"
         },
-        "name-centered-zero": "",
-        "name-grid-lines": "",
-        "name-label": "",
-        "name-placement": "",
-        "name-scale": "",
-        "name-show-border": "",
-        "name-soft-max": "",
-        "name-soft-min": "",
-        "name-width": "",
-        "placeholder-label": "",
-        "placeholder-soft-max": "",
-        "placeholder-soft-min": "",
-        "placeholder-width": "",
+        "name-centered-zero": "Zero centralizado",
+        "name-grid-lines": "Mostrar linhas de grade",
+        "name-label": "Etiqueta",
+        "name-placement": "Posicionamento",
+        "name-scale": "Escala",
+        "name-show-border": "Mostrar borda",
+        "name-soft-max": "Máximo flexível",
+        "name-soft-min": "Mínimo flexível",
+        "name-width": "Largura",
+        "placeholder-label": "Texto opcional",
+        "placeholder-soft-max": "Ver: Opções padrão > Máximo",
+        "placeholder-soft-min": "Ver: Opções padrão > Mínimo",
+        "placeholder-width": "Automático",
         "scale-distribution-editor": {
           "distribution-options": {
-            "label-linear": "",
-            "label-log": "",
-            "label-symlog": ""
+            "label-linear": "Linear",
+            "label-log": "Logarítmico",
+            "label-symlog": "Symlog"
           }
         }
       },
       "legend": {
-        "category": "",
-        "description-values": "",
+        "category": "Legenda",
+        "description-values": "Selecione valores ou cálculos para mostrar na legenda",
         "mode-options": {
-          "label-list": "",
-          "label-table": ""
+          "label-list": "Lista",
+          "label-table": "Tabela"
         },
-        "name-mode": "",
-        "name-placement": "",
-        "name-values": "",
-        "name-visibility": "",
-        "name-width": "",
+        "name-mode": "Modo",
+        "name-placement": "Posicionamento",
+        "name-values": "Valores",
+        "name-visibility": "Visibilidade",
+        "name-width": "Largura",
         "placement-options": {
-          "label-bottom": "",
-          "label-right": ""
+          "label-bottom": "Inferior",
+          "label-right": "Direita"
         }
       },
       "stacking": {
-        "name-stack-series": ""
+        "name-stack-series": "Série de pilha"
       },
       "text": {
-        "category-text-size": "",
-        "name-percent-change": "",
-        "name-title": "",
-        "name-value": "",
-        "placeholder-percent-change": "",
-        "placeholder-title": "",
-        "placeholder-value": ""
+        "category-text-size": "Tamanho do texto",
+        "name-percent-change": "Percentual de alteração",
+        "name-title": "Título",
+        "name-value": "Valor",
+        "placeholder-percent-change": "Automático",
+        "placeholder-title": "Automático",
+        "placeholder-value": "Automático"
       },
       "tooltip": {
-        "category": "",
-        "description-hover-proximity": "",
+        "category": "Dica de uso",
+        "description-hover-proximity": "Distância necessária (em pixels) entre o cursor e um ponto para que as dicas de uso sejam acionadas",
         "modeOptions": {
-          "label-all": "",
-          "label-hidden": "",
-          "label-single": ""
+          "label-all": "Tudo",
+          "label-hidden": "Oculto",
+          "label-single": "Única"
         },
-        "name-hide-zeros": "",
-        "name-hover-proximity": "",
-        "name-max-height": "",
-        "name-max-width": "",
-        "name-tooltip-mode": "",
-        "name-values-sort-order": "",
+        "name-hide-zeros": "Ocultar zeros",
+        "name-hover-proximity": "Proximidade do cursor",
+        "name-max-height": "Altura máxima",
+        "name-max-width": "Largura máxima",
+        "name-tooltip-mode": "Modo de dica de uso",
+        "name-values-sort-order": "Ordem de classificação de valores",
         "sortOptions": {
-          "label-ascending": "",
-          "label-descending": "",
-          "label-none": ""
+          "label-ascending": "Ascendente",
+          "label-descending": "Descendente",
+          "label-none": "Nenhum"
         }
       }
     },
@@ -8386,7 +8387,7 @@
       "option": "opção"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Abrir prévia da imagem"
     },
     "cascader": {
       "clear-button": "Limpar seleção"
@@ -8400,9 +8401,9 @@
       "aria-label-selected-color": "cor {{colorLabel}}"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Excluir",
       "cancel": "Cancelar",
-      "confirmText-delete": ""
+      "confirmText-delete": "Excluir"
     },
     "confirm-content": {
       "placeholder": "Digite \"{{confirmPromptText}}\" para confirmar"
@@ -8507,56 +8508,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "Abril",
+        "label-august": "Agosto",
+        "label-december": "Dezembro",
+        "label-february": "Fevereiro",
+        "label-january": "Janeiro",
+        "label-july": "Julho",
+        "label-june": "Junho",
+        "label-march": "Março",
+        "label-may": "Maio",
+        "label-november": "Novembro",
+        "label-october": "Outubro",
+        "label-september": "Setembro"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Anteontem",
+        "last-1-hour": "Última hora",
+        "last-1-year": "Último ano",
+        "last-12-hours": "Últimas 12 horas",
+        "last-15-mins": "Últimos 15 minutos",
+        "last-2-days": "Últimos 2 dias",
+        "last-2-years": "Últimos 2 anos",
+        "last-24-hours": "Últimas 24 horas",
+        "last-3-hours": "Últimas 3 horas",
+        "last-30-days": "Últimos 30 dias",
+        "last-30-mins": "Últimos 30 minutos",
+        "last-5-mins": "Últimos 5 minutos",
+        "last-5-years": "Últimos 5 anos",
+        "last-6-hours": "Últimas 6 horas",
+        "last-6-months": "Últimos 6 meses",
+        "last-7-days": "Últimos 7 dias",
+        "last-90-days": "Últimos 90 dias",
+        "previous-fiscal-quarter": "Trimestre fiscal anterior",
+        "previous-fiscal-year": "Ano fiscal anterior",
+        "previous-month": "Mês anterior",
+        "previous-week": "Semana anterior",
+        "previous-year": "Ano anterior",
+        "this-day-last-week": "Neste dia na semana passada",
+        "this-fiscal-quarter": "Este trimestre fiscal",
+        "this-fiscal-quarter-so-far": "Este trimestre fiscal até agora",
+        "this-fiscal-year": "Este ano fiscal",
+        "this-fiscal-year-so-far": "Este ano fiscal até agora",
+        "this-month": "Este mês",
+        "this-month-so-far": "Este mês até agora",
+        "this-week": "Esta semana",
+        "this-week-so-far": "Esta semana até agora",
+        "this-year": "Este ano",
+        "this-year-so-far": "Este ano até agora",
+        "today": "Hoje",
+        "today-so-far": "Hoje até agora",
+        "yesterday": "Ontem"
       }
     },
     "drawer": {
@@ -8598,33 +8599,33 @@
       "tooltip-expand-all": "Expandir todas as linhas"
     },
     "matchers-ui": {
-      "description-field-name-by-regex-matcher": "",
-      "description-fields-by-query": "",
-      "description-fields-with-name": "",
-      "description-fields-with-type": "",
-      "description-fields-with-value": "",
+      "description-field-name-by-regex-matcher": "Definir propriedades para campos com nomes que correspondem a uma expressão regular",
+      "description-fields-by-query": "Definir propriedades para campos de uma consulta específica",
+      "description-fields-with-name": "Definir propriedades para um campo específico",
+      "description-fields-with-type": "Definir propriedades para campos de um tipo específico (número, string, booleano)",
+      "description-fields-with-value": "Definir propriedades para campos com condição de redutor",
       "field-name-picker": {
-        "placeholder": ""
+        "placeholder": "Selecionar campo"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Booleano",
+        "label-enum": "Enum",
+        "label-number": "Número",
+        "label-other": "Outro",
+        "label-string": "String",
+        "label-time": "Tempo",
+        "label-traces": "Traços"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Quadros ({{framesCount}}): {{framesNames}}",
+        "label": "Consulta: {{refId}}",
+        "label-missing-ref-id": "Consulta: (refId ausente)"
       },
-      "name-field-name-by-regex-matcher": "",
-      "name-fields-by-query": "",
-      "name-fields-with-name": "",
-      "name-fields-with-type": "",
-      "name-fields-with-value": ""
+      "name-field-name-by-regex-matcher": "Campos com nome que corresponda a uma expressão regular",
+      "name-fields-by-query": "Campos que retornaram por consulta",
+      "name-fields-with-name": "Campos com nome",
+      "name-fields-with-type": "Campos com tipo",
+      "name-fields-with-value": "Campos com valores"
     },
     "menu-item": {
       "keyboard-shortcut-label": "Atalho de teclado"
@@ -8652,8 +8653,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "alternar recolher painel",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Barra de carregamento do painel",
+      "ariaLabel-panel-status": "Painel de status",
       "tooltip-cancel": "Cancelar consulta",
       "tooltip-cancel-loading": "Cancelar consulta",
       "tooltip-stop-streaming": "Parar streaming",
@@ -8722,12 +8723,12 @@
       "inspect-drawer-title": "Inspecionar valor",
       "inspect-menu-label": "Inspecionar valor",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Sem dados"
       },
       "no-values-label": "Sem valores",
       "pagination-summary": "{{itemsRangeStart}} - {{displayedEnd}} de {{numRows}} linhas",
       "sparkline": {
-        "no-data": ""
+        "no-data": "sem dados"
       }
     },
     "tags": {
@@ -8735,7 +8736,7 @@
     },
     "tags-input": {
       "add": "Adicionar",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Nova tag (pressione Enter para adicionar)",
       "remove": "Remover etiqueta: {{name}}"
     },
     "time-sync-button": {
@@ -8752,55 +8753,55 @@
       "config": {
         "get-graph-field-options": {
           "axis-placement": {
-            "description-auto": "",
-            "label-auto": "",
-            "label-hidden": "",
-            "label-left": "",
-            "label-right": ""
+            "description-auto": "Primeiro campo à esquerda, todo o restante à direita",
+            "label-auto": "Automático",
+            "label-hidden": "Oculto",
+            "label-left": "Esquerda",
+            "label-right": "Direita"
           },
           "bar-alignment": {
-            "description-after": "",
-            "description-before": "",
-            "description-center": ""
+            "description-after": "Após",
+            "description-before": "Antes",
+            "description-center": "Centro"
           },
           "draw-style": {
-            "label-bars": "",
-            "label-lines": "",
-            "label-points": ""
+            "label-bars": "Barras",
+            "label-lines": "Linhas",
+            "label-points": "Pontos"
           },
           "fill-gradient": {
-            "description-hue": "",
-            "description-opacity": "",
-            "description-scheme": "",
-            "label-hue": "",
-            "label-none": "",
-            "label-opacity": "",
-            "label-scheme": ""
+            "description-hue": "Pequeno gradiente de matiz de cor",
+            "description-opacity": "Ativar gradiente de opacidade de preenchimento",
+            "description-scheme": "Usar esquema de cores para definir o gradiente",
+            "label-hue": "Matiz",
+            "label-none": "Nenhum",
+            "label-opacity": "Opacidade",
+            "label-scheme": "Esquema"
           },
           "line-interpolation": {
-            "description-linear": "",
-            "description-smooth": "",
-            "description-step-after": "",
-            "description-step-before": ""
+            "description-linear": "Linear",
+            "description-smooth": "Suave",
+            "description-step-after": "Etapa subsequente",
+            "description-step-before": "Etapa antecedente"
           },
           "show-points": {
-            "description-auto": "",
-            "label-always": "",
-            "label-auto": "",
-            "label-never": ""
+            "description-auto": "Exibir pontos quando a densidade for baixa",
+            "label-always": "Sempre",
+            "label-auto": "Automático",
+            "label-never": "Nunca"
           },
           "stacking": {
-            "label-100": "",
-            "label-normal": "",
-            "label-off": ""
+            "label-100": "100%",
+            "label-normal": "Normal",
+            "label-off": "Desativado"
           },
           "thresholds-display-mode": {
-            "label-dashed-lines": "",
-            "label-filled-regions": "",
-            "label-filled-regions-and-dashed-lines": "",
-            "label-filled-regions-and-lines": "",
-            "label-lines": "",
-            "label-off": ""
+            "label-dashed-lines": "Com linhas (tracejadas)",
+            "label-filled-regions": "Em regiões preenchidas",
+            "label-filled-regions-and-dashed-lines": "Em regiões preenchidas e linhas (tracejadas)",
+            "label-filled-regions-and-lines": "Em regiões preenchidas e linhas",
+            "label-lines": "Com linhas",
+            "label-off": "Desativado"
           }
         }
       }
@@ -8828,14 +8829,14 @@
       "footer-add-annotation": "Adicionar anotação",
       "footer-click-to-action": "Clique para {{actionTitle}}",
       "footer-click-to-navigate": "Clique para abrir {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Filtrar por \"{{value}}\"",
       "timestamp": "Registro de data/hora"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Padrão",
+      "weekStarts-label-monday": "Segunda-feira",
+      "weekStarts-label-saturday": "Sábado",
+      "weekStarts-label-sunday": "Domingo"
     }
   },
   "graph": {
@@ -8848,78 +8849,78 @@
   },
   "heatmap": {
     "calculate-from-data-options": {
-      "label-no": "",
-      "label-yes": ""
+      "label-no": "Não",
+      "label-yes": "Sim"
     },
-    "category-cell-display": "",
-    "category-colors": "",
-    "category-exemplars": "",
-    "category-heatmap": "",
-    "category-legend": "",
-    "category-tooltip": "",
-    "category-y-axis": "",
+    "category-cell-display": "Exibição de célula",
+    "category-colors": "Cores",
+    "category-exemplars": "Exemplares",
+    "category-heatmap": "Mapa de calor",
+    "category-legend": "Legenda",
+    "category-tooltip": "Dica de uso",
+    "category-y-axis": "Eixo Y",
     "mode-options": {
-      "label-opacity": "",
-      "label-scheme": ""
+      "label-opacity": "Opacidade",
+      "label-scheme": "Esquema"
     },
-    "name-axis-label": "",
-    "name-axis-width": "",
-    "name-calculate-from-data": "",
-    "name-cell-gap": "",
-    "name-color": "",
-    "name-decimals": "",
-    "name-end-color-at-value": "",
-    "name-exponent": "",
-    "name-hide-cells-gt": "",
-    "name-hide-cells-lt": "",
-    "name-max-height": "",
-    "name-max-value": "",
-    "name-max-width": "",
-    "name-min-value": "",
-    "name-mode": "",
-    "name-placement": "",
-    "name-reverse": "",
-    "name-scale": "",
-    "name-scheme": "",
-    "name-show-color-scale": "",
-    "name-show-histogram": "",
-    "name-show-legend": "",
-    "name-start-color-from-value": "",
-    "name-steps": "",
-    "name-tick-alignment": "",
-    "name-tooltip-mode": "",
-    "name-unit": "",
-    "name-value-name": "",
-    "name-y-axis-scale": "",
-    "placeholder-axis-label": "",
-    "placeholder-axis-width": "",
-    "placeholder-decimals": "",
-    "placeholder-end-color-at-value": "",
-    "placeholder-hide-cells-gt": "",
-    "placeholder-hide-cells-lt": "",
-    "placeholder-max-value": "",
-    "placeholder-min-value": "",
-    "placeholder-start-color-from-value": "",
-    "placeholder-value-name": "",
+    "name-axis-label": "Rótulo do eixo",
+    "name-axis-width": "Largura do eixo",
+    "name-calculate-from-data": "Calcular a partir de dados",
+    "name-cell-gap": "Espaço entre as células",
+    "name-color": "Cor",
+    "name-decimals": "Decimais",
+    "name-end-color-at-value": "Encerrar escala de cores no valor",
+    "name-exponent": "Expoente",
+    "name-hide-cells-gt": "Ocultar células com valores >=",
+    "name-hide-cells-lt": "Ocultar células com valores <=",
+    "name-max-height": "Altura máxima",
+    "name-max-value": "Valor máximo",
+    "name-max-width": "Largura máxima",
+    "name-min-value": "Valor mínimo",
+    "name-mode": "Modo",
+    "name-placement": "Posicionamento",
+    "name-reverse": "Reverso",
+    "name-scale": "Escala",
+    "name-scheme": "Esquema",
+    "name-show-color-scale": "Mostrar escala de cores",
+    "name-show-histogram": "Mostrar histograma (eixo Y)",
+    "name-show-legend": "Mostrar legenda",
+    "name-start-color-from-value": "Iniciar escala de cores a partir do valor",
+    "name-steps": "Etapas",
+    "name-tick-alignment": "Alinhamento de marcação",
+    "name-tooltip-mode": "Modo de dica de uso",
+    "name-unit": "Unidade",
+    "name-value-name": "Nome do valor",
+    "name-y-axis-scale": "Escala do eixo Y",
+    "placeholder-axis-label": "Automático",
+    "placeholder-axis-width": "Automático",
+    "placeholder-decimals": "Automático",
+    "placeholder-end-color-at-value": "Automático (máximo)",
+    "placeholder-hide-cells-gt": "Nenhum",
+    "placeholder-hide-cells-lt": "Nenhum",
+    "placeholder-max-value": "Automático",
+    "placeholder-min-value": "Automático",
+    "placeholder-start-color-from-value": "Automático (mínimo)",
+    "placeholder-value-name": "Valor",
     "placement-options": {
-      "label-hidden": "",
-      "label-left": "",
-      "label-right": ""
+      "label-hidden": "Oculto",
+      "label-left": "Esquerda",
+      "label-right": "Direita"
     },
     "scale-options": {
-      "label-exponential": "",
-      "label-linear": ""
+      "label-exponential": "Exponencial",
+      "label-linear": "Linear"
     },
     "tick-alignment-options": {
-      "label-auto": "",
-      "label-bottom": "",
-      "label-middle": "",
-      "label-top": ""
+      "label-auto": "Automático",
+      "label-bottom": "Inferior (GE)",
+      "label-middle": "Meio",
+      "label-top": "Superior (LE)"
     },
     "tooltip-mode-options": {
-      "label-all": "",
-      "label-hidden": "",
-      "label-single": ""
+      "label-all": "Tudo",
+      "label-hidden": "Oculto",
+      "label-single": "Única"
     }
   },
   "help-modal": {
@@ -8979,14 +8980,14 @@
     "troubleshooting-help": "Para solicitar ajuda para resolver problemas, envie uma captura deste painel para o suporte técnico da Grafana Labs. A captura contém dados de respostas à consulta e configurações do painel."
   },
   "histogram": {
-    "category-histogram": "",
+    "category-histogram": "Histograma",
     "histogram-panel": {
       "no-histogram-found-in-response": "Nenhum histograma encontrado na resposta"
     },
-    "name-fill-opacity": "",
-    "name-gradient-mode": "",
-    "name-line-width": "",
-    "name-stacking": ""
+    "name-fill-opacity": "Opacidade do preenchimento",
+    "name-gradient-mode": "Modo de gradiente",
+    "name-line-width": "Largura da linha",
+    "name-stacking": "Empilhamento"
   },
   "inspector": {
     "inspect-data-tab": {
@@ -9215,8 +9216,8 @@
       "title-create-library-panel": "Criar painel de biblioteca"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Alterar",
+      "confirmText-replace": "Substituir"
     },
     "confirm": {
       "delete-panel": "Deseja excluir este painel?"
@@ -9241,7 +9242,7 @@
       "usage-count_other": "Usado em {{count}} painéis"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Buscar por nome, descrição ou nome da pasta"
     },
     "loading-indicator": {
       "loading-library-panel": "Carregando painel da biblioteca…"
@@ -9367,16 +9368,16 @@
     }
   },
   "logs": {
-    "category-logs": "",
+    "category-logs": "Logs",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Exato",
+      "label-none": "Nenhum",
+      "label-numbers": "Números",
+      "label-signature": "Assinatura"
     },
-    "description-enable-infinite-scrolling": "",
-    "description-enable-syntax-highlighting": "",
-    "description-show-controls": "",
+    "description-enable-infinite-scrolling": "Experimental. Solicite mais resultados ao descer até a parte inferior da lista de logs.",
+    "description-enable-syntax-highlighting": "Use um conjunto predefinido de regras de cores de sintaxe para destacar partes relevantes das linhas de log",
+    "description-show-controls": "Exibir controles para pular para a última ou primeira linha do log e filtros por nível de log",
     "fields": {
       "type": {
         "loki": {
@@ -9390,8 +9391,8 @@
       }
     },
     "font-size-options": {
-      "label-default": "",
-      "label-small": ""
+      "label-default": "Padrão",
+      "label-small": "Pequeno"
     },
     "get-dataframe-fields": {
       "vars": {
@@ -9447,64 +9448,64 @@
       "title-log-line": ""
     },
     "log-line-details": {
-      "clear-search": "",
-      "close": "",
-      "copy-shortlink": "",
-      "copy-to-clipboard": "",
-      "displayed-fields-section": "",
+      "clear-search": "Limpar",
+      "close": "Fechar detalhes do log",
+      "copy-shortlink": "Copiar link curto",
+      "copy-to-clipboard": "Copiar para a área de transferência",
+      "displayed-fields-section": "Organizar campos exibidos",
       "fields": {
-        "adhoc-statistics": "",
-        "copy-value-to-clipboard": "",
-        "filter-out": "",
-        "filter-out-query": "",
+        "adhoc-statistics": "Estatísticas ad-hoc",
+        "copy-value-to-clipboard": "Copiar valor para a área de transferência",
+        "filter-out": "Filtrar valor",
+        "filter-out-query": "Filtrar valor na consulta {{query}}",
         "toggle-field-button": {
-          "field-instead-message": "",
-          "hide-this-field": ""
+          "field-instead-message": "Exibir este campo em vez da mensagem",
+          "hide-this-field": "Ocultar este campo"
         }
       },
-      "fields-section": "",
-      "hide-log-line": "",
-      "inline-mode": "",
-      "links-section": "",
-      "log-line-field": "",
-      "log-line-section": "",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
-      "no-details": "",
-      "open-assistant": "",
-      "pin-line": "",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "fields-section": "Campos",
+      "hide-log-line": "Ocultar linha de log",
+      "inline-mode": "Exibir em linha",
+      "links-section": "Links",
+      "log-line-field": "Linha de registro",
+      "log-line-section": "Linha de log",
+      "move-displayed-field-down": "Mover para baixo",
+      "move-displayed-field-up": "Mover para cima",
+      "no-details": "Sem campos para exibir.",
+      "open-assistant": "Explique esta linha de registro no Assistente",
+      "pin-line": "Fixar log",
+      "remove-displayed-field": "Remover campo",
+      "remove-log": "Remover registro",
+      "scroll-to-logline": "Rolar para a linha do registro",
       "search": {
-        "no-results": ""
+        "no-results": "Nenhum resultado para exibir."
       },
-      "search-placeholder": "",
-      "show-context": "",
-      "show-log-line": "",
-      "sidebar-mode": "",
-      "unpin-line": ""
+      "search-placeholder": "Buscar nomes e valores de campos",
+      "show-context": "Exibir contexto",
+      "show-log-line": "Exibir linha de log",
+      "sidebar-mode": "Fixar à direita",
+      "unpin-line": "Desafixar log"
     },
     "log-line-menu": {
       "copy-link": "Copiar link para a linha do log",
       "copy-log": "Copiar linha do log",
       "hide-details": "Exibir detalhes do log",
       "icon-label": "Menu do log",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Linha de registro",
+      "log-line-explainer": "Explique esta linha de registro de forma concisa",
+      "open-assistant": "Explique esta linha de registro no Assistente",
       "pin-to-outline": "Fixar log",
       "show-context": "Exibir contexto",
       "show-details": "Ocultar detalhes do log",
       "unpin-from-outline": "Desafixar log"
     },
     "log-list-search": {
-      "close": "",
-      "filter": "",
-      "info": "",
-      "input-placeholder": "",
-      "next": "",
-      "prev": ""
+      "close": "Fechar busca",
+      "filter": "Filtrar logs correspondentes",
+      "info": "Busca no lado do cliente em strings nos logs exibidos. Não deve ser confundido com filtros de consulta. Use este componente para buscar strings específicas nos resultados do seu log.",
+      "input-placeholder": "Busca em logs",
+      "next": "Próximo resultado",
+      "prev": "Resultado anterior"
     },
     "log-row-context-modal": {
       "error-loading-log-more-logs": "Erro ao carregar mais logs.",
@@ -9565,7 +9566,7 @@
       "escape-newlines": "Corrigir sequências de tabulação e quebra de linha adicionadas incorretamente por escape nas linhas de log",
       "font-size-default": "Usar tamanho de fonte pequeno",
       "font-size-small": "Usar tamanho de fonte padrão",
-      "hide-search": "",
+      "hide-search": "Fechar busca",
       "hide-timestamps": "Ocultar data e hora",
       "hide-unique-labels": "Ocultar rótulos exclusivos",
       "newest-first": "Organizado por logs mais recentes primeiro: clique para exibir os mais antigos primeiro",
@@ -9578,7 +9579,7 @@
       "scroll-top": "Rolar para cima",
       "show-ms-timestamps": "",
       "show-ns-timestamps": "",
-      "show-search": "",
+      "show-search": "Resultado da busca nos logs",
       "show-timestamps": "Exibir data e hora",
       "show-unique-labels": "Exibir rótulos únicos",
       "unwrap-lines": "Desfazer quebra de linha",
@@ -9596,26 +9597,26 @@
         "common-labels": "Rótulos comuns:"
       }
     },
-    "name-common-labels": "",
-    "name-deduplication": "",
-    "name-details-mode": "",
+    "name-common-labels": "Rótulos comuns",
+    "name-deduplication": "Desduplicação",
+    "name-details-mode": "Modo de painel de detalhes do registro",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "Em linha",
+      "label-sidebar": "Barra lateral"
     },
-    "name-enable-infinite-scrolling": "",
-    "name-enable-log-details": "",
-    "name-enable-syntax-highlighting": "",
-    "name-font-size": "",
-    "name-order": "",
-    "name-prettify-json": "",
-    "name-show-controls": "",
+    "name-enable-infinite-scrolling": "Ativar rolagem infinita",
+    "name-enable-log-details": "Ativar detalhes do log",
+    "name-enable-syntax-highlighting": "Ativar destaque de sintaxe",
+    "name-font-size": "Tamanho da fonte",
+    "name-order": "Ordem",
+    "name-prettify-json": "Formatar JSON",
+    "name-show-controls": "Mostrar controles",
     "name-time": "",
-    "name-unique-labels": "",
-    "name-wrap-lines": "",
+    "name-unique-labels": "Rótulos exclusivos",
+    "name-wrap-lines": "Quebras de linha",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Mais recentes primeiro",
+      "label-oldest-first": "Mais antigos primeiro"
     },
     "out-of-range-message": {
       "end-of-the-selected-time-range": "Fim do intervalo de tempo selecionado."
@@ -9630,7 +9631,7 @@
     "un-themed-log-details": {
       "aria-label-data-links": "Links de dados",
       "aria-label-fields": "Campos",
-      "aria-label-line": "",
+      "aria-label-line": "Linha de log",
       "aria-label-log-level": "Nível de log",
       "aria-label-no-details": "Sem detalhes"
     },
@@ -9651,27 +9652,27 @@
     }
   },
   "logs-new": {
-    "category-logs": "",
+    "category-logs": "Logs",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Exato",
+      "label-none": "Nenhum",
+      "label-numbers": "Números",
+      "label-signature": "Assinatura"
     },
-    "description-infinite-scrolling": "",
-    "description-show-controls": "",
-    "description-syntax-highlighting": "",
-    "name-deduplication": "",
-    "name-enable-log-details": "",
-    "name-infinite-scrolling": "",
-    "name-order": "",
-    "name-show-controls": "",
-    "name-syntax-highlighting": "",
-    "name-time": "",
-    "name-wrap-lines": "",
+    "description-infinite-scrolling": "Experimental. Solicite mais resultados ao descer até a parte inferior da lista de logs.",
+    "description-show-controls": "Exibir controles para pular para a última ou primeira linha do log e filtros por nível de log",
+    "description-syntax-highlighting": "Use um conjunto predefinido de regras de cores de sintaxe para destacar partes relevantes das linhas de log",
+    "name-deduplication": "Desduplicação",
+    "name-enable-log-details": "Ativar detalhes do log",
+    "name-infinite-scrolling": "Ativar rolagem infinita",
+    "name-order": "Ordem",
+    "name-show-controls": "Mostrar controles",
+    "name-syntax-highlighting": "Ativar destaque de sintaxe",
+    "name-time": "Tempo",
+    "name-wrap-lines": "Quebras de linha",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Mais recentes primeiro",
+      "label-oldest-first": "Mais antigos primeiro"
     }
   },
   "manage-dashbaords": {
@@ -9698,8 +9699,8 @@
       "updated-on": "Atualizado em"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Tem certeza de que deseja excluir \"{{snapshotToRemove}}\"?",
+      "confirmText-delete": "Excluir",
       "title-delete": "Excluir"
     },
     "unthemed-dashboard-import": {
@@ -9711,14 +9712,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "O nome é obrigatório",
+      "message-reserved-name": "Este é um nome reservado e não pode ser usado para uma pasta.",
+      "message-same-name": "Já existe um painel de controle ou uma pasta com o mesmo nome",
+      "message-same-name-general": "Já existe uma pasta ou painel de controle na pasta geral com o mesmo nome"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Nenhuma opção encontrada"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9868,8 +9869,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Número máximo de grupos de regras de alerta atingido: exclua alguns grupos de regras de alerta ou faça upgrade do seu plano e tente novamente.",
+        "alert-rules-quota-reached": "Número máximo de regras de alerta atingido: exclua algumas regras de alerta ou faça upgrade do seu plano e tente novamente.",
         "dashboard-already-managed": "O painel de controle já está provisionado e é gerenciado pela Grafana na instância na nuvem. Recomendamos que você passe a usar o painel de controle provisionado. Se você ainda quiser copiar o painel de controle para a instância na nuvem, altere o ID do painel de controle no JSON do painel de controle, salve uma nova captura e envie novamente.",
         "datasource-already-managed": "A fonte de dados já está provisionada e é gerenciada pela Grafana na instância na nuvem. Caso se trate de outro recurso, defina outro UID e tente novamente.",
         "datasource-invalid-url": "Há uma fonte de dados com uma URL inválida. Forneça uma URL válida e tente novamente.",
@@ -10337,9 +10338,9 @@
       "aria-label": "Ajuda"
     },
     "invite-user": {
-      "invite-button": "",
+      "invite-button": "Convidar",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Convidar usuário"
     },
     "item": {
       "add-bookmark": "Adicionar aos Marcadores",
@@ -10371,12 +10372,12 @@
     "rss-button": "Mais recentes do blog"
   },
   "news": {
-    "category-news": "",
-    "description-show-image": "",
-    "description-url": "",
+    "category-news": "Novidades",
+    "description-show-image": "Determina se a imagem (og:image) para redes sociais do item de novidades é exibida acima do conteúdo do texto",
+    "description-url": "Compatível com feeds RSS e Atom",
     "link-title": "Acessar o blog da Grafana Labs",
-    "name-show-image": "",
-    "name-url": "",
+    "name-show-image": "Mostrar imagem",
+    "name-url": "URL",
     "news-panel": {
       "body-error-loading-rss-feed": "Verifique se a URL do feed está correta e se o CORS está configurado corretamente no servidor. Consulte a <2>documentação do painel de novidades.</2>",
       "loading": "Carregando...",
@@ -10385,27 +10386,27 @@
     "title": "Mais recentes do blog"
   },
   "node-graph": {
-    "category-edges": "",
-    "category-node-graph": "",
-    "category-nodes": "",
+    "category-edges": "Conexões",
+    "category-node-graph": "Gráfico de nós",
+    "category-nodes": "Nós",
     "layout-algorithm-options": {
-      "description-force": "",
-      "description-grid": "",
-      "description-layered": "",
-      "label-force": "",
-      "label-grid": "",
-      "label-layered": ""
+      "description-force": "Usar um layout direcionado por forças",
+      "description-grid": "Usar um layout de grade",
+      "description-layered": "Usar um layout em camadas",
+      "label-force": "Força",
+      "label-grid": "Grade",
+      "label-layered": "Em camadas"
     },
-    "name-arc-sections": "",
-    "name-layout-algorithm": "",
-    "name-main-stat-unit": "",
-    "name-secondary-stat-unit": "",
-    "name-zoom-mode": "",
+    "name-arc-sections": "Seções de arco",
+    "name-layout-algorithm": "Algoritmo do layout",
+    "name-main-stat-unit": "Unidade do valor principal",
+    "name-secondary-stat-unit": "Unidade do valor secundário",
+    "name-zoom-mode": "Modo zoom",
     "zoom-mode-options": {
-      "description-cooperative": "",
-      "description-greedy": "",
-      "label-cooperative": "",
-      "label-greedy": ""
+      "description-cooperative": "Permite rolar a página normalmente",
+      "description-greedy": "Reage a todos os gestos de zoom",
+      "label-cooperative": "Cooperativo",
+      "label-greedy": "Ganancioso"
     }
   },
   "nodeGraph": {
@@ -10484,40 +10485,40 @@
     },
     "registry": {
       "get-all-option-editors": {
-        "description-time-zone": "",
-        "name-time-zone": ""
+        "description-time-zone": "Seleção de fuso horário",
+        "name-time-zone": "Fuso horário"
       },
       "standard-field-condigs": {
-        "category-data-links": ""
+        "category-data-links": "Links de dados e ações"
       },
       "standard-field-configs": {
-        "category": "",
-        "category-thresholds": "",
-        "category-value-mappings": "",
-        "description-display-name": "",
-        "description-field-min-max": "",
-        "description-max": "",
-        "description-min": "",
-        "description-no-value": "",
-        "description-value-mappings": "",
-        "name-actions": "",
-        "name-ad-hoc": "",
-        "name-color-scheme": "",
-        "name-data-links": "",
-        "name-decimals": "",
-        "name-display-name": "",
-        "name-field-min-max": "",
-        "name-max": "",
-        "name-min": "",
-        "name-no-value": "",
-        "name-thresholds": "",
-        "name-unit": "",
-        "name-value-mappings": "",
-        "placeholder-decimals": "",
-        "placeholder-display-name": "",
-        "placeholder-max": "",
-        "placeholder-min": "",
-        "placeholder-unit": ""
+        "category": "Opções padrão",
+        "category-thresholds": "Limites",
+        "category-value-mappings": "Mapeamentos de valor",
+        "description-display-name": "Alterar o nome do campo ou da série",
+        "description-field-min-max": "Calcular mínimo e máximo por campo",
+        "description-max": "Deixar em branco para calcular com base em todos os valores",
+        "description-min": "Deixar em branco para calcular com base em todos os valores",
+        "description-no-value": "O que mostrar quando não há valor",
+        "description-value-mappings": "Modificar o texto de exibição com base no valor de entrada",
+        "name-actions": "Ações",
+        "name-ad-hoc": "Com filtragem ad-hoc",
+        "name-color-scheme": "Esquema de cores",
+        "name-data-links": "Links de dados",
+        "name-decimals": "Decimais",
+        "name-display-name": "Nome de exibição",
+        "name-field-min-max": "Campo mínimo/máximo",
+        "name-max": "Máximo",
+        "name-min": "Mínimo",
+        "name-no-value": "Sem valor",
+        "name-thresholds": "Limites",
+        "name-unit": "Unidade",
+        "name-value-mappings": "Mapeamentos de valor",
+        "placeholder-decimals": "automático",
+        "placeholder-display-name": "nenhum",
+        "placeholder-max": "automático",
+        "placeholder-min": "automático",
+        "placeholder-unit": "nenhum"
       }
     },
     "units": {
@@ -10562,7 +10563,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Nenhuma organização encontrada",
     "select-placeholder": "Selecionar organização"
   },
   "page": {
@@ -10626,13 +10627,13 @@
     },
     "panel-data-error-view": {
       "missing-value": {
-        "number": "",
-        "string": "",
-        "time": "",
-        "unknown": ""
+        "number": "Falta um campo numérico nos dados",
+        "string": "Falta um campo de string nos dados",
+        "time": "Falta um campo de tempo nos dados",
+        "unknown": "Não é possível visualizar os dados"
       },
       "no-value": {
-        "default": ""
+        "default": "Sem dados"
       },
       "open-visualization-suggestions": "Abrir sugestões de visualização",
       "switch-to-table": "Alternar para tabela"
@@ -10672,25 +10673,25 @@
     "select-placeholder": "Filtrar por tipo"
   },
   "piechart": {
-    "category-legend": "",
-    "category-pie-chart": "",
-    "description-labels": "",
-    "description-pie-chart-type": "",
+    "category-legend": "Legenda",
+    "category-pie-chart": "Gráfico de pizza",
+    "description-labels": "Selecione os rótulos a serem exibidos no gráfico de pizza",
+    "description-pie-chart-type": "Como o gráfico de pizza deve ser gerado",
     "labels-options": {
-      "label-name": "",
-      "label-percent": "",
-      "label-value": ""
+      "label-name": "Nome",
+      "label-percent": "Percentual",
+      "label-value": "Valor"
     },
     "legend-values-options": {
-      "label-percent": "",
-      "label-value": ""
+      "label-percent": "Percentual",
+      "label-value": "Valor"
     },
-    "name-labels": "",
-    "name-legend-values": "",
-    "name-pie-chart-type": "",
+    "name-labels": "Rótulos",
+    "name-legend-values": "Valores da legenda",
+    "name-pie-chart-type": "Tipo de gráfico de pizza",
     "pie-chart-type-options": {
-      "label-donut": "",
-      "label-pie": ""
+      "label-donut": "Donut",
+      "label-pie": "Pizza"
     }
   },
   "playlist": {
@@ -10785,7 +10786,7 @@
         "permission": "Você não tem permissão para visualizar esta página.",
         "title-access-denied": "Acesso negado"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Erro ao carregar o plug-in",
       "no-root-app-page-component-found": "Nenhum componente de página do aplicativo de origem foi encontrado"
     },
     "browse": {
@@ -10829,7 +10830,7 @@
         "update-status-text": "plug-ins atualizados"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Tem certeza de que deseja fazer o downgrade para a versão {{version}}? Não é esperado que você faça isso",
         "downgrade-confirm": "Fazer downgrade",
         "downgrade-title": "Fazer downgrade da versão do plug-in"
       }
@@ -10884,8 +10885,8 @@
       "message": "Nenhum plug-in encontrado"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Confira o console para saber mais sobre o erro.",
+      "extension-error-alert-title": "Erro ao carregar a extensão: \"{{pluginId}}/{{extensionTitle}}\""
     },
     "extensions-log-data-source": {
       "message": {
@@ -10922,13 +10923,13 @@
     "install-controls-button": {
       "title-uninstall-modal": "Desinstalar {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Tem certeza de que deseja desinstalar este plugin?",
+        "confirmText-confirm": "Confirmar"
       }
     },
     "install-controls-warning": {
       "body-not-published": "Este plug-in não está publicado em <2>grafana.com/plugins</2> e não pode ser gerenciado por meio do catálogo.",
-      "enterprise-plugin-info": "",
+      "enterprise-plugin-info": "Este plug-in só está disponível na Grafana Cloud e na Grafana Enterprise.",
       "learn-more": "Saiba mais",
       "no-valid-grafana-enterprise-license-detected": "Nenhuma licença válida da Grafana Enterprise foi identificada.",
       "title-dev-alert": "Esta é uma versão de desenvolvimento do plug-in e não pode ser desinstalada.",
@@ -10941,6 +10942,9 @@
       "label-plugin-id": "ID do plug-in",
       "label-severity": "Gravidade"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Não foi possível encontrar esse plug-in. Verifique se a URL está correta ou <1></1>acesse o <3>catálogo de plug-ins</3>.",
       "title-plugin-not-found": "Plug-in não encontrado"
@@ -11086,40 +11090,40 @@
   },
   "provisioned-resource-form": {
     "save-or-delete-resource-shared-fields": {
-      "comment-placeholder-describe-changes-optional": "",
-      "description-branch-name-in-git-hub": "",
+      "comment-placeholder-describe-changes-optional": "Adicione uma observação para descrever suas alterações (opcional)",
+      "description-branch-name-in-git-hub": "Nome do branch no GitHub",
       "description-inside-repository": "",
-      "label-branch": "",
-      "label-comment": "",
-      "label-path": "",
-      "label-workflow": ""
+      "label-branch": "Branch",
+      "label-comment": "Comentário",
+      "label-path": "Caminho",
+      "label-workflow": "Fluxo de trabalho"
     }
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Este recurso está atrás da ramificação em {{repoType}}.",
+      "not-saved": "O restante dos usuários do Grafana na sua organização ainda verá a versão atual salva na ramificação padrão configurada até que esta ramificação seja mesclada",
+      "open-in-repo-button": "Abrir em {{repoType}}",
+      "open-pull-request-in-repo": "Abrir solicitação de pull no {{repoType}}",
+      "view-in-repo-button": "Visualizar em {{repoType}} para ver as alterações mais recentes.",
+      "view-pull-request-in-repo": "Ver solicitação de pull no {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "Um novo recurso foi criado em uma ramificação em {{repoType}}.",
+    "title-loaded-pull-request-in-repo": "Este recurso é carregado a partir da ramificação que você acabou de criar em {{repoType}} e só é visível para você"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Recurso salvo com sucesso",
+  "provisioned-resource-request-handler-dashboard": "Painel de controle salvo com sucesso",
+  "provisioned-resource-request-handler-folder": "Pasta criada com sucesso",
   "provisioning": {
     "banner": {
       "message": "Este recurso está em desenvolvimento ativo no momento. Para ter uma melhor experiência e conferir as melhorias mais recentes, recomendamos usar a <2>compilação noturna</2> da Grafana."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "A ramificação a ser usada para provisionamento",
+      "branch-label": "Ramificação",
+      "branch-required": "A ramificação é um campo obrigatório",
+      "path-description": "Caminho de subdiretório opcional dentro do repositório",
+      "path-label": "Caminho",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11128,18 +11132,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Permite que os usuários escolham se desejam abrir uma solicitação de extração ao salvar as alterações. Se o repositório não permitir alterações diretas na ramificação principal, ainda pode ser necessário realizar uma solicitação de extração.",
+      "pr-workflow-label": "Ativar a opção de solicitação de extração ao salvar",
+      "token-description": "Senha do aplicativo Bitbucket com permissões de repositório",
+      "token-label": "Senha do aplicativo",
+      "token-required": "O token do Bitbucket é obrigatório",
+      "token-user-description": "O nome de usuário que será usado para acessar o repositório com a senha do aplicativo",
+      "token-user-label": "Nome de usuário",
+      "token-user-required": "O nome de usuário é obrigatório",
+      "url-description": "O URL do repositório do Bitbucket",
+      "url-label": "URL do repositório",
+      "url-pattern": "Deve ser um URL válido do repositório do Bitbucket",
+      "url-required": "O URL do repositório é obrigatório"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Adicione um nome de fácil compreensão para esta conexão de repositório",
@@ -11150,12 +11154,12 @@
       "label-display-name": "Nome de exibição",
       "placeholder-my-repository-connection": "Minha conexão de repositório",
       "text-loading-resource-information": "Carregando informações de recursos…",
-      "dashboards-count_one": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} painel de controle",
+      "dashboards-count_other": "{{count}} painel de controle",
       "files-count_one": "{{count}} arquivos",
       "files-count_other": "{{count}} arquivos",
-      "folders-count_one": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} pasta",
+      "folders-count_other": "{{count}} pasta"
     },
     "check-repository": {
       "check": "Verificar"
@@ -11229,7 +11233,7 @@
       "title-instant-updates-requests-webhooks": "Atualizações imediatas e solicitações de extração com webhooks.",
       "title-visual-previews-in-pull-requests": "Pré-visualizações em solicitações de extração com renderização de imagens"
     },
-    "error-title-default": "",
+    "error-title-default": "Erro",
     "expanded-row": {
       "job-specification": "Especificação da tarefa",
       "summary": "Resumo"
@@ -11238,8 +11242,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Configure os botões de alternância de recursos necessários"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Gerencie painéis como código no Git e provisione atualizações automaticamente",
+      "manage-your-dashboards-with-remote-provisioning": "Comece a usar o Git Sync",
       "store-dashboards-in-version-controlled-storage": "Armazene os painéis em um armazenamento com controle por versão para aprimorar a organização e o rastreamento de histórico"
     },
     "file-history-page": {
@@ -11260,16 +11264,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Adiciona uma pré-visualização em imagem das alterações do painel nas solicitações de extração. As imagens dos seus painéis da Grafana serão compartilhadas no seu repositório Git e estarão disponíveis para qualquer pessoa com acesso ao repositório.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Criar links de prévia para solicitações de extração",
       "description-image-rendering": "Requer renderização de imagem. <2>Configurar a renderização de imagens</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(requer <2>renderização de imagem</2> e acesso público ativado)",
       "description-read-only": "Os recursos não podem ser modificados por meio da Grafana.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Com que frequência sincronizar as alterações do repositório",
+      "error-sync-interval-required": "O intervalo de sincronização é obrigatório",
       "label-enable-previews": "Ativar pré-visualizações do painel em solicitações de extração",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Gerar prévias do painel de controle",
       "label-read-only": "Apenas leitura",
-      "label-sync-interval": ""
+      "label-sync-interval": "Intervalo (segundos)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Nenhum resultado corresponde à sua consulta",
@@ -11301,46 +11305,46 @@
       "subtitle-provisioning-feature": "Visualize e gerencie suas conexões de provisionamento"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "A ramificação a ser usada para provisionamento",
+      "branch-label": "Ramificação",
+      "branch-required": "A ramificação é um campo obrigatório",
+      "path-description": "Caminho de subdiretório opcional dentro do repositório",
+      "path-label": "Caminho",
+      "pr-workflow-description": "Permite que os usuários escolham se desejam abrir uma solicitação de extração ao salvar as alterações. Se o repositório não permitir alterações diretas na ramificação principal, ainda pode ser necessário realizar uma solicitação de extração.",
+      "pr-workflow-label": "Ativar a opção de solicitação de extração ao salvar",
+      "token-description": "Token ou senha de acesso ao repositório do Git",
+      "token-label": "Token de acesso",
+      "token-required": "O token do Git é obrigatório",
+      "token-user-description": "O nome de usuário que será usado para acessar o repositório com o token de acesso",
+      "token-user-label": "Nome de usuário",
+      "token-user-required": "O nome de usuário é obrigatório",
+      "url-description": "O URL do repositório do Git",
+      "url-label": "URL do repositório",
+      "url-pattern": "Deve ser um URL válido do repositório do Git",
+      "url-required": "O URL do repositório é obrigatório"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "A ramificação a ser usada para provisionamento",
+      "branch-label": "Ramificação",
+      "branch-required": "A ramificação é um campo obrigatório",
+      "path-description": "Caminho de subdiretório opcional dentro do repositório",
+      "path-label": "Caminho",
+      "pr-workflow-description": "Permite que os usuários escolham se desejam abrir uma solicitação de extração ao salvar as alterações. Se o repositório não permitir alterações diretas na ramificação principal, ainda pode ser necessário realizar uma solicitação de extração.",
+      "pr-workflow-label": "Ativar a opção de solicitação de extração ao salvar",
+      "token-description": "Token de acesso pessoal do GitHub com permissões de repositório",
+      "token-label": "Token de acesso pessoal",
+      "token-required": "O token do GitHub é obrigatório",
+      "url-description": "O URL do repositório do GitHub",
+      "url-label": "URL do repositório",
+      "url-pattern": "Deve ser um URL válido do repositório do GitHub",
+      "url-required": "O URL do repositório é obrigatório"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "A ramificação a ser usada para provisionamento",
+      "branch-label": "Ramificação",
+      "branch-required": "A ramificação é um campo obrigatório",
+      "path-description": "Caminho de subdiretório opcional dentro do repositório",
+      "path-label": "Caminho",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11349,15 +11353,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Permite que os usuários escolham se desejam abrir uma solicitação de mesclagem ao salvar as alterações. Se o repositório não permitir alterações diretas na ramificação principal, ainda pode ser necessário realizar uma solicitação de mesclagem.",
+      "pr-workflow-label": "Ativar a opção de solicitação de mesclagem ao salvar",
+      "token-description": "Token de acesso ao projeto GitLab com permissões de repositório",
+      "token-label": "Token de acesso ao projeto",
+      "token-required": "O token do GitLab é obrigatório",
+      "url-description": "O URL do repositório do GitLab",
+      "url-label": "URL do repositório",
+      "url-pattern": "Deve ser um URL válido do repositório do GitLab",
+      "url-required": "O URL do repositório é obrigatório"
     },
     "history-view": {
       "not-found": "Não encontrado"
@@ -11385,18 +11389,18 @@
       "starting": "Iniciando…",
       "status": {
         "title-error-running-job": "Erro ao executar a tarefa",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Tarefa concluída com sucesso",
+        "title-warning-running-job": "Tarefa concluída com avisos"
       },
       "summary": "Resumo",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Erro ao buscar tarefa ativa"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Caminho do sistema de arquivos local para o repositório",
+      "path-label": "Diretório do repositório",
+      "path-required": "O diretório do repositório é obrigatório"
     },
     "mode-options": {
       "folder": {
@@ -11422,7 +11426,7 @@
     },
     "repository-actions": {
       "settings": "Configurações",
-      "source-code": ""
+      "source-code": "Código fonte"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11488,22 +11492,22 @@
       "title-queued-for-deletion": "Na fila para exclusão"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Escolha um provedor:",
+      "configure-file": "Configurar o provisionamento de arquivos",
+      "configure-with-provider": "Configurar com {{ provider }}",
+      "provider-not-listed": "Se seu provedor não estiver listado:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Conectar aos repositórios do Bitbucket",
+      "github": "GitHub",
+      "github-description": "Conectar aos repositórios do GitHub",
+      "gitlab": "GitLab",
+      "gitlab-description": "Conectar aos repositórios do GitLab",
+      "local": "Local",
+      "local-description": "Configurar o provisionamento de arquivos",
+      "pure-git": "Git puro",
+      "pure-git-description": "Conectar a qualquer repositório do Git"
     },
     "resource-view": {
       "base": "Base",
@@ -11534,11 +11538,11 @@
       "label-current-step": "Etapa atual",
       "label-pending-step": "Etapa pendente"
     },
-    "success-title-default": "",
+    "success-title-default": "Sucesso",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Falha ao iniciar a tarefa",
+      "error-no-repository-name": "Nenhum nome de repositório foi informado",
+      "error-starting-job": "Erro ao iniciar a tarefa"
     },
     "sync-repository": {
       "body-edit-configuration": "Editar a configuração",
@@ -11566,7 +11570,7 @@
       "go-to": "Ir para",
       "make-sure": "Certifique-se de incluir essas permissões"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Aviso",
     "wizard": {
       "alert-point-1": "Os recursos não poderão ser criados, editados ou excluídos durante este processo. Na última etapa, eles desaparecerão.",
       "alert-point-2": "Assim que o provisionamento for concluído, os recursos reaparecerão e serão gerenciados por meio de armazenamento externo.",
@@ -11576,10 +11580,10 @@
       "button-next": "Finalizar",
       "button-start": "Iniciar sincronização",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Isso excluirá a configuração do repositório e você perderá todo o progresso. Tem certeza de que deseja descartar suas alterações?",
+        "confirm": "Sim, descartar",
+        "dismiss": "Continuar trabalhando",
+        "title": "Descartar configuração do repositório?"
       },
       "step-bootstrap": "Escolha o que será sincronizado",
       "step-connect": "Conectar",
@@ -11595,7 +11599,7 @@
     "wizard-content": {
       "button-cancel": "Cancelar",
       "button-cancelling": "Cancelando… ",
-      "button-previous": "",
+      "button-previous": "Voltar",
       "button-submitting": "Enviando…",
       "error-instance-repository-exists": "O repositório de instâncias já existe"
     }
@@ -11996,7 +12000,7 @@
         "recommended": "Recomendado",
         "results": "Resultados"
       },
-      "search": ""
+      "search": "Buscar {{parentTitle}}"
     }
   },
   "search": {
@@ -12077,7 +12081,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Nenhuma conta de serviço encontrada",
     "select-aria-label": "Seletor de conta de serviço",
     "select-placeholder": "Comece a digitar para pesquisar contas de serviço"
   },
@@ -12123,10 +12127,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Adicionar token da conta de serviço",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Você tem certeza de que deseja excluir esta conta de serviço?",
+      "body-disable-service-account": "Você tem certeza de que deseja desativar esta conta de serviço?",
+      "confirmText-delete-service-account": "Excluir conta de serviço",
+      "confirmText-disable-service-account": "Desativar conta de serviço",
       "delete-service-account": "Excluir conta de serviço",
       "disable-service-account": "Desativar conta de serviço",
       "enable-service-account": "Ativar conta de serviço",
@@ -12153,7 +12157,7 @@
       "used-by": "Usado por"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Salvar",
       "edit": "Editar"
     },
     "service-account-role-row": {
@@ -12167,16 +12171,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Adicionar conta de serviço",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Tem certeza de que deseja excluir {{serviceAccountName}}?",
+      "body-disable-service-account": "Tem certeza de que deseja desativar \"{{accountToDisable}}\"?",
+      "confirmText-delete": "Excluir",
+      "confirmText-disable-service-account": "Desativar conta de serviço",
       "placeholder-search-service-account-by-name": "Pesquisar conta de serviço por nome",
       "sub-title": "As contas de serviço e seus tokens podem ser usados para autenticação na API da Grafana. Saiba mais na nossa <2>documentação.</2>",
       "title-delete-service-account": "Excluir conta de serviço",
       "title-disable-service-account": "Desativar conta de serviço",
-      "body-delete_one": "",
-      "body-delete_other": ""
+      "body-delete_one": "Você tem certeza de que deseja excluir {{serviceAccountName}} e os {{count}} tokens que acompanham?",
+      "body-delete_other": "Você tem certeza de que deseja excluir {{serviceAccountName}} e os {{count}} tokens que acompanham?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Este token expirou",
@@ -12190,7 +12194,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Exportar como imagem",
       "export-json-title": "Exportar como JSON",
       "share-externally-title": "Compartilhar externamente",
       "share-internally-title": "Compartilhar internamente",
@@ -12227,17 +12231,17 @@
       "view-button-yaml": "Visualizar YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Ações de exportação de imagem",
+      "cancel-button": "Cancelar",
+      "download-button": "Baixar imagem",
+      "error-title": "Falha ao gerar imagem",
+      "generate-button": "Gerar imagem",
+      "generating": "Gerando imagem…",
+      "info-text": "Salvar este painel de controle como uma imagem",
+      "preview": "Prévia",
+      "preview-aria": "Prévia da imagem gerada",
+      "preview-region": "Prévia da imagem",
+      "title": "Exportar como imagem"
     },
     "library": {
       "info": "Criar painel de biblioteca."
@@ -12247,7 +12251,7 @@
       "info-text": "Crie um link direto para este painel de controle ou painel, personalizado com as opções abaixo.",
       "link-url": "URL do link",
       "render-alert": "Plug-in renderizador de imagem não instalado",
-      "render-instructions": "",
+      "render-instructions": "Para renderizar uma imagem, você precisa instalar o <2>plug-in renderizador de imagens do Grafana</2>. Entre em contato com o administrador do Grafana para instalar o plug-in.",
       "rendered-image": "Link direto de imagem renderizada",
       "save-alert": "O painel de controle não está salvo",
       "save-dashboard": "Para renderizar uma imagem do painel, você deve salvar o painel de controle primeiro.",
@@ -12315,11 +12319,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Salve o painel de controle para ativar a geração de imagens",
+    "download-disabled-help": "Gere uma imagem primeiro para ativar o download",
+    "error-title": "Falha ao gerar imagem",
     "form": {
-      "label": ""
+      "label": "Configurações de imagem do painel"
     },
     "preview": {
       "title": "Visualização do painel"
@@ -12480,112 +12484,112 @@
   },
   "stat": {
     "add-orientation-option": {
-      "description-orientation": "",
-      "name-orientation": "",
+      "description-orientation": "Orientação do layout",
+      "name-orientation": "Orientação",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-vertical": ""
+        "label-auto": "Automático",
+        "label-horizontal": "Horizontal",
+        "label-vertical": "Vertical"
       }
     },
     "add-standard-data-reduce-options": {
-      "category-value-options": "",
-      "description-calculation": "",
-      "description-fields": "",
-      "description-limit": "",
-      "description-show": "",
+      "category-value-options": "Opções de valor",
+      "description-calculation": "Escolha uma função de redução/cálculo",
+      "description-fields": "Selecione os campos que devem ser incluídos no painel",
+      "description-limit": "Número máximo de linhas a serem exibidas",
+      "description-show": "Calcular um único valor por coluna ou série ou mostrar cada linha",
       "fields-options": {
-        "label-all-fields": "",
-        "label-numeric-fields": ""
+        "label-all-fields": "Todos os campos",
+        "label-numeric-fields": "Campos numéricos"
       },
-      "name-calculation": "",
-      "name-fields": "",
-      "name-limit": "",
-      "name-show": "",
+      "name-calculation": "Cálculo",
+      "name-fields": "Campos",
+      "name-limit": "Limite",
+      "name-show": "Exibir",
       "show-options": {
-        "label-all-values": "",
-        "label-calculate": ""
+        "label-all-values": "Todos os valores",
+        "label-calculate": "Calcular"
       }
     },
-    "category-stat-styles": "",
+    "category-stat-styles": "Estilos de estatística",
     "color-mode-options": {
-      "label-background-gradient": "",
-      "label-background-solid": "",
-      "label-none": "",
-      "label-value": ""
+      "label-background-gradient": "Fundo em gradiente",
+      "label-background-solid": "Fundo em uma única cor",
+      "label-none": "Nenhum",
+      "label-value": "Valor"
     },
-    "description-graph-mode": "",
-    "description-text-mode": "",
+    "description-graph-mode": "Modo gráfico/sparkline do painel de estatísticas",
+    "description-text-mode": "Controlar se o nome e o valor são exibidos ou apenas o nome",
     "graph-mode": {
       "options": {
-        "label-area": "",
-        "label-none": ""
+        "label-area": "Área",
+        "label-none": "Nenhum"
       }
     },
     "name-color-modcolor-mode-options": {
-      "label": ""
+      "label": "Modo de cor"
     },
-    "name-graph-mode": "",
-    "name-show-percent-change": "",
-    "name-text-alignment": "",
-    "name-text-mode": "",
-    "name-wide-layout": "",
-    "percent-change-color-mode": "",
+    "name-graph-mode": "Modo de gráfico",
+    "name-show-percent-change": "Exibir alteração de percentual",
+    "name-text-alignment": "Alinhamento do texto",
+    "name-text-mode": "Modo de texto",
+    "name-wide-layout": "Layout amplo",
+    "percent-change-color-mode": "Modo de cor com alteração de percentual",
     "percent-change-color-mode-options": {
-      "label-inverted": "",
-      "label-same-as-value": "",
-      "label-standard": ""
+      "label-inverted": "Invertido",
+      "label-same-as-value": "Com o mesmo valor",
+      "label-standard": "Padrão"
     },
     "text-alignment-options": {
-      "label-auto": "",
-      "label-center": ""
+      "label-auto": "Automático",
+      "label-center": "Centro"
     },
     "text-mode-options": {
-      "label-auto": "",
-      "label-name": "",
-      "label-none": "",
-      "label-value": "",
-      "label-value-and-name": ""
+      "label-auto": "Automático",
+      "label-name": "Nome",
+      "label-none": "Nenhum",
+      "label-value": "Valor",
+      "label-value-and-name": "Valor e nome"
     },
     "wide-layout-options": {
-      "label-off": "",
-      "label-on": ""
+      "label-off": "Desativado",
+      "label-on": "Ativado"
     }
   },
   "state-timeline": {
     "align-values-options": {
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-center": "Centro",
+      "label-left": "Esquerda",
+      "label-right": "Direita"
     },
-    "category-state-timeline": "",
-    "name-align-values": "",
-    "name-connect-null-values": "",
-    "name-disconnect-values": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-merge-equal-consecutive-values": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-state-timeline": "Linha do tempo do estado",
+    "name-align-values": "Alinhar valores",
+    "name-connect-null-values": "Conectar valores nulos",
+    "name-disconnect-values": "Desconectar valores",
+    "name-fill-opacity": "Opacidade do preenchimento",
+    "name-line-width": "Largura da linha",
+    "name-merge-equal-consecutive-values": "Mesclar valores consecutivos iguais",
+    "name-page-size": "Tamanho da página (ativar paginação)",
+    "name-row-height": "Altura da linha",
+    "name-show-values": "Mostrar valores",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Sempre",
+      "label-auto": "Automático",
+      "label-never": "Nunca"
     }
   },
   "status-history": {
-    "category-status-history": "",
-    "name-column-width": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-status-history": "Histórico do status",
+    "name-column-width": "Largura da coluna",
+    "name-fill-opacity": "Opacidade do preenchimento",
+    "name-line-width": "Largura da linha",
+    "name-page-size": "Tamanho da página (ativar paginação)",
+    "name-row-height": "Altura da linha",
+    "name-show-values": "Mostrar valores",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Sempre",
+      "label-auto": "Automático",
+      "label-never": "Nunca"
     },
     "status-history-panel": {
       "too-many-points_one": "Há um número excessivo de pontos para que haja uma visualização adequada. <1></1>Atualize a consulta para retornar menos pontos. <3></3>({{count}} pontos recebidos)",
@@ -12625,26 +12629,26 @@
       "label-gauge-display-mode": "Modo de exibição do medidor",
       "label-value-display": "Exibição de valor"
     },
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Opções de célula",
+    "category-table": "Tabela",
+    "category-table-footer": "Rodapé da tabela",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Grande",
+      "label-medium": "Média",
+      "label-small": "Pequeno"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Ações",
+      "auto": "Automático",
+      "color-background": "Fundo colorido",
+      "color-text": "Texto colorido",
+      "data-links": "Links de dados",
+      "gauge": "Medidor",
+      "image": "Imagem",
+      "json": "Visualização JSON",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Pílula",
+      "sparkline": "Sparkline"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "Se selecionada, toda a linha será colorida como esta célula.",
@@ -12657,23 +12661,23 @@
       "wrap-text": "Quebrar texto"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Automático",
+      "label-center": "Centro",
+      "label-left": "Esquerda",
+      "label-right": "Direita"
     },
     "container": {
       "content": "Mostrar muitas colunas em uma única tabela pode afetar o desempenho e dificultar a leitura dos dados. Considere refinar suas consultas.",
       "show-all-series": "Mostrar todas as colunas",
       "show-only-series": "Mostrando apenas {{MAX_NUMBER_OF_COLUMNS}} colunas"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
-    "description-min-column-width": "",
-    "description-wrap-header-text": "",
+    "description-calculation": "Escolha uma função de redução/cálculo",
+    "description-cell-value-inspect": "Ativar inspeção de valor de célula em uma janela modal",
+    "description-column-filter": "Ativa/desativa filtros de campo na tabela",
+    "description-count-rows": "Exibir uma única contagem para todas as linhas de dados",
+    "description-fields": "Selecione os campos que devem ser calculados",
+    "description-min-column-width": "A largura mínima para o redimensionamento automático da coluna",
+    "description-wrap-header-text": "Ativa a quebra de texto para cabeçalhos de coluna",
     "image-cell-options-editor": {
       "description-alt-text": "Texto alternativo que será exibido se uma imagem não puder ser exibida ou para usuários que usam leitor de tela",
       "description-title-text": "Texto que será exibido ao passar o cursor sobre a imagem",
@@ -12687,66 +12691,66 @@
       },
       "label-dynamic-height": ""
     },
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-paginations": "",
-    "name-fields": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "name-wrap-header-text": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": "",
+    "name-calculation": "Cálculo",
+    "name-cell-height": "Altura da célula",
+    "name-cell-type": "Tipo de célula",
+    "name-cell-value-inspect": "Inspeção do valor da célula",
+    "name-column-alignment": "Alinhamento da coluna",
+    "name-column-filter": "Filtro de coluna",
+    "name-column-width": "Largura da coluna",
+    "name-count-rows": "Contar linhas",
+    "name-enable-paginations": "Ativar paginação",
+    "name-fields": "Campos",
+    "name-hide-in-table": "Ocultar na tabela",
+    "name-min-column-width": "Largura mínima da coluna",
+    "name-show-table-footer": "Mostrar rodapé da tabela",
+    "name-show-table-header": "Mostrar cabeçalho da tabela",
+    "name-wrap-header-text": "Ajustar texto do cabeçalho",
+    "placeholder-column-width": "automático",
+    "placeholder-fields": "Todos os campos numéricos",
     "text-wrap-options": {
       "label-wrap-text": ""
     }
   },
   "table-new": {
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Opções de célula",
+    "category-table": "Tabela",
+    "category-table-footer": "Rodapé da tabela",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Grande",
+      "label-medium": "Média",
+      "label-small": "Pequeno"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Automático",
+      "label-center": "Centro",
+      "label-left": "Esquerda",
+      "label-right": "Direita"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
+    "description-calculation": "Escolha uma função de redução/cálculo",
+    "description-cell-value-inspect": "Ativar inspeção de valor de célula em uma janela modal",
+    "description-column-filter": "Ativa/desativa filtros de campo na tabela",
+    "description-count-rows": "Exibir uma única contagem para todas as linhas de dados",
+    "description-fields": "Selecione os campos que devem ser calculados",
     "description-frozen-columns": "",
-    "description-min-column-width": "",
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-pagination": "",
-    "name-fields": "",
+    "description-min-column-width": "A largura mínima para o redimensionamento automático da coluna",
+    "name-calculation": "Cálculo",
+    "name-cell-height": "Altura da célula",
+    "name-cell-type": "Tipo de célula",
+    "name-cell-value-inspect": "Inspeção do valor da célula",
+    "name-column-alignment": "Alinhamento da coluna",
+    "name-column-filter": "Filtro de coluna",
+    "name-column-width": "Largura da coluna",
+    "name-count-rows": "Contar linhas",
+    "name-enable-pagination": "Ativar paginação",
+    "name-fields": "Campos",
     "name-frozen-columns": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": ""
+    "name-hide-in-table": "Ocultar na tabela",
+    "name-min-column-width": "Largura mínima da coluna",
+    "name-show-table-footer": "Mostrar rodapé da tabela",
+    "name-show-table-header": "Mostrar cabeçalho da tabela",
+    "placeholder-column-width": "automático",
+    "placeholder-fields": "Todos os campos numéricos"
   },
   "tag-filter": {
     "clear-button": "Limpar etiquetas",
@@ -12757,7 +12761,7 @@
     "tag-option-label": "Opção de tag"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Nenhuma equipe encontrada",
     "select-aria-label": "Seletor de equipe",
     "select-placeholder": "Selecione uma equipe"
   },
@@ -12831,17 +12835,17 @@
     }
   },
   "text": {
-    "category-text": "",
+    "category-text": "Texto",
     "mode-options": {
-      "label-code": "",
-      "label-html": "",
-      "label-markdown": ""
+      "label-code": "Código",
+      "label-html": "HTML",
+      "label-markdown": "Remarcação"
     },
-    "name-content": "",
-    "name-language": "",
-    "name-mode": "",
-    "name-show-line-numbers": "",
-    "name-show-mini-map": ""
+    "name-content": "Conteúdo",
+    "name-language": "Idioma",
+    "name-mode": "Modo",
+    "name-show-line-numbers": "Exibir números das linhas",
+    "name-show-mini-map": "Mostrar minimapa"
   },
   "theme-preview": {
     "breadcrumbs": {
@@ -12889,7 +12893,7 @@
       "apply-button": "Aplicar intervalo de tempo",
       "default-error": "Insira uma data que já passou ou \"{{now}}\"",
       "fiscal-year": "Exercício fiscal: de {{from}} a {{to}}",
-      "from-input": "",
+      "from-input": "De",
       "open-input-calendar": "Abrir calendário",
       "range-error": "\"De\" não pode ser após \"Para\"",
       "to-input": "Para"
@@ -12920,8 +12924,8 @@
   },
   "timeline": {
     "missing-field": {
-      "all": "",
-      "time": ""
+      "all": "Sem campos gráficos",
+      "time": "Os dados não têm um campo de tempo"
     }
   },
   "timeseries": {
@@ -12939,54 +12943,54 @@
       "tooltip-delete": "Excluir",
       "tooltip-edit": "Editar"
     },
-    "category-axis": "",
+    "category-axis": "Eixo",
     "config": {
       "get-graph-field-config": {
-        "aria-label-bar-width-factor": "",
-        "aria-label-fill-opacity": "",
-        "aria-label-line-width": "",
-        "aria-label-point-size": "",
-        "category-graph-styles": "",
-        "category-thresholds": "",
-        "name-bar-alignment": "",
-        "name-bar-width-factor": "",
-        "name-connect-nulls": "",
-        "name-disconnect-values": "",
-        "name-fill-below-to": "",
-        "name-fill-opacity": "",
-        "name-gradient-mode": "",
-        "name-line-interpolation": "",
-        "name-line-style": "",
-        "name-line-width": "",
-        "name-point-size": "",
-        "name-show-points": "",
-        "name-show-thresholds": "",
-        "name-style": "",
-        "name-transform": "",
+        "aria-label-bar-width-factor": "Fator de largura da barra",
+        "aria-label-fill-opacity": "Opacidade do preenchimento",
+        "aria-label-line-width": "Largura da linha",
+        "aria-label-point-size": "Tamanho do ponto",
+        "category-graph-styles": "Estilos de gráficos",
+        "category-thresholds": "Limites",
+        "name-bar-alignment": "Alinhamento da barra",
+        "name-bar-width-factor": "Fator de largura da barra",
+        "name-connect-nulls": "Conectar valores nulos",
+        "name-disconnect-values": "Desconectar valores",
+        "name-fill-below-to": "Preencher abaixo para",
+        "name-fill-opacity": "Opacidade do preenchimento",
+        "name-gradient-mode": "Modo de gradiente",
+        "name-line-interpolation": "Interpolação de linha",
+        "name-line-style": "Estilo de linha",
+        "name-line-width": "Largura da linha",
+        "name-point-size": "Tamanho do ponto",
+        "name-show-points": "Exibir pontos",
+        "name-show-thresholds": "Mostrar limites",
+        "name-style": "Estilo",
+        "name-transform": "Transformar",
         "transform-options": {
-          "description-constant": "",
-          "description-style": "",
-          "label-constant": "",
-          "label-style": ""
+          "description-constant": "O primeiro valor será exibido como uma linha constante",
+          "description-style": "Inverter os resultados para valores negativos no eixo y",
+          "label-constant": "Constante",
+          "label-style": "Y negativo"
         }
       }
     },
     "insert-nulls-editor": {
       "disconnect-options": {
-        "label-never": "",
-        "label-threshold": ""
+        "label-never": "Nunca",
+        "label-threshold": "Limite"
       }
     },
     "line-style-editor": {
       "line-fill-options": {
-        "label-dash": "",
-        "label-dots": "",
-        "label-solid": ""
+        "label-dash": "Tracejado",
+        "label-dots": "Pontilhado",
+        "label-solid": "Sólido"
       },
       "title-the-input-expects-a-segment-list": "É necessário inserir uma lista de segmentos",
       "tooltip-help": "Ajuda"
     },
-    "name-time-zone": "",
+    "name-time-zone": "Fuso horário",
     "nulls-threshold-input": {
       "placeholder-never": "Nunca"
     },
@@ -12996,9 +13000,9 @@
     },
     "span-nulls-editor": {
       "gaps-options": {
-        "label-always": "",
-        "label-never": "",
-        "label-threshold": ""
+        "label-always": "Sempre",
+        "label-never": "Nunca",
+        "label-threshold": "Limite"
       }
     },
     "timezones-editor": {
@@ -13007,17 +13011,17 @@
     }
   },
   "traces": {
-    "category-span-filters": "",
-    "name-critical-path-only": "",
-    "name-find-in-trace": "",
-    "name-max-duration": "",
-    "name-min-duration": "",
-    "name-service-name": "",
-    "name-service-name-operator": "",
-    "name-show-matches-only": "",
-    "name-span-name": "",
-    "name-span-name-operator": "",
-    "name-tags": "",
+    "category-span-filters": "Filtros de intervalo",
+    "name-critical-path-only": "Exibir apenas o caminho crítico",
+    "name-find-in-trace": "Localizar no traço",
+    "name-max-duration": "Duração máxima",
+    "name-min-duration": "Duração mínima",
+    "name-service-name": "Nome do serviço",
+    "name-service-name-operator": "Operador do nome do serviço",
+    "name-show-matches-only": "Exibir apenas correspondências",
+    "name-span-name": "Nome do intervalo",
+    "name-span-name-operator": "Operador de nome de intervalo",
+    "name-tags": "Tags",
     "traces-panel": {
       "no-data-found-in-response": "Nenhum dado encontrado na resposta"
     }
@@ -13032,20 +13036,20 @@
     "axis-editor": {
       "log-mode-options": {
         "description": {
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-size": "Dividir os buckets com base no tamanho"
         },
         "label": {
-          "split": ""
+          "split": "Dividir"
         }
       },
       "mode-options": {
         "description": {
-          "split-the-buckets-based-on-count": "",
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-count": "Dividir os buckets com base na contagem",
+          "split-the-buckets-based-on-size": "Dividir os buckets com base no tamanho"
         },
         "label": {
-          "count": "",
-          "size": ""
+          "count": "Contagem",
+          "size": "Tamanho"
         }
       },
       "placeholder-auto": "Automático"
@@ -13061,15 +13065,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Operação binária",
+          "reduce-row": "Reduzir fileira",
+          "row-index": "Índice de fileira",
+          "unary-operation": "Operação unária"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Funções cumulativas",
+        "window-functions": "Funções de janela"
       },
       "label-alias": "Apelido",
       "label-mode": "Modo",
@@ -13077,9 +13081,9 @@
     },
     "calculate-heatmap": {
       "add-heatmap-calculation-options": {
-        "name-x-bucket": "",
-        "name-y-bucket": "",
-        "name-y-bucket-scale": ""
+        "name-x-bucket": "Bucket X",
+        "name-y-bucket": "Bucket Y",
+        "name-y-bucket-scale": "Escala do bucket Y"
       }
     },
     "concatenate-transformer-editor": {
@@ -13087,9 +13091,9 @@
       "label-name": "Nome",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Copiar o nome do quadro para o nome do campo",
+          "ignore-the-frame-name": "Ignorar o nome do quadro",
+          "label-frame": "Adicionar um rótulo com o nome do quadro"
         }
       },
       "placeholder-frame": "Quadro"
@@ -13102,9 +13106,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Adicionar um transformador de tipo de campo de conversor",
       "aria-label-remove-convert-field-type-transformer": "Remover transformador de tipo de campo de conversor",
-      "convert-field-type": "",
+      "convert-field-type": "Converter tipo de campo",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Converter um campo em um tipo de campo especificado."
       },
       "label": {
         "browser": "Navegador",
@@ -13117,11 +13121,11 @@
       "label-join-with": "Unir com",
       "label-set-timezone": "Definir fuso horário",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Converter tipo de campo"
       },
       "placeholder-type": "Tipo",
       "tags": {
-        "format-field": ""
+        "format-field": "Formatar campo"
       },
       "tooltip-explicit-separator-joining-array-values": "Use um separador explícito ao unir valores de matriz",
       "tooltip-input-format": "Especifique o formato do campo de entrada para que a Grafana possa analisar a string de data corretamente.",
@@ -13140,20 +13144,20 @@
       "tooltip-enable": "Ativar"
     },
     "draggable-sort-order": {
-      "asc": "",
-      "desc": "",
+      "asc": "ASC",
+      "desc": "DESC",
       "off": "Desativar"
     },
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Combinar todos os campos em um único quadro."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Concatenar campos"
         },
         "tags": {
-          "combine": ""
+          "combine": "Combinar"
         }
       }
     },
@@ -13168,11 +13172,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Analisar campos do conteúdo (JSON, rótulos etc.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Selecionar campo"
         }
       },
       "label-delimiter": "Delimitador",
@@ -13181,7 +13185,7 @@
       "label-replace-all-fields": "Substituir todos os campos",
       "label-source": "Fonte",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Extrair campos"
       },
       "placeholder-auto": "Automático",
       "placeholder-select-delimiter": "Selecione o delimitador…",
@@ -13192,20 +13196,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Usar um valor de campo para consultar países, estados ou aeroportos."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nenhum campo de texto encontrado"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Selecionar campo de texto"
         }
       },
       "label-field": "Campo",
       "label-lookup": "Consulta",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Campos de consulta do recurso"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13216,23 +13220,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Remover partes dos resultados da consulta usando um padrão regex."
       },
       "label-from-variable": "Da variável",
       "label-identifier": "Identificador",
       "label-use-variable": "Usar variável",
       "label-variable": "Variável",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Filtrar campos por nome"
       },
       "placeholder-regular-expression-pattern": "Padrão de expressão regular"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Remover fileiras dos dados com base na consulta de origem"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Filtrar dados por consulta"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13246,33 +13250,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Adicionar condição",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Remover fileiras dos resultados da consulta usando filtros definidos pelo usuário."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Corresponder tudo",
+          "match-any": "Corresponder qualquer um"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Excluir",
+          "include": "Incluir"
         }
       },
       "label-conditions": "Condições",
       "label-filter-type": "Tipo de filtro",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Filtrar dados por valores"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nenhum campo de texto encontrado"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Selecionar campo de texto"
         }
       },
       "label-field": "Campo",
@@ -13281,10 +13285,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Manipular a formatação de campos de string."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Formatar string"
       }
     },
     "format-time-transfomer-editor": {
@@ -13296,66 +13300,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Definir o formato de saída de um campo de tempo"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Formato de hora"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Usar os valores da fileira para calcular um novo campo."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Adicionar campo do cálculo"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Definir a unidade, mín., máx. e muito mais."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Configuração a partir dos resultados da consulta"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Gerar dados de mapa de calor a partir de dados de origem."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Criar mapa de calor"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Achatar os resultados rotulados em uma tabela unida por rótulos."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Unir por rótulos"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Dividir um conjunto de dados de um quadro em várias séries."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Partição por valores"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Converter cada fileira em um campo com configuração dinâmica."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Fileiras para campos"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Aplicar operações espaciais aos resultados da consulta."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Operações espaciais"
       }
     },
     "get-timezone-options": {
@@ -13387,8 +13391,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Calcular",
+          "group-by": "Agrupar por"
         }
       },
       "placeholder-ignored": "Ignorado",
@@ -13396,42 +13400,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Agrupar dados por um valor de campo e criar dados agregados."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Agrupar por"
       },
       "title-calc-alert": "Os cálculos não terão efeito se nenhum campo estiver sendo agrupado em"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Agrupar dados por um valor de campo e criar tabelas aninhadas com os dados agrupados."
       },
       "description-show-field-names": "Se ativadas, as tabelas aninhadas exibirão os nomes dos campos como um cabeçalho da tabela",
       "label-show-field-names-in-nested-tables": "Exibir nomes de campos em tabelas aninhadas",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Agrupar em tabelas aninhadas"
       },
       "title-calc-alert": "Os cálculos não terão efeito se nenhum campo estiver sendo agrupado."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Resumir e reorganizar os dados com base em três campos."
       },
       "label-cell-value": "Valor da célula",
       "label-column": "Coluna",
       "label-empty-value": "Campo vazio",
       "label-row": "Linha",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Agrupamento em matriz"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Calcular um histograma a partir de dados de entrada."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Histograma"
       },
       "placeholder-auto": "Automático",
       "placeholder-default": "Padrão: 30",
@@ -13443,14 +13447,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Combina fileiras de mais de 2 tabelas, com base em um campo relacionado."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Unir por campo"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Obrigatório",
       "info": {
         "input-contain-labels": "Os dados de entrada não contêm nenhum rótulo",
         "no-input-or-labels-found": "Nenhum dado de entrada (ou rótulo) foi encontrado",
@@ -13474,8 +13478,8 @@
       "label-value-field-name": "Nome do campo de valor",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Colunas",
+          "rows": "Fileiras"
         }
       },
       "placeholder-optional-select-label": "(Opcional) Selecionar rótulo",
@@ -13483,18 +13487,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Agrupar séries por tempo e retornar rótulos ou tags como campos."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Rótulos para campos"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Limitar o número de itens exibidos."
       },
       "name": {
-        "limit": ""
+        "limit": "Limite"
       },
       "placeholder-value-or-variable": "Valor ou variável"
     },
@@ -13507,11 +13511,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Mesclar várias séries. Os valores serão combinados em uma fileira."
       },
       "merge-effect-applied-single-frame": "A mesclagem não tem efeito quando aplicada em um único quadro.",
       "name": {
-        "merge": ""
+        "merge": "Mesclar séries/tabelas"
       }
     },
     "multi-info": {
@@ -13523,14 +13527,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Reordenar, ocultar ou renomear campos."
       },
-      "field-order": "",
+      "field-order": "Ordem de campo",
       "field-order-auto": "Automático",
-      "field-order-manual": "",
+      "field-order-manual": "Manual",
       "first-frame-warning": "A organização de campos só funciona com um quadro único. Considere aplicar uma transformação de junção ou filtrar a entrada primeiro.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Organizar campos por nome"
       }
     },
     "partion-by-values-editor": {
@@ -13558,10 +13562,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Esticar os quadros de dados do formato largo para o formato longo."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Preparar séries temporais"
       }
     },
     "prepare-time-series-editor": {
@@ -13569,26 +13573,26 @@
       "label-info": "Informações",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Converter cada quadro para o formato longo"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Séries temporais longas"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Cria um novo quadro para cada par de tempo/número"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Séries temporais de múltiplos quadros"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Criar um quadro único unido pelo tempo"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Séries temporais amplas"
         }
       }
     },
@@ -13603,7 +13607,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Reduzir todas as fileiras ou pontos de dados a um único valor (por exemplo, máximo, média)."
       },
       "label-calculations": "Cálculos",
       "label-include-time": "Incluir horário",
@@ -13620,7 +13624,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Reduzir"
       },
       "placeholder-choose-stat": "Escolha a estatística"
     },
@@ -13630,18 +13634,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Criar um novo quadro de dados contendo valores previstos por um modelo estatístico."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Linha de tendência"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Cúbico",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Quadrático",
         "quartic": "Quártico",
-        "quintic": "Quíntico"
+        "quintic": "Quíntico",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Grau",
       "label-model-type": "Tipo de modelo",
@@ -13654,18 +13663,19 @@
           "polynomial": "Polinomial"
         }
       },
-      "regression": "",
+      "regression": "regressão",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Análise de regressão"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Número de pontos X,Y a serem previstos"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Renomear partes dos resultados da consulta usando uma expressão regular e um padrão de substituição."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Renomear campos por regex"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13679,33 +13689,33 @@
       "label-mode": "Modo",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Combina os dados de duas tabelas sempre que houver valores correspondentes em campos comuns a ambas as tabelas.",
+          "join-on-a-field": "Une um valor de campo com valores duplicados. A união externa não executável é melhor para dados tabulares (como SQL).",
+          "keep-all-rows": "Mantém todas as fileiras de qualquer tabela com um valor. Une valores de campo distintos. Eficaz e ideal para séries temporais."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Interno",
+          "outer-tabular": "Externo (tabular)",
+          "outer-time-series": "Externo (série temporal)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Mesclar várias séries. Tempo de retorno, métrica e valores como uma fileira."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Série para fileiras"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Classificar os campos em um quadro."
       },
       "label-field": "Campo",
       "label-reverse": "Reverso",
       "name": {
-        "sort-by": ""
+        "sort-by": "Ordenar por"
       },
       "placeholder-select-field": "Selecionar campo"
     },
@@ -13728,13 +13738,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Converta dados de séries temporais em fileiras de tabela para que possam ser visualizados em formato tabular ou sparkline."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "A transformação de série temporal em tabela requer pelo menos um quadro de série temporal para funcionar. Você não tem nenhum no momento."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Série temporal para tabela"
       }
     },
     "time-series-table-transform-editor": {
@@ -13752,15 +13762,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Transpor o quadro de dados."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Transpor"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Girar",
+        "transform": "Transformar",
+        "translate": "Traduzir"
       }
     },
     "unary-operation-editor": {
@@ -13769,13 +13779,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Calcular novos campos",
+        "combine": "Combinar",
+        "create-new-visualization": "Criar nova visualização",
+        "filter": "Filtro",
+        "perform-spatial-operations": "Realizar operações espaciais",
+        "reformat": "Reformulação",
+        "reorder-and-rename": "Reordenar e renomear"
       },
       "special-value-options": {
         "description": {
@@ -13826,10 +13836,10 @@
     }
   },
   "trend": {
-    "category-x-axis": "",
-    "description-x-field": "",
-    "name-x-field": "",
-    "placeholder-x-field": ""
+    "category-x-axis": "Eixo X",
+    "description-x-field": "Um valor numérico crescente",
+    "name-x-field": "Campo X",
+    "placeholder-x-field": "Primeiro valor numérico"
   },
   "upgrade-box": {
     "discovery-text": "Você descobriu um recurso Pro!",
@@ -13846,7 +13856,7 @@
     "title": "Organizações"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Nenhum usuário encontrado",
     "select-aria-label": "Seletor de usuário",
     "select-placeholder": "Comece a digitar para pesquisar um usuário"
   },
@@ -13932,8 +13942,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Tem certeza de que deseja excluir a variável \"{{variableToDelete}}\"?",
+      "confirmText-delete": "Excluir",
       "title-delete-variable": "Excluir variável"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13983,33 +13993,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Como classificar os valores desta variável",
-      "name-sort": "",
+      "name-sort": "Ordenar",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Ordem alfabética (asc.)",
+          "alphabetical-caseinsensitive-asc": "Ordem alfabética (não diferencia maiúsculas de minúsculas, asc.)",
+          "alphabetical-caseinsensitive-desc": "Ordem alfabética (não diferencia maiúsculas de minúsculas, desc.)",
+          "alphabetical-desc": "Ordem alfabética (desc.)",
+          "disabled": "Desativado",
+          "natural-asc": "Ordem natural (asc.)",
+          "natural-desc": "Ordem natural (desc.)",
+          "numerical-asc": "Ordem numérica (asc.)",
+          "numerical-desc": "Ordem numérica (desc.)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Adicionar opção",
+      "description": "Adicionar opções personalizadas além dos resultados da consulta",
+      "label-placeholder": "exibir rótulo",
+      "remove-option-button-label": "Remover opção",
+      "value-placeholder": "valor, string vazia padrão"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Como classificar opções estáticas com resultados de consulta"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Valor padrão",
       "placeholder-default-value-if-any": "valor padrão, se houver",
       "text-options": "Opções de texto"
     },
@@ -14038,8 +14048,8 @@
       "description-optional-display-name": "Nome de exibição opcional",
       "description-template-variable-characters": "O nome da variável do modelo. (Até 50 caracteres)",
       "general": "Geral",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Rótulo",
+      "name-name": "Nome",
       "placeholder-descriptive-text": "Texto descritivo",
       "placeholder-label-name": "Nome do rótulo",
       "placeholder-variable-name": "Nome da variável",
@@ -14055,13 +14065,13 @@
       "tooltip-remove-variable": "Remover variável"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Descrição"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Alternar todos os valores"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Selecionar tipo de variável"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Exibir usos"
@@ -14092,20 +14102,20 @@
     }
   },
   "xychart": {
-    "category-xychart": "",
-    "name-fill-opacity": "",
-    "name-line-style": "",
-    "name-line-width": "",
-    "name-max-point-size": "",
-    "name-min-point-size": "",
-    "name-point-shape": "",
-    "name-point-size": "",
-    "name-point-stroke-width": "",
-    "name-series-mapping": "",
-    "name-show": "",
+    "category-xychart": "Gráfico XY",
+    "name-fill-opacity": "Opacidade do preenchimento",
+    "name-line-style": "Estilo de linha",
+    "name-line-width": "Largura da linha",
+    "name-max-point-size": "Tamanho máximo do ponto",
+    "name-min-point-size": "Tamanho mínimo do ponto",
+    "name-point-shape": "Forma do ponto",
+    "name-point-size": "Tamanho do ponto",
+    "name-point-stroke-width": "Largura do traço do ponto",
+    "name-series-mapping": "Mapeamento de séries",
+    "name-show": "Exibir",
     "point-shape-options": {
-      "label-circle": "",
-      "label-square": ""
+      "label-circle": "Círculo",
+      "label-square": "Quadrado"
     },
     "series-editor": {
       "add-series": "Adicionar série",
@@ -14117,18 +14127,18 @@
       "label-y-field": "Campo Y",
       "placeholder-all-frames": "Todos os quadros",
       "placeholder-select-frame": "Selecionar um quadro",
-      "placeholder-x-field": "",
-      "placeholder-y-field": "",
+      "placeholder-x-field": "Primeiro campo de número ou de tempo em cada quadro",
+      "placeholder-y-field": "Campos de número restantes em cada quadro",
       "tooltip-delete-series": "Excluir série"
     },
     "series-mapping-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automático",
+      "label-manual": "Manual"
     },
     "show-options": {
-      "label-both": "",
-      "label-lines": "",
-      "label-points": ""
+      "label-both": "Ambos",
+      "label-lines": "Linhas",
+      "label-points": "Pontos"
     }
   }
 }
\ No newline at end of file
diff --git a/public/locales/pt-PT/grafana.json b/public/locales/pt-PT/grafana.json
index 93d62ffb1f1..68e97326cdc 100644
--- a/public/locales/pt-PT/grafana.json
+++ b/public/locales/pt-PT/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Algumas funcionalidades são estáveis (GA) e ativadas por predefinição, enquanto outras estão atualmente na sua fase Beta preliminar, disponíveis para utilizar antecipadamente.",
       "confirm-modal-body-2": "Aconselhamos a compreensão das implicações de cada alteração de funcionalidade antes de efetuar modificações.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Guardar alterações",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Disponibilidade geral",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Eliminar organização",
-      "confirmText-delete": "",
+      "confirmText-delete": "Eliminar",
       "title-delete": "Eliminar"
     },
     "anon-users": {
       "not-found": "Nenhum utilizador anónimo encontrado."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Tem a certeza de que pretende forçar o encerramento de sessão em todos os dispositivos?",
+      "confirmText-confirm-logout": "Confirmar o encerramento de sessão",
+      "confirmText-force-logout": "Forçar o encerramento de sessão",
       "title-force-logout-from-all-devices": "Forçar o encerramento de sessão em todos os dispositivos"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Guardar"
     },
     "edit-org": {
       "access-denied": "Não tem permissão para ver utilizadores desta organização. Para atualizar esta organização, contacte o administrador do servidor.",
@@ -119,10 +119,10 @@
       "users-heading": "Utilizadores da organização"
     },
     "enterprise-auth-features-card": {
-      "dismiss": "",
-      "heading": "",
-      "learn-more-link": "",
-      "text": ""
+      "dismiss": "Ignorar",
+      "heading": "Autenticação empresarial",
+      "learn-more-link": "Saiba mais",
+      "text": "Faça a gestão dos utilizadores, das equipas e das permissões automaticamente com <1>SAML</1>, <3>SCIM</3>, <6>LDAP</6> e <8>RBAC</8> — disponível no Grafana Cloud e Enterprise."
     },
     "feature-listing": {
       "title-auditing": "Auditoria",
@@ -216,11 +216,11 @@
       "not-editable": "A função deste utilizador não é editável porque é sincronizada a partir do seu fornecedor de autenticação. Consulte os <1>documentos de autenticação da Grafana</1> para obter detalhes."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Tem a certeza de que pretende eliminar o utilizador {{user}}?",
       "columns": {
         "aria-label-role": "Função"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Eliminar",
       "delete-aria-label": "Eliminar utilizador: {{name}}",
       "title-delete": "Eliminar"
     },
@@ -252,7 +252,7 @@
       "info-description": "Estas definições de sistema são definidas em grafana.ini ou custom.ini (ou substituídas em variáveis ENV). Para alterar estas definições, tem de reiniciar a Grafana."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Confirmar remoção"
     },
     "upgrade-info": {
       "title": "Licença Enterprise"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Alterar",
-      "confirmText-change": "",
+      "confirmText-change": "Alterar",
       "grafana-admin-key": "Administrador da Grafana",
       "grafana-admin-no": "Não",
       "grafana-admin-yes": "Sim",
       "title": "Permissões"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Tem a certeza de que pretende eliminar este utilizador?",
+      "body-disable": "Tem a certeza de que pretende desativar este utilizador?",
+      "confirmText-delete-user": "Eliminar utilizador",
+      "confirmText-disable-user": "Desativar utilizador",
       "delete-button": "Eliminar utilizador",
       "disable-button": "Inativar utilizador",
       "edit-button": "Editar",
@@ -331,7 +331,7 @@
       "title-disable-user": "Inativar utilizador"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Guardar"
     },
     "user-sessions": {
       "browser-column": "Navegador e SO",
@@ -374,20 +374,20 @@
       "am-active-timing-select-label-active-timings": "Tempos ativos"
     },
     "ad": {
-      "close": "",
-      "learn-more": ""
+      "close": "Fechar",
+      "learn-more": "Saiba mais"
     },
     "add-button": {
       "add-more": "Adicionar mais"
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Não foi possível carregar o botão de regra de alerta de IA",
+        "feedback-button": "Falha ao carregar o botão de feedback de IA",
+        "improve-annotations-button": "Falha ao carregar o botão de melhoria de anotações de IA",
+        "improve-labels-button": "Falha ao carregar o botão Melhorar etiquetas de IA",
+        "template-button": "Não foi possível carregar o botão de modelo de IA",
+        "triage-button": "Falha ao carregar o botão de triagem de IA"
       }
     },
     "alert": {
@@ -405,12 +405,12 @@
       "missing-series-resolve": "Avaliações de séries em falta para resolver",
       "no-annotations": "Sem anotações",
       "notification-configuration": {
-        "active-timings": "",
+        "active-timings": "Intervalos de tempo ativos",
         "contact-point": "Ponto de contacto",
         "group-by": "Agrupado por",
-        "group-title": "",
+        "group-title": "Configuração de notificações",
         "mute-timings": "Tempos de silêncio",
-        "timing-options": ""
+        "timing-options": "Tempos"
       },
       "pending-period": "Período pendente",
       "rule": "Regra",
@@ -493,7 +493,7 @@
       "title-muting-grouping-and-timings": "Silêncio, agrupamento e tempos"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nenhuma fonte de dados encontrada"
     },
     "alert-menu": {
       "copy-link": "Copiar link",
@@ -519,7 +519,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Regra de alerta"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -587,7 +587,7 @@
       "view-configuration": "Ver configuração"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Sim, redefinir configuração",
       "gma-manual-configuration-description": "A configuração interna do Grafana Alertmanager não pode ser alterada manualmente. Para alterar esta configuração, edite os recursos individuais através da interface do utilizador.",
       "gma-manual-configuration-is-not-supported": "Alterações da configuração manual não suportadas",
       "message": {
@@ -602,13 +602,13 @@
       "title-resetting-alertmanager-configuration": "A redefinir a configuração do Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Tem a certeza de que pretende restaurar a configuração para esta versão? Todas as alterações não guardadas serão perdidas.",
       "columns": {
         "compare": "Comparar",
         "restore": "Restaurar",
         "text-latest": "Mais recentes"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Sim, restaurar configuração",
       "loading": "A carregar...",
       "no-previous-configurations": "Sem configurações anteriores",
       "this-might-take-a-while": "Isto pode demorar algum tempo...",
@@ -888,10 +888,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Mais ações para o ponto de contacto \"{{contactPointName}}\"",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Eliminar",
       "button-edit": "Editar",
       "button-view": "Ver",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Exportar",
       "export-label-export": "Exportar",
       "label-delete": "Eliminar",
       "label-manage-permissions": "Gerir permissões",
@@ -964,7 +964,7 @@
     },
     "contactPoints": {
       "validation": {
-        "notFound": ""
+        "notFound": "Não foi possível encontrar o ponto de contacto \"{{contactPoint}}\""
       }
     },
     "continue-matching-indicator": {
@@ -973,7 +973,7 @@
     "copy-to-clipboard": "Copiar a \"{{label}}\" para a área de transferência",
     "create-metadata": {
       "label": {
-        "contact-point": "",
+        "contact-point": "As notificações são entregues a",
         "dashboard": "Painel de controlo",
         "dashboard-and-panel": "Painel de controlo e painel",
         "evaluation-interval": "Intervalo de avaliação",
@@ -1121,7 +1121,7 @@
       "content-show-all-errors": "Mostrar todos os erros"
     },
     "errors": {
-      "failedWith": ""
+      "failedWith": "{{-config}} falhou com {{status}}: {{-message}}"
     },
     "evaluate-every-validation-options": {
       "message": {
@@ -1426,7 +1426,7 @@
       "label-disable-resolved-message": "Desativar mensagem resolvida"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "A carregar grupos...",
       "message": {
         "must-be-a-positive-integer": "Deve ser um número inteiro positivo.",
         "must-enter-a-group-name": "Deve inserir um nome de grupo"
@@ -1523,7 +1523,7 @@
       "group-loading-error": "Erro ao carregar o grupo",
       "interval": "Intervalo",
       "namespace": "Espaço de nome",
-      "new": "",
+      "new": "Novo",
       "title": {
         "back": ""
       }
@@ -1555,7 +1555,7 @@
     },
     "group-loader": {
       "group-load-failed": "Falha ao carregar regras do grupo {{ groupName }} em {{ namespaceName }}",
-      "no-rules": ""
+      "no-rules": "Nenhuma regra encontrada neste grupo"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "O grupo está a ser eliminado"
@@ -1572,20 +1572,20 @@
       }
     },
     "home": {
-      "irm-card-description": "",
-      "irm-card-item-1": "",
-      "irm-card-item-2": "",
-      "irm-card-item-3": "",
-      "irm-card-item-4": "",
-      "irm-card-title": "",
+      "irm-card-description": "Unificar o serviço de plantão, os alertas e a resposta de incidentes com o Grafana Cloud IRM.",
+      "irm-card-item-1": "Faça a gestão de horários de plantão com o seu calendário ou Terraform.",
+      "irm-card-item-2": "Resposta a incidentes através da web, aplicação, Slack ou outros canais.",
+      "irm-card-item-3": "Identificar as causas principais com o Grafana SIFT com base em IA.",
+      "irm-card-item-4": "Analise incidentes passados para melhorar a resposta e a resiliência.",
+      "irm-card-title": "Resposta e gestão de incidentes",
       "label-get-started": "Começar",
       "label-insights": "Conhecimentos",
-      "synthetic-monitoring-card-description": "",
-      "synthetic-monitoring-card-item-1": "",
-      "synthetic-monitoring-card-item-2": "",
-      "synthetic-monitoring-card-item-3": "",
-      "synthetic-monitoring-card-item-4": "",
-      "synthetic-monitoring-card-title": ""
+      "synthetic-monitoring-card-description": "Monitorizar fluxos de utilizadores críticos, sites e API externamente, a partir de locais globais.",
+      "synthetic-monitoring-card-item-1": "Simule os percursos do utilizador de ponta a ponta com verificações do navegador.",
+      "synthetic-monitoring-card-item-2": "Executar verificações de ping, DNS, HTTP/S e TCP em todas as camadas de rede.",
+      "synthetic-monitoring-card-item-3": "Use mais de 20 sondas globais ou sondas privadas atrás da sua firewall.",
+      "synthetic-monitoring-card-item-4": "Acompanhe os SLO com alertas integrados do formato Prometheus, diretamente a partir da interface do utilizador.",
+      "synthetic-monitoring-card-title": "Monitorização sintética"
     },
     "import-to-gma": {
       "action-button": "Importar",
@@ -1599,7 +1599,7 @@
         "no-rules-body-yaml": "Não existem regras para importar. Selecione um ficheiro yaml diferente.",
         "no-rules-title": "Sem regras para importar",
         "not-using-rules-managed-by-integrations-or-plugins": {
-          "text": "",
+          "text": "As regras geridas por integrações ou plugins não devem ser importadas para as regras geridas pelo Grafana.",
           "title": "Informação"
         },
         "plugin-rules-warning": {
@@ -1885,10 +1885,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Nenhuma fonte de dados encontrada"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Tem a certeza de que pretende eliminar \"{{muteTiming}}\"?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Desativado",
@@ -1979,7 +1979,7 @@
     },
     "notification-policies-filter": {
       "label-search-by-contact-point": "Pesquisar por ponto de contacto",
-      "placeholder-search-by-contact-point": "",
+      "placeholder-search-by-contact-point": "Escolher um ponto de contacto",
       "search-query-input-placeholder-search": "Pesquisar"
     },
     "notification-policies-list": {
@@ -2140,10 +2140,10 @@
         "conflict": "A árvore de políticas de notificação foi atualizada por outro utilizador.",
         "error-code": "Mensagem de erro: \"{{error}}\"",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Não é possível adicionar ou atualizar a rota: os correspondentes entram em conflito com uma árvore de encaminhamento externa se combinarmos os correspondentes {{-matchers}}. Isso tornaria a rota inacessível."
         },
         "suffix": "Por favor, atualize a página e tente novamente.",
-        "title": ""
+        "title": "Falha ao adicionar ou atualizar a política de notificação"
       },
       "n-more-policies_one": "{{count}} políticas adicionais",
       "n-more-policies_other": "{{count}} políticas adicionais"
@@ -2199,7 +2199,7 @@
     "query-and-expressions-step": {
       "add-query": "Adicionar consulta",
       "body-queries-expressions-configured": "Criar pelo menos uma consulta ou expressão para receber alertas de",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Desativar",
       "expressions": "Expressões",
       "loading-data-sources": "A carregar origens de dados...",
       "manipulate-returned-queries-other-operations": "Manipule os dados devolvidos das consultas com operações matemáticas e outras.",
@@ -2253,7 +2253,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Regra de gravação"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Não foi possível carregar o editor de consultas devido a: {{errorMessage}}"
@@ -2273,7 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Terá de definir um novo grupo de avaliação para a regra copiada, porque o original foi aprovisionado e não pode ser utilizado para regras criadas na interface do utilizador.",
       "body-not-provisioned": "A nova regra <1>não</1> será marcada como uma regra aprovisionada.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Copiar",
       "title-copy-provisioned-alert-rule": "Copiar regra de alerta aprovisionada"
     },
     "redirect-to-rule-viewer": {
@@ -2492,12 +2492,12 @@
         "new-badge": "Novidade!",
         "text": "Importar para as regras geridas pela Grafana"
       },
-      "loading-more-groups": "",
+      "loading-more-groups": "A carregar mais grupos...",
       "more": "Mais",
       "new-alert-rule": "Nova regra de alerta",
       "new-datasource-recording-rule": "Nova regra de gravação da origem de dados",
       "new-grafana-recording-rule": "Nova regra de gravação da Grafana",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Nova regra de alerta para exportação",
       "pagination": {
         "next-page": "Mostrar mais... "
       },
@@ -2671,7 +2671,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Gestores de alerta"
       }
     },
     "settings-content": {
@@ -2809,7 +2809,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Recarregar a pré-visualização",
-      "empty-state": "",
+      "empty-state": "Adicionar conteúdo do modelo para ver a pré-visualização",
       "label-preview": "Pré-visualizar",
       "refresh": "Atualizar"
     },
@@ -2828,7 +2828,7 @@
       "loading": "A carregar...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Selecionar modelo de notificação"
         },
         "label": {
           "select-notification-template": "Selecionar modelo de notificação"
@@ -2856,8 +2856,8 @@
     },
     "templates-table": {
       "actions": "Ações",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Tem a certeza de que pretende eliminar o grupo de modelos \"{{template}}\"?",
+      "confirmText-yes-delete": "Sim, eliminar",
       "no-templates-defined": "Nenhum modelo definido.",
       "template-group": "Grupo de modelos",
       "title-delete-template-group": "Eliminar grupo de modelos"
@@ -2912,7 +2912,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Gerir regras de alerta, regras de gravação e intervalo de avaliação"
       }
     },
     "to-gma": {
@@ -2992,7 +2992,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Sim, eliminar"
       }
     },
     "use-delete-policy-modal": {
@@ -3046,51 +3046,51 @@
     }
   },
   "alertlist": {
-    "category-alert-state-filter": "",
-    "category-filter": "",
-    "category-options": "",
-    "descriptino-alerts-linked-to-dashboard": "",
-    "description-alert-instance-label": "",
-    "description-alert-name": "",
-    "description-datasource": "",
-    "description-folder": "",
-    "description-group-by": "",
-    "description-group-mode": "",
-    "description-max-items": "",
-    "description-show-inactive-alerts": "",
-    "description-sort-order": "",
-    "description-view-mode": "",
+    "category-alert-state-filter": "Filtro do estado de alerta",
+    "category-filter": "Filtro",
+    "category-options": "Opções",
+    "descriptino-alerts-linked-to-dashboard": "Mostrar apenas alertas associados a este painel de controlo",
+    "description-alert-instance-label": "Filtrar instâncias de alerta através da utilização de consultas de etiqueta, ex.: {severity=\"critical\", instance=~\"cluster-us-.+\"}",
+    "description-alert-name": "Filtrar por alertas que contenham este texto",
+    "description-datasource": "Filtrar a partir da fonte de alerta",
+    "description-folder": "Filtrar por alertas na pasta selecionada (apenas para regras de alerta geridas pelo Grafana)",
+    "description-group-by": "Filtrar alertas através da utilização de consultas de etiqueta",
+    "description-group-mode": "Como as instâncias de alerta devem ser agrupadas",
+    "description-max-items": "Máximo de alertas a mostrar",
+    "description-show-inactive-alerts": "Incluir regras de alerta que tenham 0 (zero) instâncias. Estas regras permanecem ocultas se for configurado um filtro de etiquetas de instância de alerta, pois não têm instâncias.",
+    "description-sort-order": "Ordem de classificação de alertas e instâncias de alerta",
+    "description-view-mode": "Alternar entre a vista de lista e a vista de estatística",
     "group-by": {
       "aria-label-group-by-label-keys": "agrupar por chaves de etiqueta",
       "placeholder-group-by": "Agrupar por"
     },
     "group-mode-options": {
-      "label-custom-grouping": "",
-      "label-default-grouping": ""
+      "label-custom-grouping": "Agrupamento personalizado",
+      "label-default-grouping": "Agrupamento predefinido"
     },
-    "name-alert-instance-label": "",
-    "name-alert-name": "",
-    "name-alerts-linked-to-dashboard": "",
-    "name-datasource": "",
-    "name-error": "",
-    "name-firing": "",
-    "name-folder": "",
-    "name-group-by": "",
-    "name-group-mode": "",
-    "name-max-items": "",
-    "name-no-data": "",
-    "name-normal": "",
-    "name-pending": "",
-    "name-recovering": "",
-    "name-show-inactive-alerts": "",
-    "name-sort-order": "",
-    "name-view-mode": "",
+    "name-alert-instance-label": "Etiqueta de instância de alerta",
+    "name-alert-name": "Nome do alerta",
+    "name-alerts-linked-to-dashboard": "Alertas associados a este painel de controlo",
+    "name-datasource": "Origem dos dados",
+    "name-error": "Erro",
+    "name-firing": "Alerta/Ativação",
+    "name-folder": "Pasta",
+    "name-group-by": "Agrupar por",
+    "name-group-mode": "Modo de grupo",
+    "name-max-items": "Máx. de artigos",
+    "name-no-data": "Sem dados",
+    "name-normal": "Normal",
+    "name-pending": "Pendente",
+    "name-recovering": "A recuperar",
+    "name-show-inactive-alerts": "Mostrar alertas com 0 instâncias",
+    "name-sort-order": "Ordenação",
+    "name-view-mode": "Modo de visualização ",
     "sort-order-options": {
-      "label-alphabetical-asc": "",
-      "label-alphabetical-desc": "",
-      "label-importance": "",
-      "label-time-asc": "",
-      "label-time-desc": ""
+      "label-alphabetical-asc": "Ordem alfabética (asc)",
+      "label-alphabetical-desc": "Ordem alfabética (desc)",
+      "label-importance": "Importância",
+      "label-time-asc": "Hora (asc)",
+      "label-time-desc": "Hora (desc)"
     },
     "ungrouped-mode-view": {
       "active-for": "para <1>{{duration}}</1>",
@@ -3106,8 +3106,8 @@
       "title-permission-required": "Permissão necessária"
     },
     "view-mode-options": {
-      "label-list": "",
-      "label-stat": ""
+      "label-list": "Lista",
+      "label-stat": "Estatística"
     }
   },
   "annolist": {
@@ -3120,31 +3120,31 @@
     "annotation-list-item": {
       "tooltip-created-by": "Criado por:<1></1> {{email}}"
     },
-    "category-annotation-query": "",
-    "category-display": "",
-    "category-link-behaviour": "",
-    "description-tags": "",
+    "category-annotation-query": "Consulta de anotação",
+    "category-display": "Visualização",
+    "category-link-behaviour": "Comportamento do link",
+    "description-tags": "Fazer a correspondência das etiquetas de anotação",
     "link-target-options": {
-      "label-dashboard": "",
-      "label-panel": ""
+      "label-dashboard": "Painel de controlo",
+      "label-panel": "Painel"
     },
-    "name-limit": "",
-    "name-link-target": "",
-    "name-query-filter": "",
-    "name-show-tags": "",
-    "name-show-time": "",
-    "name-show-user": "",
-    "name-tags": "",
-    "name-time-after": "",
-    "name-time-before": "",
-    "name-time-range": "",
+    "name-limit": "Limite",
+    "name-link-target": "Destino do link",
+    "name-query-filter": "Filtro de consulta",
+    "name-show-tags": "Mostrar as etiquetas",
+    "name-show-time": "Mostrar a hora",
+    "name-show-user": "Mostrar o utilizador",
+    "name-tags": "Etiquetas",
+    "name-time-after": "Tempo após",
+    "name-time-before": "Tempo antes",
+    "name-time-range": "Intervalo de tempo",
     "query-filter-options": {
-      "label-all-dashboards": "",
-      "label-this-dashboard": ""
+      "label-all-dashboards": "Todos os painéis de controlo",
+      "label-this-dashboard": "Este painel de controlo"
     },
     "time-range-options": {
-      "label-none": "",
-      "label-this-dashboard": ""
+      "label-none": "Nenhum",
+      "label-this-dashboard": "Este painel de controlo"
     }
   },
   "annotations": {
@@ -3152,7 +3152,7 @@
       "annotation": "Anotação",
       "first-value": "Primeiro valor",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Nomes de campo desconhecidos"
     },
     "empty-state": {
       "button-title": "Adicionar consulta de anotação",
@@ -3162,12 +3162,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Quando este campo está definido, a anotação será tratada como um intervalo",
+        "results-split-on-comma": "Os resultados serão separados por vírgula (,)"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}, ou o primeiro campo de texto",
+        "time-or-the-first-field": "{{defaultField}}, ou o primeiro campo de hora"
       }
     },
     "standard-annotation-query-editor": {
@@ -3245,9 +3245,9 @@
       "define-allowed-teams-ids-label": "Definir as ID das equipas permitidas",
       "display-name-description": "Será mostrado na página de início de sessão como \"Iniciar sessão com...\". Útil se utilizar mais de um fornecedor de identidade ou protocolos SSO.",
       "display-name-label": "Nome de exibição",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Parâmetro para indicar o domínio do utilizador no espaço do Azure AD/Entra ID e agilizar o processo de início de sessão.",
+      "domain-hint-label": "Dica de domínio",
+      "domain-hint-valid-domain": "Este campo deve ser um domínio válido.",
       "email-attribute-name-description": "Nome da chave a utilizar para a pesquisa de e-mail do utilizador no mapa de atributos do token de ID OAuth2.",
       "email-attribute-name-label": "Nome do atributo de e-mail",
       "email-attribute-path-description": "Expressão JMESPath a utilizar para a pesquisa de e-mail do utilizador a partir das informações do utilizador.",
@@ -3264,11 +3264,11 @@
       "id-token-attribute-name-label": "Nome do atributo do token de ID",
       "login-attribute-path-description": "Expressão JMESPath a utilizar para a pesquisa de início de sessão do utilizador a partir do token de ID do utilizador.",
       "login-attribute-path-label": "Caminho do atributo de início de sessão",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Consentimento",
+      "login-prompt-description": "Indica o tipo de interação do utilizador quando o utilizador inicia sessão com o IdP.",
+      "login-prompt-label": "Instrução de início de sessão",
+      "login-prompt-login": "Entrar",
+      "login-prompt-select-account": "Selecione a conta",
       "managed-identity-client-id-description": "A ID de cliente de identidade gerida da credencial de identidade federada da sua aplicação OAuth2.",
       "managed-identity-client-id-label": "ID de cliente de identidade gerida FIC",
       "name-attribute-path-description": "Expressão JMESPath a utilizar para a pesquisa de início de sessão do utilizador a partir do token de ID do utilizador. \nEste nome será utilizado como o nome a apresentar do utilizador.",
@@ -3304,7 +3304,7 @@
       "team-ids-github": "Lista de números inteiros de ID de equipa.",
       "team-ids-label": "ID de equipa",
       "team-ids-numbers": "As ID de equipa têm de ser números.",
-      "team-ids-other": "",
+      "team-ids-other": "Lista de cadeias de ID de equipa.",
       "team-ids-placeholder": "Introduza ID de equipa e prima Enter para adicionar",
       "teams-url-description": "O URL utilizado para consultar as ID de equipa. Se não estiver definido, o valor predefinido é de /equipas.",
       "teams-url-description-oauth": "Se configurar \"{{ teamsURLLabel }}\", tem também de configurar \"{{ teamIDsAttributePathLabel }}\".",
@@ -3339,8 +3339,8 @@
       }
     },
     "provider-card": {
-      "saml-learn-more": "",
-      "scim-learn-more": "",
+      "saml-learn-more": "Início de sessão único (SSO) com SAML.",
+      "scim-learn-more": " Sincronize utilizadores e equipas com SCIM.",
       "text-badge-enabled": "Ativado",
       "text-badge-not-enabled": "Não ativado"
     },
@@ -3348,7 +3348,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Redefinir para os valores predefinidos"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Redefinir",
       "disable": "Desativar",
       "disabling": "A desativar...",
       "discard": "Descartar",
@@ -3368,7 +3368,7 @@
       "text-badge-not-enabled": "Não ativado"
     },
     "scim-banner": {
-      "message": ""
+      "message": "O SCIM está atualmente em desenvolvimento e não é recomendado para uso em produção. Utilize com cuidado e espere possíveis alterações."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "O ponto final .well-known/openid-configuration para o seu IdP",
@@ -3380,99 +3380,99 @@
   },
   "bar-chart": {
     "warn": {
-      "missing-numeric": "",
-      "missing-series": ""
+      "missing-numeric": "Nenhum campo numérico encontrado",
+      "missing-series": "Os gráficos de barras requerem um campo de cadeia de carateres ou de hora"
     }
   },
   "barchart": {
     "config": {
-      "category-thresholds": "",
-      "description-color-by-field": "",
-      "description-x-label-max-length": "",
-      "name-bar-radius": "",
-      "name-bar-width": "",
-      "name-color-by-field": "",
-      "name-fill-opacity": "",
-      "name-full-highlight": "",
-      "name-gradient-mode": "",
-      "name-group-width": "",
-      "name-line-width": "",
-      "name-orientation": "",
-      "name-rotate-x-labels": "",
-      "name-show-thresholds": "",
-      "name-show-values": "",
-      "name-stacking": "",
-      "name-transform": "",
-      "name-x-axis": "",
-      "name-x-label-max-length": "",
-      "name-x-label-min-spacing": "",
+      "category-thresholds": "Limites",
+      "description-color-by-field": "Utilize o valor de cor para um campo associado para colorir cada valor de barra.",
+      "description-x-label-max-length": "As etiquetas do eixo X serão truncadas para o comprimento fornecido",
+      "name-bar-radius": "Raio da barra",
+      "name-bar-width": "Largura da barra",
+      "name-color-by-field": "Cor por campo",
+      "name-fill-opacity": "Opacidade de preenchimento",
+      "name-full-highlight": "Destacar a área completa ao passar o rato",
+      "name-gradient-mode": "Modo de gradiente",
+      "name-group-width": "Largura do grupo",
+      "name-line-width": "Largura da linha",
+      "name-orientation": "Orientação",
+      "name-rotate-x-labels": "Rodar etiquetas de marcação do eixo X",
+      "name-show-thresholds": "Mostrar limites",
+      "name-show-values": "Mostrar valores",
+      "name-stacking": "Empilhamento",
+      "name-transform": "Transformar",
+      "name-x-axis": "Eixo X",
+      "name-x-label-max-length": "Comprimento máx. da etiqueta de marcação do eixo X",
+      "name-x-label-min-spacing": "Espaçamento mínimo das etiquetas do eixo X",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-line-vertical": ""
+        "label-auto": "Automático",
+        "label-horizontal": "Horizontal",
+        "label-line-vertical": "Vertical"
       },
-      "placeholder-x-axis": "",
-      "placeholder-x-label-max-length": "",
+      "placeholder-x-axis": "Primeiro campo de cadeia de carateres ou de hora",
+      "placeholder-x-label-max-length": "Nenhum",
       "show-values-options": {
-        "label-always": "",
-        "label-auto": "",
-        "label-never": ""
+        "label-always": "Sempre",
+        "label-auto": "Automático",
+        "label-never": "Nunca"
       },
       "transform-options": {
-        "description-constant": "",
-        "description-negative-y": "",
-        "label-constant": "",
-        "label-negative-y": ""
+        "description-constant": "O primeiro valor será mostrado como uma linha constante",
+        "description-negative-y": "Inverter os resultados para valores negativos no eixo Y",
+        "label-constant": "Constante",
+        "label-negative-y": "Y negativo"
       }
     },
     "tick-spacing-editor": {
       "content-require-space-from-the-right-side": "Requerer espaço do lado direito",
       "gaps-options": {
-        "description-large": "",
-        "description-medium": "",
-        "description-none": "",
-        "description-small": "",
-        "label-large": "",
-        "label-medium": "",
-        "label-none": "",
-        "label-small": ""
+        "description-large": "Requerer um espaçamento de {{spacing}}",
+        "description-medium": "Requerer um espaçamento de {{spacing}}",
+        "description-none": "Mostrar todas as marcas de verificação",
+        "description-small": "Requerer um espaçamento de {{spacing}}",
+        "label-large": "Grande",
+        "label-medium": "Médio",
+        "label-none": "Nenhum",
+        "label-small": "Pequeno"
       },
       "label-rtl": "RTL"
     }
   },
   "bargauge": {
     "bar-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automático",
+      "label-manual": "Manual"
     },
-    "category-bar-gauge": "",
-    "description-max-height": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-show-unfilled-area": "",
+    "category-bar-gauge": "Medidor da barra",
+    "description-max-height": "Altura máxima da linha (orientação horizontal)",
+    "description-min-height": "Altura mínima da linha (orientação horizontal)",
+    "description-min-width": "Largura mínima da coluna (orientação vertical)",
+    "description-show-unfilled-area": "Quando se ativa, renderiza a região não preenchida como cinzenta",
     "display-mode-options": {
-      "label-basic": "",
-      "label-gradient": "",
-      "label-retro": ""
+      "label-basic": "Basic",
+      "label-gradient": "Gradiente",
+      "label-retro": "LCD retro"
     },
-    "name-bar-size": "",
-    "name-display-mode": "",
-    "name-max-height": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-name-placement": "",
+    "name-bar-size": "Tamanho da barra",
+    "name-display-mode": "Modo de visualização",
+    "name-max-height": "Altura máx.",
+    "name-min-height": "Altura mín.",
+    "name-min-width": "Largura mín.",
+    "name-name-placement": "Posicionamento do nome",
     "name-placement-options": {
-      "label-auto": "",
-      "label-hidden": "",
-      "label-left": "",
-      "label-top": ""
+      "label-auto": "Automático",
+      "label-hidden": "Oculto",
+      "label-left": "Esquerda",
+      "label-top": "Topo"
     },
-    "name-show-unfilled-area": "",
-    "name-value-display": "",
+    "name-show-unfilled-area": "Mostrar a área não preenchida",
+    "name-value-display": "Apresentação dos valores",
     "value-display-options": {
-      "label-hidden": "",
-      "label-text-color": "",
-      "label-value-color": ""
+      "label-hidden": "Oculto",
+      "label-text-color": "Cor do texto",
+      "label-value-color": "Cor do valor"
     }
   },
   "bookmarks-page": {
@@ -3486,8 +3486,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Eliminar em massa recursos provisionados",
+      "bulk-move-provisioned-resources": "Mover em massa recursos provisionados",
       "cancel-button": "Cancelar",
       "confirmation-text": "Eliminar",
       "delete-button": "Eliminar",
@@ -3496,7 +3496,7 @@
       "delete-modal-restore-dashboards-text": "Esta ação eliminará as pastas selecionadas imediatamente, mas os painéis selecionados serão marcados para eliminação em 30 dias. O administrador da sua organização pode restaurar os painéis a qualquer momento antes que os 30 dias expirem. Não é possível restaurar as pastas.",
       "delete-modal-text": "Esta ação eliminará o seguinte conteúdo:",
       "delete-modal-title": "Eliminar",
-      "delete-provisioned-folder": "",
+      "delete-provisioned-folder": "Eliminar a pasta disponibilizada",
       "deleting": "A eliminar...",
       "manage-permissions-button": "Gerir permissões",
       "move-button": "Mover",
@@ -3506,8 +3506,8 @@
       "move-modal-title": "Mover",
       "moving": "A mover...",
       "new-folder-name-required-phrase": "O nome da pasta é obrigatório.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Selecionou recursos provisionados e não provisionados. Estes não podem ser processados em conjunto. Selecione apenas recursos provisionados ou apenas recursos não provisionados e tente novamente.",
+      "selected-mix-resources-modal-title": "Tipos de recursos mistos selecionados"
     },
     "actions": {
       "button-to-recently-deleted": "Eliminado recentemente"
@@ -3520,25 +3520,25 @@
       "this-folder-is-empty": "Esta pasta está vazia"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_other": ""
+      "all-deleted": "Todos os recursos foram eliminados com sucesso",
+      "all-moved": "Todos os recursos foram movidos com sucesso",
+      "button-done": "Concluído",
+      "progress-title": "Sucesso",
+      "failed-alert_one": "{{count}} elementos falharam",
+      "failed-alert_other": "{{count}} elementos falharam"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Cancelar",
+      "button-delete": "Eliminar",
+      "button-deleting": "A eliminar...",
+      "delete-warning": "Isto eliminará as pastas selecionadas e as suas descendentes. No total, isto afetará:",
+      "error-path-not-found": "Caminho não encontrado"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Cancelar",
+      "button-move": "Mover",
+      "button-moving": "A mover...",
+      "deleting": "A eliminar",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,14 +3546,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Conteúdo do ficheiro não encontrado",
+      "error-path-not-found": "Caminho não encontrado",
+      "error-target-folder-path-missing": "O caminho da pasta de destino está em falta",
+      "error-title": "Erro de pasta de destino",
+      "move-warning": "Isto eliminará as pastas selecionadas e as suas descendentes. No total, isto afetará:",
+      "moving": "Mudança de local",
+      "progress": "Progresso: {{current}} de {{total}}",
+      "target-folder": "Pasta de destino"
     },
     "counts": {
       "alertRule_one": "{{count}} regra de alerta",
@@ -3579,12 +3579,12 @@
       "read-only-message": ""
     },
     "delete-provisioned-folder-form": {
-      "api-error": "",
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "success-message": ""
+      "api-error": "Falha ao eliminar a pasta",
+      "button-cancel": "Cancelar",
+      "button-delete": "Eliminar",
+      "button-deleting": "A eliminar...",
+      "delete-warning": "Isto eliminará esta pasta e todas as suas descendentes. No total, isto afetará:",
+      "success-message": "Pasta eliminada com sucesso"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Não foi possível obter informações sobre os descendentes"
@@ -3609,7 +3609,7 @@
       "empty-message": "Nenhuma pasta encontrada",
       "error-title": "Erro ao carregar pastas",
       "non-folder-item": "Não pasta {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "Painéis de controlo",
       "search-placeholder": "Pesquisar pastas",
       "unknown-error": "Erro desconhecido"
     },
@@ -3638,7 +3638,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Introduza o nome da pasta",
       "label-folder-name": "Nome da pasta",
       "text-pull-request-created": "Foi criado um pedido de extração com alterações a esta pasta:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "A sua pasta será criada como {{folderName}}",
       "title-pull-request-created": "Pedido de extração criado",
       "title-this-repository-is-read-only": "Este repositório é apenas de leitura"
     },
@@ -3647,52 +3647,52 @@
       "text": "Não foram encontrados resultados para a sua consulta"
     },
     "restore": {
-      "success": ""
+      "success": "Painel de controlo {{name}} restaurado"
     },
     "text-this-repository-is-read-only": "Se tiver acesso direto ao destino, copie o JSON e cole-o lá.",
     "trash-state-manager": {
       "label": {
-        "alphabetically-az": "",
-        "alphabetically-za": ""
+        "alphabetically-az": "Por ordem alfabética (A–Z)",
+        "alphabetically-za": "Por ordem alfabética (Z–A)"
       }
     }
   },
   "candlestick": {
     "additional-fields-options": {
-      "label-ignore": "",
-      "label-include": ""
+      "label-ignore": "Ignorar",
+      "label-include": "Incluir"
     },
     "candle-style-options": {
-      "label-candles": "",
-      "label-ohlc-bars": ""
+      "label-candles": "Velas",
+      "label-ohlc-bars": "Barras OHLC"
     },
-    "category-candlestick": "",
+    "category-candlestick": "Candelabro",
     "color-strategy-options": {
-      "label-since-open": "",
-      "label-since-prior-close": ""
+      "label-since-open": "Desde a abertura",
+      "label-since-prior-close": "Desde o fecho anterior"
     },
-    "description-additional-fields": "",
-    "description-close": "",
-    "description-high": "",
-    "description-low": "",
-    "description-open": "",
-    "description-volume": "",
+    "description-additional-fields": "Utilizar opções de séries temporais padrão para configurar quaisquer campos não mapeados acima",
+    "description-close": "Valor no fim do período",
+    "description-high": "Valor máximo dentro do período",
+    "description-low": "Valor mínimo dentro do período",
+    "description-open": "Valor no início do período",
+    "description-volume": "Contagem de amostras dentro do período",
     "mode-options": {
-      "label-both": "",
-      "label-candles": "",
-      "label-volume": ""
+      "label-both": "Ambas",
+      "label-candles": "Velas",
+      "label-volume": "Volume"
     },
-    "name-additional-fields": "",
-    "name-candle-style": "",
-    "name-close": "",
-    "name-color-strategy": "",
-    "name-down-color": "",
-    "name-high": "",
-    "name-low": "",
-    "name-mode": "",
-    "name-open": "",
-    "name-up-color": "",
-    "name-volume": ""
+    "name-additional-fields": "Campos adicionais",
+    "name-candle-style": "Estilo de vela",
+    "name-close": "Fechar",
+    "name-color-strategy": "Estratégia de cores",
+    "name-down-color": "Cor de baixo",
+    "name-high": "Alto",
+    "name-low": "Baixo",
+    "name-mode": "Modo",
+    "name-open": "Abrir",
+    "name-up-color": "Cor de cima",
+    "name-volume": "Volume"
   },
   "canvas": {
     "apieditor": {
@@ -3707,18 +3707,18 @@
       }
     },
     "button-item": {
-      "category-button": "",
+      "category-button": "Botão",
       "label": {
         "center": "Centro",
         "left": "Esquerda",
         "right": "Direita"
       },
-      "name-align-text": "",
-      "name-api": "",
-      "name-style": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
+      "name-align-text": "Alinhar texto",
+      "name-api": "API",
+      "name-style": "Estilo",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
       "placeholder": {
         "auto": "Automóvel"
       }
@@ -3745,21 +3745,21 @@
         }
       }
     },
-    "category-arrow-direction": "",
-    "category-background": "",
-    "category-border": "",
-    "category-canvas": "",
-    "category-color": "",
-    "category-data-links": "",
-    "category-line-style": "",
-    "category-metric-value": "",
-    "category-radius": "",
-    "category-selected-connection": "",
-    "category-selected-element": "",
-    "category-size": "",
-    "category-tooltip": "",
+    "category-arrow-direction": "Direção da seta",
+    "category-background": "Antecedentes",
+    "category-border": "Borda",
+    "category-canvas": "Tela",
+    "category-color": "Cor",
+    "category-data-links": "Ações e ligações de dados",
+    "category-line-style": "Estilo da linha",
+    "category-metric-value": "Valor métrico",
+    "category-radius": "Raio",
+    "category-selected-connection": "Ligação selecionada",
+    "category-selected-element": "Elemento selecionado ({{element}})",
+    "category-size": "Tamanho",
+    "category-tooltip": "Descrição",
     "cloud-item": {
-      "category-cloud": "",
+      "category-cloud": "Cloud",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -3768,47 +3768,47 @@
         "right": "Direita",
         "top": "Topo"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automóvel"
       }
     },
-    "description-experimental-types": "",
-    "description-inline-editing": "",
-    "description-pan-zoom": "",
+    "description-experimental-types": "Ativar a seleção dos tipos de elementos experimentais",
+    "description-inline-editing": "Ativar a edição do painel diretamente",
+    "description-pan-zoom": "Ativar a deslocação e a ampliação",
     "direction-options": {
-      "label-both": "",
-      "label-forward": "",
-      "label-none": "",
-      "label-reverse": ""
+      "label-both": "Ambas",
+      "label-forward": "Avançar",
+      "label-none": "Nenhum",
+      "label-reverse": "Inverter"
     },
     "drone-front-item": {
-      "category-drone-front": "",
-      "name-roll-angle": ""
+      "category-drone-front": "Frente do drone",
+      "name-roll-angle": "Ângulo de rolamento"
     },
     "drone-side-item": {
-      "category-drone-side": "",
-      "name-pitch-angle": ""
+      "category-drone-side": "Lado do drone",
+      "name-pitch-angle": "Ângulo de inclinação"
     },
     "drone-top-item": {
-      "category-drone-top": "",
-      "name-back-left-rotor-rpm": "",
-      "name-back-right-rotor-rpm": "",
-      "name-front-left-rotor-rpm": "",
-      "name-front-right-rotor-rpm": "",
-      "name-yaw-angle": ""
+      "category-drone-top": "Parte superior do drone",
+      "name-back-left-rotor-rpm": "RPM do rotor traseiro esquerdo",
+      "name-back-right-rotor-rpm": "RPM do rotor traseiro direito",
+      "name-front-left-rotor-rpm": "RPM do rotor dianteiro esquerdo",
+      "name-front-right-rotor-rpm": "RPM do rotor dianteiro direito",
+      "name-yaw-angle": "Ângulo de guinada"
     },
     "element-editor": {
-      "category-layout": "",
-      "description-unsupported": "",
-      "name-quick-placement": ""
+      "category-layout": "Layout",
+      "description-unsupported": "O tipo de elemento selecionado não é suportado pelas definições atuais. Ative os tipos de elementos avançados.",
+      "name-quick-placement": "Posicionamento rápido"
     },
     "ellipse-item": {
-      "category-ellipse": "",
+      "category-ellipse": "Elipse",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -3817,50 +3817,50 @@
         "right": "Direita",
         "top": "Topo"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automóvel"
       }
     },
     "icon-item": {
-      "category-icon": "",
-      "name-fill-color": "",
-      "name-svg-path": ""
+      "category-icon": "Ícone",
+      "name-fill-color": "Cor de preenchimento",
+      "name-svg-path": "Caminho SVG"
     },
     "inline-edit": {
       "canvas-inline-editor": "Editor em linha do Canvas",
       "tooltip-close-inline-editor": "Fechar editor em linha"
     },
     "inline-edit-body": {
-      "category-selected-element": "",
+      "category-selected-element": "Elemento selecionado ({{element}})",
       "label-add-item": "Adicionar item",
       "please-select-an-element": "Selecione um elemento"
     },
-    "label-actions": "",
-    "label-color": "",
-    "label-direction": "",
-    "label-image": "",
-    "label-image-size": "",
-    "label-line-style": "",
-    "label-links": "",
-    "label-radius": "",
-    "label-size": "",
-    "label-width": "",
+    "label-actions": "Ações",
+    "label-color": "Cor",
+    "label-direction": "Direção",
+    "label-image": "Imagem",
+    "label-image-size": "Tamanho da imagem",
+    "label-line-style": "Estilo da linha",
+    "label-links": "Links",
+    "label-radius": "Raio",
+    "label-size": "Tamanho",
+    "label-width": "Largura",
     "layer-editor": {
-      "category-layer": "",
-      "category-layout": "",
-      "name-constraints": "",
-      "name-elements": ""
+      "category-layer": "Camada",
+      "category-layout": "Layout",
+      "name-constraints": "Restrições",
+      "name-elements": "Elementos"
     },
     "line-style-editor": {
       "label-animate": "Animar"
     },
     "line-style-options": {
-      "label-solid": ""
+      "label-solid": "Sólido"
     },
     "metric-value-item": {
       "label": {
@@ -3875,14 +3875,14 @@
         "auto": "Automóvel"
       }
     },
-    "name-align-text": "",
-    "name-color": "",
-    "name-experimental-types": "",
-    "name-inline-editing": "",
-    "name-pan-zoom": "",
-    "name-text": "",
-    "name-text-size": "",
-    "name-vertical-align": "",
+    "name-align-text": "Alinhar texto",
+    "name-color": "Cor do texto",
+    "name-experimental-types": "Tipos de elementos experimentais",
+    "name-inline-editing": "Edição em linha",
+    "name-pan-zoom": "Deslocação e ampliação",
+    "name-text": "Texto",
+    "name-text-size": "Tamanho do texto",
+    "name-vertical-align": "Alinhamento vertical",
     "not-found-display": {
       "not-found": "<0>Não encontrado: </0><config />"
     },
@@ -3895,7 +3895,7 @@
       "zoom-scroll-wheel": "Zoom: roda de deslocamento"
     },
     "parallelogram-item": {
-      "category-parallelogram": "",
+      "category-parallelogram": "Paralelogramo",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -3904,11 +3904,11 @@
         "right": "Direita",
         "top": "Topo"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automóvel"
       }
@@ -3921,21 +3921,21 @@
     },
     "placement-editor": {
       "horizontal-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-left-and-right": "",
-        "label-right": "",
-        "label-scale": ""
+        "label-center": "Centro",
+        "label-left": "Esquerda",
+        "label-left-and-right": "Esquerda e direita",
+        "label-right": "Direita",
+        "label-scale": "Escala"
       },
       "label-constraints": "Restrições",
       "label-position": "Cargo",
       "loading": "A carregar...",
       "vertical-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-scale": "",
-        "label-top": "",
-        "label-top-and-bottom": ""
+        "label-bottom": "Inferior",
+        "label-center": "Centro",
+        "label-scale": "Escala",
+        "label-top": "Topo",
+        "label-top-and-bottom": "Superior e inferior"
       }
     },
     "quick-positioning": {
@@ -3947,7 +3947,7 @@
       "tooltip-align-vertical-centers": "Alinhar centros verticais"
     },
     "rectangle-item": {
-      "category-rectangle": "",
+      "category-rectangle": "Retângulo",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -3956,33 +3956,33 @@
         "right": "Direita",
         "top": "Topo"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automóvel"
       }
     },
     "server-item": {
-      "category-server": "",
-      "name-blink-rate": "",
-      "name-bulb-color": "",
-      "name-status-color": "",
-      "name-type": "",
+      "category-server": "Servidor",
+      "name-blink-rate": "Frequência de intermitência [hz] (0 = desligado)",
+      "name-bulb-color": "Cor da lâmpada",
+      "name-status-color": "Cor do estado",
+      "name-type": "Tipo",
       "type-options": {
-        "label-database": "",
-        "label-single": "",
-        "label-stack": "",
-        "label-terminal": ""
+        "label-database": "Base de dados",
+        "label-single": "Único",
+        "label-stack": "Stack",
+        "label-terminal": "Terminal"
       }
     },
     "text-display": {
       "double-click-to-set": "Clique duas vezes para definir o texto"
     },
     "text-item": {
-      "category-text": "",
+      "category-text": "Texto",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -3991,20 +3991,20 @@
         "right": "Direita",
         "top": "Topo"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automóvel"
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Modo de descrição",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Desativado",
+        "label-enabled": "Ativado"
       }
     },
     "tree-navigation-editor": {
@@ -4024,7 +4024,7 @@
       "tooltip-remove": "Remover"
     },
     "triangle-item": {
-      "category-triangle": "",
+      "category-triangle": "Triângulo",
       "label": {
         "bottom": "Inferior",
         "center": "Centro",
@@ -4033,18 +4033,18 @@
         "right": "Direita",
         "top": "Topo"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Alinhar texto",
+      "name-text": "Texto",
+      "name-text-color": "Cor do texto",
+      "name-text-size": "Tamanho do texto",
+      "name-vertical-align": "Alinhamento vertical",
       "placeholder": {
         "auto": "Automóvel"
       }
     },
     "wind-turbine-item": {
-      "category-wind-turbine": "",
-      "name-rpm": ""
+      "category-wind-turbine": "Turbina eólica",
+      "name-rpm": "RPM"
     }
   },
   "carousel": {
@@ -4061,8 +4061,8 @@
   "close-button": {
     "tooltip": "Fechar"
   },
-  "cloud-enterprise-feature-badge": "",
-  "cloud-feature-badge": "",
+  "cloud-enterprise-feature-badge": "Cloud e Enterprise",
+  "cloud-feature-badge": "Cloud",
   "combobox": {
     "async": {
       "error": "Ocorreu um erro ao carregar as opções."
@@ -4373,7 +4373,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Executar consulta"
     }
   },
   "dashboard": {
@@ -4536,7 +4536,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Continuar"
         },
         "title": {
           "proceed-to-external-site": "Continuar para o site externo?"
@@ -4633,7 +4633,7 @@
       }
     },
     "description": {
-      "action": ""
+      "action": "Alterar a descrição do painel de controlo"
     },
     "dynamic-config-value-editor": {
       "render-label": {
@@ -4642,17 +4642,17 @@
     },
     "edit-actions": {
       "add": "Adicionar {{typeName}}",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
-      "move": "",
+      "add-conditional-rule": "Adicionar regra {{ruleDescription}}",
+      "duplicate-panel": "Duplicar painel",
+      "edit-query-result-rule": "Alterar regra de resultado da consulta",
+      "edit-template-variable-rule": "Alterar regra de variável de modelo",
+      "edit-time-range-rule": "Alterar regra de intervalo de tempo",
+      "move": "Mover {{typeName}}",
       "panel-background": "Alterar fundo do painel",
       "panel-description": "Alterar descrição do painel",
-      "panel-max-repeats-per-row": "",
+      "panel-max-repeats-per-row": "Máx. de repetições por linha",
       "panel-repeat-direction": "Repetir direção",
-      "panel-repeat-variable": "",
+      "panel-repeat-variable": "Repetição do painel por",
       "panel-title": "Alterar título do painel",
       "paste-panel": "Colar painel",
       "remove": "Remover {{typeName}}",
@@ -4661,7 +4661,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Painel de controlo",
-        "element": "",
+        "element": "Elemento",
         "local-variable": "Variável local",
         "multiple-elements": "Vários elementos",
         "multiple-elements-delete-text": "Tem a certeza de que pretende eliminar estes elementos?",
@@ -4743,10 +4743,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Exportar painel de controlo"
       },
       "menu": {
-        "label": ""
+        "label": "Exportar painel de controlo"
       }
     },
     "fetch-dashboard": {
@@ -4768,9 +4768,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Predefinição",
+          "shared-crosshair": "Mira partilhada",
+          "shared-tooltip": "Dica de ferramenta partilhada"
         }
       }
     },
@@ -4787,7 +4787,7 @@
     "get-field-override-categories": {
       "label-add-field-override": "Adicionar substituição de campo",
       "label-add-override-property": "Adicionar propriedade de substituição",
-      "override-name": "",
+      "override-name": "Substituir {{overrideNum}}",
       "title": {
         "add-button": "adicionar botão"
       }
@@ -4823,14 +4823,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Não enviar dados de anotação para os seguintes painéis",
+        "annotation-panels-support-annotations": "Enviar os dados de anotação para todos os painéis que suportam anotações",
+        "annotations-explicitly-listed-panels": "Enviar as anotações para os painéis explicitamente listados"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Todos os painéis",
+        "all-panels-except": "Todos os painéis, exceto",
+        "selected-panels": "Painéis selecionados"
       }
     },
     "get-panel-frame-category": {
@@ -5016,7 +5016,7 @@
       "title-matched_other": "Correspondente a {{count}}/{{totalCount}} opções"
     },
     "outline": {
-      "repeated-item": "",
+      "repeated-item": "Repetir",
       "tree-item": {
         "empty": "(vazio)",
         "no-title": "<no title>"
@@ -5092,7 +5092,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Tem a certeza de que pretende restaurar o painel de controlo para a versão {{version}}? Todas as alterações não guardadas serão perdidas.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Sim, restaurar para a versão {{version}}",
       "title-restore-version": "Restaurar versão"
     },
     "row-options-button": {
@@ -5144,7 +5144,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Painel de controlo guardado"
     },
     "save-dashboard-as-button": {
       "save-as": "Guardar como"
@@ -5174,13 +5174,13 @@
       "label-changes": "Alterações",
       "label-details": "Detalhes",
       "title": "Guardar o painel de controlo",
-      "title-copy": "",
-      "title-provisioned": ""
+      "title-copy": "Guardar a cópia do painel de controlo",
+      "title-provisioned": "Painel de controlo fornecido"
     },
     "save-dashboard-error-proxy": {
       "body-name-exists": "Já existe um painel de controlo com o mesmo nome na pasta selecionada.<1></1><2>Ainda pretende guardar este painel de controlo?</2>",
       "body-version-mismatch": "Outra pessoa atualizou este painel de controlo<1></1><2>Ainda pretende guardar este painel de controlo?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Guardar e substituir",
       "title-name-exists": "Conflito",
       "title-version-mismatch": "Conflito"
     },
@@ -5253,7 +5253,7 @@
       }
     },
     "title": {
-      "action": ""
+      "action": "Alterar o título do painel de controlo"
     },
     "toolbar": {
       "add": "Adicionar",
@@ -5377,9 +5377,9 @@
       "label-apply-transformation-to": "Aplicar transformação a"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Tenha em atenção que remover uma transformação pode danificar outras. Se houver apenas uma única transformação, voltará ao ecrã de seleção principal.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Eliminar",
         "title-debug": "Depurar",
         "title-disable-transformation": "Desativar transformação",
         "title-filter": "Filtro",
@@ -5400,16 +5400,16 @@
       "placeholder-search-for-transformation": "Pesquisar por transformação",
       "show-images": "Mostrar imagens",
       "title-add-another-transformation": "Adicionar outra transformação",
-      "view-all": ""
+      "view-all": "Ver tudo"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Ao eliminar todas as transformações, voltará ao ecrã de seleção principal."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Adicionar outra transformação"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Eliminar tudo",
       "delete-all-transformations": "Eliminar todas as transformações",
       "title-delete-all-transformations": "Eliminar todas as transformações?",
       "tooltip-clear-search": "Limpar a pesquisa",
@@ -5439,16 +5439,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Alterar a descrição da variável"
       },
       "hide": {
-        "action": ""
+        "action": "Alterar opção de ocultar variável"
       },
       "label": {
-        "action": ""
+        "action": "Alterar etiqueta da variável"
       },
       "name": {
-        "action": ""
+        "action": "Alterar nome da variável"
       }
     },
     "version-history-comparison": {
@@ -5460,7 +5460,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar seleção da versão {{version}}",
       "date": "Data",
-      "name-latest": "",
+      "name-latest": "Mais recentes",
       "notes": "Observações",
       "restore": "Restaurar",
       "updated-by": "Atualizado por",
@@ -5538,7 +5538,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Forneça dimensões como CSV: {{name}}, {{value}}",
       "label-data-source": "Origem dos dados",
       "label-use-static-key-dimensions": "Utilizar dimensões de chave estática",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Permitir valores personalizados"
     },
     "add-to-dashboard": {
       "message": {
@@ -5612,7 +5612,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Revogar URL público"
       },
       "title": {
         "revoke-public-url": "Revogar URL público"
@@ -5625,7 +5625,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opções personalizadas",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Valores separados por vírgulas",
       "selection-options": "Opções de seleção"
     },
     "dashboard-edit-pane-renderer": {
@@ -5646,8 +5646,8 @@
       "label-with-tags": "Com etiquetas",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Painéis de controlo",
+          "link": "Link"
         }
       },
       "placeholder-open-dashboard": "Abrir painel de controlo"
@@ -5690,8 +5690,8 @@
       "data-source-options": "Opções de origem de dados",
       "description-instance-name-filter": "Filtro regex para as instâncias de origem de dados a escolher na lista de valores de variáveis. Deixe em branco para todos.",
       "example-instance-name-filter": "Exemplo: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Filtro de nome de instância",
+      "name-type": "Tipo",
       "selection-options": "Opções de seleção"
     },
     "default-grid-layout-manager": {
@@ -5702,12 +5702,12 @@
       }
     },
     "delete-provisioned-dashboard-form": {
-      "api-error": "",
+      "api-error": "Não foi possível eliminar o painel de controlo",
       "cancel-action": "Cancelar",
       "delete-action": "Eliminar painel de controlo",
       "deleting": "A eliminar...",
-      "drawer-title": "",
-      "success-message": ""
+      "drawer-title": "Eliminar o painel de controlo disponibilizado",
+      "success-message": "Painel de controlo eliminado com sucesso"
     },
     "description-label": {
       "description": "Descrição"
@@ -5736,15 +5736,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Editável",
+          "readonly": "Apenas de leitura"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Predefinição",
+          "shared-crosshair": "Mira partilhada",
+          "shared-tooltip": "Dica de ferramenta partilhada"
         }
       }
     },
@@ -5756,36 +5756,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Adicionar filtros de chave/valor em tempo real",
+        "dynamically-switch-source-multiple-panels": "Alternar dinamicamente a origem de dados para vários painéis",
+        "group": "Adicionar chaves para agrupar em tempo real",
+        "hidden-constant-variable": "Uma variável constante oculta, útil para prefixos métricos em painéis que pretende partilhar",
+        "users-enter-arbitrary-strings-textbox": "Os utilizadores podem inserir quaisquer cadeias de caracteres arbitrárias numa caixa de texto",
+        "values-are-static-and-defined-manually": "Os valores são estáticos e definidos manualmente",
+        "values-fetched-source-query": "Os valores são obtidos a partir de uma consulta de origem de dados",
+        "values-timespans": "Os valores são intervalos de tempo, como 1 min, 1 h, 1 d"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Filtros ad hoc",
+        "constant": "Constante",
+        "custom": "Personalizar",
+        "data-source": "Origem dos dados",
+        "group-by": "Agrupar por",
+        "interval": "Intervalo",
+        "query": "Consulta",
+        "textbox": "Caixa de texto"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Não enviar dados de anotação para os seguintes painéis",
+        "annotation-panels-support-annotations": "Enviar os dados de anotação para todos os painéis que suportam anotações",
+        "annotations-explicitly-listed-panels": "Enviar as anotações para os painéis explicitamente listados"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Todos os painéis",
+        "all-panels-except": "Todos os painéis, exceto",
+        "selected-panels": "Painéis selecionados"
       }
     },
     "get-panel-frame-options": {
@@ -5813,7 +5813,7 @@
       "group-by-options": "Agrupar por opções",
       "label-data-source": "Origem dos dados",
       "label-use-static-group-by-dimensions": "Utilizar dimensões de grupo estático",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Permitir valores personalizados"
     },
     "help-wizard": {
       "copy-to-clipboard": "Copiar para a área de transferência",
@@ -5849,14 +5849,14 @@
       "apply": "Aplicar"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Calcula dinamicamente o intervalo ao dividir o intervalo de tempo pela contagem especificada",
       "description-calculated-value-below-threshold": "O valor calculado não irá abaixo deste limite",
       "description-step-count": "Quantas vezes o intervalo de tempo atual deve ser dividido para calcular o valor",
       "interval-options": "Opções de intervalo",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Opção automática",
+      "name-min-interval": "Intervalo mínimo",
+      "name-step-count": "Número de passos",
+      "name-values": "Valores"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5877,19 +5877,19 @@
       "usage-count_other": "Utilizado em {{count}} painéis de controlo"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Erro ao mover o painel de controlo",
+      "api-error": "Não foi possível mover o painel de controlo",
+      "cancel-action": "Cancelar",
+      "current-file-not-found": "Não foi possível encontrar o ficheiro do painel de controlo atual",
+      "drawer-title": "Painel de controlo provisionado",
+      "file-load-error": "Erro ao carregar o painel de controlo",
+      "loading-file-data": "A carregar dados do painel de controlo",
+      "move-action": "Mover painel de controlo",
+      "move-read-only-message": "Este painel de controlo não pode ser movido diretamente da Grafana porque o repositório é apenas de leitura. Para mover este painel de controlo, mova o ficheiro no seu repositório Git.",
+      "moving": "A mover...",
+      "success-message": "Painel de controlo movido com sucesso",
+      "target-path-label": "Caminho de destino",
+      "title-this-repository-is-read-only": "Este repositório é apenas de leitura"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Já existe um painel de controlo com o mesmo nome na pasta selecionada. Ainda pretende guardar este painel de controlo?",
@@ -5897,7 +5897,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Continuar"
       },
       "title": {
         "proceed-to-external-site": "Continuar para o site externo?"
@@ -5912,7 +5912,7 @@
       }
     },
     "panel-data-alerting-tab": {
-      "tab-label": ""
+      "tab-label": "Alertar"
     },
     "panel-data-alerting-tab-rendered": {
       "alert": {
@@ -5923,19 +5923,19 @@
       "title-dashboard-not-saved": "Painel de controlo não guardado"
     },
     "panel-data-queries-tab": {
-      "tab-label": ""
+      "tab-label": "Consultas"
     },
     "panel-data-queries-tab-rendered": {
       "add-query": "Adicionar consulta",
       "expression": "Expressão "
     },
     "panel-data-transformations-tab": {
-      "tab-label": ""
+      "tab-label": "Transformações"
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Adicionar outra transformação",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Ao eliminar todas as transformações, voltará ao ecrã de seleção principal.",
+      "confirmText-delete-all": "Eliminar tudo",
       "delete-all-transformations": "Eliminar todas as transformações",
       "title-delete-all-transformations": "Eliminar todas as transformações?"
     },
@@ -5988,13 +5988,13 @@
       "description-examples": "Os grupos de captura nomeados podem ser utilizados para separar o texto e o valor de exibição (<1>ver exemplos</1>).",
       "description-optional": "Opcional, se pretender extrair parte de um nome de série ou segmento de nó métrico.",
       "label-data-source": "Origem dos dados",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Ordenação de opções estáticas",
       "label-target-data-source": "Origem de dados de destino",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Usar opções estáticas",
+      "name-regex": "Regex",
       "query-options": "Opções de consulta",
       "selection-options": "Opções de seleção",
-      "static-options-legend": ""
+      "static-options-legend": "Opções estáticas"
     },
     "resource-export": {
       "label": {
@@ -6007,7 +6007,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Tem a certeza de que pretende restaurar o painel de controlo para a versão {{version}}? Todas as alterações não guardadas serão perdidas.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Sim, restaurar para a versão {{version}}",
       "title-restore-version": "Restaurar versão"
     },
     "save-button": {
@@ -6026,15 +6026,15 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Não foi possível guardar o painel de controlo"
       },
-      "required": ""
+      "required": "Preenchimento obrigatório"
     },
     "save-dashboard-drawer": {
       "tabs": {
         "label-changes": "Alterações",
         "label-details": "Detalhes",
         "title": "Guardar o painel de controlo",
-        "title-copy": "",
-        "title-provisioned": ""
+        "title-copy": "Guardar a cópia do painel de controlo",
+        "title-provisioned": "Painel de controlo fornecido"
       }
     },
     "save-dashboard-form": {
@@ -6053,8 +6053,8 @@
         "title-someone-else-has-updated-this-dashboard": "Outra pessoa atualizou este painel de controlo",
         "would-still-dashboard": "Ainda pretende guardar este painel de controlo?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "Devido a limitações no novo esquema de painel de controlo (V2), os painéis de biblioteca serão convertidos em painéis regulares com conteúdo incorporado durante a exportação externa.",
+      "schema-v2-library-panels-export-title": "Os painéis de biblioteca serão convertidos em painéis regulares",
       "title-dashboard-drastically-changed": "Painel de controlo alterado de forma irreversível"
     },
     "save-dashboard-form-common-options": {
@@ -6101,10 +6101,10 @@
       "description-enables-multiple-values-selected": "Permite que vários valores sejam selecionados ao mesmo tempo",
       "description-enables-option-include-variables": "Ativa uma opção para incluir todos os valores",
       "description-enables-users-custom-values": "Permite que os utilizadores adicionem valores personalizados à lista",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Permitir valores personalizados",
+      "name-custom-all-value": "Personalizar todos os valores",
+      "name-include-all-option": "Incluir a opção Tudo",
+      "name-multi-value": "Valor múltiplo"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Alternar menu de partilha"
@@ -6125,7 +6125,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Valor predefinido"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opcional)",
@@ -6150,8 +6150,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Se desassociar este painel, poderá editá-lo sem afetar quaisquer outros painéis. No entanto, depois de fazer uma alteração, não poderá reverter para o painel reutilizável original.",
+      "confirmText-yes-unlink": "Sim, desassociar",
       "title-really-unlink-panel": "Tem a certeza de que pretende desassociar este painel?"
     },
     "unsaved-changes-modal": {
@@ -6169,7 +6169,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Painel de controlo guardado"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Esta variável não é referenciada por nenhuma variável ou por nenhum painel de controlo.",
@@ -6181,15 +6181,15 @@
       "aria-label-variable-editor-form": "Formulário do editor de variáveis",
       "back-to-list": "Voltar à lista",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Eliminar variável"
       },
       "delete": "Eliminar",
       "description-optional-display-name": "Nome de exibição opcional",
       "description-template-variable-characters": "O nome da variável do modelo. (máx. 50 caracteres)",
       "general": "Geral",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Descrição",
+      "name-label": "Etiqueta",
+      "name-name": "Nome",
       "placeholder-descriptive-text": "Texto descritivo",
       "placeholder-label-name": "Nome da etiqueta",
       "placeholder-variable-name": "Nome da variável",
@@ -6204,8 +6204,8 @@
       "variable": "Variável"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Tem a certeza de que pretende eliminar: {{variable}}?",
+      "confirmText-delete-variable": "Eliminar variável",
       "title-delete-variable": "Eliminar variável",
       "tooltip-duplicate-variable": "Variável duplicada",
       "tooltip-remove-variable": "Remover variável"
@@ -6213,15 +6213,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Etiqueta",
+          "nothing": "Nada",
+          "variable": "Variável"
         }
       },
       "label": "Ocultar"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Tipo de variável"
     },
     "variable-usages-button": {
       "title-show-usages": "A mostrar as utilizações para: {{variableId}}",
@@ -6249,7 +6249,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar seleção da versão {{version}}",
       "date": "Data",
-      "name-latest": "",
+      "name-latest": "Mais recentes",
       "notes": "Observações",
       "restore": "Restaurar",
       "updated-by": "Atualizado por",
@@ -6356,18 +6356,18 @@
     }
   },
   "dashlist": {
-    "category-dashboard-list": "",
-    "name-folder": "",
-    "name-include-current-template-variables": "",
-    "name-include-current-time-range": "",
-    "name-max-items": "",
-    "name-query": "",
-    "name-recently-viewed": "",
-    "name-search": "",
-    "name-show-folder-names": "",
-    "name-show-headings": "",
-    "name-starred": "",
-    "name-tags": ""
+    "category-dashboard-list": "Lista do painel de controlo",
+    "name-folder": "Pasta",
+    "name-include-current-template-variables": "Incluir os valores atuais das variáveis de modelos",
+    "name-include-current-time-range": "Incluir intervalo de tempo atual",
+    "name-max-items": "Máx. de artigos",
+    "name-query": "Consulta",
+    "name-recently-viewed": "Visto recentemente",
+    "name-search": "Pesquisar",
+    "name-show-folder-names": "Mostrar os nomes das pastas",
+    "name-show-headings": "Mostrar os títulos",
+    "name-starred": "Marcado com estrela",
+    "name-tags": "Etiquetas"
   },
   "data-source-list": {
     "empty-state": {
@@ -6631,16 +6631,16 @@
   "dimensions": {
     "background-size-editor": {
       "options": {
-        "label-contain": "",
-        "label-cover": "",
-        "label-fill": "",
-        "label-original": "",
-        "label-tile": ""
+        "label-contain": "Conter",
+        "label-cover": "Cobertura",
+        "label-fill": "Preenchimento",
+        "label-original": "Original",
+        "label-tile": "Mosaico"
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": "",
-      "noOptionsMessage-no-fields-found": ""
+      "label-fixed-color": "Cor fixa",
+      "noOptionsMessage-no-fields-found": "Nenhum campo encontrado"
     },
     "file-dropzone-custom-children": {
       "upload": "Carregar"
@@ -6654,10 +6654,10 @@
       "placeholder-search": "Pesquisar"
     },
     "resource-dimension-editor": {
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Usar um resultado do campo de cadeia de carateres",
+      "description-fixed": "Valor fixo",
       "label-field": "Campo",
-      "label-fixed": "",
+      "label-fixed": "Fixo",
       "label-mappings": "Mapeamentos",
       "label-source": "Origem"
     },
@@ -6675,35 +6675,35 @@
     },
     "scalar-dimension-editor": {
       "fixed-value-options": {
-        "label-fixed-values": ""
+        "label-fixed-values": "Valor fixo"
       },
       "label-limit": "Limite",
       "label-value": "Valor",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Nenhum campo encontrado",
       "scalar-options": {
-        "description-clamped": "",
-        "description-mod": "",
-        "label-clamped": "",
-        "label-mod": ""
+        "description-clamped": "Usar valores de campo, fixados em máx. e mín.",
+        "description-mod": "Usar valores de campo, mod. a partir do máximo",
+        "label-clamped": "Fixado",
+        "label-mod": "Mod."
       }
     },
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Valor fixo"
         }
       },
       "label-max": "Máx.",
       "label-min": "Mín.",
       "label-value": "Valor",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Nenhum campo encontrado"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Mostrar valor do campo",
+      "description-fixed": "Valor fixo",
       "label-field": "Campo",
-      "label-fixed": "",
+      "label-fixed": "Fixo",
       "label-source": "Origem",
       "label-template": "Modelo",
       "label-value": "Valor"
@@ -6717,16 +6717,16 @@
       "description-percentage-means-thresholds-relative": "Percentagem significa limites relativos a mín. e máx.",
       "modes": {
         "description": {
-          "threshold-based-percent-between-minmax": "",
-          "thresholds-based-absolute-values": ""
+          "threshold-based-percent-between-minmax": "Escolher o limite com base na percentagem entre mín./máx.",
+          "thresholds-based-absolute-values": "Escolher os limites com base nos valores absolutos"
         },
         "label": {
-          "absolute": "",
-          "percentage": ""
+          "absolute": "Absoluto",
+          "percentage": "Percentagem"
         }
       },
       "thresholds-mode": "Modo de limites",
-      "value-base": ""
+      "value-base": "Base"
     },
     "urlpicker-tab": {
       "label-preview": "Pré-visualizar"
@@ -6806,6 +6806,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Eventos",
@@ -7078,7 +7079,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "A carregar..."
     },
     "prev": "Anterior",
     "queryless-apps-extensions": {
@@ -7265,7 +7266,7 @@
           "start-time": "Hora de início:"
         }
       },
-      "share-span": "",
+      "share-span": "Partilhar",
       "warnings": "Avisos"
     },
     "span-filters": {
@@ -7275,8 +7276,8 @@
       "aria-label-select-service-name-operator": "Selecionar o operador do nome do serviço",
       "aria-label-select-span-name": "Selecionar o nome do intervalo",
       "aria-label-select-span-name-operator": "Selecionar o operador do nome do intervalo",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Selecionar a duração máxima do intervalo",
+      "ariaLabel-select-min-span-duration": "Selecionar a duração mínima do intervalo",
       "label-collapse": "Filtros de intervalo",
       "label-duration": "Duração",
       "label-service-name": "Nome do serviço",
@@ -7348,23 +7349,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Duração",
+      "export-started": "Exportação iniciada",
+      "give-feedback": "Feedback",
+      "link-copied": "Link copiado para a área de transferência",
+      "path": "Caminho",
+      "route": "Via",
+      "services": "Serviços",
+      "share": "Partilhar",
+      "share-copy-link": "Copiar link",
+      "share-export-json": "Exportar como JSON",
+      "share-tooltip": "Partilhar rastreio",
+      "start-time": "Hora de início",
+      "target": "Destino",
+      "title-share-thoughts-about-tracing-grafana": "Partilhe a sua opinião sobre o rastreamento na Grafana.",
+      "tooltip-url": "{{route}} ou {{url}} ou {{target}} ou {{path}}",
+      "trace-id": "ID de rastreio",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Botão para limpar filtros",
@@ -7464,7 +7465,7 @@
       "when": "QUANDO"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Execute o SQL do MySQL-dialect nas tabelas devolvidas das suas fontes de dados. As consultas de origem de dados (ou seja, \"A\", \"B\") estão disponíveis como tabelas e referenciadas por nome de consulta. Os campos estão disponíveis como colunas, conforme devolvidos da fonte de dados.",
       "label-operation": "Funcionamento"
     },
     "math": {
@@ -7495,7 +7496,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Limpar pastas",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Nenhuma pasta encontrada",
     "select-aria-label": "Filtro de pastas",
     "select-placeholder": "Filtrar por pasta"
   },
@@ -7544,23 +7545,23 @@
     "title": "Sair da página?"
   },
   "gauge": {
-    "category-gauge": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-neutral": "",
-    "description-show-threshold-labels": "",
-    "description-show-threshold-markers": "",
+    "category-gauge": "Medidor",
+    "description-min-height": "Altura mínima da linha (orientação horizontal)",
+    "description-min-width": "Largura mínima da coluna (orientação vertical)",
+    "description-neutral": "Deixe em branco para usar Mín. como ponto neutro",
+    "description-show-threshold-labels": "Renderizar os valores de limite em torno da barra de medição",
+    "description-show-threshold-markers": "Renderiza os limites como uma barra externa",
     "gauge-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automático",
+      "label-manual": "Manual"
     },
-    "name-gauge-size": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-neutral": "",
-    "name-show-threshold-labels": "",
-    "name-show-threshold-markers": "",
-    "placeholder-neutral": ""
+    "name-gauge-size": "Tamanho do medidor",
+    "name-min-height": "Altura mín.",
+    "name-min-width": "Largura mín.",
+    "name-neutral": "Neutro",
+    "name-show-threshold-labels": "Mostrar as etiquetas de limite",
+    "name-show-threshold-markers": "Mostrar os marcadores de limite",
+    "placeholder-neutral": "auto"
   },
   "gen-ai": {
     "apply-suggestion": "Aplicar",
@@ -7569,51 +7570,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Gazetteer não encontrado",
+      "warning-no-geometry": "não foi possível encontrar a geometria",
+      "warning-select-geohash": "Selecionar campo geohash",
+      "warning-select-lat-long": "Selecionar campos de latitude/longitude",
+      "warning-select-lookup": "Selecionar campo de pesquisa",
+      "warning-unable-to-find": "Não foi possível encontrar os campos de localização"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nenhum campo de cadeia de caracteres encontrado"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nenhum campo numérico encontrado"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nenhum campo numérico encontrado"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Nenhum campo de cadeia de caracteres encontrado"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Gazetteer",
+      "name-geohash-field": "Campo Geohash",
+      "name-latitude-field": "Campo de latitude",
+      "name-location-mode": "Modo de localização",
+      "name-longitude-field": "Campo de longitude",
+      "name-lookup-field": "Campo de pesquisa"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Identificar automaticamente os dados de localização com base nos nomes de campo predefinidos",
+        "description-coords": "Especificar campos de latitude e longitude",
+        "description-geohash": "Especificar campo geohash",
+        "description-lookup": "Especifique o Gazetteer e o campo de pesquisa",
+        "label-auto": "Automático",
+        "label-coords": "Coordenadas",
+        "label-geohash": "Geohash",
+        "label-lookup": "Pesquisar"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Camada de mapa de base",
+    "category-map-controls": "Controlos do mapa",
+    "category-map-layers": "Camadas do mapa",
+    "category-map-view": "Vista do mapa",
     "coordinates-map-view-editor": {
       "label-latitude": "Latitude",
       "label-longitude": "Longitude"
@@ -7622,15 +7623,15 @@
       "center": "Centro:",
       "zoom": "Ampliar:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Esta localização será mostrada quando o painel for carregado pela primeira vez.",
+    "description-mouse-wheel-zoom": "Ativar o controlo de zoom através da roda do rato",
+    "description-no-repeat": "Impedir que o mapa se repita horizontalmente",
+    "description-share-view": "Use a mesma visualização em vários painéis. Nota: isto pode exigir uma recarga do painel.",
+    "description-show-attribution": "Mostrar as informações de atribuição da origem do mapa no canto inferior direito",
+    "description-show-debug": "Mostrar informações do mapa",
+    "description-show-measure": "Mostrar ferramentas para fazer medições no mapa",
+    "description-show-scale": "Indicar a escala do mapa",
+    "description-show-zoom": "Mostrar botões de controlo de zoom no canto superior esquerdo",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Camada"
@@ -7654,12 +7655,12 @@
       "aria-label-add-geomap-style-rule": "Adicionar regra de estilo geomap"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Camada de base",
+      "description-display-tooltip": "Mostrar a dica de ferramenta para a camada",
+      "name-data": "Dados",
+      "name-display-tooltip": "Mostrar dica de ferramenta",
+      "name-layer-type": "Tipo de camada",
+      "name-opacity": "Opacidade"
     },
     "layers-editor": {
       "label-add-layer": "Adicionar camada",
@@ -7672,9 +7673,9 @@
       "use-current-map-settings": "Utilizar as definições atuais do mapa"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Mostrar legenda do mapa",
+      "name-show-legend": "Mostrar legenda",
+      "name-styles": "Estilos"
     },
     "markers-legend": {
       "title-symbol": "Símbolo"
@@ -7683,27 +7684,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Mostrar ferramentas de medição"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Vista inicial",
+    "name-mouse-wheel-zoom": "Zoom por roda do rato",
+    "name-no-repeat": "Sem repetição de mapa",
+    "name-share-view": "Partilhar vista",
+    "name-show-attribution": "Mostrar atribuição",
+    "name-show-debug": "Mostrar depuração",
+    "name-show-measure": "Mostrar ferramentas de medição",
+    "name-show-scale": "Mostrar escala",
+    "name-show-zoom": "Mostrar controlo de zoom",
+    "name-tooltip": "Descrição",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Nenhum campo de string encontrado"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "A camada do mapa base é configurada pelo administrador do servidor."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Centro",
+        "label-left": "Esquerda",
+        "label-right": "Direita"
       },
       "label-align": "Alinhar",
       "label-baseline": "Linha de base",
@@ -7719,12 +7720,12 @@
       "label-text-label": "Etiqueta de texto",
       "label-x-offset": "Deslocamento de X",
       "label-y-offset": "Deslocamento de Y",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Selecionar um símbolo",
+      "placeholderText-select-symbol-or-add-text": "Selecione um símbolo ou adicione uma etiqueta de texto",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Inferior",
+        "label-center": "Centro",
+        "label-top": "Topo"
       }
     },
     "style-rule-editor": {
@@ -7738,13 +7739,13 @@
       "placeholder-value": "valor"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Mostrar pop-up ao passar o rato",
+      "description-none": "Mostrar conteúdo ao clicar, não ao passar o rato",
+      "label-details": "Detalhes",
+      "label-none": "Nenhum"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Camada {{name}}"
     }
   },
   "get-enterprise": {
@@ -7864,400 +7865,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Pés/seg²",
+            "name-g-unit": "Unidade G",
+            "name-meters-sec": "Metros/seg²"
           },
-          "name": ""
+          "name": "Aceleração"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Minutos de arco",
+            "name-arc-seconds": "Segundos de arco",
+            "name-degrees": "Graus (°)",
+            "name-gradian": "Gradiano",
+            "name-radians": "Radianos"
           },
-          "name": ""
+          "name": "Ângulo"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Acres (ac)",
+            "name-hectares": "Hectares (ha)",
+            "name-square-feet": "Pés quadrados (ft²)",
+            "name-square-meters": "Metros quadrados (m²)",
+            "name-square-miles": "Milhas quadradas (mi²)"
           },
-          "name": ""
+          "name": "Área"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Ligado/desligado",
+            "name-true-false": "Verdadeiro/Falso",
+            "name-yes-no": "Sim/Não"
           },
-          "name": ""
+          "name": "Booleano"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "Computação"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "grama por metro cúbico (g/m³)",
+            "name-g-nm3": "grama por metro cúbico normal (g/Nm³)",
+            "name-mg-dl": "miligramas por decilitro (mg/dl)",
+            "name-mg-m3": "miligrama por metro cúbico (mg/m³)",
+            "name-mg-nm3": "miligrama por metro cúbico normal (mg/Nm³)",
+            "name-mmol-l": "milimoles por litro (mmol/l)",
+            "name-ng-m3": "nanograma por metro cúbico (ng/m³)",
+            "name-ng-nm3": "nanograma por metro cúbico normal (ng/Nm³)",
+            "name-ppb": "partes por mil milhões (ppb)",
+            "name-ppm": "partes por milhão (ppm)",
+            "name-ug-m3": "micrograma por metro cúbico (μg/m³)",
+            "name-ug-nm3": "micrograma por metro cúbico normal (μg/Nm³)"
           },
-          "name": ""
+          "name": "Concentração"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Lev búlgaro (BGN)",
+            "name-brl": "Real (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "Franco suíço (CHF)",
+            "name-czk": "Coroa checa (czk)",
+            "name-dkk": "Coroa dinamarquesa (kr)",
+            "name-eur": "Euro (€)",
+            "name-gbp": "Libra (£)",
+            "name-idr": "Rupia indonésia (Rp)",
+            "name-ils": "Novo shekel israelita (₪)",
+            "name-inr": "Rúpia indiana (₹)",
+            "name-isk": "Coroa islandesa (kr)",
+            "name-jpy": "Iene (¥)",
+            "name-krw": "Won sul-coreano (₩)",
+            "name-mbtc": "Milli Bitcoin (฿)",
+            "name-myr": "Ringgit malaio (RM)",
+            "name-nok": "Coroa norueguesa (kr)",
+            "name-php": "Peso filipino (PHP)",
+            "name-pln": "Złoty polaco (PLN)",
+            "name-pyg": "Guaraní (₲)",
+            "name-rub": "Rublo (₽)",
+            "name-sek": "Coroa sueca (kr)",
+            "name-try": "Lira turca (₺)",
+            "name-uah": "Grívnia (₴)",
+            "name-ubtc": "Micro Bitcoin (฿)",
+            "name-usd": "Dólar ($)",
+            "name-uyu": "Peso uruguaio (UYU)",
+            "name-vnd": "Dong vietnamita (VND)",
+            "name-xpf": "Franco CFP (XPF)",
+            "name-zar": "Rand sul-africano (R)"
           },
-          "name": ""
+          "name": "Moeda"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bits(IEC)",
+            "name-bits-si": "bits(SI)",
+            "name-bytes-iec": "bytes(IEC)",
+            "name-bytes-si": "bytes(SI)",
+            "name-gibibytes": "gibibytes",
+            "name-gigabytes": "gigabytes",
+            "name-kibibytes": "kibibytes",
+            "name-kilobytes": "kilobytes",
+            "name-mebibytes": "mebibytes",
+            "name-megabytes": "megabytes",
+            "name-pebibytes": "pebibytes",
+            "name-petabytes": "petabytes",
+            "name-tebibytes": "tebibytes",
+            "name-terabytes": "terabytes"
           },
-          "name": ""
+          "name": "Dados"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bits/seg(IEC)",
+            "name-bits-sec-si": "bits/seg(SI)",
+            "name-bytes-sec-iec": "bytes/seg(IEC)",
+            "name-bytes-sec-si": "bytes/seg(SI)",
+            "name-gibibits-sec": "gibibits/seg",
+            "name-gibibytes-sec": "gibibytes/seg",
+            "name-gigabits-sec": "gigabits/seg",
+            "name-gigabytes-sec": "gigabytes/seg",
+            "name-kibibits-sec": "kibibits/seg",
+            "name-kibibytes-sec": "kibibytes/seg",
+            "name-kilobits-sec": "kilobits/seg",
+            "name-kilobytes-sec": "kilobytes/seg",
+            "name-mebibits-sec": "mebibits/seg",
+            "name-mebibytes-sec": "mebibytes/seg",
+            "name-megabits-sec": "megabits/seg",
+            "name-megabytes-sec": "megabytes/seg",
+            "name-packets-sec": "pacotes/seg",
+            "name-pebibits-sec": "pebibits/seg",
+            "name-pebibytes-sec": "pebibytes/seg",
+            "name-petabits-sec": "petabits/seg",
+            "name-petabytes-sec": "petabytes/seg",
+            "name-tebibits-sec": "tebibits/seg",
+            "name-tebibytes-sec": "tebibytes/seg",
+            "name-terabits-sec": "terabits/seg",
+            "name-terabytes-sec": "terabytes/seg"
           },
-          "name": ""
+          "name": "Taxa de dados"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Predefinição de data e hora",
+            "name-datetime-iso": "Data e hora ISO",
+            "name-datetime-iso-no-date": "Data e hora ISO (sem data se for hoje)",
+            "name-datetime-local": "Data e hora local",
+            "name-datetime-local-no-date": "Data e hora local (sem data se for hoje)",
+            "name-datetime-us": "Data e hora EUA",
+            "name-datetime-us-no-date": "Data e hora EUA (sem data se for hoje)",
+            "name-from-now": "A partir de agora"
           },
-          "name": ""
+          "name": "Data e hora"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Ampere [A]",
+            "name-ampere-hour": "Ampere-hora (Ah)",
+            "name-decibel-milliwatt": "Decibel-milliwatt (dBm)",
+            "name-electron-volt": "Eletrão-volt (eV)",
+            "name-farad": "Farad (F)",
+            "name-femtofarad": "Femtofarad (fF)",
+            "name-gigawatt": "Gigawatt (GW)",
+            "name-henry": "Henry (H)",
+            "name-joule": "Joule (J)",
+            "name-kiloampere": "Quiloampere (kA)",
+            "name-kiloampere-hour": "Quiloampere-hora (kAh)",
+            "name-kiloohm": "Quilo-ohm (kΩ)",
+            "name-kilovolt": "Quilovolt (kV)",
+            "name-kilovolt-ampere": "Quilovolt-Ampere (kVA)",
+            "name-kilovolt-ampere-reactive": "Quilovolt-Ampere reativo (kVAr)",
+            "name-kilowatt": "Quilowatt (kW)",
+            "name-kilowatt-hour": "Quilowatt-hora (kWh)",
+            "name-kilowatt-min": "Quilowatt-min (kWm)",
+            "name-lumens": "Lúmens (Lm)",
+            "name-megaohm": "Megaohm (MΩ)",
+            "name-megawatt": "Megawatt (MW)",
+            "name-megawatt-hour": "Megawatt-hora (MWh)",
+            "name-microfarad": "Microfarad (µF)",
+            "name-microhenry": "Micro-henry (µH)",
+            "name-milliampere": "Miliampere (mA)",
+            "name-milliampere-hour": "Miliampere-hora (mAh)",
+            "name-millihenry": "Milli-henry (mH)",
+            "name-milliohm": "Mili-ohm (mΩ)",
+            "name-millivolt": "Millivolt (mV)",
+            "name-milliwatt": "Milliwatt (mW)",
+            "name-nanofarad": "Nanofarad (nF)",
+            "name-ohm": "Ohm (Ω)",
+            "name-picofarad": "Picofarad (pF)",
+            "name-volt": "Volt (V)",
+            "name-volt-ampere": "Volt-Ampere (VA)",
+            "name-volt-ampere-reactive": "Volt-Ampere reativo (VAr)",
+            "name-watt": "Watt W",
+            "name-watt-hour": "Watt-hora (Wh)",
+            "name-watt-hour-per-kg": "Watt-hora por quilograma (Wh/kg)",
+            "name-watt-square-meter": "Watt por metro quadrado (W/m²)"
           },
-          "name": ""
+          "name": "Energia"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Pés cúbicos/min (cfm)",
+            "name-cubic-feet-sec": "Pés cúbicos/seg (cfs)",
+            "name-cubic-meters-sec": "Metros cúbicos/seg (cms)",
+            "name-gallons-min": "Galões/min (gpm)",
+            "name-litre-hour": "Litro/hora",
+            "name-litre-min": "Litros/min (l/min)",
+            "name-lux": "Lux (lx)",
+            "name-millilitre-min": "mililitro/min (ml/min)"
           },
-          "name": ""
+          "name": "Fluxo"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Quilonewton-metros (kNm)",
+            "name-kilonewtons": "Quilonewtons (kN)",
+            "name-newton-meters": "Newton-metros (Nm)",
+            "name-newtons": "Newtons (N)"
           },
-          "name": ""
+          "name": "Forçar"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "exahashes/seg",
+            "name-gigahashes-sec": "gigahashes/seg",
+            "name-hashes-sec": "hashes/seg",
+            "name-kilohashes-sec": "kilohashes/seg",
+            "name-megahashes-sec": "megahashes/seg",
+            "name-petahashes-sec": "petahashes/seg",
+            "name-terahashes-sec": "terahashes/seg"
           },
-          "name": ""
+          "name": "Taxa de hash"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "pés (ft)",
+            "name-inch": "polegada (pol.)",
+            "name-kilometer": "quilómetro (km)",
+            "name-meter": "metro (m)",
+            "name-mile": "milha (mi)",
+            "name-millimeter": "milímetro (mm)"
           },
-          "name": ""
+          "name": "Comprimento"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "grama (g)",
+            "name-kilogram": "quilograma (kg)",
+            "name-metric-ton": "tonelada métrica (t)",
+            "name-milligram": "miligrama (mg)",
+            "name-pound": "libra (lb)"
           },
-          "name": ""
+          "name": "Equilíbrio de"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Candela (cd)",
+            "name-decibel": "Decibel",
+            "name-hexadecimal": "Hexadecimal",
+            "name-hexadecimal-0x": "Hexadecimal (0x)",
+            "name-humidity": "Humidade (%H)",
+            "name-locale": "Formato local",
+            "name-number": "Número",
+            "name-percent-1": "Percentagem (0,0-1,0)",
+            "name-percent-100": "Percentagem (0-100)",
+            "name-pixels": "Pixels",
+            "name-scientific": "Notação científica",
+            "name-short": "curto",
+            "name-si-short": "SI curto",
+            "name-string": "String"
           },
-          "name": ""
+          "name": "Vários"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Bares",
+            "name-hectopascals": "Hectopascals",
+            "name-inches-mercury": "Polegadas de mercúrio",
+            "name-kilobars": "Quilobares",
+            "name-kilopascals": "Quilopascals",
+            "name-millibars": "Milibares",
+            "name-pascals": "Pascals",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Pressão"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Becquerel (Bq)",
+            "name-curie": "curie (Ci)",
+            "name-exposure": "Exposição (C/kg)",
+            "name-gray": "Gray (Gy)",
+            "name-microsievert": "microSievert (µSv)",
+            "name-microsievert-hour": "microSievert/hora (µSv/h)",
+            "name-millisievert": "miliSievert (mSv)",
+            "name-millisievert-hour": "miliSievert/hora (mSv/h)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "roentgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/hora (Sv/h)"
           },
-          "name": ""
+          "name": "Radiação"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Graus por segundo (°/s)",
+            "name-gigahertz": "Gigahertz (GHz)",
+            "name-hertz": "Hertz (Hz)",
+            "name-kilohertz": "Quilohertz (kHz)",
+            "name-megahertz": "Megahertz (MHz)",
+            "name-radians-sec": "Radianos por segundo (rad/s)",
+            "name-rpm": "Rotações por minuto (rpm)"
           },
-          "name": ""
+          "name": "Velocidade de rotação"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsius (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Temperatura"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "contagens/min (cpm)",
+            "name-counts-sec": "contagens/seg (cps)",
+            "name-events-min": "eventos/min (epm)",
+            "name-events-sec": "eventos/seg (eps)",
+            "name-io-ops-sec": "I/O ops/seg (iops)",
+            "name-messages-min": "mensagens/min (mpm)",
+            "name-messages-sec": "mensagens/seg (mps)",
+            "name-ops-min": "ops/min (opm)",
+            "name-ops-sec": "ops/seg (ops)",
+            "name-reads-min": "leituras/min (rpm)",
+            "name-reads-sec": "leituras/seg (rps)",
+            "name-records-min": "registos/min (rpm)",
+            "name-records-sec": "registos/seg (rps)",
+            "name-requests-min": "pedidos/min (rpm)",
+            "name-requests-sec": "pedidos/seg (rps)",
+            "name-rows-min": "linhas/min (rpm)",
+            "name-rows-sec": "linhas/seg (rps)",
+            "name-writes-min": "escritas/min (wpm)",
+            "name-writes-sec": "escritas/seg (wps)"
           },
-          "name": ""
+          "name": "Processamento"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "relógio (ms)",
+            "name-clock-s": "relógio (seg)",
+            "name-days": "dias (d)",
+            "name-duration-dhms": "duração (d hh:mm:ss)",
+            "name-duration-hms": "duração (hh:mm:ss)",
+            "name-duration-ms": "duração (ms)",
+            "name-duration-s": "duração (s)",
+            "name-hertz": "Hertz (1/s)",
+            "name-hours": "horas (h)",
+            "name-microseconds": "microssegundos (µs)",
+            "name-milliseconds": "milissegundos (ms)",
+            "name-minutes": "minutos (m)",
+            "name-nanoseconds": "nanosegundos (ns)",
+            "name-seconds": "segundos (seg)",
+            "name-timeticks": "Timeticks (s/100)"
           },
-          "name": ""
+          "name": "Hora"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "quilómetros/hora (km/h)",
+            "name-knot": "nó (kn)",
+            "name-meters-second": "metros/segundo (m/s)",
+            "name-miles-hour": "milhas/hora (mph)"
           },
-          "name": ""
+          "name": "Velocidade"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "decímetro cúbico",
+            "name-cubic-meter": "metro cúbico",
+            "name-gallons": "galões",
+            "name-litre": "litro (l)",
+            "name-millilitre": "mililitro (ml)",
+            "name-normal-cubic-meter": "Metro cúbico normal"
           },
-          "name": ""
+          "name": "Volume"
         }
       }
     }
@@ -8300,85 +8301,85 @@
     },
     "builder": {
       "axis": {
-        "category-axis": "",
-        "color-label": "",
+        "category-axis": "Eixo",
+        "color-label": "Cor",
         "color-options": {
-          "label-series": "",
-          "label-text": ""
+          "label-series": "Série",
+          "label-text": "Texto"
         },
         "grid-line-options": {
-          "label-auto": "",
-          "label-off": "",
-          "label-on": ""
+          "label-auto": "Automático",
+          "label-off": "Desligado",
+          "label-on": "Ligado"
         },
-        "name-centered-zero": "",
-        "name-grid-lines": "",
-        "name-label": "",
-        "name-placement": "",
-        "name-scale": "",
-        "name-show-border": "",
-        "name-soft-max": "",
-        "name-soft-min": "",
-        "name-width": "",
-        "placeholder-label": "",
-        "placeholder-soft-max": "",
-        "placeholder-soft-min": "",
-        "placeholder-width": "",
+        "name-centered-zero": "Zero centralizado",
+        "name-grid-lines": "Mostrar as linhas da grelha",
+        "name-label": "Etiqueta",
+        "name-placement": "Posicionamento",
+        "name-scale": "Escala",
+        "name-show-border": "Mostrar a borda",
+        "name-soft-max": "Máx. suave",
+        "name-soft-min": "Mín. suave",
+        "name-width": "Largura",
+        "placeholder-label": "Texto opcional",
+        "placeholder-soft-max": "Ver: Opções predefinidas > Máx.",
+        "placeholder-soft-min": "Ver: Opções predefinidas > Mín.",
+        "placeholder-width": "Automático",
         "scale-distribution-editor": {
           "distribution-options": {
-            "label-linear": "",
-            "label-log": "",
-            "label-symlog": ""
+            "label-linear": "Linear",
+            "label-log": "Logarítmico",
+            "label-symlog": "Symlog"
           }
         }
       },
       "legend": {
-        "category": "",
-        "description-values": "",
+        "category": "Legenda",
+        "description-values": "Selecionar os valores ou cálculos para mostrar na legenda",
         "mode-options": {
-          "label-list": "",
-          "label-table": ""
+          "label-list": "Lista",
+          "label-table": "Tabela"
         },
-        "name-mode": "",
-        "name-placement": "",
-        "name-values": "",
-        "name-visibility": "",
-        "name-width": "",
+        "name-mode": "Modo",
+        "name-placement": "Posicionamento",
+        "name-values": "Valores",
+        "name-visibility": "Visibilidade",
+        "name-width": "Largura",
         "placement-options": {
-          "label-bottom": "",
-          "label-right": ""
+          "label-bottom": "Inferior",
+          "label-right": "Direita"
         }
       },
       "stacking": {
-        "name-stack-series": ""
+        "name-stack-series": "Empilhar a série"
       },
       "text": {
-        "category-text-size": "",
-        "name-percent-change": "",
-        "name-title": "",
-        "name-value": "",
-        "placeholder-percent-change": "",
-        "placeholder-title": "",
-        "placeholder-value": ""
+        "category-text-size": "Tamanho do texto",
+        "name-percent-change": "Variação percentual",
+        "name-title": "Título",
+        "name-value": "Valor",
+        "placeholder-percent-change": "Automático",
+        "placeholder-title": "Automático",
+        "placeholder-value": "Automático"
       },
       "tooltip": {
-        "category": "",
-        "description-hover-proximity": "",
+        "category": "Descrição",
+        "description-hover-proximity": "Qual é a distância a que o cursor deve estar de um ponto para acionar a descrição, em píxeis",
         "modeOptions": {
-          "label-all": "",
-          "label-hidden": "",
-          "label-single": ""
+          "label-all": "Tudo",
+          "label-hidden": "Oculto",
+          "label-single": "Único"
         },
-        "name-hide-zeros": "",
-        "name-hover-proximity": "",
-        "name-max-height": "",
-        "name-max-width": "",
-        "name-tooltip-mode": "",
-        "name-values-sort-order": "",
+        "name-hide-zeros": "Ocultar zeros",
+        "name-hover-proximity": "Proximidade do cursor",
+        "name-max-height": "Altura máx.",
+        "name-max-width": "Largura máxima",
+        "name-tooltip-mode": "Modo de descrição",
+        "name-values-sort-order": "Ordem de classificação dos valores",
         "sortOptions": {
-          "label-ascending": "",
-          "label-descending": "",
-          "label-none": ""
+          "label-ascending": "Ascendente",
+          "label-descending": "Descendente",
+          "label-none": "Nenhum"
         }
       }
     },
@@ -8386,7 +8387,7 @@
       "option": "opção"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Abrir pré-visualização da imagem"
     },
     "cascader": {
       "clear-button": "Limpar a seleção"
@@ -8400,9 +8401,9 @@
       "aria-label-selected-color": "cor {{colorLabel}} "
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Eliminar",
       "cancel": "Cancelar",
-      "confirmText-delete": ""
+      "confirmText-delete": "Eliminar"
     },
     "confirm-content": {
       "placeholder": "Digite \"{{confirmPromptText}}\" para confirmar"
@@ -8507,56 +8508,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "Abril",
+        "label-august": "Agosto",
+        "label-december": "Dezembro",
+        "label-february": "Fevereiro",
+        "label-january": "Janeiro",
+        "label-july": "Julho",
+        "label-june": "Junho",
+        "label-march": "Março",
+        "label-may": "Maio",
+        "label-november": "Novembro",
+        "label-october": "Outubro",
+        "label-september": "Setembro"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Anteontem",
+        "last-1-hour": "Última 1 hora",
+        "last-1-year": "Último ano",
+        "last-12-hours": "Últimas 12 horas",
+        "last-15-mins": "Últimos 15 minutos",
+        "last-2-days": "Últimos 2 dias",
+        "last-2-years": "Últimos 2 anos",
+        "last-24-hours": "Últimas 24 horas",
+        "last-3-hours": "Últimas 3 horas",
+        "last-30-days": "Últimos 30 dias",
+        "last-30-mins": "Últimos 30 minutos",
+        "last-5-mins": "Últimos 5 minutos",
+        "last-5-years": "Últimos 5 anos",
+        "last-6-hours": "Últimas 6 horas",
+        "last-6-months": "Últimos 6 meses",
+        "last-7-days": "Últimos 7 dias",
+        "last-90-days": "Últimos 90 dias",
+        "previous-fiscal-quarter": "Trimestre fiscal anterior",
+        "previous-fiscal-year": "Ano fiscal anterior",
+        "previous-month": "Mês anterior",
+        "previous-week": "Semana anterior",
+        "previous-year": "Ano anterior",
+        "this-day-last-week": "Este dia na semana passada",
+        "this-fiscal-quarter": "Este trimestre fiscal",
+        "this-fiscal-quarter-so-far": "Este trimestre fiscal até agora",
+        "this-fiscal-year": "Este ano fiscal",
+        "this-fiscal-year-so-far": "Este ano fiscal até agora",
+        "this-month": "Este mês",
+        "this-month-so-far": "Este mês até agora",
+        "this-week": "Esta semana",
+        "this-week-so-far": "Esta semana até agora",
+        "this-year": "Este ano",
+        "this-year-so-far": "Este ano até agora",
+        "today": "Hoje",
+        "today-so-far": "Hoje até agora",
+        "yesterday": "Ontem"
       }
     },
     "drawer": {
@@ -8598,33 +8599,33 @@
       "tooltip-expand-all": "Expandir todas as linhas"
     },
     "matchers-ui": {
-      "description-field-name-by-regex-matcher": "",
-      "description-fields-by-query": "",
-      "description-fields-with-name": "",
-      "description-fields-with-type": "",
-      "description-fields-with-value": "",
+      "description-field-name-by-regex-matcher": "Definir propriedades para campos com nomes que correspondam a um regex",
+      "description-fields-by-query": "Definir propriedades para campos de uma consulta específica",
+      "description-fields-with-name": "Definir propriedades para um campo específico",
+      "description-fields-with-type": "Definir propriedades para campos de um tipo específico (número, cadeia de carateres, booleano)",
+      "description-fields-with-value": "Definir propriedades para campos com uma condição de redução",
       "field-name-picker": {
-        "placeholder": ""
+        "placeholder": "Selecionar campo"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Booleano",
+        "label-enum": "Enum.",
+        "label-number": "Número",
+        "label-other": "Outro",
+        "label-string": "String",
+        "label-time": "Hora",
+        "label-traces": "Vestígios"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Quadros ({{framesCount}}): {{framesNames}}",
+        "label": "Consulta: {{refId}}",
+        "label-missing-ref-id": "Consulta: (refId em falta)"
       },
-      "name-field-name-by-regex-matcher": "",
-      "name-fields-by-query": "",
-      "name-fields-with-name": "",
-      "name-fields-with-type": "",
-      "name-fields-with-value": ""
+      "name-field-name-by-regex-matcher": "Campos com um nome que corresponda a um regex",
+      "name-fields-by-query": "Campos devolvidos pela consulta",
+      "name-fields-with-name": "Campos com nome",
+      "name-fields-with-type": "Campos com tipo",
+      "name-fields-with-value": "Campos com valores"
     },
     "menu-item": {
       "keyboard-shortcut-label": "Atalho de teclado"
@@ -8652,8 +8653,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "alternar painel de recolha",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Barra de carregamento do painel",
+      "ariaLabel-panel-status": "Estado do painel",
       "tooltip-cancel": "Cancelar consulta",
       "tooltip-cancel-loading": "Cancelar consulta",
       "tooltip-stop-streaming": "Parar a transmissão",
@@ -8722,12 +8723,12 @@
       "inspect-drawer-title": "Inspecionar valor",
       "inspect-menu-label": "Inspecionar valor",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Sem dados"
       },
       "no-values-label": "Nenhum valor",
       "pagination-summary": "{{itemsRangeStart}} - {{displayedEnd}} de {{numRows}} linhas",
       "sparkline": {
-        "no-data": ""
+        "no-data": "sem dados"
       }
     },
     "tags": {
@@ -8735,7 +8736,7 @@
     },
     "tags-input": {
       "add": "Adicionar",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Nova etiqueta (introduzir chave para adicionar)",
       "remove": "Remover etiqueta: {{name}}"
     },
     "time-sync-button": {
@@ -8752,55 +8753,55 @@
       "config": {
         "get-graph-field-options": {
           "axis-placement": {
-            "description-auto": "",
-            "label-auto": "",
-            "label-hidden": "",
-            "label-left": "",
-            "label-right": ""
+            "description-auto": "Primeiro campo à esquerda, o restante à direita",
+            "label-auto": "Automático",
+            "label-hidden": "Oculto",
+            "label-left": "Esquerda",
+            "label-right": "Direita"
           },
           "bar-alignment": {
-            "description-after": "",
-            "description-before": "",
-            "description-center": ""
+            "description-after": "Depois",
+            "description-before": "Antes",
+            "description-center": "Centro"
           },
           "draw-style": {
-            "label-bars": "",
-            "label-lines": "",
-            "label-points": ""
+            "label-bars": "Barras",
+            "label-lines": "Linhas",
+            "label-points": "Pontos"
           },
           "fill-gradient": {
-            "description-hue": "",
-            "description-opacity": "",
-            "description-scheme": "",
-            "label-hue": "",
-            "label-none": "",
-            "label-opacity": "",
-            "label-scheme": ""
+            "description-hue": "Pequeno gradiente da tonalidade de cor",
+            "description-opacity": "Ativar gradiente de opacidade de preenchimento",
+            "description-scheme": "Usar esquema de cores para definir o gradiente",
+            "label-hue": "Tonalidade",
+            "label-none": "Nenhum",
+            "label-opacity": "Opacidade",
+            "label-scheme": "Esquema"
           },
           "line-interpolation": {
-            "description-linear": "",
-            "description-smooth": "",
-            "description-step-after": "",
-            "description-step-before": ""
+            "description-linear": "Linear",
+            "description-smooth": "Suave",
+            "description-step-after": "Passo seguinte",
+            "description-step-before": "Passo anterior"
           },
           "show-points": {
-            "description-auto": "",
-            "label-always": "",
-            "label-auto": "",
-            "label-never": ""
+            "description-auto": "Mostrar pontos quando a densidade estiver baixa",
+            "label-always": "Sempre",
+            "label-auto": "Automático",
+            "label-never": "Nunca"
           },
           "stacking": {
-            "label-100": "",
-            "label-normal": "",
-            "label-off": ""
+            "label-100": "100%",
+            "label-normal": "Normal",
+            "label-off": "Desligado"
           },
           "thresholds-display-mode": {
-            "label-dashed-lines": "",
-            "label-filled-regions": "",
-            "label-filled-regions-and-dashed-lines": "",
-            "label-filled-regions-and-lines": "",
-            "label-lines": "",
-            "label-off": ""
+            "label-dashed-lines": "Como linhas (tracejadas)",
+            "label-filled-regions": "Como regiões preenchidas",
+            "label-filled-regions-and-dashed-lines": "Como regiões e linhas preenchidas (tracejadas)",
+            "label-filled-regions-and-lines": "Como regiões e linhas preenchidas",
+            "label-lines": "Como linhas",
+            "label-off": "Desligado"
           }
         }
       }
@@ -8828,14 +8829,14 @@
       "footer-add-annotation": "Adicionar anotação",
       "footer-click-to-action": "Clique para {{actionTitle}}",
       "footer-click-to-navigate": "Clique para abrir {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Filtrar por \"{{value}}\"",
       "timestamp": "Registo de data e hora"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Predefinição",
+      "weekStarts-label-monday": "Segunda-feira",
+      "weekStarts-label-saturday": "Sábado",
+      "weekStarts-label-sunday": "Domingo"
     }
   },
   "graph": {
@@ -8848,78 +8849,78 @@
   },
   "heatmap": {
     "calculate-from-data-options": {
-      "label-no": "",
-      "label-yes": ""
+      "label-no": "Não",
+      "label-yes": "Sim"
     },
-    "category-cell-display": "",
-    "category-colors": "",
-    "category-exemplars": "",
-    "category-heatmap": "",
-    "category-legend": "",
-    "category-tooltip": "",
-    "category-y-axis": "",
+    "category-cell-display": "Mostrar a célula",
+    "category-colors": "Cores",
+    "category-exemplars": "Exemplares",
+    "category-heatmap": "Mapa de calor",
+    "category-legend": "Legenda",
+    "category-tooltip": "Descrição",
+    "category-y-axis": "Eixo Y",
     "mode-options": {
-      "label-opacity": "",
-      "label-scheme": ""
+      "label-opacity": "Opacidade",
+      "label-scheme": "Esquema"
     },
-    "name-axis-label": "",
-    "name-axis-width": "",
-    "name-calculate-from-data": "",
-    "name-cell-gap": "",
-    "name-color": "",
-    "name-decimals": "",
-    "name-end-color-at-value": "",
-    "name-exponent": "",
-    "name-hide-cells-gt": "",
-    "name-hide-cells-lt": "",
-    "name-max-height": "",
-    "name-max-value": "",
-    "name-max-width": "",
-    "name-min-value": "",
-    "name-mode": "",
-    "name-placement": "",
-    "name-reverse": "",
-    "name-scale": "",
-    "name-scheme": "",
-    "name-show-color-scale": "",
-    "name-show-histogram": "",
-    "name-show-legend": "",
-    "name-start-color-from-value": "",
-    "name-steps": "",
-    "name-tick-alignment": "",
-    "name-tooltip-mode": "",
-    "name-unit": "",
-    "name-value-name": "",
-    "name-y-axis-scale": "",
-    "placeholder-axis-label": "",
-    "placeholder-axis-width": "",
-    "placeholder-decimals": "",
-    "placeholder-end-color-at-value": "",
-    "placeholder-hide-cells-gt": "",
-    "placeholder-hide-cells-lt": "",
-    "placeholder-max-value": "",
-    "placeholder-min-value": "",
-    "placeholder-start-color-from-value": "",
-    "placeholder-value-name": "",
+    "name-axis-label": "Etiqueta do eixo",
+    "name-axis-width": "Largura do eixo",
+    "name-calculate-from-data": "Calcular a partir de dados",
+    "name-cell-gap": "Espaço entre as células",
+    "name-color": "Cor",
+    "name-decimals": "Decimais",
+    "name-end-color-at-value": "Terminar a escala de cores no valor",
+    "name-exponent": "Expoente",
+    "name-hide-cells-gt": "Ocultar células com valores >=",
+    "name-hide-cells-lt": "Ocultar células com valores <=",
+    "name-max-height": "Altura máx.",
+    "name-max-value": "Valor máx.",
+    "name-max-width": "Largura máxima",
+    "name-min-value": "Valor mín.",
+    "name-mode": "Modo",
+    "name-placement": "Posicionamento",
+    "name-reverse": "Inverter",
+    "name-scale": "Escala",
+    "name-scheme": "Esquema",
+    "name-show-color-scale": "Mostrar a escala de cores",
+    "name-show-histogram": "Mostrar o histograma (eixo Y)",
+    "name-show-legend": "Mostrar legenda",
+    "name-start-color-from-value": "Iniciar a escala de cores a partir do valor",
+    "name-steps": "Passos",
+    "name-tick-alignment": "Alinhamento de marcação",
+    "name-tooltip-mode": "Modo de descrição",
+    "name-unit": "Unidade",
+    "name-value-name": "Nome do valor",
+    "name-y-axis-scale": "Escala do eixo Y",
+    "placeholder-axis-label": "Automático",
+    "placeholder-axis-width": "Automático",
+    "placeholder-decimals": "Automático",
+    "placeholder-end-color-at-value": "Automático (máx.)",
+    "placeholder-hide-cells-gt": "Nenhum",
+    "placeholder-hide-cells-lt": "Nenhum",
+    "placeholder-max-value": "Automático",
+    "placeholder-min-value": "Automático",
+    "placeholder-start-color-from-value": "Automático (mín.)",
+    "placeholder-value-name": "Valor",
     "placement-options": {
-      "label-hidden": "",
-      "label-left": "",
-      "label-right": ""
+      "label-hidden": "Oculto",
+      "label-left": "Esquerda",
+      "label-right": "Direita"
     },
     "scale-options": {
-      "label-exponential": "",
-      "label-linear": ""
+      "label-exponential": "Exponencial",
+      "label-linear": "Linear"
     },
     "tick-alignment-options": {
-      "label-auto": "",
-      "label-bottom": "",
-      "label-middle": "",
-      "label-top": ""
+      "label-auto": "Automático",
+      "label-bottom": "Inferior (GE)",
+      "label-middle": "Meio",
+      "label-top": "Superior (LE)"
     },
     "tooltip-mode-options": {
-      "label-all": "",
-      "label-hidden": "",
-      "label-single": ""
+      "label-all": "Tudo",
+      "label-hidden": "Oculto",
+      "label-single": "Único"
     }
   },
   "help-modal": {
@@ -8979,14 +8980,14 @@
     "troubleshooting-help": "Para solicitar ajuda na resolução de problemas, envie um instantâneo deste painel para o Apoio Técnico da Grafana Labs. O instantâneo contém dados de resposta à consulta e definições do painel."
   },
   "histogram": {
-    "category-histogram": "",
+    "category-histogram": "Histograma",
     "histogram-panel": {
       "no-histogram-found-in-response": "Nenhum histograma encontrado na resposta"
     },
-    "name-fill-opacity": "",
-    "name-gradient-mode": "",
-    "name-line-width": "",
-    "name-stacking": ""
+    "name-fill-opacity": "Opacidade de preenchimento",
+    "name-gradient-mode": "Modo de gradiente",
+    "name-line-width": "Largura da linha",
+    "name-stacking": "Empilhamento"
   },
   "inspector": {
     "inspect-data-tab": {
@@ -9215,8 +9216,8 @@
       "title-create-library-panel": "Criar painel de biblioteca"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Alterar",
+      "confirmText-replace": "Substituir"
     },
     "confirm": {
       "delete-panel": "Pretende eliminar este painel?"
@@ -9241,7 +9242,7 @@
       "usage-count_other": "Utilizado em {{count}} painéis de controlo"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Pesquisar por nome, descrição ou nome da pasta"
     },
     "loading-indicator": {
       "loading-library-panel": "A carregar painel de biblioteca..."
@@ -9367,16 +9368,16 @@
     }
   },
   "logs": {
-    "category-logs": "",
+    "category-logs": "Registos",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Exato",
+      "label-none": "Nenhum",
+      "label-numbers": "Números",
+      "label-signature": "Assinatura"
     },
-    "description-enable-infinite-scrolling": "",
-    "description-enable-syntax-highlighting": "",
-    "description-show-controls": "",
+    "description-enable-infinite-scrolling": "Experimental. Obtenha mais resultados deslocando o ecrã até à parte inferior da lista de registos.",
+    "description-enable-syntax-highlighting": "Utilizar uma gramática de coloração de sintaxe predefinida para destacar as partes relevantes das linhas de registo",
+    "description-show-controls": "Mostrar controlos para aceder à última ou primeira linha de registo e filtrar por nível de registo",
     "fields": {
       "type": {
         "loki": {
@@ -9390,8 +9391,8 @@
       }
     },
     "font-size-options": {
-      "label-default": "",
-      "label-small": ""
+      "label-default": "Predefinição",
+      "label-small": "Pequeno"
     },
     "get-dataframe-fields": {
       "vars": {
@@ -9447,64 +9448,64 @@
       "title-log-line": ""
     },
     "log-line-details": {
-      "clear-search": "",
-      "close": "",
-      "copy-shortlink": "",
-      "copy-to-clipboard": "",
-      "displayed-fields-section": "",
+      "clear-search": "Limpar",
+      "close": "Fechar detalhes do registo",
+      "copy-shortlink": "Copiar link curto",
+      "copy-to-clipboard": "Copiar para a área de transferência",
+      "displayed-fields-section": "Organizar campos exibidos",
       "fields": {
-        "adhoc-statistics": "",
-        "copy-value-to-clipboard": "",
-        "filter-out": "",
-        "filter-out-query": "",
+        "adhoc-statistics": "Estatísticas ad-hoc",
+        "copy-value-to-clipboard": "Copiar o valor para a área de transferência",
+        "filter-out": "Retirar o filtro de valor",
+        "filter-out-query": "Filtrar o valor na consulta {{query}}",
         "toggle-field-button": {
-          "field-instead-message": "",
-          "hide-this-field": ""
+          "field-instead-message": "Mostrar este campo em vez da mensagem",
+          "hide-this-field": "Ocultar este campo"
         }
       },
-      "fields-section": "",
-      "hide-log-line": "",
-      "inline-mode": "",
-      "links-section": "",
-      "log-line-field": "",
-      "log-line-section": "",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
-      "no-details": "",
-      "open-assistant": "",
-      "pin-line": "",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "fields-section": "Campos",
+      "hide-log-line": "Ocultar linha de registo",
+      "inline-mode": "Mostrar em linha",
+      "links-section": "Links",
+      "log-line-field": "Linha de registo",
+      "log-line-section": "Linha de registo",
+      "move-displayed-field-down": "Mover para baixo",
+      "move-displayed-field-up": "Mover para cima",
+      "no-details": "Nenhum campo a mostrar.",
+      "open-assistant": "Explique esta linha de registo no Assistente",
+      "pin-line": "Afixar registo",
+      "remove-displayed-field": "Remover o campo",
+      "remove-log": "Remover registo",
+      "scroll-to-logline": "Deslizar para a linha de registo",
       "search": {
-        "no-results": ""
+        "no-results": "Não há resultados para mostrar."
       },
-      "search-placeholder": "",
-      "show-context": "",
-      "show-log-line": "",
-      "sidebar-mode": "",
-      "unpin-line": ""
+      "search-placeholder": "Pesquisar por nomes e valores dos campos",
+      "show-context": "Mostrar contexto",
+      "show-log-line": "Mostrar linha de registo",
+      "sidebar-mode": "Ancorar à direita",
+      "unpin-line": "Retirar registo"
     },
     "log-line-menu": {
       "copy-link": "Copiar link para a linha de registo",
       "copy-log": "Copiar linha de registo",
       "hide-details": "Mostrar detalhes do registo",
       "icon-label": "Menu de registo",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Linha de registo",
+      "log-line-explainer": "Explique esta linha de registo de forma concisa",
+      "open-assistant": "Explique esta linha de registo no Assistente",
       "pin-to-outline": "Afixar registo",
       "show-context": "Mostrar contexto",
       "show-details": "Ocultar detalhes do registo",
       "unpin-from-outline": "Retirar registo"
     },
     "log-list-search": {
-      "close": "",
-      "filter": "",
-      "info": "",
-      "input-placeholder": "",
-      "next": "",
-      "prev": ""
+      "close": "Fechar a pesquisa",
+      "filter": "Filtrar registos correspondentes",
+      "info": "Pesquisa do lado do cliente por cadeias de carateres dentro dos registos exibidos. Não se deve confundir com filtros de consulta. Utilizar este componente para pesquisar cadeias de carateres específicas nos seus resultados de registo.",
+      "input-placeholder": "Pesquisar em registos",
+      "next": "Próximo resultado",
+      "prev": "Resultado anterior"
     },
     "log-row-context-modal": {
       "error-loading-log-more-logs": "Erro ao carregar mais registos.",
@@ -9565,7 +9566,7 @@
       "escape-newlines": "Corrigir sequências de novas linhas e tabulações ignoradas incorretamente nas linhas de registo",
       "font-size-default": "Utilize um tamanho de letra pequeno",
       "font-size-small": "Utilize o tamanho de letra predefinido",
-      "hide-search": "",
+      "hide-search": "Fechar a pesquisa",
       "hide-timestamps": "Ocultar registos de hora/data",
       "hide-unique-labels": "Ocultar etiquetas únicas",
       "newest-first": "Ordenado por registos mais recentes primeiro - Clique para mostrar os mais antigos primeiro",
@@ -9578,7 +9579,7 @@
       "scroll-top": "Rolar para o topo",
       "show-ms-timestamps": "",
       "show-ns-timestamps": "",
-      "show-search": "",
+      "show-search": "Pesquisar no resultado dos registos",
       "show-timestamps": "Mostrar registos de data e hora",
       "show-unique-labels": "Mostrar etiquetas únicas",
       "unwrap-lines": "Revelar linhas",
@@ -9596,26 +9597,26 @@
         "common-labels": "Etiquetas comuns:"
       }
     },
-    "name-common-labels": "",
-    "name-deduplication": "",
-    "name-details-mode": "",
+    "name-common-labels": "Etiquetas comuns",
+    "name-deduplication": "Desduplicação",
+    "name-details-mode": "Modo de painel de detalhes de registo",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "Em linha",
+      "label-sidebar": "Barra lateral"
     },
-    "name-enable-infinite-scrolling": "",
-    "name-enable-log-details": "",
-    "name-enable-syntax-highlighting": "",
-    "name-font-size": "",
-    "name-order": "",
-    "name-prettify-json": "",
-    "name-show-controls": "",
+    "name-enable-infinite-scrolling": "Ativar deslocação infinita",
+    "name-enable-log-details": "Ativar detalhes do registo",
+    "name-enable-syntax-highlighting": "Ativar o destaque de sintaxe",
+    "name-font-size": "Tamanho do tipo de letra",
+    "name-order": "Ordem",
+    "name-prettify-json": "Embelezar JSON",
+    "name-show-controls": "Mostrar controlos",
     "name-time": "",
-    "name-unique-labels": "",
-    "name-wrap-lines": "",
+    "name-unique-labels": "Etiquetas únicas",
+    "name-wrap-lines": "Encapsular linhas",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Mais recentes primeiro",
+      "label-oldest-first": "Mais antigos primeiro"
     },
     "out-of-range-message": {
       "end-of-the-selected-time-range": "Fim do intervalo de tempo selecionado."
@@ -9630,7 +9631,7 @@
     "un-themed-log-details": {
       "aria-label-data-links": "Ligações de dados",
       "aria-label-fields": "Campos",
-      "aria-label-line": "",
+      "aria-label-line": "Linha de registo",
       "aria-label-log-level": "Nível de registo",
       "aria-label-no-details": "Sem detalhes"
     },
@@ -9651,27 +9652,27 @@
     }
   },
   "logs-new": {
-    "category-logs": "",
+    "category-logs": "Registos",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Exato",
+      "label-none": "Nenhum",
+      "label-numbers": "Números",
+      "label-signature": "Assinatura"
     },
-    "description-infinite-scrolling": "",
-    "description-show-controls": "",
-    "description-syntax-highlighting": "",
-    "name-deduplication": "",
-    "name-enable-log-details": "",
-    "name-infinite-scrolling": "",
-    "name-order": "",
-    "name-show-controls": "",
-    "name-syntax-highlighting": "",
-    "name-time": "",
-    "name-wrap-lines": "",
+    "description-infinite-scrolling": "Experimental. Obtenha mais resultados deslocando o ecrã até à parte inferior da lista de registos.",
+    "description-show-controls": "Mostrar controlos para aceder à última ou primeira linha de registo e filtrar por nível de registo",
+    "description-syntax-highlighting": "Utilizar uma gramática de coloração de sintaxe predefinida para destacar as partes relevantes das linhas de registo",
+    "name-deduplication": "Desduplicação",
+    "name-enable-log-details": "Ativar detalhes do registo",
+    "name-infinite-scrolling": "Ativar deslocação infinita",
+    "name-order": "Ordem",
+    "name-show-controls": "Mostrar controlos",
+    "name-syntax-highlighting": "Ativar o destaque de sintaxe",
+    "name-time": "Hora",
+    "name-wrap-lines": "Encapsular linhas",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Mais recentes primeiro",
+      "label-oldest-first": "Mais antigos primeiro"
     }
   },
   "manage-dashbaords": {
@@ -9698,8 +9699,8 @@
       "updated-on": "Atualizado a"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Tem a certeza de que pretende eliminar '{{snapshotToRemove}}'?",
+      "confirmText-delete": "Eliminar",
       "title-delete": "Eliminar"
     },
     "unthemed-dashboard-import": {
@@ -9711,14 +9712,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "O nome é obrigatório",
+      "message-reserved-name": "Este é um nome reservado e não pode ser utilizado para uma pasta.",
+      "message-same-name": "Já existe um painel de controlo ou uma pasta com o mesmo nome",
+      "message-same-name-general": "Já existe uma pasta ou painel de controlo na pasta geral com o mesmo nome"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Nenhuma opção encontrada"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9868,8 +9869,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Número máximo de grupos de regras de alerta atingido: elimine alguns grupos de regras de alerta ou faça upgrade do seu plano e tente novamente.",
+        "alert-rules-quota-reached": "Número máximo de regras de alerta atingido: elimine algumas regras de alerta ou faça upgrade do seu plano e tente novamente.",
         "dashboard-already-managed": "O painel de controlo já está provisionado e gerido pela Grafana na instância de nuvem. Recomendamos a utilização do painel de controlo provisionado a partir de agora. Se ainda pretender copiar o painel de controlo para a instância de nuvem, altere o ID do painel de controlo no JSON do painel de controlo, guarde um novo instantâneo e carregue novamente.",
         "datasource-already-managed": "A origem de dados já está provisionada e gerida pela Grafana na instância de nuvem. Se este for um recurso diferente, defina outro UID e tente novamente.",
         "datasource-invalid-url": "Existe uma origem de dados com um URL inválido. Forneça um URL válido e tente novamente.",
@@ -10339,7 +10340,7 @@
     "invite-user": {
       "invite-button": "Convidar",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Convidar utilizador"
     },
     "item": {
       "add-bookmark": "Adicionar aos Marcadores",
@@ -10371,12 +10372,12 @@
     "rss-button": "Novidades do blog"
   },
   "news": {
-    "category-news": "",
-    "description-show-image": "",
-    "description-url": "",
+    "category-news": "Notícias",
+    "description-show-image": "Controla se a imagem social (og:image) do artigo de notícias é mostrada acima do conteúdo de texto",
+    "description-url": "Suporta feeds RSS e Atom",
     "link-title": "Ir para o blogue da Grafana Labs",
-    "name-show-image": "",
-    "name-url": "",
+    "name-show-image": "Mostrar a imagem",
+    "name-url": "URL",
     "news-panel": {
       "body-error-loading-rss-feed": "Certifique-se de que o URL do feed está correto e que o CORS está configurado corretamente no servidor. Consulte a <2>documentação do painel de notícias.</2>",
       "loading": "A carregar...",
@@ -10385,27 +10386,27 @@
     "title": "Novidades do blog"
   },
   "node-graph": {
-    "category-edges": "",
-    "category-node-graph": "",
-    "category-nodes": "",
+    "category-edges": "Extremidades",
+    "category-node-graph": "Gráfico de nós",
+    "category-nodes": "Nós",
     "layout-algorithm-options": {
-      "description-force": "",
-      "description-grid": "",
-      "description-layered": "",
-      "label-force": "",
-      "label-grid": "",
-      "label-layered": ""
+      "description-force": "Usar um layout direcionado por força",
+      "description-grid": "Usar um layout de grelha",
+      "description-layered": "Usar um layout em camadas",
+      "label-force": "Forçar",
+      "label-grid": "Grelha",
+      "label-layered": "Em camadas"
     },
-    "name-arc-sections": "",
-    "name-layout-algorithm": "",
-    "name-main-stat-unit": "",
-    "name-secondary-stat-unit": "",
-    "name-zoom-mode": "",
+    "name-arc-sections": "Secções de arco",
+    "name-layout-algorithm": "Algoritmo de layout",
+    "name-main-stat-unit": "Unidade de estatística principal",
+    "name-secondary-stat-unit": "Unidade de estatística secundária",
+    "name-zoom-mode": "Modo de zoom",
     "zoom-mode-options": {
-      "description-cooperative": "",
-      "description-greedy": "",
-      "label-cooperative": "",
-      "label-greedy": ""
+      "description-cooperative": "Permite-lhe percorrer a página normalmente",
+      "description-greedy": "Reage a todos os gestos de ampliação",
+      "label-cooperative": "Cooperativo",
+      "label-greedy": "Ganancioso"
     }
   },
   "nodeGraph": {
@@ -10484,40 +10485,40 @@
     },
     "registry": {
       "get-all-option-editors": {
-        "description-time-zone": "",
-        "name-time-zone": ""
+        "description-time-zone": "Seleção de fuso horário",
+        "name-time-zone": "Fuso horário"
       },
       "standard-field-condigs": {
-        "category-data-links": ""
+        "category-data-links": "Ações e ligações de dados"
       },
       "standard-field-configs": {
-        "category": "",
-        "category-thresholds": "",
-        "category-value-mappings": "",
-        "description-display-name": "",
-        "description-field-min-max": "",
-        "description-max": "",
-        "description-min": "",
-        "description-no-value": "",
-        "description-value-mappings": "",
-        "name-actions": "",
-        "name-ad-hoc": "",
-        "name-color-scheme": "",
-        "name-data-links": "",
-        "name-decimals": "",
-        "name-display-name": "",
-        "name-field-min-max": "",
-        "name-max": "",
-        "name-min": "",
-        "name-no-value": "",
-        "name-thresholds": "",
-        "name-unit": "",
-        "name-value-mappings": "",
-        "placeholder-decimals": "",
-        "placeholder-display-name": "",
-        "placeholder-max": "",
-        "placeholder-min": "",
-        "placeholder-unit": ""
+        "category": "Opções predefinidas",
+        "category-thresholds": "Limites",
+        "category-value-mappings": "Mapeamentos de valor",
+        "description-display-name": "Alterar o nome do campo ou da série",
+        "description-field-min-max": "Calcular mín. e máx. por campo",
+        "description-max": "Deixe em branco para efetuar o cálculo com base em todos os valores",
+        "description-min": "Deixe em branco para efetuar o cálculo com base em todos os valores",
+        "description-no-value": "O que mostrar quando não existe nenhum valor",
+        "description-value-mappings": "Modificar o texto de exibição com base no valor de entrada",
+        "name-actions": "Ações",
+        "name-ad-hoc": "Filtrável ad-hoc",
+        "name-color-scheme": "Esquema de cores",
+        "name-data-links": "Ligações de dados",
+        "name-decimals": "Decimais",
+        "name-display-name": "Nome de exibição",
+        "name-field-min-max": "Campo mín./máx.",
+        "name-max": "Máx.",
+        "name-min": "Mín.",
+        "name-no-value": "Sem valor",
+        "name-thresholds": "Limites",
+        "name-unit": "Unidade",
+        "name-value-mappings": "Mapeamentos de valor",
+        "placeholder-decimals": "auto",
+        "placeholder-display-name": "nenhuma",
+        "placeholder-max": "auto",
+        "placeholder-min": "auto",
+        "placeholder-unit": "nenhuma"
       }
     },
     "units": {
@@ -10562,7 +10563,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Nenhuma organização encontrada",
     "select-placeholder": "Selecionar organização"
   },
   "page": {
@@ -10626,13 +10627,13 @@
     },
     "panel-data-error-view": {
       "missing-value": {
-        "number": "",
-        "string": "",
-        "time": "",
-        "unknown": ""
+        "number": "Falta um campo de número nos dados",
+        "string": "Falta um campo de cadeia de carateres nos dados",
+        "time": "Falta um campo de hora nos dados",
+        "unknown": "Não é possível visualizar os dados"
       },
       "no-value": {
-        "default": ""
+        "default": "Sem dados"
       },
       "open-visualization-suggestions": "Abrir sugestões de visualização",
       "switch-to-table": "Mudar para tabela"
@@ -10672,25 +10673,25 @@
     "select-placeholder": "Filtrar por tipo"
   },
   "piechart": {
-    "category-legend": "",
-    "category-pie-chart": "",
-    "description-labels": "",
-    "description-pie-chart-type": "",
+    "category-legend": "Legenda",
+    "category-pie-chart": "Gráfico circular",
+    "description-labels": "Selecionar as etiquetas a serem exibidas no gráfico circular",
+    "description-pie-chart-type": "Como o gráfico circular deve ser renderizado",
     "labels-options": {
-      "label-name": "",
-      "label-percent": "",
-      "label-value": ""
+      "label-name": "Nome",
+      "label-percent": "Percentagem",
+      "label-value": "Valor"
     },
     "legend-values-options": {
-      "label-percent": "",
-      "label-value": ""
+      "label-percent": "Percentagem",
+      "label-value": "Valor"
     },
-    "name-labels": "",
-    "name-legend-values": "",
-    "name-pie-chart-type": "",
+    "name-labels": "Etiquetas",
+    "name-legend-values": "Valores da legenda",
+    "name-pie-chart-type": "Tipo de gráfico circular",
     "pie-chart-type-options": {
-      "label-donut": "",
-      "label-pie": ""
+      "label-donut": "Anel",
+      "label-pie": "Circular"
     }
   },
   "playlist": {
@@ -10785,7 +10786,7 @@
         "permission": "Não possui permissão para ver esta página.",
         "title-access-denied": "Acesso negado"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Falha ao carregar o plugin",
       "no-root-app-page-component-found": "Não foi encontrado nenhum componente de página de aplicação de nível superior"
     },
     "browse": {
@@ -10829,7 +10830,7 @@
         "update-status-text": "plugins atualizados"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Tem a certeza de que pretende fazer o downgrade para a versão {{version}}? Normalmente, não deveria estar a fazer isto.",
         "downgrade-confirm": "Downgrade",
         "downgrade-title": "Fazer o downgrade da versão do plugin"
       }
@@ -10858,7 +10859,7 @@
         "dependencies": "Dependências",
         "documentation": "Documentação",
         "downloads": "Transferências",
-        "from": "",
+        "from": "De",
         "installedVersion": "Versão instalada",
         "lastCommitDate": "Data do último compromisso:",
         "latestReleaseDate": "Data de lançamento mais recente:",
@@ -10884,8 +10885,8 @@
       "message": "Nenhum plugin encontrado"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Verifique a consola para obter mais detalhes sobre o erro.",
+      "extension-error-alert-title": "Falha ao carregar a extensão: \"{{pluginId}}/{{extensionTitle}}\""
     },
     "extensions-log-data-source": {
       "message": {
@@ -10922,13 +10923,13 @@
     "install-controls-button": {
       "title-uninstall-modal": "Desinstalar {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Tem a certeza de que pretende desinstalar este plugin?",
+        "confirmText-confirm": "Confirmar"
       }
     },
     "install-controls-warning": {
       "body-not-published": "Este plugin não está publicado em <2>grafana.com/plugins</2> e não pode ser gerido através do catálogo.",
-      "enterprise-plugin-info": "",
+      "enterprise-plugin-info": "Este plugin está disponível apenas no Grafana Cloud e no Grafana Enterprise.",
       "learn-more": "Saiba mais",
       "no-valid-grafana-enterprise-license-detected": "Não foi detetada nenhuma licença válida do Grafana Enterprise.",
       "title-dev-alert": "Esta é uma compilação de desenvolvimento do plugin e não pode ser desinstalada.",
@@ -10941,6 +10942,9 @@
       "label-plugin-id": "ID do plugin",
       "label-severity": "Gravidade"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Não é possível encontrar esse plugin. Verifique se o URL está correto ou <1></1>aceda ao <3>catálogo de plugins</3>.",
       "title-plugin-not-found": "Plugin não encontrado"
@@ -11086,40 +11090,40 @@
   },
   "provisioned-resource-form": {
     "save-or-delete-resource-shared-fields": {
-      "comment-placeholder-describe-changes-optional": "",
-      "description-branch-name-in-git-hub": "",
+      "comment-placeholder-describe-changes-optional": "Adicione uma nota para descrever as suas alterações (opcional)",
+      "description-branch-name-in-git-hub": "Nome do ramo no GitHub",
       "description-inside-repository": "",
-      "label-branch": "",
-      "label-comment": "",
-      "label-path": "",
-      "label-workflow": ""
+      "label-branch": "Ramo",
+      "label-comment": "Comentário",
+      "label-path": "Caminho",
+      "label-workflow": "Fluxo de trabalho"
     }
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Este recurso está atrás do ramo em {{repoType}}.",
+      "not-saved": "Os restantes utilizadores da Grafana na sua organização continuarão a ver a versão atualmente guardada no ramo predefinido configurado até que esse ramo seja combinado",
+      "open-in-repo-button": "Abrir em {{repoType}}",
+      "open-pull-request-in-repo": "Abrir pedido de extração em {{repoType}}",
+      "view-in-repo-button": "Ver em {{repoType}} para ver as alterações mais recentes.",
+      "view-pull-request-in-repo": "Ver pedido de extração em {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "Foi criado um novo recurso num ramo em {{repoType}}.",
+    "title-loaded-pull-request-in-repo": "Este recurso é carregado a partir do ramo que acabou de criar em {{repoType}} e só é visível para si"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Recurso guardado com sucesso",
+  "provisioned-resource-request-handler-dashboard": "Painel de controlo guardado com sucesso",
+  "provisioned-resource-request-handler-folder": "Pasta criada com sucesso",
   "provisioning": {
     "banner": {
       "message": "Esta funcionalidade está atualmente em desenvolvimento ativo. Para a melhor experiência e as melhorias mais recentes, recomendamos a utilização da <2>compilação noturna</2> da Grafana."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "O ramo a utilizar para o aprovisionamento",
+      "branch-label": "Ramo",
+      "branch-required": "O ramo é obrigatório",
+      "path-description": "Caminho de subdiretório opcional dentro do repositório",
+      "path-label": "Caminho",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11128,18 +11132,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Permite que os utilizadores escolham se querem abrir um pedido de extração ao guardar as alterações. Se o repositório não permitir alterações diretas ao ramo principal, ainda poderá ser necessário um pedido de extração.",
+      "pr-workflow-label": "Ativar a opção de pedido de extração ao guardar",
+      "token-description": "Palavra-passe da aplicação Bitbucket com permissões de repositório",
+      "token-label": "Palavra-passe da aplicação",
+      "token-required": "O token Bitbucket é obrigatório",
+      "token-user-description": "O nome de utilizador que será utilizado para aceder ao repositório com a palavra-passe da aplicação",
+      "token-user-label": "Nome de utilizador",
+      "token-user-required": "O utilizador é obrigatório",
+      "url-description": "O URL do repositório Bitbucket",
+      "url-label": "URL do repositório",
+      "url-pattern": "Tem de ser um URL de repositório Bitbucket válido",
+      "url-required": "O URL do repositório é obrigatório"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Adicione um nome claro para esta ligação de repositório",
@@ -11150,12 +11154,12 @@
       "label-display-name": "Nome do visor",
       "placeholder-my-repository-connection": "A minha ligação de repositório",
       "text-loading-resource-information": "A carregar informações de recursos...",
-      "dashboards-count_one": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} painéis de controlo",
+      "dashboards-count_other": "{{count}} painéis de controlo",
       "files-count_one": "{{count}} ficheiro",
       "files-count_other": "{{count}} ficheiros",
-      "folders-count_one": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} pasta",
+      "folders-count_other": "{{count}} pasta"
     },
     "check-repository": {
       "check": "Verificar"
@@ -11229,7 +11233,7 @@
       "title-instant-updates-requests-webhooks": "Atualizações instantâneas e pedidos de extração com webhooks.",
       "title-visual-previews-in-pull-requests": "Pré-visualizações em pedidos de extração com renderização de imagens"
     },
-    "error-title-default": "",
+    "error-title-default": "Erro",
     "expanded-row": {
       "job-specification": "Definição do trabalho",
       "summary": "Resumo"
@@ -11238,8 +11242,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Configure as opções de funcionalidades necessárias"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Gerir painéis de controlo como código no Git e fornecer atualizações automaticamente",
+      "manage-your-dashboards-with-remote-provisioning": "Começar a usar o Git Sync",
       "store-dashboards-in-version-controlled-storage": "Armazenar painéis em armazenamento controlado por versão para melhor organização e acompanhamento do histórico"
     },
     "file-history-page": {
@@ -11260,16 +11264,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Adicionar uma pré-visualização de imagem das alterações do painel de controlo nos pedidos de extração. As imagens dos seus painéis de controlo Grafana serão partilhadas no seu repositório Git e visíveis para qualquer pessoa com acesso ao repositório.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Criar links de pré-visualização para pedidos de extração",
       "description-image-rendering": "Requer renderização de imagens. <2>Configurar a renderização de imagens</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(requer <2>renderização de imagem</2> e acesso público ativado)",
       "description-read-only": "Os recursos não podem ser modificados através da Grafana.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Com que frequência sincronizar as alterações do repositório",
+      "error-sync-interval-required": "O intervalo de sincronização é obrigatório",
       "label-enable-previews": "Ativar as pré-visualizações do painel de controlo em pedidos de extração",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Gerar pré-visualizações do painel de controlo",
       "label-read-only": "Apenas para leitura",
-      "label-sync-interval": ""
+      "label-sync-interval": "Intervalo de sincronização (segundos)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Não foram encontrados resultados que correspondam à sua consulta",
@@ -11301,46 +11305,46 @@
       "subtitle-provisioning-feature": "Ver e gerir as suas ligações de provisionamento"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "O ramo a utilizar para o aprovisionamento",
+      "branch-label": "Ramo",
+      "branch-required": "O ramo é obrigatório",
+      "path-description": "Caminho de subdiretório opcional dentro do repositório",
+      "path-label": "Caminho",
+      "pr-workflow-description": "Permite que os utilizadores escolham se querem abrir um pedido de extração ao guardar as alterações. Se o repositório não permitir alterações diretas ao ramo principal, ainda poderá ser necessário um pedido de extração.",
+      "pr-workflow-label": "Ativar a opção de pedido de extração ao guardar",
+      "token-description": "Token ou palavra-passe de acesso ao repositório Git",
+      "token-label": "Token de acesso",
+      "token-required": "O token do Git é obrigatório",
+      "token-user-description": "O nome de utilizador que será utilizado para aceder ao repositório com o token de acesso",
+      "token-user-label": "Nome de utilizador",
+      "token-user-required": "O utilizador é obrigatório",
+      "url-description": "O URL do repositório Git",
+      "url-label": "URL do repositório",
+      "url-pattern": "Tem de ser um URL de repositório Git válido",
+      "url-required": "O URL do repositório é obrigatório"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "O ramo a utilizar para o aprovisionamento",
+      "branch-label": "Ramo",
+      "branch-required": "O ramo é obrigatório",
+      "path-description": "Caminho de subdiretório opcional dentro do repositório",
+      "path-label": "Caminho",
+      "pr-workflow-description": "Permite que os utilizadores escolham se querem abrir um pedido de extração ao guardar as alterações. Se o repositório não permitir alterações diretas ao ramo principal, ainda poderá ser necessário um pedido de extração.",
+      "pr-workflow-label": "Ativar a opção de pedido de extração ao guardar",
+      "token-description": "Token de acesso pessoal do GitHub com permissões de repositório",
+      "token-label": "Token de acesso pessoal",
+      "token-required": "O token do GitHub é obrigatório",
+      "url-description": "URL do repositório Github",
+      "url-label": "URL do repositório",
+      "url-pattern": "Tem de ser um URL de repositório GitHub válido",
+      "url-required": "O URL do repositório é obrigatório"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "O ramo a utilizar para o aprovisionamento",
+      "branch-label": "Ramo",
+      "branch-required": "O ramo é obrigatório",
+      "path-description": "Caminho de subdiretório opcional dentro do repositório",
+      "path-label": "Caminho",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11349,15 +11353,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Permite que os utilizadores escolham se querem abrir um pedido de combinação ao guardar as alterações. Se o repositório não permitir alterações diretas ao ramo principal, ainda poderá ser necessário um pedido de combinação.",
+      "pr-workflow-label": "Ativar a opção de pedido de combinação ao guardar",
+      "token-description": "Token de acesso ao projeto GitLab com permissões de repositório",
+      "token-label": "Token de acesso ao projeto",
+      "token-required": "O token do GitLab é obrigatório",
+      "url-description": "O URL do repositório GitLab",
+      "url-label": "URL do repositório",
+      "url-pattern": "Tem de ser um URL de repositório GitLab válido",
+      "url-required": "O URL do repositório é obrigatório"
     },
     "history-view": {
       "not-found": "Não encontrado"
@@ -11385,18 +11389,18 @@
       "starting": "A iniciar...",
       "status": {
         "title-error-running-job": "Erro ao executar tarefa",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Trabalho concluído com sucesso",
+        "title-warning-running-job": "Tarefa concluída com avisos"
       },
       "summary": "Resumo",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Erro ao obter a tarefa ativa"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Caminho do sistema de ficheiros local para o repositório",
+      "path-label": "Caminho do repositório",
+      "path-required": "O caminho do repositório é obrigatório"
     },
     "mode-options": {
       "folder": {
@@ -11422,7 +11426,7 @@
     },
     "repository-actions": {
       "settings": "Definições",
-      "source-code": ""
+      "source-code": "Código-fonte"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11488,22 +11492,22 @@
       "title-queued-for-deletion": "Em fila para eliminação"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Escolha um fornecedor:",
+      "configure-file": "Configurar o provisionamento de ficheiros",
+      "configure-with-provider": "Configurar com {{ provider }}",
+      "provider-not-listed": "Se o seu fornecedor não estiver listado:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Ligar a repositórios Bitbucket",
+      "github": "GitHub",
+      "github-description": "Ligar a repositórios do GitHub",
+      "gitlab": "GitLab",
+      "gitlab-description": "Ligar a repositórios do GitLab",
+      "local": "Local",
+      "local-description": "Configurar o provisionamento de ficheiros",
+      "pure-git": "Git puro",
+      "pure-git-description": "Ligar a qualquer repositório Git"
     },
     "resource-view": {
       "base": "Base",
@@ -11534,11 +11538,11 @@
       "label-current-step": "Passo atual",
       "label-pending-step": "Passo pendente"
     },
-    "success-title-default": "",
+    "success-title-default": "Sucesso",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Falha ao iniciar a tarefa",
+      "error-no-repository-name": "Nenhum nome de repositório fornecido",
+      "error-starting-job": "Erro ao iniciar a tarefa"
     },
     "sync-repository": {
       "body-edit-configuration": "Editar a configuração",
@@ -11566,7 +11570,7 @@
       "go-to": "Aceda a",
       "make-sure": "Certifique-se de incluir estas permissões"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Aviso",
     "wizard": {
       "alert-point-1": "Os recursos não poderão ser criados, editados ou eliminados durante este processo. No último passo, irão desaparecer.",
       "alert-point-2": "Assim que o provisionamento estiver concluído, os recursos reaparecerão e serão geridos através de um armazenamento externo.",
@@ -11576,10 +11580,10 @@
       "button-next": "Concluir",
       "button-start": "Iniciar sincronização",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Isto eliminará a configuração do repositório e todo o progresso será perdido. Tem a certeza de que pretende rejeitar as suas alterações?",
+        "confirm": "Sim, rejeitar",
+        "dismiss": "Continuar a trabalhar",
+        "title": "Rejeitar a configuração do repositório?"
       },
       "step-bootstrap": "Escolha o que sincronizar",
       "step-connect": "Conectar ",
@@ -11595,7 +11599,7 @@
     "wizard-content": {
       "button-cancel": "Cancelar",
       "button-cancelling": "A cancelar... ",
-      "button-previous": "",
+      "button-previous": "Anterior",
       "button-submitting": "A enviar...",
       "error-instance-repository-exists": "O repositório de instâncias já existe"
     }
@@ -11996,7 +12000,7 @@
         "recommended": "Recomendado",
         "results": "Resultados"
       },
-      "search": ""
+      "search": "Pesquisar {{parentTitle}}"
     }
   },
   "search": {
@@ -12077,7 +12081,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Nenhuma conta de serviço encontrada",
     "select-aria-label": "Selecionador da conta de serviço",
     "select-placeholder": "Comece a escrever para pesquisar contas de serviço"
   },
@@ -12123,10 +12127,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Adicionar token da conta de serviço",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Tem a certeza de que pretende eliminar esta conta de serviço?",
+      "body-disable-service-account": "Tem a certeza de que pretende desativar esta conta de serviço?",
+      "confirmText-delete-service-account": "Eliminar a conta de serviço",
+      "confirmText-disable-service-account": "Desativar a conta de serviço",
       "delete-service-account": "Eliminar a conta de serviço",
       "disable-service-account": "Desativar a conta de serviço",
       "enable-service-account": "Ativar a conta de serviço",
@@ -12153,7 +12157,7 @@
       "used-by": "Utilizado por"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Guardar",
       "edit": "Editar"
     },
     "service-account-role-row": {
@@ -12167,16 +12171,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Adicionar conta de serviço",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Tem a certeza de que pretende eliminar {{serviceAccountName}}?",
+      "body-disable-service-account": "Tem a certeza de que pretende desativar \"{{accountToDisable}}\"?",
+      "confirmText-delete": "Eliminar",
+      "confirmText-disable-service-account": "Desativar a conta de serviço",
       "placeholder-search-service-account-by-name": "Pesquisar uma conta de serviço por nome",
       "sub-title": "As contas de serviço e os seus tokens podem ser utilizados para autenticar na API da Grafana. Saiba mais na nossa <2>documentação.</2>",
       "title-delete-service-account": "Eliminar a conta de serviço",
       "title-disable-service-account": "Desativar a conta de serviço",
-      "body-delete_one": "",
-      "body-delete_other": ""
+      "body-delete_one": "Tem a certeza de que pretende eliminar {{serviceAccountName}} e {{count}} tokens associados?",
+      "body-delete_other": "Tem a certeza de que pretende eliminar {{serviceAccountName}} e {{count}} tokens associados?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Este token expirou",
@@ -12190,7 +12194,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Exportar como imagem",
       "export-json-title": "Exportar como JSON",
       "share-externally-title": "Partilhar externamente",
       "share-internally-title": "Partilhar internamente",
@@ -12227,17 +12231,17 @@
       "view-button-yaml": "Ver YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Ações de exportação de imagem",
+      "cancel-button": "Cancelar",
+      "download-button": "Transferir imagem",
+      "error-title": "Falha ao gerar imagem",
+      "generate-button": "Gerar imagem",
+      "generating": "A gerar imagem...",
+      "info-text": "Guardar este painel de controlo como uma imagem",
+      "preview": "Pré-visualizar",
+      "preview-aria": "Pré-visualização da imagem gerada",
+      "preview-region": "Pré-visualização da imagem",
+      "title": "Exportar como imagem"
     },
     "library": {
       "info": "Criar painel de biblioteca."
@@ -12247,7 +12251,7 @@
       "info-text": "Crie um link direto para este painel de controlo ou painel, personalizado com as opções abaixo.",
       "link-url": "URL do link",
       "render-alert": "Plugin de renderização de imagem não instalado",
-      "render-instructions": "",
+      "render-instructions": "Para renderizar uma imagem, tem de instalar o <2>plugin de renderização de imagens Grafana</2>. Entre em contacto com o seu administrador Grafana para instalar o plugin.",
       "rendered-image": "Link direto para imagem renderizada",
       "save-alert": "O painel de controlo não está guardado",
       "save-dashboard": "Para processar uma imagem de painel, tem de guardar o painel de controlo primeiro.",
@@ -12315,11 +12319,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Guardar o painel de controlo para ativar a geração de imagens",
+    "download-disabled-help": "Gere uma imagem primeiro para ativar a transferência",
+    "error-title": "Falha ao gerar imagem",
     "form": {
-      "label": ""
+      "label": "Definições de imagem do painel"
     },
     "preview": {
       "title": "Pré-visualização do painel"
@@ -12480,112 +12484,112 @@
   },
   "stat": {
     "add-orientation-option": {
-      "description-orientation": "",
-      "name-orientation": "",
+      "description-orientation": "Orientação do layout",
+      "name-orientation": "Orientação",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-vertical": ""
+        "label-auto": "Automático",
+        "label-horizontal": "Horizontal",
+        "label-vertical": "Vertical"
       }
     },
     "add-standard-data-reduce-options": {
-      "category-value-options": "",
-      "description-calculation": "",
-      "description-fields": "",
-      "description-limit": "",
-      "description-show": "",
+      "category-value-options": "Opções de valor",
+      "description-calculation": "Escolha uma função de redução ou cálculo",
+      "description-fields": "Selecionar os campos que devem ser incluídos no painel",
+      "description-limit": "Número máx. de linhas para mostrar",
+      "description-show": "Calcular um único valor por coluna ou série ou mostrar cada linha",
       "fields-options": {
-        "label-all-fields": "",
-        "label-numeric-fields": ""
+        "label-all-fields": "Todos os campos",
+        "label-numeric-fields": "Campos numéricos"
       },
-      "name-calculation": "",
-      "name-fields": "",
-      "name-limit": "",
-      "name-show": "",
+      "name-calculation": "Cálculo",
+      "name-fields": "Campos",
+      "name-limit": "Limite",
+      "name-show": "Mostrar",
       "show-options": {
-        "label-all-values": "",
-        "label-calculate": ""
+        "label-all-values": "Todos os valores",
+        "label-calculate": "Calcular"
       }
     },
-    "category-stat-styles": "",
+    "category-stat-styles": "Estilos de estatísticas",
     "color-mode-options": {
-      "label-background-gradient": "",
-      "label-background-solid": "",
-      "label-none": "",
-      "label-value": ""
+      "label-background-gradient": "Gradiente do fundo",
+      "label-background-solid": "Fundo sólido",
+      "label-none": "Nenhum",
+      "label-value": "Valor"
     },
-    "description-graph-mode": "",
-    "description-text-mode": "",
+    "description-graph-mode": "Modo gráfico/sparkline do painel de estatísticas",
+    "description-text-mode": "Verificar se o nome e o valor são exibidos ou apenas o nome",
     "graph-mode": {
       "options": {
-        "label-area": "",
-        "label-none": ""
+        "label-area": "Área",
+        "label-none": "Nenhum"
       }
     },
     "name-color-modcolor-mode-options": {
-      "label": ""
+      "label": "Modo de cor"
     },
-    "name-graph-mode": "",
-    "name-show-percent-change": "",
-    "name-text-alignment": "",
-    "name-text-mode": "",
-    "name-wide-layout": "",
-    "percent-change-color-mode": "",
+    "name-graph-mode": "Modo de gráfico",
+    "name-show-percent-change": "Mostrar a alteração em percentagem",
+    "name-text-alignment": "Alinhamento do texto ",
+    "name-text-mode": "Modo do texto",
+    "name-wide-layout": "Layout em largura",
+    "percent-change-color-mode": "Modo de cor da variação percentual",
     "percent-change-color-mode-options": {
-      "label-inverted": "",
-      "label-same-as-value": "",
-      "label-standard": ""
+      "label-inverted": "Invertido",
+      "label-same-as-value": "Igual ao valor",
+      "label-standard": "Predefinição"
     },
     "text-alignment-options": {
-      "label-auto": "",
-      "label-center": ""
+      "label-auto": "Automático",
+      "label-center": "Centro"
     },
     "text-mode-options": {
-      "label-auto": "",
-      "label-name": "",
-      "label-none": "",
-      "label-value": "",
-      "label-value-and-name": ""
+      "label-auto": "Automático",
+      "label-name": "Nome",
+      "label-none": "Nenhum",
+      "label-value": "Valor",
+      "label-value-and-name": "Valor e nome"
     },
     "wide-layout-options": {
-      "label-off": "",
-      "label-on": ""
+      "label-off": "Desligado",
+      "label-on": "Ligado"
     }
   },
   "state-timeline": {
     "align-values-options": {
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-center": "Centro",
+      "label-left": "Esquerda",
+      "label-right": "Direita"
     },
-    "category-state-timeline": "",
-    "name-align-values": "",
-    "name-connect-null-values": "",
-    "name-disconnect-values": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-merge-equal-consecutive-values": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-state-timeline": "Cronologia do estado",
+    "name-align-values": "Alinhar valores",
+    "name-connect-null-values": "Conectar os valores nulos",
+    "name-disconnect-values": "Desconectar os valores",
+    "name-fill-opacity": "Opacidade de preenchimento",
+    "name-line-width": "Largura da linha",
+    "name-merge-equal-consecutive-values": "Combinar os valores consecutivos iguais",
+    "name-page-size": "Tamanho da página (ativar paginação)",
+    "name-row-height": "Altura da linha",
+    "name-show-values": "Mostrar valores",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Sempre",
+      "label-auto": "Automático",
+      "label-never": "Nunca"
     }
   },
   "status-history": {
-    "category-status-history": "",
-    "name-column-width": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-status-history": "Histórico do estado",
+    "name-column-width": "Largura da coluna",
+    "name-fill-opacity": "Opacidade de preenchimento",
+    "name-line-width": "Largura da linha",
+    "name-page-size": "Tamanho da página (ativar paginação)",
+    "name-row-height": "Altura da linha",
+    "name-show-values": "Mostrar valores",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Sempre",
+      "label-auto": "Automático",
+      "label-never": "Nunca"
     },
     "status-history-panel": {
       "too-many-points_one": "Demasiados pontos para visualizar corretamente. <1></1>Atualizar a consulta para devolver menos pontos. <3></3>({{count}} pontos recebidos)",
@@ -12625,26 +12629,26 @@
       "label-gauge-display-mode": "Modo de exibição do calibre",
       "label-value-display": "Apresentação dos valores"
     },
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Opções de célula",
+    "category-table": "Tabela",
+    "category-table-footer": "Rodapé da tabela",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Grande",
+      "label-medium": "Médio",
+      "label-small": "Pequeno"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Ações",
+      "auto": "Automático",
+      "color-background": "Fundo colorido",
+      "color-text": "Texto colorido",
+      "data-links": "Ligações de dados",
+      "gauge": "Medidor",
+      "image": "Imagem",
+      "json": "Visualização JSON",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Pílula",
+      "sparkline": "Sparkline"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "Se selecionado, toda a linha será colorida como esta célula seria.",
@@ -12657,23 +12661,23 @@
       "wrap-text": "Ajustar texto"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Automático",
+      "label-center": "Centro",
+      "label-left": "Esquerda",
+      "label-right": "Direita"
     },
     "container": {
       "content": "Mostrar demasiadas colunas numa única tabela pode afetar o desempenho e dificultar a leitura dos dados. Considere refinar as suas consultas.",
       "show-all-series": "Mostrar todas as colunas",
       "show-only-series": "A mostrar apenas {{MAX_NUMBER_OF_COLUMNS}} colunas"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
-    "description-min-column-width": "",
-    "description-wrap-header-text": "",
+    "description-calculation": "Escolha uma função de redução ou cálculo",
+    "description-cell-value-inspect": "Ativar a inspeção do valor da célula numa janela modal",
+    "description-column-filter": "Ativa/desativa filtros de campo na tabela",
+    "description-count-rows": "Mostrar uma única contagem para todas as linhas de dados",
+    "description-fields": "Selecionar os campos que devem ser calculados",
+    "description-min-column-width": "A largura mínima para o redimensionamento automático da coluna",
+    "description-wrap-header-text": "Ativa o encapsulamento de texto para cabeçalhos de coluna",
     "image-cell-options-editor": {
       "description-alt-text": "Texto alternativo que será exibido se uma imagem não puder ser exibida ou para utilizadores que utilizem um leitor de ecrã",
       "description-title-text": "Texto que será exibido quando o cursor passar por cima da imagem",
@@ -12687,66 +12691,66 @@
       },
       "label-dynamic-height": ""
     },
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-paginations": "",
-    "name-fields": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "name-wrap-header-text": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": "",
+    "name-calculation": "Cálculo",
+    "name-cell-height": "Altura da célula",
+    "name-cell-type": "Tipo de célula",
+    "name-cell-value-inspect": "Inspeção do valor da célula",
+    "name-column-alignment": "Alinhamento da coluna",
+    "name-column-filter": "Filtro de coluna",
+    "name-column-width": "Largura da coluna",
+    "name-count-rows": "Contar linhas",
+    "name-enable-paginations": "Ativar paginação",
+    "name-fields": "Campos",
+    "name-hide-in-table": "Ocultar na tabela",
+    "name-min-column-width": "Largura mínima da coluna",
+    "name-show-table-footer": "Mostrar o rodapé da tabela",
+    "name-show-table-header": "Mostrar o cabeçalho da tabela",
+    "name-wrap-header-text": "Encapsular o texto do cabeçalho",
+    "placeholder-column-width": "auto",
+    "placeholder-fields": "Todos os campos numéricos",
     "text-wrap-options": {
       "label-wrap-text": ""
     }
   },
   "table-new": {
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Opções de célula",
+    "category-table": "Tabela",
+    "category-table-footer": "Rodapé da tabela",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Grande",
+      "label-medium": "Médio",
+      "label-small": "Pequeno"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Automático",
+      "label-center": "Centro",
+      "label-left": "Esquerda",
+      "label-right": "Direita"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
+    "description-calculation": "Escolha uma função de redução ou cálculo",
+    "description-cell-value-inspect": "Ativar a inspeção do valor da célula numa janela modal",
+    "description-column-filter": "Ativa/desativa filtros de campo na tabela",
+    "description-count-rows": "Mostrar uma única contagem para todas as linhas de dados",
+    "description-fields": "Selecionar os campos que devem ser calculados",
     "description-frozen-columns": "",
-    "description-min-column-width": "",
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-pagination": "",
-    "name-fields": "",
+    "description-min-column-width": "A largura mínima para o redimensionamento automático da coluna",
+    "name-calculation": "Cálculo",
+    "name-cell-height": "Altura da célula",
+    "name-cell-type": "Tipo de célula",
+    "name-cell-value-inspect": "Inspeção do valor da célula",
+    "name-column-alignment": "Alinhamento da coluna",
+    "name-column-filter": "Filtro de coluna",
+    "name-column-width": "Largura da coluna",
+    "name-count-rows": "Contar linhas",
+    "name-enable-pagination": "Ativar paginação",
+    "name-fields": "Campos",
     "name-frozen-columns": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": ""
+    "name-hide-in-table": "Ocultar na tabela",
+    "name-min-column-width": "Largura mínima da coluna",
+    "name-show-table-footer": "Mostrar o rodapé da tabela",
+    "name-show-table-header": "Mostrar o cabeçalho da tabela",
+    "placeholder-column-width": "auto",
+    "placeholder-fields": "Todos os campos numéricos"
   },
   "tag-filter": {
     "clear-button": "Limpar etiquetas",
@@ -12757,7 +12761,7 @@
     "tag-option-label": "Opção de etiqueta"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Nenhuma equipa encontrada",
     "select-aria-label": "Seletor de equipa",
     "select-placeholder": "Selecione uma equipa"
   },
@@ -12831,17 +12835,17 @@
     }
   },
   "text": {
-    "category-text": "",
+    "category-text": "Texto",
     "mode-options": {
-      "label-code": "",
-      "label-html": "",
-      "label-markdown": ""
+      "label-code": "Cód.",
+      "label-html": "HTML",
+      "label-markdown": "Markdown"
     },
-    "name-content": "",
-    "name-language": "",
-    "name-mode": "",
-    "name-show-line-numbers": "",
-    "name-show-mini-map": ""
+    "name-content": "Conteúdo",
+    "name-language": "Idioma",
+    "name-mode": "Modo",
+    "name-show-line-numbers": "Mostrar os números das linhas",
+    "name-show-mini-map": "Mostrar o minimapa"
   },
   "theme-preview": {
     "breadcrumbs": {
@@ -12889,7 +12893,7 @@
       "apply-button": "Aplicar intervalo de tempo",
       "default-error": "Introduza uma data passada ou \"{{now}}\"",
       "fiscal-year": "Ano fiscal: {{from}} - {{to}}",
-      "from-input": "",
+      "from-input": "De",
       "open-input-calendar": "Abrir calendário",
       "range-error": "\"De\" não pode ser posterior a \"Até\"",
       "to-input": "Para"
@@ -12907,7 +12911,7 @@
       "aria-role": "Seleção do intervalo de tempo",
       "default-title": "Intervalos de tempo",
       "example-title": "Exemplo de intervalos de tempo",
-      "from-label": "",
+      "from-label": "De",
       "from-to": "{{timeOptionFrom}} até {{timeOptionTo}}",
       "specify": "Especifique o intervalo de tempo",
       "submit-button-label": "Botão de envio do Seletor de hora",
@@ -12920,8 +12924,8 @@
   },
   "timeline": {
     "missing-field": {
-      "all": "",
-      "time": ""
+      "all": "Sem campos gráficos",
+      "time": "Os dados não têm um campo de hora"
     }
   },
   "timeseries": {
@@ -12939,54 +12943,54 @@
       "tooltip-delete": "Eliminar",
       "tooltip-edit": "Editar"
     },
-    "category-axis": "",
+    "category-axis": "Eixo",
     "config": {
       "get-graph-field-config": {
-        "aria-label-bar-width-factor": "",
-        "aria-label-fill-opacity": "",
-        "aria-label-line-width": "",
-        "aria-label-point-size": "",
-        "category-graph-styles": "",
-        "category-thresholds": "",
-        "name-bar-alignment": "",
-        "name-bar-width-factor": "",
-        "name-connect-nulls": "",
-        "name-disconnect-values": "",
-        "name-fill-below-to": "",
-        "name-fill-opacity": "",
-        "name-gradient-mode": "",
-        "name-line-interpolation": "",
-        "name-line-style": "",
-        "name-line-width": "",
-        "name-point-size": "",
-        "name-show-points": "",
-        "name-show-thresholds": "",
-        "name-style": "",
-        "name-transform": "",
+        "aria-label-bar-width-factor": "Fator de largura da barra",
+        "aria-label-fill-opacity": "Opacidade de preenchimento",
+        "aria-label-line-width": "Largura da linha",
+        "aria-label-point-size": "Tamanho dos pontos",
+        "category-graph-styles": "Estilos de gráficos",
+        "category-thresholds": "Limites",
+        "name-bar-alignment": "Alinhamento da barra",
+        "name-bar-width-factor": "Fator de largura da barra",
+        "name-connect-nulls": "Conectar os valores nulos",
+        "name-disconnect-values": "Desconectar os valores",
+        "name-fill-below-to": "Preencher abaixo para",
+        "name-fill-opacity": "Opacidade de preenchimento",
+        "name-gradient-mode": "Modo de gradiente",
+        "name-line-interpolation": "Interpolação de linha",
+        "name-line-style": "Estilo da linha",
+        "name-line-width": "Largura da linha",
+        "name-point-size": "Tamanho dos pontos",
+        "name-show-points": "Mostrar os pontos",
+        "name-show-thresholds": "Mostrar limites",
+        "name-style": "Estilo",
+        "name-transform": "Transformar",
         "transform-options": {
-          "description-constant": "",
-          "description-style": "",
-          "label-constant": "",
-          "label-style": ""
+          "description-constant": "O primeiro valor será mostrado como uma linha constante",
+          "description-style": "Inverter os resultados para valores negativos no eixo Y",
+          "label-constant": "Constante",
+          "label-style": "Y negativo"
         }
       }
     },
     "insert-nulls-editor": {
       "disconnect-options": {
-        "label-never": "",
-        "label-threshold": ""
+        "label-never": "Nunca",
+        "label-threshold": "Limite"
       }
     },
     "line-style-editor": {
       "line-fill-options": {
-        "label-dash": "",
-        "label-dots": "",
-        "label-solid": ""
+        "label-dash": "Traço",
+        "label-dots": "Pontos",
+        "label-solid": "Sólido"
       },
       "title-the-input-expects-a-segment-list": "A entrada espera uma lista de segmentos",
       "tooltip-help": "Ajuda"
     },
-    "name-time-zone": "",
+    "name-time-zone": "Fuso horário",
     "nulls-threshold-input": {
       "placeholder-never": "Nunca"
     },
@@ -12996,9 +13000,9 @@
     },
     "span-nulls-editor": {
       "gaps-options": {
-        "label-always": "",
-        "label-never": "",
-        "label-threshold": ""
+        "label-always": "Sempre",
+        "label-never": "Nunca",
+        "label-threshold": "Limite"
       }
     },
     "timezones-editor": {
@@ -13007,17 +13011,17 @@
     }
   },
   "traces": {
-    "category-span-filters": "",
-    "name-critical-path-only": "",
-    "name-find-in-trace": "",
-    "name-max-duration": "",
-    "name-min-duration": "",
-    "name-service-name": "",
-    "name-service-name-operator": "",
-    "name-show-matches-only": "",
-    "name-span-name": "",
-    "name-span-name-operator": "",
-    "name-tags": "",
+    "category-span-filters": "Filtros de intervalo",
+    "name-critical-path-only": "Mostrar apenas o caminho crítico",
+    "name-find-in-trace": "Localizar no Trace",
+    "name-max-duration": "Duração máx.",
+    "name-min-duration": "Duração mín.",
+    "name-service-name": "Nome do serviço",
+    "name-service-name-operator": "Operador do nome do serviço",
+    "name-show-matches-only": "Mostrar apenas as correspondências",
+    "name-span-name": "Nome do intervalo",
+    "name-span-name-operator": "Operador do nome do intervalo",
+    "name-tags": "Etiquetas",
     "traces-panel": {
       "no-data-found-in-response": "Nenhum dado encontrado na resposta"
     }
@@ -13032,20 +13036,20 @@
     "axis-editor": {
       "log-mode-options": {
         "description": {
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-size": "Dividir os registos com base no tamanho"
         },
         "label": {
-          "split": ""
+          "split": "Dividir"
         }
       },
       "mode-options": {
         "description": {
-          "split-the-buckets-based-on-count": "",
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-count": "Dividir os registos com base na contagem",
+          "split-the-buckets-based-on-size": "Dividir os registos com base no tamanho"
         },
         "label": {
-          "count": "",
-          "size": ""
+          "count": "Número",
+          "size": "Tamanho"
         }
       },
       "placeholder-auto": "Automóvel"
@@ -13061,15 +13065,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Operação binária",
+          "reduce-row": "Reduzir linha",
+          "row-index": "Índice de linha",
+          "unary-operation": "Operação unária"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Funções cumulativas",
+        "window-functions": "Funções de janela"
       },
       "label-alias": "Nome alternativo",
       "label-mode": "Modo",
@@ -13077,9 +13081,9 @@
     },
     "calculate-heatmap": {
       "add-heatmap-calculation-options": {
-        "name-x-bucket": "",
-        "name-y-bucket": "",
-        "name-y-bucket-scale": ""
+        "name-x-bucket": "Registo X",
+        "name-y-bucket": "Registo Y",
+        "name-y-bucket-scale": "Escala de registo Y"
       }
     },
     "concatenate-transformer-editor": {
@@ -13087,9 +13091,9 @@
       "label-name": "Nome",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Copiar o nome de quadro para o nome do campo",
+          "ignore-the-frame-name": "Ignorar o nome do quadro",
+          "label-frame": "Adicionar uma etiqueta com o nome do quadro"
         }
       },
       "placeholder-frame": "Frame"
@@ -13102,9 +13106,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Adicionar um transformador de tipo de campo convert",
       "aria-label-remove-convert-field-type-transformer": "Remover transformador de tipo de campo convert",
-      "convert-field-type": "",
+      "convert-field-type": "Converter tipo de campo",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Converter um campo para um tipo de campo especificado."
       },
       "label": {
         "browser": "Navegador",
@@ -13117,11 +13121,11 @@
       "label-join-with": "Juntar com",
       "label-set-timezone": "Definir o fuso horário",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Converter tipo de campo"
       },
       "placeholder-type": "Tipo",
       "tags": {
-        "format-field": ""
+        "format-field": "Formatar campo"
       },
       "tooltip-explicit-separator-joining-array-values": "Utilize um separador explícito ao juntar valores de matriz",
       "tooltip-input-format": "Especificar o formato do campo de entrada para que a Grafana possa analisar a cadeia de datas corretamente.",
@@ -13140,20 +13144,20 @@
       "tooltip-enable": "Ativar"
     },
     "draggable-sort-order": {
-      "asc": "",
-      "desc": "",
+      "asc": "ASC",
+      "desc": "DESC",
       "off": "Desligado"
     },
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Combinar todos os campos num único quadro."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Concatenar campos"
         },
         "tags": {
-          "combine": ""
+          "combine": "Combinar"
         }
       }
     },
@@ -13168,11 +13172,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Analisar campos a partir do conteúdo (JSON, etiquetas, etc.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Selecionar campo"
         }
       },
       "label-delimiter": "Delimitador",
@@ -13181,7 +13185,7 @@
       "label-replace-all-fields": "Substituir todos os campos",
       "label-source": "Origem",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Extrair campos"
       },
       "placeholder-auto": "Automóvel",
       "placeholder-select-delimiter": "Selecione o delimitador...",
@@ -13192,20 +13196,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Usar um valor de campo para pesquisar países, estados ou aeroportos."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nenhum campo de texto encontrado"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Selecionar campo de texto"
         }
       },
       "label-field": "Campo",
       "label-lookup": "Pesquisar",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Campos de pesquisa do recurso"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13216,23 +13220,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Remova partes dos resultados da consulta usando um padrão regex."
       },
       "label-from-variable": "Da variável",
       "label-identifier": "Identificador",
       "label-use-variable": "Utilizar variável",
       "label-variable": "Variável",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Filtrar campos por nome"
       },
       "placeholder-regular-expression-pattern": "Padrão de expressão regular"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Remover linhas dos dados com base na consulta de origem"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Filtrar dados por consulta"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13246,33 +13250,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Adicionar condição",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Remover linhas dos resultados da consulta usando filtros definidos pelo utilizador."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Correspondência total",
+          "match-any": "Correspondência parcial"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Excluir",
+          "include": "Incluir"
         }
       },
       "label-conditions": "Condições",
       "label-filter-type": "Tipo de filtro",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Filtrar dados por valores"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Nenhum campo de texto encontrado"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Selecionar campo de texto"
         }
       },
       "label-field": "Campo",
@@ -13281,10 +13285,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Manipular a formatação de campos de string."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Formatar string"
       }
     },
     "format-time-transfomer-editor": {
@@ -13296,66 +13300,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Definir o formato de saída de um campo de hora"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Formatar hora"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Utilizar os valores da linha para calcular um novo campo."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Adicionar campo a partir do cálculo"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Definir unidade, min., máx. e muito mais."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Configuração a partir dos resultados da consulta"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Gerar dados de mapa de calor a partir de dados de origem."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Criar mapa de calor"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Nivelar os resultados etiquetados numa tabela unida por etiquetas."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Unir por etiquetas"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Dividir um conjunto de dados de um quadro em várias séries."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Partição por valores"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Converter cada linha num campo com configuração dinâmica."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Linhas para campos"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Aplicar operações espaciais aos resultados da consulta."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Operações espaciais"
       }
     },
     "get-timezone-options": {
@@ -13387,8 +13391,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Calcular",
+          "group-by": "Agrupar por"
         }
       },
       "placeholder-ignored": "Ignorado",
@@ -13396,42 +13400,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Agrupar dados por um valor de campo e criar dados agregados."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Agrupar por"
       },
       "title-calc-alert": "Os cálculos não terão efeito se nenhum campo for agrupado"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Agrupar dados por um valor de campo e criar tabelas aninhadas com os dados agrupados."
       },
       "description-show-field-names": "Se esta opção estiver ativada, as tabelas aninhadas mostrarão os nomes dos campos como cabeçalho da tabela",
       "label-show-field-names-in-nested-tables": "Mostrar nomes de campos em tabelas aninhadas",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Agrupar em tabelas aninhadas"
       },
       "title-calc-alert": "Os cálculos não terão efeito se nenhum campo for agrupado."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Resumir e reorganizar os dados com base em três campos."
       },
       "label-cell-value": "Valor da célula",
       "label-column": "Coluna",
       "label-empty-value": "Valor vazio",
       "label-row": "Linha",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Agrupar em matriz"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Calcular um histograma a partir de dados de entrada."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Histograma"
       },
       "placeholder-auto": "Automóvel",
       "placeholder-default": "Predefinição: 30",
@@ -13443,14 +13447,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Combinar linhas de 2 ou mais tabelas, com base num campo relacionado."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Unir por campo"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Preenchimento obrigatório",
       "info": {
         "input-contain-labels": "A entrada não contém nenhumas etiquetas",
         "no-input-or-labels-found": "Nenhuma entrada encontrada (ou etiquetas encontradas)",
@@ -13474,8 +13478,8 @@
       "label-value-field-name": "Nome do campo de valor",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Colunas",
+          "rows": "Linhas"
         }
       },
       "placeholder-optional-select-label": "(Opcional) Selecionar etiqueta",
@@ -13483,18 +13487,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Agrupar séries por tempo e devolver etiquetas ou marcadores como campos."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Etiquetas para campos"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Limitar o número de elementos mostrados."
       },
       "name": {
-        "limit": ""
+        "limit": "Limite"
       },
       "placeholder-value-or-variable": "Valor ou variável"
     },
@@ -13507,11 +13511,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Combinar várias séries. Os valores serão combinados numa linha."
       },
       "merge-effect-applied-single-frame": "A fusão não tem efeito quando aplicada num frame único.",
       "name": {
-        "merge": ""
+        "merge": "Combinar séries/tabelas"
       }
     },
     "multi-info": {
@@ -13523,14 +13527,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Reordenar, ocultar ou renomear campos."
       },
-      "field-order": "",
+      "field-order": "Ordem de campo",
       "field-order-auto": "Automóvel",
-      "field-order-manual": "",
+      "field-order-manual": "Manual",
       "first-frame-warning": "Organizar campos só funciona com um único frame. Considere aplicar uma transformação de junção ou filtrar a entrada primeiro.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Organizar campos por nome"
       }
     },
     "partion-by-values-editor": {
@@ -13558,10 +13562,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Esticar quadros de dados do formato largo para o formato longo."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Preparar séries temporais"
       }
     },
     "prepare-time-series-editor": {
@@ -13569,26 +13573,26 @@
       "label-info": "Informação",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Converter cada quadro para formato longo"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Séries temporais longas"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Cria um novo quadro para cada par de hora/número"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Séries temporais de múltiplos quadros"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Cria um único quadro unido por tempo"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Séries temporais largas"
         }
       }
     },
@@ -13603,7 +13607,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Reduzir todas as linhas ou pontos de dados a um único valor (por exemplo, máx., média)."
       },
       "label-calculations": "Cálculos",
       "label-include-time": "Incluir hora",
@@ -13620,7 +13624,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Reduzir"
       },
       "placeholder-choose-stat": "Escolher estatística"
     },
@@ -13630,18 +13634,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Criar uma nova estrutura de dados contendo valores previstos por um modelo estatístico."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Linha de tendência"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Cúbico",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Quadrático",
         "quartic": "Quártico",
-        "quintic": "Quíntico"
+        "quintic": "Quíntico",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Degree",
       "label-model-type": "Tipo de modelo",
@@ -13654,18 +13663,19 @@
           "polynomial": "Polinómio"
         }
       },
-      "regression": "",
+      "regression": "regressão",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Análise de regressão"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Número de pontos X, Y para prever"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Renomear partes dos resultados da consulta usando uma expressão regular e um padrão de substituição."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Renomear campos por regex"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13679,33 +13689,33 @@
       "label-mode": "Modo",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Combinar dados de duas tabelas sempre que houver valores correspondentes em campos comuns a ambas as tabelas.",
+          "join-on-a-field": "Unir um valor de campo com valores duplicados. Junção externa não eficiente é melhor usada para dados tabulares (tipo SQL).",
+          "keep-all-rows": "Manter todas as linhas de qualquer tabela com um valor. Unir em valores de campo distintos. Desempenho e melhor usado para séries temporais."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Interior",
+          "outer-tabular": "Exterior (tabular)",
+          "outer-time-series": "Exterior (séries temporais)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Combinar várias séries. Tempo de retorno, métrica e valores como uma linha."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Série para linhas"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Ordenar campos num quadro."
       },
       "label-field": "Campo",
       "label-reverse": "Inverter",
       "name": {
-        "sort-by": ""
+        "sort-by": "Ordenar por"
       },
       "placeholder-select-field": "Selecionar campo"
     },
@@ -13728,13 +13738,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Converter dados de séries temporais em linhas de tabela para que possam ser visualizados em formato tabular ou sparkline."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "A transformação de série temporal em tabela requer pelo menos um quadro de série temporal para funcionar. De momento, não tem nenhum."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Série temporal para tabela"
       }
     },
     "time-series-table-transform-editor": {
@@ -13752,15 +13762,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Transpor a estrutura de dados."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Transpor"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Rodar",
+        "transform": "Transformar",
+        "translate": "Tradução"
       }
     },
     "unary-operation-editor": {
@@ -13769,13 +13779,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Calcular novos campos",
+        "combine": "Combinar",
+        "create-new-visualization": "Criar nova visualização",
+        "filter": "Filtrar",
+        "perform-spatial-operations": "Realizar operações espaciais",
+        "reformat": "Reformatar",
+        "reorder-and-rename": "Reordenar e renomear"
       },
       "special-value-options": {
         "description": {
@@ -13826,10 +13836,10 @@
     }
   },
   "trend": {
-    "category-x-axis": "",
-    "description-x-field": "",
-    "name-x-field": "",
-    "placeholder-x-field": ""
+    "category-x-axis": "Eixo X",
+    "description-x-field": "Um valor numérico crescente",
+    "name-x-field": "Campo X",
+    "placeholder-x-field": "Primeiro valor numérico"
   },
   "upgrade-box": {
     "discovery-text": "Descobriu uma funcionalidade Pro!",
@@ -13846,7 +13856,7 @@
     "title": "Organizações"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Nenhum utilizador encontrado",
     "select-aria-label": "Seletor de utilizador",
     "select-placeholder": "Começar a digitar para pesquisar utilizador"
   },
@@ -13932,8 +13942,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Tem a certeza de que pretende eliminar a variável \"{{variableToDelete}}\"?",
+      "confirmText-delete": "Eliminar",
       "title-delete-variable": "Eliminar variável"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13983,33 +13993,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Como ordenar os valores desta variável",
-      "name-sort": "",
+      "name-sort": "Ordenar",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Ordem alfabética (asc.)",
+          "alphabetical-caseinsensitive-asc": "Ordem alfabética (não diferencia maiúsculas de minúsculas, asc.)",
+          "alphabetical-caseinsensitive-desc": "Ordem alfabética (não diferencia maiúsculas de minúsculas, desc.)",
+          "alphabetical-desc": "Ordem alfabética (desc.)",
+          "disabled": "Desativado",
+          "natural-asc": "Natural (asc.)",
+          "natural-desc": "Natural (desc.)",
+          "numerical-asc": "Numérico (asc.)",
+          "numerical-desc": "Numérico (desc.)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Adicionar opção",
+      "description": "Adicionar opções personalizadas além dos resultados da consulta",
+      "label-placeholder": "etiqueta de visualização",
+      "remove-option-button-label": "Remover opção",
+      "value-placeholder": "valor, string vazia predefinida"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Como ordenar opções estáticas com resultados de consulta"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Valor predefinido",
       "placeholder-default-value-if-any": "valor predefinido, se houver",
       "text-options": "Opções de texto"
     },
@@ -14038,8 +14048,8 @@
       "description-optional-display-name": "Nome de exibição opcional",
       "description-template-variable-characters": "O nome da variável do modelo. (máx. 50 caracteres)",
       "general": "Geral",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Etiqueta",
+      "name-name": "Nome",
       "placeholder-descriptive-text": "Texto descritivo",
       "placeholder-label-name": "Nome da etiqueta",
       "placeholder-variable-name": "Nome da variável",
@@ -14055,13 +14065,13 @@
       "tooltip-remove-variable": "Remover variável"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Descrição"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Alternar todos os valores"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Selecionar tipo de variável"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Mostrar utilizações"
@@ -14092,20 +14102,20 @@
     }
   },
   "xychart": {
-    "category-xychart": "",
-    "name-fill-opacity": "",
-    "name-line-style": "",
-    "name-line-width": "",
-    "name-max-point-size": "",
-    "name-min-point-size": "",
-    "name-point-shape": "",
-    "name-point-size": "",
-    "name-point-stroke-width": "",
-    "name-series-mapping": "",
-    "name-show": "",
+    "category-xychart": "Gráfico XY",
+    "name-fill-opacity": "Opacidade de preenchimento",
+    "name-line-style": "Estilo da linha",
+    "name-line-width": "Largura da linha",
+    "name-max-point-size": "Tamanho máx. dos pontos",
+    "name-min-point-size": "Tamanho mín. dos pontos",
+    "name-point-shape": "Forma do ponto",
+    "name-point-size": "Tamanho dos pontos",
+    "name-point-stroke-width": "Largura do traço do ponto",
+    "name-series-mapping": "Mapeamento de séries",
+    "name-show": "Mostrar",
     "point-shape-options": {
-      "label-circle": "",
-      "label-square": ""
+      "label-circle": "Círculo",
+      "label-square": "Quadrado"
     },
     "series-editor": {
       "add-series": "Adicionar séries",
@@ -14117,18 +14127,18 @@
       "label-y-field": "Campo Y",
       "placeholder-all-frames": "Todos os frames",
       "placeholder-select-frame": "Selecionar frame",
-      "placeholder-x-field": "",
-      "placeholder-y-field": "",
+      "placeholder-x-field": "Primeiro campo de número ou de hora em cada frame",
+      "placeholder-y-field": "Campos de número restantes em cada frame",
       "tooltip-delete-series": "Eliminar série"
     },
     "series-mapping-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Automático",
+      "label-manual": "Manual"
     },
     "show-options": {
-      "label-both": "",
-      "label-lines": "",
-      "label-points": ""
+      "label-both": "Ambas",
+      "label-lines": "Linhas",
+      "label-points": "Pontos"
     }
   }
 }
\ No newline at end of file
diff --git a/public/locales/ru-RU/grafana.json b/public/locales/ru-RU/grafana.json
index 9ab69a1fb0c..68a4978e25b 100644
--- a/public/locales/ru-RU/grafana.json
+++ b/public/locales/ru-RU/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Одни функции работают в стабильном режиме (GA) и включены по умолчанию, а другие находятся на стадии предварительной бета-версии, доступной для раннего использования.",
       "confirm-modal-body-2": "Прежде чем вносить изменения, рекомендуем ознакомиться с их последствиями для каждой функции.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Сохранить изменения",
       "get-stage-cell": {
         "beta": "Бета",
         "content-general-availability": "Общедоступность",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Удалить организацию",
-      "confirmText-delete": "",
+      "confirmText-delete": "Удалить",
       "title-delete": "Удаление"
     },
     "anon-users": {
       "not-found": "Анонимные пользователи не найдены."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Действительно выполнить принудительный выход из системы на всех устройствах?",
+      "confirmText-confirm-logout": "Подтвердить выход",
+      "confirmText-force-logout": "Принудительный выход",
       "title-force-logout-from-all-devices": "Принудительный выход на всех устройствах"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Сохранить"
     },
     "edit-org": {
       "access-denied": "У вас нет разрешения на просмотр пользователей в этой организации. Чтобы обновить данные этой организации, обратитесь к администратору сервера.",
@@ -119,10 +119,10 @@
       "users-heading": "Пользователи организации"
     },
     "enterprise-auth-features-card": {
-      "dismiss": "",
-      "heading": "",
-      "learn-more-link": "",
-      "text": ""
+      "dismiss": "Закрыть",
+      "heading": "Аутентификация Enterprise",
+      "learn-more-link": "Подробнее",
+      "text": "Управляйте пользователями, командами и разрешениями автоматически с помощью <1>SAML</1>, <3>SCIM</3>, <6>LDAP</6> и <8>RBAC</8> (доступно в Grafana Cloud и Enterprise)."
     },
     "feature-listing": {
       "title-auditing": "Проверка",
@@ -216,11 +216,11 @@
       "not-editable": "Роль этого пользователя не редактируется, поскольку она синхронизируется с провайдером аутентификации. Подробнее см. в <1>документации по аутентификации Grafana</1>."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Действительно удалить пользователя {{user}}?",
       "columns": {
         "aria-label-role": "Роль"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Удалить",
       "delete-aria-label": "Удалить пользователя: {{name}}",
       "title-delete": "Удаление"
     },
@@ -252,7 +252,7 @@
       "info-description": "Эти параметры настройки системы заданы в файле grafana.ini или custom.ini (или переопределены в переменных ENV). Чтобы изменить их, необходимо перезапустить Grafana."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Подтвердить удаление"
     },
     "upgrade-info": {
       "title": "Лицензия Enterprise"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Изменить",
-      "confirmText-change": "",
+      "confirmText-change": "Изменить",
       "grafana-admin-key": "Администратор Grafana",
       "grafana-admin-no": "Нет",
       "grafana-admin-yes": "Да",
       "title": "Разрешения"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Действительно удалить этого пользователя?",
+      "body-disable": "Действительно отключить этого пользователя?",
+      "confirmText-delete-user": "Удалить пользователя",
+      "confirmText-disable-user": "Отключить пользователя",
       "delete-button": "Удалить пользователя",
       "disable-button": "Отключить пользователя",
       "edit-button": "Редактировать",
@@ -331,7 +331,7 @@
       "title-disable-user": "Отключение пользователя"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Сохранить"
     },
     "user-sessions": {
       "browser-column": "Браузер и ОС",
@@ -374,20 +374,20 @@
       "am-active-timing-select-label-active-timings": "Периоды активности"
     },
     "ad": {
-      "close": "",
-      "learn-more": ""
+      "close": "Закрыть",
+      "learn-more": "Подробнее"
     },
     "add-button": {
       "add-more": "Добавить еще"
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Не удалось загрузить кнопку правил оповещения на основе ИИ",
+        "feedback-button": "Не удалось загрузить кнопку обратной связи на основе ИИ",
+        "improve-annotations-button": "Не удалось загрузить кнопку улучшения аннотаций на основе ИИ",
+        "improve-labels-button": "Не удалось загрузить кнопку улучшения меток на основе ИИ",
+        "template-button": "Не удалось загрузить кнопку шаблонов на основе ИИ",
+        "triage-button": "Не удалось загрузить кнопку приоритизации на основе ИИ"
       }
     },
     "alert": {
@@ -405,12 +405,12 @@
       "missing-series-resolve": "Отсутствуют оценки рядов (необходимо решить)",
       "no-annotations": "Нет аннотаций",
       "notification-configuration": {
-        "active-timings": "",
+        "active-timings": "Временные интервалы активности",
         "contact-point": "Точка контакта",
         "group-by": "Группировка по",
-        "group-title": "",
+        "group-title": "Настройка уведомлений",
         "mute-timings": "Время отключения звука",
-        "timing-options": ""
+        "timing-options": "Временные периоды"
       },
       "pending-period": "Период ожидания",
       "rule": "Правило",
@@ -501,7 +501,7 @@
       "title-muting-grouping-and-timings": "Отключение звука, группировка и определение времени"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Источники данных не найдены"
     },
     "alert-menu": {
       "copy-link": "Копировать ссылку",
@@ -527,7 +527,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Правило оповещения"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -595,7 +595,7 @@
       "view-configuration": "Просмотр конфигурации"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Да, сбросить конфигурацию",
       "gma-manual-configuration-description": "Внутреннюю конфигурацию обработчика оповещений Grafana Alertmanager невозможно изменить вручную. Чтобы изменить конфигурацию, измените отдельные ресурсы через пользовательский интерфейс.",
       "gma-manual-configuration-is-not-supported": "Изменения конфигурации вручную не поддерживаются",
       "message": {
@@ -610,13 +610,13 @@
       "title-resetting-alertmanager-configuration": "Сброс конфигурации обработчика оповещений Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Действительно восстановить конфигурацию до этой версии? Все несохраненные изменения будут потеряны.",
       "columns": {
         "compare": "Сравнить",
         "restore": "Восстановить",
         "text-latest": "Последние"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Да, восстановить конфигурацию",
       "loading": "Загрузка…",
       "no-previous-configurations": "Нет предыдущих конфигураций",
       "this-might-take-a-while": "Это может занять некоторое время...",
@@ -896,10 +896,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Другие действия для точки контакта «{{contactPointName}}»",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Удалить",
       "button-edit": "Редактировать",
       "button-view": "Просмотр",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Экспорт",
       "export-label-export": "Экспорт",
       "label-delete": "Удалить",
       "label-manage-permissions": "Управление разрешениями",
@@ -976,7 +976,7 @@
     },
     "contactPoints": {
       "validation": {
-        "notFound": ""
+        "notFound": "Точка контакта «{{contactPoint}}» не найдена"
       }
     },
     "continue-matching-indicator": {
@@ -985,7 +985,7 @@
     "copy-to-clipboard": "Копировать метку «{{label}}» в буфер обмена",
     "create-metadata": {
       "label": {
-        "contact-point": "",
+        "contact-point": "Точка контакта для доставки уведомлений",
         "dashboard": "Дашборд",
         "dashboard-and-panel": "Дашборд и панель",
         "evaluation-interval": "Интервал оценки",
@@ -1133,7 +1133,7 @@
       "content-show-all-errors": "Показать все ошибки"
     },
     "errors": {
-      "failedWith": ""
+      "failedWith": "Ошибка {{-config}} со статусом {{status}}: {{-message}}"
     },
     "evaluate-every-validation-options": {
       "message": {
@@ -1438,7 +1438,7 @@
       "label-disable-resolved-message": "Отключить сообщение об устранении"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Загрузка групп...",
       "message": {
         "must-be-a-positive-integer": "Должно быть положительным целым числом.",
         "must-enter-a-group-name": "Необходимо ввести название группы"
@@ -1535,7 +1535,7 @@
       "group-loading-error": "Ошибка при загрузке группы",
       "interval": "Интервал",
       "namespace": "Пространство имен",
-      "new": "",
+      "new": "Новое",
       "title": {
         "back": ""
       }
@@ -1567,7 +1567,7 @@
     },
     "group-loader": {
       "group-load-failed": "Не удалось загрузить правила из группы {{ groupName }} в {{ namespaceName }}",
-      "no-rules": ""
+      "no-rules": "В этой группе не найдено правил"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "Выполняется удаление группы"
@@ -1584,20 +1584,20 @@
       }
     },
     "home": {
-      "irm-card-description": "",
-      "irm-card-item-1": "",
-      "irm-card-item-2": "",
-      "irm-card-item-3": "",
-      "irm-card-item-4": "",
-      "irm-card-title": "",
+      "irm-card-description": "Используйте Grafana Cloud IRM для составления графиков дежурств, маршрутизации оповещений и реагирования на инциденты в одном месте.",
+      "irm-card-item-1": "Управляйте графиками дежурств с помощью своего календаря или Terraform.",
+      "irm-card-item-2": "Реагируйте на инциденты через Интернет, приложение, Slack или другие каналы.",
+      "irm-card-item-3": "Выявляйте первопричины с помощью Grafana SIFT на базе ИИ.",
+      "irm-card-item-4": "Анализируйте прошлые случаи, чтобы улучшить реагирование на инциденты и повысить устойчивость к ним.",
+      "irm-card-title": "Реагирование на инциденты и управление ими",
       "label-get-started": "Начало работы",
       "label-insights": "Аналитика",
-      "synthetic-monitoring-card-description": "",
-      "synthetic-monitoring-card-item-1": "",
-      "synthetic-monitoring-card-item-2": "",
-      "synthetic-monitoring-card-item-3": "",
-      "synthetic-monitoring-card-item-4": "",
-      "synthetic-monitoring-card-title": ""
+      "synthetic-monitoring-card-description": "Осуществляйте внешний мониторинг критически важных пользовательских путей, веб-сайтов и API из любой точки мира.",
+      "synthetic-monitoring-card-item-1": "Моделируйте все этапы пути пользователя с помощью проверок браузера.",
+      "synthetic-monitoring-card-item-2": "Выполняйте проверки связи, DNS, HTTP/S и TCP на каждом сетевом уровне.",
+      "synthetic-monitoring-card-item-3": "Используйте более 20 общих или приватных зондов за брандмауэром.",
+      "synthetic-monitoring-card-item-4": "Следите за целями уровня обслуживания (SLO) с помощью встроенных оповещений в формате Prometheus прямо в пользовательском интерфейсе.",
+      "synthetic-monitoring-card-title": "Синтетический мониторинг"
     },
     "import-to-gma": {
       "action-button": "Импорт",
@@ -1611,7 +1611,7 @@
         "no-rules-body-yaml": "Нет правил для импорта. Выберите другой YAML-файл.",
         "no-rules-title": "Нет правил для импорта",
         "not-using-rules-managed-by-integrations-or-plugins": {
-          "text": "",
+          "text": "Правила, управляемые интеграциями или плагинами, не следует импортировать в правила, которые управляются Grafana.",
           "title": "Информация"
         },
         "plugin-rules-warning": {
@@ -1899,10 +1899,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Источники данных не найдены"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Действительно удалить «{{muteTiming}}»?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Отключено",
@@ -1993,7 +1993,7 @@
     },
     "notification-policies-filter": {
       "label-search-by-contact-point": "Поиск по точке контакта",
-      "placeholder-search-by-contact-point": "",
+      "placeholder-search-by-contact-point": "Выбрать точку контакта",
       "search-query-input-placeholder-search": "Поиск"
     },
     "notification-policies-list": {
@@ -2156,10 +2156,10 @@
         "conflict": "Другой пользователь обновил дерево политик уведомления.",
         "error-code": "Сообщение об ошибке: «{{error}}»",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Невозможно добавить или обновить маршрут: если объединить средства сопоставления {{-matchers}}, они будут конфликтовать с внешним деревом маршрутизации. Маршрут станет недоступным."
         },
         "suffix": "Обновите страницу и повторите попытку.",
-        "title": ""
+        "title": "Не удалось добавить или обновить политику уведомления"
       },
       "n-more-policies_one": "{{count}} дополнительная политика",
       "n-more-policies_few": "{{count}} дополнительные политики",
@@ -2217,7 +2217,7 @@
     "query-and-expressions-step": {
       "add-query": "Добавить запрос",
       "body-queries-expressions-configured": "Создайте хотя бы один запрос или выражение, на основе которых будет отправляться оповещение",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Деактивировать",
       "expressions": "Выражения",
       "loading-data-sources": "Загрузка источников данных...",
       "manipulate-returned-queries-other-operations": "Управляйте данными, возвращаемыми в результате запросов, с помощью математических и других операций.",
@@ -2271,7 +2271,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Правило записи"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Не удалось загрузить редактор запросов. Причина: {{errorMessage}}"
@@ -2291,7 +2291,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Нужно будет установить новую группу оценки для скопированного правила, поскольку исходная группа была подготовлена и не может использоваться для правил, созданных в пользовательском интерфейсе.",
       "body-not-provisioned": "Новое правило <1>не</1> будет помечено как подготовленное.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Копировать",
       "title-copy-provisioned-alert-rule": "Копирование подготовленного правила оповещения"
     },
     "redirect-to-rule-viewer": {
@@ -2512,12 +2512,12 @@
         "new-badge": "Новое",
         "text": "Импортировать в правила, управляемые Grafana"
       },
-      "loading-more-groups": "",
+      "loading-more-groups": "Загрузка дополнительных групп...",
       "more": "Еще",
       "new-alert-rule": "Новое правило оповещения",
       "new-datasource-recording-rule": "Новое правило записи источника данных",
       "new-grafana-recording-rule": "Новое правило записи Grafana",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Новое правило оповещения для экспорта",
       "pagination": {
         "next-page": "Показать еще…"
       },
@@ -2697,7 +2697,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Обработчики оповещений"
       }
     },
     "settings-content": {
@@ -2835,7 +2835,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Обновить просмотр",
-      "empty-state": "",
+      "empty-state": "Добавьте содержимое шаблона для предварительного просмотра",
       "label-preview": "Предварительный просмотр",
       "refresh": "Обновить"
     },
@@ -2854,7 +2854,7 @@
       "loading": "Загрузка…",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Выбрать шаблон уведомления"
         },
         "label": {
           "select-notification-template": "Выбрать шаблон уведомления"
@@ -2882,8 +2882,8 @@
     },
     "templates-table": {
       "actions": "Действия",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Действительно удалить группу шаблонов «{{template}}»?",
+      "confirmText-yes-delete": "Да, удалить",
       "no-templates-defined": "Шаблоны не настроены.",
       "template-group": "Группа шаблонов",
       "title-delete-template-group": "Удаление группы шаблонов"
@@ -2938,7 +2938,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Управление правилами оповещения, правилами записи и интервалом оценки"
       }
     },
     "to-gma": {
@@ -3018,7 +3018,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Да, удалить"
       }
     },
     "use-delete-policy-modal": {
@@ -3072,51 +3072,51 @@
     }
   },
   "alertlist": {
-    "category-alert-state-filter": "",
-    "category-filter": "",
-    "category-options": "",
-    "descriptino-alerts-linked-to-dashboard": "",
-    "description-alert-instance-label": "",
-    "description-alert-name": "",
-    "description-datasource": "",
-    "description-folder": "",
-    "description-group-by": "",
-    "description-group-mode": "",
-    "description-max-items": "",
-    "description-show-inactive-alerts": "",
-    "description-sort-order": "",
-    "description-view-mode": "",
+    "category-alert-state-filter": "Фильтр по состоянию оповещений",
+    "category-filter": "Фильтр",
+    "category-options": "Параметры",
+    "descriptino-alerts-linked-to-dashboard": "Показывать только оповещения, связанные с данным дашбордом",
+    "description-alert-instance-label": "Фильтровать экземпляры оповещений с помощью запроса меток, например: {severity=\"critical\", instance=~\"cluster-us-.+\"}",
+    "description-alert-name": "Фильтровать по оповещениям, содержащим данный текст",
+    "description-datasource": "Фильтровать по источнику оповещений",
+    "description-folder": "Фильтровать по оповещениям в выбранной папке (только для правил оповещения, управляемых Grafana)",
+    "description-group-by": "Фильтровать оповещения с помощью запроса меток",
+    "description-group-mode": "Способ группировки экземпляров оповещений",
+    "description-max-items": "Максимальное количество отображаемых оповещений",
+    "description-show-inactive-alerts": "Включить правила оповещений с 0 (нулем) экземпляров. Поскольку эти правила не имеют экземпляров, они остаются скрытыми, если установлен фильтр по метке экземпляров оповещений.",
+    "description-sort-order": "Порядок сортировки оповещений и их экземпляров",
+    "description-view-mode": "Переключение между представлением списка и представлением статистики",
     "group-by": {
       "aria-label-group-by-label-keys": "группировать по ключам меток",
       "placeholder-group-by": "Группировать по"
     },
     "group-mode-options": {
-      "label-custom-grouping": "",
-      "label-default-grouping": ""
+      "label-custom-grouping": "Пользовательская группировка",
+      "label-default-grouping": "Группировка по умолчанию"
     },
-    "name-alert-instance-label": "",
-    "name-alert-name": "",
-    "name-alerts-linked-to-dashboard": "",
-    "name-datasource": "",
-    "name-error": "",
-    "name-firing": "",
-    "name-folder": "",
-    "name-group-by": "",
-    "name-group-mode": "",
-    "name-max-items": "",
-    "name-no-data": "",
-    "name-normal": "",
-    "name-pending": "",
-    "name-recovering": "",
-    "name-show-inactive-alerts": "",
-    "name-sort-order": "",
-    "name-view-mode": "",
+    "name-alert-instance-label": "Метка экземпляра оповещения",
+    "name-alert-name": "Имя оповещения",
+    "name-alerts-linked-to-dashboard": "Оповещения, связанные с данным дашбордом",
+    "name-datasource": "Источник данных",
+    "name-error": "Ошибка",
+    "name-firing": "Активные",
+    "name-folder": "Папка",
+    "name-group-by": "Группировать по",
+    "name-group-mode": "Режим группировки",
+    "name-max-items": "Макс. количество элементов",
+    "name-no-data": "Нет данных",
+    "name-normal": "Нормальные",
+    "name-pending": "В ожидании",
+    "name-recovering": "Восстанавливаются",
+    "name-show-inactive-alerts": "Показывать оповещения с 0 экземплярами",
+    "name-sort-order": "Порядок сортировки",
+    "name-view-mode": "Режим просмотра",
     "sort-order-options": {
-      "label-alphabetical-asc": "",
-      "label-alphabetical-desc": "",
-      "label-importance": "",
-      "label-time-asc": "",
-      "label-time-desc": ""
+      "label-alphabetical-asc": "По алфавиту (в прямом порядке)",
+      "label-alphabetical-desc": "По алфавиту (в обратном порядке)",
+      "label-importance": "По степени важности",
+      "label-time-asc": "По времени (в порядке возрастания)",
+      "label-time-desc": "По времени (в порядке убывания)"
     },
     "ungrouped-mode-view": {
       "active-for": "в течение <1>{{duration}}</1>",
@@ -3132,8 +3132,8 @@
       "title-permission-required": "Требуется разрешение"
     },
     "view-mode-options": {
-      "label-list": "",
-      "label-stat": ""
+      "label-list": "Список",
+      "label-stat": "Статистика"
     }
   },
   "annolist": {
@@ -3146,31 +3146,31 @@
     "annotation-list-item": {
       "tooltip-created-by": "Автор:<1></1> {{email}}"
     },
-    "category-annotation-query": "",
-    "category-display": "",
-    "category-link-behaviour": "",
-    "description-tags": "",
+    "category-annotation-query": "Запрос аннотаций",
+    "category-display": "Отображение",
+    "category-link-behaviour": "Поведение ссылок",
+    "description-tags": "Сопоставить теги аннотаций",
     "link-target-options": {
-      "label-dashboard": "",
-      "label-panel": ""
+      "label-dashboard": "Дашборд",
+      "label-panel": "Панель"
     },
-    "name-limit": "",
-    "name-link-target": "",
-    "name-query-filter": "",
-    "name-show-tags": "",
-    "name-show-time": "",
-    "name-show-user": "",
-    "name-tags": "",
-    "name-time-after": "",
-    "name-time-before": "",
-    "name-time-range": "",
+    "name-limit": "Лимит",
+    "name-link-target": "Цель ссылки",
+    "name-query-filter": "Фильтр запроса",
+    "name-show-tags": "Показывать теги",
+    "name-show-time": "Показывать время",
+    "name-show-user": "Показывать пользователя",
+    "name-tags": "Теги",
+    "name-time-after": "Время после",
+    "name-time-before": "Время до",
+    "name-time-range": "Временной диапазон",
     "query-filter-options": {
-      "label-all-dashboards": "",
-      "label-this-dashboard": ""
+      "label-all-dashboards": "Все дашборды",
+      "label-this-dashboard": "Данный дашборд"
     },
     "time-range-options": {
-      "label-none": "",
-      "label-this-dashboard": ""
+      "label-none": "Нет",
+      "label-this-dashboard": "Данный дашборд"
     }
   },
   "annotations": {
@@ -3178,7 +3178,7 @@
       "annotation": "Аннотация",
       "first-value": "Первое значение",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Неизвестные имена полей"
     },
     "empty-state": {
       "button-title": "Добавить запрос аннотации",
@@ -3188,12 +3188,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Если это поле задано, аннотация будет рассматриваться как диапазон",
+        "results-split-on-comma": "Результаты будут разделены запятой (,)"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}} или первое текстовое поле",
+        "time-or-the-first-field": "{{defaultField}} или первое поле времени"
       }
     },
     "standard-annotation-query-editor": {
@@ -3271,9 +3271,9 @@
       "define-allowed-teams-ids-label": "Определить идентификаторы разрешенных команд",
       "display-name-description": "Будет отображаться на странице входа как «Войти с помощью...». Параметр полезен, если вы используете несколько поставщиков удостоверений или протоколов единого входа.",
       "display-name-label": "Отображаемое имя",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Параметр, указывающий область пользователя в клиенте Azure AD/Entra ID и упрощающий процесс входа.",
+      "domain-hint-label": "Подсказка домена",
+      "domain-hint-valid-domain": "В этом поле должен быть указан действительный домен.",
       "email-attribute-name-description": "Имя ключа, используемого для поиска адреса эл. почты пользователя в карте атрибутов идентификационного токена OAuth2.",
       "email-attribute-name-label": "Имя атрибута эл. почты",
       "email-attribute-path-description": "Выражение JMESPath, используемое для поиска адреса эл. почты в информации пользователя.",
@@ -3290,11 +3290,11 @@
       "id-token-attribute-name-label": "Путь атрибута идентификационного токена",
       "login-attribute-path-description": "Выражение JMESPath, используемое для поиска логина в идентификационном токене пользователя.",
       "login-attribute-path-label": "Путь атрибута логина",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Согласие",
+      "login-prompt-description": "Указывает тип взаимодействия с пользователем при входе с помощью IdP.",
+      "login-prompt-label": "Приглашение на вход в систему",
+      "login-prompt-login": "Вход",
+      "login-prompt-select-account": "Выберите учетную запись",
       "managed-identity-client-id-description": "Идентификатор клиента управляемого удостоверения федеративных учетных данных вашего приложения OAuth2.",
       "managed-identity-client-id-label": "Идентификатор клиента управляемого удостоверения FIC",
       "name-attribute-path-description": "Выражение JMESPath, используемое для поиска имени пользователя в его идентификационном токене. \nЭто имя будет использоваться в качестве отображаемого имени пользователя.",
@@ -3330,7 +3330,7 @@
       "team-ids-github": "Целочисленный список идентификаторов команд.",
       "team-ids-label": "Идентификаторы команд",
       "team-ids-numbers": "Идентификаторы команд должны быть числами.",
-      "team-ids-other": "",
+      "team-ids-other": "Строковый список идентификаторов команд.",
       "team-ids-placeholder": "Введите идентификаторы команд и нажмите «Enter», чтобы их добавить",
       "teams-url-description": "URL-адрес, используемый для запроса идентификаторов команд. Если URL-адрес не установлен, значением по умолчанию является /teams.",
       "teams-url-description-oauth": "Если вы устанавливаете «{{ teamsURLLabel }}», также необходимо установить «{{ teamIDsAttributePathLabel }}».",
@@ -3365,8 +3365,8 @@
       }
     },
     "provider-card": {
-      "saml-learn-more": "",
-      "scim-learn-more": "",
+      "saml-learn-more": "Единый вход (SSO) с помощью SAML.",
+      "scim-learn-more": "Синхронизировать пользователей и команды с помощью SCIM.",
       "text-badge-enabled": "Включено",
       "text-badge-not-enabled": "Не включена"
     },
@@ -3374,7 +3374,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Сброс до значений по умолчанию"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Сброс",
       "disable": "Отключить",
       "disabling": "Отключение...",
       "discard": "Отменить",
@@ -3394,7 +3394,7 @@
       "text-badge-not-enabled": "Не включена"
     },
     "scim-banner": {
-      "message": ""
+      "message": "Стандарт SCIM в настоящее время находится в разработке и не рекомендуется для использования в производстве. Используйте его с осторожностью и учитывайте возможные изменения."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "Конечная точка .well-known/openid-configuration для вашего поставщика удостоверений (IdP)",
@@ -3406,99 +3406,99 @@
   },
   "bar-chart": {
     "warn": {
-      "missing-numeric": "",
-      "missing-series": ""
+      "missing-numeric": "Числовые поля не найдены",
+      "missing-series": "Для столбчатых диаграмм требуется строковое или временное поле"
     }
   },
   "barchart": {
     "config": {
-      "category-thresholds": "",
-      "description-color-by-field": "",
-      "description-x-label-max-length": "",
-      "name-bar-radius": "",
-      "name-bar-width": "",
-      "name-color-by-field": "",
-      "name-fill-opacity": "",
-      "name-full-highlight": "",
-      "name-gradient-mode": "",
-      "name-group-width": "",
-      "name-line-width": "",
-      "name-orientation": "",
-      "name-rotate-x-labels": "",
-      "name-show-thresholds": "",
-      "name-show-values": "",
-      "name-stacking": "",
-      "name-transform": "",
-      "name-x-axis": "",
-      "name-x-label-max-length": "",
-      "name-x-label-min-spacing": "",
+      "category-thresholds": "Пороговые значения",
+      "description-color-by-field": "Используйте значение цвета для поля того же уровня, чтобы задать цвет каждого значения столбца.",
+      "description-x-label-max-length": "Метки оси X будут усечены до указанной длины",
+      "name-bar-radius": "Радиус столбцов",
+      "name-bar-width": "Ширина столбцов",
+      "name-color-by-field": "Цвет по полю",
+      "name-fill-opacity": "Прозрачность заливки",
+      "name-full-highlight": "Выделить всю область при наведении",
+      "name-gradient-mode": "Режим градиента",
+      "name-group-width": "Ширина групп",
+      "name-line-width": "Ширина линии",
+      "name-orientation": "Ориентация",
+      "name-rotate-x-labels": "Повернуть метки деления оси x",
+      "name-show-thresholds": "Показывать пороговые значения",
+      "name-show-values": "Показывать значения",
+      "name-stacking": "Расположение в стеке",
+      "name-transform": "Преобразовать",
+      "name-x-axis": "Ось X",
+      "name-x-label-max-length": "Максимальная длина метки деления оси X",
+      "name-x-label-min-spacing": "Минимальное расстояние между метками оси X",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-line-vertical": ""
+        "label-auto": "Авто",
+        "label-horizontal": "Горизонтальная",
+        "label-line-vertical": "Вертикальная"
       },
-      "placeholder-x-axis": "",
-      "placeholder-x-label-max-length": "",
+      "placeholder-x-axis": "Первое строковое или временное поле",
+      "placeholder-x-label-max-length": "Нет",
       "show-values-options": {
-        "label-always": "",
-        "label-auto": "",
-        "label-never": ""
+        "label-always": "Всегда",
+        "label-auto": "Авто",
+        "label-never": "Никогда"
       },
       "transform-options": {
-        "description-constant": "",
-        "description-negative-y": "",
-        "label-constant": "",
-        "label-negative-y": ""
+        "description-constant": "Первое значение будет отображаться в виде постоянной линии",
+        "description-negative-y": "Изменить результаты на отрицательные значения по оси y",
+        "label-constant": "Постоянная",
+        "label-negative-y": "Отрицательные для оси Y"
       }
     },
     "tick-spacing-editor": {
       "content-require-space-from-the-right-side": "Требуется пространство с правой стороны",
       "gaps-options": {
-        "description-large": "",
-        "description-medium": "",
-        "description-none": "",
-        "description-small": "",
-        "label-large": "",
-        "label-medium": "",
-        "label-none": "",
-        "label-small": ""
+        "description-large": "Требуется расстояние {{spacing}}",
+        "description-medium": "Требуется расстояние {{spacing}}",
+        "description-none": "Показывать все метки деления",
+        "description-small": "Требуется расстояние {{spacing}}",
+        "label-large": "Большая",
+        "label-medium": "Средняя",
+        "label-none": "Нет",
+        "label-small": "Малое"
       },
       "label-rtl": "Справа налево"
     }
   },
   "bargauge": {
     "bar-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Авто",
+      "label-manual": "Ручной"
     },
-    "category-bar-gauge": "",
-    "description-max-height": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-show-unfilled-area": "",
+    "category-bar-gauge": "Столбчатый индикатор",
+    "description-max-height": "Максимальная высота строки (горизонтальная ориентация)",
+    "description-min-height": "Минимальная высота строки (горизонтальная ориентация)",
+    "description-min-width": "Минимальная ширина столбца (вертикальная ориентация)",
+    "description-show-unfilled-area": "Если этот параметр включен, незаполненная область отображается серым цветом",
     "display-mode-options": {
-      "label-basic": "",
-      "label-gradient": "",
-      "label-retro": ""
+      "label-basic": "Базовый",
+      "label-gradient": "Градиент",
+      "label-retro": "Ретро ЖКИ"
     },
-    "name-bar-size": "",
-    "name-display-mode": "",
-    "name-max-height": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-name-placement": "",
+    "name-bar-size": "Размер столбцов",
+    "name-display-mode": "Режим отображения",
+    "name-max-height": "Макс. высота",
+    "name-min-height": "Мин. высота",
+    "name-min-width": "Мин. ширина",
+    "name-name-placement": "Размещение имен",
     "name-placement-options": {
-      "label-auto": "",
-      "label-hidden": "",
-      "label-left": "",
-      "label-top": ""
+      "label-auto": "Авто",
+      "label-hidden": "Скрыты",
+      "label-left": "Слева",
+      "label-top": "Сверху"
     },
-    "name-show-unfilled-area": "",
-    "name-value-display": "",
+    "name-show-unfilled-area": "Показывать незаполненную область",
+    "name-value-display": "Отображение значений",
     "value-display-options": {
-      "label-hidden": "",
-      "label-text-color": "",
-      "label-value-color": ""
+      "label-hidden": "Скрыты",
+      "label-text-color": "Цвет текста",
+      "label-value-color": "Цвет значений"
     }
   },
   "bookmarks-page": {
@@ -3512,8 +3512,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Массовое удаление подготовленных ресурсов",
+      "bulk-move-provisioned-resources": "Массовое перемещение подготовленных ресурсов",
       "cancel-button": "Отмена",
       "confirmation-text": "Удалить",
       "delete-button": "Удалить",
@@ -3522,7 +3522,7 @@
       "delete-modal-restore-dashboards-text": "Это действие приведет к немедленному удалению выбранных папок, а выбранные дашборды будут помечены для удаления через 30 дней. Администратор вашей организации может восстановить дашборды в любое время в течение указанных 30 дней. Папки нельзя восстановить.",
       "delete-modal-text": "Это действие приведет к удалению следующего контента:",
       "delete-modal-title": "Удаление",
-      "delete-provisioned-folder": "",
+      "delete-provisioned-folder": "Удалить подготовленную папку",
       "deleting": "Удаление...",
       "manage-permissions-button": "Управление разрешениями",
       "move-button": "Переместить",
@@ -3532,8 +3532,8 @@
       "move-modal-title": "Перемещение",
       "moving": "Перемещение...",
       "new-folder-name-required-phrase": "Необходимо указать имя папки.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Вы выбрали как подготовленные, так и неподготовленные ресурсы. Совместная обработка невозможна. Выберите только подготовленные или неподготовленные ресурсы и повторите попытку.",
+      "selected-mix-resources-modal-title": "Выбраны разные типы ресурсов"
     },
     "actions": {
       "button-to-recently-deleted": "Последние удаленные"
@@ -3546,27 +3546,27 @@
       "this-folder-is-empty": "Папка пуста"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_few": "",
-      "failed-alert_many": "",
-      "failed-alert_other": ""
+      "all-deleted": "Все ресурсы удалены",
+      "all-moved": "Все ресурсы перемещены",
+      "button-done": "Готово",
+      "progress-title": "Выполнено",
+      "failed-alert_one": "Ошибка при обработке {{count}} элемента",
+      "failed-alert_few": "Ошибка при обработке {{count}} элементов",
+      "failed-alert_many": "Ошибка при обработке {{count}} элементов",
+      "failed-alert_other": "Ошибка при обработке {{count}} элемента"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Отмена",
+      "button-delete": "Удалить",
+      "button-deleting": "Удаление...",
+      "delete-warning": "Будут удалены выбранные папки и их дочерние элементы. В общей сложности будет удалено:",
+      "error-path-not-found": "Путь не найден"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Отмена",
+      "button-move": "Переместить",
+      "button-moving": "Перемещение...",
+      "deleting": "Удаление",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3574,14 +3574,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Содержимое файла не найдено",
+      "error-path-not-found": "Путь не найден",
+      "error-target-folder-path-missing": "Путь к целевой папке отсутствует",
+      "error-title": "Ошибка в целевой папке",
+      "move-warning": "Будут перемещены выбранные папки и их дочерние элементы. В общей сложности будет перемещено:",
+      "moving": "Перемещение",
+      "progress": "Прогресс: {{current}} из {{total}}",
+      "target-folder": "Целевая папка"
     },
     "counts": {
       "alertRule_one": "{{count}} правило оповещения",
@@ -3617,12 +3617,12 @@
       "read-only-message": ""
     },
     "delete-provisioned-folder-form": {
-      "api-error": "",
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "success-message": ""
+      "api-error": "Не удалось удалить папку",
+      "button-cancel": "Отмена",
+      "button-delete": "Удалить",
+      "button-deleting": "Удаление...",
+      "delete-warning": "Эта папка и все дочерние папки будут удалены. Действие окажет влияние на следующие элементы:",
+      "success-message": "Папка удалена"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Невозможно получить информацию о потомках"
@@ -3647,7 +3647,7 @@
       "empty-message": "Папки не найдены",
       "error-title": "Ошибка загрузки папок",
       "non-folder-item": "{{itemKind}} {{itemUID}} не является папкой",
-      "root-title": "",
+      "root-title": "Дашборды",
       "search-placeholder": "Поиск папок",
       "unknown-error": "Неизвестная ошибка"
     },
@@ -3676,7 +3676,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Ввести имя папки",
       "label-folder-name": "Имя папки",
       "text-pull-request-created": "Создан запрос на включение изменений в папке:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "Ваша папка будет создана как {{folderName}}",
       "title-pull-request-created": "Создан запрос на включение изменений",
       "title-this-repository-is-read-only": "Репозиторий предназначен только для чтения"
     },
@@ -3685,52 +3685,52 @@
       "text": "По вашему запросу ничего не найдено"
     },
     "restore": {
-      "success": ""
+      "success": "Дашборд {{name}} восстановлен"
     },
     "text-this-repository-is-read-only": "Если у вас есть прямой доступ к целевому объекту, скопируйте JSON-файл и вставьте его туда.",
     "trash-state-manager": {
       "label": {
-        "alphabetically-az": "",
-        "alphabetically-za": ""
+        "alphabetically-az": "В алфавитном порядке (прямом)",
+        "alphabetically-za": "В алфавитном порядке (обратном)"
       }
     }
   },
   "candlestick": {
     "additional-fields-options": {
-      "label-ignore": "",
-      "label-include": ""
+      "label-ignore": "Игнорировать",
+      "label-include": "Включить"
     },
     "candle-style-options": {
-      "label-candles": "",
-      "label-ohlc-bars": ""
+      "label-candles": "Свечи",
+      "label-ohlc-bars": "Столбцы диаграммы OHLC"
     },
-    "category-candlestick": "",
+    "category-candlestick": "Диаграмма «японские свечи»",
     "color-strategy-options": {
-      "label-since-open": "",
-      "label-since-prior-close": ""
+      "label-since-open": "С открытия",
+      "label-since-prior-close": "С предшествующего закрытия"
     },
-    "description-additional-fields": "",
-    "description-close": "",
-    "description-high": "",
-    "description-low": "",
-    "description-open": "",
-    "description-volume": "",
+    "description-additional-fields": "Используйте стандартные параметры временных рядов для настройки любых полей, не отображенных выше",
+    "description-close": "Значение на конец периода",
+    "description-high": "Максимальное значение за период",
+    "description-low": "Минимальное значение за период",
+    "description-open": "Значение на начало периода",
+    "description-volume": "Количество выборок за период",
     "mode-options": {
-      "label-both": "",
-      "label-candles": "",
-      "label-volume": ""
+      "label-both": "Оба",
+      "label-candles": "Свечи",
+      "label-volume": "Объем"
     },
-    "name-additional-fields": "",
-    "name-candle-style": "",
-    "name-close": "",
-    "name-color-strategy": "",
-    "name-down-color": "",
-    "name-high": "",
-    "name-low": "",
-    "name-mode": "",
-    "name-open": "",
-    "name-up-color": "",
-    "name-volume": ""
+    "name-additional-fields": "Дополнительные поля",
+    "name-candle-style": "Вид свечей",
+    "name-close": "Закрытие",
+    "name-color-strategy": "Цветовая стратегия",
+    "name-down-color": "Цвет снижения",
+    "name-high": "Максимум",
+    "name-low": "Минимум",
+    "name-mode": "Режим",
+    "name-open": "Открытие",
+    "name-up-color": "Цвет повышения",
+    "name-volume": "Объем"
   },
   "canvas": {
     "apieditor": {
@@ -3745,18 +3745,18 @@
       }
     },
     "button-item": {
-      "category-button": "",
+      "category-button": "Кнопка",
       "label": {
         "center": "По центру",
         "left": "Слева",
         "right": "Справа"
       },
-      "name-align-text": "",
-      "name-api": "",
-      "name-style": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
+      "name-align-text": "Выровнять текст",
+      "name-api": "API",
+      "name-style": "Стиль",
+      "name-text": "Текст",
+      "name-text-color": "Цвет текста",
+      "name-text-size": "Размер текста",
       "placeholder": {
         "auto": "Авто"
       }
@@ -3783,21 +3783,21 @@
         }
       }
     },
-    "category-arrow-direction": "",
-    "category-background": "",
-    "category-border": "",
-    "category-canvas": "",
-    "category-color": "",
-    "category-data-links": "",
-    "category-line-style": "",
-    "category-metric-value": "",
-    "category-radius": "",
-    "category-selected-connection": "",
-    "category-selected-element": "",
-    "category-size": "",
-    "category-tooltip": "",
+    "category-arrow-direction": "Направление стрелки",
+    "category-background": "Фон",
+    "category-border": "Граница",
+    "category-canvas": "Холст",
+    "category-color": "Цвет",
+    "category-data-links": "Ссылки на данные и действия",
+    "category-line-style": "Стиль линии",
+    "category-metric-value": "Значение метрики",
+    "category-radius": "Радиус",
+    "category-selected-connection": "Выбранное соединение",
+    "category-selected-element": "Выбранный элемент ({{element}})",
+    "category-size": "Размер",
+    "category-tooltip": "Подсказка",
     "cloud-item": {
-      "category-cloud": "",
+      "category-cloud": "Облако",
       "label": {
         "bottom": "Снизу",
         "center": "По центру",
@@ -3806,47 +3806,47 @@
         "right": "Справа",
         "top": "Сверху"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Выровнять текст",
+      "name-text": "Текст",
+      "name-text-color": "Цвет текста",
+      "name-text-size": "Размер текста",
+      "name-vertical-align": "Выравнивание по вертикали",
       "placeholder": {
         "auto": "Авто"
       }
     },
-    "description-experimental-types": "",
-    "description-inline-editing": "",
-    "description-pan-zoom": "",
+    "description-experimental-types": "Включить выбор экспериментальных типов элементов",
+    "description-inline-editing": "Включить прямое редактирование панели",
+    "description-pan-zoom": "Включить панорамирование и масштабирование",
     "direction-options": {
-      "label-both": "",
-      "label-forward": "",
-      "label-none": "",
-      "label-reverse": ""
+      "label-both": "Оба",
+      "label-forward": "Вперед",
+      "label-none": "Нет",
+      "label-reverse": "Назад"
     },
     "drone-front-item": {
-      "category-drone-front": "",
-      "name-roll-angle": ""
+      "category-drone-front": "Дрон, вид спереди",
+      "name-roll-angle": "Угол крена"
     },
     "drone-side-item": {
-      "category-drone-side": "",
-      "name-pitch-angle": ""
+      "category-drone-side": "Дрон, вид сбоку",
+      "name-pitch-angle": "Угол тангажа"
     },
     "drone-top-item": {
-      "category-drone-top": "",
-      "name-back-left-rotor-rpm": "",
-      "name-back-right-rotor-rpm": "",
-      "name-front-left-rotor-rpm": "",
-      "name-front-right-rotor-rpm": "",
-      "name-yaw-angle": ""
+      "category-drone-top": "Дрон, вид сверху",
+      "name-back-left-rotor-rpm": "Скорость вращения заднего левого ротора",
+      "name-back-right-rotor-rpm": "Скорость вращения заднего правого ротора",
+      "name-front-left-rotor-rpm": "Скорость вращения переднего левого ротора",
+      "name-front-right-rotor-rpm": "Скорость вращения переднего правого ротора",
+      "name-yaw-angle": "Угол рыскания"
     },
     "element-editor": {
-      "category-layout": "",
-      "description-unsupported": "",
-      "name-quick-placement": ""
+      "category-layout": "Макет",
+      "description-unsupported": "Выбранный тип элемента не поддерживается текущими настройками. Включите дополнительные типы элементов.",
+      "name-quick-placement": "Быстрое размещение"
     },
     "ellipse-item": {
-      "category-ellipse": "",
+      "category-ellipse": "Эллипс",
       "label": {
         "bottom": "Снизу",
         "center": "По центру",
@@ -3855,50 +3855,50 @@
         "right": "Справа",
         "top": "Сверху"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Выровнять текст",
+      "name-text": "Текст",
+      "name-text-color": "Цвет текста",
+      "name-text-size": "Размер текста",
+      "name-vertical-align": "Выравнивание по вертикали",
       "placeholder": {
         "auto": "Авто"
       }
     },
     "icon-item": {
-      "category-icon": "",
-      "name-fill-color": "",
-      "name-svg-path": ""
+      "category-icon": "Значок",
+      "name-fill-color": "Цвет заливки",
+      "name-svg-path": "Путь SVG"
     },
     "inline-edit": {
       "canvas-inline-editor": "Встроенный редактор холста",
       "tooltip-close-inline-editor": "Закрыть встроенный редактор"
     },
     "inline-edit-body": {
-      "category-selected-element": "",
+      "category-selected-element": "Выбранный элемент ({{element}})",
       "label-add-item": "Добавить элемент",
       "please-select-an-element": "Выберите элемент"
     },
-    "label-actions": "",
-    "label-color": "",
-    "label-direction": "",
-    "label-image": "",
-    "label-image-size": "",
-    "label-line-style": "",
-    "label-links": "",
-    "label-radius": "",
-    "label-size": "",
-    "label-width": "",
+    "label-actions": "Действия",
+    "label-color": "Цвет",
+    "label-direction": "Направление",
+    "label-image": "Изображение",
+    "label-image-size": "Размер изображения",
+    "label-line-style": "Стиль линии",
+    "label-links": "Ссылки",
+    "label-radius": "Радиус",
+    "label-size": "Размер",
+    "label-width": "Ширина",
     "layer-editor": {
-      "category-layer": "",
-      "category-layout": "",
-      "name-constraints": "",
-      "name-elements": ""
+      "category-layer": "Слой",
+      "category-layout": "Макет",
+      "name-constraints": "Ограничения",
+      "name-elements": "Элементы"
     },
     "line-style-editor": {
       "label-animate": "Анимировать"
     },
     "line-style-options": {
-      "label-solid": ""
+      "label-solid": "Сплошная"
     },
     "metric-value-item": {
       "label": {
@@ -3913,14 +3913,14 @@
         "auto": "Авто"
       }
     },
-    "name-align-text": "",
-    "name-color": "",
-    "name-experimental-types": "",
-    "name-inline-editing": "",
-    "name-pan-zoom": "",
-    "name-text": "",
-    "name-text-size": "",
-    "name-vertical-align": "",
+    "name-align-text": "Выровнять текст",
+    "name-color": "Цвет текста",
+    "name-experimental-types": "Экспериментальные типы элементов",
+    "name-inline-editing": "Прямое редактирование",
+    "name-pan-zoom": "Панорамирование и масштабирование",
+    "name-text": "Текст",
+    "name-text-size": "Размер текста",
+    "name-vertical-align": "Выравнивание по вертикали",
     "not-found-display": {
       "not-found": "<0>Не найдено: </0><config />"
     },
@@ -3933,7 +3933,7 @@
       "zoom-scroll-wheel": "Масштаб: колесико прокрутки"
     },
     "parallelogram-item": {
-      "category-parallelogram": "",
+      "category-parallelogram": "Параллелограмм",
       "label": {
         "bottom": "Снизу",
         "center": "По центру",
@@ -3942,11 +3942,11 @@
         "right": "Справа",
         "top": "Сверху"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Выровнять текст",
+      "name-text": "Текст",
+      "name-text-color": "Цвет текста",
+      "name-text-size": "Размер текста",
+      "name-vertical-align": "Выравнивание по вертикали",
       "placeholder": {
         "auto": "Авто"
       }
@@ -3959,21 +3959,21 @@
     },
     "placement-editor": {
       "horizontal-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-left-and-right": "",
-        "label-right": "",
-        "label-scale": ""
+        "label-center": "По центру",
+        "label-left": "Слева",
+        "label-left-and-right": "Слева и справа",
+        "label-right": "Справа",
+        "label-scale": "По масштабу"
       },
       "label-constraints": "Ограничения",
       "label-position": "Положение",
       "loading": "Загрузка…",
       "vertical-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-scale": "",
-        "label-top": "",
-        "label-top-and-bottom": ""
+        "label-bottom": "Снизу",
+        "label-center": "По центру",
+        "label-scale": "По масштабу",
+        "label-top": "Сверху",
+        "label-top-and-bottom": "Сверху и снизу"
       }
     },
     "quick-positioning": {
@@ -3985,7 +3985,7 @@
       "tooltip-align-vertical-centers": "Выровнять по вертикали"
     },
     "rectangle-item": {
-      "category-rectangle": "",
+      "category-rectangle": "Прямоугольник",
       "label": {
         "bottom": "Снизу",
         "center": "По центру",
@@ -3994,33 +3994,33 @@
         "right": "Справа",
         "top": "Сверху"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Выровнять текст",
+      "name-text": "Текст",
+      "name-text-color": "Цвет текста",
+      "name-text-size": "Размер текста",
+      "name-vertical-align": "Выравнивание по вертикали",
       "placeholder": {
         "auto": "Авто"
       }
     },
     "server-item": {
-      "category-server": "",
-      "name-blink-rate": "",
-      "name-bulb-color": "",
-      "name-status-color": "",
-      "name-type": "",
+      "category-server": "Сервер",
+      "name-blink-rate": "Частота мигания [Гц] (0 = выкл.)",
+      "name-bulb-color": "Цвет лампы",
+      "name-status-color": "Цвет статуса",
+      "name-type": "Тип",
       "type-options": {
-        "label-database": "",
-        "label-single": "",
-        "label-stack": "",
-        "label-terminal": ""
+        "label-database": "База данных",
+        "label-single": "Один",
+        "label-stack": "Стек",
+        "label-terminal": "Терминал"
       }
     },
     "text-display": {
       "double-click-to-set": "Дважды нажмите, чтобы установить текст"
     },
     "text-item": {
-      "category-text": "",
+      "category-text": "Текст",
       "label": {
         "bottom": "Снизу",
         "center": "По центру",
@@ -4029,20 +4029,20 @@
         "right": "Справа",
         "top": "Сверху"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Выровнять текст",
+      "name-text": "Текст",
+      "name-text-color": "Цвет текста",
+      "name-text-size": "Размер текста",
+      "name-vertical-align": "Выравнивание по вертикали",
       "placeholder": {
         "auto": "Авто"
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Режим подсказок",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Отключены",
+        "label-enabled": "Включены"
       }
     },
     "tree-navigation-editor": {
@@ -4062,7 +4062,7 @@
       "tooltip-remove": "Удалить"
     },
     "triangle-item": {
-      "category-triangle": "",
+      "category-triangle": "Треугольник",
       "label": {
         "bottom": "Снизу",
         "center": "По центру",
@@ -4071,18 +4071,18 @@
         "right": "Справа",
         "top": "Сверху"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Выровнять текст",
+      "name-text": "Текст",
+      "name-text-color": "Цвет текста",
+      "name-text-size": "Размер текста",
+      "name-vertical-align": "Выравнивание по вертикали",
       "placeholder": {
         "auto": "Авто"
       }
     },
     "wind-turbine-item": {
-      "category-wind-turbine": "",
-      "name-rpm": ""
+      "category-wind-turbine": "Ветрогенератор",
+      "name-rpm": "об/мин"
     }
   },
   "carousel": {
@@ -4099,8 +4099,8 @@
   "close-button": {
     "tooltip": "Закрыть"
   },
-  "cloud-enterprise-feature-badge": "",
-  "cloud-feature-badge": "",
+  "cloud-enterprise-feature-badge": "Cloud и Enterprise",
+  "cloud-feature-badge": "Cloud",
   "combobox": {
     "async": {
       "error": "Ошибка при загрузке параметров."
@@ -4411,7 +4411,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Выполнить запрос"
     }
   },
   "dashboard": {
@@ -4574,7 +4574,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Продолжить"
         },
         "title": {
           "proceed-to-external-site": "Перейти на внешний сайт?"
@@ -4671,7 +4671,7 @@
       }
     },
     "description": {
-      "action": ""
+      "action": "Изменить описание дашборда"
     },
     "dynamic-config-value-editor": {
       "render-label": {
@@ -4680,17 +4680,17 @@
     },
     "edit-actions": {
       "add": "Добавить {{typeName}}",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
-      "move": "",
+      "add-conditional-rule": "Добавить {{ruleDescription}} правило",
+      "duplicate-panel": "Дублировать панель",
+      "edit-query-result-rule": "Изменить правило результата запроса",
+      "edit-template-variable-rule": "Изменить правило переменной шаблона",
+      "edit-time-range-rule": "Изменить правило временного диапазона",
+      "move": "Переместить {{typeName}}",
       "panel-background": "Изменить фон панели",
       "panel-description": "Изменить описание панели",
-      "panel-max-repeats-per-row": "",
+      "panel-max-repeats-per-row": "Макс. повторений на строку",
       "panel-repeat-direction": "Повторение направления",
-      "panel-repeat-variable": "",
+      "panel-repeat-variable": "Повторение панели по",
       "panel-title": "Изменить заголовок панели",
       "paste-panel": "Вставка панели",
       "remove": "Удалить {{typeName}}",
@@ -4699,7 +4699,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Дашборд",
-        "element": "",
+        "element": "Элемент",
         "local-variable": "Локальная переменная",
         "multiple-elements": "Несколько элементов",
         "multiple-elements-delete-text": "Действительно удалить элементы?",
@@ -4781,10 +4781,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Экспорт дашборда"
       },
       "menu": {
-        "label": ""
+        "label": "Меню экспорта дашборда"
       }
     },
     "fetch-dashboard": {
@@ -4806,9 +4806,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "По умолчанию",
+          "shared-crosshair": "Общее перекрестие",
+          "shared-tooltip": "Общая подсказка"
         }
       }
     },
@@ -4825,7 +4825,7 @@
     "get-field-override-categories": {
       "label-add-field-override": "Добавить переопределение полей",
       "label-add-override-property": "Добавить свойство переопределения",
-      "override-name": "",
+      "override-name": "Переопределение {{overrideNum}}",
       "title": {
         "add-button": "добавить кнопку"
       }
@@ -4861,14 +4861,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Не отправлять данные аннотаций на следующие панели",
+        "annotation-panels-support-annotations": "Отправить данные аннотаций на все панели, поддерживающие их",
+        "annotations-explicitly-listed-panels": "Отправить аннотации только на указанные панели"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Все панели",
+        "all-panels-except": "Все панели, кроме",
+        "selected-panels": "Выбранные панели"
       }
     },
     "get-panel-frame-category": {
@@ -5056,7 +5056,7 @@
       "title-matched_other": "Совпадение: {{count}}/{{totalCount}} параметра"
     },
     "outline": {
-      "repeated-item": "",
+      "repeated-item": "Повторить",
       "tree-item": {
         "empty": "(пусто)",
         "no-title": "<нет заголовка>"
@@ -5132,7 +5132,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Действительно восстановить дашборд до версии {{version}}? Все несохраненные изменения будут потеряны.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Да, восстановить до версии {{version}}",
       "title-restore-version": "Восстановление версии"
     },
     "row-options-button": {
@@ -5184,7 +5184,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Дашборд сохранен"
     },
     "save-dashboard-as-button": {
       "save-as": "Сохранить как"
@@ -5214,13 +5214,13 @@
       "label-changes": "Изменения",
       "label-details": "Подробности",
       "title": "Сохранить дашборд",
-      "title-copy": "",
-      "title-provisioned": ""
+      "title-copy": "Сохранить копию дашборда",
+      "title-provisioned": "Подготовленный дашборд"
     },
     "save-dashboard-error-proxy": {
       "body-name-exists": "Дашборд с таким именем уже существует в выбранной папке.<1></1><2>Все равно сохранить дашборд?</2>",
       "body-version-mismatch": "Дашборд обновлен другим пользователем<1></1><2>Все равно сохранить дашборд?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Сохранить и перезаписать",
       "title-name-exists": "Конфликт",
       "title-version-mismatch": "Конфликт"
     },
@@ -5293,7 +5293,7 @@
       }
     },
     "title": {
-      "action": ""
+      "action": "Изменить заголовок дашборда"
     },
     "toolbar": {
       "add": "Добавить",
@@ -5417,9 +5417,9 @@
       "label-apply-transformation-to": "Применить преобразование к"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Обратите внимание, что удаление одного преобразования может привести к нарушению работы других. Если имеется только одно преобразование, вы вернетесь на главный экран выбора.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Удалить",
         "title-debug": "Отладка",
         "title-disable-transformation": "Отключение преобразования",
         "title-filter": "Фильтр",
@@ -5440,16 +5440,16 @@
       "placeholder-search-for-transformation": "Поиск преобразования",
       "show-images": "Показать изображения",
       "title-add-another-transformation": "Добавление другого преобразования",
-      "view-all": ""
+      "view-all": "Просмотреть все"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Удалив все преобразования, вы вернетесь на главный экран выбора."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Добавить другое преобразование"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Удалить все",
       "delete-all-transformations": "Удалить все преобразования",
       "title-delete-all-transformations": "Удалить все преобразования?",
       "tooltip-clear-search": "Очистить поиск",
@@ -5479,16 +5479,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Изменить описание переменной"
       },
       "hide": {
-        "action": ""
+        "action": "Изменить параметр скрытия переменной"
       },
       "label": {
-        "action": ""
+        "action": "Изменить метку переменной"
       },
       "name": {
-        "action": ""
+        "action": "Изменить имя переменной"
       }
     },
     "version-history-comparison": {
@@ -5500,7 +5500,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Переключить выбор версии {{version}}",
       "date": "Дата",
-      "name-latest": "",
+      "name-latest": "Последние",
       "notes": "Примечания",
       "restore": "Восстановить",
       "updated-by": "Кем обновлено",
@@ -5578,7 +5578,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Укажите измерения в формате CSV: {{name}}, {{value}}.",
       "label-data-source": "Источник данных",
       "label-use-static-key-dimensions": "Использовать измерения статического ключа",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Разрешить пользовательские значения"
     },
     "add-to-dashboard": {
       "message": {
@@ -5652,7 +5652,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Отозвать общедоступный URL-адрес"
       },
       "title": {
         "revoke-public-url": "Отозвать общедоступный URL-адрес"
@@ -5665,7 +5665,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Пользовательские параметры",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Значения, разделенные запятыми",
       "selection-options": "Параметры выбора"
     },
     "dashboard-edit-pane-renderer": {
@@ -5686,8 +5686,8 @@
       "label-with-tags": "С тегами",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Дашборды",
+          "link": "Ссылка"
         }
       },
       "placeholder-open-dashboard": "Открыть дашборд"
@@ -5730,8 +5730,8 @@
       "data-source-options": "Параметры источника данных",
       "description-instance-name-filter": "Фильтр регулярных выражений для выбора экземпляров источников данных в списке значений переменных. Оставьте пустым для всех.",
       "example-instance-name-filter": "Пример: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Фильтр по имени экземпляров",
+      "name-type": "Тип",
       "selection-options": "Параметры выбора"
     },
     "default-grid-layout-manager": {
@@ -5742,12 +5742,12 @@
       }
     },
     "delete-provisioned-dashboard-form": {
-      "api-error": "",
+      "api-error": "Не удалось удалить дашборд",
       "cancel-action": "Отмена",
       "delete-action": "Удалить дашборд",
       "deleting": "Удаление...",
-      "drawer-title": "",
-      "success-message": ""
+      "drawer-title": "Удалить подготовленный дашборд",
+      "success-message": "Дашборд удален"
     },
     "description-label": {
       "description": "Описание"
@@ -5776,15 +5776,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Редактируемый",
+          "readonly": "Только для чтения"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "По умолчанию",
+          "shared-crosshair": "Общее перекрестие",
+          "shared-tooltip": "Общая подсказка"
         }
       }
     },
@@ -5796,36 +5796,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Добавляйте фильтры «ключ/значение» в процессе работы",
+        "dynamically-switch-source-multiple-panels": "Динамическое переключение источника данных для нескольких панелей",
+        "group": "Добавляйте ключи для группировки в процессе работы",
+        "hidden-constant-variable": "Скрытая константная переменная для префиксов метрик на дашбордах, доступ к которым вы хотите открыть",
+        "users-enter-arbitrary-strings-textbox": "Пользователи могут вводить любые произвольные строки в текстовое поле",
+        "values-are-static-and-defined-manually": "Значения являются статическими и задаются вручную",
+        "values-fetched-source-query": "Значения извлекаются из запроса к источнику данных",
+        "values-timespans": "Значения являются временными интервалами, например, 1 мин, 1 ч, 1 д"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Специальные фильтры",
+        "constant": "Константа",
+        "custom": "Пользовательская",
+        "data-source": "Источник данных",
+        "group-by": "Группировать по",
+        "interval": "Интервал",
+        "query": "Запрос",
+        "textbox": "Текстовое поле"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Не отправлять данные аннотаций на следующие панели",
+        "annotation-panels-support-annotations": "Отправить данные аннотаций на все панели, поддерживающие их",
+        "annotations-explicitly-listed-panels": "Отправить аннотации только на указанные панели"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Все панели",
+        "all-panels-except": "Все панели, кроме",
+        "selected-panels": "Выбранные панели"
       }
     },
     "get-panel-frame-options": {
@@ -5853,7 +5853,7 @@
       "group-by-options": "Группировать по параметрам",
       "label-data-source": "Источник данных",
       "label-use-static-group-by-dimensions": "Использовать измерения статической группы",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Разрешить пользовательские значения"
     },
     "help-wizard": {
       "copy-to-clipboard": "Копировать в буфер обмена",
@@ -5889,14 +5889,14 @@
       "apply": "Применить"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Динамически рассчитывает интервал путем деления временного диапазона на указанное количество",
       "description-calculated-value-below-threshold": "Расчетное значение не будет ниже этого порога.",
       "description-step-count": "Сколько раз нужно разделить текущий временной диапазон для расчета значения.",
       "interval-options": "Параметры интервалов",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Автоматический параметр",
+      "name-min-interval": "Мин. интервал",
+      "name-step-count": "Количество шагов",
+      "name-values": "Значения"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5919,19 +5919,19 @@
       "usage-count_other": "Используется на {{count}} дашбордах"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Ошибка при перемещении дашборда",
+      "api-error": "Не удалось переместить дашборд",
+      "cancel-action": "Отмена",
+      "current-file-not-found": "Текущий файл дашборда не найден",
+      "drawer-title": "Переместить подготовленный дашборд",
+      "file-load-error": "Ошибка при загрузке дашборда",
+      "loading-file-data": "Загрузка данных дашборда",
+      "move-action": "Переместить дашборд",
+      "move-read-only-message": "Дашборд невозможно переместить непосредственно из Grafana, поскольку репозиторий доступен только для чтения. Чтобы переместить этот дашборд, переместите файл в репозиторий Git.",
+      "moving": "Перемещение...",
+      "success-message": "Дашборд перемещен",
+      "target-path-label": "Целевой путь",
+      "title-this-repository-is-read-only": "Репозиторий предназначен только для чтения"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Дашборд с таким названием уже существует в выбранной папке. Все равно сохранить дашборд?",
@@ -5939,7 +5939,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Продолжить"
       },
       "title": {
         "proceed-to-external-site": "Перейти на внешний сайт?"
@@ -5954,7 +5954,7 @@
       }
     },
     "panel-data-alerting-tab": {
-      "tab-label": ""
+      "tab-label": "Оповещение"
     },
     "panel-data-alerting-tab-rendered": {
       "alert": {
@@ -5965,19 +5965,19 @@
       "title-dashboard-not-saved": "Дашборд не сохранен"
     },
     "panel-data-queries-tab": {
-      "tab-label": ""
+      "tab-label": "Запросы"
     },
     "panel-data-queries-tab-rendered": {
       "add-query": "Добавить запрос",
       "expression": "Выражение "
     },
     "panel-data-transformations-tab": {
-      "tab-label": ""
+      "tab-label": "Преобразования"
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Добавить другое преобразование",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Удалив все преобразования, вы вернетесь на главный экран выбора.",
+      "confirmText-delete-all": "Удалить все",
       "delete-all-transformations": "Удалить все преобразования",
       "title-delete-all-transformations": "Удалить все преобразования?"
     },
@@ -6030,13 +6030,13 @@
       "description-examples": "Именованные группы записи можно использовать для разделения отображаемого текста и значения (<1>см. примеры</1>).",
       "description-optional": "Дополнительно, если вы хотите извлечь часть имени ряда или сегмента узла метрики.",
       "label-data-source": "Источник данных",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Сортировка статических параметров",
       "label-target-data-source": "Целевой источник данных",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Использовать статические параметры",
+      "name-regex": "Регулярное выражение",
       "query-options": "Параметры запросов",
       "selection-options": "Параметры выбора",
-      "static-options-legend": ""
+      "static-options-legend": "Статические параметры"
     },
     "resource-export": {
       "label": {
@@ -6049,7 +6049,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Действительно восстановить дашборд до версии {{version}}? Все несохраненные изменения будут потеряны.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Да, восстановить до версии {{version}}",
       "title-restore-version": "Восстановление версии"
     },
     "save-button": {
@@ -6068,15 +6068,15 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Не удалось сохранить дашборд"
       },
-      "required": ""
+      "required": "Обязательно"
     },
     "save-dashboard-drawer": {
       "tabs": {
         "label-changes": "Изменения",
         "label-details": "Подробности",
         "title": "Сохранить дашборд",
-        "title-copy": "",
-        "title-provisioned": ""
+        "title-copy": "Сохранить копию дашборда",
+        "title-provisioned": "Подготовленный дашборд"
       }
     },
     "save-dashboard-form": {
@@ -6095,8 +6095,8 @@
         "title-someone-else-has-updated-this-dashboard": "Дашборд обновлен другим пользователем",
         "would-still-dashboard": "Все равно сохранить дашборд?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "Из-за ограничений в новой схеме дашборда (V2) панели библиотеки будут преобразованы в обычные панели со встроенным содержимым во время внешнего экспорта.",
+      "schema-v2-library-panels-export-title": "Панели библиотеки будут преобразованы в обычные панели",
       "title-dashboard-drastically-changed": "Дашборд необратимо изменен"
     },
     "save-dashboard-form-common-options": {
@@ -6145,10 +6145,10 @@
       "description-enables-multiple-values-selected": "Позволяет выбирать несколько значений одновременно.",
       "description-enables-option-include-variables": "Включает параметр для добавления всех значений",
       "description-enables-users-custom-values": "Позволяет пользователям добавлять пользовательские значения в список.",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Разрешить пользовательские значения",
+      "name-custom-all-value": "Пользовательское значение «Все»",
+      "name-include-all-option": "Включить параметр «Все»",
+      "name-multi-value": "Несколько значений"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Переключить меню общего доступа"
@@ -6169,7 +6169,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Значение по умолчанию"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(необязательно)",
@@ -6194,8 +6194,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Если вы отсоедините эту панель, вы сможете редактировать ее отдельно от других дашбордов. Однако после внесения изменений вы не сможете вернуться к исходной панели многократного использования.",
+      "confirmText-yes-unlink": "Да, отсоединить",
       "title-really-unlink-panel": "Действительно отсоединить панель?"
     },
     "unsaved-changes-modal": {
@@ -6213,7 +6213,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Дашборд сохранен"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "На эту переменную не ссылается ни одна переменная или дашборд",
@@ -6225,15 +6225,15 @@
       "aria-label-variable-editor-form": "Форма редактора переменных",
       "back-to-list": "Назад к списку",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Удалить переменную"
       },
       "delete": "Удалить",
       "description-optional-display-name": "Отображаемое имя (необязательно)",
       "description-template-variable-characters": "Название переменной шаблона. (Макс. 50 символов.)",
       "general": "Общие сведения",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Описание",
+      "name-label": "Метка",
+      "name-name": "Имя",
       "placeholder-descriptive-text": "Поясняющий текст",
       "placeholder-label-name": "Название метки",
       "placeholder-variable-name": "Название переменной",
@@ -6248,8 +6248,8 @@
       "variable": "Переменная"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Вы действительно хотите удалить {{variable}}?",
+      "confirmText-delete-variable": "Удалить переменную",
       "title-delete-variable": "Удаление переменной",
       "tooltip-duplicate-variable": "Дублировать переменную",
       "tooltip-remove-variable": "Удалить переменную"
@@ -6257,15 +6257,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Метка",
+          "nothing": "Ничего",
+          "variable": "Переменная"
         }
       },
       "label": "Скрыть"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Тип переменной"
     },
     "variable-usages-button": {
       "title-show-usages": "Показаны варианты использования для: {{variableId}}",
@@ -6293,7 +6293,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Переключить выбор версии {{version}}",
       "date": "Дата",
-      "name-latest": "",
+      "name-latest": "Последние",
       "notes": "Примечания",
       "restore": "Восстановить",
       "updated-by": "Кем обновлено",
@@ -6400,18 +6400,18 @@
     }
   },
   "dashlist": {
-    "category-dashboard-list": "",
-    "name-folder": "",
-    "name-include-current-template-variables": "",
-    "name-include-current-time-range": "",
-    "name-max-items": "",
-    "name-query": "",
-    "name-recently-viewed": "",
-    "name-search": "",
-    "name-show-folder-names": "",
-    "name-show-headings": "",
-    "name-starred": "",
-    "name-tags": ""
+    "category-dashboard-list": "Список дашбордов",
+    "name-folder": "Папка",
+    "name-include-current-template-variables": "Включить текущие значения переменных шаблона",
+    "name-include-current-time-range": "Включить текущий временной диапазон",
+    "name-max-items": "Макс. количество элементов",
+    "name-query": "Запрос",
+    "name-recently-viewed": "Последние просмотренные",
+    "name-search": "Поиск",
+    "name-show-folder-names": "Показывать имена дашбордов",
+    "name-show-headings": "Показывать заголовки",
+    "name-starred": "Помеченные",
+    "name-tags": "Теги"
   },
   "data-source-list": {
     "empty-state": {
@@ -6675,16 +6675,16 @@
   "dimensions": {
     "background-size-editor": {
       "options": {
-        "label-contain": "",
-        "label-cover": "",
-        "label-fill": "",
-        "label-original": "",
-        "label-tile": ""
+        "label-contain": "Заключить",
+        "label-cover": "Покрыть",
+        "label-fill": "Заполнить",
+        "label-original": "Оригинал",
+        "label-tile": "Замостить"
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": "",
-      "noOptionsMessage-no-fields-found": ""
+      "label-fixed-color": "Фиксированный цвет",
+      "noOptionsMessage-no-fields-found": "Поля не найдены"
     },
     "file-dropzone-custom-children": {
       "upload": "Передать"
@@ -6698,10 +6698,10 @@
       "placeholder-search": "Поиск"
     },
     "resource-dimension-editor": {
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Использовать результат строкового поля",
+      "description-fixed": "Фиксированное значение",
       "label-field": "Поле",
-      "label-fixed": "",
+      "label-fixed": "Фиксированное",
       "label-mappings": "Сопоставления",
       "label-source": "Источник"
     },
@@ -6719,35 +6719,35 @@
     },
     "scalar-dimension-editor": {
       "fixed-value-options": {
-        "label-fixed-values": ""
+        "label-fixed-values": "Фиксированное значение"
       },
       "label-limit": "Предельное значение",
       "label-value": "Значение",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Поля не найдены",
       "scalar-options": {
-        "description-clamped": "",
-        "description-mod": "",
-        "label-clamped": "",
-        "label-mod": ""
+        "description-clamped": "Использовать значения полей, привязанные к макс. и мин.",
+        "description-mod": "Использовать значения полей, модифицированные от макс.",
+        "label-clamped": "Привязанные",
+        "label-mod": "Модифицированные"
       }
     },
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Фиксированное значение"
         }
       },
       "label-max": "Макс.",
       "label-min": "Мин.",
       "label-value": "Значение",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Поля не найдены"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Отобразить значение поля",
+      "description-fixed": "Фиксированное значение",
       "label-field": "Поле",
-      "label-fixed": "",
+      "label-fixed": "Фиксированное",
       "label-source": "Источник",
       "label-template": "Шаблон",
       "label-value": "Значение"
@@ -6761,16 +6761,16 @@
       "description-percentage-means-thresholds-relative": "Процент означает пороговые значения относительно минимального и максимального значения.",
       "modes": {
         "description": {
-          "threshold-based-percent-between-minmax": "",
-          "thresholds-based-absolute-values": ""
+          "threshold-based-percent-between-minmax": "Выбрать пороговое значение на основе процентного соотношения между мин. и макс.",
+          "thresholds-based-absolute-values": "Выбрать пороговые значения на основе абсолютных значений"
         },
         "label": {
-          "absolute": "",
-          "percentage": ""
+          "absolute": "Абсолютные",
+          "percentage": "В процентах"
         }
       },
       "thresholds-mode": "Режим пороговых значений",
-      "value-base": ""
+      "value-base": "Базовое"
     },
     "urlpicker-tab": {
       "label-preview": "Предварительный просмотр"
@@ -6850,6 +6850,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "События",
@@ -7122,7 +7123,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Загрузка…"
     },
     "prev": "Назад",
     "queryless-apps-extensions": {
@@ -7309,7 +7310,7 @@
           "start-time": "Время начала:"
         }
       },
-      "share-span": "",
+      "share-span": "Поделиться",
       "warnings": "Предупреждения"
     },
     "span-filters": {
@@ -7319,8 +7320,8 @@
       "aria-label-select-service-name-operator": "Выбрать оператор названия службы",
       "aria-label-select-span-name": "Выбрать название диапазона",
       "aria-label-select-span-name-operator": "Выбрать оператора названия диапазона",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Выбрать макс. продолжительность интервала",
+      "ariaLabel-select-min-span-duration": "Выбрать мин. продолжительность интервала",
       "label-collapse": "Фильтры диапазонов",
       "label-duration": "Длительность",
       "label-service-name": "Название службы",
@@ -7392,23 +7393,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Длительность",
+      "export-started": "Экспорт запущен",
+      "give-feedback": "Обратная связь",
+      "link-copied": "Ссылка скопирована в буфер обмена",
+      "path": "Путь",
+      "route": "Маршрут",
+      "services": "Службы",
+      "share": "Поделиться",
+      "share-copy-link": "Копировать ссылку",
+      "share-export-json": "Экспорт в формате JSON",
+      "share-tooltip": "Поделиться трассировкой",
+      "start-time": "Время начала",
+      "target": "Цель",
+      "title-share-thoughts-about-tracing-grafana": "Поделитесь своим мнением о трассировке в Grafana.",
+      "tooltip-url": "{{route}} или {{url}}, или {{target}}, или {{path}}",
+      "trace-id": "Идентификатор трассировки",
+      "url": "URL-адрес"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Кнопка очистки фильтров",
@@ -7508,7 +7509,7 @@
       "when": "КОГДА"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Выполните SQL-запрос на диалекте MySQL к таблицам, возвращенным вашими источниками данных. Запросы к источникам данных (например, «A», «B») доступны в виде таблиц с ссылкой на них по имени запроса. Поля доступны в виде столбцов, возвращенных источником данных.",
       "label-operation": "Операция"
     },
     "math": {
@@ -7539,7 +7540,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Очистить папки",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Папки не найдены",
     "select-aria-label": "Фильтр папок",
     "select-placeholder": "Фильтровать по папкам"
   },
@@ -7588,23 +7589,23 @@
     "title": "Покинуть страницу?"
   },
   "gauge": {
-    "category-gauge": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-neutral": "",
-    "description-show-threshold-labels": "",
-    "description-show-threshold-markers": "",
+    "category-gauge": "Индикатор",
+    "description-min-height": "Минимальная высота строки (горизонтальная ориентация)",
+    "description-min-width": "Минимальная ширина столбца (вертикальная ориентация)",
+    "description-neutral": "Оставить пустым, чтобы использовать мин. как нейтральную точку",
+    "description-show-threshold-labels": "Отобразить пороговые значения вокруг столбца индикатора",
+    "description-show-threshold-markers": "Отобразить пороговые значения в виде внешнего столбца",
     "gauge-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Авто",
+      "label-manual": "Ручной"
     },
-    "name-gauge-size": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-neutral": "",
-    "name-show-threshold-labels": "",
-    "name-show-threshold-markers": "",
-    "placeholder-neutral": ""
+    "name-gauge-size": "Размеры индикатора",
+    "name-min-height": "Мин. высота",
+    "name-min-width": "Мин. ширина",
+    "name-neutral": "Нейтральный",
+    "name-show-threshold-labels": "Показывать метки пороговых значений",
+    "name-show-threshold-markers": "Показывать маркеры пороговых значений",
+    "placeholder-neutral": "авто"
   },
   "gen-ai": {
     "apply-suggestion": "Применить",
@@ -7613,51 +7614,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Географический каталог не найден",
+      "warning-no-geometry": "не удалось найти геометрию",
+      "warning-select-geohash": "Выберите поле geohash",
+      "warning-select-lat-long": "Выберите поля широты/долготы",
+      "warning-select-lookup": "Выберите поле подстановки",
+      "warning-unable-to-find": "Не удалось найти поля местоположения"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Строковые поля не найдены"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Числовые поля не найдены"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Числовые поля не найдены"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Строковые поля не найдены"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Географический каталог",
+      "name-geohash-field": "Поле geohash",
+      "name-latitude-field": "Поле широты",
+      "name-location-mode": "Режим определения местоположения",
+      "name-longitude-field": "Поле долготы",
+      "name-lookup-field": "Поле подстановки"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Автоматически определять данные о местоположении на основе имен полей по умолчанию",
+        "description-coords": "Укажите поля широты и долготы",
+        "description-geohash": "Укажите поле geohash",
+        "description-lookup": "Укажите географический каталог и поле подстановки",
+        "label-auto": "Авто",
+        "label-coords": "Координаты",
+        "label-geohash": "Geohash",
+        "label-lookup": "Подстановка"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Слой базовой карты",
+    "category-map-controls": "Управление картой",
+    "category-map-layers": "Слои карты",
+    "category-map-view": "Представление карты",
     "coordinates-map-view-editor": {
       "label-latitude": "Широта",
       "label-longitude": "Долгота"
@@ -7666,15 +7667,15 @@
       "center": "Центр:",
       "zoom": "Масштаб:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Это местоположение будет показываться при первой загрузке панели.",
+    "description-mouse-wheel-zoom": "Включить управление масштабом с помощью колесика мыши",
+    "description-no-repeat": "Отключить повторение карты по горизонтали",
+    "description-share-view": "Использовать одно и то же представление на нескольких панелях. Примечание: может потребоваться перезагрузка дашборда.",
+    "description-show-attribution": "Показывать информацию об источнике карты в правом нижнем углу",
+    "description-show-debug": "Показывать информацию о карте",
+    "description-show-measure": "Показывать инструменты для выполнения измерений на карте",
+    "description-show-scale": "Показывать масштаб карты",
+    "description-show-zoom": "Показывать кнопки управления масштабом в верхнем левом углу",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Слой"
@@ -7698,12 +7699,12 @@
       "aria-label-add-geomap-style-rule": "Добавить правило стиля геокарты"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Базовый слой",
+      "description-display-tooltip": "Показывать подсказки по слоям",
+      "name-data": "Данные",
+      "name-display-tooltip": "Показывать подсказки",
+      "name-layer-type": "Тип слоя",
+      "name-opacity": "Прозрачность"
     },
     "layers-editor": {
       "label-add-layer": "Добавить слой",
@@ -7716,9 +7717,9 @@
       "use-current-map-settings": "Использовать текущие настройки карты"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Показывать условные обозначения карты",
+      "name-show-legend": "Показывать условные обозначения",
+      "name-styles": "Стили"
     },
     "markers-legend": {
       "title-symbol": "Символ"
@@ -7727,27 +7728,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Показать инструменты измерения"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Исходный вид",
+    "name-mouse-wheel-zoom": "Масштабирование колесиком мыши",
+    "name-no-repeat": "Отключить повторение карты",
+    "name-share-view": "Общий доступ к представлению",
+    "name-show-attribution": "Показывать источник",
+    "name-show-debug": "Показывать настройки",
+    "name-show-measure": "Показывать инструменты для измерения",
+    "name-show-scale": "Показывать масштаб",
+    "name-show-zoom": "Показывать элементы управления масштабом",
+    "name-tooltip": "Подсказка",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Строковые поля не найдены"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "Слой базовой карты конфигурируется администратором сервера."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "По центру",
+        "label-left": "Слева",
+        "label-right": "Справа"
       },
       "label-align": "Выравнивание",
       "label-baseline": "Базовая линия",
@@ -7763,12 +7764,12 @@
       "label-text-label": "Текстовая метка",
       "label-x-offset": "Смещение по оси X",
       "label-y-offset": "Смещение по оси Y",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Выберите символ",
+      "placeholderText-select-symbol-or-add-text": "Выберите символ или добавьте текстовую метку",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Снизу",
+        "label-center": "По центру",
+        "label-top": "Сверху"
       }
     },
     "style-rule-editor": {
@@ -7782,13 +7783,13 @@
       "placeholder-value": "значение"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Показывать всплывающее окно при наведении",
+      "description-none": "Показывать содержимое при нажатии, а не при наведении",
+      "label-details": "Подробности",
+      "label-none": "Нет"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Слой {{name}}"
     }
   },
   "get-enterprise": {
@@ -7908,400 +7909,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Фут/с²",
+            "name-g-unit": "Единица ускорения свободного падения (G)",
+            "name-meters-sec": "М/с²"
           },
-          "name": ""
+          "name": "Ускорение"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Угловые минуты",
+            "name-arc-seconds": "Угловые секунды",
+            "name-degrees": "Градусы (°)",
+            "name-gradian": "Градиан",
+            "name-radians": "Радианы"
           },
-          "name": ""
+          "name": "Угол"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Акры (акр)",
+            "name-hectares": "Гектары (га)",
+            "name-square-feet": "Квадратные футы (фут²)",
+            "name-square-meters": "Квадратные метры (м²)",
+            "name-square-miles": "Квадратные мили (миля²)"
           },
-          "name": ""
+          "name": "Площадь"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Вкл. / Выкл.",
+            "name-true-false": "Истина / Ложь",
+            "name-yes-no": "Да / Нет"
           },
-          "name": ""
+          "name": "Логическое значение"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "Эксафлоп/с",
+            "name-flops": "Флоп/с",
+            "name-gflops": "Гигафлоп/с",
+            "name-mflops": "Мегафлоп/с",
+            "name-pflops": "Петафлоп/с",
+            "name-tflops": "Терафлоп/с",
+            "name-yflops": "Йоттафлоп/с",
+            "name-zflops": "Зеттафлоп/с"
           },
-          "name": ""
+          "name": "Вычислительная мощность"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "грамм на кубический метр (г/м³)",
+            "name-g-nm3": "грамм на нормальный кубический метр (г/Нм³)",
+            "name-mg-dl": "миллиграмм на децилитр (мг/дл)",
+            "name-mg-m3": "миллиграмм на кубический метр (мг/м³)",
+            "name-mg-nm3": "миллиграмм на нормальный кубический метр (мг/Нм³)",
+            "name-mmol-l": "миллимоль на литр (ммоль/л)",
+            "name-ng-m3": "нанограмм на кубический метр (нг/м³)",
+            "name-ng-nm3": "нанограмм на нормальный кубический метр (нг/Нм³)",
+            "name-ppb": "частей на миллиард (ppb)",
+            "name-ppm": "частей на миллион (ppm)",
+            "name-ug-m3": "микрограмм на кубический метр (мкг/м³)",
+            "name-ug-nm3": "микрограмм на нормальный кубический метр (мкг/Нм³)"
           },
-          "name": ""
+          "name": "Концентрация"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Болгарский лев (BGN)",
+            "name-brl": "Бразильский реал (R$)",
+            "name-btc": "Биткоин (฿)",
+            "name-chf": "Швейцарский франк (CHF)",
+            "name-czk": "Чешская крона (CZK)",
+            "name-dkk": "Датская крона (kr)",
+            "name-eur": "Евро (€)",
+            "name-gbp": "Фунт стерлингов (£)",
+            "name-idr": "Индонезийская рупия (Rp)",
+            "name-ils": "Новый израильский шекель (₪)",
+            "name-inr": "Индийская рупия (₹)",
+            "name-isk": "Исландская крона (kr)",
+            "name-jpy": "Йена (¥)",
+            "name-krw": "Южнокорейская вона (₩)",
+            "name-mbtc": "Миллибиткоин (฿)",
+            "name-myr": "Малайзийский ринггит (RM)",
+            "name-nok": "Норвежская крона (kr)",
+            "name-php": "Филиппинское песо (PHP)",
+            "name-pln": "Польский злотый (PLN)",
+            "name-pyg": "Парагвайский гуарани (₲)",
+            "name-rub": "Российский рубль (₽)",
+            "name-sek": "Шведская крона (kr)",
+            "name-try": "Турецкая лира (₺)",
+            "name-uah": "Украинская гривна (₴)",
+            "name-ubtc": "Микробиткоин (฿)",
+            "name-usd": "Доллар США ($)",
+            "name-uyu": "Уругвайское песо (UYU)",
+            "name-vnd": "Вьетнамский донг (VND)",
+            "name-xpf": "Тихоокеанский франк (XPF)",
+            "name-zar": "Южноафриканский рэнд (R)"
           },
-          "name": ""
+          "name": "Валюта"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "биты (МЭК)",
+            "name-bits-si": "биты (СИ)",
+            "name-bytes-iec": "байты (МЭК)",
+            "name-bytes-si": "байты (СИ)",
+            "name-gibibytes": "гибибайты",
+            "name-gigabytes": "гигабайты",
+            "name-kibibytes": "кибибайты",
+            "name-kilobytes": "килобайты",
+            "name-mebibytes": "мебибайты",
+            "name-megabytes": "мегабайты",
+            "name-pebibytes": "пебибайты",
+            "name-petabytes": "петабайты",
+            "name-tebibytes": "тебибайты",
+            "name-terabytes": "терабайты"
           },
-          "name": ""
+          "name": "Данные"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "бит/с (МЭК)",
+            "name-bits-sec-si": "бит/с (СИ)",
+            "name-bytes-sec-iec": "байт/с (МЭК)",
+            "name-bytes-sec-si": "байт/с (СИ)",
+            "name-gibibits-sec": "гибибит/с",
+            "name-gibibytes-sec": "гибибайт/с",
+            "name-gigabits-sec": "гигабит/с",
+            "name-gigabytes-sec": "гигабайт/с",
+            "name-kibibits-sec": "кибибит/с",
+            "name-kibibytes-sec": "кибибайт/с",
+            "name-kilobits-sec": "килобит/с",
+            "name-kilobytes-sec": "килобайт/с",
+            "name-mebibits-sec": "мебибит/с",
+            "name-mebibytes-sec": "мебибайт/с",
+            "name-megabits-sec": "мегабит/с",
+            "name-megabytes-sec": "мегабайт/с",
+            "name-packets-sec": "пакеты/с",
+            "name-pebibits-sec": "пебибит/с",
+            "name-pebibytes-sec": "пебибайт/с",
+            "name-petabits-sec": "петабит/с",
+            "name-petabytes-sec": "петабайт/с",
+            "name-tebibits-sec": "тебибит/с",
+            "name-tebibytes-sec": "тебибайт/с",
+            "name-terabits-sec": "терабит/с",
+            "name-terabytes-sec": "терабайт/с"
           },
-          "name": ""
+          "name": "Скорость передачи данных"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Дата и время по умолчанию",
+            "name-datetime-iso": "Дата и время в формате ISO",
+            "name-datetime-iso-no-date": "Дата и время в формате ISO (без даты, если сегодня)",
+            "name-datetime-local": "Дата и время в местном формате",
+            "name-datetime-local-no-date": "Дата и время в местном формате (без даты, если сегодня)",
+            "name-datetime-us": "Дата и время в американском формате",
+            "name-datetime-us-no-date": "Дата и время в американском формате (без даты, если сегодня)",
+            "name-from-now": "С настоящего момента"
           },
-          "name": ""
+          "name": "Дата и время"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Ампер (А)",
+            "name-ampere-hour": "Ампер-час (А·ч)",
+            "name-decibel-milliwatt": "Децибел-милливатт (дБм)",
+            "name-electron-volt": "Электрон-вольт (эВ)",
+            "name-farad": "Фарад (Ф)",
+            "name-femtofarad": "Фемтофарад (фФ)",
+            "name-gigawatt": "Гигаватт (ГВт)",
+            "name-henry": "Генри (Гн)",
+            "name-joule": "Джоуль (Дж)",
+            "name-kiloampere": "Килоампер (кА)",
+            "name-kiloampere-hour": "Килоампер-час (кА·ч)",
+            "name-kiloohm": "Килоом (кОм)",
+            "name-kilovolt": "Киловольт (кВ)",
+            "name-kilovolt-ampere": "Киловольт-ампер (кВА)",
+            "name-kilovolt-ampere-reactive": "Киловольт-ампер реактивный (кВАр)",
+            "name-kilowatt": "Киловатт (кВт)",
+            "name-kilowatt-hour": "Киловатт-час (кВт·ч)",
+            "name-kilowatt-min": "Киловатт-минут (кВт·мин)",
+            "name-lumens": "Люмен (лм)",
+            "name-megaohm": "Мегаом (МОм)",
+            "name-megawatt": "Мегаватт (МВт)",
+            "name-megawatt-hour": "Мегаватт-час (МВт·ч)",
+            "name-microfarad": "Микрофарад (мкФ)",
+            "name-microhenry": "Микрогенри (мкГн)",
+            "name-milliampere": "Миллиампер (мА)",
+            "name-milliampere-hour": "Миллиампер-час (мА·ч)",
+            "name-millihenry": "Миллигенри (мГн)",
+            "name-milliohm": "Миллиом (мОм)",
+            "name-millivolt": "Милливольт (мВ)",
+            "name-milliwatt": "Милливатт (мВт)",
+            "name-nanofarad": "Нанофарад (нФ)",
+            "name-ohm": "Ом (Ом)",
+            "name-picofarad": "Пикофарад (пФ)",
+            "name-volt": "Вольт (В)",
+            "name-volt-ampere": "Вольт-ампер (ВА)",
+            "name-volt-ampere-reactive": "Вольт-ампер реактивный (ВАр)",
+            "name-watt": "Ватт (Вт)",
+            "name-watt-hour": "Ватт-час (Вт·ч)",
+            "name-watt-hour-per-kg": "Ватт-час на килограмм (Вт·ч/кг)",
+            "name-watt-square-meter": "Ватт на квадратный метр (Вт/м²)"
           },
-          "name": ""
+          "name": "Энергия"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Кубический фут/мин (куб. фут/мин)",
+            "name-cubic-feet-sec": "Кубический фут/с (куб. фут/с)",
+            "name-cubic-meters-sec": "Кубический метр/с (куб. м/с)",
+            "name-gallons-min": "Галлон/мин (гал/мин)",
+            "name-litre-hour": "Литр/час",
+            "name-litre-min": "Литр/мин (л/мин)",
+            "name-lux": "Люкс (лк)",
+            "name-millilitre-min": "миллилитр/мин (мл/мин)"
           },
-          "name": ""
+          "name": "Расход"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Килоньютон-метр (кН·м)",
+            "name-kilonewtons": "Килоньютон (кН)",
+            "name-newton-meters": "Ньютон-метр (Н·м)",
+            "name-newtons": "Ньютон (Н)"
           },
-          "name": ""
+          "name": "Сила"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "эксахеш/сек",
+            "name-gigahashes-sec": "гигахеш/сек",
+            "name-hashes-sec": "хеш/сек",
+            "name-kilohashes-sec": "килохеш/сек",
+            "name-megahashes-sec": "мегахеш/сек",
+            "name-petahashes-sec": "петахеш/сек",
+            "name-terahashes-sec": "терахеш/сек"
           },
-          "name": ""
+          "name": "Хешрейт"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "фут (фут)",
+            "name-inch": "дюйм (дюйм)",
+            "name-kilometer": "километр (км)",
+            "name-meter": "метр (м)",
+            "name-mile": "миля (миля)",
+            "name-millimeter": "миллиметр (мм)"
           },
-          "name": ""
+          "name": "Длина"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "грамм (г)",
+            "name-kilogram": "килограмм (кг)",
+            "name-metric-ton": "метрическая тонна (т)",
+            "name-milligram": "миллиграмм (мг)",
+            "name-pound": "фунт (фунт)"
           },
-          "name": ""
+          "name": "Масса"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Кандела (кд)",
+            "name-decibel": "Децибел",
+            "name-hexadecimal": "Шестнадцатеричный",
+            "name-hexadecimal-0x": "Шестнадцатеричный (0x)",
+            "name-humidity": "Влажность (%)",
+            "name-locale": "Формат локали",
+            "name-number": "Число",
+            "name-percent-1": "Процент (0,0–1,0)",
+            "name-percent-100": "Процент (0–100)",
+            "name-pixels": "Пиксели",
+            "name-scientific": "Экспоненциальное представление",
+            "name-short": "краткий",
+            "name-si-short": "краткий СИ",
+            "name-string": "Строка"
           },
-          "name": ""
+          "name": "Прочее"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Бар",
+            "name-hectopascals": "Гектопаскаль",
+            "name-inches-mercury": "Дюймы ртутного столба",
+            "name-kilobars": "Килобар",
+            "name-kilopascals": "Килопаскаль",
+            "name-millibars": "Миллибар",
+            "name-pascals": "Паскаль",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Давление"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Беккерель (Бк)",
+            "name-curie": "кюри (Ки)",
+            "name-exposure": "Экспозиционная доза (Кл/кг)",
+            "name-gray": "Грей (Гр)",
+            "name-microsievert": "микрозиверт (мкЗв)",
+            "name-microsievert-hour": "микрозиверт/час (мкЗв/ч)",
+            "name-millisievert": "миллизиверт (мЗв)",
+            "name-millisievert-hour": "миллизиверт/час (мЗв/ч)",
+            "name-rad": "рад",
+            "name-rem": "бэр",
+            "name-roentgen": "рентген (Р)",
+            "name-sievert": "Зиверт (Зв)",
+            "name-sievert-hour": "Зиверт/час (Зв/ч)"
           },
-          "name": ""
+          "name": "Излучение"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Градусы в секунду (°/с)",
+            "name-gigahertz": "Гигагерц (ГГц)",
+            "name-hertz": "Герц (Гц)",
+            "name-kilohertz": "Килогерц (кГц)",
+            "name-megahertz": "Мегагерц (МГц)",
+            "name-radians-sec": "Радиан в секунду (рад/с)",
+            "name-rpm": "Обороты в минуту (об/мин)"
           },
-          "name": ""
+          "name": "Скорость вращения"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Градусы Цельсия (°C)",
+            "name-fahrenheit": "Градусы Фаренгейта (°F)",
+            "name-kelvin": "Кельвин (К)"
           },
-          "name": ""
+          "name": "Температура"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "число отсчетов в минуту (cpm)",
+            "name-counts-sec": "число отсчетов в секунду (cps)",
+            "name-events-min": "число событий в минуту (epm)",
+            "name-events-sec": "число событий в секунду (eps)",
+            "name-io-ops-sec": "число операций ввода/вывода в секунду (iops)",
+            "name-messages-min": "число сообщений в минуту (mpm)",
+            "name-messages-sec": "число сообщений в секунду (mps)",
+            "name-ops-min": "число операций в минуту (opm)",
+            "name-ops-sec": "число операций в секунду (ops)",
+            "name-reads-min": "число считываний в минуту (rpm)",
+            "name-reads-sec": "число считываний в секунду (rps)",
+            "name-records-min": "число записей в минуту (rpm)",
+            "name-records-sec": "число записей в секунду (rps)",
+            "name-requests-min": "число запросов в минуту (rpm)",
+            "name-requests-sec": "число запросов в секунду (rps)",
+            "name-rows-min": "число строк в минуту (rpm)",
+            "name-rows-sec": "число строк в секунду (rps)",
+            "name-writes-min": "число записей в минуту (wpm)",
+            "name-writes-sec": "число записей в секунду (wps)"
           },
-          "name": ""
+          "name": "Пропускная способность"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "время (мс)",
+            "name-clock-s": "время (с)",
+            "name-days": "дни (д)",
+            "name-duration-dhms": "продолжительность (д чч:мм:сс)",
+            "name-duration-hms": "продолжительность (чч:мм:сс)",
+            "name-duration-ms": "продолжительность (мс)",
+            "name-duration-s": "продолжительность (с)",
+            "name-hertz": "Герц (1/с)",
+            "name-hours": "часы (ч)",
+            "name-microseconds": "микросекунды (мкс)",
+            "name-milliseconds": "миллисекунды (мс)",
+            "name-minutes": "минуты (мин)",
+            "name-nanoseconds": "наносекунды (нс)",
+            "name-seconds": "секунды (с)",
+            "name-timeticks": "Отметки времени (с/100)"
           },
-          "name": ""
+          "name": "Время"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "километров в час (км/ч)",
+            "name-knot": "узел (уз)",
+            "name-meters-second": "метров в секунду (м/с)",
+            "name-miles-hour": "миль в час (миль/ч)"
           },
-          "name": ""
+          "name": "Скорость"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "кубический дециметр",
+            "name-cubic-meter": "кубический метр",
+            "name-gallons": "галлоны",
+            "name-litre": "литр (л)",
+            "name-millilitre": "миллилитр (мл)",
+            "name-normal-cubic-meter": "Нормальный кубический метр"
           },
-          "name": ""
+          "name": "Объем"
         }
       }
     }
@@ -8344,85 +8345,85 @@
     },
     "builder": {
       "axis": {
-        "category-axis": "",
-        "color-label": "",
+        "category-axis": "Ось",
+        "color-label": "Цвет",
         "color-options": {
-          "label-series": "",
-          "label-text": ""
+          "label-series": "Ряды",
+          "label-text": "Текст"
         },
         "grid-line-options": {
-          "label-auto": "",
-          "label-off": "",
-          "label-on": ""
+          "label-auto": "Авто",
+          "label-off": "Выкл.",
+          "label-on": "Вкл."
         },
-        "name-centered-zero": "",
-        "name-grid-lines": "",
-        "name-label": "",
-        "name-placement": "",
-        "name-scale": "",
-        "name-show-border": "",
-        "name-soft-max": "",
-        "name-soft-min": "",
-        "name-width": "",
-        "placeholder-label": "",
-        "placeholder-soft-max": "",
-        "placeholder-soft-min": "",
-        "placeholder-width": "",
+        "name-centered-zero": "Центр на нуле",
+        "name-grid-lines": "Показывать линии сетки",
+        "name-label": "Метка",
+        "name-placement": "Размещение",
+        "name-scale": "Шкала",
+        "name-show-border": "Показывать границу",
+        "name-soft-max": "Мягкий макс.",
+        "name-soft-min": "Мягкий мин.",
+        "name-width": "Ширина",
+        "placeholder-label": "Дополнительный текст",
+        "placeholder-soft-max": "См. «Стандартные параметры > Макс.»",
+        "placeholder-soft-min": "См. «Стандартные параметры > Мин.»",
+        "placeholder-width": "Авто",
         "scale-distribution-editor": {
           "distribution-options": {
-            "label-linear": "",
-            "label-log": "",
-            "label-symlog": ""
+            "label-linear": "Линейная",
+            "label-log": "Логарифмическая",
+            "label-symlog": "Симметричная логарифмическая"
           }
         }
       },
       "legend": {
-        "category": "",
-        "description-values": "",
+        "category": "Условные обозначения",
+        "description-values": "Выберите значения или расчеты для отображения в условных обозначениях",
         "mode-options": {
-          "label-list": "",
-          "label-table": ""
+          "label-list": "Список",
+          "label-table": "Таблица"
         },
-        "name-mode": "",
-        "name-placement": "",
-        "name-values": "",
-        "name-visibility": "",
-        "name-width": "",
+        "name-mode": "Режим",
+        "name-placement": "Размещение",
+        "name-values": "Значения",
+        "name-visibility": "Видимость",
+        "name-width": "Ширина",
         "placement-options": {
-          "label-bottom": "",
-          "label-right": ""
+          "label-bottom": "Снизу",
+          "label-right": "Справа"
         }
       },
       "stacking": {
-        "name-stack-series": ""
+        "name-stack-series": "Располагать ряды в стеке"
       },
       "text": {
-        "category-text-size": "",
-        "name-percent-change": "",
-        "name-title": "",
-        "name-value": "",
-        "placeholder-percent-change": "",
-        "placeholder-title": "",
-        "placeholder-value": ""
+        "category-text-size": "Размер текста",
+        "name-percent-change": "Процентное изменение",
+        "name-title": "Заголовок",
+        "name-value": "Значение",
+        "placeholder-percent-change": "Авто",
+        "placeholder-title": "Авто",
+        "placeholder-value": "Авто"
       },
       "tooltip": {
-        "category": "",
-        "description-hover-proximity": "",
+        "category": "Подсказка",
+        "description-hover-proximity": "Насколько близко курсор должен быть к точке, чтобы вызвать всплывающую подсказку, в пикселях",
         "modeOptions": {
-          "label-all": "",
-          "label-hidden": "",
-          "label-single": ""
+          "label-all": "Все",
+          "label-hidden": "Скрыты",
+          "label-single": "Один"
         },
-        "name-hide-zeros": "",
-        "name-hover-proximity": "",
-        "name-max-height": "",
-        "name-max-width": "",
-        "name-tooltip-mode": "",
-        "name-values-sort-order": "",
+        "name-hide-zeros": "Скрывать нули",
+        "name-hover-proximity": "Близость наведения",
+        "name-max-height": "Макс. высота",
+        "name-max-width": "Макс. ширина",
+        "name-tooltip-mode": "Режим подсказок",
+        "name-values-sort-order": "Порядок сортировки значений",
         "sortOptions": {
-          "label-ascending": "",
-          "label-descending": "",
-          "label-none": ""
+          "label-ascending": "По возрастанию",
+          "label-descending": "По убыванию",
+          "label-none": "Нет"
         }
       }
     },
@@ -8430,7 +8431,7 @@
       "option": "параметр"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Открыть предварительный просмотр изображения"
     },
     "cascader": {
       "clear-button": "Очистить выбор"
@@ -8444,9 +8445,9 @@
       "aria-label-selected-color": "{{colorLabel}} цвет"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Удалить",
       "cancel": "Отмена",
-      "confirmText-delete": ""
+      "confirmText-delete": "Удалить"
     },
     "confirm-content": {
       "placeholder": "Введите «{{confirmPromptText}}» для подтверждения"
@@ -8551,56 +8552,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "Апрель",
+        "label-august": "Август",
+        "label-december": "Декабрь",
+        "label-february": "Февраль",
+        "label-january": "Январь",
+        "label-july": "Июль",
+        "label-june": "Июнь",
+        "label-march": "Март",
+        "label-may": "Май",
+        "label-november": "Ноябрь",
+        "label-october": "Октябрь",
+        "label-september": "Сентябрь"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Позавчера",
+        "last-1-hour": "Последний час",
+        "last-1-year": "Последний год",
+        "last-12-hours": "Последние 12 часов",
+        "last-15-mins": "Последние 15 минут",
+        "last-2-days": "Последние 2 дня",
+        "last-2-years": "Последние 2 года",
+        "last-24-hours": "Последние 24 часа",
+        "last-3-hours": "Последние 3 часа",
+        "last-30-days": "Последние 30 дней",
+        "last-30-mins": "Последние 30 минут",
+        "last-5-mins": "Последние 5 минут",
+        "last-5-years": "Последние 5 лет",
+        "last-6-hours": "Последние 6 часов",
+        "last-6-months": "Последние 6 месяцев",
+        "last-7-days": "Последние 7 дней",
+        "last-90-days": "Последние 90 дней",
+        "previous-fiscal-quarter": "Предыдущий финансовый квартал",
+        "previous-fiscal-year": "Предыдущий финансовый год",
+        "previous-month": "Предыдущий месяц",
+        "previous-week": "Предыдущая неделя",
+        "previous-year": "Предыдущий год",
+        "this-day-last-week": "Этот день на прошлой неделе",
+        "this-fiscal-quarter": "Текущий финансовый квартал",
+        "this-fiscal-quarter-so-far": "Текущий финансовый квартал по состоянию на настоящий момент",
+        "this-fiscal-year": "Текущий финансовый год",
+        "this-fiscal-year-so-far": "Текущий финансовый год по состоянию на настоящий момент",
+        "this-month": "Текущий месяц",
+        "this-month-so-far": "Текущий месяц по состоянию на настоящий момент",
+        "this-week": "Текущая неделя",
+        "this-week-so-far": "Текущая неделя по состоянию на настоящий момент",
+        "this-year": "Текущий год",
+        "this-year-so-far": "Текущий год по состоянию на настоящий момент",
+        "today": "Сегодня",
+        "today-so-far": "Сегодня по состоянию на настоящий момент",
+        "yesterday": "Вчера"
       }
     },
     "drawer": {
@@ -8642,33 +8643,33 @@
       "tooltip-expand-all": "Развернуть все строки"
     },
     "matchers-ui": {
-      "description-field-name-by-regex-matcher": "",
-      "description-fields-by-query": "",
-      "description-fields-with-name": "",
-      "description-fields-with-type": "",
-      "description-fields-with-value": "",
+      "description-field-name-by-regex-matcher": "Установить свойства для полей с именами, соответствующими регулярному выражению",
+      "description-fields-by-query": "Установить свойства для полей из определенного запроса",
+      "description-fields-with-name": "Установить свойства для определенного поля",
+      "description-fields-with-type": "Установить свойства для полей определенного типа (число, строка, логическое значение)",
+      "description-fields-with-value": "Установить свойства для полей с условием преобразования",
       "field-name-picker": {
-        "placeholder": ""
+        "placeholder": "Выбрать поле"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Логическое значение",
+        "label-enum": "Перечисление",
+        "label-number": "Число",
+        "label-other": "Прочее",
+        "label-string": "Строка",
+        "label-time": "Время",
+        "label-traces": "Трассировки"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Фреймы ({{framesCount}}): {{framesNames}}",
+        "label": "Запрос: {{refId}}",
+        "label-missing-ref-id": "Запрос: (отсутствует идентификатор ссылки)"
       },
-      "name-field-name-by-regex-matcher": "",
-      "name-fields-by-query": "",
-      "name-fields-with-name": "",
-      "name-fields-with-type": "",
-      "name-fields-with-value": ""
+      "name-field-name-by-regex-matcher": "Поля с именем, соответствующим регулярному выражению",
+      "name-fields-by-query": "Поля, возвращенные запросом",
+      "name-fields-with-name": "Поля с именем",
+      "name-fields-with-type": "Поля с типом",
+      "name-fields-with-value": "Поля со значениями"
     },
     "menu-item": {
       "keyboard-shortcut-label": "Сочетание клавиш"
@@ -8696,8 +8697,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "включить сворачивание панели",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Полоса загрузки панели",
+      "ariaLabel-panel-status": "Статус панели",
       "tooltip-cancel": "Отмена запроса",
       "tooltip-cancel-loading": "Отмена запроса",
       "tooltip-stop-streaming": "Остановка потоковой передачи",
@@ -8766,12 +8767,12 @@
       "inspect-drawer-title": "Проверить значение",
       "inspect-menu-label": "Проверить значение",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Нет данных"
       },
       "no-values-label": "Нет значений",
       "pagination-summary": "Строки: {{itemsRangeStart}} - {{displayedEnd}} из {{numRows}}",
       "sparkline": {
-        "no-data": ""
+        "no-data": "нет данных"
       }
     },
     "tags": {
@@ -8779,7 +8780,7 @@
     },
     "tags-input": {
       "add": "Добавить",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Новый тег (введите ключ для добавления)",
       "remove": "Удалить тег: {{name}} "
     },
     "time-sync-button": {
@@ -8796,55 +8797,55 @@
       "config": {
         "get-graph-field-options": {
           "axis-placement": {
-            "description-auto": "",
-            "label-auto": "",
-            "label-hidden": "",
-            "label-left": "",
-            "label-right": ""
+            "description-auto": "Первое поле слева, всё остальное справа",
+            "label-auto": "Авто",
+            "label-hidden": "Скрыты",
+            "label-left": "Слева",
+            "label-right": "Справа"
           },
           "bar-alignment": {
-            "description-after": "",
-            "description-before": "",
-            "description-center": ""
+            "description-after": "После",
+            "description-before": "Перед",
+            "description-center": "По центру"
           },
           "draw-style": {
-            "label-bars": "",
-            "label-lines": "",
-            "label-points": ""
+            "label-bars": "Столбцы",
+            "label-lines": "Линии",
+            "label-points": "Точки"
           },
           "fill-gradient": {
-            "description-hue": "",
-            "description-opacity": "",
-            "description-scheme": "",
-            "label-hue": "",
-            "label-none": "",
-            "label-opacity": "",
-            "label-scheme": ""
+            "description-hue": "Небольшой градиент оттенка цвета",
+            "description-opacity": "Включить градиент прозрачности заливки",
+            "description-scheme": "Использовать цветовую схему для определения градиента",
+            "label-hue": "Оттенок",
+            "label-none": "Нет",
+            "label-opacity": "Прозрачность",
+            "label-scheme": "Схема"
           },
           "line-interpolation": {
-            "description-linear": "",
-            "description-smooth": "",
-            "description-step-after": "",
-            "description-step-before": ""
+            "description-linear": "Линейная",
+            "description-smooth": "Гладкая",
+            "description-step-after": "Шаг после",
+            "description-step-before": "Шаг до"
           },
           "show-points": {
-            "description-auto": "",
-            "label-always": "",
-            "label-auto": "",
-            "label-never": ""
+            "description-auto": "Показывать точки при низкой плотности",
+            "label-always": "Всегда",
+            "label-auto": "Авто",
+            "label-never": "Никогда"
           },
           "stacking": {
-            "label-100": "",
-            "label-normal": "",
-            "label-off": ""
+            "label-100": "100%",
+            "label-normal": "Нормальное",
+            "label-off": "Выкл."
           },
           "thresholds-display-mode": {
-            "label-dashed-lines": "",
-            "label-filled-regions": "",
-            "label-filled-regions-and-dashed-lines": "",
-            "label-filled-regions-and-lines": "",
-            "label-lines": "",
-            "label-off": ""
+            "label-dashed-lines": "В виде линий (пунктирных)",
+            "label-filled-regions": "В виде заполненных областей",
+            "label-filled-regions-and-dashed-lines": "В виде заполненных областей и линий (пунктирных)",
+            "label-filled-regions-and-lines": "В виде заполненных областей и линий",
+            "label-lines": "В виде линий",
+            "label-off": "Выкл."
           }
         }
       }
@@ -8872,14 +8873,14 @@
       "footer-add-annotation": "Добавить аннотацию",
       "footer-click-to-action": "Нажмите, чтобы {{actionTitle}}",
       "footer-click-to-navigate": "Нажмите, чтобы открыть {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Фильтр по «{{value}}»",
       "timestamp": "Метка времени"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "По умолчанию",
+      "weekStarts-label-monday": "Понедельник",
+      "weekStarts-label-saturday": "Суббота",
+      "weekStarts-label-sunday": "Воскресенье"
     }
   },
   "graph": {
@@ -8892,78 +8893,78 @@
   },
   "heatmap": {
     "calculate-from-data-options": {
-      "label-no": "",
-      "label-yes": ""
+      "label-no": "Нет",
+      "label-yes": "Да"
     },
-    "category-cell-display": "",
-    "category-colors": "",
-    "category-exemplars": "",
-    "category-heatmap": "",
-    "category-legend": "",
-    "category-tooltip": "",
-    "category-y-axis": "",
+    "category-cell-display": "Отображение ячеек",
+    "category-colors": "Цвета",
+    "category-exemplars": "Образцы",
+    "category-heatmap": "Тепловая карта",
+    "category-legend": "Условные обозначения",
+    "category-tooltip": "Подсказка",
+    "category-y-axis": "Ось Y",
     "mode-options": {
-      "label-opacity": "",
-      "label-scheme": ""
+      "label-opacity": "Прозрачность",
+      "label-scheme": "Схема"
     },
-    "name-axis-label": "",
-    "name-axis-width": "",
-    "name-calculate-from-data": "",
-    "name-cell-gap": "",
-    "name-color": "",
-    "name-decimals": "",
-    "name-end-color-at-value": "",
-    "name-exponent": "",
-    "name-hide-cells-gt": "",
-    "name-hide-cells-lt": "",
-    "name-max-height": "",
-    "name-max-value": "",
-    "name-max-width": "",
-    "name-min-value": "",
-    "name-mode": "",
-    "name-placement": "",
-    "name-reverse": "",
-    "name-scale": "",
-    "name-scheme": "",
-    "name-show-color-scale": "",
-    "name-show-histogram": "",
-    "name-show-legend": "",
-    "name-start-color-from-value": "",
-    "name-steps": "",
-    "name-tick-alignment": "",
-    "name-tooltip-mode": "",
-    "name-unit": "",
-    "name-value-name": "",
-    "name-y-axis-scale": "",
-    "placeholder-axis-label": "",
-    "placeholder-axis-width": "",
-    "placeholder-decimals": "",
-    "placeholder-end-color-at-value": "",
-    "placeholder-hide-cells-gt": "",
-    "placeholder-hide-cells-lt": "",
-    "placeholder-max-value": "",
-    "placeholder-min-value": "",
-    "placeholder-start-color-from-value": "",
-    "placeholder-value-name": "",
+    "name-axis-label": "Метка оси",
+    "name-axis-width": "Толщина оси",
+    "name-calculate-from-data": "Рассчитать по данным",
+    "name-cell-gap": "Расстояние между ячейками",
+    "name-color": "Цвет",
+    "name-decimals": "Кол-во знаков после запятой",
+    "name-end-color-at-value": "Конечное значение цветовой шкалы",
+    "name-exponent": "Показатель",
+    "name-hide-cells-gt": "Скрывать ячейки со значениями >=",
+    "name-hide-cells-lt": "Скрывать ячейки со значениями <=",
+    "name-max-height": "Макс. высота",
+    "name-max-value": "Макс. значение",
+    "name-max-width": "Макс. ширина",
+    "name-min-value": "Мин. значение",
+    "name-mode": "Режим",
+    "name-placement": "Размещение",
+    "name-reverse": "Назад",
+    "name-scale": "Шкала",
+    "name-scheme": "Схема",
+    "name-show-color-scale": "Показывать цветовую шкалу",
+    "name-show-histogram": "Показывать гистограмму (ось Y)",
+    "name-show-legend": "Показывать условные обозначения",
+    "name-start-color-from-value": "Начальное значение цветовой шкалы",
+    "name-steps": "Шаги",
+    "name-tick-alignment": "Выравнивание делений",
+    "name-tooltip-mode": "Режим подсказок",
+    "name-unit": "Единица",
+    "name-value-name": "Имя значения",
+    "name-y-axis-scale": "Шкала оси Y",
+    "placeholder-axis-label": "Авто",
+    "placeholder-axis-width": "Авто",
+    "placeholder-decimals": "Авто",
+    "placeholder-end-color-at-value": "Авто (макс.)",
+    "placeholder-hide-cells-gt": "Нет",
+    "placeholder-hide-cells-lt": "Нет",
+    "placeholder-max-value": "Авто",
+    "placeholder-min-value": "Авто",
+    "placeholder-start-color-from-value": "Авто (мин.)",
+    "placeholder-value-name": "Значение",
     "placement-options": {
-      "label-hidden": "",
-      "label-left": "",
-      "label-right": ""
+      "label-hidden": "Скрыты",
+      "label-left": "Слева",
+      "label-right": "Справа"
     },
     "scale-options": {
-      "label-exponential": "",
-      "label-linear": ""
+      "label-exponential": "Экспоненциальная",
+      "label-linear": "Линейная"
     },
     "tick-alignment-options": {
-      "label-auto": "",
-      "label-bottom": "",
-      "label-middle": "",
-      "label-top": ""
+      "label-auto": "Авто",
+      "label-bottom": "Снизу (GE)",
+      "label-middle": "Посередине",
+      "label-top": "Сверху (LE)"
     },
     "tooltip-mode-options": {
-      "label-all": "",
-      "label-hidden": "",
-      "label-single": ""
+      "label-all": "Все",
+      "label-hidden": "Скрыты",
+      "label-single": "Один"
     }
   },
   "help-modal": {
@@ -9023,14 +9024,14 @@
     "troubleshooting-help": "Чтобы запросить помощь в устранении неполадок, отправьте снимок этой панели в службу технической поддержки Grafana Labs. Снимок содержит данные ответа на запрос и параметры панели."
   },
   "histogram": {
-    "category-histogram": "",
+    "category-histogram": "Гистограмма",
     "histogram-panel": {
       "no-histogram-found-in-response": "Гистограммы в ответе не найдены"
     },
-    "name-fill-opacity": "",
-    "name-gradient-mode": "",
-    "name-line-width": "",
-    "name-stacking": ""
+    "name-fill-opacity": "Прозрачность заливки",
+    "name-gradient-mode": "Режим градиента",
+    "name-line-width": "Ширина линии",
+    "name-stacking": "Расположение в стеке"
   },
   "inspector": {
     "inspect-data-tab": {
@@ -9263,8 +9264,8 @@
       "title-create-library-panel": "Создание панели библиотеки"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Изменить",
+      "confirmText-replace": "Заменить"
     },
     "confirm": {
       "delete-panel": "Удалить панель?"
@@ -9291,7 +9292,7 @@
       "usage-count_other": "Используется на {{count}} дашборда"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Поиск по имени, описанию или имени папки"
     },
     "loading-indicator": {
       "loading-library-panel": "Загрузка панели библиотеки..."
@@ -9421,16 +9422,16 @@
     }
   },
   "logs": {
-    "category-logs": "",
+    "category-logs": "Журналы",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Точная",
+      "label-none": "Нет",
+      "label-numbers": "Номера",
+      "label-signature": "Подпись"
     },
-    "description-enable-infinite-scrolling": "",
-    "description-enable-syntax-highlighting": "",
-    "description-show-controls": "",
+    "description-enable-infinite-scrolling": "Экспериментальная функция. Запросите больше результатов, прокрутив список журналов до конца.",
+    "description-enable-syntax-highlighting": "Использовать предустановленную грамматику подсветки синтаксиса для выделения важных частей строк журнала",
+    "description-show-controls": "Отображать элементы управления для перехода к последней или первой строке журнала и фильтры по уровню журнала",
     "fields": {
       "type": {
         "loki": {
@@ -9450,8 +9451,8 @@
       }
     },
     "font-size-options": {
-      "label-default": "",
-      "label-small": ""
+      "label-default": "По умолчанию",
+      "label-small": "Мелкий"
     },
     "get-dataframe-fields": {
       "vars": {
@@ -9507,64 +9508,64 @@
       "title-log-line": ""
     },
     "log-line-details": {
-      "clear-search": "",
-      "close": "",
-      "copy-shortlink": "",
-      "copy-to-clipboard": "",
-      "displayed-fields-section": "",
+      "clear-search": "Очистить",
+      "close": "Закрыть сведения о журнале",
+      "copy-shortlink": "Копировать короткую ссылку",
+      "copy-to-clipboard": "Копировать в буфер обмена",
+      "displayed-fields-section": "Организовать отображаемые поля",
       "fields": {
-        "adhoc-statistics": "",
-        "copy-value-to-clipboard": "",
-        "filter-out": "",
-        "filter-out-query": "",
+        "adhoc-statistics": "Специальная статистика",
+        "copy-value-to-clipboard": "Копировать значение в буфер обмена",
+        "filter-out": "Отсеять значение",
+        "filter-out-query": "Отфильтровать значение в запросе {{query}}",
         "toggle-field-button": {
-          "field-instead-message": "",
-          "hide-this-field": ""
+          "field-instead-message": "Показывать поле вместо сообщения",
+          "hide-this-field": "Скрыть поле"
         }
       },
-      "fields-section": "",
-      "hide-log-line": "",
-      "inline-mode": "",
-      "links-section": "",
-      "log-line-field": "",
-      "log-line-section": "",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
-      "no-details": "",
-      "open-assistant": "",
-      "pin-line": "",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "fields-section": "Поля",
+      "hide-log-line": "Скрыть строку журнала",
+      "inline-mode": "Показать встроенные",
+      "links-section": "Ссылки",
+      "log-line-field": "Строка журнала",
+      "log-line-section": "Строка журнала",
+      "move-displayed-field-down": "Вниз",
+      "move-displayed-field-up": "Вверх",
+      "no-details": "Отсутствуют поля для отображения.",
+      "open-assistant": "Объяснить эту строку журнала в Помощнике",
+      "pin-line": "Закрепить журнал",
+      "remove-displayed-field": "Удалить поле",
+      "remove-log": "Удалить журнал",
+      "scroll-to-logline": "Прокрутить до строки журнала",
       "search": {
-        "no-results": ""
+        "no-results": "Нет результатов для отображения."
       },
-      "search-placeholder": "",
-      "show-context": "",
-      "show-log-line": "",
-      "sidebar-mode": "",
-      "unpin-line": ""
+      "search-placeholder": "Поиск по именам и значениям полей",
+      "show-context": "Показать контекст",
+      "show-log-line": "Показать строку журнала",
+      "sidebar-mode": "Привязать справа",
+      "unpin-line": "Открепить журнал"
     },
     "log-line-menu": {
       "copy-link": "Копировать ссылку в строку журнала",
       "copy-log": "Копировать строку журнала",
       "hide-details": "Показать сведения о журнале",
       "icon-label": "Меню журнала",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Строка журнала",
+      "log-line-explainer": "Объяснить эту строку журнала кратко",
+      "open-assistant": "Объяснить эту строку журнала в Помощнике",
       "pin-to-outline": "Закрепить журнал",
       "show-context": "Показать контекст",
       "show-details": "Скрыть сведения о журнале",
       "unpin-from-outline": "Открепить журнал"
     },
     "log-list-search": {
-      "close": "",
-      "filter": "",
-      "info": "",
-      "input-placeholder": "",
-      "next": "",
-      "prev": ""
+      "close": "Закрыть поиск",
+      "filter": "Фильтр соответствующих журналов",
+      "info": "Поиск строк в отображаемых журналах на стороне клиента. Не следует путать с фильтрами запросов. Используйте этот компонент для поиска определенных строк в результатах журнала.",
+      "input-placeholder": "Поиск по журналам",
+      "next": "Следующий результат",
+      "prev": "Предыдущий результат"
     },
     "log-row-context-modal": {
       "error-loading-log-more-logs": "Ошибка при загрузке дополнительных журналов.",
@@ -9625,7 +9626,7 @@
       "escape-newlines": "Исправить неправильно экранированные последовательности новой строки и табуляции в строках журнала",
       "font-size-default": "Использовать мелкий размер шрифта",
       "font-size-small": "Использовать размер шрифта по умолчанию",
-      "hide-search": "",
+      "hide-search": "Закрыть поиск",
       "hide-timestamps": "Скрыть метки времени",
       "hide-unique-labels": "Скрыть уникальные метки",
       "newest-first": "Сначала отображаются самые новые журналы. Нажмите, чтобы показать сначала самые старые",
@@ -9638,7 +9639,7 @@
       "scroll-top": "Прокрутить вверх",
       "show-ms-timestamps": "",
       "show-ns-timestamps": "",
-      "show-search": "",
+      "show-search": "Результат поиска по журналам",
       "show-timestamps": "Показать метки времени",
       "show-unique-labels": "Показать уникальные метки",
       "unwrap-lines": "Не переносить строки",
@@ -9656,26 +9657,26 @@
         "common-labels": "Общие метки:"
       }
     },
-    "name-common-labels": "",
-    "name-deduplication": "",
-    "name-details-mode": "",
+    "name-common-labels": "Общие метки",
+    "name-deduplication": "Дедупликация",
+    "name-details-mode": "Режим панели сведений о журнале",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "Встроенные",
+      "label-sidebar": "Боковая панель"
     },
-    "name-enable-infinite-scrolling": "",
-    "name-enable-log-details": "",
-    "name-enable-syntax-highlighting": "",
-    "name-font-size": "",
-    "name-order": "",
-    "name-prettify-json": "",
-    "name-show-controls": "",
+    "name-enable-infinite-scrolling": "Включить бесконечную прокрутку",
+    "name-enable-log-details": "Включить сведения о журнале",
+    "name-enable-syntax-highlighting": "Включить подсветку синтаксиса",
+    "name-font-size": "Размер шрифта",
+    "name-order": "Порядок",
+    "name-prettify-json": "Форматировать JSON",
+    "name-show-controls": "Показывать элементы управления",
     "name-time": "",
-    "name-unique-labels": "",
-    "name-wrap-lines": "",
+    "name-unique-labels": "Уникальные метки",
+    "name-wrap-lines": "Переносить строки",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Сначала новые",
+      "label-oldest-first": "Сначала старые"
     },
     "out-of-range-message": {
       "end-of-the-selected-time-range": "Конец выбранного временного диапазона."
@@ -9690,7 +9691,7 @@
     "un-themed-log-details": {
       "aria-label-data-links": "Ссылки на данные",
       "aria-label-fields": "Поля",
-      "aria-label-line": "",
+      "aria-label-line": "Строка журнала",
       "aria-label-log-level": "Уровень журнала",
       "aria-label-no-details": "Нет сведений"
     },
@@ -9711,27 +9712,27 @@
     }
   },
   "logs-new": {
-    "category-logs": "",
+    "category-logs": "Журналы",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Точная",
+      "label-none": "Нет",
+      "label-numbers": "Номера",
+      "label-signature": "Подпись"
     },
-    "description-infinite-scrolling": "",
-    "description-show-controls": "",
-    "description-syntax-highlighting": "",
-    "name-deduplication": "",
-    "name-enable-log-details": "",
-    "name-infinite-scrolling": "",
-    "name-order": "",
-    "name-show-controls": "",
-    "name-syntax-highlighting": "",
-    "name-time": "",
-    "name-wrap-lines": "",
+    "description-infinite-scrolling": "Экспериментальная функция. Запросите больше результатов, прокрутив список журналов до конца.",
+    "description-show-controls": "Отображать элементы управления для перехода к последней или первой строке журнала и фильтры по уровню журнала",
+    "description-syntax-highlighting": "Использовать предустановленную грамматику подсветки синтаксиса для выделения важных частей строк журнала",
+    "name-deduplication": "Дедупликация",
+    "name-enable-log-details": "Включить сведения о журнале",
+    "name-infinite-scrolling": "Включить бесконечную прокрутку",
+    "name-order": "Порядок",
+    "name-show-controls": "Показывать элементы управления",
+    "name-syntax-highlighting": "Включить подсветку синтаксиса",
+    "name-time": "Время",
+    "name-wrap-lines": "Переносить строки",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Сначала новые",
+      "label-oldest-first": "Сначала старые"
     }
   },
   "manage-dashbaords": {
@@ -9758,8 +9759,8 @@
       "updated-on": "Дата обновления"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Действительно удалить «{{snapshotToRemove}}»?",
+      "confirmText-delete": "Удалить",
       "title-delete": "Удалить"
     },
     "unthemed-dashboard-import": {
@@ -9771,14 +9772,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "Требуется ввести имя",
+      "message-reserved-name": "Это имя зарезервировано, его нельзя использовать для папки.",
+      "message-same-name": "Дашборд или папка с таким именем уже существует",
+      "message-same-name-general": "Папка или дашборд в общей папке с таким именем уже существует"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Параметры не найдены"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9928,8 +9929,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Достигнуто максимальное количество групп правил оповещения. Удалите некоторые группы правил оповещения или обновите свой план и повторите попытку.",
+        "alert-rules-quota-reached": "Достигнуто максимальное количество правил оповещения. Удалите некоторые правила оповещения или обновите свой план и повторите попытку.",
         "dashboard-already-managed": "Дашборд уже подготовлен в облачном экземпляре и управляется Grafana. Рекомендуем в будущем использовать подготовленный дашборд. Если вы всё же хотите скопировать дашборд в облачный экземпляр, измените его идентификатор в JSON-файле, сохраните новый снимок и загрузите его снова.",
         "datasource-already-managed": "Источник данных уже подготовлен в облачном экземпляре и управляется Grafana. Если это другой ресурс, установите другой UID и повторите попытку.",
         "datasource-invalid-url": "Существует источник данных с недопустимым URL-адресом. Укажите действительный URL-адрес и повторите попытку.",
@@ -10399,7 +10400,7 @@
     "invite-user": {
       "invite-button": "Пригласить",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Пригласить пользователя"
     },
     "item": {
       "add-bookmark": "Добавить в закладки",
@@ -10431,12 +10432,12 @@
     "rss-button": "Последние записи в блоге"
   },
   "news": {
-    "category-news": "",
-    "description-show-image": "",
-    "description-url": "",
+    "category-news": "Новости",
+    "description-show-image": "Управляет отображением социального изображения новостной статьи (og:image) над текстовым содержимым",
+    "description-url": "Поддерживает RSS- и Atom-каналы",
     "link-title": "Перейти в блог Grafana Labs",
-    "name-show-image": "",
-    "name-url": "",
+    "name-show-image": "Показать изображение",
+    "name-url": "URL",
     "news-panel": {
       "body-error-loading-rss-feed": "Убедитесь, что указан верный URL-адрес канала и на сервере правильно настроено совместное использование ресурсов между разными источниками (CORS). См. <2>документацию на панели новостей.</2>",
       "loading": "Загрузка…",
@@ -10445,27 +10446,27 @@
     "title": "Последние записи в блоге"
   },
   "node-graph": {
-    "category-edges": "",
-    "category-node-graph": "",
-    "category-nodes": "",
+    "category-edges": "Края",
+    "category-node-graph": "Граф узлов",
+    "category-nodes": "Узлы",
     "layout-algorithm-options": {
-      "description-force": "",
-      "description-grid": "",
-      "description-layered": "",
-      "label-force": "",
-      "label-grid": "",
-      "label-layered": ""
+      "description-force": "Использовать силовой макет",
+      "description-grid": "Использовать макет в виде сетки",
+      "description-layered": "Использовать многослойный макет",
+      "label-force": "Сила",
+      "label-grid": "Сетка",
+      "label-layered": "Многослойный"
     },
-    "name-arc-sections": "",
-    "name-layout-algorithm": "",
-    "name-main-stat-unit": "",
-    "name-secondary-stat-unit": "",
-    "name-zoom-mode": "",
+    "name-arc-sections": "Секции дуги",
+    "name-layout-algorithm": "Алгоритм макета",
+    "name-main-stat-unit": "Основная единица статистики",
+    "name-secondary-stat-unit": "Вторичная единица статистики",
+    "name-zoom-mode": "Режим масштабирования",
     "zoom-mode-options": {
-      "description-cooperative": "",
-      "description-greedy": "",
-      "label-cooperative": "",
-      "label-greedy": ""
+      "description-cooperative": "Позволяет прокручивать страницу в обычном режиме",
+      "description-greedy": "Реагирует на все жесты масштабирования",
+      "label-cooperative": "Кооперативное",
+      "label-greedy": "Каскадное"
     }
   },
   "nodeGraph": {
@@ -10550,40 +10551,40 @@
     },
     "registry": {
       "get-all-option-editors": {
-        "description-time-zone": "",
-        "name-time-zone": ""
+        "description-time-zone": "Выбор часового пояса",
+        "name-time-zone": "Часовой пояс"
       },
       "standard-field-condigs": {
-        "category-data-links": ""
+        "category-data-links": "Ссылки на данные и действия"
       },
       "standard-field-configs": {
-        "category": "",
-        "category-thresholds": "",
-        "category-value-mappings": "",
-        "description-display-name": "",
-        "description-field-min-max": "",
-        "description-max": "",
-        "description-min": "",
-        "description-no-value": "",
-        "description-value-mappings": "",
-        "name-actions": "",
-        "name-ad-hoc": "",
-        "name-color-scheme": "",
-        "name-data-links": "",
-        "name-decimals": "",
-        "name-display-name": "",
-        "name-field-min-max": "",
-        "name-max": "",
-        "name-min": "",
-        "name-no-value": "",
-        "name-thresholds": "",
-        "name-unit": "",
-        "name-value-mappings": "",
-        "placeholder-decimals": "",
-        "placeholder-display-name": "",
-        "placeholder-max": "",
-        "placeholder-min": "",
-        "placeholder-unit": ""
+        "category": "Стандартные параметры",
+        "category-thresholds": "Пороговые значения",
+        "category-value-mappings": "Сопоставления значений",
+        "description-display-name": "Изменить имя поля или ряда",
+        "description-field-min-max": "Рассчитать мин. и макс. на поле",
+        "description-max": "Оставить пустым, чтобы рассчитать на основе всех значений",
+        "description-min": "Оставить пустым, чтобы рассчитать на основе всех значений",
+        "description-no-value": "Что показывать, когда нет значения",
+        "description-value-mappings": "Изменить отображаемый текст на основе введенного значения",
+        "name-actions": "Действия",
+        "name-ad-hoc": "Для специальных фильтров",
+        "name-color-scheme": "Цветовая схема",
+        "name-data-links": "Ссылки на данные",
+        "name-decimals": "Кол-во знаков после запятой",
+        "name-display-name": "Отображаемое имя",
+        "name-field-min-max": "Мин./макс. поля",
+        "name-max": "Макс.",
+        "name-min": "Мин.",
+        "name-no-value": "Нет значений",
+        "name-thresholds": "Пороговые значения",
+        "name-unit": "Единица",
+        "name-value-mappings": "Сопоставления значений",
+        "placeholder-decimals": "авто",
+        "placeholder-display-name": "нет",
+        "placeholder-max": "авто",
+        "placeholder-min": "авто",
+        "placeholder-unit": "нет"
       }
     },
     "units": {
@@ -10628,7 +10629,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Организации не найдены",
     "select-placeholder": "Выбрать организацию"
   },
   "page": {
@@ -10692,13 +10693,13 @@
     },
     "panel-data-error-view": {
       "missing-value": {
-        "number": "",
-        "string": "",
-        "time": "",
-        "unknown": ""
+        "number": "В данных отсутствует числовое поле",
+        "string": "В данных отсутствует строковое поле",
+        "time": "В данных отсутствует поле времени",
+        "unknown": "Невозможно визуализировать данные"
       },
       "no-value": {
-        "default": ""
+        "default": "Нет данных"
       },
       "open-visualization-suggestions": "Открыть варианты визуализации",
       "switch-to-table": "Переключиться на таблицу"
@@ -10738,25 +10739,25 @@
     "select-placeholder": "Фильтр по типу"
   },
   "piechart": {
-    "category-legend": "",
-    "category-pie-chart": "",
-    "description-labels": "",
-    "description-pie-chart-type": "",
+    "category-legend": "Условные обозначения",
+    "category-pie-chart": "Круговая диаграмма",
+    "description-labels": "Выбрать метки для отображения на круговой диаграмме",
+    "description-pie-chart-type": "Как должна отображаться круговая диаграмма",
     "labels-options": {
-      "label-name": "",
-      "label-percent": "",
-      "label-value": ""
+      "label-name": "Имя",
+      "label-percent": "Процент",
+      "label-value": "Значение"
     },
     "legend-values-options": {
-      "label-percent": "",
-      "label-value": ""
+      "label-percent": "Процент",
+      "label-value": "Значение"
     },
-    "name-labels": "",
-    "name-legend-values": "",
-    "name-pie-chart-type": "",
+    "name-labels": "Метки",
+    "name-legend-values": "Значения условных обозначений",
+    "name-pie-chart-type": "Тип круговой диаграммы",
     "pie-chart-type-options": {
-      "label-donut": "",
-      "label-pie": ""
+      "label-donut": "Кольцевая",
+      "label-pie": "Круговая"
     }
   },
   "playlist": {
@@ -10851,7 +10852,7 @@
         "permission": "Отсутствует разрешение на просмотр этой страницы.",
         "title-access-denied": "Доступ запрещен"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Не удалось загрузить плагин",
       "no-root-app-page-component-found": "Компонент корневой страницы приложения не найден"
     },
     "browse": {
@@ -10895,7 +10896,7 @@
         "update-status-text": "плагины обновлены"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Действительно перейти на версию {{version}}? Обычно такое действие не рекомендуется",
         "downgrade-confirm": "Понизить версию",
         "downgrade-title": "Понижение версии плагина"
       }
@@ -10924,7 +10925,7 @@
         "dependencies": "Зависимости",
         "documentation": "Документация",
         "downloads": "Загрузки",
-        "from": "",
+        "from": "Время начала",
         "installedVersion": "Установленная версия",
         "lastCommitDate": "Дата последней фиксации:",
         "latestReleaseDate": "Дата последнего выпуска:",
@@ -10950,8 +10951,8 @@
       "message": "Плагины не найдены"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Для получения более подробной информации об ошибке проверьте консоль.",
+      "extension-error-alert-title": "Не удалось загрузить расширение: «{{pluginId}}/{{extensionTitle}}»"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10988,13 +10989,13 @@
     "install-controls-button": {
       "title-uninstall-modal": "Удаление {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Действительно удалить этот плагин?",
+        "confirmText-confirm": "Подтвердить"
       }
     },
     "install-controls-warning": {
       "body-not-published": "Этот плагин не опубликован на странице <2>grafana.com/plugins</2> и им невозможно управлять через каталог.",
-      "enterprise-plugin-info": "",
+      "enterprise-plugin-info": "Этот плагин доступен только в Grafana Cloud и Grafana Enterprise.",
       "learn-more": "Подробнее",
       "no-valid-grafana-enterprise-license-detected": "Не обнаружена действующая лицензия Grafana Enterprise",
       "title-dev-alert": "Это тестовая сборка плагина, которую невозможно удалить.",
@@ -11007,6 +11008,9 @@
       "label-plugin-id": "Идентификатор плагина",
       "label-severity": "Серьезность"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Не удалось найти плагин. Проверьте правильность URL-адреса или <1></1>перейдите в <3>каталог плагинов</3>.",
       "title-plugin-not-found": "Плагин не найден"
@@ -11152,40 +11156,40 @@
   },
   "provisioned-resource-form": {
     "save-or-delete-resource-shared-fields": {
-      "comment-placeholder-describe-changes-optional": "",
-      "description-branch-name-in-git-hub": "",
+      "comment-placeholder-describe-changes-optional": "Добавить примечание с описанием изменений (необязательно)",
+      "description-branch-name-in-git-hub": "Имя ветви в GitHub",
       "description-inside-repository": "",
-      "label-branch": "",
-      "label-comment": "",
-      "label-path": "",
-      "label-workflow": ""
+      "label-branch": "Ветвь",
+      "label-comment": "Комментарий",
+      "label-path": "Путь",
+      "label-workflow": "Рабочий процесс"
     }
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Этот ресурс находится за ветвью в {{repoType}}.",
+      "not-saved": "Остальные пользователи Grafana в вашей организации будут по-прежнему видеть текущую версию, сохраненную в заданной ветви по умолчанию, до тех пор, пока эта ветвь не будет объединена",
+      "open-in-repo-button": "Открыть в {{repoType}}",
+      "open-pull-request-in-repo": "Открыть запрос на включение изменений в {{repoType}}",
+      "view-in-repo-button": "Просмотрите его в {{repoType}}, чтобы увидеть последние изменения.",
+      "view-pull-request-in-repo": "Просмотреть запрос на включение изменений в {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "В ветви в {{repoType}} создан новый ресурс.",
+    "title-loaded-pull-request-in-repo": "Этот ресурс загружается из ветви, которую вы только что создали в {{repoType}}, и виден только вам"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Ресурс сохранен",
+  "provisioned-resource-request-handler-dashboard": "Дашборд сохранен",
+  "provisioned-resource-request-handler-folder": "Папка создана",
   "provisioning": {
     "banner": {
       "message": "В настоящее время эта функция находится в стадии активной разработки. Чтобы обеспечить максимальное удобство пользования и получить доступ к последним улучшениям, рекомендуем использовать <2>ночную сборку</2> Grafana."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Ветвь, используемая для подготовки",
+      "branch-label": "Ветвь",
+      "branch-required": "Требуется указать ветвь",
+      "path-description": "Дополнительный путь к подкаталогу в репозитории",
+      "path-label": "Путь",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11194,18 +11198,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Позволяет пользователям выбрать, следует ли открывать запрос на включение изменений при их сохранении. Если репозиторий не позволяет вносить прямые изменения в основную ветвь, всё равно может потребоваться запрос на включение изменений.",
+      "pr-workflow-label": "Включить параметр запроса на включение изменений при сохранении",
+      "token-description": "Пароль приложения Bitbucket с правами доступа к репозиторию",
+      "token-label": "Пароль приложения",
+      "token-required": "Требуется токен Bitbucket",
+      "token-user-description": "Имя пользователя, которое будет использоваться для доступа к репозиторию с паролем приложения",
+      "token-user-label": "Имя пользователя",
+      "token-user-required": "Требуется ввести имя пользователя",
+      "url-description": "URL-адрес репозитория Bitbucket",
+      "url-label": "URL-адрес репозитория",
+      "url-pattern": "Должен быть действительным URL-адресом репозитория Bitbucket",
+      "url-required": "Требуется указать URL-адрес репозитория"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Добавьте понятное имя для этого подключения к репозиторию.",
@@ -11216,18 +11220,18 @@
       "label-display-name": "Отображаемое имя",
       "placeholder-my-repository-connection": "Мое подключение к репозиторию",
       "text-loading-resource-information": "Загрузка информации о ресурсе...",
-      "dashboards-count_one": "",
-      "dashboards-count_few": "",
-      "dashboards-count_many": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} дашборд",
+      "dashboards-count_few": "{{count}} дашборда",
+      "dashboards-count_many": "{{count}} дашбордов",
+      "dashboards-count_other": "{{count}} дашборда",
       "files-count_one": "{{count}} файл",
       "files-count_few": "{{count}} файла",
       "files-count_many": "{{count}} файлов",
       "files-count_other": "{{count}} файла",
-      "folders-count_one": "",
-      "folders-count_few": "",
-      "folders-count_many": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} папка",
+      "folders-count_few": "{{count}} папки",
+      "folders-count_many": "{{count}} папок",
+      "folders-count_other": "{{count}} папки"
     },
     "check-repository": {
       "check": "Проверить"
@@ -11301,7 +11305,7 @@
       "title-instant-updates-requests-webhooks": "Мгновенные обновления и запросы на включение изменений с помощью веб-перехватчиков",
       "title-visual-previews-in-pull-requests": "Просмотр в запросах на включение изменений с визуализацией изображений"
     },
-    "error-title-default": "",
+    "error-title-default": "Ошибка",
     "expanded-row": {
       "job-specification": "Спецификация задания",
       "summary": "Сводка"
@@ -11310,8 +11314,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Настроить необходимые переключатели функциональности"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Управлять дашбордами как кодом в Git и автоматически выполнять обновления",
+      "manage-your-dashboards-with-remote-provisioning": "Начало работы с Git Sync",
       "store-dashboards-in-version-controlled-storage": "Храните дашборды в хранилище с контролем версий для лучшей организации и отслеживания журналов"
     },
     "file-history-page": {
@@ -11332,16 +11336,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Обеспечивает возможность просмотра изображений с изменениями дашборда в запросах на включение изменений. Изображения дашбордов Grafana будут публиковаться в вашем репозитории Git и видны всем, у кого есть доступ к репозиторию.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Создать ссылки для предварительного просмотра запросов на включение изменений",
       "description-image-rendering": "Требует визуализации изображений. <2>Настройте визуализацию изображений</2>.",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(требует <2>визуализации изображений</2> и включенного общего доступа)",
       "description-read-only": "Ресурсы невозможно изменить через Grafana.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Как часто синхронизировать изменения из репозитория",
+      "error-sync-interval-required": "Требуется указать интервал синхронизации",
       "label-enable-previews": "Включить просмотр дашбордов в запросах на включение изменений",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Создать предварительный просмотр дашборда",
       "label-read-only": "Только для чтения",
-      "label-sync-interval": ""
+      "label-sync-interval": "Интервал синхронизации (в секундах)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "По вашему запросу ничего не найдено",
@@ -11373,46 +11377,46 @@
       "subtitle-provisioning-feature": "Просмотр подключений для подготовки и управлением ими"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Ветвь, используемая для подготовки",
+      "branch-label": "Ветвь",
+      "branch-required": "Требуется указать ветвь",
+      "path-description": "Дополнительный путь к подкаталогу в репозитории",
+      "path-label": "Путь",
+      "pr-workflow-description": "Позволяет пользователям выбрать, следует ли открывать запрос на включение изменений при их сохранении. Если репозиторий не позволяет вносить прямые изменения в основную ветвь, всё равно может потребоваться запрос на включение изменений.",
+      "pr-workflow-label": "Включить параметр запроса на включение изменений при сохранении",
+      "token-description": "Токен или пароль доступа к репозиторию Git",
+      "token-label": "Токен доступа",
+      "token-required": "Требуется токен Git",
+      "token-user-description": "Имя пользователя, которое будет использоваться для доступа к репозиторию с токеном доступа",
+      "token-user-label": "Имя пользователя",
+      "token-user-required": "Требуется ввести имя пользователя",
+      "url-description": "URL-адрес репозитория Git",
+      "url-label": "URL-адрес репозитория",
+      "url-pattern": "Должен быть действительным URL-адресом репозитория Git",
+      "url-required": "Требуется указать URL-адрес репозитория"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Ветвь, используемая для подготовки",
+      "branch-label": "Ветвь",
+      "branch-required": "Требуется указать ветвь",
+      "path-description": "Дополнительный путь к подкаталогу в репозитории",
+      "path-label": "Путь",
+      "pr-workflow-description": "Позволяет пользователям выбрать, следует ли открывать запрос на включение изменений при их сохранении. Если репозиторий не позволяет вносить прямые изменения в основную ветвь, всё равно может потребоваться запрос на включение изменений.",
+      "pr-workflow-label": "Включить параметр запроса на включение изменений при сохранении",
+      "token-description": "Персональный токен доступа GitHub с правами доступа к репозиторию",
+      "token-label": "Персональный токен доступа",
+      "token-required": "Требуется токен GitHub",
+      "url-description": "URL-адрес репозитория GitHub",
+      "url-label": "URL-адрес репозитория",
+      "url-pattern": "Должен быть действительным URL-адресом репозитория GitHub",
+      "url-required": "Требуется указать URL-адрес репозитория"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Ветвь, используемая для подготовки",
+      "branch-label": "Ветвь",
+      "branch-required": "Требуется указать ветвь",
+      "path-description": "Дополнительный путь к подкаталогу в репозитории",
+      "path-label": "Путь",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11421,15 +11425,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Позволяет пользователям выбрать, следует ли открывать запрос на объединение изменений при их сохранении. Если репозиторий не позволяет вносить прямые изменения в основную ветвь, всё равно может потребоваться запрос на объединение изменений.",
+      "pr-workflow-label": "Включить параметр запроса на объединение изменений при сохранении",
+      "token-description": "Токен доступа к проекту GitLab с правами доступа к репозиторию",
+      "token-label": "Токен доступа к проекту",
+      "token-required": "Требуется токен GitLab",
+      "url-description": "URL-адрес репозитория GitLab",
+      "url-label": "URL-адрес репозитория",
+      "url-pattern": "Должен быть действительным URL-адресом репозитория GitLab",
+      "url-required": "Требуется указать URL-адрес репозитория"
     },
     "history-view": {
       "not-found": "Не найдено"
@@ -11457,18 +11461,18 @@
       "starting": "Запуск...",
       "status": {
         "title-error-running-job": "Ошибка при выполнении задания",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Задание завершено",
+        "title-warning-running-job": "Задание завершено с предупреждениями"
       },
       "summary": "Сводка",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Ошибка при получении активного задания"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Путь к репозиторию в локальной файловой системе",
+      "path-label": "Путь к репозиторию",
+      "path-required": "Требуется указать путь к репозиторию"
     },
     "mode-options": {
       "folder": {
@@ -11494,7 +11498,7 @@
     },
     "repository-actions": {
       "settings": "Параметры",
-      "source-code": ""
+      "source-code": "Исходный код"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11560,22 +11564,22 @@
       "title-queued-for-deletion": "В очереди на удаление"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Выберите поставщика:",
+      "configure-file": "Настроить подготовку файлов",
+      "configure-with-provider": "Настроить с помощью {{ provider }}",
+      "provider-not-listed": "Если вашего поставщика нет в списке:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Подключиться к репозиториям Bitbucket",
+      "github": "GitHub",
+      "github-description": "Подключиться к репозиториям GitHub",
+      "gitlab": "GitLab",
+      "gitlab-description": "Подключиться к репозиториям GitLab",
+      "local": "Локальный",
+      "local-description": "Настроить подготовку файлов",
+      "pure-git": "Pure Git",
+      "pure-git-description": "Подключиться к любому репозиторию Git"
     },
     "resource-view": {
       "base": "Основа",
@@ -11606,11 +11610,11 @@
       "label-current-step": "Текущий шаг",
       "label-pending-step": "Предстоящий шаг"
     },
-    "success-title-default": "",
+    "success-title-default": "Выполнено",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Не удалось запустить задание",
+      "error-no-repository-name": "Не указано имя репозитория",
+      "error-starting-job": "Ошибка при запуске задания"
     },
     "sync-repository": {
       "body-edit-configuration": "Редактировать конфигурацию",
@@ -11638,7 +11642,7 @@
       "go-to": "Перейти к",
       "make-sure": "Обязательно включите эти разрешения"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Предупреждение",
     "wizard": {
       "alert-point-1": "Во время этого процесса невозможно создавать, редактировать или удалять ресурсы. На последнем шаге они исчезнут.",
       "alert-point-2": "После завершения подготовки ресурсы снова появятся и будут управляться через внешнее хранилище.",
@@ -11648,10 +11652,10 @@
       "button-next": "Готово",
       "button-start": "Начать синхронизацию",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Конфигурация репозитория будет удалена, и вы потеряете весь прогресс. Действительно отменить изменения?",
+        "confirm": "Да, отменить",
+        "dismiss": "Продолжить работу",
+        "title": "Отменить настройку репозитория?"
       },
       "step-bootstrap": "Выберите, что синхронизировать",
       "step-connect": "Подключить",
@@ -11667,7 +11671,7 @@
     "wizard-content": {
       "button-cancel": "Отмена",
       "button-cancelling": "Отмена...",
-      "button-previous": "",
+      "button-previous": "Назад",
       "button-submitting": "Отправка...",
       "error-instance-repository-exists": "Репозиторий экземпляров уже существует"
     }
@@ -12076,7 +12080,7 @@
         "recommended": "Рекомендуемые",
         "results": "Результаты"
       },
-      "search": ""
+      "search": "Поиск {{parentTitle}}"
     }
   },
   "search": {
@@ -12157,7 +12161,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Служебные учетные записи не найдены",
     "select-aria-label": "Указатель служебной учетной записи",
     "select-placeholder": "Начните вводить текст для поиска служебных учетных записей"
   },
@@ -12203,10 +12207,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Добавить токен служебной учетной записи",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Действительно удалить эту служебную учетную запись?",
+      "body-disable-service-account": "Действительно отключить эту служебную учетную запись?",
+      "confirmText-delete-service-account": "Удалить служебную учетную запись",
+      "confirmText-disable-service-account": "Отключить служебную учетную запись",
       "delete-service-account": "Удалить служебную учетную запись",
       "disable-service-account": "Отключить служебную учетную запись",
       "enable-service-account": "Включить служебную учетную запись",
@@ -12233,7 +12237,7 @@
       "used-by": "Кем используется"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Сохранить",
       "edit": "Редактировать"
     },
     "service-account-role-row": {
@@ -12247,18 +12251,18 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Добавить служебную учетную запись",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Действительно удалить {{serviceAccountName}}?",
+      "body-disable-service-account": "Действительно отключить «{{accountToDisable}}»?",
+      "confirmText-delete": "Удалить",
+      "confirmText-disable-service-account": "Отключить служебную учетную запись",
       "placeholder-search-service-account-by-name": "Поиск служебной учетной записи по имени",
       "sub-title": "Служебные учетные записи и их токены можно использовать для аутентификации в API Grafana Подробнее см. в нашей <2>документации</2></2>",
       "title-delete-service-account": "Удалить служебную учетную запись",
       "title-disable-service-account": "Отключение служебной учетной записи",
-      "body-delete_one": "",
-      "body-delete_few": "",
-      "body-delete_many": "",
-      "body-delete_other": ""
+      "body-delete_one": "Действительно удалить {{serviceAccountName}} и {{count}} сопутствующий токен?",
+      "body-delete_few": "Действительно удалить {{serviceAccountName}} и {{count}} сопутствующих токена?",
+      "body-delete_many": "Действительно удалить {{serviceAccountName}} и {{count}} сопутствующих токенов?",
+      "body-delete_other": "Действительно удалить {{serviceAccountName}} и {{count}} сопутствующего токена?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Срок действия токена истек",
@@ -12272,7 +12276,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Экспортировать как изображение",
       "export-json-title": "Экспорт в формате JSON",
       "share-externally-title": "Общий доступ с внешними пользователями",
       "share-internally-title": "Общий доступ с внутренними пользователями",
@@ -12309,17 +12313,17 @@
       "view-button-yaml": "Просмотр YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Действия по экспорту изображения",
+      "cancel-button": "Отмена",
+      "download-button": "Загрузить изображение",
+      "error-title": "Не удалось создать изображение",
+      "generate-button": "Создать изображение",
+      "generating": "Создание изображения...",
+      "info-text": "Сохранить этот дашборд как изображение",
+      "preview": "Предварительный просмотр",
+      "preview-aria": "Предварительный просмотр созданного изображения",
+      "preview-region": "Предварительный просмотр изображения",
+      "title": "Экспортировать как изображение"
     },
     "library": {
       "info": "Создайте панель библиотеки."
@@ -12329,7 +12333,7 @@
       "info-text": "Создайте прямую ссылку на дашборд или панель, настроенные с помощью приведенных ниже параметров.",
       "link-url": "Привязать URL-адрес",
       "render-alert": "Плагин визуализации изображений не установлен",
-      "render-instructions": "",
+      "render-instructions": "Чтобы визуализировать изображение, необходимо установить <2>плагин визуализации изображений Grafana</2>. Чтобы установить плагин, обратитесь к своему администратору Grafana.",
       "rendered-image": "Прямая ссылка на визуализированное изображение",
       "save-alert": "Дашборд не сохранен",
       "save-dashboard": "Чтобы визуализировать изображение панели, сначала необходимо сохранить дашборд.",
@@ -12397,11 +12401,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Сохраните дашборд, чтобы включить создание изображений",
+    "download-disabled-help": "Сначала создайте изображение, чтобы включить загрузку",
+    "error-title": "Не удалось создать изображение",
     "form": {
-      "label": ""
+      "label": "Настройки изображения панели"
     },
     "preview": {
       "title": "Предварительный просмотр панели"
@@ -12562,112 +12566,112 @@
   },
   "stat": {
     "add-orientation-option": {
-      "description-orientation": "",
-      "name-orientation": "",
+      "description-orientation": "Ориентация макета",
+      "name-orientation": "Ориентация",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-vertical": ""
+        "label-auto": "Авто",
+        "label-horizontal": "Горизонтальная",
+        "label-vertical": "Вертикальная"
       }
     },
     "add-standard-data-reduce-options": {
-      "category-value-options": "",
-      "description-calculation": "",
-      "description-fields": "",
-      "description-limit": "",
-      "description-show": "",
+      "category-value-options": "Параметры значений",
+      "description-calculation": "Выбрать функцию преобразования / расчета",
+      "description-fields": "Выбрать поля для включения на панель",
+      "description-limit": "Макс. количество строк для отображения",
+      "description-show": "Рассчитать одно значение для столбца или ряда или показать каждую строку",
       "fields-options": {
-        "label-all-fields": "",
-        "label-numeric-fields": ""
+        "label-all-fields": "Все поля",
+        "label-numeric-fields": "Числовые поля"
       },
-      "name-calculation": "",
-      "name-fields": "",
-      "name-limit": "",
-      "name-show": "",
+      "name-calculation": "Расчет",
+      "name-fields": "Поля",
+      "name-limit": "Лимит",
+      "name-show": "Показать",
       "show-options": {
-        "label-all-values": "",
-        "label-calculate": ""
+        "label-all-values": "Все значения",
+        "label-calculate": "Рассчитать"
       }
     },
-    "category-stat-styles": "",
+    "category-stat-styles": "Стили статистики",
     "color-mode-options": {
-      "label-background-gradient": "",
-      "label-background-solid": "",
-      "label-none": "",
-      "label-value": ""
+      "label-background-gradient": "Градиент фона",
+      "label-background-solid": "Сплошной фон",
+      "label-none": "Нет",
+      "label-value": "Значение"
     },
-    "description-graph-mode": "",
-    "description-text-mode": "",
+    "description-graph-mode": "Граф панели статистики / режим спарклайна",
+    "description-text-mode": "Управление отображением имени и значения или только имени",
     "graph-mode": {
       "options": {
-        "label-area": "",
-        "label-none": ""
+        "label-area": "Область",
+        "label-none": "Нет"
       }
     },
     "name-color-modcolor-mode-options": {
-      "label": ""
+      "label": "Цветовой режим"
     },
-    "name-graph-mode": "",
-    "name-show-percent-change": "",
-    "name-text-alignment": "",
-    "name-text-mode": "",
-    "name-wide-layout": "",
-    "percent-change-color-mode": "",
+    "name-graph-mode": "Режим графа",
+    "name-show-percent-change": "Показать процентное изменение",
+    "name-text-alignment": "Выравнивание текста",
+    "name-text-mode": "Текстовый режим",
+    "name-wide-layout": "Широкий макет",
+    "percent-change-color-mode": "Цветовой режим процентного изменения",
     "percent-change-color-mode-options": {
-      "label-inverted": "",
-      "label-same-as-value": "",
-      "label-standard": ""
+      "label-inverted": "Инвертированный",
+      "label-same-as-value": "Аналогичный значению",
+      "label-standard": "Стандартный"
     },
     "text-alignment-options": {
-      "label-auto": "",
-      "label-center": ""
+      "label-auto": "Авто",
+      "label-center": "По центру"
     },
     "text-mode-options": {
-      "label-auto": "",
-      "label-name": "",
-      "label-none": "",
-      "label-value": "",
-      "label-value-and-name": ""
+      "label-auto": "Авто",
+      "label-name": "Имя",
+      "label-none": "Нет",
+      "label-value": "Значение",
+      "label-value-and-name": "Значение и имя"
     },
     "wide-layout-options": {
-      "label-off": "",
-      "label-on": ""
+      "label-off": "Выкл.",
+      "label-on": "Вкл."
     }
   },
   "state-timeline": {
     "align-values-options": {
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-center": "По центру",
+      "label-left": "Слева",
+      "label-right": "Справа"
     },
-    "category-state-timeline": "",
-    "name-align-values": "",
-    "name-connect-null-values": "",
-    "name-disconnect-values": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-merge-equal-consecutive-values": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-state-timeline": "Временная шкала состояний",
+    "name-align-values": "Выровнять значения",
+    "name-connect-null-values": "Соединить нулевые значения",
+    "name-disconnect-values": "Отсоединить значения",
+    "name-fill-opacity": "Прозрачность заливки",
+    "name-line-width": "Ширина линии",
+    "name-merge-equal-consecutive-values": "Объединить равные последовательные значения",
+    "name-page-size": "Размер страницы (включить нумерацию страниц)",
+    "name-row-height": "Высота строки",
+    "name-show-values": "Показывать значения",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Всегда",
+      "label-auto": "Авто",
+      "label-never": "Никогда"
     }
   },
   "status-history": {
-    "category-status-history": "",
-    "name-column-width": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-status-history": "История статусов",
+    "name-column-width": "Ширина столбца",
+    "name-fill-opacity": "Прозрачность заливки",
+    "name-line-width": "Ширина линии",
+    "name-page-size": "Размер страницы (включить нумерацию страниц)",
+    "name-row-height": "Высота строки",
+    "name-show-values": "Показывать значения",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Всегда",
+      "label-auto": "Авто",
+      "label-never": "Никогда"
     },
     "status-history-panel": {
       "too-many-points_one": "Слишком много точек для правильной визуализации. <1></1>Обновите запрос, чтобы получить меньше точек. <3></3>(получено {{count}} точки)",
@@ -12709,26 +12713,26 @@
       "label-gauge-display-mode": "Режим отображения индикатора",
       "label-value-display": "Отображаемое значение"
     },
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Параметры ячеек",
+    "category-table": "Таблица",
+    "category-table-footer": "Футер таблицы",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Большая",
+      "label-medium": "Средняя",
+      "label-small": "Малая"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Действия",
+      "auto": "Авто",
+      "color-background": "Цветной фон",
+      "color-text": "Цветной текст",
+      "data-links": "Ссылки на данные",
+      "gauge": "Индикатор",
+      "image": "Изображение",
+      "json": "Представление JSON",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Скругленный прямоугольник",
+      "sparkline": "Спарклайн"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "При выборе этого параметра вся строка будет окрашена аналогично этой ячейке.",
@@ -12741,23 +12745,23 @@
       "wrap-text": "Перенос текста"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Авто",
+      "label-center": "По центру",
+      "label-left": "Слева",
+      "label-right": "Справа"
     },
     "container": {
       "content": "Отображение слишком большого количества столбцов в одной таблице может повлиять на производительность и затруднить чтение данных. Попробуйте уточнить запросы.",
       "show-all-series": "Показать все столбцы",
       "show-only-series": "Максимальное количество отображаемых столбцов: {{MAX_NUMBER_OF_COLUMNS}}"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
-    "description-min-column-width": "",
-    "description-wrap-header-text": "",
+    "description-calculation": "Выбрать функцию преобразования / расчета",
+    "description-cell-value-inspect": "Включить проверку значений ячеек в модальном окне",
+    "description-column-filter": "Включает/отключает фильтры полей в таблице",
+    "description-count-rows": "Отобразить один счетчик для всех строк данных",
+    "description-fields": "Выбрать поля, которые необходимо рассчитать",
+    "description-min-column-width": "Минимальная ширина для автоматического изменения размера столбцов",
+    "description-wrap-header-text": "Включает перенос текста для заголовков столбцов",
     "image-cell-options-editor": {
       "description-alt-text": "Альтернативный текст, который будет отображаться, если невозможно показать изображение, или для пользователей, которые используют программу чтения с экрана",
       "description-title-text": "Текст, который будет отображаться при наведении курсора на изображение",
@@ -12771,66 +12775,66 @@
       },
       "label-dynamic-height": ""
     },
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-paginations": "",
-    "name-fields": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "name-wrap-header-text": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": "",
+    "name-calculation": "Расчет",
+    "name-cell-height": "Высота ячеек",
+    "name-cell-type": "Тип ячеек",
+    "name-cell-value-inspect": "Проверка значений ячеек",
+    "name-column-alignment": "Выравнивание столбцов",
+    "name-column-filter": "Фильтр столбцов",
+    "name-column-width": "Ширина столбца",
+    "name-count-rows": "Подсчет строк",
+    "name-enable-paginations": "Включить нумерацию страниц",
+    "name-fields": "Поля",
+    "name-hide-in-table": "Скрыть в таблице",
+    "name-min-column-width": "Минимальная ширина столбца",
+    "name-show-table-footer": "Показать футер таблицы",
+    "name-show-table-header": "Показать заголовок таблицы",
+    "name-wrap-header-text": "Перенос текста заголовка",
+    "placeholder-column-width": "авто",
+    "placeholder-fields": "Все числовые поля",
     "text-wrap-options": {
       "label-wrap-text": ""
     }
   },
   "table-new": {
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Параметры ячеек",
+    "category-table": "Таблица",
+    "category-table-footer": "Футер таблицы",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Большая",
+      "label-medium": "Средняя",
+      "label-small": "Малая"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Авто",
+      "label-center": "По центру",
+      "label-left": "Слева",
+      "label-right": "Справа"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
+    "description-calculation": "Выбрать функцию преобразования / расчета",
+    "description-cell-value-inspect": "Включить проверку значений ячеек в модальном окне",
+    "description-column-filter": "Включает/отключает фильтры полей в таблице",
+    "description-count-rows": "Отобразить один счетчик для всех строк данных",
+    "description-fields": "Выбрать поля, которые необходимо рассчитать",
     "description-frozen-columns": "",
-    "description-min-column-width": "",
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-pagination": "",
-    "name-fields": "",
+    "description-min-column-width": "Минимальная ширина для автоматического изменения размера столбцов",
+    "name-calculation": "Расчет",
+    "name-cell-height": "Высота ячеек",
+    "name-cell-type": "Тип ячеек",
+    "name-cell-value-inspect": "Проверка значений ячеек",
+    "name-column-alignment": "Выравнивание столбцов",
+    "name-column-filter": "Фильтр столбцов",
+    "name-column-width": "Ширина столбца",
+    "name-count-rows": "Подсчет строк",
+    "name-enable-pagination": "Включить нумерацию страниц",
+    "name-fields": "Поля",
     "name-frozen-columns": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": ""
+    "name-hide-in-table": "Скрыть в таблице",
+    "name-min-column-width": "Минимальная ширина столбца",
+    "name-show-table-footer": "Показать футер таблицы",
+    "name-show-table-header": "Показать заголовок таблицы",
+    "placeholder-column-width": "авто",
+    "placeholder-fields": "Все числовые поля"
   },
   "tag-filter": {
     "clear-button": "Очистить теги",
@@ -12841,7 +12845,7 @@
     "tag-option-label": "Параметр тегов"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Команды не найдены",
     "select-aria-label": "Указатель команды",
     "select-placeholder": "Выбрать команду"
   },
@@ -12915,17 +12919,17 @@
     }
   },
   "text": {
-    "category-text": "",
+    "category-text": "Текст",
     "mode-options": {
-      "label-code": "",
-      "label-html": "",
-      "label-markdown": ""
+      "label-code": "Код",
+      "label-html": "HTML",
+      "label-markdown": "Markdown"
     },
-    "name-content": "",
-    "name-language": "",
-    "name-mode": "",
-    "name-show-line-numbers": "",
-    "name-show-mini-map": ""
+    "name-content": "Контент",
+    "name-language": "Язык",
+    "name-mode": "Режим",
+    "name-show-line-numbers": "Показывать номера строк",
+    "name-show-mini-map": "Показать мини-карту"
   },
   "theme-preview": {
     "breadcrumbs": {
@@ -12973,7 +12977,7 @@
       "apply-button": "Применить временной диапазон",
       "default-error": "Введите прошедшую дату или «{{now}}»",
       "fiscal-year": "Отчетный год: {{from}} – {{to}}",
-      "from-input": "",
+      "from-input": "Время начала",
       "open-input-calendar": "Открыть календарь",
       "range-error": "Время начала не может быть позже времени окончания",
       "to-input": "Время окончания"
@@ -12991,7 +12995,7 @@
       "aria-role": "Выбор временного диапазона",
       "default-title": "Временные диапазоны",
       "example-title": "Примеры временных диапазонов",
-      "from-label": "",
+      "from-label": "Время начала",
       "from-to": "{{timeOptionFrom}} до {{timeOptionTo}}",
       "specify": "Указать временной диапазон",
       "submit-button-label": "Кнопка отправки указателя времени",
@@ -13004,8 +13008,8 @@
   },
   "timeline": {
     "missing-field": {
-      "all": "",
-      "time": ""
+      "all": "Нет полей для построения графов",
+      "time": "Данные не имеют поля времени"
     }
   },
   "timeseries": {
@@ -13023,54 +13027,54 @@
       "tooltip-delete": "Удалить",
       "tooltip-edit": "Редактировать"
     },
-    "category-axis": "",
+    "category-axis": "Ось",
     "config": {
       "get-graph-field-config": {
-        "aria-label-bar-width-factor": "",
-        "aria-label-fill-opacity": "",
-        "aria-label-line-width": "",
-        "aria-label-point-size": "",
-        "category-graph-styles": "",
-        "category-thresholds": "",
-        "name-bar-alignment": "",
-        "name-bar-width-factor": "",
-        "name-connect-nulls": "",
-        "name-disconnect-values": "",
-        "name-fill-below-to": "",
-        "name-fill-opacity": "",
-        "name-gradient-mode": "",
-        "name-line-interpolation": "",
-        "name-line-style": "",
-        "name-line-width": "",
-        "name-point-size": "",
-        "name-show-points": "",
-        "name-show-thresholds": "",
-        "name-style": "",
-        "name-transform": "",
+        "aria-label-bar-width-factor": "Коэффициент ширины столбца",
+        "aria-label-fill-opacity": "Прозрачность заливки",
+        "aria-label-line-width": "Ширина линии",
+        "aria-label-point-size": "Размер точек",
+        "category-graph-styles": "Стили графов",
+        "category-thresholds": "Пороговые значения",
+        "name-bar-alignment": "Выравнивание столбцов",
+        "name-bar-width-factor": "Коэффициент ширины столбца",
+        "name-connect-nulls": "Соединить нулевые значения",
+        "name-disconnect-values": "Отсоединить значения",
+        "name-fill-below-to": "Заполнить до",
+        "name-fill-opacity": "Прозрачность заливки",
+        "name-gradient-mode": "Режим градиента",
+        "name-line-interpolation": "Интерполяция линии",
+        "name-line-style": "Стиль линии",
+        "name-line-width": "Ширина линии",
+        "name-point-size": "Размер точек",
+        "name-show-points": "Показывать точки",
+        "name-show-thresholds": "Показывать пороговые значения",
+        "name-style": "Стиль",
+        "name-transform": "Преобразовать",
         "transform-options": {
-          "description-constant": "",
-          "description-style": "",
-          "label-constant": "",
-          "label-style": ""
+          "description-constant": "Первое значение будет отображаться в виде постоянной линии",
+          "description-style": "Изменить результаты на отрицательные значения по оси y",
+          "label-constant": "Постоянная",
+          "label-style": "Отрицательные для оси Y"
         }
       }
     },
     "insert-nulls-editor": {
       "disconnect-options": {
-        "label-never": "",
-        "label-threshold": ""
+        "label-never": "Никогда",
+        "label-threshold": "Пороговое значение"
       }
     },
     "line-style-editor": {
       "line-fill-options": {
-        "label-dash": "",
-        "label-dots": "",
-        "label-solid": ""
+        "label-dash": "Тире",
+        "label-dots": "Точки",
+        "label-solid": "Сплошная"
       },
       "title-the-input-expects-a-segment-list": "Ввод ожидает список сегментов",
       "tooltip-help": "Справка"
     },
-    "name-time-zone": "",
+    "name-time-zone": "Часовой пояс",
     "nulls-threshold-input": {
       "placeholder-never": "Бессрочно"
     },
@@ -13080,9 +13084,9 @@
     },
     "span-nulls-editor": {
       "gaps-options": {
-        "label-always": "",
-        "label-never": "",
-        "label-threshold": ""
+        "label-always": "Всегда",
+        "label-never": "Никогда",
+        "label-threshold": "Пороговое значение"
       }
     },
     "timezones-editor": {
@@ -13091,17 +13095,17 @@
     }
   },
   "traces": {
-    "category-span-filters": "",
-    "name-critical-path-only": "",
-    "name-find-in-trace": "",
-    "name-max-duration": "",
-    "name-min-duration": "",
-    "name-service-name": "",
-    "name-service-name-operator": "",
-    "name-show-matches-only": "",
-    "name-span-name": "",
-    "name-span-name-operator": "",
-    "name-tags": "",
+    "category-span-filters": "Фильтры диапазонов",
+    "name-critical-path-only": "Показать только критический путь",
+    "name-find-in-trace": "Найти в трассировке",
+    "name-max-duration": "Макс. продолжительность",
+    "name-min-duration": "Мин. продолжительность",
+    "name-service-name": "Имя службы",
+    "name-service-name-operator": "Оператор имени службы",
+    "name-show-matches-only": "Показать только совпадения",
+    "name-span-name": "Имя диапазона",
+    "name-span-name-operator": "Оператор имени диапазона",
+    "name-tags": "Теги",
     "traces-panel": {
       "no-data-found-in-response": "Данные в ответе не найдены"
     }
@@ -13116,20 +13120,20 @@
     "axis-editor": {
       "log-mode-options": {
         "description": {
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-size": "Разделить сегменты по размеру"
         },
         "label": {
-          "split": ""
+          "split": "Разделить"
         }
       },
       "mode-options": {
         "description": {
-          "split-the-buckets-based-on-count": "",
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-count": "Разделить сегменты по количеству",
+          "split-the-buckets-based-on-size": "Разделить сегменты по размеру"
         },
         "label": {
-          "count": "",
-          "size": ""
+          "count": "Количество",
+          "size": "Размер"
         }
       },
       "placeholder-auto": "Авто"
@@ -13145,15 +13149,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Бинарная операция",
+          "reduce-row": "Уменьшить строку",
+          "row-index": "Индекс строки",
+          "unary-operation": "Унарная операция"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Кумулятивные функции",
+        "window-functions": "Оконные функции"
       },
       "label-alias": "Псевдоним",
       "label-mode": "Режим",
@@ -13161,9 +13165,9 @@
     },
     "calculate-heatmap": {
       "add-heatmap-calculation-options": {
-        "name-x-bucket": "",
-        "name-y-bucket": "",
-        "name-y-bucket-scale": ""
+        "name-x-bucket": "Сегмент X",
+        "name-y-bucket": "Сегмент Y",
+        "name-y-bucket-scale": "Шкала сегмента Y"
       }
     },
     "concatenate-transformer-editor": {
@@ -13171,9 +13175,9 @@
       "label-name": "Имя",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Копировать имя фрейма в имя поля",
+          "ignore-the-frame-name": "Игнорировать имя фрейма",
+          "label-frame": "Добавить метку с именем фрейма"
         }
       },
       "placeholder-frame": "Фрейм"
@@ -13186,9 +13190,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Добавить преобразователь типа поля",
       "aria-label-remove-convert-field-type-transformer": "Удалить преобразователь типа поля",
-      "convert-field-type": "",
+      "convert-field-type": "Преобразовать тип поля",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Преобразуйте поле в указанный тип."
       },
       "label": {
         "browser": "Браузер",
@@ -13201,11 +13205,11 @@
       "label-join-with": "Объединить с",
       "label-set-timezone": "Установить часовой пояс",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Преобразовать тип поля"
       },
       "placeholder-type": "Тип",
       "tags": {
-        "format-field": ""
+        "format-field": "Форматировать поле"
       },
       "tooltip-explicit-separator-joining-array-values": "Используйте явный разделитель при объединении значений массива",
       "tooltip-input-format": "Укажите формат поля ввода, чтобы дать Grafana возможность правильно проанализировать строку даты.",
@@ -13224,20 +13228,20 @@
       "tooltip-enable": "Включить"
     },
     "draggable-sort-order": {
-      "asc": "",
-      "desc": "",
+      "asc": "По возрастанию",
+      "desc": "По убыванию",
       "off": "Выкл."
     },
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Объедините все поля в один фрейм."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Объединить поля"
         },
         "tags": {
-          "combine": ""
+          "combine": "Объединить"
         }
       }
     },
@@ -13252,11 +13256,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Проведите анализ полей из содержимого (JSON, метки и т. д.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Выбрать поле"
         }
       },
       "label-delimiter": "Разделитель",
@@ -13265,7 +13269,7 @@
       "label-replace-all-fields": "Заменить все поля",
       "label-source": "Источник",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Извлечь поля"
       },
       "placeholder-auto": "Авто",
       "placeholder-select-delimiter": "Выбор разделителя...",
@@ -13276,20 +13280,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Используйте значение поля для поиска стран, штатов или аэропортов."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Текстовые поля не найдены"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Выбрать текстовое поле"
         }
       },
       "label-field": "Поле",
       "label-lookup": "Просмотр",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Подставить поля из ресурса"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13300,23 +13304,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Удалите части результатов запроса с помощью шаблона регулярного выражения."
       },
       "label-from-variable": "Из переменной",
       "label-identifier": "Идентификатор",
       "label-use-variable": "Использовать переменную",
       "label-variable": "Переменная",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Фильтр полей по имени"
       },
       "placeholder-regular-expression-pattern": "Шаблон регулярного выражения"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Удалите строки из данных на основе исходного запроса"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Фильтр данных по запросу"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13330,33 +13334,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Добавить условие",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Удалите строки из результатов запроса с помощью пользовательских фильтров."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Сопоставить все",
+          "match-any": "Сопоставить любые"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Исключить",
+          "include": "Включить"
         }
       },
       "label-conditions": "Условия",
       "label-filter-type": "Тип фильтра",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Фильтр данных по значениям"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Текстовые поля не найдены"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Выбрать текстовое поле"
         }
       },
       "label-field": "Поле",
@@ -13365,10 +13369,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Изменяйте форматирование строковых полей."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Форматировать строку"
       }
     },
     "format-time-transfomer-editor": {
@@ -13380,66 +13384,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Установить формат вывода поля времени"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Форматировать время"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Используйте значения строк для расчета нового поля."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Добавить поле из расчета"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Установите единицу, минимум, максимум и прочее."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Настроить по результатам запроса"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Создайте данные тепловой карты из исходных данных."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Создать тепловую карту"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Сведите помеченные результаты в таблицу, объединенную метками."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Объединить по меткам"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Разделите набор данных в одном фрейме на несколько рядов."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Разделить по значениям"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Преобразуйте каждую строку в поле с динамической конфигурацией."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Строки в поля"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Применяйте пространственные операции к результатам запроса."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Пространственные операции"
       }
     },
     "get-timezone-options": {
@@ -13471,8 +13475,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Рассчитать",
+          "group-by": "Группировать по"
         }
       },
       "placeholder-ignored": "Пропущено",
@@ -13480,42 +13484,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Группируйте данные по значениям полей и получайте агрегированные данные."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Группировать по"
       },
       "title-calc-alert": "Расчеты не дадут результата, если нет сгруппированных полей"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Группируйте данные по значениям полей и создавайте вложенные таблицы со сгруппированными данными."
       },
       "description-show-field-names": "Если параметр включен, вложенные таблицы будут отображать имена полей в качестве заголовка таблицы.",
       "label-show-field-names-in-nested-tables": "Показывать названия полей во вложенных таблицах",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Группировать во вложенные таблицы"
       },
       "title-calc-alert": "Расчеты не дадут результата, если нет сгруппированных полей"
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Обобщайте и переупорядочивайте данные на основе трех полей."
       },
       "label-cell-value": "Значение ячейки",
       "label-column": "Столбец",
       "label-empty-value": "Пустое значение",
       "label-row": "Строка",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Группировка в матрицу"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Рассчитайте гистограмму по вводным данным."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Гистограмма"
       },
       "placeholder-auto": "Авто",
       "placeholder-default": "По умолчанию: 30",
@@ -13527,14 +13531,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Объедините строки из более чем 2 таблиц на основе связанного поля."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Объединить по полю"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Обязательно",
       "info": {
         "input-contain-labels": "Ввод не содержит меток",
         "no-input-or-labels-found": "Не найден ввод (или метки)",
@@ -13558,8 +13562,8 @@
       "label-value-field-name": "Название поля значений",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Столбцы",
+          "rows": "Строки"
         }
       },
       "placeholder-optional-select-label": "Выбрать метку (необязательно)",
@@ -13567,18 +13571,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Группируйте ряды по времени и возвращайте метки или теги в виде полей."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Метки к полям"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Ограничьте количество отображаемых элементов."
       },
       "name": {
-        "limit": ""
+        "limit": "Ограничить"
       },
       "placeholder-value-or-variable": "Значение или переменная"
     },
@@ -13591,11 +13595,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Объедините несколько рядов. Значения будут объединены в одну строку."
       },
       "merge-effect-applied-single-frame": "Слияние не дает результата, если применяется к одиночному фрейму.",
       "name": {
-        "merge": ""
+        "merge": "Объединить ряды/таблицы"
       }
     },
     "multi-info": {
@@ -13607,14 +13611,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Измените порядок полей, скройте или переименуйте их."
       },
-      "field-order": "",
+      "field-order": "Порядок полей",
       "field-order-auto": "Авто",
-      "field-order-manual": "",
+      "field-order-manual": "Ручной",
       "first-frame-warning": "Функция упорядочивания полей работает только с одиночным фреймом. Попробуйте сначала применить преобразование соединения или отфильтровать ввод.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Упорядочить поля по имени"
       }
     },
     "partion-by-values-editor": {
@@ -13642,10 +13646,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Растягивайте фреймы данных из широкого формата в длинный."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Подготовить временные ряды"
       }
     },
     "prepare-time-series-editor": {
@@ -13653,26 +13657,26 @@
       "label-info": "Информация",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Преобразовать каждый фрейм в длинный формат"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Длинные временные ряды"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Создает новый фрейм для каждой пары «время/число»"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Несколько фреймов временных рядов"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Создает одиночный фрейм, объединенный по времени"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Широкие временные ряды"
         }
       }
     },
@@ -13687,7 +13691,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Приведите все строки или точки данных к одному значению (например, максимальному, среднему)."
       },
       "label-calculations": "Расчеты",
       "label-include-time": "Включить время",
@@ -13704,7 +13708,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Сократить"
       },
       "placeholder-choose-stat": "Выбрать статистику"
     },
@@ -13714,18 +13718,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Создайте новый фрейм данных со значениями, спрогнозированными статистической моделью."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Линия тренда"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Кубическая",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Квадратичная",
         "quartic": "Четвертого порядка",
-        "quintic": "Пятого порядка"
+        "quintic": "Пятого порядка",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Степень",
       "label-model-type": "Тип модели",
@@ -13738,18 +13747,19 @@
           "polynomial": "Полиномиальная"
         }
       },
-      "regression": "",
+      "regression": "регрессия",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Регрессионный анализ"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Количество точек X, Y для прогнозирования"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Переименуйте части результатов запроса с помощью регулярного выражения и шаблона замены."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Переименовать поля по регулярному выражению"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13763,33 +13773,33 @@
       "label-mode": "Режим",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Объединяйте данные из двух таблиц всякий раз, когда в общих для обеих таблиц полях есть совпадающие значения.",
+          "join-on-a-field": "Объединяйте по значениям полей с дублированными значениями. Внешнее объединение, которое не является высокопроизводительным, лучше всего использовать для табличных данных (типа SQL).",
+          "keep-all-rows": "Сохраняйте все строки из любой таблицы со значениями. Объединяйте по отдельным значениям полей. Объединение является высокопроизводительным и лучше всего подходит для временных рядов."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Внутреннее",
+          "outer-tabular": "Внешнее (табличные данные)",
+          "outer-time-series": "Внешнее (временные ряды)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Объедините несколько рядов. Возвращает время, метрику и значения в виде строки."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Ряды в строки"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Сортируйте поля в фрейме."
       },
       "label-field": "Поле",
       "label-reverse": "Изменить на обратное",
       "name": {
-        "sort-by": ""
+        "sort-by": "Сортировать по"
       },
       "placeholder-select-field": "Выбрать поле"
     },
@@ -13812,13 +13822,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Преобразуйте данные временных рядов в строки таблицы, чтобы их можно было просматривать в табличном формате или в виде спарклайна."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "Для преобразования временных рядов в таблицу требуется хотя бы один фрейм временных рядов. В настоящее время у вас их нет."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Временные ряды в таблицу"
       }
     },
     "time-series-table-transform-editor": {
@@ -13836,15 +13846,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Транспонируйте фрейм данных."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Транспонировать"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Сводить",
+        "transform": "Преобразовать",
+        "translate": "Переводить"
       }
     },
     "unary-operation-editor": {
@@ -13853,13 +13863,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Рассчитать новые поля",
+        "combine": "Объединить",
+        "create-new-visualization": "Создать новую визуализацию",
+        "filter": "Фильтр",
+        "perform-spatial-operations": "Выполнить пространственные операции",
+        "reformat": "Переформатировать",
+        "reorder-and-rename": "Переупорядочить и переименовать"
       },
       "special-value-options": {
         "description": {
@@ -13910,10 +13920,10 @@
     }
   },
   "trend": {
-    "category-x-axis": "",
-    "description-x-field": "",
-    "name-x-field": "",
-    "placeholder-x-field": ""
+    "category-x-axis": "Ось X",
+    "description-x-field": "Увеличивающееся числовое значение",
+    "name-x-field": "Поле X",
+    "placeholder-x-field": "Первое числовое значение"
   },
   "upgrade-box": {
     "discovery-text": "Вы открыли для себя функцию Pro.",
@@ -13930,7 +13940,7 @@
     "title": "Организации"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Пользователи не найдены",
     "select-aria-label": "Указатель пользователей",
     "select-placeholder": "Начните вводить текст для поиска пользователя"
   },
@@ -14016,8 +14026,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Действительно удалить переменную «{{variableToDelete}}»?",
+      "confirmText-delete": "Удалить",
       "title-delete-variable": "Удаление переменной"
     },
     "create-ad-hoc-variable-adapter": {
@@ -14067,33 +14077,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Как сортировать значения этой переменной.",
-      "name-sort": "",
+      "name-sort": "Сортировать",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "По алфавиту (в прямом порядке)",
+          "alphabetical-caseinsensitive-asc": "По алфавиту (без учета регистра, в прямом порядке)",
+          "alphabetical-caseinsensitive-desc": "По алфавиту (без учета регистра, в обратном порядке)",
+          "alphabetical-desc": "По алфавиту (в обратном порядке)",
+          "disabled": "Отключено",
+          "natural-asc": "В естественном порядке (по возрастанию)",
+          "natural-desc": "В естественном порядке (по убыванию)",
+          "numerical-asc": "В числовом порядке (по возрастанию)",
+          "numerical-desc": "В числовом порядке (по убыванию)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Добавить параметр",
+      "description": "Добавить пользовательские параметры в дополнение к результатам запроса",
+      "label-placeholder": "показать метку",
+      "remove-option-button-label": "Удалить параметр",
+      "value-placeholder": "значение, пустая строка по умолчанию"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Как сортировать статические параметры с результатами запроса"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Значение по умолчанию",
       "placeholder-default-value-if-any": "значение по умолчанию, если имеется",
       "text-options": "Параметры текста"
     },
@@ -14122,8 +14132,8 @@
       "description-optional-display-name": "Отображаемое имя (необязательно)",
       "description-template-variable-characters": "Название переменной шаблона. (Макс. 50 символов.)",
       "general": "Общие сведения",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Метка",
+      "name-name": "Имя",
       "placeholder-descriptive-text": "Поясняющий текст",
       "placeholder-label-name": "Название метки",
       "placeholder-variable-name": "Название переменной",
@@ -14139,13 +14149,13 @@
       "tooltip-remove-variable": "Удалить переменную"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Описание"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Переключить все значения"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Выбрать тип переменной"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Показать варианты использования"
@@ -14176,20 +14186,20 @@
     }
   },
   "xychart": {
-    "category-xychart": "",
-    "name-fill-opacity": "",
-    "name-line-style": "",
-    "name-line-width": "",
-    "name-max-point-size": "",
-    "name-min-point-size": "",
-    "name-point-shape": "",
-    "name-point-size": "",
-    "name-point-stroke-width": "",
-    "name-series-mapping": "",
-    "name-show": "",
+    "category-xychart": "График XY",
+    "name-fill-opacity": "Прозрачность заливки",
+    "name-line-style": "Стиль линии",
+    "name-line-width": "Ширина линии",
+    "name-max-point-size": "Макс. размер точек",
+    "name-min-point-size": "Мин. размер точек",
+    "name-point-shape": "Форма точек",
+    "name-point-size": "Размер точек",
+    "name-point-stroke-width": "Ширина обводки точек",
+    "name-series-mapping": "Сопоставление рядов",
+    "name-show": "Показать",
     "point-shape-options": {
-      "label-circle": "",
-      "label-square": ""
+      "label-circle": "Круглая",
+      "label-square": "Квадрат"
     },
     "series-editor": {
       "add-series": "Добавить ряд",
@@ -14201,18 +14211,18 @@
       "label-y-field": "Поле Y",
       "placeholder-all-frames": "Все фреймы",
       "placeholder-select-frame": "Выбрать фрейм",
-      "placeholder-x-field": "",
-      "placeholder-y-field": "",
+      "placeholder-x-field": "Первое числовое или временное поле в каждом фрейме",
+      "placeholder-y-field": "Оставшиеся числовые поля в каждом фрейме",
       "tooltip-delete-series": "Удалить ряд"
     },
     "series-mapping-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Авто",
+      "label-manual": "Ручной"
     },
     "show-options": {
-      "label-both": "",
-      "label-lines": "",
-      "label-points": ""
+      "label-both": "Оба",
+      "label-lines": "Линии",
+      "label-points": "Точки"
     }
   }
 }
\ No newline at end of file
diff --git a/public/locales/sv-SE/grafana.json b/public/locales/sv-SE/grafana.json
index 617594cca3e..be98fb25436 100644
--- a/public/locales/sv-SE/grafana.json
+++ b/public/locales/sv-SE/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Vissa funktioner är stabila (GA) och aktiverade som standard, medan vissa för närvarande är i sin preliminära betafas och finns tillgängliga för tidig tillämpning.",
       "confirm-modal-body-2": "Vi rekommenderar att du ser till att du förstår konsekvenserna av varje funktionsändring innan du gör några ändringar.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Spara ändringarna",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Allmän tillgänglighet",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Radera org",
-      "confirmText-delete": "",
+      "confirmText-delete": "Radera",
       "title-delete": "Radera"
     },
     "anon-users": {
       "not-found": "Inga anonyma användare hittades."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Är du säker på att du vill tvinga utloggning från alla enheter?",
+      "confirmText-confirm-logout": "Bekräfta utloggning",
+      "confirmText-force-logout": "Tvinga utloggning",
       "title-force-logout-from-all-devices": "Tvinga utloggning från alla enheter"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Spara"
     },
     "edit-org": {
       "access-denied": "Du har inte behörighet att se användare i denna organisation. Kontakta serveradministratören om du behöver uppdatera den här organisationen.",
@@ -119,10 +119,10 @@
       "users-heading": "Organisationsanvändare"
     },
     "enterprise-auth-features-card": {
-      "dismiss": "",
-      "heading": "",
-      "learn-more-link": "",
-      "text": ""
+      "dismiss": "Avfärda",
+      "heading": "Enterprise-autentisering",
+      "learn-more-link": "Läs mer",
+      "text": "Hantera användare, team och behörigheter automatiskt med <1>SAML</1>, <3>SCIM</3>, <6>LDAP</6> och <8>RBAC</8> – tillgängligt i Grafana Cloud och Enterprise."
     },
     "feature-listing": {
       "title-auditing": "Revision",
@@ -216,11 +216,11 @@
       "not-editable": "Denna användares roll kan inte redigeras eftersom den synkroniseras från din autentiseringsleverantör. Se <1>Grafanas autentiseringsdokumentation</1> för mer information."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "Är du säker på att du vill radera användaren {{user}}?",
       "columns": {
         "aria-label-role": "Roll"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Radera",
       "delete-aria-label": "Radera användare: {{name}}",
       "title-delete": "Radera"
     },
@@ -252,7 +252,7 @@
       "info-description": "Dessa systeminställningar definieras i grafana.ini eller custom.ini (eller åsidosätts genom ENV-variabler). För att ändra dessa måste du för närvarande starta om Grafana."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Bekräfta borttagning"
     },
     "upgrade-info": {
       "title": "Företagslicens"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Ändra",
-      "confirmText-change": "",
+      "confirmText-change": "Ändra",
       "grafana-admin-key": "Grafana Admin",
       "grafana-admin-no": "Nej",
       "grafana-admin-yes": "Ja",
       "title": "Behörigheter"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Är du säker på att du vill radera denna användare?",
+      "body-disable": "Är du säker på att du vill inaktivera den här användaren?",
+      "confirmText-delete-user": "Radera användare",
+      "confirmText-disable-user": "Inaktivera användare",
       "delete-button": "Radera användare",
       "disable-button": "Inaktivera användare",
       "edit-button": "Redigera",
@@ -331,7 +331,7 @@
       "title-disable-user": "Inaktivera användare"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Spara"
     },
     "user-sessions": {
       "browser-column": "Webbläsare och operativsystem",
@@ -374,20 +374,20 @@
       "am-active-timing-select-label-active-timings": "Aktiva tidsinställningar"
     },
     "ad": {
-      "close": "",
-      "learn-more": ""
+      "close": "Stäng",
+      "learn-more": "Läs mer"
     },
     "add-button": {
       "add-more": "Lägg till fler"
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Knappen för AI-varningsregel kunde inte laddas",
+        "feedback-button": "Knappen för AI-feedback kunde inte laddas",
+        "improve-annotations-button": "Knappen för AI-förbättrade kommentarer kunde inte laddas",
+        "improve-labels-button": "Knappen för AI-förbättrade etiketter kunde inte laddas",
+        "template-button": "Knappen för AI-mall kunde inte laddas",
+        "triage-button": "Knappen för AI-prioritering kunde inte laddas"
       }
     },
     "alert": {
@@ -405,12 +405,12 @@
       "missing-series-resolve": "Saknade serieutvärderingar att åtgärda",
       "no-annotations": "Inga kommentarer",
       "notification-configuration": {
-        "active-timings": "",
+        "active-timings": "Aktiva tidsintervall",
         "contact-point": "Kontaktpunkt",
         "group-by": "Grupperad efter",
-        "group-title": "",
+        "group-title": "Aviseringskonfiguration",
         "mute-timings": "Tysta tidsinställningarna",
-        "timing-options": ""
+        "timing-options": "Tider"
       },
       "pending-period": "Väntande period",
       "rule": "Regel",
@@ -493,7 +493,7 @@
       "title-muting-grouping-and-timings": "Tystnad, gruppering och tidsinställningar"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Inga datakällor hittades"
     },
     "alert-menu": {
       "copy-link": "Kopiera länk",
@@ -519,7 +519,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Varningsregel"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -587,7 +587,7 @@
       "view-configuration": "Visa konfiguration"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Ja, återställ konfigurationen",
       "gma-manual-configuration-description": "Den interna konfigurationen för Grafana Alertmanager kan inte ändras manuellt. Ändra den här konfigurationen genom att redigera de enskilda resurserna via användargränssnittet.",
       "gma-manual-configuration-is-not-supported": "Manuella konfigurationsändringar stöds inte",
       "message": {
@@ -602,13 +602,13 @@
       "title-resetting-alertmanager-configuration": "Återställer konfigurationen för Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Är du säker på att du vill återställa konfigurationen till denna version? Alla ändringar som inte sparats kommer att gå förlorade.",
       "columns": {
         "compare": "Jämför",
         "restore": "Återställ",
         "text-latest": "Senaste"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Ja, återställ konfigurationen",
       "loading": "Laddar …",
       "no-previous-configurations": "Inga tidigare konfigurationer",
       "this-might-take-a-while": "Det kan ta en stund …",
@@ -888,10 +888,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Fler åtgärder för kontaktpunkten ”{{contactPointName}}”",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Radera",
       "button-edit": "Redigera",
       "button-view": "Visa",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Exportera",
       "export-label-export": "Exportera",
       "label-delete": "Ta bort",
       "label-manage-permissions": "Hantera behörigheter",
@@ -964,7 +964,7 @@
     },
     "contactPoints": {
       "validation": {
-        "notFound": ""
+        "notFound": "Kontaktpunkten ”{{contactPoint}}” kunde inte hittas"
       }
     },
     "continue-matching-indicator": {
@@ -973,7 +973,7 @@
     "copy-to-clipboard": "Kopiera ”{{label}}” till klippbordet",
     "create-metadata": {
       "label": {
-        "contact-point": "",
+        "contact-point": "Aviseringar levereras till",
         "dashboard": "Instrumentpanel",
         "dashboard-and-panel": "Instrumentpanel och panel",
         "evaluation-interval": "Utvärderingsintervall",
@@ -1121,7 +1121,7 @@
       "content-show-all-errors": "Visa alla fel"
     },
     "errors": {
-      "failedWith": ""
+      "failedWith": "{{-config}} misslyckades med {{status}}: {{-message}}"
     },
     "evaluate-every-validation-options": {
       "message": {
@@ -1426,7 +1426,7 @@
       "label-disable-resolved-message": "Inaktivera löst meddelande"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Laddar grupper …",
       "message": {
         "must-be-a-positive-integer": "Måste vara ett positivt heltal.",
         "must-enter-a-group-name": "Måste ange ett gruppnamn"
@@ -1523,7 +1523,7 @@
       "group-loading-error": "Fel vid laddning av gruppen",
       "interval": "Intervall",
       "namespace": "Namnområde",
-      "new": "",
+      "new": "Nyhet",
       "title": {
         "back": ""
       }
@@ -1555,7 +1555,7 @@
     },
     "group-loader": {
       "group-load-failed": "Det gick inte att ladda reglerna från gruppen {{ groupName }} i {{ namespaceName }}",
-      "no-rules": ""
+      "no-rules": "Inga regler hittades i denna grupp"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "Gruppen raderas"
@@ -1572,20 +1572,20 @@
       }
     },
     "home": {
-      "irm-card-description": "",
-      "irm-card-item-1": "",
-      "irm-card-item-2": "",
-      "irm-card-item-3": "",
-      "irm-card-item-4": "",
-      "irm-card-title": "",
+      "irm-card-description": "Sammanfoga jour, varning och incidentsvar med Grafana Cloud IRM.",
+      "irm-card-item-1": "Hantera jourscheman med din kalender eller Terraform.",
+      "irm-card-item-2": "Svara på incidenter via webben, appen, Slack eller andra kanaler.",
+      "irm-card-item-3": "Identifiera grundorsaker med AI-drivna Grafana SIFT.",
+      "irm-card-item-4": "Analysera tidigare incidenter för att förbättra respons och motståndskraft.",
+      "irm-card-title": "Incidentsvar och -hantering",
       "label-get-started": "Kom igång nu",
       "label-insights": "Insikter",
-      "synthetic-monitoring-card-description": "",
-      "synthetic-monitoring-card-item-1": "",
-      "synthetic-monitoring-card-item-2": "",
-      "synthetic-monitoring-card-item-3": "",
-      "synthetic-monitoring-card-item-4": "",
-      "synthetic-monitoring-card-title": ""
+      "synthetic-monitoring-card-description": "Övervaka kritiska användarflöden, webbplatser och API:er externt, från globala platser.",
+      "synthetic-monitoring-card-item-1": "Simulera slutanvändarresor med webbläsarkontroller.",
+      "synthetic-monitoring-card-item-2": "Kör ping-, DNS-, HTTP/S- och TCP-kontroller på varje nätverkslager.",
+      "synthetic-monitoring-card-item-3": "Använd över 20 globala sonder eller privata sonder bakom din brandvägg.",
+      "synthetic-monitoring-card-item-4": "Spåra SLO:er med inbyggda Prometheus-liknande varningar – direkt från användargränssnittet.",
+      "synthetic-monitoring-card-title": "Syntetisk övervakning"
     },
     "import-to-gma": {
       "action-button": "Importera",
@@ -1599,7 +1599,7 @@
         "no-rules-body-yaml": "Det finns inga regler att importera. Välj en annan yaml-fil.",
         "no-rules-title": "Inga regler att importera",
         "not-using-rules-managed-by-integrations-or-plugins": {
-          "text": "",
+          "text": "Regler som hanteras av integrationer eller plugins bör inte importeras till Grafana-hanterade regler.",
           "title": "Information"
         },
         "plugin-rules-warning": {
@@ -1885,10 +1885,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Inga datakällor hittades"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "Är du säker på att du vill radera ”{{muteTiming}}”?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Inaktiverad",
@@ -1979,7 +1979,7 @@
     },
     "notification-policies-filter": {
       "label-search-by-contact-point": "Sök efter kontaktpunkt",
-      "placeholder-search-by-contact-point": "",
+      "placeholder-search-by-contact-point": "Välj en kontaktpunkt",
       "search-query-input-placeholder-search": "Sök"
     },
     "notification-policies-list": {
@@ -2140,10 +2140,10 @@
         "conflict": "Aviseringspolicyträdet har uppdaterats av en annan användare.",
         "error-code": "Felmeddelande: ”{{error}}”",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Kan inte lägga till eller uppdatera rutt: dess matchare {{-matchers}} orsakar en konflikt med ett externt routingträd om vi skulle slå samman dem. Det skulle göra rutten oåtkomlig."
         },
         "suffix": "Uppdatera sidan och försök igen.",
-        "title": ""
+        "title": "Det gick inte att lägga till eller uppdatera aviseringspolicy"
       },
       "n-more-policies_one": "{{count}} ytterligare policyer",
       "n-more-policies_other": "{{count}} ytterligare policyer"
@@ -2199,7 +2199,7 @@
     "query-and-expressions-step": {
       "add-query": "Lägg till fråga",
       "body-queries-expressions-configured": "Skapa minst en fråga eller ett uttryck att bli larmad för",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Inaktivera",
       "expressions": "Uttryck",
       "loading-data-sources": "Laddar datakällor …",
       "manipulate-returned-queries-other-operations": "Manipulera data som returneras från frågor med matematikfunktioner och andra operationer.",
@@ -2253,7 +2253,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Inspelningsregel"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Kunde inte ladda frågeredigerare på grund av: {{errorMessage}}"
@@ -2273,7 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Du måste ställa in en ny utvärderingsgrupp för den kopierade regeln eftersom den ursprungliga har provisionerats och inte kan användas för regler som skapats i användargränssnittet.",
       "body-not-provisioned": "Den nya regeln kommer <1>inte</1> att markeras som en provisionerad regel.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Kopiera",
       "title-copy-provisioned-alert-rule": "Kopiera provisionerad larmregel"
     },
     "redirect-to-rule-viewer": {
@@ -2492,12 +2492,12 @@
         "new-badge": "Nyhet!",
         "text": "Importera till Grafana-hanterade regler"
       },
-      "loading-more-groups": "",
+      "loading-more-groups": "Laddar fler grupper …",
       "more": "Mer",
       "new-alert-rule": "Ny varningsregel",
       "new-datasource-recording-rule": "Ny registreringsregel för datakälla",
       "new-grafana-recording-rule": "Ny registreringsregel för Grafana",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Ny varningsregel för export",
       "pagination": {
         "next-page": "Visa mer …"
       },
@@ -2671,7 +2671,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Varningshanterare"
       }
     },
     "settings-content": {
@@ -2809,7 +2809,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Uppdatera förhandsgranskning",
-      "empty-state": "",
+      "empty-state": "Lägg till mallinnehåll för att se förhandsgranskning",
       "label-preview": "Förhandsgranska",
       "refresh": "Uppdatera"
     },
@@ -2828,7 +2828,7 @@
       "loading": "Laddar …",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Välj aviseringsmall"
         },
         "label": {
           "select-notification-template": "Välj aviseringsmall"
@@ -2856,8 +2856,8 @@
     },
     "templates-table": {
       "actions": "Åtgärder",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "Är du säker på att du vill radera mallgruppen ”{{template}}”?",
+      "confirmText-yes-delete": "Ja, radera",
       "no-templates-defined": "Inga mallar definierade.",
       "template-group": "Mallgrupp",
       "title-delete-template-group": "Radera mallgrupp"
@@ -2912,7 +2912,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Hantera varningsregler, inspelningsregler och utvärderingsintervall"
       }
     },
     "to-gma": {
@@ -2992,7 +2992,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Ja, radera"
       }
     },
     "use-delete-policy-modal": {
@@ -3046,51 +3046,51 @@
     }
   },
   "alertlist": {
-    "category-alert-state-filter": "",
-    "category-filter": "",
-    "category-options": "",
-    "descriptino-alerts-linked-to-dashboard": "",
-    "description-alert-instance-label": "",
-    "description-alert-name": "",
-    "description-datasource": "",
-    "description-folder": "",
-    "description-group-by": "",
-    "description-group-mode": "",
-    "description-max-items": "",
-    "description-show-inactive-alerts": "",
-    "description-sort-order": "",
-    "description-view-mode": "",
+    "category-alert-state-filter": "Varningstillståndsfilter",
+    "category-filter": "Filtrera",
+    "category-options": "Alternativ",
+    "descriptino-alerts-linked-to-dashboard": "Visa endast varningar kopplade till denna instrumentpanel",
+    "description-alert-instance-label": "Filtrera varningsinstanser med etikettförfrågan, t.ex.: {severity=\"critical\", instance=~\"cluster-us-.+\"}",
+    "description-alert-name": "Filtrera efter varningar som innehåller denna text",
+    "description-datasource": "Filtrera från varningskälla",
+    "description-folder": "Filtrera efter varningar i den valda mappen (endast för Grafana-hanterade larmregler)",
+    "description-group-by": "Filtrera varningar med etikettförfrågan",
+    "description-group-mode": "Hur larminstanser ska grupperas",
+    "description-max-items": "Maximalt antal larm att visa",
+    "description-show-inactive-alerts": "Inkludera larmregler som har 0 (noll) instanser. Eftersom dessa regler inte har några instanser förblir de dolda om etikettfiltret för varningsinstans har konfigurerats.",
+    "description-sort-order": "Sorteringsordning för larm och larminstanser",
+    "description-view-mode": "Växla mellan listvy och statistikvy",
     "group-by": {
       "aria-label-group-by-label-keys": "gruppera efter etikettnycklar",
       "placeholder-group-by": "Gruppera efter"
     },
     "group-mode-options": {
-      "label-custom-grouping": "",
-      "label-default-grouping": ""
+      "label-custom-grouping": "Anpassad gruppering",
+      "label-default-grouping": "Standardgruppering"
     },
-    "name-alert-instance-label": "",
-    "name-alert-name": "",
-    "name-alerts-linked-to-dashboard": "",
-    "name-datasource": "",
-    "name-error": "",
-    "name-firing": "",
-    "name-folder": "",
-    "name-group-by": "",
-    "name-group-mode": "",
-    "name-max-items": "",
-    "name-no-data": "",
-    "name-normal": "",
-    "name-pending": "",
-    "name-recovering": "",
-    "name-show-inactive-alerts": "",
-    "name-sort-order": "",
-    "name-view-mode": "",
+    "name-alert-instance-label": "Etikett för varningsinstans",
+    "name-alert-name": "Namn för varning",
+    "name-alerts-linked-to-dashboard": "Varningar kopplade till denna instrumentpanel",
+    "name-datasource": "Datakälla",
+    "name-error": "Fel",
+    "name-firing": "Larmar/utlöser",
+    "name-folder": "Mapp",
+    "name-group-by": "Gruppera efter",
+    "name-group-mode": "Grupp-läge",
+    "name-max-items": "Max objekt",
+    "name-no-data": "Inga data",
+    "name-normal": "Normal",
+    "name-pending": "Väntande",
+    "name-recovering": "Återställer",
+    "name-show-inactive-alerts": "Visa varningar med 0 instanser",
+    "name-sort-order": "Sorteringsordning",
+    "name-view-mode": "Visningsläge",
     "sort-order-options": {
-      "label-alphabetical-asc": "",
-      "label-alphabetical-desc": "",
-      "label-importance": "",
-      "label-time-asc": "",
-      "label-time-desc": ""
+      "label-alphabetical-asc": "Alfabetiskt (stigande)",
+      "label-alphabetical-desc": "Alfabetiskt (fallande)",
+      "label-importance": "Betydelse",
+      "label-time-asc": "Tid (stigande)",
+      "label-time-desc": "Tid (fallande)"
     },
     "ungrouped-mode-view": {
       "active-for": "för <1>{{duration}}</1>",
@@ -3106,8 +3106,8 @@
       "title-permission-required": "Tillstånd krävs"
     },
     "view-mode-options": {
-      "label-list": "",
-      "label-stat": ""
+      "label-list": "Lista",
+      "label-stat": "Stat"
     }
   },
   "annolist": {
@@ -3120,31 +3120,31 @@
     "annotation-list-item": {
       "tooltip-created-by": "Skapad av:<1></1> {{email}}"
     },
-    "category-annotation-query": "",
-    "category-display": "",
-    "category-link-behaviour": "",
-    "description-tags": "",
+    "category-annotation-query": "Kommenteringsfråga",
+    "category-display": "Display",
+    "category-link-behaviour": "Länkbeteende",
+    "description-tags": "Matcha kommentarstaggar",
     "link-target-options": {
-      "label-dashboard": "",
-      "label-panel": ""
+      "label-dashboard": "Instrumentpanel",
+      "label-panel": "Panel"
     },
-    "name-limit": "",
-    "name-link-target": "",
-    "name-query-filter": "",
-    "name-show-tags": "",
-    "name-show-time": "",
-    "name-show-user": "",
-    "name-tags": "",
-    "name-time-after": "",
-    "name-time-before": "",
-    "name-time-range": "",
+    "name-limit": "Gräns",
+    "name-link-target": "Länkmål",
+    "name-query-filter": "Frågefilter",
+    "name-show-tags": "Visa taggar",
+    "name-show-time": "Visa tid",
+    "name-show-user": "Visa användare",
+    "name-tags": "Taggar",
+    "name-time-after": "Tid efter",
+    "name-time-before": "Tid före",
+    "name-time-range": "Tidsintervall",
     "query-filter-options": {
-      "label-all-dashboards": "",
-      "label-this-dashboard": ""
+      "label-all-dashboards": "Alla kontrollpaneler",
+      "label-this-dashboard": "Den här instrumentpanelen"
     },
     "time-range-options": {
-      "label-none": "",
-      "label-this-dashboard": ""
+      "label-none": "Ingen",
+      "label-this-dashboard": "Den här instrumentpanelen"
     }
   },
   "annotations": {
@@ -3152,7 +3152,7 @@
       "annotation": "Kommentar",
       "first-value": "Första värde",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Okända fältnamn"
     },
     "empty-state": {
       "button-title": "Lägg till kommenteringsfråga",
@@ -3162,12 +3162,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "När detta fält definieras kommer kommentaren att behandlas som ett intervall",
+        "results-split-on-comma": "Resultaten delas upp baserat på kommatecken (,)"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}} eller det första textfältet",
+        "time-or-the-first-field": "{{defaultField}} eller det första tidsfältet"
       }
     },
     "standard-annotation-query-editor": {
@@ -3245,9 +3245,9 @@
       "define-allowed-teams-ids-label": "Definiera tillåtna team-ID",
       "display-name-description": "Kommer att visas på inloggningssidan som ”Logga in med …” Användbart om du använder fler än en identitetsleverantör eller SSO-protokoll.",
       "display-name-label": "Visningsnamn",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Parameter som anger användarens domän i Azure AD/Entra ID-klienten och effektiviserar inloggningsprocessen.",
+      "domain-hint-label": "Domäntips",
+      "domain-hint-valid-domain": "Detta fält måste vara en giltig domän.",
       "email-attribute-name-description": "Namn på nyckeln som ska användas för användarens e-postsökning inom attributkartan för OAuth2 ID-token.",
       "email-attribute-name-label": "E-postattributnamn",
       "email-attribute-path-description": "JMESPath-uttryck som ska användas för användarens e-postsökning från användarinformationen.",
@@ -3264,11 +3264,11 @@
       "id-token-attribute-name-label": "ID-tokenattributnamn",
       "login-attribute-path-description": "JMESPath-uttryck som ska användas för användarens inloggningssökning från användar-ID-token.",
       "login-attribute-path-label": "Sökväg för inloggningsattribut",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Samtycke",
+      "login-prompt-description": "Anger typen av användarinteraktion när användaren loggar in med IdP.",
+      "login-prompt-label": "Inloggningsprompt",
+      "login-prompt-login": "Logga in",
+      "login-prompt-select-account": "Välj konto",
       "managed-identity-client-id-description": "Klient-ID för den hanterade identiteten för din OAuth2-apps federerade identitetsuppgift.",
       "managed-identity-client-id-label": "FIC klient-ID för hanterad identitet",
       "name-attribute-path-description": "JMESPath-uttryck som ska användas för användarnamnsökning från användar-ID-token.Det här namnet kommer att användas som användarens visningsnamn.",
@@ -3304,7 +3304,7 @@
       "team-ids-github": "Heltalslista över team-ID:n.",
       "team-ids-label": "Team-ID:n",
       "team-ids-numbers": "Team-ID:n måste vara siffror.",
-      "team-ids-other": "",
+      "team-ids-other": "Stränglista över team-ID:n.",
       "team-ids-placeholder": "Ange team-ID och tryck på returtangenten för att lägga till",
       "teams-url-description": "Webbadressen som används för att fråga efter team-ID:n. Om det inte anges är standardvärdet /teams.",
       "teams-url-description-oauth": "Om du konfigurerar ”{{ teamsURLLabel }}” måste du även konfigurera ”{{ teamIDsAttributePathLabel }}”.",
@@ -3339,8 +3339,8 @@
       }
     },
     "provider-card": {
-      "saml-learn-more": "",
-      "scim-learn-more": "",
+      "saml-learn-more": "Enkel inloggning (SSO) med SAML.",
+      "scim-learn-more": " Synkronisera användare och team med SCIM.",
       "text-badge-enabled": "Aktiverad",
       "text-badge-not-enabled": "Ej aktiverat"
     },
@@ -3348,7 +3348,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Återställ till standardvärden"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Återställ",
       "disable": "Inaktivera",
       "disabling": "Inaktiverar …",
       "discard": "Kassera",
@@ -3368,7 +3368,7 @@
       "text-badge-not-enabled": "Ej aktiverat"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM är under utveckling och bör inte användas i en produktionsmiljö. Använd med försiktighet och räkna med potentiella ändringar."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "Slutpunkten .well-known/openid-configuration för din identitetsleverantör",
@@ -3380,99 +3380,99 @@
   },
   "bar-chart": {
     "warn": {
-      "missing-numeric": "",
-      "missing-series": ""
+      "missing-numeric": "Inga numeriska fält hittades",
+      "missing-series": "Stapeldiagram kräver ett sträng- eller tidsfält"
     }
   },
   "barchart": {
     "config": {
-      "category-thresholds": "",
-      "description-color-by-field": "",
-      "description-x-label-max-length": "",
-      "name-bar-radius": "",
-      "name-bar-width": "",
-      "name-color-by-field": "",
-      "name-fill-opacity": "",
-      "name-full-highlight": "",
-      "name-gradient-mode": "",
-      "name-group-width": "",
-      "name-line-width": "",
-      "name-orientation": "",
-      "name-rotate-x-labels": "",
-      "name-show-thresholds": "",
-      "name-show-values": "",
-      "name-stacking": "",
-      "name-transform": "",
-      "name-x-axis": "",
-      "name-x-label-max-length": "",
-      "name-x-label-min-spacing": "",
+      "category-thresholds": "Trösklar",
+      "description-color-by-field": "Använd färgvärdet för ett syskonfält för att färglägga varje stapelvärde.",
+      "description-x-label-max-length": "X-axelns etiketter kommer att trunkeras till den angivna längden",
+      "name-bar-radius": "Stapelradie",
+      "name-bar-width": "Stapelbredd",
+      "name-color-by-field": "Färg per fält",
+      "name-fill-opacity": "Fyllningsopacitet",
+      "name-full-highlight": "Markera hela området vid hovring",
+      "name-gradient-mode": "Toningsläge",
+      "name-group-width": "Gruppbredd",
+      "name-line-width": "Linjebredd",
+      "name-orientation": "Orientering",
+      "name-rotate-x-labels": "Vrid etiketterna på x-axeln",
+      "name-show-thresholds": "Visa trösklar",
+      "name-show-values": "Visa värden",
+      "name-stacking": "Stapling",
+      "name-transform": "Omvandla",
+      "name-x-axis": "X-axel",
+      "name-x-label-max-length": "Maximal längd på etikett för x-axeln",
+      "name-x-label-min-spacing": "Minsta avstånd för x-axelns etiketter",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-line-vertical": ""
+        "label-auto": "Auto",
+        "label-horizontal": "Horisontellt",
+        "label-line-vertical": "Vertikalt"
       },
-      "placeholder-x-axis": "",
-      "placeholder-x-label-max-length": "",
+      "placeholder-x-axis": "Första sträng- eller tidsfältet",
+      "placeholder-x-label-max-length": "Ingen",
       "show-values-options": {
-        "label-always": "",
-        "label-auto": "",
-        "label-never": ""
+        "label-always": "Alltid",
+        "label-auto": "Auto",
+        "label-never": "Aldrig"
       },
       "transform-options": {
-        "description-constant": "",
-        "description-negative-y": "",
-        "label-constant": "",
-        "label-negative-y": ""
+        "description-constant": "Det första värdet kommer att visas som en fast linje",
+        "description-negative-y": "Vänd resultaten till negativa värden på y-axeln",
+        "label-constant": "Konstant",
+        "label-negative-y": "Negativt Y"
       }
     },
     "tick-spacing-editor": {
       "content-require-space-from-the-right-side": "Kräv utrymme från höger",
       "gaps-options": {
-        "description-large": "",
-        "description-medium": "",
-        "description-none": "",
-        "description-small": "",
-        "label-large": "",
-        "label-medium": "",
-        "label-none": "",
-        "label-small": ""
+        "description-large": "Kräv ett avstånd på {{spacing}}",
+        "description-medium": "Kräv ett avstånd på {{spacing}}",
+        "description-none": "Visa alla skalstreck",
+        "description-small": "Kräv ett avstånd på {{spacing}}",
+        "label-large": "Stor",
+        "label-medium": "Medium",
+        "label-none": "Ingen",
+        "label-small": "Litet"
       },
       "label-rtl": "RTL"
     }
   },
   "bargauge": {
     "bar-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Auto",
+      "label-manual": "Manuell"
     },
-    "category-bar-gauge": "",
-    "description-max-height": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-show-unfilled-area": "",
+    "category-bar-gauge": "Stapelmätare",
+    "description-max-height": "Maximal radhöjd (horisontell orientering)",
+    "description-min-height": "Minsta radhöjd (horisontell orientering)",
+    "description-min-width": "Minsta kolumnbredd (vertikal orientering)",
+    "description-show-unfilled-area": "När det är aktiverat återges det ofyllda området som grått",
     "display-mode-options": {
-      "label-basic": "",
-      "label-gradient": "",
-      "label-retro": ""
+      "label-basic": "Grundläggande",
+      "label-gradient": "Toning",
+      "label-retro": "Retro LCD"
     },
-    "name-bar-size": "",
-    "name-display-mode": "",
-    "name-max-height": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-name-placement": "",
+    "name-bar-size": "Stapelstorlek",
+    "name-display-mode": "Visningsläge:",
+    "name-max-height": "Max. höjd",
+    "name-min-height": "Min. höjd",
+    "name-min-width": "Minsta bredd",
+    "name-name-placement": "Namnplacering",
     "name-placement-options": {
-      "label-auto": "",
-      "label-hidden": "",
-      "label-left": "",
-      "label-top": ""
+      "label-auto": "Auto",
+      "label-hidden": "Dolt",
+      "label-left": "Vänster",
+      "label-top": "Överst"
     },
-    "name-show-unfilled-area": "",
-    "name-value-display": "",
+    "name-show-unfilled-area": "Visa ofyllt område",
+    "name-value-display": "Värdevisning",
     "value-display-options": {
-      "label-hidden": "",
-      "label-text-color": "",
-      "label-value-color": ""
+      "label-hidden": "Dolt",
+      "label-text-color": "Textfärg",
+      "label-value-color": "Värdefärg"
     }
   },
   "bookmarks-page": {
@@ -3486,8 +3486,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Massborttagning av tilldelade resurser",
+      "bulk-move-provisioned-resources": "Massflyttning av tilldelade resurser",
       "cancel-button": "Avbryt",
       "confirmation-text": "Ta bort",
       "delete-button": "Ta bort",
@@ -3496,7 +3496,7 @@
       "delete-modal-restore-dashboards-text": "Denna åtgärd raderar de valda mapparna omedelbart, men de valda instrumentpanelerna markeras för radering om 30 dagar. Din organisationsadministratör kan återställa instrumentpanelerna när som helst innan de 30 dagarna löper ut. Mappar kan inte återställas.",
       "delete-modal-text": "Denna åtgärd raderar följande innehåll:",
       "delete-modal-title": "Ta bort",
-      "delete-provisioned-folder": "",
+      "delete-provisioned-folder": "Ta bort provisionerad mapp",
       "deleting": "Tar bort ...",
       "manage-permissions-button": "Hantera behörigheter",
       "move-button": "Flytta",
@@ -3506,8 +3506,8 @@
       "move-modal-title": "Flytta",
       "moving": "Flyttar ...",
       "new-folder-name-required-phrase": "Mappnamn krävs.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Du har valt både provisionerade och icke-provisionerade resurser. Dessa kan inte hanteras tillsammans. Välj enbart provisionerade eller enbart icke-provisionerade resurser och försök igen.",
+      "selected-mix-resources-modal-title": "Blandade resurstyper valda"
     },
     "actions": {
       "button-to-recently-deleted": "Nyligen raderat"
@@ -3520,25 +3520,25 @@
       "this-folder-is-empty": "Denna mapp är tom"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_other": ""
+      "all-deleted": "Alla resurser har raderats",
+      "all-moved": "Alla resurser flyttades korrekt",
+      "button-done": "Klar",
+      "progress-title": "Lyckades",
+      "failed-alert_one": "{{count}} objekt misslyckades",
+      "failed-alert_other": "{{count}} objekt misslyckades"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "Avbryt",
+      "button-delete": "Radera",
+      "button-deleting": "Tar bort …",
+      "delete-warning": "Detta kommer att radera valda mappar och alla underordnade mappar. Totalt kommer detta att påverka:",
+      "error-path-not-found": "Sökvägen hittades inte"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "Avbryt",
+      "button-move": "Flytta",
+      "button-moving": "Flyttar …",
+      "deleting": "Raderar",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,14 +3546,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Filinnehåll hittades inte",
+      "error-path-not-found": "Sökvägen hittades inte",
+      "error-target-folder-path-missing": "Sökväg till målmappen saknas",
+      "error-title": "Fel i målmappen",
+      "move-warning": "Detta kommer att flytta valda mappar och alla underordnade mappar. Totalt kommer detta att påverka:",
+      "moving": "Flyttar",
+      "progress": "Förlopp: {{current}} av {{total}}",
+      "target-folder": "Målkatalog"
     },
     "counts": {
       "alertRule_one": "{{count}} varningsregel",
@@ -3579,12 +3579,12 @@
       "read-only-message": ""
     },
     "delete-provisioned-folder-form": {
-      "api-error": "",
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "success-message": ""
+      "api-error": "Det gick inte att radera mappen",
+      "button-cancel": "Avbryt",
+      "button-delete": "Ta bort",
+      "button-deleting": "Tar bort ...",
+      "delete-warning": "Detta kommer att radera den här mappen och alla dess underordnade. Totalt kommer detta att påverka:",
+      "success-message": "Mappen har raderats"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Det gick inte att hämta underordnad information"
@@ -3609,7 +3609,7 @@
       "empty-message": "Inga mappar hittades",
       "error-title": "Fel vid laddning av mappar",
       "non-folder-item": "Icke-mapp {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "Kontrollpaneler",
       "search-placeholder": "Sök mappar",
       "unknown-error": "Okänt fel"
     },
@@ -3638,7 +3638,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Ange mappnamn",
       "label-folder-name": "Mappnamn",
       "text-pull-request-created": "En pull-begäran har skapats med ändringar i den här mappen:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "Din mapp kommer att skapas som {{folderName}}",
       "title-pull-request-created": "Pull-begäran skapad",
       "title-this-repository-is-read-only": "Den här databasen är skrivskyddad"
     },
@@ -3647,52 +3647,52 @@
       "text": "Inga resultat hittades för din fråga"
     },
     "restore": {
-      "success": ""
+      "success": "Instrumentpanelen {{name}} har återställts"
     },
     "text-this-repository-is-read-only": "Om du har direkt åtkomst till målet kopierar du JSON och klistrar in den där.",
     "trash-state-manager": {
       "label": {
-        "alphabetically-az": "",
-        "alphabetically-za": ""
+        "alphabetically-az": "Alfabetiskt (A–Ö)",
+        "alphabetically-za": "Alfabetiskt (Ö–A)"
       }
     }
   },
   "candlestick": {
     "additional-fields-options": {
-      "label-ignore": "",
-      "label-include": ""
+      "label-ignore": "Ignorera",
+      "label-include": "Inkludera"
     },
     "candle-style-options": {
-      "label-candles": "",
-      "label-ohlc-bars": ""
+      "label-candles": "Ljus",
+      "label-ohlc-bars": "OHLC-staplar"
     },
-    "category-candlestick": "",
+    "category-candlestick": "Ljusstake",
     "color-strategy-options": {
-      "label-since-open": "",
-      "label-since-prior-close": ""
+      "label-since-open": "Sedan öppnad",
+      "label-since-prior-close": "Sedan tidigare stängning"
     },
-    "description-additional-fields": "",
-    "description-close": "",
-    "description-high": "",
-    "description-low": "",
-    "description-open": "",
-    "description-volume": "",
+    "description-additional-fields": "Använd standardalternativ för tidsserier för att konfigurera alla fält som inte är mappade ovan",
+    "description-close": "Värde vid periodens slut",
+    "description-high": "Maximalt värde inom perioden",
+    "description-low": "Minsta värde inom perioden",
+    "description-open": "Värde vid periodens början",
+    "description-volume": "Provantal inom perioden",
     "mode-options": {
-      "label-both": "",
-      "label-candles": "",
-      "label-volume": ""
+      "label-both": "Båda",
+      "label-candles": "Ljus",
+      "label-volume": "Volym"
     },
-    "name-additional-fields": "",
-    "name-candle-style": "",
-    "name-close": "",
-    "name-color-strategy": "",
-    "name-down-color": "",
-    "name-high": "",
-    "name-low": "",
-    "name-mode": "",
-    "name-open": "",
-    "name-up-color": "",
-    "name-volume": ""
+    "name-additional-fields": "Ytterligare fält",
+    "name-candle-style": "Ljusstil",
+    "name-close": "Stäng",
+    "name-color-strategy": "Färgstrategi",
+    "name-down-color": "Nedåt färg",
+    "name-high": "Hög",
+    "name-low": "Låg",
+    "name-mode": "Läge",
+    "name-open": "Öppna",
+    "name-up-color": "Uppåt färg",
+    "name-volume": "Volym"
   },
   "canvas": {
     "apieditor": {
@@ -3707,18 +3707,18 @@
       }
     },
     "button-item": {
-      "category-button": "",
+      "category-button": "Knapp",
       "label": {
         "center": "Centrera",
         "left": "Vänster",
         "right": "Höger"
       },
-      "name-align-text": "",
-      "name-api": "",
-      "name-style": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
+      "name-align-text": "Justera text",
+      "name-api": "API",
+      "name-style": "Stil",
+      "name-text": "Text",
+      "name-text-color": "Textfärg",
+      "name-text-size": "Textstorlek",
       "placeholder": {
         "auto": "Auto"
       }
@@ -3745,21 +3745,21 @@
         }
       }
     },
-    "category-arrow-direction": "",
-    "category-background": "",
-    "category-border": "",
-    "category-canvas": "",
-    "category-color": "",
-    "category-data-links": "",
-    "category-line-style": "",
-    "category-metric-value": "",
-    "category-radius": "",
-    "category-selected-connection": "",
-    "category-selected-element": "",
-    "category-size": "",
-    "category-tooltip": "",
+    "category-arrow-direction": "Pilriktning",
+    "category-background": "Bakgrund",
+    "category-border": "Ram",
+    "category-canvas": "Rityta",
+    "category-color": "Färg",
+    "category-data-links": "Datalänkar och åtgärder",
+    "category-line-style": "Linjestil",
+    "category-metric-value": "Mätvärde",
+    "category-radius": "Radie",
+    "category-selected-connection": "Vald anslutning",
+    "category-selected-element": "Valt element ({{element}})",
+    "category-size": "Storlek",
+    "category-tooltip": "Verktygstips",
     "cloud-item": {
-      "category-cloud": "",
+      "category-cloud": "Moln",
       "label": {
         "bottom": "Underst",
         "center": "Centrera",
@@ -3768,47 +3768,47 @@
         "right": "Höger",
         "top": "Överst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Justera text",
+      "name-text": "Text",
+      "name-text-color": "Textfärg",
+      "name-text-size": "Textstorlek",
+      "name-vertical-align": "Vertikal justering",
       "placeholder": {
         "auto": "Auto"
       }
     },
-    "description-experimental-types": "",
-    "description-inline-editing": "",
-    "description-pan-zoom": "",
+    "description-experimental-types": "Aktivera val av experimentella elementtyper",
+    "description-inline-editing": "Aktivera direkt redigering av panelen",
+    "description-pan-zoom": "Aktivera panorering och zoom",
     "direction-options": {
-      "label-both": "",
-      "label-forward": "",
-      "label-none": "",
-      "label-reverse": ""
+      "label-both": "Båda",
+      "label-forward": "Framåt",
+      "label-none": "Ingen",
+      "label-reverse": "Omvänt"
     },
     "drone-front-item": {
-      "category-drone-front": "",
-      "name-roll-angle": ""
+      "category-drone-front": "Drönare (front)",
+      "name-roll-angle": "Rullvinkel"
     },
     "drone-side-item": {
-      "category-drone-side": "",
-      "name-pitch-angle": ""
+      "category-drone-side": "Drönare (sida)",
+      "name-pitch-angle": "Anfallsvinkel"
     },
     "drone-top-item": {
-      "category-drone-top": "",
-      "name-back-left-rotor-rpm": "",
-      "name-back-right-rotor-rpm": "",
-      "name-front-left-rotor-rpm": "",
-      "name-front-right-rotor-rpm": "",
-      "name-yaw-angle": ""
+      "category-drone-top": "Drönare (topp)",
+      "name-back-left-rotor-rpm": "Bakre vänstra rotorns varvtal",
+      "name-back-right-rotor-rpm": "Bakre högra rotorns varvtal",
+      "name-front-left-rotor-rpm": "Främre vänstra rotorns varvtal",
+      "name-front-right-rotor-rpm": "Främre högra rotorns varvtal",
+      "name-yaw-angle": "Girvinkel"
     },
     "element-editor": {
-      "category-layout": "",
-      "description-unsupported": "",
-      "name-quick-placement": ""
+      "category-layout": "Layout",
+      "description-unsupported": "Vald elementtyp stöds inte av de aktuella inställningarna. Aktivera avancerade elementtyper.",
+      "name-quick-placement": "Snabb placering"
     },
     "ellipse-item": {
-      "category-ellipse": "",
+      "category-ellipse": "Ellips",
       "label": {
         "bottom": "Underst",
         "center": "Centrera",
@@ -3817,50 +3817,50 @@
         "right": "Höger",
         "top": "Överst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Justera text",
+      "name-text": "Text",
+      "name-text-color": "Textfärg",
+      "name-text-size": "Textstorlek",
+      "name-vertical-align": "Vertikal justering",
       "placeholder": {
         "auto": "Auto"
       }
     },
     "icon-item": {
-      "category-icon": "",
-      "name-fill-color": "",
-      "name-svg-path": ""
+      "category-icon": "Ikon",
+      "name-fill-color": "Fyllningsfärg",
+      "name-svg-path": "SVG-sökväg"
     },
     "inline-edit": {
       "canvas-inline-editor": "Canvas Inline-redigerare",
       "tooltip-close-inline-editor": "Stäng inline-redigeraren"
     },
     "inline-edit-body": {
-      "category-selected-element": "",
+      "category-selected-element": "Valt element ({{element}})",
       "label-add-item": "Lägg till post",
       "please-select-an-element": "Välj ett element"
     },
-    "label-actions": "",
-    "label-color": "",
-    "label-direction": "",
-    "label-image": "",
-    "label-image-size": "",
-    "label-line-style": "",
-    "label-links": "",
-    "label-radius": "",
-    "label-size": "",
-    "label-width": "",
+    "label-actions": "Åtgärder",
+    "label-color": "Färg",
+    "label-direction": "Vägbeskrivning",
+    "label-image": "Image",
+    "label-image-size": "Bildstorlek",
+    "label-line-style": "Linjestil",
+    "label-links": "Länkar",
+    "label-radius": "Radie",
+    "label-size": "Storlek",
+    "label-width": "Bredd",
     "layer-editor": {
-      "category-layer": "",
-      "category-layout": "",
-      "name-constraints": "",
-      "name-elements": ""
+      "category-layer": "Lager",
+      "category-layout": "Layout",
+      "name-constraints": "Begränsningar",
+      "name-elements": "Element"
     },
     "line-style-editor": {
       "label-animate": "Animera"
     },
     "line-style-options": {
-      "label-solid": ""
+      "label-solid": "Solid"
     },
     "metric-value-item": {
       "label": {
@@ -3875,14 +3875,14 @@
         "auto": "Auto"
       }
     },
-    "name-align-text": "",
-    "name-color": "",
-    "name-experimental-types": "",
-    "name-inline-editing": "",
-    "name-pan-zoom": "",
-    "name-text": "",
-    "name-text-size": "",
-    "name-vertical-align": "",
+    "name-align-text": "Justera text",
+    "name-color": "Textfärg",
+    "name-experimental-types": "Typer av experimentella element",
+    "name-inline-editing": "Redigerar inline",
+    "name-pan-zoom": "Panorering och zoomning",
+    "name-text": "Text",
+    "name-text-size": "Textstorlek",
+    "name-vertical-align": "Vertikal justering",
     "not-found-display": {
       "not-found": "<0>Hittades inte: </0><config />"
     },
@@ -3895,7 +3895,7 @@
       "zoom-scroll-wheel": "Zoom: skrollhjul"
     },
     "parallelogram-item": {
-      "category-parallelogram": "",
+      "category-parallelogram": "Parallellogram",
       "label": {
         "bottom": "Underst",
         "center": "Centrera",
@@ -3904,11 +3904,11 @@
         "right": "Höger",
         "top": "Överst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Justera text",
+      "name-text": "Text",
+      "name-text-color": "Textfärg",
+      "name-text-size": "Textstorlek",
+      "name-vertical-align": "Vertikal justering",
       "placeholder": {
         "auto": "Auto"
       }
@@ -3921,21 +3921,21 @@
     },
     "placement-editor": {
       "horizontal-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-left-and-right": "",
-        "label-right": "",
-        "label-scale": ""
+        "label-center": "Centrera",
+        "label-left": "Vänster",
+        "label-left-and-right": "Vänster och höger",
+        "label-right": "Höger",
+        "label-scale": "Skala"
       },
       "label-constraints": "Begränsningar",
       "label-position": "Position",
       "loading": "Laddar …",
       "vertical-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-scale": "",
-        "label-top": "",
-        "label-top-and-bottom": ""
+        "label-bottom": "Underst",
+        "label-center": "Centrera",
+        "label-scale": "Skala",
+        "label-top": "Överst",
+        "label-top-and-bottom": "Överst och nederst"
       }
     },
     "quick-positioning": {
@@ -3947,7 +3947,7 @@
       "tooltip-align-vertical-centers": "Justera centrerat vertikalt"
     },
     "rectangle-item": {
-      "category-rectangle": "",
+      "category-rectangle": "Rektangel",
       "label": {
         "bottom": "Underst",
         "center": "Centrera",
@@ -3956,33 +3956,33 @@
         "right": "Höger",
         "top": "Överst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Justera text",
+      "name-text": "Text",
+      "name-text-color": "Textfärg",
+      "name-text-size": "Textstorlek",
+      "name-vertical-align": "Vertikal justering",
       "placeholder": {
         "auto": "Auto"
       }
     },
     "server-item": {
-      "category-server": "",
-      "name-blink-rate": "",
-      "name-bulb-color": "",
-      "name-status-color": "",
-      "name-type": "",
+      "category-server": "Server",
+      "name-blink-rate": "Blinkfrekvens [Hz] (0 = av)",
+      "name-bulb-color": "Lampfärg",
+      "name-status-color": "Statusfärg",
+      "name-type": "Typ",
       "type-options": {
-        "label-database": "",
-        "label-single": "",
-        "label-stack": "",
-        "label-terminal": ""
+        "label-database": "Databas",
+        "label-single": "Singel",
+        "label-stack": "Stack",
+        "label-terminal": "Plint"
       }
     },
     "text-display": {
       "double-click-to-set": "Dubbelklicka för att ställa in text"
     },
     "text-item": {
-      "category-text": "",
+      "category-text": "Text",
       "label": {
         "bottom": "Underst",
         "center": "Centrera",
@@ -3991,20 +3991,20 @@
         "right": "Höger",
         "top": "Överst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Justera text",
+      "name-text": "Text",
+      "name-text-color": "Textfärg",
+      "name-text-size": "Textstorlek",
+      "name-vertical-align": "Vertikal justering",
       "placeholder": {
         "auto": "Auto"
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Verktygstipsläge",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Inaktiverad",
+        "label-enabled": "Aktiverad"
       }
     },
     "tree-navigation-editor": {
@@ -4024,7 +4024,7 @@
       "tooltip-remove": "Ta bort"
     },
     "triangle-item": {
-      "category-triangle": "",
+      "category-triangle": "Triangel",
       "label": {
         "bottom": "Underst",
         "center": "Centrera",
@@ -4033,18 +4033,18 @@
         "right": "Höger",
         "top": "Överst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Justera text",
+      "name-text": "Text",
+      "name-text-color": "Textfärg",
+      "name-text-size": "Textstorlek",
+      "name-vertical-align": "Vertikal justering",
       "placeholder": {
         "auto": "Auto"
       }
     },
     "wind-turbine-item": {
-      "category-wind-turbine": "",
-      "name-rpm": ""
+      "category-wind-turbine": "Vindkraftverk",
+      "name-rpm": "RPM"
     }
   },
   "carousel": {
@@ -4061,8 +4061,8 @@
   "close-button": {
     "tooltip": "Stäng"
   },
-  "cloud-enterprise-feature-badge": "",
-  "cloud-feature-badge": "",
+  "cloud-enterprise-feature-badge": "Cloud och Enterprise",
+  "cloud-feature-badge": "Moln",
   "combobox": {
     "async": {
       "error": "Ett fel uppstod vid inläsning av alternativ."
@@ -4373,7 +4373,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Kör fråga"
     }
   },
   "dashboard": {
@@ -4536,7 +4536,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "Fortsätt"
         },
         "title": {
           "proceed-to-external-site": "Fortsätt till extern webbplats?"
@@ -4633,7 +4633,7 @@
       }
     },
     "description": {
-      "action": ""
+      "action": "Ändra instrumentpanelbeskrivning"
     },
     "dynamic-config-value-editor": {
       "render-label": {
@@ -4642,17 +4642,17 @@
     },
     "edit-actions": {
       "add": "Lägg till {{typeName}}",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
-      "move": "",
+      "add-conditional-rule": "Lägg till regeln {{ruleDescription}}",
+      "duplicate-panel": "Duplicera panel",
+      "edit-query-result-rule": "Ändra regel för frågeresultat",
+      "edit-template-variable-rule": "Ändra regel för mallvariabel",
+      "edit-time-range-rule": "Ändra regel för tidsintervall",
+      "move": "Flytta {{typeName}}",
       "panel-background": "Ändra panelbakgrund",
       "panel-description": "Ändra panelbeskrivning",
-      "panel-max-repeats-per-row": "",
+      "panel-max-repeats-per-row": "Max upprepningar per rad",
       "panel-repeat-direction": "Upprepa riktning",
-      "panel-repeat-variable": "",
+      "panel-repeat-variable": "Panelupprepning efter",
       "panel-title": "Ändra paneltitel",
       "paste-panel": "Klistra in panel",
       "remove": "Ta bort {{typeName}}",
@@ -4661,7 +4661,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Instrumentpanel",
-        "element": "",
+        "element": "Element",
         "local-variable": "Lokal variabel",
         "multiple-elements": "Flera element",
         "multiple-elements-delete-text": "Är du säker på att du vill radera dessa element?",
@@ -4743,10 +4743,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Exportera kontrollpanelen"
       },
       "menu": {
-        "label": ""
+        "label": "Menyn Exportera kontrollpanel"
       }
     },
     "fetch-dashboard": {
@@ -4768,9 +4768,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Standard",
+          "shared-crosshair": "Delat hårkors",
+          "shared-tooltip": "Delat verktygstips"
         }
       }
     },
@@ -4787,7 +4787,7 @@
     "get-field-override-categories": {
       "label-add-field-override": "Lägg till åsidosättning av fält",
       "label-add-override-property": "Lägg till egenskap för åsidosättning",
-      "override-name": "",
+      "override-name": "Åsidosätt {{overrideNum}}",
       "title": {
         "add-button": "lägg till knapp"
       }
@@ -4823,14 +4823,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Skicka inte kommentarer till följande paneler",
+        "annotation-panels-support-annotations": "Skicka kommentarsdata till alla paneler som stöder kommentarer",
+        "annotations-explicitly-listed-panels": "Skicka kommentarerna till de uttryckligen angivna panelerna"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Alla paneler",
+        "all-panels-except": "Alla paneler förutom",
+        "selected-panels": "Valda paneler"
       }
     },
     "get-panel-frame-category": {
@@ -5016,7 +5016,7 @@
       "title-matched_other": "Matchade {{count}}/{{totalCount}} alternativ"
     },
     "outline": {
-      "repeated-item": "",
+      "repeated-item": "Upprepa",
       "tree-item": {
         "empty": "(tomt)",
         "no-title": "<no title>"
@@ -5092,7 +5092,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Är du säker på att du vill återställa instrumentpanelen till version {{version}}? Alla ändringar som inte sparats kommer att gå förlorade.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Ja, återställ till version {{version}}",
       "title-restore-version": "Återställ versionen"
     },
     "row-options-button": {
@@ -5144,7 +5144,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Kontrollpanelen sparades"
     },
     "save-dashboard-as-button": {
       "save-as": "Spara som"
@@ -5174,13 +5174,13 @@
       "label-changes": "Ändringar",
       "label-details": "Detaljer",
       "title": "Spara instrumentpanel",
-      "title-copy": "",
-      "title-provisioned": ""
+      "title-copy": "Spara kopia av instrumentpanel",
+      "title-provisioned": "Tilldelad instrumentpanel"
     },
     "save-dashboard-error-proxy": {
       "body-name-exists": "En instrumentpanel med samma namn finns redan i den valda mappen. <1></1><2>Vill du fortfarande spara denna instrumentpanel?</2>",
       "body-version-mismatch": "Någon annan har uppdaterat denna instrumentpanel<1></1><2>Vill du fortfarande spara denna instrumentpanel?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Spara och skriv över",
       "title-name-exists": "Konflikt",
       "title-version-mismatch": "Konflikt"
     },
@@ -5253,7 +5253,7 @@
       }
     },
     "title": {
-      "action": ""
+      "action": "Ändra instrumentpaneltitel"
     },
     "toolbar": {
       "add": "Lägg till",
@@ -5377,9 +5377,9 @@
       "label-apply-transformation-to": "Tillämpa transformering på"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Observera att om du tar bort en transformering kan det påverka andra. Om endast en transformering finns, återgår du till huvudskärmen för val.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Radera",
         "title-debug": "Felsök",
         "title-disable-transformation": "Inaktivera transformering",
         "title-filter": "Filtrera",
@@ -5400,16 +5400,16 @@
       "placeholder-search-for-transformation": "Sök efter transformering",
       "show-images": "Visa bilder",
       "title-add-another-transformation": "Lägg till ytterligare en transformering",
-      "view-all": ""
+      "view-all": "Visa alla"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Om du tar bort alla transformationer kommer du att återgå till huvudvalsskärmen."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Lägg till ytterligare en transformering"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Radera alla",
       "delete-all-transformations": "Radera alla transformeringar",
       "title-delete-all-transformations": "Radera alla transformeringar?",
       "tooltip-clear-search": "Rensa sökningen",
@@ -5439,16 +5439,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Ändra variabelbeskrivning"
       },
       "hide": {
-        "action": ""
+        "action": "Ändra alternativ för att dölja variabel"
       },
       "label": {
-        "action": ""
+        "action": "Ändra variabeletikett"
       },
       "name": {
-        "action": ""
+        "action": "Ändra variabelnamn"
       }
     },
     "version-history-comparison": {
@@ -5460,7 +5460,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Växla val av version {{version}}",
       "date": "Datum",
-      "name-latest": "",
+      "name-latest": "Senaste",
       "notes": "Anteckningar",
       "restore": "Återställ",
       "updated-by": "Uppdaterad av",
@@ -5538,7 +5538,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Tillhandahåll dimensioner som CSV: {{name}}, {{value}}",
       "label-data-source": "Datakälla",
       "label-use-static-key-dimensions": "Använd dimensioner för statiska nycklar",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Tillåt anpassade värden"
     },
     "add-to-dashboard": {
       "message": {
@@ -5612,7 +5612,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Återkalla offentlig webbadress"
       },
       "title": {
         "revoke-public-url": "Återkalla offentlig webbadress"
@@ -5625,7 +5625,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Anpassade alternativ",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Värden åtskilda med kommatecken",
       "selection-options": "Urvalsalternativ"
     },
     "dashboard-edit-pane-renderer": {
@@ -5646,8 +5646,8 @@
       "label-with-tags": "Med taggar",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Kontrollpaneler",
+          "link": "Länk"
         }
       },
       "placeholder-open-dashboard": "Öppna instrumentpanel"
@@ -5690,8 +5690,8 @@
       "data-source-options": "Alternativ för datakälla",
       "description-instance-name-filter": "Regex-filter för vilka datakällsinstanser att välja mellan i variabelvärdelistan. Lämna tomt för alla.",
       "example-instance-name-filter": "Exempel: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Instansnamnfilter",
+      "name-type": "Typ",
       "selection-options": "Urvalsalternativ"
     },
     "default-grid-layout-manager": {
@@ -5702,12 +5702,12 @@
       }
     },
     "delete-provisioned-dashboard-form": {
-      "api-error": "",
+      "api-error": "Det gick inte att radera instrumentpanelen",
       "cancel-action": "Avbryt",
       "delete-action": "Ta bort instrumentpanel",
       "deleting": "Tar bort ...",
-      "drawer-title": "",
-      "success-message": ""
+      "drawer-title": "Ta bort den tillhandahållna instrumentpanelen",
+      "success-message": "Kontrollpanelen har raderats"
     },
     "description-label": {
       "description": "Beskrivning"
@@ -5736,15 +5736,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Redigerbar",
+          "readonly": "Skrivskyddad"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Standard",
+          "shared-crosshair": "Delat hårkors",
+          "shared-tooltip": "Delat verktygstips"
         }
       }
     },
@@ -5756,36 +5756,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Lägg till nyckel-/värdefilter i farten",
+        "dynamically-switch-source-multiple-panels": "Byt datakälla dynamiskt för flera paneler",
+        "group": "Lägg till nycklar att gruppera efter i farten",
+        "hidden-constant-variable": "En dold konstant variabel, användbar för metriska prefix i kontrollpaneler som du vill dela",
+        "users-enter-arbitrary-strings-textbox": "Användare kan ange valfria strängar i en textruta",
+        "values-are-static-and-defined-manually": "Värdena är statiska och definieras manuellt",
+        "values-fetched-source-query": "Värden hämtas från en datakällfråga",
+        "values-timespans": "Värdena är tidsintervall, t.ex. 1 m, 1 h, 1 d"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Ad hoc-filter",
+        "constant": "Konstant",
+        "custom": "Anpassad",
+        "data-source": "Datakälla",
+        "group-by": "Gruppera efter",
+        "interval": "Intervall",
+        "query": "Fråga",
+        "textbox": "Textfält"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Skicka inte kommentarer till följande paneler",
+        "annotation-panels-support-annotations": "Skicka kommentarsdata till alla paneler som stöder kommentarer",
+        "annotations-explicitly-listed-panels": "Skicka kommentarerna till de uttryckligen angivna panelerna"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Alla paneler",
+        "all-panels-except": "Alla paneler förutom",
+        "selected-panels": "Valda paneler"
       }
     },
     "get-panel-frame-options": {
@@ -5813,7 +5813,7 @@
       "group-by-options": "Gruppera efter alternativ",
       "label-data-source": "Datakälla",
       "label-use-static-group-by-dimensions": "Använd statiska gruppdimensioner",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Tillåt anpassade värden"
     },
     "help-wizard": {
       "copy-to-clipboard": "Kopiera till urklippet",
@@ -5849,14 +5849,14 @@
       "apply": "Tillämpa"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Beräknar intervallet dynamiskt genom att dividera tidsintervallet med det angivna antalet",
       "description-calculated-value-below-threshold": "Det beräknade värdet kommer inte att vara under denna tröskel",
       "description-step-count": "Hur många gånger det aktuella tidsintervallet ska delas för att beräkna värdet",
       "interval-options": "Intervallalternativ",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Automatiskt alternativ",
+      "name-min-interval": "Min intervall",
+      "name-step-count": "Stegantal",
+      "name-values": "Värden"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5877,19 +5877,19 @@
       "usage-count_other": "Används på {{count}} instrumentpaneler"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Fel när kontrollpanel skulle flyttas",
+      "api-error": "Det gick inte att flytta kontrollpanelen",
+      "cancel-action": "Avbryt",
+      "current-file-not-found": "Den aktuella kontrollpanelfilen kunde inte hittas",
+      "drawer-title": "Flytta tilldelad kontrollpanel",
+      "file-load-error": "Fel vid laddning av kontrollpanel",
+      "loading-file-data": "Laddar kontrollpanel",
+      "move-action": "Flytta kontrollpanel",
+      "move-read-only-message": "Den här kontrollpanelen kan inte flyttas direkt från Grafana eftersom arkivet är skrivskyddat. Om du vill flytta den ska du flytta filen i Git-arkivet istället.",
+      "moving": "Flyttar …",
+      "success-message": "Kontrollpanelen har flyttats",
+      "target-path-label": "Målsökväg",
+      "title-this-repository-is-read-only": "Den här databasen är skrivskyddad"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "En instrumentpanel med samma namn finns redan i den valda mappen. Vill du fortfarande spara denna instrumentpanel?",
@@ -5897,7 +5897,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "Fortsätt"
       },
       "title": {
         "proceed-to-external-site": "Fortsätt till extern webbplats?"
@@ -5912,7 +5912,7 @@
       }
     },
     "panel-data-alerting-tab": {
-      "tab-label": ""
+      "tab-label": "Varning"
     },
     "panel-data-alerting-tab-rendered": {
       "alert": {
@@ -5923,19 +5923,19 @@
       "title-dashboard-not-saved": "Instrumentpanelen sparades inte"
     },
     "panel-data-queries-tab": {
-      "tab-label": ""
+      "tab-label": "Frågor"
     },
     "panel-data-queries-tab-rendered": {
       "add-query": "Lägg till fråga",
       "expression": "Uttryck "
     },
     "panel-data-transformations-tab": {
-      "tab-label": ""
+      "tab-label": "Omvandlingar"
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Lägg till ytterligare en transformering",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Om du tar bort alla transformationer kommer du att återgå till huvudvalsskärmen.",
+      "confirmText-delete-all": "Radera alla",
       "delete-all-transformations": "Radera alla transformeringar",
       "title-delete-all-transformations": "Radera alla transformeringar?"
     },
@@ -5988,13 +5988,13 @@
       "description-examples": "Namngivna fångstgrupper kan användas för att separera visningstexten och värdet (<1>se exempel</1>).",
       "description-optional": "Valfritt, om du vill extrahera en del av ett serienamn eller metriskt nodsegment.",
       "label-data-source": "Datakälla",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Sortering av statiska alternativ",
       "label-target-data-source": "Måldatakälla",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Använd statiska alternativ",
+      "name-regex": "Regex",
       "query-options": "Frågealternativ",
       "selection-options": "Urvalsalternativ",
-      "static-options-legend": ""
+      "static-options-legend": "Statiska alternativ"
     },
     "resource-export": {
       "label": {
@@ -6007,7 +6007,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Är du säker på att du vill återställa instrumentpanelen till version {{version}}? Alla ändringar som inte sparats kommer att gå förlorade.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Ja, återställ till version {{version}}",
       "title-restore-version": "Återställ versionen"
     },
     "save-button": {
@@ -6026,15 +6026,15 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Det gick inte att spara instrumentpanel"
       },
-      "required": ""
+      "required": "Krävs"
     },
     "save-dashboard-drawer": {
       "tabs": {
         "label-changes": "Ändringar",
         "label-details": "Detaljer",
         "title": "Spara instrumentpanel",
-        "title-copy": "",
-        "title-provisioned": ""
+        "title-copy": "Spara kopia av instrumentpanel",
+        "title-provisioned": "Tilldelad instrumentpanel"
       }
     },
     "save-dashboard-form": {
@@ -6053,8 +6053,8 @@
         "title-someone-else-has-updated-this-dashboard": "Någon annan har uppdaterat denna instrumentpanel",
         "would-still-dashboard": "Vill du fortfarande spara denna instrumentpanel?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "På grund av begränsningar i det nya kontrollpanelschemat (V2) kommer bibliotekspaneler att konverteras till vanliga paneler med inbäddat innehåll under extern export.",
+      "schema-v2-library-panels-export-title": "Bibliotekspaneler kommer att konverteras till vanliga paneler",
       "title-dashboard-drastically-changed": "Instrumentpanelen har ändrats oåterkalleligt"
     },
     "save-dashboard-form-common-options": {
@@ -6101,10 +6101,10 @@
       "description-enables-multiple-values-selected": "Gör det möjligt att välja flera värden samtidigt",
       "description-enables-option-include-variables": "Aktiverar ett alternativ för att inkludera alla värden",
       "description-enables-users-custom-values": "Gör det möjligt för användare att lägga till anpassade värden i listan",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Tillåt anpassade värden",
+      "name-custom-all-value": "Anpassa allt värde",
+      "name-include-all-option": "Alternativet Inkludera alla",
+      "name-multi-value": "Multivärde"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Växla delningsmenyn"
@@ -6125,7 +6125,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Standardvärde"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(valfritt)",
@@ -6150,8 +6150,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Om du tar bort kopplingen till den här panelen kan du redigera den utan att påverka några andra kontrollpaneler. Men när du gör en ändring kommer den sedan inte att kunna återföras till dess återanvändbara panel.",
+      "confirmText-yes-unlink": "Ja, ta bort kopplingen",
       "title-really-unlink-panel": "Vill du verkligen avlänka den här panelen?"
     },
     "unsaved-changes-modal": {
@@ -6169,7 +6169,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Kontrollpanelen sparades"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Den här variabeln refereras inte av någon variabel eller instrumentpanel.",
@@ -6181,15 +6181,15 @@
       "aria-label-variable-editor-form": "Formulär för variabelsredigering",
       "back-to-list": "Tillbaka till listan",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Radera variabel"
       },
       "delete": "Ta bort",
       "description-optional-display-name": "Valfritt visningsnamn",
       "description-template-variable-characters": "Namnet på mallvariabeln. (Högst 50 tecken)",
       "general": "Allmänt",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Beskrivning",
+      "name-label": "Etikett",
+      "name-name": "Namn",
       "placeholder-descriptive-text": "Beskrivande text",
       "placeholder-label-name": "Etikettnamn",
       "placeholder-variable-name": "Variabelnamn",
@@ -6204,8 +6204,8 @@
       "variable": "Variabel"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Är du säker på att du vill radera: {{variable}}?",
+      "confirmText-delete-variable": "Radera variabel",
       "title-delete-variable": "Radera variabel",
       "tooltip-duplicate-variable": "Dubblettvariabel",
       "tooltip-remove-variable": "Ta bort variabel"
@@ -6213,15 +6213,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Etikett",
+          "nothing": "Ingenting",
+          "variable": "Variabel"
         }
       },
       "label": "Dölj"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Variabeltyp"
     },
     "variable-usages-button": {
       "title-show-usages": "Visar användningar för: {{variableId}}",
@@ -6249,7 +6249,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Växla val av version {{version}}",
       "date": "Datum",
-      "name-latest": "",
+      "name-latest": "Senaste",
       "notes": "Anteckningar",
       "restore": "Återställ",
       "updated-by": "Uppdaterad av",
@@ -6356,18 +6356,18 @@
     }
   },
   "dashlist": {
-    "category-dashboard-list": "",
-    "name-folder": "",
-    "name-include-current-template-variables": "",
-    "name-include-current-time-range": "",
-    "name-max-items": "",
-    "name-query": "",
-    "name-recently-viewed": "",
-    "name-search": "",
-    "name-show-folder-names": "",
-    "name-show-headings": "",
-    "name-starred": "",
-    "name-tags": ""
+    "category-dashboard-list": "Lista över instrumentpaneler",
+    "name-folder": "Mapp",
+    "name-include-current-template-variables": "Inkludera aktuella mallvariabelvärden",
+    "name-include-current-time-range": "Inkludera aktuellt tidsintervall",
+    "name-max-items": "Max objekt",
+    "name-query": "Fråga",
+    "name-recently-viewed": "Senast sedda",
+    "name-search": "Sök",
+    "name-show-folder-names": "Visa mappnamn",
+    "name-show-headings": "Visa rubriker",
+    "name-starred": "Stjärnmärkt",
+    "name-tags": "Taggar"
   },
   "data-source-list": {
     "empty-state": {
@@ -6631,16 +6631,16 @@
   "dimensions": {
     "background-size-editor": {
       "options": {
-        "label-contain": "",
-        "label-cover": "",
-        "label-fill": "",
-        "label-original": "",
-        "label-tile": ""
+        "label-contain": "Innehåller",
+        "label-cover": "Täcke",
+        "label-fill": "Fyll",
+        "label-original": "Original",
+        "label-tile": "Bricka"
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": "",
-      "noOptionsMessage-no-fields-found": ""
+      "label-fixed-color": "Fast färg",
+      "noOptionsMessage-no-fields-found": "Inga fält hittades"
     },
     "file-dropzone-custom-children": {
       "upload": "Ladda upp"
@@ -6654,10 +6654,10 @@
       "placeholder-search": "Sök"
     },
     "resource-dimension-editor": {
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Använd resultat från strängfält",
+      "description-fixed": "Fast värde",
       "label-field": "Fält",
-      "label-fixed": "",
+      "label-fixed": "Fast",
       "label-mappings": "Mappningar",
       "label-source": "Källa"
     },
@@ -6675,35 +6675,35 @@
     },
     "scalar-dimension-editor": {
       "fixed-value-options": {
-        "label-fixed-values": ""
+        "label-fixed-values": "Fast värde"
       },
       "label-limit": "Gräns",
       "label-value": "Värde",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Inga fält hittades",
       "scalar-options": {
-        "description-clamped": "",
-        "description-mod": "",
-        "label-clamped": "",
-        "label-mod": ""
+        "description-clamped": "Använd fältvärden, klämda till max och min",
+        "description-mod": "Använd fältvärden, mod från max",
+        "label-clamped": "Fastklämd",
+        "label-mod": "Mod"
       }
     },
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Fast värde"
         }
       },
       "label-max": "Max",
       "label-min": "Min",
       "label-value": "Värde",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Inga fält hittades"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Visa fältvärde",
+      "description-fixed": "Fast värde",
       "label-field": "Fält",
-      "label-fixed": "",
+      "label-fixed": "Fast",
       "label-source": "Källa",
       "label-template": "Mall",
       "label-value": "Värde"
@@ -6717,16 +6717,16 @@
       "description-percentage-means-thresholds-relative": "Procentandel avser tröskelvärden i förhållande till min och max",
       "modes": {
         "description": {
-          "threshold-based-percent-between-minmax": "",
-          "thresholds-based-absolute-values": ""
+          "threshold-based-percent-between-minmax": "Välj tröskel baserat på procenten mellan min/max",
+          "thresholds-based-absolute-values": "Välj trösklar baserat på de absoluta värdena"
         },
         "label": {
-          "absolute": "",
-          "percentage": ""
+          "absolute": "Absolut",
+          "percentage": "Procentsats"
         }
       },
       "thresholds-mode": "Tröskelläge",
-      "value-base": ""
+      "value-base": "Bas"
     },
     "urlpicker-tab": {
       "label-preview": "Förhandsgranska"
@@ -6806,6 +6806,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Evenemang",
@@ -7078,7 +7079,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Laddar …"
     },
     "prev": "Tidigare",
     "queryless-apps-extensions": {
@@ -7265,7 +7266,7 @@
           "start-time": "Starttid:"
         }
       },
-      "share-span": "",
+      "share-span": "Dela",
       "warnings": "Varningar"
     },
     "span-filters": {
@@ -7275,8 +7276,8 @@
       "aria-label-select-service-name-operator": "Välj operator för tjänstnamn",
       "aria-label-select-span-name": "Välj namn på intervall",
       "aria-label-select-span-name-operator": "Välj operator för intervallnamn",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Välj maximal varaktighet för tidsspann",
+      "ariaLabel-select-min-span-duration": "Välj minimal varaktighet för tidsspann",
       "label-collapse": "Intervallfilter",
       "label-duration": "Varaktighet",
       "label-service-name": "Namn på tjänst",
@@ -7348,23 +7349,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Varaktighet",
+      "export-started": "Exporten startad",
+      "give-feedback": "Feedback",
+      "link-copied": "Länk kopierad till urklipp",
+      "path": "Sökväg",
+      "route": "Rutt",
+      "services": "Tjänster",
+      "share": "Dela",
+      "share-copy-link": "Kopiera länk",
+      "share-export-json": "Exportera som JSON",
+      "share-tooltip": "Dela spårning",
+      "start-time": "Starttid",
+      "target": "Mål",
+      "title-share-thoughts-about-tracing-grafana": "Dela dina tankar om att spåra i Grafana.",
+      "tooltip-url": "{{route}} eller {{url}} eller {{target}} eller {{path}}",
+      "trace-id": "Spårnings-ID",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Knappen Rensa filter",
@@ -7464,7 +7465,7 @@
       "when": "NÄR"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Kör MySQL-dialect SQL mot tabellerna som returneras från dina datakällor. Datakällfrågor (dvs. ”A”, ”B”) är tillgängliga som tabeller och refereras av frågenamn. Fält är tillgängliga som kolumner, som returneras från datakällan.",
       "label-operation": "Drift"
     },
     "math": {
@@ -7495,7 +7496,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Rensa mappar",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Inga mappar hittades",
     "select-aria-label": "Mappfilter",
     "select-placeholder": "Filtrera efter mapp"
   },
@@ -7544,23 +7545,23 @@
     "title": "Lämna sidan?"
   },
   "gauge": {
-    "category-gauge": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-neutral": "",
-    "description-show-threshold-labels": "",
-    "description-show-threshold-markers": "",
+    "category-gauge": "Mätare",
+    "description-min-height": "Minsta radhöjd (horisontell orientering)",
+    "description-min-width": "Minsta kolumnbredd (vertikal orientering)",
+    "description-neutral": "Lämna tomt för att använda Min som neutral punkt",
+    "description-show-threshold-labels": "Rendera tröskelvärdena runt mätarstapeln",
+    "description-show-threshold-markers": "Rendera trösklarna som en yttre stapel",
     "gauge-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Auto",
+      "label-manual": "Manuell"
     },
-    "name-gauge-size": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-neutral": "",
-    "name-show-threshold-labels": "",
-    "name-show-threshold-markers": "",
-    "placeholder-neutral": ""
+    "name-gauge-size": "Mätarstorlek",
+    "name-min-height": "Min. höjd",
+    "name-min-width": "Minsta bredd",
+    "name-neutral": "Neutral",
+    "name-show-threshold-labels": "Visa tröskelvärdesetiketter",
+    "name-show-threshold-markers": "Visa tröskelmarkörer",
+    "placeholder-neutral": "auto"
   },
   "gen-ai": {
     "apply-suggestion": "Tillämpa",
@@ -7569,51 +7570,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Ortregister hittades inte",
+      "warning-no-geometry": "kunde inte hitta geometri",
+      "warning-select-geohash": "Välj geohash-fält",
+      "warning-select-lat-long": "Välj fält för latitud/longitud",
+      "warning-select-lookup": "Välj sökfält",
+      "warning-unable-to-find": "Det gick inte att hitta platsfält"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Inga strängfält hittades"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Inga numeriska fält hittades"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Inga numeriska fält hittades"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Inga strängfält hittades"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Ortregister",
+      "name-geohash-field": "Geohash-fält",
+      "name-latitude-field": "Latitudfält",
+      "name-location-mode": "Platsläge",
+      "name-longitude-field": "Longitudfält",
+      "name-lookup-field": "Sökfält"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Identifiera platsdata automatiskt baserat på standardfältnamn",
+        "description-coords": "Ange fält för latitud och longitud",
+        "description-geohash": "Ange geohash-fält",
+        "description-lookup": "Ange ortregister och sökfält",
+        "label-auto": "Auto",
+        "label-coords": "Koordinater",
+        "label-geohash": "Geohash",
+        "label-lookup": "Slå upp"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Baslägeslager",
+    "category-map-controls": "Kartkontroller",
+    "category-map-layers": "Kartlager",
+    "category-map-view": "Kartvy",
     "coordinates-map-view-editor": {
       "label-latitude": "Latitud",
       "label-longitude": "Longitud"
@@ -7622,15 +7623,15 @@
       "center": "Centrera:",
       "zoom": "Zooma:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Den här platsen visas när panelen laddas för första gången.",
+    "description-mouse-wheel-zoom": "Aktivera zoomkontroll via mushjulet",
+    "description-no-repeat": "Förhindra att kartan upprepas horisontellt",
+    "description-share-view": "Använd samma visning i flera paneler. Obs! Det kan kräva en omladdning av kontrollpanelen.",
+    "description-show-attribution": "Visa kartans källhänvisning nere till höger",
+    "description-show-debug": "Visa kartinformation",
+    "description-show-measure": "Visa verktyg för att göra mätningar på kartan",
+    "description-show-scale": "Ange skala för kartan",
+    "description-show-zoom": "Visa zoomkontrollknappar i det övre vänstra hörnet",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Lager"
@@ -7654,12 +7655,12 @@
       "aria-label-add-geomap-style-rule": "Lägg till geomap-stilregel"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Baslager",
+      "description-display-tooltip": "Visa verktygstips för lager",
+      "name-data": "Data",
+      "name-display-tooltip": "Visa verktygstips",
+      "name-layer-type": "Lagertyp",
+      "name-opacity": "Opacitet"
     },
     "layers-editor": {
       "label-add-layer": "Lägg till lager",
@@ -7672,9 +7673,9 @@
       "use-current-map-settings": "Använd aktuella kartinställningar"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Visa kartförklaring",
+      "name-show-legend": "Visa förklaring",
+      "name-styles": "Teman"
     },
     "markers-legend": {
       "title-symbol": "Symbol"
@@ -7683,27 +7684,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Visa mätverktyg"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "Initial vy",
+    "name-mouse-wheel-zoom": "Zooma med mushjulet",
+    "name-no-repeat": "Ingen kartupprepning",
+    "name-share-view": "Dela vy",
+    "name-show-attribution": "Visa tillskrivning",
+    "name-show-debug": "Visa felsökning",
+    "name-show-measure": "Visa mätverktyg",
+    "name-show-scale": "Visa skala",
+    "name-show-zoom": "Visa zoomkontroll",
+    "name-tooltip": "Verktygstips",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Inga strängfält hittades"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "Grundkartlagret konfigureras av serveradministratören."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Centrera",
+        "label-left": "Vänster",
+        "label-right": "Höger"
       },
       "label-align": "Justera",
       "label-baseline": "Baslinje",
@@ -7719,12 +7720,12 @@
       "label-text-label": "Textetikett",
       "label-x-offset": "X-förskjutning",
       "label-y-offset": "Y-förskjutning",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Välj en symbol",
+      "placeholderText-select-symbol-or-add-text": "Välj en symbol eller lägg till en textetikett",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Underst",
+        "label-center": "Centrera",
+        "label-top": "Överst"
       }
     },
     "style-rule-editor": {
@@ -7738,13 +7739,13 @@
       "placeholder-value": "värde"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Visa popup vid hovring",
+      "description-none": "Visa innehåll vid klick, inte vid hovring",
+      "label-details": "Detaljer",
+      "label-none": "Ingen"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "Lager {{name}}"
     }
   },
   "get-enterprise": {
@@ -7864,400 +7865,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Fot/sek²",
+            "name-g-unit": "G-enhet",
+            "name-meters-sec": "Meter/sek²"
           },
-          "name": ""
+          "name": "Acceleration"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Bågminuter",
+            "name-arc-seconds": "Bågsekunder",
+            "name-degrees": "Grader (°)",
+            "name-gradian": "Gradian",
+            "name-radians": "Radianer"
           },
-          "name": ""
+          "name": "Vinkel"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Tunnland (ac)",
+            "name-hectares": "Hektar (ha)",
+            "name-square-feet": "Kvadratfot (ft²)",
+            "name-square-meters": "Kvadratmeter (m²)",
+            "name-square-miles": "Kvadratmiles (mi²)"
           },
-          "name": ""
+          "name": "Yta"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "På/Av",
+            "name-true-false": "Sant/Falskt",
+            "name-yes-no": "Ja/Nej"
           },
-          "name": ""
+          "name": "Boolesk"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "Beräkning"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "gram per kubikmeter (g/m³)",
+            "name-g-nm3": "gram per normal kubikmeter (g/Nm³)",
+            "name-mg-dl": "milligram per deciliter (mg/dl)",
+            "name-mg-m3": "milligram per kubikmeter (mg/m³)",
+            "name-mg-nm3": "milligram per normal kubikmeter (mg/Nm³)",
+            "name-mmol-l": "millimol per liter (mmol/l)",
+            "name-ng-m3": "nanogram per kubikmeter (ng/m³)",
+            "name-ng-nm3": "nanogram per normal kubikmeter (ng/Nm³)",
+            "name-ppb": "antal per miljard (ppb)",
+            "name-ppm": "antal per miljon (ppm)",
+            "name-ug-m3": "mikrogram per kubikmeter (μg/m³)",
+            "name-ug-nm3": "mikrogram per normal kubikmeter (μg/Nm³)"
           },
-          "name": ""
+          "name": "Koncentration"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Bulgariska lev (BGN)",
+            "name-brl": "Real (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "Schweiziska franc (CHF)",
+            "name-czk": "Tjeckisk krona (CZK)",
+            "name-dkk": "Dansk krona (kr)",
+            "name-eur": "Euro (€)",
+            "name-gbp": "Pund (£)",
+            "name-idr": "Indonesisk rupiah (Rp)",
+            "name-ils": "Israelisk ny shekel (₪)",
+            "name-inr": "Indisk rupie (₹)",
+            "name-isk": "Isländsk krona (kr)",
+            "name-jpy": "Yen (¥)",
+            "name-krw": "Sydkoreanska won (₩)",
+            "name-mbtc": "Milli bitcoin (฿)",
+            "name-myr": "Malaysisk ringgit (RM)",
+            "name-nok": "Norsk krona (kr)",
+            "name-php": "Filippinsk peso (PHP)",
+            "name-pln": "Polsk zloty (PLN)",
+            "name-pyg": "Guaraní (₲)",
+            "name-rub": "Rubler (₽)",
+            "name-sek": "Svensk krona (kr)",
+            "name-try": "Turkiska lira (₺)",
+            "name-uah": "Hryvnia (₴)",
+            "name-ubtc": "Micro bitcoin (฿)",
+            "name-usd": "Dollar ($)",
+            "name-uyu": "Uruguayansk peso (UYU)",
+            "name-vnd": "Vietnamesisk dong (VND)",
+            "name-xpf": "CFP-franc (XPF)",
+            "name-zar": "Sydafrikansk rand (R)"
           },
-          "name": ""
+          "name": "Valuta"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bitar (IEC)",
+            "name-bits-si": "bitar (SI)",
+            "name-bytes-iec": "byte (IEC)",
+            "name-bytes-si": "byte (SI)",
+            "name-gibibytes": "gibibyte",
+            "name-gigabytes": "gigabyte",
+            "name-kibibytes": "kibibyte",
+            "name-kilobytes": "kilobyte",
+            "name-mebibytes": "mebibyte",
+            "name-megabytes": "megabyte",
+            "name-pebibytes": "pebibyte",
+            "name-petabytes": "petabyte",
+            "name-tebibytes": "tebibyte",
+            "name-terabytes": "terabyte"
           },
-          "name": ""
+          "name": "Data"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bitar/sek (IEC)",
+            "name-bits-sec-si": "bitar/sek (SI)",
+            "name-bytes-sec-iec": "byte/sek (IEC)",
+            "name-bytes-sec-si": "byte/sek (SI)",
+            "name-gibibits-sec": "gibibit/sek",
+            "name-gibibytes-sec": "gibibyte/sek",
+            "name-gigabits-sec": "gigabit/sek",
+            "name-gigabytes-sec": "gigabyte/sek",
+            "name-kibibits-sec": "kibibit/sek",
+            "name-kibibytes-sec": "kibibyte/sek",
+            "name-kilobits-sec": "kilobit/sek",
+            "name-kilobytes-sec": "kilobyte/sek",
+            "name-mebibits-sec": "mebibit/sek",
+            "name-mebibytes-sec": "mebibyte/sek",
+            "name-megabits-sec": "megabit/sek",
+            "name-megabytes-sec": "megabyte/sek",
+            "name-packets-sec": "paket/sek",
+            "name-pebibits-sec": "pebibit/sek",
+            "name-pebibytes-sec": "pebibyte/sek",
+            "name-petabits-sec": "petabit/sek",
+            "name-petabytes-sec": "petabyte/sek",
+            "name-tebibits-sec": "tebibit/sek",
+            "name-tebibytes-sec": "tebibyte/sek",
+            "name-terabits-sec": "terabit/sek",
+            "name-terabytes-sec": "terabyte/sek"
           },
-          "name": ""
+          "name": "Dataöverförings­hastighet"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Standardinställning för datum och tid",
+            "name-datetime-iso": "Datum och tid ISO",
+            "name-datetime-iso-no-date": "Datum och tid ISO (inget datum om idag)",
+            "name-datetime-local": "Datum och tid lokalt",
+            "name-datetime-local-no-date": "Datum och tid lokalt (inget datum om idag)",
+            "name-datetime-us": "Datum och tid USA",
+            "name-datetime-us-no-date": "Datum och tid USA (inget datum om idag)",
+            "name-from-now": "Från nu"
           },
-          "name": ""
+          "name": "Datum och tid"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Ampere (A)",
+            "name-ampere-hour": "Amperetimme (Ah)",
+            "name-decibel-milliwatt": "Decibel-milliwatt (dBm)",
+            "name-electron-volt": "Elektronvolt (eV)",
+            "name-farad": "Farad (F)",
+            "name-femtofarad": "Femtofarad (fF)",
+            "name-gigawatt": "Gigawatt (GW)",
+            "name-henry": "Henry (H)",
+            "name-joule": "Joule (J)",
+            "name-kiloampere": "Kiloampere (kA)",
+            "name-kiloampere-hour": "Kiloamperetimme (kAh)",
+            "name-kiloohm": "Kiloohm (kΩ)",
+            "name-kilovolt": "Kilovolt (kV)",
+            "name-kilovolt-ampere": "Kilovoltampere (kVA)",
+            "name-kilovolt-ampere-reactive": "Kilovoltampere reaktiv (kVAr)",
+            "name-kilowatt": "Kilowatt (kW)",
+            "name-kilowatt-hour": "Kilowattimme (kWh)",
+            "name-kilowatt-min": "Kilowattmin (kWm)",
+            "name-lumens": "Lumen (Lm)",
+            "name-megaohm": "Megaohm (MΩ)",
+            "name-megawatt": "Megawatt (MW)",
+            "name-megawatt-hour": "Megawattimme (MWh)",
+            "name-microfarad": "Mikrofarad (µF)",
+            "name-microhenry": "Mikrohenry (µH)",
+            "name-milliampere": "Milliampere (mA)",
+            "name-milliampere-hour": "Milliamperetimme (mAh)",
+            "name-millihenry": "Millihenry (mH)",
+            "name-milliohm": "Milliohm (mΩ)",
+            "name-millivolt": "Millivolt (mV)",
+            "name-milliwatt": "Milliwatt (mW)",
+            "name-nanofarad": "Nanofarad (nF)",
+            "name-ohm": "Ohm (Ω)",
+            "name-picofarad": "Picofarad (pF)",
+            "name-volt": "Volt (V)",
+            "name-volt-ampere": "Voltampere (VA)",
+            "name-volt-ampere-reactive": "Voltampere reaktiv (VAr)",
+            "name-watt": "Watt (W)",
+            "name-watt-hour": "Wattimme (Wh)",
+            "name-watt-hour-per-kg": "Wattimme per kilogram (Wh/kg)",
+            "name-watt-square-meter": "Watt per kvadratmeter (W/m²)"
           },
-          "name": ""
+          "name": "Energi"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Kubikfot/min (cfm)",
+            "name-cubic-feet-sec": "Kubikfot/sek (cfs)",
+            "name-cubic-meters-sec": "Kubikmeter/sek (cms)",
+            "name-gallons-min": "Gallon/min (gpm)",
+            "name-litre-hour": "Liter/timme",
+            "name-litre-min": "Liter/min (L/min)",
+            "name-lux": "Lux (lx)",
+            "name-millilitre-min": "milliliter/min (mL/min)"
           },
-          "name": ""
+          "name": "Flow"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Kilonewtonmeter (kNm)",
+            "name-kilonewtons": "Kilonewton (kN)",
+            "name-newton-meters": "Newtonmeter (Nm)",
+            "name-newtons": "Newton (N)"
           },
-          "name": ""
+          "name": "Kraft"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "exahash/sek",
+            "name-gigahashes-sec": "gigahash/sek",
+            "name-hashes-sec": "hash/sek",
+            "name-kilohashes-sec": "kilohash/sek",
+            "name-megahashes-sec": "megahash/sek",
+            "name-petahashes-sec": "petahash/sek",
+            "name-terahashes-sec": "terahash/sek"
           },
-          "name": ""
+          "name": "Hashhastighet"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "fot (ft)",
+            "name-inch": "tum (tum)",
+            "name-kilometer": "kilometer (km)",
+            "name-meter": "meter (m)",
+            "name-mile": "mile (mi)",
+            "name-millimeter": "millimeter (mm)"
           },
-          "name": ""
+          "name": "Längd"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "gram (g)",
+            "name-kilogram": "kilogram (kg)",
+            "name-metric-ton": "metriskt ton (t)",
+            "name-milligram": "milligram (mg)",
+            "name-pound": "pund (lb)"
           },
-          "name": ""
+          "name": "Massa"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Candela (cd)",
+            "name-decibel": "Decibel",
+            "name-hexadecimal": "Hexadecimal",
+            "name-hexadecimal-0x": "Hexadecimal (0x)",
+            "name-humidity": "Luftfuktighet (%H)",
+            "name-locale": "Lokalt format",
+            "name-number": "Nummer",
+            "name-percent-1": "Procent (0,0–1,0)",
+            "name-percent-100": "Procent (0–100)",
+            "name-pixels": "Pixlar",
+            "name-scientific": "Vetenskaplig notation",
+            "name-short": "kort",
+            "name-si-short": "SI kort",
+            "name-string": "Sträng"
           },
-          "name": ""
+          "name": "Övrigt"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Stolpar",
+            "name-hectopascals": "Hektopascal",
+            "name-inches-mercury": "Tum kvicksilver",
+            "name-kilobars": "Kilobar",
+            "name-kilopascals": "Kilopascal",
+            "name-millibars": "Millibar",
+            "name-pascals": "Pascal",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Tryck"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Becquerel (Bq)",
+            "name-curie": "curie (Ci)",
+            "name-exposure": "Exponering (C/kg)",
+            "name-gray": "Gray (Gy)",
+            "name-microsievert": "mikrosievert (µSv)",
+            "name-microsievert-hour": "mikrosievert/timme (µSv/h)",
+            "name-millisievert": "millisievert (mSv)",
+            "name-millisievert-hour": "millisievert/timme (mSv/h)",
+            "name-rad": "rad",
+            "name-rem": "rem",
+            "name-roentgen": "röntgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/timme (Sv/h)"
           },
-          "name": ""
+          "name": "Strålning"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Grader per sekund (°/s)",
+            "name-gigahertz": "Gigahertz (GHz)",
+            "name-hertz": "Hertz (Hz)",
+            "name-kilohertz": "Kilohertz (kHz)",
+            "name-megahertz": "Megahertz (MHz)",
+            "name-radians-sec": "Radianer per sekund (rad/s)",
+            "name-rpm": "Varv per minut (rpm)"
           },
-          "name": ""
+          "name": "Rotationshastighet"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Celsius (°C)",
+            "name-fahrenheit": "Fahrenheit (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Temperatur"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "antal/min (cpm)",
+            "name-counts-sec": "antal/sek (cps)",
+            "name-events-min": "händelser/min (epm)",
+            "name-events-sec": "händelser/sek (eps)",
+            "name-io-ops-sec": "I/O-operationer/sek (iops)",
+            "name-messages-min": "meddelanden/min (mpm)",
+            "name-messages-sec": "meddelanden/sek (mps)",
+            "name-ops-min": "operationer/min (opm)",
+            "name-ops-sec": "operationer/sek (ops)",
+            "name-reads-min": "avläsningar/min (rpm)",
+            "name-reads-sec": "avläsningar/sek (rps)",
+            "name-records-min": "poster/min (rpm)",
+            "name-records-sec": "poster/sek (rps)",
+            "name-requests-min": "förfrågningar/min (rpm)",
+            "name-requests-sec": "förfrågningar/sek (rps)",
+            "name-rows-min": "rader/min (rpm)",
+            "name-rows-sec": "rader/sek (rps)",
+            "name-writes-min": "skrivningar/min (wpm)",
+            "name-writes-sec": "skrivningar/sek (wps)"
           },
-          "name": ""
+          "name": "Genomströmning"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "klocka (ms)",
+            "name-clock-s": "klocka (s)",
+            "name-days": "dagar (d)",
+            "name-duration-dhms": "varaktighet (d hh:mm:ss)",
+            "name-duration-hms": "varaktighet (hh:mm:ss)",
+            "name-duration-ms": "varaktighet (ms)",
+            "name-duration-s": "varaktighet (s)",
+            "name-hertz": "Hertz (1/s)",
+            "name-hours": "timmar (h)",
+            "name-microseconds": "mikrosekunder (µs)",
+            "name-milliseconds": "millisekunder (ms)",
+            "name-minutes": "minuter (m)",
+            "name-nanoseconds": "nanosekunder (ns)",
+            "name-seconds": "sekunder (s)",
+            "name-timeticks": "Tidsmarkeringar (s/100)"
           },
-          "name": ""
+          "name": "Tid"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "kilometer/timme (km/h)",
+            "name-knot": "knop (kn)",
+            "name-meters-second": "meter/sekund (m/s)",
+            "name-miles-hour": "miles/timme (mph)"
           },
-          "name": ""
+          "name": "Hastighet"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "kubikdecimeter",
+            "name-cubic-meter": "kubikmeter",
+            "name-gallons": "gallon",
+            "name-litre": "liter (L)",
+            "name-millilitre": "milliliter (mL)",
+            "name-normal-cubic-meter": "Normalkubikmeter"
           },
-          "name": ""
+          "name": "Volym"
         }
       }
     }
@@ -8300,85 +8301,85 @@
     },
     "builder": {
       "axis": {
-        "category-axis": "",
-        "color-label": "",
+        "category-axis": "Axel",
+        "color-label": "Färg",
         "color-options": {
-          "label-series": "",
-          "label-text": ""
+          "label-series": "Serie",
+          "label-text": "Text"
         },
         "grid-line-options": {
-          "label-auto": "",
-          "label-off": "",
-          "label-on": ""
+          "label-auto": "Auto",
+          "label-off": "Av",
+          "label-on": "På"
         },
-        "name-centered-zero": "",
-        "name-grid-lines": "",
-        "name-label": "",
-        "name-placement": "",
-        "name-scale": "",
-        "name-show-border": "",
-        "name-soft-max": "",
-        "name-soft-min": "",
-        "name-width": "",
-        "placeholder-label": "",
-        "placeholder-soft-max": "",
-        "placeholder-soft-min": "",
-        "placeholder-width": "",
+        "name-centered-zero": "Centrerad nolla",
+        "name-grid-lines": "Visa rutnät",
+        "name-label": "Etikett",
+        "name-placement": "Placering",
+        "name-scale": "Skala",
+        "name-show-border": "Visa ram",
+        "name-soft-max": "Mjuk max",
+        "name-soft-min": "Mjuk min",
+        "name-width": "Bredd",
+        "placeholder-label": "Valfri text",
+        "placeholder-soft-max": "Se: Standardalternativ > Max",
+        "placeholder-soft-min": "Se: Standardalternativ > Min",
+        "placeholder-width": "Auto",
         "scale-distribution-editor": {
           "distribution-options": {
-            "label-linear": "",
-            "label-log": "",
-            "label-symlog": ""
+            "label-linear": "Linjär",
+            "label-log": "Logaritmisk",
+            "label-symlog": "Symlog"
           }
         }
       },
       "legend": {
-        "category": "",
-        "description-values": "",
+        "category": "Förklaringar",
+        "description-values": "Välj värden eller beräkningar som ska visas i förklaringen",
         "mode-options": {
-          "label-list": "",
-          "label-table": ""
+          "label-list": "Lista",
+          "label-table": "Tabell"
         },
-        "name-mode": "",
-        "name-placement": "",
-        "name-values": "",
-        "name-visibility": "",
-        "name-width": "",
+        "name-mode": "Läge",
+        "name-placement": "Placering",
+        "name-values": "Värden",
+        "name-visibility": "Synlighet",
+        "name-width": "Bredd",
         "placement-options": {
-          "label-bottom": "",
-          "label-right": ""
+          "label-bottom": "Underst",
+          "label-right": "Höger"
         }
       },
       "stacking": {
-        "name-stack-series": ""
+        "name-stack-series": "Stapelserier"
       },
       "text": {
-        "category-text-size": "",
-        "name-percent-change": "",
-        "name-title": "",
-        "name-value": "",
-        "placeholder-percent-change": "",
-        "placeholder-title": "",
-        "placeholder-value": ""
+        "category-text-size": "Textstorlek",
+        "name-percent-change": "Procentuell förändring",
+        "name-title": "Titel",
+        "name-value": "Värde",
+        "placeholder-percent-change": "Auto",
+        "placeholder-title": "Auto",
+        "placeholder-value": "Auto"
       },
       "tooltip": {
-        "category": "",
-        "description-hover-proximity": "",
+        "category": "Verktygstips",
+        "description-hover-proximity": "Hur nära markören måste vara till en punkt för att utlösa verktygstips, i pixlar",
         "modeOptions": {
-          "label-all": "",
-          "label-hidden": "",
-          "label-single": ""
+          "label-all": "Alla",
+          "label-hidden": "Dolt",
+          "label-single": "Singel"
         },
-        "name-hide-zeros": "",
-        "name-hover-proximity": "",
-        "name-max-height": "",
-        "name-max-width": "",
-        "name-tooltip-mode": "",
-        "name-values-sort-order": "",
+        "name-hide-zeros": "Dölj nollor",
+        "name-hover-proximity": "Hovringsavstånd",
+        "name-max-height": "Max. höjd",
+        "name-max-width": "Max bredd",
+        "name-tooltip-mode": "Verktygstipsläge",
+        "name-values-sort-order": "Sorteringsordning för värden",
         "sortOptions": {
-          "label-ascending": "",
-          "label-descending": "",
-          "label-none": ""
+          "label-ascending": "Stigande",
+          "label-descending": "Fallande",
+          "label-none": "Ingen"
         }
       }
     },
@@ -8386,7 +8387,7 @@
       "option": "alternativ"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Öppna bildförhandsvisning"
     },
     "cascader": {
       "clear-button": "Rensa val"
@@ -8400,9 +8401,9 @@
       "aria-label-selected-color": "{{colorLabel}} färg"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Radera",
       "cancel": "Avbryt",
-      "confirmText-delete": ""
+      "confirmText-delete": "Radera"
     },
     "confirm-content": {
       "placeholder": "Skriv ”{{confirmPromptText}}” för att bekräfta"
@@ -8507,56 +8508,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "April",
+        "label-august": "Augusti",
+        "label-december": "December",
+        "label-february": "Februari",
+        "label-january": "Januari",
+        "label-july": "Juli",
+        "label-june": "Juni",
+        "label-march": "Mars",
+        "label-may": "Maj",
+        "label-november": "November",
+        "label-october": "Oktober",
+        "label-september": "September"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "I förrgår",
+        "last-1-hour": "Senaste timmen",
+        "last-1-year": "Senaste året",
+        "last-12-hours": "Senaste 12 timmarna",
+        "last-15-mins": "Sista 15 minuterna",
+        "last-2-days": "Senaste 2 dagarna",
+        "last-2-years": "Senaste 2 åren",
+        "last-24-hours": "Senaste 24 timmarna",
+        "last-3-hours": "Senaste 3 timmarna",
+        "last-30-days": "Senaste 30 dagarna",
+        "last-30-mins": "Sista 30 minuterna",
+        "last-5-mins": "Senaste 5 minuterna",
+        "last-5-years": "Senaste fem åren",
+        "last-6-hours": "Senaste 6 timmarna",
+        "last-6-months": "Senaste 6 månaderna",
+        "last-7-days": "Senaste 7 dagarna",
+        "last-90-days": "Senaste 90 dagarna",
+        "previous-fiscal-quarter": "Föregående räkenskapskvartal",
+        "previous-fiscal-year": "Föregående räkenskapsår",
+        "previous-month": "Föregående månad",
+        "previous-week": "Föregående vecka",
+        "previous-year": "Föregående år",
+        "this-day-last-week": "Den här dagen förra veckan",
+        "this-fiscal-quarter": "Detta räkenskapskvartal",
+        "this-fiscal-quarter-so-far": "Hittills detta räkenskapskvartal",
+        "this-fiscal-year": "Detta räkenskapsår",
+        "this-fiscal-year-so-far": "Detta räkenskapsår hittills",
+        "this-month": "Denna månad",
+        "this-month-so-far": "Denna månad hittills",
+        "this-week": "Denna vecka",
+        "this-week-so-far": "Denna vecka hittills",
+        "this-year": "Det här året",
+        "this-year-so-far": "Detta år hittills",
+        "today": "Idag",
+        "today-so-far": "Hittills idag",
+        "yesterday": "Igår"
       }
     },
     "drawer": {
@@ -8598,33 +8599,33 @@
       "tooltip-expand-all": "Expandera alla rader"
     },
     "matchers-ui": {
-      "description-field-name-by-regex-matcher": "",
-      "description-fields-by-query": "",
-      "description-fields-with-name": "",
-      "description-fields-with-type": "",
-      "description-fields-with-value": "",
+      "description-field-name-by-regex-matcher": "Ange egenskaper för fält med namn som matchar en regex",
+      "description-fields-by-query": "Ange egenskaper för fält från en specifik fråga",
+      "description-fields-with-name": "Ange egenskaper för ett specifikt fält",
+      "description-fields-with-type": "Ange egenskaper för fält av en specifik typ (nummer, sträng, boolesk)",
+      "description-fields-with-value": "Ange egenskaper för fält med reduceringsvillkor",
       "field-name-picker": {
-        "placeholder": ""
+        "placeholder": "Välj fält"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Boolesk",
+        "label-enum": "Uppräkning",
+        "label-number": "Nummer",
+        "label-other": "Annat",
+        "label-string": "Sträng",
+        "label-time": "Tid",
+        "label-traces": "Spår"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Ramar ({{framesCount}}): {{framesNames}}",
+        "label": "Fråga: {{refId}}",
+        "label-missing-ref-id": "Fråga: (saknar refId)"
       },
-      "name-field-name-by-regex-matcher": "",
-      "name-fields-by-query": "",
-      "name-fields-with-name": "",
-      "name-fields-with-type": "",
-      "name-fields-with-value": ""
+      "name-field-name-by-regex-matcher": "Fält med namnmatchande regex",
+      "name-fields-by-query": "Fält som returneras av fråga",
+      "name-fields-with-name": "Fält med namn",
+      "name-fields-with-type": "Fält med typ",
+      "name-fields-with-value": "Fält med värden"
     },
     "menu-item": {
       "keyboard-shortcut-label": "Kortkommando"
@@ -8652,8 +8653,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "växla dölj panel",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Panelladdningsfält",
+      "ariaLabel-panel-status": "Panelstatus",
       "tooltip-cancel": "Avbryt fråga",
       "tooltip-cancel-loading": "Avbryt fråga",
       "tooltip-stop-streaming": "Avsluta streaming",
@@ -8722,12 +8723,12 @@
       "inspect-drawer-title": "Inspektera värde",
       "inspect-menu-label": "Inspektera värde",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Inga data"
       },
       "no-values-label": "Inga värden",
       "pagination-summary": "{{itemsRangeStart}} - {{displayedEnd}} av {{numRows}} rader",
       "sparkline": {
-        "no-data": ""
+        "no-data": "inga data"
       }
     },
     "tags": {
@@ -8735,7 +8736,7 @@
     },
     "tags-input": {
       "add": "Lägg till",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Ny tagg (ange nyckel för att lägga till)",
       "remove": "Ta bort tagg: {{name}}"
     },
     "time-sync-button": {
@@ -8752,55 +8753,55 @@
       "config": {
         "get-graph-field-options": {
           "axis-placement": {
-            "description-auto": "",
-            "label-auto": "",
-            "label-hidden": "",
-            "label-left": "",
-            "label-right": ""
+            "description-auto": "Första fältet till vänster, allt annat till höger",
+            "label-auto": "Auto",
+            "label-hidden": "Dolt",
+            "label-left": "Vänster",
+            "label-right": "Höger"
           },
           "bar-alignment": {
-            "description-after": "",
-            "description-before": "",
-            "description-center": ""
+            "description-after": "Efter",
+            "description-before": "Före",
+            "description-center": "Centrera"
           },
           "draw-style": {
-            "label-bars": "",
-            "label-lines": "",
-            "label-points": ""
+            "label-bars": "Stolpar",
+            "label-lines": "Rader",
+            "label-points": "Poäng"
           },
           "fill-gradient": {
-            "description-hue": "",
-            "description-opacity": "",
-            "description-scheme": "",
-            "label-hue": "",
-            "label-none": "",
-            "label-opacity": "",
-            "label-scheme": ""
+            "description-hue": "Liten färgtongradient",
+            "description-opacity": "Aktivera toning för fyllnadsopacitet",
+            "description-scheme": "Använd färgschema för att definiera gradient",
+            "label-hue": "Nyans",
+            "label-none": "Ingen",
+            "label-opacity": "Opacitet",
+            "label-scheme": "Förvaltning"
           },
           "line-interpolation": {
-            "description-linear": "",
-            "description-smooth": "",
-            "description-step-after": "",
-            "description-step-before": ""
+            "description-linear": "Linjär",
+            "description-smooth": "Smidig",
+            "description-step-after": "Steg efter",
+            "description-step-before": "Steg innan"
           },
           "show-points": {
-            "description-auto": "",
-            "label-always": "",
-            "label-auto": "",
-            "label-never": ""
+            "description-auto": "Visa punkter när toningen är låg",
+            "label-always": "Alltid",
+            "label-auto": "Auto",
+            "label-never": "Aldrig"
           },
           "stacking": {
-            "label-100": "",
-            "label-normal": "",
-            "label-off": ""
+            "label-100": "100 %",
+            "label-normal": "Normal",
+            "label-off": "Av"
           },
           "thresholds-display-mode": {
-            "label-dashed-lines": "",
-            "label-filled-regions": "",
-            "label-filled-regions-and-dashed-lines": "",
-            "label-filled-regions-and-lines": "",
-            "label-lines": "",
-            "label-off": ""
+            "label-dashed-lines": "Som linjer (streckade)",
+            "label-filled-regions": "Som fyllda områden",
+            "label-filled-regions-and-dashed-lines": "Som fyllda områden och linjer (streckade)",
+            "label-filled-regions-and-lines": "Som fyllda områden och linjer",
+            "label-lines": "Som linjer",
+            "label-off": "Av"
           }
         }
       }
@@ -8828,14 +8829,14 @@
       "footer-add-annotation": "Lägg till kommentar",
       "footer-click-to-action": "Klicka för att {{actionTitle}}",
       "footer-click-to-navigate": "Klicka för att öppna {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "Filtrera för ”{{value}}”",
       "timestamp": "Tidsstämpel"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Standard",
+      "weekStarts-label-monday": "Måndag",
+      "weekStarts-label-saturday": "Lördag",
+      "weekStarts-label-sunday": "Söndag"
     }
   },
   "graph": {
@@ -8848,78 +8849,78 @@
   },
   "heatmap": {
     "calculate-from-data-options": {
-      "label-no": "",
-      "label-yes": ""
+      "label-no": "Nej",
+      "label-yes": "Ja"
     },
-    "category-cell-display": "",
-    "category-colors": "",
-    "category-exemplars": "",
-    "category-heatmap": "",
-    "category-legend": "",
-    "category-tooltip": "",
-    "category-y-axis": "",
+    "category-cell-display": "Cellvisning",
+    "category-colors": "Färger",
+    "category-exemplars": "Exemplar",
+    "category-heatmap": "Värmekarta",
+    "category-legend": "Förklaringar",
+    "category-tooltip": "Verktygstips",
+    "category-y-axis": "Y-axel",
     "mode-options": {
-      "label-opacity": "",
-      "label-scheme": ""
+      "label-opacity": "Opacitet",
+      "label-scheme": "Förvaltning"
     },
-    "name-axis-label": "",
-    "name-axis-width": "",
-    "name-calculate-from-data": "",
-    "name-cell-gap": "",
-    "name-color": "",
-    "name-decimals": "",
-    "name-end-color-at-value": "",
-    "name-exponent": "",
-    "name-hide-cells-gt": "",
-    "name-hide-cells-lt": "",
-    "name-max-height": "",
-    "name-max-value": "",
-    "name-max-width": "",
-    "name-min-value": "",
-    "name-mode": "",
-    "name-placement": "",
-    "name-reverse": "",
-    "name-scale": "",
-    "name-scheme": "",
-    "name-show-color-scale": "",
-    "name-show-histogram": "",
-    "name-show-legend": "",
-    "name-start-color-from-value": "",
-    "name-steps": "",
-    "name-tick-alignment": "",
-    "name-tooltip-mode": "",
-    "name-unit": "",
-    "name-value-name": "",
-    "name-y-axis-scale": "",
-    "placeholder-axis-label": "",
-    "placeholder-axis-width": "",
-    "placeholder-decimals": "",
-    "placeholder-end-color-at-value": "",
-    "placeholder-hide-cells-gt": "",
-    "placeholder-hide-cells-lt": "",
-    "placeholder-max-value": "",
-    "placeholder-min-value": "",
-    "placeholder-start-color-from-value": "",
-    "placeholder-value-name": "",
+    "name-axis-label": "Axeletikett",
+    "name-axis-width": "Axelbredd",
+    "name-calculate-from-data": "Beräkna från data",
+    "name-cell-gap": "Cellavstånd",
+    "name-color": "Färg",
+    "name-decimals": "Decimaler",
+    "name-end-color-at-value": "Avsluta färgskala vid värde",
+    "name-exponent": "Exponent",
+    "name-hide-cells-gt": "Dölj celler med värden >=",
+    "name-hide-cells-lt": "Dölj celler med värden <=",
+    "name-max-height": "Max. höjd",
+    "name-max-value": "Maxvärde",
+    "name-max-width": "Max bredd",
+    "name-min-value": "Minvärde",
+    "name-mode": "Läge",
+    "name-placement": "Placering",
+    "name-reverse": "Omvänt",
+    "name-scale": "Skala",
+    "name-scheme": "Förvaltning",
+    "name-show-color-scale": "Visa färgskala",
+    "name-show-histogram": "Visa histogram (Y-axel)",
+    "name-show-legend": "Visa förklaring",
+    "name-start-color-from-value": "Starta färgskala från värde",
+    "name-steps": "Steg",
+    "name-tick-alignment": "Justering av skalstreck",
+    "name-tooltip-mode": "Verktygstipsläge",
+    "name-unit": "Enhet",
+    "name-value-name": "Värdenamn",
+    "name-y-axis-scale": "Y-axelns skala",
+    "placeholder-axis-label": "Auto",
+    "placeholder-axis-width": "Auto",
+    "placeholder-decimals": "Auto",
+    "placeholder-end-color-at-value": "Auto (max)",
+    "placeholder-hide-cells-gt": "Ingen",
+    "placeholder-hide-cells-lt": "Ingen",
+    "placeholder-max-value": "Auto",
+    "placeholder-min-value": "Auto",
+    "placeholder-start-color-from-value": "Auto (min)",
+    "placeholder-value-name": "Värde",
     "placement-options": {
-      "label-hidden": "",
-      "label-left": "",
-      "label-right": ""
+      "label-hidden": "Dolt",
+      "label-left": "Vänster",
+      "label-right": "Höger"
     },
     "scale-options": {
-      "label-exponential": "",
-      "label-linear": ""
+      "label-exponential": "Exponentiella",
+      "label-linear": "Linjär"
     },
     "tick-alignment-options": {
-      "label-auto": "",
-      "label-bottom": "",
-      "label-middle": "",
-      "label-top": ""
+      "label-auto": "Auto",
+      "label-bottom": "Underst (GE)",
+      "label-middle": "Mitten",
+      "label-top": "Överst (LE)"
     },
     "tooltip-mode-options": {
-      "label-all": "",
-      "label-hidden": "",
-      "label-single": ""
+      "label-all": "Alla",
+      "label-hidden": "Dolt",
+      "label-single": "Singel"
     }
   },
   "help-modal": {
@@ -8979,14 +8980,14 @@
     "troubleshooting-help": "Om du vill begära felsökningshjälp skickar du en ögonblicksbild av denna panel till Grafana Labs tekniska support. Ögonblicksbilden innehåller frågesvarsdata och panelinställningar."
   },
   "histogram": {
-    "category-histogram": "",
+    "category-histogram": "Histogram",
     "histogram-panel": {
       "no-histogram-found-in-response": "Inget histogram hittades i svaret"
     },
-    "name-fill-opacity": "",
-    "name-gradient-mode": "",
-    "name-line-width": "",
-    "name-stacking": ""
+    "name-fill-opacity": "Fyllningsopacitet",
+    "name-gradient-mode": "Toningsläge",
+    "name-line-width": "Linjebredd",
+    "name-stacking": "Stapling"
   },
   "inspector": {
     "inspect-data-tab": {
@@ -9215,8 +9216,8 @@
       "title-create-library-panel": "Skapa bibliotekspanel"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Ändra",
+      "confirmText-replace": "Byt ut"
     },
     "confirm": {
       "delete-panel": "Vill du radera denna panel?"
@@ -9241,7 +9242,7 @@
       "usage-count_other": "Används på {{count}} instrumentpaneler"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Sök efter namn, beskrivning eller mappnamn"
     },
     "loading-indicator": {
       "loading-library-panel": "Laddar bibliotekspanel …"
@@ -9367,16 +9368,16 @@
     }
   },
   "logs": {
-    "category-logs": "",
+    "category-logs": "Loggar",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Exakt",
+      "label-none": "Ingen",
+      "label-numbers": "Nummer",
+      "label-signature": "Underskrift"
     },
-    "description-enable-infinite-scrolling": "",
-    "description-enable-syntax-highlighting": "",
-    "description-show-controls": "",
+    "description-enable-infinite-scrolling": "Experimentellt. Begär fler resultat genom att bläddra till längst ner i logglistan.",
+    "description-enable-syntax-highlighting": "Använd en fördefinierad syntaxfärgningsgrammatik för att markera relevanta delar av loggraderna",
+    "description-show-controls": "Visa kontroller för att hoppa till den sista eller första loggraden och filtrera efter loggnivå",
     "fields": {
       "type": {
         "loki": {
@@ -9390,8 +9391,8 @@
       }
     },
     "font-size-options": {
-      "label-default": "",
-      "label-small": ""
+      "label-default": "Standard",
+      "label-small": "Litet"
     },
     "get-dataframe-fields": {
       "vars": {
@@ -9447,64 +9448,64 @@
       "title-log-line": ""
     },
     "log-line-details": {
-      "clear-search": "",
-      "close": "",
-      "copy-shortlink": "",
-      "copy-to-clipboard": "",
-      "displayed-fields-section": "",
+      "clear-search": "Rensa",
+      "close": "Stäng loggdetaljer",
+      "copy-shortlink": "Kopiera kortlänk",
+      "copy-to-clipboard": "Kopiera till urklippet",
+      "displayed-fields-section": "Organisera visade fält",
       "fields": {
-        "adhoc-statistics": "",
-        "copy-value-to-clipboard": "",
-        "filter-out": "",
-        "filter-out-query": "",
+        "adhoc-statistics": "Ad hoc-statistik",
+        "copy-value-to-clipboard": "Kopiera värde till klippbordet",
+        "filter-out": "Filtrera bort värde",
+        "filter-out-query": "Filtrera bort värde i frågan {{query}}",
         "toggle-field-button": {
-          "field-instead-message": "",
-          "hide-this-field": ""
+          "field-instead-message": "Visa det här fältet istället för meddelandet",
+          "hide-this-field": "Dölj detta fält"
         }
       },
-      "fields-section": "",
-      "hide-log-line": "",
-      "inline-mode": "",
-      "links-section": "",
-      "log-line-field": "",
-      "log-line-section": "",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
-      "no-details": "",
-      "open-assistant": "",
-      "pin-line": "",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "fields-section": "Fält",
+      "hide-log-line": "Dölj loggrad",
+      "inline-mode": "Visa inline",
+      "links-section": "Länkar",
+      "log-line-field": "Loggrad",
+      "log-line-section": "Loggrad",
+      "move-displayed-field-down": "Flytta ner",
+      "move-displayed-field-up": "Flytta upp",
+      "no-details": "Fält som ska visas.",
+      "open-assistant": "Förklara denna loggrad i Assistant",
+      "pin-line": "Fäst logg",
+      "remove-displayed-field": "Ta bort fält",
+      "remove-log": "Ta bort logg",
+      "scroll-to-logline": "Skrolla till loggrad",
       "search": {
-        "no-results": ""
+        "no-results": "Inga resultat att visa."
       },
-      "search-placeholder": "",
-      "show-context": "",
-      "show-log-line": "",
-      "sidebar-mode": "",
-      "unpin-line": ""
+      "search-placeholder": "Sök fältnamn och värden",
+      "show-context": "Visa sammanhang",
+      "show-log-line": "Visa loggrad",
+      "sidebar-mode": "Förankra till höger",
+      "unpin-line": "Frigör logg"
     },
     "log-line-menu": {
       "copy-link": "Kopiera länk till loggrad",
       "copy-log": "Kopiera loggrad",
       "hide-details": "Visa loggdetaljer",
       "icon-label": "Loggmeny",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Loggrad",
+      "log-line-explainer": "Förklara denna loggrad på ett kortfattat sätt",
+      "open-assistant": "Förklara denna loggrad i Assistant",
       "pin-to-outline": "Fäst logg",
       "show-context": "Visa sammanhang",
       "show-details": "Dölj loggdetaljer",
       "unpin-from-outline": "Frigör logg"
     },
     "log-list-search": {
-      "close": "",
-      "filter": "",
-      "info": "",
-      "input-placeholder": "",
-      "next": "",
-      "prev": ""
+      "close": "Stäng sökning",
+      "filter": "Filtrera matchande loggar",
+      "info": "Klientsidans sökning efter strängar i de visade loggarna. Ska inte förväxlas med frågefilter. Använd den här komponenten för att söka efter specifika strängar i dina loggresultat.",
+      "input-placeholder": "Sök i loggar",
+      "next": "Nästa resultat",
+      "prev": "Föregående resultat"
     },
     "log-row-context-modal": {
       "error-loading-log-more-logs": "Fel vid laddning av fler loggar.",
@@ -9565,7 +9566,7 @@
       "escape-newlines": "Åtgärda felaktiga undantagstecken för radbrytningar och tabbar i loggrader",
       "font-size-default": "Använd liten teckenstorlek",
       "font-size-small": "Använd standardteckenstorlek",
-      "hide-search": "",
+      "hide-search": "Stäng sökning",
       "hide-timestamps": "Dölj tidsstämplar",
       "hide-unique-labels": "Dölj unika etiketter",
       "newest-first": "Sorterat efter nyaste loggar först – klicka om du vill visa äldsta först",
@@ -9578,7 +9579,7 @@
       "scroll-top": "Skrolla till toppen",
       "show-ms-timestamps": "",
       "show-ns-timestamps": "",
-      "show-search": "",
+      "show-search": "Resultat av sökning i loggar",
       "show-timestamps": "Visa tidsstämplar",
       "show-unique-labels": "Visa unika etiketter",
       "unwrap-lines": "Ta bort radbrytningar",
@@ -9596,26 +9597,26 @@
         "common-labels": "Vanliga etiketter:"
       }
     },
-    "name-common-labels": "",
-    "name-deduplication": "",
-    "name-details-mode": "",
+    "name-common-labels": "Vanliga etiketter",
+    "name-deduplication": "Avduplicering",
+    "name-details-mode": "Panelläge för loggdetaljer",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "Inline",
+      "label-sidebar": "Sidofält"
     },
-    "name-enable-infinite-scrolling": "",
-    "name-enable-log-details": "",
-    "name-enable-syntax-highlighting": "",
-    "name-font-size": "",
-    "name-order": "",
-    "name-prettify-json": "",
-    "name-show-controls": "",
+    "name-enable-infinite-scrolling": "Aktivera oändlig rullning",
+    "name-enable-log-details": "Aktivera loggdetaljer",
+    "name-enable-syntax-highlighting": "Aktivera syntaxfärgläggning",
+    "name-font-size": "Teckenstorlek",
+    "name-order": "Beställning",
+    "name-prettify-json": "Gör JSON snyggare",
+    "name-show-controls": "Visa kontroller",
     "name-time": "",
-    "name-unique-labels": "",
-    "name-wrap-lines": "",
+    "name-unique-labels": "Unika etiketter",
+    "name-wrap-lines": "Radbryt linjer",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Nyaste först",
+      "label-oldest-first": "Äldsta först"
     },
     "out-of-range-message": {
       "end-of-the-selected-time-range": "Slut på det valda tidsintervallet."
@@ -9630,7 +9631,7 @@
     "un-themed-log-details": {
       "aria-label-data-links": "Datalänkar",
       "aria-label-fields": "Fält",
-      "aria-label-line": "",
+      "aria-label-line": "Loggrad",
       "aria-label-log-level": "Loggnivå",
       "aria-label-no-details": "Inga uppgiftger"
     },
@@ -9651,27 +9652,27 @@
     }
   },
   "logs-new": {
-    "category-logs": "",
+    "category-logs": "Loggar",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Exakt",
+      "label-none": "Ingen",
+      "label-numbers": "Nummer",
+      "label-signature": "Underskrift"
     },
-    "description-infinite-scrolling": "",
-    "description-show-controls": "",
-    "description-syntax-highlighting": "",
-    "name-deduplication": "",
-    "name-enable-log-details": "",
-    "name-infinite-scrolling": "",
-    "name-order": "",
-    "name-show-controls": "",
-    "name-syntax-highlighting": "",
-    "name-time": "",
-    "name-wrap-lines": "",
+    "description-infinite-scrolling": "Experimentellt. Begär fler resultat genom att bläddra till längst ner i logglistan.",
+    "description-show-controls": "Visa kontroller för att hoppa till den sista eller första loggraden och filtrera efter loggnivå",
+    "description-syntax-highlighting": "Använd en fördefinierad syntaxfärgningsgrammatik för att markera relevanta delar av loggraderna",
+    "name-deduplication": "Avduplicering",
+    "name-enable-log-details": "Aktivera loggdetaljer",
+    "name-infinite-scrolling": "Aktivera oändlig rullning",
+    "name-order": "Beställning",
+    "name-show-controls": "Visa kontroller",
+    "name-syntax-highlighting": "Aktivera syntaxfärgläggning",
+    "name-time": "Tid",
+    "name-wrap-lines": "Radbryt linjer",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Nyaste först",
+      "label-oldest-first": "Äldsta först"
     }
   },
   "manage-dashbaords": {
@@ -9698,8 +9699,8 @@
       "updated-on": "Uppdaterat den"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "Är du säker på att du vill radera ”{{snapshotToRemove}}”?",
+      "confirmText-delete": "Radera",
       "title-delete": "Ta bort"
     },
     "unthemed-dashboard-import": {
@@ -9711,14 +9712,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "Namn är obligatoriskt",
+      "message-reserved-name": "Detta är ett reserverat namn och kan inte användas för en mapp.",
+      "message-same-name": "En kontrollpanel eller en mapp med samma namn finns redan",
+      "message-same-name-general": "En mapp eller kontrollpanel i den allmänna mappen med samma namn finns redan"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Inga alternativ hittades"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9868,8 +9869,8 @@
     "resource-details": {
       "dismiss-button": "OK",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Maximalt antal varningsregelgrupper har uppnåtts: Radera några varningsregelgrupper eller uppgradera din plan och försök igen.",
+        "alert-rules-quota-reached": "Maximalt antal varningsregler har uppnåtts: Radera några varningsregler eller uppgradera din plan och försök igen.",
         "dashboard-already-managed": "Instrumentpanelen tillhandahålls och hanteras redan av Grafana i molninstansen. Vi rekommenderar att du använder den tillhandahållna instrumentpanelen framöver. Om du fortfarande vill kopiera instrumentpanelens molninstans ändrar du instrumentpanelens ID i instrumentpanelens JSON, sparar en ny ögonblicksbild och laddar sedan upp på nytt.",
         "datasource-already-managed": "Datakällan tillhandahålls och hanteras redan av Grafana i molninstansen. Om detta är en annan resurs, ange ett annat UID och försök igen.",
         "datasource-invalid-url": "Det finns en datakälla som har en ogiltig webbadress. Ange en giltig webbadress och försök igen.",
@@ -10339,7 +10340,7 @@
     "invite-user": {
       "invite-button": "Bjud in",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Bjud in användare"
     },
     "item": {
       "add-bookmark": "Lägg till bokmärken",
@@ -10371,12 +10372,12 @@
     "rss-button": "Senaste från bloggen"
   },
   "news": {
-    "category-news": "",
-    "description-show-image": "",
-    "description-url": "",
+    "category-news": "Nyheter",
+    "description-show-image": "Kontrollerar om nyhetsobjektets sociala bild (og:image) visas ovanför textinnehållet",
+    "description-url": "Stöder RSS- och Atom-flöden",
     "link-title": "Gå till Grafana Labs blogg",
-    "name-show-image": "",
-    "name-url": "",
+    "name-show-image": "Visa bild",
+    "name-url": "URL",
     "news-panel": {
       "body-error-loading-rss-feed": "Se till att flödes-URL är korrekt och att CORS har konfigurerats korrekt på servern. Se <2>dokumentationen för nyhetspanelen.</2>",
       "loading": "Laddar …",
@@ -10385,27 +10386,27 @@
     "title": "Senaste från bloggen"
   },
   "node-graph": {
-    "category-edges": "",
-    "category-node-graph": "",
-    "category-nodes": "",
+    "category-edges": "Kanter",
+    "category-node-graph": "Nodgraf",
+    "category-nodes": "Noder",
     "layout-algorithm-options": {
-      "description-force": "",
-      "description-grid": "",
-      "description-layered": "",
-      "label-force": "",
-      "label-grid": "",
-      "label-layered": ""
+      "description-force": "Använd en kraftbaserad layout",
+      "description-grid": "Använd en rutnätslayout",
+      "description-layered": "Använd en skiktad layout",
+      "label-force": "Kraft",
+      "label-grid": "Rutnät",
+      "label-layered": "Skiktad"
     },
-    "name-arc-sections": "",
-    "name-layout-algorithm": "",
-    "name-main-stat-unit": "",
-    "name-secondary-stat-unit": "",
-    "name-zoom-mode": "",
+    "name-arc-sections": "Bågsektioner",
+    "name-layout-algorithm": "Layoutalgoritm",
+    "name-main-stat-unit": "Huvudstatistikenhet",
+    "name-secondary-stat-unit": "Sekundär statistikenhet",
+    "name-zoom-mode": "Zoomläge",
     "zoom-mode-options": {
-      "description-cooperative": "",
-      "description-greedy": "",
-      "label-cooperative": "",
-      "label-greedy": ""
+      "description-cooperative": "Gör att du kan rulla på sidan normalt",
+      "description-greedy": "Reagerar på alla zoomgester",
+      "label-cooperative": "Kooperativt",
+      "label-greedy": "Girigt"
     }
   },
   "nodeGraph": {
@@ -10484,40 +10485,40 @@
     },
     "registry": {
       "get-all-option-editors": {
-        "description-time-zone": "",
-        "name-time-zone": ""
+        "description-time-zone": "Val av tidszon",
+        "name-time-zone": "Tidszon"
       },
       "standard-field-condigs": {
-        "category-data-links": ""
+        "category-data-links": "Datalänkar och åtgärder"
       },
       "standard-field-configs": {
-        "category": "",
-        "category-thresholds": "",
-        "category-value-mappings": "",
-        "description-display-name": "",
-        "description-field-min-max": "",
-        "description-max": "",
-        "description-min": "",
-        "description-no-value": "",
-        "description-value-mappings": "",
-        "name-actions": "",
-        "name-ad-hoc": "",
-        "name-color-scheme": "",
-        "name-data-links": "",
-        "name-decimals": "",
-        "name-display-name": "",
-        "name-field-min-max": "",
-        "name-max": "",
-        "name-min": "",
-        "name-no-value": "",
-        "name-thresholds": "",
-        "name-unit": "",
-        "name-value-mappings": "",
-        "placeholder-decimals": "",
-        "placeholder-display-name": "",
-        "placeholder-max": "",
-        "placeholder-min": "",
-        "placeholder-unit": ""
+        "category": "Standardtillval",
+        "category-thresholds": "Trösklar",
+        "category-value-mappings": "Värdemappningar",
+        "description-display-name": "Ändra fält- eller serienamn",
+        "description-field-min-max": "Beräkna min/max per fält",
+        "description-max": "Lämna tomt om du vill beräkna baserat på alla värden",
+        "description-min": "Lämna tomt om du vill beräkna baserat på alla värden",
+        "description-no-value": "Vad som ska visas när det inte finns något värde",
+        "description-value-mappings": "Ändra visningstexten baserat på inmatningsvärdet",
+        "name-actions": "Åtgärder",
+        "name-ad-hoc": "Ad hoc-filtrerbart",
+        "name-color-scheme": "Färgschema",
+        "name-data-links": "Datalänkar",
+        "name-decimals": "Decimaler",
+        "name-display-name": "Visningsnamn",
+        "name-field-min-max": "Fält min/max",
+        "name-max": "Max",
+        "name-min": "Min",
+        "name-no-value": "Inget värde",
+        "name-thresholds": "Trösklar",
+        "name-unit": "Enhet",
+        "name-value-mappings": "Värdemappningar",
+        "placeholder-decimals": "auto",
+        "placeholder-display-name": "inget",
+        "placeholder-max": "auto",
+        "placeholder-min": "auto",
+        "placeholder-unit": "inget"
       }
     },
     "units": {
@@ -10562,7 +10563,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Inga organisationer hittades",
     "select-placeholder": "Välj organisation"
   },
   "page": {
@@ -10626,13 +10627,13 @@
     },
     "panel-data-error-view": {
       "missing-value": {
-        "number": "",
-        "string": "",
-        "time": "",
-        "unknown": ""
+        "number": "Data saknar ett nummerfält",
+        "string": "Data saknar ett strängfält",
+        "time": "Data saknar ett tidsfält",
+        "unknown": "Kan inte visualisera data"
       },
       "no-value": {
-        "default": ""
+        "default": "Inga data"
       },
       "open-visualization-suggestions": "Öppna visualiseringsförslag",
       "switch-to-table": "Byt till tabell"
@@ -10672,25 +10673,25 @@
     "select-placeholder": "Filtrera efter typ"
   },
   "piechart": {
-    "category-legend": "",
-    "category-pie-chart": "",
-    "description-labels": "",
-    "description-pie-chart-type": "",
+    "category-legend": "Förklaringar",
+    "category-pie-chart": "Cirkeldiagram",
+    "description-labels": "Välj de etiketter som ska visas i cirkeldiagrammet",
+    "description-pie-chart-type": "Hur cirkeldiagrammet ska renderas",
     "labels-options": {
-      "label-name": "",
-      "label-percent": "",
-      "label-value": ""
+      "label-name": "Namn",
+      "label-percent": "Procent",
+      "label-value": "Värde"
     },
     "legend-values-options": {
-      "label-percent": "",
-      "label-value": ""
+      "label-percent": "Procent",
+      "label-value": "Värde"
     },
-    "name-labels": "",
-    "name-legend-values": "",
-    "name-pie-chart-type": "",
+    "name-labels": "Etiketter",
+    "name-legend-values": "Förklaringsvärden",
+    "name-pie-chart-type": "Typ av cirkeldiagram",
     "pie-chart-type-options": {
-      "label-donut": "",
-      "label-pie": ""
+      "label-donut": "Munk",
+      "label-pie": "Paj"
     }
   },
   "playlist": {
@@ -10785,7 +10786,7 @@
         "permission": "Du saknar behörighet att visa den här sidan.",
         "title-access-denied": "Åtkomst nekad"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Tilläggsprogrammet kunde inte laddas",
       "no-root-app-page-component-found": "Ingen komponent för rotapplikationssidan hittades"
     },
     "browse": {
@@ -10829,7 +10830,7 @@
         "update-status-text": "plugins uppdaterade"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Är du verkligen säker på att du vill nedgradera till version {{version}}? Du borde normalt inte göra det",
         "downgrade-confirm": "Nedgradera",
         "downgrade-title": "Nedgradera tilläggsversion"
       }
@@ -10858,7 +10859,7 @@
         "dependencies": "Beroenden",
         "documentation": "Dokumentation",
         "downloads": "Nedladdningar",
-        "from": "",
+        "from": "Från",
         "installedVersion": "Installerad version",
         "lastCommitDate": "Senaste åtagandedatum:",
         "latestReleaseDate": "Senaste utgivningsdatum:",
@@ -10884,8 +10885,8 @@
       "message": "Inga tilläggsprogram hittades"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Kontrollera konsolen för mer information om felet.",
+      "extension-error-alert-title": "Tillägg kunde inte laddas: ”{{pluginId}}/{{extensionTitle}}”"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10922,13 +10923,13 @@
     "install-controls-button": {
       "title-uninstall-modal": "Avinstallera {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Är du säker på att du vill avinstallera detta tillägg?",
+        "confirmText-confirm": "Bekräfta"
       }
     },
     "install-controls-warning": {
       "body-not-published": "Detta tillägg har inte publicerat på <2>grafana.com/plugins</2> och kan inte hanteras via katalogen.",
-      "enterprise-plugin-info": "",
+      "enterprise-plugin-info": "Detta tillägg är endast tillgängligt i Grafana Cloud och Grafana Enterprise.",
       "learn-more": "Läs mer",
       "no-valid-grafana-enterprise-license-detected": "Ingen giltig Grafana Enterprise-licens upptäcktes.",
       "title-dev-alert": "Detta är en utvecklingsversion av tillägget och kan inte avinstalleras.",
@@ -10941,6 +10942,9 @@
       "label-plugin-id": "Tilläggs-ID",
       "label-severity": "Allvarlighetsgrad"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Detta plugin-program kan inte hittas. Kontrollera att webbadressen är korrekt eller <1></1>gå till <3>plugin-katalogen</3>.",
       "title-plugin-not-found": "Plugin hittades inte"
@@ -11086,40 +11090,40 @@
   },
   "provisioned-resource-form": {
     "save-or-delete-resource-shared-fields": {
-      "comment-placeholder-describe-changes-optional": "",
-      "description-branch-name-in-git-hub": "",
+      "comment-placeholder-describe-changes-optional": "Lägg till en anteckning för att beskriva dina ändringar (valfritt)",
+      "description-branch-name-in-git-hub": "Grennamn i GitHub",
       "description-inside-repository": "",
-      "label-branch": "",
-      "label-comment": "",
-      "label-path": "",
-      "label-workflow": ""
+      "label-branch": "Gren",
+      "label-comment": "Kommentar",
+      "label-path": "Sökväg",
+      "label-workflow": "Arbetsflöde"
     }
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Den här resursen ligger bakom grenen i {{repoType}}.",
+      "not-saved": "Resten av Grafana-användarna i din organisation kommer fortfarande att se den aktuella versionen som sparats i den konfigurerade standardgrenen tills den här grenen slås samman",
+      "open-in-repo-button": "Öppna i {{repoType}}",
+      "open-pull-request-in-repo": "Öppna pull-begäran i {{repoType}}",
+      "view-in-repo-button": "Visa den i {{repoType}} för att se de senaste ändringarna.",
+      "view-pull-request-in-repo": "Visa pull-begäran i {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "En ny resurs har skapats i en gren i {{repoType}}.",
+    "title-loaded-pull-request-in-repo": "Den här resursen laddas från den gren du just skapade i {{repoType}} och den är bara synlig för dig"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Resursen har sparats",
+  "provisioned-resource-request-handler-dashboard": "Kontrollpanel sparades framgångsrikt",
+  "provisioned-resource-request-handler-folder": "Mappen skapades",
   "provisioning": {
     "banner": {
       "message": "Den här funktionen är för närvarande under aktiv utveckling. För den bästa upplevelsen och de senaste förbättringarna rekommenderar vi att du använder <2> nightly-versionen</2> av Grafana."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Grenen som ska användas för provisionering",
+      "branch-label": "Gren",
+      "branch-required": "Gren krävs",
+      "path-description": "Valfri sökväg till underkatalog på lagringsplatsen",
+      "path-label": "Sökväg",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11128,18 +11132,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Tillåter användare att välja om de vill öppna en pull-begäran när de sparar ändringar. Om lagringsplatsen inte tillåter direkta ändringar i huvudgrenen kan en pull-begäran fortfarande krävas.",
+      "pr-workflow-label": "Aktivera alternativ för hämtningsbegäran när du sparar",
+      "token-description": "Bitbucket-applösenord med behörigheter för lagringsplats",
+      "token-label": "App-lösenord",
+      "token-required": "Bitbucket-token krävs",
+      "token-user-description": "Det användarnamn som kommer att användas för att komma åt lagringsplatsen med appens lösenord",
+      "token-user-label": "Användarnamn",
+      "token-user-required": "Användarnamn krävs",
+      "url-description": "Webbadress för Bitbucket-lagringsplatsen",
+      "url-label": "Webbadress för lagringsplats",
+      "url-pattern": "Måste vara en giltig webbadress för Bitbucket-lagringsplatsen",
+      "url-required": "Webbadress för lagringsplats krävs"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Lägg till ett tydligt namn för den här lagringsplatsanslutningen",
@@ -11150,12 +11154,12 @@
       "label-display-name": "Visningsnamn",
       "placeholder-my-repository-connection": "Min lagringsplatsanslutning",
       "text-loading-resource-information": "Läser in resursinformation …",
-      "dashboards-count_one": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} kontrollpanel",
+      "dashboards-count_other": "{{count}} kontrollpanel",
       "files-count_one": "{{count}} filer",
       "files-count_other": "{{count}} filer",
-      "folders-count_one": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} mapp",
+      "folders-count_other": "{{count}} mapp"
     },
     "check-repository": {
       "check": "Kolla"
@@ -11229,7 +11233,7 @@
       "title-instant-updates-requests-webhooks": "Omedelbara uppdateringar och pull-förfrågningar med webhooks.",
       "title-visual-previews-in-pull-requests": "Visuella förhandsgranskningar i pull-förfrågningar med bildrendering"
     },
-    "error-title-default": "",
+    "error-title-default": "Fel",
     "expanded-row": {
       "job-specification": "Jobbeskrivning",
       "summary": "Sammanfattning"
@@ -11238,8 +11242,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Konfigurera obligatoriska funktionsväxlare"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Hantera kontrollpaneler som kod i Git och provisionering av uppdateringar automatiskt",
+      "manage-your-dashboards-with-remote-provisioning": "Kom igång med Git Sync",
       "store-dashboards-in-version-controlled-storage": "Lagra instrumentpaneler med versionsstyrd lagring för bättre organisering och historikspårning"
     },
     "file-history-page": {
@@ -11260,16 +11264,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Lägger till en förhandsgranskning av ändringar i instrumentpanelen för pull-förfrågningar. Bilder av dina Grafana-instrumentpaneler kommer att delas på din Git-lagringsplats och vara synliga för alla med lagringsåtkomst.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Skapa förhandsgranskningslänkar för pull-begäranden",
       "description-image-rendering": "Kräver bildrendering. <2>Konfigurera bildrendering</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(kräver <2>bildrendering</2> och att offentlig åtkomst är aktiverad)",
       "description-read-only": "Resurser kan inte ändras via Grafana.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Hur ofta ändringar ska synkroniseras från lagringsplatsen",
+      "error-sync-interval-required": "Synkroniseringsintervall är obligatoriskt",
       "label-enable-previews": "Aktivera förhandsgranskningar av panelen i pull-förfrågningar",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Generera förhandsgranskningar av kontrollpanelen",
       "label-read-only": "Skrivskyddad",
-      "label-sync-interval": ""
+      "label-sync-interval": "Synkroniseringsintervall (sekunder)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Inga resultat som matchar din fråga",
@@ -11301,46 +11305,46 @@
       "subtitle-provisioning-feature": "Visa och hantera dina provisioneringsanslutningar"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Grenen som ska användas för provisionering",
+      "branch-label": "Gren",
+      "branch-required": "Gren krävs",
+      "path-description": "Valfri sökväg till underkatalog på lagringsplatsen",
+      "path-label": "Sökväg",
+      "pr-workflow-description": "Tillåter användare att välja om de vill öppna en pull-begäran när de sparar ändringar. Om lagringsplatsen inte tillåter direkta ändringar i huvudgrenen kan en pull-begäran fortfarande krävas.",
+      "pr-workflow-label": "Aktivera alternativ för hämtningsbegäran när du sparar",
+      "token-description": "Åtkomsttoken eller lösenord för Git-lagringsplats",
+      "token-label": "Åtkomsttoken",
+      "token-required": "Git-token krävs",
+      "token-user-description": "Det användarnamn som kommer att användas för att komma åt lagringsplatsen med åtkomsttoken",
+      "token-user-label": "Användarnamn",
+      "token-user-required": "Användarnamn krävs",
+      "url-description": "Webbadress för Git-lagringsplatsen",
+      "url-label": "Webbadress för lagringsplats",
+      "url-pattern": "Måste vara en giltig webbadress för Git-lagringsplats",
+      "url-required": "Webbadress för lagringsplats krävs"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Grenen som ska användas för provisionering",
+      "branch-label": "Gren",
+      "branch-required": "Gren krävs",
+      "path-description": "Valfri sökväg till underkatalog på lagringsplatsen",
+      "path-label": "Sökväg",
+      "pr-workflow-description": "Tillåter användare att välja om de vill öppna en pull-begäran när de sparar ändringar. Om lagringsplatsen inte tillåter direkta ändringar i huvudgrenen kan en pull-begäran fortfarande krävas.",
+      "pr-workflow-label": "Aktivera alternativ för hämtningsbegäran när du sparar",
+      "token-description": "Personlig accesskod för GitHub med behörigheter för lagringsplats",
+      "token-label": "Personlig accesskod",
+      "token-required": "GitHub-token krävs",
+      "url-description": "Webbadress för GitHub-lagringsplatsen",
+      "url-label": "Webbadress för lagringsplats",
+      "url-pattern": "Måste vara en giltig webbadress för GitHub-lagringsplats",
+      "url-required": "Webbadress för lagringsplats krävs"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Grenen som ska användas för provisionering",
+      "branch-label": "Gren",
+      "branch-required": "Gren krävs",
+      "path-description": "Valfri sökväg till underkatalog på lagringsplatsen",
+      "path-label": "Sökväg",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11349,15 +11353,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Tillåter användare att välja om de vill öppna en sammanslagningsbegäran när de sparar ändringar. Om lagringsplatsen inte tillåter direkta ändringar i huvudgrenen kan en sammanslagningsbegäran fortfarande krävas.",
+      "pr-workflow-label": "Aktivera alternativ för sammanslagningsbegäran när du sparar",
+      "token-description": "Accesskod för GitLab-projekt med behörigheter för lagringsplats",
+      "token-label": "Projektåtkomsttoken",
+      "token-required": "GitLab-token krävs",
+      "url-description": "Webbadress för GitLab-lagringsplatsen",
+      "url-label": "Webbadress för lagringsplats",
+      "url-pattern": "Måste vara en giltig webbadress för GitLab-lagringsplats",
+      "url-required": "Webbadress för lagringsplats krävs"
     },
     "history-view": {
       "not-found": "Hittades inte"
@@ -11385,18 +11389,18 @@
       "starting": "Startar …",
       "status": {
         "title-error-running-job": "Ett fel uppstod när ett jobb kördes",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "Jobbet har slutförts",
+        "title-warning-running-job": "Jobbet slutfördes med varningar"
       },
       "summary": "Sammanfattning",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Fel vid hämtning av aktivt jobb"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Lokal filsystemväg till lagringsplatsen",
+      "path-label": "Sökväg till lagringsplats",
+      "path-required": "Sökväg till lagringsplats krävs"
     },
     "mode-options": {
       "folder": {
@@ -11422,7 +11426,7 @@
     },
     "repository-actions": {
       "settings": "Inställningar",
-      "source-code": ""
+      "source-code": "Källkod"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11488,22 +11492,22 @@
       "title-queued-for-deletion": "Köad för radering"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Välj en leverantör:",
+      "configure-file": "Konfigurera provisionering med filer",
+      "configure-with-provider": "Konfigurera med {{ provider }}",
+      "provider-not-listed": "Om din leverantör inte är listad:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Anslut till Bitbucket-lagringsplatser",
+      "github": "GitHub",
+      "github-description": "Anslut till GitHub-lagringsplatser",
+      "gitlab": "GitLab",
+      "gitlab-description": "Anslut till GitLab-lagringsplatser",
+      "local": "Lokal",
+      "local-description": "Konfigurera provisionering med filer",
+      "pure-git": "Ren Git",
+      "pure-git-description": "Anslut till valfri Git-lagringsplats"
     },
     "resource-view": {
       "base": "Bas",
@@ -11534,11 +11538,11 @@
       "label-current-step": "Nuvarande steg",
       "label-pending-step": "Väntande steg"
     },
-    "success-title-default": "",
+    "success-title-default": "Lyckades",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "Misslyckades att starta",
+      "error-no-repository-name": "Inget lagringsplatsnamn angivet",
+      "error-starting-job": "Fel vid start av jobb"
     },
     "sync-repository": {
       "body-edit-configuration": "Redigera konfigurationen",
@@ -11566,7 +11570,7 @@
       "go-to": "Gå till",
       "make-sure": "Se till att inkludera dessa behörigheter"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Varning",
     "wizard": {
       "alert-point-1": "Resurser kan inte skapas, redigeras eller raderas under den här processen. I det sista steget kommer de att försvinna.",
       "alert-point-2": "När provisionering är klar kommer resurserna att visas igen och kan hanteras via extern lagring.",
@@ -11576,10 +11580,10 @@
       "button-next": "Slutför",
       "button-start": "Påbörja synkronisering",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Detta kommer att radera lagringsplatskonfigurationen och du kommer att förlora alla ändringar. Är du säker på att du vill kassera dina ändringar?",
+        "confirm": "Ja, kassera",
+        "dismiss": "Fortsätta jobba",
+        "title": "Kassera lagringsplatsinställningen?"
       },
       "step-bootstrap": "Välj vad du vill synkronisera",
       "step-connect": "Anslut",
@@ -11595,7 +11599,7 @@
     "wizard-content": {
       "button-cancel": "Avbryt",
       "button-cancelling": "Avbryter …",
-      "button-previous": "",
+      "button-previous": "Föregående",
       "button-submitting": "Skickar …",
       "error-instance-repository-exists": "Instanslagringsplatsen finns redan"
     }
@@ -11996,7 +12000,7 @@
         "recommended": "Rekommenderas",
         "results": "Resultat"
       },
-      "search": ""
+      "search": "Sök {{parentTitle}}"
     }
   },
   "search": {
@@ -12077,7 +12081,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Inga servicekonton hittades",
     "select-aria-label": "Servicekontoväljare",
     "select-placeholder": "Börja skriva för att söka efter servicekonton"
   },
@@ -12123,10 +12127,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Lägg till servicekontotoken",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Vill du verkligen radera detta servicekonto?",
+      "body-disable-service-account": "Vill du verkligen inaktivera detta servicekonto?",
+      "confirmText-delete-service-account": "Radera servicekonto",
+      "confirmText-disable-service-account": "Inaktivera servicekonto",
       "delete-service-account": "Radera servicekonto",
       "disable-service-account": "Inaktivera servicekonto",
       "enable-service-account": "Aktivera servicekonto",
@@ -12153,7 +12157,7 @@
       "used-by": "Använd av"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Spara",
       "edit": "Redigera"
     },
     "service-account-role-row": {
@@ -12167,16 +12171,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Lägg till servicekonto",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "Är du säker på att du vill radera {{serviceAccountName}}?",
+      "body-disable-service-account": "Är du säker på att du vill inaktivera ”{{accountToDisable}}”?",
+      "confirmText-delete": "Radera",
+      "confirmText-disable-service-account": "Inaktivera servicekonto",
       "placeholder-search-service-account-by-name": "Sök servicekonto efter namn",
       "sub-title": "Servicekonton och deras token kan användas för att autentisera mot Grafana API. Läs mer i vår <2>dokumentation.</2>",
       "title-delete-service-account": "Radera servicekonto",
       "title-disable-service-account": "Inaktivera servicekonto",
-      "body-delete_one": "",
-      "body-delete_other": ""
+      "body-delete_one": "Är du säker på att du vill radera {{serviceAccountName}} och {{count}} tillhörande token?",
+      "body-delete_other": "Är du säker på att du vill radera {{serviceAccountName}} och {{count}} tillhörande token?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Denna token har löpt ut",
@@ -12190,7 +12194,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Exportera som bild",
       "export-json-title": "Exportera som JSON",
       "share-externally-title": "Dela externt",
       "share-internally-title": "Dela internt",
@@ -12227,17 +12231,17 @@
       "view-button-yaml": "Visa YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Bildexportåtgärder",
+      "cancel-button": "Avbryt",
+      "download-button": "Ladda ner bild",
+      "error-title": "Det gick inte att generera bild",
+      "generate-button": "Generera bild",
+      "generating": "Genererar bild …",
+      "info-text": "Spara denna kontrollpanel som en bild",
+      "preview": "Förhandsgranska",
+      "preview-aria": "Genererad bildförhandsvisning",
+      "preview-region": "Bildförhandsvisning",
+      "title": "Exportera som bild"
     },
     "library": {
       "info": "Skapa bibliotekspanel."
@@ -12247,7 +12251,7 @@
       "info-text": "Skapa en direktlänk till denna instrumentpanel eller panel, anpassad med alternativen nedan.",
       "link-url": "Länkens webbadress",
       "render-alert": "Tilläggsprogram för bildrendering inte installerat",
-      "render-instructions": "",
+      "render-instructions": "För att rendera en bild måste du installera <2>Grafanas bildrenderingstillägg</2>. Kontakta din Grafana-administratör för installation av tillägget.",
       "rendered-image": "Direktlänk till renderad bild",
       "save-alert": "Instrumentpanelen sparades inte",
       "save-dashboard": "För att rendera en panelbild måste du spara instrumentpanelen först.",
@@ -12315,11 +12319,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Spara kontrollpanelen för att aktivera bildgenerering",
+    "download-disabled-help": "Generera en bild först för att aktivera nedladdning",
+    "error-title": "Det gick inte att generera bild",
     "form": {
-      "label": ""
+      "label": "Inställningar för panelbild"
     },
     "preview": {
       "title": "Panelförhandsgranskning"
@@ -12480,112 +12484,112 @@
   },
   "stat": {
     "add-orientation-option": {
-      "description-orientation": "",
-      "name-orientation": "",
+      "description-orientation": "Layoutorientering",
+      "name-orientation": "Orientering",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-vertical": ""
+        "label-auto": "Auto",
+        "label-horizontal": "Horisontellt",
+        "label-vertical": "Vertikalt"
       }
     },
     "add-standard-data-reduce-options": {
-      "category-value-options": "",
-      "description-calculation": "",
-      "description-fields": "",
-      "description-limit": "",
-      "description-show": "",
+      "category-value-options": "Värdealternativ",
+      "description-calculation": "Välj en reduceringsfunktion/beräkning",
+      "description-fields": "Välj de fält som ska inkluderas i panelen",
+      "description-limit": "Max antal rader att visa",
+      "description-show": "Beräkna ett enda värde per kolumn eller serie eller visa varje rad",
       "fields-options": {
-        "label-all-fields": "",
-        "label-numeric-fields": ""
+        "label-all-fields": "Alla fält",
+        "label-numeric-fields": "Numeriska fält"
       },
-      "name-calculation": "",
-      "name-fields": "",
-      "name-limit": "",
-      "name-show": "",
+      "name-calculation": "Beräkning",
+      "name-fields": "Fält",
+      "name-limit": "Gräns",
+      "name-show": "Visa",
       "show-options": {
-        "label-all-values": "",
-        "label-calculate": ""
+        "label-all-values": "Alla värden",
+        "label-calculate": "Beräkna"
       }
     },
-    "category-stat-styles": "",
+    "category-stat-styles": "Stat-stilar",
     "color-mode-options": {
-      "label-background-gradient": "",
-      "label-background-solid": "",
-      "label-none": "",
-      "label-value": ""
+      "label-background-gradient": "Bakgrundstoning",
+      "label-background-solid": "Bakgrundsfärg",
+      "label-none": "Ingen",
+      "label-value": "Värde"
     },
-    "description-graph-mode": "",
-    "description-text-mode": "",
+    "description-graph-mode": "Stat-panelgraf/sparkline-läge",
+    "description-text-mode": "Kontrollera om namn och värde visas eller bara namn",
     "graph-mode": {
       "options": {
-        "label-area": "",
-        "label-none": ""
+        "label-area": "Yta",
+        "label-none": "Ingen"
       }
     },
     "name-color-modcolor-mode-options": {
-      "label": ""
+      "label": "Färgläge"
     },
-    "name-graph-mode": "",
-    "name-show-percent-change": "",
-    "name-text-alignment": "",
-    "name-text-mode": "",
-    "name-wide-layout": "",
-    "percent-change-color-mode": "",
+    "name-graph-mode": "Diagramläge",
+    "name-show-percent-change": "Visa procentuell förändring",
+    "name-text-alignment": "Text justering",
+    "name-text-mode": "Textläge",
+    "name-wide-layout": "Bred layout",
+    "percent-change-color-mode": "Färgläge för procentuell förändring",
     "percent-change-color-mode-options": {
-      "label-inverted": "",
-      "label-same-as-value": "",
-      "label-standard": ""
+      "label-inverted": "Omvänd",
+      "label-same-as-value": "Samma som värde",
+      "label-standard": "Standard"
     },
     "text-alignment-options": {
-      "label-auto": "",
-      "label-center": ""
+      "label-auto": "Auto",
+      "label-center": "Centrera"
     },
     "text-mode-options": {
-      "label-auto": "",
-      "label-name": "",
-      "label-none": "",
-      "label-value": "",
-      "label-value-and-name": ""
+      "label-auto": "Auto",
+      "label-name": "Namn",
+      "label-none": "Ingen",
+      "label-value": "Värde",
+      "label-value-and-name": "Värde och namn"
     },
     "wide-layout-options": {
-      "label-off": "",
-      "label-on": ""
+      "label-off": "Av",
+      "label-on": "På"
     }
   },
   "state-timeline": {
     "align-values-options": {
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-center": "Centrera",
+      "label-left": "Vänster",
+      "label-right": "Höger"
     },
-    "category-state-timeline": "",
-    "name-align-values": "",
-    "name-connect-null-values": "",
-    "name-disconnect-values": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-merge-equal-consecutive-values": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-state-timeline": "Ange tidslinje",
+    "name-align-values": "Justera värden",
+    "name-connect-null-values": "Anslut nollvärden",
+    "name-disconnect-values": "Koppla bort värden",
+    "name-fill-opacity": "Fyllningsopacitet",
+    "name-line-width": "Linjebredd",
+    "name-merge-equal-consecutive-values": "Slå samman på varandra följande lika värden",
+    "name-page-size": "Sidstorlek (aktivera sidnumrering)",
+    "name-row-height": "Radhöjd",
+    "name-show-values": "Visa värden",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Alltid",
+      "label-auto": "Auto",
+      "label-never": "Aldrig"
     }
   },
   "status-history": {
-    "category-status-history": "",
-    "name-column-width": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-status-history": "Statushistorik",
+    "name-column-width": "Kolumnbredd",
+    "name-fill-opacity": "Fyllningsopacitet",
+    "name-line-width": "Linjebredd",
+    "name-page-size": "Sidstorlek (aktivera sidnumrering)",
+    "name-row-height": "Radhöjd",
+    "name-show-values": "Visa värden",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Alltid",
+      "label-auto": "Auto",
+      "label-never": "Aldrig"
     },
     "status-history-panel": {
       "too-many-points_one": "För många punkter för att visualisera ordentligt. <1></1>Uppdatera frågan för att returnera färre punkter. <3></3>({{count}} punkter mottagna)",
@@ -12625,26 +12629,26 @@
       "label-gauge-display-mode": "Mätarvisningsläge",
       "label-value-display": "Värdevisning"
     },
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Cellalternativ",
+    "category-table": "Tabell",
+    "category-table-footer": "Tabellsidfot",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Stor",
+      "label-medium": "Medium",
+      "label-small": "Litet"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "Åtgärder",
+      "auto": "Auto",
+      "color-background": "Färgad bakgrund",
+      "color-text": "Färgad text",
+      "data-links": "Datalänkar",
+      "gauge": "Mätare",
+      "image": "Image",
+      "json": "JSON-vy",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Piller",
+      "sparkline": "Miniatyrdiagram"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "Om valt kommer hela raden att färgas som denna cell skulle vara.",
@@ -12657,23 +12661,23 @@
       "wrap-text": "Radbryt text"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Auto",
+      "label-center": "Centrera",
+      "label-left": "Vänster",
+      "label-right": "Höger"
     },
     "container": {
       "content": "Om för många kolumner visas i en enda tabell kan prestandan påverkas och data kan bli svårare att läsa. Överväg att förfina dina frågor.",
       "show-all-series": "Visa alla kolumner",
       "show-only-series": "Visar endast {{MAX_NUMBER_OF_COLUMNS}} kolumner"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
-    "description-min-column-width": "",
-    "description-wrap-header-text": "",
+    "description-calculation": "Välj en reduceringsfunktion/beräkning",
+    "description-cell-value-inspect": "Aktivera cellvärdesinspektion i ett modalt fönster",
+    "description-column-filter": "Aktiverar/inaktiverar fältfilter i tabellen",
+    "description-count-rows": "Visa ett enda antal för alla datarader",
+    "description-fields": "Välj de fält som ska beräknas",
+    "description-min-column-width": "Minsta bredd för automatisk storleksändring av kolumn",
+    "description-wrap-header-text": "Aktiverar radbyte för kolumnrubriker",
     "image-cell-options-editor": {
       "description-alt-text": "Alternativ text som kommer att visas om en bild inte kan visas eller för användare som använder en skärmläsare",
       "description-title-text": "Text som visas när muspekaren hålls över bilden",
@@ -12687,66 +12691,66 @@
       },
       "label-dynamic-height": ""
     },
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-paginations": "",
-    "name-fields": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "name-wrap-header-text": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": "",
+    "name-calculation": "Beräkning",
+    "name-cell-height": "Cellhöjd",
+    "name-cell-type": "Celltyp",
+    "name-cell-value-inspect": "Inspektion av cellvärde",
+    "name-column-alignment": "Kolumnjustering",
+    "name-column-filter": "Kolumnfilter",
+    "name-column-width": "Kolumnbredd",
+    "name-count-rows": "Antal rader",
+    "name-enable-paginations": "Aktivera sidindelning",
+    "name-fields": "Fält",
+    "name-hide-in-table": "Dölj i tabell",
+    "name-min-column-width": "Minsta kolumnbredd",
+    "name-show-table-footer": "Visa tabellsidfot",
+    "name-show-table-header": "Visa tabellsidhuvud",
+    "name-wrap-header-text": "Radbryt rubriktext",
+    "placeholder-column-width": "auto",
+    "placeholder-fields": "Alla numeriska fält",
     "text-wrap-options": {
       "label-wrap-text": ""
     }
   },
   "table-new": {
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Cellalternativ",
+    "category-table": "Tabell",
+    "category-table-footer": "Tabellsidfot",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Stor",
+      "label-medium": "Medium",
+      "label-small": "Litet"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Auto",
+      "label-center": "Centrera",
+      "label-left": "Vänster",
+      "label-right": "Höger"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
+    "description-calculation": "Välj en reduceringsfunktion/beräkning",
+    "description-cell-value-inspect": "Aktivera cellvärdesinspektion i ett modalt fönster",
+    "description-column-filter": "Aktiverar/inaktiverar fältfilter i tabellen",
+    "description-count-rows": "Visa ett enda antal för alla datarader",
+    "description-fields": "Välj de fält som ska beräknas",
     "description-frozen-columns": "",
-    "description-min-column-width": "",
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-pagination": "",
-    "name-fields": "",
+    "description-min-column-width": "Minsta bredd för automatisk storleksändring av kolumn",
+    "name-calculation": "Beräkning",
+    "name-cell-height": "Cellhöjd",
+    "name-cell-type": "Celltyp",
+    "name-cell-value-inspect": "Inspektion av cellvärde",
+    "name-column-alignment": "Kolumnjustering",
+    "name-column-filter": "Kolumnfilter",
+    "name-column-width": "Kolumnbredd",
+    "name-count-rows": "Antal rader",
+    "name-enable-pagination": "Aktivera sidindelning",
+    "name-fields": "Fält",
     "name-frozen-columns": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": ""
+    "name-hide-in-table": "Dölj i tabell",
+    "name-min-column-width": "Minsta kolumnbredd",
+    "name-show-table-footer": "Visa tabellsidfot",
+    "name-show-table-header": "Visa tabellsidhuvud",
+    "placeholder-column-width": "auto",
+    "placeholder-fields": "Alla numeriska fält"
   },
   "tag-filter": {
     "clear-button": "Rensa taggar",
@@ -12757,7 +12761,7 @@
     "tag-option-label": "Etikettalternativ"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Inga team hittades",
     "select-aria-label": "Teamväljare",
     "select-placeholder": "Välj ett team"
   },
@@ -12831,17 +12835,17 @@
     }
   },
   "text": {
-    "category-text": "",
+    "category-text": "Text",
     "mode-options": {
-      "label-code": "",
-      "label-html": "",
-      "label-markdown": ""
+      "label-code": "Kod",
+      "label-html": "HTML",
+      "label-markdown": "Markdown"
     },
-    "name-content": "",
-    "name-language": "",
-    "name-mode": "",
-    "name-show-line-numbers": "",
-    "name-show-mini-map": ""
+    "name-content": "Innehåll",
+    "name-language": "Språk",
+    "name-mode": "Läge",
+    "name-show-line-numbers": "Visa radnummer",
+    "name-show-mini-map": "Visa minikarta"
   },
   "theme-preview": {
     "breadcrumbs": {
@@ -12889,7 +12893,7 @@
       "apply-button": "Tillämpa tidsintervall",
       "default-error": "Ange ett tidigare datum eller ”{{now}}”",
       "fiscal-year": "Räkenskapsår: {{from}}–{{to}}",
-      "from-input": "",
+      "from-input": "Från",
       "open-input-calendar": "Öppna kalendern",
       "range-error": "”Från” kan inte vara efter ”Till”",
       "to-input": "Till"
@@ -12907,7 +12911,7 @@
       "aria-role": "Val av tidsintervall",
       "default-title": "Tidsintervall",
       "example-title": "Exempel på tidsintervall",
-      "from-label": "",
+      "from-label": "Från",
       "from-to": "{{timeOptionFrom}} till {{timeOptionTo}}",
       "specify": "Ange tidsintervall",
       "submit-button-label": "Knapp för att skicka TimePicker",
@@ -12920,8 +12924,8 @@
   },
   "timeline": {
     "missing-field": {
-      "all": "",
-      "time": ""
+      "all": "Inga graferbara fält",
+      "time": "Data har inget tidsfält"
     }
   },
   "timeseries": {
@@ -12939,54 +12943,54 @@
       "tooltip-delete": "Radera",
       "tooltip-edit": "Redigera"
     },
-    "category-axis": "",
+    "category-axis": "Axel",
     "config": {
       "get-graph-field-config": {
-        "aria-label-bar-width-factor": "",
-        "aria-label-fill-opacity": "",
-        "aria-label-line-width": "",
-        "aria-label-point-size": "",
-        "category-graph-styles": "",
-        "category-thresholds": "",
-        "name-bar-alignment": "",
-        "name-bar-width-factor": "",
-        "name-connect-nulls": "",
-        "name-disconnect-values": "",
-        "name-fill-below-to": "",
-        "name-fill-opacity": "",
-        "name-gradient-mode": "",
-        "name-line-interpolation": "",
-        "name-line-style": "",
-        "name-line-width": "",
-        "name-point-size": "",
-        "name-show-points": "",
-        "name-show-thresholds": "",
-        "name-style": "",
-        "name-transform": "",
+        "aria-label-bar-width-factor": "Breddfaktor för stapel",
+        "aria-label-fill-opacity": "Fyllningsopacitet",
+        "aria-label-line-width": "Linjebredd",
+        "aria-label-point-size": "Punktstorlek",
+        "category-graph-styles": "Diagramstilar",
+        "category-thresholds": "Trösklar",
+        "name-bar-alignment": "Stapeljustering",
+        "name-bar-width-factor": "Breddfaktor för stapel",
+        "name-connect-nulls": "Anslut nollvärden",
+        "name-disconnect-values": "Koppla bort värden",
+        "name-fill-below-to": "Fyll i nedan till",
+        "name-fill-opacity": "Fyllningsopacitet",
+        "name-gradient-mode": "Toningsläge",
+        "name-line-interpolation": "Linjeinterpolering",
+        "name-line-style": "Linjestil",
+        "name-line-width": "Linjebredd",
+        "name-point-size": "Punktstorlek",
+        "name-show-points": "Visa poäng",
+        "name-show-thresholds": "Visa trösklar",
+        "name-style": "Stil",
+        "name-transform": "Omvandla",
         "transform-options": {
-          "description-constant": "",
-          "description-style": "",
-          "label-constant": "",
-          "label-style": ""
+          "description-constant": "Det första värdet kommer att visas som en fast linje",
+          "description-style": "Vänd resultaten till negativa värden på y-axeln",
+          "label-constant": "Konstant",
+          "label-style": "Negativt Y"
         }
       }
     },
     "insert-nulls-editor": {
       "disconnect-options": {
-        "label-never": "",
-        "label-threshold": ""
+        "label-never": "Aldrig",
+        "label-threshold": "Tröskel"
       }
     },
     "line-style-editor": {
       "line-fill-options": {
-        "label-dash": "",
-        "label-dots": "",
-        "label-solid": ""
+        "label-dash": "Kontrollpanel",
+        "label-dots": "Punkter",
+        "label-solid": "Solid"
       },
       "title-the-input-expects-a-segment-list": "Inmatningen förväntar sig en segmentlista",
       "tooltip-help": "Hjälp"
     },
-    "name-time-zone": "",
+    "name-time-zone": "Tidszon",
     "nulls-threshold-input": {
       "placeholder-never": "Aldrig"
     },
@@ -12996,9 +13000,9 @@
     },
     "span-nulls-editor": {
       "gaps-options": {
-        "label-always": "",
-        "label-never": "",
-        "label-threshold": ""
+        "label-always": "Alltid",
+        "label-never": "Aldrig",
+        "label-threshold": "Tröskel"
       }
     },
     "timezones-editor": {
@@ -13007,17 +13011,17 @@
     }
   },
   "traces": {
-    "category-span-filters": "",
-    "name-critical-path-only": "",
-    "name-find-in-trace": "",
-    "name-max-duration": "",
-    "name-min-duration": "",
-    "name-service-name": "",
-    "name-service-name-operator": "",
-    "name-show-matches-only": "",
-    "name-span-name": "",
-    "name-span-name-operator": "",
-    "name-tags": "",
+    "category-span-filters": "Intervallfilter",
+    "name-critical-path-only": "Visa endast kritisk linje",
+    "name-find-in-trace": "Hitta i spårning",
+    "name-max-duration": "Maximal varaktighet",
+    "name-min-duration": "Minimal varaktighet",
+    "name-service-name": "Namn på tjänst",
+    "name-service-name-operator": "Operator för tjänstnamn",
+    "name-show-matches-only": "Visa endast matchningar",
+    "name-span-name": "Intervallnamn",
+    "name-span-name-operator": "Operator för intervallnamn",
+    "name-tags": "Taggar",
     "traces-panel": {
       "no-data-found-in-response": "Inga data hittades i svaret"
     }
@@ -13032,20 +13036,20 @@
     "axis-editor": {
       "log-mode-options": {
         "description": {
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-size": "Dela upp grupperna baserat på storlek"
         },
         "label": {
-          "split": ""
+          "split": "Dela"
         }
       },
       "mode-options": {
         "description": {
-          "split-the-buckets-based-on-count": "",
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-count": "Dela upp grupperna baserat på antal",
+          "split-the-buckets-based-on-size": "Dela upp grupperna baserat på storlek"
         },
         "label": {
-          "count": "",
-          "size": ""
+          "count": "Räknare",
+          "size": "Storlek"
         }
       },
       "placeholder-auto": "Auto"
@@ -13061,15 +13065,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "Binär operation",
+          "reduce-row": "Minska rad",
+          "row-index": "Radindex",
+          "unary-operation": "Unär operation"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Kumulativa funktioner",
+        "window-functions": "Fönsterfunktioner"
       },
       "label-alias": "Alias",
       "label-mode": "Läge",
@@ -13077,9 +13081,9 @@
     },
     "calculate-heatmap": {
       "add-heatmap-calculation-options": {
-        "name-x-bucket": "",
-        "name-y-bucket": "",
-        "name-y-bucket-scale": ""
+        "name-x-bucket": "X-grupp",
+        "name-y-bucket": "Y-grupp",
+        "name-y-bucket-scale": "Y-gruppskala"
       }
     },
     "concatenate-transformer-editor": {
@@ -13087,9 +13091,9 @@
       "label-name": "Namn",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Kopiera ramnamn till fältnamn",
+          "ignore-the-frame-name": "Ignorera ramnamnet",
+          "label-frame": "Lägg till en etikett med ramnamnet"
         }
       },
       "placeholder-frame": "Ram"
@@ -13102,9 +13106,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Lägg till en transformering för att konvertera fälttyp",
       "aria-label-remove-convert-field-type-transformer": "Ta bort transformering för att konvertera fälttyp",
-      "convert-field-type": "",
+      "convert-field-type": "Konvertera fälttyp",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Konvertera ett fält till en angiven fälttyp."
       },
       "label": {
         "browser": "Webbläsare",
@@ -13117,11 +13121,11 @@
       "label-join-with": "Sammanfoga med",
       "label-set-timezone": "Ange tidszon",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Konvertera fälttyp"
       },
       "placeholder-type": "Typ",
       "tags": {
-        "format-field": ""
+        "format-field": "Formatera fält"
       },
       "tooltip-explicit-separator-joining-array-values": "Använd en tydlig avgränsare vid sammanfogning av matrisvärden",
       "tooltip-input-format": "Ange formatet för inmatningsfältet så att Grafana kan tolka datumsträngen korrekt.",
@@ -13140,20 +13144,20 @@
       "tooltip-enable": "Aktivera"
     },
     "draggable-sort-order": {
-      "asc": "",
-      "desc": "",
+      "asc": "STIGANDE",
+      "desc": "FALLANDE",
       "off": "Av"
     },
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Kombinera alla fält till en enda ram."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Sammanfoga fält"
         },
         "tags": {
-          "combine": ""
+          "combine": "Kombinera"
         }
       }
     },
@@ -13168,11 +13172,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Tolka fält från innehåll (JSON, etiketter, etc)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Välj fält"
         }
       },
       "label-delimiter": "Avgränsare",
@@ -13181,7 +13185,7 @@
       "label-replace-all-fields": "Ersätt alla fält",
       "label-source": "Källa",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Extrahera fält"
       },
       "placeholder-auto": "Auto",
       "placeholder-select-delimiter": "Välj avgränsare …",
@@ -13192,20 +13196,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Använd ett fältvärde för att söka efter länder, delstater eller flygplatser."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Inga textfält hittades"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Välj textfält"
         }
       },
       "label-field": "Fält",
       "label-lookup": "Slå upp",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Sökfält från resurs"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13216,23 +13220,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Ta bort delar av frågeresultaten med ett regex-mönster."
       },
       "label-from-variable": "Från variabel",
       "label-identifier": "Identifierare",
       "label-use-variable": "Använd variabel",
       "label-variable": "Variabel",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Filtrera fält efter namn"
       },
       "placeholder-regular-expression-pattern": "Vanligt uttrycksmönster"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Ta bort rader från data baserat på ursprungsfråga"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Filtrera data efter fråga"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13246,33 +13250,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Lägg till villkor",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Ta bort rader från frågeresultaten med användardefinierade filter."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Matcha alla",
+          "match-any": "Matcha någon"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Exkludera",
+          "include": "Inkludera"
         }
       },
       "label-conditions": "Villkor",
       "label-filter-type": "Filtertyp",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Filtrera per värden"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Inga textfält hittades"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Välj textfält"
         }
       },
       "label-field": "Fält",
@@ -13281,10 +13285,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Manipulera formatering av strängfält."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Formatera sträng"
       }
     },
     "format-time-transfomer-editor": {
@@ -13296,66 +13300,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Ställ in utdataformat för ett tidsfält"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Formatera tid"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Använd radvärdena för att beräkna ett nytt fält."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Lägg till fält från beräkning"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Ställ in enhet, min, max med mera."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Konfigurera från frågeresultat"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Generera värmekartdata från källdata."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Skapa värmekarta"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Platta till etiketterade resultat i en tabell som sammanfogas med etiketter."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Sammanfoga efter etiketter"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Dela upp en dataset med en ram i flera serier."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Partitionera efter värden"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Konvertera varje rad till ett fält med dynamisk konfiguration."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Rader till fält"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Tillämpa rumsliga operationer på frågeresultat."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Rumsoperationer"
       }
     },
     "get-timezone-options": {
@@ -13387,8 +13391,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Beräkna",
+          "group-by": "Gruppera efter"
         }
       },
       "placeholder-ignored": "Ignorerad",
@@ -13396,42 +13400,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Gruppera data efter ett fältvärde och skapa aggregerade data."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Gruppera efter"
       },
       "title-calc-alert": "Beräkningar kommer inte att ha någon effekt om inga fält grupperas efter"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Gruppera data efter ett fältvärde och skapa kapslade tabeller med de grupperade data."
       },
       "description-show-field-names": "Om det är aktiverat kommer kapslade tabeller att visa fältnamn som en tabellrubrik",
       "label-show-field-names-in-nested-tables": "Visa fältnamn i kapslade tabeller",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "Gruppera till kapslade tabeller"
       },
       "title-calc-alert": "Beräkningar kommer inte att ha någon effekt om inga fält grupperas efter."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Sammanfatta och omorganisera data baserat på tre fält."
       },
       "label-cell-value": "Cellvärde",
       "label-column": "Kolumn",
       "label-empty-value": "Tomt värde",
       "label-row": "Rad",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Gruppera till matris"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Beräkna ett histogram från inmatningsdata."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Histogram"
       },
       "placeholder-auto": "Auto",
       "placeholder-default": "Standard: 30",
@@ -13443,14 +13447,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "Kombinera rader från 2+ tabeller, baserat på ett relaterat fält."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Sammanfoga efter fält"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Krävs",
       "info": {
         "input-contain-labels": "Inmatningen innehåller inte några etiketter",
         "no-input-or-labels-found": "Inga inmatningar (eller etiketter) hittades",
@@ -13474,8 +13478,8 @@
       "label-value-field-name": "Namn på värdefält",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Kolumner",
+          "rows": "Rader"
         }
       },
       "placeholder-optional-select-label": "(Valfritt) Välj etikett",
@@ -13483,18 +13487,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Gruppera serier efter tid och returnera etiketter eller taggar som fält."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Etiketter till fält"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Begränsa antalet objekt som visas."
       },
       "name": {
-        "limit": ""
+        "limit": "Gräns"
       },
       "placeholder-value-or-variable": "Värde eller variabel"
     },
@@ -13507,11 +13511,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Slå samman flera serier. Värdena kommer att kombineras till en rad."
       },
       "merge-effect-applied-single-frame": "Sammanfogning har ingen effekt när den tillämpas på en enda ram.",
       "name": {
-        "merge": ""
+        "merge": "Slå samman serier/tabeller"
       }
     },
     "multi-info": {
@@ -13523,14 +13527,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Ordna om, dölj eller byt namn på fält."
       },
-      "field-order": "",
+      "field-order": "Fältsorteringsordning",
       "field-order-auto": "Auto",
-      "field-order-manual": "",
+      "field-order-manual": "Manuell",
       "first-frame-warning": "Organisera fält fungerar endast med en enda ram. Överväg att tillämpa en kopplingstransformation eller filtrera indata först.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Organisera fält efter namn"
       }
     },
     "partion-by-values-editor": {
@@ -13558,10 +13562,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Sträck dataramar från det breda formatet till det långa formatet."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Förbered tidsserier"
       }
     },
     "prepare-time-series-editor": {
@@ -13569,26 +13573,26 @@
       "label-info": "Information",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Konvertera varje ram till långt format"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Långa tidsserier"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Skapar en ny ram för varje tids-/nummerpar"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Tidsserier med flera ramar"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Skapar en enda ram sammanfogad efter tid"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Breda tidsserier"
         }
       }
     },
@@ -13603,7 +13607,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Reducera alla rader eller datapunkter till ett enda värde (t.ex. max, medelvärde)."
       },
       "label-calculations": "Beräkningar",
       "label-include-time": "Inkludera tid",
@@ -13620,7 +13624,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Minska"
       },
       "placeholder-choose-stat": "Välj statistik"
     },
@@ -13630,18 +13634,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "Skapa en ny dataram som innehåller värden som förutsägs av en statistisk modell."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Trendlinje"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Kubik",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "Kvadratisk",
         "quartic": "Fjärdegradare",
-        "quintic": "Femtegradare"
+        "quintic": "Femtegradare",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Grad",
       "label-model-type": "Modelltyp",
@@ -13654,18 +13663,19 @@
           "polynomial": "Polynom"
         }
       },
-      "regression": "",
+      "regression": "regression",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Regressionsanalys"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Antal X,Y-poäng att förutsäga"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Byt namn på delar av frågeresultaten med ett reguljärt uttryck och ersättningsmönster."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Byt namn på fält efter regex"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13679,33 +13689,33 @@
       "label-mode": "Läge",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Kombinera data från två tabeller när det finns matchande värden i ett fält som är gemensamt för båda tabellerna.",
+          "join-on-a-field": "Sammanfoga på ett fältvärde med duplicerade värden. Icke-presterande yttre sammanfogning används bäst för tabelldata (SQL-liknande).",
+          "keep-all-rows": "Behåll alla rader från alla tabeller med ett värde. Sammanfoga på distinkta fältvärden. Prestanda och bäst använd för tidsserier."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "Inre",
+          "outer-tabular": "Yttre (tabell)",
+          "outer-time-series": "Yttre (tidsserie)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Slå samman flera serier. Returnera tid, mätvärde och värden som en rad."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Serie till rader"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Sortera fält i en ram."
       },
       "label-field": "Fält",
       "label-reverse": "Omvänt",
       "name": {
-        "sort-by": ""
+        "sort-by": "Sortera efter"
       },
       "placeholder-select-field": "Välj fält"
     },
@@ -13728,13 +13738,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Konvertera tidsseriedata till tabellrader så att de kan visas i tabell- eller sparkline-format."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "Tidsserie till tabell-transformationen kräver minst en tidsserieram för att fungera. Du har för närvarande ingen."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Tidsserie till tabell"
       }
     },
     "time-series-table-transform-editor": {
@@ -13752,15 +13762,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Transponera dataramen."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Transponera"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Pivot",
+        "transform": "Omvandla",
+        "translate": "Översätt"
       }
     },
     "unary-operation-editor": {
@@ -13769,13 +13779,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Beräkna nya fält",
+        "combine": "Kombinera",
+        "create-new-visualization": "Skapa ny visualisering",
+        "filter": "Filtrera",
+        "perform-spatial-operations": "Utför rumsliga operationer",
+        "reformat": "Omformatera",
+        "reorder-and-rename": "Ordna om och byt namn"
       },
       "special-value-options": {
         "description": {
@@ -13826,10 +13836,10 @@
     }
   },
   "trend": {
-    "category-x-axis": "",
-    "description-x-field": "",
-    "name-x-field": "",
-    "placeholder-x-field": ""
+    "category-x-axis": "X-axel",
+    "description-x-field": "Ett ökande numeriskt värde",
+    "name-x-field": "X-fält",
+    "placeholder-x-field": "Första numeriska värdet"
   },
   "upgrade-box": {
     "discovery-text": "Du har upptäckt en PRO-funktion!",
@@ -13846,7 +13856,7 @@
     "title": "Organisationer"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Inga användare hittades",
     "select-aria-label": "Användarväljare",
     "select-placeholder": "Börja skriva för att söka efter användare"
   },
@@ -13932,8 +13942,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "Är du säker på att du vill radera variabeln ”{{variableToDelete}}”?",
+      "confirmText-delete": "Radera",
       "title-delete-variable": "Radera variabel"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13983,33 +13993,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Hur värdena för denna variabel ska sorteras",
-      "name-sort": "",
+      "name-sort": "Sortera",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Alfabetiskt (stigande)",
+          "alphabetical-caseinsensitive-asc": "Alfabetiskt (skiftlägeskänsligt, stigande)",
+          "alphabetical-caseinsensitive-desc": "Alfabetiskt (skiftlägeskänsligt, fallande)",
+          "alphabetical-desc": "Alfabetiskt (fallande)",
+          "disabled": "Inaktiverad",
+          "natural-asc": "Naturligt (stigande)",
+          "natural-desc": "Naturligt (fallande)",
+          "numerical-asc": "Numeriskt (stigande)",
+          "numerical-desc": "Numeriskt (fallande)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Lägg till alternativ",
+      "description": "Lägg till anpassade alternativ utöver frågeresultat",
+      "label-placeholder": "displayetikett",
+      "remove-option-button-label": "Ta bort alternativ",
+      "value-placeholder": "värde, tom sträng som standard"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Hur man sorterar statiska alternativ med frågeresultat"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Standardvärde",
       "placeholder-default-value-if-any": "standardvärde, om något",
       "text-options": "Textalternativ"
     },
@@ -14038,8 +14048,8 @@
       "description-optional-display-name": "Valfritt visningsnamn",
       "description-template-variable-characters": "Namnet på mallvariabeln. (Högst 50 tecken)",
       "general": "Allmänt",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Etikett",
+      "name-name": "Namn",
       "placeholder-descriptive-text": "Beskrivande text",
       "placeholder-label-name": "Etikettnamn",
       "placeholder-variable-name": "Variabelnamn",
@@ -14055,13 +14065,13 @@
       "tooltip-remove-variable": "Ta bort variabel"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Beskrivning"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Växla alla värden"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Välj variabeltyp"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Visa användningar"
@@ -14092,20 +14102,20 @@
     }
   },
   "xychart": {
-    "category-xychart": "",
-    "name-fill-opacity": "",
-    "name-line-style": "",
-    "name-line-width": "",
-    "name-max-point-size": "",
-    "name-min-point-size": "",
-    "name-point-shape": "",
-    "name-point-size": "",
-    "name-point-stroke-width": "",
-    "name-series-mapping": "",
-    "name-show": "",
+    "category-xychart": "XY-diagram",
+    "name-fill-opacity": "Fyllningsopacitet",
+    "name-line-style": "Linjestil",
+    "name-line-width": "Linjebredd",
+    "name-max-point-size": "Max punktstorlek",
+    "name-min-point-size": "Min punktstorlek",
+    "name-point-shape": "Punktform",
+    "name-point-size": "Punktstorlek",
+    "name-point-stroke-width": "Punktlinjebredd",
+    "name-series-mapping": "Seriemappning",
+    "name-show": "Visa",
     "point-shape-options": {
-      "label-circle": "",
-      "label-square": ""
+      "label-circle": "Cirkel",
+      "label-square": "Kvadratisk"
     },
     "series-editor": {
       "add-series": "Lägg till serier",
@@ -14117,18 +14127,18 @@
       "label-y-field": "Y-fält",
       "placeholder-all-frames": "Alla ramar",
       "placeholder-select-frame": "Välj ram",
-      "placeholder-x-field": "",
-      "placeholder-y-field": "",
+      "placeholder-x-field": "Första nummer- eller tidsfältet i varje ram",
+      "placeholder-y-field": "Återstående nummerfält i varje ram",
       "tooltip-delete-series": "Radera serie"
     },
     "series-mapping-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Auto",
+      "label-manual": "Manuell"
     },
     "show-options": {
-      "label-both": "",
-      "label-lines": "",
-      "label-points": ""
+      "label-both": "Båda",
+      "label-lines": "Rader",
+      "label-points": "Poäng"
     }
   }
 }
\ No newline at end of file
diff --git a/public/locales/tr-TR/grafana.json b/public/locales/tr-TR/grafana.json
index b349f3a97f1..d1ca031350d 100644
--- a/public/locales/tr-TR/grafana.json
+++ b/public/locales/tr-TR/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Bazı özellikler kararlı sürümdedir (Genel Kullanım/GA) ve varsayılan olarak etkindir, bazıları ise henüz ön aşamada olan Beta aşamasındadır ve erken benimseme için kullanılabilir durumdadır.",
       "confirm-modal-body-2": "Özelliklerde değişiklik yapmadan önce etkilerini gözden geçirmenizi öneririz.",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "Değişiklikleri kaydet",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Genel kullanılabilirlik",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Kuruluşu sil",
-      "confirmText-delete": "",
+      "confirmText-delete": "Sil",
       "title-delete": "Sil"
     },
     "anon-users": {
       "not-found": "Anonim kullanıcı bulunamadı."
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "Tüm cihazlardan çıkış yapmaya zorlamak istediğinizden emin misiniz?",
+      "confirmText-confirm-logout": "Çıkışı onayla",
+      "confirmText-force-logout": "Çıkış yapmaya zorla",
       "title-force-logout-from-all-devices": "Tüm cihazlardan çıkış yapmaya zorla"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "Kaydet"
     },
     "edit-org": {
       "access-denied": "Bu kuruluştaki kullanıcıları görme izniniz yok. Bu kuruluşu güncellemek için sunucu yöneticinize başvurun.",
@@ -119,10 +119,10 @@
       "users-heading": "Kuruluş kullanıcıları"
     },
     "enterprise-auth-features-card": {
-      "dismiss": "",
-      "heading": "",
-      "learn-more-link": "",
-      "text": ""
+      "dismiss": "Kapat",
+      "heading": "Kurumsal kimlik doğrulama",
+      "learn-more-link": "Daha fazla bilgi edinin",
+      "text": "Grafana Cloud ve Enterprise sürümlerinde kullanıcıları, ekipleri ve izinleri <1>SAML</1>, <3>SCIM</3>, <6>LDAP</6> ve <8>RBAC</8> ile otomatik olarak yönetin."
     },
     "feature-listing": {
       "title-auditing": "Denetim",
@@ -216,11 +216,11 @@
       "not-editable": "Bu kullanıcının rolü, kimlik doğrulama sağlayıcınızdan eşitlendiği için düzenlenemez. Ayrıntılar için <1>Grafana kimlik doğrulama belgelerine</1> bakın."
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "{{user}} adlı kullanıcıyı silmek istediğinizden emin misiniz?",
       "columns": {
         "aria-label-role": "Rol"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "Sil",
       "delete-aria-label": "Kullanıcıyı sil: {{name}}",
       "title-delete": "Sil"
     },
@@ -252,7 +252,7 @@
       "info-description": "Bu sistem ayarları, grafana.ini veya custom.ini dosyalarında tanımlanmıştır (veya ENV değişkenlerinde geçersiz kılınabilir). Bu ayarları değiştirmek için şu anda Grafana'yı yeniden başlatmanız gerekmektedir."
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "Silmeyi onayla"
     },
     "upgrade-info": {
       "title": "Enterprise lisansı"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Değiştir",
-      "confirmText-change": "",
+      "confirmText-change": "Değiştir",
       "grafana-admin-key": "Grafana Yöneticisi",
       "grafana-admin-no": "Hayır",
       "grafana-admin-yes": "Evet",
       "title": "İzinler"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "Bu kullanıcıyı silmek istediğinizden emin misiniz?",
+      "body-disable": "Bu kullanıcıyı devre dışı bırakmak istediğinizden emin misiniz?",
+      "confirmText-delete-user": "Kullanıcıyı sil",
+      "confirmText-disable-user": "Kullanıcıyı devre dışı bırak",
       "delete-button": "Kullanıcıyı sil",
       "disable-button": "Kullanıcıyı devre dışı bırak",
       "edit-button": "Düzenle",
@@ -331,7 +331,7 @@
       "title-disable-user": "Kullanıcıyı devre dışı bırak"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "Kaydet"
     },
     "user-sessions": {
       "browser-column": "Tarayıcı ve işletim sistemi",
@@ -374,20 +374,20 @@
       "am-active-timing-select-label-active-timings": "Aktif zamanlamalar"
     },
     "ad": {
-      "close": "",
-      "learn-more": ""
+      "close": "Kapat",
+      "learn-more": "Daha fazla bilgi edinin"
     },
     "add-button": {
       "add-more": "Daha fazlasını ekle"
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "Yapay Zekâ Uyarı Kuralı Düğmesi yüklenemedi",
+        "feedback-button": "Yapay Zekâ Geri Bildirim Düğmesi yüklenemedi",
+        "improve-annotations-button": "Yapay Zekâ Ek Açıklamaları İyileştir Düğmesi yüklenemedi",
+        "improve-labels-button": "Yapay Zekâ Etiketleri İyileştir Düğmesi yüklenemedi",
+        "template-button": "Yapay Zekâ Şablon Düğmesi yüklenemedi",
+        "triage-button": "Yapay Zekâ Önceliklendirme Düğmesi yüklenemedi"
       }
     },
     "alert": {
@@ -405,12 +405,12 @@
       "missing-series-resolve": "Çözüm için eksik dizi değerlendirmeleri",
       "no-annotations": "Ek açıklama yok",
       "notification-configuration": {
-        "active-timings": "",
+        "active-timings": "Aktif zaman aralıkları",
         "contact-point": "İletişim noktası",
         "group-by": "Gruplandırma ölçütü",
-        "group-title": "",
+        "group-title": "Bildirim yapılandırması",
         "mute-timings": "Sessize alma zamanlamaları",
-        "timing-options": ""
+        "timing-options": "Zamanlamalar"
       },
       "pending-period": "Bekleme süresi",
       "rule": "Kural",
@@ -493,7 +493,7 @@
       "title-muting-grouping-and-timings": "Sessize alma, gruplandırma ve zamanlamalar"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Veri kaynağı bulunamadı"
     },
     "alert-menu": {
       "copy-link": "Bağlantıyı kopyala",
@@ -519,7 +519,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "Uyarı kuralı"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -587,7 +587,7 @@
       "view-configuration": "Yapılandırmayı görüntüle"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "Evet, yapılandırmayı sıfırla",
       "gma-manual-configuration-description": "Grafana'nın dahili Alertmanager yapılandırması manuel olarak değiştirilemez. Bu yapılandırmayı değiştirmek için bireysel kaynakları kullanıcı arayüzü üzerinden düzenleyin.",
       "gma-manual-configuration-is-not-supported": "Manuel yapılandırma değişiklikleri desteklenmiyor",
       "message": {
@@ -602,13 +602,13 @@
       "title-resetting-alertmanager-configuration": "Alertmanager yapılandırması sıfırlanıyor"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "Yapılandırmayı bu sürüme geri yüklemek istediğinizden emin misiniz? Kaydedilmemiş tüm değişiklikler kaybolacaktır.",
       "columns": {
         "compare": "Karşılaştır",
         "restore": "Geri yükle",
         "text-latest": "En son"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "Evet, yapılandırmayı geri yükle",
       "loading": "Yükleniyor...",
       "no-previous-configurations": "Önceki yapılandırmalar bulunamadı",
       "this-might-take-a-while": "Bu işlem biraz zaman alabilir...",
@@ -888,10 +888,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "\"{{contactPointName}}\" iletişim noktası için daha fazla işlem",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "Sil",
       "button-edit": "Düzenle",
       "button-view": "Görüntüle",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "Dışa aktar",
       "export-label-export": "Dışa aktar",
       "label-delete": "Sil",
       "label-manage-permissions": "İzinleri yönet",
@@ -964,7 +964,7 @@
     },
     "contactPoints": {
       "validation": {
-        "notFound": ""
+        "notFound": "\"{{contactPoint}}\" temas noktası bulunamadı"
       }
     },
     "continue-matching-indicator": {
@@ -973,7 +973,7 @@
     "copy-to-clipboard": "\"{{label}}\" metnini panoya kopyala",
     "create-metadata": {
       "label": {
-        "contact-point": "",
+        "contact-point": "Bildirimler şuraya iletilir:",
         "dashboard": "Pano",
         "dashboard-and-panel": "Pano ve panel",
         "evaluation-interval": "Değerlendirme aralığı",
@@ -1121,7 +1121,7 @@
       "content-show-all-errors": "Tüm hataları göster"
     },
     "errors": {
-      "failedWith": ""
+      "failedWith": "{{-config}}, {{status}} durumu ile başarısız oldu: {{-message}}"
     },
     "evaluate-every-validation-options": {
       "message": {
@@ -1426,7 +1426,7 @@
       "label-disable-resolved-message": "Çözümlenmiş mesajı devre dışı bırak"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "Gruplar yükleniyor...",
       "message": {
         "must-be-a-positive-integer": "Pozitif bir tam sayı olmalıdır.",
         "must-enter-a-group-name": "Bir grup adı girilmelidir"
@@ -1523,7 +1523,7 @@
       "group-loading-error": "Grup yüklenirken hata oluştu",
       "interval": "Aralık",
       "namespace": "Ad alanı",
-      "new": "",
+      "new": "Yeni",
       "title": {
         "back": ""
       }
@@ -1555,7 +1555,7 @@
     },
     "group-loader": {
       "group-load-failed": "{{ namespaceName }} alanındaki {{ groupName }} grubundan kurallar yüklenemedi",
-      "no-rules": ""
+      "no-rules": "Bu grupta kural bulunamadı"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "Grup siliniyor"
@@ -1572,20 +1572,20 @@
       }
     },
     "home": {
-      "irm-card-description": "",
-      "irm-card-item-1": "",
-      "irm-card-item-2": "",
-      "irm-card-item-3": "",
-      "irm-card-item-4": "",
-      "irm-card-title": "",
+      "irm-card-description": "Grafana Cloud IRM ile çağrı, uyarı ve olay müdahalesini tek bir çatı altında birleştirin.",
+      "irm-card-item-1": "Çağrı çizelgelerini takviminizle ya da Terraform ile yönetin.",
+      "irm-card-item-2": "Olaylara web, uygulama, Slack veya diğer kanallar üzerinden müdahale edin.",
+      "irm-card-item-3": "Yapay zekâ destekli Grafana SIFT ile temel nedenleri tespit edin.",
+      "irm-card-item-4": "Geçmiş olayları analiz ederek müdahale süreçlerinizi ve dayanıklılığınızı geliştirin.",
+      "irm-card-title": "Olay müdahalesi ve yönetimi",
       "label-get-started": "Başlayalım",
       "label-insights": "İçgörüler",
-      "synthetic-monitoring-card-description": "",
-      "synthetic-monitoring-card-item-1": "",
-      "synthetic-monitoring-card-item-2": "",
-      "synthetic-monitoring-card-item-3": "",
-      "synthetic-monitoring-card-item-4": "",
-      "synthetic-monitoring-card-title": ""
+      "synthetic-monitoring-card-description": "Kritik kullanıcı akışlarını, web sitelerini ve API'leri küresel konumlardan haricî olarak izleyin.",
+      "synthetic-monitoring-card-item-1": "Tarayıcı kontrolleriyle uçtan uca kullanıcı yolculuklarını simüle edin.",
+      "synthetic-monitoring-card-item-2": "Ağın her katmanında ping, DNS, HTTP/S ve TCP kontrolleri gerçekleştirin.",
+      "synthetic-monitoring-card-item-3": "Güvenlik duvarınızın içindeki özel yoklamaları ya da 20'yi aşkın küresel yoklamayı kullanın.",
+      "synthetic-monitoring-card-item-4": "SLO'ları, arayüz üzerinden doğrudan erişilebilen yerleşik Prometheus tipi uyarılarla takip edin.",
+      "synthetic-monitoring-card-title": "Yapay İzleme"
     },
     "import-to-gma": {
       "action-button": "İçe aktar",
@@ -1599,7 +1599,7 @@
         "no-rules-body-yaml": "İçe aktarılacak kural yok. Lütfen farklı bir yaml dosyası seçin.",
         "no-rules-title": "İçe aktarılacak kural yok",
         "not-using-rules-managed-by-integrations-or-plugins": {
-          "text": "",
+          "text": "Entegrasyonlar veya eklentiler tarafından yönetilen kurallar, Grafana tarafından yönetilen kurallara aktarılmamalıdır.",
           "title": "Bilgi"
         },
         "plugin-rules-warning": {
@@ -1885,10 +1885,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "Veri kaynağı bulunamadı"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "\"{{muteTiming}}\" öğesini silmek istediğinizden emin misiniz?"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Devre dışı",
@@ -1979,7 +1979,7 @@
     },
     "notification-policies-filter": {
       "label-search-by-contact-point": "İletişim noktasına göre ara",
-      "placeholder-search-by-contact-point": "",
+      "placeholder-search-by-contact-point": "Bir iletişim noktası seçin",
       "search-query-input-placeholder-search": "Ara"
     },
     "notification-policies-list": {
@@ -2140,10 +2140,10 @@
         "conflict": "Bildirim politikası ağacı başka bir kullanıcı tarafından güncellendi.",
         "error-code": "Hata mesajı: \"{{error}}\"",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "Yönlendirme eklenemiyor veya güncellenemiyor: {{-matchers}} eşleştiricilerini birleştirdiğimizde eşleştiriciler harici bir yönlendirme ağacıyla çakışır. Bu, yönlendirmenin erişilemez olmasına neden olur."
         },
         "suffix": "Lütfen sayfayı yenileyin ve tekrar deneyin.",
-        "title": ""
+        "title": "Bildirim politikası eklenemedi veya güncellenemedi"
       },
       "n-more-policies_one": "{{count}} ek politika",
       "n-more-policies_other": "{{count}} ek politika"
@@ -2199,7 +2199,7 @@
     "query-and-expressions-step": {
       "add-query": "Sorgu ekle",
       "body-queries-expressions-configured": "Uyarı oluşturabilmek için en az bir sorgu veya ifade oluşturun",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "Devre dışı bırak",
       "expressions": "İfadeler",
       "loading-data-sources": "Veri kaynakları yükleniyor...",
       "manipulate-returned-queries-other-operations": "Sorgulardan dönen verileri matematik ve diğer işlemlerle düzenleyin.",
@@ -2253,7 +2253,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "Kayıt kuralı"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "Sorgu düzenleyici şu nedenle yüklenemedi: {{errorMessage}}"
@@ -2273,7 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Kopyalanan kural için yeni bir değerlendirme grubu ayarlamanız gerekir çünkü orijinal kural sağlanmış ve kullanıcı arayüzünde oluşturulan kurallar için kullanılamaz.",
       "body-not-provisioned": "Yeni kural, sağlanmış bir kural olarak <1>işaretlenmeyecek</1>.",
-      "confirmText-copy": "",
+      "confirmText-copy": "Kopyala",
       "title-copy-provisioned-alert-rule": "Sağlanan uyarı kuralını kopyala"
     },
     "redirect-to-rule-viewer": {
@@ -2492,12 +2492,12 @@
         "new-badge": "Yeni!",
         "text": "Grafana tarafından yönetilen kurallara içe aktar"
       },
-      "loading-more-groups": "",
+      "loading-more-groups": "Daha fazla grup yükleniyor...",
       "more": "Daha Fazla",
       "new-alert-rule": "Yeni uyarı kuralı",
       "new-datasource-recording-rule": "Yeni veri kaynağı kayıt kuralı",
       "new-grafana-recording-rule": "Yeni Grafana kayıt kuralı",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "Dışa aktarma için yeni uyarı kuralı",
       "pagination": {
         "next-page": "Daha fazla göster..."
       },
@@ -2671,7 +2671,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "Uyarı yöneticileri"
       }
     },
     "settings-content": {
@@ -2809,7 +2809,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "Ön izlemeyi yenile",
-      "empty-state": "",
+      "empty-state": "Ön izlemeyi görmek için şablon içeriği ekleyin",
       "label-preview": "Ön izleme",
       "refresh": "Yenile"
     },
@@ -2828,7 +2828,7 @@
       "loading": "Yükleniyor...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "Bildirim şablonu seçin"
         },
         "label": {
           "select-notification-template": "Bildirim şablonu seçin"
@@ -2856,8 +2856,8 @@
     },
     "templates-table": {
       "actions": "İşlemler",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "\"{{template}}\" şablon grubunu silmek istediğinizden emin misiniz?",
+      "confirmText-yes-delete": "Evet, sil",
       "no-templates-defined": "Tanımlanmış şablon yok.",
       "template-group": "Şablon grubu",
       "title-delete-template-group": "Şablon grubunu sil"
@@ -2912,7 +2912,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "Uyarı kurallarını, kayıt kurallarını ve değerlendirme aralığını yönetin"
       }
     },
     "to-gma": {
@@ -2992,7 +2992,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "Evet, sil"
       }
     },
     "use-delete-policy-modal": {
@@ -3046,51 +3046,51 @@
     }
   },
   "alertlist": {
-    "category-alert-state-filter": "",
-    "category-filter": "",
-    "category-options": "",
-    "descriptino-alerts-linked-to-dashboard": "",
-    "description-alert-instance-label": "",
-    "description-alert-name": "",
-    "description-datasource": "",
-    "description-folder": "",
-    "description-group-by": "",
-    "description-group-mode": "",
-    "description-max-items": "",
-    "description-show-inactive-alerts": "",
-    "description-sort-order": "",
-    "description-view-mode": "",
+    "category-alert-state-filter": "Uyarı durumu filtresi",
+    "category-filter": "Filtre",
+    "category-options": "Seçenekler",
+    "descriptino-alerts-linked-to-dashboard": "Yalnızca bu panoya bağlı uyarıları göster",
+    "description-alert-instance-label": "Etiket sorgularıyla uyarı örneklerini filtreleyin, örneğin: {severity=\"critical\", instance=~\"cluster-us-.+\"}",
+    "description-alert-name": "Bu metni içeren uyarıları filtreleyin",
+    "description-datasource": "Uyarı kaynağından filtrele",
+    "description-folder": "Seçilen klasördeki uyarıları filtreleyin (yalnızca Grafana tarafından yönetilen uyarı kuralları için)",
+    "description-group-by": "Etiket sorgulama kullanarak uyarıları filtreleyin",
+    "description-group-mode": "Uyarı örneklerinin nasıl gruplanacağını belirleyin",
+    "description-max-items": "Görüntülenecek maksimum uyarı sayısı",
+    "description-show-inactive-alerts": "0 (sıfır) örneğe sahip uyarı kurallarını dâhil edin. Bu kuralların örneği olmadığından Uyarı örneği etiketi filtresi ayarlanmışsa gizli kalırlar.",
+    "description-sort-order": "Uyarıların ve uyarı örneklerinin sıralama düzeni",
+    "description-view-mode": "Liste görünümü ile istatistik görünümü arasında geçiş yapın",
     "group-by": {
       "aria-label-group-by-label-keys": "etiket anahtarlarına göre grupla",
       "placeholder-group-by": "Gruplama ölçütü"
     },
     "group-mode-options": {
-      "label-custom-grouping": "",
-      "label-default-grouping": ""
+      "label-custom-grouping": "Özel gruplandırma",
+      "label-default-grouping": "Varsayılan gruplandırma"
     },
-    "name-alert-instance-label": "",
-    "name-alert-name": "",
-    "name-alerts-linked-to-dashboard": "",
-    "name-datasource": "",
-    "name-error": "",
-    "name-firing": "",
-    "name-folder": "",
-    "name-group-by": "",
-    "name-group-mode": "",
-    "name-max-items": "",
-    "name-no-data": "",
-    "name-normal": "",
-    "name-pending": "",
-    "name-recovering": "",
-    "name-show-inactive-alerts": "",
-    "name-sort-order": "",
-    "name-view-mode": "",
+    "name-alert-instance-label": "Uyarı örneği etiketi",
+    "name-alert-name": "Uyarı adı",
+    "name-alerts-linked-to-dashboard": "Bu panoya bağlı uyarılar",
+    "name-datasource": "Veri kaynağı",
+    "name-error": "Hata",
+    "name-firing": "Uyarı/Tetikleme",
+    "name-folder": "Klasör",
+    "name-group-by": "Gruplama ölçütü",
+    "name-group-mode": "Grup modu",
+    "name-max-items": "Maks. öge",
+    "name-no-data": "Veri Yok",
+    "name-normal": "Normal",
+    "name-pending": "Bekliyor",
+    "name-recovering": "Geri yükleniyor",
+    "name-show-inactive-alerts": "0 örnekli uyarıları göster",
+    "name-sort-order": "Sıralama ölçütü",
+    "name-view-mode": "Görüntüleme modu",
     "sort-order-options": {
-      "label-alphabetical-asc": "",
-      "label-alphabetical-desc": "",
-      "label-importance": "",
-      "label-time-asc": "",
-      "label-time-desc": ""
+      "label-alphabetical-asc": "Alfabetik (artan)",
+      "label-alphabetical-desc": "Alfabetik (azalan)",
+      "label-importance": "Önemli",
+      "label-time-asc": "Zaman (artan)",
+      "label-time-desc": "Zaman (azalan)"
     },
     "ungrouped-mode-view": {
       "active-for": "<1>{{duration}}</1> süreyle",
@@ -3106,8 +3106,8 @@
       "title-permission-required": "İzin gerekiyor"
     },
     "view-mode-options": {
-      "label-list": "",
-      "label-stat": ""
+      "label-list": "Liste",
+      "label-stat": "İstatistik"
     }
   },
   "annolist": {
@@ -3120,31 +3120,31 @@
     "annotation-list-item": {
       "tooltip-created-by": "Oluşturan:<1></1> {{email}}"
     },
-    "category-annotation-query": "",
-    "category-display": "",
-    "category-link-behaviour": "",
-    "description-tags": "",
+    "category-annotation-query": "Ek açıklama sorgusu",
+    "category-display": "Ekran",
+    "category-link-behaviour": "Bağlantı davranışı",
+    "description-tags": "Ek açıklama etiketlerini eşleştir",
     "link-target-options": {
-      "label-dashboard": "",
-      "label-panel": ""
+      "label-dashboard": "Pano",
+      "label-panel": "Panel"
     },
-    "name-limit": "",
-    "name-link-target": "",
-    "name-query-filter": "",
-    "name-show-tags": "",
-    "name-show-time": "",
-    "name-show-user": "",
-    "name-tags": "",
-    "name-time-after": "",
-    "name-time-before": "",
-    "name-time-range": "",
+    "name-limit": "Sınırlama",
+    "name-link-target": "Bağlantı hedefi",
+    "name-query-filter": "Sorgu filtresi",
+    "name-show-tags": "Etiketleri göster",
+    "name-show-time": "Zamanı göster",
+    "name-show-user": "Kullanıcıyı göster",
+    "name-tags": "Etiketler",
+    "name-time-after": "Şu tarihten sonra:",
+    "name-time-before": "Şu tarihten önce:",
+    "name-time-range": "Zaman aralığı",
     "query-filter-options": {
-      "label-all-dashboards": "",
-      "label-this-dashboard": ""
+      "label-all-dashboards": "Tüm panolar",
+      "label-this-dashboard": "Bu pano"
     },
     "time-range-options": {
-      "label-none": "",
-      "label-this-dashboard": ""
+      "label-none": "Yok",
+      "label-this-dashboard": "Bu pano"
     }
   },
   "annotations": {
@@ -3152,7 +3152,7 @@
       "annotation": "Ek açıklama",
       "first-value": "İlk değer",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "Bilinmeyen alan adları"
     },
     "empty-state": {
       "button-title": "Ek açıklama sorgusu ekle",
@@ -3162,12 +3162,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "Bu alan tanımlandığında, ek açıklama bir aralık olarak değerlendirilecektir",
+        "results-split-on-comma": "Sonuçlar virgülle (,) bölünecek"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}, veya ilk metin alanı",
+        "time-or-the-first-field": "{{defaultField}}, veya ilk zaman alanı"
       }
     },
     "standard-annotation-query-editor": {
@@ -3245,9 +3245,9 @@
       "define-allowed-teams-ids-label": "İzin verilen ekip kimliklerini tanımlayın",
       "display-name-description": "Giriş sayfasında \"Şununla giriş yap:\" olarak gösterilecektir. Birden fazla kimlik sağlayıcı veya SSO protokolü kullanıyorsanız faydalıdır.",
       "display-name-label": "Görünen ad",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "Azure AD/Entra ID kiracısında kullanıcının alanını belirtmek ve oturum açma işlemini kolaylaştırmak için parametre.",
+      "domain-hint-label": "Alan adı ipucu",
+      "domain-hint-valid-domain": "Bu alan geçerli bir alan adı olmalıdır.",
       "email-attribute-name-description": "OAuth2 kimlik belirteci öznitelik eşlemesinde kullanıcı e-postasını aramak için kullanılacak anahtarın adı.",
       "email-attribute-name-label": "E-posta özniteliği adı",
       "email-attribute-path-description": "Kullanıcı bilgilerinden kullanıcı e-postasını aramak için kullanılacak JMESPath ifadesi.",
@@ -3264,11 +3264,11 @@
       "id-token-attribute-name-label": "Kimlik belirteci özniteliği adı",
       "login-attribute-path-description": "Kullanıcı kimliği belirtecinden giriş bilgisini aramak için kullanılacak JMESPath ifadesi.",
       "login-attribute-path-label": "Giriş özniteliği yolu",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "Onay",
+      "login-prompt-description": "Kullanıcı IdP ile oturum açtığında kullanıcı etkileşiminin türünü gösterir.",
+      "login-prompt-label": "Oturum açma istemi",
+      "login-prompt-login": "Oturum aç",
+      "login-prompt-select-account": "Hesap seç",
       "managed-identity-client-id-description": "OAuth2 uygulamanızın birleşik kimlik bilgilerinin yönetilen kimlik istemci kimliği.",
       "managed-identity-client-id-label": "FIC tarafından yönetilen kimlik istemci kimliği",
       "name-attribute-path-description": "Kullanıcı kimliği belirtecinden kullanıcı adını aramak için kullanılacak JMESPath ifadesi.\nBu ad, kullanıcının görünen adı olarak kullanılacaktır.",
@@ -3304,7 +3304,7 @@
       "team-ids-github": "Ekip kimliklerinin tam sayı listesi.",
       "team-ids-label": "Ekip kimlikleri",
       "team-ids-numbers": "Ekip kimlikleri sayı olmalıdır.",
-      "team-ids-other": "",
+      "team-ids-other": "Ekip Kimliklerinin dize listesi.",
       "team-ids-placeholder": "Ekip kimliklerini girin ve eklemek için Enter tuşuna basın",
       "teams-url-description": "Ekip kimliklerini sorgulamak için kullanılan URL. Ayarlanmazsa varsayılan değer /teams olur.",
       "teams-url-description-oauth": "\"{{ teamsURLLabel }}\" alanı yapılandırıldıysa \"{{ teamIDsAttributePathLabel }}\" alanı da yapılandırılmalıdır.",
@@ -3339,8 +3339,8 @@
       }
     },
     "provider-card": {
-      "saml-learn-more": "",
-      "scim-learn-more": "",
+      "saml-learn-more": "SAML ile çoklu oturum açma (SSO).",
+      "scim-learn-more": " Kullanıcıları ve ekipleri SCIM ile senkronize edin.",
       "text-badge-enabled": "Etkin",
       "text-badge-not-enabled": "Devre dışı"
     },
@@ -3348,7 +3348,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Varsayılan değerlere sıfırla"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "Sıfırla",
       "disable": "Devre dışı bırak",
       "disabling": "Devre dışı bırakılıyor...",
       "discard": "Vazgeç",
@@ -3368,7 +3368,7 @@
       "text-badge-not-enabled": "Devre dışı"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM şu anda geliştirme aşamasındadır ve üretim kullanımı için önerilmez. Lütfen dikkatli kullanın ve olası değişiklikler olabileceğini unutmayın."
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "Kimlik sağlayıcınız (IdP) için .well-known/openid-configuration uç noktası",
@@ -3380,99 +3380,99 @@
   },
   "bar-chart": {
     "warn": {
-      "missing-numeric": "",
-      "missing-series": ""
+      "missing-numeric": "Sayısal alan bulunamadı",
+      "missing-series": "Çubuk grafikler bir metin veya zaman alanı gerektirir"
     }
   },
   "barchart": {
     "config": {
-      "category-thresholds": "",
-      "description-color-by-field": "",
-      "description-x-label-max-length": "",
-      "name-bar-radius": "",
-      "name-bar-width": "",
-      "name-color-by-field": "",
-      "name-fill-opacity": "",
-      "name-full-highlight": "",
-      "name-gradient-mode": "",
-      "name-group-width": "",
-      "name-line-width": "",
-      "name-orientation": "",
-      "name-rotate-x-labels": "",
-      "name-show-thresholds": "",
-      "name-show-values": "",
-      "name-stacking": "",
-      "name-transform": "",
-      "name-x-axis": "",
-      "name-x-label-max-length": "",
-      "name-x-label-min-spacing": "",
+      "category-thresholds": "Eşikler",
+      "description-color-by-field": "Her çubuğun rengini belirlemek için aynı gruptaki bir alanın renk değerini kullan.",
+      "description-x-label-max-length": "X ekseni etiketleri belirtilen uzunlukta kısaltılacaktır",
+      "name-bar-radius": "Çubuk yarıçapı",
+      "name-bar-width": "Çubuk genişliği",
+      "name-color-by-field": "Alana göre renklendir",
+      "name-fill-opacity": "Dolgu opaklığı",
+      "name-full-highlight": "Üzerine gelindiğinde tüm alanı vurgula",
+      "name-gradient-mode": "Gradyan modu",
+      "name-group-width": "Grup genişliği",
+      "name-line-width": "Çizgi genişliği",
+      "name-orientation": "Yön",
+      "name-rotate-x-labels": "X ekseni işaret etiketlerini döndür",
+      "name-show-thresholds": "Eşikleri göster",
+      "name-show-values": "Değerleri göster",
+      "name-stacking": "İstifleme",
+      "name-transform": "Dönüştür",
+      "name-x-axis": "X Ekseni",
+      "name-x-label-max-length": "X ekseni işaret etiketi maksimum uzunluğu",
+      "name-x-label-min-spacing": "X ekseni etiketleri minimum aralığı",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-line-vertical": ""
+        "label-auto": "Otomatik",
+        "label-horizontal": "Yatay",
+        "label-line-vertical": "Dikey"
       },
-      "placeholder-x-axis": "",
-      "placeholder-x-label-max-length": "",
+      "placeholder-x-axis": "İlk dize veya zaman alanı",
+      "placeholder-x-label-max-length": "Yok",
       "show-values-options": {
-        "label-always": "",
-        "label-auto": "",
-        "label-never": ""
+        "label-always": "Her zaman",
+        "label-auto": "Otomatik",
+        "label-never": "Hiçbir zaman"
       },
       "transform-options": {
-        "description-constant": "",
-        "description-negative-y": "",
-        "label-constant": "",
-        "label-negative-y": ""
+        "description-constant": "İlk değer sabit bir çizgi olarak gösterilecektir",
+        "description-negative-y": "Sonuçları y ekseninde negatif değerlere çevir",
+        "label-constant": "Sabit",
+        "label-negative-y": "Negatif Y"
       }
     },
     "tick-spacing-editor": {
       "content-require-space-from-the-right-side": "Sağ tarafta boşluk bırakılmasını zorunlu kıl",
       "gaps-options": {
-        "description-large": "",
-        "description-medium": "",
-        "description-none": "",
-        "description-small": "",
-        "label-large": "",
-        "label-medium": "",
-        "label-none": "",
-        "label-small": ""
+        "description-large": "{{spacing}} aralığı zorunlu kıl",
+        "description-medium": "{{spacing}} aralığı zorunlu kıl",
+        "description-none": "Tüm onay işaretlerini göster",
+        "description-small": "{{spacing}} aralığı zorunlu kıl",
+        "label-large": "Büyük",
+        "label-medium": "Orta",
+        "label-none": "Yok",
+        "label-small": "Küçük"
       },
       "label-rtl": "RTL"
     }
   },
   "bargauge": {
     "bar-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Otomatik",
+      "label-manual": "Manuel"
     },
-    "category-bar-gauge": "",
-    "description-max-height": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-show-unfilled-area": "",
+    "category-bar-gauge": "Çubuk gösterge",
+    "description-max-height": "Maksimum satır yüksekliği (yatay hizalama)",
+    "description-min-height": "Minimum satır yüksekliği (yatay hizalama)",
+    "description-min-width": "Minimum sütun genişliği (dikey hizalama)",
+    "description-show-unfilled-area": "Etkinleştirildiğinde doldurulmamış bölge gri olarak görüntülenir",
     "display-mode-options": {
-      "label-basic": "",
-      "label-gradient": "",
-      "label-retro": ""
+      "label-basic": "Temel",
+      "label-gradient": "Gradyan",
+      "label-retro": "Retro LCD"
     },
-    "name-bar-size": "",
-    "name-display-mode": "",
-    "name-max-height": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-name-placement": "",
+    "name-bar-size": "Çubuk boyutu",
+    "name-display-mode": "Görüntüleme modu",
+    "name-max-height": "Maks. yükseklik",
+    "name-min-height": "Min. yükseklik",
+    "name-min-width": "Min. genişlik",
+    "name-name-placement": "Ad yerleşimi",
     "name-placement-options": {
-      "label-auto": "",
-      "label-hidden": "",
-      "label-left": "",
-      "label-top": ""
+      "label-auto": "Otomatik",
+      "label-hidden": "Gizli",
+      "label-left": "Sol",
+      "label-top": "Üst"
     },
-    "name-show-unfilled-area": "",
-    "name-value-display": "",
+    "name-show-unfilled-area": "Doldurulmamış alanı göster",
+    "name-value-display": "Değer görüntüleme",
     "value-display-options": {
-      "label-hidden": "",
-      "label-text-color": "",
-      "label-value-color": ""
+      "label-hidden": "Gizli",
+      "label-text-color": "Metin rengi",
+      "label-value-color": "Değer rengi"
     }
   },
   "bookmarks-page": {
@@ -3486,8 +3486,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "Sağlanan Kaynakları Toplu Sil",
+      "bulk-move-provisioned-resources": "Sağlanan Kaynakları Toplu Taşı",
       "cancel-button": "İptal",
       "confirmation-text": "Sil",
       "delete-button": "Sil",
@@ -3496,7 +3496,7 @@
       "delete-modal-restore-dashboards-text": "Bu işlem, seçilen klasörleri anında silecektir ancak seçilen panolar 30 gün içinde silinmek üzere işaretlenecektir. Kuruluş yöneticiniz, panoları 30 günlük süre dolmadan önce istediği zaman geri yükleyebilir. Klasörler geri yüklenemez.",
       "delete-modal-text": "Bu işlem aşağıdaki içerikleri silecektir:",
       "delete-modal-title": "Sil",
-      "delete-provisioned-folder": "",
+      "delete-provisioned-folder": "Sağlanan klasörü sil",
       "deleting": "Siliniyor...",
       "manage-permissions-button": "İzinleri yönet",
       "move-button": "Taşı",
@@ -3506,8 +3506,8 @@
       "move-modal-title": "Taşı",
       "moving": "Taşınıyor...",
       "new-folder-name-required-phrase": "Klasör adı gereklidir.",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "Hem sağlanmış hem de sağlanmamış kaynakları seçtiniz. Bunlar birlikte işlenemez. Lütfen yalnızca sağlanmış kaynakları veya yalnızca sağlanmamış kaynakları seçin ve tekrar deneyin.",
+      "selected-mix-resources-modal-title": "Karışık kaynak türleri seçildi"
     },
     "actions": {
       "button-to-recently-deleted": "Son silinenler"
@@ -3520,25 +3520,25 @@
       "this-folder-is-empty": "Klasör boş"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_one": "",
-      "failed-alert_other": ""
+      "all-deleted": "Tüm kaynaklar başarıyla silindi",
+      "all-moved": "Tüm kaynaklar başarıyla taşındı",
+      "button-done": "Tamamlandı",
+      "progress-title": "Başarılı",
+      "failed-alert_one": "{{count}} öge başarısız oldu",
+      "failed-alert_other": "{{count}} öge başarısız oldu"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "İptal et",
+      "button-delete": "Sil",
+      "button-deleting": "Siliniyor...",
+      "delete-warning": "Bu işlem, seçilen klasörleri ve alt öğelerini silecektir. Bu işlem toplamda şunları etkileyecektir:",
+      "error-path-not-found": "Yol bulunamadı"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "İptal et",
+      "button-move": "Taşı",
+      "button-moving": "Taşınıyor...",
+      "deleting": "Siliniyor",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,14 +3546,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "Dosya içeriği bulunamadı",
+      "error-path-not-found": "Yol bulunamadı",
+      "error-target-folder-path-missing": "Hedef klasör yolu eksik",
+      "error-title": "Hedef Klasör Hatası",
+      "move-warning": "Bu işlem, seçilen klasörleri ve alt öğelerini taşıyacaktır. Bu işlem toplamda şunları etkileyecektir:",
+      "moving": "Taşınıyor",
+      "progress": "İlerleme: {{current}} / {{total}}",
+      "target-folder": "Hedef Klasör"
     },
     "counts": {
       "alertRule_one": "{{count}} uyarı kuralı",
@@ -3579,12 +3579,12 @@
       "read-only-message": ""
     },
     "delete-provisioned-folder-form": {
-      "api-error": "",
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "success-message": ""
+      "api-error": "Klasör silinemedi",
+      "button-cancel": "İptal et",
+      "button-delete": "Sil",
+      "button-deleting": "Siliniyor...",
+      "delete-warning": "Bu işlem, bu klasörü ve tüm alt klasörlerini silecektir. Bu işlem toplamda şunları etkileyecektir:",
+      "success-message": "Klasör başarıyla silindi"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "Alt öge bilgileri alınamıyor"
@@ -3609,7 +3609,7 @@
       "empty-message": "Klasör bulunamadı",
       "error-title": "Klasörler yüklenirken hata oluştu",
       "non-folder-item": "Klasörsüz {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "Panolar",
       "search-placeholder": "Klasör ara",
       "unknown-error": "Bilinmeyen hata"
     },
@@ -3638,7 +3638,7 @@
       "folder-name-input-placeholder-enter-folder-name": "Klasör adını girin",
       "label-folder-name": "Klasör adı",
       "text-pull-request-created": "Bu klasörde yapılan değişikliklerle bir çekme isteği oluşturuldu:",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "Klasörünüz şu şekilde oluşturulacak: {{folderName}}",
       "title-pull-request-created": "Çekme isteği oluşturuldu",
       "title-this-repository-is-read-only": "Bu depo salt okunur"
     },
@@ -3647,52 +3647,52 @@
       "text": "Sorgunuz için sonuç bulunamadı"
     },
     "restore": {
-      "success": ""
+      "success": "{{name}} panosu geri yüklendi"
     },
     "text-this-repository-is-read-only": "Hedefe doğrudan erişiminiz varsa JSON'u kopyalayıp oraya yapıştırın.",
     "trash-state-manager": {
       "label": {
-        "alphabetically-az": "",
-        "alphabetically-za": ""
+        "alphabetically-az": "Alfabetik (A-Z)",
+        "alphabetically-za": "Alfabetik (Z-A)"
       }
     }
   },
   "candlestick": {
     "additional-fields-options": {
-      "label-ignore": "",
-      "label-include": ""
+      "label-ignore": "Yok say",
+      "label-include": "Dâhil et"
     },
     "candle-style-options": {
-      "label-candles": "",
-      "label-ohlc-bars": ""
+      "label-candles": "Mumlar",
+      "label-ohlc-bars": "OHLC Çubukları"
     },
-    "category-candlestick": "",
+    "category-candlestick": "Şamdan",
     "color-strategy-options": {
-      "label-since-open": "",
-      "label-since-prior-close": ""
+      "label-since-open": "Açıldığından beri",
+      "label-since-prior-close": "Önceki kapatılıştan beri"
     },
-    "description-additional-fields": "",
-    "description-close": "",
-    "description-high": "",
-    "description-low": "",
-    "description-open": "",
-    "description-volume": "",
+    "description-additional-fields": "Yukarıda eşleştirilmeyen alanları yapılandırmak için standart zaman serisi seçeneklerini kullanın",
+    "description-close": "Dönem sonundaki değer",
+    "description-high": "Dönem içindeki maksimum değer",
+    "description-low": "Dönem içindeki minimum değer",
+    "description-open": "Dönem başındaki değer",
+    "description-volume": "Dönem içindeki örnek sayısı",
     "mode-options": {
-      "label-both": "",
-      "label-candles": "",
-      "label-volume": ""
+      "label-both": "Her ikisi de",
+      "label-candles": "Mumlar",
+      "label-volume": "Hacim"
     },
-    "name-additional-fields": "",
-    "name-candle-style": "",
-    "name-close": "",
-    "name-color-strategy": "",
-    "name-down-color": "",
-    "name-high": "",
-    "name-low": "",
-    "name-mode": "",
-    "name-open": "",
-    "name-up-color": "",
-    "name-volume": ""
+    "name-additional-fields": "Ek alanlar",
+    "name-candle-style": "Mum stili",
+    "name-close": "Kapat",
+    "name-color-strategy": "Renk stratejisi",
+    "name-down-color": "Alt renk",
+    "name-high": "Yüksek",
+    "name-low": "Düşük",
+    "name-mode": "Mod",
+    "name-open": "Aç",
+    "name-up-color": "Üst renk",
+    "name-volume": "Hacim"
   },
   "canvas": {
     "apieditor": {
@@ -3707,18 +3707,18 @@
       }
     },
     "button-item": {
-      "category-button": "",
+      "category-button": "Düğme",
       "label": {
         "center": "Merkez",
         "left": "Sol",
         "right": "Sağ"
       },
-      "name-align-text": "",
-      "name-api": "",
-      "name-style": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
+      "name-align-text": "Metni hizala",
+      "name-api": "API",
+      "name-style": "Stil",
+      "name-text": "Metin",
+      "name-text-color": "Metin rengi",
+      "name-text-size": "Metin boyutu",
       "placeholder": {
         "auto": "Otomatik"
       }
@@ -3745,21 +3745,21 @@
         }
       }
     },
-    "category-arrow-direction": "",
-    "category-background": "",
-    "category-border": "",
-    "category-canvas": "",
-    "category-color": "",
-    "category-data-links": "",
-    "category-line-style": "",
-    "category-metric-value": "",
-    "category-radius": "",
-    "category-selected-connection": "",
-    "category-selected-element": "",
-    "category-size": "",
-    "category-tooltip": "",
+    "category-arrow-direction": "Ok yönü",
+    "category-background": "Arka Plan",
+    "category-border": "Kenarlık",
+    "category-canvas": "Tuval",
+    "category-color": "Renk",
+    "category-data-links": "Veri bağlantıları ve eylemler",
+    "category-line-style": "Çizgi stili",
+    "category-metric-value": "Metrik değeri",
+    "category-radius": "Çap",
+    "category-selected-connection": "Seçilen bağlantı",
+    "category-selected-element": "Seçilen öge ({{element}})",
+    "category-size": "Boyut",
+    "category-tooltip": "Araç ipucu",
     "cloud-item": {
-      "category-cloud": "",
+      "category-cloud": "Bulut",
       "label": {
         "bottom": "Alt",
         "center": "Merkez",
@@ -3768,47 +3768,47 @@
         "right": "Sağ",
         "top": "Üst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Metni hizala",
+      "name-text": "Metin",
+      "name-text-color": "Metin rengi",
+      "name-text-size": "Metin boyutu",
+      "name-vertical-align": "Dikey hizalama",
       "placeholder": {
         "auto": "Otomatik"
       }
     },
-    "description-experimental-types": "",
-    "description-inline-editing": "",
-    "description-pan-zoom": "",
+    "description-experimental-types": "Deneysel öge türlerinin seçimini etkinleştir",
+    "description-inline-editing": "Paneli doğrudan düzenlemeyi etkinleştir",
+    "description-pan-zoom": "Kaydırma ve yakınlaştırmayı etkinleştir",
     "direction-options": {
-      "label-both": "",
-      "label-forward": "",
-      "label-none": "",
-      "label-reverse": ""
+      "label-both": "Her ikisi de",
+      "label-forward": "İleri",
+      "label-none": "Yok",
+      "label-reverse": "Geri döndür"
     },
     "drone-front-item": {
-      "category-drone-front": "",
-      "name-roll-angle": ""
+      "category-drone-front": "Ön Drone",
+      "name-roll-angle": "Yuvarlanma Açısı"
     },
     "drone-side-item": {
-      "category-drone-side": "",
-      "name-pitch-angle": ""
+      "category-drone-side": "Yan Drone",
+      "name-pitch-angle": "Eğim Açısı"
     },
     "drone-top-item": {
-      "category-drone-top": "",
-      "name-back-left-rotor-rpm": "",
-      "name-back-right-rotor-rpm": "",
-      "name-front-left-rotor-rpm": "",
-      "name-front-right-rotor-rpm": "",
-      "name-yaw-angle": ""
+      "category-drone-top": "Üst Drone",
+      "name-back-left-rotor-rpm": "Sol Arka Rotor Devir Hızı",
+      "name-back-right-rotor-rpm": "Sağ Arka Rotor Devir Hızı",
+      "name-front-left-rotor-rpm": "Sol Ön Rotor Devir Hızı",
+      "name-front-right-rotor-rpm": "Sağ Ön Rotor Devir Hızı",
+      "name-yaw-angle": "Sapma Açısı"
     },
     "element-editor": {
-      "category-layout": "",
-      "description-unsupported": "",
-      "name-quick-placement": ""
+      "category-layout": "Düzen",
+      "description-unsupported": "Seçilen öge tipi mevcut ayarlar tarafından desteklenmiyor. Lütfen gelişmiş öge türlerini etkinleştirin.",
+      "name-quick-placement": "Hızlı yerleştirme"
     },
     "ellipse-item": {
-      "category-ellipse": "",
+      "category-ellipse": "Elips",
       "label": {
         "bottom": "Alt",
         "center": "Merkez",
@@ -3817,50 +3817,50 @@
         "right": "Sağ",
         "top": "Üst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Metni hizala",
+      "name-text": "Metin",
+      "name-text-color": "Metin rengi",
+      "name-text-size": "Metin boyutu",
+      "name-vertical-align": "Dikey hizalama",
       "placeholder": {
         "auto": "Otomatik"
       }
     },
     "icon-item": {
-      "category-icon": "",
-      "name-fill-color": "",
-      "name-svg-path": ""
+      "category-icon": "Simge",
+      "name-fill-color": "Dolgu rengi",
+      "name-svg-path": "SVG Yolu"
     },
     "inline-edit": {
       "canvas-inline-editor": "Tuval Satır İçi Düzenleyici",
       "tooltip-close-inline-editor": "Satır içi düzenleyiciyi kapat"
     },
     "inline-edit-body": {
-      "category-selected-element": "",
+      "category-selected-element": "Seçilen öge ({{element}})",
       "label-add-item": "Öge ekle",
       "please-select-an-element": "Lütfen bir bileşen seçin"
     },
-    "label-actions": "",
-    "label-color": "",
-    "label-direction": "",
-    "label-image": "",
-    "label-image-size": "",
-    "label-line-style": "",
-    "label-links": "",
-    "label-radius": "",
-    "label-size": "",
-    "label-width": "",
+    "label-actions": "İşlemler",
+    "label-color": "Renk",
+    "label-direction": "Yön",
+    "label-image": "Resim",
+    "label-image-size": "Resim boyutu",
+    "label-line-style": "Çizgi stili",
+    "label-links": "Bağlantılar",
+    "label-radius": "Çap",
+    "label-size": "Boyut",
+    "label-width": "Genişlik",
     "layer-editor": {
-      "category-layer": "",
-      "category-layout": "",
-      "name-constraints": "",
-      "name-elements": ""
+      "category-layer": "Katman",
+      "category-layout": "Düzen",
+      "name-constraints": "Kısıtlamalar",
+      "name-elements": "Ögeler"
     },
     "line-style-editor": {
       "label-animate": "Animasyon"
     },
     "line-style-options": {
-      "label-solid": ""
+      "label-solid": "Katı"
     },
     "metric-value-item": {
       "label": {
@@ -3875,14 +3875,14 @@
         "auto": "Otomatik"
       }
     },
-    "name-align-text": "",
-    "name-color": "",
-    "name-experimental-types": "",
-    "name-inline-editing": "",
-    "name-pan-zoom": "",
-    "name-text": "",
-    "name-text-size": "",
-    "name-vertical-align": "",
+    "name-align-text": "Metni hizala",
+    "name-color": "Metin rengi",
+    "name-experimental-types": "Deneysel öge türleri",
+    "name-inline-editing": "Satır içi düzenleme",
+    "name-pan-zoom": "Kaydırma ve yakınlaştırma",
+    "name-text": "Metin",
+    "name-text-size": "Metin boyutu",
+    "name-vertical-align": "Dikey hizalama",
     "not-found-display": {
       "not-found": "<0>Bulunamadı: </0><config />"
     },
@@ -3895,7 +3895,7 @@
       "zoom-scroll-wheel": "Yakınlaştırma: Tekerleği kaydırma"
     },
     "parallelogram-item": {
-      "category-parallelogram": "",
+      "category-parallelogram": "Paralelkenar",
       "label": {
         "bottom": "Alt",
         "center": "Merkez",
@@ -3904,11 +3904,11 @@
         "right": "Sağ",
         "top": "Üst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Metni hizala",
+      "name-text": "Metin",
+      "name-text-color": "Metin rengi",
+      "name-text-size": "Metin boyutu",
+      "name-vertical-align": "Dikey hizalama",
       "placeholder": {
         "auto": "Otomatik"
       }
@@ -3921,21 +3921,21 @@
     },
     "placement-editor": {
       "horizontal-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-left-and-right": "",
-        "label-right": "",
-        "label-scale": ""
+        "label-center": "Merkez",
+        "label-left": "Sol",
+        "label-left-and-right": "Sol ve sağ",
+        "label-right": "Sağ",
+        "label-scale": "Ölçek"
       },
       "label-constraints": "Kısıtlamalar",
       "label-position": "Pozisyon",
       "loading": "Yükleniyor...",
       "vertical-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-scale": "",
-        "label-top": "",
-        "label-top-and-bottom": ""
+        "label-bottom": "Alt",
+        "label-center": "Merkez",
+        "label-scale": "Ölçek",
+        "label-top": "Üst",
+        "label-top-and-bottom": "Üst ve alt"
       }
     },
     "quick-positioning": {
@@ -3947,7 +3947,7 @@
       "tooltip-align-vertical-centers": "Dikey merkezleri hizala"
     },
     "rectangle-item": {
-      "category-rectangle": "",
+      "category-rectangle": "Dikdörtgen",
       "label": {
         "bottom": "Alt",
         "center": "Merkez",
@@ -3956,33 +3956,33 @@
         "right": "Sağ",
         "top": "Üst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Metni hizala",
+      "name-text": "Metin",
+      "name-text-color": "Metin rengi",
+      "name-text-size": "Metin boyutu",
+      "name-vertical-align": "Dikey hizalama",
       "placeholder": {
         "auto": "Otomatik"
       }
     },
     "server-item": {
-      "category-server": "",
-      "name-blink-rate": "",
-      "name-bulb-color": "",
-      "name-status-color": "",
-      "name-type": "",
+      "category-server": "Sunucu",
+      "name-blink-rate": "Yanıp sönme hızı [hz] (0 = kapalı)",
+      "name-bulb-color": "Ampul rengi",
+      "name-status-color": "Durum rengi",
+      "name-type": "Tür",
       "type-options": {
-        "label-database": "",
-        "label-single": "",
-        "label-stack": "",
-        "label-terminal": ""
+        "label-database": "Veri tabanı",
+        "label-single": "Tek",
+        "label-stack": "Yığın",
+        "label-terminal": "Terminal"
       }
     },
     "text-display": {
       "double-click-to-set": "Metni ayarlamak için çift tıklayın"
     },
     "text-item": {
-      "category-text": "",
+      "category-text": "Metin",
       "label": {
         "bottom": "Alt",
         "center": "Merkez",
@@ -3991,20 +3991,20 @@
         "right": "Sağ",
         "top": "Üst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Metni hizala",
+      "name-text": "Metin",
+      "name-text-color": "Metin rengi",
+      "name-text-size": "Metin boyutu",
+      "name-vertical-align": "Dikey hizalama",
       "placeholder": {
         "auto": "Otomatik"
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "Araç ipucu modu",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "Devre dışı",
+        "label-enabled": "Etkin"
       }
     },
     "tree-navigation-editor": {
@@ -4024,7 +4024,7 @@
       "tooltip-remove": "Kaldır"
     },
     "triangle-item": {
-      "category-triangle": "",
+      "category-triangle": "Üçgen",
       "label": {
         "bottom": "Alt",
         "center": "Merkez",
@@ -4033,18 +4033,18 @@
         "right": "Sağ",
         "top": "Üst"
       },
-      "name-align-text": "",
-      "name-text": "",
-      "name-text-color": "",
-      "name-text-size": "",
-      "name-vertical-align": "",
+      "name-align-text": "Metni hizala",
+      "name-text": "Metin",
+      "name-text-color": "Metin rengi",
+      "name-text-size": "Metin boyutu",
+      "name-vertical-align": "Dikey hizalama",
       "placeholder": {
         "auto": "Otomatik"
       }
     },
     "wind-turbine-item": {
-      "category-wind-turbine": "",
-      "name-rpm": ""
+      "category-wind-turbine": "Rüzgâr Türbini",
+      "name-rpm": "RPM"
     }
   },
   "carousel": {
@@ -4061,8 +4061,8 @@
   "close-button": {
     "tooltip": "Kapat"
   },
-  "cloud-enterprise-feature-badge": "",
-  "cloud-feature-badge": "",
+  "cloud-enterprise-feature-badge": "Bulut ve Kurumsal",
+  "cloud-feature-badge": "Bulut",
   "combobox": {
     "async": {
       "error": "Seçenekler yüklenirken bir hata oluştu."
@@ -4373,7 +4373,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "Sorgu çalıştır"
     }
   },
   "dashboard": {
@@ -4536,7 +4536,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "İlerleyin"
         },
         "title": {
           "proceed-to-external-site": "Haricî siteye geçilsin mi?"
@@ -4633,7 +4633,7 @@
       }
     },
     "description": {
-      "action": ""
+      "action": "Pano açıklamasını değiştir"
     },
     "dynamic-config-value-editor": {
       "render-label": {
@@ -4642,17 +4642,17 @@
     },
     "edit-actions": {
       "add": "{{typeName}} ekle",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
-      "move": "",
+      "add-conditional-rule": "{{ruleDescription}} kuralı ekle",
+      "duplicate-panel": "Paneli çoğalt",
+      "edit-query-result-rule": "Sorgu sonucu kuralını değiştir",
+      "edit-template-variable-rule": "Şablon değişkeni kuralını değiştir",
+      "edit-time-range-rule": "Zaman aralığı kuralını değiştir",
+      "move": "{{typeName}} ögesini taşı",
       "panel-background": "Panel arka planını değiştir",
       "panel-description": "Panel açıklamasını değiştir",
-      "panel-max-repeats-per-row": "",
+      "panel-max-repeats-per-row": "Satır başına maksimum tekrar sayısı",
       "panel-repeat-direction": "Tekrar yönü",
-      "panel-repeat-variable": "",
+      "panel-repeat-variable": "Panel yineleme ölçütü",
       "panel-title": "Panel başlığını değiştir",
       "paste-panel": "Paneli yapıştır",
       "remove": "{{typeName}} ögesini kaldır",
@@ -4661,7 +4661,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "Pano",
-        "element": "",
+        "element": "Bileşen",
         "local-variable": "Yerel değişken",
         "multiple-elements": "Birden çok öge",
         "multiple-elements-delete-text": "Bu ögeleri silmek istediğinize emin misiniz?",
@@ -4743,10 +4743,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "Panoyu dışa aktar"
       },
       "menu": {
-        "label": ""
+        "label": "Pano menüsünü dışa aktar"
       }
     },
     "fetch-dashboard": {
@@ -4768,9 +4768,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Varsayılan",
+          "shared-crosshair": "Paylaşılan artı işareti",
+          "shared-tooltip": "Paylaşılan araç ipucu"
         }
       }
     },
@@ -4787,7 +4787,7 @@
     "get-field-override-categories": {
       "label-add-field-override": "Alan geçersiz kılma ekle",
       "label-add-override-property": "Geçersiz kılma özelliği ekle",
-      "override-name": "",
+      "override-name": "{{overrideNum}} ögesini geçersiz kıl",
       "title": {
         "add-button": "ekle düğmesi"
       }
@@ -4823,14 +4823,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Ek açıklama verilerini aşağıdaki panellere gönderme",
+        "annotation-panels-support-annotations": "Ek açıklama verilerini, ek açıklamaları destekleyen tüm panellere gönder",
+        "annotations-explicitly-listed-panels": "Ek açıklamaları açıkça listelenen panellere gönder"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Tüm paneller",
+        "all-panels-except": "Şunlar hariç tüm paneller",
+        "selected-panels": "Seçili paneller"
       }
     },
     "get-panel-frame-category": {
@@ -5016,7 +5016,7 @@
       "title-matched_other": "{{totalCount}} seçenekten {{count}} tanesi eşleşti"
     },
     "outline": {
-      "repeated-item": "",
+      "repeated-item": "Tekrar et",
       "tree-item": {
         "empty": "(boş)",
         "no-title": "<başlık yok>"
@@ -5092,7 +5092,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Panoyu {{version}} sürümüne geri yüklemek istediğinize emin misiniz? Kaydedilmemiş tüm değişiklikler kaybolacaktır.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Evet, {{version}} sürümüne geri yükle",
       "title-restore-version": "Sürümü geri yükle"
     },
     "row-options-button": {
@@ -5144,7 +5144,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Pano kaydedildi"
     },
     "save-dashboard-as-button": {
       "save-as": "Farklı kaydet"
@@ -5174,13 +5174,13 @@
       "label-changes": "Değişiklikler",
       "label-details": "Ayrıntılar",
       "title": "Panoyu kaydet",
-      "title-copy": "",
-      "title-provisioned": ""
+      "title-copy": "Pano kopyasını kaydet",
+      "title-provisioned": "Sağlanan pano"
     },
     "save-dashboard-error-proxy": {
       "body-name-exists": "Seçilen klasörde aynı isimde bir pano zaten mevcut. <1></1><2>Yine de bu panoyu kaydetmek istiyor musunuz?</2>",
       "body-version-mismatch": "Başka bir kullanıcı bu panoyu güncelledi<1></1><2>Yine de bu panoyu kaydetmek ister misiniz?</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "Kaydet ve üzerine yaz",
       "title-name-exists": "Çakışma",
       "title-version-mismatch": "Çakışma"
     },
@@ -5253,7 +5253,7 @@
       }
     },
     "title": {
-      "action": ""
+      "action": "Pano başlığını değiştir"
     },
     "toolbar": {
       "add": "Ekle",
@@ -5377,9 +5377,9 @@
       "label-apply-transformation-to": "Dönüşümü şuraya uygula"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "Bir dönüşümü kaldırmanın diğerlerini bozabileceğini unutmayın. Yalnızca tek bir dönüşüm varsa ana seçim ekranına geri döneceksiniz.",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "Sil",
         "title-debug": "Hata ayıklama",
         "title-disable-transformation": "Dönüşümü devre dışı bırakma",
         "title-filter": "Filtreleyin",
@@ -5400,16 +5400,16 @@
       "placeholder-search-for-transformation": "Dönüşüm ara",
       "show-images": "Resimleri göster",
       "title-add-another-transformation": "Başka bir dönüşüm ekle",
-      "view-all": ""
+      "view-all": "Tümünü görüntüle"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "Tüm dönüşümleri silerek ana seçim ekranına geri döneceksiniz."
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Başka bir dönüşüm ekle"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "Tümünü sil",
       "delete-all-transformations": "Tüm dönüşümleri sil",
       "title-delete-all-transformations": "Tüm dönüşümler silinsin mi?",
       "tooltip-clear-search": "Aramayı temizle",
@@ -5439,16 +5439,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "Değişken açıklamasını değiştir"
       },
       "hide": {
-        "action": ""
+        "action": "Değişken gizleme seçeneğini değiştir"
       },
       "label": {
-        "action": ""
+        "action": "Değişken etiketini değiştir"
       },
       "name": {
-        "action": ""
+        "action": "Değişken adını değiştir"
       }
     },
     "version-history-comparison": {
@@ -5460,7 +5460,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "{{version}} sürümünün seçimini değiştir",
       "date": "Tarih",
-      "name-latest": "",
+      "name-latest": "En son",
       "notes": "Notlar",
       "restore": "Geri yükle",
       "updated-by": "Güncelleyen",
@@ -5538,7 +5538,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Boyutları CSV biçiminde girin: {{name}}, {{value}}",
       "label-data-source": "Veri kaynağı",
       "label-use-static-key-dimensions": "Statik anahtar boyutları kullan",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Özel değer girişine izin ver"
     },
     "add-to-dashboard": {
       "message": {
@@ -5612,7 +5612,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "Herkese açık URL'yi iptal et"
       },
       "title": {
         "revoke-public-url": "Herkese açık URL'yi iptal et"
@@ -5625,7 +5625,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Özel seçenekler",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "Virgülle ayrılmış değerler",
       "selection-options": "Seçim ayarları"
     },
     "dashboard-edit-pane-renderer": {
@@ -5646,8 +5646,8 @@
       "label-with-tags": "Etiketlerle birlikte",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "Panolar",
+          "link": "Bağlantı"
         }
       },
       "placeholder-open-dashboard": "Panoyu aç"
@@ -5690,8 +5690,8 @@
       "data-source-options": "Veri kaynağı seçenekleri",
       "description-instance-name-filter": "Değişken değer listesinde hangi veri kaynağı örneklerinin seçileceğini belirlemek için regex (düzenli ifade) filtresi. Tümü için boş bırakın.",
       "example-instance-name-filter": "Örnek: <codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "Örnek adı filtresi",
+      "name-type": "Tür",
       "selection-options": "Seçim ayarları"
     },
     "default-grid-layout-manager": {
@@ -5702,12 +5702,12 @@
       }
     },
     "delete-provisioned-dashboard-form": {
-      "api-error": "",
+      "api-error": "Pano silinemedi",
       "cancel-action": "İptal et",
       "delete-action": "Panoyu sil",
       "deleting": "Siliniyor...",
-      "drawer-title": "",
-      "success-message": ""
+      "drawer-title": "Sağlanan Panoyu Sil",
+      "success-message": "Pano başarıyla silindi"
     },
     "description-label": {
       "description": "Açıklama"
@@ -5736,15 +5736,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "Düzenlenebilir",
+          "readonly": "Salt okunur"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "Varsayılan",
+          "shared-crosshair": "Paylaşılan artı işareti",
+          "shared-tooltip": "Paylaşılan araç ipucu"
         }
       }
     },
@@ -5756,36 +5756,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "Anında anahtar/değer filtreleri ekleyin",
+        "dynamically-switch-source-multiple-panels": "Birden fazla panel için veri kaynağını dinamik olarak değiştirin",
+        "group": "Anında gruplandırma için anahtarlar ekleyin",
+        "hidden-constant-variable": "Paylaşmak istediğiniz panolardaki metrik önekler için kullanışlı olan gizli bir sabit değişken",
+        "users-enter-arbitrary-strings-textbox": "Kullanıcılar bir metin kutusuna herhangi bir dizi girebilir",
+        "values-are-static-and-defined-manually": "Değerler statiktir ve manuel olarak tanımlanır",
+        "values-fetched-source-query": "Değerler bir veri kaynağı sorgusundan alınır",
+        "values-timespans": "Değerler zaman aralıklarıdır, örneğin 1 dk, 1 sa, 1 gün"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "Geçici filtreler",
+        "constant": "Sabit",
+        "custom": "Özel",
+        "data-source": "Veri kaynağı",
+        "group-by": "Gruplandır",
+        "interval": "Aralık",
+        "query": "Sorgu",
+        "textbox": "Metin kutusu"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "Ek açıklama verilerini aşağıdaki panellere gönderme",
+        "annotation-panels-support-annotations": "Ek açıklama verilerini, ek açıklamaları destekleyen tüm panellere gönder",
+        "annotations-explicitly-listed-panels": "Ek açıklamaları açıkça listelenen panellere gönder"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "Tüm paneller",
+        "all-panels-except": "Şunlar hariç tüm paneller",
+        "selected-panels": "Seçili paneller"
       }
     },
     "get-panel-frame-options": {
@@ -5813,7 +5813,7 @@
       "group-by-options": "Seçeneklere göre grupla",
       "label-data-source": "Veri kaynağı",
       "label-use-static-group-by-dimensions": "Statik grup boyutlarını kullan",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "Özel değerlere izin ver"
     },
     "help-wizard": {
       "copy-to-clipboard": "Panoya kopyala",
@@ -5849,14 +5849,14 @@
       "apply": "Uygula"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "Zaman aralığını belirtilen sayıya bölerek aralığı dinamik olarak hesaplar",
       "description-calculated-value-below-threshold": "Hesaplanan değer bu eşiğin altına düşmeyecektir",
       "description-step-count": "Değeri hesaplamak için mevcut zaman aralığının kaç kez bölüneceği",
       "interval-options": "Aralık seçenekleri",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "Otomatik seçenek",
+      "name-min-interval": "Min. aralık",
+      "name-step-count": "Adım sayısı",
+      "name-values": "Değerler"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5877,19 +5877,19 @@
       "usage-count_other": "{{count}} panoda kullanılıyor"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "Pano taşınırken hata oluştu",
+      "api-error": "Pano taşınamadı",
+      "cancel-action": "İptal et",
+      "current-file-not-found": "Geçerli pano dosyası bulunamadı",
+      "drawer-title": "Sağlanan Gösterge Tablosunu Taşı",
+      "file-load-error": "Pano yüklenirken hata oluştu",
+      "loading-file-data": "Pano verisi yükleniyor",
+      "move-action": "Panoyu taşı",
+      "move-read-only-message": "Depo salt okunur olduğundan bu pano doğrudan Grafana'dan taşınamaz. Bu panoyu taşımak için lütfen dosyayı Git deponuza taşıyın.",
+      "moving": "Taşınıyor...",
+      "success-message": "Pano başarıyla taşındı",
+      "target-path-label": "Hedef yol",
+      "title-this-repository-is-read-only": "Bu depo salt okunur"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "Seçilen klasörde aynı isimde bir pano zaten mevcut. Yine de bu panoyu kaydetmek istiyor musunuz?",
@@ -5897,7 +5897,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "İlerleyin"
       },
       "title": {
         "proceed-to-external-site": "Haricî siteye geçilsin mi?"
@@ -5912,7 +5912,7 @@
       }
     },
     "panel-data-alerting-tab": {
-      "tab-label": ""
+      "tab-label": "Uyarı"
     },
     "panel-data-alerting-tab-rendered": {
       "alert": {
@@ -5923,19 +5923,19 @@
       "title-dashboard-not-saved": "Pano kaydedilmedi"
     },
     "panel-data-queries-tab": {
-      "tab-label": ""
+      "tab-label": "Sorgular"
     },
     "panel-data-queries-tab-rendered": {
       "add-query": "Sorgu ekle",
       "expression": "İfade "
     },
     "panel-data-transformations-tab": {
-      "tab-label": ""
+      "tab-label": "Dönüşümler"
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Başka bir dönüşüm ekle",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "Tüm dönüşümleri silerek ana seçim ekranına geri döneceksiniz.",
+      "confirmText-delete-all": "Tümünü sil",
       "delete-all-transformations": "Tüm dönüşümleri sil",
       "title-delete-all-transformations": "Tüm dönüşümler silinsin mi?"
     },
@@ -5988,13 +5988,13 @@
       "description-examples": "Görüntü metnini ve değeri ayırmak için adlandırılmış yakalama grupları kullanılabilir (<1>örnekleri görün</1>).",
       "description-optional": "İsteğe bağlıdır, bir seri adının veya metrik düğüm parçasının bir kısmını çıkarmak istiyorsanız kullanılır.",
       "label-data-source": "Veri kaynağı",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "Statik seçenekleri sırala",
       "label-target-data-source": "Hedef veri kaynağı",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "Statik seçenekleri kullan",
+      "name-regex": "Düzenli İfade",
       "query-options": "Sorgu seçenekleri",
       "selection-options": "Seçim ayarları",
-      "static-options-legend": ""
+      "static-options-legend": "Statik seçenekler"
     },
     "resource-export": {
       "label": {
@@ -6007,7 +6007,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Panoyu {{version}} sürümüne geri yüklemek istediğinize emin misiniz? Kaydedilmemiş tüm değişiklikler kaybolacaktır.",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "Evet, {{version}} sürümüne geri yükle",
       "title-restore-version": "Sürümü geri yükle"
     },
     "save-button": {
@@ -6026,15 +6026,15 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "Pano kaydedilemedi"
       },
-      "required": ""
+      "required": "Gerekli"
     },
     "save-dashboard-drawer": {
       "tabs": {
         "label-changes": "Değişiklikler",
         "label-details": "Ayrıntılar",
         "title": "Panoyu kaydet",
-        "title-copy": "",
-        "title-provisioned": ""
+        "title-copy": "Pano kopyasını kaydet",
+        "title-provisioned": "Sağlanan pano"
       }
     },
     "save-dashboard-form": {
@@ -6053,8 +6053,8 @@
         "title-someone-else-has-updated-this-dashboard": "Başka biri bu panoyu güncelledi",
         "would-still-dashboard": "Yine de bu panoyu kaydetmek istiyor musunuz?"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "Yeni pano şemasındaki (V2) sınırlamalar nedeniyle kütüphane panelleri, harici dışa aktarma sırasında gömülü içeriğe sahip normal panellere dönüştürülecektir.",
+      "schema-v2-library-panels-export-title": "Kütüphane panelleri normal panellere dönüştürülecek",
       "title-dashboard-drastically-changed": "Pano geri döndürülemez şekilde değiştirildi"
     },
     "save-dashboard-form-common-options": {
@@ -6101,10 +6101,10 @@
       "description-enables-multiple-values-selected": "Aynı anda birden fazla değerin seçilmesini sağlar",
       "description-enables-option-include-variables": "Tüm değerleri dahil etme seçeneğini etkinleştirir",
       "description-enables-users-custom-values": "Kullanıcıların listeye özel değerler eklemesine olanak tanır",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "Özel değer girişine izin ver",
+      "name-custom-all-value": "Özel tüm değer",
+      "name-include-all-option": "Tümünü Dahil Et seçeneği",
+      "name-multi-value": "Çoklu değer"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Paylaşım menüsünü aç/kapat"
@@ -6125,7 +6125,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "Varsayılan değer"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(isteğe bağlı)",
@@ -6150,8 +6150,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "Bu panelin bağlantısını kaldırırsanız diğer panoları etkilemeden düzenleyebilirsiniz. Ancak bir değişiklik yaptıktan sonra orijinal yeniden kullanılabilir panele geri dönemezsiniz.",
+      "confirmText-yes-unlink": "Evet, bağlantıyı kaldır",
       "title-really-unlink-panel": "Bu panelin bağlantısını gerçekten kaldırmak istiyor musunuz?"
     },
     "unsaved-changes-modal": {
@@ -6169,7 +6169,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "Pano kaydedildi"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Bu değişken başka bir değişken veya pano tarafından referans alınmıyor.",
@@ -6181,15 +6181,15 @@
       "aria-label-variable-editor-form": "Değişken düzenleyici formu",
       "back-to-list": "Listeye geri dön",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "Değişkeni sil"
       },
       "delete": "Sil",
       "description-optional-display-name": "İsteğe bağlı görünen ad",
       "description-template-variable-characters": "Şablon değişkeninin adı. (Maks. 50 karakter)",
       "general": "Genel",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "Açıklama",
+      "name-label": "Etiket",
+      "name-name": "Ad",
       "placeholder-descriptive-text": "Açıklayıcı metin",
       "placeholder-label-name": "Etiket adı",
       "placeholder-variable-name": "Değişken adı",
@@ -6204,8 +6204,8 @@
       "variable": "Değişken"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "Şunu silmek istediğinizden emin misiniz: {{variable}}?",
+      "confirmText-delete-variable": "Değişkeni sil",
       "title-delete-variable": "Değişkeni sil",
       "tooltip-duplicate-variable": "Değişkeni çoğalt",
       "tooltip-remove-variable": "Değişkeni kaldır"
@@ -6213,15 +6213,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "Etiket",
+          "nothing": "Hiçbir şey",
+          "variable": "Değişken"
         }
       },
       "label": "Gizle"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "Değişken tipi"
     },
     "variable-usages-button": {
       "title-show-usages": "{{variableId}} için kullanım yerleri gösteriliyor",
@@ -6249,7 +6249,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "{{version}} sürümünün seçimini değiştir",
       "date": "Tarih",
-      "name-latest": "",
+      "name-latest": "En son",
       "notes": "Notlar",
       "restore": "Geri yükle",
       "updated-by": "Güncelleyen",
@@ -6356,18 +6356,18 @@
     }
   },
   "dashlist": {
-    "category-dashboard-list": "",
-    "name-folder": "",
-    "name-include-current-template-variables": "",
-    "name-include-current-time-range": "",
-    "name-max-items": "",
-    "name-query": "",
-    "name-recently-viewed": "",
-    "name-search": "",
-    "name-show-folder-names": "",
-    "name-show-headings": "",
-    "name-starred": "",
-    "name-tags": ""
+    "category-dashboard-list": "Pano listesi",
+    "name-folder": "Klasör",
+    "name-include-current-template-variables": "Geçerli şablon değişkeni değerlerini dâhil et",
+    "name-include-current-time-range": "Geçerli zaman aralığını dâhil et",
+    "name-max-items": "Maks. öge",
+    "name-query": "Sorgu",
+    "name-recently-viewed": "Son görüntülenen",
+    "name-search": "Ara",
+    "name-show-folder-names": "Klasör adlarını göster",
+    "name-show-headings": "Başlıkları göster",
+    "name-starred": "Yıldızlı",
+    "name-tags": "Etiketler"
   },
   "data-source-list": {
     "empty-state": {
@@ -6631,16 +6631,16 @@
   "dimensions": {
     "background-size-editor": {
       "options": {
-        "label-contain": "",
-        "label-cover": "",
-        "label-fill": "",
-        "label-original": "",
-        "label-tile": ""
+        "label-contain": "Kapsa",
+        "label-cover": "Kapak",
+        "label-fill": "Doldur",
+        "label-original": "Orijinal",
+        "label-tile": "Karo"
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": "",
-      "noOptionsMessage-no-fields-found": ""
+      "label-fixed-color": "Sabit renk",
+      "noOptionsMessage-no-fields-found": "Hiçbir alan bulunamadı"
     },
     "file-dropzone-custom-children": {
       "upload": "Yükle"
@@ -6654,10 +6654,10 @@
       "placeholder-search": "Ara"
     },
     "resource-dimension-editor": {
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Bir dize alanı sonucu kullan",
+      "description-fixed": "Sabit değer",
       "label-field": "Alan",
-      "label-fixed": "",
+      "label-fixed": "Sabit",
       "label-mappings": "Eşlemeler",
       "label-source": "Kaynak"
     },
@@ -6675,35 +6675,35 @@
     },
     "scalar-dimension-editor": {
       "fixed-value-options": {
-        "label-fixed-values": ""
+        "label-fixed-values": "Sabit değer"
       },
       "label-limit": "Sınırlama",
       "label-value": "Değer",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "Hiçbir alan bulunamadı",
       "scalar-options": {
-        "description-clamped": "",
-        "description-mod": "",
-        "label-clamped": "",
-        "label-mod": ""
+        "description-clamped": "Maks. ve min. değerlere sabitlenmiş alan değerlerini kullan",
+        "description-mod": "Alan değerlerini kullanarak maksimum değere göre modülüs hesapla",
+        "label-clamped": "Sabitlenmiş",
+        "label-mod": "Mod"
       }
     },
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "Sabit değer"
         }
       },
       "label-max": "Maks.",
       "label-min": "Min.",
       "label-value": "Değer",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "Hiçbir alan bulunamadı"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
-      "description-field": "",
-      "description-fixed": "",
+      "description-field": "Alan değerini görüntüle",
+      "description-fixed": "Sabit değer",
       "label-field": "Alan",
-      "label-fixed": "",
+      "label-fixed": "Sabit",
       "label-source": "Kaynak",
       "label-template": "Şablonu",
       "label-value": "Değer"
@@ -6717,16 +6717,16 @@
       "description-percentage-means-thresholds-relative": "Yüzde, min. ve maks. değerler baz alınarak hesaplanır",
       "modes": {
         "description": {
-          "threshold-based-percent-between-minmax": "",
-          "thresholds-based-absolute-values": ""
+          "threshold-based-percent-between-minmax": "Min./maks. değerler arasındaki yüzdeye göre eşik değeri seçin",
+          "thresholds-based-absolute-values": "Mutlak değerlere göre eşik değerleri seçin"
         },
         "label": {
-          "absolute": "",
-          "percentage": ""
+          "absolute": "Mutlak",
+          "percentage": "Yüzde"
         }
       },
       "thresholds-mode": "Eşik değeri modu",
-      "value-base": ""
+      "value-base": "Temel"
     },
     "urlpicker-tab": {
       "label-preview": "Ön izleme"
@@ -6806,6 +6806,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "Etkinlikler",
@@ -7078,7 +7079,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "Yükleniyor..."
     },
     "prev": "Önceki",
     "queryless-apps-extensions": {
@@ -7265,7 +7266,7 @@
           "start-time": "Başlangıç Tarihi:"
         }
       },
-      "share-span": "",
+      "share-span": "Paylaş",
       "warnings": "Uyarılar"
     },
     "span-filters": {
@@ -7275,8 +7276,8 @@
       "aria-label-select-service-name-operator": "Hizmet adını işlecini seç",
       "aria-label-select-span-name": "Zaman aralığı adı seç",
       "aria-label-select-span-name-operator": "Zaman aralığı adı işleci seçin",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "Maksimum zaman aralığı süresini seçin",
+      "ariaLabel-select-min-span-duration": "Minimum zaman aralığı süresini seçin",
       "label-collapse": "Zaman aralığı filtreleri",
       "label-duration": "Süre",
       "label-service-name": "Hizmet adı",
@@ -7348,23 +7349,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "Süre",
+      "export-started": "Dışa aktarma işlemi başlatıldı",
+      "give-feedback": "Geri Bildirim",
+      "link-copied": "Bağlantı panoya kopyalandı",
+      "path": "Yol",
+      "route": "Yol",
+      "services": "Hizmetler",
+      "share": "Paylaş",
+      "share-copy-link": "Bağlantıyı kopyala",
+      "share-export-json": "JSON olarak dışa aktar",
+      "share-tooltip": "İzlemeyi paylaş",
+      "start-time": "Başlangıç zamanı",
+      "target": "Hedef",
+      "title-share-thoughts-about-tracing-grafana": "Grafana'daki izleme deneyiminiz hakkındaki görüşlerinizi paylaşın.",
+      "tooltip-url": "{{route}} veya {{url}} veya {{target}} veya {{path}}",
+      "trace-id": "İzleme kimliği",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "Filtreleri temizle düğmesi",
@@ -7464,7 +7465,7 @@
       "when": "NE ZAMAN"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "Veri kaynaklarınızdan döndürülen tablolar üzerinde MySQL-dialect SQL çalıştırın. Veri kaynağı sorguları (yani \"A\", \"B\") tablo olarak kullanılabilir ve sorgu adı ile referans alınır. Alanlar, veri kaynağından döndürüldüğü gibi sütun olarak kullanılabilir.",
       "label-operation": "Çalıştırma"
     },
     "math": {
@@ -7495,7 +7496,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Klasörleri temizle",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "Klasör bulunamadı",
     "select-aria-label": "Klasör filtresi",
     "select-placeholder": "Klasöre göre filtrele"
   },
@@ -7544,23 +7545,23 @@
     "title": "Sayfadan ayrılmak mı istiyorsunuz?"
   },
   "gauge": {
-    "category-gauge": "",
-    "description-min-height": "",
-    "description-min-width": "",
-    "description-neutral": "",
-    "description-show-threshold-labels": "",
-    "description-show-threshold-markers": "",
+    "category-gauge": "Ölçü",
+    "description-min-height": "Minimum satır yüksekliği (yatay hizalama)",
+    "description-min-width": "Minimum sütun genişliği (dikey hizalama)",
+    "description-neutral": "Nötr nokta olarak Min. değerini kullanmak için boş bırakın",
+    "description-show-threshold-labels": "Eşik değerlerini gösterge çubuğunun etrafında görüntüle",
+    "description-show-threshold-markers": "Eşikleri dış çubuk olarak görüntüler",
     "gauge-size-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Otomatik",
+      "label-manual": "Manuel"
     },
-    "name-gauge-size": "",
-    "name-min-height": "",
-    "name-min-width": "",
-    "name-neutral": "",
-    "name-show-threshold-labels": "",
-    "name-show-threshold-markers": "",
-    "placeholder-neutral": ""
+    "name-gauge-size": "Gösterge boyutu",
+    "name-min-height": "Min. yükseklik",
+    "name-min-width": "Min. genişlik",
+    "name-neutral": "Nötr",
+    "name-show-threshold-labels": "Eşik etiketlerini göster",
+    "name-show-threshold-markers": "Eşik işaretçilerini göster",
+    "placeholder-neutral": "otomatik"
   },
   "gen-ai": {
     "apply-suggestion": "Uygula",
@@ -7569,51 +7570,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "Yer adları dizini bulunamadı",
+      "warning-no-geometry": "geometri bulunamıyor",
+      "warning-select-geohash": "Geohash alanını seçin",
+      "warning-select-lat-long": "Enlem/boylam alanlarını seçin",
+      "warning-select-lookup": "Arama alanını seçin",
+      "warning-unable-to-find": "Konum alanları bulunamıyor"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Dize alanı bulunamadı"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Sayısal alan bulunamadı"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Sayısal alan bulunamadı"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "Dize alanı bulunamadı"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "Yer adları dizini",
+      "name-geohash-field": "Geohash alanı",
+      "name-latitude-field": "Enlem alanı",
+      "name-location-mode": "Konum Modu",
+      "name-longitude-field": "Boylam alanı",
+      "name-lookup-field": "Arama alanı"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "Varsayılan alan adlarına göre konum verilerini otomatik olarak tanımlayın",
+        "description-coords": "Enlem ve boylam alanlarını belirtin",
+        "description-geohash": "Geohash alanını belirtin",
+        "description-lookup": "Yer adları dizini ve arama alanını belirtin",
+        "label-auto": "Otomatik",
+        "label-coords": "Koordinatlar",
+        "label-geohash": "Geohash",
+        "label-lookup": "Arama"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "Temel harita katmanı",
+    "category-map-controls": "Harita kontrolleri",
+    "category-map-layers": "Harita katmanları",
+    "category-map-view": "Harita görünümü",
     "coordinates-map-view-editor": {
       "label-latitude": "Enlem",
       "label-longitude": "Boylam"
@@ -7622,15 +7623,15 @@
       "center": "Merkez:",
       "zoom": "Yakınlaştırma:"
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "Bu konum, panel ilk yüklendiğinde gösterilecektir.",
+    "description-mouse-wheel-zoom": "Fare tekerleği ile yakınlaştırma kontrolünü etkinleştir",
+    "description-no-repeat": "Haritanın yatay olarak tekrar etmesini önleyin",
+    "description-share-view": "Birden fazla panelde aynı görünümü kullanın.  Not: Bunun için panonun yeniden yüklenmesi gerekebilir.",
+    "description-show-attribution": "Harita kaynağı atıf bilgilerini sağ altta göster",
+    "description-show-debug": "Harita bilgilerini göster",
+    "description-show-measure": "Harita üzerinde ölçüm yapmak için araçları göster",
+    "description-show-scale": "Harita ölçeğini belirtin",
+    "description-show-zoom": "Sol üst köşedeki yakınlaştırma kontrol düğmelerini göster",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Katman"
@@ -7654,12 +7655,12 @@
       "aria-label-add-geomap-style-rule": "Coğrafi harita stili kuralı ekle"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "Temel katman ",
+      "description-display-tooltip": "Katman için araç ipucunu göster",
+      "name-data": "Veri",
+      "name-display-tooltip": "Araç ipucunu göster",
+      "name-layer-type": "Katman türü",
+      "name-opacity": "Opaklık"
     },
     "layers-editor": {
       "label-add-layer": "Katman ekle",
@@ -7672,9 +7673,9 @@
       "use-current-map-settings": "Şu anki ayarları kullan"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "Harita açıklamasını göster",
+      "name-show-legend": "Açıklamayı göster",
+      "name-styles": "Biçemler"
     },
     "markers-legend": {
       "title-symbol": "Sembol"
@@ -7683,27 +7684,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "Ölçüm araçlarını göster"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "İlk görünüm",
+    "name-mouse-wheel-zoom": "Fare tekerleği yakınlaştırma",
+    "name-no-repeat": "Harita tekrarı yok",
+    "name-share-view": "Görünümü paylaş",
+    "name-show-attribution": "Özniteliği göster",
+    "name-show-debug": "Hata ayıklamayı göster",
+    "name-show-measure": "Ölçüm araçlarını göster",
+    "name-show-scale": "Ölçeği göster",
+    "name-show-zoom": "Yakınlaştırma kontrolünü göster",
+    "name-tooltip": "Araç ipucu",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "Dize alanı bulunamadı"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "Temel harita katmanı, sunucu yöneticisi tarafından yapılandırılır."
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "Merkez",
+        "label-left": "Sol",
+        "label-right": "Sağ"
       },
       "label-align": "Hizalama",
       "label-baseline": "Başlangıç değeri",
@@ -7719,12 +7720,12 @@
       "label-text-label": "Metin etiketi",
       "label-x-offset": "X ofseti",
       "label-y-offset": "Y ofseti",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "Bir sembol seçin",
+      "placeholderText-select-symbol-or-add-text": "Bir sembol seçin veya bir metin etiketi ekleyin",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "Alt",
+        "label-center": "Merkez",
+        "label-top": "Üst"
       }
     },
     "style-rule-editor": {
@@ -7738,13 +7739,13 @@
       "placeholder-value": "değer"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "Üzerine gelindiğinde açılır pencereyi göster",
+      "description-none": "İçerikleri üzerine gelindiğinde değil tıklandığında göster",
+      "label-details": "Ayrıntılar",
+      "label-none": "Yok"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "{{name}} katmanı"
     }
   },
   "get-enterprise": {
@@ -7864,400 +7865,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "Fit/sn²",
+            "name-g-unit": "G birimi",
+            "name-meters-sec": "Metre/sn²"
           },
-          "name": ""
+          "name": "Hızlanma"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "Yay Dakikaları",
+            "name-arc-seconds": "Yay Saniyeleri",
+            "name-degrees": "Derece (°)",
+            "name-gradian": "Gradyan",
+            "name-radians": "Radyan"
           },
-          "name": ""
+          "name": "Açı"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "Dönüm (ac)",
+            "name-hectares": "Hektar (ha)",
+            "name-square-feet": "Fit Kare (ft²)",
+            "name-square-meters": "Metrekare (m²)",
+            "name-square-miles": "Mil Kare (mi²)"
           },
-          "name": ""
+          "name": "Bölge"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "Açma/Kapatma",
+            "name-true-false": "Doğru / Yanlış",
+            "name-yes-no": "Evet / Hayır"
           },
-          "name": ""
+          "name": "Boole Değeri"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "Hesaplama"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "metreküp başına gram (g/m³)",
+            "name-g-nm3": "normal metreküp başına gram (g/Nm³)",
+            "name-mg-dl": "desilitre başına miligram (mg/dL)",
+            "name-mg-m3": "metreküp başına miligram (mg/m³)",
+            "name-mg-nm3": "normal metreküp başına miligram (mg/Nm³)",
+            "name-mmol-l": "litre başına milimol (mmol/L)",
+            "name-ng-m3": "metreküp başına nanogram (ng/m³)",
+            "name-ng-nm3": "normal metreküp başına nanogram (ng/Nm³)",
+            "name-ppb": "milyarda parça (ppb)",
+            "name-ppm": "milyonda parça (ppm)",
+            "name-ug-m3": "metreküp başına mikrogram (μg/m³)",
+            "name-ug-nm3": "normal metreküp başına mikrogram (μg/Nm³)"
           },
-          "name": ""
+          "name": "Konsantrasyon"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "Bulgar Levası (BGN)",
+            "name-brl": "Brezilya Reali (R$)",
+            "name-btc": "Bitcoin (฿)",
+            "name-chf": "İsviçre Frangı (CHF)",
+            "name-czk": "Çek Korunası (CZK)",
+            "name-dkk": "Danimarka Kronu (kr)",
+            "name-eur": "Euro (€)",
+            "name-gbp": "Pound (£)",
+            "name-idr": "Endonezya Rupisi (Rp)",
+            "name-ils": "Yeni İsrail Şekeli (₪)",
+            "name-inr": "Hindistan Rupisi (₹)",
+            "name-isk": "İzlanda Kronu (kr)",
+            "name-jpy": "Yen (¥)",
+            "name-krw": "Güney Kore Wonu (₩)",
+            "name-mbtc": "Milli Bitcoin (฿)",
+            "name-myr": "Malezya Ringiti (RM)",
+            "name-nok": "Norveç Kronu (kr)",
+            "name-php": "Filipin Pezosu (PHP)",
+            "name-pln": "Polonya Zlotisi (PLN)",
+            "name-pyg": "Guarani (₲)",
+            "name-rub": "Ruble (₽)",
+            "name-sek": "İsveç Kronu (kr)",
+            "name-try": "Türk Lirası (₺)",
+            "name-uah": "Hryvnia (₴)",
+            "name-ubtc": "Mikro Bitcoin (฿)",
+            "name-usd": "Dolar ($)",
+            "name-uyu": "Uruguay Pezosu (UYU)",
+            "name-vnd": "Vietnam Dongu (VND)",
+            "name-xpf": "CFP Frangı (XPF)",
+            "name-zar": "Güney Afrika Randı (R)"
           },
-          "name": ""
+          "name": "Para Birimi"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "bit (IEC)",
+            "name-bits-si": "bit (SI)",
+            "name-bytes-iec": "bayt (IEC)",
+            "name-bytes-si": "bayt (SI)",
+            "name-gibibytes": "gibibayt",
+            "name-gigabytes": "gigabayt",
+            "name-kibibytes": "kibibayt",
+            "name-kilobytes": "kilobayt",
+            "name-mebibytes": "mebibayt",
+            "name-megabytes": "megabayt",
+            "name-pebibytes": "pebibayt",
+            "name-petabytes": "petabayt",
+            "name-tebibytes": "tebibayt",
+            "name-terabytes": "terabayt"
           },
-          "name": ""
+          "name": "Veri"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "bit/sn (IEC)",
+            "name-bits-sec-si": "bit/sn (SI)",
+            "name-bytes-sec-iec": "bayt/sn (IEC)",
+            "name-bytes-sec-si": "bayt/sn (SI)",
+            "name-gibibits-sec": "gibibit/sn",
+            "name-gibibytes-sec": "gibibayt/sn",
+            "name-gigabits-sec": "gigabit/sn",
+            "name-gigabytes-sec": "gigabayt/sn",
+            "name-kibibits-sec": "kibibit/sn",
+            "name-kibibytes-sec": "kibibayt/sn",
+            "name-kilobits-sec": "kilobit/sn",
+            "name-kilobytes-sec": "kilobayt/sn",
+            "name-mebibits-sec": "mebibit/sn",
+            "name-mebibytes-sec": "mebibayt/sn",
+            "name-megabits-sec": "megabit/sn",
+            "name-megabytes-sec": "megabayt/sn",
+            "name-packets-sec": "paket/sn",
+            "name-pebibits-sec": "pebibit/sn",
+            "name-pebibytes-sec": "pebibayt/sn",
+            "name-petabits-sec": "petabit/sn",
+            "name-petabytes-sec": "petabayt/sn",
+            "name-tebibits-sec": "tebibit/sn",
+            "name-tebibytes-sec": "tebibayt/sn",
+            "name-terabits-sec": "terabit/sn",
+            "name-terabytes-sec": "terabayt/sn"
           },
-          "name": ""
+          "name": "Veri hızı"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "Tarih saat varsayılan",
+            "name-datetime-iso": "Tarih saat ISO",
+            "name-datetime-iso-no-date": "Tarih saat ISO (Bugünse tarih yok)",
+            "name-datetime-local": "Tarih saat yerel",
+            "name-datetime-local-no-date": "Tarih saat yerel (Bugünse tarih yok)",
+            "name-datetime-us": "Tarih saat ABD",
+            "name-datetime-us-no-date": "Tarih saat ISO (Bugünse tarih yok)",
+            "name-from-now": "Şu Andan İtibaren"
           },
-          "name": ""
+          "name": "Tarih & saat"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "Amper (A)",
+            "name-ampere-hour": "Amper-saat (Ah)",
+            "name-decibel-milliwatt": "Desibel-milivat (dBm)",
+            "name-electron-volt": "Elektron volt (eV)",
+            "name-farad": "Farad (F)",
+            "name-femtofarad": "Femtofarad (fF)",
+            "name-gigawatt": "Gigawatt (GW)",
+            "name-henry": "Henry (H)",
+            "name-joule": "Jül (J)",
+            "name-kiloampere": "Kiloamper (kA)",
+            "name-kiloampere-hour": "Kiloamper saat (kAh)",
+            "name-kiloohm": "Kiloohm (kΩ)",
+            "name-kilovolt": "Kilovolt (kV)",
+            "name-kilovolt-ampere": "Kilovolt-Amper (kVA)",
+            "name-kilovolt-ampere-reactive": "Kilovolt-Amper reaktif (kVAr)",
+            "name-kilowatt": "Kilovat (kW)",
+            "name-kilowatt-hour": "Kilovat-saat (kWh)",
+            "name-kilowatt-min": "Kilovat-dk (kWm)",
+            "name-lumens": "Lümen (Lm)",
+            "name-megaohm": "Megaohm (MΩ)",
+            "name-megawatt": "Megavat (MW)",
+            "name-megawatt-hour": "Megavat saat (MWh)",
+            "name-microfarad": "Mikrofarad (µF)",
+            "name-microhenry": "Mikrohenri (µH)",
+            "name-milliampere": "Miliamper (mA)",
+            "name-milliampere-hour": "Miliamper saat (mAh)",
+            "name-millihenry": "Milihenri (mH)",
+            "name-milliohm": "Miliohm (mΩ)",
+            "name-millivolt": "Milivolt (mV)",
+            "name-milliwatt": "Milivat (mW)",
+            "name-nanofarad": "Nanofarad (nF)",
+            "name-ohm": "Ohm (Ω)",
+            "name-picofarad": "Pikofarad (pF)",
+            "name-volt": "Volt (V)",
+            "name-volt-ampere": "Volt-Amper (VA)",
+            "name-volt-ampere-reactive": "Volt-Amper reaktif (VAr)",
+            "name-watt": "Watt (W)",
+            "name-watt-hour": "Watt-saat (Wh)",
+            "name-watt-hour-per-kg": "Kilogram başına watt-saat (Wh/kg)",
+            "name-watt-square-meter": "Metrekare başına watt (W/m²)"
           },
-          "name": ""
+          "name": "Enerji"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "Kübik fit/dk (cfm)",
+            "name-cubic-feet-sec": "Fit küp/sn (cfs)",
+            "name-cubic-meters-sec": "Metreküp/sn (cms)",
+            "name-gallons-min": "Gal/dk (gpm)",
+            "name-litre-hour": "Litre/saat",
+            "name-litre-min": "Litre/dk (L/dk)",
+            "name-lux": "(Lux (lx))",
+            "name-millilitre-min": "mililitre/dk (mL/dk)"
           },
-          "name": ""
+          "name": "Akış"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "Kilonewton-metre (kNm)",
+            "name-kilonewtons": "Kilonewton (kN)",
+            "name-newton-meters": "Newton-metre (Nm)",
+            "name-newtons": "Newton (N)"
           },
-          "name": ""
+          "name": "Kuvvet"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "eksahash/sn",
+            "name-gigahashes-sec": "gigahash/sn",
+            "name-hashes-sec": "hash/sn",
+            "name-kilohashes-sec": "kilohash/sn",
+            "name-megahashes-sec": "megahash/sn",
+            "name-petahashes-sec": "petahash/sn",
+            "name-terahashes-sec": "terahash/sn"
           },
-          "name": ""
+          "name": "Hash oranı"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "fit (ft)",
+            "name-inch": "inç (in)",
+            "name-kilometer": "kilometre (km)",
+            "name-meter": "metre (m)",
+            "name-mile": "mil (mi)",
+            "name-millimeter": "milimetre (mm)"
           },
-          "name": ""
+          "name": "Uzunluk"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "gram (g)",
+            "name-kilogram": "kilogram (kg)",
+            "name-metric-ton": "metrik ton (t)",
+            "name-milligram": "miligram (mg)",
+            "name-pound": "pound (lb)"
           },
-          "name": ""
+          "name": "Kütle"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "Kandela (cd)",
+            "name-decibel": "Desibel",
+            "name-hexadecimal": "Onaltılık",
+            "name-hexadecimal-0x": "Onaltılık (0x)",
+            "name-humidity": "Nem (%H)",
+            "name-locale": "Yerel tarih biçimi",
+            "name-number": "Numarası",
+            "name-percent-1": "Yüzde (0,0-1,0)",
+            "name-percent-100": "Yüzde (0-100)",
+            "name-pixels": "Pikseller",
+            "name-scientific": "Bilimsel gösterim",
+            "name-short": "kısa",
+            "name-si-short": "SI kısa",
+            "name-string": "Dize"
           },
-          "name": ""
+          "name": "Çeşitli"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "Çubuklar",
+            "name-hectopascals": "Hektopaskal",
+            "name-inches-mercury": "Cıva inç",
+            "name-kilobars": "Kilobar",
+            "name-kilopascals": "Kilopaskal",
+            "name-millibars": "Millibar",
+            "name-pascals": "Paskal",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "Basınç"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "Becquerel (Bq)",
+            "name-curie": "küri (Ci)",
+            "name-exposure": "Maruz kalma (C/kg)",
+            "name-gray": "Gri (Gy)",
+            "name-microsievert": "mikroSievert (µSv)",
+            "name-microsievert-hour": "mikroSievert/saat (µSv/sa)",
+            "name-millisievert": "miliSievert (mSv)",
+            "name-millisievert-hour": "miliSievert/saat (mSv/sa)",
+            "name-rad": "Rad.",
+            "name-rem": "rem",
+            "name-roentgen": "röntgen (R)",
+            "name-sievert": "Sievert (Sv)",
+            "name-sievert-hour": "Sievert/saat (Sv/sa)"
           },
-          "name": ""
+          "name": "Radyasyon"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "Saniye başına derece (°/s)",
+            "name-gigahertz": "Gigahertz (GHz)",
+            "name-hertz": "Hertz (Hz)",
+            "name-kilohertz": "Kilohertz (kHz)",
+            "name-megahertz": "Megahertz (MHz)",
+            "name-radians-sec": "Saniye başına radyan (rad/s)",
+            "name-rpm": "Dakikada devir sayısı (rpm)"
           },
-          "name": ""
+          "name": "Dönme Hızı"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "Santigrat (°C)",
+            "name-fahrenheit": "Fahrenhayt (°F)",
+            "name-kelvin": "Kelvin (K)"
           },
-          "name": ""
+          "name": "Sıcaklık"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "sayı/dk (cpm)",
+            "name-counts-sec": "sayı/sn (cps)",
+            "name-events-min": "olay/dk (epm)",
+            "name-events-sec": "olay/sn (eps)",
+            "name-io-ops-sec": "G/Ç işlem/sn (iops)",
+            "name-messages-min": "mesaj/dk (mpm)",
+            "name-messages-sec": "mesaj/sn (mps)",
+            "name-ops-min": "ops/dk (opm)",
+            "name-ops-sec": "işlem/sn (ops)",
+            "name-reads-min": "okuma/dk (rpm)",
+            "name-reads-sec": "okuma/sn (rps)",
+            "name-records-min": "kayıt/dk (rpm)",
+            "name-records-sec": "kayıt/sn (rps)",
+            "name-requests-min": "istek/dk (rpm)",
+            "name-requests-sec": "istek/sn (rps)",
+            "name-rows-min": "satır/dk (rpm)",
+            "name-rows-sec": "satır/sn (rps)",
+            "name-writes-min": "yazma/dk (wpm)",
+            "name-writes-sec": "yazma/sn (wps)"
           },
-          "name": ""
+          "name": "Kapasite"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "saat (ms)",
+            "name-clock-s": "saat (s)",
+            "name-days": "gün (g)",
+            "name-duration-dhms": "süre (g ss:dd:ss)",
+            "name-duration-hms": "süre (ss:dd:ss)",
+            "name-duration-ms": "süre (ms)",
+            "name-duration-s": "süre (s)",
+            "name-hertz": "Hertz (1/s)",
+            "name-hours": "saat (sa)",
+            "name-microseconds": "mikrosaniye (µs)",
+            "name-milliseconds": "milisaniye (ms)",
+            "name-minutes": "dakika (dk)",
+            "name-nanoseconds": "nanosaniye (ns)",
+            "name-seconds": "saniye (s)",
+            "name-timeticks": "Zaman işaretleri (s/100)"
           },
-          "name": ""
+          "name": "Zaman"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "kilometre/saat (km/sa)",
+            "name-knot": "deniz mili (kn)",
+            "name-meters-second": "metre/saniye (m/s)",
+            "name-miles-hour": "mil/saat (mph)"
           },
-          "name": ""
+          "name": "Hız"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "desimetre küp",
+            "name-cubic-meter": "metre küp",
+            "name-gallons": "galon",
+            "name-litre": "litre (L)",
+            "name-millilitre": "mililitre (mL)",
+            "name-normal-cubic-meter": "Normal metreküp"
           },
-          "name": ""
+          "name": "Hacim"
         }
       }
     }
@@ -8300,85 +8301,85 @@
     },
     "builder": {
       "axis": {
-        "category-axis": "",
-        "color-label": "",
+        "category-axis": "Eksen",
+        "color-label": "Renk",
         "color-options": {
-          "label-series": "",
-          "label-text": ""
+          "label-series": "Seri",
+          "label-text": "Metin"
         },
         "grid-line-options": {
-          "label-auto": "",
-          "label-off": "",
-          "label-on": ""
+          "label-auto": "Otomatik",
+          "label-off": "Kapalı",
+          "label-on": "Açık"
         },
-        "name-centered-zero": "",
-        "name-grid-lines": "",
-        "name-label": "",
-        "name-placement": "",
-        "name-scale": "",
-        "name-show-border": "",
-        "name-soft-max": "",
-        "name-soft-min": "",
-        "name-width": "",
-        "placeholder-label": "",
-        "placeholder-soft-max": "",
-        "placeholder-soft-min": "",
-        "placeholder-width": "",
+        "name-centered-zero": "Ortalanmış sıfır",
+        "name-grid-lines": "Izgara çizgilerini göster",
+        "name-label": "Etiket",
+        "name-placement": "Yerleşim",
+        "name-scale": "Ölçek",
+        "name-show-border": "Kenarlığı göster",
+        "name-soft-max": "Esnek maksimum değer",
+        "name-soft-min": "Esnek minimum değer",
+        "name-width": "Genişlik",
+        "placeholder-label": "İsteğe bağlı metin",
+        "placeholder-soft-max": "Bkz. Standart seçenekler > Maks.",
+        "placeholder-soft-min": "Bkz. Standart seçenekler > Min.",
+        "placeholder-width": "Otomatik",
         "scale-distribution-editor": {
           "distribution-options": {
-            "label-linear": "",
-            "label-log": "",
-            "label-symlog": ""
+            "label-linear": "Doğrusal",
+            "label-log": "Logaritmik",
+            "label-symlog": "Symlog (Simetrik Logaritmik Ölçek)"
           }
         }
       },
       "legend": {
-        "category": "",
-        "description-values": "",
+        "category": "Gösterge",
+        "description-values": "Açıklamada gösterilecek değerleri veya hesaplamaları seçin",
         "mode-options": {
-          "label-list": "",
-          "label-table": ""
+          "label-list": "Liste",
+          "label-table": "Tablo"
         },
-        "name-mode": "",
-        "name-placement": "",
-        "name-values": "",
-        "name-visibility": "",
-        "name-width": "",
+        "name-mode": "Mod",
+        "name-placement": "Yerleşim",
+        "name-values": "Değerler",
+        "name-visibility": "Görünürlük",
+        "name-width": "Genişlik",
         "placement-options": {
-          "label-bottom": "",
-          "label-right": ""
+          "label-bottom": "Alt",
+          "label-right": "Sağ"
         }
       },
       "stacking": {
-        "name-stack-series": ""
+        "name-stack-series": "Yığın serisi"
       },
       "text": {
-        "category-text-size": "",
-        "name-percent-change": "",
-        "name-title": "",
-        "name-value": "",
-        "placeholder-percent-change": "",
-        "placeholder-title": "",
-        "placeholder-value": ""
+        "category-text-size": "Metin boyutu",
+        "name-percent-change": "Yüzde değişimi",
+        "name-title": "Başlık",
+        "name-value": "Değer",
+        "placeholder-percent-change": "Otomatik",
+        "placeholder-title": "Otomatik",
+        "placeholder-value": "Otomatik"
       },
       "tooltip": {
-        "category": "",
-        "description-hover-proximity": "",
+        "category": "Araç ipucu",
+        "description-hover-proximity": "İmlecin, araç ipucunu tetiklemek için bir noktaya ne kadar yakın olması gerektiği (piksel cinsinden)",
         "modeOptions": {
-          "label-all": "",
-          "label-hidden": "",
-          "label-single": ""
+          "label-all": "Tümü",
+          "label-hidden": "Gizli",
+          "label-single": "Tek"
         },
-        "name-hide-zeros": "",
-        "name-hover-proximity": "",
-        "name-max-height": "",
-        "name-max-width": "",
-        "name-tooltip-mode": "",
-        "name-values-sort-order": "",
+        "name-hide-zeros": "Sıfırları gizle",
+        "name-hover-proximity": "İmleç yakınlığı",
+        "name-max-height": "Maks. yükseklik",
+        "name-max-width": "Maks. genişlik",
+        "name-tooltip-mode": "Araç ipucu modu",
+        "name-values-sort-order": "Değer sıralama ölçütü",
         "sortOptions": {
-          "label-ascending": "",
-          "label-descending": "",
-          "label-none": ""
+          "label-ascending": "Artan",
+          "label-descending": "Azalan",
+          "label-none": "Yok"
         }
       }
     },
@@ -8386,7 +8387,7 @@
       "option": "seçenek"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "Resim ön izlemeyi aç"
     },
     "cascader": {
       "clear-button": "Seçimi temizle"
@@ -8400,9 +8401,9 @@
       "aria-label-selected-color": "{{colorLabel}} rengi"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "Sil",
       "cancel": "İptal",
-      "confirmText-delete": ""
+      "confirmText-delete": "Sil"
     },
     "confirm-content": {
       "placeholder": "Onaylamak için \"{{confirmPromptText}}\" yazın"
@@ -8507,56 +8508,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "Nisan",
+        "label-august": "Ağustos",
+        "label-december": "Aralık",
+        "label-february": "Şubat",
+        "label-january": "Ocak",
+        "label-july": "Temmuz",
+        "label-june": "Haziran",
+        "label-march": "Mart",
+        "label-may": "Mayıs",
+        "label-november": "Kasım",
+        "label-october": "Ekim",
+        "label-september": "Eylül"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "Dünden önceki gün",
+        "last-1-hour": "Son 1 saat",
+        "last-1-year": "Son 1 yıl",
+        "last-12-hours": "Son 12 saat",
+        "last-15-mins": "Son 15 dakika",
+        "last-2-days": "Son 2 gün",
+        "last-2-years": "Son 2 yıl",
+        "last-24-hours": "Son 24 saat",
+        "last-3-hours": "Son 3 saat",
+        "last-30-days": "Son 30 gün",
+        "last-30-mins": "Son 30 dakika",
+        "last-5-mins": "Son 5 dakika",
+        "last-5-years": "Son 5 yıl",
+        "last-6-hours": "Son 6 saat",
+        "last-6-months": "Son 6 ay ",
+        "last-7-days": "Son 7 Gün",
+        "last-90-days": "Son 90 gün",
+        "previous-fiscal-quarter": "Önceki mali çeyrek",
+        "previous-fiscal-year": "Önceki mali yıl",
+        "previous-month": "Önceki ay",
+        "previous-week": "Önceki hafta",
+        "previous-year": "Önceki yıl",
+        "this-day-last-week": "Geçen hafta bugün",
+        "this-fiscal-quarter": "Bu mali çeyrek",
+        "this-fiscal-quarter-so-far": "Bu mali çeyreğin başından bugüne",
+        "this-fiscal-year": "Bu mali yıl",
+        "this-fiscal-year-so-far": "Bu mali yıl şimdiye kadar",
+        "this-month": "Bu ay",
+        "this-month-so-far": "Bu ay şimdiye kadar",
+        "this-week": "Bu hafta",
+        "this-week-so-far": "Bu hafta şimdiye kadar",
+        "this-year": "Bu yıl ",
+        "this-year-so-far": "Bu yıl şimdiye kadar",
+        "today": "Bugün",
+        "today-so-far": "Bugün şimdiye kadar",
+        "yesterday": "Dün"
       }
     },
     "drawer": {
@@ -8598,33 +8599,33 @@
       "tooltip-expand-all": "Tüm satırları genişlet"
     },
     "matchers-ui": {
-      "description-field-name-by-regex-matcher": "",
-      "description-fields-by-query": "",
-      "description-fields-with-name": "",
-      "description-fields-with-type": "",
-      "description-fields-with-value": "",
+      "description-field-name-by-regex-matcher": "Adı bir düzenli ifadeye uyan alanlar için özellikleri ayarla",
+      "description-fields-by-query": "Belirli bir sorgudan gelen alanlar için özellikleri ayarla",
+      "description-fields-with-name": "Belirli bir alan için özellikleri ayarla",
+      "description-fields-with-type": "Belirli bir türdeki (sayı, metin, mantıksal) alanlar için özellikleri ayarla",
+      "description-fields-with-value": "Azaltıcı koşulu bulunan alanlar için özellikleri ayarla",
       "field-name-picker": {
-        "placeholder": ""
+        "placeholder": "Alan seçin"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "Boole Değeri",
+        "label-enum": "Sıralama",
+        "label-number": "Numarası",
+        "label-other": "Diğer",
+        "label-string": "Dize",
+        "label-time": "Zaman",
+        "label-traces": "İzler"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "Çerçeveler ({{framesCount}}): {{framesNames}}",
+        "label": "Sorgu: {{refId}}",
+        "label-missing-ref-id": "Sorgu: (eksik refId)"
       },
-      "name-field-name-by-regex-matcher": "",
-      "name-fields-by-query": "",
-      "name-fields-with-name": "",
-      "name-fields-with-type": "",
-      "name-fields-with-value": ""
+      "name-field-name-by-regex-matcher": "Adı düzenli ifade ile eşleşen alanlar",
+      "name-fields-by-query": "Sorgu tarafından döndürülen alanlar",
+      "name-fields-with-name": "Adı olan alanlar",
+      "name-fields-with-type": "Türü olan alanlar",
+      "name-fields-with-value": "Değerleri olan alanlar"
     },
     "menu-item": {
       "keyboard-shortcut-label": "Klavye kısayolu"
@@ -8652,8 +8653,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "paneli daralt/genişlet",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "Panel yükleme çubuğu",
+      "ariaLabel-panel-status": "Panel durumu",
       "tooltip-cancel": "Sorguyu iptal et",
       "tooltip-cancel-loading": "Sorguyu iptal et",
       "tooltip-stop-streaming": "Akışı durdur",
@@ -8722,12 +8723,12 @@
       "inspect-drawer-title": "Değeri incele",
       "inspect-menu-label": "Değeri incele",
       "nested-table": {
-        "no-data": ""
+        "no-data": "Veri yok"
       },
       "no-values-label": "Değer yok",
       "pagination-summary": "{{itemsRangeStart}} - {{displayedEnd}}/{{numRows}} satır",
       "sparkline": {
-        "no-data": ""
+        "no-data": "veri yok"
       }
     },
     "tags": {
@@ -8735,7 +8736,7 @@
     },
     "tags-input": {
       "add": "Ekle",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "Yeni etiket (eklemek için anahtarı girin)",
       "remove": "Etiketi kaldır: {{name}}"
     },
     "time-sync-button": {
@@ -8752,55 +8753,55 @@
       "config": {
         "get-graph-field-options": {
           "axis-placement": {
-            "description-auto": "",
-            "label-auto": "",
-            "label-hidden": "",
-            "label-left": "",
-            "label-right": ""
+            "description-auto": "İlk alan solda, diğer her şey sağda",
+            "label-auto": "Otomatik",
+            "label-hidden": "Gizli",
+            "label-left": "Sol",
+            "label-right": "Sağ"
           },
           "bar-alignment": {
-            "description-after": "",
-            "description-before": "",
-            "description-center": ""
+            "description-after": "Sonra",
+            "description-before": "Önce",
+            "description-center": "Merkez"
           },
           "draw-style": {
-            "label-bars": "",
-            "label-lines": "",
-            "label-points": ""
+            "label-bars": "Çubuklar",
+            "label-lines": "Çizgiler",
+            "label-points": "Noktalar"
           },
           "fill-gradient": {
-            "description-hue": "",
-            "description-opacity": "",
-            "description-scheme": "",
-            "label-hue": "",
-            "label-none": "",
-            "label-opacity": "",
-            "label-scheme": ""
+            "description-hue": "Hafif renk tonu gradyanı",
+            "description-opacity": "Dolgu opaklığı gradyanını etkinleştir",
+            "description-scheme": "Gradyanı tanımlamak için renk düzenini kullanın",
+            "label-hue": "Renk Tonu",
+            "label-none": "Yok",
+            "label-opacity": "Opaklık",
+            "label-scheme": "Düzen"
           },
           "line-interpolation": {
-            "description-linear": "",
-            "description-smooth": "",
-            "description-step-after": "",
-            "description-step-before": ""
+            "description-linear": "Doğrusal",
+            "description-smooth": "Yumuşak",
+            "description-step-after": "Sonraki adım",
+            "description-step-before": "Önceki adım"
           },
           "show-points": {
-            "description-auto": "",
-            "label-always": "",
-            "label-auto": "",
-            "label-never": ""
+            "description-auto": "Yoğunluk düşük olduğunda noktaları göster",
+            "label-always": "Her zaman",
+            "label-auto": "Otomatik",
+            "label-never": "Hiçbir zaman"
           },
           "stacking": {
-            "label-100": "",
-            "label-normal": "",
-            "label-off": ""
+            "label-100": "%100",
+            "label-normal": "Normal",
+            "label-off": "Kapalı"
           },
           "thresholds-display-mode": {
-            "label-dashed-lines": "",
-            "label-filled-regions": "",
-            "label-filled-regions-and-dashed-lines": "",
-            "label-filled-regions-and-lines": "",
-            "label-lines": "",
-            "label-off": ""
+            "label-dashed-lines": "Çizgi olarak (kesik)",
+            "label-filled-regions": "Doldurulmuş bölgeler olarak",
+            "label-filled-regions-and-dashed-lines": "Doldurulmuş bölgeler ve çizgi olarak (kesik)",
+            "label-filled-regions-and-lines": "Doldurulmuş bölgeler ve çizgi olarak",
+            "label-lines": "Çizgi olarak",
+            "label-off": "Kapalı"
           }
         }
       }
@@ -8828,14 +8829,14 @@
       "footer-add-annotation": "Ek açıklama ekle",
       "footer-click-to-action": "{{actionTitle}} için tıklayın",
       "footer-click-to-navigate": "{{linkTitle}} ögesini açmak için tıklayın",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "'{{value}}' değerine göre filtrele",
       "timestamp": "Zaman damgası"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "Varsayılan",
+      "weekStarts-label-monday": "Pazartesi",
+      "weekStarts-label-saturday": "Cumartesi",
+      "weekStarts-label-sunday": "Pazar"
     }
   },
   "graph": {
@@ -8848,78 +8849,78 @@
   },
   "heatmap": {
     "calculate-from-data-options": {
-      "label-no": "",
-      "label-yes": ""
+      "label-no": "Hayır",
+      "label-yes": "Evet"
     },
-    "category-cell-display": "",
-    "category-colors": "",
-    "category-exemplars": "",
-    "category-heatmap": "",
-    "category-legend": "",
-    "category-tooltip": "",
-    "category-y-axis": "",
+    "category-cell-display": "Hücre görünümü",
+    "category-colors": "Renkler",
+    "category-exemplars": "Örnekler",
+    "category-heatmap": "Isı Haritası",
+    "category-legend": "Gösterge",
+    "category-tooltip": "Araç ipucu",
+    "category-y-axis": "Y Ekseni",
     "mode-options": {
-      "label-opacity": "",
-      "label-scheme": ""
+      "label-opacity": "Opaklık",
+      "label-scheme": "Düzen"
     },
-    "name-axis-label": "",
-    "name-axis-width": "",
-    "name-calculate-from-data": "",
-    "name-cell-gap": "",
-    "name-color": "",
-    "name-decimals": "",
-    "name-end-color-at-value": "",
-    "name-exponent": "",
-    "name-hide-cells-gt": "",
-    "name-hide-cells-lt": "",
-    "name-max-height": "",
-    "name-max-value": "",
-    "name-max-width": "",
-    "name-min-value": "",
-    "name-mode": "",
-    "name-placement": "",
-    "name-reverse": "",
-    "name-scale": "",
-    "name-scheme": "",
-    "name-show-color-scale": "",
-    "name-show-histogram": "",
-    "name-show-legend": "",
-    "name-start-color-from-value": "",
-    "name-steps": "",
-    "name-tick-alignment": "",
-    "name-tooltip-mode": "",
-    "name-unit": "",
-    "name-value-name": "",
-    "name-y-axis-scale": "",
-    "placeholder-axis-label": "",
-    "placeholder-axis-width": "",
-    "placeholder-decimals": "",
-    "placeholder-end-color-at-value": "",
-    "placeholder-hide-cells-gt": "",
-    "placeholder-hide-cells-lt": "",
-    "placeholder-max-value": "",
-    "placeholder-min-value": "",
-    "placeholder-start-color-from-value": "",
-    "placeholder-value-name": "",
+    "name-axis-label": "Eksen etiketi",
+    "name-axis-width": "Eksen genişliği",
+    "name-calculate-from-data": "Verilerden hesapla",
+    "name-cell-gap": "Hücre boşluğu",
+    "name-color": "Renk",
+    "name-decimals": "Ondalık",
+    "name-end-color-at-value": "Renk ölçeğini bu değerde sonlandır",
+    "name-exponent": "Üs",
+    "name-hide-cells-gt": "Değeri >= olan hücreleri gizle",
+    "name-hide-cells-lt": "Değeri <= olan hücreleri gizle",
+    "name-max-height": "Maks. yükseklik",
+    "name-max-value": "Maksimum değer",
+    "name-max-width": "Maks. genişlik",
+    "name-min-value": "Minimum değer",
+    "name-mode": "Mod",
+    "name-placement": "Yerleşim",
+    "name-reverse": "Geri döndür",
+    "name-scale": "Ölçek",
+    "name-scheme": "Düzen",
+    "name-show-color-scale": "Renk ölçeğini göster",
+    "name-show-histogram": "Histogramı göster (Y ekseni)",
+    "name-show-legend": "Açıklamayı göster",
+    "name-start-color-from-value": "Renk ölçeğini bu değerden başlat",
+    "name-steps": "Adımlar",
+    "name-tick-alignment": "İşaret hizalaması",
+    "name-tooltip-mode": "Araç ipucu modu",
+    "name-unit": "Birim",
+    "name-value-name": "Değer adı",
+    "name-y-axis-scale": "Y ekseni ölçeği",
+    "placeholder-axis-label": "Otomatik",
+    "placeholder-axis-width": "Otomatik",
+    "placeholder-decimals": "Otomatik",
+    "placeholder-end-color-at-value": "Otomatik (maks.)",
+    "placeholder-hide-cells-gt": "Yok",
+    "placeholder-hide-cells-lt": "Yok",
+    "placeholder-max-value": "Otomatik",
+    "placeholder-min-value": "Otomatik",
+    "placeholder-start-color-from-value": "Otomatik (min.)",
+    "placeholder-value-name": "Değer",
     "placement-options": {
-      "label-hidden": "",
-      "label-left": "",
-      "label-right": ""
+      "label-hidden": "Gizli",
+      "label-left": "Sol",
+      "label-right": "Sağ"
     },
     "scale-options": {
-      "label-exponential": "",
-      "label-linear": ""
+      "label-exponential": "Üstel",
+      "label-linear": "Doğrusal"
     },
     "tick-alignment-options": {
-      "label-auto": "",
-      "label-bottom": "",
-      "label-middle": "",
-      "label-top": ""
+      "label-auto": "Otomatik",
+      "label-bottom": "Alt (GE)",
+      "label-middle": "Orta",
+      "label-top": "Üst (LE)"
     },
     "tooltip-mode-options": {
-      "label-all": "",
-      "label-hidden": "",
-      "label-single": ""
+      "label-all": "Tümü",
+      "label-hidden": "Gizli",
+      "label-single": "Tek"
     }
   },
   "help-modal": {
@@ -8979,14 +8980,14 @@
     "troubleshooting-help": "Sorun giderme yardımı istemek için bu panelin anlık görüntüsünü Grafana Labs Teknik Destek ekibine gönderin. Anlık görüntü, sorgu yanıt verilerini ve panel ayarlarını içerir."
   },
   "histogram": {
-    "category-histogram": "",
+    "category-histogram": "Histogram",
     "histogram-panel": {
       "no-histogram-found-in-response": "Yanıt içinde bir histogram bulunamadı"
     },
-    "name-fill-opacity": "",
-    "name-gradient-mode": "",
-    "name-line-width": "",
-    "name-stacking": ""
+    "name-fill-opacity": "Dolgu opaklığı",
+    "name-gradient-mode": "Gradyan modu",
+    "name-line-width": "Çizgi genişliği",
+    "name-stacking": "İstifleme"
   },
   "inspector": {
     "inspect-data-tab": {
@@ -9215,8 +9216,8 @@
       "title-create-library-panel": "Kütüphane paneli oluştur"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "Değiştir",
+      "confirmText-replace": "Değiştir"
     },
     "confirm": {
       "delete-panel": "Bu paneli kaldırmak istiyor musunuz?"
@@ -9241,7 +9242,7 @@
       "usage-count_other": "{{count}} panoda kullanılıyor"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "Ada, açıklamaya veya klasör adına göre ara"
     },
     "loading-indicator": {
       "loading-library-panel": "Kütüphane paneli yükleniyor..."
@@ -9367,16 +9368,16 @@
     }
   },
   "logs": {
-    "category-logs": "",
+    "category-logs": "Günlükler",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Özdeş",
+      "label-none": "Yok",
+      "label-numbers": "Sayılar",
+      "label-signature": "İmza"
     },
-    "description-enable-infinite-scrolling": "",
-    "description-enable-syntax-highlighting": "",
-    "description-show-controls": "",
+    "description-enable-infinite-scrolling": "Deneysel. Günlük listesinin en altına kaydırarak daha fazla sonuç isteyin.",
+    "description-enable-syntax-highlighting": "Günlük satırlarının ilgili bölümlerini vurgulamak için önceden tanımlanmış bir sözdizimi renklendirme kuralı kullan",
+    "description-show-controls": "Son veya ilk günlük satırına atlamak için ekran kontrolleri ve günlük düzeyine göre filtreler",
     "fields": {
       "type": {
         "loki": {
@@ -9390,8 +9391,8 @@
       }
     },
     "font-size-options": {
-      "label-default": "",
-      "label-small": ""
+      "label-default": "Varsayılan",
+      "label-small": "Küçük"
     },
     "get-dataframe-fields": {
       "vars": {
@@ -9447,64 +9448,64 @@
       "title-log-line": ""
     },
     "log-line-details": {
-      "clear-search": "",
-      "close": "",
-      "copy-shortlink": "",
-      "copy-to-clipboard": "",
-      "displayed-fields-section": "",
+      "clear-search": "Temizle",
+      "close": "Günlük ayrıntılarını kapat",
+      "copy-shortlink": "Kısa bağlantıyı kopyala",
+      "copy-to-clipboard": "Panoya kopyala",
+      "displayed-fields-section": "Görüntülenen alanları düzenle",
       "fields": {
-        "adhoc-statistics": "",
-        "copy-value-to-clipboard": "",
-        "filter-out": "",
-        "filter-out-query": "",
+        "adhoc-statistics": "Geçici istatistikler",
+        "copy-value-to-clipboard": "Değeri panoya kopyala",
+        "filter-out": "Değeri filtre dışı bırak",
+        "filter-out-query": "{{query}} sorgusu içinde değeri filtrele",
         "toggle-field-button": {
-          "field-instead-message": "",
-          "hide-this-field": ""
+          "field-instead-message": "Mesaj yerine bu alanı göster",
+          "hide-this-field": "Bu alanı gizle"
         }
       },
-      "fields-section": "",
-      "hide-log-line": "",
-      "inline-mode": "",
-      "links-section": "",
-      "log-line-field": "",
-      "log-line-section": "",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
-      "no-details": "",
-      "open-assistant": "",
-      "pin-line": "",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "fields-section": "Alanlar",
+      "hide-log-line": "Günlük satırını gizle",
+      "inline-mode": "Satır içi görüntüle",
+      "links-section": "Bağlantılar",
+      "log-line-field": "Günlük satırı",
+      "log-line-section": "Günlük satırı",
+      "move-displayed-field-down": "Aşağı taşı",
+      "move-displayed-field-up": "Yukarı taşı",
+      "no-details": "Görüntülenecek alan yok.",
+      "open-assistant": "Bu günlük satırını Asistan'da açıklayın",
+      "pin-line": "Günlüğü sabitle",
+      "remove-displayed-field": "Alanı kaldır",
+      "remove-log": "Günlüğü kaldır",
+      "scroll-to-logline": "Günlük satırına git",
       "search": {
-        "no-results": ""
+        "no-results": "Görüntülenecek sonuç yok."
       },
-      "search-placeholder": "",
-      "show-context": "",
-      "show-log-line": "",
-      "sidebar-mode": "",
-      "unpin-line": ""
+      "search-placeholder": "Alan adlarını ve değerlerini ara",
+      "show-context": "İçeriği göster",
+      "show-log-line": "Günlük satırını göster",
+      "sidebar-mode": "Sağa sabitle",
+      "unpin-line": "Günlüğü sabitlemeyi kaldır"
     },
     "log-line-menu": {
       "copy-link": "Bağlantıyı günlük satırına kopyala",
       "copy-log": "Günlük satırını kopyala",
       "hide-details": "Günlük ayrıntılarını göster",
       "icon-label": "Günlük menüsü",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "Günlük satırı",
+      "log-line-explainer": "Bu günlük satırını kısa ve öz bir şekilde açıklayın",
+      "open-assistant": "Bu günlük satırını Asistan'da açıklayın",
       "pin-to-outline": "Günlüğü sabitle",
       "show-context": "İçeriği göster",
       "show-details": "Günlük ayrıntılarını gizle",
       "unpin-from-outline": "Günlüğü sabitlemeyi kaldır"
     },
     "log-list-search": {
-      "close": "",
-      "filter": "",
-      "info": "",
-      "input-placeholder": "",
-      "next": "",
-      "prev": ""
+      "close": "Aramayı kapat",
+      "filter": "Eşleşen günlükleri filtrele",
+      "info": "Görüntülenen günlükler içinde istemci taraflı metin araması yapın. Sorgu filtreleriyle karıştırılmamalıdır. Bu bileşeni, günlük sonuçlarınızda belirli ifadeleri aramak için kullanın.",
+      "input-placeholder": "Günlüklerde ara",
+      "next": "Sonraki sonuç",
+      "prev": "Önceki sonuç"
     },
     "log-row-context-modal": {
       "error-loading-log-more-logs": "Daha fazla günlük kaydı yüklenirken hata oluştu.",
@@ -9565,7 +9566,7 @@
       "escape-newlines": "Günlük kaydı satırlarındaki kaçış karakterli satır sonu ve sekme dizilerini düzelt",
       "font-size-default": "Küçük yazı tipi boyutu kullan",
       "font-size-small": "Varsayılan yazı tipi boyutunu kullan",
-      "hide-search": "",
+      "hide-search": "Aramayı kapat",
       "hide-timestamps": "Zaman damgalarını gizle",
       "hide-unique-labels": "Benzersiz etiketleri gizle",
       "newest-first": "Günlükler yeniden eskiye sıralandı: En eskileri göstermek için tıklayın",
@@ -9578,7 +9579,7 @@
       "scroll-top": "En üste kaydır",
       "show-ms-timestamps": "",
       "show-ns-timestamps": "",
-      "show-search": "",
+      "show-search": "Günlük sonuçlarında ara",
       "show-timestamps": "Zaman damgalarını göster",
       "show-unique-labels": "Benzersiz etiketleri göster",
       "unwrap-lines": "Satırları çöz",
@@ -9596,26 +9597,26 @@
         "common-labels": "Ortak etiketler:"
       }
     },
-    "name-common-labels": "",
-    "name-deduplication": "",
-    "name-details-mode": "",
+    "name-common-labels": "Ortak etiketler",
+    "name-deduplication": "Yinelenenleri kaldırma",
+    "name-details-mode": "Günlük Ayrıntıları panel modu",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "Satır içi",
+      "label-sidebar": "Kenar çubuğu"
     },
-    "name-enable-infinite-scrolling": "",
-    "name-enable-log-details": "",
-    "name-enable-syntax-highlighting": "",
-    "name-font-size": "",
-    "name-order": "",
-    "name-prettify-json": "",
-    "name-show-controls": "",
+    "name-enable-infinite-scrolling": "Sonsuz kaydırmayı etkinleştir",
+    "name-enable-log-details": "Günlük ayrıntılarını etkinleştir",
+    "name-enable-syntax-highlighting": "Sözdizimi renklendirmesini etkinleştir",
+    "name-font-size": "Yazı tipi boyutu",
+    "name-order": "Sıralama",
+    "name-prettify-json": "JSON'u iyileştir",
+    "name-show-controls": "Kontrolleri göster",
     "name-time": "",
-    "name-unique-labels": "",
-    "name-wrap-lines": "",
+    "name-unique-labels": "Benzersiz etiketler",
+    "name-wrap-lines": "Satırları kaydır",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Yeniden eskiye",
+      "label-oldest-first": "Eskiden yeniye"
     },
     "out-of-range-message": {
       "end-of-the-selected-time-range": "Seçilen zaman aralığının sonu."
@@ -9630,7 +9631,7 @@
     "un-themed-log-details": {
       "aria-label-data-links": "Veri bağlantıları",
       "aria-label-fields": "Alanlar",
-      "aria-label-line": "",
+      "aria-label-line": "Günlük satırı",
       "aria-label-log-level": "Günlük kaydı seviyesi",
       "aria-label-no-details": "Ayrıntı yok"
     },
@@ -9651,27 +9652,27 @@
     }
   },
   "logs-new": {
-    "category-logs": "",
+    "category-logs": "Günlükler",
     "deduplication-options": {
-      "label-exact": "",
-      "label-none": "",
-      "label-numbers": "",
-      "label-signature": ""
+      "label-exact": "Özdeş",
+      "label-none": "Yok",
+      "label-numbers": "Sayılar",
+      "label-signature": "İmza"
     },
-    "description-infinite-scrolling": "",
-    "description-show-controls": "",
-    "description-syntax-highlighting": "",
-    "name-deduplication": "",
-    "name-enable-log-details": "",
-    "name-infinite-scrolling": "",
-    "name-order": "",
-    "name-show-controls": "",
-    "name-syntax-highlighting": "",
-    "name-time": "",
-    "name-wrap-lines": "",
+    "description-infinite-scrolling": "Deneysel. Günlük listesinin en altına kaydırarak daha fazla sonuç isteyin.",
+    "description-show-controls": "Son veya ilk günlük satırına atlamak için ekran kontrolleri ve günlük düzeyine göre filtreler",
+    "description-syntax-highlighting": "Günlük satırlarının ilgili bölümlerini vurgulamak için önceden tanımlanmış bir sözdizimi renklendirme kuralı kullan",
+    "name-deduplication": "Yinelenenleri kaldırma",
+    "name-enable-log-details": "Günlük ayrıntılarını etkinleştir",
+    "name-infinite-scrolling": "Sonsuz kaydırmayı etkinleştir",
+    "name-order": "Sıralama",
+    "name-show-controls": "Kontrolleri göster",
+    "name-syntax-highlighting": "Sözdizimi renklendirmesini etkinleştir",
+    "name-time": "Zaman",
+    "name-wrap-lines": "Satırları kaydır",
     "order-options": {
-      "label-newest-first": "",
-      "label-oldest-first": ""
+      "label-newest-first": "Yeniden eskiye",
+      "label-oldest-first": "Eskiden yeniye"
     }
   },
   "manage-dashbaords": {
@@ -9698,8 +9699,8 @@
       "updated-on": "Güncelleme tarihi"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "'{{snapshotToRemove}}' silmek istediğinizden emin misiniz?",
+      "confirmText-delete": "Sil",
       "title-delete": "Sil"
     },
     "unthemed-dashboard-import": {
@@ -9711,14 +9712,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "Ad gereklidir",
+      "message-reserved-name": "Bu ayrılmış bir addır ve bir klasör için kullanılamaz.",
+      "message-same-name": "Aynı isimde bir pano veya klasör zaten mevcut",
+      "message-same-name-general": "Genel klasörde aynı ada sahip bir klasör veya kontrol paneli zaten mevcut"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "Seçenek bulunamadı"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9868,8 +9869,8 @@
     "resource-details": {
       "dismiss-button": "Tamam",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "Maksimum uyarı kuralı grubu sayısına ulaşıldı: Bazı uyarı kuralı gruplarını silin veya planınızı yükseltin ve tekrar deneyin.",
+        "alert-rules-quota-reached": "Maksimum uyarı kuralı sayısına ulaşıldı: Bazı uyarı kurallarını silin veya planınızı yükseltin ve tekrar deneyin.",
         "dashboard-already-managed": "Pano zaten bulut örneğinde Grafana tarafından sağlanmış ve yönetilmektedir. Bundan sonra sağlanan panoyu kullanmanızı öneririz. Yine de panoyu bulut örneğine kopyalamak istiyorsanız pano JSON'unda pano kimliğini değiştirin, yeni bir anlık görüntü kaydedin ve tekrar yükleyin.",
         "datasource-already-managed": "Veri kaynağı zaten bulut örneğinde Grafana tarafından sağlanmış ve yönetilmektedir. Bu farklı bir kaynaksa başka bir UID belirleyin ve tekrar deneyin.",
         "datasource-invalid-url": "Geçersiz bir URL içeren bir veri kaynağı var. Geçerli bir URL girin ve tekrar deneyin.",
@@ -10339,7 +10340,7 @@
     "invite-user": {
       "invite-button": "Davet et",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "Kullanıcı davet et"
     },
     "item": {
       "add-bookmark": "Yer imlerine ekle",
@@ -10371,12 +10372,12 @@
     "rss-button": "Blog'tan son gönderiler"
   },
   "news": {
-    "category-news": "",
-    "description-show-image": "",
-    "description-url": "",
+    "category-news": "Haberler",
+    "description-show-image": "Haber ögesinin sosyal medya görselinin (og:image) metin içeriğinin üstünde gösterilip gösterilmeyeceğini denetler",
+    "description-url": "RSS ve Atom yayınlarını destekler",
     "link-title": "Grafana Labs bloguna git",
-    "name-show-image": "",
-    "name-url": "",
+    "name-show-image": "Resmi göster",
+    "name-url": "URL",
     "news-panel": {
       "body-error-loading-rss-feed": "Akış URL'sinin doğru olduğundan ve CORS'un sunucuda doğru yapılandırıldığından emin olun. <2>Haberler paneli belgelerine</2> bakın.",
       "loading": "Yükleniyor...",
@@ -10385,27 +10386,27 @@
     "title": "Blog'tan son gönderiler"
   },
   "node-graph": {
-    "category-edges": "",
-    "category-node-graph": "",
-    "category-nodes": "",
+    "category-edges": "Kenarlar",
+    "category-node-graph": "Düğüm grafiği",
+    "category-nodes": "Düğümler",
     "layout-algorithm-options": {
-      "description-force": "",
-      "description-grid": "",
-      "description-layered": "",
-      "label-force": "",
-      "label-grid": "",
-      "label-layered": ""
+      "description-force": "Kuvvet yönelimli yerleşim düzeni kullan",
+      "description-grid": "Izgara düzenini kullan",
+      "description-layered": "Katmanlı bir düzen kullan",
+      "label-force": "Kuvvet",
+      "label-grid": "Izgara",
+      "label-layered": "Katmanlı"
     },
-    "name-arc-sections": "",
-    "name-layout-algorithm": "",
-    "name-main-stat-unit": "",
-    "name-secondary-stat-unit": "",
-    "name-zoom-mode": "",
+    "name-arc-sections": "Yay bölümleri",
+    "name-layout-algorithm": "Düzen algoritması",
+    "name-main-stat-unit": "Ana istatistik birimi",
+    "name-secondary-stat-unit": "İkincil istatistik birimi",
+    "name-zoom-mode": "Yakınlaştırma modu",
     "zoom-mode-options": {
-      "description-cooperative": "",
-      "description-greedy": "",
-      "label-cooperative": "",
-      "label-greedy": ""
+      "description-cooperative": "Sayfayı normal şekilde kaydırmanızı sağlar",
+      "description-greedy": "Tüm yakınlaştırma hareketlerine tepki verir",
+      "label-cooperative": "Yardımcı",
+      "label-greedy": "Geniş kapsamlı"
     }
   },
   "nodeGraph": {
@@ -10484,40 +10485,40 @@
     },
     "registry": {
       "get-all-option-editors": {
-        "description-time-zone": "",
-        "name-time-zone": ""
+        "description-time-zone": "Saat dilimi seçimi",
+        "name-time-zone": "Saat dilimi"
       },
       "standard-field-condigs": {
-        "category-data-links": ""
+        "category-data-links": "Veri bağlantıları ve eylemler"
       },
       "standard-field-configs": {
-        "category": "",
-        "category-thresholds": "",
-        "category-value-mappings": "",
-        "description-display-name": "",
-        "description-field-min-max": "",
-        "description-max": "",
-        "description-min": "",
-        "description-no-value": "",
-        "description-value-mappings": "",
-        "name-actions": "",
-        "name-ad-hoc": "",
-        "name-color-scheme": "",
-        "name-data-links": "",
-        "name-decimals": "",
-        "name-display-name": "",
-        "name-field-min-max": "",
-        "name-max": "",
-        "name-min": "",
-        "name-no-value": "",
-        "name-thresholds": "",
-        "name-unit": "",
-        "name-value-mappings": "",
-        "placeholder-decimals": "",
-        "placeholder-display-name": "",
-        "placeholder-max": "",
-        "placeholder-min": "",
-        "placeholder-unit": ""
+        "category": "Standart seçenekler",
+        "category-thresholds": "Eşikler",
+        "category-value-mappings": "Değer eşlemeleri",
+        "description-display-name": "Alan veya seri adını değiştirin",
+        "description-field-min-max": "Her alan için minimum ve maksimum değeri hesapla",
+        "description-max": "Tüm değerlere göre hesaplama yapmak için boş bırakın",
+        "description-min": "Tüm değerlere göre hesaplama yapmak için boş bırakın",
+        "description-no-value": "Değer olmadığında ne gösterileceğini belirtin",
+        "description-value-mappings": "Giriş değerine göre görüntülenen metni özelleştirin",
+        "name-actions": "İşlemler",
+        "name-ad-hoc": "Geçici filtrelenebilir",
+        "name-color-scheme": "Renk düzeni",
+        "name-data-links": "Veri bağlantıları",
+        "name-decimals": "Ondalık",
+        "name-display-name": "Görünen ad",
+        "name-field-min-max": "Alan min./maks.",
+        "name-max": "Maks.",
+        "name-min": "Min.",
+        "name-no-value": "Değer yok",
+        "name-thresholds": "Eşikler",
+        "name-unit": "Birim",
+        "name-value-mappings": "Değer eşlemeleri",
+        "placeholder-decimals": "otomatik",
+        "placeholder-display-name": "yok",
+        "placeholder-max": "otomatik",
+        "placeholder-min": "otomatik",
+        "placeholder-unit": "yok"
       }
     },
     "units": {
@@ -10562,7 +10563,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "Kuruluş bulunamadı",
     "select-placeholder": "Kuruluş Seçin"
   },
   "page": {
@@ -10626,13 +10627,13 @@
     },
     "panel-data-error-view": {
       "missing-value": {
-        "number": "",
-        "string": "",
-        "time": "",
-        "unknown": ""
+        "number": "Verilerde bir sayı alanı eksik",
+        "string": "Verilerde bir dize alanı eksik",
+        "time": "Verilerde bir zaman alanı eksik",
+        "unknown": "Veriler görselleştirilemiyor"
       },
       "no-value": {
-        "default": ""
+        "default": "Veri yok"
       },
       "open-visualization-suggestions": "Görselleştirme önerilerini aç",
       "switch-to-table": "Tabloya geç"
@@ -10672,25 +10673,25 @@
     "select-placeholder": "Türe göre filtrele"
   },
   "piechart": {
-    "category-legend": "",
-    "category-pie-chart": "",
-    "description-labels": "",
-    "description-pie-chart-type": "",
+    "category-legend": "Gösterge",
+    "category-pie-chart": "Pasta grafik",
+    "description-labels": "Pasta grafikte görüntülenecek etiketleri seçin",
+    "description-pie-chart-type": "Pasta grafiğin nasıl oluşturulacağını belirleyin",
     "labels-options": {
-      "label-name": "",
-      "label-percent": "",
-      "label-value": ""
+      "label-name": "Ad",
+      "label-percent": "Yüzde",
+      "label-value": "Değer"
     },
     "legend-values-options": {
-      "label-percent": "",
-      "label-value": ""
+      "label-percent": "Yüzde",
+      "label-value": "Değer"
     },
-    "name-labels": "",
-    "name-legend-values": "",
-    "name-pie-chart-type": "",
+    "name-labels": "Etiketler",
+    "name-legend-values": "Gösterge değerleri",
+    "name-pie-chart-type": "Pasta grafiği türü",
     "pie-chart-type-options": {
-      "label-donut": "",
-      "label-pie": ""
+      "label-donut": "Halka",
+      "label-pie": "Pasta"
     }
   },
   "playlist": {
@@ -10785,7 +10786,7 @@
         "permission": "Bu sayfayı görüntüleme izniniz yok.",
         "title-access-denied": "Erişim reddedildi"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "Eklenti yüklenemedi",
       "no-root-app-page-component-found": "Kök uygulama sayfası bileşeni bulunamadı"
     },
     "browse": {
@@ -10829,7 +10830,7 @@
         "update-status-text": "Eklentiler güncellendi"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "Bu eski sürüme düşürmek istediğinizden emin misiniz: {{version}}? Bunu normalde yapmamalısınız",
         "downgrade-confirm": "Eski sürüme düşür",
         "downgrade-title": "Eklenti sürümünü eski sürüme düşür"
       }
@@ -10858,7 +10859,7 @@
         "dependencies": "Bağımlılıklar",
         "documentation": "Belgeler",
         "downloads": "İndirmeler",
-        "from": "",
+        "from": "Başlangıç",
         "installedVersion": "Yüklü Sürüm",
         "lastCommitDate": "Son yürütme tarihi:",
         "latestReleaseDate": "Son yayın tarihi:",
@@ -10884,8 +10885,8 @@
       "message": "Eklenti bulunamadı"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "Hata hakkında daha fazla bilgi için konsolu kontrol edin.",
+      "extension-error-alert-title": "Uzantı yüklenemedi: \"{{pluginId}}/{{extensionTitle}}\""
     },
     "extensions-log-data-source": {
       "message": {
@@ -10922,13 +10923,13 @@
     "install-controls-button": {
       "title-uninstall-modal": "{{plugin}} eklentisini kaldır",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "Bu eklentiyi kaldırmak istediğinizden emin misiniz?",
+        "confirmText-confirm": "Onayla"
       }
     },
     "install-controls-warning": {
       "body-not-published": "Bu eklenti <2>grafana.com/plugins</2> adresinde yayımlanmadı ve katalog üzerinden yönetilemez.",
-      "enterprise-plugin-info": "",
+      "enterprise-plugin-info": "Bu eklenti yalnızca Grafana Cloud ve Grafana Enterprise'da kullanılabilir.",
       "learn-more": "Daha fazla bilgi edinin",
       "no-valid-grafana-enterprise-license-detected": "Geçerli bir Grafana Enterprise lisansı bulunamadı.",
       "title-dev-alert": "Bu, eklentinin geliştirme sürümüdür ve kaldırılamaz.",
@@ -10941,6 +10942,9 @@
       "label-plugin-id": "Eklenti Kimliği",
       "label-severity": "Önem derecesi"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "Bu eklenti bulunamıyor. Lütfen URL'nin doğru olduğundan emin olun veya <1></1><3>eklenti kataloğuna</3> gidin.",
       "title-plugin-not-found": "Eklenti bulunamadı"
@@ -11086,40 +11090,40 @@
   },
   "provisioned-resource-form": {
     "save-or-delete-resource-shared-fields": {
-      "comment-placeholder-describe-changes-optional": "",
-      "description-branch-name-in-git-hub": "",
+      "comment-placeholder-describe-changes-optional": "Değişikliklerinizi açıklayan bir not ekleyin (isteğe bağlı)",
+      "description-branch-name-in-git-hub": "GitHub'daki dal adı",
       "description-inside-repository": "",
-      "label-branch": "",
-      "label-comment": "",
-      "label-path": "",
-      "label-workflow": ""
+      "label-branch": "Dal",
+      "label-comment": "Yorum",
+      "label-path": "Yol",
+      "label-workflow": "İş akışı"
     }
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "Bu kaynak, {{repoType}} içindeki dalın gerisinde.",
+      "not-saved": "Kuruluşunuzdaki diğer Grafana kullanıcıları, bu dal birleştirilene kadar yapılandırılmış varsayılan dala kaydedilen mevcut sürümü görmeye devam edecektir",
+      "open-in-repo-button": "Şurada aç: {{repoType}}",
+      "open-pull-request-in-repo": "Şurada çekme isteği aç: {{repoType}}",
+      "view-in-repo-button": "En son değişiklikleri görmek için {{repoType}} içinde görüntüleyin.",
+      "view-pull-request-in-repo": "Çekme isteğini şurada görüntüleyin: {{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "{{repoType}} içindeki bir dalda yeni bir kaynak oluşturuldu.",
+    "title-loaded-pull-request-in-repo": "Bu kaynak, {{repoType}} içinde yeni oluşturduğunuz daldan yüklendi ve yalnızca siz görebilirsiniz"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "Kaynak başarıyla kaydedildi",
+  "provisioned-resource-request-handler-dashboard": "Pano başarıyla kaydedildi",
+  "provisioned-resource-request-handler-folder": "Klasör başarıyla oluşturuldu",
   "provisioning": {
     "banner": {
       "message": "Bu özellik şu anda aktif geliştirme aşamasındadır. En iyi deneyim ve en yeni geliştirmeler için Grafana'nın <2>gecelik derleme</2> sürümünü kullanmanızı öneririz."
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Sağlama için kullanılacak dal",
+      "branch-label": "Dal",
+      "branch-required": "Dal gereklidir",
+      "path-description": "Depo içinde isteğe bağlı alt dizin yolu",
+      "path-label": "Yol",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11128,18 +11132,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Kullanıcıların değişiklikleri kaydederken bir çekme isteği açıp açmayacağını seçmesine izin verir. Depo ana dala doğrudan değişikliklere izin vermiyorsa bir çekme isteği gerekebilir.",
+      "pr-workflow-label": "Kaydederken çekme isteği seçeneğini etkinleştir",
+      "token-description": "Depo izinlerine sahip Bitbucket Uygulama Parolası",
+      "token-label": "Uygulama Parolası",
+      "token-required": "Bitbucket belirteci gereklidir",
+      "token-user-description": "Uygulama parolasıyla depoya erişmek için kullanılacak kullanıcı adı",
+      "token-user-label": "Kullanıcı adı",
+      "token-user-required": "Kullanıcı adı gereklidir",
+      "url-description": "Bitbucket depo URL'si",
+      "url-label": "Depo URL'si",
+      "url-pattern": "Geçerli bir Bitbucket depo URL'si olmalıdır",
+      "url-required": "Depo URL'si gereklidir"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "Bu depo bağlantısı için net bir ad ekleyin",
@@ -11150,12 +11154,12 @@
       "label-display-name": "Görünen ad",
       "placeholder-my-repository-connection": "Depo bağlantım",
       "text-loading-resource-information": "Kaynak bilgileri yükleniyor...",
-      "dashboards-count_one": "",
-      "dashboards-count_other": "",
+      "dashboards-count_one": "{{count}} pano",
+      "dashboards-count_other": "{{count}} pano",
       "files-count_one": "{{count}} dosya",
       "files-count_other": "{{count}} dosya",
-      "folders-count_one": "",
-      "folders-count_other": ""
+      "folders-count_one": "{{count}} klasör",
+      "folders-count_other": "{{count}} klasör"
     },
     "check-repository": {
       "check": "Kontrol et"
@@ -11229,7 +11233,7 @@
       "title-instant-updates-requests-webhooks": "Web kancalarıyla anlık güncellemeler ve çekme istekleri.",
       "title-visual-previews-in-pull-requests": "Çekme isteklerinde resimlerin işlenmesiyle birlikte görsel ön izleme"
     },
-    "error-title-default": "",
+    "error-title-default": "Hata",
     "expanded-row": {
       "job-specification": "İşin Özellikleri",
       "summary": "Özet"
@@ -11238,8 +11242,8 @@
       "actions": {
         "set-up-required-feature-toggles": "Gerekli özellik anahtarlarını ayarla"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "Panoları Git'de kod olarak yönetin ve güncellemeleri otomatik sağlayın",
+      "manage-your-dashboards-with-remote-provisioning": "Git Sync'i kullanmaya başlayın",
       "store-dashboards-in-version-controlled-storage": "Daha iyi organizasyon ve geçmiş takibi için panoları sürüm kontrollü bir depoda saklayın"
     },
     "file-history-page": {
@@ -11260,16 +11264,16 @@
     },
     "finish-step": {
       "description-enable-previews": "Çekme isteklerinde pano değişikliklerinin görsel ön izlemesini ekler. Grafana panolarınızın görselleri Git deponuzda paylaşılacak ve depo erişimi olan herkes tarafından görülebilecektir.",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "Çekme istekleri için ön izleme bağlantıları oluşturun",
       "description-image-rendering": "Görsel oluşturma gerektirir. <2>Görsel oluşturmayı ayarlayın</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "(<2>görsel oluşturma</2> ve herkese açık erişimin etkinleştirilmesi gerekir)",
       "description-read-only": "Kaynaklar Grafana aracılığıyla değiştirilemez.",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "Depodaki değişikliklerin ne sıklıkta eşitleneceği",
+      "error-sync-interval-required": "Sync aralığı gereklidir",
       "label-enable-previews": "Çekme isteklerinde pano ön izlemelerini etkinleştir",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "Pano Ön İzlemeleri Oluştur",
       "label-read-only": "Salt okunur",
-      "label-sync-interval": ""
+      "label-sync-interval": "Eşitleme Aralığı (saniye)"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "Sorgunuzla eşleşen sonuç yok",
@@ -11301,46 +11305,46 @@
       "subtitle-provisioning-feature": "Sağlama bağlantılarınızı görüntüleyin ve yönetin"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Sağlama için kullanılacak dal",
+      "branch-label": "Dal",
+      "branch-required": "Dal gereklidir",
+      "path-description": "Depo içinde isteğe bağlı alt dizin yolu",
+      "path-label": "Yol",
+      "pr-workflow-description": "Kullanıcıların değişiklikleri kaydederken bir çekme isteği açıp açmayacağını seçmesine izin verir. Depo ana dala doğrudan değişikliklere izin vermiyorsa bir çekme isteği gerekebilir.",
+      "pr-workflow-label": "Kaydederken çekme isteği seçeneğini etkinleştir",
+      "token-description": "Git deposu erişim belirteci veya parolası",
+      "token-label": "Erişim Belirteci",
+      "token-required": "Git belirteci gereklidir",
+      "token-user-description": "Erişim belirteciyle depoya erişmek için kullanılacak kullanıcı adı",
+      "token-user-label": "Kullanıcı adı",
+      "token-user-required": "Kullanıcı adı gereklidir",
+      "url-description": "Git deposu URL'si",
+      "url-label": "Depo URL'si",
+      "url-pattern": "Geçerli bir Git depo URL'si olmalıdır",
+      "url-required": "Depo URL'si gereklidir"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "Sağlama için kullanılacak dal",
+      "branch-label": "Dal",
+      "branch-required": "Dal gereklidir",
+      "path-description": "Depo içinde isteğe bağlı alt dizin yolu",
+      "path-label": "Yol",
+      "pr-workflow-description": "Kullanıcıların değişiklikleri kaydederken bir çekme isteği açıp açmayacağını seçmesine izin verir. Depo ana dala doğrudan değişikliklere izin vermiyorsa bir çekme isteği gerekebilir.",
+      "pr-workflow-label": "Kaydederken çekme isteği seçeneğini etkinleştir",
+      "token-description": "Depo izinlerine sahip GitHub Kişisel Erişim Belirteci",
+      "token-label": "Kişisel Erişim Belirteci",
+      "token-required": "GitHub belirteci gereklidir",
+      "url-description": "GitHub depo URL'si",
+      "url-label": "Depo URL'si",
+      "url-pattern": "Geçerli bir GitHub depo URL'si olmalıdır",
+      "url-required": "Depo URL'si gereklidir"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "Sağlama için kullanılacak dal",
+      "branch-label": "Dal",
+      "branch-required": "Dal gereklidir",
+      "path-description": "Depo içinde isteğe bağlı alt dizin yolu",
+      "path-label": "Yol",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11349,15 +11353,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "Kullanıcıların değişiklikleri kaydederken bir birleştirme isteği açıp açmayacağını seçmesine izin verir. Depo ana dala doğrudan değişikliklere izin vermiyorsa bir birleştirme isteği gerekebilir.",
+      "pr-workflow-label": "Kaydederken birleştirme isteği seçeneğini etkinleştir",
+      "token-description": "Depo izinlerine sahip GitLab Proje Erişim Belirteci",
+      "token-label": "Proje Erişim Belirteci",
+      "token-required": "GitLab belirteci gereklidir",
+      "url-description": "GitLab depo URL'si",
+      "url-label": "Depo URL'si",
+      "url-pattern": "Geçerli bir GitLab depo URL'si olmalıdır",
+      "url-required": "Depo URL'si gereklidir"
     },
     "history-view": {
       "not-found": "Bulunamadı"
@@ -11385,18 +11389,18 @@
       "starting": "Başlatılıyor...",
       "status": {
         "title-error-running-job": "İş çalıştırılırken hata oluştu",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "İş başarıyla tamamlandı",
+        "title-warning-running-job": "İş, uyarılarla tamamlandı"
       },
       "summary": "Özet",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "Etkin iş alınırken hata oluştu"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "Depoya giden yerel dosya sistemi yolu",
+      "path-label": "Depo Yolu",
+      "path-required": "Depo yolu gereklidir"
     },
     "mode-options": {
       "folder": {
@@ -11422,7 +11426,7 @@
     },
     "repository-actions": {
       "settings": "Ayarlar",
-      "source-code": ""
+      "source-code": "Kaynak kodu"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11488,22 +11492,22 @@
       "title-queued-for-deletion": "Silinmek üzere kuyruğa alındı"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "Bir sağlayıcı seçin:",
+      "configure-file": "Dosya sağlamayı yapılandır",
+      "configure-with-provider": "Şununla yapılandır: {{ provider }}",
+      "provider-not-listed": "Sağlayıcınız listede yoksa:"
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "Bitbucket depolarına bağlanın",
+      "github": "GitHub",
+      "github-description": "GitHub depolarına bağlanın",
+      "gitlab": "GitLab",
+      "gitlab-description": "GitLab depolarına bağlanın",
+      "local": "Yerel",
+      "local-description": "Dosya sağlamayı yapılandır",
+      "pure-git": "Pure Git",
+      "pure-git-description": "Herhangi bir Git deposuna bağlanın"
     },
     "resource-view": {
       "base": "Temel",
@@ -11534,11 +11538,11 @@
       "label-current-step": "Mevcut adım",
       "label-pending-step": "Bekleyen adım"
     },
-    "success-title-default": "",
+    "success-title-default": "Başarılı",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "İş başlatılamadı",
+      "error-no-repository-name": "Depo adı sağlanmadı",
+      "error-starting-job": "İş başlatılırken hata oluştu"
     },
     "sync-repository": {
       "body-edit-configuration": "Yapılandırmayı düzenle",
@@ -11566,7 +11570,7 @@
       "go-to": "Şuraya git:",
       "make-sure": "Bu izinleri eklediğinizden emin olun"
     },
-    "warning-title-default": "",
+    "warning-title-default": "Uyarı",
     "wizard": {
       "alert-point-1": "Bu işlem sırasında kaynaklar oluşturulamayacak, düzenlenemeyecek veya silinemeyecek. Son adımda kaynaklar kaybolacaktır.",
       "alert-point-2": "Sağlama işlemi tamamlandığında kaynaklar tekrar görünecek ve harici depolama üzerinden yönetilecektir.",
@@ -11576,10 +11580,10 @@
       "button-next": "Sonlandır",
       "button-start": "Senkronizasyonu başlat",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "Bu işlem, depo yapılandırmasını silecek ve tüm ilerlemeyi kaybedeceksiniz. Değişikliklerinizi silmek istediğinizden emin misiniz?",
+        "confirm": "Evet, yoksay",
+        "dismiss": "Çalışmaya devam et",
+        "title": "Depo kurulumu silinsin mi?"
       },
       "step-bootstrap": "Nelerin senkronize edileceğini seçin",
       "step-connect": "Bağlan",
@@ -11595,7 +11599,7 @@
     "wizard-content": {
       "button-cancel": "İptal",
       "button-cancelling": "İptal ediliyor...",
-      "button-previous": "",
+      "button-previous": "Önceki",
       "button-submitting": "Gönderiliyor...",
       "error-instance-repository-exists": "Örnek deposu zaten var"
     }
@@ -11996,7 +12000,7 @@
         "recommended": "Önerilen",
         "results": "Sonuçlar"
       },
-      "search": ""
+      "search": "{{parentTitle}} ara"
     }
   },
   "search": {
@@ -12077,7 +12081,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "Hizmet hesabı bulunamadı",
     "select-aria-label": "Hizmet hesabı seçici",
     "select-placeholder": "Hizmet hesaplarını aramak için yazmaya başlayın"
   },
@@ -12123,10 +12127,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Hizmet hesabı belirteci ekle",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "Bu hizmet hesabını silmek istediğinizden emin misiniz?",
+      "body-disable-service-account": "Bu hizmet hesabını devre dışı bırakmak istediğinizden emin misiniz?",
+      "confirmText-delete-service-account": "Hizmet hesabını sil",
+      "confirmText-disable-service-account": "Hizmet hesabını devre dışı bırak",
       "delete-service-account": "Hizmet hesabını sil",
       "disable-service-account": "Hizmet hesabını devre dışı bırak",
       "enable-service-account": "Hizmet hesabını etkinleştir",
@@ -12153,7 +12157,7 @@
       "used-by": "Kullanan:"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "Kaydet",
       "edit": "Düzenle"
     },
     "service-account-role-row": {
@@ -12167,16 +12171,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Hizmet hesabı ekle",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "{{serviceAccountName}} öğesini silmek istediğinizden emin misiniz?",
+      "body-disable-service-account": "'{{accountToDisable}}' öğesini devre dışı bırakmak istediğinizden emin misiniz?",
+      "confirmText-delete": "Sil",
+      "confirmText-disable-service-account": "Hizmet hesabını devre dışı bırak",
       "placeholder-search-service-account-by-name": "Hizmet hesabını ada göre ara",
       "sub-title": "Hizmet hesapları ve belirteçleri, Grafana API'ye karşı kimlik doğrulamak için kullanılabilir. Daha fazla bilgi için <2>belgelerimize</2>",
       "title-delete-service-account": "Hizmet hesabını sil",
       "title-disable-service-account": "Hizmet hesabını devre dışı bırak",
-      "body-delete_one": "",
-      "body-delete_other": ""
+      "body-delete_one": "{{serviceAccountName}} hizmet hesabını ve {{count}} eşlik eden belirteçleri silmek istediğinizden emin misiniz?",
+      "body-delete_other": "{{serviceAccountName}} hizmet hesabını ve {{count}} eşlik eden belirteçleri silmek istediğinizden emin misiniz?"
     },
     "token-expiration": {
       "content-this-token-has-expired": "Bu belirtecin süresi doldu",
@@ -12190,7 +12194,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "Resim olarak dışarıya aktar",
       "export-json-title": "JSON olarak dışa aktar",
       "share-externally-title": "Haricî olarak paylaş",
       "share-internally-title": "Dâhilî olarak paylaş",
@@ -12227,17 +12231,17 @@
       "view-button-yaml": "YAML'yi görüntüle"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "Görsel dışa aktarma işlemleri",
+      "cancel-button": "İptal et",
+      "download-button": "Görseli indir",
+      "error-title": "Görsel oluşturulamadı",
+      "generate-button": "Görsel oluştur",
+      "generating": "Görsel oluşturuluyor...",
+      "info-text": "Bu panoyu görsel olarak kaydet",
+      "preview": "Ön izleme",
+      "preview-aria": "Oluşturulan görsel ön izlemesi",
+      "preview-region": "Görsel ön izlemesi",
+      "title": "Resim olarak dışarıya aktar"
     },
     "library": {
       "info": "Kütüphane paneli oluşturun."
@@ -12247,7 +12251,7 @@
       "info-text": "Aşağıdaki seçeneklerle özelleştirilen bu panoya veya panele doğrudan bir bağlantı oluşturun.",
       "link-url": "Bağlantı URL'si",
       "render-alert": "Görüntü işleme eklentisi yüklü değil",
-      "render-instructions": "",
+      "render-instructions": "Bir görsel oluşturmak için <2>Grafana görüntü işleme eklentisini</2> yüklemeniz gerekir. Lütfen eklentiyi yüklemek için Grafana yöneticinizle iletişime geçin.",
       "rendered-image": "Doğrudan bağlantılı oluşturulmuş görüntü",
       "save-alert": "Pano kaydedilmedi",
       "save-dashboard": "Panel görüntüsü oluşturmak için önce panoyu kaydetmelisiniz.",
@@ -12315,11 +12319,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "Görüntü oluşturmayı etkinleştirmek için panoyu kaydedin",
+    "download-disabled-help": "İndirmeyi etkinleştirmek için önce bir görsel oluşturun",
+    "error-title": "Görsel oluşturulamadı",
     "form": {
-      "label": ""
+      "label": "Panel görsel ayarları"
     },
     "preview": {
       "title": "Panel ön izlemesi"
@@ -12480,112 +12484,112 @@
   },
   "stat": {
     "add-orientation-option": {
-      "description-orientation": "",
-      "name-orientation": "",
+      "description-orientation": "Düzen yönü",
+      "name-orientation": "Yön",
       "orientation-options": {
-        "label-auto": "",
-        "label-horizontal": "",
-        "label-vertical": ""
+        "label-auto": "Otomatik",
+        "label-horizontal": "Yatay",
+        "label-vertical": "Dikey"
       }
     },
     "add-standard-data-reduce-options": {
-      "category-value-options": "",
-      "description-calculation": "",
-      "description-fields": "",
-      "description-limit": "",
-      "description-show": "",
+      "category-value-options": "Değer seçenekleri",
+      "description-calculation": "Bir azaltıcı işlevi/hesaplama seçin",
+      "description-fields": "Panele dâhil edilmesi gereken alanları seçin",
+      "description-limit": "Görüntülenecek maksimum satır sayısı",
+      "description-show": "Sütun veya seri başına tek bir değer hesaplayın veya her satırı gösterin",
       "fields-options": {
-        "label-all-fields": "",
-        "label-numeric-fields": ""
+        "label-all-fields": "Tüm Alanlar",
+        "label-numeric-fields": "Sayısal Alanlar"
       },
-      "name-calculation": "",
-      "name-fields": "",
-      "name-limit": "",
-      "name-show": "",
+      "name-calculation": "Hesaplama",
+      "name-fields": "Alanlar",
+      "name-limit": "Sınırlama",
+      "name-show": "Göster",
       "show-options": {
-        "label-all-values": "",
-        "label-calculate": ""
+        "label-all-values": "Burada belirlenen tüm değerler",
+        "label-calculate": "Hesapla"
       }
     },
-    "category-stat-styles": "",
+    "category-stat-styles": "İstatistik stilleri",
     "color-mode-options": {
-      "label-background-gradient": "",
-      "label-background-solid": "",
-      "label-none": "",
-      "label-value": ""
+      "label-background-gradient": "Arka Plan Gradyanı",
+      "label-background-solid": "Düz Arka Plan",
+      "label-none": "Yok",
+      "label-value": "Değer"
     },
-    "description-graph-mode": "",
-    "description-text-mode": "",
+    "description-graph-mode": "İstatistik paneli grafiği/mini grafik modu",
+    "description-text-mode": "Yalnızca adın mı yoksa ad ve değerin birlikte mi görüntüleneceğini belirleyin",
     "graph-mode": {
       "options": {
-        "label-area": "",
-        "label-none": ""
+        "label-area": "Bölge",
+        "label-none": "Yok"
       }
     },
     "name-color-modcolor-mode-options": {
-      "label": ""
+      "label": "Renk modu"
     },
-    "name-graph-mode": "",
-    "name-show-percent-change": "",
-    "name-text-alignment": "",
-    "name-text-mode": "",
-    "name-wide-layout": "",
-    "percent-change-color-mode": "",
+    "name-graph-mode": "Grafik modu",
+    "name-show-percent-change": "Yüzde değişimini göster",
+    "name-text-alignment": "Metin hizalama",
+    "name-text-mode": "Metin modu",
+    "name-wide-layout": "Geniş düzen",
+    "percent-change-color-mode": "Yüzde değişimi renk modu",
     "percent-change-color-mode-options": {
-      "label-inverted": "",
-      "label-same-as-value": "",
-      "label-standard": ""
+      "label-inverted": "Tersine çevrilmiş",
+      "label-same-as-value": "Değerle aynı",
+      "label-standard": "Standart"
     },
     "text-alignment-options": {
-      "label-auto": "",
-      "label-center": ""
+      "label-auto": "Otomatik",
+      "label-center": "Merkez"
     },
     "text-mode-options": {
-      "label-auto": "",
-      "label-name": "",
-      "label-none": "",
-      "label-value": "",
-      "label-value-and-name": ""
+      "label-auto": "Otomatik",
+      "label-name": "Ad",
+      "label-none": "Yok",
+      "label-value": "Değer",
+      "label-value-and-name": "Değer ve ad"
     },
     "wide-layout-options": {
-      "label-off": "",
-      "label-on": ""
+      "label-off": "Kapalı",
+      "label-on": "Açık"
     }
   },
   "state-timeline": {
     "align-values-options": {
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-center": "Merkez",
+      "label-left": "Sol",
+      "label-right": "Sağ"
     },
-    "category-state-timeline": "",
-    "name-align-values": "",
-    "name-connect-null-values": "",
-    "name-disconnect-values": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-merge-equal-consecutive-values": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-state-timeline": "Durum zaman çizelgesi",
+    "name-align-values": "Değerleri hizala",
+    "name-connect-null-values": "Boş değerleri bağla",
+    "name-disconnect-values": "Değerlerin bağlantısını kes",
+    "name-fill-opacity": "Dolgu opaklığı",
+    "name-line-width": "Çizgi genişliği",
+    "name-merge-equal-consecutive-values": "Eşit ve ardışık değerleri birleştir",
+    "name-page-size": "Sayfa boyutu (sayfalandırmayı etkinleştir)",
+    "name-row-height": "Satır yüksekliği",
+    "name-show-values": "Değerleri göster",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Her zaman",
+      "label-auto": "Otomatik",
+      "label-never": "Hiçbir zaman"
     }
   },
   "status-history": {
-    "category-status-history": "",
-    "name-column-width": "",
-    "name-fill-opacity": "",
-    "name-line-width": "",
-    "name-page-size": "",
-    "name-row-height": "",
-    "name-show-values": "",
+    "category-status-history": "Durum geçmişi",
+    "name-column-width": "Sütun genişliği",
+    "name-fill-opacity": "Dolgu opaklığı",
+    "name-line-width": "Çizgi genişliği",
+    "name-page-size": "Sayfa boyutu (sayfalandırmayı etkinleştir)",
+    "name-row-height": "Satır yüksekliği",
+    "name-show-values": "Değerleri göster",
     "show-values-options": {
-      "label-always": "",
-      "label-auto": "",
-      "label-never": ""
+      "label-always": "Her zaman",
+      "label-auto": "Otomatik",
+      "label-never": "Hiçbir zaman"
     },
     "status-history-panel": {
       "too-many-points_one": "Veri noktası sayısı çok fazla olduğu için düzgün görselleştirilemiyor. <1></1>Sorguyu daha az nokta döndürecek şekilde güncelleyin. <3></3>({{count}} nokta alındı)",
@@ -12625,26 +12629,26 @@
       "label-gauge-display-mode": "Gösterge ekranı modu",
       "label-value-display": "Değer görüntüleme"
     },
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Hücre seçenekleri",
+    "category-table": "Tablo",
+    "category-table-footer": "Tablo alt bilgisi",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Büyük",
+      "label-medium": "Orta",
+      "label-small": "Küçük"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "İşlemler",
+      "auto": "Otomatik",
+      "color-background": "Renkli arka plan",
+      "color-text": "Renkli metin ",
+      "data-links": "Veri bağlantıları",
+      "gauge": "Ölçü",
+      "image": "Görsel",
+      "json": "JSON Görünümü",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "Pill",
+      "sparkline": "Sparkline"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "Seçilirse tüm satır bu hücre gibi renklendirilecektir.",
@@ -12657,23 +12661,23 @@
       "wrap-text": "Metni satıra sığdır"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Otomatik",
+      "label-center": "Merkez",
+      "label-left": "Sol",
+      "label-right": "Sağ"
     },
     "container": {
       "content": "Tek bir tabloda çok fazla sütun göstermek performansı etkileyebilir ve verilerin okunmasını zorlaştırabilir. Sorgularınızı daraltmayı düşünün.",
       "show-all-series": "Tüm sütunları göster",
       "show-only-series": "Sadece {{MAX_NUMBER_OF_COLUMNS}} sütun gösteriliyor"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
-    "description-min-column-width": "",
-    "description-wrap-header-text": "",
+    "description-calculation": "Bir azaltıcı işlevi/hesaplama seçin",
+    "description-cell-value-inspect": "Hücre değerini açılır pencerede incelemeyi etkinleştir",
+    "description-column-filter": "Tablo içindeki alan filtrelerini etkinleştir/devre dışı bırak",
+    "description-count-rows": "Tüm veri satırları için tek bir sayı görüntüle",
+    "description-fields": "Hesaplanacak alanları seçin",
+    "description-min-column-width": "Sütunların otomatik olarak yeniden boyutlandırılması için minimum genişlik",
+    "description-wrap-header-text": "Sütun başlıkları için metin kaydırmayı etkinleştirir",
     "image-cell-options-editor": {
       "description-alt-text": "Görsel görüntülenemediğinde veya ekran okuyucu kullanan kullanıcılar için gösterilecek alternatif metin",
       "description-title-text": "İmleç görselin üzerine getirildiğinde görüntülenecek metin",
@@ -12687,66 +12691,66 @@
       },
       "label-dynamic-height": ""
     },
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-paginations": "",
-    "name-fields": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "name-wrap-header-text": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": "",
+    "name-calculation": "Hesaplama",
+    "name-cell-height": "Hücre yüksekliği",
+    "name-cell-type": "Hücre tipi",
+    "name-cell-value-inspect": "Hücre değeri incelemesi",
+    "name-column-alignment": "Sütun hizalama",
+    "name-column-filter": "Sütun filtresi",
+    "name-column-width": "Sütun genişliği",
+    "name-count-rows": "Satır sayısını göster",
+    "name-enable-paginations": "Sayfalandırmayı etkinleştir",
+    "name-fields": "Alanlar",
+    "name-hide-in-table": "Tabloda gizle",
+    "name-min-column-width": "Minimum sütun genişliği",
+    "name-show-table-footer": "Tablo alt bilgisini göster",
+    "name-show-table-header": "Tablo başlığını göster",
+    "name-wrap-header-text": "Başlık metnini kaydır",
+    "placeholder-column-width": "otomatik",
+    "placeholder-fields": "Tüm Sayısal Alanlar",
     "text-wrap-options": {
       "label-wrap-text": ""
     }
   },
   "table-new": {
-    "category-cell-options": "",
-    "category-table": "",
-    "category-table-footer": "",
+    "category-cell-options": "Hücre seçenekleri",
+    "category-table": "Tablo",
+    "category-table-footer": "Tablo alt bilgisi",
     "cell-height-options": {
-      "label-large": "",
-      "label-medium": "",
-      "label-small": ""
+      "label-large": "Büyük",
+      "label-medium": "Orta",
+      "label-small": "Küçük"
     },
     "column-alignment-options": {
-      "label-auto": "",
-      "label-center": "",
-      "label-left": "",
-      "label-right": ""
+      "label-auto": "Otomatik",
+      "label-center": "Merkez",
+      "label-left": "Sol",
+      "label-right": "Sağ"
     },
-    "description-calculation": "",
-    "description-cell-value-inspect": "",
-    "description-column-filter": "",
-    "description-count-rows": "",
-    "description-fields": "",
+    "description-calculation": "Bir azaltıcı işlevi/hesaplama seçin",
+    "description-cell-value-inspect": "Hücre değerini açılır pencerede incelemeyi etkinleştir",
+    "description-column-filter": "Tablo içindeki alan filtrelerini etkinleştir/devre dışı bırak",
+    "description-count-rows": "Tüm veri satırları için tek bir sayı görüntüle",
+    "description-fields": "Hesaplanacak alanları seçin",
     "description-frozen-columns": "",
-    "description-min-column-width": "",
-    "name-calculation": "",
-    "name-cell-height": "",
-    "name-cell-type": "",
-    "name-cell-value-inspect": "",
-    "name-column-alignment": "",
-    "name-column-filter": "",
-    "name-column-width": "",
-    "name-count-rows": "",
-    "name-enable-pagination": "",
-    "name-fields": "",
+    "description-min-column-width": "Sütunların otomatik olarak yeniden boyutlandırılması için minimum genişlik",
+    "name-calculation": "Hesaplama",
+    "name-cell-height": "Hücre yüksekliği",
+    "name-cell-type": "Hücre tipi",
+    "name-cell-value-inspect": "Hücre değeri incelemesi",
+    "name-column-alignment": "Sütun hizalama",
+    "name-column-filter": "Sütun filtresi",
+    "name-column-width": "Sütun genişliği",
+    "name-count-rows": "Satır sayısını göster",
+    "name-enable-pagination": "Sayfalandırmayı etkinleştir",
+    "name-fields": "Alanlar",
     "name-frozen-columns": "",
-    "name-hide-in-table": "",
-    "name-min-column-width": "",
-    "name-show-table-footer": "",
-    "name-show-table-header": "",
-    "placeholder-column-width": "",
-    "placeholder-fields": ""
+    "name-hide-in-table": "Tabloda gizle",
+    "name-min-column-width": "Minimum sütun genişliği",
+    "name-show-table-footer": "Tablo alt bilgisini göster",
+    "name-show-table-header": "Tablo başlığını göster",
+    "placeholder-column-width": "otomatik",
+    "placeholder-fields": "Tüm Sayısal Alanlar"
   },
   "tag-filter": {
     "clear-button": "Etiketleri temizle",
@@ -12757,7 +12761,7 @@
     "tag-option-label": "Etiket seçeneği"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "Ekip bulunamadı",
     "select-aria-label": "Ekip seçici",
     "select-placeholder": "Bir ekip seçin"
   },
@@ -12831,17 +12835,17 @@
     }
   },
   "text": {
-    "category-text": "",
+    "category-text": "Metin",
     "mode-options": {
-      "label-code": "",
-      "label-html": "",
-      "label-markdown": ""
+      "label-code": "Kod",
+      "label-html": "HTML",
+      "label-markdown": "Markdown"
     },
-    "name-content": "",
-    "name-language": "",
-    "name-mode": "",
-    "name-show-line-numbers": "",
-    "name-show-mini-map": ""
+    "name-content": "İçerik",
+    "name-language": "Dil",
+    "name-mode": "Mod",
+    "name-show-line-numbers": "Satır numaralarını göster",
+    "name-show-mini-map": "Mini haritayı göster"
   },
   "theme-preview": {
     "breadcrumbs": {
@@ -12889,7 +12893,7 @@
       "apply-button": "Zaman aralığını uygula",
       "default-error": "Lütfen geçmiş bir tarih veya \"{{now}}\" ifadesini girin",
       "fiscal-year": "Mali yıl: {{from}}-{{to}}",
-      "from-input": "",
+      "from-input": "Başlangıç",
       "open-input-calendar": "Takvimi aç",
       "range-error": "\"Başlangıç\", \"Bitiş\" sonrasına denk gelen bir tarih olamaz.",
       "to-input": "Bitiş"
@@ -12907,7 +12911,7 @@
       "aria-role": "Zaman aralığı seçimi",
       "default-title": "Zaman aralıkları",
       "example-title": "Örnek zaman aralıkları",
-      "from-label": "",
+      "from-label": "Başlangıç",
       "from-to": "{{timeOptionFrom}} - {{timeOptionTo}}",
       "specify": "Zaman aralığını belirtin",
       "submit-button-label": "TimePicker gönder düğmesi",
@@ -12920,8 +12924,8 @@
   },
   "timeline": {
     "missing-field": {
-      "all": "",
-      "time": ""
+      "all": "Grafiklenebilir alan yok",
+      "time": "Verilerin zaman alanı yok"
     }
   },
   "timeseries": {
@@ -12939,54 +12943,54 @@
       "tooltip-delete": "Sil",
       "tooltip-edit": "Düzenle"
     },
-    "category-axis": "",
+    "category-axis": "Eksen",
     "config": {
       "get-graph-field-config": {
-        "aria-label-bar-width-factor": "",
-        "aria-label-fill-opacity": "",
-        "aria-label-line-width": "",
-        "aria-label-point-size": "",
-        "category-graph-styles": "",
-        "category-thresholds": "",
-        "name-bar-alignment": "",
-        "name-bar-width-factor": "",
-        "name-connect-nulls": "",
-        "name-disconnect-values": "",
-        "name-fill-below-to": "",
-        "name-fill-opacity": "",
-        "name-gradient-mode": "",
-        "name-line-interpolation": "",
-        "name-line-style": "",
-        "name-line-width": "",
-        "name-point-size": "",
-        "name-show-points": "",
-        "name-show-thresholds": "",
-        "name-style": "",
-        "name-transform": "",
+        "aria-label-bar-width-factor": "Çubuk genişliği faktörü",
+        "aria-label-fill-opacity": "Dolgu opaklığı",
+        "aria-label-line-width": "Çizgi genişliği",
+        "aria-label-point-size": "Nokta boyutu",
+        "category-graph-styles": "Grafik stilleri",
+        "category-thresholds": "Eşikler",
+        "name-bar-alignment": "Çubuk hizalama",
+        "name-bar-width-factor": "Çubuk genişliği faktörü",
+        "name-connect-nulls": "Boş değerleri bağla",
+        "name-disconnect-values": "Değerlerin bağlantısını kes",
+        "name-fill-below-to": "Şu seriye kadar alanı doldur:",
+        "name-fill-opacity": "Dolgu opaklığı",
+        "name-gradient-mode": "Gradyan modu",
+        "name-line-interpolation": "Çizgi ilişkilendirmesi",
+        "name-line-style": "Çizgi stili",
+        "name-line-width": "Çizgi genişliği",
+        "name-point-size": "Nokta boyutu",
+        "name-show-points": "Noktaları göster",
+        "name-show-thresholds": "Eşikleri göster",
+        "name-style": "Stil",
+        "name-transform": "Dönüştür",
         "transform-options": {
-          "description-constant": "",
-          "description-style": "",
-          "label-constant": "",
-          "label-style": ""
+          "description-constant": "İlk değer sabit bir çizgi olarak gösterilecektir",
+          "description-style": "Sonuçları y ekseninde negatif değerlere çevir",
+          "label-constant": "Sabit",
+          "label-style": "Negatif Y"
         }
       }
     },
     "insert-nulls-editor": {
       "disconnect-options": {
-        "label-never": "",
-        "label-threshold": ""
+        "label-never": "Hiçbir zaman",
+        "label-threshold": "Eşik"
       }
     },
     "line-style-editor": {
       "line-fill-options": {
-        "label-dash": "",
-        "label-dots": "",
-        "label-solid": ""
+        "label-dash": "Çizgi",
+        "label-dots": "Noktalar",
+        "label-solid": "Katı"
       },
       "title-the-input-expects-a-segment-list": "Girdi bir segment listesi bekliyor",
       "tooltip-help": "Yardım"
     },
-    "name-time-zone": "",
+    "name-time-zone": "Saat dilimi",
     "nulls-threshold-input": {
       "placeholder-never": "Hiçbir zaman"
     },
@@ -12996,9 +13000,9 @@
     },
     "span-nulls-editor": {
       "gaps-options": {
-        "label-always": "",
-        "label-never": "",
-        "label-threshold": ""
+        "label-always": "Her zaman",
+        "label-never": "Hiçbir zaman",
+        "label-threshold": "Eşik"
       }
     },
     "timezones-editor": {
@@ -13007,17 +13011,17 @@
     }
   },
   "traces": {
-    "category-span-filters": "",
-    "name-critical-path-only": "",
-    "name-find-in-trace": "",
-    "name-max-duration": "",
-    "name-min-duration": "",
-    "name-service-name": "",
-    "name-service-name-operator": "",
-    "name-show-matches-only": "",
-    "name-span-name": "",
-    "name-span-name-operator": "",
-    "name-tags": "",
+    "category-span-filters": "Zaman aralığı filtreleri",
+    "name-critical-path-only": "Sadece kritik yolu göster",
+    "name-find-in-trace": "İzlemede bul",
+    "name-max-duration": "Maks. süre",
+    "name-min-duration": "Min. süre",
+    "name-service-name": "Hizmet adı",
+    "name-service-name-operator": "Hizmet adı işleci",
+    "name-show-matches-only": "Sadece eşleşenleri göster",
+    "name-span-name": "Zaman aralığı adı",
+    "name-span-name-operator": "Zaman aralığı adı işleci",
+    "name-tags": "Etiketler",
     "traces-panel": {
       "no-data-found-in-response": "Yanıtta veri bulunamadı"
     }
@@ -13032,20 +13036,20 @@
     "axis-editor": {
       "log-mode-options": {
         "description": {
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-size": "Demetleri boyuta göre ayır"
         },
         "label": {
-          "split": ""
+          "split": "Ayır"
         }
       },
       "mode-options": {
         "description": {
-          "split-the-buckets-based-on-count": "",
-          "split-the-buckets-based-on-size": ""
+          "split-the-buckets-based-on-count": "Demetleri sayısına göre ayır",
+          "split-the-buckets-based-on-size": "Demetleri boyuta göre ayır"
         },
         "label": {
-          "count": "",
-          "size": ""
+          "count": "Sayı",
+          "size": "Boyut"
         }
       },
       "placeholder-auto": "Otomatik"
@@ -13061,15 +13065,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "İkili işlem",
+          "reduce-row": "Satırı daralt",
+          "row-index": "Satır dizini",
+          "unary-operation": "Tekli işlem"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "Kümülatif işlevler",
+        "window-functions": "Pencere işlevleri"
       },
       "label-alias": "Takma isim",
       "label-mode": "Mod",
@@ -13077,9 +13081,9 @@
     },
     "calculate-heatmap": {
       "add-heatmap-calculation-options": {
-        "name-x-bucket": "",
-        "name-y-bucket": "",
-        "name-y-bucket-scale": ""
+        "name-x-bucket": "X Demeti",
+        "name-y-bucket": "Y Demeti",
+        "name-y-bucket-scale": "Y Demeti ölçeği"
       }
     },
     "concatenate-transformer-editor": {
@@ -13087,9 +13091,9 @@
       "label-name": "Ad",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "Çerçeve adını alan adına kopyala",
+          "ignore-the-frame-name": "Çerçeve adını yok say",
+          "label-frame": "Çerçeve adıyla bir etiket ekle"
         }
       },
       "placeholder-frame": "Çerçeve"
@@ -13102,9 +13106,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Alan türü dönüştürücü ekle",
       "aria-label-remove-convert-field-type-transformer": "Alan türü dönüştürücüyü kaldır",
-      "convert-field-type": "",
+      "convert-field-type": "Alan türünü dönüştür",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "Bir alanı belirtilen alan türüne dönüştürün."
       },
       "label": {
         "browser": "Tarayıcı",
@@ -13117,11 +13121,11 @@
       "label-join-with": "Birleştir",
       "label-set-timezone": "Zaman dilimini ayarla",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "Alan türünü dönüştür"
       },
       "placeholder-type": "Tür",
       "tags": {
-        "format-field": ""
+        "format-field": "Alan biçimlendir"
       },
       "tooltip-explicit-separator-joining-array-values": "Dizi değerlerini birleştirirken açık bir ayırıcı kullanın",
       "tooltip-input-format": "Grafana'nın tarih dizesini doğru şekilde ayrıştırabilmesi için girdi alanı biçimini belirtin.",
@@ -13140,20 +13144,20 @@
       "tooltip-enable": "Etkinleştir"
     },
     "draggable-sort-order": {
-      "asc": "",
-      "desc": "",
+      "asc": "ART",
+      "desc": "AZL",
       "off": "Kapalı"
     },
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "Tüm alanları tek bir çerçevede birleştirin."
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "Alanları birleştir"
         },
         "tags": {
-          "combine": ""
+          "combine": "Birleştir"
         }
       }
     },
@@ -13168,11 +13172,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "Alanları içerikten ayrıştırın (JSON, etiketler vb.)."
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "Alan seçin"
         }
       },
       "label-delimiter": "Sınırlayıcı",
@@ -13181,7 +13185,7 @@
       "label-replace-all-fields": "Tüm alanları değiştir",
       "label-source": "Kaynak",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "Alanları ayıkla"
       },
       "placeholder-auto": "Otomatik",
       "placeholder-select-delimiter": "Sınırlayıcı seçin...",
@@ -13192,20 +13196,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "Ülkeleri, eyaletleri veya havalimanlarını aramak için bir alan değeri kullanın."
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Hiçbir metin alanı bulunamadı"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Metin alanını seçin"
         }
       },
       "label-field": "Alan",
       "label-lookup": "Arama",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "Kaynaktan alanları ara"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13216,23 +13220,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "Bir regex deseni kullanarak sorgu sonuçlarının bölümlerini kaldırın."
       },
       "label-from-variable": "Değişken üzerinden",
       "label-identifier": "Tanımlayıcı",
       "label-use-variable": "Değişken kullan",
       "label-variable": "Değişken",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "Alanları ada göre filtrele"
       },
       "placeholder-regular-expression-pattern": "Düzenli ifade deseni"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "Kaynak sorgusuna göre verilerden satırları kaldırın"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "Veriyi sorguya göre filtrele"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13246,33 +13250,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "Koşul ekle",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "Kullanıcı tanımlı filtreleri kullanarak sorgu sonuçlarından satırları kaldırın."
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "Tümünü eşleştir",
+          "match-any": "Herhangi birini eşleştir"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "Hariç",
+          "include": "Dâhil et"
         }
       },
       "label-conditions": "Koşullar",
       "label-filter-type": "Filtre türü",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "Verileri değerlere göre filtrele"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "Hiçbir metin alanı bulunamadı"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "Metin alanını seçin"
         }
       },
       "label-field": "Alan",
@@ -13281,10 +13285,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "Dize alanları biçimlendirmesini değiştirin."
       },
       "name": {
-        "format-string": ""
+        "format-string": "Biçim dizesi"
       }
     },
     "format-time-transfomer-editor": {
@@ -13296,66 +13300,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "Bir zaman alanının çıktı biçimini ayarlayın"
       },
       "name": {
-        "format-time": ""
+        "format-time": "Zamanı biçimlendir"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "Yeni bir alan hesaplamak için satır değerlerini kullanın."
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "Hesaplamadan alan ekle"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "Birim, min, maks ve daha fazlasını ayarlayın."
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "Sorgu sonuçlarından yapılandırma"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "Kaynak verilerden ısı haritası verileri oluşturun."
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "Isı haritası oluştur"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "Etiketli sonuçları, etiketlerle birleştirilmiş bir tabloda düzleştirin."
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "Etiketlere göre birleştir"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "Tek çerçeveli bir veri kümesini birden fazla seriye ayırın."
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "Değerlere göre bölme"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "Her satırı dinamik yapılandırmaya sahip bir alana dönüştürün."
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "Alan satırları"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "Sorgu sonuçlarına uzamsal işlemler uygulayın."
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "Mekansal işlemler"
       }
     },
     "get-timezone-options": {
@@ -13387,8 +13391,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "Hesapla",
+          "group-by": "Gruplandır"
         }
       },
       "placeholder-ignored": "Yok sayıldı",
@@ -13396,42 +13400,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "Verileri bir alan değerine göre gruplandırın ve toplu veriler oluşturun."
       },
       "name": {
-        "group-by": ""
+        "group-by": "Gruplandır"
       },
       "title-calc-alert": "Hiçbir alan gruplanmıyorsa hesaplamaların etkisi olmaz"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "Verileri bir alan değerine göre gruplandırın ve gruplanmış verilerle iç içe tablolar oluşturun."
       },
       "description-show-field-names": "Etkinleştirilirse iç içe tablolar alan adlarını tablo başlığı olarak gösterir",
       "label-show-field-names-in-nested-tables": "Alan adlarını iç içe tablolarda göster",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "İç içe tablolara grupla"
       },
       "title-calc-alert": "Hiçbir alan gruplanmıyorsa hesaplamalar etkili olmayacaktır."
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "Verileri üç alana göre özetleyin ve yeniden düzenleyin."
       },
       "label-cell-value": "Hücre değeri",
       "label-column": "Sütun",
       "label-empty-value": "Boş değer",
       "label-row": "Satır",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "Matrise gruplandırma"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "Giriş verilerinden bir histogram hesaplayın."
       },
       "name": {
-        "histogram": ""
+        "histogram": "Histogram"
       },
       "placeholder-auto": "Otomatik",
       "placeholder-default": "Varsayılan: 30",
@@ -13443,14 +13447,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "İlgili bir alana göre 2+ tablodaki satırları birleştirin."
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "Alana göre birleştir"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "Gerekli",
       "info": {
         "input-contain-labels": "Girdi herhangi bir etiket içermiyor",
         "no-input-or-labels-found": "Girdi (veya etiket) bulunamadı",
@@ -13474,8 +13478,8 @@
       "label-value-field-name": "Değer alanı adı",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "Sütunlar",
+          "rows": "Satırlar"
         }
       },
       "placeholder-optional-select-label": "(İsteğe bağlı) Etiket seçin",
@@ -13483,18 +13487,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "Serileri zamana göre gruplandırın ve etiketleri veya etiketleri alan olarak döndürün."
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "Alan etiketleri"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "Görüntülenen öğe sayısını sınırlayın."
       },
       "name": {
-        "limit": ""
+        "limit": "Sınırlama"
       },
       "placeholder-value-or-variable": "Değer veya değişken"
     },
@@ -13507,11 +13511,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Birden fazla seriyi birleştirin. Değerler tek bir satırda birleştirilecektir."
       },
       "merge-effect-applied-single-frame": "Tek bir çerçeveye uygulandığında birleştirmenin etkisi olmaz.",
       "name": {
-        "merge": ""
+        "merge": "Serileri/tabloları birleştir"
       }
     },
     "multi-info": {
@@ -13523,14 +13527,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "Alanları yeniden sıralayın, gizleyin veya yeniden adlandırın."
       },
-      "field-order": "",
+      "field-order": "Alan sıralaması",
       "field-order-auto": "Otomatik",
-      "field-order-manual": "",
+      "field-order-manual": "Manuel",
       "first-frame-warning": "Alanları düzenleme yalnızca tek bir çerçeveyle çalışır. Önce birleştirme dönüşümü uygulamayı veya girdiyi filtrelemeyi düşünün.",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "Alanları ada göre düzenleyin"
       }
     },
     "partion-by-values-editor": {
@@ -13558,10 +13562,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "Veri çerçevelerini geniş biçimden uzun biçime genişletin."
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "Zaman serilerini hazırlayın"
       }
     },
     "prepare-time-series-editor": {
@@ -13569,26 +13573,26 @@
       "label-info": "Bilgi",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "Her çerçeveyi uzun biçime dönüştürün"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "Uzun zaman serileri"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "Her zaman/sayı çifti için yeni bir çerçeve oluşturur"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "Çok çerçeveli zaman serisi"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "Zamana göre birleştirilmiş tek bir çerçeve oluşturur"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "Geniş zaman serileri"
         }
       }
     },
@@ -13603,7 +13607,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "Tüm satırları veya veri noktalarını tek bir değere indirin (ör. maksimum, ortalama)."
       },
       "label-calculations": "Hesaplamalar",
       "label-include-time": "Zamanı dahil et",
@@ -13620,7 +13624,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "Daralt"
       },
       "placeholder-choose-stat": "İstatistik seç"
     },
@@ -13630,18 +13634,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "İstatistiksel bir model tarafından tahmin edilen değerleri içeren yeni bir veri çerçevesi oluşturun."
       },
       "name": {
-        "trendline": ""
+        "trendline": "Trend çizgisi"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "Kübik",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "İkinci dereceden",
         "quartic": "Dördüncü dereceden",
-        "quintic": "Beşinci dereceden"
+        "quintic": "Beşinci dereceden",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "Seviye",
       "label-model-type": "Model tipi",
@@ -13654,18 +13663,19 @@
           "polynomial": "Polinom"
         }
       },
-      "regression": "",
+      "regression": "gerileme",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "Regresyon analizi"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "Tahmin edilecek X,Y noktalarının sayısı"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "Bir normal ifade ve değiştirme deseni kullanarak sorgu sonuçlarının bölümlerini yeniden adlandırın."
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "Alanları regex ile yeniden adlandır"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13679,33 +13689,33 @@
       "label-mode": "Mod",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "Her iki tabloda da ortak olan alanlarda eşleşen değerler olduğunda iki tablodaki verileri birleştirin.",
+          "join-on-a-field": "Yinelenen değerlere sahip bir alan değerine katılın. Performanssız dış birleştirme en iyi tablo (SQL benzeri) verileri için kullanılır.",
+          "keep-all-rows": "Herhangi bir tablodaki tüm satırları bir değerle saklayın. Farklı alan değerlerine katılın. Zaman serileri için en iyi performans ve kullanım."
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "İç",
+          "outer-tabular": "Dış (tablosal)",
+          "outer-time-series": "Dış (zaman serisi)"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "Birden fazla seriyi birleştirin. Zamanı, metriği ve değerleri satır olarak döndürün."
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "Seriden satırlara"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "Alanları bir çerçevede sıralayın."
       },
       "label-field": "Alan",
       "label-reverse": "Geri döndür",
       "name": {
-        "sort-by": ""
+        "sort-by": "Sıralama ölçütü"
       },
       "placeholder-select-field": "Gönderi seçim alanı"
     },
@@ -13728,13 +13738,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "Zaman serisi verilerini tablo satırlarına dönüştürün, böylece tablo veya mini grafik biçiminde görüntülenebilirler."
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "Zaman serilerinden tabloya dönüşümün çalışması için en az bir zaman serisi çerçevesi gerekir. Şu anda hiçbir zaman serisi çerçeveniz yok."
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "Zaman serilerinden tabloya"
       }
     },
     "time-series-table-transform-editor": {
@@ -13752,15 +13762,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "Veri çerçevesini aktarın."
       },
       "name": {
-        "transpose": ""
+        "transpose": "Sırasını değiştir"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "Pivot",
+        "transform": "Dönüştür",
+        "translate": "Çevir"
       }
     },
     "unary-operation-editor": {
@@ -13769,13 +13779,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "Yeni alanları hesapla",
+        "combine": "Birleştir",
+        "create-new-visualization": "Yeni görselleştirme oluştur",
+        "filter": "Filtrele",
+        "perform-spatial-operations": "Mekansal işlemler gerçekleştirin",
+        "reformat": "Yeniden biçimlendir",
+        "reorder-and-rename": "Yeniden sırala ve yeniden adlandır"
       },
       "special-value-options": {
         "description": {
@@ -13826,10 +13836,10 @@
     }
   },
   "trend": {
-    "category-x-axis": "",
-    "description-x-field": "",
-    "name-x-field": "",
-    "placeholder-x-field": ""
+    "category-x-axis": "X ekseni",
+    "description-x-field": "Artan bir sayısal değer",
+    "name-x-field": "X alanı",
+    "placeholder-x-field": "İlk sayısal değer"
   },
   "upgrade-box": {
     "discovery-text": "Bir Pro özelliği keşfettiniz!",
@@ -13846,7 +13856,7 @@
     "title": "Kuruluşlar"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "Kullanıcı bulunamadı",
     "select-aria-label": "Kullanıcı seçici",
     "select-placeholder": "Kullanıcı aramak için yazmaya başlayın"
   },
@@ -13932,8 +13942,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "\"{{variableToDelete}}\" değişkenini silmek istediğinizden emin misiniz?",
+      "confirmText-delete": "Sil",
       "title-delete-variable": "Değişkeni sil"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13983,33 +13993,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "Bu değişkenin değerlerini nasıl sıralayacağınız",
-      "name-sort": "",
+      "name-sort": "Sırala",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "Alfabetik (artan)",
+          "alphabetical-caseinsensitive-asc": "Alfabetik (büyük/küçük harfe duyarsız, artan)",
+          "alphabetical-caseinsensitive-desc": "Alfabetik (büyük/küçük harfe duyarsız, azalan)",
+          "alphabetical-desc": "Alfabetik (azalan)",
+          "disabled": "Devre dışı",
+          "natural-asc": "Doğal (artan)",
+          "natural-desc": "Doğal (azalan)",
+          "numerical-asc": "Sayısal (artan)",
+          "numerical-desc": "Sayısal (azalan)"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "Seçenek ekle",
+      "description": "Sorgu sonuçlarına ek olarak özel seçenekler ekleyin",
+      "label-placeholder": "etiketi göster",
+      "remove-option-button-label": "Seçenek kaldır",
+      "value-placeholder": "değer, varsayılan boş dize"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "Statik seçenekleri sorgu sonuçlarıyla sıralama"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "Varsayılan değer",
       "placeholder-default-value-if-any": "Varsayılan değer (varsa)",
       "text-options": "Metin seçenekleri"
     },
@@ -14038,8 +14048,8 @@
       "description-optional-display-name": "İsteğe bağlı görünen ad",
       "description-template-variable-characters": "Şablon değişkeninin adı. (Maks. 50 karakter)",
       "general": "Genel",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "Etiket",
+      "name-name": "Ad",
       "placeholder-descriptive-text": "Açıklayıcı metin",
       "placeholder-label-name": "Etiket adı",
       "placeholder-variable-name": "Değişken adı",
@@ -14055,13 +14065,13 @@
       "tooltip-remove-variable": "Değişkeni kaldır"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "Açıklama"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "Tüm değerleri aç/kapat"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "Değişken tipi seçin"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "Kullanımları göster"
@@ -14092,20 +14102,20 @@
     }
   },
   "xychart": {
-    "category-xychart": "",
-    "name-fill-opacity": "",
-    "name-line-style": "",
-    "name-line-width": "",
-    "name-max-point-size": "",
-    "name-min-point-size": "",
-    "name-point-shape": "",
-    "name-point-size": "",
-    "name-point-stroke-width": "",
-    "name-series-mapping": "",
-    "name-show": "",
+    "category-xychart": "XY Grafiği",
+    "name-fill-opacity": "Dolgu opaklığı",
+    "name-line-style": "Çizgi stili",
+    "name-line-width": "Çizgi genişliği",
+    "name-max-point-size": "Maks. nokta boyutu",
+    "name-min-point-size": "Min. nokta boyutu",
+    "name-point-shape": "Nokta şekli",
+    "name-point-size": "Nokta boyutu",
+    "name-point-stroke-width": "Nokta çizgi kalınlığı",
+    "name-series-mapping": "Seri eşleme",
+    "name-show": "Göster",
     "point-shape-options": {
-      "label-circle": "",
-      "label-square": ""
+      "label-circle": "Daire",
+      "label-square": "Kare"
     },
     "series-editor": {
       "add-series": "Seri ekle",
@@ -14117,18 +14127,18 @@
       "label-y-field": "Y alanı",
       "placeholder-all-frames": "Tüm çerçeveler",
       "placeholder-select-frame": "Çerçeve seçin",
-      "placeholder-x-field": "",
-      "placeholder-y-field": "",
+      "placeholder-x-field": "Her çerçevedeki ilk sayı veya zaman alanı",
+      "placeholder-y-field": "Her çerçevedeki kalan sayı alanları",
       "tooltip-delete-series": "Seriyi sil"
     },
     "series-mapping-options": {
-      "label-auto": "",
-      "label-manual": ""
+      "label-auto": "Otomatik",
+      "label-manual": "Manuel"
     },
     "show-options": {
-      "label-both": "",
-      "label-lines": "",
-      "label-points": ""
+      "label-both": "Her ikisi de",
+      "label-lines": "Çizgiler",
+      "label-points": "Noktalar"
     }
   }
 }
\ No newline at end of file
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 9b47775d336..cef3bc0acf0 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "有些功能可以稳定运行（GA 正式版）并默认启用，而有些功能目前处于初步的 Beta 测试阶段，可供用户提前试用。",
       "confirm-modal-body-2": "我们建议在修改之前了解每个功能更改所带来的影响。",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "保存更改",
       "get-stage-cell": {
         "beta": "Beta 测试版",
         "content-general-availability": "正式发布",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "删除组织",
-      "confirmText-delete": "",
+      "confirmText-delete": "删除",
       "title-delete": "删除"
     },
     "anon-users": {
       "not-found": "未找到匿名用户。"
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "您确定要强制从所有设备退出登录吗？",
+      "confirmText-confirm-logout": "确认退出登录",
+      "confirmText-force-logout": "强制退出登录",
       "title-force-logout-from-all-devices": "强制从所有设备退出登录"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "保存"
     },
     "edit-org": {
       "access-denied": "您没有权限查看此组织中的用户。要更新此组织，请与服务器管理员联系。",
@@ -216,11 +216,11 @@
       "not-editable": "此用户的角色不可编辑，因为它是从您的身份验证提供商同步而来的。有关详细信息，请参阅 <1>Grafana 身份验证文档</1>。"
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "您确定要删除用户{{user}}吗？",
       "columns": {
         "aria-label-role": "角色"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "删除",
       "delete-aria-label": "删除用户：{{name}}",
       "title-delete": "删除"
     },
@@ -252,7 +252,7 @@
       "info-description": "这些系统设置在 grafana.ini 或 custom.ini 中定义（或在 ENV 变量中覆盖）。要更改这些设置，您当前需要重新启动 Grafana。"
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "确认删除"
     },
     "upgrade-info": {
       "title": "企业许可"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "更改",
-      "confirmText-change": "",
+      "confirmText-change": "更改",
       "grafana-admin-key": "Grafana 管理员",
       "grafana-admin-no": "否",
       "grafana-admin-yes": "是",
       "title": "权限"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "您确认要删除此用户吗？",
+      "body-disable": "您确定要禁用此用户吗？",
+      "confirmText-delete-user": "删除用户",
+      "confirmText-disable-user": "禁用用户",
       "delete-button": "删除用户",
       "disable-button": "禁用用户",
       "edit-button": "编辑",
@@ -331,7 +331,7 @@
       "title-disable-user": "禁用用户"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "保存"
     },
     "user-sessions": {
       "browser-column": "浏览器和操作系统",
@@ -382,12 +382,12 @@
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "AI 警报规则按钮加载失败",
+        "feedback-button": "AI 反馈按钮加载失败",
+        "improve-annotations-button": "AI 改进注释按钮加载失败",
+        "improve-labels-button": "AI 改进标签按钮加载失败",
+        "template-button": "AI 模板按钮加载失败",
+        "triage-button": "AI 分类按钮加载失败"
       }
     },
     "alert": {
@@ -489,7 +489,7 @@
       "title-muting-grouping-and-timings": "静音、分组和时间设定"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "未找到数据源"
     },
     "alert-menu": {
       "copy-link": "复制链接",
@@ -515,7 +515,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "警报规则"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -583,7 +583,7 @@
       "view-configuration": "视图配置"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "是，重置配置",
       "gma-manual-configuration-description": "无法手动更改内部 Grafana Alertmanager 配置。要更改此配置，请通过用户界面编辑单个资源。",
       "gma-manual-configuration-is-not-supported": "不支持手动进行配置更改",
       "message": {
@@ -598,13 +598,13 @@
       "title-resetting-alertmanager-configuration": "重置 Alertmanager 配置"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "您确定要将配置还原到此版本吗？所有未保存的更改都将丢失。",
       "columns": {
         "compare": "比较",
         "restore": "还原",
         "text-latest": "最近"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "是，还原配置",
       "loading": "加载中...",
       "no-previous-configurations": "没有以前的配置",
       "this-might-take-a-while": "这可能需要一点时间...",
@@ -884,10 +884,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "联络点“{{contactPointName}}“的更多操作",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "删除",
       "button-edit": "编辑",
       "button-view": "查看",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "导出",
       "export-label-export": "导出",
       "label-delete": "删除",
       "label-manage-permissions": "管理权限",
@@ -1420,7 +1420,7 @@
       "label-disable-resolved-message": "禁用已解除消息"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "正在加载组…",
       "message": {
         "must-be-a-positive-integer": "必须是正整数。",
         "must-enter-a-group-name": "输入一个组名称"
@@ -1517,7 +1517,7 @@
       "group-loading-error": "加载组时出错",
       "interval": "间隔",
       "namespace": "命名空间",
-      "new": "",
+      "new": "新",
       "title": {
         "back": ""
       }
@@ -1549,7 +1549,7 @@
     },
     "group-loader": {
       "group-load-failed": "从 {{ namespaceName }} 的组 {{ groupName }} 中加载规则失败",
-      "no-rules": ""
+      "no-rules": "在此组中未找到规则"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "正在删除组"
@@ -1878,10 +1878,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "未找到数据源"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "您确定要删除“{{muteTiming}}”吗？"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "已禁用",
@@ -2132,10 +2132,10 @@
         "conflict": "通知策略树已由其他用户更新。",
         "error-code": "错误消息：“{{error}}”",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "无法添加或更新路由：如果我们合并匹配器 {{-matchers}}，匹配器将与外部路由树冲突。这将导致路由无法访问。"
         },
         "suffix": "请刷新页面并重试。",
-        "title": ""
+        "title": "添加或更新通知策略失败"
       },
       "n-more-policies_other": "其他 {{count}} 个策略"
     },
@@ -2190,7 +2190,7 @@
     "query-and-expressions-step": {
       "add-query": "添加查询",
       "body-queries-expressions-configured": "至少创建一个查询或表达式以发出警报",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "停用",
       "expressions": "表达式",
       "loading-data-sources": "正在加载数据源...",
       "manipulate-returned-queries-other-operations": "使用数学和其他操作处理查询返回的数据。",
@@ -2244,7 +2244,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "录制规则"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "由于以下原因，无法加载查询编辑器：{{errorMessage}}"
@@ -2264,7 +2264,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "您需要为复制的规则设置一个新的评估组，因为原始规则已预配，无法用于在用户界面中创建的规则。",
       "body-not-provisioned": "新规则将<1>不会</1>被标记为预配规则。",
-      "confirmText-copy": "",
+      "confirmText-copy": "复制",
       "title-copy-provisioned-alert-rule": "复制已预置的警报规则"
     },
     "redirect-to-rule-viewer": {
@@ -2487,7 +2487,7 @@
       "new-alert-rule": "新建警报规则",
       "new-datasource-recording-rule": "新的数据源录制规则",
       "new-grafana-recording-rule": "新的 Grafana 录制规则",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "用于导出的新警报规则",
       "pagination": {
         "next-page": "显示更多..."
       },
@@ -2658,7 +2658,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "警报管理器"
       }
     },
     "settings-content": {
@@ -2796,7 +2796,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "刷新预览",
-      "empty-state": "",
+      "empty-state": "添加模板内容以查看预览",
       "label-preview": "预览",
       "refresh": "刷新"
     },
@@ -2815,7 +2815,7 @@
       "loading": "加载中...",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "选择通知模板"
         },
         "label": {
           "select-notification-template": "选择通知模板"
@@ -2843,8 +2843,8 @@
     },
     "templates-table": {
       "actions": "操作",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "您确定要删除模板组“{{template}}”吗？",
+      "confirmText-yes-delete": "是，删除",
       "no-templates-defined": "未定义模板。",
       "template-group": "模板组",
       "title-delete-template-group": "删除模板组"
@@ -2899,7 +2899,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "管理警报规则、记录规则和评估间隔"
       }
     },
     "to-gma": {
@@ -2979,7 +2979,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "是，删除"
       }
     },
     "use-delete-policy-modal": {
@@ -3139,7 +3139,7 @@
       "annotation": "注释",
       "first-value": "第一个值",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "未知字段名称"
     },
     "empty-state": {
       "button-title": "添加注释查询",
@@ -3149,12 +3149,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "若此字段已被定义，注释将被视为范围",
+        "results-split-on-comma": "结果将以逗号 (,) 分隔"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}，或第一个文本字段",
+        "time-or-the-first-field": "{{defaultField}}，或第一个时间字段"
       }
     },
     "standard-annotation-query-editor": {
@@ -3232,9 +3232,9 @@
       "define-allowed-teams-ids-label": "定义允许的团队 ID",
       "display-name-description": "将在登录页面上显示为“使用... 登录”。如果您使用多个身份提供程序或 SSO 协议，这将很有帮助。",
       "display-name-label": "显示名称",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "用于指示 Azure AD/Entra ID 租户中用户领域并简化登录流程的参数。",
+      "domain-hint-label": "域提示",
+      "domain-hint-valid-domain": "此字段必须是有效的域。",
       "email-attribute-name-description": "用于在 OAuth2 ID 令牌的属性映射中查找用户电子邮箱的密钥的名称。",
       "email-attribute-name-label": "电子邮箱属性名称",
       "email-attribute-path-description": "用于从用户信息中查找用户电子邮箱的 JMESPath 表达式。",
@@ -3251,11 +3251,11 @@
       "id-token-attribute-name-label": "ID 令牌属性名称",
       "login-attribute-path-description": "用于从用户 ID 令牌中查找用户登录的 JMESPath 表达式。",
       "login-attribute-path-label": "登录属性路径",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "同意",
+      "login-prompt-description": "指示用户使用 IdP 登录时的用户交互类型。",
+      "login-prompt-label": "登录提示",
+      "login-prompt-login": "登录",
+      "login-prompt-select-account": "选择账户",
       "managed-identity-client-id-description": "OAuth2 应用的联合身份凭证的托管身份客户端 ID。",
       "managed-identity-client-id-label": "FIC 托管身份客户端 ID",
       "name-attribute-path-description": "用于从用户 ID 令牌中查找用户名的 JMESPath 表达式。此名称将用作用户的显示名称。",
@@ -3291,7 +3291,7 @@
       "team-ids-github": "团队 ID 的整数列表。",
       "team-ids-label": "团队 ID",
       "team-ids-numbers": "团队 ID 必须是数字。",
-      "team-ids-other": "",
+      "team-ids-other": "团队 ID 的字符串列表。",
       "team-ids-placeholder": "输入团队 ID 并按 Enter 键添加",
       "teams-url-description": "用于查询团队 ID 的网址。如果未设置，则默认值为 /teams。",
       "teams-url-description-oauth": "如果配置了“{{ teamsURLLabel }}”，则还必须配置“{{ teamIDsAttributePathLabel }}”。",
@@ -3335,7 +3335,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "重置为默认值"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "重置",
       "disable": "禁用",
       "disabling": "正在禁用…",
       "discard": "丢弃",
@@ -3355,7 +3355,7 @@
       "text-badge-not-enabled": "未启用"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM 目前正在开发中，不建议用于生产。请谨慎使用并注意可能出现的变化。"
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "IdP 的 .well-known/openid-configuration 端点",
@@ -3473,8 +3473,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "批量删除已预置的资源",
+      "bulk-move-provisioned-resources": "批量移动已预置的资源",
       "cancel-button": "取消",
       "confirmation-text": "删除",
       "delete-button": "删除",
@@ -3493,8 +3493,8 @@
       "move-modal-title": "移动",
       "moving": "正在移动...",
       "new-folder-name-required-phrase": "文件夹名称是必需项。",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "您已选择了已预置和未预置的资源。这些资源无法一起处理。请仅选择已预置的资源或未预置的资源，然后重试。",
+      "selected-mix-resources-modal-title": "已选择混合资源类型"
     },
     "actions": {
       "button-to-recently-deleted": "最近删除"
@@ -3507,24 +3507,24 @@
       "this-folder-is-empty": "此文件夹为空"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_other": ""
+      "all-deleted": "所有资源已成功删除",
+      "all-moved": "所有资源已成功移动",
+      "button-done": "完成",
+      "progress-title": "成功",
+      "failed-alert_other": "{{count}} 个项目失败"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "取消",
+      "button-delete": "删除",
+      "button-deleting": "正在删除…",
+      "delete-warning": "此操作将删除所选文件夹及其子文件夹。总体而言，这将影响：",
+      "error-path-not-found": "未找到路径"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "取消",
+      "button-move": "移动",
+      "button-moving": "正在移动…",
+      "deleting": "正在删除",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3532,14 +3532,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "未找到文件内容",
+      "error-path-not-found": "未找到路径",
+      "error-target-folder-path-missing": "缺少目标文件夹路径",
+      "error-title": "目标文件夹错误",
+      "move-warning": "此操作将移动所选文件夹及其子文件夹。总体而言，这将影响：",
+      "moving": "正在移动",
+      "progress": "进度：{{current}}/{{total}}",
+      "target-folder": "目标文件夹"
     },
     "counts": {
       "alertRule_other": "{{count}} 条警告规则",
@@ -3565,7 +3565,7 @@
       "button-delete": "删除",
       "button-deleting": "正在删除...",
       "delete-warning": "这将删除此文件夹及其所有子文件夹。总体而言，这将影响：",
-      "success-message": ""
+      "success-message": "文件夹已成功删除"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "无法检索后代信息"
@@ -3590,7 +3590,7 @@
       "empty-message": "未找到文件夹",
       "error-title": "加载文件夹时出错",
       "non-folder-item": "非文件夹 {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "数据面板",
       "search-placeholder": "搜索文件夹",
       "unknown-error": "未知错误"
     },
@@ -3619,7 +3619,7 @@
       "folder-name-input-placeholder-enter-folder-name": "输入文件夹名称",
       "label-folder-name": "文件夹名称",
       "text-pull-request-created": "已创建拉取请求，对此文件夹进行更改：",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "您的文件夹将创建为 {{folderName}}",
       "title-pull-request-created": "拉取请求已创建",
       "title-this-repository-is-read-only": "此存储库为只读"
     },
@@ -3738,7 +3738,7 @@
     "category-selected-connection": "所选连接",
     "category-selected-element": "所选元素 ({{element}})",
     "category-size": "大小",
-    "category-tooltip": "",
+    "category-tooltip": "工具提示",
     "cloud-item": {
       "category-cloud": "Cloud",
       "label": {
@@ -3982,10 +3982,10 @@
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "工具提示模式",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "已禁用",
+        "label-enabled": "已启用"
       }
     },
     "tree-navigation-editor": {
@@ -4354,7 +4354,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "运行查询"
     }
   },
   "dashboard": {
@@ -4517,7 +4517,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "继续"
         },
         "title": {
           "proceed-to-external-site": "继续前往外部网站？"
@@ -4623,11 +4623,11 @@
     },
     "edit-actions": {
       "add": "添加{{typeName}}",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
+      "add-conditional-rule": "添加 {{ruleDescription}} 规则",
+      "duplicate-panel": "复制面板",
+      "edit-query-result-rule": "更改查询结果规则",
+      "edit-template-variable-rule": "更改模板变量规则",
+      "edit-time-range-rule": "更改时间范围规则",
       "move": "移动{{typeName}}",
       "panel-background": "更改面板背景",
       "panel-description": "更改面板描述",
@@ -4642,7 +4642,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "仪表板",
-        "element": "",
+        "element": "元素",
         "local-variable": "局部变量",
         "multiple-elements": "多个元素",
         "multiple-elements-delete-text": "您确定要删除这些元素吗？",
@@ -4724,10 +4724,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "导出数据面板"
       },
       "menu": {
-        "label": ""
+        "label": "导出数据面板菜单"
       }
     },
     "fetch-dashboard": {
@@ -4749,9 +4749,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "默认",
+          "shared-crosshair": "共享十字线",
+          "shared-tooltip": "共享工具提示"
         }
       }
     },
@@ -4804,14 +4804,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "不要将注释数据发送到以下面板",
+        "annotation-panels-support-annotations": "将注释数据发送到支持注释的所有面板",
+        "annotations-explicitly-listed-panels": "将注释发送到明确列出的面板"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "所有面板",
+        "all-panels-except": "所有面板，以下除外",
+        "selected-panels": "所选面板"
       }
     },
     "get-panel-frame-category": {
@@ -5072,7 +5072,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "您确定要将数据面板还原到版本吗 {{version}}？所有未保存的更改都将丢失。",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "是，恢复到版本 {{version}}",
       "title-restore-version": "恢复版本"
     },
     "row-options-button": {
@@ -5124,7 +5124,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "数据面板已保存"
     },
     "save-dashboard-as-button": {
       "save-as": "另存为"
@@ -5160,7 +5160,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "所选文件夹中已存在具有相同名称的数据面板。<1></1><2>您仍然要保存此数据面板吗？。",
       "body-version-mismatch": "其他人已更新此数据面板<1></1><2>您仍然要保存此数据面板吗？。",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "保存并覆盖",
       "title-name-exists": "冲突",
       "title-version-mismatch": "冲突"
     },
@@ -5357,9 +5357,9 @@
       "label-apply-transformation-to": "将转换应用于"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "请注意，移除一个转换可能会破坏其他转换。如果只有一个转换，您将返回主选择屏幕。",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "删除",
         "title-debug": "调试",
         "title-disable-transformation": "禁用转换",
         "title-filter": "筛选条件",
@@ -5380,16 +5380,16 @@
       "placeholder-search-for-transformation": "搜索转换",
       "show-images": "显示图像",
       "title-add-another-transformation": "添加其他转换",
-      "view-all": ""
+      "view-all": "查看全部"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "删除所有转换后，您将返回主选择屏幕。"
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "添加其他转换"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "删除全部",
       "delete-all-transformations": "删除所有转换",
       "title-delete-all-transformations": "删除所有转换？",
       "tooltip-clear-search": "清除搜索",
@@ -5419,16 +5419,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "更改变量描述"
       },
       "hide": {
-        "action": ""
+        "action": "更改变量隐藏选项"
       },
       "label": {
-        "action": ""
+        "action": "更改变量标签"
       },
       "name": {
-        "action": ""
+        "action": "更改变量名称"
       }
     },
     "version-history-comparison": {
@@ -5440,7 +5440,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "切换版本 {{version}} 的选择",
       "date": "日期",
-      "name-latest": "",
+      "name-latest": "最近",
       "notes": "备注",
       "restore": "还原",
       "updated-by": "更新人",
@@ -5518,7 +5518,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "以 CSV 格式提供维度：{{name}}, {{value}}",
       "label-data-source": "数据源",
       "label-use-static-key-dimensions": "使用静态键维度",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "允许自定义值"
     },
     "add-to-dashboard": {
       "message": {
@@ -5592,7 +5592,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "撤销公共 URL"
       },
       "title": {
         "revoke-public-url": "撤销公共网址"
@@ -5605,7 +5605,7 @@
     },
     "custom-variable-form": {
       "custom-options": "自定义选项",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "以逗号分隔的值",
       "selection-options": "选择内容选项"
     },
     "dashboard-edit-pane-renderer": {
@@ -5626,8 +5626,8 @@
       "label-with-tags": "带标记",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "数据面板",
+          "link": "关联"
         }
       },
       "placeholder-open-dashboard": "打开数据面板"
@@ -5670,8 +5670,8 @@
       "data-source-options": "数据源选项",
       "description-instance-name-filter": "正则表达式筛选器，用于在变量值列表中选择数据源实例。保留所有为空。",
       "example-instance-name-filter": "示例：<codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "实例名称筛选条件",
+      "name-type": "类型",
       "selection-options": "选择内容选项"
     },
     "default-grid-layout-manager": {
@@ -5687,7 +5687,7 @@
       "delete-action": "删除数据面板",
       "deleting": "正在删除...",
       "drawer-title": "删除已预置的数据面板",
-      "success-message": ""
+      "success-message": "数据面板已成功删除"
     },
     "description-label": {
       "description": "描述"
@@ -5716,15 +5716,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "可编辑",
+          "readonly": "只读"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "默认",
+          "shared-crosshair": "共享十字线",
+          "shared-tooltip": "共享工具提示"
         }
       }
     },
@@ -5736,36 +5736,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "即时添加键/值筛选条件",
+        "dynamically-switch-source-multiple-panels": "动态切换多个面板的数据源",
+        "group": "即时添加按键分组",
+        "hidden-constant-variable": "隐藏的常量变量，对于您要共享的数据面板中的指标前缀很有用",
+        "users-enter-arbitrary-strings-textbox": "用户可以在文本框中输入任意字符串",
+        "values-are-static-and-defined-manually": "值为静态，由手动定义",
+        "values-fetched-source-query": "值从数据源查询中获取",
+        "values-timespans": "值是时间跨度，例如 1 分钟、1 小时、1 天"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "临时筛选条件",
+        "constant": "固定",
+        "custom": "自定义",
+        "data-source": "数据源",
+        "group-by": "分组方式",
+        "interval": "间隔",
+        "query": "查询",
+        "textbox": "文本框"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "不要将注释数据发送到以下面板",
+        "annotation-panels-support-annotations": "将注释数据发送到支持注释的所有面板",
+        "annotations-explicitly-listed-panels": "将注释发送到明确列出的面板"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "所有面板",
+        "all-panels-except": "所有面板，以下除外",
+        "selected-panels": "所选面板"
       }
     },
     "get-panel-frame-options": {
@@ -5793,7 +5793,7 @@
       "group-by-options": "分组选项",
       "label-data-source": "数据源",
       "label-use-static-group-by-dimensions": "使用静态组维度",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "允许自定义值"
     },
     "help-wizard": {
       "copy-to-clipboard": "复制到剪贴板",
@@ -5829,14 +5829,14 @@
       "apply": "应用"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "通过将时间范围除以指定的计数来动态计算间隔",
       "description-calculated-value-below-threshold": "计算值不会低于此阈值",
       "description-step-count": "计算值时，应将当前时间范围除以多少倍",
       "interval-options": "间隔选项",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "自动选项",
+      "name-min-interval": "最小间隔",
+      "name-step-count": "步数",
+      "name-values": "值"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5856,19 +5856,19 @@
       "usage-count_other": "用于 {{count}} 个数据面板"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "移动数据面板时出错",
+      "api-error": "移动数据面板失败",
+      "cancel-action": "取消",
+      "current-file-not-found": "找不到当前数据面板文件",
+      "drawer-title": "移动已预置的数据面板",
+      "file-load-error": "加载数据面板时出错",
+      "loading-file-data": "正在加载数据面板",
+      "move-action": "移动数据面板",
+      "move-read-only-message": "此数据面板无法直接从 Grafana 移动，因为存储库为只读。要移动此数据面板，请移动 Git 存储库中的文件。",
+      "moving": "正在移动…",
+      "success-message": "数据面板已成功移动",
+      "target-path-label": "目标路径",
+      "title-this-repository-is-read-only": "此存储库为只读"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "所选文件夹中已存在具有相同名称的数据面板。您仍然要保存此数据面板吗？",
@@ -5876,7 +5876,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "继续"
       },
       "title": {
         "proceed-to-external-site": "继续前往外部网站？"
@@ -5913,8 +5913,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "添加其他转换",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "删除所有转换后，您将返回主选择屏幕。",
+      "confirmText-delete-all": "删除全部",
       "delete-all-transformations": "删除所有转换",
       "title-delete-all-transformations": "删除所有转换？"
     },
@@ -5967,13 +5967,13 @@
       "description-examples": "命名捕获组可用于分隔显示文本和值（<1>参见示例</1>）。",
       "description-optional": "可选，如果您想要提取序列名称或指标节点段的一部分。",
       "label-data-source": "数据源",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "静态选项排序",
       "label-target-data-source": "目标数据源",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "使用静态选项",
+      "name-regex": "正则表达式",
       "query-options": "查询选项",
       "selection-options": "选择内容选项",
-      "static-options-legend": ""
+      "static-options-legend": "静态选项"
     },
     "resource-export": {
       "label": {
@@ -5986,7 +5986,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "您确定要将数据面板还原到版本吗 {{version}}？所有未保存的更改都将丢失。",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "是，恢复到版本 {{version}}",
       "title-restore-version": "恢复版本"
     },
     "save-button": {
@@ -6005,7 +6005,7 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "保存数据面板失败"
       },
-      "required": ""
+      "required": "必填"
     },
     "save-dashboard-drawer": {
       "tabs": {
@@ -6032,8 +6032,8 @@
         "title-someone-else-has-updated-this-dashboard": "其他人已更新此数据面板",
         "would-still-dashboard": "您仍然要保存此数据面板吗？"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "由于新数据面板架构 (V2) 的限制，在外部导出过程中，库面板将转换为包含嵌入内容的常规面板。",
+      "schema-v2-library-panels-export-title": "库面板将转换为常规面板",
       "title-dashboard-drastically-changed": "数据面板已不可逆地更改"
     },
     "save-dashboard-form-common-options": {
@@ -6079,10 +6079,10 @@
       "description-enables-multiple-values-selected": "允许同时选择多个值",
       "description-enables-option-include-variables": "启用选项以包含所有值",
       "description-enables-users-custom-values": "允许用户向列表中添加自定义值",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "允许自定义值",
+      "name-custom-all-value": "自定义所有值",
+      "name-include-all-option": "包含“全部”选项",
+      "name-multi-value": "多值"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "切换共享菜单"
@@ -6103,7 +6103,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "默认值"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "（可选）",
@@ -6128,8 +6128,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "如果取消关联此面板，您将能够在不影响任何其他数据面板的情况下对其进行编辑。但是，一旦更改，您将无法恢复到其原始的可重用面板。",
+      "confirmText-yes-unlink": "是，取消关联",
       "title-really-unlink-panel": "您确定要取消关联此面板吗？"
     },
     "unsaved-changes-modal": {
@@ -6147,7 +6147,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "数据面板已保存"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "此变量未被任何变量或数据面板引用。",
@@ -6159,15 +6159,15 @@
       "aria-label-variable-editor-form": "变量编辑器表单",
       "back-to-list": "回到列表",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "删除变量"
       },
       "delete": "删除",
       "description-optional-display-name": "可选显示名称",
       "description-template-variable-characters": "模板变量的名称。（最多 50 个字符）",
       "general": "概况",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "描述",
+      "name-label": "标签",
+      "name-name": "名称",
       "placeholder-descriptive-text": "描述性文本",
       "placeholder-label-name": "标签名称",
       "placeholder-variable-name": "变量名称",
@@ -6182,8 +6182,8 @@
       "variable": "变量"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "您确定要删除{{variable}}吗？",
+      "confirmText-delete-variable": "删除变量",
       "title-delete-variable": "删除变量",
       "tooltip-duplicate-variable": "复制变量",
       "tooltip-remove-variable": "移除变量"
@@ -6191,15 +6191,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "标签",
+          "nothing": "无",
+          "variable": "变量"
         }
       },
       "label": "隐藏"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "变量类型"
     },
     "variable-usages-button": {
       "title-show-usages": "显示使用情况：{{variableId}}",
@@ -6227,7 +6227,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "切换版本 {{version}} 的选择",
       "date": "日期",
-      "name-latest": "",
+      "name-latest": "最近",
       "notes": "备注",
       "restore": "还原",
       "updated-by": "更新人",
@@ -6618,7 +6618,7 @@
     },
     "color-dimension-editor": {
       "label-fixed-color": "固定颜色",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "未找到字段"
     },
     "file-dropzone-custom-children": {
       "upload": "上传"
@@ -6657,7 +6657,7 @@
       },
       "label-limit": "限制",
       "label-value": "值",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "未找到字段",
       "scalar-options": {
         "description-clamped": "使用字段值，并限制在最大值与最小值之间",
         "description-mod": "使用字段值，并从最大值取模",
@@ -6668,13 +6668,13 @@
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "固定值"
         }
       },
       "label-max": "最高",
       "label-min": "最小",
       "label-value": "值",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "未找到字段"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
@@ -6784,6 +6784,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "事件",
@@ -7056,7 +7057,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "正在加载…"
     },
     "prev": "上一步",
     "queryless-apps-extensions": {
@@ -7243,7 +7244,7 @@
           "start-time": "开始时间："
         }
       },
-      "share-span": "",
+      "share-span": "共享",
       "warnings": "警告"
     },
     "span-filters": {
@@ -7253,8 +7254,8 @@
       "aria-label-select-service-name-operator": "选择服务名称运算符",
       "aria-label-select-span-name": "选择跨度名称",
       "aria-label-select-span-name-operator": "选择跨度名称运算符",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "选择最大跨度持续时间",
+      "ariaLabel-select-min-span-duration": "选择最小跨度持续时间",
       "label-collapse": "跨度筛选器",
       "label-duration": "持续时间",
       "label-service-name": "服务名称",
@@ -7326,23 +7327,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "时长",
+      "export-started": "导出已开始",
+      "give-feedback": "反馈",
+      "link-copied": "链接已复制到剪贴板",
+      "path": "路径",
+      "route": "路由",
+      "services": "服务",
+      "share": "共享",
+      "share-copy-link": "复制链接",
+      "share-export-json": "导出为 JSON",
+      "share-tooltip": "共享跟踪",
+      "start-time": "开始时间",
+      "target": "目标",
+      "title-share-thoughts-about-tracing-grafana": "分享您对 Grafana 跟踪功能的看法。",
+      "tooltip-url": "{{route}} 或 {{url}} 或 {{target}} 或 {{path}}",
+      "trace-id": "跟踪 ID",
+      "url": "URL"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "清除筛选按钮",
@@ -7442,7 +7443,7 @@
       "when": "满足以下条件时"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "对从数据源返回的表运行 MySQL 方言 SQL。数据源查询（即“A”、“B”）可作为表提供，并由查询名称引用。字段可作为从数据源返回的列使用。",
       "label-operation": "运算"
     },
     "math": {
@@ -7473,7 +7474,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "清除文件夹",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "未找到文件夹",
     "select-aria-label": "文件夹筛选",
     "select-placeholder": "按文件夹筛选"
   },
@@ -7547,51 +7548,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "未找到地名录",
+      "warning-no-geometry": "无法找到几何图形",
+      "warning-select-geohash": "选择地理哈希字段",
+      "warning-select-lat-long": "选择纬度/经度字段",
+      "warning-select-lookup": "选择查找字段",
+      "warning-unable-to-find": "无法找到位置字段"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "未找到字符串字段"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "未找到数字字段"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "未找到数字字段"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "未找到字符串字段"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "地名录",
+      "name-geohash-field": "地理哈希字段",
+      "name-latitude-field": "纬度字段",
+      "name-location-mode": "位置模式",
+      "name-longitude-field": "经度字段",
+      "name-lookup-field": "查找字段"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "根据默认字段名称自动识别位置数据",
+        "description-coords": "指定纬度和经度字段",
+        "description-geohash": "指定地理哈希字段",
+        "description-lookup": "指定地名录和查找字段",
+        "label-auto": "自动",
+        "label-coords": "坐标",
+        "label-geohash": "地理哈希",
+        "label-lookup": "查找"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "底图图层",
+    "category-map-controls": "地图控件",
+    "category-map-layers": "地图图层",
+    "category-map-view": "地图视图",
     "coordinates-map-view-editor": {
       "label-latitude": "纬度",
       "label-longitude": "经度"
@@ -7600,15 +7601,15 @@
       "center": "居中：",
       "zoom": "缩放："
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "此位置将在面板首次加载时显示。",
+    "description-mouse-wheel-zoom": "启用鼠标滚轮缩放控制",
+    "description-no-repeat": "防止地图水平重复",
+    "description-share-view": "在多个面板上使用相同的视图。注意：这可能需要重新加载数据面板。",
+    "description-show-attribution": "在右下角显示地图来源归属信息",
+    "description-show-debug": "显示地图信息",
+    "description-show-measure": "在地图上显示用于测量的工具",
+    "description-show-scale": "标注地图比例",
+    "description-show-zoom": "在左上角显示缩放控制按钮",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "图层"
@@ -7632,12 +7633,12 @@
       "aria-label-add-geomap-style-rule": "添加地理图样式规则"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "底图图层",
+      "description-display-tooltip": "显示图层的工具提示",
+      "name-data": "数据",
+      "name-display-tooltip": "显示工具提示",
+      "name-layer-type": "图层类型",
+      "name-opacity": "不透明度"
     },
     "layers-editor": {
       "label-add-layer": "添加图层",
@@ -7650,9 +7651,9 @@
       "use-current-map-settings": "使用当前地图设置"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "显示地图图例",
+      "name-show-legend": "显示图例",
+      "name-styles": "样式"
     },
     "markers-legend": {
       "title-symbol": "符号"
@@ -7661,27 +7662,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "显示测量工具"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "初始视图",
+    "name-mouse-wheel-zoom": "鼠标滚轮缩放",
+    "name-no-repeat": "无地图重复",
+    "name-share-view": "共享视图",
+    "name-show-attribution": "显示属性",
+    "name-show-debug": "显示调试",
+    "name-show-measure": "显示测量工具",
+    "name-show-scale": "显示比例",
+    "name-show-zoom": "显示缩放控制",
+    "name-tooltip": "工具提示",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "未找到字符串字段"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "基础地图图层由服务器管理员配置。"
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "中心",
+        "label-left": "左侧",
+        "label-right": "右侧"
       },
       "label-align": "对齐",
       "label-baseline": "基线",
@@ -7697,12 +7698,12 @@
       "label-text-label": "文本标签",
       "label-x-offset": "X 轴偏移量",
       "label-y-offset": "Y 轴偏移量",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "选择符号",
+      "placeholderText-select-symbol-or-add-text": "选择符号或添加文本标签",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "底部",
+        "label-center": "中心",
+        "label-top": "顶部"
       }
     },
     "style-rule-editor": {
@@ -7716,13 +7717,13 @@
       "placeholder-value": "值"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "悬停时显示弹出窗口",
+      "description-none": "点击时显示内容，而非悬停时显示",
+      "label-details": "详情",
+      "label-none": "无"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "图层{{name}}"
     }
   },
   "get-enterprise": {
@@ -7842,400 +7843,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "英尺/秒²",
+            "name-g-unit": "G 单位",
+            "name-meters-sec": "米/秒²"
           },
-          "name": ""
+          "name": "加速度"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "弧分",
+            "name-arc-seconds": "弧秒",
+            "name-degrees": "度（°）",
+            "name-gradian": "百分度",
+            "name-radians": "弧度"
           },
-          "name": ""
+          "name": "角度"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "英亩 (ac)",
+            "name-hectares": "公顷 (ha)",
+            "name-square-feet": "平方英尺 (ft²)",
+            "name-square-meters": "平方米 (m²)",
+            "name-square-miles": "平方英里 (mi²)"
           },
-          "name": ""
+          "name": "面积"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "开 / 关",
+            "name-true-false": "对 / 错",
+            "name-yes-no": "是 / 否"
           },
-          "name": ""
+          "name": "布尔"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "计算"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "克每立方米 (g/m³)",
+            "name-g-nm3": "克每标准立方米 (g/Nm³)",
+            "name-mg-dl": "毫克每分升 (mg/dL)",
+            "name-mg-m3": "毫克每立方米 (mg/m³)",
+            "name-mg-nm3": "毫克每标准立方米 (mg/Nm³)",
+            "name-mmol-l": "毫摩尔每升 (mmol/L)",
+            "name-ng-m3": "纳克每立方米 (ng/m³)",
+            "name-ng-nm3": "纳克每标准立方米 (ng/Nm³)",
+            "name-ppb": "十亿分之一 (ppb)",
+            "name-ppm": "百万分之一 (ppm)",
+            "name-ug-m3": "微克每立方米 (μg/m³)",
+            "name-ug-nm3": "微克每标准立方米 (μg/Nm³)"
           },
-          "name": ""
+          "name": "浓度"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "保加利亚列弗 (BGN)",
+            "name-brl": "雷亚尔 (R$)",
+            "name-btc": "比特币 (฿)",
+            "name-chf": "瑞士法郎 (CHF)",
+            "name-czk": "捷克克朗 (czk)",
+            "name-dkk": "丹麦克朗 (kr)",
+            "name-eur": "欧元 (€)",
+            "name-gbp": "英镑 (£)",
+            "name-idr": "印度尼西亚卢比 (Rp)",
+            "name-ils": "以色列新谢克尔 (₪)",
+            "name-inr": "印度卢比 (₹)",
+            "name-isk": "冰岛克朗 (kr)",
+            "name-jpy": "日元 (¥)",
+            "name-krw": "韩元 (₩)",
+            "name-mbtc": "毫比特币 (฿)",
+            "name-myr": "马来西亚林吉特 (RM)",
+            "name-nok": "挪威克朗 (kr)",
+            "name-php": "菲律宾比索 (PHP)",
+            "name-pln": "波兰兹罗提 (PLN)",
+            "name-pyg": "瓜拉尼 (₲)",
+            "name-rub": "卢布 (₽)",
+            "name-sek": "瑞典克朗 (kr)",
+            "name-try": "土耳其里拉 (₺)",
+            "name-uah": "格里夫纳 (₴)",
+            "name-ubtc": "微比特币 (฿)",
+            "name-usd": "美元 ($)",
+            "name-uyu": "乌拉圭比索 (UYU)",
+            "name-vnd": "越南盾 (VND)",
+            "name-xpf": "太平洋法郎 (XPF)",
+            "name-zar": "南非兰特 (R)"
           },
-          "name": ""
+          "name": "货币"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "位(IEC)",
+            "name-bits-si": "位(SI)",
+            "name-bytes-iec": "字节(IEC)",
+            "name-bytes-si": "字节(SI)",
+            "name-gibibytes": "吉二进制字节",
+            "name-gigabytes": "千兆字节",
+            "name-kibibytes": "千二进制字节",
+            "name-kilobytes": "千字节",
+            "name-mebibytes": "兆二进制字节",
+            "name-megabytes": "兆字节",
+            "name-pebibytes": "拍二进制字节",
+            "name-petabytes": "拍字节",
+            "name-tebibytes": "太二进制字节",
+            "name-terabytes": "太字节"
           },
-          "name": ""
+          "name": "数据"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "位/秒(IEC)",
+            "name-bits-sec-si": "位/秒(SI)",
+            "name-bytes-sec-iec": "字节/秒(IEC)",
+            "name-bytes-sec-si": "字节/秒(SI)",
+            "name-gibibits-sec": "吉二进制比特/秒",
+            "name-gibibytes-sec": "吉二进制字节/秒",
+            "name-gigabits-sec": "千兆比特/秒",
+            "name-gigabytes-sec": "千兆字节/秒",
+            "name-kibibits-sec": "千二进制比特/秒",
+            "name-kibibytes-sec": "千二进制字节/秒",
+            "name-kilobits-sec": "千比特/秒",
+            "name-kilobytes-sec": "千字节/秒",
+            "name-mebibits-sec": "兆二进制比特/秒",
+            "name-mebibytes-sec": "兆二进制字节/秒",
+            "name-megabits-sec": "兆比特/秒",
+            "name-megabytes-sec": "兆字节/秒",
+            "name-packets-sec": "数据包/秒",
+            "name-pebibits-sec": "拍二进制比特/秒",
+            "name-pebibytes-sec": "拍二进制字节/秒",
+            "name-petabits-sec": "拍比特/秒",
+            "name-petabytes-sec": "拍字节/秒",
+            "name-tebibits-sec": "太二进制比特/秒",
+            "name-tebibytes-sec": "太二进制字节/秒",
+            "name-terabits-sec": "太位/秒",
+            "name-terabytes-sec": "太字节/秒"
           },
-          "name": ""
+          "name": "数据速率"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "日期时间默认",
+            "name-datetime-iso": "日期时间 ISO",
+            "name-datetime-iso-no-date": "日期时间 ISO（如果是今天则无日期）",
+            "name-datetime-local": "日期时间本地",
+            "name-datetime-local-no-date": "日期时间本地（如果是今天则无日期）",
+            "name-datetime-us": "日期时间美国",
+            "name-datetime-us-no-date": "日期时间美国（如果是今天则无日期）",
+            "name-from-now": "离现在"
           },
-          "name": ""
+          "name": "日期与时间"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "安培 (A)",
+            "name-ampere-hour": "安培-小时 (Ah)",
+            "name-decibel-milliwatt": "分贝毫瓦 (dBm)",
+            "name-electron-volt": "电子伏特 (eV)",
+            "name-farad": "法拉 (F)",
+            "name-femtofarad": "飞法拉 (fF)",
+            "name-gigawatt": "千兆瓦 (GW)",
+            "name-henry": "亨利 (H)",
+            "name-joule": "焦耳 (J)",
+            "name-kiloampere": "千安培 (kA)",
+            "name-kiloampere-hour": "千安培小时 (kAh)",
+            "name-kiloohm": "千欧姆 (kΩ)",
+            "name-kilovolt": "千伏 (kV)",
+            "name-kilovolt-ampere": "千伏安 (kVA)",
+            "name-kilovolt-ampere-reactive": "千伏安无功功率  (kVAr)",
+            "name-kilowatt": "千瓦 (kW)",
+            "name-kilowatt-hour": "千瓦时 (kWh)",
+            "name-kilowatt-min": "千瓦分钟 (kWm)",
+            "name-lumens": "流明 (Lm)",
+            "name-megaohm": "兆欧姆 (MΩ)",
+            "name-megawatt": "兆瓦 (MW)",
+            "name-megawatt-hour": "兆瓦时 (MWh)",
+            "name-microfarad": "微法拉 (µF)",
+            "name-microhenry": "微亨 (µH)",
+            "name-milliampere": "毫安 (mA)",
+            "name-milliampere-hour": "毫安时 (mAh)",
+            "name-millihenry": "毫亨 (mH)",
+            "name-milliohm": "毫欧姆 (mΩ)",
+            "name-millivolt": "毫伏 (mV)",
+            "name-milliwatt": "毫瓦 (mW)",
+            "name-nanofarad": "纳法拉 (nF)",
+            "name-ohm": "欧姆 (Ω)",
+            "name-picofarad": "皮法拉 (pF)",
+            "name-volt": "伏特 (V)",
+            "name-volt-ampere": "伏安 (VA)",
+            "name-volt-ampere-reactive": "伏安无功功率 (VAr)",
+            "name-watt": "瓦特 (W)",
+            "name-watt-hour": "瓦特时 (Wh)",
+            "name-watt-hour-per-kg": "瓦特时每千克 (Wh/kg)",
+            "name-watt-square-meter": "瓦特每平方米 (W/m²)"
           },
-          "name": ""
+          "name": "能源"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "立方英尺/分钟 (cfm)",
+            "name-cubic-feet-sec": "立方英尺/秒 (cfs)",
+            "name-cubic-meters-sec": "立方米/秒 (cms)",
+            "name-gallons-min": "加仑/分钟 (gpm)",
+            "name-litre-hour": "升/小时",
+            "name-litre-min": "升/分钟 (L/min)",
+            "name-lux": "勒克斯 (lx)",
+            "name-millilitre-min": "毫升/分钟 (mL/min)"
           },
-          "name": ""
+          "name": "流"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "千牛顿米 (kNm)",
+            "name-kilonewtons": "千牛顿 (kN)",
+            "name-newton-meters": "牛顿米 (Nm)",
+            "name-newtons": "牛顿 (N)"
           },
-          "name": ""
+          "name": "力"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "艾哈希/秒",
+            "name-gigahashes-sec": "吉哈希/秒",
+            "name-hashes-sec": "哈希/秒",
+            "name-kilohashes-sec": "千哈希/秒",
+            "name-megahashes-sec": "兆哈希/秒",
+            "name-petahashes-sec": "拍哈希/秒",
+            "name-terahashes-sec": "太哈希/秒"
           },
-          "name": ""
+          "name": "哈希率"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "英尺 (ft)",
+            "name-inch": "英寸 (in)",
+            "name-kilometer": "公里 (km)",
+            "name-meter": "米 (m)",
+            "name-mile": "英里 (mi)",
+            "name-millimeter": "毫米 (mm)"
           },
-          "name": ""
+          "name": "长度"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "克 (g)",
+            "name-kilogram": "千克 (kg)",
+            "name-metric-ton": "公吨 (t)",
+            "name-milligram": "毫克 (mg)",
+            "name-pound": "磅 (lb)"
           },
-          "name": ""
+          "name": "质量"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "坎德拉 (cd)",
+            "name-decibel": "分贝",
+            "name-hexadecimal": "十六进制",
+            "name-hexadecimal-0x": "十六进制 (0x)",
+            "name-humidity": "湿度 (%H)",
+            "name-locale": "区域格式",
+            "name-number": "数量",
+            "name-percent-1": "百分比 (0.0-1.0)",
+            "name-percent-100": "百分比 (0-100)",
+            "name-pixels": "像素",
+            "name-scientific": "科学记数法",
+            "name-short": "短",
+            "name-si-short": "SI 短",
+            "name-string": "字符串"
           },
-          "name": ""
+          "name": "其他"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "巴",
+            "name-hectopascals": "百帕",
+            "name-inches-mercury": "英寸汞柱",
+            "name-kilobars": "千巴",
+            "name-kilopascals": "千帕斯卡",
+            "name-millibars": "毫巴",
+            "name-pascals": "帕斯卡",
+            "name-psi": "PSI"
           },
-          "name": ""
+          "name": "压力"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "贝克勒尔 (Bq)",
+            "name-curie": "居里 (Ci)",
+            "name-exposure": "曝光 (C/kg)",
+            "name-gray": "戈瑞 (Gy)",
+            "name-microsievert": "微西弗特 (µSv)",
+            "name-microsievert-hour": "微西弗特/小时 (µSv/h)",
+            "name-millisievert": "毫西弗特 (mSv)",
+            "name-millisievert-hour": "毫西弗特/小时 (mSv/h)",
+            "name-rad": "弧度",
+            "name-rem": "雷姆",
+            "name-roentgen": "伦琴 (R)",
+            "name-sievert": "希沃特 (Sv)",
+            "name-sievert-hour": "西弗特/小时 (Sv/h)"
           },
-          "name": ""
+          "name": "辐射"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "度每秒 (°/s)",
+            "name-gigahertz": "千兆赫兹 (GHz)",
+            "name-hertz": "赫兹 (Hz)",
+            "name-kilohertz": "千赫兹 (kHz)",
+            "name-megahertz": "兆赫兹 (MHz)",
+            "name-radians-sec": "弧度每秒 (rad/s)",
+            "name-rpm": "每分钟转数 (rpm)"
           },
-          "name": ""
+          "name": "转动速度"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "摄氏 (°C)",
+            "name-fahrenheit": "华氏 (°F)",
+            "name-kelvin": "开尔文 (K)"
           },
-          "name": ""
+          "name": "温度"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "次/分钟 (cpm)",
+            "name-counts-sec": "次/秒钟 (cps)",
+            "name-events-min": "事件/分钟 (epm)",
+            "name-events-sec": "事件/秒钟 (eps)",
+            "name-io-ops-sec": "I/O 操作/秒 (iops)",
+            "name-messages-min": "消息/分钟 (mpm)",
+            "name-messages-sec": "消息/秒 (mps)",
+            "name-ops-min": "操作/分钟 (opm)",
+            "name-ops-sec": "操作/秒钟 (ops)",
+            "name-reads-min": "读取/分钟 (rpm)",
+            "name-reads-sec": "读取/秒钟 (rps)",
+            "name-records-min": "记录/分钟 (rpm)",
+            "name-records-sec": "记录/秒钟 (rps)",
+            "name-requests-min": "请求/分钟 (rpm)",
+            "name-requests-sec": "请求/秒钟 (rps)",
+            "name-rows-min": "行/分钟 (rpm)",
+            "name-rows-sec": "行/秒钟 (rps)",
+            "name-writes-min": "写入/分钟 (wpm)",
+            "name-writes-sec": "写入/秒钟 (wps)"
           },
-          "name": ""
+          "name": "吞吐量"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "时钟（毫秒）",
+            "name-clock-s": "时钟（秒）",
+            "name-days": "天 (d)",
+            "name-duration-dhms": "持续时间（天 时:分:秒）",
+            "name-duration-hms": "持续时间（时:分:秒）",
+            "name-duration-ms": "持续时间 (ms)",
+            "name-duration-s": "持续时间 (s)",
+            "name-hertz": "赫兹 (1/s)",
+            "name-hours": "小时 (h)",
+            "name-microseconds": "微秒 (µs)",
+            "name-milliseconds": "毫秒 (ms)",
+            "name-minutes": "分钟 (m)",
+            "name-nanoseconds": "纳秒 (ns)",
+            "name-seconds": "秒 (s)",
+            "name-timeticks": "时间刻度 (s/100)"
           },
-          "name": ""
+          "name": "时间"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "公里/小时 (km/h)",
+            "name-knot": "节 (kn)",
+            "name-meters-second": "米/秒 (m/s)",
+            "name-miles-hour": "英里/小时 (mph)"
           },
-          "name": ""
+          "name": "速度"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "立方分米",
+            "name-cubic-meter": "立方米",
+            "name-gallons": "加仑",
+            "name-litre": "升 (L)",
+            "name-millilitre": "毫升 (mL)",
+            "name-normal-cubic-meter": "标准立方米"
           },
-          "name": ""
+          "name": "容量"
         }
       }
     }
@@ -8364,7 +8365,7 @@
       "option": "选项"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "打开预览画面"
     },
     "cascader": {
       "clear-button": "清除选择"
@@ -8378,9 +8379,9 @@
       "aria-label-selected-color": "{{colorLabel}} 颜色"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "删除",
       "cancel": "取消",
-      "confirmText-delete": ""
+      "confirmText-delete": "删除"
     },
     "confirm-content": {
       "placeholder": "键入“{{confirmPromptText}}”以确认"
@@ -8485,56 +8486,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "四月",
+        "label-august": "八月",
+        "label-december": "十二月",
+        "label-february": "二月",
+        "label-january": "一月",
+        "label-july": "七月",
+        "label-june": "六月",
+        "label-march": "三月",
+        "label-may": "五月",
+        "label-november": "十一月",
+        "label-october": "十月",
+        "label-september": "九月"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "前天",
+        "last-1-hour": "最近 1 个小时",
+        "last-1-year": "最近 1 年",
+        "last-12-hours": "最近 12 小时",
+        "last-15-mins": "最近 15 分钟",
+        "last-2-days": "最近 2 天",
+        "last-2-years": "最近 2 年",
+        "last-24-hours": "最近 24 小时",
+        "last-3-hours": "最近 3 小时",
+        "last-30-days": "最近 30 天",
+        "last-30-mins": "最近 30 分钟",
+        "last-5-mins": "最近 5 分钟",
+        "last-5-years": "最近 5 年",
+        "last-6-hours": "最近 6 小时",
+        "last-6-months": "最近 6 个月",
+        "last-7-days": "最近 7 天",
+        "last-90-days": "最近 90 天",
+        "previous-fiscal-quarter": "上一财季",
+        "previous-fiscal-year": "上一财年",
+        "previous-month": "上个月",
+        "previous-week": "上周",
+        "previous-year": "上一年",
+        "this-day-last-week": "上周的今天",
+        "this-fiscal-quarter": "本财季",
+        "this-fiscal-quarter-so-far": "本财季到现在",
+        "this-fiscal-year": "本财年",
+        "this-fiscal-year-so-far": "本财年到现在",
+        "this-month": "本月",
+        "this-month-so-far": "本月到现在",
+        "this-week": "本周",
+        "this-week-so-far": "本周到现在",
+        "this-year": "今年",
+        "this-year-so-far": "今年到现在",
+        "today": "今天",
+        "today-so-far": "今天到现在",
+        "yesterday": "昨天"
       }
     },
     "drawer": {
@@ -8585,18 +8586,18 @@
         "placeholder": "选择字段"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "布尔",
+        "label-enum": "枚举",
+        "label-number": "数量",
+        "label-other": "其他",
+        "label-string": "字符串",
+        "label-time": "时间",
+        "label-traces": "跟踪"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "帧 ({{framesCount}})：{{framesNames}}",
+        "label": "查询：{{refId}}",
+        "label-missing-ref-id": "查询：（缺少 refId）"
       },
       "name-field-name-by-regex-matcher": "名称匹配正则表达式的字段",
       "name-fields-by-query": "查询返回的字段",
@@ -8630,8 +8631,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "切换折叠面板",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "面板加载栏",
+      "ariaLabel-panel-status": "面板状态",
       "tooltip-cancel": "取消查询",
       "tooltip-cancel-loading": "取消查询",
       "tooltip-stop-streaming": "停止流媒体传输",
@@ -8700,12 +8701,12 @@
       "inspect-drawer-title": "检查值",
       "inspect-menu-label": "检查值",
       "nested-table": {
-        "no-data": ""
+        "no-data": "无数据"
       },
       "no-values-label": "没有值",
       "pagination-summary": "第 {{itemsRangeStart}} - {{displayedEnd}} 行，共 {{numRows}} 行",
       "sparkline": {
-        "no-data": ""
+        "no-data": "无数据"
       }
     },
     "tags": {
@@ -8713,7 +8714,7 @@
     },
     "tags-input": {
       "add": "添加",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "新标签（按 Enter 键以添加）",
       "remove": "移除标记：{{name}}"
     },
     "time-sync-button": {
@@ -8806,14 +8807,14 @@
       "footer-add-annotation": "添加注释",
       "footer-click-to-action": "点击以 {{actionTitle}}",
       "footer-click-to-navigate": "点击打开 {{linkTitle}}",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "筛选“{{value}}”",
       "timestamp": "时间戳"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "默认",
+      "weekStarts-label-monday": "星期一",
+      "weekStarts-label-saturday": "星期六",
+      "weekStarts-label-sunday": "星期日"
     }
   },
   "graph": {
@@ -9191,8 +9192,8 @@
       "title-create-library-panel": "创建库面板"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "更改",
+      "confirmText-replace": "替换"
     },
     "confirm": {
       "delete-panel": "要删除这个面板吗？"
@@ -9216,7 +9217,7 @@
       "usage-count_other": "用于 {{count}} 个数据面板"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "按名称、描述或文件夹名称搜索"
     },
     "loading-indicator": {
       "loading-library-panel": "正在加载库面板..."
@@ -9421,7 +9422,7 @@
       "close": "关闭日志详情",
       "copy-shortlink": "复制短链接",
       "copy-to-clipboard": "复制到剪贴板",
-      "displayed-fields-section": "",
+      "displayed-fields-section": "组织显示的字段",
       "fields": {
         "adhoc-statistics": "临时统计数据",
         "copy-value-to-clipboard": "将值复制到剪贴板",
@@ -9434,25 +9435,25 @@
       },
       "fields-section": "字段",
       "hide-log-line": "隐藏日志行",
-      "inline-mode": "",
+      "inline-mode": "内联显示",
       "links-section": "关联",
-      "log-line-field": "",
+      "log-line-field": "日志行",
       "log-line-section": "日志行",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
+      "move-displayed-field-down": "下移",
+      "move-displayed-field-up": "上移",
       "no-details": "没有要显示的字段。",
-      "open-assistant": "",
+      "open-assistant": "在 Assistant 中解释此日志行",
       "pin-line": "固定日志",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "remove-displayed-field": "移除字段",
+      "remove-log": "移除日志",
+      "scroll-to-logline": "滚动到日志行",
       "search": {
         "no-results": "没有要显示的结果。"
       },
       "search-placeholder": "搜索字段名称和值",
       "show-context": "显示上下文",
       "show-log-line": "显示日志行",
-      "sidebar-mode": "",
+      "sidebar-mode": "锚定到右侧",
       "unpin-line": "取消固定日志"
     },
     "log-line-menu": {
@@ -9460,9 +9461,9 @@
       "copy-log": "复制日志行",
       "hide-details": "显示日志详情",
       "icon-label": "日志菜单",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "日志行",
+      "log-line-explainer": "简要解释此日志行",
+      "open-assistant": "在 Assistant 中解释此日志行",
       "pin-to-outline": "固定日志",
       "show-context": "显示上下文",
       "show-details": "隐藏日志详情",
@@ -9568,10 +9569,10 @@
     },
     "name-common-labels": "常用标签",
     "name-deduplication": "去重",
-    "name-details-mode": "",
+    "name-details-mode": "日志详情面板模式",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "内联",
+      "label-sidebar": "侧边栏"
     },
     "name-enable-infinite-scrolling": "启用无限滚动",
     "name-enable-log-details": "启用日志详情",
@@ -9668,8 +9669,8 @@
       "updated-on": "更新日期"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "您确定要删除“{{snapshotToRemove}}”吗？",
+      "confirmText-delete": "删除",
       "title-delete": "删除"
     },
     "unthemed-dashboard-import": {
@@ -9681,14 +9682,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "名称为必填项",
+      "message-reserved-name": "这是保留名称，不能用于文件夹。",
+      "message-same-name": "已存在同名的数据面板或文件夹",
+      "message-same-name-general": "通用文件夹中已存在同名的文件夹或数据面板"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "未找到选项"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9838,8 +9839,8 @@
     "resource-details": {
       "dismiss-button": "好",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "已达到警报规则组的最大数量：请删除一些警报规则组或升级您的套餐，然后重试。",
+        "alert-rules-quota-reached": "已达到警报规则的最大数量：请删除一些警报规则或升级您的套餐，然后重试。",
         "dashboard-already-managed": "数据面板已由 Grafana 在云实例中配置和管理。我们建议您今后使用已配置的数据面板。如果您仍然希望将数据面板复制到云实例，请更改数据面板 JSON 中的数据面板 ID，保存新的快照并再次上传。",
         "datasource-already-managed": "数据源已由 Grafana 在云实例中配置和管理。如果这是其他资源，请设置另一个 UID，然后重试。",
         "datasource-invalid-url": "有一个数据源的 URL 无效。请提供有效的 URL，然后重试。",
@@ -10307,9 +10308,9 @@
       "aria-label": "帮助"
     },
     "invite-user": {
-      "invite-button": "",
+      "invite-button": "邀请",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "邀请用户"
     },
     "item": {
       "add-bookmark": "添加到书签",
@@ -10529,7 +10530,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "未找到组织",
     "select-placeholder": "选择组织"
   },
   "page": {
@@ -10752,7 +10753,7 @@
         "permission": "您无权查看此页面。",
         "title-access-denied": "访问被拒绝"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "插件加载失败",
       "no-root-app-page-component-found": "找不到根应用页面组件"
     },
     "browse": {
@@ -10796,7 +10797,7 @@
         "update-status-text": "插件已更新"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "您确定要降级版本 {{version}} 吗？通常不建议这样做",
         "downgrade-confirm": "降级",
         "downgrade-title": "降级插件版本"
       }
@@ -10851,8 +10852,8 @@
       "message": "找不到插件"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "请检查控制台，了解有关错误的更多详细信息。",
+      "extension-error-alert-title": "扩展加载失败：\"{{pluginId}}/{{extensionTitle}}\""
     },
     "extensions-log-data-source": {
       "message": {
@@ -10889,8 +10890,8 @@
     "install-controls-button": {
       "title-uninstall-modal": "卸载 {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "您确定要卸载此插件吗？",
+        "confirmText-confirm": "确认"
       }
     },
     "install-controls-warning": {
@@ -10908,6 +10909,9 @@
       "label-plugin-id": "插件 Id",
       "label-severity": "严重程度"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "找不到该插件。请检查 URL 是否正确，或<1></1>转到<3>插件目录</3>。",
       "title-plugin-not-found": "未找到插件"
@@ -11064,29 +11068,29 @@
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "此资源位于 {{repoType}} 的分支之后。",
+      "not-saved": "在合并此分支之前，您组织中的其他 Grafana 用户仍将看到保存到已配置默认分支的当前版本",
+      "open-in-repo-button": "在 {{repoType}} 中打开",
+      "open-pull-request-in-repo": "在以下位置打开拉取请求：{{repoType}}",
+      "view-in-repo-button": "在中查看 {{repoType}}，以查看最新更改。",
+      "view-pull-request-in-repo": "在以下位置查看拉取请求：{{repoType}}"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "已在 {{repoType}} 的分支中创建新资源。",
+    "title-loaded-pull-request-in-repo": "此资源从您刚刚在 {{repoType}} 中创建的分支加载，并且仅对您可见"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "资源已成功保存",
+  "provisioned-resource-request-handler-dashboard": "数据面板已成功保存",
+  "provisioned-resource-request-handler-folder": "文件夹已成功创建",
   "provisioning": {
     "banner": {
       "message": "此功能目前正在积极开发中。为了获得最佳体验和最新改进，我们建议您使用 Grafana 的<2>夜间版本</2>。"
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "用于预置的分支",
+      "branch-label": "分支",
+      "branch-required": "分支为必填项",
+      "path-description": "存储库内的可选子目录路径",
+      "path-label": "路径",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11095,18 +11099,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "允许用户选择在保存更改时是否打开拉取请求。如果存储库不允许直接更改主分支，则仍可能需要拉取请求。",
+      "pr-workflow-label": "保存时启用拉取请求选项",
+      "token-description": "具有存储库权限的 Bitbucket 应用密码",
+      "token-label": "应用密码",
+      "token-required": "Bitbucket 令牌为必填项",
+      "token-user-description": "将用于使用应用密码访问存储库的用户名",
+      "token-user-label": "用户名",
+      "token-user-required": "用户名为必填项",
+      "url-description": "Bitbucket 存储库 URL",
+      "url-label": "存储库 URL",
+      "url-pattern": "必须是有效的 Bitbucket 存储库 URL",
+      "url-required": "存储库 URL 为必填项"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "为此存储库连接添加明确的名称",
@@ -11117,9 +11121,9 @@
       "label-display-name": "显示名称",
       "placeholder-my-repository-connection": "我的存储库连接",
       "text-loading-resource-information": "正在加载资源信息...",
-      "dashboards-count_other": "",
+      "dashboards-count_other": "{{count}} 个数据面板",
       "files-count_other": "{{count}} 个文件",
-      "folders-count_other": ""
+      "folders-count_other": "{{count}} 个文件夹"
     },
     "check-repository": {
       "check": "检查"
@@ -11193,7 +11197,7 @@
       "title-instant-updates-requests-webhooks": "通过 Webhook 实现即时更新和拉取请求。",
       "title-visual-previews-in-pull-requests": "具有图像渲染功能的拉取请求可视化预览"
     },
-    "error-title-default": "",
+    "error-title-default": "错误",
     "expanded-row": {
       "job-specification": "作业规范",
       "summary": "摘要"
@@ -11202,8 +11206,8 @@
       "actions": {
         "set-up-required-feature-toggles": "设置所需的功能切换"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "在 Git 中将数据面板作为代码进行管理，并自动预置更新",
+      "manage-your-dashboards-with-remote-provisioning": "开始使用 Git 同步",
       "store-dashboards-in-version-controlled-storage": "将数据面板存储在版本控制的存储中，以便更好地整理内容和跟踪历史记录"
     },
     "file-history-page": {
@@ -11224,16 +11228,16 @@
     },
     "finish-step": {
       "description-enable-previews": "在拉取请求中添加数据面板更改的图像预览。Grafana 数据面板的图像将在 Git 存储库中共享，并对具有存储库访问权限的任何人可见。",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "创建拉取请求的预览链接",
       "description-image-rendering": "需要图像渲染。<2>设置图像渲染</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "（需要启用<2>图像渲染</2>和公共访问权限）",
       "description-read-only": "无法通过 Grafana 修改资源。",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "从存储库同步更改的频率",
+      "error-sync-interval-required": "同步间隔为必填项",
       "label-enable-previews": "在拉取请求中启用数据面板预览",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "生成数据面板预览",
       "label-read-only": "只读",
-      "label-sync-interval": ""
+      "label-sync-interval": "间隔（秒）"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "没有找到与您的查询匹配的结果",
@@ -11265,46 +11269,46 @@
       "subtitle-provisioning-feature": "查看和管理您的预配连接"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "用于预置的分支",
+      "branch-label": "分支",
+      "branch-required": "分支为必填项",
+      "path-description": "存储库内的可选子目录路径",
+      "path-label": "路径",
+      "pr-workflow-description": "允许用户选择在保存更改时是否打开拉取请求。如果存储库不允许直接更改主分支，则仍可能需要拉取请求。",
+      "pr-workflow-label": "保存时启用拉取请求选项",
+      "token-description": "Git 存储库访问令牌或密码",
+      "token-label": "访问令牌",
+      "token-required": "Git 令牌为必填项",
+      "token-user-description": "将用于使用访问令牌访问存储库的用户名",
+      "token-user-label": "用户名",
+      "token-user-required": "用户名为必填项",
+      "url-description": "Git 存储库 URL",
+      "url-label": "存储库 URL",
+      "url-pattern": "必须是有效的 Git 存储库 URL",
+      "url-required": "存储库 URL 为必填项"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "用于预置的分支",
+      "branch-label": "分支",
+      "branch-required": "分支为必填项",
+      "path-description": "存储库内的可选子目录路径",
+      "path-label": "路径",
+      "pr-workflow-description": "允许用户选择在保存更改时是否打开拉取请求。如果存储库不允许直接更改主分支，则仍可能需要拉取请求。",
+      "pr-workflow-label": "保存时启用拉取请求选项",
+      "token-description": "具有存储库权限的 GitHub 个人访问令牌",
+      "token-label": "个人访问令牌",
+      "token-required": "GitHub 令牌为必填项",
+      "url-description": "GitHub 存储库 URL",
+      "url-label": "存储库 URL",
+      "url-pattern": "必须是有效的 GitHub 存储库 URL",
+      "url-required": "存储库 URL 为必填项"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "用于预置的分支",
+      "branch-label": "分支",
+      "branch-required": "分支为必填项",
+      "path-description": "存储库内的可选子目录路径",
+      "path-label": "路径",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11313,15 +11317,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "允许用户选择在保存更改时是否打开合并请求。如果存储库不允许直接更改主分支，则仍可能需要合并请求。",
+      "pr-workflow-label": "保存时启用合并请求选项",
+      "token-description": "具有存储库权限的 GitLab 项目访问令牌",
+      "token-label": "项目访问令牌",
+      "token-required": "GitLab 令牌为必填项",
+      "url-description": "GitLab 存储库 URL",
+      "url-label": "存储库 URL",
+      "url-pattern": "必须是有效的 GitLab 存储库 URL",
+      "url-required": "存储库 URL 为必填项"
     },
     "history-view": {
       "not-found": "未找到"
@@ -11349,18 +11353,18 @@
       "starting": "正在启动...",
       "status": {
         "title-error-running-job": "运行作业时出错",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "作业已成功完成",
+        "title-warning-running-job": "作业已完成，但有警告"
       },
       "summary": "摘要",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "获取活动作业时出错"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "存储库的本地文件系统路径",
+      "path-label": "存储库路径",
+      "path-required": "存储库路径为必填项"
     },
     "mode-options": {
       "folder": {
@@ -11386,7 +11390,7 @@
     },
     "repository-actions": {
       "settings": "设置",
-      "source-code": ""
+      "source-code": "源代码"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11452,22 +11456,22 @@
       "title-queued-for-deletion": "已进入队列等待删除"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "选择一个提供商：",
+      "configure-file": "配置文件预置",
+      "configure-with-provider": "使用 {{ provider }} 配置",
+      "provider-not-listed": "如果您的提供商未列出："
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "连接到 Bitbucket 存储库",
+      "github": "GitHub",
+      "github-description": "连接到 GitHub 存储库",
+      "gitlab": "GitLab",
+      "gitlab-description": "连接到 GitLab 存储库",
+      "local": "本地",
+      "local-description": "配置文件预置",
+      "pure-git": "纯 Git",
+      "pure-git-description": "连接到任何 Git 存储库"
     },
     "resource-view": {
       "base": "基本",
@@ -11498,11 +11502,11 @@
       "label-current-step": "当前步骤",
       "label-pending-step": "待处理步骤"
     },
-    "success-title-default": "",
+    "success-title-default": "成功",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "启动作业失败",
+      "error-no-repository-name": "未提供存储库名称",
+      "error-starting-job": "启动作业时出错"
     },
     "sync-repository": {
       "body-edit-configuration": "编辑配置",
@@ -11530,7 +11534,7 @@
       "go-to": "前往",
       "make-sure": "务必包含以下权限"
     },
-    "warning-title-default": "",
+    "warning-title-default": "警告",
     "wizard": {
       "alert-point-1": "在此过程中将无法创建、编辑或删除资源。在最后一步中，它们将消失。",
       "alert-point-2": "预配完成后，资源将重新出现并通过外部存储进行管理。",
@@ -11540,10 +11544,10 @@
       "button-next": "完成",
       "button-start": "开始同步",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "此操作将删除存储库配置，您将丢失所有进度。您确定要丢弃更改吗？",
+        "confirm": "是，丢弃",
+        "dismiss": "继续工作",
+        "title": "丢弃存储库设置？"
       },
       "step-bootstrap": "选择要同步的内容",
       "step-connect": "连接",
@@ -11559,7 +11563,7 @@
     "wizard-content": {
       "button-cancel": "取消",
       "button-cancelling": "正在取消...",
-      "button-previous": "",
+      "button-previous": "上一个",
       "button-submitting": "正在提交...",
       "error-instance-repository-exists": "实例存储库已存在"
     }
@@ -11956,7 +11960,7 @@
         "recommended": "推荐",
         "results": "结果"
       },
-      "search": ""
+      "search": "搜索 {{parentTitle}}"
     }
   },
   "search": {
@@ -12037,7 +12041,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "未找到服务账户",
     "select-aria-label": "服务帐户选取器",
     "select-placeholder": "开始键入以搜索服务账户"
   },
@@ -12083,10 +12087,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "添加服务账户令牌",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "您确定要删除此服务帐户吗？",
+      "body-disable-service-account": "您确定要禁用此服务帐户吗？",
+      "confirmText-delete-service-account": "删除服务账户",
+      "confirmText-disable-service-account": "禁用服务帐户",
       "delete-service-account": "删除服务账户",
       "disable-service-account": "禁用服务账户",
       "enable-service-account": "启用服务账户",
@@ -12113,7 +12117,7 @@
       "used-by": "使用方"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "保存",
       "edit": "编辑"
     },
     "service-account-role-row": {
@@ -12127,15 +12131,15 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "添加服务账户",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "您确定要删除 {{serviceAccountName}} 吗？",
+      "body-disable-service-account": "您确定要禁用“{{accountToDisable}}”吗？",
+      "confirmText-delete": "删除",
+      "confirmText-disable-service-account": "禁用服务帐户",
       "placeholder-search-service-account-by-name": "按名称搜索服务账户",
       "sub-title": "服务账户及其令牌可用于对 Grafana API 进行身份验证。不妨在我们的<2>文档</2>中了解更多信息。",
       "title-delete-service-account": "删除服务账户",
       "title-disable-service-account": "禁用服务账户",
-      "body-delete_other": ""
+      "body-delete_other": "您确定要删除 {{serviceAccountName}} 和 {{count}} 个随附令牌吗？"
     },
     "token-expiration": {
       "content-this-token-has-expired": "此令牌已过期",
@@ -12149,7 +12153,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "导出为图像",
       "export-json-title": "导出为 JSON",
       "share-externally-title": "在外部共享",
       "share-internally-title": "在内部共享",
@@ -12186,17 +12190,17 @@
       "view-button-yaml": "查看 YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "图像导出操作",
+      "cancel-button": "取消",
+      "download-button": "下载图像",
+      "error-title": "生成图像失败",
+      "generate-button": "生成图像",
+      "generating": "正在生成图像…",
+      "info-text": "将此数据面板保存为图像",
+      "preview": "预览",
+      "preview-aria": "生成的图像预览",
+      "preview-region": "图像预览",
+      "title": "导出为图像"
     },
     "library": {
       "info": "创建库面板。"
@@ -12206,7 +12210,7 @@
       "info-text": "创建指向此仪表板或面板的直接链接，通过以下选项自定义。",
       "link-url": "链接网址",
       "render-alert": "未安装图像渲染器插件",
-      "render-instructions": "",
+      "render-instructions": "要渲染图像，您必须安装 <2>Grafana 图像渲染器插件</2>。请与您的 Grafana 管理员联系以安装插件。",
       "rendered-image": "直接链接至渲染后的图像",
       "save-alert": "仪表板未保存",
       "save-dashboard": "要渲染面板图像，需要先保存仪表板。",
@@ -12274,11 +12278,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "保存数据面板以启用图像生成",
+    "download-disabled-help": "首先生成图像以启用下载",
+    "error-title": "生成图像失败",
     "form": {
-      "label": ""
+      "label": "面板图像设置"
     },
     "preview": {
       "title": "面板预览"
@@ -12592,17 +12596,17 @@
       "label-small": "小"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "操作",
+      "auto": "自动",
+      "color-background": "彩色背景",
+      "color-text": "彩色文本",
+      "data-links": "数据关联",
+      "gauge": "仪表",
+      "image": "图片",
+      "json": "JSON 视图",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "圆形",
+      "sparkline": "迷你图"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "如果选中，整行将按此单元格的颜色显示。",
@@ -12631,7 +12635,7 @@
     "description-count-rows": "显示所有数据行的单个计数",
     "description-fields": "选择应计算的字段",
     "description-min-column-width": "列自动调整大小的最小宽度",
-    "description-wrap-header-text": "",
+    "description-wrap-header-text": "启用列标题的文字换行",
     "image-cell-options-editor": {
       "description-alt-text": "在图片无法显示或用户使用屏幕阅读器时，将显示的替代文本",
       "description-title-text": "光标悬停在图片上时将显示的文本",
@@ -12715,7 +12719,7 @@
     "tag-option-label": "标记选项"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "未找到团队",
     "select-aria-label": "团队选择器",
     "select-placeholder": "选择一个团队"
   },
@@ -13019,15 +13023,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "二元运算",
+          "reduce-row": "减少行",
+          "row-index": "行索引",
+          "unary-operation": "一元运算"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "累积函数",
+        "window-functions": "窗口函数"
       },
       "label-alias": "别名",
       "label-mode": "模式",
@@ -13045,9 +13049,9 @@
       "label-name": "名称",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "将帧名称复制到字段名称",
+          "ignore-the-frame-name": "忽略帧名称",
+          "label-frame": "添加带有帧名称的标签"
         }
       },
       "placeholder-frame": "帧"
@@ -13060,9 +13064,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "添加转换字段类型转换器",
       "aria-label-remove-convert-field-type-transformer": "移除转换字段类型转换器",
-      "convert-field-type": "",
+      "convert-field-type": "转换字段类型",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "将字段转换为指定的字段类型。"
       },
       "label": {
         "browser": "浏览器",
@@ -13075,11 +13079,11 @@
       "label-join-with": "结合对象",
       "label-set-timezone": "设置时区",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "转换字段类型"
       },
       "placeholder-type": "类型",
       "tags": {
-        "format-field": ""
+        "format-field": "格式化字段"
       },
       "tooltip-explicit-separator-joining-array-values": "合并数组值时使用显式分隔符",
       "tooltip-input-format": "指定输入字段的格式，以便 Grafana 可以正确解析日期字符串。",
@@ -13105,13 +13109,13 @@
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "将所有字段合并到一个帧中。"
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "拼接字段"
         },
         "tags": {
-          "combine": ""
+          "combine": "合并"
         }
       }
     },
@@ -13126,11 +13130,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "从内容（JSON、标签等）解析字段。"
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "选择字段"
         }
       },
       "label-delimiter": "分隔符",
@@ -13139,7 +13143,7 @@
       "label-replace-all-fields": "替换所有字段",
       "label-source": "源",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "提取字段"
       },
       "placeholder-auto": "自动",
       "placeholder-select-delimiter": "选择分隔符...",
@@ -13150,20 +13154,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "使用字段值查找国家/地区、州/省或机场。"
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "未找到文本字段"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "选择文本字段"
         }
       },
       "label-field": "字段",
       "label-lookup": "查阅",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "从资源中查找字段"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13174,23 +13178,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "使用正则表达式模式移除查询结果的部分内容。"
       },
       "label-from-variable": "从变量",
       "label-identifier": "标识符",
       "label-use-variable": "使用变量",
       "label-variable": "变量",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "按名称筛选字段"
       },
       "placeholder-regular-expression-pattern": "正则表达式模式"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "根据原始查询从数据中移除行"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "按查询筛选数据"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13204,33 +13208,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "添加条件",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "使用用户定义的筛选条件从查询结果中移除行。"
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "完全匹配",
+          "match-any": "任意匹配"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "不包括",
+          "include": "包括"
         }
       },
       "label-conditions": "条件",
       "label-filter-type": "筛选器类型",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "按值筛选数据"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "未找到文本字段"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "选择文本字段"
         }
       },
       "label-field": "字段",
@@ -13239,10 +13243,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "操作字符串字段格式。"
       },
       "name": {
-        "format-string": ""
+        "format-string": "格式化字符串"
       }
     },
     "format-time-transfomer-editor": {
@@ -13254,66 +13258,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "设置时间字段的输出格式"
       },
       "name": {
-        "format-time": ""
+        "format-time": "格式化时间"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "使用行值计算新字段。"
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "从计算中添加字段"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "设置单位、最小值、最大值等。"
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "从查询结果配置"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "从源数据生成热图数据。"
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "创建热图"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "将标记的结果扁平化为由标签连接的表格。"
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "按标签合并"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "将单帧数据集拆分为多个序列。"
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "按值分区"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "将每一行转换为具有动态配置的字段。"
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "行到字段"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "对查询结果应用空间操作。"
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "空间操作"
       }
     },
     "get-timezone-options": {
@@ -13345,8 +13349,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "计算",
+          "group-by": "分组方式"
         }
       },
       "placeholder-ignored": "已忽略",
@@ -13354,42 +13358,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "按字段值对数据进行分组并创建聚合数据。"
       },
       "name": {
-        "group-by": ""
+        "group-by": "分组方式"
       },
       "title-calc-alert": "如果没有对字段进行分组，则计算不会产生效果"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "按字段值对数据进行分组，并使用分组数据创建嵌套表。"
       },
       "description-show-field-names": "如果启用，嵌套表会将字段名称显示为表头",
       "label-show-field-names-in-nested-tables": "在嵌套表中显示字段名称",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "分组到嵌套表"
       },
       "title-calc-alert": "如果没有对字段进行分组，则计算不会产生效果。"
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "根据三个字段汇总和重组数据。"
       },
       "label-cell-value": "单元格值",
       "label-column": "列",
       "label-empty-value": "空值",
       "label-row": "行",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "分组到矩阵"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "从输入数据计算直方图。"
       },
       "name": {
-        "histogram": ""
+        "histogram": "直方图"
       },
       "placeholder-auto": "自动",
       "placeholder-default": "默认：30",
@@ -13401,14 +13405,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "根据相关字段合并 2 个以上表格中的行。"
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "按字段合并"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "必填",
       "info": {
         "input-contain-labels": "输入不包含任何标签",
         "no-input-or-labels-found": "找不到输入（或标签）",
@@ -13432,8 +13436,8 @@
       "label-value-field-name": "值字段名称",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "列",
+          "rows": "行"
         }
       },
       "placeholder-optional-select-label": "（可选）选择标签",
@@ -13441,18 +13445,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "按时间对系列进行分组，并将标签或标记作为字段返回。"
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "标签到字段"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "限制显示的项目数。"
       },
       "name": {
-        "limit": ""
+        "limit": "限制"
       },
       "placeholder-value-or-variable": "值或变量"
     },
@@ -13465,11 +13469,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "合并多个序列。值将合并为一行。"
       },
       "merge-effect-applied-single-frame": "合并功能在单帧上应用时没有效果。",
       "name": {
-        "merge": ""
+        "merge": "合并序列/表"
       }
     },
     "multi-info": {
@@ -13481,14 +13485,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "对字段重新排序、隐藏或重命名。"
       },
       "field-order": "字段顺序",
       "field-order-auto": "自动",
       "field-order-manual": "手动",
       "first-frame-warning": "组织字段仅适用于单个帧。请考虑先应用连接转换或筛选输入。",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "按名称组织字段"
       }
     },
     "partion-by-values-editor": {
@@ -13516,10 +13520,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "将数据帧从宽格式拉伸为长格式。"
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "准备时间序列"
       }
     },
     "prepare-time-series-editor": {
@@ -13527,26 +13531,26 @@
       "label-info": "信息",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "将每个帧转换为长格式"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "长时间序列"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "为每个时间/数字对创建一个新帧"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "多帧时间序列"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "创建由时间连接的单个帧"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "宽时间序列"
         }
       }
     },
@@ -13561,7 +13565,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "将所有行或数据点减少到单个值（例如最大值、平均值）。"
       },
       "label-calculations": "计算",
       "label-include-time": "包含时间",
@@ -13578,7 +13582,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "减少"
       },
       "placeholder-choose-stat": "选择统计"
     },
@@ -13588,18 +13592,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "创建一个包含统计模型预测值的新数据帧。"
       },
       "name": {
-        "trendline": ""
+        "trendline": "趋势线"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "三次型",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "二次型",
         "quartic": "四次型",
-        "quintic": "五次型"
+        "quintic": "五次型",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "度",
       "label-model-type": "模型类型",
@@ -13614,16 +13623,17 @@
       },
       "regression": "回归",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "回归分析"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "要预测的 X,Y 点的数量"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "使用正则表达式和替换模式重命名查询结果的部分。"
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "按正则表达式重命名字段"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13637,33 +13647,33 @@
       "label-mode": "模式",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "只要两个表格的公共字段中存在匹配值，就合并两个表格中的数据。",
+          "join-on-a-field": "在具有重复值的字段值上连接。非高性能外部连接最适合用于表格（类似 SQL）数据。",
+          "keep-all-rows": "保留任何表中具有值的所有行。联接不同的字段值。性能最佳，最适合用于时间序列。"
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "内",
+          "outer-tabular": "外（表格）",
+          "outer-time-series": "外（时间序列）"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "合并多个序列。返回时间、指标和值作为一行。"
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "序列到行"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "对帧中的字段进行排序。"
       },
       "label-field": "字段",
       "label-reverse": "反转",
       "name": {
-        "sort-by": ""
+        "sort-by": "排序方式"
       },
       "placeholder-select-field": "选择字段"
     },
@@ -13686,13 +13696,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "将时间序列数据转换为表格行，以便以表格或迷你图格式查看。"
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "时间序列到表的转换需要至少一个时间序列帧才能运行。您目前没有。"
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "时间序列到表"
       }
     },
     "time-series-table-transform-editor": {
@@ -13710,15 +13720,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "转置数据帧。"
       },
       "name": {
-        "transpose": ""
+        "transpose": "转置"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "枢轴",
+        "transform": "转换",
+        "translate": "翻译"
       }
     },
     "unary-operation-editor": {
@@ -13727,13 +13737,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "计算新字段",
+        "combine": "合并",
+        "create-new-visualization": "创建新的可视化",
+        "filter": "筛选条件",
+        "perform-spatial-operations": "执行空间操作",
+        "reformat": "重新格式化",
+        "reorder-and-rename": "重新排序和重命名"
       },
       "special-value-options": {
         "description": {
@@ -13804,7 +13814,7 @@
     "title": "组织"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "未找到用户",
     "select-aria-label": "用户选取器",
     "select-placeholder": "开始键入以搜索用户"
   },
@@ -13890,8 +13900,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "您确定要删除变量“{{variableToDelete}}”吗？",
+      "confirmText-delete": "删除",
       "title-delete-variable": "删除变量"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13941,33 +13951,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "如何对此变量的值进行排序",
-      "name-sort": "",
+      "name-sort": "排序",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "按字母顺序（升序）",
+          "alphabetical-caseinsensitive-asc": "按字母顺序（不区分大小写，升序）",
+          "alphabetical-caseinsensitive-desc": "按字母顺序（不区分大小写，降序）",
+          "alphabetical-desc": "按字母顺序（降序）",
+          "disabled": "已禁用",
+          "natural-asc": "自然（升序）",
+          "natural-desc": "自然（降序）",
+          "numerical-asc": "数值（升序）",
+          "numerical-desc": "数值（降序）"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "添加选项",
+      "description": "在查询结果之外添加自定义选项",
+      "label-placeholder": "显示标签",
+      "remove-option-button-label": "移除选项",
+      "value-placeholder": "值，默认空字符串"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "如何使用查询结果对静态选项进行排序"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "默认值",
       "placeholder-default-value-if-any": "默认值（如有）",
       "text-options": "文本选项"
     },
@@ -13996,8 +14006,8 @@
       "description-optional-display-name": "可选显示名称",
       "description-template-variable-characters": "模板变量的名称。（最多 50 个字符）",
       "general": "概况",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "标签",
+      "name-name": "名称",
       "placeholder-descriptive-text": "描述性文本",
       "placeholder-label-name": "标签名称",
       "placeholder-variable-name": "变量名称",
@@ -14013,13 +14023,13 @@
       "tooltip-remove-variable": "移除变量"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "描述"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "切换所有值"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "选择变量类型"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "显示使用情况"
diff --git a/public/locales/zh-Hant/grafana.json b/public/locales/zh-Hant/grafana.json
index b72aa60c9c8..7dc7bc05844 100644
--- a/public/locales/zh-Hant/grafana.json
+++ b/public/locales/zh-Hant/grafana.json
@@ -84,7 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "部分功能穩定 (GA) 且預設為啟用，有些功能目前則處於初步 Beta 階段，可供早期採用。",
       "confirm-modal-body-2": "建議您在進行修改前了解各項功能變更的影響。",
-      "confirmText-save-changes": "",
+      "confirmText-save-changes": "儲存變更",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "一般可用性",
@@ -97,20 +97,20 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "刪除組織",
-      "confirmText-delete": "",
+      "confirmText-delete": "刪除",
       "title-delete": "刪除"
     },
     "anon-users": {
       "not-found": "未找到匿名使用者。"
     },
     "base-user-sessions": {
-      "body-force-logout-from-all-devices": "",
-      "confirmText-confirm-logout": "",
-      "confirmText-force-logout": "",
+      "body-force-logout-from-all-devices": "確定要強制從所有裝置登出嗎？",
+      "confirmText-confirm-logout": "確認登出",
+      "confirmText-force-logout": "強制登出",
       "title-force-logout-from-all-devices": "強制從所有裝置登出"
     },
     "change-org-button": {
-      "confirmText-save": ""
+      "confirmText-save": "儲存"
     },
     "edit-org": {
       "access-denied": "您沒有權限查看此組織中的使用者。若要更新此組織，請聯絡您的伺服器管理員。",
@@ -216,11 +216,11 @@
       "not-editable": "無法編輯此使用者的角色，因為其角色來自您的驗證提供者同步設定。詳情請參閱 <1>Grafana 身分驗證文件</1>。"
     },
     "org-users-table": {
-      "body-delete": "",
+      "body-delete": "確定要刪除使用者{{user}}嗎？",
       "columns": {
         "aria-label-role": "角色"
       },
-      "confirmText-delete": "",
+      "confirmText-delete": "刪除",
       "delete-aria-label": "刪除使用者：{{name}}",
       "title-delete": "刪除"
     },
@@ -252,7 +252,7 @@
       "info-description": "這些系統設定在 grafana.ini 或 custom.ini 中定義（或在 ENV 變數中覆寫）。若要變更這些設定，您目前需要重新啟動 Grafana。"
     },
     "un-themed-org-row": {
-      "confirmText-confirm-removal": ""
+      "confirmText-confirm-removal": "確認移除"
     },
     "upgrade-info": {
       "title": "企業版授權"
@@ -306,17 +306,17 @@
     },
     "user-permissions": {
       "change-button": "變更",
-      "confirmText-change": "",
+      "confirmText-change": "變更",
       "grafana-admin-key": "Grafana 管理員",
       "grafana-admin-no": "否",
       "grafana-admin-yes": "是",
       "title": "權限"
     },
     "user-profile": {
-      "body-delete": "",
-      "body-disable": "",
-      "confirmText-delete-user": "",
-      "confirmText-disable-user": "",
+      "body-delete": "確定要刪除此使用者嗎？",
+      "body-disable": "確定要停用此使用者嗎？",
+      "confirmText-delete-user": "刪除使用者",
+      "confirmText-disable-user": "停用使用者",
       "delete-button": "刪除使用者",
       "disable-button": "停用使用者",
       "edit-button": "編輯",
@@ -331,7 +331,7 @@
       "title-disable-user": "停用使用者"
     },
     "user-profile-row": {
-      "confirmText-save": ""
+      "confirmText-save": "儲存"
     },
     "user-sessions": {
       "browser-column": "瀏覽器和作業系統",
@@ -382,12 +382,12 @@
     },
     "ai": {
       "error-boundary": {
-        "alert-rule-button": "",
-        "feedback-button": "",
-        "improve-annotations-button": "",
-        "improve-labels-button": "",
-        "template-button": "",
-        "triage-button": ""
+        "alert-rule-button": "AI 警示規則按鈕無法載入",
+        "feedback-button": "AI 回饋按鈕無法載入",
+        "improve-annotations-button": "AI 改善註解按鈕無法載入",
+        "improve-labels-button": "AI 改善標籤按鈕無法載入",
+        "template-button": "AI 範本按鈕無法載入",
+        "triage-button": "AI 分類按鈕無法載入"
       }
     },
     "alert": {
@@ -489,7 +489,7 @@
       "title-muting-grouping-and-timings": "靜音、分組和時間"
     },
     "alert-manager-picker": {
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "未找到資料來源"
     },
     "alert-menu": {
       "copy-link": "複製網址",
@@ -515,7 +515,7 @@
       }
     },
     "alert-rule": {
-      "term": ""
+      "term": "警報規則"
     },
     "alert-rule-form": {
       "action-buttons": {
@@ -583,7 +583,7 @@
       "view-configuration": "檢視設定"
     },
     "alertmanager-config": {
-      "confirmText-yes-reset-configuration": "",
+      "confirmText-yes-reset-configuration": "是，清空並重新選擇",
       "gma-manual-configuration-description": "無法手動變更內部 Grafana Alertmanager 設定。若要變更此設定，請透過使用者介面編輯個別資源。",
       "gma-manual-configuration-is-not-supported": "不支援手動設定變更",
       "message": {
@@ -598,13 +598,13 @@
       "title-resetting-alertmanager-configuration": "正在重設 Alertmanager 設定"
     },
     "alertmanager-configuration-version-manager": {
-      "body-restore-configuration-version-unsaved-changes": "",
+      "body-restore-configuration-version-unsaved-changes": "確定要將設定還原至此版本嗎？所有未儲存的變更將會遺失。",
       "columns": {
         "compare": "比較",
         "restore": "還原",
         "text-latest": "最新"
       },
-      "confirmText-yes-restore-configuration": "",
+      "confirmText-yes-restore-configuration": "是，還原設定",
       "loading": "正在載入…",
       "no-previous-configurations": "沒有之前的設定",
       "this-might-take-a-while": "這可能需要一段時間...",
@@ -884,10 +884,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "聯絡點「{{contactPointName}}」的更多動作",
-      "ariaLabel-delete": "",
+      "ariaLabel-delete": "刪除",
       "button-edit": "編輯",
       "button-view": "檢視",
-      "export-ariaLabel-export": "",
+      "export-ariaLabel-export": "匯出",
       "export-label-export": "匯出",
       "label-delete": "刪除",
       "label-manage-permissions": "管理權限",
@@ -1420,7 +1420,7 @@
       "label-disable-resolved-message": "停用已解決的訊息"
     },
     "grafana-evaluation-behavior-step": {
-      "loadingMessage-loading-groups": "",
+      "loadingMessage-loading-groups": "正在載入群組…",
       "message": {
         "must-be-a-positive-integer": "必須為正整數。",
         "must-enter-a-group-name": "必須輸入群組名稱"
@@ -1517,7 +1517,7 @@
       "group-loading-error": "載入群組時發生錯誤",
       "interval": "間隔",
       "namespace": "命名空間",
-      "new": "",
+      "new": "新",
       "title": {
         "back": ""
       }
@@ -1549,7 +1549,7 @@
     },
     "group-loader": {
       "group-load-failed": "無法從「{{ namespaceName }}」中的群組「{{ groupName }}」載入規則",
-      "no-rules": ""
+      "no-rules": "此群組中未找到規則"
     },
     "group-status": {
       "content-the-group-is-being-deleted": "正在刪除群組"
@@ -1878,10 +1878,10 @@
           }
         }
       },
-      "noOptionsMessage-no-datasources-found": ""
+      "noOptionsMessage-no-datasources-found": "未找到資料來源"
     },
     "mute-timing-actions-button": {
-      "body-delete-mute-timing": ""
+      "body-delete-mute-timing": "確定要刪除「{{muteTiming}}」嗎？"
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "已停用",
@@ -2132,10 +2132,10 @@
         "conflict": "通知政策樹已由其他使用者更新。",
         "error-code": "錯誤訊息：「{{error}}」",
         "routes": {
-          "conflictingMatchers": ""
+          "conflictingMatchers": "無法新增或更新路由：如果我們合併了比對器「{{-matchers}}」，比對器會與外部路由樹衝突。這將使路由無法到達。"
         },
         "suffix": "請重新整理此頁面並再試一次。",
-        "title": ""
+        "title": "無法新增或更新通知政策"
       },
       "n-more-policies_other": "{{count}} 個其他政策"
     },
@@ -2190,7 +2190,7 @@
     "query-and-expressions-step": {
       "add-query": "新增查詢",
       "body-queries-expressions-configured": "建立至少一個查詢或表達式以便收到警報",
-      "confirmText-deactivate": "",
+      "confirmText-deactivate": "停用",
       "expressions": "表達式",
       "loading-data-sources": "正在載入資料來源…",
       "manipulate-returned-queries-other-operations": "使用數學和其他運算來處理查詢返回的資料。",
@@ -2244,7 +2244,7 @@
       }
     },
     "recording-rule": {
-      "term": ""
+      "term": "錄製規則"
     },
     "recording-rule-editor": {
       "error-no-query-editor": "由於以下原因，無法載入查詢編輯器：{{errorMessage}}"
@@ -2264,7 +2264,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "您需要為複製的規則設定新的評估群組，因為原始群組已佈建，無法用於在使用者介面中建立的規則。",
       "body-not-provisioned": "新規則將<1>不會</1>標記為已佈建的規則。",
-      "confirmText-copy": "",
+      "confirmText-copy": "複製",
       "title-copy-provisioned-alert-rule": "複製已設定的警報規則"
     },
     "redirect-to-rule-viewer": {
@@ -2487,7 +2487,7 @@
       "new-alert-rule": "新的警報規則",
       "new-datasource-recording-rule": "新的資料來源錄製規則",
       "new-grafana-recording-rule": "新的 Grafana 錄製規則",
-      "new-rule-for-export": "",
+      "new-rule-for-export": "用於匯出的新警報規則",
       "pagination": {
         "next-page": "顯示更多內容…"
       },
@@ -2658,7 +2658,7 @@
     },
     "settings": {
       "tabs": {
-        "alert-managers": ""
+        "alert-managers": "警報管理員"
       }
     },
     "settings-content": {
@@ -2796,7 +2796,7 @@
     },
     "template-preview": {
       "aria-label-refresh-preview": "重新整理預覽",
-      "empty-state": "",
+      "empty-state": "新增範本內容以查看預覽",
       "label-preview": "預覽",
       "refresh": "更新"
     },
@@ -2815,7 +2815,7 @@
       "loading": "正在載入…",
       "template-options": {
         "ariaLabel": {
-          "select-notification-template": ""
+          "select-notification-template": "選取通知範本"
         },
         "label": {
           "select-notification-template": "選取通知範本"
@@ -2843,8 +2843,8 @@
     },
     "templates-table": {
       "actions": "動作",
-      "body-delete-template-group": "",
-      "confirmText-yes-delete": "",
+      "body-delete-template-group": "確定要刪除範本群組「{{template}}」嗎？",
+      "confirmText-yes-delete": "是的，刪除",
       "no-templates-defined": "未定義任何範本。",
       "template-group": "範本群組",
       "title-delete-template-group": "刪除範本群組"
@@ -2899,7 +2899,7 @@
     },
     "titles": {
       "group-view": {
-        "subtitle": ""
+        "subtitle": "管理警報規則、記錄規則和評估間隔"
       }
     },
     "to-gma": {
@@ -2979,7 +2979,7 @@
     },
     "use-delete-modal": {
       "modal": {
-        "confirmText-yes-delete": ""
+        "confirmText-yes-delete": "是的，刪除"
       }
     },
     "use-delete-policy-modal": {
@@ -3139,7 +3139,7 @@
       "annotation": "註解",
       "first-value": "第一項數值",
       "from": "",
-      "noOptionsMessage-unknown-field-names": ""
+      "noOptionsMessage-unknown-field-names": "未知欄位名稱"
     },
     "empty-state": {
       "button-title": "新增注釋查詢",
@@ -3149,12 +3149,12 @@
     },
     "get-annotation-event-names": {
       "help": {
-        "annotation-treated-as-range": "",
-        "results-split-on-comma": ""
+        "annotation-treated-as-range": "定義此欄位時，註解將被視為範圍",
+        "results-split-on-comma": "結果將以逗號 (,) 分隔"
       },
       "placeholder": {
-        "text-or-the-first-field": "",
-        "time-or-the-first-field": ""
+        "text-or-the-first-field": "{{defaultField}}，或第一個文字欄位",
+        "time-or-the-first-field": "{{defaultField}}，或第一個時間欄位"
       }
     },
     "standard-annotation-query-editor": {
@@ -3232,9 +3232,9 @@
       "define-allowed-teams-ids-label": "定義允許的團隊 ID",
       "display-name-description": "將在登入頁面上顯示為「使用...登入」。如果您使用多個身分提供者或 SSO 協定，這項功能會很有幫助。",
       "display-name-label": "顯示名稱",
-      "domain-hint-description": "",
-      "domain-hint-label": "",
-      "domain-hint-valid-domain": "",
+      "domain-hint-description": "用於指示 Azure AD/Entra ID 租用戶中使用者領域的參數，並簡化登入流程。",
+      "domain-hint-label": "網域提示",
+      "domain-hint-valid-domain": "此欄位必須為有效的網域。",
       "email-attribute-name-description": "設定用來在 OAuth2 ID 權杖的屬性對應中查找使用者電子郵件的金鑰名稱。",
       "email-attribute-name-label": "電子郵件屬性名稱",
       "email-attribute-path-description": "用來從使用者資訊中查找使用者電子郵件的 JMESPath 表達式。",
@@ -3251,11 +3251,11 @@
       "id-token-attribute-name-label": "ID 權杖屬性名稱",
       "login-attribute-path-description": "用於從使用者 ID 權杖中查找使用者登入的 JMESPath 表達式。",
       "login-attribute-path-label": "登入屬性路徑",
-      "login-prompt-consent": "",
-      "login-prompt-description": "",
-      "login-prompt-label": "",
-      "login-prompt-login": "",
-      "login-prompt-select-account": "",
+      "login-prompt-consent": "同意",
+      "login-prompt-description": "表示使用者使用 IdP 登入時的使用者互動類型。",
+      "login-prompt-label": "登入提示",
+      "login-prompt-login": "登入",
+      "login-prompt-select-account": "選擇帳戶",
       "managed-identity-client-id-description": "OAuth2 應用程式中聯合身分憑證的受控身分用戶端 ID。",
       "managed-identity-client-id-label": "FIC 受控身分用戶端 ID",
       "name-attribute-path-description": "用於從使用者 ID 權杖中查找使用者名稱的 JMESPath 表達式。\n此名稱將用作使用者的顯示名稱。",
@@ -3291,7 +3291,7 @@
       "team-ids-github": "團隊 ID 的整數清單。",
       "team-ids-label": "團隊 ID",
       "team-ids-numbers": "團隊 ID 必須為數字。",
-      "team-ids-other": "",
+      "team-ids-other": "團隊識別碼的字串清單。",
       "team-ids-placeholder": "輸入團隊 ID，然後按 Enter 新增",
       "teams-url-description": "用於查詢團隊 ID 的網址。如未設定，則預設值為 /teams。",
       "teams-url-description-oauth": "若您設定了「{{ teamsURLLabel }}」，則必須同時設定「{{ teamIDsAttributePathLabel }}」。",
@@ -3335,7 +3335,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "重設為預設值"
       },
-      "confirmText-reset": "",
+      "confirmText-reset": "重設",
       "disable": "停用",
       "disabling": "正在停用…",
       "discard": "捨棄",
@@ -3355,7 +3355,7 @@
       "text-badge-not-enabled": "未啟用"
     },
     "scim-banner": {
-      "message": ""
+      "message": "SCIM 目前正在開發中，不建議用於生產。請謹慎使用，並做好可能發生變更的準備。"
     },
     "server-discovery-modal": {
       "label-the-wellknownopenidconfiguration-endpoint-for-your-id-p": "您的 IdP 的 .well-known/openid-configuration 端點",
@@ -3473,8 +3473,8 @@
   },
   "browse-dashboards": {
     "action": {
-      "bulk-delete-provisioned-resources": "",
-      "bulk-move-provisioned-resources": "",
+      "bulk-delete-provisioned-resources": "批次刪除已佈建的資源",
+      "bulk-move-provisioned-resources": "批次移動已佈建的資源",
       "cancel-button": "取消",
       "confirmation-text": "刪除",
       "delete-button": "刪除",
@@ -3493,8 +3493,8 @@
       "move-modal-title": "移動",
       "moving": "正在移動…",
       "new-folder-name-required-phrase": "必須要有資料夾名稱。",
-      "selected-mix-resources-modal-text": "",
-      "selected-mix-resources-modal-title": ""
+      "selected-mix-resources-modal-text": "您已選取已佈建和非佈建資源。這些資源無法一起處理。請僅選取已佈建的資源或僅選取非佈建資源，然後再試一次。",
+      "selected-mix-resources-modal-title": "已選取混合資源類型"
     },
     "actions": {
       "button-to-recently-deleted": "最近刪除"
@@ -3507,24 +3507,24 @@
       "this-folder-is-empty": "此資料夾為空"
     },
     "bulk-action-resources-form": {
-      "all-deleted": "",
-      "all-moved": "",
-      "button-done": "",
-      "progress-title": "",
-      "failed-alert_other": ""
+      "all-deleted": "已成功刪除所有資源",
+      "all-moved": "已成功移動所有資源",
+      "button-done": "完成",
+      "progress-title": "成功",
+      "failed-alert_other": "{{count}} 個項目失敗"
     },
     "bulk-delete-resources-form": {
-      "button-cancel": "",
-      "button-delete": "",
-      "button-deleting": "",
-      "delete-warning": "",
-      "error-path-not-found": ""
+      "button-cancel": "取消",
+      "button-delete": "刪除",
+      "button-deleting": "正在刪除…",
+      "delete-warning": "這將刪除所選資料夾及其子資料夾。總體而言，這將影響：",
+      "error-path-not-found": "找不到路徑"
     },
     "bulk-move-resources-form": {
-      "button-cancel": "",
-      "button-move": "",
-      "button-moving": "",
-      "deleting": "",
+      "button-cancel": "取消",
+      "button-move": "移動",
+      "button-moving": "正在移動…",
+      "deleting": "正在刪除",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3532,14 +3532,14 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "",
-      "error-path-not-found": "",
-      "error-target-folder-path-missing": "",
-      "error-title": "",
-      "move-warning": "",
-      "moving": "",
-      "progress": "",
-      "target-folder": ""
+      "error-file-content-not-found": "找不到檔案內容",
+      "error-path-not-found": "找不到路徑",
+      "error-target-folder-path-missing": "缺少目標資料夾路徑",
+      "error-title": "目標資料夾錯誤",
+      "move-warning": "這將移動所選資料夾及其子資料夾。總體而言，這將影響：",
+      "moving": "正在移動",
+      "progress": "進度：已完成 {{current}} 個，共 {{total}} 個",
+      "target-folder": "目標資料夾"
     },
     "counts": {
       "alertRule_other": "{{count}} 個警報規則",
@@ -3565,7 +3565,7 @@
       "button-delete": "刪除",
       "button-deleting": "正在刪除…",
       "delete-warning": "這將刪除此資料夾及其所有子資料夾。總體而言，這會影響：",
-      "success-message": ""
+      "success-message": "已成功刪除資料夾"
     },
     "descendant-count": {
       "title-unable-to-retrieve-descendant-information": "無法擷取子系資訊"
@@ -3590,7 +3590,7 @@
       "empty-message": "未發現資料夾",
       "error-title": "載入資料夾時發生錯誤",
       "non-folder-item": "非資料夾 {{itemKind}} {{itemUID}}",
-      "root-title": "",
+      "root-title": "儀表板",
       "search-placeholder": "搜尋資料夾",
       "unknown-error": "未知錯誤"
     },
@@ -3619,7 +3619,7 @@
       "folder-name-input-placeholder-enter-folder-name": "輸入資料夾名稱",
       "label-folder-name": "資料夾名稱",
       "text-pull-request-created": "已建立拉取請求，其中包含對此資料夾的變更：",
-      "text-your-folder-will-be-created-as": "",
+      "text-your-folder-will-be-created-as": "您的資料夾將建立為「{{folderName}}」",
       "title-pull-request-created": "已建立拉取請求",
       "title-this-repository-is-read-only": "此存放庫為唯讀"
     },
@@ -3738,7 +3738,7 @@
     "category-selected-connection": "所選連線",
     "category-selected-element": "所選元素 ({{element}})",
     "category-size": "大小",
-    "category-tooltip": "",
+    "category-tooltip": "工具提示",
     "cloud-item": {
       "category-cloud": "雲端",
       "label": {
@@ -3982,10 +3982,10 @@
       }
     },
     "tooltip-options": {
-      "name-tooltip-mode": "",
+      "name-tooltip-mode": "工具提示模式",
       "tooltip-mode-options": {
-        "label-disabled": "",
-        "label-enabled": ""
+        "label-disabled": "已停用",
+        "label-enabled": "已啟用"
       }
     },
     "tree-navigation-editor": {
@@ -4354,7 +4354,7 @@
   },
   "dashbaord-scene": {
     "variable-editor-form": {
-      "run-query": ""
+      "run-query": "執行查詢"
     }
   },
   "dashboard": {
@@ -4517,7 +4517,7 @@
     "dash-nav": {
       "on-open-snapshot-original": {
         "confirmText": {
-          "proceed": ""
+          "proceed": "繼續"
         },
         "title": {
           "proceed-to-external-site": "是否繼續前往外部網站？"
@@ -4623,11 +4623,11 @@
     },
     "edit-actions": {
       "add": "新增 {{typeName}}",
-      "add-conditional-rule": "",
-      "duplicate-panel": "",
-      "edit-query-result-rule": "",
-      "edit-template-variable-rule": "",
-      "edit-time-range-rule": "",
+      "add-conditional-rule": "新增「{{ruleDescription}}」規則",
+      "duplicate-panel": "複製面板",
+      "edit-query-result-rule": "變更查詢結果規則",
+      "edit-template-variable-rule": "變更範本變數規則",
+      "edit-time-range-rule": "變更時間範圍規則",
       "move": "移動 {{typeName}}",
       "panel-background": "變更面板背景",
       "panel-description": "變更面板描述",
@@ -4642,7 +4642,7 @@
     "edit-pane": {
       "elements": {
         "dashboard": "儀表板",
-        "element": "",
+        "element": "元件",
         "local-variable": "本機變數",
         "multiple-elements": "多個元素",
         "multiple-elements-delete-text": "確定要刪除這些元素嗎？",
@@ -4724,10 +4724,10 @@
     },
     "export": {
       "button": {
-        "label": ""
+        "label": "匯出儀表板"
       },
       "menu": {
-        "label": ""
+        "label": "匯出儀表板功能表"
       }
     },
     "fetch-dashboard": {
@@ -4749,9 +4749,9 @@
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "預設",
+          "shared-crosshair": "共用十字線",
+          "shared-tooltip": "共用工具提示"
         }
       }
     },
@@ -4804,14 +4804,14 @@
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "不要將註解資料傳送至以下面板",
+        "annotation-panels-support-annotations": "將註釋資料傳送至所有支援註解的面板",
+        "annotations-explicitly-listed-panels": "將註解傳送至明確列出的面板"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "所有面板",
+        "all-panels-except": "所有面板，以下除外",
+        "selected-panels": "選取的面板"
       }
     },
     "get-panel-frame-category": {
@@ -5072,7 +5072,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "確定要將儀表板還原到版本{{version}}嗎？所有未儲存變更將會遺失。",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "是，還原至版本 {{version}}",
       "title-restore-version": "還原版本"
     },
     "row-options-button": {
@@ -5124,7 +5124,7 @@
       }
     },
     "save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "儀表板已儲存"
     },
     "save-dashboard-as-button": {
       "save-as": "另存為"
@@ -5160,7 +5160,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "所選資料夾中已存在名稱相同的儀表板。<1></1><2>仍要儲存此儀表板嗎？</2>",
       "body-version-mismatch": "其他人已更新此儀表板<1></1><2>仍要儲存此儀表板嗎？</2>",
-      "confirmText-save-and-overwrite": "",
+      "confirmText-save-and-overwrite": "儲存並覆寫",
       "title-name-exists": "衝突",
       "title-version-mismatch": "衝突"
     },
@@ -5357,9 +5357,9 @@
       "label-apply-transformation-to": "套用轉換至"
     },
     "transformation-operation-row": {
-      "body-delete": "",
+      "body-delete": "請注意，移除一個轉換可能會破壞其他轉換。如果只有一個轉換，您將返回主選擇畫面。",
       "render-actions": {
-        "confirmText-delete": "",
+        "confirmText-delete": "刪除",
         "title-debug": "除錯",
         "title-disable-transformation": "停用轉換",
         "title-filter": "篩選",
@@ -5380,16 +5380,16 @@
       "placeholder-search-for-transformation": "搜尋轉換",
       "show-images": "顯示圖片",
       "title-add-another-transformation": "新增另一個轉換",
-      "view-all": ""
+      "view-all": "檢視全部"
     },
     "un-theme-transformations-editor": {
-      "body-delete-all-transformations": ""
+      "body-delete-all-transformations": "刪除所有轉換後，您將返回主選擇畫面。"
     },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "新增另一個轉換"
       },
-      "confirmText-delete-all": "",
+      "confirmText-delete-all": "全部刪除",
       "delete-all-transformations": "刪除所有轉換",
       "title-delete-all-transformations": "是否要刪除所有轉換？",
       "tooltip-clear-search": "清除搜尋",
@@ -5419,16 +5419,16 @@
     },
     "variable": {
       "description": {
-        "action": ""
+        "action": "變更變數描述"
       },
       "hide": {
-        "action": ""
+        "action": "變更變數隱藏選項"
       },
       "label": {
-        "action": ""
+        "action": "變更變數標籤"
       },
       "name": {
-        "action": ""
+        "action": "變更變數名稱"
       }
     },
     "version-history-comparison": {
@@ -5440,7 +5440,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "切換{{version}}版本選擇",
       "date": "日期",
-      "name-latest": "",
+      "name-latest": "最新",
       "notes": "備註",
       "restore": "還原",
       "updated-by": "更新者",
@@ -5518,7 +5518,7 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "以 CSV 格式提供維度：{{name}}，{{value}}",
       "label-data-source": "資料來源",
       "label-use-static-key-dimensions": "使用靜態金鑰維度",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "允許自訂值"
     },
     "add-to-dashboard": {
       "message": {
@@ -5592,7 +5592,7 @@
     },
     "config-public-dashboard": {
       "confirmText": {
-        "revoke-public-url": ""
+        "revoke-public-url": "撤銷公共網址"
       },
       "title": {
         "revoke-public-url": "撤銷公共網址"
@@ -5605,7 +5605,7 @@
     },
     "custom-variable-form": {
       "custom-options": "自訂選項",
-      "name-values-separated-comma": "",
+      "name-values-separated-comma": "以逗號分隔的值",
       "selection-options": "選擇選項"
     },
     "dashboard-edit-pane-renderer": {
@@ -5626,8 +5626,8 @@
       "label-with-tags": "使用標記",
       "link-type-options": {
         "label": {
-          "dashboards": "",
-          "link": ""
+          "dashboards": "儀表板",
+          "link": "連結"
         }
       },
       "placeholder-open-dashboard": "打開儀表板"
@@ -5670,8 +5670,8 @@
       "data-source-options": "資料來源選項",
       "description-instance-name-filter": "在變數值清單中選擇資料來源執行個體的正規表達式篩選器。全部留空。",
       "example-instance-name-filter": "範例：<codeExample />",
-      "name-instance-name-filter": "",
-      "name-type": "",
+      "name-instance-name-filter": "執行個體名稱篩選",
+      "name-type": "類型",
       "selection-options": "選擇選項"
     },
     "default-grid-layout-manager": {
@@ -5687,7 +5687,7 @@
       "delete-action": "刪除儀表板",
       "deleting": "正在刪除…",
       "drawer-title": "刪除已佈建的儀表板",
-      "success-message": ""
+      "success-message": "儀表板已成功刪除"
     },
     "description-label": {
       "description": "說明"
@@ -5716,15 +5716,15 @@
     "general-settings-edit-view": {
       "editable_options": {
         "label": {
-          "editable": "",
-          "readonly": ""
+          "editable": "可編輯",
+          "readonly": "唯讀"
         }
       },
       "graph_tooltip_options": {
         "label": {
-          "default": "",
-          "shared-crosshair": "",
-          "shared-tooltip": ""
+          "default": "預設",
+          "shared-crosshair": "共用十字線",
+          "shared-tooltip": "共用工具提示"
         }
       }
     },
@@ -5736,36 +5736,36 @@
     },
     "get-editable-variables": {
       "description": {
-        "add-keyvalue-filters-on-the-fly": "",
-        "dynamically-switch-source-multiple-panels": "",
-        "group": "",
-        "hidden-constant-variable": "",
-        "users-enter-arbitrary-strings-textbox": "",
-        "values-are-static-and-defined-manually": "",
-        "values-fetched-source-query": "",
-        "values-timespans": ""
+        "add-keyvalue-filters-on-the-fly": "即時新增鍵／值篩選條件",
+        "dynamically-switch-source-multiple-panels": "動態切換多個面板的資料來源",
+        "group": "即時新增鍵以便進行分組",
+        "hidden-constant-variable": "隱藏的常數變數，對於您要共用的儀表板中的指標前置詞很有用",
+        "users-enter-arbitrary-strings-textbox": "使用者可以在文字方塊中輸入任何任意字串",
+        "values-are-static-and-defined-manually": "值是靜態的，並且是手動定義的",
+        "values-fetched-source-query": "從資料來源查詢中擷取值",
+        "values-timespans": "值為時間跨度，例如 1 分鐘、1 小時、1 天"
       },
       "name": {
-        "ad-hoc-filters": "",
-        "constant": "",
-        "custom": "",
-        "data-source": "",
-        "group-by": "",
-        "interval": "",
-        "query": "",
-        "textbox": ""
+        "ad-hoc-filters": "隨機篩選條件",
+        "constant": "常數",
+        "custom": "自訂",
+        "data-source": "資料來源",
+        "group-by": "分組依據",
+        "interval": "間隔",
+        "query": "查詢",
+        "textbox": "文字方塊"
       }
     },
     "get-panel-filters": {
       "description": {
-        "annotation-following-panels": "",
-        "annotation-panels-support-annotations": "",
-        "annotations-explicitly-listed-panels": ""
+        "annotation-following-panels": "不要將註解資料傳送至以下面板",
+        "annotation-panels-support-annotations": "將註釋資料傳送至所有支援註解的面板",
+        "annotations-explicitly-listed-panels": "將註解傳送至明確列出的面板"
       },
       "label": {
-        "all-panels": "",
-        "all-panels-except": "",
-        "selected-panels": ""
+        "all-panels": "所有面板",
+        "all-panels-except": "所有面板，以下除外",
+        "selected-panels": "選取的面板"
       }
     },
     "get-panel-frame-options": {
@@ -5793,7 +5793,7 @@
       "group-by-options": "按選項分組",
       "label-data-source": "資料來源",
       "label-use-static-group-by-dimensions": "使用靜態群組維度",
-      "name-allow-custom-values": ""
+      "name-allow-custom-values": "允許自訂值"
     },
     "help-wizard": {
       "copy-to-clipboard": "複製至剪貼簿",
@@ -5829,14 +5829,14 @@
       "apply": "套用"
     },
     "interval-variable-form": {
-      "description-auto-option": "",
+      "description-auto-option": "透過將時間範圍除以指定的計數來動態計算間隔",
       "description-calculated-value-below-threshold": "計算值不會低於此閾值",
       "description-step-count": "應該將目前的時間範圍除以次數來計算數值",
       "interval-options": "間隔選項",
-      "name-auto-option": "",
-      "name-min-interval": "",
-      "name-step-count": "",
-      "name-values": ""
+      "name-auto-option": "自動選項",
+      "name-min-interval": "最小間隔",
+      "name-step-count": "步數",
+      "name-values": "值"
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5856,19 +5856,19 @@
       "usage-count_other": "用於 {{count}} 個儀表板"
     },
     "move-provisioned-dashboard-form": {
-      "alert-error-moving-dashboard": "",
-      "api-error": "",
-      "cancel-action": "",
-      "current-file-not-found": "",
-      "drawer-title": "",
-      "file-load-error": "",
-      "loading-file-data": "",
-      "move-action": "",
-      "move-read-only-message": "",
-      "moving": "",
-      "success-message": "",
-      "target-path-label": "",
-      "title-this-repository-is-read-only": ""
+      "alert-error-moving-dashboard": "移動儀表板時發生錯誤",
+      "api-error": "無法移動儀表板",
+      "cancel-action": "取消",
+      "current-file-not-found": "找不到目前的儀表板檔案",
+      "drawer-title": "移動已佈建的儀表板",
+      "file-load-error": "載入儀表板發生錯誤",
+      "loading-file-data": "正在載入儀表板資料",
+      "move-action": "移動儀表板",
+      "move-read-only-message": "由於儲存庫為唯讀，因此無法直接從 Grafana 移動此儀表板。若要移動此儀表板，請移動您 Git 儲存庫中的檔案。",
+      "moving": "正在移動…",
+      "success-message": "儀表板已成功移動",
+      "target-path-label": "目標路徑",
+      "title-this-repository-is-read-only": "此儲存庫為唯讀"
     },
     "name-already-exists-error": {
       "body-name-already-exists": "所選資料夾中已存在名稱相同的儀表板。仍要儲存此儀表板嗎？",
@@ -5876,7 +5876,7 @@
     },
     "on-open-snapshot-original-dashboard": {
       "confirmText": {
-        "proceed": ""
+        "proceed": "繼續"
       },
       "title": {
         "proceed-to-external-site": "是否繼續前往外部網站？"
@@ -5913,8 +5913,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "新增另一個轉換",
-      "body-delete-all-transformations": "",
-      "confirmText-delete-all": "",
+      "body-delete-all-transformations": "刪除所有轉換後，您將返回主選擇畫面。",
+      "confirmText-delete-all": "全部刪除",
       "delete-all-transformations": "刪除所有轉換",
       "title-delete-all-transformations": "是否要刪除所有轉換？"
     },
@@ -5967,13 +5967,13 @@
       "description-examples": "已命名的擷取群組可用於分隔顯示文字與數值（<1>請參閱範例</1>）。",
       "description-optional": "若想擷取系列名稱或指標節點區段的一部分，則為可選。",
       "label-data-source": "資料來源",
-      "label-static-options-sort": "",
+      "label-static-options-sort": "靜態選項排序",
       "label-target-data-source": "目標資料來源",
-      "label-use-static-options": "",
-      "name-regex": "",
+      "label-use-static-options": "使用靜態選項",
+      "name-regex": "Regex",
       "query-options": "查詢選項",
       "selection-options": "選擇選項",
-      "static-options-legend": ""
+      "static-options-legend": "靜態選項"
     },
     "resource-export": {
       "label": {
@@ -5986,7 +5986,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "確定要將儀表板還原到版本{{version}}嗎？所有未儲存變更將會遺失。",
-      "confirmText-restore-version": "",
+      "confirmText-restore-version": "是，還原至版本 {{version}}",
       "title-restore-version": "還原版本"
     },
     "save-button": {
@@ -6005,7 +6005,7 @@
       "render-footer": {
         "title-failed-to-save-dashboard": "無法儲存儀表板"
       },
-      "required": ""
+      "required": "必填"
     },
     "save-dashboard-drawer": {
       "tabs": {
@@ -6032,8 +6032,8 @@
         "title-someone-else-has-updated-this-dashboard": "其他人已更新此儀表板",
         "would-still-dashboard": "仍要儲存此儀表板嗎？"
       },
-      "schema-v2-library-panels-export": "",
-      "schema-v2-library-panels-export-title": "",
+      "schema-v2-library-panels-export": "由於新儀表板架構 (V2) 的限制，在外部匯出期間，資料庫面板將轉換為具有內嵌內容的常規面板。",
+      "schema-v2-library-panels-export-title": "資料庫面板將轉換為常規面板",
       "title-dashboard-drastically-changed": "已永久變更儀表板"
     },
     "save-dashboard-form-common-options": {
@@ -6079,10 +6079,10 @@
       "description-enables-multiple-values-selected": "啟用同時選取多個值",
       "description-enables-option-include-variables": "啟用選項以包含所有值",
       "description-enables-users-custom-values": "使用者能夠將自訂值新增至清單",
-      "name-allow-custom-values": "",
-      "name-custom-all-value": "",
-      "name-include-all-option": "",
-      "name-multi-value": ""
+      "name-allow-custom-values": "允許自訂值",
+      "name-custom-all-value": "自訂所有數值",
+      "name-include-all-option": "包含所有選項",
+      "name-multi-value": "多值"
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "切換分享選單"
@@ -6103,7 +6103,7 @@
       }
     },
     "text-box-variable": {
-      "name-default-value": ""
+      "name-default-value": "預設值"
     },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "（選填）",
@@ -6128,8 +6128,8 @@
       }
     },
     "unlink-modal": {
-      "body-unlink-panel": "",
-      "confirmText-yes-unlink": "",
+      "body-unlink-panel": "如果取消連結此面板，您可以在不影響任何其他儀表板的情況下加以編輯。但是，一旦您進行變更，您將無法恢復為其原始的可重複使用面板。",
+      "confirmText-yes-unlink": "是的，取消連結",
       "title-really-unlink-panel": "確定要取消連結此面板嗎？"
     },
     "unsaved-changes-modal": {
@@ -6147,7 +6147,7 @@
       }
     },
     "use-save-dashboard": {
-      "message-dashboard-saved": ""
+      "message-dashboard-saved": "儀表板已儲存"
     },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "此變數未被任何變數或儀表板參照使用。",
@@ -6159,15 +6159,15 @@
       "aria-label-variable-editor-form": "變數編輯器表單",
       "back-to-list": "返回清單",
       "confirmText": {
-        "delete-variable": ""
+        "delete-variable": "刪除變數"
       },
       "delete": "刪除",
       "description-optional-display-name": "可選的顯示名稱",
       "description-template-variable-characters": "範本變數的名稱。（最多 50 個字元）",
       "general": "一般",
-      "name-description": "",
-      "name-label": "",
-      "name-name": "",
+      "name-description": "說明",
+      "name-label": "標籤",
+      "name-name": "名稱",
       "placeholder-descriptive-text": "描述性文字",
       "placeholder-label-name": "標籤名稱",
       "placeholder-variable-name": "變數名稱",
@@ -6182,8 +6182,8 @@
       "variable": "變數"
     },
     "variable-editor-list-row": {
-      "body-delete-variable": "",
-      "confirmText-delete-variable": "",
+      "body-delete-variable": "確定要刪除嗎：{{variable}}？",
+      "confirmText-delete-variable": "刪除變數",
       "title-delete-variable": "刪除變數",
       "tooltip-duplicate-variable": "複製變數",
       "tooltip-remove-variable": "移除變數"
@@ -6191,15 +6191,15 @@
     "variable-hide-select": {
       "hide_options": {
         "label": {
-          "label": "",
-          "nothing": "",
-          "variable": ""
+          "label": "標籤",
+          "nothing": "無內容",
+          "variable": "變數"
         }
       },
       "label": "隱藏"
     },
     "variable-type-select": {
-      "name-variable-type": ""
+      "name-variable-type": "變數類型"
     },
     "variable-usages-button": {
       "title-show-usages": "顯示以下項目的使用情況：{{variableId}}",
@@ -6227,7 +6227,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "切換{{version}}版本選擇",
       "date": "日期",
-      "name-latest": "",
+      "name-latest": "最新",
       "notes": "備註",
       "restore": "還原",
       "updated-by": "更新者",
@@ -6618,7 +6618,7 @@
     },
     "color-dimension-editor": {
       "label-fixed-color": "固定色彩",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "未找到欄位"
     },
     "file-dropzone-custom-children": {
       "upload": "上傳"
@@ -6657,7 +6657,7 @@
       },
       "label-limit": "限制",
       "label-value": "數值",
-      "noOptionsMessage-no-fields-found": "",
+      "noOptionsMessage-no-fields-found": "未找到欄位",
       "scalar-options": {
         "description-clamped": "使用欄位值，固定最大值和最小值",
         "description-mod": "使用欄位值，從最大值模組化",
@@ -6668,13 +6668,13 @@
     "scale-dimension-editor": {
       "fixed-value-option": {
         "label": {
-          "fixed-value": ""
+          "fixed-value": "固定值"
         }
       },
       "label-max": "最大",
       "label-min": "最小",
       "label-value": "數值",
-      "noOptionsMessage-no-fields-found": ""
+      "noOptionsMessage-no-fields-found": "未找到欄位"
     },
     "text-dimension-editor": {
       "aria-label-clear-value": "",
@@ -6784,6 +6784,7 @@
       }
     }
   },
+  "exemplar-tooltip-header": "",
   "explore": {
     "accordian-logs": {
       "events": "事件",
@@ -7056,7 +7057,7 @@
       }
     },
     "pane": {
-      "loading-placeholder": ""
+      "loading-placeholder": "正在載入…"
     },
     "prev": "上一頁",
     "queryless-apps-extensions": {
@@ -7243,7 +7244,7 @@
           "start-time": "開始時間："
         }
       },
-      "share-span": "",
+      "share-span": "分享",
       "warnings": "警告"
     },
     "span-filters": {
@@ -7253,8 +7254,8 @@
       "aria-label-select-service-name-operator": "選取服務名稱運算子",
       "aria-label-select-span-name": "選取範圍名稱",
       "aria-label-select-span-name-operator": "選擇範圍名稱運算子",
-      "ariaLabel-select-max-span-duration": "",
-      "ariaLabel-select-min-span-duration": "",
+      "ariaLabel-select-max-span-duration": "選擇最大跨度持續時間",
+      "ariaLabel-select-min-span-duration": "選取最小跨度持續時間",
       "label-collapse": "範圍篩選器",
       "label-duration": "持續時間",
       "label-service-name": "服務名稱",
@@ -7326,23 +7327,23 @@
     },
     "trace-page-header": {
       "aria-label-share-dropdown": "",
-      "duration": "",
-      "export-started": "",
-      "give-feedback": "",
-      "link-copied": "",
-      "path": "",
-      "route": "",
-      "services": "",
-      "share": "",
-      "share-copy-link": "",
-      "share-export-json": "",
-      "share-tooltip": "",
-      "start-time": "",
-      "target": "",
-      "title-share-thoughts-about-tracing-grafana": "",
-      "tooltip-url": "",
-      "trace-id": "",
-      "url": ""
+      "duration": "持續時間",
+      "export-started": "匯出已開始",
+      "give-feedback": "意見回饋",
+      "link-copied": "連結已復製到剪貼簿",
+      "path": "路徑",
+      "route": "路徑",
+      "services": "服務",
+      "share": "分享",
+      "share-copy-link": "複製連結",
+      "share-export-json": "匯出為 JSON",
+      "share-tooltip": "分享追蹤",
+      "start-time": "開始時間",
+      "target": "目標",
+      "title-share-thoughts-about-tracing-grafana": "分享對於在 Grafana 中進行追蹤的想法。",
+      "tooltip-url": "{{route}} 或 {{url}} 或 {{target}} 或 {{path}}",
+      "trace-id": "追蹤 ID",
+      "url": "網址"
     },
     "trace-page-search-bar": {
       "aria-label-clear-filters": "清除篩選條件按鈕",
@@ -7442,7 +7443,7 @@
       "when": "當"
     },
     "expression-query-editor": {
-      "helper-text-sql": "",
+      "helper-text-sql": "針對從資料來源返回的表格執行 MySQL 特定語法 SQL。資料來源查詢（即「A」、「B」）可作為表格使用，並由查詢名稱引用。欄位可作為從資料來源返回的欄使用。",
       "label-operation": "操作"
     },
     "math": {
@@ -7473,7 +7474,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "清除資料夾",
-    "noOptionsMessage-no-folders-found": "",
+    "noOptionsMessage-no-folders-found": "未找到資料夾",
     "select-aria-label": "資料夾篩選條件",
     "select-placeholder": "按資料夾篩選"
   },
@@ -7547,51 +7548,51 @@
   },
   "geo": {
     "get-geometry-field": {
-      "warning-gazetteer-not-found": "",
-      "warning-no-geometry": "",
-      "warning-select-geohash": "",
-      "warning-select-lat-long": "",
-      "warning-select-lookup": "",
-      "warning-unable-to-find": ""
+      "warning-gazetteer-not-found": "找不到地名資料庫",
+      "warning-no-geometry": "無法找到幾何",
+      "warning-select-geohash": "選擇 Geohash 欄位",
+      "warning-select-lat-long": "選擇緯度／經度欄位",
+      "warning-select-lookup": "選擇查找欄位",
+      "warning-unable-to-find": "無法找到位置欄位"
     },
     "location-editor": {
       "geohash-field": {
-        "no-fields-message": ""
+        "no-fields-message": "未找到字串欄位"
       },
       "latitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "未找到數值欄位"
       },
       "longitude-field": {
-        "no-fields-message": ""
+        "no-fields-message": "未找到數值欄位"
       },
       "lookup-field": {
-        "no-fields-message": ""
+        "no-fields-message": "未找到字串欄位"
       },
-      "name-gazetteer": "",
-      "name-geohash-field": "",
-      "name-latitude-field": "",
-      "name-location-mode": "",
-      "name-longitude-field": "",
-      "name-lookup-field": ""
+      "name-gazetteer": "地名資料庫",
+      "name-geohash-field": "Geohash 欄位",
+      "name-latitude-field": "緯度欄位",
+      "name-location-mode": "位置模式",
+      "name-longitude-field": "經度欄位",
+      "name-lookup-field": "查找欄位"
     },
     "location-more-editor": {
       "mode-options": {
-        "description-auto": "",
-        "description-coords": "",
-        "description-geohash": "",
-        "description-lookup": "",
-        "label-auto": "",
-        "label-coords": "",
-        "label-geohash": "",
-        "label-lookup": ""
+        "description-auto": "根據預設欄位名稱自動識別位置資料",
+        "description-coords": "指定緯度和經度欄位",
+        "description-geohash": "指定 Geohash 欄位",
+        "description-lookup": "指定地名資料庫和查找欄位",
+        "label-auto": "自動",
+        "label-coords": "坐標",
+        "label-geohash": "Geohash",
+        "label-lookup": "查找"
       }
     }
   },
   "geomap": {
-    "category-basemap-layer": "",
-    "category-map-controls": "",
-    "category-map-layers": "",
-    "category-map-view": "",
+    "category-basemap-layer": "底圖圖層",
+    "category-map-controls": "地圖控制項",
+    "category-map-layers": "地圖圖層",
+    "category-map-view": "地圖檢視",
     "coordinates-map-view-editor": {
       "label-latitude": "緯度",
       "label-longitude": "經度"
@@ -7600,15 +7601,15 @@
       "center": "置中：",
       "zoom": "放大："
     },
-    "description-initial-view": "",
-    "description-mouse-wheel-zoom": "",
-    "description-no-repeat": "",
-    "description-share-view": "",
-    "description-show-attribution": "",
-    "description-show-debug": "",
-    "description-show-measure": "",
-    "description-show-scale": "",
-    "description-show-zoom": "",
+    "description-initial-view": "首次載入面板時，將會顯示此位置。",
+    "description-mouse-wheel-zoom": "啟用滑鼠滾輪縮放控制",
+    "description-no-repeat": "防止地圖水平重複",
+    "description-share-view": "在多個面板上使用相同的檢視。請注意：這可能需要重新載入儀表板。",
+    "description-show-attribution": "在右下角顯示地圖來源屬性資訊",
+    "description-show-debug": "顯示地圖資訊",
+    "description-show-measure": "顯示在地圖上進行測量的工具",
+    "description-show-scale": "註明地圖比例",
+    "description-show-zoom": "在左上角顯示縮放控制按鈕",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "層次"
@@ -7632,12 +7633,12 @@
       "aria-label-add-geomap-style-rule": "新增地圖樣式規則"
     },
     "layer-editor": {
-      "category-base-layer": "",
-      "description-display-tooltip": "",
-      "name-data": "",
-      "name-display-tooltip": "",
-      "name-layer-type": "",
-      "name-opacity": ""
+      "category-base-layer": "底圖圖層",
+      "description-display-tooltip": "顯示圖層的工具提示",
+      "name-data": "資料",
+      "name-display-tooltip": "顯示工具提示",
+      "name-layer-type": "圖層類型",
+      "name-opacity": "不透明度"
     },
     "layers-editor": {
       "label-add-layer": "新增圖層",
@@ -7650,9 +7651,9 @@
       "use-current-map-settings": "使用目前的地圖設定"
     },
     "markers-layer": {
-      "description-show-legend": "",
-      "name-show-legend": "",
-      "name-styles": ""
+      "description-show-legend": "顯示地圖圖例",
+      "name-show-legend": "顯示圖例",
+      "name-styles": "樣式"
     },
     "markers-legend": {
       "title-symbol": "符號"
@@ -7661,27 +7662,27 @@
       "aria-label-close": "",
       "tooltip-show-measure-tools": "顯示測量工具"
     },
-    "name-initial-view": "",
-    "name-mouse-wheel-zoom": "",
-    "name-no-repeat": "",
-    "name-share-view": "",
-    "name-show-attribution": "",
-    "name-show-debug": "",
-    "name-show-measure": "",
-    "name-show-scale": "",
-    "name-show-zoom": "",
-    "name-tooltip": "",
+    "name-initial-view": "初始檢視",
+    "name-mouse-wheel-zoom": "滑鼠滾輪縮放",
+    "name-no-repeat": "無地圖重複",
+    "name-share-view": "分享檢視",
+    "name-show-attribution": "顯示屬性",
+    "name-show-debug": "顯示偵錯",
+    "name-show-measure": "顯示測量工具",
+    "name-show-scale": "顯示比例",
+    "name-show-zoom": "顯示縮放控制",
+    "name-tooltip": "工具提示",
     "photos-layer": {
-      "noFieldsMessage-no-string-fields": ""
+      "noFieldsMessage-no-string-fields": "未找到字串欄位"
     },
     "plugin": {
       "basemap-layer-configured-server-admin": "底圖圖層由伺服器管理員設定。"
     },
     "style-editor": {
       "horizontal-align-options": {
-        "label-center": "",
-        "label-left": "",
-        "label-right": ""
+        "label-center": "置中",
+        "label-left": "左側",
+        "label-right": "右側"
       },
       "label-align": "對齊",
       "label-baseline": "基準線",
@@ -7697,12 +7698,12 @@
       "label-text-label": "文字標籤",
       "label-x-offset": "X 軸偏移",
       "label-y-offset": "Y 軸偏移",
-      "placeholderText-select-symbol": "",
-      "placeholderText-select-symbol-or-add-text": "",
+      "placeholderText-select-symbol": "選擇符號",
+      "placeholderText-select-symbol-or-add-text": "選取符號或新增文字標籤",
       "vertical-align-options": {
-        "label-bottom": "",
-        "label-center": "",
-        "label-top": ""
+        "label-bottom": "底部",
+        "label-center": "置中",
+        "label-top": "頂端"
       }
     },
     "style-rule-editor": {
@@ -7716,13 +7717,13 @@
       "placeholder-value": "值"
     },
     "tooltip-options": {
-      "description-details": "",
-      "description-none": "",
-      "label-details": "",
-      "label-none": ""
+      "description-details": "懸停時顯示快顯視窗",
+      "description-none": "按一下時才顯示內容，而不是懸停時顯示",
+      "label-details": "詳細資訊",
+      "label-none": "無"
     },
     "utils": {
-      "get-next-layer-name": ""
+      "get-next-layer-name": "圖層 {{name}}"
     }
   },
   "get-enterprise": {
@@ -7842,400 +7843,400 @@
       "categories": {
         "acceleration": {
           "formats": {
-            "name-feet-sec": "",
-            "name-g-unit": "",
-            "name-meters-sec": ""
+            "name-feet-sec": "英尺/秒²",
+            "name-g-unit": "G 單元",
+            "name-meters-sec": "公尺/秒²"
           },
-          "name": ""
+          "name": "加速"
         },
         "angle": {
           "formats": {
-            "name-arc-minutes": "",
-            "name-arc-seconds": "",
-            "name-degrees": "",
-            "name-gradian": "",
-            "name-radians": ""
+            "name-arc-minutes": "角分",
+            "name-arc-seconds": "角秒",
+            "name-degrees": "度 (°)",
+            "name-gradian": "異分度",
+            "name-radians": "弧度"
           },
-          "name": ""
+          "name": "角度"
         },
         "area": {
           "formats": {
-            "name-acres": "",
-            "name-hectares": "",
-            "name-square-feet": "",
-            "name-square-meters": "",
-            "name-square-miles": ""
+            "name-acres": "英畝 (ac)",
+            "name-hectares": "公頃 (ha)",
+            "name-square-feet": "平方英尺 (ft²)",
+            "name-square-meters": "平方公尺 (m²)",
+            "name-square-miles": "平方英里 (mi²)"
           },
-          "name": ""
+          "name": "區域"
         },
         "boolean": {
           "formats": {
-            "name-on-off": "",
-            "name-true-false": "",
-            "name-yes-no": ""
+            "name-on-off": "開啟 / 關閉",
+            "name-true-false": "啟用 / 關閉",
+            "name-yes-no": "是／否"
           },
-          "name": ""
+          "name": "布林值"
         },
         "computation": {
           "formats": {
-            "name-eflops": "",
-            "name-flops": "",
-            "name-gflops": "",
-            "name-mflops": "",
-            "name-pflops": "",
-            "name-tflops": "",
-            "name-yflops": "",
-            "name-zflops": ""
+            "name-eflops": "EFLOP/s",
+            "name-flops": "FLOP/s",
+            "name-gflops": "GFLOP/s",
+            "name-mflops": "MFLOP/s",
+            "name-pflops": "PFLOP/s",
+            "name-tflops": "TFLOP/s",
+            "name-yflops": "YFLOP/s",
+            "name-zflops": "ZFLOP/s"
           },
-          "name": ""
+          "name": "計算"
         },
         "concentration": {
           "formats": {
-            "name-g-m3": "",
-            "name-g-nm3": "",
-            "name-mg-dl": "",
-            "name-mg-m3": "",
-            "name-mg-nm3": "",
-            "name-mmol-l": "",
-            "name-ng-m3": "",
-            "name-ng-nm3": "",
-            "name-ppb": "",
-            "name-ppm": "",
-            "name-ug-m3": "",
-            "name-ug-nm3": ""
+            "name-g-m3": "克每立方公尺 (g/m³)",
+            "name-g-nm3": "克每標準立方公尺 (g/Nm³)",
+            "name-mg-dl": "毫克每分升 (mg/dL)",
+            "name-mg-m3": "毫克每立方公尺 (mg/m³)",
+            "name-mg-nm3": "毫克每標準立方公尺 (mg/Nm³)",
+            "name-mmol-l": "毫摩爾每升 (mmol/L)",
+            "name-ng-m3": "奈克每立方公尺 (ng/m³)",
+            "name-ng-nm3": "奈克每標準立方公尺 (ng/Nm³)",
+            "name-ppb": "十億分率 (ppb)",
+            "name-ppm": "百萬分率 (ppm)",
+            "name-ug-m3": "微克每立方公尺 (μg/m³)",
+            "name-ug-nm3": "微克每標準立方公尺 (μg/Nm³)"
           },
-          "name": ""
+          "name": "濃度"
         },
         "currency": {
           "formats": {
-            "name-bgn": "",
-            "name-brl": "",
-            "name-btc": "",
-            "name-chf": "",
-            "name-czk": "",
-            "name-dkk": "",
-            "name-eur": "",
-            "name-gbp": "",
-            "name-idr": "",
-            "name-ils": "",
-            "name-inr": "",
-            "name-isk": "",
-            "name-jpy": "",
-            "name-krw": "",
-            "name-mbtc": "",
-            "name-myr": "",
-            "name-nok": "",
-            "name-php": "",
-            "name-pln": "",
-            "name-pyg": "",
-            "name-rub": "",
-            "name-sek": "",
-            "name-try": "",
-            "name-uah": "",
-            "name-ubtc": "",
-            "name-usd": "",
-            "name-uyu": "",
-            "name-vnd": "",
-            "name-xpf": "",
-            "name-zar": ""
+            "name-bgn": "保加利亞列弗 (BGN)",
+            "name-brl": "雷亞爾 (R$)",
+            "name-btc": "比特幣 (฿)",
+            "name-chf": "瑞士法郎 (CHF)",
+            "name-czk": "捷克克朗 (CZK)",
+            "name-dkk": "丹麥克朗 (kr)",
+            "name-eur": "歐元 (€)",
+            "name-gbp": "英鎊 (£)",
+            "name-idr": "印尼盧比 (Rp)",
+            "name-ils": "以色列新錫克爾 (₪)",
+            "name-inr": "印度盧比 (₹)",
+            "name-isk": "冰島克朗 (kr)",
+            "name-jpy": "日元 (¥)",
+            "name-krw": "韓元 (₩)",
+            "name-mbtc": "千分比特幣 (฿)",
+            "name-myr": "馬來西亞林吉特 (RM)",
+            "name-nok": "挪威克朗 (kr)",
+            "name-php": "菲律賓比索 (PHP)",
+            "name-pln": "波蘭茲羅提 (PLN)",
+            "name-pyg": "巴拉圭瓜拉尼 (₲)",
+            "name-rub": "盧布 (₽)",
+            "name-sek": "瑞典克朗 (kr)",
+            "name-try": "新土耳其里拉 (₺)",
+            "name-uah": "烏克蘭格里夫納 (₴)",
+            "name-ubtc": "百萬分比特幣 (฿)",
+            "name-usd": "美元 ($)",
+            "name-uyu": "烏拉圭比索 (UYU)",
+            "name-vnd": "越南盾 (VND)",
+            "name-xpf": "太平洋法郎 (XPF)",
+            "name-zar": "南非蘭特 (R)"
           },
-          "name": ""
+          "name": "貨幣"
         },
         "data": {
           "formats": {
-            "name-bits-iec": "",
-            "name-bits-si": "",
-            "name-bytes-iec": "",
-            "name-bytes-si": "",
-            "name-gibibytes": "",
-            "name-gigabytes": "",
-            "name-kibibytes": "",
-            "name-kilobytes": "",
-            "name-mebibytes": "",
-            "name-megabytes": "",
-            "name-pebibytes": "",
-            "name-petabytes": "",
-            "name-tebibytes": "",
-            "name-terabytes": ""
+            "name-bits-iec": "位元 (IEC)",
+            "name-bits-si": "位元 (SI)",
+            "name-bytes-iec": "位元組 (IEC)",
+            "name-bytes-si": "位元組 (SI)",
+            "name-gibibytes": "吉比位元組",
+            "name-gigabytes": "吉位元組",
+            "name-kibibytes": "千二進位元組",
+            "name-kilobytes": "千位元組",
+            "name-mebibytes": "兆位元組",
+            "name-megabytes": "百萬位元組",
+            "name-pebibytes": "千兆位元組",
+            "name-petabytes": "拍位元組",
+            "name-tebibytes": "兆二進位元組",
+            "name-terabytes": "兆位元組"
           },
-          "name": ""
+          "name": "資料"
         },
         "data-rate": {
           "formats": {
-            "name-bits-sec-iec": "",
-            "name-bits-sec-si": "",
-            "name-bytes-sec-iec": "",
-            "name-bytes-sec-si": "",
-            "name-gibibits-sec": "",
-            "name-gibibytes-sec": "",
-            "name-gigabits-sec": "",
-            "name-gigabytes-sec": "",
-            "name-kibibits-sec": "",
-            "name-kibibytes-sec": "",
-            "name-kilobits-sec": "",
-            "name-kilobytes-sec": "",
-            "name-mebibits-sec": "",
-            "name-mebibytes-sec": "",
-            "name-megabits-sec": "",
-            "name-megabytes-sec": "",
-            "name-packets-sec": "",
-            "name-pebibits-sec": "",
-            "name-pebibytes-sec": "",
-            "name-petabits-sec": "",
-            "name-petabytes-sec": "",
-            "name-tebibits-sec": "",
-            "name-tebibytes-sec": "",
-            "name-terabits-sec": "",
-            "name-terabytes-sec": ""
+            "name-bits-sec-iec": "位元/秒 (IEC)",
+            "name-bits-sec-si": "位元/秒 (SI)",
+            "name-bytes-sec-iec": "位元組/秒 (IEC)",
+            "name-bytes-sec-si": "位元組/秒 (SI)",
+            "name-gibibits-sec": "吉比位元/秒",
+            "name-gibibytes-sec": "吉比位元組/秒",
+            "name-gigabits-sec": "吉位元/秒",
+            "name-gigabytes-sec": "吉位元組/秒",
+            "name-kibibits-sec": "千位元/秒",
+            "name-kibibytes-sec": "千二進位元組/秒",
+            "name-kilobits-sec": "千位元/秒",
+            "name-kilobytes-sec": "千位元組/秒",
+            "name-mebibits-sec": "兆二進位元/秒",
+            "name-mebibytes-sec": "兆位元組/秒",
+            "name-megabits-sec": "百萬位元/秒",
+            "name-megabytes-sec": "百萬位元組/秒",
+            "name-packets-sec": "封包數/秒",
+            "name-pebibits-sec": "千兆位元/秒",
+            "name-pebibytes-sec": "千兆位元組/秒",
+            "name-petabits-sec": "千兆位元/秒",
+            "name-petabytes-sec": "千兆位元組/秒",
+            "name-tebibits-sec": "千兆位元/秒",
+            "name-tebibytes-sec": "兆二進位元組/秒",
+            "name-terabits-sec": "兆位元/秒",
+            "name-terabytes-sec": "兆位元組/秒"
           },
-          "name": ""
+          "name": "資料速率"
         },
         "date-time": {
           "formats": {
-            "name-datetime-default": "",
-            "name-datetime-iso": "",
-            "name-datetime-iso-no-date": "",
-            "name-datetime-local": "",
-            "name-datetime-local-no-date": "",
-            "name-datetime-us": "",
-            "name-datetime-us-no-date": "",
-            "name-from-now": ""
+            "name-datetime-default": "日期時間預設值",
+            "name-datetime-iso": "ISO 標準日期時間",
+            "name-datetime-iso-no-date": "ISO 標準日期時間（如果是今天，則無日期）",
+            "name-datetime-local": "當地日期時間",
+            "name-datetime-local-no-date": "當地日期時間（如果是今天，則無日期）",
+            "name-datetime-us": "美國日期時間",
+            "name-datetime-us-no-date": "美國日期時間（如果是今天，則無日期）",
+            "name-from-now": "現在起"
           },
-          "name": ""
+          "name": "日期與時間"
         },
         "energy": {
           "formats": {
-            "name-ampere": "",
-            "name-ampere-hour": "",
-            "name-decibel-milliwatt": "",
-            "name-electron-volt": "",
-            "name-farad": "",
-            "name-femtofarad": "",
-            "name-gigawatt": "",
-            "name-henry": "",
-            "name-joule": "",
-            "name-kiloampere": "",
-            "name-kiloampere-hour": "",
-            "name-kiloohm": "",
-            "name-kilovolt": "",
-            "name-kilovolt-ampere": "",
-            "name-kilovolt-ampere-reactive": "",
-            "name-kilowatt": "",
-            "name-kilowatt-hour": "",
-            "name-kilowatt-min": "",
-            "name-lumens": "",
-            "name-megaohm": "",
-            "name-megawatt": "",
-            "name-megawatt-hour": "",
-            "name-microfarad": "",
-            "name-microhenry": "",
-            "name-milliampere": "",
-            "name-milliampere-hour": "",
-            "name-millihenry": "",
-            "name-milliohm": "",
-            "name-millivolt": "",
-            "name-milliwatt": "",
-            "name-nanofarad": "",
-            "name-ohm": "",
-            "name-picofarad": "",
-            "name-volt": "",
-            "name-volt-ampere": "",
-            "name-volt-ampere-reactive": "",
-            "name-watt": "",
-            "name-watt-hour": "",
-            "name-watt-hour-per-kg": "",
-            "name-watt-square-meter": ""
+            "name-ampere": "安培 (A)",
+            "name-ampere-hour": "安培時 (Ah)",
+            "name-decibel-milliwatt": "分貝毫瓦 (dBm)",
+            "name-electron-volt": "電子伏特 (eV)",
+            "name-farad": "法拉 (F)",
+            "name-femtofarad": "飛法拉 (fF)",
+            "name-gigawatt": "吉瓦 (GW)",
+            "name-henry": "亨利 (H)",
+            "name-joule": "焦耳 (J)",
+            "name-kiloampere": "千安培 (kA)",
+            "name-kiloampere-hour": "千安培-小時 (kAh)",
+            "name-kiloohm": "千歐姆 (kΩ)",
+            "name-kilovolt": "千伏特 (kV)",
+            "name-kilovolt-ampere": "千伏安 (kVA)",
+            "name-kilovolt-ampere-reactive": "千伏安無功 (kVAr)",
+            "name-kilowatt": "千瓦 (kW)",
+            "name-kilowatt-hour": "千瓦時 (kWh)",
+            "name-kilowatt-min": "千瓦分鐘 (kWm)",
+            "name-lumens": "流明 (Lm)",
+            "name-megaohm": "兆歐姆 (MΩ)",
+            "name-megawatt": "兆瓦 (MW)",
+            "name-megawatt-hour": "兆瓦時 (MWh)",
+            "name-microfarad": "微法拉 (µF)",
+            "name-microhenry": "微亨利 (µH)",
+            "name-milliampere": "毫安培 (mA)",
+            "name-milliampere-hour": "毫安時 (mAh)",
+            "name-millihenry": "毫亨利 (mH)",
+            "name-milliohm": "毫歐姆 (mΩ)",
+            "name-millivolt": "毫伏特 (mV)",
+            "name-milliwatt": "毫瓦特 (mW)",
+            "name-nanofarad": "奈法拉 (nF)",
+            "name-ohm": "歐姆 (Ω)",
+            "name-picofarad": "皮法拉德 (pF)",
+            "name-volt": "伏特 (V)",
+            "name-volt-ampere": "伏安 (VA)",
+            "name-volt-ampere-reactive": "伏安無功 (VAr)",
+            "name-watt": "瓦特 (W)",
+            "name-watt-hour": "瓦特時 (Wh)",
+            "name-watt-hour-per-kg": "瓦特時每公斤 (Wh/kg)",
+            "name-watt-square-meter": "瓦每平方公尺 (W/m²)"
           },
-          "name": ""
+          "name": "能量"
         },
         "flow": {
           "formats": {
-            "name-cubic-feet-min": "",
-            "name-cubic-feet-sec": "",
-            "name-cubic-meters-sec": "",
-            "name-gallons-min": "",
-            "name-litre-hour": "",
-            "name-litre-min": "",
-            "name-lux": "",
-            "name-millilitre-min": ""
+            "name-cubic-feet-min": "立方英尺/分鐘 (cfm)",
+            "name-cubic-feet-sec": "立方英尺/秒 (cfs)",
+            "name-cubic-meters-sec": "立方公尺/秒 (cms)",
+            "name-gallons-min": "加侖/分鐘 (gpm)",
+            "name-litre-hour": "公升/小時",
+            "name-litre-min": "公升/分鐘 (L/min)",
+            "name-lux": "勒克斯 (lx)",
+            "name-millilitre-min": "毫升/分鐘 (mL/min)"
           },
-          "name": ""
+          "name": "流量"
         },
         "force": {
           "formats": {
-            "name-kilonewton-meters": "",
-            "name-kilonewtons": "",
-            "name-newton-meters": "",
-            "name-newtons": ""
+            "name-kilonewton-meters": "千牛頓米 (kNm)",
+            "name-kilonewtons": "千牛頓 (kN)",
+            "name-newton-meters": "牛頓-公尺 (Nm)",
+            "name-newtons": "牛頓 (N)"
           },
-          "name": ""
+          "name": "力"
         },
         "hash-rate": {
           "formats": {
-            "name-exahashes-sec": "",
-            "name-gigahashes-sec": "",
-            "name-hashes-sec": "",
-            "name-kilohashes-sec": "",
-            "name-megahashes-sec": "",
-            "name-petahashes-sec": "",
-            "name-terahashes-sec": ""
+            "name-exahashes-sec": "艾位元組/秒",
+            "name-gigahashes-sec": "吉位元組/秒",
+            "name-hashes-sec": "哈希次數/秒",
+            "name-kilohashes-sec": "千位元組/秒",
+            "name-megahashes-sec": "百萬哈希/秒",
+            "name-petahashes-sec": "千兆位元組/秒",
+            "name-terahashes-sec": "兆哈希/秒"
           },
-          "name": ""
+          "name": "哈希率"
         },
         "length": {
           "formats": {
-            "name-feet": "",
-            "name-inch": "",
-            "name-kilometer": "",
-            "name-meter": "",
-            "name-mile": "",
-            "name-millimeter": ""
+            "name-feet": "英尺 (ft)",
+            "name-inch": "英吋 (in)",
+            "name-kilometer": "公里 (km)",
+            "name-meter": "公尺 (m)",
+            "name-mile": "英里 (mi)",
+            "name-millimeter": "公釐 (mm)"
           },
-          "name": ""
+          "name": "長度"
         },
         "mass": {
           "formats": {
-            "name-gram": "",
-            "name-kilogram": "",
-            "name-metric-ton": "",
-            "name-milligram": "",
-            "name-pound": ""
+            "name-gram": "克 (g)",
+            "name-kilogram": "公斤 (kg)",
+            "name-metric-ton": "公噸 (t)",
+            "name-milligram": "毫克 (mg)",
+            "name-pound": "磅 (lb)"
           },
-          "name": ""
+          "name": "質量"
         },
         "misc": {
           "formats": {
-            "name-candala": "",
-            "name-decibel": "",
-            "name-hexadecimal": "",
-            "name-hexadecimal-0x": "",
-            "name-humidity": "",
-            "name-locale": "",
-            "name-number": "",
-            "name-percent-1": "",
-            "name-percent-100": "",
-            "name-pixels": "",
-            "name-scientific": "",
-            "name-short": "",
-            "name-si-short": "",
-            "name-string": ""
+            "name-candala": "坎德拉 (cd)",
+            "name-decibel": "分貝",
+            "name-hexadecimal": "十六進位",
+            "name-hexadecimal-0x": "十六進位 (0x)",
+            "name-humidity": "濕度 (%H)",
+            "name-locale": "地區格式",
+            "name-number": "次數",
+            "name-percent-1": "百分比 (0.0-1.0)",
+            "name-percent-100": "百分比 (0-100)",
+            "name-pixels": "像素",
+            "name-scientific": "科學記號標記法",
+            "name-short": "短格式",
+            "name-si-short": "SI 短格式",
+            "name-string": "字串"
           },
-          "name": ""
+          "name": "其他項目"
         },
         "pressure": {
           "formats": {
-            "name-bars": "",
-            "name-hectopascals": "",
-            "name-inches-mercury": "",
-            "name-kilobars": "",
-            "name-kilopascals": "",
-            "name-millibars": "",
-            "name-pascals": "",
-            "name-psi": ""
+            "name-bars": "長條",
+            "name-hectopascals": "百帕斯卡",
+            "name-inches-mercury": "英吋汞柱",
+            "name-kilobars": "千巴",
+            "name-kilopascals": "千帕斯卡",
+            "name-millibars": "毫巴",
+            "name-pascals": "帕斯卡",
+            "name-psi": "磅力每平方英吋"
           },
-          "name": ""
+          "name": "壓力"
         },
         "radiation": {
           "formats": {
-            "name-becquerel": "",
-            "name-curie": "",
-            "name-exposure": "",
-            "name-gray": "",
-            "name-microsievert": "",
-            "name-microsievert-hour": "",
-            "name-millisievert": "",
-            "name-millisievert-hour": "",
-            "name-rad": "",
-            "name-rem": "",
-            "name-roentgen": "",
-            "name-sievert": "",
-            "name-sievert-hour": ""
+            "name-becquerel": "貝克勒爾 (Bq)",
+            "name-curie": "居里 (Ci)",
+            "name-exposure": "暴露量 (C/kg)",
+            "name-gray": "灰度 (Gy)",
+            "name-microsievert": "微西弗特 (µSv)",
+            "name-microsievert-hour": "微西弗特/小時 (µSv/h)",
+            "name-millisievert": "毫西弗特 (mSv)",
+            "name-millisievert-hour": "毫西弗特/小時 (mSv/h)",
+            "name-rad": "弳度",
+            "name-rem": "人體輻射當量",
+            "name-roentgen": "倫琴 (R)",
+            "name-sievert": "希沃特 (Sv)",
+            "name-sievert-hour": "希沃特/小時 (Sv/h)"
           },
-          "name": ""
+          "name": "輻射"
         },
         "rotational-speed": {
           "formats": {
-            "name-degrees-sec": "",
-            "name-gigahertz": "",
-            "name-hertz": "",
-            "name-kilohertz": "",
-            "name-megahertz": "",
-            "name-radians-sec": "",
-            "name-rpm": ""
+            "name-degrees-sec": "每秒度數 (°/s)",
+            "name-gigahertz": "千兆赫 (GHz)",
+            "name-hertz": "赫茲 (Hz)",
+            "name-kilohertz": "千赫茲 (kHz)",
+            "name-megahertz": "兆赫茲 (MHz)",
+            "name-radians-sec": "每秒弧度 (rad/s)",
+            "name-rpm": "每分鐘轉數 (rpm)"
           },
-          "name": ""
+          "name": "轉速"
         },
         "temperature": {
           "formats": {
-            "name-celsius": "",
-            "name-fahrenheit": "",
-            "name-kelvin": ""
+            "name-celsius": "攝氏度 (°C)",
+            "name-fahrenheit": "華氏度 (°F)",
+            "name-kelvin": "開爾文 (K)"
           },
-          "name": ""
+          "name": "溫度"
         },
         "throughput": {
           "formats": {
-            "name-counts-min": "",
-            "name-counts-sec": "",
-            "name-events-min": "",
-            "name-events-sec": "",
-            "name-io-ops-sec": "",
-            "name-messages-min": "",
-            "name-messages-sec": "",
-            "name-ops-min": "",
-            "name-ops-sec": "",
-            "name-reads-min": "",
-            "name-reads-sec": "",
-            "name-records-min": "",
-            "name-records-sec": "",
-            "name-requests-min": "",
-            "name-requests-sec": "",
-            "name-rows-min": "",
-            "name-rows-sec": "",
-            "name-writes-min": "",
-            "name-writes-sec": ""
+            "name-counts-min": "次數/分鐘 (cpm)",
+            "name-counts-sec": "次數/秒 (cps)",
+            "name-events-min": "事件/分鐘 (epm)",
+            "name-events-sec": "事件/秒 (eps)",
+            "name-io-ops-sec": "I/O 操作/秒 (iops)",
+            "name-messages-min": "訊息/分鐘 (mpm)",
+            "name-messages-sec": "訊息/秒 (mps)",
+            "name-ops-min": "操作/分鐘 (opm)",
+            "name-ops-sec": "操作/秒 (ops)",
+            "name-reads-min": "讀取/分鐘 (rpm)",
+            "name-reads-sec": "讀取/秒 (rps)",
+            "name-records-min": "記錄/分鐘 (rpm)",
+            "name-records-sec": "記錄/秒 (rps)",
+            "name-requests-min": "請求/分鐘 (rpm)",
+            "name-requests-sec": "請求/秒 (rps)",
+            "name-rows-min": "列/分鐘 (rpm)",
+            "name-rows-sec": "列/秒 (rps)",
+            "name-writes-min": "寫入/分鐘 (wpm)",
+            "name-writes-sec": "寫入/秒 (wps)"
           },
-          "name": ""
+          "name": "輸送量"
         },
         "time": {
           "formats": {
-            "name-clock-ms": "",
-            "name-clock-s": "",
-            "name-days": "",
-            "name-duration-dhms": "",
-            "name-duration-hms": "",
-            "name-duration-ms": "",
-            "name-duration-s": "",
-            "name-hertz": "",
-            "name-hours": "",
-            "name-microseconds": "",
-            "name-milliseconds": "",
-            "name-minutes": "",
-            "name-nanoseconds": "",
-            "name-seconds": "",
-            "name-timeticks": ""
+            "name-clock-ms": "時鐘時間 (ms)",
+            "name-clock-s": "時鐘時間 (s)",
+            "name-days": "天 (d)",
+            "name-duration-dhms": "持續時間 (d hh:mm:ss)",
+            "name-duration-hms": "持續時間 (hh:mm:ss)",
+            "name-duration-ms": "持續時間 (ms)",
+            "name-duration-s": "持續時間 (s)",
+            "name-hertz": "赫茲 (1/s)",
+            "name-hours": "小時 (h)",
+            "name-microseconds": "微秒 (µs)",
+            "name-milliseconds": "毫秒 (ms)",
+            "name-minutes": "分鐘 (m)",
+            "name-nanoseconds": "奈秒 (ns)",
+            "name-seconds": "秒 (s)",
+            "name-timeticks": "時間刻度 (s/100)"
           },
-          "name": ""
+          "name": "時間"
         },
         "velocity": {
           "formats": {
-            "name-kilometers-hour": "",
-            "name-knot": "",
-            "name-meters-second": "",
-            "name-miles-hour": ""
+            "name-kilometers-hour": "公里/小時 (km/h)",
+            "name-knot": "節 (kn)",
+            "name-meters-second": "公尺/秒 (m/s)",
+            "name-miles-hour": "英里/小時 (mph)"
           },
-          "name": ""
+          "name": "速度"
         },
         "volume": {
           "formats": {
-            "name-cubic-decimeter": "",
-            "name-cubic-meter": "",
-            "name-gallons": "",
-            "name-litre": "",
-            "name-millilitre": "",
-            "name-normal-cubic-meter": ""
+            "name-cubic-decimeter": "立方分公尺",
+            "name-cubic-meter": "立方公尺",
+            "name-gallons": "加侖",
+            "name-litre": "升 (L)",
+            "name-millilitre": "毫升 (mL)",
+            "name-normal-cubic-meter": "標準立方公尺"
           },
-          "name": ""
+          "name": "量"
         }
       }
     }
@@ -8364,7 +8365,7 @@
       "option": "選項"
     },
     "carousel": {
-      "aria-label-open-image": ""
+      "aria-label-open-image": "開啟圖片預覽"
     },
     "cascader": {
       "clear-button": "清空選項"
@@ -8378,9 +8379,9 @@
       "aria-label-selected-color": "{{colorLabel}} 顏色"
     },
     "confirm-button": {
-      "aria-label-delete": "",
+      "aria-label-delete": "刪除",
       "cancel": "取消",
-      "confirmText-delete": ""
+      "confirmText-delete": "刪除"
     },
     "confirm-content": {
       "placeholder": "輸入「{{confirmPromptText}}」以確認"
@@ -8485,56 +8486,56 @@
     },
     "date-time-pickers": {
       "month-options": {
-        "label-april": "",
-        "label-august": "",
-        "label-december": "",
-        "label-february": "",
-        "label-january": "",
-        "label-july": "",
-        "label-june": "",
-        "label-march": "",
-        "label-may": "",
-        "label-november": "",
-        "label-october": "",
-        "label-september": ""
+        "label-april": "四月",
+        "label-august": "八月",
+        "label-december": "十二月",
+        "label-february": "二月",
+        "label-january": "一月",
+        "label-july": "七月",
+        "label-june": "六月",
+        "label-march": "三月",
+        "label-may": "五月",
+        "label-november": "十一月",
+        "label-october": "十月",
+        "label-september": "九月"
       },
       "quick-options": {
-        "day-before-yesterday": "",
-        "last-1-hour": "",
-        "last-1-year": "",
-        "last-12-hours": "",
-        "last-15-mins": "",
-        "last-2-days": "",
-        "last-2-years": "",
-        "last-24-hours": "",
-        "last-3-hours": "",
-        "last-30-days": "",
-        "last-30-mins": "",
-        "last-5-mins": "",
-        "last-5-years": "",
-        "last-6-hours": "",
-        "last-6-months": "",
-        "last-7-days": "",
-        "last-90-days": "",
-        "previous-fiscal-quarter": "",
-        "previous-fiscal-year": "",
-        "previous-month": "",
-        "previous-week": "",
-        "previous-year": "",
-        "this-day-last-week": "",
-        "this-fiscal-quarter": "",
-        "this-fiscal-quarter-so-far": "",
-        "this-fiscal-year": "",
-        "this-fiscal-year-so-far": "",
-        "this-month": "",
-        "this-month-so-far": "",
-        "this-week": "",
-        "this-week-so-far": "",
-        "this-year": "",
-        "this-year-so-far": "",
-        "today": "",
-        "today-so-far": "",
-        "yesterday": ""
+        "day-before-yesterday": "前天",
+        "last-1-hour": "過去 1 小時",
+        "last-1-year": "過去 1 年",
+        "last-12-hours": "過去 12 小時",
+        "last-15-mins": "過去 15 分鐘",
+        "last-2-days": "過去 2 天",
+        "last-2-years": "過去 2 年",
+        "last-24-hours": "過去 24 小時",
+        "last-3-hours": "過去 3 小時",
+        "last-30-days": "過去 30 天",
+        "last-30-mins": "過去 30 分鐘",
+        "last-5-mins": "過去 5 分鐘",
+        "last-5-years": "過去 5 年",
+        "last-6-hours": "過去 6 小時",
+        "last-6-months": "過去 6 個月",
+        "last-7-days": "過去 7 天",
+        "last-90-days": "過去 90 天",
+        "previous-fiscal-quarter": "上一個會計季度",
+        "previous-fiscal-year": "上一個會計年度",
+        "previous-month": "上個月",
+        "previous-week": "上一週",
+        "previous-year": "上一年",
+        "this-day-last-week": "上週的這一天",
+        "this-fiscal-quarter": "本會計季度",
+        "this-fiscal-quarter-so-far": "本會計季度迄今",
+        "this-fiscal-year": "本會計年度",
+        "this-fiscal-year-so-far": "本會計年度迄今",
+        "this-month": "本月",
+        "this-month-so-far": "本月迄今",
+        "this-week": "本週",
+        "this-week-so-far": "本週迄今",
+        "this-year": "今年",
+        "this-year-so-far": "今年迄今",
+        "today": "今天",
+        "today-so-far": "今天迄今",
+        "yesterday": "昨天"
       }
     },
     "drawer": {
@@ -8585,18 +8586,18 @@
         "placeholder": "選擇欄位"
       },
       "get-all-field-type-icon-options": {
-        "label-boolean": "",
-        "label-enum": "",
-        "label-number": "",
-        "label-other": "",
-        "label-string": "",
-        "label-time": "",
-        "label-traces": ""
+        "label-boolean": "布林值",
+        "label-enum": "列舉",
+        "label-number": "次數",
+        "label-other": "其他",
+        "label-string": "字串",
+        "label-time": "時間",
+        "label-traces": "追蹤"
       },
       "get-list-of-query-ref-ids": {
-        "description": "",
-        "label": "",
-        "label-missing-ref-id": ""
+        "description": "框架（{{framesCount}}）：{{framesNames}}",
+        "label": "查詢：{{refId}}",
+        "label-missing-ref-id": "查詢：（缺少 refId）"
       },
       "name-field-name-by-regex-matcher": "名稱與正則表達式相符的欄位",
       "name-fields-by-query": "查詢傳回的欄位",
@@ -8630,8 +8631,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "切換收闔面板",
-      "ariaLabel-panel-loading": "",
-      "ariaLabel-panel-status": "",
+      "ariaLabel-panel-loading": "面板載入列",
+      "ariaLabel-panel-status": "面板狀態",
       "tooltip-cancel": "取消查詢",
       "tooltip-cancel-loading": "取消查詢",
       "tooltip-stop-streaming": "停止串流",
@@ -8700,12 +8701,12 @@
       "inspect-drawer-title": "檢查值",
       "inspect-menu-label": "檢查值",
       "nested-table": {
-        "no-data": ""
+        "no-data": "無資料"
       },
       "no-values-label": "沒有數值",
       "pagination-summary": "{{itemsRangeStart}} - 第 {{displayedEnd}} 列，共 {{numRows}} 列",
       "sparkline": {
-        "no-data": ""
+        "no-data": "無資料"
       }
     },
     "tags": {
@@ -8713,7 +8714,7 @@
     },
     "tags-input": {
       "add": "新增",
-      "placeholder-new-tag": "",
+      "placeholder-new-tag": "新標記（輸入金鑰以新增）",
       "remove": "移除標籤：{{name}}"
     },
     "time-sync-button": {
@@ -8806,14 +8807,14 @@
       "footer-add-annotation": "新增注釋",
       "footer-click-to-action": "點選以{{actionTitle}}",
       "footer-click-to-navigate": "點選以開啟「{{linkTitle}}」",
-      "footer-filter-for-value": "",
+      "footer-filter-for-value": "篩選值「{{value}}」",
       "timestamp": "時間戳記"
     },
     "week-start-picker": {
-      "weekStarts-label-default": "",
-      "weekStarts-label-monday": "",
-      "weekStarts-label-saturday": "",
-      "weekStarts-label-sunday": ""
+      "weekStarts-label-default": "預設",
+      "weekStarts-label-monday": "星期一",
+      "weekStarts-label-saturday": "星期六",
+      "weekStarts-label-sunday": "星期日"
     }
   },
   "graph": {
@@ -9191,8 +9192,8 @@
       "title-create-library-panel": "建立資料庫面板"
     },
     "change-library-panel-modal": {
-      "confirmText-change": "",
-      "confirmText-replace": ""
+      "confirmText-change": "變更",
+      "confirmText-replace": "取代"
     },
     "confirm": {
       "delete-panel": "要刪除此面板嗎？"
@@ -9216,7 +9217,7 @@
       "usage-count_other": "用於 {{count}} 個儀表板"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": ""
+      "placeholder-search-by-name-or-description": "按名稱、描述或資料夾名稱搜尋"
     },
     "loading-indicator": {
       "loading-library-panel": "正在載入資料庫面板…"
@@ -9421,7 +9422,7 @@
       "close": "關閉紀錄詳細資訊",
       "copy-shortlink": "複製短連結",
       "copy-to-clipboard": "複製至剪貼簿",
-      "displayed-fields-section": "",
+      "displayed-fields-section": "組織顯示的欄位",
       "fields": {
         "adhoc-statistics": "隨機統計資料",
         "copy-value-to-clipboard": "將此值複製到剪貼簿",
@@ -9434,25 +9435,25 @@
       },
       "fields-section": "欄位",
       "hide-log-line": "隱藏紀錄行",
-      "inline-mode": "",
+      "inline-mode": "顯示內嵌",
       "links-section": "連結",
-      "log-line-field": "",
+      "log-line-field": "紀錄行",
       "log-line-section": "紀錄行",
-      "move-displayed-field-down": "",
-      "move-displayed-field-up": "",
+      "move-displayed-field-down": "下移",
+      "move-displayed-field-up": "上移",
       "no-details": "沒有要顯示的欄位。",
-      "open-assistant": "",
+      "open-assistant": "在 Assistant 中解釋此紀錄行",
       "pin-line": "固定紀錄",
-      "remove-displayed-field": "",
-      "remove-log": "",
-      "scroll-to-logline": "",
+      "remove-displayed-field": "移除欄位",
+      "remove-log": "移除紀錄",
+      "scroll-to-logline": "捲動到紀錄行",
       "search": {
         "no-results": "沒有要顯示的結果。"
       },
       "search-placeholder": "搜尋欄位名稱和值",
       "show-context": "顯示前後文",
       "show-log-line": "顯示紀錄行",
-      "sidebar-mode": "",
+      "sidebar-mode": "錨定到右側",
       "unpin-line": "取消固定紀錄"
     },
     "log-line-menu": {
@@ -9460,9 +9461,9 @@
       "copy-log": "複製日誌行",
       "hide-details": "顯示紀錄詳細資料",
       "icon-label": "日誌功能表",
-      "log-line": "",
-      "log-line-explainer": "",
-      "open-assistant": "",
+      "log-line": "紀錄行",
+      "log-line-explainer": "以簡潔的方式解釋此紀錄行",
+      "open-assistant": "在 Assistant 中解釋此紀錄行",
       "pin-to-outline": "釘選日誌",
       "show-context": "顯示內容",
       "show-details": "隱藏紀錄詳細資料",
@@ -9568,10 +9569,10 @@
     },
     "name-common-labels": "通用標籤",
     "name-deduplication": "重複",
-    "name-details-mode": "",
+    "name-details-mode": "紀錄詳細資訊面板模式",
     "name-details-options": {
-      "label-inline": "",
-      "label-sidebar": ""
+      "label-inline": "內嵌",
+      "label-sidebar": "側邊欄"
     },
     "name-enable-infinite-scrolling": "啟用無限捲動",
     "name-enable-log-details": "啟用紀錄詳細資訊",
@@ -9668,8 +9669,8 @@
       "updated-on": "更新日期"
     },
     "snapshot-list-table": {
-      "body-delete": "",
-      "confirmText-delete": "",
+      "body-delete": "確定要刪除「{{snapshotToRemove}}」嗎？",
+      "confirmText-delete": "刪除",
       "title-delete": "刪除"
     },
     "unthemed-dashboard-import": {
@@ -9681,14 +9682,14 @@
       }
     },
     "validation-srv": {
-      "message-name-required": "",
-      "message-reserved-name": "",
-      "message-same-name": "",
-      "message-same-name-general": ""
+      "message-name-required": "名稱為必填",
+      "message-reserved-name": "這是保留名稱，無法用於資料夾。",
+      "message-same-name": "儀表板或資料夾名稱已存在",
+      "message-same-name-general": "一般資料夾中已存在同名的資料夾或儀表板"
     }
   },
   "metric-select": {
-    "noOptionsMessage-no-options-found": ""
+    "noOptionsMessage-no-options-found": "未找到選項"
   },
   "migrate-to-cloud": {
     "build-snapshot": {
@@ -9838,8 +9839,8 @@
     "resource-details": {
       "dismiss-button": "確定",
       "error-messages": {
-        "alert-rules-group-quota-reached": "",
-        "alert-rules-quota-reached": "",
+        "alert-rules-group-quota-reached": "已達到警報規則群組的最大數量：請刪除部分警報規則群組，或升級您的方案，然後再試一次。",
+        "alert-rules-quota-reached": "已達到警報規則的最大數量：請刪除部分警報規則，或升級您的方案，然後再試一次。",
         "dashboard-already-managed": "儀表板已由 Grafana 在雲端執行個體中佈建和管理。我們建議您將來使用已設定的儀表板。若您仍然希望將儀表板複製至雲端執行個體，請變更儀表板 JSON 中的儀表板 ID，儲存新的快照並重新上傳。",
         "datasource-already-managed": "資料來源已由 Grafana 在雲端執行個體中佈建和管理。如果這是不同的資源，請設定另一個 UID 並再試一次。",
         "datasource-invalid-url": "有一個資料來源的網址無效。請提供有效的網址，然後再試一次。",
@@ -10309,7 +10310,7 @@
     "invite-user": {
       "invite-button": "邀請",
       "invite-new-user-button": "",
-      "invite-tooltip": ""
+      "invite-tooltip": "邀請使用者"
     },
     "item": {
       "add-bookmark": "新增至書籤",
@@ -10529,7 +10530,7 @@
     }
   },
   "org-picker": {
-    "noOptionsMessage-no-organizations-found": "",
+    "noOptionsMessage-no-organizations-found": "未找到組織",
     "select-placeholder": "選取組織"
   },
   "page": {
@@ -10752,7 +10753,7 @@
         "permission": "您沒有查看此頁面的權限。",
         "title-access-denied": "拒絕存取"
       },
-      "error-loading-plugin": "",
+      "error-loading-plugin": "外掛程式無法載入",
       "no-root-app-page-component-found": "找不到根應用程式頁面元件"
     },
     "browse": {
@@ -10796,7 +10797,7 @@
         "update-status-text": "外掛程式已更新"
       },
       "versions": {
-        "confirmation-text": "",
+        "confirmation-text": "確定要降級至版本 {{version}} 嗎？通常不應這麼做",
         "downgrade-confirm": "降級",
         "downgrade-title": "降級外掛程式版本"
       }
@@ -10851,8 +10852,8 @@
       "message": "未找到外掛程式"
     },
     "extensions": {
-      "extension-error-alert-description": "",
-      "extension-error-alert-title": ""
+      "extension-error-alert-description": "檢查主控台以了解有關錯誤的更多詳細資訊。",
+      "extension-error-alert-title": "擴充功能無法載入：「{{pluginId}}/{{extensionTitle}}」"
     },
     "extensions-log-data-source": {
       "message": {
@@ -10889,8 +10890,8 @@
     "install-controls-button": {
       "title-uninstall-modal": "解除安裝 {{plugin}}",
       "uninstall-controls": {
-        "body-uninstall-plugin": "",
-        "confirmText-confirm": ""
+        "body-uninstall-plugin": "確定要解除安裝此外掛程式嗎？",
+        "confirmText-confirm": "確認"
       }
     },
     "install-controls-warning": {
@@ -10908,6 +10909,9 @@
       "label-plugin-id": "外掛程式 ID",
       "label-severity": "嚴重性"
     },
+    "no-updates-available": {
+      "message": ""
+    },
     "not-found-plugin": {
       "body-plugin-not-found": "找不到該外掛程式。請檢查網址是否正確或<1></1>前往<3>外掛程式目錄</3>。",
       "title-plugin-not-found": "找不到外掛程式"
@@ -11064,29 +11068,29 @@
   },
   "provisioned-resource-preview-banner": {
     "preview-banner": {
-      "behind-branch-text": "",
-      "not-saved": "",
-      "open-in-repo-button": "",
-      "open-pull-request-in-repo": "",
-      "view-in-repo-button": "",
-      "view-pull-request-in-repo": ""
+      "behind-branch-text": "此資源位於 {{repoType}} 的分支後方。",
+      "not-saved": "在合併此分支之前，您組織中的其他 Grafana 使用者仍會看到儲存到已設定預設分支的目前版本",
+      "open-in-repo-button": "在 {{repoType}} 中開啟",
+      "open-pull-request-in-repo": "在 {{repoType}} 中開啟拉取請求",
+      "view-in-repo-button": "在 {{repoType}} 中檢視，以查看最新變更。",
+      "view-pull-request-in-repo": "在 {{repoType}} 中檢視拉取請求"
     },
-    "title-created-branch-in-repo": "",
-    "title-loaded-pull-request-in-repo": ""
+    "title-created-branch-in-repo": "已在 {{repoType}} 的分支中建立新資源。",
+    "title-loaded-pull-request-in-repo": "此資源是從您剛剛在 {{repoType}} 中建立的分支載入，且只有您可以查看"
   },
-  "provisioned-resource-request-handler": "",
-  "provisioned-resource-request-handler-dashboard": "",
-  "provisioned-resource-request-handler-folder": "",
+  "provisioned-resource-request-handler": "資源已成功儲存",
+  "provisioned-resource-request-handler-dashboard": "儀表板已成功儲存",
+  "provisioned-resource-request-handler-folder": "已成功建立資料夾",
   "provisioning": {
     "banner": {
       "message": "此功能目前正在積極開發中。為了獲得最佳體驗和最新改進版本，建議使用 Grafana 的<2>夜間版本</2>。"
     },
     "bitbucket": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "用於佈建的分支",
+      "branch-label": "分支",
+      "branch-required": "分支為必填",
+      "path-description": "儲存庫中的可選子目錄路徑",
+      "path-label": "路徑",
       "permissions": {
         "pull-requests-label": "",
         "pull-requests-read-write": "",
@@ -11095,18 +11099,18 @@
         "webhooks-label": "",
         "webhooks-read-write": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "允許使用者在儲存變更時選擇是否開啟拉取請求。如果儲存庫不允許直接變更主分支，則可能仍需要拉取請求。",
+      "pr-workflow-label": "儲存時啟用拉取請求選項",
+      "token-description": "具有儲存庫權限的 Bitbucket 應用程式密碼",
+      "token-label": "應用程式密碼",
+      "token-required": "Bitbucket 權杖為必填",
+      "token-user-description": "將用於存取具有應用程式密碼的儲存庫的使用者名稱",
+      "token-user-label": "使用者名稱",
+      "token-user-required": "使用者名稱為必填",
+      "url-description": "Bitbucket 儲存庫網址",
+      "url-label": "儲存庫網址",
+      "url-pattern": "必須為有效的 Bitbucket 儲存庫網址",
+      "url-required": "儲存庫網址為必填"
     },
     "bootstrap-step": {
       "description-clear-repository-connection": "為此儲存庫連線新增一個明確的名稱",
@@ -11117,9 +11121,9 @@
       "label-display-name": "顯示名稱",
       "placeholder-my-repository-connection": "我的儲存庫連線",
       "text-loading-resource-information": "正在載入資源資訊…",
-      "dashboards-count_other": "",
+      "dashboards-count_other": "{{count}} 個儀表板",
       "files-count_other": "{{count}} 個檔案",
-      "folders-count_other": ""
+      "folders-count_other": "{{count}} 個資料夾"
     },
     "check-repository": {
       "check": "勾選"
@@ -11193,7 +11197,7 @@
       "title-instant-updates-requests-webhooks": "透過 webhook 即時更新和拉取請求。",
       "title-visual-previews-in-pull-requests": "具有圖片轉譯的拉取請求中的視覺預覽"
     },
-    "error-title-default": "",
+    "error-title-default": "錯誤",
     "expanded-row": {
       "job-specification": "作業規範",
       "summary": "摘要"
@@ -11202,8 +11206,8 @@
       "actions": {
         "set-up-required-feature-toggles": "設定所需的功能切換"
       },
-      "manage-dashboards-provision-updates-automatically": "",
-      "manage-your-dashboards-with-remote-provisioning": "",
+      "manage-dashboards-provision-updates-automatically": "在 Git 中將儀表板作為代碼管理，並自動佈建更新",
+      "manage-your-dashboards-with-remote-provisioning": "開始使用 Git Sync",
       "store-dashboards-in-version-controlled-storage": "將儀表板儲存在版本控制的儲存空間中，以便更好地組織和追蹤歷史紀錄"
     },
     "file-history-page": {
@@ -11224,16 +11228,16 @@
     },
     "finish-step": {
       "description-enable-previews": "在拉取請求中新增儀表板變更的圖片預覽。您的 Grafana 儀表板圖像將在您的 Git 儲存庫中共用，並且任何具有儲存庫存取權限者都可以看見。",
-      "description-generate-dashboard-previews": "",
+      "description-generate-dashboard-previews": "建立拉取請求的預覽連結",
       "description-image-rendering": "需要圖片轉譯。<2>設定圖片轉譯</2>",
-      "description-preview-requirements": "",
+      "description-preview-requirements": "（需要<2>圖片轉譯</2>並啟用公開存取權）",
       "description-read-only": "無法透過 Grafana 修改資源。",
-      "description-sync-interval": "",
-      "error-sync-interval-required": "",
+      "description-sync-interval": "從儲存庫同步變更的頻率",
+      "error-sync-interval-required": "同步間隔為必填",
       "label-enable-previews": "在拉取請求中啟用儀表板預覽",
-      "label-generate-dashboard-previews": "",
+      "label-generate-dashboard-previews": "產生儀表板預覽",
       "label-read-only": "唯讀",
-      "label-sync-interval": ""
+      "label-sync-interval": "同步間隔（秒）"
     },
     "folder-repository-list": {
       "no-results-matching-your-query": "沒有符合您查詢的結果",
@@ -11265,46 +11269,46 @@
       "subtitle-provisioning-feature": "檢視及管理您的佈建連線"
     },
     "git": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "token-user-description": "",
-      "token-user-label": "",
-      "token-user-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "用於佈建的分支",
+      "branch-label": "分支",
+      "branch-required": "分支為必填",
+      "path-description": "儲存庫中的可選子目錄路徑",
+      "path-label": "路徑",
+      "pr-workflow-description": "允許使用者在儲存變更時選擇是否開啟拉取請求。如果儲存庫不允許直接變更主分支，則可能仍需要拉取請求。",
+      "pr-workflow-label": "儲存時啟用拉取請求選項",
+      "token-description": "Git 儲存庫存取權杖或密碼",
+      "token-label": "存取權杖",
+      "token-required": "Git 權杖為必填",
+      "token-user-description": "將用於存取具有存取權杖的儲存庫的使用者名稱",
+      "token-user-label": "使用者名稱",
+      "token-user-required": "使用者名稱為必填",
+      "url-description": "Git 儲存庫網址",
+      "url-label": "儲存庫網址",
+      "url-pattern": "必須為有效的 Git 儲存庫網址",
+      "url-required": "儲存庫網址為必填"
     },
     "github": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "branch-description": "用於佈建的分支",
+      "branch-label": "分支",
+      "branch-required": "分支為必填",
+      "path-description": "儲存庫中的可選子目錄路徑",
+      "path-label": "路徑",
+      "pr-workflow-description": "允許使用者在儲存變更時選擇是否開啟拉取請求。如果儲存庫不允許直接變更主分支，則可能仍需要拉取請求。",
+      "pr-workflow-label": "儲存時啟用拉取請求選項",
+      "token-description": "具有儲存庫權限的 GitHub 個人存取權杖",
+      "token-label": "個人存取權杖",
+      "token-required": "GitHub 權杖為必填",
+      "url-description": "Github 儲存庫網址",
+      "url-label": "儲存庫網址",
+      "url-pattern": "必須為有效的 GitHub 儲存庫網址",
+      "url-required": "儲存庫網址為必填"
     },
     "gitlab": {
-      "branch-description": "",
-      "branch-label": "",
-      "branch-required": "",
-      "path-description": "",
-      "path-label": "",
+      "branch-description": "用於佈建的分支",
+      "branch-label": "分支",
+      "branch-required": "分支為必填",
+      "path-description": "儲存庫中的可選子目錄路徑",
+      "path-label": "路徑",
       "permissions": {
         "api": "",
         "api-read-write": "",
@@ -11313,15 +11317,15 @@
         "user-label": "",
         "user-read": ""
       },
-      "pr-workflow-description": "",
-      "pr-workflow-label": "",
-      "token-description": "",
-      "token-label": "",
-      "token-required": "",
-      "url-description": "",
-      "url-label": "",
-      "url-pattern": "",
-      "url-required": ""
+      "pr-workflow-description": "允許使用者在儲存變更時選擇是否開啟合併請求。如果儲存庫不允許直接變更主分支，則可能仍需要合併請求。",
+      "pr-workflow-label": "儲存時啟用合併請求選項",
+      "token-description": "具有儲存庫權限的 GitLab 專案存取權杖",
+      "token-label": "專案存取權杖",
+      "token-required": "GitLab 權杖為必填",
+      "url-description": "GitLab 儲存庫網址",
+      "url-label": "儲存庫網址",
+      "url-pattern": "必須為有效的 GitLab 儲存庫網址",
+      "url-required": "儲存庫網址為必填"
     },
     "history-view": {
       "not-found": "無結果"
@@ -11349,18 +11353,18 @@
       "starting": "正在開始…",
       "status": {
         "title-error-running-job": "執行作業時發生錯誤",
-        "title-success-running-job": "",
-        "title-warning-running-job": ""
+        "title-success-running-job": "作業已成功完成",
+        "title-warning-running-job": "作業已完成，但有警告"
       },
       "summary": "摘要",
       "title": {
-        "error-fetching-active-job": ""
+        "error-fetching-active-job": "擷取進行中的作業時發生錯誤"
       }
     },
     "local": {
-      "path-description": "",
-      "path-label": "",
-      "path-required": ""
+      "path-description": "儲存庫的本機檔案系統路徑",
+      "path-label": "儲存庫路徑",
+      "path-required": "儲存庫路徑為必填"
     },
     "mode-options": {
       "folder": {
@@ -11386,7 +11390,7 @@
     },
     "repository-actions": {
       "settings": "設定",
-      "source-code": ""
+      "source-code": "原始碼"
     },
     "repository-card": {
       "get-repository-meta": {
@@ -11452,22 +11456,22 @@
       "title-queued-for-deletion": "已排入刪除佇列"
     },
     "repository-type-cards": {
-      "choose-provider": "",
-      "configure-file": "",
-      "configure-with-provider": "",
-      "provider-not-listed": ""
+      "choose-provider": "選擇一個提供者：",
+      "configure-file": "設定檔案佈建",
+      "configure-with-provider": "以{{ provider }}設定",
+      "provider-not-listed": "如果您的提供者未列出："
     },
     "repository-types": {
-      "bitbucket": "",
-      "bitbucket-description": "",
-      "github": "",
-      "github-description": "",
-      "gitlab": "",
-      "gitlab-description": "",
-      "local": "",
-      "local-description": "",
-      "pure-git": "",
-      "pure-git-description": ""
+      "bitbucket": "Bitbucket",
+      "bitbucket-description": "連接到 Bitbucket 儲存庫",
+      "github": "GitHub",
+      "github-description": "連接到 GitHub 儲存庫",
+      "gitlab": "GitLab",
+      "gitlab-description": "連接到 GitLab 儲存庫",
+      "local": "本機",
+      "local-description": "設定檔案佈建",
+      "pure-git": "純 Git",
+      "pure-git-description": "連接到任何 Git 儲存庫"
     },
     "resource-view": {
       "base": "基數",
@@ -11498,11 +11502,11 @@
       "label-current-step": "目前步驟",
       "label-pending-step": "待處理步驟"
     },
-    "success-title-default": "",
+    "success-title-default": "成功",
     "sync-job": {
-      "error-no-job-id": "",
-      "error-no-repository-name": "",
-      "error-starting-job": ""
+      "error-no-job-id": "無法啟動作業",
+      "error-no-repository-name": "未提供儲存庫名稱",
+      "error-starting-job": "開始作業時發生錯誤"
     },
     "sync-repository": {
       "body-edit-configuration": "編輯設定",
@@ -11530,7 +11534,7 @@
       "go-to": "前往",
       "make-sure": "請務必包含以下權限"
     },
-    "warning-title-default": "",
+    "warning-title-default": "警告",
     "wizard": {
       "alert-point-1": "在此過程中，將無法建立、編輯或刪除資源。在最後一步中，它們將會消失。",
       "alert-point-2": "佈建完成後，資源將重新出現，並透過外部儲存空間進行管理。",
@@ -11540,10 +11544,10 @@
       "button-next": "結束",
       "button-start": "開始同步處理",
       "discard-modal": {
-        "body": "",
-        "confirm": "",
-        "dismiss": "",
-        "title": ""
+        "body": "這將刪除儲存庫設定，您將失去所有進度。確定要捨棄變更嗎？",
+        "confirm": "是的，捨棄",
+        "dismiss": "繼續工作",
+        "title": "要捨棄儲存庫設定嗎？"
       },
       "step-bootstrap": "選擇要同步的內容",
       "step-connect": "連接",
@@ -11559,7 +11563,7 @@
     "wizard-content": {
       "button-cancel": "取消",
       "button-cancelling": "正在取消…",
-      "button-previous": "",
+      "button-previous": "上一個",
       "button-submitting": "正在提交…",
       "error-instance-repository-exists": "執行個體儲存庫已存在"
     }
@@ -11956,7 +11960,7 @@
         "recommended": "建議",
         "results": "結果"
       },
-      "search": ""
+      "search": "搜尋「{{parentTitle}}」"
     }
   },
   "search": {
@@ -12037,7 +12041,7 @@
     }
   },
   "service-account-picker": {
-    "noOptionsMessage-no-service-accounts-found": "",
+    "noOptionsMessage-no-service-accounts-found": "未找到服務帳戶",
     "select-aria-label": "服務帳戶選擇器",
     "select-placeholder": "開始輸入以搜尋服務帳戶"
   },
@@ -12083,10 +12087,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "新增服務帳戶權杖",
-      "body-delete-service-account": "",
-      "body-disable-service-account": "",
-      "confirmText-delete-service-account": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-service-account": "確定要刪除此服務帳戶嗎？",
+      "body-disable-service-account": "確定要停用此服務帳戶嗎？",
+      "confirmText-delete-service-account": "刪除服務帳戶",
+      "confirmText-disable-service-account": "停用服務帳戶",
       "delete-service-account": "刪除服務帳戶",
       "disable-service-account": "停用服務帳戶",
       "enable-service-account": "啟用服務帳戶",
@@ -12113,7 +12117,7 @@
       "used-by": "使用者"
     },
     "service-account-profile-row": {
-      "confirmText-save": "",
+      "confirmText-save": "儲存",
       "edit": "編輯"
     },
     "service-account-role-row": {
@@ -12127,15 +12131,15 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "新增服務帳戶",
-      "body-delete-with-tokens": "",
-      "body-disable-service-account": "",
-      "confirmText-delete": "",
-      "confirmText-disable-service-account": "",
+      "body-delete-with-tokens": "確定要刪除「{{serviceAccountName}}」嗎？",
+      "body-disable-service-account": "確定要停用「{{accountToDisable}}」嗎？",
+      "confirmText-delete": "刪除",
+      "confirmText-disable-service-account": "停用服務帳戶",
       "placeholder-search-service-account-by-name": "按名稱搜尋服務帳戶",
       "sub-title": "服務帳戶及其權杖可用於針對 Grafana API 進行驗證。請在我們的<2>文件中閱讀更多資訊。</2>",
       "title-delete-service-account": "刪除服務帳戶",
       "title-disable-service-account": "停用服務帳戶",
-      "body-delete_other": ""
+      "body-delete_other": "確定要刪除「{{serviceAccountName}}」和 {{count}} 個隨附的權杖嗎？"
     },
     "token-expiration": {
       "content-this-token-has-expired": "此權杖已過期",
@@ -12149,7 +12153,7 @@
   },
   "share-dashboard": {
     "menu": {
-      "export-image-title": "",
+      "export-image-title": "匯出為圖片",
       "export-json-title": "匯出為 JSON",
       "share-externally-title": "外部分享",
       "share-internally-title": "內部分享",
@@ -12186,17 +12190,17 @@
       "view-button-yaml": "檢視 YAML"
     },
     "image": {
-      "actions": "",
-      "cancel-button": "",
-      "download-button": "",
-      "error-title": "",
-      "generate-button": "",
-      "generating": "",
-      "info-text": "",
-      "preview": "",
-      "preview-aria": "",
-      "preview-region": "",
-      "title": ""
+      "actions": "圖片匯出動作",
+      "cancel-button": "取消",
+      "download-button": "下載圖片",
+      "error-title": "無法產生圖片",
+      "generate-button": "產生圖片",
+      "generating": "正在產生圖片…",
+      "info-text": "將此儀表板儲存為圖片",
+      "preview": "預覽",
+      "preview-aria": "產生的圖片預覽",
+      "preview-region": "圖片預覽",
+      "title": "匯出為圖片"
     },
     "library": {
       "info": "建立資料庫面板。"
@@ -12206,7 +12210,7 @@
       "info-text": "建立指向此儀表板或面板的直接連結，並使用以下選項自訂。",
       "link-url": "連結網址",
       "render-alert": "未安裝圖片轉譯器外掛程式",
-      "render-instructions": "",
+      "render-instructions": "若要轉譯圖片，您必須安裝 <2>Grafana 圖片轉譯器外掛程式</2>。請聯絡您的 Grafana 管理員以安裝外掛程式。",
       "rendered-image": "直接連結轉譯的圖片",
       "save-alert": "儀表板未儲存",
       "save-dashboard": "若要呈現面板圖片，您必須先儲存儀表板。",
@@ -12274,11 +12278,11 @@
     }
   },
   "share-panel-image": {
-    "disabled-help": "",
-    "download-disabled-help": "",
-    "error-title": "",
+    "disabled-help": "儲存儀表板以啟用圖片產生",
+    "download-disabled-help": "首先產生圖片以啟用下載",
+    "error-title": "無法產生圖片",
     "form": {
-      "label": ""
+      "label": "面板圖片設定"
     },
     "preview": {
       "title": "面板預覽"
@@ -12592,17 +12596,17 @@
       "label-small": "小"
     },
     "cell-types": {
-      "actions": "",
-      "auto": "",
-      "color-background": "",
-      "color-text": "",
-      "data-links": "",
-      "gauge": "",
-      "image": "",
-      "json": "",
+      "actions": "動作",
+      "auto": "自動",
+      "color-background": "彩色背景",
+      "color-text": "文字顏色",
+      "data-links": "資料連結",
+      "gauge": "儀表",
+      "image": "圖片",
+      "json": "JSON 檢視",
       "markdown": "",
-      "pill": "",
-      "sparkline": ""
+      "pill": "圓角標籤",
+      "sparkline": "走勢圖"
     },
     "color-background-cell-options-editor": {
       "description-apply-to-entire-row": "若選取，整列將以此儲存格的顏色顯示。",
@@ -12631,7 +12635,7 @@
     "description-count-rows": "顯示所有資料列的單一計數",
     "description-fields": "選擇應計算的欄位",
     "description-min-column-width": "欄自動調整大小的最小寬度",
-    "description-wrap-header-text": "",
+    "description-wrap-header-text": "啟用欄標題的文字自動換行功能",
     "image-cell-options-editor": {
       "description-alt-text": "若圖片無法顯示或為使用螢幕閱讀器的使用者顯示的替代文字",
       "description-title-text": "滑鼠移至圖片上方時所顯示的文字",
@@ -12715,7 +12719,7 @@
     "tag-option-label": "標記選項"
   },
   "team-picker": {
-    "noOptionsMessage-no-teams-found": "",
+    "noOptionsMessage-no-teams-found": "未找到團隊",
     "select-aria-label": "團隊選擇器",
     "select-placeholder": "選擇團隊"
   },
@@ -13019,15 +13023,15 @@
     "calculate-field-transformer-editor": {
       "calculation-modes": {
         "label": {
-          "binary-operation": "",
-          "reduce-row": "",
-          "row-index": "",
-          "unary-operation": ""
+          "binary-operation": "二元運算",
+          "reduce-row": "減少列",
+          "row-index": "列索引",
+          "unary-operation": "一元運算"
         }
       },
       "label": {
-        "cumulative-functions": "",
-        "window-functions": ""
+        "cumulative-functions": "累積函數",
+        "window-functions": "視窗函數"
       },
       "label-alias": "別名",
       "label-mode": "模式",
@@ -13045,9 +13049,9 @@
       "label-name": "名稱",
       "name-modes": {
         "label": {
-          "copy-frame-name-to-field": "",
-          "ignore-the-frame-name": "",
-          "label-frame": ""
+          "copy-frame-name-to-field": "將框架名稱複製到欄位名稱",
+          "ignore-the-frame-name": "忽略框架名稱",
+          "label-frame": "新增帶有框架名稱的標籤"
         }
       },
       "placeholder-frame": "畫面"
@@ -13060,9 +13064,9 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "新增轉換欄位類型轉換器",
       "aria-label-remove-convert-field-type-transformer": "移除轉換欄位類型轉換器",
-      "convert-field-type": "",
+      "convert-field-type": "轉換欄位類型",
       "description": {
-        "convert-to-specified-field-type": ""
+        "convert-to-specified-field-type": "將欄位轉換為指定欄位類型。"
       },
       "label": {
         "browser": "瀏覽器",
@@ -13075,11 +13079,11 @@
       "label-join-with": "合併方式",
       "label-set-timezone": "設定時區",
       "name": {
-        "convert-field-type": ""
+        "convert-field-type": "轉換欄位類型"
       },
       "placeholder-type": "類型",
       "tags": {
-        "format-field": ""
+        "format-field": "格式化欄位"
       },
       "tooltip-explicit-separator-joining-array-values": "合併陣列值時使用明確的分隔符",
       "tooltip-input-format": "指定輸入欄位的格式，以便 Grafana 可以正確解析日期字串。",
@@ -13105,13 +13109,13 @@
     "editors": {
       "concatenate-transformer-editor": {
         "description": {
-          "combine-all-fields": ""
+          "combine-all-fields": "將所有欄位合併到單個框架中。"
         },
         "name": {
-          "concatenate-fields": ""
+          "concatenate-fields": "串連欄位"
         },
         "tags": {
-          "combine": ""
+          "combine": "合併"
         }
       }
     },
@@ -13126,11 +13130,11 @@
     },
     "extract-fields-transformer-editor": {
       "description": {
-        "parse-fields-from-content": ""
+        "parse-fields-from-content": "從內容（JSON、標籤等）中剖析欄位。"
       },
       "field-name-picker-settings": {
         "placeholderText": {
-          "select-field": ""
+          "select-field": "選擇欄位"
         }
       },
       "label-delimiter": "定界符",
@@ -13139,7 +13143,7 @@
       "label-replace-all-fields": "取代所有欄位",
       "label-source": "來源",
       "name": {
-        "extract-fields": ""
+        "extract-fields": "擷取欄位"
       },
       "placeholder-auto": "自動",
       "placeholder-select-delimiter": "選擇分隔符…",
@@ -13150,20 +13154,20 @@
     },
     "field-lookup-transformer-editor": {
       "description": {
-        "lookup-additional-fields-external-source": ""
+        "lookup-additional-fields-external-source": "使用欄位值來查詢國家、州或機場。"
       },
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "未找到文字欄位"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "選擇文字欄位"
         }
       },
       "label-field": "欄位",
       "label-lookup": "查找",
       "name": {
-        "lookup-fields-from-resource": ""
+        "lookup-fields-from-resource": "從資源中查找欄位"
       }
     },
     "field-to-config-mapping-editor": {
@@ -13174,23 +13178,23 @@
     },
     "filter-by-name-transformer-editor": {
       "description": {
-        "remove-part-query-results-regex-pattern": ""
+        "remove-part-query-results-regex-pattern": "使用正則表達式模式移除部分查詢結果。"
       },
       "label-from-variable": "從變數",
       "label-identifier": "標識符",
       "label-use-variable": "使用變數",
       "label-variable": "變數",
       "name": {
-        "filter-fields-by-name": ""
+        "filter-fields-by-name": "按名稱篩選欄位"
       },
       "placeholder-regular-expression-pattern": "規則運算式模式"
     },
     "filter-by-ref-id-transformer-editor": {
       "description": {
-        "filter-data-by-query-useful-sharing-results": ""
+        "filter-data-by-query-useful-sharing-results": "根據來源查詢從資料中移除列"
       },
       "name": {
-        "filter-data-by-query": ""
+        "filter-data-by-query": "依查詢篩選資料"
       }
     },
     "filter-by-value-filter-editor": {
@@ -13204,33 +13208,33 @@
     "filter-by-value-transformer-editor": {
       "add-condition": "新增條件",
       "description": {
-        "remove-rows-query-results-user-defined-filters": ""
+        "remove-rows-query-results-user-defined-filters": "使用使用者定義的篩選條件從查詢結果中移除列。"
       },
       "filter-match": {
         "label": {
-          "match-all": "",
-          "match-any": ""
+          "match-all": "匹配全部",
+          "match-any": "匹配任何"
         }
       },
       "filter-types": {
         "label": {
-          "exclude": "",
-          "include": ""
+          "exclude": "排除",
+          "include": "包含"
         }
       },
       "label-conditions": "條件",
       "label-filter-type": "篩選器類型",
       "name": {
-        "filter-data-by-values": ""
+        "filter-data-by-values": "依據數值篩選資料"
       }
     },
     "format-string-transfomer-editor": {
       "field-name-picker-settings": {
         "noFieldsMessage": {
-          "no-text-fields-found": ""
+          "no-text-fields-found": "未找到文字欄位"
         },
         "placeholderText": {
-          "select-text-field": ""
+          "select-text-field": "選擇文字欄位"
         }
       },
       "label-field": "欄位",
@@ -13239,10 +13243,10 @@
     },
     "format-string-transformer-editor": {
       "description": {
-        "manipulate-string-fields-formatting": ""
+        "manipulate-string-fields-formatting": "操縱字串欄位格式。"
       },
       "name": {
-        "format-string": ""
+        "format-string": "格式化字串"
       }
     },
     "format-time-transfomer-editor": {
@@ -13254,66 +13258,66 @@
     },
     "format-time-transformer-editor": {
       "description": {
-        "set-based-on-time": ""
+        "set-based-on-time": "設定時間欄位的輸出格式"
       },
       "name": {
-        "format-time": ""
+        "format-time": "格式化時間"
       }
     },
     "get-calculate-field-transform-registry-item": {
       "description": {
-        "values-calculate-field": ""
+        "values-calculate-field": "使用列值計算新欄位。"
       },
       "name": {
-        "add-field-from-calculation": ""
+        "add-field-from-calculation": "從計算中新增欄位"
       }
     },
     "get-config-from-data-transformer": {
       "description": {
-        "set-unit-min-max-and-more": ""
+        "set-unit-min-max-and-more": "設定單位、最小值、最大值等。"
       },
       "name": {
-        "config-from-query-results": ""
+        "config-from-query-results": "從查詢結果設定"
       }
     },
     "get-heatmap-transformer": {
       "description": {
-        "generate-heatmap-data-from-source": ""
+        "generate-heatmap-data-from-source": "從來源資料產生熱度圖資料。"
       },
       "name": {
-        "create-heatmap": ""
+        "create-heatmap": "建立熱度圖"
       }
     },
     "get-join-by-labels-transformer": {
       "description": {
-        "flatten-labeled-results-table-joined-labels": ""
+        "flatten-labeled-results-table-joined-labels": "將標籤結果平面化為由標籤連接的表格。"
       },
       "name": {
-        "join-by-labels": ""
+        "join-by-labels": "依據標籤加入"
       }
     },
     "get-partition-by-values-transformer": {
       "description": {
-        "split-oneframe-dataset-multiple-series": ""
+        "split-oneframe-dataset-multiple-series": "將單一框架資料集分割為多個序列。"
       },
       "name": {
-        "partition-by-values": ""
+        "partition-by-values": "依值分割"
       }
     },
     "get-rows-to-fields-transformer": {
       "description": {
-        "convert-field-dynamic-config": ""
+        "convert-field-dynamic-config": "使用動態設定將每列轉換為欄位。"
       },
       "name": {
-        "rows-to-fields": ""
+        "rows-to-fields": "列到欄位"
       }
     },
     "get-spatial-transformer": {
       "description": {
-        "apply-spatial-operations-to-query-results": ""
+        "apply-spatial-operations-to-query-results": "將空間操作套用至查詢結果。"
       },
       "name": {
-        "spatial-operations": ""
+        "spatial-operations": "空間作業"
       }
     },
     "get-timezone-options": {
@@ -13345,8 +13349,8 @@
     "group-by-field-configuration": {
       "options": {
         "label": {
-          "calculate": "",
-          "group-by": ""
+          "calculate": "計算",
+          "group-by": "分組依據"
         }
       },
       "placeholder-ignored": "已略過",
@@ -13354,42 +13358,42 @@
     },
     "group-by-transformer-editor": {
       "description": {
-        "group-series-by-field-calculate-stats": ""
+        "group-series-by-field-calculate-stats": "依欄位值分組資料並建立聚合資料。"
       },
       "name": {
-        "group-by": ""
+        "group-by": "分組依據"
       },
       "title-calc-alert": "如未將任何欄位分組，則計算將無效"
     },
     "group-to-nested-table-transformer-editor": {
       "description": {
-        "group-by-field-value": ""
+        "group-by-field-value": "依欄位值分組資料，並使用分組資料建立巢狀表格。"
       },
       "description-show-field-names": "若啟用，巢狀表格將顯示欄位名稱作為表格標題",
       "label-show-field-names-in-nested-tables": "在巢狀表格中顯示欄位名稱",
       "name": {
-        "group-to-nested-tables": ""
+        "group-to-nested-tables": "分組到巢狀表格"
       },
       "title-calc-alert": "如未將任何欄位分組，則計算將無效。"
     },
     "grouping-to-matrix-transformer-editor": {
       "description": {
-        "summarize-and-reorganize-data": ""
+        "summarize-and-reorganize-data": "根據三個欄位彙總和重組資料。"
       },
       "label-cell-value": "儲存格數值",
       "label-column": "欄位",
       "label-empty-value": "空白數值",
       "label-row": "列",
       "name": {
-        "grouping-to-matrix": ""
+        "grouping-to-matrix": "分組到矩陣"
       }
     },
     "histogram-transformer-editor": {
       "description": {
-        "calculate-histogram-from-input-data": ""
+        "calculate-histogram-from-input-data": "從輸入資料計算直方圖。"
       },
       "name": {
-        "histogram": ""
+        "histogram": "直方圖"
       },
       "placeholder-auto": "自動",
       "placeholder-default": "預設值：30",
@@ -13401,14 +13405,14 @@
     },
     "join-by-field-transformer-editor": {
       "description": {
-        "combine-rows-from-2-tables": ""
+        "combine-rows-from-2-tables": "根據相關欄位合併 2 個以上表格的列。"
       },
       "name": {
-        "join-by-field": ""
+        "join-by-field": "依欄位加入"
       }
     },
     "join-by-labels-transformer-editor": {
-      "error-required": "",
+      "error-required": "必填",
       "info": {
         "input-contain-labels": "輸入內容不包含任何標籤",
         "no-input-or-labels-found": "找不到輸入內容（或標籤）",
@@ -13432,8 +13436,8 @@
       "label-value-field-name": "值欄位名稱",
       "modes": {
         "label": {
-          "columns": "",
-          "rows": ""
+          "columns": "欄",
+          "rows": "列"
         }
       },
       "placeholder-optional-select-label": "（選填）選取標籤",
@@ -13441,18 +13445,18 @@
     },
     "labels-to-fields-transformer-editor": {
       "description": {
-        "groups-series-time-return-labels-tags-fields": ""
+        "groups-series-time-return-labels-tags-fields": "依時間分組系列，並將標籤或標籤作為欄位返回。"
       },
       "name": {
-        "labels-to-fields": ""
+        "labels-to-fields": "欄位標籤"
       }
     },
     "limit-transformer-editor": {
       "description": {
-        "limit-number-items-displayed": ""
+        "limit-number-items-displayed": "限制顯示的項目數。"
       },
       "name": {
-        "limit": ""
+        "limit": "限制"
       },
       "placeholder-value-or-variable": "值或變數"
     },
@@ -13465,11 +13469,11 @@
     },
     "merge-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "合併多個序列。數值將合併成一列。"
       },
       "merge-effect-applied-single-frame": "套用到單個框架時，合併不起作用。",
       "name": {
-        "merge": ""
+        "merge": "合併系列／表格"
       }
     },
     "multi-info": {
@@ -13481,14 +13485,14 @@
     },
     "organize-fields-transformer-editor": {
       "description": {
-        "reorder-hide-or-rename-fields": ""
+        "reorder-hide-or-rename-fields": "重新排序、隱藏或重新命名欄位。"
       },
       "field-order": "欄位順序",
       "field-order-auto": "自動",
       "field-order-manual": "手動",
       "first-frame-warning": "組織欄位僅適用於單個框架。請考慮先套用加入轉換或篩選輸入。",
       "name": {
-        "organize-fields": ""
+        "organize-fields": "按名稱組織欄位"
       }
     },
     "partion-by-values-editor": {
@@ -13516,10 +13520,10 @@
     },
     "prepare-time-series": {
       "description": {
-        "stretch-data-frames": ""
+        "stretch-data-frames": "將資料框架從寬格式拉伸為長格式。"
       },
       "name": {
-        "prepare-time-series": ""
+        "prepare-time-series": "準備時間序列"
       }
     },
     "prepare-time-series-editor": {
@@ -13527,26 +13531,26 @@
       "label-info": "資訊",
       "long-info": {
         "description": {
-          "convert-each-frame-to-long-format": ""
+          "convert-each-frame-to-long-format": "將每個框架轉換為長格式"
         },
         "label": {
-          "long-time-series": ""
+          "long-time-series": "長時間序列"
         }
       },
       "multi-info": {
         "description": {
-          "creates-frame-timenumber": ""
+          "creates-frame-timenumber": "為每個時間／數字對建立新框架"
         },
         "label": {
-          "multiframe-time-series": ""
+          "multiframe-time-series": "多框架時間序列"
         }
       },
       "wide-info": {
         "description": {
-          "creates-single-frame-joined": ""
+          "creates-single-frame-joined": "建立按時間連接的單一框架"
         },
         "label": {
-          "wide-time-series": ""
+          "wide-time-series": "寬時間序列"
         }
       }
     },
@@ -13561,7 +13565,7 @@
     },
     "reduce-transformer-editor": {
       "description": {
-        "reduce-to-single-value": ""
+        "reduce-to-single-value": "將所有列或資料點減少為單一值（例如最大值、平均值）。"
       },
       "label-calculations": "計算",
       "label-include-time": "包含時間",
@@ -13578,7 +13582,7 @@
         }
       },
       "name": {
-        "reduce": ""
+        "reduce": "減少"
       },
       "placeholder-choose-stat": "選擇統計資料"
     },
@@ -13588,18 +13592,23 @@
     },
     "regression": {
       "description": {
-        "create-new-data-frame": ""
+        "create-new-data-frame": "建立一個新的資料框架，其中包含統計模型預測的值。"
       },
       "name": {
-        "trendline": ""
+        "trendline": "趨勢線"
       }
     },
     "regression-transformer-editor": {
       "label": {
         "cubic": "立方",
+        "decic": "",
+        "nonic": "",
+        "octic": "",
         "quadratic": "二次方",
         "quartic": "四次方",
-        "quintic": "五次方"
+        "quintic": "五次方",
+        "septic": "",
+        "sextic": ""
       },
       "label-degree": "度",
       "label-model-type": "模型類型",
@@ -13614,16 +13623,17 @@
       },
       "regression": "回歸",
       "tags": {
-        "regression-analysis": ""
+        "regression-analysis": "迴歸分析工具"
       },
+      "tooltip-high-degree-polynomial": "",
       "tooltip-number-of-xy-points-to-predict": "要預測的 X、Y 點數"
     },
     "rename-by-regex-transformer": {
       "description": {
-        "rename-parts-using-regex": ""
+        "rename-parts-using-regex": "使用正則表達式和替換模式重新命名部分查詢結果。"
       },
       "name": {
-        "rename-fields-by-regex": ""
+        "rename-fields-by-regex": "依據正則表達式重新命名欄位"
       }
     },
     "rename-by-regex-transformer-editor": {
@@ -13637,33 +13647,33 @@
       "label-mode": "模式",
       "modes": {
         "description": {
-          "combine-data-from-two-tables": "",
-          "join-on-a-field": "",
-          "keep-all-rows": ""
+          "combine-data-from-two-tables": "每當兩個表格的公共欄位中有相符的值時，合併兩個表格的資料。",
+          "join-on-a-field": "在具有重複值的欄位值上進行連接。非高效外連接最適合用於表格式（類似 SQL）資料。",
+          "keep-all-rows": "保留任何表格中具有值的所有列。連接不同的欄位值。表現最佳，最適合用於時間序列。"
         },
         "label": {
-          "inner": "",
-          "outer-tabular": "",
-          "outer-time-series": ""
+          "inner": "內部",
+          "outer-tabular": "外部（表格式）",
+          "outer-time-series": "外部（時間序列）"
         }
       }
     },
     "series-to-rows-transformer-editor": {
       "description": {
-        "merge-multiple-series": ""
+        "merge-multiple-series": "合併多個序列。傳回時間、指標和數值作為一列。"
       },
       "name": {
-        "series-to-rows": ""
+        "series-to-rows": "將序列轉為列"
       }
     },
     "sort-by-transformer-editor": {
       "description": {
-        "sort-fields": ""
+        "sort-fields": "對框架中的欄位進行排序。"
       },
       "label-field": "欄位",
       "label-reverse": "反向",
       "name": {
-        "sort-by": ""
+        "sort-by": "排序方式"
       },
       "placeholder-select-field": "選擇欄位"
     },
@@ -13686,13 +13696,13 @@
     },
     "time-series-table": {
       "description": {
-        "convert-to-table-rows": ""
+        "convert-to-table-rows": "將時間序列資料轉換為表格列，以便以表格或走勢圖格式查看。"
       },
       "is-applicable-description": {
-        "requires-time-series-frame": ""
+        "requires-time-series-frame": "時間序列到表格轉換需要至少一個時間序列框架才能運作。您目前沒有任何框架。"
       },
       "name": {
-        "time-series-to-table": ""
+        "time-series-to-table": "時間序列到表格"
       }
     },
     "time-series-table-transform-editor": {
@@ -13710,15 +13720,15 @@
     },
     "transpose-transformer-editor": {
       "description": {
-        "transpose-data-frame": ""
+        "transpose-data-frame": "轉置資料框架。"
       },
       "name": {
-        "transpose": ""
+        "transpose": "轉置"
       },
       "tags": {
-        "pivot": "",
-        "transform": "",
-        "translate": ""
+        "pivot": "樞紐",
+        "transform": "轉變",
+        "translate": "翻譯"
       }
     },
     "unary-operation-editor": {
@@ -13727,13 +13737,13 @@
     },
     "utils": {
       "get-categories-labels": {
-        "calculate-new-fields": "",
-        "combine": "",
-        "create-new-visualization": "",
-        "filter": "",
-        "perform-spatial-operations": "",
-        "reformat": "",
-        "reorder-and-rename": ""
+        "calculate-new-fields": "計算新欄位",
+        "combine": "合併",
+        "create-new-visualization": "建立新的視覺化",
+        "filter": "篩選",
+        "perform-spatial-operations": "執行空間作業",
+        "reformat": "重新格式化",
+        "reorder-and-rename": "重新排序和重新命名"
       },
       "special-value-options": {
         "description": {
@@ -13804,7 +13814,7 @@
     "title": "組織"
   },
   "user-picker": {
-    "noOptionsMessage-no-users-found": "",
+    "noOptionsMessage-no-users-found": "未找到使用者",
     "select-aria-label": "使用者選擇器",
     "select-placeholder": "開始輸入以搜尋使用者"
   },
@@ -13890,8 +13900,8 @@
       }
     },
     "confirm-delete-modal": {
-      "body-delete-variable": "",
-      "confirmText-delete": "",
+      "body-delete-variable": "確定要刪除變數「{{variableToDelete}}」嗎？",
+      "confirmText-delete": "刪除",
       "title-delete-variable": "刪除變數"
     },
     "create-ad-hoc-variable-adapter": {
@@ -13941,33 +13951,33 @@
     },
     "query-variable-sort-select": {
       "description-values-variable": "如何將此變數的值排序",
-      "name-sort": "",
+      "name-sort": "排序",
       "sort_options": {
         "label": {
-          "alphabetical-asc": "",
-          "alphabetical-caseinsensitive-asc": "",
-          "alphabetical-caseinsensitive-desc": "",
-          "alphabetical-desc": "",
-          "disabled": "",
-          "natural-asc": "",
-          "natural-desc": "",
-          "numerical-asc": "",
-          "numerical-desc": ""
+          "alphabetical-asc": "字母（升序）",
+          "alphabetical-caseinsensitive-asc": "字母（不區分大小寫，升序）",
+          "alphabetical-caseinsensitive-desc": "字母（不區分大小寫，降序）",
+          "alphabetical-desc": "字母（降序）",
+          "disabled": "已停用",
+          "natural-asc": "自然（升序）",
+          "natural-desc": "自然（降序）",
+          "numerical-asc": "數值（升序）",
+          "numerical-desc": "數值（降序）"
         }
       }
     },
     "query-variable-static-options": {
-      "add-option-button-label": "",
-      "description": "",
-      "label-placeholder": "",
-      "remove-option-button-label": "",
-      "value-placeholder": ""
+      "add-option-button-label": "新增選項",
+      "description": "除了查詢結果之外，還可新增自訂選項",
+      "label-placeholder": "顯示標籤",
+      "remove-option-button-label": "移除選項",
+      "value-placeholder": "值，預設空字串"
     },
     "query-variable-static-options-sort-select": {
-      "description-values-variable": ""
+      "description-values-variable": "如何使用查詢結果對靜態選項進行排序"
     },
     "text-box-variable-editor": {
-      "name-default-value": "",
+      "name-default-value": "預設值",
       "placeholder-default-value-if-any": "預設值（如有）",
       "text-options": "文字選項"
     },
@@ -13996,8 +14006,8 @@
       "description-optional-display-name": "可選的顯示名稱",
       "description-template-variable-characters": "範本變數的名稱。（最多 50 個字元）",
       "general": "一般",
-      "name-label": "",
-      "name-name": "",
+      "name-label": "標籤",
+      "name-name": "名稱",
       "placeholder-descriptive-text": "描述性文字",
       "placeholder-label-name": "標籤名稱",
       "placeholder-variable-name": "變數名稱",
@@ -14013,13 +14023,13 @@
       "tooltip-remove-variable": "移除變數"
     },
     "variable-editor-un-connected": {
-      "name-description": ""
+      "name-description": "說明"
     },
     "variable-options": {
       "aria-label-toggle-all-values": "切換所有值"
     },
     "variable-type-select": {
-      "name-select-variable-type": ""
+      "name-select-variable-type": "選擇變數類型"
     },
     "variable-usages-button": {
       "tooltip-show-usages": "顯示使用情況"

From 90dfc26b4372d0a0cfe4dd20697f45c3ecacfc56 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 12 Aug 2025 10:56:12 +0100
Subject: [PATCH 103/243] Chore: Update nx to 21.3.11 (#109508)

* Reapply "Update dependency nx to v21 (#109232)" (#109476)

This reverts commit 6fe0893630b01114a4b18dd4d8cc9d43d497f022.

* Update nx to 21.3.11
---
 nx.json      |   3 +
 package.json |   5 +-
 yarn.lock    | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 221 insertions(+), 5 deletions(-)

diff --git a/nx.json b/nx.json
index e60803eee58..f5f0322645b 100644
--- a/nx.json
+++ b/nx.json
@@ -8,5 +8,8 @@
       "cache": true
     }
   },
+  "tui": {
+    "autoExit": true
+  },
   "defaultBase": "main"
 }
diff --git a/package.json b/package.json
index eb043cf14b3..8805a5a5337 100644
--- a/package.json
+++ b/package.json
@@ -223,7 +223,7 @@
     "msw": "2.10.4",
     "mutationobserver-shim": "0.3.7",
     "node-notifier": "10.0.1",
-    "nx": "20.7.1",
+    "nx": "21.3.11",
     "openapi-types": "^12.1.3",
     "pa11y-ci": "^4.0.0",
     "pdf-parse": "^1.1.1",
@@ -462,6 +462,9 @@
   },
   "packageManager": "yarn@4.9.2",
   "dependenciesMeta": {
+    "nx": {
+      "built": false
+    },
     "prettier@3.6.2": {
       "unplugged": true
     }
diff --git a/yarn.lock b/yarn.lock
index 8a4938c488a..b6d49c8bb99 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4168,6 +4168,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jest/diff-sequences@npm:30.0.1":
+  version: 30.0.1
+  resolution: "@jest/diff-sequences@npm:30.0.1"
+  checksum: 10/0ddb7c7ba92d6057a2ee51a9cfc2155b77cca707fe959167466ea02dcb0687018cc3c22b9622f25f3a417d6ad370e2d4dcfedf9f1410dc9c02954a7484423cc7
+  languageName: node
+  linkType: hard
+
 "@jest/environment@npm:^29.7.0":
   version: 29.7.0
   resolution: "@jest/environment@npm:29.7.0"
@@ -4213,6 +4220,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jest/get-type@npm:30.0.1":
+  version: 30.0.1
+  resolution: "@jest/get-type@npm:30.0.1"
+  checksum: 10/bd6cb2fe1661b652f06e5c6f7ef5aa37247a5b4bf04aad8ce6a8a8ba659efaf983bab9d52755be8cf92478f8d894c024de2fbddf4c3f6be804b808a20dfc347b
+  languageName: node
+  linkType: hard
+
 "@jest/globals@npm:^29.7.0":
   version: 29.7.0
   resolution: "@jest/globals@npm:29.7.0"
@@ -4281,6 +4295,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jest/schemas@npm:30.0.5":
+  version: 30.0.5
+  resolution: "@jest/schemas@npm:30.0.5"
+  dependencies:
+    "@sinclair/typebox": "npm:^0.34.0"
+  checksum: 10/40df4db55d4aeed09d1c7e19caf23788309cea34490a1c5d584c913494195e698b9967e996afc27226cac6d76e7512fe73ae6b9584480695c60dd18a5459cdba
+  languageName: node
+  linkType: hard
+
 "@jest/schemas@npm:^29.6.3":
   version: 29.6.3
   resolution: "@jest/schemas@npm:29.6.3"
@@ -5519,6 +5542,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-darwin-arm64@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-darwin-arm64@npm:21.3.11"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@nx/nx-darwin-x64@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-darwin-x64@npm:20.7.1"
@@ -5526,6 +5556,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-darwin-x64@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-darwin-x64@npm:21.3.11"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@nx/nx-freebsd-x64@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-freebsd-x64@npm:20.7.1"
@@ -5533,6 +5570,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-freebsd-x64@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-freebsd-x64@npm:21.3.11"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@nx/nx-linux-arm-gnueabihf@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-arm-gnueabihf@npm:20.7.1"
@@ -5540,6 +5584,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-linux-arm-gnueabihf@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-linux-arm-gnueabihf@npm:21.3.11"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@nx/nx-linux-arm64-gnu@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-arm64-gnu@npm:20.7.1"
@@ -5547,6 +5598,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-linux-arm64-gnu@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-linux-arm64-gnu@npm:21.3.11"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@nx/nx-linux-arm64-musl@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-arm64-musl@npm:20.7.1"
@@ -5554,6 +5612,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-linux-arm64-musl@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-linux-arm64-musl@npm:21.3.11"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "@nx/nx-linux-x64-gnu@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-x64-gnu@npm:20.7.1"
@@ -5561,6 +5626,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-linux-x64-gnu@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-linux-x64-gnu@npm:21.3.11"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@nx/nx-linux-x64-musl@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-linux-x64-musl@npm:20.7.1"
@@ -5568,6 +5640,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-linux-x64-musl@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-linux-x64-musl@npm:21.3.11"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "@nx/nx-win32-arm64-msvc@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-win32-arm64-msvc@npm:20.7.1"
@@ -5575,6 +5654,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-win32-arm64-msvc@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-win32-arm64-msvc@npm:21.3.11"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@nx/nx-win32-x64-msvc@npm:20.7.1":
   version: 20.7.1
   resolution: "@nx/nx-win32-x64-msvc@npm:20.7.1"
@@ -5582,6 +5668,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nx/nx-win32-x64-msvc@npm:21.3.11":
+  version: 21.3.11
+  resolution: "@nx/nx-win32-x64-msvc@npm:21.3.11"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@octokit/auth-token@npm:^4.0.0":
   version: 4.0.0
   resolution: "@octokit/auth-token@npm:4.0.0"
@@ -11240,7 +11333,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^5.0.0":
+"ansi-styles@npm:^5.0.0, ansi-styles@npm:^5.2.0":
   version: 5.2.0
   resolution: "ansi-styles@npm:5.2.0"
   checksum: 10/d7f4e97ce0623aea6bc0d90dcd28881ee04cba06c570b97fd3391bd7a268eedfd9d5e2dd4fdcbdd82b8105df5faf6f24aaedc08eaf3da898e702db5948f63469
@@ -18433,7 +18526,7 @@ __metadata:
     nanoid: "npm:^5.0.9"
     node-forge: "npm:^1.3.1"
     node-notifier: "npm:10.0.1"
-    nx: "npm:20.7.1"
+    nx: "npm:21.3.11"
     ol: "npm:10.6.1"
     ol-ext: "npm:4.0.33"
     openapi-types: "npm:^12.1.3"
@@ -18529,6 +18622,8 @@ __metadata:
     yargs: "npm:^18.0.0"
     zod: "npm:^4.0.0"
   dependenciesMeta:
+    nx:
+      built: false
     prettier@3.6.2:
       unplugged: true
   languageName: unknown
@@ -20708,6 +20803,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-diff@npm:^30.0.2":
+  version: 30.0.5
+  resolution: "jest-diff@npm:30.0.5"
+  dependencies:
+    "@jest/diff-sequences": "npm:30.0.1"
+    "@jest/get-type": "npm:30.0.1"
+    chalk: "npm:^4.1.2"
+    pretty-format: "npm:30.0.5"
+  checksum: 10/4cd3120640588a7bcc2ff3ff23c5b12939d0155f25098f7ed63e7801a9553fdcd0590a9fdd8b085646b0f1132e6da1228805fa9d2a83dd3686e146d804edb1ca
+  languageName: node
+  linkType: hard
+
 "jest-docblock@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-docblock@npm:29.7.0"
@@ -23987,7 +24094,92 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nx@npm:20.7.1, nx@npm:>=17.1.2 < 21":
+"nx@npm:21.3.11":
+  version: 21.3.11
+  resolution: "nx@npm:21.3.11"
+  dependencies:
+    "@napi-rs/wasm-runtime": "npm:0.2.4"
+    "@nx/nx-darwin-arm64": "npm:21.3.11"
+    "@nx/nx-darwin-x64": "npm:21.3.11"
+    "@nx/nx-freebsd-x64": "npm:21.3.11"
+    "@nx/nx-linux-arm-gnueabihf": "npm:21.3.11"
+    "@nx/nx-linux-arm64-gnu": "npm:21.3.11"
+    "@nx/nx-linux-arm64-musl": "npm:21.3.11"
+    "@nx/nx-linux-x64-gnu": "npm:21.3.11"
+    "@nx/nx-linux-x64-musl": "npm:21.3.11"
+    "@nx/nx-win32-arm64-msvc": "npm:21.3.11"
+    "@nx/nx-win32-x64-msvc": "npm:21.3.11"
+    "@yarnpkg/lockfile": "npm:^1.1.0"
+    "@yarnpkg/parsers": "npm:3.0.2"
+    "@zkochan/js-yaml": "npm:0.0.7"
+    axios: "npm:^1.8.3"
+    chalk: "npm:^4.1.0"
+    cli-cursor: "npm:3.1.0"
+    cli-spinners: "npm:2.6.1"
+    cliui: "npm:^8.0.1"
+    dotenv: "npm:~16.4.5"
+    dotenv-expand: "npm:~11.0.6"
+    enquirer: "npm:~2.3.6"
+    figures: "npm:3.2.0"
+    flat: "npm:^5.0.2"
+    front-matter: "npm:^4.0.2"
+    ignore: "npm:^5.0.4"
+    jest-diff: "npm:^30.0.2"
+    jsonc-parser: "npm:3.2.0"
+    lines-and-columns: "npm:2.0.3"
+    minimatch: "npm:9.0.3"
+    node-machine-id: "npm:1.1.12"
+    npm-run-path: "npm:^4.0.1"
+    open: "npm:^8.4.0"
+    ora: "npm:5.3.0"
+    resolve.exports: "npm:2.0.3"
+    semver: "npm:^7.5.3"
+    string-width: "npm:^4.2.3"
+    tar-stream: "npm:~2.2.0"
+    tmp: "npm:~0.2.1"
+    tree-kill: "npm:^1.2.2"
+    tsconfig-paths: "npm:^4.1.2"
+    tslib: "npm:^2.3.0"
+    yaml: "npm:^2.6.0"
+    yargs: "npm:^17.6.2"
+    yargs-parser: "npm:21.1.1"
+  peerDependencies:
+    "@swc-node/register": ^1.8.0
+    "@swc/core": ^1.3.85
+  dependenciesMeta:
+    "@nx/nx-darwin-arm64":
+      optional: true
+    "@nx/nx-darwin-x64":
+      optional: true
+    "@nx/nx-freebsd-x64":
+      optional: true
+    "@nx/nx-linux-arm-gnueabihf":
+      optional: true
+    "@nx/nx-linux-arm64-gnu":
+      optional: true
+    "@nx/nx-linux-arm64-musl":
+      optional: true
+    "@nx/nx-linux-x64-gnu":
+      optional: true
+    "@nx/nx-linux-x64-musl":
+      optional: true
+    "@nx/nx-win32-arm64-msvc":
+      optional: true
+    "@nx/nx-win32-x64-msvc":
+      optional: true
+  peerDependenciesMeta:
+    "@swc-node/register":
+      optional: true
+    "@swc/core":
+      optional: true
+  bin:
+    nx: bin/nx.js
+    nx-cloud: bin/nx-cloud.js
+  checksum: 10/a53230e33dd00e0962d1ade5f90611b66b109a3fc932abbe1d5e0d136857347f946a29325bd24f6293b836c97b8340d7e602837be4b36d9d3424c24f1b630847
+  languageName: node
+  linkType: hard
+
+"nx@npm:>=17.1.2 < 21":
   version: 20.7.1
   resolution: "nx@npm:20.7.1"
   dependencies:
@@ -26005,6 +26197,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pretty-format@npm:30.0.5":
+  version: 30.0.5
+  resolution: "pretty-format@npm:30.0.5"
+  dependencies:
+    "@jest/schemas": "npm:30.0.5"
+    ansi-styles: "npm:^5.2.0"
+    react-is: "npm:^18.3.1"
+  checksum: 10/bb65e53092f321257d80cd2c0165e65123805c9d4c4ada1ddac15b08c8879d6d031e6f01ac80e2685ef95ac35d302065196a036c63cd8729747f6e0fa21a55bf
+  languageName: node
+  linkType: hard
+
 "pretty-format@npm:^27.0.2, pretty-format@npm:^27.5.1":
   version: 27.5.1
   resolution: "pretty-format@npm:27.5.1"
@@ -27083,7 +27286,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:18.2.0, react-is@npm:^18.0.0, react-is@npm:^18.2.0":
+"react-is@npm:18.2.0":
   version: 18.2.0
   resolution: "react-is@npm:18.2.0"
   checksum: 10/200cd65bf2e0be7ba6055f647091b725a45dd2a6abef03bf2380ce701fd5edccee40b49b9d15edab7ac08a762bf83cb4081e31ec2673a5bfb549a36ba21570df
@@ -27104,6 +27307,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-is@npm:^18.0.0, react-is@npm:^18.2.0, react-is@npm:^18.3.1":
+  version: 18.3.1
+  resolution: "react-is@npm:18.3.1"
+  checksum: 10/d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22
+  languageName: node
+  linkType: hard
+
 "react-lifecycles-compat@npm:^3.0.4":
   version: 3.0.4
   resolution: "react-lifecycles-compat@npm:3.0.4"

From f2303a8ad968a761b9b97064f351810672c74ded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Tue, 12 Aug 2025 11:57:37 +0200
Subject: [PATCH 104/243] Provisioning: Include Ref URLs in Job Status
 (#109464)

* Add URLs to Job spec

* Rename them as RefURLs

* Implement RefURLs for Github

* Add Ref URLs to Jobs

* Worker Test

* Create the branch in the staged writer

* Regenerate Git mock

* Format code

* Consolidate ResourceURLs and RefURLs into one

* Fix broken tests
---
 .../pkg/apis/provisioning/v0alpha1/jobs.go    |   3 +
 .../pkg/apis/provisioning/v0alpha1/types.go   |  12 +-
 .../v0alpha1/zz_generated.deepcopy.go         |  39 +-
 .../v0alpha1/zz_generated.openapi.go          |  94 +--
 ...enerated.openapi_violation_exceptions.list |   1 +
 .../provisioning/v0alpha1/jobstatus.go        |   9 +
 .../provisioning/v0alpha1/repositoryurls.go   |  52 ++
 .../pkg/generated/applyconfiguration/utils.go |   2 +
 .../apis/provisioning/jobs/delete/worker.go   |   9 +
 .../provisioning/jobs/delete/worker_test.go   | 333 ++++++++---
 .../apis/provisioning/jobs/export/worker.go   |  13 +-
 .../provisioning/jobs/export/worker_test.go   | 178 ++++++
 .../jobs/job_progress_recorder_mock.go        |  34 ++
 .../apis/provisioning/jobs/move/worker.go     |   9 +
 .../provisioning/jobs/move/worker_test.go     | 167 ++++++
 .../apis/provisioning/jobs/progress.go        |  14 +
 .../apis/provisioning/jobs/progress_test.go   |  85 +++
 pkg/registry/apis/provisioning/jobs/queue.go  |   1 +
 .../apis/provisioning/jobs/store_mock.go      | 106 ++++
 .../provisioning/repository/git/staged.go     |   8 +-
 .../repository/git/staged_test.go             |  43 +-
 .../github/github_repository_mock.go          |  73 ++-
 .../repository/github/repository.go           |  23 +-
 .../repository/github/repository_test.go      |  92 ++-
 .../repository/reader_writer_mock.go          | 559 ++++++++++++++++++
 .../provisioning/repository/repository.go     |   6 +-
 .../repository/repository_with_urls_mock.go   | 309 ++++++++++
 .../apis/provisioning/resources/dualwriter.go |   2 +-
 .../apis/provisioning/resources/parser.go     |   2 +-
 .../provisioning.grafana.app-v0alpha1.json    |  97 +--
 30 files changed, 2157 insertions(+), 218 deletions(-)
 create mode 100644 apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/repositoryurls.go
 create mode 100644 pkg/registry/apis/provisioning/jobs/progress_test.go
 create mode 100644 pkg/registry/apis/provisioning/repository/reader_writer_mock.go
 create mode 100644 pkg/registry/apis/provisioning/repository/repository_with_urls_mock.go

diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go
index d28c96f08aa..847da88fbc5 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/jobs.go
@@ -204,6 +204,9 @@ type JobStatus struct {
 
 	// Summary of processed actions
 	Summary []*JobResourceSummary `json:"summary,omitempty"`
+
+	// URLs contains URLs for the reference branch or commit if applicable.
+	URLs *RepositoryURLs `json:"url,omitempty"`
 }
 
 // Convert a JOB to a
diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/types.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/types.go
index e633deda52a..219db2907fb 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/types.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/types.go
@@ -316,7 +316,7 @@ type ResourceWrapper struct {
 	Repository ResourceRepositoryInfo `json:"repository"`
 
 	// Typed links for this file (only supported by external systems, github etc)
-	URLs *ResourceURLs `json:"urls,omitempty"`
+	URLs *RepositoryURLs `json:"urls,omitempty"`
 
 	// The modified time in the remote file system
 	Timestamp *metav1.Time `json:"timestamp,omitempty"`
@@ -374,14 +374,14 @@ type ResourceRepositoryInfo struct {
 	Name string `json:"name"`
 }
 
-type ResourceURLs struct {
-	// A URL pointing to the this file in the repository
-	SourceURL string `json:"sourceURL,omitempty"`
-
+type RepositoryURLs struct {
 	// A URL pointing to the repository this lives in
 	RepositoryURL string `json:"repositoryURL,omitempty"`
 
-	// A URL that will create a new pull requeset for this branch
+	// A URL pointing to the file or ref in the repository
+	SourceURL string `json:"sourceURL,omitempty"`
+
+	// A URL that will create a new pull request for this branch
 	NewPullRequestURL string `json:"newPullRequestURL,omitempty"`
 
 	// Compare this version to the target branch
diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go
index 863fa3e0817..868437c9e85 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.deepcopy.go
@@ -499,6 +499,11 @@ func (in *JobStatus) DeepCopyInto(out *JobStatus) {
 			}
 		}
 	}
+	if in.URLs != nil {
+		in, out := &in.URLs, &out.URLs
+		*out = new(RepositoryURLs)
+		**out = **in
+	}
 	return
 }
 
@@ -790,6 +795,22 @@ func (in *RepositoryStatus) DeepCopy() *RepositoryStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RepositoryURLs) DeepCopyInto(out *RepositoryURLs) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RepositoryURLs.
+func (in *RepositoryURLs) DeepCopy() *RepositoryURLs {
+	if in == nil {
+		return nil
+	}
+	out := new(RepositoryURLs)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RepositoryView) DeepCopyInto(out *RepositoryView) {
 	*out = *in
@@ -1023,22 +1044,6 @@ func (in *ResourceType) DeepCopy() *ResourceType {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ResourceURLs) DeepCopyInto(out *ResourceURLs) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceURLs.
-func (in *ResourceURLs) DeepCopy() *ResourceURLs {
-	if in == nil {
-		return nil
-	}
-	out := new(ResourceURLs)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ResourceWrapper) DeepCopyInto(out *ResourceWrapper) {
 	*out = *in
@@ -1046,7 +1051,7 @@ func (in *ResourceWrapper) DeepCopyInto(out *ResourceWrapper) {
 	out.Repository = in.Repository
 	if in.URLs != nil {
 		in, out := &in.URLs, &out.URLs
-		*out = new(ResourceURLs)
+		*out = new(RepositoryURLs)
 		**out = **in
 	}
 	if in.Timestamp != nil {
diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
index 50832fe9d6d..0b4c4e42377 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go
@@ -45,6 +45,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.RepositoryList":            schema_pkg_apis_provisioning_v0alpha1_RepositoryList(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.RepositorySpec":            schema_pkg_apis_provisioning_v0alpha1_RepositorySpec(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.RepositoryStatus":          schema_pkg_apis_provisioning_v0alpha1_RepositoryStatus(ref),
+		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.RepositoryURLs":            schema_pkg_apis_provisioning_v0alpha1_RepositoryURLs(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.RepositoryView":            schema_pkg_apis_provisioning_v0alpha1_RepositoryView(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.RepositoryViewList":        schema_pkg_apis_provisioning_v0alpha1_RepositoryViewList(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceCount":             schema_pkg_apis_provisioning_v0alpha1_ResourceCount(ref),
@@ -55,7 +56,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceRepositoryInfo":    schema_pkg_apis_provisioning_v0alpha1_ResourceRepositoryInfo(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceStats":             schema_pkg_apis_provisioning_v0alpha1_ResourceStats(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceType":              schema_pkg_apis_provisioning_v0alpha1_ResourceType(ref),
-		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceURLs":              schema_pkg_apis_provisioning_v0alpha1_ResourceURLs(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceWrapper":           schema_pkg_apis_provisioning_v0alpha1_ResourceWrapper(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.SyncJobOptions":            schema_pkg_apis_provisioning_v0alpha1_SyncJobOptions(ref),
 		"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.SyncOptions":               schema_pkg_apis_provisioning_v0alpha1_SyncOptions(ref),
@@ -1116,11 +1116,17 @@ func schema_pkg_apis_provisioning_v0alpha1_JobStatus(ref common.ReferenceCallbac
 							},
 						},
 					},
+					"url": {
+						SchemaProps: spec.SchemaProps{
+							Description: "URLs contains URLs for the reference branch or commit if applicable.",
+							Ref:         ref("github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.RepositoryURLs"),
+						},
+					},
 				},
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.JobResourceSummary"},
+			"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.JobResourceSummary", "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.RepositoryURLs"},
 	}
 }
 
@@ -1651,6 +1657,46 @@ func schema_pkg_apis_provisioning_v0alpha1_RepositoryStatus(ref common.Reference
 	}
 }
 
+func schema_pkg_apis_provisioning_v0alpha1_RepositoryURLs(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"repositoryURL": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A URL pointing to the repository this lives in",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"sourceURL": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A URL pointing to the file or ref in the repository",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"newPullRequestURL": {
+						SchemaProps: spec.SchemaProps{
+							Description: "A URL that will create a new pull request for this branch",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"compareURL": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Compare this version to the target branch",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
 func schema_pkg_apis_provisioning_v0alpha1_RepositoryView(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
@@ -2216,46 +2262,6 @@ func schema_pkg_apis_provisioning_v0alpha1_ResourceType(ref common.ReferenceCall
 	}
 }
 
-func schema_pkg_apis_provisioning_v0alpha1_ResourceURLs(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Type: []string{"object"},
-				Properties: map[string]spec.Schema{
-					"sourceURL": {
-						SchemaProps: spec.SchemaProps{
-							Description: "A URL pointing to the this file in the repository",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"repositoryURL": {
-						SchemaProps: spec.SchemaProps{
-							Description: "A URL pointing to the repository this lives in",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"newPullRequestURL": {
-						SchemaProps: spec.SchemaProps{
-							Description: "A URL that will create a new pull requeset for this branch",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"compareURL": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Compare this version to the target branch",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
 func schema_pkg_apis_provisioning_v0alpha1_ResourceWrapper(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
@@ -2308,7 +2314,7 @@ func schema_pkg_apis_provisioning_v0alpha1_ResourceWrapper(ref common.ReferenceC
 					"urls": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Typed links for this file (only supported by external systems, github etc)",
-							Ref:         ref("github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceURLs"),
+							Ref:         ref("github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.RepositoryURLs"),
 						},
 					},
 					"timestamp": {
@@ -2349,7 +2355,7 @@ func schema_pkg_apis_provisioning_v0alpha1_ResourceWrapper(ref common.ReferenceC
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceObjects", "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceRepositoryInfo", "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceURLs", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
+			"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.RepositoryURLs", "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceObjects", "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1.ResourceRepositoryInfo", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
 	}
 }
 
diff --git a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list
index 3060c1f664d..2eca68f79d2 100644
--- a/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list
+++ b/apps/provisioning/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list
@@ -18,6 +18,7 @@ API rule violation: list_type_missing,github.com/grafana/grafana/apps/provisioni
 API rule violation: list_type_missing,github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1,TestResults,Errors
 API rule violation: list_type_missing,github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1,WebhookStatus,SubscribedEvents
 API rule violation: names_match,github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1,JobSpec,PullRequest
+API rule violation: names_match,github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1,JobStatus,URLs
 API rule violation: names_match,github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1,ManagerStats,Identity
 API rule violation: names_match,github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1,RepositorySpec,GitHub
 API rule violation: names_match,github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1,RepositorySpec,GitLab
diff --git a/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/jobstatus.go b/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/jobstatus.go
index 37a025730e3..ea9228473a5 100644
--- a/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/jobstatus.go
+++ b/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/jobstatus.go
@@ -18,6 +18,7 @@ type JobStatusApplyConfiguration struct {
 	Errors   []string                                   `json:"errors,omitempty"`
 	Progress *float64                                   `json:"progress,omitempty"`
 	Summary  []*provisioningv0alpha1.JobResourceSummary `json:"summary,omitempty"`
+	URLs     *RepositoryURLsApplyConfiguration          `json:"url,omitempty"`
 }
 
 // JobStatusApplyConfiguration constructs a declarative configuration of the JobStatus type for use with
@@ -88,3 +89,11 @@ func (b *JobStatusApplyConfiguration) WithSummary(values ...**provisioningv0alph
 	}
 	return b
 }
+
+// WithURLs sets the URLs field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the URLs field is set to the value of the last call.
+func (b *JobStatusApplyConfiguration) WithURLs(value *RepositoryURLsApplyConfiguration) *JobStatusApplyConfiguration {
+	b.URLs = value
+	return b
+}
diff --git a/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/repositoryurls.go b/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/repositoryurls.go
new file mode 100644
index 00000000000..d18ae864988
--- /dev/null
+++ b/apps/provisioning/pkg/generated/applyconfiguration/provisioning/v0alpha1/repositoryurls.go
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by applyconfiguration-gen. DO NOT EDIT.
+
+package v0alpha1
+
+// RepositoryURLsApplyConfiguration represents a declarative configuration of the RepositoryURLs type for use
+// with apply.
+type RepositoryURLsApplyConfiguration struct {
+	RepositoryURL     *string `json:"repositoryURL,omitempty"`
+	SourceURL         *string `json:"sourceURL,omitempty"`
+	NewPullRequestURL *string `json:"newPullRequestURL,omitempty"`
+	CompareURL        *string `json:"compareURL,omitempty"`
+}
+
+// RepositoryURLsApplyConfiguration constructs a declarative configuration of the RepositoryURLs type for use with
+// apply.
+func RepositoryURLs() *RepositoryURLsApplyConfiguration {
+	return &RepositoryURLsApplyConfiguration{}
+}
+
+// WithRepositoryURL sets the RepositoryURL field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the RepositoryURL field is set to the value of the last call.
+func (b *RepositoryURLsApplyConfiguration) WithRepositoryURL(value string) *RepositoryURLsApplyConfiguration {
+	b.RepositoryURL = &value
+	return b
+}
+
+// WithSourceURL sets the SourceURL field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the SourceURL field is set to the value of the last call.
+func (b *RepositoryURLsApplyConfiguration) WithSourceURL(value string) *RepositoryURLsApplyConfiguration {
+	b.SourceURL = &value
+	return b
+}
+
+// WithNewPullRequestURL sets the NewPullRequestURL field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the NewPullRequestURL field is set to the value of the last call.
+func (b *RepositoryURLsApplyConfiguration) WithNewPullRequestURL(value string) *RepositoryURLsApplyConfiguration {
+	b.NewPullRequestURL = &value
+	return b
+}
+
+// WithCompareURL sets the CompareURL field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the CompareURL field is set to the value of the last call.
+func (b *RepositoryURLsApplyConfiguration) WithCompareURL(value string) *RepositoryURLsApplyConfiguration {
+	b.CompareURL = &value
+	return b
+}
diff --git a/apps/provisioning/pkg/generated/applyconfiguration/utils.go b/apps/provisioning/pkg/generated/applyconfiguration/utils.go
index 7c6cb060f78..8725415c377 100644
--- a/apps/provisioning/pkg/generated/applyconfiguration/utils.go
+++ b/apps/provisioning/pkg/generated/applyconfiguration/utils.go
@@ -56,6 +56,8 @@ func ForKind(kind schema.GroupVersionKind) interface{} {
 		return &provisioningv0alpha1.RepositorySpecApplyConfiguration{}
 	case v0alpha1.SchemeGroupVersion.WithKind("RepositoryStatus"):
 		return &provisioningv0alpha1.RepositoryStatusApplyConfiguration{}
+	case v0alpha1.SchemeGroupVersion.WithKind("RepositoryURLs"):
+		return &provisioningv0alpha1.RepositoryURLsApplyConfiguration{}
 	case v0alpha1.SchemeGroupVersion.WithKind("ResourceCount"):
 		return &provisioningv0alpha1.ResourceCountApplyConfiguration{}
 	case v0alpha1.SchemeGroupVersion.WithKind("ResourceRef"):
diff --git a/pkg/registry/apis/provisioning/jobs/delete/worker.go b/pkg/registry/apis/provisioning/jobs/delete/worker.go
index d55f6300abd..9beff8e953e 100644
--- a/pkg/registry/apis/provisioning/jobs/delete/worker.go
+++ b/pkg/registry/apis/provisioning/jobs/delete/worker.go
@@ -78,6 +78,15 @@ func (w *Worker) Process(ctx context.Context, repo repository.Repository, job pr
 		return fmt.Errorf("delete files from repository: %w", err)
 	}
 
+	// Set RefURLs if the repository supports it and we have a target ref
+	if opts.Ref != "" {
+		if repoWithURLs, ok := repo.(repository.RepositoryWithURLs); ok {
+			if refURLs, urlErr := repoWithURLs.RefURLs(ctx, opts.Ref); urlErr == nil && refURLs != nil {
+				progress.SetRefURLs(ctx, refURLs)
+			}
+		}
+	}
+
 	if opts.Ref == "" {
 		progress.ResetResults()
 		progress.SetMessage(ctx, "pull resources")
diff --git a/pkg/registry/apis/provisioning/jobs/delete/worker_test.go b/pkg/registry/apis/provisioning/jobs/delete/worker_test.go
index 1da3656f6ce..372ce5d29d5 100644
--- a/pkg/registry/apis/provisioning/jobs/delete/worker_test.go
+++ b/pkg/registry/apis/provisioning/jobs/delete/worker_test.go
@@ -6,10 +6,11 @@ import (
 	"testing"
 	"time"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	v0alpha1 "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs"
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning/repository"
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning/resources"
@@ -29,41 +30,41 @@ func (m *mockReaderWriter) Delete(ctx context.Context, path, ref, message string
 // simpleRepository implements only the base Repository interface, not ReaderWriter
 type simpleRepository struct{}
 
-func (s *simpleRepository) Config() *provisioning.Repository { return nil }
-func (s *simpleRepository) Validate() field.ErrorList        { return nil }
-func (s *simpleRepository) Test(ctx context.Context) (*provisioning.TestResults, error) {
+func (s *simpleRepository) Config() *v0alpha1.Repository { return nil }
+func (s *simpleRepository) Validate() field.ErrorList    { return nil }
+func (s *simpleRepository) Test(ctx context.Context) (*v0alpha1.TestResults, error) {
 	return nil, nil
 }
 
 func TestDeleteWorker_IsSupported(t *testing.T) {
 	tests := []struct {
 		name     string
-		job      provisioning.Job
+		job      v0alpha1.Job
 		expected bool
 	}{
 		{
 			name: "delete action is supported",
-			job: provisioning.Job{
-				Spec: provisioning.JobSpec{
-					Action: provisioning.JobActionDelete,
+			job: v0alpha1.Job{
+				Spec: v0alpha1.JobSpec{
+					Action: v0alpha1.JobActionDelete,
 				},
 			},
 			expected: true,
 		},
 		{
 			name: "pull action is not supported",
-			job: provisioning.Job{
-				Spec: provisioning.JobSpec{
-					Action: provisioning.JobActionPull,
+			job: v0alpha1.Job{
+				Spec: v0alpha1.JobSpec{
+					Action: v0alpha1.JobActionPull,
 				},
 			},
 			expected: false,
 		},
 		{
 			name: "push action is not supported",
-			job: provisioning.Job{
-				Spec: provisioning.JobSpec{
-					Action: provisioning.JobActionPush,
+			job: v0alpha1.Job{
+				Spec: v0alpha1.JobSpec{
+					Action: v0alpha1.JobActionPush,
 				},
 			},
 			expected: false,
@@ -80,9 +81,9 @@ func TestDeleteWorker_IsSupported(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessMissingDeleteSettings(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
 		},
 	}
 
@@ -92,10 +93,10 @@ func TestDeleteWorker_ProcessMissingDeleteSettings(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessNotReaderWriter(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
 				Paths: []string{"test/path"},
 			},
 		},
@@ -121,10 +122,10 @@ func TestDeleteWorker_ProcessNotReaderWriter(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessWrapFnError(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
 				Paths: []string{"test/path"},
 			},
 		},
@@ -144,10 +145,10 @@ func TestDeleteWorker_ProcessWrapFnError(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessDeleteFilesSuccess(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
 				Paths: []string{"test/path1", "test/path2"},
 				Ref:   "main",
 			},
@@ -192,10 +193,10 @@ func TestDeleteWorker_ProcessDeleteFilesSuccess(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessDeleteFilesWithError(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
 				Paths: []string{"test/path1", "test/path2"},
 				Ref:   "main",
 			},
@@ -230,10 +231,10 @@ func TestDeleteWorker_ProcessDeleteFilesWithError(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessWithSyncWorker(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
 				Paths: []string{"test/path"},
 			},
 		},
@@ -264,7 +265,7 @@ func TestDeleteWorker_ProcessWithSyncWorker(t *testing.T) {
 	mockProgress.On("ResetResults").Return()
 	mockProgress.On("SetMessage", mock.Anything, "pull resources").Return()
 
-	mockSyncWorker.On("Process", mock.Anything, mockRepo, mock.MatchedBy(func(syncJob provisioning.Job) bool {
+	mockSyncWorker.On("Process", mock.Anything, mockRepo, mock.MatchedBy(func(syncJob v0alpha1.Job) bool {
 		return syncJob.Spec.Pull != nil && !syncJob.Spec.Pull.Incremental
 	}), mockProgress).Return(nil)
 
@@ -274,10 +275,10 @@ func TestDeleteWorker_ProcessWithSyncWorker(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessSyncWorkerError(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
 				Paths: []string{"test/path"},
 			},
 		},
@@ -357,7 +358,7 @@ func TestDeleteWorker_deleteFiles(t *testing.T) {
 			}
 			mockProgress := jobs.NewMockJobProgressRecorder(t)
 
-			opts := provisioning.DeleteJobOptions{
+			opts := v0alpha1.DeleteJobOptions{
 				Ref: "main",
 			}
 
@@ -393,12 +394,12 @@ func TestDeleteWorker_deleteFiles(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessWithResourceRefs(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
 				Paths: []string{"test/path1"},
-				Resources: []provisioning.ResourceRef{
+				Resources: []v0alpha1.ResourceRef{
 					{
 						Name:  "test-dashboard",
 						Kind:  "Dashboard",
@@ -481,11 +482,11 @@ func TestDeleteWorker_ProcessWithResourceRefs(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessResourceRefsOnly(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
-				Resources: []provisioning.ResourceRef{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
+				Resources: []v0alpha1.ResourceRef{
 					{
 						Name:  "test-dashboard",
 						Kind:  "Dashboard",
@@ -536,11 +537,11 @@ func TestDeleteWorker_ProcessResourceRefsOnly(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessResourceResolutionError(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
-				Resources: []provisioning.ResourceRef{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
+				Resources: []v0alpha1.ResourceRef{
 					{
 						Name:  "nonexistent-dashboard",
 						Kind:  "Dashboard",
@@ -591,7 +592,7 @@ func TestDeleteWorker_ProcessResourceResolutionError(t *testing.T) {
 	mockProgress.On("SetMessage", mock.Anything, "pull resources").Return()
 
 	mockSyncWorker := jobs.NewMockWorker(t)
-	mockSyncWorker.On("Process", mock.Anything, mockRepo, mock.MatchedBy(func(syncJob provisioning.Job) bool {
+	mockSyncWorker.On("Process", mock.Anything, mockRepo, mock.MatchedBy(func(syncJob v0alpha1.Job) bool {
 		return syncJob.Spec.Pull != nil && !syncJob.Spec.Pull.Incremental
 	}), mockProgress).Return(nil)
 
@@ -601,11 +602,11 @@ func TestDeleteWorker_ProcessResourceResolutionError(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessResourcesFactoryError(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
-				Resources: []provisioning.ResourceRef{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
+				Resources: []v0alpha1.ResourceRef{
 					{
 						Name:  "test-dashboard",
 						Kind:  "Dashboard",
@@ -640,11 +641,11 @@ func TestDeleteWorker_ProcessResourcesFactoryError(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessResourceRefsNotReaderWriter(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
-				Resources: []provisioning.ResourceRef{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
+				Resources: []v0alpha1.ResourceRef{
 					{
 						Name:  "test-dashboard",
 						Kind:  "Dashboard",
@@ -676,11 +677,11 @@ func TestDeleteWorker_ProcessResourceRefsNotReaderWriter(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessResourceResolutionTooManyErrors(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
-				Resources: []provisioning.ResourceRef{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
+				Resources: []v0alpha1.ResourceRef{
 					{
 						Name:  "nonexistent-dashboard",
 						Kind:  "Dashboard",
@@ -729,11 +730,11 @@ func TestDeleteWorker_ProcessResourceResolutionTooManyErrors(t *testing.T) {
 }
 
 func TestDeleteWorker_ProcessMixedResourcesWithPartialFailure(t *testing.T) {
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
-				Resources: []provisioning.ResourceRef{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
+				Resources: []v0alpha1.ResourceRef{
 					{
 						Name:  "valid-dashboard",
 						Kind:  "Dashboard",
@@ -827,13 +828,13 @@ func TestDeleteWorker_ProcessMixedResourcesWithPartialFailure(t *testing.T) {
 
 func TestDeleteWorker_ProcessWithPathDeduplication(t *testing.T) {
 	// Test that duplicate paths from explicit paths and resource resolution are deduplicated
-	job := provisioning.Job{
-		Spec: provisioning.JobSpec{
-			Action: provisioning.JobActionDelete,
-			Delete: &provisioning.DeleteJobOptions{
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
 				Ref:   "main",                                                             // Add ref to avoid sync worker execution
 				Paths: []string{"dashboards/test-dashboard.json", "folders/test-folder/"}, // Explicit paths
-				Resources: []provisioning.ResourceRef{
+				Resources: []v0alpha1.ResourceRef{
 					{
 						Name:  "test-dashboard", // This will resolve to "dashboards/test-dashboard.json" (duplicate)
 						Kind:  "Dashboard",
@@ -984,3 +985,167 @@ func TestDeduplicatePaths(t *testing.T) {
 		})
 	}
 }
+
+func TestDeleteWorker_RefURLsSetWithRef(t *testing.T) {
+	mockRepoWithURLs := repository.NewMockRepositoryWithURLs(t)
+	config := &v0alpha1.Repository{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-repo",
+			Namespace: "test-namespace",
+		},
+		Spec: v0alpha1.RepositorySpec{
+			Type: v0alpha1.GitHubRepositoryType,
+		},
+	}
+	mockRepoWithURLs.On("Config").Return(config).Maybe() // Config may be called multiple times
+
+	// Mock RefURLs method to return expected URLs
+	expectedRefURLs := &v0alpha1.RepositoryURLs{
+		SourceURL:         "https://github.com/grafana/grafana/tree/feature-branch",
+		CompareURL:        "https://github.com/grafana/grafana/compare/main...feature-branch",
+		NewPullRequestURL: "https://github.com/grafana/grafana/compare/main...feature-branch?quick_pull=1&labels=grafana",
+	}
+	mockRepoWithURLs.On("RefURLs", mock.Anything, "feature-branch").Return(expectedRefURLs, nil)
+
+	mockProgress := jobs.NewMockJobProgressRecorder(t)
+	mockProgress.On("SetTotal", mock.Anything, 1).Once()
+	mockProgress.On("StrictMaxErrors", 1).Once()
+	mockProgress.On("SetMessage", mock.Anything, "Deleting test.json").Once()
+	mockProgress.On("Record", mock.Anything, mock.Anything).Once()
+	mockProgress.On("TooManyErrors").Return(nil).Once()
+	mockProgress.On("SetRefURLs", mock.Anything, expectedRefURLs).Once()
+
+	mockReaderWriter := repository.NewMockReaderWriter(t)
+	mockReaderWriter.On("Delete", mock.Anything, "test.json", "feature-branch", "Delete test.json").Return(nil)
+
+	mockWrapFn := repository.NewMockWrapWithStageFn(t)
+	mockWrapFn.On("Execute", mock.Anything, mockRepoWithURLs, mock.Anything, mock.Anything).Return(func(ctx context.Context, repo repository.Repository, opts repository.StageOptions, fn func(repository.Repository, bool) error) error {
+		return fn(mockReaderWriter, true)
+	})
+
+	mockResourcesFactory := resources.NewMockRepositoryResourcesFactory(t)
+
+	job := v0alpha1.Job{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-job"},
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
+				Ref:   "feature-branch",
+				Paths: []string{"test.json"},
+			},
+		},
+	}
+
+	worker := NewWorker(nil, mockWrapFn.Execute, mockResourcesFactory)
+	err := worker.Process(context.Background(), mockRepoWithURLs, job, mockProgress)
+	require.NoError(t, err)
+
+	// Verify that SetRefURLs was called with the expected RefURLs
+	mockProgress.AssertExpectations(t)
+	mockRepoWithURLs.AssertExpectations(t)
+}
+
+func TestDeleteWorker_RefURLsNotSetWithoutRef(t *testing.T) {
+	mockRepoWithURLs := repository.NewMockRepositoryWithURLs(t)
+	config := &v0alpha1.Repository{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-repo",
+			Namespace: "test-namespace",
+		},
+		Spec: v0alpha1.RepositorySpec{
+			Type: v0alpha1.GitHubRepositoryType,
+		},
+	}
+	mockRepoWithURLs.On("Config").Return(config).Maybe() // Config may be called multiple times
+
+	mockProgress := jobs.NewMockJobProgressRecorder(t)
+	mockProgress.On("SetTotal", mock.Anything, 1).Once()
+	mockProgress.On("StrictMaxErrors", 1).Once()
+	mockProgress.On("SetMessage", mock.Anything, "Deleting test.json").Once()
+	mockProgress.On("Record", mock.Anything, mock.Anything).Once()
+	mockProgress.On("TooManyErrors").Return(nil).Once()
+	mockProgress.On("ResetResults").Once()
+	mockProgress.On("SetMessage", mock.Anything, "pull resources").Once()
+	// SetRefURLs should NOT be called since no ref is specified
+
+	mockReaderWriter := repository.NewMockReaderWriter(t)
+	mockReaderWriter.On("Delete", mock.Anything, "test.json", "", "Delete test.json").Return(nil)
+
+	mockWrapFn := repository.NewMockWrapWithStageFn(t)
+	mockWrapFn.On("Execute", mock.Anything, mockRepoWithURLs, mock.Anything, mock.Anything).Return(func(ctx context.Context, repo repository.Repository, opts repository.StageOptions, fn func(repository.Repository, bool) error) error {
+		return fn(mockReaderWriter, true)
+	})
+
+	mockSyncWorker := jobs.NewMockWorker(t)
+	mockSyncWorker.On("Process", mock.Anything, mockRepoWithURLs, mock.Anything, mockProgress).Return(nil)
+
+	mockResourcesFactory := resources.NewMockRepositoryResourcesFactory(t)
+
+	job := v0alpha1.Job{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-job"},
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
+				// No ref specified
+				Paths: []string{"test.json"},
+			},
+		},
+	}
+
+	worker := NewWorker(mockSyncWorker, mockWrapFn.Execute, mockResourcesFactory)
+	err := worker.Process(context.Background(), mockRepoWithURLs, job, mockProgress)
+	require.NoError(t, err)
+
+	// Verify that SetRefURLs was NOT called since no ref was specified
+	mockProgress.AssertExpectations(t)
+}
+
+func TestDeleteWorker_RefURLsNotSetForNonURLRepository(t *testing.T) {
+	mockRepo := repository.NewMockRepository(t)
+	config := &v0alpha1.Repository{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-repo",
+			Namespace: "test-namespace",
+		},
+		Spec: v0alpha1.RepositorySpec{
+			Type: v0alpha1.GitRepositoryType, // Regular git repo, not GitHub
+		},
+	}
+	mockRepo.On("Config").Return(config).Maybe() // Config may be called multiple times
+
+	mockProgress := jobs.NewMockJobProgressRecorder(t)
+	mockProgress.On("SetTotal", mock.Anything, 1).Once()
+	mockProgress.On("StrictMaxErrors", 1).Once()
+	mockProgress.On("SetMessage", mock.Anything, "Deleting test.json").Once()
+	mockProgress.On("Record", mock.Anything, mock.Anything).Once()
+	mockProgress.On("TooManyErrors").Return(nil).Once()
+	// SetRefURLs should NOT be called since repo doesn't support URLs
+
+	mockReaderWriter := repository.NewMockReaderWriter(t)
+	mockReaderWriter.On("Delete", mock.Anything, "test.json", "feature-branch", "Delete test.json").Return(nil)
+
+	mockWrapFn := repository.NewMockWrapWithStageFn(t)
+	mockWrapFn.On("Execute", mock.Anything, mockRepo, mock.Anything, mock.Anything).Return(func(ctx context.Context, repo repository.Repository, opts repository.StageOptions, fn func(repository.Repository, bool) error) error {
+		return fn(mockReaderWriter, true)
+	})
+
+	mockResourcesFactory := resources.NewMockRepositoryResourcesFactory(t)
+
+	job := v0alpha1.Job{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-job"},
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionDelete,
+			Delete: &v0alpha1.DeleteJobOptions{
+				Ref:   "feature-branch",
+				Paths: []string{"test.json"},
+			},
+		},
+	}
+
+	worker := NewWorker(nil, mockWrapFn.Execute, mockResourcesFactory)
+	err := worker.Process(context.Background(), mockRepo, job, mockProgress)
+	require.NoError(t, err)
+
+	// Verify that SetRefURLs was NOT called since repo doesn't support URLs
+	mockProgress.AssertExpectations(t)
+}
diff --git a/pkg/registry/apis/provisioning/jobs/export/worker.go b/pkg/registry/apis/provisioning/jobs/export/worker.go
index 524b01dce4c..df394cfcd00 100644
--- a/pkg/registry/apis/provisioning/jobs/export/worker.go
+++ b/pkg/registry/apis/provisioning/jobs/export/worker.go
@@ -88,5 +88,16 @@ func (r *ExportWorker) Process(ctx context.Context, repo repository.Repository,
 		return r.exportFn(ctx, cfg.Name, *options, clients, repositoryResources, progress)
 	}
 
-	return r.wrapWithStageFn(ctx, repo, cloneOptions, fn)
+	err := r.wrapWithStageFn(ctx, repo, cloneOptions, fn)
+
+	// Set RefURLs if the repository supports it and we have a target branch
+	if options.Branch != "" {
+		if repoWithURLs, ok := repo.(repository.RepositoryWithURLs); ok {
+			if refURLs, urlErr := repoWithURLs.RefURLs(ctx, options.Branch); urlErr == nil && refURLs != nil {
+				progress.SetRefURLs(ctx, refURLs)
+			}
+		}
+	}
+
+	return err
 }
diff --git a/pkg/registry/apis/provisioning/jobs/export/worker_test.go b/pkg/registry/apis/provisioning/jobs/export/worker_test.go
index d78b0ec5b8b..36e50e25494 100644
--- a/pkg/registry/apis/provisioning/jobs/export/worker_test.go
+++ b/pkg/registry/apis/provisioning/jobs/export/worker_test.go
@@ -549,3 +549,181 @@ func TestExportWorker_ProcessGitRepositoryExportFnError(t *testing.T) {
 	err := r.Process(context.Background(), mockRepo, job, mockProgress)
 	require.EqualError(t, err, "export failed")
 }
+
+func TestExportWorker_RefURLsSetWithBranch(t *testing.T) {
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionPush,
+			Push: &v0alpha1.ExportJobOptions{
+				Branch:  "feature-branch",
+				Message: "test commit",
+			},
+		},
+	}
+
+	// Create a repository that implements both Repository and RepositoryWithURLs
+	mockRepoWithURLs := repository.NewMockRepositoryWithURLs(t)
+
+	mockRepoWithURLs.On("Config").Return(&v0alpha1.Repository{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-repo",
+			Namespace: "test-namespace",
+		},
+		Spec: v0alpha1.RepositorySpec{
+			Type:      v0alpha1.GitHubRepositoryType,
+			Workflows: []v0alpha1.Workflow{v0alpha1.WriteWorkflow, v0alpha1.BranchWorkflow},
+		},
+	})
+
+	// Mock RefURLs method to return expected URLs
+	expectedRefURLs := &v0alpha1.RepositoryURLs{
+		SourceURL:         "https://github.com/grafana/grafana/tree/feature-branch",
+		CompareURL:        "https://github.com/grafana/grafana/compare/main...feature-branch",
+		NewPullRequestURL: "https://github.com/grafana/grafana/compare/main...feature-branch?quick_pull=1&labels=grafana",
+	}
+	mockRepoWithURLs.On("RefURLs", mock.Anything, "feature-branch").Return(expectedRefURLs, nil)
+
+	// Mock progress recorder to expect SetRefURLs call
+	mockProgress := jobs.NewMockJobProgressRecorder(t)
+	mockProgress.On("SetRefURLs", mock.Anything, expectedRefURLs).Once()
+
+	// Mock other dependencies
+	mockClients := resources.NewMockClientFactory(t)
+	mockResourceClients := resources.NewMockResourceClients(t)
+	mockClients.On("Clients", mock.Anything, "test-namespace").Return(mockResourceClients, nil)
+
+	mockRepoResources := resources.NewMockRepositoryResourcesFactory(t)
+	mockRepoResourcesClient := resources.NewMockRepositoryResources(t)
+	mockRepoResources.On("Client", mock.Anything, mock.Anything).Return(mockRepoResourcesClient, nil)
+
+	mockExportFn := NewMockExportFn(t)
+	mockExportFn.On("Execute", mock.Anything, "test-repo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
+
+	// Mock the ReaderWriter interface that the export function expects
+	mockReaderWriter := repository.NewMockReaderWriter(t)
+
+	mockStageFn := NewMockWrapWithStageFn(t)
+	mockStageFn.On("Execute", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(func(ctx context.Context, repo repository.Repository, stageOpts repository.StageOptions, fn func(repository.Repository, bool) error) error {
+		// The staging function needs to call the inner function with a ReaderWriter
+		return fn(mockReaderWriter, true)
+	})
+
+	r := NewExportWorker(mockClients, mockRepoResources, mockExportFn.Execute, mockStageFn.Execute)
+	err := r.Process(context.Background(), mockRepoWithURLs, job, mockProgress)
+	require.NoError(t, err)
+
+	// Verify that SetRefURLs was called with the expected RefURLs
+	mockProgress.AssertExpectations(t)
+	mockRepoWithURLs.AssertExpectations(t)
+}
+
+func TestExportWorker_RefURLsNotSetWithoutBranch(t *testing.T) {
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionPush,
+			Push: &v0alpha1.ExportJobOptions{
+				Message: "test commit",
+				// No branch specified
+			},
+		},
+	}
+
+	mockRepoWithURLs := repository.NewMockRepositoryWithURLs(t)
+
+	mockRepoWithURLs.On("Config").Return(&v0alpha1.Repository{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-repo",
+			Namespace: "test-namespace",
+		},
+		Spec: v0alpha1.RepositorySpec{
+			Type:      v0alpha1.GitHubRepositoryType,
+			Workflows: []v0alpha1.Workflow{v0alpha1.WriteWorkflow},
+		},
+	})
+
+	// Mock progress recorder - SetRefURLs should NOT be called
+	mockProgress := jobs.NewMockJobProgressRecorder(t)
+	// Explicitly NOT expecting SetRefURLs call
+
+	// Mock other dependencies
+	mockClients := resources.NewMockClientFactory(t)
+	mockResourceClients := resources.NewMockResourceClients(t)
+	mockClients.On("Clients", mock.Anything, "test-namespace").Return(mockResourceClients, nil)
+
+	mockRepoResources := resources.NewMockRepositoryResourcesFactory(t)
+	mockRepoResourcesClient := resources.NewMockRepositoryResources(t)
+	mockRepoResources.On("Client", mock.Anything, mock.Anything).Return(mockRepoResourcesClient, nil)
+
+	mockExportFn := NewMockExportFn(t)
+	mockExportFn.On("Execute", mock.Anything, "test-repo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
+
+	mockReaderWriter := repository.NewMockReaderWriter(t)
+
+	mockStageFn := NewMockWrapWithStageFn(t)
+	mockStageFn.On("Execute", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(func(ctx context.Context, repo repository.Repository, stageOpts repository.StageOptions, fn func(repository.Repository, bool) error) error {
+		return fn(mockReaderWriter, true)
+	})
+
+	r := NewExportWorker(mockClients, mockRepoResources, mockExportFn.Execute, mockStageFn.Execute)
+	err := r.Process(context.Background(), mockRepoWithURLs, job, mockProgress)
+	require.NoError(t, err)
+
+	// Verify that SetRefURLs was NOT called since no branch was specified
+	mockProgress.AssertExpectations(t)
+}
+
+func TestExportWorker_RefURLsNotSetForNonURLRepository(t *testing.T) {
+	job := v0alpha1.Job{
+		Spec: v0alpha1.JobSpec{
+			Action: v0alpha1.JobActionPush,
+			Push: &v0alpha1.ExportJobOptions{
+				Branch:  "feature-branch",
+				Message: "test commit",
+			},
+		},
+	}
+
+	// Use a regular Repository that doesn't implement RepositoryWithURLs
+	mockRepo := repository.NewMockRepository(t)
+
+	mockRepo.On("Config").Return(&v0alpha1.Repository{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-repo",
+			Namespace: "test-namespace",
+		},
+		Spec: v0alpha1.RepositorySpec{
+			Type:      v0alpha1.GitRepositoryType, // Regular git repo, not GitHub
+			Workflows: []v0alpha1.Workflow{v0alpha1.WriteWorkflow, v0alpha1.BranchWorkflow},
+		},
+	})
+
+	// Mock progress recorder - SetRefURLs should NOT be called
+	mockProgress := jobs.NewMockJobProgressRecorder(t)
+	// Explicitly NOT expecting SetRefURLs call
+
+	// Mock other dependencies
+	mockClients := resources.NewMockClientFactory(t)
+	mockResourceClients := resources.NewMockResourceClients(t)
+	mockClients.On("Clients", mock.Anything, "test-namespace").Return(mockResourceClients, nil)
+
+	mockRepoResources := resources.NewMockRepositoryResourcesFactory(t)
+	mockRepoResourcesClient := resources.NewMockRepositoryResources(t)
+	mockRepoResources.On("Client", mock.Anything, mock.Anything).Return(mockRepoResourcesClient, nil)
+
+	mockExportFn := NewMockExportFn(t)
+	mockExportFn.On("Execute", mock.Anything, "test-repo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
+
+	mockReaderWriter := repository.NewMockReaderWriter(t)
+
+	mockStageFn := NewMockWrapWithStageFn(t)
+	mockStageFn.On("Execute", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(func(ctx context.Context, repo repository.Repository, stageOpts repository.StageOptions, fn func(repository.Repository, bool) error) error {
+		return fn(mockReaderWriter, true)
+	})
+
+	r := NewExportWorker(mockClients, mockRepoResources, mockExportFn.Execute, mockStageFn.Execute)
+	err := r.Process(context.Background(), mockRepo, job, mockProgress)
+	require.NoError(t, err)
+
+	// Verify that SetRefURLs was NOT called since repo doesn't support URLs
+	mockProgress.AssertExpectations(t)
+}
diff --git a/pkg/registry/apis/provisioning/jobs/job_progress_recorder_mock.go b/pkg/registry/apis/provisioning/jobs/job_progress_recorder_mock.go
index be0b6d3d9b0..3cefca9e5af 100644
--- a/pkg/registry/apis/provisioning/jobs/job_progress_recorder_mock.go
+++ b/pkg/registry/apis/provisioning/jobs/job_progress_recorder_mock.go
@@ -203,6 +203,40 @@ func (_c *MockJobProgressRecorder_SetMessage_Call) RunAndReturn(run func(context
 	return _c
 }
 
+// SetRefURLs provides a mock function with given fields: ctx, refURLs
+func (_m *MockJobProgressRecorder) SetRefURLs(ctx context.Context, refURLs *v0alpha1.RepositoryURLs) {
+	_m.Called(ctx, refURLs)
+}
+
+// MockJobProgressRecorder_SetRefURLs_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetRefURLs'
+type MockJobProgressRecorder_SetRefURLs_Call struct {
+	*mock.Call
+}
+
+// SetRefURLs is a helper method to define mock.On call
+//   - ctx context.Context
+//   - refURLs *v0alpha1.RepositoryURLs
+func (_e *MockJobProgressRecorder_Expecter) SetRefURLs(ctx interface{}, refURLs interface{}) *MockJobProgressRecorder_SetRefURLs_Call {
+	return &MockJobProgressRecorder_SetRefURLs_Call{Call: _e.mock.On("SetRefURLs", ctx, refURLs)}
+}
+
+func (_c *MockJobProgressRecorder_SetRefURLs_Call) Run(run func(ctx context.Context, refURLs *v0alpha1.RepositoryURLs)) *MockJobProgressRecorder_SetRefURLs_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*v0alpha1.RepositoryURLs))
+	})
+	return _c
+}
+
+func (_c *MockJobProgressRecorder_SetRefURLs_Call) Return() *MockJobProgressRecorder_SetRefURLs_Call {
+	_c.Call.Return()
+	return _c
+}
+
+func (_c *MockJobProgressRecorder_SetRefURLs_Call) RunAndReturn(run func(context.Context, *v0alpha1.RepositoryURLs)) *MockJobProgressRecorder_SetRefURLs_Call {
+	_c.Run(run)
+	return _c
+}
+
 // SetTotal provides a mock function with given fields: ctx, total
 func (_m *MockJobProgressRecorder) SetTotal(ctx context.Context, total int) {
 	_m.Called(ctx, total)
diff --git a/pkg/registry/apis/provisioning/jobs/move/worker.go b/pkg/registry/apis/provisioning/jobs/move/worker.go
index f0b53c8d404..5e409db7e4b 100644
--- a/pkg/registry/apis/provisioning/jobs/move/worker.go
+++ b/pkg/registry/apis/provisioning/jobs/move/worker.go
@@ -89,6 +89,15 @@ func (w *Worker) Process(ctx context.Context, repo repository.Repository, job pr
 		return fmt.Errorf("move files in repository: %w", err)
 	}
 
+	// Set RefURLs if the repository supports it and we have a target ref
+	if opts.Ref != "" {
+		if repoWithURLs, ok := repo.(repository.RepositoryWithURLs); ok {
+			if refURLs, urlErr := repoWithURLs.RefURLs(ctx, opts.Ref); urlErr == nil && refURLs != nil {
+				progress.SetRefURLs(ctx, refURLs)
+			}
+		}
+	}
+
 	if opts.Ref == "" {
 		progress.ResetResults()
 		progress.SetMessage(ctx, "pull resources")
diff --git a/pkg/registry/apis/provisioning/jobs/move/worker_test.go b/pkg/registry/apis/provisioning/jobs/move/worker_test.go
index c2e57a3552b..a728bd5d9f0 100644
--- a/pkg/registry/apis/provisioning/jobs/move/worker_test.go
+++ b/pkg/registry/apis/provisioning/jobs/move/worker_test.go
@@ -833,3 +833,170 @@ func TestMoveWorker_deduplicatePaths(t *testing.T) {
 		})
 	}
 }
+
+func TestMoveWorker_RefURLsSetWithRef(t *testing.T) {
+	mockRepoWithURLs := repository.NewMockRepositoryWithURLs(t)
+	config := &provisioning.Repository{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-repo",
+			Namespace: "test-namespace",
+		},
+		Spec: provisioning.RepositorySpec{
+			Type: provisioning.GitHubRepositoryType,
+		},
+	}
+	mockRepoWithURLs.On("Config").Return(config).Maybe() // Config may be called multiple times
+
+	// Mock RefURLs method to return expected URLs
+	expectedRefURLs := &provisioning.RepositoryURLs{
+		SourceURL:         "https://github.com/grafana/grafana/tree/feature-branch",
+		CompareURL:        "https://github.com/grafana/grafana/compare/main...feature-branch",
+		NewPullRequestURL: "https://github.com/grafana/grafana/compare/main...feature-branch?quick_pull=1&labels=grafana",
+	}
+	mockRepoWithURLs.On("RefURLs", mock.Anything, "feature-branch").Return(expectedRefURLs, nil)
+
+	mockProgress := jobs.NewMockJobProgressRecorder(t)
+	mockProgress.On("SetTotal", mock.Anything, 1).Once()
+	mockProgress.On("StrictMaxErrors", 1).Once()
+	mockProgress.On("SetMessage", mock.Anything, "Moving test.json to target/test.json").Once()
+	mockProgress.On("Record", mock.Anything, mock.Anything).Once()
+	mockProgress.On("TooManyErrors").Return(nil).Once()
+	mockProgress.On("SetRefURLs", mock.Anything, expectedRefURLs).Once()
+
+	mockReaderWriter := repository.NewMockReaderWriter(t)
+	mockReaderWriter.On("Move", mock.Anything, "test.json", "target/test.json", "feature-branch", "Move test.json to target/test.json").Return(nil)
+
+	mockWrapFn := repository.NewMockWrapWithStageFn(t)
+	mockWrapFn.On("Execute", mock.Anything, mockRepoWithURLs, mock.Anything, mock.Anything).Return(func(ctx context.Context, repo repository.Repository, opts repository.StageOptions, fn func(repository.Repository, bool) error) error {
+		return fn(mockReaderWriter, true)
+	})
+
+	mockResourcesFactory := resources.NewMockRepositoryResourcesFactory(t)
+
+	job := provisioning.Job{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-job"},
+		Spec: provisioning.JobSpec{
+			Action: provisioning.JobActionMove,
+			Move: &provisioning.MoveJobOptions{
+				Ref:        "feature-branch",
+				Paths:      []string{"test.json"},
+				TargetPath: "target/",
+			},
+		},
+	}
+
+	worker := NewWorker(nil, mockWrapFn.Execute, mockResourcesFactory)
+	err := worker.Process(context.Background(), mockRepoWithURLs, job, mockProgress)
+	require.NoError(t, err)
+
+	// Verify that SetRefURLs was called with the expected RefURLs
+	mockProgress.AssertExpectations(t)
+	mockRepoWithURLs.AssertExpectations(t)
+}
+
+func TestMoveWorker_RefURLsNotSetWithoutRef(t *testing.T) {
+	mockRepoWithURLs := repository.NewMockRepositoryWithURLs(t)
+	config := &provisioning.Repository{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-repo",
+			Namespace: "test-namespace",
+		},
+		Spec: provisioning.RepositorySpec{
+			Type: provisioning.GitHubRepositoryType,
+		},
+	}
+	mockRepoWithURLs.On("Config").Return(config).Maybe() // Config may be called multiple times
+
+	mockProgress := jobs.NewMockJobProgressRecorder(t)
+	mockProgress.On("SetTotal", mock.Anything, 1).Once()
+	mockProgress.On("StrictMaxErrors", 1).Once()
+	mockProgress.On("SetMessage", mock.Anything, "Moving test.json to target/test.json").Once()
+	mockProgress.On("Record", mock.Anything, mock.Anything).Once()
+	mockProgress.On("TooManyErrors").Return(nil).Once()
+	mockProgress.On("ResetResults").Once()
+	mockProgress.On("SetMessage", mock.Anything, "pull resources").Once()
+	// SetRefURLs should NOT be called since no ref is specified
+
+	mockReaderWriter := repository.NewMockReaderWriter(t)
+	mockReaderWriter.On("Move", mock.Anything, "test.json", "target/test.json", "", "Move test.json to target/test.json").Return(nil)
+
+	mockWrapFn := repository.NewMockWrapWithStageFn(t)
+	mockWrapFn.On("Execute", mock.Anything, mockRepoWithURLs, mock.Anything, mock.Anything).Return(func(ctx context.Context, repo repository.Repository, opts repository.StageOptions, fn func(repository.Repository, bool) error) error {
+		return fn(mockReaderWriter, true)
+	})
+
+	mockSyncWorker := jobs.NewMockWorker(t)
+	mockSyncWorker.On("Process", mock.Anything, mockRepoWithURLs, mock.Anything, mockProgress).Return(nil)
+
+	mockResourcesFactory := resources.NewMockRepositoryResourcesFactory(t)
+
+	job := provisioning.Job{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-job"},
+		Spec: provisioning.JobSpec{
+			Action: provisioning.JobActionMove,
+			Move: &provisioning.MoveJobOptions{
+				// No ref specified
+				Paths:      []string{"test.json"},
+				TargetPath: "target/",
+			},
+		},
+	}
+
+	worker := NewWorker(mockSyncWorker, mockWrapFn.Execute, mockResourcesFactory)
+	err := worker.Process(context.Background(), mockRepoWithURLs, job, mockProgress)
+	require.NoError(t, err)
+
+	// Verify that SetRefURLs was NOT called since no ref was specified
+	mockProgress.AssertExpectations(t)
+}
+
+func TestMoveWorker_RefURLsNotSetForNonURLRepository(t *testing.T) {
+	mockRepo := repository.NewMockRepository(t)
+	config := &provisioning.Repository{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-repo",
+			Namespace: "test-namespace",
+		},
+		Spec: provisioning.RepositorySpec{
+			Type: provisioning.GitRepositoryType, // Regular git repo, not GitHub
+		},
+	}
+	mockRepo.On("Config").Return(config).Maybe() // Config may be called multiple times
+
+	mockProgress := jobs.NewMockJobProgressRecorder(t)
+	mockProgress.On("SetTotal", mock.Anything, 1).Once()
+	mockProgress.On("StrictMaxErrors", 1).Once()
+	mockProgress.On("SetMessage", mock.Anything, "Moving test.json to target/test.json").Once()
+	mockProgress.On("Record", mock.Anything, mock.Anything).Once()
+	mockProgress.On("TooManyErrors").Return(nil).Once()
+	// SetRefURLs should NOT be called since repo doesn't support URLs
+
+	mockReaderWriter := repository.NewMockReaderWriter(t)
+	mockReaderWriter.On("Move", mock.Anything, "test.json", "target/test.json", "feature-branch", "Move test.json to target/test.json").Return(nil)
+
+	mockWrapFn := repository.NewMockWrapWithStageFn(t)
+	mockWrapFn.On("Execute", mock.Anything, mockRepo, mock.Anything, mock.Anything).Return(func(ctx context.Context, repo repository.Repository, opts repository.StageOptions, fn func(repository.Repository, bool) error) error {
+		return fn(mockReaderWriter, true)
+	})
+
+	mockResourcesFactory := resources.NewMockRepositoryResourcesFactory(t)
+
+	job := provisioning.Job{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-job"},
+		Spec: provisioning.JobSpec{
+			Action: provisioning.JobActionMove,
+			Move: &provisioning.MoveJobOptions{
+				Ref:        "feature-branch",
+				Paths:      []string{"test.json"},
+				TargetPath: "target/",
+			},
+		},
+	}
+
+	worker := NewWorker(nil, mockWrapFn.Execute, mockResourcesFactory)
+	err := worker.Process(context.Background(), mockRepo, job, mockProgress)
+	require.NoError(t, err)
+
+	// Verify that SetRefURLs was NOT called since repo doesn't support URLs
+	mockProgress.AssertExpectations(t)
+}
diff --git a/pkg/registry/apis/provisioning/jobs/progress.go b/pkg/registry/apis/provisioning/jobs/progress.go
index f0266471837..17d0fb60248 100644
--- a/pkg/registry/apis/provisioning/jobs/progress.go
+++ b/pkg/registry/apis/provisioning/jobs/progress.go
@@ -53,6 +53,7 @@ type jobProgressRecorder struct {
 	resultCount         int
 	errorCount          int
 	errors              []string
+	refURLs             *provisioning.RepositoryURLs
 	notifyImmediatelyFn ProgressFn
 	maybeNotifyFn       ProgressFn
 	summaries           map[string]*provisioning.JobResourceSummary
@@ -117,6 +118,18 @@ func (r *jobProgressRecorder) SetFinalMessage(ctx context.Context, msg string) {
 	logging.FromContext(ctx).Info("job final message", "message", msg)
 }
 
+func (r *jobProgressRecorder) SetRefURLs(ctx context.Context, refURLs *provisioning.RepositoryURLs) {
+	r.mu.Lock()
+	r.refURLs = refURLs
+	r.mu.Unlock()
+
+	if refURLs != nil {
+		logging.FromContext(ctx).Debug("job ref URLs set", "sourceURL", refURLs.SourceURL, "compareURL", refURLs.CompareURL, "newPullRequestURL", refURLs.NewPullRequestURL)
+	} else {
+		logging.FromContext(ctx).Debug("job ref URLs cleared")
+	}
+}
+
 func (r *jobProgressRecorder) SetTotal(ctx context.Context, total int) {
 	r.mu.Lock()
 	r.total = total
@@ -253,6 +266,7 @@ func (r *jobProgressRecorder) Complete(ctx context.Context, err error) provision
 
 	jobStatus.Summary = r.summary()
 	jobStatus.Errors = r.errors
+	jobStatus.URLs = r.refURLs
 
 	// Check for errors during execution
 	if len(jobStatus.Errors) > 0 && jobStatus.State != provisioning.JobStateError {
diff --git a/pkg/registry/apis/provisioning/jobs/progress_test.go b/pkg/registry/apis/provisioning/jobs/progress_test.go
new file mode 100644
index 00000000000..caf44c767ff
--- /dev/null
+++ b/pkg/registry/apis/provisioning/jobs/progress_test.go
@@ -0,0 +1,85 @@
+package jobs
+
+import (
+	"context"
+	"testing"
+
+	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestJobProgressRecorderSetRefURLs(t *testing.T) {
+	ctx := context.Background()
+
+	// Create a progress recorder
+	mockProgressFn := func(ctx context.Context, status provisioning.JobStatus) error {
+		return nil
+	}
+	recorder := newJobProgressRecorder(mockProgressFn).(*jobProgressRecorder)
+
+	// Test setting RefURLs
+	expectedRefURLs := &provisioning.RepositoryURLs{
+		SourceURL:         "https://github.com/grafana/grafana/tree/feature-branch",
+		CompareURL:        "https://github.com/grafana/grafana/compare/main...feature-branch",
+		NewPullRequestURL: "https://github.com/grafana/grafana/compare/main...feature-branch?quick_pull=1&labels=grafana",
+	}
+
+	recorder.SetRefURLs(ctx, expectedRefURLs)
+
+	// Verify RefURLs are stored
+	recorder.mu.RLock()
+	assert.Equal(t, expectedRefURLs, recorder.refURLs)
+	recorder.mu.RUnlock()
+
+	// Test that RefURLs are included in the final status
+	finalStatus := recorder.Complete(ctx, nil)
+	assert.Equal(t, expectedRefURLs, finalStatus.URLs)
+}
+
+func TestJobProgressRecorderSetRefURLsNil(t *testing.T) {
+	ctx := context.Background()
+
+	// Create a progress recorder
+	mockProgressFn := func(ctx context.Context, status provisioning.JobStatus) error {
+		return nil
+	}
+	recorder := newJobProgressRecorder(mockProgressFn).(*jobProgressRecorder)
+
+	// Test setting nil RefURLs
+	recorder.SetRefURLs(ctx, nil)
+
+	// Verify nil RefURLs are stored
+	recorder.mu.RLock()
+	assert.Nil(t, recorder.refURLs)
+	recorder.mu.RUnlock()
+
+	// Test that nil RefURLs are included in the final status
+	finalStatus := recorder.Complete(ctx, nil)
+	assert.Nil(t, finalStatus.URLs)
+}
+
+func TestJobProgressRecorderCompleteIncludesRefURLs(t *testing.T) {
+	ctx := context.Background()
+
+	// Create a progress recorder
+	mockProgressFn := func(ctx context.Context, status provisioning.JobStatus) error {
+		return nil
+	}
+	recorder := newJobProgressRecorder(mockProgressFn).(*jobProgressRecorder)
+
+	// Set some RefURLs
+	refURLs := &provisioning.RepositoryURLs{
+		SourceURL: "https://github.com/grafana/grafana/tree/test-branch",
+	}
+	recorder.SetRefURLs(ctx, refURLs)
+
+	// Complete the job
+	finalStatus := recorder.Complete(ctx, nil)
+
+	// Verify the final status includes RefURLs
+	require.NotNil(t, finalStatus.URLs)
+	assert.Equal(t, refURLs.SourceURL, finalStatus.URLs.SourceURL)
+	assert.Equal(t, provisioning.JobStateSuccess, finalStatus.State)
+	assert.Equal(t, "completed successfully", finalStatus.Message)
+}
diff --git a/pkg/registry/apis/provisioning/jobs/queue.go b/pkg/registry/apis/provisioning/jobs/queue.go
index 3a9757d93a1..f7e2a60e4f5 100644
--- a/pkg/registry/apis/provisioning/jobs/queue.go
+++ b/pkg/registry/apis/provisioning/jobs/queue.go
@@ -25,6 +25,7 @@ type JobProgressRecorder interface {
 	SetTotal(ctx context.Context, total int)
 	TooManyErrors() error
 	StrictMaxErrors(maxErrors int)
+	SetRefURLs(ctx context.Context, refURLs *provisioning.RepositoryURLs)
 	Complete(ctx context.Context, err error) provisioning.JobStatus
 }
 
diff --git a/pkg/registry/apis/provisioning/jobs/store_mock.go b/pkg/registry/apis/provisioning/jobs/store_mock.go
index 79d91719605..aebcac9bbbe 100644
--- a/pkg/registry/apis/provisioning/jobs/store_mock.go
+++ b/pkg/registry/apis/provisioning/jobs/store_mock.go
@@ -182,6 +182,112 @@ func (_c *MockStore_Complete_Call) RunAndReturn(run func(context.Context, *v0alp
 	return _c
 }
 
+// Get provides a mock function with given fields: ctx, name
+func (_m *MockStore) Get(ctx context.Context, name string) (*v0alpha1.Job, error) {
+	ret := _m.Called(ctx, name)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
+	var r0 *v0alpha1.Job
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) (*v0alpha1.Job, error)); ok {
+		return rf(ctx, name)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) *v0alpha1.Job); ok {
+		r0 = rf(ctx, name)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*v0alpha1.Job)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(ctx, name)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// MockStore_Get_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Get'
+type MockStore_Get_Call struct {
+	*mock.Call
+}
+
+// Get is a helper method to define mock.On call
+//   - ctx context.Context
+//   - name string
+func (_e *MockStore_Expecter) Get(ctx interface{}, name interface{}) *MockStore_Get_Call {
+	return &MockStore_Get_Call{Call: _e.mock.On("Get", ctx, name)}
+}
+
+func (_c *MockStore_Get_Call) Run(run func(ctx context.Context, name string)) *MockStore_Get_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string))
+	})
+	return _c
+}
+
+func (_c *MockStore_Get_Call) Return(_a0 *v0alpha1.Job, _a1 error) *MockStore_Get_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *MockStore_Get_Call) RunAndReturn(run func(context.Context, string) (*v0alpha1.Job, error)) *MockStore_Get_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// RenewLease provides a mock function with given fields: ctx, job
+func (_m *MockStore) RenewLease(ctx context.Context, job *v0alpha1.Job) error {
+	ret := _m.Called(ctx, job)
+
+	if len(ret) == 0 {
+		panic("no return value specified for RenewLease")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, *v0alpha1.Job) error); ok {
+		r0 = rf(ctx, job)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// MockStore_RenewLease_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'RenewLease'
+type MockStore_RenewLease_Call struct {
+	*mock.Call
+}
+
+// RenewLease is a helper method to define mock.On call
+//   - ctx context.Context
+//   - job *v0alpha1.Job
+func (_e *MockStore_Expecter) RenewLease(ctx interface{}, job interface{}) *MockStore_RenewLease_Call {
+	return &MockStore_RenewLease_Call{Call: _e.mock.On("RenewLease", ctx, job)}
+}
+
+func (_c *MockStore_RenewLease_Call) Run(run func(ctx context.Context, job *v0alpha1.Job)) *MockStore_RenewLease_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*v0alpha1.Job))
+	})
+	return _c
+}
+
+func (_c *MockStore_RenewLease_Call) Return(_a0 error) *MockStore_RenewLease_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *MockStore_RenewLease_Call) RunAndReturn(run func(context.Context, *v0alpha1.Job) error) *MockStore_RenewLease_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // Update provides a mock function with given fields: ctx, job
 func (_m *MockStore) Update(ctx context.Context, job *v0alpha1.Job) (*v0alpha1.Job, error) {
 	ret := _m.Called(ctx, job)
diff --git a/pkg/registry/apis/provisioning/repository/git/staged.go b/pkg/registry/apis/provisioning/repository/git/staged.go
index f55eb709341..01a375ce7f4 100644
--- a/pkg/registry/apis/provisioning/repository/git/staged.go
+++ b/pkg/registry/apis/provisioning/repository/git/staged.go
@@ -31,13 +31,9 @@ func NewStagedGitRepository(ctx context.Context, repo *gitRepository, opts repos
 		branch = repo.gitConfig.Branch
 	}
 
-	ref, err := repo.client.GetRef(ctx, "refs/heads/"+branch)
+	ref, err := repo.ensureBranchExists(ctx, branch)
 	if err != nil {
-		// TODO: opts.CreateIfNotExists doesn't make sense in the context of the staged repository
-		// because we only support the branch that is passed in.
-		// we should probably add branch to the repository.CloneOptions which should be repurposed
-		// as some kind of branch creation options.
-		return nil, err
+		return nil, fmt.Errorf("ensure branch exists: %w", err)
 	}
 
 	writer, err := repo.client.NewStagedWriter(ctx, ref)
diff --git a/pkg/registry/apis/provisioning/repository/git/staged_test.go b/pkg/registry/apis/provisioning/repository/git/staged_test.go
index 2b18fd3445f..8f3940f10f8 100644
--- a/pkg/registry/apis/provisioning/repository/git/staged_test.go
+++ b/pkg/registry/apis/provisioning/repository/git/staged_test.go
@@ -131,7 +131,48 @@ func TestNewStagedGitRepository(t *testing.T) {
 			opts: repository.StageOptions{
 				Mode: repository.StageModeCommitOnEach,
 			},
-			wantError: errors.New("ref not found"),
+			wantError: errors.New("ensure branch exists: check branch exists: ref not found"),
+		},
+		{
+			name: "creates branch when it doesn't exist",
+			setupMock: func(mockClient *mocks.FakeClient) {
+				// First call to GetRef for feature-branch returns not found
+				// Second call to GetRef for main branch (source) returns success
+				// Third call to CreateRef creates the feature branch
+				// Fourth call to GetRef for feature-branch returns the created branch
+				callCount := 0
+				mockClient.GetRefStub = func(ctx context.Context, ref string) (nanogit.Ref, error) {
+					callCount++
+					switch callCount {
+					case 1:
+						// First call: feature-branch doesn't exist
+						if ref == "refs/heads/feature-branch" {
+							return nanogit.Ref{}, nanogit.ErrObjectNotFound
+						}
+					case 2:
+						// Second call: get source branch (main)
+						if ref == "refs/heads/main" {
+							return nanogit.Ref{
+								Name: "refs/heads/main",
+								Hash: hash.Hash{1, 2, 3},
+							}, nil
+						}
+					}
+					return nanogit.Ref{}, errors.New("unexpected call")
+				}
+
+				// CreateRef should be called to create the new branch
+				mockClient.CreateRefReturns(nil)
+
+				mockWriter := &mocks.FakeStagedWriter{}
+				mockClient.NewStagedWriterReturns(mockWriter, nil)
+			},
+			opts: repository.StageOptions{
+				Ref:  "feature-branch",
+				Mode: repository.StageModeCommitOnEach,
+			},
+			expectedRef: "refs/heads/feature-branch",
+			wantError:   nil,
 		},
 		{
 			name: "fails with NewStagedWriter error",
diff --git a/pkg/registry/apis/provisioning/repository/github/github_repository_mock.go b/pkg/registry/apis/provisioning/repository/github/github_repository_mock.go
index 7b5509935f1..e5fc32897cf 100644
--- a/pkg/registry/apis/provisioning/repository/github/github_repository_mock.go
+++ b/pkg/registry/apis/provisioning/repository/github/github_repository_mock.go
@@ -829,6 +829,65 @@ func (_c *MockGithubRepository_ReadTree_Call) RunAndReturn(run func(context.Cont
 	return _c
 }
 
+// RefURLs provides a mock function with given fields: ctx, ref
+func (_m *MockGithubRepository) RefURLs(ctx context.Context, ref string) (*v0alpha1.RepositoryURLs, error) {
+	ret := _m.Called(ctx, ref)
+
+	if len(ret) == 0 {
+		panic("no return value specified for RefURLs")
+	}
+
+	var r0 *v0alpha1.RepositoryURLs
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) (*v0alpha1.RepositoryURLs, error)); ok {
+		return rf(ctx, ref)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) *v0alpha1.RepositoryURLs); ok {
+		r0 = rf(ctx, ref)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*v0alpha1.RepositoryURLs)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(ctx, ref)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// MockGithubRepository_RefURLs_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'RefURLs'
+type MockGithubRepository_RefURLs_Call struct {
+	*mock.Call
+}
+
+// RefURLs is a helper method to define mock.On call
+//   - ctx context.Context
+//   - ref string
+func (_e *MockGithubRepository_Expecter) RefURLs(ctx interface{}, ref interface{}) *MockGithubRepository_RefURLs_Call {
+	return &MockGithubRepository_RefURLs_Call{Call: _e.mock.On("RefURLs", ctx, ref)}
+}
+
+func (_c *MockGithubRepository_RefURLs_Call) Run(run func(ctx context.Context, ref string)) *MockGithubRepository_RefURLs_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string))
+	})
+	return _c
+}
+
+func (_c *MockGithubRepository_RefURLs_Call) Return(_a0 *v0alpha1.RepositoryURLs, _a1 error) *MockGithubRepository_RefURLs_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *MockGithubRepository_RefURLs_Call) RunAndReturn(run func(context.Context, string) (*v0alpha1.RepositoryURLs, error)) *MockGithubRepository_RefURLs_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // Repo provides a mock function with no fields
 func (_m *MockGithubRepository) Repo() string {
 	ret := _m.Called()
@@ -875,23 +934,23 @@ func (_c *MockGithubRepository_Repo_Call) RunAndReturn(run func() string) *MockG
 }
 
 // ResourceURLs provides a mock function with given fields: ctx, file
-func (_m *MockGithubRepository) ResourceURLs(ctx context.Context, file *repository.FileInfo) (*v0alpha1.ResourceURLs, error) {
+func (_m *MockGithubRepository) ResourceURLs(ctx context.Context, file *repository.FileInfo) (*v0alpha1.RepositoryURLs, error) {
 	ret := _m.Called(ctx, file)
 
 	if len(ret) == 0 {
 		panic("no return value specified for ResourceURLs")
 	}
 
-	var r0 *v0alpha1.ResourceURLs
+	var r0 *v0alpha1.RepositoryURLs
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *repository.FileInfo) (*v0alpha1.ResourceURLs, error)); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *repository.FileInfo) (*v0alpha1.RepositoryURLs, error)); ok {
 		return rf(ctx, file)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, *repository.FileInfo) *v0alpha1.ResourceURLs); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *repository.FileInfo) *v0alpha1.RepositoryURLs); ok {
 		r0 = rf(ctx, file)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v0alpha1.ResourceURLs)
+			r0 = ret.Get(0).(*v0alpha1.RepositoryURLs)
 		}
 	}
 
@@ -923,12 +982,12 @@ func (_c *MockGithubRepository_ResourceURLs_Call) Run(run func(ctx context.Conte
 	return _c
 }
 
-func (_c *MockGithubRepository_ResourceURLs_Call) Return(_a0 *v0alpha1.ResourceURLs, _a1 error) *MockGithubRepository_ResourceURLs_Call {
+func (_c *MockGithubRepository_ResourceURLs_Call) Return(_a0 *v0alpha1.RepositoryURLs, _a1 error) *MockGithubRepository_ResourceURLs_Call {
 	_c.Call.Return(_a0, _a1)
 	return _c
 }
 
-func (_c *MockGithubRepository_ResourceURLs_Call) RunAndReturn(run func(context.Context, *repository.FileInfo) (*v0alpha1.ResourceURLs, error)) *MockGithubRepository_ResourceURLs_Call {
+func (_c *MockGithubRepository_ResourceURLs_Call) RunAndReturn(run func(context.Context, *repository.FileInfo) (*v0alpha1.RepositoryURLs, error)) *MockGithubRepository_ResourceURLs_Call {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/pkg/registry/apis/provisioning/repository/github/repository.go b/pkg/registry/apis/provisioning/repository/github/repository.go
index ac95e54312f..00ff70eb213 100644
--- a/pkg/registry/apis/provisioning/repository/github/repository.go
+++ b/pkg/registry/apis/provisioning/repository/github/repository.go
@@ -198,7 +198,7 @@ func (r *githubRepository) ListRefs(ctx context.Context) ([]provisioning.RefItem
 }
 
 // ResourceURLs implements RepositoryWithURLs.
-func (r *githubRepository) ResourceURLs(ctx context.Context, file *repository.FileInfo) (*provisioning.ResourceURLs, error) {
+func (r *githubRepository) ResourceURLs(ctx context.Context, file *repository.FileInfo) (*provisioning.RepositoryURLs, error) {
 	cfg := r.config.Spec.GitHub
 	if file.Path == "" || cfg == nil {
 		return nil, nil
@@ -209,7 +209,7 @@ func (r *githubRepository) ResourceURLs(ctx context.Context, file *repository.Fi
 		ref = cfg.Branch
 	}
 
-	urls := &provisioning.ResourceURLs{
+	urls := &provisioning.RepositoryURLs{
 		RepositoryURL: cfg.URL,
 		SourceURL:     fmt.Sprintf("%s/blob/%s/%s", cfg.URL, ref, file.Path),
 	}
@@ -224,6 +224,25 @@ func (r *githubRepository) ResourceURLs(ctx context.Context, file *repository.Fi
 	return urls, nil
 }
 
+// RefURLs implements RepositoryWithURLs.
+func (r *githubRepository) RefURLs(ctx context.Context, ref string) (*provisioning.RepositoryURLs, error) {
+	cfg := r.config.Spec.GitHub
+	if cfg == nil || ref == "" {
+		return nil, nil
+	}
+
+	urls := &provisioning.RepositoryURLs{
+		SourceURL: fmt.Sprintf("%s/tree/%s", cfg.URL, ref),
+	}
+
+	if ref != cfg.Branch {
+		urls.CompareURL = fmt.Sprintf("%s/compare/%s...%s", cfg.URL, cfg.Branch, ref)
+		urls.NewPullRequestURL = fmt.Sprintf("%s?quick_pull=1&labels=grafana", urls.CompareURL)
+	}
+
+	return urls, nil
+}
+
 func (r *githubRepository) OnCreate(_ context.Context) ([]map[string]interface{}, error) {
 	return nil, nil
 }
diff --git a/pkg/registry/apis/provisioning/repository/github/repository_test.go b/pkg/registry/apis/provisioning/repository/github/repository_test.go
index 3a11127e9da..94d9c938cd5 100644
--- a/pkg/registry/apis/provisioning/repository/github/repository_test.go
+++ b/pkg/registry/apis/provisioning/repository/github/repository_test.go
@@ -688,7 +688,7 @@ func TestGitHubRepositoryResourceURLs(t *testing.T) {
 		name          string
 		file          *repository.FileInfo
 		config        *provisioning.Repository
-		expectedURLs  *provisioning.ResourceURLs
+		expectedURLs  *provisioning.RepositoryURLs
 		expectedError error
 	}{
 		{
@@ -705,7 +705,7 @@ func TestGitHubRepositoryResourceURLs(t *testing.T) {
 					},
 				},
 			},
-			expectedURLs: &provisioning.ResourceURLs{
+			expectedURLs: &provisioning.RepositoryURLs{
 				RepositoryURL:     "https://github.com/grafana/grafana",
 				SourceURL:         "https://github.com/grafana/grafana/blob/feature-branch/dashboards/test.json",
 				CompareURL:        "https://github.com/grafana/grafana/compare/main...feature-branch",
@@ -726,7 +726,7 @@ func TestGitHubRepositoryResourceURLs(t *testing.T) {
 					},
 				},
 			},
-			expectedURLs: &provisioning.ResourceURLs{
+			expectedURLs: &provisioning.RepositoryURLs{
 				RepositoryURL: "https://github.com/grafana/grafana",
 				SourceURL:     "https://github.com/grafana/grafana/blob/main/dashboards/test.json",
 			},
@@ -783,6 +783,92 @@ func TestGitHubRepositoryResourceURLs(t *testing.T) {
 	}
 }
 
+func TestGitHubRepositoryRefURLs(t *testing.T) {
+	tests := []struct {
+		name          string
+		ref           string
+		config        *provisioning.Repository
+		expectedURLs  *provisioning.RepositoryURLs
+		expectedError error
+	}{
+		{
+			name: "ref different from branch",
+			ref:  "feature-branch",
+			config: &provisioning.Repository{
+				Spec: provisioning.RepositorySpec{
+					GitHub: &provisioning.GitHubRepositoryConfig{
+						URL:    "https://github.com/grafana/grafana",
+						Branch: "main",
+					},
+				},
+			},
+			expectedURLs: &provisioning.RepositoryURLs{
+				SourceURL:         "https://github.com/grafana/grafana/tree/feature-branch",
+				CompareURL:        "https://github.com/grafana/grafana/compare/main...feature-branch",
+				NewPullRequestURL: "https://github.com/grafana/grafana/compare/main...feature-branch?quick_pull=1&labels=grafana",
+			},
+		},
+		{
+			name: "ref same as branch",
+			ref:  "main",
+			config: &provisioning.Repository{
+				Spec: provisioning.RepositorySpec{
+					GitHub: &provisioning.GitHubRepositoryConfig{
+						URL:    "https://github.com/grafana/grafana",
+						Branch: "main",
+					},
+				},
+			},
+			expectedURLs: &provisioning.RepositoryURLs{
+				SourceURL: "https://github.com/grafana/grafana/tree/main",
+			},
+		},
+		{
+			name: "empty ref returns nil",
+			ref:  "",
+			config: &provisioning.Repository{
+				Spec: provisioning.RepositorySpec{
+					GitHub: &provisioning.GitHubRepositoryConfig{
+						URL:    "https://github.com/grafana/grafana",
+						Branch: "main",
+					},
+				},
+			},
+			expectedURLs: nil,
+		},
+		{
+			name: "nil github config returns nil",
+			ref:  "feature-branch",
+			config: &provisioning.Repository{
+				Spec: provisioning.RepositorySpec{
+					GitHub: nil,
+				},
+			},
+			expectedURLs: nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			repo := &githubRepository{
+				config: tt.config,
+				owner:  "grafana",
+				repo:   "grafana",
+			}
+
+			urls, err := repo.RefURLs(context.Background(), tt.ref)
+
+			if tt.expectedError != nil {
+				require.Error(t, err)
+				require.Equal(t, tt.expectedError.Error(), err.Error())
+			} else {
+				require.NoError(t, err)
+				require.Equal(t, tt.expectedURLs, urls)
+			}
+		})
+	}
+}
+
 // Test simple delegation functions
 func TestGitHubRepositoryDelegation(t *testing.T) {
 	ctx := context.Background()
diff --git a/pkg/registry/apis/provisioning/repository/reader_writer_mock.go b/pkg/registry/apis/provisioning/repository/reader_writer_mock.go
new file mode 100644
index 00000000000..5990d5b3eb2
--- /dev/null
+++ b/pkg/registry/apis/provisioning/repository/reader_writer_mock.go
@@ -0,0 +1,559 @@
+// Code generated by mockery v2.52.4. DO NOT EDIT.
+
+package repository
+
+import (
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+	field "k8s.io/apimachinery/pkg/util/validation/field"
+
+	v0alpha1 "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+)
+
+// MockReaderWriter is an autogenerated mock type for the ReaderWriter type
+type MockReaderWriter struct {
+	mock.Mock
+}
+
+type MockReaderWriter_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *MockReaderWriter) EXPECT() *MockReaderWriter_Expecter {
+	return &MockReaderWriter_Expecter{mock: &_m.Mock}
+}
+
+// Config provides a mock function with no fields
+func (_m *MockReaderWriter) Config() *v0alpha1.Repository {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Config")
+	}
+
+	var r0 *v0alpha1.Repository
+	if rf, ok := ret.Get(0).(func() *v0alpha1.Repository); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*v0alpha1.Repository)
+		}
+	}
+
+	return r0
+}
+
+// MockReaderWriter_Config_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Config'
+type MockReaderWriter_Config_Call struct {
+	*mock.Call
+}
+
+// Config is a helper method to define mock.On call
+func (_e *MockReaderWriter_Expecter) Config() *MockReaderWriter_Config_Call {
+	return &MockReaderWriter_Config_Call{Call: _e.mock.On("Config")}
+}
+
+func (_c *MockReaderWriter_Config_Call) Run(run func()) *MockReaderWriter_Config_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *MockReaderWriter_Config_Call) Return(_a0 *v0alpha1.Repository) *MockReaderWriter_Config_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *MockReaderWriter_Config_Call) RunAndReturn(run func() *v0alpha1.Repository) *MockReaderWriter_Config_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Create provides a mock function with given fields: ctx, path, ref, data, message
+func (_m *MockReaderWriter) Create(ctx context.Context, path string, ref string, data []byte, message string) error {
+	ret := _m.Called(ctx, path, ref, data, message)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string, []byte, string) error); ok {
+		r0 = rf(ctx, path, ref, data, message)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// MockReaderWriter_Create_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Create'
+type MockReaderWriter_Create_Call struct {
+	*mock.Call
+}
+
+// Create is a helper method to define mock.On call
+//   - ctx context.Context
+//   - path string
+//   - ref string
+//   - data []byte
+//   - message string
+func (_e *MockReaderWriter_Expecter) Create(ctx interface{}, path interface{}, ref interface{}, data interface{}, message interface{}) *MockReaderWriter_Create_Call {
+	return &MockReaderWriter_Create_Call{Call: _e.mock.On("Create", ctx, path, ref, data, message)}
+}
+
+func (_c *MockReaderWriter_Create_Call) Run(run func(ctx context.Context, path string, ref string, data []byte, message string)) *MockReaderWriter_Create_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].([]byte), args[4].(string))
+	})
+	return _c
+}
+
+func (_c *MockReaderWriter_Create_Call) Return(_a0 error) *MockReaderWriter_Create_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *MockReaderWriter_Create_Call) RunAndReturn(run func(context.Context, string, string, []byte, string) error) *MockReaderWriter_Create_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Delete provides a mock function with given fields: ctx, path, ref, message
+func (_m *MockReaderWriter) Delete(ctx context.Context, path string, ref string, message string) error {
+	ret := _m.Called(ctx, path, ref, message)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string, string) error); ok {
+		r0 = rf(ctx, path, ref, message)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// MockReaderWriter_Delete_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Delete'
+type MockReaderWriter_Delete_Call struct {
+	*mock.Call
+}
+
+// Delete is a helper method to define mock.On call
+//   - ctx context.Context
+//   - path string
+//   - ref string
+//   - message string
+func (_e *MockReaderWriter_Expecter) Delete(ctx interface{}, path interface{}, ref interface{}, message interface{}) *MockReaderWriter_Delete_Call {
+	return &MockReaderWriter_Delete_Call{Call: _e.mock.On("Delete", ctx, path, ref, message)}
+}
+
+func (_c *MockReaderWriter_Delete_Call) Run(run func(ctx context.Context, path string, ref string, message string)) *MockReaderWriter_Delete_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].(string))
+	})
+	return _c
+}
+
+func (_c *MockReaderWriter_Delete_Call) Return(_a0 error) *MockReaderWriter_Delete_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *MockReaderWriter_Delete_Call) RunAndReturn(run func(context.Context, string, string, string) error) *MockReaderWriter_Delete_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Move provides a mock function with given fields: ctx, oldPath, newPath, ref, message
+func (_m *MockReaderWriter) Move(ctx context.Context, oldPath string, newPath string, ref string, message string) error {
+	ret := _m.Called(ctx, oldPath, newPath, ref, message)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Move")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string) error); ok {
+		r0 = rf(ctx, oldPath, newPath, ref, message)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// MockReaderWriter_Move_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Move'
+type MockReaderWriter_Move_Call struct {
+	*mock.Call
+}
+
+// Move is a helper method to define mock.On call
+//   - ctx context.Context
+//   - oldPath string
+//   - newPath string
+//   - ref string
+//   - message string
+func (_e *MockReaderWriter_Expecter) Move(ctx interface{}, oldPath interface{}, newPath interface{}, ref interface{}, message interface{}) *MockReaderWriter_Move_Call {
+	return &MockReaderWriter_Move_Call{Call: _e.mock.On("Move", ctx, oldPath, newPath, ref, message)}
+}
+
+func (_c *MockReaderWriter_Move_Call) Run(run func(ctx context.Context, oldPath string, newPath string, ref string, message string)) *MockReaderWriter_Move_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].(string), args[4].(string))
+	})
+	return _c
+}
+
+func (_c *MockReaderWriter_Move_Call) Return(_a0 error) *MockReaderWriter_Move_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *MockReaderWriter_Move_Call) RunAndReturn(run func(context.Context, string, string, string, string) error) *MockReaderWriter_Move_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Read provides a mock function with given fields: ctx, path, ref
+func (_m *MockReaderWriter) Read(ctx context.Context, path string, ref string) (*FileInfo, error) {
+	ret := _m.Called(ctx, path, ref)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Read")
+	}
+
+	var r0 *FileInfo
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) (*FileInfo, error)); ok {
+		return rf(ctx, path, ref)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) *FileInfo); ok {
+		r0 = rf(ctx, path, ref)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*FileInfo)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok {
+		r1 = rf(ctx, path, ref)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// MockReaderWriter_Read_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Read'
+type MockReaderWriter_Read_Call struct {
+	*mock.Call
+}
+
+// Read is a helper method to define mock.On call
+//   - ctx context.Context
+//   - path string
+//   - ref string
+func (_e *MockReaderWriter_Expecter) Read(ctx interface{}, path interface{}, ref interface{}) *MockReaderWriter_Read_Call {
+	return &MockReaderWriter_Read_Call{Call: _e.mock.On("Read", ctx, path, ref)}
+}
+
+func (_c *MockReaderWriter_Read_Call) Run(run func(ctx context.Context, path string, ref string)) *MockReaderWriter_Read_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string), args[2].(string))
+	})
+	return _c
+}
+
+func (_c *MockReaderWriter_Read_Call) Return(_a0 *FileInfo, _a1 error) *MockReaderWriter_Read_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *MockReaderWriter_Read_Call) RunAndReturn(run func(context.Context, string, string) (*FileInfo, error)) *MockReaderWriter_Read_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ReadTree provides a mock function with given fields: ctx, ref
+func (_m *MockReaderWriter) ReadTree(ctx context.Context, ref string) ([]FileTreeEntry, error) {
+	ret := _m.Called(ctx, ref)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ReadTree")
+	}
+
+	var r0 []FileTreeEntry
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) ([]FileTreeEntry, error)); ok {
+		return rf(ctx, ref)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) []FileTreeEntry); ok {
+		r0 = rf(ctx, ref)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]FileTreeEntry)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(ctx, ref)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// MockReaderWriter_ReadTree_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ReadTree'
+type MockReaderWriter_ReadTree_Call struct {
+	*mock.Call
+}
+
+// ReadTree is a helper method to define mock.On call
+//   - ctx context.Context
+//   - ref string
+func (_e *MockReaderWriter_Expecter) ReadTree(ctx interface{}, ref interface{}) *MockReaderWriter_ReadTree_Call {
+	return &MockReaderWriter_ReadTree_Call{Call: _e.mock.On("ReadTree", ctx, ref)}
+}
+
+func (_c *MockReaderWriter_ReadTree_Call) Run(run func(ctx context.Context, ref string)) *MockReaderWriter_ReadTree_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string))
+	})
+	return _c
+}
+
+func (_c *MockReaderWriter_ReadTree_Call) Return(_a0 []FileTreeEntry, _a1 error) *MockReaderWriter_ReadTree_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *MockReaderWriter_ReadTree_Call) RunAndReturn(run func(context.Context, string) ([]FileTreeEntry, error)) *MockReaderWriter_ReadTree_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Test provides a mock function with given fields: ctx
+func (_m *MockReaderWriter) Test(ctx context.Context) (*v0alpha1.TestResults, error) {
+	ret := _m.Called(ctx)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Test")
+	}
+
+	var r0 *v0alpha1.TestResults
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context) (*v0alpha1.TestResults, error)); ok {
+		return rf(ctx)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) *v0alpha1.TestResults); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*v0alpha1.TestResults)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// MockReaderWriter_Test_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Test'
+type MockReaderWriter_Test_Call struct {
+	*mock.Call
+}
+
+// Test is a helper method to define mock.On call
+//   - ctx context.Context
+func (_e *MockReaderWriter_Expecter) Test(ctx interface{}) *MockReaderWriter_Test_Call {
+	return &MockReaderWriter_Test_Call{Call: _e.mock.On("Test", ctx)}
+}
+
+func (_c *MockReaderWriter_Test_Call) Run(run func(ctx context.Context)) *MockReaderWriter_Test_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context))
+	})
+	return _c
+}
+
+func (_c *MockReaderWriter_Test_Call) Return(_a0 *v0alpha1.TestResults, _a1 error) *MockReaderWriter_Test_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *MockReaderWriter_Test_Call) RunAndReturn(run func(context.Context) (*v0alpha1.TestResults, error)) *MockReaderWriter_Test_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Update provides a mock function with given fields: ctx, path, ref, data, message
+func (_m *MockReaderWriter) Update(ctx context.Context, path string, ref string, data []byte, message string) error {
+	ret := _m.Called(ctx, path, ref, data, message)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string, []byte, string) error); ok {
+		r0 = rf(ctx, path, ref, data, message)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// MockReaderWriter_Update_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Update'
+type MockReaderWriter_Update_Call struct {
+	*mock.Call
+}
+
+// Update is a helper method to define mock.On call
+//   - ctx context.Context
+//   - path string
+//   - ref string
+//   - data []byte
+//   - message string
+func (_e *MockReaderWriter_Expecter) Update(ctx interface{}, path interface{}, ref interface{}, data interface{}, message interface{}) *MockReaderWriter_Update_Call {
+	return &MockReaderWriter_Update_Call{Call: _e.mock.On("Update", ctx, path, ref, data, message)}
+}
+
+func (_c *MockReaderWriter_Update_Call) Run(run func(ctx context.Context, path string, ref string, data []byte, message string)) *MockReaderWriter_Update_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].([]byte), args[4].(string))
+	})
+	return _c
+}
+
+func (_c *MockReaderWriter_Update_Call) Return(_a0 error) *MockReaderWriter_Update_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *MockReaderWriter_Update_Call) RunAndReturn(run func(context.Context, string, string, []byte, string) error) *MockReaderWriter_Update_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Validate provides a mock function with no fields
+func (_m *MockReaderWriter) Validate() field.ErrorList {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Validate")
+	}
+
+	var r0 field.ErrorList
+	if rf, ok := ret.Get(0).(func() field.ErrorList); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(field.ErrorList)
+		}
+	}
+
+	return r0
+}
+
+// MockReaderWriter_Validate_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Validate'
+type MockReaderWriter_Validate_Call struct {
+	*mock.Call
+}
+
+// Validate is a helper method to define mock.On call
+func (_e *MockReaderWriter_Expecter) Validate() *MockReaderWriter_Validate_Call {
+	return &MockReaderWriter_Validate_Call{Call: _e.mock.On("Validate")}
+}
+
+func (_c *MockReaderWriter_Validate_Call) Run(run func()) *MockReaderWriter_Validate_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *MockReaderWriter_Validate_Call) Return(_a0 field.ErrorList) *MockReaderWriter_Validate_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *MockReaderWriter_Validate_Call) RunAndReturn(run func() field.ErrorList) *MockReaderWriter_Validate_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Write provides a mock function with given fields: ctx, path, ref, data, message
+func (_m *MockReaderWriter) Write(ctx context.Context, path string, ref string, data []byte, message string) error {
+	ret := _m.Called(ctx, path, ref, data, message)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Write")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string, []byte, string) error); ok {
+		r0 = rf(ctx, path, ref, data, message)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// MockReaderWriter_Write_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Write'
+type MockReaderWriter_Write_Call struct {
+	*mock.Call
+}
+
+// Write is a helper method to define mock.On call
+//   - ctx context.Context
+//   - path string
+//   - ref string
+//   - data []byte
+//   - message string
+func (_e *MockReaderWriter_Expecter) Write(ctx interface{}, path interface{}, ref interface{}, data interface{}, message interface{}) *MockReaderWriter_Write_Call {
+	return &MockReaderWriter_Write_Call{Call: _e.mock.On("Write", ctx, path, ref, data, message)}
+}
+
+func (_c *MockReaderWriter_Write_Call) Run(run func(ctx context.Context, path string, ref string, data []byte, message string)) *MockReaderWriter_Write_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].([]byte), args[4].(string))
+	})
+	return _c
+}
+
+func (_c *MockReaderWriter_Write_Call) Return(_a0 error) *MockReaderWriter_Write_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *MockReaderWriter_Write_Call) RunAndReturn(run func(context.Context, string, string, []byte, string) error) *MockReaderWriter_Write_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// NewMockReaderWriter creates a new instance of MockReaderWriter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockReaderWriter(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockReaderWriter {
+	mock := &MockReaderWriter{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/registry/apis/provisioning/repository/repository.go b/pkg/registry/apis/provisioning/repository/repository.go
index 5608366060b..6ac356fc6c5 100644
--- a/pkg/registry/apis/provisioning/repository/repository.go
+++ b/pkg/registry/apis/provisioning/repository/repository.go
@@ -119,17 +119,19 @@ type Writer interface {
 	Move(ctx context.Context, oldPath, newPath, ref, message string) error
 }
 
+//go:generate mockery --name ReaderWriter --structname MockReaderWriter --inpackage --filename reader_writer_mock.go --with-expecter
 type ReaderWriter interface {
 	Reader
 	Writer
 }
 
-// Hooks called after the repository has been created, updated or deleted
+//go:generate mockery --name RepositoryWithURLs --structname MockRepositoryWithURLs --inpackage --filename repository_with_urls_mock.go --with-expecter
 type RepositoryWithURLs interface {
 	Repository
 
 	// Get resource URLs for a file inside a repository
-	ResourceURLs(ctx context.Context, file *FileInfo) (*provisioning.ResourceURLs, error)
+	ResourceURLs(ctx context.Context, file *FileInfo) (*provisioning.RepositoryURLs, error)
+	RefURLs(ctx context.Context, ref string) (*provisioning.RepositoryURLs, error)
 }
 
 // Hooks called after the repository has been created, updated or deleted
diff --git a/pkg/registry/apis/provisioning/repository/repository_with_urls_mock.go b/pkg/registry/apis/provisioning/repository/repository_with_urls_mock.go
new file mode 100644
index 00000000000..c277cb32026
--- /dev/null
+++ b/pkg/registry/apis/provisioning/repository/repository_with_urls_mock.go
@@ -0,0 +1,309 @@
+// Code generated by mockery v2.52.4. DO NOT EDIT.
+
+package repository
+
+import (
+	context "context"
+
+	mock "github.com/stretchr/testify/mock"
+	field "k8s.io/apimachinery/pkg/util/validation/field"
+
+	v0alpha1 "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+)
+
+// MockRepositoryWithURLs is an autogenerated mock type for the RepositoryWithURLs type
+type MockRepositoryWithURLs struct {
+	mock.Mock
+}
+
+type MockRepositoryWithURLs_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *MockRepositoryWithURLs) EXPECT() *MockRepositoryWithURLs_Expecter {
+	return &MockRepositoryWithURLs_Expecter{mock: &_m.Mock}
+}
+
+// Config provides a mock function with no fields
+func (_m *MockRepositoryWithURLs) Config() *v0alpha1.Repository {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Config")
+	}
+
+	var r0 *v0alpha1.Repository
+	if rf, ok := ret.Get(0).(func() *v0alpha1.Repository); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*v0alpha1.Repository)
+		}
+	}
+
+	return r0
+}
+
+// MockRepositoryWithURLs_Config_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Config'
+type MockRepositoryWithURLs_Config_Call struct {
+	*mock.Call
+}
+
+// Config is a helper method to define mock.On call
+func (_e *MockRepositoryWithURLs_Expecter) Config() *MockRepositoryWithURLs_Config_Call {
+	return &MockRepositoryWithURLs_Config_Call{Call: _e.mock.On("Config")}
+}
+
+func (_c *MockRepositoryWithURLs_Config_Call) Run(run func()) *MockRepositoryWithURLs_Config_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *MockRepositoryWithURLs_Config_Call) Return(_a0 *v0alpha1.Repository) *MockRepositoryWithURLs_Config_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *MockRepositoryWithURLs_Config_Call) RunAndReturn(run func() *v0alpha1.Repository) *MockRepositoryWithURLs_Config_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// RefURLs provides a mock function with given fields: ctx, ref
+func (_m *MockRepositoryWithURLs) RefURLs(ctx context.Context, ref string) (*v0alpha1.RepositoryURLs, error) {
+	ret := _m.Called(ctx, ref)
+
+	if len(ret) == 0 {
+		panic("no return value specified for RefURLs")
+	}
+
+	var r0 *v0alpha1.RepositoryURLs
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string) (*v0alpha1.RepositoryURLs, error)); ok {
+		return rf(ctx, ref)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string) *v0alpha1.RepositoryURLs); ok {
+		r0 = rf(ctx, ref)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*v0alpha1.RepositoryURLs)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(ctx, ref)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// MockRepositoryWithURLs_RefURLs_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'RefURLs'
+type MockRepositoryWithURLs_RefURLs_Call struct {
+	*mock.Call
+}
+
+// RefURLs is a helper method to define mock.On call
+//   - ctx context.Context
+//   - ref string
+func (_e *MockRepositoryWithURLs_Expecter) RefURLs(ctx interface{}, ref interface{}) *MockRepositoryWithURLs_RefURLs_Call {
+	return &MockRepositoryWithURLs_RefURLs_Call{Call: _e.mock.On("RefURLs", ctx, ref)}
+}
+
+func (_c *MockRepositoryWithURLs_RefURLs_Call) Run(run func(ctx context.Context, ref string)) *MockRepositoryWithURLs_RefURLs_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string))
+	})
+	return _c
+}
+
+func (_c *MockRepositoryWithURLs_RefURLs_Call) Return(_a0 *v0alpha1.RepositoryURLs, _a1 error) *MockRepositoryWithURLs_RefURLs_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *MockRepositoryWithURLs_RefURLs_Call) RunAndReturn(run func(context.Context, string) (*v0alpha1.RepositoryURLs, error)) *MockRepositoryWithURLs_RefURLs_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// ResourceURLs provides a mock function with given fields: ctx, file
+func (_m *MockRepositoryWithURLs) ResourceURLs(ctx context.Context, file *FileInfo) (*v0alpha1.RepositoryURLs, error) {
+	ret := _m.Called(ctx, file)
+
+	if len(ret) == 0 {
+		panic("no return value specified for ResourceURLs")
+	}
+
+	var r0 *v0alpha1.RepositoryURLs
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *FileInfo) (*v0alpha1.RepositoryURLs, error)); ok {
+		return rf(ctx, file)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *FileInfo) *v0alpha1.RepositoryURLs); ok {
+		r0 = rf(ctx, file)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*v0alpha1.RepositoryURLs)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *FileInfo) error); ok {
+		r1 = rf(ctx, file)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// MockRepositoryWithURLs_ResourceURLs_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ResourceURLs'
+type MockRepositoryWithURLs_ResourceURLs_Call struct {
+	*mock.Call
+}
+
+// ResourceURLs is a helper method to define mock.On call
+//   - ctx context.Context
+//   - file *FileInfo
+func (_e *MockRepositoryWithURLs_Expecter) ResourceURLs(ctx interface{}, file interface{}) *MockRepositoryWithURLs_ResourceURLs_Call {
+	return &MockRepositoryWithURLs_ResourceURLs_Call{Call: _e.mock.On("ResourceURLs", ctx, file)}
+}
+
+func (_c *MockRepositoryWithURLs_ResourceURLs_Call) Run(run func(ctx context.Context, file *FileInfo)) *MockRepositoryWithURLs_ResourceURLs_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*FileInfo))
+	})
+	return _c
+}
+
+func (_c *MockRepositoryWithURLs_ResourceURLs_Call) Return(_a0 *v0alpha1.RepositoryURLs, _a1 error) *MockRepositoryWithURLs_ResourceURLs_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *MockRepositoryWithURLs_ResourceURLs_Call) RunAndReturn(run func(context.Context, *FileInfo) (*v0alpha1.RepositoryURLs, error)) *MockRepositoryWithURLs_ResourceURLs_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Test provides a mock function with given fields: ctx
+func (_m *MockRepositoryWithURLs) Test(ctx context.Context) (*v0alpha1.TestResults, error) {
+	ret := _m.Called(ctx)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Test")
+	}
+
+	var r0 *v0alpha1.TestResults
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context) (*v0alpha1.TestResults, error)); ok {
+		return rf(ctx)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) *v0alpha1.TestResults); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*v0alpha1.TestResults)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// MockRepositoryWithURLs_Test_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Test'
+type MockRepositoryWithURLs_Test_Call struct {
+	*mock.Call
+}
+
+// Test is a helper method to define mock.On call
+//   - ctx context.Context
+func (_e *MockRepositoryWithURLs_Expecter) Test(ctx interface{}) *MockRepositoryWithURLs_Test_Call {
+	return &MockRepositoryWithURLs_Test_Call{Call: _e.mock.On("Test", ctx)}
+}
+
+func (_c *MockRepositoryWithURLs_Test_Call) Run(run func(ctx context.Context)) *MockRepositoryWithURLs_Test_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context))
+	})
+	return _c
+}
+
+func (_c *MockRepositoryWithURLs_Test_Call) Return(_a0 *v0alpha1.TestResults, _a1 error) *MockRepositoryWithURLs_Test_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *MockRepositoryWithURLs_Test_Call) RunAndReturn(run func(context.Context) (*v0alpha1.TestResults, error)) *MockRepositoryWithURLs_Test_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Validate provides a mock function with no fields
+func (_m *MockRepositoryWithURLs) Validate() field.ErrorList {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Validate")
+	}
+
+	var r0 field.ErrorList
+	if rf, ok := ret.Get(0).(func() field.ErrorList); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(field.ErrorList)
+		}
+	}
+
+	return r0
+}
+
+// MockRepositoryWithURLs_Validate_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Validate'
+type MockRepositoryWithURLs_Validate_Call struct {
+	*mock.Call
+}
+
+// Validate is a helper method to define mock.On call
+func (_e *MockRepositoryWithURLs_Expecter) Validate() *MockRepositoryWithURLs_Validate_Call {
+	return &MockRepositoryWithURLs_Validate_Call{Call: _e.mock.On("Validate")}
+}
+
+func (_c *MockRepositoryWithURLs_Validate_Call) Run(run func()) *MockRepositoryWithURLs_Validate_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *MockRepositoryWithURLs_Validate_Call) Return(_a0 field.ErrorList) *MockRepositoryWithURLs_Validate_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *MockRepositoryWithURLs_Validate_Call) RunAndReturn(run func() field.ErrorList) *MockRepositoryWithURLs_Validate_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// NewMockRepositoryWithURLs creates a new instance of MockRepositoryWithURLs. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockRepositoryWithURLs(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MockRepositoryWithURLs {
+	mock := &MockRepositoryWithURLs{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/registry/apis/provisioning/resources/dualwriter.go b/pkg/registry/apis/provisioning/resources/dualwriter.go
index 78042c35a12..bfe4ca499a6 100644
--- a/pkg/registry/apis/provisioning/resources/dualwriter.go
+++ b/pkg/registry/apis/provisioning/resources/dualwriter.go
@@ -576,7 +576,7 @@ func (r *DualReadWriter) deleteFolder(ctx context.Context, opts DualWriteOptions
 	return folderDeleteResponse(ctx, opts.Path, opts.Ref, r.repo)
 }
 
-func getFolderURLs(ctx context.Context, path, ref string, repo repository.Repository) (*provisioning.ResourceURLs, error) {
+func getFolderURLs(ctx context.Context, path, ref string, repo repository.Repository) (*provisioning.RepositoryURLs, error) {
 	if urlRepo, ok := repo.(repository.RepositoryWithURLs); ok && ref != "" {
 		urls, err := urlRepo.ResourceURLs(ctx, &repository.FileInfo{Path: path, Ref: ref})
 		if err != nil {
diff --git a/pkg/registry/apis/provisioning/resources/parser.go b/pkg/registry/apis/provisioning/resources/parser.go
index 2b3f0c2deac..8c6c3b94587 100644
--- a/pkg/registry/apis/provisioning/resources/parser.go
+++ b/pkg/registry/apis/provisioning/resources/parser.go
@@ -87,7 +87,7 @@ type ParsedResource struct {
 	Repo provisioning.ResourceRepositoryInfo
 
 	// Resource URLs
-	URLs *provisioning.ResourceURLs
+	URLs *provisioning.RepositoryURLs
 
 	// Check for classic file types (dashboard.json, etc)
 	Classic provisioning.ClassicFileType
diff --git a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
index b9df6bea5ea..dbe70573707 100644
--- a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
@@ -3135,6 +3135,14 @@
             "items": {
               "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.JobResourceSummary"
             }
+          },
+          "url": {
+            "description": "URLs contains URLs for the reference branch or commit if applicable.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.RepositoryURLs"
+              }
+            ]
           }
         }
       },
@@ -3516,6 +3524,27 @@
           }
         }
       },
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.RepositoryURLs": {
+        "type": "object",
+        "properties": {
+          "compareURL": {
+            "description": "Compare this version to the target branch",
+            "type": "string"
+          },
+          "newPullRequestURL": {
+            "description": "A URL that will create a new pull request for this branch",
+            "type": "string"
+          },
+          "repositoryURL": {
+            "description": "A URL pointing to the repository this lives in",
+            "type": "string"
+          },
+          "sourceURL": {
+            "description": "A URL pointing to the file or ref in the repository",
+            "type": "string"
+          }
+        }
+      },
       "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceCount": {
         "type": "object",
         "required": [
@@ -3767,27 +3796,6 @@
           }
         }
       },
-      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceURLs": {
-        "type": "object",
-        "properties": {
-          "compareURL": {
-            "description": "Compare this version to the target branch",
-            "type": "string"
-          },
-          "newPullRequestURL": {
-            "description": "A URL that will create a new pull requeset for this branch",
-            "type": "string"
-          },
-          "repositoryURL": {
-            "description": "A URL pointing to the repository this lives in",
-            "type": "string"
-          },
-          "sourceURL": {
-            "description": "A URL pointing to the this file in the repository",
-            "type": "string"
-          }
-        }
-      },
       "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceWrapper": {
         "description": "This is a container type for any resource type",
         "type": "object",
@@ -3855,7 +3863,7 @@
             "description": "Typed links for this file (only supported by external systems, github etc)",
             "allOf": [
               {
-                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceURLs"
+                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.RepositoryURLs"
               }
             ]
           }
@@ -4666,6 +4674,9 @@
             "description": "Summary of processed actions",
             "type": "array",
             "items": {}
+          },
+          "url": {
+            "description": "URLs contains URLs for the reference branch or commit if applicable."
           }
         }
       },
@@ -4963,6 +4974,27 @@
           }
         }
       },
+      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RepositoryURLs": {
+        "type": "object",
+        "properties": {
+          "compareURL": {
+            "description": "Compare this version to the target branch",
+            "type": "string"
+          },
+          "newPullRequestURL": {
+            "description": "A URL that will create a new pull request for this branch",
+            "type": "string"
+          },
+          "repositoryURL": {
+            "description": "A URL pointing to the repository this lives in",
+            "type": "string"
+          },
+          "sourceURL": {
+            "description": "A URL pointing to the file or ref in the repository",
+            "type": "string"
+          }
+        }
+      },
       "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RepositoryView": {
         "type": "object",
         "required": [
@@ -5327,27 +5359,6 @@
           }
         }
       },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceURLs": {
-        "type": "object",
-        "properties": {
-          "compareURL": {
-            "description": "Compare this version to the target branch",
-            "type": "string"
-          },
-          "newPullRequestURL": {
-            "description": "A URL that will create a new pull requeset for this branch",
-            "type": "string"
-          },
-          "repositoryURL": {
-            "description": "A URL pointing to the repository this lives in",
-            "type": "string"
-          },
-          "sourceURL": {
-            "description": "A URL pointing to the this file in the repository",
-            "type": "string"
-          }
-        }
-      },
       "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceWrapper": {
         "description": "This is a container type for any resource type",
         "type": "object",

From 9b3b6fcdb23a693137df53744251af7dc3b4acc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Tue, 12 Aug 2025 14:40:03 +0200
Subject: [PATCH 105/243] Security: Fix actor spoofing vulnerability in
 Dependabot workflow (#109519)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace github.actor with github.event.pull_request.user.login to prevent
actor context spoofing in pull requests from forks. This ensures only
genuine Dependabot PRs can trigger the workspace update workflow.

Fixes zizmor security finding with Medium confidence level.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-authored-by: Claude <noreply@anthropic.com>
---
 .github/workflows/pr-dependabot-update-go-workspace.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-dependabot-update-go-workspace.yml b/.github/workflows/pr-dependabot-update-go-workspace.yml
index b0dbc68c266..5e9eb65c81e 100644
--- a/.github/workflows/pr-dependabot-update-go-workspace.yml
+++ b/.github/workflows/pr-dependabot-update-go-workspace.yml
@@ -17,7 +17,7 @@ permissions:
 jobs:
   update:
     runs-on: "ubuntu-latest"
-    if: ${{ github.actor == 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == github.repository }}
+    if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == github.repository }}
     continue-on-error: true
     steps:
     - name: Retrieve GitHub App secrets

From ce64b66798267c8942f7dc5897a4e124cf22af96 Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Tue, 12 Aug 2025 08:57:42 -0400
Subject: [PATCH 106/243] BulkDeleteProvisionedResource: Use resource names to
 perform bulk deletion job (#109281)

* BulkMoveProvisionedResource and BulkDeleteProvisionedResource: use resource name for BE job
---
 .../BulkActionFailureBanner.test.tsx          | 151 ---------
 .../BulkActions/BulkActionFailureBanner.tsx   |  29 --
 .../BulkActions/BulkActionPostSubmitStep.tsx  |  54 ----
 .../BulkActions/BulkActionProgress.test.tsx   |  69 ----
 .../BulkActions/BulkActionProgress.tsx        |  40 ---
 .../BulkDeleteProvisionedResource.test.tsx    | 298 ++++++++++--------
 .../BulkDeleteProvisionedResource.tsx         | 173 +++-------
 .../BulkMoveProvisionedResource.tsx           | 240 ++++----------
 .../BulkActions/useBulkActionJob.ts           |  70 ++++
 .../BulkActions/useBulkActionRequest.ts       |  39 ---
 .../components/BulkActions/utils.ts           |  11 -
 .../browse-dashboards/components/utils.ts     |  38 +--
 .../provisioning/Job/FinishedJobStatus.tsx    |  19 +-
 .../features/provisioning/Job/JobContent.tsx  |  21 +-
 .../features/provisioning/Job/JobStatus.tsx   |  20 +-
 .../Repository/RepositoryLink.tsx             |  42 ++-
 .../provisioning/Wizard/SynchronizeStep.tsx   |   2 +-
 public/locales/en-US/grafana.json             |  27 +-
 18 files changed, 415 insertions(+), 928 deletions(-)
 delete mode 100644 public/app/features/browse-dashboards/components/BulkActions/BulkActionFailureBanner.test.tsx
 delete mode 100644 public/app/features/browse-dashboards/components/BulkActions/BulkActionFailureBanner.tsx
 delete mode 100644 public/app/features/browse-dashboards/components/BulkActions/BulkActionPostSubmitStep.tsx
 delete mode 100644 public/app/features/browse-dashboards/components/BulkActions/BulkActionProgress.test.tsx
 delete mode 100644 public/app/features/browse-dashboards/components/BulkActions/BulkActionProgress.tsx
 create mode 100644 public/app/features/browse-dashboards/components/BulkActions/useBulkActionJob.ts
 delete mode 100644 public/app/features/browse-dashboards/components/BulkActions/useBulkActionRequest.ts

diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkActionFailureBanner.test.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkActionFailureBanner.test.tsx
deleted file mode 100644
index 9d91c74fbae..00000000000
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkActionFailureBanner.test.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-import { BulkActionFailureBanner, MoveResultFailed } from './BulkActionFailureBanner';
-
-const setup = (resultOverrides?: Array<Partial<MoveResultFailed>>, onDismissOverride?: () => void) => {
-  const defaultFailedItems: MoveResultFailed[] = [
-    {
-      status: 'failed',
-      title: 'Dashboard 1',
-      errorMessage: 'Permission denied',
-    },
-    {
-      status: 'failed',
-      title: 'Dashboard 2',
-      errorMessage: 'Network error',
-    },
-  ];
-
-  const result =
-    resultOverrides !== undefined
-      ? resultOverrides.map((override) => ({ status: 'failed' as const, title: 'Default Title', ...override }))
-      : defaultFailedItems;
-
-  const onDismiss = onDismissOverride || jest.fn();
-
-  const props = {
-    result,
-    onDismiss,
-  };
-
-  return {
-    user: userEvent.setup(),
-    ...render(<BulkActionFailureBanner {...props} />),
-    props,
-  };
-};
-
-describe('BulkActionFailureBanner', () => {
-  it('should display error alert with correct item count', () => {
-    const testData = [{ title: 'Single Item', errorMessage: 'Single error' }];
-    setup(testData);
-
-    // Test that an alert is rendered
-    const alert = screen.getByRole('alert');
-    expect(alert).toBeInTheDocument();
-
-    // Test structure: should have same number of list items as input data
-    const listItems = screen.getAllByRole('listitem');
-    expect(listItems).toHaveLength(testData.length);
-  });
-
-  it('should render correct number of failed items with proper structure', () => {
-    const testData = [
-      { title: 'Failed Dashboard A', errorMessage: 'Access denied' },
-      { title: 'Failed Dashboard B', errorMessage: 'Validation failed' },
-    ];
-    setup(testData);
-
-    const alert = screen.getByRole('alert');
-    expect(alert).toBeInTheDocument();
-
-    // Test structure: number of list items matches input
-    const listItems = screen.getAllByRole('listitem');
-    expect(listItems).toHaveLength(testData.length);
-
-    // Test that each item has the expected structure (title + error message)
-    listItems.forEach((item, index) => {
-      const title = testData[index].title;
-      const errorMessage = testData[index].errorMessage;
-
-      if (title) {
-        expect(item).toHaveTextContent(title);
-      }
-      if (errorMessage) {
-        expect(item).toHaveTextContent(errorMessage);
-      }
-    });
-  });
-
-  it('should handle mixed scenarios', () => {
-    const testData = [
-      { title: 'Item without error' },
-      { title: 'Item with empty error', errorMessage: '' },
-      { title: 'Another item with error', errorMessage: 'Another error' },
-    ];
-    setup(testData);
-
-    const alert = screen.getByRole('alert');
-    expect(alert).toBeInTheDocument();
-
-    const listItems = screen.getAllByRole('listitem');
-    expect(listItems).toHaveLength(testData.length);
-
-    // Test that items with error messages contain both title and error
-    // Items without errors should only contain title
-    testData.forEach((data, index) => {
-      const listItem = listItems[index];
-
-      // All items should have their title
-      if (data.title) {
-        expect(listItem).toHaveTextContent(data.title);
-      }
-
-      // Only items with non-empty error messages should show the error
-      if (data.errorMessage && data.errorMessage.trim() !== '') {
-        expect(listItem).toHaveTextContent(data.errorMessage);
-      }
-    });
-  });
-
-  it('should maintain list structure', () => {
-    const testData = [
-      { title: 'Item 1', errorMessage: 'Error 1' },
-      { title: 'Item 2', errorMessage: 'Error 2' },
-    ];
-    setup(testData);
-
-    // Test semantic structure
-    const list = screen.getByRole('list');
-    expect(list).toBeInTheDocument();
-
-    const listItems = screen.getAllByRole('listitem');
-    expect(listItems).toHaveLength(testData.length);
-  });
-
-  it('should handle items without error messages', () => {
-    const testData = [{ title: 'Just Title Item' }];
-    setup(testData);
-
-    const listItems = screen.getAllByRole('listitem');
-    expect(listItems).toHaveLength(1);
-
-    const item = listItems[0];
-    expect(item).toHaveTextContent(testData[0].title!);
-    // Should not contain colon separator when no error message
-    expect(item.textContent).not.toMatch(/:\s*.+$/);
-  });
-
-  it('should render dismissible alert', () => {
-    const onDismiss = jest.fn();
-    setup([], onDismiss);
-
-    const alert = screen.getByRole('alert');
-    expect(alert).toBeInTheDocument();
-
-    // Alert should have close button (dismissible)
-    const closeButton = screen.getByRole('button', { name: /close/i });
-    expect(closeButton).toBeInTheDocument();
-  });
-});
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkActionFailureBanner.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkActionFailureBanner.tsx
deleted file mode 100644
index 332e0695144..00000000000
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkActionFailureBanner.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { t } from '@grafana/i18n';
-import { Alert } from '@grafana/ui';
-
-export type MoveResultFailed = {
-  status?: 'failed';
-  title?: string;
-  errorMessage?: string;
-};
-
-export function BulkActionFailureBanner({ result, onDismiss }: { result: MoveResultFailed[]; onDismiss: () => void }) {
-  return (
-    <Alert
-      severity="error"
-      title={t('browse-dashboards.bulk-action-resources-form.failed-alert', '{{count}} items failed', {
-        count: result.length,
-      })}
-      onRemove={onDismiss}
-    >
-      <ul>
-        {result.map((item) => (
-          <li key={item.title}>
-            <strong>{item.title}</strong>
-            {item.errorMessage && `: ${item.errorMessage}`}
-          </li>
-        ))}
-      </ul>
-    </Alert>
-  );
-}
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkActionPostSubmitStep.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkActionPostSubmitStep.tsx
deleted file mode 100644
index c3a03aac1c9..00000000000
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkActionPostSubmitStep.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { t, Trans } from '@grafana/i18n';
-import { Alert, Button, Stack } from '@grafana/ui';
-
-import { BulkActionFailureBanner, MoveResultFailed } from './BulkActionFailureBanner';
-import { BulkActionProgress, ProgressState } from './BulkActionProgress';
-import { MoveResultSuccessState } from './utils';
-
-interface Props {
-  action: 'move' | 'delete';
-  progress: ProgressState | null;
-  successState: MoveResultSuccessState;
-  failureResults: MoveResultFailed[] | undefined;
-  handleSuccess: () => void;
-  setFailureResults: (results: MoveResultFailed[] | undefined) => void;
-}
-
-export function BulkActionPostSubmitStep({
-  action,
-  progress,
-  successState,
-  failureResults,
-  handleSuccess,
-  setFailureResults,
-}: Props) {
-  if (progress) {
-    return <BulkActionProgress progress={progress} action={action} />;
-  }
-
-  if (successState.allSuccess) {
-    return (
-      <>
-        <Alert severity="success" title={t('browse-dashboards.bulk-action-resources-form.progress-title', 'Success')}>
-          {action === 'move'
-            ? t('browse-dashboards.bulk-action-resources-form.all-moved', 'All resources have been moved successfully')
-            : t(
-                'browse-dashboards.bulk-action-resources-form.all-deleted',
-                'All resources have been deleted successfully'
-              )}
-        </Alert>
-        <Stack gap={2}>
-          <Button onClick={() => handleSuccess()}>
-            <Trans i18nKey="browse-dashboards.bulk-action-resources-form.button-done">Done</Trans>
-          </Button>
-        </Stack>
-      </>
-    );
-  }
-
-  if (failureResults) {
-    return <BulkActionFailureBanner result={failureResults} onDismiss={() => setFailureResults(undefined)} />;
-  }
-
-  return null;
-}
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkActionProgress.test.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkActionProgress.test.tsx
deleted file mode 100644
index 47a6fabfb6a..00000000000
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkActionProgress.test.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { render, screen } from '@testing-library/react';
-
-import { BulkActionProgress, ProgressState } from './BulkActionProgress';
-
-const setup = (progressOverrides: Partial<ProgressState> = {}, action: 'delete' | 'move' = 'delete') => {
-  const defaultProgress: ProgressState = {
-    current: 5,
-    total: 10,
-    item: 'Test Dashboard',
-    ...progressOverrides,
-  };
-
-  const props = {
-    progress: defaultProgress,
-  };
-
-  return {
-    ...render(<BulkActionProgress {...props} action={action} />),
-    props,
-  };
-};
-
-describe('BulkActionProgress', () => {
-  it('should render progress text with current and total values', () => {
-    setup({ current: 3, total: 8 });
-
-    expect(screen.getByText(/Progress: 3 of 8/)).toBeInTheDocument();
-  });
-
-  it('should render current item being deleted', () => {
-    setup({ item: 'My Test Dashboard' });
-
-    expect(screen.getByText(/Deleting:/)).toBeInTheDocument();
-    expect(screen.getByText(/My Test Dashboard/)).toBeInTheDocument();
-  });
-
-  it('should handle edge case with total of 1', () => {
-    setup({ current: 1, total: 1 });
-
-    expect(screen.getByText(/Progress: 1 of 1/)).toBeInTheDocument();
-  });
-
-  it('should handle edge case with zero current progress', () => {
-    setup({ current: 0, total: 5 });
-
-    expect(screen.getByText(/Progress: 0 of 5/)).toBeInTheDocument();
-  });
-
-  it('should render all required elements together', () => {
-    setup({ current: 7, total: 15, item: 'Complex Dashboard Name' });
-
-    // Progress text
-    expect(screen.getByText(/Progress: 7 of 15/)).toBeInTheDocument();
-
-    // Spinner icon
-    expect(screen.getByTestId('Spinner')).toBeInTheDocument();
-
-    // Current item text
-    expect(screen.getByText(/Deleting:/)).toBeInTheDocument();
-    expect(screen.getByText(/Complex Dashboard Name/)).toBeInTheDocument();
-  });
-
-  it('should render moving action text when action is move', () => {
-    setup({ current: 2, total: 4, item: 'Moving Dashboard' }, 'move');
-
-    expect(screen.getByText(/Moving:/)).toBeInTheDocument();
-    expect(screen.getByText(/Moving Dashboard/)).toBeInTheDocument();
-  });
-});
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkActionProgress.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkActionProgress.tsx
deleted file mode 100644
index f022554d52a..00000000000
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkActionProgress.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Trans } from '@grafana/i18n';
-import { Box, Text, Stack, Spinner } from '@grafana/ui';
-import ProgressBar from 'app/features/provisioning/Shared/ProgressBar';
-
-export type ProgressState = {
-  current: number;
-  total: number;
-  item: string;
-};
-
-interface Props {
-  progress: ProgressState;
-  action: 'move' | 'delete';
-}
-
-export function BulkActionProgress({ progress, action }: Props) {
-  const progressPercentage = Math.round((progress.current / progress.total) * 100);
-
-  return (
-    <Box>
-      <Stack direction="row" alignItems="center">
-        <Text>
-          <Trans i18nKey="browse-dashboards.bulk-move-resources-form.progress">
-            Progress: {{ current: progress.current }} of {{ total: progress.total }}
-          </Trans>
-        </Text>
-        <Spinner size="sm" />
-      </Stack>
-      <ProgressBar progress={progressPercentage} topBottomSpacing={1} />
-      <Text variant="bodySmall" color="secondary">
-        {action === 'move' ? (
-          <Trans i18nKey="browse-dashboards.bulk-move-resources-form.moving">Moving</Trans>
-        ) : (
-          <Trans i18nKey="browse-dashboards.bulk-move-resources-form.deleting">Deleting</Trans>
-        )}
-        : {progress.item}
-      </Text>
-    </Box>
-  );
-}
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
index b4fc6013446..34b61e59041 100644
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
+++ b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
@@ -1,45 +1,10 @@
 import { screen, waitFor } from '@testing-library/react';
-import { HttpResponse, http } from 'msw';
 import { render } from 'test/test-utils';
 
-import { setBackendSrv } from '@grafana/runtime';
-import server, { setupMockServer } from '@grafana/test-utils/server';
-import { RepositoryView } from 'app/api/clients/provisioning/v0alpha1';
-import { backendSrv } from 'app/core/services/backend_srv';
+import { Job, RepositoryView } from 'app/api/clients/provisioning/v0alpha1';
 
 import { BulkDeleteProvisionedResource } from './BulkDeleteProvisionedResource';
-
-// Set up backendSrv as recommended in the PR comment
-setBackendSrv(backendSrv);
-setupMockServer();
-
-jest.mock('../utils', () => ({
-  collectSelectedItems: jest.fn().mockReturnValue([
-    { uid: 'folder-1', isFolder: true, displayName: 'Test Folder' },
-    { uid: 'dashboard-1', isFolder: false, displayName: 'Test Dashboard' },
-  ]),
-  fetchProvisionedDashboardPath: jest.fn().mockResolvedValue('/test/dashboard.json'),
-}));
-
-jest.mock('../../state/hooks', () => ({
-  useChildrenByParentUIDState: jest.fn().mockReturnValue({}),
-  rootItemsSelector: jest.fn().mockReturnValue({
-    items: [
-      { uid: 'folder-1', title: 'Test Folder', kind: 'folder' },
-      { uid: 'dashboard-1', title: 'Test Dashboard', kind: 'dashboard' },
-    ],
-  }),
-}));
-
-jest.mock('../../state/utils', () => ({
-  findItem: jest.fn().mockImplementation((rootItems: unknown[], childrenByUID: unknown, uid: string) => {
-    const mockRootItems = [
-      { uid: 'folder-1', title: 'Test Folder', kind: 'folder' },
-      { uid: 'dashboard-1', title: 'Test Dashboard', kind: 'dashboard' },
-    ];
-    return mockRootItems.find((item) => item.uid === uid);
-  }),
-}));
+import { ResponseType } from './useBulkActionJob';
 
 jest.mock('../BrowseActions/DescendantCount', () => ({
   DescendantCount: jest.fn(({ selectedItems }) => (
@@ -54,82 +19,98 @@ jest.mock('app/features/provisioning/hooks/useGetResourceRepositoryView', () =>
   useGetResourceRepositoryView: jest.fn(),
 }));
 
-describe('BulkDeleteProvisionedResource', () => {
+jest.mock('./useBulkActionJob', () => ({
+  useBulkActionJob: jest.fn(),
+}));
+
+jest.mock('app/features/provisioning/Job/JobStatus', () => ({
+  JobStatus: jest.fn(({ watch, jobType }) => (
+    <div data-testid="job-status">
+      Job Status - {jobType} - {watch?.status?.state || 'pending'}
+    </div>
+  )),
+}));
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getAppEvents: jest.fn(() => ({
+    publish: jest.fn(),
+  })),
+}));
+
+const mockUseGetResourceRepositoryView = jest.mocked(
+  require('app/features/provisioning/hooks/useGetResourceRepositoryView').useGetResourceRepositoryView
+);
+const mockUseBulkActionJob = jest.mocked(require('./useBulkActionJob').useBulkActionJob);
+const mockGetAppEvents = jest.mocked(require('@grafana/runtime').getAppEvents);
+
+function setup(
+  repository: RepositoryView | null,
+  mockJobResult: ResponseType = {
+    success: true,
+    job: { metadata: { name: 'test-job' }, status: { state: 'success' } },
+  },
+  isLoading = false
+) {
+  const selectedItems = {
+    folder: { 'folder-1': true },
+    dashboard: { 'dashboard-1': true },
+  };
+
   const defaultRepository: RepositoryView = {
-    name: 'test-folder', // This must match the folderUid passed to the component
+    name: 'test-folder',
     type: 'github',
     title: 'Test Repository',
     target: 'folder',
     workflows: ['branch', 'write'],
   };
 
-  const selectedItems = {
-    folder: { 'folder-1': true },
-    dashboard: { 'dashboard-1': true },
-  };
+  const onDismiss = jest.fn();
+  const mockCreateBulkJob = jest.fn().mockResolvedValue(mockJobResult);
 
-  beforeEach(() => {
-    server.use(
-      http.delete('/apis/provisioning.grafana.app/v0alpha1/namespaces/default/repositories/:name/files/*', () => {
-        return HttpResponse.json({
-          urls: { repositoryURL: 'https://github.com/test/repo' },
-        });
-      })
-    );
-    jest.clearAllMocks();
-
-    const { useGetResourceRepositoryView } = jest.requireMock(
-      'app/features/provisioning/hooks/useGetResourceRepositoryView'
-    );
-    useGetResourceRepositoryView.mockReturnValue({
-      repository: defaultRepository,
-      folder: {
-        metadata: {
-          annotations: {
-            'grafana.app/file-path': '/test/folder',
+  mockUseGetResourceRepositoryView.mockReturnValue({
+    repository: repository ?? defaultRepository,
+    folder: repository
+      ? {
+          metadata: {
+            annotations: {
+              'grafana.app/file-path': '/test/folder',
+            },
           },
-        },
-      },
-      isInstanceManaged: false,
-    });
+        }
+      : null,
+    isInstanceManaged: false,
+  });
+
+  mockUseBulkActionJob.mockReturnValue({
+    createBulkJob: mockCreateBulkJob,
+    isLoading,
+  });
+
+  const renderResult = render(
+    <BulkDeleteProvisionedResource folderUid="test-folder" selectedItems={selectedItems} onDismiss={onDismiss} />
+  );
+
+  return {
+    onDismiss,
+    mockCreateBulkJob,
+    selectedItems,
+    defaultRepository,
+    ...renderResult,
+  };
+}
+
+describe('BulkDeleteProvisionedResource', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
   });
 
   afterEach(() => {
     jest.restoreAllMocks();
   });
 
-  function setup(repository: RepositoryView | null = defaultRepository) {
-    const onDismiss = jest.fn();
-
-    const { useGetResourceRepositoryView } = jest.requireMock(
-      'app/features/provisioning/hooks/useGetResourceRepositoryView'
-    );
-    useGetResourceRepositoryView.mockReturnValue({
-      repository,
-      folder: repository
-        ? {
-            metadata: {
-              annotations: {
-                'grafana.app/file-path': '/test/folder',
-              },
-            },
-          }
-        : null,
-      isInstanceManaged: false,
-    });
-
-    const renderResult = render(
-      <BulkDeleteProvisionedResource folderUid="test-folder" selectedItems={selectedItems} onDismiss={onDismiss} />
-    );
-
-    return {
-      onDismiss,
-      ...renderResult,
-    };
-  }
-
   it('renders the delete warning and form', async () => {
-    setup();
+    setup(null);
 
     expect(await screen.findByText(/This will delete selected folders and their descendants/)).toBeInTheDocument();
     expect(screen.getByRole('button', { name: /Delete/i })).toBeInTheDocument();
@@ -137,7 +118,7 @@ describe('BulkDeleteProvisionedResource', () => {
   });
 
   it('calls onDismiss when Cancel is clicked', async () => {
-    const { onDismiss, user } = setup();
+    const { onDismiss, user } = setup(null);
 
     await user.click(screen.getByRole('button', { name: /Cancel/i }));
 
@@ -145,57 +126,112 @@ describe('BulkDeleteProvisionedResource', () => {
   });
 
   it('handles successful deletion', async () => {
-    const { user } = setup();
+    const { user, mockCreateBulkJob, defaultRepository } = setup(null);
 
     await user.click(screen.getByRole('button', { name: /Delete/i }));
 
-    expect(await screen.findByText(/All resources have been deleted successfully/)).toBeInTheDocument();
-  });
-
-  it('handles deletion errors', async () => {
-    const { user } = setup();
-
-    // Mock API to return error for this test
-    server.use(
-      http.delete('/apis/provisioning.grafana.app/v0alpha1/namespaces/default/repositories/:name/files/*', () => {
-        return HttpResponse.json({ message: 'Network error' }, { status: 500 });
+    expect(mockCreateBulkJob).toHaveBeenCalledWith(
+      defaultRepository,
+      expect.objectContaining({
+        action: 'delete',
+        delete: expect.objectContaining({
+          resources: expect.arrayContaining([
+            expect.objectContaining({ name: 'folder-1', kind: 'Folder' }),
+            expect.objectContaining({ name: 'dashboard-1', kind: 'Dashboard' }),
+          ]),
+        }),
       })
     );
 
+    // Should show JobStatus component
+    expect(await screen.findByTestId('job-status')).toBeInTheDocument();
+    expect(screen.getByText(/Job Status - delete - success/)).toBeInTheDocument();
+  });
+
+  it('handles deletion errors', async () => {
+    const mockPublish = jest.fn();
+    const { user } = setup(null, { success: false, error: 'Network error' });
+
+    mockGetAppEvents.mockReturnValue({
+      publish: mockPublish,
+    });
+
     await user.click(screen.getByRole('button', { name: /Delete/i }));
 
-    await waitFor(() => {
-      // Should show error alert with failed items
-      expect(screen.getByRole('alert')).toBeInTheDocument();
-      expect(screen.getByLabelText(/items failed/)).toBeInTheDocument();
+    // Should remain on form (not show JobStatus) when there's an error
+    expect(screen.queryByTestId('job-status')).not.toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /Delete/i })).toBeInTheDocument();
 
-      // Should have error list items for both folder and dashboard
-      const errorItems = screen.getAllByRole('listitem');
-      expect(errorItems).toHaveLength(2); // One for folder, one for dashboard
+    expect(mockPublish).toHaveBeenCalledWith({
+      type: 'alert-error',
+      payload: ['Error deleting resources', 'Network error'],
     });
   });
 
   it('shows loading state during deletion', async () => {
-    const { user } = setup();
-
-    // Mock slow API response
-    server.use(
-      http.delete('/apis/provisioning.grafana.app/v0alpha1/namespaces/default/repositories/:name/files/*', async () => {
-        await new Promise((resolve) => setTimeout(resolve, 100));
-        return HttpResponse.json({
-          urls: { repositoryURL: 'https://github.com/test/repo' },
-        });
-      })
-    );
+    const workingJob: Job = { metadata: { name: 'test-job' }, status: { state: 'working' } };
+    const { user } = setup(null, { success: true, job: workingJob });
 
     await user.click(screen.getByRole('button', { name: /Delete/i }));
 
-    expect(screen.getByText(/Deleting.../)).toBeInTheDocument();
+    // After click, should show JobStatus
+    await waitFor(() => {
+      expect(screen.getByTestId('job-status')).toBeInTheDocument();
+    });
+
+    expect(screen.getByText(/Job Status - delete - working/)).toBeInTheDocument();
   });
 
-  it('returns null when repository is not available', () => {
-    setup(null);
+  it('Should not show buttons when job is in working state', async () => {
+    const workingJob: Job = { metadata: { name: 'test-job' }, status: { state: 'working' } };
+    const { user } = setup(null, { success: true, job: workingJob });
 
-    expect(screen.getByLabelText('Repository not found')).toBeInTheDocument();
+    await user.click(screen.getByRole('button', { name: /Delete/i }));
+
+    // Should show JobStatus after submission
+    expect(await screen.findByTestId('job-status')).toBeInTheDocument();
+
+    // Done button should not be disabled
+    const deleteButton = screen.queryByRole('button', { name: /Delete/i });
+    expect(deleteButton).not.toBeInTheDocument();
+  });
+
+  it('calls createBulkJob with branch workflow parameters when branch is selected', async () => {
+    const { user, mockCreateBulkJob, defaultRepository } = setup(null);
+
+    await user.click(screen.getByRole('button', { name: /Delete/i }));
+
+    expect(mockCreateBulkJob).toHaveBeenCalledWith(
+      defaultRepository,
+      expect.objectContaining({
+        action: 'delete',
+        delete: expect.objectContaining({
+          ref: expect.stringContaining('bulk-delete/'),
+        }),
+      })
+    );
+  });
+
+  it('calls createBulkJob with write workflow parameters when write is selected', async () => {
+    const { user, mockCreateBulkJob, defaultRepository } = setup(null);
+
+    // Switch to write workflow
+    const writeRadio = screen.getByRole('radio', { name: /Save/i });
+    await user.click(writeRadio);
+
+    await user.click(screen.getByRole('button', { name: /Delete/i }));
+
+    expect(mockCreateBulkJob).toHaveBeenCalledWith(
+      defaultRepository,
+      expect.objectContaining({
+        action: 'delete',
+        delete: expect.objectContaining({
+          resources: expect.arrayContaining([
+            expect.objectContaining({ name: 'folder-1', kind: 'Folder' }),
+            expect.objectContaining({ name: 'dashboard-1', kind: 'Dashboard' }),
+          ]),
+        }),
+      })
+    );
   });
 });
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx
index 8bcb95e6a2d..786b31d6c8a 100644
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx
+++ b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx
@@ -1,155 +1,76 @@
 import { useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
+import { AppEvents } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
+import { getAppEvents } from '@grafana/runtime';
 import { Box, Button, Stack } from '@grafana/ui';
-import {
-  DeleteRepositoryFilesWithPathApiArg,
-  DeleteRepositoryFilesWithPathApiResponse,
-  RepositoryView,
-  useDeleteRepositoryFilesWithPathMutation,
-} from 'app/api/clients/provisioning/v0alpha1';
-import { extractErrorMessage } from 'app/api/utils';
-import { AnnoKeySourcePath } from 'app/features/apiserver/types';
+import { Job, RepositoryView } from 'app/api/clients/provisioning/v0alpha1';
 import { ResourceEditFormSharedFields } from 'app/features/dashboard-scene/components/Provisioned/ResourceEditFormSharedFields';
 import { getDefaultWorkflow, getWorkflowOptions } from 'app/features/dashboard-scene/saving/provisioned/defaults';
 import { generateTimestamp } from 'app/features/dashboard-scene/saving/provisioned/utils/timestamp';
+import { JobStatus } from 'app/features/provisioning/Job/JobStatus';
 import { useGetResourceRepositoryView } from 'app/features/provisioning/hooks/useGetResourceRepositoryView';
-import { useSelector } from 'app/types/store';
 
-import { useChildrenByParentUIDState, rootItemsSelector } from '../../state/hooks';
-import { findItem } from '../../state/utils';
 import { DescendantCount } from '../BrowseActions/DescendantCount';
-import { collectSelectedItems, fetchProvisionedDashboardPath } from '../utils';
+import { collectSelectedItems } from '../utils';
 
-import { MoveResultFailed } from './BulkActionFailureBanner';
-import { BulkActionPostSubmitStep } from './BulkActionPostSubmitStep';
-import { ProgressState } from './BulkActionProgress';
 import { RepoInvalidStateBanner } from './RepoInvalidStateBanner';
-import { useBulkActionRequest } from './useBulkActionRequest';
+import { DeleteJobSpec, useBulkActionJob } from './useBulkActionJob';
 import { useFolderNameFromSelection } from './useFolderNameFromSelection';
-import {
-  BulkActionFormData,
-  BulkActionProvisionResourceProps,
-  BulkSuccessResponse,
-  MoveResultSuccessState,
-} from './utils';
+import { BulkActionFormData, BulkActionProvisionResourceProps } from './utils';
 
 interface FormProps extends BulkActionProvisionResourceProps {
   initialValues: BulkActionFormData;
   repository: RepositoryView;
   workflowOptions: Array<{ label: string; value: string }>;
-  folderPath?: string;
 }
 
-function FormContent({ initialValues, selectedItems, repository, workflowOptions, folderPath, onDismiss }: FormProps) {
+function FormContent({ initialValues, selectedItems, repository, workflowOptions, onDismiss }: FormProps) {
   // States
-  const [progress, setProgress] = useState<ProgressState | null>(null);
-  const [failureResults, setFailureResults] = useState<MoveResultFailed[] | undefined>();
-  const [successState, setSuccessState] = useState<MoveResultSuccessState>({
-    allSuccess: false,
-    repoUrl: '',
-  });
+  const [job, setJob] = useState<Job>();
   const [hasSubmitted, setHasSubmitted] = useState(false);
 
   // Hooks
-  const [deleteRepoFile, request] = useDeleteRepositoryFilesWithPathMutation();
+  const { createBulkJob, isLoading: isCreatingJob } = useBulkActionJob();
   const methods = useForm<BulkActionFormData>({ defaultValues: initialValues });
-  const childrenByParentUID = useChildrenByParentUIDState();
-  const rootItems = useSelector(rootItemsSelector);
   const { handleSubmit, watch } = methods;
   const workflow = watch('workflow');
-  const { handleSuccess } = useBulkActionRequest({ workflow, repository, successState, onDismiss });
-
-  const getResourcePath = async (uid: string, isFolder: boolean): Promise<string | undefined> => {
-    const item = findItem(rootItems?.items || [], childrenByParentUID, uid);
-    if (!item) {
-      return undefined;
-    }
-    return isFolder ? `${folderPath}/${item.title}/` : fetchProvisionedDashboardPath(uid);
-  };
 
   const handleSubmitForm = async (data: BulkActionFormData) => {
-    setFailureResults(undefined);
     setHasSubmitted(true);
 
-    const targets = collectSelectedItems(selectedItems, childrenByParentUID, rootItems?.items || []);
+    const resources = collectSelectedItems(selectedItems);
 
-    if (targets.length > 0) {
-      setProgress({
-        current: 0,
-        total: targets.length,
-        item: targets[0].displayName || 'Unknown',
+    // Create the delete job spec
+    const jobSpec: DeleteJobSpec = {
+      action: 'delete',
+      delete: {
+        ref: data.workflow === 'write' ? undefined : data.ref,
+        resources,
+      },
+    };
+
+    const result = await createBulkJob(repository, jobSpec);
+
+    if (result.success && result.job) {
+      setJob(result.job); // Store the job for tracking
+    } else if (!result.success && result.error) {
+      // Handle error case - show error alert
+      getAppEvents().publish({
+        type: AppEvents.alertError.name,
+        payload: [
+          t('browse-dashboards.bulk-delete-resources-form.error-deleting-resources', 'Error deleting resources'),
+          result.error,
+        ],
       });
-    }
-
-    const successes: BulkSuccessResponse<
-      DeleteRepositoryFilesWithPathApiArg,
-      DeleteRepositoryFilesWithPathApiResponse
-    > = [];
-    const failures: MoveResultFailed[] = [];
-
-    // Iterate through each selected item and delete it
-    // We want sequential processing to avoid overwhelming the API
-    for (let i = 0; i < targets.length; i++) {
-      const { uid, isFolder, displayName } = targets[i];
-      setProgress({
-        current: i,
-        total: targets.length,
-        item: displayName,
-      });
-
-      try {
-        // get path in repository
-        const path = await getResourcePath(uid, isFolder);
-        if (!path) {
-          failures.push({
-            status: 'failed',
-            title: `${isFolder ? 'Folder' : 'Dashboard'}: ${displayName}`,
-            errorMessage: t('browse-dashboards.bulk-delete-resources-form.error-path-not-found', 'Path not found'),
-          });
-          continue;
-        }
-
-        // build params
-        const deleteParams: DeleteRepositoryFilesWithPathApiArg = {
-          name: repository.name,
-          path,
-          ref: workflow === 'write' ? undefined : data.ref,
-          message: data.comment || `Delete resource ${path}`,
-        };
-
-        // perform delete operation
-        const response = await deleteRepoFile(deleteParams).unwrap();
-        successes.push({ index: i, item: deleteParams, data: response });
-      } catch (error: unknown) {
-        failures.push({
-          status: 'failed',
-          title: `${isFolder ? 'Folder' : 'Dashboard'}: ${displayName}`,
-          errorMessage: extractErrorMessage(error),
-        });
-      }
-
-      setProgress({
-        current: i + 1,
-        total: targets.length,
-        item: targets[i + 1]?.displayName,
-      });
-    }
-
-    setProgress(null);
-
-    if (successes.length > 0 && failures.length === 0) {
-      // handleSuccess(successes);
-      setSuccessState({
-        allSuccess: true,
-        repoUrl: successes[0].data.urls?.newPullRequestURL,
-      });
-    } else if (failures.length > 0) {
-      setFailureResults(failures);
+      setHasSubmitted(false); // Reset submit state so user can try again
     }
   };
 
+  const disableBtn =
+    isCreatingJob || job?.status?.state === 'working' || job?.status?.state === 'pending' || hasSubmitted;
+
   return (
     <FormProvider {...methods}>
       <form onSubmit={handleSubmit(handleSubmitForm)}>
@@ -161,15 +82,8 @@ function FormContent({ initialValues, selectedItems, repository, workflowOptions
             <DescendantCount selectedItems={{ ...selectedItems, panel: {}, $all: false }} />
           </Box>
 
-          {hasSubmitted ? (
-            <BulkActionPostSubmitStep
-              action="delete"
-              progress={progress}
-              successState={successState}
-              failureResults={failureResults}
-              handleSuccess={handleSuccess}
-              setFailureResults={setFailureResults}
-            />
+          {hasSubmitted && job ? (
+            <JobStatus watch={job} jobType="delete" />
           ) : (
             <>
               <ResourceEditFormSharedFields
@@ -180,14 +94,13 @@ function FormContent({ initialValues, selectedItems, repository, workflowOptions
                 repository={repository}
                 hidePath
               />
-
               <Stack gap={2}>
-                <Button type="submit" disabled={request.isLoading || !!failureResults} variant="destructive">
-                  {request.isLoading
+                <Button type="submit" disabled={disableBtn} variant="destructive">
+                  {job?.status?.state === 'working' || job?.status?.state === 'pending'
                     ? t('browse-dashboards.bulk-delete-resources-form.button-deleting', 'Deleting...')
                     : t('browse-dashboards.bulk-delete-resources-form.button-delete', 'Delete')}
                 </Button>
-                <Button variant="secondary" fill="outline" onClick={onDismiss} disabled={request.isLoading}>
+                <Button variant="secondary" fill="outline" onClick={onDismiss} disabled={isCreatingJob}>
                   <Trans i18nKey="browse-dashboards.bulk-delete-resources-form.button-cancel">Cancel</Trans>
                 </Button>
               </Stack>
@@ -205,10 +118,9 @@ export function BulkDeleteProvisionedResource({
   onDismiss,
 }: BulkActionProvisionResourceProps) {
   const folderName = useFolderNameFromSelection({ folderUid, selectedItems });
-  const { repository, folder, isReadOnlyRepo } = useGetResourceRepositoryView({ folderName });
+  const { repository, isReadOnlyRepo } = useGetResourceRepositoryView({ folderName });
 
   const workflowOptions = getWorkflowOptions(repository);
-  const folderPath = folder?.metadata?.annotations?.[AnnoKeySourcePath] || '';
   const timestamp = generateTimestamp();
 
   const initialValues = {
@@ -228,7 +140,6 @@ export function BulkDeleteProvisionedResource({
       initialValues={initialValues}
       repository={repository}
       workflowOptions={workflowOptions}
-      folderPath={folderPath}
     />
   );
 }
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx
index 883ec38c578..22640003c20 100644
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx
+++ b/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx
@@ -2,45 +2,26 @@ import { skipToken } from '@reduxjs/toolkit/query';
 import { useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
+import { AppEvents } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
-import { FolderPicker } from '@grafana/runtime';
+import { FolderPicker, getAppEvents } from '@grafana/runtime';
 import { Box, Button, Field, Stack } from '@grafana/ui';
 import { useGetFolderQuery } from 'app/api/clients/folder/v1beta1';
-import {
-  CreateRepositoryFilesWithPathApiArg,
-  CreateRepositoryFilesWithPathApiResponse,
-  RepositoryView,
-  useCreateRepositoryFilesWithPathMutation,
-  ResourceWrapper,
-} from 'app/api/clients/provisioning/v0alpha1';
-import { extractErrorMessage } from 'app/api/utils';
-import { ScopedResourceClient } from 'app/features/apiserver/client';
+import { RepositoryView, Job } from 'app/api/clients/provisioning/v0alpha1';
 import { AnnoKeySourcePath } from 'app/features/apiserver/types';
 import { ResourceEditFormSharedFields } from 'app/features/dashboard-scene/components/Provisioned/ResourceEditFormSharedFields';
 import { getDefaultWorkflow, getWorkflowOptions } from 'app/features/dashboard-scene/saving/provisioned/defaults';
 import { generateTimestamp } from 'app/features/dashboard-scene/saving/provisioned/utils/timestamp';
+import { JobStatus } from 'app/features/provisioning/Job/JobStatus';
 import { useGetResourceRepositoryView } from 'app/features/provisioning/hooks/useGetResourceRepositoryView';
-import { useSelector } from 'app/types/store';
 
-import { useChildrenByParentUIDState, rootItemsSelector } from '../../state/hooks';
-import { findItem } from '../../state/utils';
 import { DescendantCount } from '../BrowseActions/DescendantCount';
-import { collectSelectedItems, fetchProvisionedDashboardPath } from '../utils';
+import { collectSelectedItems } from '../utils';
 
-import { MoveResultFailed } from './BulkActionFailureBanner';
-import { BulkActionPostSubmitStep } from './BulkActionPostSubmitStep';
-import { ProgressState } from './BulkActionProgress';
 import { RepoInvalidStateBanner } from './RepoInvalidStateBanner';
-import { useBulkActionRequest } from './useBulkActionRequest';
+import { MoveJobSpec, useBulkActionJob } from './useBulkActionJob';
 import { useFolderNameFromSelection } from './useFolderNameFromSelection';
-import {
-  BulkActionFormData,
-  BulkActionProvisionResourceProps,
-  BulkSuccessResponse,
-  getTargetFolderPathInRepo,
-  getResourceTargetPath,
-  MoveResultSuccessState,
-} from './utils';
+import { BulkActionFormData, BulkActionProvisionResourceProps, getTargetFolderPathInRepo } from './utils';
 
 interface FormProps extends BulkActionProvisionResourceProps {
   initialValues: BulkActionFormData;
@@ -51,178 +32,64 @@ interface FormProps extends BulkActionProvisionResourceProps {
 
 function FormContent({ initialValues, selectedItems, repository, workflowOptions, folderPath, onDismiss }: FormProps) {
   // States
+  const [job, setJob] = useState<Job>();
   const [targetFolderUID, setTargetFolderUID] = useState<string | undefined>(undefined);
-  const [progress, setProgress] = useState<ProgressState | null>(null);
-  const [failureResults, setFailureResults] = useState<MoveResultFailed[] | undefined>();
-  const [successState, setSuccessState] = useState<MoveResultSuccessState>({
-    allSuccess: false,
-    repoUrl: '',
-  });
   const [hasSubmitted, setHasSubmitted] = useState(false);
 
   // Hooks
-  const [moveFile, moveRequest] = useCreateRepositoryFilesWithPathMutation();
+  const { createBulkJob, isLoading: isCreatingJob } = useBulkActionJob();
   const methods = useForm<BulkActionFormData>({ defaultValues: initialValues });
-  const childrenByParentUID = useChildrenByParentUIDState();
-  const rootItems = useSelector(rootItemsSelector);
   const { handleSubmit, watch } = methods;
   const workflow = watch('workflow');
-  const { handleSuccess } = useBulkActionRequest({ workflow, repository, successState, onDismiss });
 
   // Get target folder data
   const { data: targetFolder } = useGetFolderQuery(targetFolderUID ? { name: targetFolderUID } : skipToken);
 
-  const getResourceCurrentPath = async (uid: string, isFolder: boolean): Promise<string | undefined> => {
-    const item = findItem(rootItems?.items || [], childrenByParentUID, uid);
-    if (!item) {
-      return undefined;
-    }
-    return isFolder ? `${folderPath}/${item.title}/` : fetchProvisionedDashboardPath(uid);
-  };
-
-  const getDashboardBody = async (currentPath: string) => {
-    const repositoryClient = new ScopedResourceClient({
-      group: 'provisioning.grafana.app',
-      version: 'v0alpha1',
-      resource: 'repositories',
-    });
-    const fileResponse = await repositoryClient.subresource<ResourceWrapper>(repository.name, `files/${currentPath}`);
-    return fileResponse.resource?.file;
-  };
-
   const setupMoveOperation = () => {
     const targetFolderPathInRepo = getTargetFolderPathInRepo({ targetFolder });
-    const targets = collectSelectedItems(selectedItems, childrenByParentUID, rootItems?.items || []);
+    const resources = collectSelectedItems(selectedItems);
 
-    if (targets.length > 0) {
-      setProgress({
-        current: 0,
-        total: targets.length,
-        item: targets[0].displayName || 'Unknown',
-      });
-    }
-
-    return { targetFolderPathInRepo, targets };
-  };
-
-  const createFileBody = async (isFolder: boolean, displayName: string, currentPath: string) => {
-    if (isFolder) {
-      return {
-        title: displayName,
-        type: 'folder',
-      };
-    }
-
-    const fileBody = await getDashboardBody(currentPath);
-    if (!fileBody) {
-      throw new Error(
-        t('browse-dashboards.bulk-move-resources-form.error-file-content-not-found', 'File content not found')
-      );
-    }
-
-    return fileBody;
+    return { targetFolderPathInRepo, resources };
   };
 
   const handleSubmitForm = async (data: BulkActionFormData) => {
-    setFailureResults(undefined);
     setHasSubmitted(true);
 
-    // 1. Validate
-    if (!targetFolder) {
-      setFailureResults([
-        {
-          status: 'failed',
-          title: t('browse-dashboards.bulk-move-resources-form.error-title', 'Target Folder Error'),
-        },
-      ]);
-      return;
+    // 1. Setup
+    const { targetFolderPathInRepo, resources } = setupMoveOperation();
+
+    if (!targetFolderPathInRepo) {
+      throw new Error(
+        t(
+          'browse-dashboards.bulk-move-resources-form.error-no-target-folder-path',
+          'Target folder path in repository is invalid, please select another folder.'
+        )
+      );
     }
 
-    // 2. Setup
-    const { targetFolderPathInRepo, targets } = setupMoveOperation();
+    // Create the move job spec
+    const jobSpec: MoveJobSpec = {
+      action: 'move',
+      move: {
+        ref: data.workflow === 'write' ? undefined : data.ref,
+        targetPath: `${targetFolderPathInRepo}/`,
+        resources,
+      },
+    };
 
-    // 3. Process items
-    const successes: BulkSuccessResponse<
-      CreateRepositoryFilesWithPathApiArg,
-      CreateRepositoryFilesWithPathApiResponse
-    > = [];
-    const failures: MoveResultFailed[] = [];
+    const result = await createBulkJob(repository, jobSpec);
 
-    // Iterate through each selected item and move it
-    // We want sequential processing to avoid overwhelming the API
-    for (let i = 0; i < targets.length; i++) {
-      const { uid, isFolder, displayName } = targets[i];
-      setProgress({
-        current: i,
-        total: targets.length,
-        item: displayName,
+    if (result.success && result.job) {
+      setJob(result.job); // Store the job for tracking
+    } else if (!result.success && result.error) {
+      getAppEvents().publish({
+        type: AppEvents.alertError.name,
+        payload: [
+          t('browse-dashboards.bulk-move-resources-form.error-moving-resources', 'Error moving resources'),
+          result.error,
+        ],
       });
-
-      try {
-        // 1. Get source path in repository
-        const currentPath = await getResourceCurrentPath(uid, isFolder);
-        if (!currentPath) {
-          failures.push({
-            status: 'failed',
-            title: `${isFolder ? 'Folder' : 'Dashboard'}: ${displayName}`,
-            errorMessage: t('browse-dashboards.bulk-move-resources-form.error-path-not-found', 'Path not found'),
-          });
-          continue;
-        }
-
-        if (!targetFolderPathInRepo) {
-          failures.push({
-            status: 'failed',
-            title: `${isFolder ? 'Folder' : 'Dashboard'}: ${displayName}`,
-            errorMessage: t(
-              'browse-dashboards.bulk-move-resources-form.error-target-folder-path-missing',
-              'Target folder path is missing'
-            ),
-          });
-          continue;
-        }
-
-        const newPath = getResourceTargetPath(currentPath, targetFolderPathInRepo);
-        const fileBody = await createFileBody(isFolder, displayName, currentPath);
-
-        // Build move parameters
-        const moveParams: CreateRepositoryFilesWithPathApiArg = {
-          name: repository.name,
-          path: newPath, // NEW target path
-          ref: workflow === 'write' ? undefined : data.ref,
-          message: data.comment || `Move resource ${displayName}`,
-          originalPath: currentPath, // CURRENT path (source)
-          body: fileBody, // File content
-        };
-
-        // Call endpoint to move resource
-        const response = await moveFile(moveParams).unwrap();
-        successes.push({ index: i, item: moveParams, data: response });
-      } catch (error: unknown) {
-        failures.push({
-          status: 'failed',
-          title: `${isFolder ? 'Folder' : 'Dashboard'}: ${displayName}`,
-          errorMessage: extractErrorMessage(error),
-        });
-      }
-
-      setProgress({
-        current: i + 1,
-        total: targets.length,
-        item: targets[i + 1]?.displayName,
-      });
-    }
-
-    setProgress(null);
-
-    if (successes.length > 0 && failures.length === 0) {
-      // handleSuccess(successes);
-      setSuccessState({
-        allSuccess: true,
-        repoUrl: successes[0].data.urls?.newPullRequestURL,
-      });
-    } else if (failures.length > 0) {
-      setFailureResults(failures);
+      setHasSubmitted(false); // Reset submit state so user can try again
     }
   };
 
@@ -237,15 +104,8 @@ function FormContent({ initialValues, selectedItems, repository, workflowOptions
             <DescendantCount selectedItems={{ ...selectedItems, panel: {}, $all: false }} />
           </Box>
 
-          {hasSubmitted ? (
-            <BulkActionPostSubmitStep
-              action="move"
-              progress={progress}
-              successState={successState}
-              failureResults={failureResults}
-              handleSuccess={handleSuccess}
-              setFailureResults={setFailureResults}
-            />
+          {hasSubmitted && job ? (
+            <JobStatus watch={job} jobType="delete" />
           ) : (
             <>
               {/* Target folder selection */}
@@ -262,12 +122,20 @@ function FormContent({ initialValues, selectedItems, repository, workflowOptions
               />
 
               <Stack gap={2}>
-                <Button type="submit" disabled={moveRequest.isLoading || !!failureResults}>
-                  {moveRequest.isLoading
+                <Button
+                  tooltip={
+                    !targetFolder
+                      ? t('browse-dashboards.bulk-move-resources-form.button-tooltip', 'Please select a target folder')
+                      : undefined
+                  }
+                  type="submit"
+                  disabled={!!job || isCreatingJob || hasSubmitted || !targetFolder}
+                >
+                  {isCreatingJob
                     ? t('browse-dashboards.bulk-move-resources-form.button-moving', 'Moving...')
                     : t('browse-dashboards.bulk-move-resources-form.button-move', 'Move')}
                 </Button>
-                <Button variant="secondary" fill="outline" onClick={onDismiss} disabled={moveRequest.isLoading}>
+                <Button variant="secondary" fill="outline" onClick={onDismiss} disabled={isCreatingJob}>
                   <Trans i18nKey="browse-dashboards.bulk-move-resources-form.button-cancel">Cancel</Trans>
                 </Button>
               </Stack>
diff --git a/public/app/features/browse-dashboards/components/BulkActions/useBulkActionJob.ts b/public/app/features/browse-dashboards/components/BulkActions/useBulkActionJob.ts
new file mode 100644
index 00000000000..fe47c0469e6
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BulkActions/useBulkActionJob.ts
@@ -0,0 +1,70 @@
+import { useCreateRepositoryJobsMutation, RepositoryView, Job } from 'app/api/clients/provisioning/v0alpha1';
+import { extractErrorMessage } from 'app/api/utils';
+
+export interface ResourceRef {
+  name: string;
+  group: 'dashboard.grafana.app' | 'folder.grafana.app';
+  kind: 'Dashboard' | 'Folder';
+}
+
+export interface DeleteJobSpec {
+  action: 'delete';
+  delete: {
+    ref?: string;
+    resources: ResourceRef[];
+  };
+}
+
+export interface MoveJobSpec {
+  action: 'move';
+  move: {
+    ref?: string;
+    targetPath: string; // Must end with '/' slash
+    resources: ResourceRef[];
+  };
+}
+
+export type BulkJobSpec = DeleteJobSpec | MoveJobSpec;
+
+interface UseBulkActionJobResult {
+  createBulkJob: (
+    repository: RepositoryView,
+    jobSpec: BulkJobSpec
+  ) => Promise<{
+    success: boolean;
+    jobId?: string;
+    job?: Job; // Return the full job object
+    error?: string;
+  }>;
+  isLoading: boolean;
+}
+
+export type ResponseType = { success: boolean; jobId?: string; job?: Job; error?: string };
+
+// This hook is used to create bulk action (delete, move) jobs for provisioning resources
+export function useBulkActionJob(): UseBulkActionJobResult {
+  const [createJob, { isLoading }] = useCreateRepositoryJobsMutation();
+
+  const createBulkJob = async (repository: RepositoryView, jobSpec: BulkJobSpec): Promise<ResponseType> => {
+    try {
+      const response = await createJob({
+        name: repository.name,
+        jobSpec,
+      }).unwrap();
+
+      const jobId = response.metadata?.name;
+      return {
+        success: true,
+        jobId,
+        job: response, // Return the full job object
+      };
+    } catch (error) {
+      return { success: false, error: extractErrorMessage(error) };
+    }
+  };
+
+  return {
+    createBulkJob,
+    isLoading,
+  };
+}
diff --git a/public/app/features/browse-dashboards/components/BulkActions/useBulkActionRequest.ts b/public/app/features/browse-dashboards/components/BulkActions/useBulkActionRequest.ts
deleted file mode 100644
index 0e0ddfcaf2c..00000000000
--- a/public/app/features/browse-dashboards/components/BulkActions/useBulkActionRequest.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useNavigate } from 'react-router-dom-v5-compat';
-
-import { RepositoryView } from 'app/api/clients/provisioning/v0alpha1';
-import { buildResourceBranchRedirectUrl } from 'app/features/dashboard-scene/settings/utils';
-
-import { MoveResultSuccessState } from './utils';
-
-interface Props {
-  workflow?: 'branch' | 'write';
-  repository: RepositoryView;
-  successState: MoveResultSuccessState;
-  onDismiss?: () => void;
-}
-export function useBulkActionRequest({ workflow, repository, successState, onDismiss }: Props) {
-  const navigate = useNavigate();
-
-  const handleSuccess = () => {
-    if (workflow === 'branch') {
-      onDismiss?.();
-      if (successState.repoUrl) {
-        const url = buildResourceBranchRedirectUrl({
-          paramName: 'repo_url',
-          paramValue: successState.repoUrl,
-          repoType: repository.type,
-        });
-
-        navigate(url);
-        return;
-      }
-      window.location.reload();
-    } else {
-      onDismiss?.();
-      window.location.reload();
-    }
-  };
-  return {
-    handleSuccess,
-  };
-}
diff --git a/public/app/features/browse-dashboards/components/BulkActions/utils.ts b/public/app/features/browse-dashboards/components/BulkActions/utils.ts
index 48fc4892c73..d039fecab23 100644
--- a/public/app/features/browse-dashboards/components/BulkActions/utils.ts
+++ b/public/app/features/browse-dashboards/components/BulkActions/utils.ts
@@ -16,17 +16,6 @@ export interface BulkActionProvisionResourceProps {
   onDismiss?: () => void;
 }
 
-export type BulkSuccessResponse<T, K> = Array<{
-  index: number;
-  item: T;
-  data: K;
-}>;
-
-export type MoveResultSuccessState = {
-  allSuccess: boolean;
-  repoUrl?: string;
-};
-
 export function getTargetFolderPathInRepo({ targetFolder }: { targetFolder?: Folder }): string | undefined {
   if (!targetFolder) {
     return undefined;
diff --git a/public/app/features/browse-dashboards/components/utils.ts b/public/app/features/browse-dashboards/components/utils.ts
index 66a85a6d0ee..3443967fc62 100644
--- a/public/app/features/browse-dashboards/components/utils.ts
+++ b/public/app/features/browse-dashboards/components/utils.ts
@@ -1,13 +1,10 @@
 import { config } from '@grafana/runtime';
 import { contextSrv } from 'app/core/core';
-import { AnnoKeySourcePath } from 'app/features/apiserver/types';
-import { getDashboardAPI } from 'app/features/dashboard/api/dashboard_api';
-import { DashboardViewItem } from 'app/features/search/types';
 
-import { useChildrenByParentUIDState } from '../state/hooks';
-import { findItem } from '../state/utils';
 import { DashboardTreeSelection, DashboardViewItemWithUIItems, BrowseDashboardsPermissions } from '../types';
 
+import { ResourceRef } from './BulkActions/useBulkActionJob';
+
 export function makeRowID(baseId: string, item: DashboardViewItemWithUIItems) {
   return baseId + item.uid;
 }
@@ -63,47 +60,26 @@ export function formatFolderName(folderName?: string): string {
   return result;
 }
 
-// Fetch provisioned dashboard path in repository
-export async function fetchProvisionedDashboardPath(uid: string): Promise<string | undefined> {
-  try {
-    const dto = await getDashboardAPI().getDashboardDTO(uid);
-    const sourcePath =
-      'meta' in dto
-        ? dto.meta.k8s?.annotations?.[AnnoKeySourcePath] || dto.meta.provisionedExternalId
-        : dto.metadata?.annotations?.[AnnoKeySourcePath];
-    return `${sourcePath}`;
-  } catch (error) {
-    console.error('Error fetching provisioned dashboard path:', error);
-    return undefined;
-  }
-}
-
 // Collect selected dashboard and folder from the DashboardTreeSelection
 // This is used to prepare the items for bulk delete operation.
-export function collectSelectedItems(
-  selectedItems: Omit<DashboardTreeSelection, 'panel' | '$all'>,
-  childrenByParentUID: ReturnType<typeof useChildrenByParentUIDState>,
-  rootItems: DashboardViewItem[] = []
-) {
-  const targets: Array<{ uid: string; isFolder: boolean; displayName: string }> = [];
+export function collectSelectedItems(selectedItems: Omit<DashboardTreeSelection, 'panel' | '$all'>) {
+  const resources: ResourceRef[] = [];
 
   // folders
   for (const [uid, selected] of Object.entries(selectedItems.folder)) {
     if (selected) {
-      const item = findItem(rootItems, childrenByParentUID, uid);
-      targets.push({ uid, isFolder: true, displayName: item?.title || uid });
+      resources.push({ name: uid, group: 'folder.grafana.app', kind: 'Folder' });
     }
   }
 
   // dashboards
   for (const [uid, selected] of Object.entries(selectedItems.dashboard)) {
     if (selected) {
-      const item = findItem(rootItems, childrenByParentUID, uid);
-      targets.push({ uid, isFolder: false, displayName: item?.title || uid });
+      resources.push({ name: uid, group: 'dashboard.grafana.app', kind: 'Dashboard' });
     }
   }
 
-  return targets;
+  return resources;
 }
 
 export function canEditItemType(itemKind: string, permissions: BrowseDashboardsPermissions) {
diff --git a/public/app/features/provisioning/Job/FinishedJobStatus.tsx b/public/app/features/provisioning/Job/FinishedJobStatus.tsx
index 05ed8c1a13c..60b5ce73917 100644
--- a/public/app/features/provisioning/Job/FinishedJobStatus.tsx
+++ b/public/app/features/provisioning/Job/FinishedJobStatus.tsx
@@ -4,18 +4,19 @@ import { Trans, t } from '@grafana/i18n';
 import { Spinner, Stack, Text } from '@grafana/ui';
 import { useGetRepositoryJobsWithPathQuery } from 'app/api/clients/provisioning/v0alpha1';
 
-import { useStepStatus } from '../Wizard/StepStatusContext';
+import { StepStatusInfo } from '../Wizard/types';
 
 import { JobContent } from './JobContent';
 
 export interface FinishedJobProps {
   jobUid: string;
   repositoryName: string;
+  jobType: 'sync' | 'delete' | 'move';
+  onStatusChange?: (statusInfo: StepStatusInfo) => void;
 }
 
-export function FinishedJobStatus({ jobUid, repositoryName }: FinishedJobProps) {
+export function FinishedJobStatus({ jobUid, repositoryName, jobType, onStatusChange }: FinishedJobProps) {
   const hasRetried = useRef(false);
-  const { setStepStatusInfo } = useStepStatus();
   const finishedQuery = useGetRepositoryJobsWithPathQuery({
     name: repositoryName,
     uid: jobUid,
@@ -39,7 +40,7 @@ export function FinishedJobStatus({ jobUid, repositoryName }: FinishedJobProps)
       const { state, message, errors } = job.status;
 
       if (state === 'error') {
-        setStepStatusInfo({
+        onStatusChange?.({
           status: 'error',
           error: {
             title: t('provisioning.job-status.status.title-error-running-job', 'Error running job'),
@@ -47,14 +48,14 @@ export function FinishedJobStatus({ jobUid, repositoryName }: FinishedJobProps)
           },
         });
       } else if (state === 'success') {
-        setStepStatusInfo({
+        onStatusChange?.({
           status: 'success',
           success: {
             title: t('provisioning.job-status.status.title-success-running-job', 'Job completed successfully'),
           },
         });
       } else if (state === 'warning') {
-        setStepStatusInfo({
+        onStatusChange?.({
           status: 'warning',
           warning: {
             title: t('provisioning.job-status.status.title-warning-running-job', 'Job completed with warnings'),
@@ -69,10 +70,10 @@ export function FinishedJobStatus({ jobUid, repositoryName }: FinishedJobProps)
         clearTimeout(timeoutId);
       }
     };
-  }, [finishedQuery, job, setStepStatusInfo]);
+  }, [finishedQuery, job, onStatusChange]);
 
   if (retryFailed) {
-    setStepStatusInfo({
+    onStatusChange?.({
       status: 'error',
       error: {
         title: t('provisioning.job-status.no-job-found', 'No job found'),
@@ -96,5 +97,5 @@ export function FinishedJobStatus({ jobUid, repositoryName }: FinishedJobProps)
     );
   }
 
-  return <JobContent job={job} isFinishedJob={true} />;
+  return <JobContent job={job} isFinishedJob={true} onStatusChange={onStatusChange} jobType={jobType} />;
 }
diff --git a/public/app/features/provisioning/Job/JobContent.tsx b/public/app/features/provisioning/Job/JobContent.tsx
index 867f7844fda..0e469937b88 100644
--- a/public/app/features/provisioning/Job/JobContent.tsx
+++ b/public/app/features/provisioning/Job/JobContent.tsx
@@ -6,17 +6,18 @@ import { Job } from 'app/api/clients/provisioning/v0alpha1';
 
 import { RepositoryLink } from '../Repository/RepositoryLink';
 import ProgressBar from '../Shared/ProgressBar';
-import { useStepStatus } from '../Wizard/StepStatusContext';
+import { StepStatusInfo } from '../Wizard/types';
 
 import { JobSummary } from './JobSummary';
 
 export interface JobContentProps {
+  jobType: 'sync' | 'delete' | 'move';
   job?: Job;
   isFinishedJob?: boolean;
+  onStatusChange?: (statusInfo: StepStatusInfo) => void;
 }
 
-export function JobContent({ job, isFinishedJob = false }: JobContentProps) {
-  const { setStepStatusInfo } = useStepStatus();
+export function JobContent({ jobType, job, isFinishedJob = false, onStatusChange }: JobContentProps) {
   const errorSetRef = useRef(false);
 
   if (!job?.status) {
@@ -34,11 +35,11 @@ export function JobContent({ job, isFinishedJob = false }: JobContentProps) {
 
     switch (state) {
       case 'success':
-        setStepStatusInfo({ status: 'success' });
+        onStatusChange?.({ status: 'success' });
         break;
       case 'warning':
         if (!errorSetRef.current) {
-          setStepStatusInfo({
+          onStatusChange?.({
             status: 'warning',
             warning: {
               title: t('provisioning.job-status.status.title-warning-running-job', 'Job completed with warnings'),
@@ -50,7 +51,7 @@ export function JobContent({ job, isFinishedJob = false }: JobContentProps) {
         break;
       case 'error':
         if (!errorSetRef.current) {
-          setStepStatusInfo({
+          onStatusChange?.({
             status: 'error',
             error: {
               title: t('provisioning.job-status.status.title-error-running-job', 'Error running job'),
@@ -62,12 +63,12 @@ export function JobContent({ job, isFinishedJob = false }: JobContentProps) {
         break;
       case 'working':
       case 'pending':
-        setStepStatusInfo({ status: 'running' });
+        onStatusChange?.({ status: 'running' });
         break;
       default:
         break;
     }
-  }, [state, message, errors, setStepStatusInfo]);
+  }, [state, message, errors, onStatusChange]);
 
   return (
     <Stack direction="column" gap={2}>
@@ -75,7 +76,7 @@ export function JobContent({ job, isFinishedJob = false }: JobContentProps) {
         {['working', 'pending'].includes(state ?? '') && (
           <Stack direction="row" alignItems="center" justifyContent="center" gap={2}>
             <Spinner size={24} />
-            <Text element="h4" color="secondary">
+            <Text element="h5" color="secondary">
               {message ?? state ?? t('provisioning.job-status.starting', 'Starting...')}
             </Text>
           </Stack>
@@ -94,7 +95,7 @@ export function JobContent({ job, isFinishedJob = false }: JobContentProps) {
           </Stack>
         )}
         {state === 'success' ? (
-          <RepositoryLink name={repoName} />
+          <RepositoryLink name={repoName} jobType={jobType} />
         ) : (
           <ControlledCollapse label={t('provisioning.job-status.label-view-details', 'View details')} isOpen={false}>
             <pre>{JSON.stringify(job, null, 2)}</pre>
diff --git a/public/app/features/provisioning/Job/JobStatus.tsx b/public/app/features/provisioning/Job/JobStatus.tsx
index ee05d56c051..3a517ea775c 100644
--- a/public/app/features/provisioning/Job/JobStatus.tsx
+++ b/public/app/features/provisioning/Job/JobStatus.tsx
@@ -2,17 +2,18 @@ import { Trans, t } from '@grafana/i18n';
 import { Spinner, Stack, Text } from '@grafana/ui';
 import { Job, useListJobQuery } from 'app/api/clients/provisioning/v0alpha1';
 
-import { useStepStatus } from '../Wizard/StepStatusContext';
+import { StepStatusInfo } from '../Wizard/types';
 
 import { FinishedJobStatus } from './FinishedJobStatus';
 import { JobContent } from './JobContent';
 
 export interface JobStatusProps {
   watch: Job;
+  onStatusChange?: (statusInfo: StepStatusInfo) => void;
+  jobType: 'sync' | 'delete' | 'move';
 }
 
-export function JobStatus({ watch }: JobStatusProps) {
-  const { setStepStatusInfo } = useStepStatus();
+export function JobStatus({ jobType, watch, onStatusChange }: JobStatusProps) {
   const activeQuery = useListJobQuery({
     fieldSelector: `metadata.name=${watch.metadata?.name}`,
     watch: true,
@@ -36,7 +37,7 @@ export function JobStatus({ watch }: JobStatusProps) {
   }
 
   if (activeQuery.isError) {
-    setStepStatusInfo({
+    onStatusChange?.({
       status: 'error',
       error: {
         title: t('provisioning.job-status.title.error-fetching-active-job', 'Error fetching active job'),
@@ -46,11 +47,18 @@ export function JobStatus({ watch }: JobStatusProps) {
   }
 
   if (activeJob) {
-    return <JobContent job={activeJob} isFinishedJob={false} />;
+    return <JobContent job={activeJob} isFinishedJob={false} onStatusChange={onStatusChange} jobType={jobType} />;
   }
 
   if (shouldCheckFinishedJobs) {
-    return <FinishedJobStatus jobUid={watch.metadata?.uid!} repositoryName={repoLabel} />;
+    return (
+      <FinishedJobStatus
+        jobUid={watch.metadata?.uid!}
+        repositoryName={repoLabel}
+        onStatusChange={onStatusChange}
+        jobType={jobType}
+      />
+    );
   }
 
   return (
diff --git a/public/app/features/provisioning/Repository/RepositoryLink.tsx b/public/app/features/provisioning/Repository/RepositoryLink.tsx
index 85ad92810c8..f97a448efa4 100644
--- a/public/app/features/provisioning/Repository/RepositoryLink.tsx
+++ b/public/app/features/provisioning/Repository/RepositoryLink.tsx
@@ -1,16 +1,17 @@
 import { skipToken } from '@reduxjs/toolkit/query';
 
 import { Trans } from '@grafana/i18n';
-import { Stack, Text, TextLink } from '@grafana/ui';
+import { LinkButton, Stack, Text, TextLink } from '@grafana/ui';
 import { useGetRepositoryQuery } from 'app/api/clients/provisioning/v0alpha1';
 
 import { getRepoHref } from '../utils/git';
 
 type RepositoryLinkProps = {
   name?: string;
+  jobType: 'sync' | 'delete' | 'move';
 };
 
-export function RepositoryLink({ name }: RepositoryLinkProps) {
+export function RepositoryLink({ name, jobType }: RepositoryLinkProps) {
   const repoQuery = useGetRepositoryQuery(name ? { name } : skipToken);
   const repo = repoQuery.data;
 
@@ -20,21 +21,36 @@ export function RepositoryLink({ name }: RepositoryLinkProps) {
 
   const repoHref = getRepoHref(repo.spec?.github);
 
+  if (jobType === 'sync') {
+    return (
+      <>
+        <Text>
+          <Trans i18nKey="provisioning.repository-link.grafana-repository-synced">
+            Your resources are now in your external storage and provisioned into your instance. From now on, your
+            instance and the external storage will be synchronized.
+          </Trans>
+        </Text>
+
+        {repoHref && (
+          <Stack direction="row" gap={2}>
+            <TextLink href={repoHref} external>
+              <Trans i18nKey="provisioning.repository-link.sync-job.view-repository">View repository</Trans>
+            </TextLink>
+          </Stack>
+        )}
+      </>
+    );
+  }
+
   return (
-    <Stack direction="column" gap={1}>
-      <Text>
-        <Trans i18nKey="provisioning.repository-link.grafana-repository-synced">
-          Your resources are now in your external storage and provisioned into your instance. From now on, your instance
-          and the external storage will be synchronized.
-        </Trans>
-      </Text>
+    <>
       {repoHref && (
         <Stack direction="row" gap={2}>
-          <TextLink href={repoHref} external>
-            <Trans i18nKey="provisioning.repository-link.view-repository">View repository</Trans>
-          </TextLink>
+          <LinkButton href={repoHref} icon="external-link-alt" variant="secondary" target="_blank">
+            <Trans i18nKey="provisioning.repository-link.delete-or-move-job.view-repository">View repository</Trans>
+          </LinkButton>
         </Stack>
       )}
-    </Stack>
+    </>
   );
 }
diff --git a/public/app/features/provisioning/Wizard/SynchronizeStep.tsx b/public/app/features/provisioning/Wizard/SynchronizeStep.tsx
index 64ae9ee8732..d05d1a96c4e 100644
--- a/public/app/features/provisioning/Wizard/SynchronizeStep.tsx
+++ b/public/app/features/provisioning/Wizard/SynchronizeStep.tsx
@@ -39,7 +39,7 @@ export function SynchronizeStep({ isLegacyStorage }: SynchronizeStepProps) {
   };
 
   if (job) {
-    return <JobStatus watch={job} />;
+    return <JobStatus watch={job} onStatusChange={setStepStatusInfo} jobType="sync" />;
   }
 
   return (
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index fddcbfc2009..2c9adb3e3e4 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -3519,26 +3519,18 @@
     "browse-view": {
       "this-folder-is-empty": "This folder is empty"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "All resources have been deleted successfully",
-      "all-moved": "All resources have been moved successfully",
-      "button-done": "Done",
-      "failed-alert_one": "{{count}} items failed",
-      "failed-alert_other": "{{count}} items failed",
-      "progress-title": "Success"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Cancel",
       "button-delete": "Delete",
       "button-deleting": "Deleting...",
       "delete-warning": "This will delete selected folders and their descendants. In total, this will affect:",
-      "error-path-not-found": "Path not found"
+      "error-deleting-resources": "Error deleting resources"
     },
     "bulk-move-resources-form": {
       "button-cancel": "Cancel",
       "button-move": "Move",
       "button-moving": "Moving...",
-      "deleting": "Deleting",
+      "button-tooltip": "Please select a target folder",
       "error": {
         "read-only-message": "If you have direct access to the target, please make modifications directly in the target repository.",
         "read-only-saving-message": "Repository is read-only and provisioned in git. {{readOnlyMessage}}",
@@ -3546,13 +3538,9 @@
         "repository-not-found-message": "The repository for the selected folder could not be found. Please ensure that the folder is provisioned correctly.",
         "repository-not-found-title": "Repository not found"
       },
-      "error-file-content-not-found": "File content not found",
-      "error-path-not-found": "Path not found",
-      "error-target-folder-path-missing": "Target folder path is missing",
-      "error-title": "Target Folder Error",
+      "error-moving-resources": "Error moving resources",
+      "error-no-target-folder-path": "Target folder path in repository is invalid, please select another folder.",
       "move-warning": "This will move selected folders and their descendants. In total, this will affect:",
-      "moving": "Moving",
-      "progress": "Progress: {{current}} of {{total}}",
       "target-folder": "Target Folder"
     },
     "counts": {
@@ -11442,8 +11430,13 @@
       "title-repository-is-unhealthy": "Repository is unhealthy"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": "View repository"
+      },
       "grafana-repository-synced": "Your resources are now in your external storage and provisioned into your instance. From now on, your instance and the external storage will be synchronized.",
-      "view-repository": "View repository"
+      "sync-job": {
+        "view-repository": "View repository"
+      }
     },
     "repository-overview": {
       "checked": "Checked:",

From 6c106a85ac34db103e4d9e1c770ee4b4c7aa7349 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Tue, 12 Aug 2025 15:06:04 +0200
Subject: [PATCH 107/243] UI: Add `aria-labelledby` and `data-testid` to
 `MultiCombobox` (#109521)

Add aria-labelledby and data-testid props
---
 .../src/components/Combobox/MultiCombobox.tsx        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx b/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
index 4545a828325..bd9a65b705c 100644
--- a/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
+++ b/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
@@ -47,6 +47,8 @@ export const MultiCombobox = <T extends string | number>(props: MultiComboboxPro
     maxWidth,
     isClearable,
     createCustomValue = false,
+    'aria-labelledby': ariaLabelledBy,
+    'data-testid': dataTestId,
   } = props;
 
   const styles = useStyles2(getComboboxStyles);
@@ -285,15 +287,17 @@ export const MultiCombobox = <T extends string | number>(props: MultiComboboxPro
           )}
           <input
             className={multiStyles.input}
-            {...getInputProps(
-              getDropdownProps({
+            {...getInputProps({
+              ...getDropdownProps({
                 disabled,
                 preventKeyAction: isOpen,
                 placeholder: visibleItems.length === 0 ? placeholder : '',
                 ref: inputRef,
                 style: { width: inputWidth },
-              })
-            )}
+              }),
+              'aria-labelledby': ariaLabelledBy, // Label should be handled with the Field component
+              'data-testid': dataTestId,
+            })}
           />
 
           <div className={multiStyles.suffix} ref={suffixMeasureRef} {...getToggleButtonProps()}>

From db0a1bc30f05b6ef1936171e541269df17499e05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Tue, 12 Aug 2025 15:22:30 +0200
Subject: [PATCH 108/243] Remove `sqlDatasourceDatabaseSelection` feature
 toggle (#109391)

* Remove `sqlDatasourceDatabaseSelection` feature toggle

* Update e2e tests
---
 .../datasources/mysql/query-editor/_index.md  |  2 +-
 .../feature-toggles/index.md                  |  1 -
 .../plugin-e2e/mysql/mocks/mysql.mocks.ts     |  2 +-
 .../mysql/visual-query-builder.spec.ts        | 14 ++++----
 .../src/types/featureToggles.gen.ts           |  4 ---
 .../src/components/DatasetSelector.tsx        | 33 +++----------------
 .../QueryEditorFeatureFlag.utils.ts           |  5 ---
 .../src/components/QueryHeader.tsx            |  6 ----
 .../src/components/SqlComponents.test.tsx     | 10 ------
 .../src/datasource/SqlDatasource.ts           | 12 +++----
 pkg/services/featuremgmt/registry.go          |  8 -----
 pkg/services/featuremgmt/toggles_gen.csv      |  1 -
 pkg/services/featuremgmt/toggles_gen.go       |  4 ---
 pkg/services/featuremgmt/toggles_gen.json     |  3 +-
 14 files changed, 19 insertions(+), 86 deletions(-)
 delete mode 100644 packages/grafana-sql/src/components/QueryEditorFeatureFlag.utils.ts

diff --git a/docs/sources/datasources/mysql/query-editor/_index.md b/docs/sources/datasources/mysql/query-editor/_index.md
index b34bcf65935..5139a04d2f3 100644
--- a/docs/sources/datasources/mysql/query-editor/_index.md
+++ b/docs/sources/datasources/mysql/query-editor/_index.md
@@ -70,7 +70,7 @@ Grafana’s query editors are unique for each data source. For general informati
 The MySQL query editor is located on the [Explore page](ref:explore). You can also access the MySQL query editor from a dashboard panel. Click the ellipsis in the upper right of the panel and select **Edit**.
 
 {{< admonition type="note" >}}
-If a default database is configured in the **Data Source Configuration page**, or via a provisioning configuration file, users will be restricted to querying only that pre-configured database. This feature is behind a feature flag and is available once you enable `sqlDatasourceDatabaseSelection`.
+If a default database is configured in the **Data Source Configuration page**, or via a provisioning configuration file, users will be restricted to querying only that pre-configured database.
 {{< /admonition >}}
 
 ## MySQL query editor components
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index e66178703ff..c5b1d0d05d1 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -90,7 +90,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `refactorVariablesTimeRange`      | Refactor time range variables flow to reduce number of API calls made when query variables are chained |
 | `faroDatasourceSelector`          | Enable the data source selector within the Frontend Apps section of the Frontend Observability         |
 | `enableDatagridEditing`           | Enables the edit functionality in the datagrid panel                                                   |
-| `sqlDatasourceDatabaseSelection`  | Enables previous SQL data source dataset dropdown behavior                                             |
 | `reportingRetries`                | Enables rendering retries for the reporting feature                                                    |
 | `externalServiceAccounts`         | Automatic service account and token setup for plugins                                                  |
 | `cloudWatchBatchQueries`          | Runs CloudWatch metrics queries as separate batches                                                    |
diff --git a/e2e-playwright/plugin-e2e/mysql/mocks/mysql.mocks.ts b/e2e-playwright/plugin-e2e/mysql/mocks/mysql.mocks.ts
index 63718c6d1a4..0b235c01a31 100644
--- a/e2e-playwright/plugin-e2e/mysql/mocks/mysql.mocks.ts
+++ b/e2e-playwright/plugin-e2e/mysql/mocks/mysql.mocks.ts
@@ -64,7 +64,7 @@ export const datasetResponse = {
             },
             fields: [{ name: 'TABLE_SCHEMA', type: 'string', typeInfo: { frame: 'string', nullable: true } }],
           },
-          data: { values: [['DataMaker', 'mysql', 'performance_schema', 'sys']] },
+          data: { values: [['grafana', 'mysql', 'performance_schema', 'sys']] },
         },
       ],
     },
diff --git a/e2e-playwright/plugin-e2e/mysql/visual-query-builder.spec.ts b/e2e-playwright/plugin-e2e/mysql/visual-query-builder.spec.ts
index 9cf6c580927..e54c8749300 100644
--- a/e2e-playwright/plugin-e2e/mysql/visual-query-builder.spec.ts
+++ b/e2e-playwright/plugin-e2e/mysql/visual-query-builder.spec.ts
@@ -48,7 +48,7 @@ test.describe(
       await expect(
         explorePage.getByGrafanaSelector(selectors.components.CodeEditor.container).getByRole('textbox')
       ).toHaveValue(
-        `SELECT\n  $__timeGroupAlias(createdAt, $__interval),\n  AVG(\`bigint\`)\nFROM\n  DataMaker.normalTable\nLIMIT\n  50`
+        `SELECT\n  $__timeGroupAlias(createdAt, $__interval),\n  AVG(\`bigint\`)\nFROM\n  grafana.normalTable\nLIMIT\n  50`
       );
     });
 
@@ -83,9 +83,7 @@ test.describe(
       // Validate that the timeFilter macro was added
       await expect(
         explorePage.getByGrafanaSelector(selectors.components.CodeEditor.container).getByRole('textbox')
-      ).toHaveValue(
-        `SELECT\n  createdAt\nFROM\n  DataMaker.normalTable\nWHERE\n  $__timeFilter(createdAt)\nLIMIT\n  50`
-      );
+      ).toHaveValue(`SELECT\n  createdAt\nFROM\n  grafana.normalTable\nWHERE\n  $__timeFilter(createdAt)\nLIMIT\n  50`);
 
       // Validate that the timeFilter macro was removed when changed to equals operator
       await explorePage.getByGrafanaSelector(selectors.components.SQLQueryEditor.filterOperator).click();
@@ -96,7 +94,7 @@ test.describe(
 
       await expect(
         explorePage.getByGrafanaSelector(selectors.components.CodeEditor.container).getByRole('textbox')
-      ).not.toHaveValue(`SELECT\n  createdAt\nFROM\n  DataMaker.normalTable\nWHERE\n  createdAt = NULL\nLIMIT\n  50`);
+      ).not.toHaveValue(`SELECT\n  createdAt\nFROM\n  grafana.normalTable\nWHERE\n  createdAt = NULL\nLIMIT\n  50`);
     });
 
     test('visual query builder should not crash when filter is set to select_any_in', async ({ explorePage, page }) => {
@@ -114,7 +112,7 @@ test.describe(
                 uid: 'P4FDCC188E688367F',
               },
               format: 'table',
-              rawSql: "SELECT * FROM DataMaker.normalTable WHERE name IN ('a') LIMIT 50 ",
+              rawSql: "SELECT * FROM grafana.normalTable WHERE name IN ('a') LIMIT 50 ",
               editorMode: 'builder',
               sql: {
                 columns: [
@@ -157,7 +155,7 @@ test.describe(
                 },
                 whereString: "name IN ('a')",
               },
-              dataset: 'DataMaker',
+              dataset: 'grafana',
               table: 'normalTable',
             },
           ],
@@ -170,7 +168,7 @@ test.describe(
       // Validate the query
       await expect(
         explorePage.getByGrafanaSelector(selectors.components.CodeEditor.container).getByRole('textbox')
-      ).toHaveValue(`SELECT\n  *\nFROM\n  DataMaker.normalTable\nWHERE\n  name IN ('a')\nLIMIT\n  50`);
+      ).toHaveValue(`SELECT\n  *\nFROM\n  grafana.normalTable\nWHERE\n  name IN ('a')\nLIMIT\n  50`);
     });
   }
 );
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index ab2b61ba179..9e53b6cb08b 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -161,10 +161,6 @@ export interface FeatureToggles {
   */
   pluginsFrontendSandbox?: boolean;
   /**
-  * Enables previous SQL data source dataset dropdown behavior
-  */
-  sqlDatasourceDatabaseSelection?: boolean;
-  /**
   * Enables writing multiple items from a single query within Recorded Queries
   * @default true
   */
diff --git a/packages/grafana-sql/src/components/DatasetSelector.tsx b/packages/grafana-sql/src/components/DatasetSelector.tsx
index 6059d7efe43..f7324005e03 100644
--- a/packages/grafana-sql/src/components/DatasetSelector.tsx
+++ b/packages/grafana-sql/src/components/DatasetSelector.tsx
@@ -1,4 +1,3 @@
-import { useEffect } from 'react';
 import { useAsync } from 'react-use';
 
 import { SelectableValue } from '@grafana/data';
@@ -7,8 +6,6 @@ import { Select } from '@grafana/ui';
 
 import { DB, ResourceSelectorProps, SQLDialect, toOption } from '../types';
 
-import { isSqlDatasourceDatabaseSelectionFeatureFlagEnabled } from './QueryEditorFeatureFlag.utils';
-
 export interface DatasetSelectorProps extends ResourceSelectorProps {
   db: DB;
   dataset: string | undefined;
@@ -37,13 +34,11 @@ export const DatasetSelector = ({
   const hasPreconfigCondition = !!preconfiguredDataset || dialect === 'postgres';
 
   const state = useAsync(async () => {
-    if (isSqlDatasourceDatabaseSelectionFeatureFlagEnabled()) {
-      // If a default database is already configured for a MSSQL or MySQL data source, OR the data source is Postgres, no need to fetch other databases.
-      if (hasPreconfigCondition) {
-        // Set the current database to the preconfigured database.
-        onChange(toOption(preconfiguredDataset));
-        return [toOption(preconfiguredDataset)];
-      }
+    // If a default database is already configured for a MSSQL or MySQL data source, OR the data source is Postgres, no need to fetch other databases.
+    if (hasPreconfigCondition) {
+      // Set the current database to the preconfigured database.
+      onChange(toOption(preconfiguredDataset));
+      return [toOption(preconfiguredDataset)];
     }
 
     // If there is no preconfigured database, but there is a selected dataset, set the current database to the selected dataset.
@@ -56,24 +51,6 @@ export const DatasetSelector = ({
     return datasets.map(toOption);
   }, []);
 
-  useEffect(() => {
-    if (!isSqlDatasourceDatabaseSelectionFeatureFlagEnabled()) {
-      // Set default dataset when values are fetched
-      if (!dataset) {
-        if (state.value && state.value[0]) {
-          onChange(state.value[0]);
-        }
-      } else {
-        if (state.value && state.value.find((v) => v.value === dataset) === undefined) {
-          // if value is set and newly fetched values does not contain selected value
-          if (state.value.length > 0) {
-            onChange(state.value[0]);
-          }
-        }
-      }
-    }
-  }, [state.value, onChange, dataset]);
-
   return (
     <Select
       aria-label={t('grafana-sql.components.dataset-selector.aria-label-dataset-selector', 'Dataset selector')}
diff --git a/packages/grafana-sql/src/components/QueryEditorFeatureFlag.utils.ts b/packages/grafana-sql/src/components/QueryEditorFeatureFlag.utils.ts
deleted file mode 100644
index 59f9d51ca47..00000000000
--- a/packages/grafana-sql/src/components/QueryEditorFeatureFlag.utils.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { config } from '@grafana/runtime';
-
-export const isSqlDatasourceDatabaseSelectionFeatureFlagEnabled = () => {
-  return !!config.featureToggles.sqlDatasourceDatabaseSelection;
-};
diff --git a/packages/grafana-sql/src/components/QueryHeader.tsx b/packages/grafana-sql/src/components/QueryHeader.tsx
index 240b73a3c27..fa0cb184d2a 100644
--- a/packages/grafana-sql/src/components/QueryHeader.tsx
+++ b/packages/grafana-sql/src/components/QueryHeader.tsx
@@ -13,7 +13,6 @@ import { SQLQuery, QueryFormat, QueryRowFilter, QUERY_FORMAT_OPTIONS, DB, SQLDia
 
 import { ConfirmModal } from './ConfirmModal';
 import { DatasetSelector } from './DatasetSelector';
-import { isSqlDatasourceDatabaseSelectionFeatureFlagEnabled } from './QueryEditorFeatureFlag.utils';
 import { TableSelector } from './TableSelector';
 
 export interface QueryHeaderProps {
@@ -117,11 +116,6 @@ export function QueryHeader({
     if (dialect === 'influx') {
       return false;
     }
-    // If the feature flag is DISABLED, && the datasource is Postgres (`dialect = 'postgres`),
-    // we want to hide the dropdown - as per previous behavior.
-    if (!isSqlDatasourceDatabaseSelectionFeatureFlagEnabled() && dialect === 'postgres') {
-      return false;
-    }
 
     return true;
   };
diff --git a/packages/grafana-sql/src/components/SqlComponents.test.tsx b/packages/grafana-sql/src/components/SqlComponents.test.tsx
index efe5bd85bd7..5aaf8f154cf 100644
--- a/packages/grafana-sql/src/components/SqlComponents.test.tsx
+++ b/packages/grafana-sql/src/components/SqlComponents.test.tsx
@@ -1,7 +1,5 @@
 import { render, waitFor } from '@testing-library/react';
 
-import { config } from '@grafana/runtime';
-
 import { SQLExpression } from '../types';
 import { makeVariable } from '../utils/testHelpers';
 
@@ -10,14 +8,6 @@ import { buildMockDatasetSelectorProps, buildMockTableSelectorProps } from './Sq
 import { TableSelector } from './TableSelector';
 import { removeQuotesForMultiVariables } from './visual-query-builder/SQLWhereRow';
 
-beforeEach(() => {
-  config.featureToggles.sqlDatasourceDatabaseSelection = true;
-});
-
-afterEach(() => {
-  config.featureToggles.sqlDatasourceDatabaseSelection = false;
-});
-
 describe('DatasetSelector', () => {
   it('should only query the database when needed', async () => {
     const mockProps = buildMockDatasetSelectorProps();
diff --git a/packages/grafana-sql/src/datasource/SqlDatasource.ts b/packages/grafana-sql/src/datasource/SqlDatasource.ts
index e255c256ed8..f3e3f6880ae 100644
--- a/packages/grafana-sql/src/datasource/SqlDatasource.ts
+++ b/packages/grafana-sql/src/datasource/SqlDatasource.ts
@@ -35,8 +35,6 @@ import { MACRO_NAMES } from '../constants';
 import { DB, SQLQuery, SQLOptions, SqlQueryModel, QueryFormat } from '../types';
 import migrateAnnotation from '../utils/migration';
 
-import { isSqlDatasourceDatabaseSelectionFeatureFlagEnabled } from './../components/QueryEditorFeatureFlag.utils';
-
 export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLOptions> {
   id: number;
   responseParser: ResponseParser;
@@ -127,13 +125,11 @@ export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLO
 
   query(request: DataQueryRequest<SQLQuery>): Observable<DataQueryResponse> {
     // This logic reenables the previous SQL behavior regarding what databases are available for the user to query.
-    if (isSqlDatasourceDatabaseSelectionFeatureFlagEnabled()) {
-      const databaseIssue = this.checkForDatabaseIssue(request);
+    const databaseIssue = this.checkForDatabaseIssue(request);
 
-      if (!!databaseIssue) {
-        const error = new Error(databaseIssue);
-        return throwError(() => error);
-      }
+    if (!!databaseIssue) {
+      const error = new Error(databaseIssue);
+      return throwError(() => error);
     }
 
     request.targets.forEach((target) => {
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 96e117d40cf..44ff23ec99d 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -254,14 +254,6 @@ var (
 			Stage:       FeatureStagePrivatePreview,
 			Owner:       grafanaPluginsPlatformSquad,
 		},
-		{
-			Name:              "sqlDatasourceDatabaseSelection",
-			Description:       "Enables previous SQL data source dataset dropdown behavior",
-			FrontendOnly:      true,
-			Stage:             FeatureStagePublicPreview,
-			Owner:             grafanaOSSBigTent,
-			HideFromAdminPage: true,
-		},
 		{
 			Name:           "recordedQueriesMulti",
 			Description:    "Enables writing multiple items from a single query within Recorded Queries",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 382137df4e0..da4ec52ac27 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -32,7 +32,6 @@ faroDatasourceSelector,preview,@grafana/app-o11y,false,false,true
 enableDatagridEditing,preview,@grafana/dataviz-squad,false,false,true
 extraThemes,experimental,@grafana/grafana-frontend-platform,false,false,true
 pluginsFrontendSandbox,privatePreview,@grafana/plugins-platform-backend,false,false,false
-sqlDatasourceDatabaseSelection,preview,@grafana/oss-big-tent,false,false,true
 recordedQueriesMulti,GA,@grafana/observability-metrics,false,false,false
 logsExploreTableVisualisation,GA,@grafana/observability-logs,false,false,true
 awsDatasourcesTempCredentials,GA,@grafana/aws-datasources,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index cde2bae2dbf..19fd4691ef5 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -139,10 +139,6 @@ const (
 	// Enables the plugins frontend sandbox
 	FlagPluginsFrontendSandbox = "pluginsFrontendSandbox"
 
-	// FlagSqlDatasourceDatabaseSelection
-	// Enables previous SQL data source dataset dropdown behavior
-	FlagSqlDatasourceDatabaseSelection = "sqlDatasourceDatabaseSelection"
-
 	// FlagRecordedQueriesMulti
 	// Enables writing multiple items from a single query within Recorded Queries
 	FlagRecordedQueriesMulti = "recordedQueriesMulti"
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 6edcea489d1..dab955c2ce5 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -2927,7 +2927,8 @@
       "metadata": {
         "name": "sqlDatasourceDatabaseSelection",
         "resourceVersion": "1753448760331",
-        "creationTimestamp": "2023-06-06T16:28:52Z"
+        "creationTimestamp": "2023-06-06T16:28:52Z",
+        "deletionTimestamp": "2025-08-08T12:18:29Z"
       },
       "spec": {
         "description": "Enables previous SQL data source dataset dropdown behavior",

From 80e8a6e2118020274e2379ac37ef381903725089 Mon Sep 17 00:00:00 2001
From: Bogdan Matei <bogdan.matei@grafana.com>
Date: Tue, 12 Aug 2025 16:23:19 +0300
Subject: [PATCH 109/243] Dashboard: Improvements to conditional rendering
 (#108108)

---
 .../kinds/v2alpha1/dashboard_spec.cue         |   2 +-
 .../kinds/v2beta1/dashboard_spec.cue          |   2 +-
 .../dashboard/v2alpha1/dashboard_spec.cue     |   2 +-
 .../dashboard/v2alpha1/dashboard_spec_gen.go  |   6 +-
 .../apis/dashboard/v2beta1/dashboard_spec.cue |   2 +-
 .../dashboard/v2beta1/dashboard_spec_gen.go   |   6 +-
 .../dashboard/v2alpha0/dashboard.schema.cue   |   2 +-
 .../dashboard/v2alpha1/types.spec.gen.ts      |   2 +-
 .../dashboard/v2beta1/types.spec.gen.ts       |   2 +-
 .../ConditionalRenderingGroup.tsx             |  18 +-
 .../ConditionalRenderingVariable.tsx          | 161 ++++++++++++++----
 .../conditional-rendering/types.ts            |   2 +-
 .../layout-auto-grid/AutoGridItemRenderer.tsx |  14 +-
 public/locales/en-US/grafana.json             |   7 +-
 14 files changed, 164 insertions(+), 64 deletions(-)

diff --git a/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue b/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
index 8ab1891e626..2aba16b9489 100644
--- a/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
+++ b/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
@@ -941,7 +941,7 @@ ConditionalRenderingVariableKind: {
 
 ConditionalRenderingVariableSpec: {
 	variable: string
-	operator: "equals" | "notEquals"
+	operator: "equals" | "notEquals" | "matches" | "notMatches"
 	value:    string
 }
 
diff --git a/apps/dashboard/kinds/v2beta1/dashboard_spec.cue b/apps/dashboard/kinds/v2beta1/dashboard_spec.cue
index cf71e6b2dc4..1c7ca148a08 100644
--- a/apps/dashboard/kinds/v2beta1/dashboard_spec.cue
+++ b/apps/dashboard/kinds/v2beta1/dashboard_spec.cue
@@ -942,7 +942,7 @@ ConditionalRenderingVariableKind: {
 
 ConditionalRenderingVariableSpec: {
 	variable: string
-	operator: "equals" | "notEquals"
+	operator: "equals" | "notEquals" | "matches" | "notMatches"
 	value:    string
 }
 
diff --git a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
index 160adf4e7bf..f566d3775b6 100644
--- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
@@ -945,7 +945,7 @@ ConditionalRenderingVariableKind: {
 
 ConditionalRenderingVariableSpec: {
 	variable: string
-	operator: "equals" | "notEquals"
+	operator: "equals" | "notEquals" | "matches" | "notMatches"
 	value:    string
 }
 
diff --git a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go
index 9ddbe89502f..f1e36092724 100644
--- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go
+++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go
@@ -1859,8 +1859,10 @@ const (
 type DashboardConditionalRenderingVariableSpecOperator string
 
 const (
-	DashboardConditionalRenderingVariableSpecOperatorEquals    DashboardConditionalRenderingVariableSpecOperator = "equals"
-	DashboardConditionalRenderingVariableSpecOperatorNotEquals DashboardConditionalRenderingVariableSpecOperator = "notEquals"
+	DashboardConditionalRenderingVariableSpecOperatorEquals     DashboardConditionalRenderingVariableSpecOperator = "equals"
+	DashboardConditionalRenderingVariableSpecOperatorNotEquals  DashboardConditionalRenderingVariableSpecOperator = "notEquals"
+	DashboardConditionalRenderingVariableSpecOperatorMatches    DashboardConditionalRenderingVariableSpecOperator = "matches"
+	DashboardConditionalRenderingVariableSpecOperatorNotMatches DashboardConditionalRenderingVariableSpecOperator = "notMatches"
 )
 
 // +k8s:openapi-gen=true
diff --git a/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec.cue b/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec.cue
index a35eaa482f7..d110a33fa01 100644
--- a/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec.cue
@@ -946,7 +946,7 @@ ConditionalRenderingVariableKind: {
 
 ConditionalRenderingVariableSpec: {
 	variable: string
-	operator: "equals" | "notEquals"
+	operator: "equals" | "notEquals" | "matches" | "notMatches"
 	value:    string
 }
 
diff --git a/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec_gen.go b/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec_gen.go
index d66f582e42a..10e17f2c5e2 100644
--- a/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec_gen.go
+++ b/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec_gen.go
@@ -1884,8 +1884,10 @@ const (
 type DashboardConditionalRenderingVariableSpecOperator string
 
 const (
-	DashboardConditionalRenderingVariableSpecOperatorEquals    DashboardConditionalRenderingVariableSpecOperator = "equals"
-	DashboardConditionalRenderingVariableSpecOperatorNotEquals DashboardConditionalRenderingVariableSpecOperator = "notEquals"
+	DashboardConditionalRenderingVariableSpecOperatorEquals     DashboardConditionalRenderingVariableSpecOperator = "equals"
+	DashboardConditionalRenderingVariableSpecOperatorNotEquals  DashboardConditionalRenderingVariableSpecOperator = "notEquals"
+	DashboardConditionalRenderingVariableSpecOperatorMatches    DashboardConditionalRenderingVariableSpecOperator = "matches"
+	DashboardConditionalRenderingVariableSpecOperatorNotMatches DashboardConditionalRenderingVariableSpecOperator = "notMatches"
 )
 
 // +k8s:openapi-gen=true
diff --git a/packages/grafana-schema/src/schema/dashboard/v2alpha0/dashboard.schema.cue b/packages/grafana-schema/src/schema/dashboard/v2alpha0/dashboard.schema.cue
index 3f1f40287cc..5369503d6f2 100644
--- a/packages/grafana-schema/src/schema/dashboard/v2alpha0/dashboard.schema.cue
+++ b/packages/grafana-schema/src/schema/dashboard/v2alpha0/dashboard.schema.cue
@@ -934,7 +934,7 @@ ConditionalRenderingVariableKind: {
 
 ConditionalRenderingVariableSpec: {
   variable: string
-  operator: "equals" | "notEquals"
+  operator: "equals" | "notEquals" | "matches" | "notMatches"
   value: string
 }
 
diff --git a/packages/grafana-schema/src/schema/dashboard/v2alpha1/types.spec.gen.ts b/packages/grafana-schema/src/schema/dashboard/v2alpha1/types.spec.gen.ts
index 04fc5092d8a..d821bff4532 100644
--- a/packages/grafana-schema/src/schema/dashboard/v2alpha1/types.spec.gen.ts
+++ b/packages/grafana-schema/src/schema/dashboard/v2alpha1/types.spec.gen.ts
@@ -700,7 +700,7 @@ export const defaultConditionalRenderingVariableKind = (): ConditionalRenderingV
 
 export interface ConditionalRenderingVariableSpec {
 	variable: string;
-	operator: "equals" | "notEquals";
+	operator: "equals" | "notEquals" | "matches" | "notMatches";
 	value: string;
 }
 
diff --git a/packages/grafana-schema/src/schema/dashboard/v2beta1/types.spec.gen.ts b/packages/grafana-schema/src/schema/dashboard/v2beta1/types.spec.gen.ts
index a6140372eb9..46b54c556fa 100644
--- a/packages/grafana-schema/src/schema/dashboard/v2beta1/types.spec.gen.ts
+++ b/packages/grafana-schema/src/schema/dashboard/v2beta1/types.spec.gen.ts
@@ -699,7 +699,7 @@ export const defaultConditionalRenderingVariableKind = (): ConditionalRenderingV
 
 export interface ConditionalRenderingVariableSpec {
 	variable: string;
-	operator: "equals" | "notEquals";
+	operator: "equals" | "notEquals" | "matches" | "notMatches";
 	value: string;
 }
 
diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroup.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroup.tsx
index 8ebba87cab3..59fdccbd190 100644
--- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroup.tsx
+++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroup.tsx
@@ -70,15 +70,17 @@ export class ConditionalRenderingGroup extends ConditionalRenderingBase<Conditio
     this.setStateAndNotify({ condition });
   }
 
-  public createItem(itemType: GroupConditionItemType) {
-    const item =
-      itemType === 'data'
-        ? ConditionalRenderingData.createEmpty()
-        : itemType === 'variable'
-          ? ConditionalRenderingVariable.createEmpty(sceneGraph.getVariables(this).state.variables[0].state.name)
-          : ConditionalRenderingTimeRangeSize.createEmpty();
+  public createItem(itemType: GroupConditionItemType): ConditionalRenderingConditions {
+    switch (itemType) {
+      case 'data':
+        return ConditionalRenderingData.createEmpty();
 
-    return item;
+      case 'timeRangeSize':
+        return ConditionalRenderingTimeRangeSize.createEmpty();
+
+      case 'variable':
+        return ConditionalRenderingVariable.createEmpty(sceneGraph.getVariables(this).state.variables[0].state.name);
+    }
   }
 
   public addItem(item: ConditionalRenderingConditions) {
diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingVariable.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingVariable.tsx
index 92dee9f7c0f..1b074c8c149 100644
--- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingVariable.tsx
+++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingVariable.tsx
@@ -1,9 +1,12 @@
-import { useMemo } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import { t } from '@grafana/i18n';
 import { SceneComponentProps, sceneGraph, VariableDependencyConfig } from '@grafana/scenes';
-import { ConditionalRenderingVariableKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
-import { Box, Combobox, ComboboxOption, Input, Stack } from '@grafana/ui';
+import {
+  ConditionalRenderingVariableKind,
+  ConditionalRenderingVariableSpec,
+} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Box, Combobox, ComboboxOption, Field, Input, Stack } from '@grafana/ui';
 
 import { dashboardEditActions } from '../edit-pane/shared';
 
@@ -54,16 +57,29 @@ export class ConditionalRenderingVariable extends ConditionalRenderingBase<Condi
     const variable = sceneGraph.getVariables(this).getByName(this.state.value.name);
 
     if (!variable) {
-      return false;
+      return true;
     }
 
     const variableValue = variable.getValue() ?? '';
 
-    const hit = Array.isArray(variableValue)
-      ? variableValue.includes(this.state.value.value)
-      : variableValue === this.state.value.value;
+    let hit: boolean;
 
-    return this.state.value.operator === '!=' ? !hit : hit;
+    if (this.state.value.operator === '=' || this.state.value.operator === '!=') {
+      hit = Array.isArray(variableValue)
+        ? variableValue.includes(this.state.value.value.toString())
+        : variableValue === this.state.value.value.toString();
+    } else {
+      try {
+        const regex = new RegExp(this.state.value.value);
+        hit = Array.isArray(variableValue)
+          ? variableValue.some((currentVariableValue) => regex.test(currentVariableValue.toString()))
+          : regex.test(variableValue.toString());
+      } catch (err) {
+        return true;
+      }
+    }
+
+    return this.state.value.operator === '!=' || this.state.value.operator === '!~' ? !hit : hit;
   }
 
   public serialize(): ConditionalRenderingVariableKind {
@@ -71,7 +87,7 @@ export class ConditionalRenderingVariable extends ConditionalRenderingBase<Condi
       kind: 'ConditionalRenderingVariable',
       spec: {
         variable: this.state.value.name,
-        operator: this.state.value.operator === '=' ? 'equals' : 'notEquals',
+        operator: this._getLongOperator(this.state.value.operator),
         value: this.state.value.value,
       },
     };
@@ -81,7 +97,7 @@ export class ConditionalRenderingVariable extends ConditionalRenderingBase<Condi
     return new ConditionalRenderingVariable({
       value: {
         name: model.spec.variable,
-        operator: model.spec.operator === 'equals' ? '=' : '!=',
+        operator: ConditionalRenderingVariable._getShortOperator(model.spec.operator),
         value: model.spec.value,
       },
     });
@@ -90,14 +106,54 @@ export class ConditionalRenderingVariable extends ConditionalRenderingBase<Condi
   public static createEmpty(name: string): ConditionalRenderingVariable {
     return new ConditionalRenderingVariable({ value: { name, operator: '=', value: '' } });
   }
+
+  private _getLongOperator(operator: VariableConditionValueOperator): ConditionalRenderingVariableSpec['operator'] {
+    switch (operator) {
+      case '=':
+        return 'equals';
+
+      case '!=':
+        return 'notEquals';
+
+      case '=~':
+        return 'matches';
+
+      case '!~':
+        return 'notMatches';
+    }
+  }
+
+  private static _getShortOperator(
+    operator: ConditionalRenderingVariableSpec['operator']
+  ): VariableConditionValueOperator {
+    switch (operator) {
+      case 'equals':
+        return '=';
+
+      case 'notEquals':
+        return '!=';
+
+      case 'matches':
+        return '=~';
+
+      case 'notMatches':
+        return '!~';
+    }
+  }
 }
 
 function ConditionalRenderingVariableRenderer({ model }: SceneComponentProps<ConditionalRenderingVariable>) {
   const { value } = model.useState();
 
+  const [actualValue, setActualValue] = useState(value.value);
+
+  useEffect(() => {
+    setActualValue(value.value);
+  }, [value.value]);
+
   const variables = useMemo(() => sceneGraph.getVariables(model), [model]);
 
-  const variableNames: Array<ComboboxOption<string>> = useMemo(
+  const variableNames: ComboboxOption[] = useMemo(
     () => variables.state.variables.map((v) => ({ value: v.state.name, label: v.state.label ?? v.state.name })),
     [variables.state.variables]
   );
@@ -109,10 +165,31 @@ function ConditionalRenderingVariableRenderer({ model }: SceneComponentProps<Con
         value: '!=',
         description: t('dashboard.conditional-rendering.conditions.variable.operator.not-equals', 'Not equals'),
       },
+      {
+        value: '=~',
+        description: t('dashboard.conditional-rendering.conditions.variable.operator.matches', 'Matches'),
+      },
+      {
+        value: '!~',
+        description: t('dashboard.conditional-rendering.conditions.variable.operator.not-matches', 'Not matches'),
+      },
     ],
     []
   );
 
+  const valueError = useMemo(() => {
+    if (value.operator === '=~' || value.operator === '!~') {
+      try {
+        new RegExp(actualValue);
+        return '';
+      } catch (err) {
+        return t('dashboard.conditional-rendering.conditions.variable.error.invalid-regex', 'Invalid regex');
+      }
+    }
+
+    return '';
+  }, [actualValue, value.operator]);
+
   const undoText = t('dashboard.edit-actions.edit-template-variable-rule', 'Change template variable rule');
 
   return (
@@ -124,12 +201,14 @@ function ConditionalRenderingVariableRenderer({ model }: SceneComponentProps<Con
             options={variableNames}
             value={value.name}
             onChange={(option) => {
-              dashboardEditActions.edit({
-                description: undoText,
-                source: model,
-                perform: () => model.setStateAndNotify({ value: { ...value, name: option.value } }),
-                undo: () => model.setStateAndNotify({ value: { ...value, name: value.name } }),
-              });
+              if (option.value !== value.name) {
+                dashboardEditActions.edit({
+                  description: undoText,
+                  source: model,
+                  perform: () => model.setStateAndNotify({ value: { ...value, name: option.value } }),
+                  undo: () => model.setStateAndNotify({ value: { ...value, name: value.name } }),
+                });
+              }
             }}
           />
         </Box>
@@ -140,28 +219,38 @@ function ConditionalRenderingVariableRenderer({ model }: SceneComponentProps<Con
           options={operatorOptions}
           value={value.operator}
           onChange={(option) => {
-            dashboardEditActions.edit({
-              description: undoText,
-              source: model,
-              perform: () => model.setStateAndNotify({ value: { ...value, operator: option.value } }),
-              undo: () => model.setStateAndNotify({ value: { ...value, operator: value.operator } }),
-            });
+            if (option.value !== value.operator) {
+              dashboardEditActions.edit({
+                description: undoText,
+                source: model,
+                perform: () => model.setStateAndNotify({ value: { ...value, operator: option.value } }),
+                undo: () => model.setStateAndNotify({ value: { ...value, operator: value.operator } }),
+              });
+            }
           }}
         />
       </Stack>
-      <Input
-        placeholder={t('dashboard.conditional-rendering.conditions.variable.value', 'Value')}
-        value={value.value}
-        onChange={(e) => {
-          const eventValue = e.currentTarget.value;
-          dashboardEditActions.edit({
-            description: undoText,
-            source: model,
-            perform: () => model.setStateAndNotify({ value: { ...value, value: eventValue } }),
-            undo: () => model.setStateAndNotify({ value: { ...value, value: value.value } }),
-          });
-        }}
-      />
+      <Field error={valueError} invalid={!!valueError} noMargin>
+        <Input
+          placeholder={t('dashboard.conditional-rendering.conditions.variable.value', 'Value')}
+          value={actualValue}
+          onChange={(evt) => {
+            if (evt.currentTarget.value !== value.value) {
+              setActualValue(evt.currentTarget.value);
+            }
+          }}
+          onBlur={() => {
+            if (actualValue !== value.value) {
+              dashboardEditActions.edit({
+                description: undoText,
+                source: model,
+                perform: () => model.setStateAndNotify({ value: { ...value, value: actualValue } }),
+                undo: () => model.setStateAndNotify({ value: { ...value, value: value.value } }),
+              });
+            }
+          }}
+        />
+      </Field>
     </Stack>
   );
 }
diff --git a/public/app/features/dashboard-scene/conditional-rendering/types.ts b/public/app/features/dashboard-scene/conditional-rendering/types.ts
index 6a1f94876fd..f07330967de 100644
--- a/public/app/features/dashboard-scene/conditional-rendering/types.ts
+++ b/public/app/features/dashboard-scene/conditional-rendering/types.ts
@@ -22,7 +22,7 @@ export type GroupConditionValue = ConditionalRenderingConditions[];
 
 export type TimeRangeSizeConditionValue = string;
 
-export type VariableConditionValueOperator = '=' | '!=';
+export type VariableConditionValueOperator = '=' | '!=' | '=~' | '!~';
 
 export type VariableConditionValue = {
   name: string;
diff --git a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
index f3cee9f8b23..f7abc61955e 100644
--- a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
@@ -22,13 +22,6 @@ export function AutoGridItemRenderer({ model }: SceneComponentProps<AutoGridItem
 
   const isLazy = useMemo(() => getIsLazy(preload), [preload]);
 
-  if (isConditionallyHidden && !isEditing) {
-    return null;
-  }
-
-  const isDragging = !!draggingKey;
-  const isDragged = draggingKey === key;
-
   const Wrapper = useMemo(
     () =>
       memo(
@@ -69,6 +62,13 @@ export function AutoGridItemRenderer({ model }: SceneComponentProps<AutoGridItem
     [conditionalRenderingClass, conditionalRenderingOverlay, isLazy, key, model.containerRef, styles]
   );
 
+  if (isConditionallyHidden && !isEditing) {
+    return null;
+  }
+
+  const isDragging = !!draggingKey;
+  const isDragged = draggingKey === key;
+
   return repeatedPanels ? (
     <>
       {repeatedPanels.map((item, index) => (
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 2c9adb3e3e4..d5bf489e26b 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -4497,12 +4497,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": "Invalid regex"
+          },
           "info": "Show or hide the {{type}} dynamically based on the variable value.",
           "label": "Template variable",
           "name": "Name",
           "operator": {
             "equals": "Equals",
-            "not-equals": "Not equals"
+            "matches": "Matches",
+            "not-equals": "Not equals",
+            "not-matches": "Not matches"
           },
           "value": "Value"
         }

From 904bf6b8071e1eec629a33b4610a03ae01f8a9e7 Mon Sep 17 00:00:00 2001
From: Matheus Macabu <macabu@users.noreply.github.com>
Date: Tue, 12 Aug 2025 15:33:23 +0200
Subject: [PATCH 110/243] Investigations: Move Grafana core packages to
 pkg/registry/apps (#109477)

---
 apps/investigations/go.mod                    | 158 +---
 apps/investigations/go.sum                    | 824 +-----------------
 .../apps/investigations}/authorizer.go        |   2 +-
 .../apps/investigations}/authorizer_test.go   |   2 +-
 pkg/registry/apps/investigations/register.go  |   2 +-
 5 files changed, 23 insertions(+), 965 deletions(-)
 rename {apps/investigations/pkg/app => pkg/registry/apps/investigations}/authorizer.go (97%)
 rename {apps/investigations/pkg/app => pkg/registry/apps/investigations}/authorizer_test.go (99%)

diff --git a/apps/investigations/go.mod b/apps/investigations/go.mod
index 0f5c5c227df..f94e2710e12 100644
--- a/apps/investigations/go.mod
+++ b/apps/investigations/go.mod
@@ -3,195 +3,68 @@ module github.com/grafana/grafana/apps/investigations
 go 1.24.6
 
 require (
-	github.com/grafana/grafana v0.0.0-00010101000000-000000000000
-	github.com/grafana/grafana-app-sdk v0.40.2
-	github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250804150913-990f1c69ecc2
-	github.com/stretchr/testify v1.10.0
+	github.com/grafana/grafana-app-sdk v0.40.3
 	k8s.io/apimachinery v0.33.3
-	k8s.io/apiserver v0.33.3
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
 )
 
-// transitive dependencies that need replaced
-// TODO: stop depending on grafana core
-replace github.com/grafana/grafana => ../..
-
-replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20250620093340-be61a673dee6
-
 require (
-	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/BurntSushi/toml v1.5.0 // indirect
-	github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f // indirect
-	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
-	github.com/apache/arrow-go/v18 v18.3.0 // indirect
-	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.36.5 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.70 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 // indirect
-	github.com/aws/smithy-go v1.22.4 // indirect
-	github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/bluele/gcache v0.0.2 // indirect
 	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
-	github.com/bwmarrin/snowflake v0.3.0 // indirect
 	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cheekybits/genny v1.0.0 // indirect
-	github.com/chromedp/cdproto v0.0.0-20250429231605-6ed5b53462d4 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/diegoholiveira/jsonlogic/v3 v3.7.4 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/elazarl/goproxy v1.7.2 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
-	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
-	github.com/fatih/color v1.18.0 // indirect
+	github.com/evanphx/json-patch v5.9.11+incompatible // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/getkin/kin-openapi v0.132.0 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.4 // indirect
-	github.com/go-kit/log v0.2.1 // indirect
-	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/go-sql-driver/mysql v1.9.3 // indirect
-	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/gogo/googleapis v1.4.1 // indirect
+	github.com/go-test/deep v1.1.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-migrate/migrate/v4 v4.7.0 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/btree v1.1.3 // indirect
-	github.com/google/flatbuffers v25.2.10+incompatible // indirect
 	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/mux v1.8.1 // indirect
-	github.com/grafana/alerting v0.0.0-20250729175202-b4b881b7b263 // indirect
-	github.com/grafana/authlib v0.0.0-20250710201142-9542f2f28d43 // indirect
-	github.com/grafana/authlib/types v0.0.0-20250710201142-9542f2f28d43 // indirect
-	github.com/grafana/dataplane/sdata v0.0.9 // indirect
-	github.com/grafana/dskit v0.0.0-20250611075409-46f51e1ce914 // indirect
-	github.com/grafana/grafana-app-sdk/logging v0.40.1 // indirect
-	github.com/grafana/grafana-aws-sdk v1.1.0 // indirect
-	github.com/grafana/grafana-azure-sdk-go/v2 v2.2.0 // indirect
-	github.com/grafana/grafana-plugin-sdk-go v0.278.0 // indirect
-	github.com/grafana/grafana/pkg/apiserver v0.0.0-20250804150913-990f1c69ecc2 // indirect
-	github.com/grafana/otel-profiling-go v0.5.1 // indirect
-	github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
-	github.com/grafana/sqlds/v4 v4.2.4 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
+	github.com/grafana/grafana-app-sdk/logging v0.40.2 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-hclog v1.6.3 // indirect
-	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-metrics v0.5.4 // indirect
-	github.com/hashicorp/go-msgpack/v2 v2.1.2 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.6.3 // indirect
-	github.com/hashicorp/go-sockaddr v1.0.7 // indirect
-	github.com/hashicorp/golang-lru v1.0.2 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
-	github.com/hashicorp/memberlist v0.5.2 // indirect
-	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
-	github.com/jmespath-community/go-jmespath v1.1.1 // indirect
-	github.com/jmoiron/sqlx v1.3.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/jszwedko/go-datemath v0.1.1-0.20230526204004-640a500621d6 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
-	github.com/lib/pq v1.10.9 // indirect
-	github.com/magefile/mage v1.15.0 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
-	github.com/mattetti/filebuffer v1.0.1 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/mattn/go-sqlite3 v1.14.22 // indirect
-	github.com/mdlayher/socket v0.4.1 // indirect
-	github.com/mdlayher/vsock v1.2.1 // indirect
-	github.com/miekg/dns v1.1.63 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mithrandie/csvq v1.18.1 // indirect
-	github.com/mithrandie/csvq-driver v1.7.0 // indirect
-	github.com/mithrandie/go-file/v2 v2.1.0 // indirect
-	github.com/mithrandie/go-text v1.6.0 // indirect
-	github.com/mithrandie/ternary v1.1.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
-	github.com/nikunjy/rules v1.5.0 // indirect
 	github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
 	github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
-	github.com/oklog/run v1.1.0 // indirect
-	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/open-feature/go-sdk v1.14.1 // indirect
-	github.com/open-feature/go-sdk-contrib/providers/go-feature-flag v0.2.3 // indirect
-	github.com/open-feature/go-sdk-contrib/providers/ofrep v0.1.5 // indirect
-	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/onsi/ginkgo/v2 v2.22.2 // indirect
+	github.com/onsi/gomega v1.36.2 // indirect
 	github.com/perimeterx/marshmallow v1.1.5 // indirect
-	github.com/pierrec/lz4/v4 v4.1.22 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/alertmanager v0.28.0 // indirect
-	github.com/prometheus/client_golang v1.22.0 // indirect
+	github.com/prometheus/client_golang v1.23.0 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.65.0 // indirect
-	github.com/prometheus/exporter-toolkit v0.14.0 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/puzpuzpuz/xsync/v2 v2.5.1 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/spf13/pflag v1.0.7 // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/thomaspoignant/go-feature-flag v1.42.0 // indirect
-	github.com/tjhop/slog-gokit v0.1.3 // indirect
-	github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
-	github.com/unknwon/com v1.0.1 // indirect
-	github.com/unknwon/log v0.0.0-20200308114134-929b1006e34a // indirect
-	github.com/urfave/cli v1.22.16 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	github.com/zeebo/xxh3 v1.0.2 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.61.0 // indirect
-	go.opentelemetry.io/contrib/propagators/jaeger v1.36.0 // indirect
-	go.opentelemetry.io/contrib/samplers/jaegerremote v0.30.0 // indirect
 	go.opentelemetry.io/otel v1.37.0 // indirect
-	go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
 	go.opentelemetry.io/otel/metric v1.37.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	golang.org/x/crypto v0.40.0 // indirect
-	golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
-	golang.org/x/mod v0.26.0 // indirect
 	golang.org/x/net v0.42.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
@@ -199,30 +72,19 @@ require (
 	golang.org/x/term v0.33.0 // indirect
 	golang.org/x/text v0.27.0 // indirect
 	golang.org/x/time v0.11.0 // indirect
-	golang.org/x/tools v0.35.0 // indirect
-	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/grpc v1.74.2 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
-	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.33.3 // indirect
 	k8s.io/apiextensions-apiserver v0.33.3 // indirect
 	k8s.io/client-go v0.33.3 // indirect
-	k8s.io/component-base v0.33.3 // indirect
 	k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
-	modernc.org/libc v1.65.0 // indirect
-	modernc.org/mathutil v1.7.1 // indirect
-	modernc.org/memory v1.10.0 // indirect
-	modernc.org/sqlite v1.37.0 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
 	sigs.k8s.io/yaml v1.5.0 // indirect
-	xorm.io/builder v0.3.6 // indirect
 )
diff --git a/apps/investigations/go.sum b/apps/investigations/go.sum
index fdc15812b80..c586ffa88d2 100644
--- a/apps/investigations/go.sum
+++ b/apps/investigations/go.sum
@@ -1,1031 +1,229 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
-cuelang.org/go v0.11.1 h1:pV+49MX1mmvDm8Qh3Za3M786cty8VKPWzQ1Ho4gZRP0=
-cuelang.org/go v0.11.1/go.mod h1:PBY6XvPUswPPJ2inpvUozP9mebDVTXaeehQikhZPBz0=
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.1 h1:Wc1ml6QlJs2BHQ/9Bqu1jiyggbsSjramq2oUmp5WeIo=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.1/go.mod h1:Ot/6aikWnKWi4l9QB7qVSwa8iMphQNqkWALMoNT3rzM=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1/go.mod h1:JdM5psgjfBf5fo2uWOZhflPWyDBZ/O/CNAH9CtsuZE4=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 h1:FPKJS1T+clwv+OLGt13a8UjqeRuh0O4SJ3lUriThc+4=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1/go.mod h1:j2chePtV91HrC22tGoRX3sGY42uF13WzmmV80/OdVAA=
-github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
-github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e h1:NeAW1fUYUEWhft7pkxDf6WoUvEZJ/uOKsvtpjLnn8MU=
-github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
-github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-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 v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
-github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
-github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
-github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
-github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
-github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
-github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
-github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
-github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
-github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
-github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
-github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f h1:HR5nRmUQgXrwqZOwZ2DAc/aCi3Bu3xENpspW935vxu0=
-github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f/go.mod h1:f3HiCrHjHBdcm6E83vGaXh1KomZMA2P6aeo3hKx/wg0=
-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/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b h1:mimo19zliBX/vSQ6PWWSL9lK8qwHozUj03+zLoEB8O0=
-github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b/go.mod h1:fvzegU4vN3H1qMT+8wDmzjAcDONcgo2/SZ/TyfdUOFs=
-github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
-github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
-github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
-github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
-github.com/apache/arrow-go/v18 v18.3.0 h1:Xq4A6dZj9Nu33sqZibzn012LNnewkTUlfKVUFD/RX/I=
-github.com/apache/arrow-go/v18 v18.3.0/go.mod h1:eEM1DnUTHhgGAjf/ChvOAQbUQ+EPohtDrArffvUjPg8=
-github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
-github.com/apache/thrift v0.21.0 h1:tdPmh/ptjE1IJnhbhrcl2++TauVjy242rkV/UzJChnE=
-github.com/apache/thrift v0.21.0/go.mod h1:W1H8aR/QRtYNvrPeFXBtobyRkd0/YVhTc6i07XIAgDw=
-github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
-github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
-github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
-github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/at-wat/mqtt-go v0.19.4 h1:R2cbCU7O5PHQ38unbe1Y51ncG3KsFEJV6QeipDoqdLQ=
-github.com/at-wat/mqtt-go v0.19.4/go.mod h1:AsiWc9kqVOhqq7LzUeWT/AkKUBfx3Sw5cEe8lc06fqA=
-github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE=
-github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
-github.com/aws/aws-sdk-go-v2 v1.36.5 h1:0OF9RiEMEdDdZEMqF9MRjevyxAQcf6gY+E7vwBILFj0=
-github.com/aws/aws-sdk-go-v2 v1.36.5/go.mod h1:EYrzvCCN9CMUTa5+6lf6MM4tq3Zjp8UhSGR/cBsjai0=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.70 h1:ONnH5CM16RTXRkS8Z1qg7/s2eDOhHhaXVd72mmyv4/0=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.70/go.mod h1:M+lWhhmomVGgtuPOhO85u4pEa3SmssPTdcYpP/5J/xc=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 h1:SsytQyTMHMDPspp+spo7XwXTP44aJZZAC7fBV2C5+5s=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36/go.mod h1:Q1lnJArKRXkenyog6+Y+zr7WDpk4e6XlR6gs20bbeNo=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 h1:i2vNHQiXUvKhs3quBR6aqlgJaiaexz/aNvdCktW/kAM=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36/go.mod h1:UdyGa7Q91id/sdyHPwth+043HhmP6yP9MBHgbZM0xo8=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4 h1:CXV68E2dNqhuynZJPB80bhPQwAKqBWVer887figW6Jc=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4/go.mod h1:/xFi9KtvBXP97ppCz1TAEvU1Uf66qvid89rbem3wCzQ=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 h1:t0E6FzREdtCsiLIoLCWsYliNsRBgyGD/MCK571qk4MI=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17/go.mod h1:ygpklyoaypuyDvOM5ujWGrYWpAK3h7ugnmKCU/76Ys4=
-github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 h1:NFOJ/NXEGV4Rq//71Hs1jC/NvPs1ezajK+yQmkwnPV0=
-github.com/aws/aws-sdk-go-v2/service/sts v1.34.0/go.mod h1:7ph2tGpfQvwzgistp2+zga9f+bCjlQJPkPUmMgDSD7w=
-github.com/aws/smithy-go v1.22.4 h1:uqXzVZNuNexwc/xrh6Tb56u89WDlJY6HS+KC0S4QSjw=
-github.com/aws/smithy-go v1.22.4/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
-github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df h1:GSoSVRLoBaFpOOds6QyY1L8AX7uoY+Ln3BHc22W40X0=
-github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df/go.mod h1:hiVxq5OP2bUGBRNS3Z/bt/reCLFNbdcST6gISi1fiOM=
-github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=
-github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 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/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
-github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
-github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
-github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
-github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
-github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous=
 github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
-github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
-github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
-github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
-github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
-github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
-github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8=
 github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
-github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
-github.com/chromedp/cdproto v0.0.0-20250429231605-6ed5b53462d4 h1:UZdrvid2JFwnvPlUSEFlE794XZL4Jmrj8fuxfcLECJE=
-github.com/chromedp/cdproto v0.0.0-20250429231605-6ed5b53462d4/go.mod h1:NItd7aLkcfOA/dcMXvl8p1u+lQqioRMq/SqDp71Pb/k=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
-github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
-github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
-github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-github.com/cockroachdb/apd/v3 v3.2.1 h1:U+8j7t0axsIgvQUqthuNm82HIrYXodOV2iWLWtEaIwg=
-github.com/cockroachdb/apd/v3 v3.2.1/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc=
-github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
-github.com/containerd/containerd v1.2.7/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
-github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
-github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
-github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg=
-github.com/cznic/golex v0.0.0-20170803123110-4ab7c5e190e4/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc=
-github.com/cznic/internal v0.0.0-20180608152220-f44710a21d00/go.mod h1:olo7eAdKwJdXxb55TKGLiJ6xt1H0/tiiRCWKVLmtjY4=
-github.com/cznic/lldb v1.1.0/go.mod h1:FIZVUmYUVhPwRiPzL8nD/mpFcJ/G7SSXjjXYG4uRI3A=
-github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
-github.com/cznic/ql v1.2.0/go.mod h1:FbpzhyZrqr0PVlK6ury+PoW3T0ODUV22OeWIxcaOrSE=
-github.com/cznic/sortutil v0.0.0-20150617083342-4c7342852e65/go.mod h1:q2w6Bg5jeox1B+QkJ6Wp/+Vn0G/bo3f1uY7Fn3vivIQ=
-github.com/cznic/strutil v0.0.0-20171016134553-529a34b1c186/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc=
-github.com/cznic/zappy v0.0.0-20160723133515-2533cb5b45cc/go.mod h1:Y1SNZ4dRUOKXshKUbwUapqNncRrho4mkjQebgEHZLj8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/dhui/dktest v0.3.0/go.mod h1:cyzIUfGsBEbZ6BT7tnXqAShHSXCZhSNmFl70sZ7c1yc=
-github.com/diegoholiveira/jsonlogic/v3 v3.7.4 h1:92HSmB9bwM/o0ZvrCpcvTP2EsPXSkKtAniIr2W/dcIM=
-github.com/diegoholiveira/jsonlogic/v3 v3.7.4/go.mod h1:OYRb6FSTVmMM+MNQ7ElmMsczyNSepw+OU4Z8emDSi4w=
-github.com/dlmiddlecote/sqlstats v1.0.2 h1:gSU11YN23D/iY50A2zVYwgXgy072khatTsIW6UPjUtI=
-github.com/dlmiddlecote/sqlstats v1.0.2/go.mod h1:0CWaIh/Th+z2aI6Q9Jpfg/o21zmGxWhbByHgQSCUQvY=
-github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v0.7.3-0.20190103212154-2b7e084dc98b/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v0.7.3-0.20190817195342-4760db040282/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
-github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
-github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY=
-github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g=
-github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
-github.com/dolthub/go-mysql-server v0.19.1-0.20250410182021-5632d67cd46e h1:7pAttAqWaudUAsM9iHASi/4eFBK+qn4qeaNto7g8bK4=
-github.com/dolthub/go-mysql-server v0.19.1-0.20250410182021-5632d67cd46e/go.mod h1:KZyoO3jngyZCLyCf100FEQTrwAHj33AIMj4Zv4u3MNE=
-github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ=
-github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
-github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4 h1:LGTt2LtYX8vaai32d+c9L0sMcP+Dg9w1kO6+lbsxxYg=
-github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
-github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
-github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
 github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
 github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
-github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
-github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
-github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
-github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/fsouza/fake-gcs-server v1.7.0/go.mod h1:5XIRs4YvwNbNoz+1JF8j6KLAyDh7RHGAyAK3EP2EsNk=
+github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb4Z+d1UQi45df52xW8=
+github.com/evanphx/json-patch v5.9.11+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
 github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
-github.com/gchaincl/sqlhooks v1.3.0 h1:yKPXxW9a5CjXaVf2HkQn6wn7TZARvbAOAelr3H8vK2Y=
-github.com/gchaincl/sqlhooks v1.3.0/go.mod h1:9BypXnereMT0+Ys8WGWHqzgkkOfHIhyeUCqXC24ra34=
 github.com/getkin/kin-openapi v0.132.0 h1:3ISeLMsQzcb5v26yeJrBcdTCEQTag36ZjaGk7MIRUwk=
 github.com/getkin/kin-openapi v0.132.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58=
-github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
-github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-jose/go-jose/v3 v3.0.4 h1:Wp5HA7bLQcKnf6YYao/4kpRpVMp/yf6+pJKV8WFSaNY=
-github.com/go-jose/go-jose/v3 v3.0.4/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
-github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-ldap/ldap/v3 v3.4.4 h1:qPjipEpt+qDa6SI/h1fzuGWoRUY+qqQ9sOZq67/PYUs=
-github.com/go-ldap/ldap/v3 v3.4.4/go.mod h1:fe1MsuN5eJJ1FeLT/LEBVdWfNWKh459R7aXgXtJC+aI=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
-github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU=
-github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo=
-github.com/go-openapi/errors v0.22.0 h1:c4xY/OLxUBSTiepAg3j/MHuAv5mJhnf53LLMWFB+u/w=
-github.com/go-openapi/errors v0.22.0/go.mod h1:J3DmZScxCDufmIMsdOuDHxJbdOGC0xtUynjIx092vXE=
 github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
 github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
 github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
-github.com/go-openapi/loads v0.22.0 h1:ECPGd4jX1U6NApCGG1We+uEozOAvXvJSF4nnwHZ8Aco=
-github.com/go-openapi/loads v0.22.0/go.mod h1:yLsaTCS92mnSAZX5WWoxszLj0u+Ojl+Zs5Stn1oF+rs=
-github.com/go-openapi/runtime v0.28.0 h1:gpPPmWSNGo214l6n8hzdXYhPuJcGtziTOgUpvsFWGIQ=
-github.com/go-openapi/runtime v0.28.0/go.mod h1:QN7OzcS+XuYmkQLw05akXk0jRH/eZ3kb18+1KwW9gyc=
-github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY=
-github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
-github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c=
-github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4=
 github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
 github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
-github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58=
-github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ=
-github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
-github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
-github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
-github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
-github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
-github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
-github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
-github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
-github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
-github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
-github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
-github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
-github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
+github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
-github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v5 v5.2.3 h1:kkGXqQOBSDDWRhWNXTFpqGSCMyh/PLnqUvMGJPDJDs0=
-github.com/golang-jwt/jwt/v5 v5.2.3/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/golang-migrate/migrate/v4 v4.7.0 h1:gONcHxHApDTKXDyLH/H97gEHmpu1zcnnbAaq2zgrPrs=
-github.com/golang-migrate/migrate/v4 v4.7.0/go.mod h1:Qvut3N4xKWjoH3sokBccML6WyHSnggXm/DvMMnTsQIc=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/U=
-github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
-github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
-github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q=
-github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
 github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
-github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
 github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI=
-github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
-github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
-github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
-github.com/grafana/alerting v0.0.0-20250729175202-b4b881b7b263 h1:hcr/AmPB0KL4H+gCEFIdKUnkihTxGAkAOiZA7GDYoL8=
-github.com/grafana/alerting v0.0.0-20250729175202-b4b881b7b263/go.mod h1:VKxaR93Gff0ZlO2sPcdPVob1a/UzArFEW5zx3Bpyhls=
-github.com/grafana/authlib v0.0.0-20250710201142-9542f2f28d43 h1:vVPT0i5Y1vI6qzecYStV2yk7cHKrC3Pc7AgvwT5KydQ=
-github.com/grafana/authlib v0.0.0-20250710201142-9542f2f28d43/go.mod h1:1fWkOiL+m32NBgRHZtlZGz2ji868tPZACYbqP3nBRJI=
-github.com/grafana/authlib/types v0.0.0-20250710201142-9542f2f28d43 h1:NlkGMnVi/oUn6Cr90QbJYpQJ4FnjyAIG9Ex5GtTZIzw=
-github.com/grafana/authlib/types v0.0.0-20250710201142-9542f2f28d43/go.mod h1:qeWYbnWzaYGl88JlL9+DsP1GT2Cudm58rLtx13fKZdw=
-github.com/grafana/dataplane/sdata v0.0.9 h1:AGL1LZnCUG4MnQtnWpBPbQ8ZpptaZs14w6kE/MWfg7s=
-github.com/grafana/dataplane/sdata v0.0.9/go.mod h1:Jvs5ddpGmn6vcxT7tCTWAZ1mgi4sbcdFt9utQx5uMAU=
-github.com/grafana/dskit v0.0.0-20250611075409-46f51e1ce914 h1:qcSGhr691f1mmPHwg2svGyO40Ex92G02aOyHzP6XHCE=
-github.com/grafana/dskit v0.0.0-20250611075409-46f51e1ce914/go.mod h1:OiN4P4aC6LwLzLbEupH3Ue83VfQoNMfG48rsna8jI/E=
-github.com/grafana/grafana-app-sdk v0.40.2 h1:j2ftFuqhX+exYUipfEjeWDs3i7oiJkweTF8gFLL7wWU=
-github.com/grafana/grafana-app-sdk v0.40.2/go.mod h1:BbNXPNki3mtbkWxYqJsyA1Cj9AShSyaY33z8WkyfVv0=
-github.com/grafana/grafana-app-sdk/logging v0.40.1 h1:ru+GqbaQk6jthA5l2Yo1WI/JbNXKNQmLiqNrxz7HGP4=
-github.com/grafana/grafana-app-sdk/logging v0.40.1/go.mod h1:otUD9XpJD7A5sCLb8mcs9hIXGdeV6lnhzVwe747g4RU=
-github.com/grafana/grafana-aws-sdk v1.1.0 h1:G0fvwbQmHw14c5RXPd7Gnw9ZQcgzl139LtMDoe0KhmE=
-github.com/grafana/grafana-aws-sdk v1.1.0/go.mod h1:7e+47EdHynteYWGoT5Ere9KeOXQObsk8F0vkOLQ1tz8=
-github.com/grafana/grafana-azure-sdk-go/v2 v2.2.0 h1:0TYrkzAc3u0HX+9GK86cGrLTUAcmQfl3/LEB3tL+SOA=
-github.com/grafana/grafana-azure-sdk-go/v2 v2.2.0/go.mod h1:H9sVh9A4yg5egMGZeh0mifxT1Q/uqwKe1LBjBJU6pN8=
-github.com/grafana/grafana-plugin-sdk-go v0.278.0 h1:5/rIYparLi02pofdaag8wnjspMMVNCi8cZhC4cdC3Ho=
-github.com/grafana/grafana-plugin-sdk-go v0.278.0/go.mod h1:+8NXT/XUJ/89GV6FxGQ366NZ3nU+cAXDMd0OUESF9H4=
-github.com/grafana/grafana/apps/dashboard v0.0.0-20250804150913-990f1c69ecc2 h1:M5kMQVRjcjtnGuw0RM9/iab5VpmJyBwpEDbSfS6IQV4=
-github.com/grafana/grafana/apps/dashboard v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:Ik6PLuCNceqTeOesGeQLn4hVL5wCbfscuAEhBEdq8js=
-github.com/grafana/grafana/apps/provisioning v0.0.0-20250804150913-990f1c69ecc2 h1:83OGBndFNYijNjgQpSf4y1bSNlscVDq8ru97Q6PyU6o=
-github.com/grafana/grafana/apps/provisioning v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:qzFUVwLI1b5UIbVFxFydUYAsnOK27AgtA5so3EW8jM0=
-github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250804150913-990f1c69ecc2 h1:X0cnaFdR+iz+sDSuoZmkryFSjOirchHe2MdKSRwBWgM=
-github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:RRvSjHH12/PnQaXraMO65jUhVu8n59mzvhfIMBETnV4=
-github.com/grafana/grafana/pkg/apiserver v0.0.0-20250804150913-990f1c69ecc2 h1:oUINBBiA25EwjOFXJVa4rmU8jHlOGn5EdPCmqpIqy4Q=
-github.com/grafana/grafana/pkg/apiserver v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:BA9Rvm6co9tbrZ0lS8ScqLFvAnDQ4lZOyplJgB+yMQQ=
-github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8=
-github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls=
-github.com/grafana/prometheus-alertmanager v0.25.1-0.20250620093340-be61a673dee6 h1:oJnbhG6ZNy10AjsgNeAtAKeGHogIGOMfAsBH6fYYa5M=
-github.com/grafana/prometheus-alertmanager v0.25.1-0.20250620093340-be61a673dee6/go.mod h1:O/QP1BCm0HHIzbKvgMzqb5sSyH88rzkFk84F4TfJjBU=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
-github.com/grafana/sqlds/v4 v4.2.4 h1:Xlxy1udWqDK0dlbuJ1qXL7K3EYaf+aKMl38zhd3VbQY=
-github.com/grafana/sqlds/v4 v4.2.4/go.mod h1:BQRjUG8rOqrBI4NAaeoWrIMuoNgfi8bdhCJ+5cgEfLU=
-github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o=
-github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 h1:sGm2vDRFUrQJO/Veii4h4zG2vvqG6uWNkBHSTqXOZk0=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2/go.mod h1:wd1YpapPLivG6nQgbf7ZkG1hhSOXDhhn4MLTknx2aAc=
+github.com/grafana/grafana-app-sdk v0.40.3 h1:JFo7uAfbAJUfZ9neD7/4sODKm1xgu9zhckclH/N4DYU=
+github.com/grafana/grafana-app-sdk v0.40.3/go.mod h1:j0KzHo3Sa6kd+lnwSScBNoV9Vobkg/YY9HtEjxpyPrk=
+github.com/grafana/grafana-app-sdk/logging v0.40.2 h1:HQ1+y9Od92iMbWWB54QxiYpNtCvYGUVpyxvxZ7ywB1k=
+github.com/grafana/grafana-app-sdk/logging v0.40.2/go.mod h1:otUD9XpJD7A5sCLb8mcs9hIXGdeV6lnhzVwe747g4RU=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
-github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
-github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-metrics v0.5.4 h1:8mmPiIJkTPPEbAiV97IxdAGNdRdaWwVap1BU6elejKY=
-github.com/hashicorp/go-metrics v0.5.4/go.mod h1:CG5yz4NZ/AI/aQt9Ucm/vdBnbh7fvmv4lxZ350i+QQI=
-github.com/hashicorp/go-msgpack/v2 v2.1.2 h1:4Ee8FTp834e+ewB71RDrQ0VKpyFdrKOjvYtnQ/ltVj0=
-github.com/hashicorp/go-msgpack/v2 v2.1.2/go.mod h1:upybraOAblm4S7rx0+jeNy+CWWhzywQsSRV5033mMu4=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.6.3 h1:xgHB+ZUSYeuJi96WtxEjzi23uh7YQpznjGh0U0UUrwg=
-github.com/hashicorp/go-plugin v1.6.3/go.mod h1:MRobyh+Wc/nYy1V4KAXUiYfzxoYhs7V1mlH1Z7iY2h0=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-sockaddr v1.0.7 h1:G+pTkSO01HpR5qCxg7lxfsFEZaG+C0VssTy/9dbT+Fw=
-github.com/hashicorp/go-sockaddr v1.0.7/go.mod h1:FZQbEYa1pxkQ7WLpyXJ6cbjpT8q0YgQaK/JakXqGyWw=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
-github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
-github.com/hashicorp/memberlist v0.5.2 h1:rJoNPWZ0juJBgqn48gjy59K5H4rNgvUoM1kUD7bXiuI=
-github.com/hashicorp/memberlist v0.5.2/go.mod h1:Ri9p/tRShbjYnpNf4FFPXG7wxEGY4Nrcn6E7jrVa//4=
-github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
-github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
-github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
-github.com/jackc/pgx v3.2.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
-github.com/jaegertracing/jaeger-idl v0.5.0 h1:zFXR5NL3Utu7MhPg8ZorxtCBjHrL3ReM1VoB65FOFGE=
-github.com/jaegertracing/jaeger-idl v0.5.0/go.mod h1:ON90zFo9eoyXrt9F/KN8YeF3zxcnujaisMweFY/rg5k=
-github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4=
-github.com/jessevdk/go-flags v1.6.1/go.mod h1:Mk8T1hIAWpOiJiHa9rJASDK2UGWji0EuPGBnNLMooyc=
-github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
-github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
-github.com/jmespath-community/go-jmespath v1.1.1 h1:bFikPhsi/FdmlZhVgSCd2jj1e7G/rw+zyQfyg5UF+L4=
-github.com/jmespath-community/go-jmespath v1.1.1/go.mod h1:4gOyFJsR/Gk+05RgTKYrifT7tBPWD8Lubtb5jRrfy9I=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
-github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 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/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jszwedko/go-datemath v0.1.1-0.20230526204004-640a500621d6 h1:SwcnSwBR7X/5EHJQlXBockkJVIMRVt5yKaesBPMtyZQ=
-github.com/jszwedko/go-datemath v0.1.1-0.20230526204004-640a500621d6/go.mod h1:WrYiIuiXUMIvTDAQw97C+9l0CnBmCcvosPjN3XDqS/o=
-github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
-github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
-github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
-github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
-github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kshvakov/clickhouse v1.3.5/go.mod h1:DMzX7FxRymoNkVgizH0DWAL8Cur7wHLgx3MUnGwJqpE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8=
-github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
-github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
-github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
-github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
 github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
-github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM=
-github.com/mattetti/filebuffer v1.0.1/go.mod h1:YdMURNDOttIiruleeVr6f56OrMc+MydEnTcXwtkxNVs=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
-github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
-github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
-github.com/mdlayher/vsock v1.2.1 h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ=
-github.com/mdlayher/vsock v1.2.1/go.mod h1:NRfCibel++DgeMD8z/hP+PPTjlNJsdPOmxcnENvE+SE=
-github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
-github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs=
-github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs=
-github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
-github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
-github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
-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/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.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE=
-github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/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/mithrandie/csvq v1.18.1 h1:f7NB2scbb7xx2ffPduJ2VtZ85RpWXfvanYskAkGlCBU=
-github.com/mithrandie/csvq v1.18.1/go.mod h1:MRJj7AtcXfk7jhNGxLuJGP3LORmh4lpiPWxQ7VyCRn8=
-github.com/mithrandie/csvq-driver v1.7.0 h1:ejiavXNWwTPMyr3fJFnhcqd1L1cYudA0foQy9cZrqhw=
-github.com/mithrandie/csvq-driver v1.7.0/go.mod h1:HcN3xL9UCJnBYA/AIQOOB/KlyfXAiYr5yxDmiwrGk5o=
-github.com/mithrandie/go-file/v2 v2.1.0 h1:XA5Tl+73GXMDvgwSE3Sg0uC5FkLr3hnXs8SpUas0hyg=
-github.com/mithrandie/go-file/v2 v2.1.0/go.mod h1:9YtTF3Xo59GqC1Pxw6KyGVcM/qubAMlxVsqI/u9r++c=
-github.com/mithrandie/go-text v1.6.0 h1:8gOXTMPbMY8DJbKMTv8kHhADcJlDWXqS/YQH4SyWO6s=
-github.com/mithrandie/go-text v1.6.0/go.mod h1:xCgj1xiNbI/d4xA9sLVvXkjh5B2tNx2ZT2/3rpmh8to=
-github.com/mithrandie/ternary v1.1.1 h1:k/joD6UGVYxHixYmSR8EGgDFNONBMqyD373xT4QRdC4=
-github.com/mithrandie/ternary v1.1.1/go.mod h1:0D9Ba3+09K2TdSZO7/bFCC0GjSXetCvYuYq0u8FY/1g=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
-github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA=
-github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
-github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
-github.com/nikunjy/rules v1.5.0 h1:KJDSLOsFhwt7kcXUyZqwkgrQg5YoUwj+TVu6ItCQShw=
-github.com/nikunjy/rules v1.5.0/go.mod h1:TlZtZdBChrkqi8Lr2AXocme8Z7EsbxtFdDoKeI6neBQ=
 github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//JalHPu/3yz+De2J+4aLtSRlHiY=
 github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw=
 github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c=
 github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o=
-github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
-github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
-github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
-github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-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/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
 github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
 github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
-github.com/open-feature/go-sdk v1.14.1 h1:jcxjCIG5Up3XkgYwWN5Y/WWfc6XobOhqrIwjyDBsoQo=
-github.com/open-feature/go-sdk v1.14.1/go.mod h1:t337k0VB/t/YxJ9S0prT30ISUHwYmUd/jhUZgFcOvGg=
-github.com/open-feature/go-sdk-contrib/providers/go-feature-flag v0.2.3 h1:6jpO63NCEZv4xunJj+aNlDuFVuRkVBPMcIuxvFPYRWQ=
-github.com/open-feature/go-sdk-contrib/providers/go-feature-flag v0.2.3/go.mod h1:dPUHjAIFzg+ci/wt6XxlNiiMkOh5Yw4SGyeRY0AFT0g=
-github.com/open-feature/go-sdk-contrib/providers/ofrep v0.1.5 h1:ZdqlGnNwhWf3luhBQlIpbglvcCzjkcuEgOEhYhr5Emc=
-github.com/open-feature/go-sdk-contrib/providers/ofrep v0.1.5/go.mod h1:jrD4UG3ZCzuwImKHlyuIN2iWeYjlOX5+zJ/sX45efuE=
-github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
-github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
-github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
-github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
 github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
 github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
-github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
-github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
+github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
 github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
-github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
-github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
-github.com/prometheus/exporter-toolkit v0.14.0 h1:NMlswfibpcZZ+H0sZBiTjrA3/aBFHkNZqE+iCj5EmRg=
-github.com/prometheus/exporter-toolkit v0.14.0/go.mod h1:Gu5LnVvt7Nr/oqTBUC23WILZepW0nffNo10XdhQcwWA=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
 github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
 github.com/puzpuzpuz/xsync/v2 v2.5.1 h1:mVGYAvzDSu52+zaGyNjC+24Xw2bQi3kTr4QJ6N9pIIU=
 github.com/puzpuzpuz/xsync/v2 v2.5.1/go.mod h1:gD2H2krq/w52MfPLE+Uy64TzJDVY7lP2znR9qmR35kU=
-github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
-github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
-github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
-github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
-github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
-github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
-github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c h1:aqg5Vm5dwtvL+YgDpBcK1ITf3o96N/K7/wsRXQnUTEs=
-github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c/go.mod h1:owqhoLW1qZoYLZzLnBw+QkPP9WZnjlSWihhxAJC1+/M=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU=
-github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY=
-github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w=
-github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
-github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
-github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
 github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf h1:Z2X3Os7oRzpdJ75iPqWZc0HeJWFYNCvKsfpQwFpRNTA=
-github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf/go.mod h1:M8agBzgqHIhgj7wEn9/0hJUZcrvt9VY+Ln+S1I5Mha0=
-github.com/tetratelabs/wazero v1.8.2 h1:yIgLR/b2bN31bjxwXHD8a3d+BogigR952csSDdLYEv4=
-github.com/tetratelabs/wazero v1.8.2/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
-github.com/thejerf/slogassert v0.3.4 h1:VoTsXixRbXMrRSSxDjYTiEDCM4VWbsYPW5rB/hX24kM=
-github.com/thejerf/slogassert v0.3.4/go.mod h1:0zn9ISLVKo1aPMTqcGfG1o6dWwt+Rk574GlUxHD4rs8=
-github.com/thomaspoignant/go-feature-flag v1.42.0 h1:C7embmOTzaLyRki+OoU2RvtVjJE9IrvgBA2C1mRN1lc=
-github.com/thomaspoignant/go-feature-flag v1.42.0/go.mod h1:y0QiWH7chHWhGATb/+XqwAwErORmPSH2MUsQlCmmWlM=
-github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tjhop/slog-gokit v0.1.3 h1:6SdexP3UIeg93KLFeiM1Wp1caRwdTLgsD/THxBUy1+o=
-github.com/tjhop/slog-gokit v0.1.3/go.mod h1:Bbu5v2748qpAWH7k6gse/kw3076IJf6owJmh7yArmJs=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 h1:aVGB3YnaS/JNfOW3tiHIlmNmTDg618va+eT0mVomgyI=
-github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8/go.mod h1:fVle4kNr08ydeohzYafr20oZzbAkhQT39gKK/pFQ5M4=
-github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs=
-github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
-github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3/go.mod h1:1xEUf2abjfP92w2GZTV+GgaRxXErwRXcClbUwrNJffU=
-github.com/unknwon/log v0.0.0-20200308114134-929b1006e34a h1:vcrhXnj9g9PIE+cmZgaPSwOyJ8MAQTRmsgGrB0x5rF4=
-github.com/unknwon/log v0.0.0-20200308114134-929b1006e34a/go.mod h1:1xEUf2abjfP92w2GZTV+GgaRxXErwRXcClbUwrNJffU=
-github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli v1.22.16 h1:MH0k6uJxdwdeWQTwhSO42Pwr4YLrNLwBtg1MRgTqPdQ=
-github.com/urfave/cli v1.22.16/go.mod h1:EeJR6BKodywf4zciqrdw6hpCPk68JO9z5LazXZMn5Po=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
-github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
-github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
-github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
-github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
-gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
-go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.17.3 h1:TQyXhnsWfWtgAhMtOgtYHMTkZIfBTpMTsMnd9ZBeHxQ=
-go.mongodb.org/mongo-driver v1.17.3/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
-go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 h1:x7wzEgXfnzJcHDwStJT+mxOz4etr2EcexjqhBvmoakw=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.61.0 h1:lREC4C0ilyP4WibDhQ7Gg2ygAQFP8oR07Fst/5cafwI=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.61.0/go.mod h1:HfvuU0kW9HewH14VCOLImqKvUgONodURG7Alj/IrnGI=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY=
-go.opentelemetry.io/contrib/propagators/jaeger v1.36.0 h1:SoCgXYF4ISDtNyfLUzsGDaaudZVTx2yJhOyBO0+/GYk=
-go.opentelemetry.io/contrib/propagators/jaeger v1.36.0/go.mod h1:VHu48l0YTRKSObdPQ+Sb8xMZvdnJlN7yhHuHoPgNqHM=
-go.opentelemetry.io/contrib/samplers/jaegerremote v0.30.0 h1:bQ1Gvah4Sp8z7epSkgJaNTuZm7sutfA6Fji2/7cKFMc=
-go.opentelemetry.io/contrib/samplers/jaegerremote v0.30.0/go.mod h1:9b8Q9rH52NgYH3ShiTFB5wf18Vt3RTH/VMB7LDcC1ug=
-go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
 go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
 go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
-go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=
-go.opentelemetry.io/otel/exporters/jaeger v1.17.0/go.mod h1:nPCqOnEH9rNLKqH/+rrUjiMzHJdV1BlpKcTwRTyKkKI=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 h1:EtFWSnwW9hGObjkIdmlnWSydO+Qs8OwzfzXLUPg4xOc=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0/go.mod h1:QjUEoiGCPkvFZ/MjK6ZZfNOS6mfVEVKYE99dFhuN2LI=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 h1:bDMKF3RUSxshZ5OjOTi8rsHGaPKsAt76FaqgvIUySLc=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0/go.mod h1:dDT67G/IkA46Mr2l9Uj7HsQVwsjASyV9SjGofsiUZDA=
-go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
 go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
 go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
-go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
 go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
 go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
 go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
 go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
-go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
 go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
 go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os=
 go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo=
-go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
-go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
 go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
 go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
 go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
-golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 h1:y5zboxd6LQAqYIhHnB48p0ByQ/GnQx2BE33L8BOHQkI=
-golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
-golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
-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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
 golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
 golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
 golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-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-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190102155601-82a175fd1598/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190426135247-a129542de9ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191020152052-9984515f0562/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
 golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-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.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
 golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
 golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
-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.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
 golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
-golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425222832-ad9eeb80039a/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
 golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
 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=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
-golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 gomodules.xyz/jsonpatch/v2 v2.5.0 h1:JELs8RLM12qJGXU4u/TO3V25KW8GreMKl9pdkk14RM0=
 gomodules.xyz/jsonpatch/v2 v2.5.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
-gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
-gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
-google.golang.org/api v0.3.2/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 h1:oWVWY3NzT7KJppx2UKhKmzPq4SRe0LdCijVRwvGeikY=
 google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822/go.mod h1:h3c4v36UTKzUiuaOKQ6gr3S+0hovBtUrXzTG/i3+XEc=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
-google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
 google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
 google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
-gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
 gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo=
-gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
-gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/mail.v2 v2.3.1 h1:WYFn/oANrAGP2C0dcV6/pbkPzv8yGzqTjPmTeO7qoXk=
-gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
-gopkg.in/src-d/go-errors.v1 v1.0.0 h1:cooGdZnCjYbeS1zb1s6pVAAimTdKceRrpn7aKOnNIfc=
-gopkg.in/src-d/go-errors.v1 v1.0.0/go.mod h1:q1cBlomlw2FnDBDNGlnh6X0jPihy+QxZfMMNxPCbdYg=
-gopkg.in/telebot.v3 v3.2.1 h1:3I4LohaAyJBiivGmkfB+CiVu7QFOWkuZ4+KHgO/G3rs=
-gopkg.in/telebot.v3 v3.2.1/go.mod h1:GJKwwWqp9nSkIVN51eRKU78aB5f5OnQuWdwiIZfPbko=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-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.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
-honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
 k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
 k8s.io/apiextensions-apiserver v0.33.3 h1:qmOcAHN6DjfD0v9kxL5udB27SRP6SG/MTopmge3MwEs=
 k8s.io/apiextensions-apiserver v0.33.3/go.mod h1:oROuctgo27mUsyp9+Obahos6CWcMISSAPzQ77CAQGz8=
 k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
 k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
-k8s.io/apiserver v0.33.3 h1:Wv0hGc+QFdMJB4ZSiHrCgN3zL3QRatu56+rpccKC3J4=
-k8s.io/apiserver v0.33.3/go.mod h1:05632ifFEe6TxwjdAIrwINHWE2hLwyADFk5mBsQa15E=
 k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
 k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
-k8s.io/component-base v0.33.3 h1:mlAuyJqyPlKZM7FyaoM/LcunZaaY353RXiOd2+B5tGA=
-k8s.io/component-base v0.33.3/go.mod h1:ktBVsBzkI3imDuxYXmVxZ2zxJnYTZ4HAsVj9iF09qp4=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
 k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
 k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-modernc.org/cc/v4 v4.26.0 h1:QMYvbVduUGH0rrO+5mqF/PSPPRZNpRtg2CLELy7vUpA=
-modernc.org/cc/v4 v4.26.0/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
-modernc.org/ccgo/v4 v4.26.0 h1:gVzXaDzGeBYJ2uXTOpR8FR7OlksDOe9jxnjhIKCsiTc=
-modernc.org/ccgo/v4 v4.26.0/go.mod h1:Sem8f7TFUtVXkG2fiaChQtyyfkqhJBg/zjEJBkmuAVY=
-modernc.org/fileutil v1.3.1 h1:8vq5fe7jdtEvoCf3Zf9Nm0Q05sH6kGx0Op2CPx1wTC8=
-modernc.org/fileutil v1.3.1/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
-modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
-modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
-modernc.org/libc v1.65.0 h1:e183gLDnAp9VJh6gWKdTy0CThL9Pt7MfcR/0bgb7Y1Y=
-modernc.org/libc v1.65.0/go.mod h1:7m9VzGq7APssBTydds2zBcxGREwvIGpuUBaKTXdm2Qs=
-modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
-modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
-modernc.org/memory v1.10.0 h1:fzumd51yQ1DxcOxSO+S6X7+QTuVU+n8/Aj7swYjFfC4=
-modernc.org/memory v1.10.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
-modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
-modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
-modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
-modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI=
-modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM=
-modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
-modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
-modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
-modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
@@ -1036,5 +234,3 @@ sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vt
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
 sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
 sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
-xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
-xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
diff --git a/apps/investigations/pkg/app/authorizer.go b/pkg/registry/apps/investigations/authorizer.go
similarity index 97%
rename from apps/investigations/pkg/app/authorizer.go
rename to pkg/registry/apps/investigations/authorizer.go
index 0747b06da5e..3178f3d2f9c 100644
--- a/apps/investigations/pkg/app/authorizer.go
+++ b/pkg/registry/apps/investigations/authorizer.go
@@ -1,4 +1,4 @@
-package app
+package investigations
 
 import (
 	"context"
diff --git a/apps/investigations/pkg/app/authorizer_test.go b/pkg/registry/apps/investigations/authorizer_test.go
similarity index 99%
rename from apps/investigations/pkg/app/authorizer_test.go
rename to pkg/registry/apps/investigations/authorizer_test.go
index 9829fb84793..c6d870bc7e7 100644
--- a/apps/investigations/pkg/app/authorizer_test.go
+++ b/pkg/registry/apps/investigations/authorizer_test.go
@@ -1,4 +1,4 @@
-package app
+package investigations
 
 import (
 	"context"
diff --git a/pkg/registry/apps/investigations/register.go b/pkg/registry/apps/investigations/register.go
index 41ef093d5c2..6fbf2603491 100644
--- a/pkg/registry/apps/investigations/register.go
+++ b/pkg/registry/apps/investigations/register.go
@@ -25,7 +25,7 @@ func RegisterApp(
 	appCfg := &runner.AppBuilderConfig{
 		OpenAPIDefGetter:         investigationv0alpha1.GetOpenAPIDefinitions,
 		ManagedKinds:             investigationapp.GetKinds(),
-		Authorizer:               investigationapp.GetAuthorizer(),
+		Authorizer:               GetAuthorizer(),
 		AllowedV0Alpha1Resources: []string{builder.AllResourcesAllowed},
 	}
 	provider.Provider = simple.NewAppProvider(apis.LocalManifest(), appCfg, investigationapp.New)

From 57865b6a901171fe2a7195e980c126250abf0b74 Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Tue, 12 Aug 2025 09:45:08 -0400
Subject: [PATCH 111/243] Browse Dashboards: Prevent cross repo resource
 selection (#109500)

* BrowseActions: when selecting item from a provisioned folder, disable all items from other provisioned folder. Display a  tooltip when checkbox is disabled.
---
 .../useSelectionProvisioningStatus.ts         | 44 ++++++++++++-------
 .../useSelectionRepoValidation.ts             | 35 +++++++++++++++
 .../components/BrowseActions/utils.ts         | 41 +++++++++++++++++
 .../BulkDeleteProvisionedResource.test.tsx    | 16 +++++++
 .../BulkDeleteProvisionedResource.tsx         | 12 +++--
 .../BulkMoveProvisionedResource.tsx           | 13 ++++--
 .../components/CheckboxCell.tsx               | 30 ++++++++++++-
 .../browse-dashboards/components/utils.ts     | 42 +++++++++++++++++-
 .../browse-dashboards/state/reducers.ts       | 11 +++++
 public/locales/en-US/grafana.json             |  3 ++
 10 files changed, 222 insertions(+), 25 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/components/BrowseActions/useSelectionRepoValidation.ts

diff --git a/public/app/features/browse-dashboards/components/BrowseActions/useSelectionProvisioningStatus.ts b/public/app/features/browse-dashboards/components/BrowseActions/useSelectionProvisioningStatus.ts
index cc4724b9ded..891dd1cecd1 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/useSelectionProvisioningStatus.ts
+++ b/public/app/features/browse-dashboards/components/BrowseActions/useSelectionProvisioningStatus.ts
@@ -12,6 +12,10 @@ import { useSelector } from 'app/types/store';
 import { findItem } from '../../state/utils';
 import { DashboardTreeSelection } from '../../types';
 
+// TODO: This will soon be remove after bulk action is merged in
+
+// This hook can be remove once searching endpoint returns provisioning status
+// It is used to determine if the selected items are provisioned or not, which is currently missing from the search API
 export function useSelectionProvisioningStatus(
   selectedItems: Omit<DashboardTreeSelection, 'panel' | '$all'>,
   isParentProvisioned: boolean
@@ -23,7 +27,6 @@ export function useSelectionProvisioningStatus(
   const provisioningEnabled = config.featureToggles.provisioning;
 
   const [status, setStatus] = useState({ hasProvisioned: false, hasNonProvisioned: false });
-
   const [folderCache, setFolderCache] = useState<Record<string, boolean>>({});
   const [dashboardCache, setDashboardCache] = useState<Record<string, boolean>>({});
 
@@ -38,6 +41,8 @@ export function useSelectionProvisioningStatus(
     []
   );
 
+  // Simplified: removed complex root folder tracking logic
+
   const findItemInState = useCallback(
     (uid: string) => {
       const item = findItem(browseState.rootItems?.items || [], browseState.childrenByParentUID, uid);
@@ -84,7 +89,6 @@ export function useSelectionProvisioningStatus(
   const checkItemProvisioning = useCallback(
     async (uid: string, isFolder: boolean): Promise<boolean> => {
       if (isSearching) {
-        // If searching, we need provisioning status with fetching metadata
         return isFolder ? await getFolderMeta(uid) : await getDashboardMeta(uid);
       }
 
@@ -93,7 +97,7 @@ export function useSelectionProvisioningStatus(
         return item?.managedBy === ManagerKind.Repo;
       }
 
-      // Check parent folder first
+      // Check parent folder first for dashboards
       const parent = item?.parentUID ? findItemInState(item.parentUID) : undefined;
       if (parent?.managedBy === ManagerKind.Repo) {
         return true;
@@ -106,7 +110,7 @@ export function useSelectionProvisioningStatus(
 
   useEffect(() => {
     const checkProvisioningStatus = async () => {
-      // If the instance is provisioned or the parent folder is provisioned, we can skip checking individual items
+      // Early returns for simple cases
       if (isProvisionedInstance || isParentProvisioned) {
         setStatus({ hasProvisioned: true, hasNonProvisioned: false });
         return;
@@ -120,6 +124,12 @@ export function useSelectionProvisioningStatus(
       const folders = Object.keys(selectedItems.folder).filter((uid) => selectedItems.folder[uid]);
       const dashboards = Object.keys(selectedItems.dashboard).filter((uid) => selectedItems.dashboard[uid]);
 
+      // If no items selected
+      if (folders.length === 0 && dashboards.length === 0) {
+        setStatus({ hasProvisioned: false, hasNonProvisioned: false });
+        return;
+      }
+
       let hasProvisioned = false;
       let hasNonProvisioned = false;
 
@@ -127,11 +137,18 @@ export function useSelectionProvisioningStatus(
         ...folders.map((uid) => ({ uid, isFolder: true })),
         ...dashboards.map((uid) => ({ uid, isFolder: false })),
       ];
+
       for (const { uid, isFolder } of allItems) {
         const isProvisioned = await checkItemProvisioning(uid, isFolder);
-        isProvisioned ? (hasProvisioned = true) : (hasNonProvisioned = true);
+
+        if (isProvisioned) {
+          hasProvisioned = true;
+        } else {
+          hasNonProvisioned = true;
+        }
+
         if (hasProvisioned && hasNonProvisioned) {
-          // If we have both provisioned and non-provisioned items, we can stop checking
+          // If we have both, we can stop checking
           break;
         }
       }
@@ -140,15 +157,10 @@ export function useSelectionProvisioningStatus(
     };
 
     checkProvisioningStatus();
-  }, [
-    selectedItems,
-    isProvisionedInstance,
-    isParentProvisioned,
-    isSearching,
-    findItemInState,
-    checkItemProvisioning,
-    provisioningEnabled,
-  ]);
+  }, [selectedItems, isProvisionedInstance, isParentProvisioned, checkItemProvisioning, provisioningEnabled]);
 
-  return status;
+  return {
+    hasProvisioned: status.hasProvisioned,
+    hasNonProvisioned: status.hasNonProvisioned,
+  };
 }
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/useSelectionRepoValidation.ts b/public/app/features/browse-dashboards/components/BrowseActions/useSelectionRepoValidation.ts
new file mode 100644
index 00000000000..30ee0957c17
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/BrowseActions/useSelectionRepoValidation.ts
@@ -0,0 +1,35 @@
+import { useSelector } from 'app/types/store';
+
+import { useChildrenByParentUIDState, rootItemsSelector } from '../../state/hooks';
+import { findItem } from '../../state/utils';
+import { DashboardTreeSelection } from '../../types';
+import { getItemRepositoryUid } from '../utils';
+
+// This hook is responsible for validating if all selected resources (dashboard folders and dashboards) are in the same repository
+export function useSelectionRepoValidation(selectedItems: Omit<DashboardTreeSelection, 'panel' | '$all'>) {
+  const childrenByParentUID = useChildrenByParentUIDState();
+  const rootItems = useSelector(rootItemsSelector)?.items ?? [];
+
+  const getRepoUid = (uid: string) => {
+    const item = findItem(rootItems, childrenByParentUID, uid);
+    return item ? getItemRepositoryUid(item, rootItems, childrenByParentUID) : 'non_provisioned';
+  };
+
+  const selectedUIDs = [
+    ...Object.keys(selectedItems.folder || {}).filter((id) => selectedItems.folder[id]),
+    ...Object.keys(selectedItems.dashboard || {}).filter((id) => selectedItems.dashboard[id]),
+  ];
+
+  const repoUIDs = selectedUIDs.map(getRepoUid).filter((repoId): repoId is string => !!repoId);
+
+  const selectedItemsRepoUID = repoUIDs.length > 0 ? repoUIDs[0] : undefined;
+  const isCrossRepo = new Set(repoUIDs).size > 1;
+
+  const isInLockedRepo = (uid: string) => !selectedItemsRepoUID || getRepoUid(uid) === selectedItemsRepoUID;
+
+  return {
+    selectedItemsRepoUID,
+    isInLockedRepo,
+    isCrossRepo, // true if items are from different repositories
+  };
+}
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/utils.ts b/public/app/features/browse-dashboards/components/BrowseActions/utils.ts
index 2d6b4328c53..59a3979cf2f 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/utils.ts
+++ b/public/app/features/browse-dashboards/components/BrowseActions/utils.ts
@@ -1,4 +1,8 @@
 import { t } from '@grafana/i18n';
+import { DashboardViewItem } from 'app/features/search/types';
+
+import { findItem } from '../../state/utils';
+import { DashboardViewItemCollection } from '../../types';
 
 export function buildBreakdownString(
   folderCount: number,
@@ -26,3 +30,40 @@ export function buildBreakdownString(
   }
   return breakdownString;
 }
+
+// Utility: Get root folder for any item (reusing existing pattern from reducers.ts)
+export function getItemRootFolder(
+  item: { uid: string; parentUID?: string; kind?: string },
+  browseState: {
+    rootItems?: { items: DashboardViewItem[] };
+    childrenByParentUID: Record<string, DashboardViewItemCollection>;
+  }
+): string | undefined {
+  const rootItems = browseState.rootItems?.items || [];
+
+  // If it's already a root-level item, return its UID (only for folders)
+  if (!item.parentUID) {
+    return item.kind === 'folder' ? item.uid : undefined;
+  }
+
+  // For nested items, traverse up to find root folder (same pattern as reducers.ts)
+  let nextParentUID = item.parentUID;
+
+  while (nextParentUID) {
+    const parent = findItem(rootItems, browseState.childrenByParentUID, nextParentUID);
+
+    // Safety check to prevent infinite loops (same as reducers.ts)
+    if (!parent) {
+      break;
+    }
+
+    // Found the root folder (no parent)
+    if (!parent.parentUID) {
+      return parent.uid;
+    }
+
+    nextParentUID = parent.parentUID;
+  }
+
+  return undefined;
+}
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
index 34b61e59041..65b6686ef14 100644
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
+++ b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
@@ -3,6 +3,8 @@ import { render } from 'test/test-utils';
 
 import { Job, RepositoryView } from 'app/api/clients/provisioning/v0alpha1';
 
+import { useSelectionRepoValidation } from '../BrowseActions/useSelectionRepoValidation';
+
 import { BulkDeleteProvisionedResource } from './BulkDeleteProvisionedResource';
 import { ResponseType } from './useBulkActionJob';
 
@@ -19,6 +21,14 @@ jest.mock('app/features/provisioning/hooks/useGetResourceRepositoryView', () =>
   useGetResourceRepositoryView: jest.fn(),
 }));
 
+jest.mock('../BrowseActions/useSelectionRepoValidation', () => ({
+  useSelectionRepoValidation: jest.fn(),
+}));
+
+const mockUseSelectionRepoValidation = useSelectionRepoValidation as jest.MockedFunction<
+  typeof useSelectionRepoValidation
+>;
+
 jest.mock('./useBulkActionJob', () => ({
   useBulkActionJob: jest.fn(),
 }));
@@ -103,6 +113,12 @@ function setup(
 describe('BulkDeleteProvisionedResource', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+
+    mockUseSelectionRepoValidation.mockReturnValue({
+      selectedItemsRepoUID: 'test-folder',
+      isInLockedRepo: jest.fn().mockReturnValue(false),
+      isCrossRepo: false,
+    });
   });
 
   afterEach(() => {
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx
index 786b31d6c8a..16970ee282d 100644
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx
+++ b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.tsx
@@ -11,13 +11,14 @@ import { getDefaultWorkflow, getWorkflowOptions } from 'app/features/dashboard-s
 import { generateTimestamp } from 'app/features/dashboard-scene/saving/provisioned/utils/timestamp';
 import { JobStatus } from 'app/features/provisioning/Job/JobStatus';
 import { useGetResourceRepositoryView } from 'app/features/provisioning/hooks/useGetResourceRepositoryView';
+import { GENERAL_FOLDER_UID } from 'app/features/search/constants';
 
 import { DescendantCount } from '../BrowseActions/DescendantCount';
+import { useSelectionRepoValidation } from '../BrowseActions/useSelectionRepoValidation';
 import { collectSelectedItems } from '../utils';
 
 import { RepoInvalidStateBanner } from './RepoInvalidStateBanner';
 import { DeleteJobSpec, useBulkActionJob } from './useBulkActionJob';
-import { useFolderNameFromSelection } from './useFolderNameFromSelection';
 import { BulkActionFormData, BulkActionProvisionResourceProps } from './utils';
 
 interface FormProps extends BulkActionProvisionResourceProps {
@@ -117,9 +118,14 @@ export function BulkDeleteProvisionedResource({
   selectedItems,
   onDismiss,
 }: BulkActionProvisionResourceProps) {
-  const folderName = useFolderNameFromSelection({ folderUid, selectedItems });
-  const { repository, isReadOnlyRepo } = useGetResourceRepositoryView({ folderName });
+  // Check if we're on the root browser dashboards page
+  const isRootPage = !folderUid || folderUid === GENERAL_FOLDER_UID;
+  const { selectedItemsRepoUID } = useSelectionRepoValidation(selectedItems);
 
+  // For root provisioned folders, the folder UID is the repository name
+  const { repository, isReadOnlyRepo } = useGetResourceRepositoryView({
+    folderName: isRootPage ? selectedItemsRepoUID : folderUid,
+  });
   const workflowOptions = getWorkflowOptions(repository);
   const timestamp = generateTimestamp();
 
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx
index 22640003c20..f20d41d650d 100644
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx
+++ b/public/app/features/browse-dashboards/components/BulkActions/BulkMoveProvisionedResource.tsx
@@ -14,13 +14,14 @@ import { getDefaultWorkflow, getWorkflowOptions } from 'app/features/dashboard-s
 import { generateTimestamp } from 'app/features/dashboard-scene/saving/provisioned/utils/timestamp';
 import { JobStatus } from 'app/features/provisioning/Job/JobStatus';
 import { useGetResourceRepositoryView } from 'app/features/provisioning/hooks/useGetResourceRepositoryView';
+import { GENERAL_FOLDER_UID } from 'app/features/search/constants';
 
 import { DescendantCount } from '../BrowseActions/DescendantCount';
+import { useSelectionRepoValidation } from '../BrowseActions/useSelectionRepoValidation';
 import { collectSelectedItems } from '../utils';
 
 import { RepoInvalidStateBanner } from './RepoInvalidStateBanner';
 import { MoveJobSpec, useBulkActionJob } from './useBulkActionJob';
-import { useFolderNameFromSelection } from './useFolderNameFromSelection';
 import { BulkActionFormData, BulkActionProvisionResourceProps, getTargetFolderPathInRepo } from './utils';
 
 interface FormProps extends BulkActionProvisionResourceProps {
@@ -148,8 +149,12 @@ function FormContent({ initialValues, selectedItems, repository, workflowOptions
 }
 
 export function BulkMoveProvisionedResource({ folderUid, selectedItems, onDismiss }: BulkActionProvisionResourceProps) {
-  const folderName = useFolderNameFromSelection({ folderUid, selectedItems });
-  const { repository, folder, isReadOnlyRepo } = useGetResourceRepositoryView({ folderName });
+  // Check if we're on the root browser dashboards page
+  const isRootPage = !folderUid || folderUid === GENERAL_FOLDER_UID;
+  const { selectedItemsRepoUID } = useSelectionRepoValidation(selectedItems);
+  const { repository, folder, isReadOnlyRepo } = useGetResourceRepositoryView({
+    folderName: isRootPage ? selectedItemsRepoUID : folderUid,
+  });
 
   const workflowOptions = getWorkflowOptions(repository);
   const folderPath = folder?.metadata?.annotations?.[AnnoKeySourcePath] || '';
@@ -172,7 +177,7 @@ export function BulkMoveProvisionedResource({ folderUid, selectedItems, onDismis
       initialValues={initialValues}
       repository={repository}
       workflowOptions={workflowOptions}
-      folderPath={folderPath}
+      folderPath={isRootPage ? '/' : folderPath}
     />
   );
 }
diff --git a/public/app/features/browse-dashboards/components/CheckboxCell.tsx b/public/app/features/browse-dashboards/components/CheckboxCell.tsx
index 60995129f90..7867510d940 100644
--- a/public/app/features/browse-dashboards/components/CheckboxCell.tsx
+++ b/public/app/features/browse-dashboards/components/CheckboxCell.tsx
@@ -3,10 +3,13 @@ import { css } from '@emotion/css';
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
-import { Checkbox, useStyles2 } from '@grafana/ui';
+import { Checkbox, Tooltip, useStyles2 } from '@grafana/ui';
+import { ManagerKind } from 'app/features/apiserver/types';
+import { useSelector } from 'app/types/store';
 
 import { DashboardsTreeCellProps, SelectionState } from '../types';
 
+import { useSelectionRepoValidation } from './BrowseActions/useSelectionRepoValidation';
 import { isSharedWithMe, canEditItemType } from './utils';
 
 export default function CheckboxCell({
@@ -17,6 +20,11 @@ export default function CheckboxCell({
 }: DashboardsTreeCellProps) {
   const item = row.item;
 
+  // Get current selection state for repository validation
+  const selectedItems = useSelector((state) => state.browseDashboards.selectedItems);
+  const { selectedItemsRepoUID, isInLockedRepo } = useSelectionRepoValidation(selectedItems);
+
+  // Early returns for cases where we should show a spacer instead of checkbox
   if (!isSelected) {
     return <CheckboxSpacer />;
   }
@@ -33,11 +41,31 @@ export default function CheckboxCell({
     return <CheckboxSpacer />;
   }
 
+  // Disable checkbox for root provisioned folder itself
+  if (item.managedBy === ManagerKind.Repo && !item.parentUID) {
+    return <CheckboxSpacer />;
+  }
+
   // Check if user can edit this specific item type
   if (permissions && !canEditItemType(item.kind, permissions)) {
     return <CheckboxSpacer />;
   }
 
+  if (selectedItemsRepoUID && !isInLockedRepo(item.uid)) {
+    return (
+      <Tooltip
+        content={t(
+          'browse-dashboards.dashboards-tree.checkbox.disabled-not-in-same-repo',
+          'This item is not in the same repository as the selected items.'
+        )}
+      >
+        <span>
+          <Checkbox disabled value={false} />
+        </span>
+      </Tooltip>
+    );
+  }
+
   const state = isSelected(item);
 
   return (
diff --git a/public/app/features/browse-dashboards/components/utils.ts b/public/app/features/browse-dashboards/components/utils.ts
index 3443967fc62..ef72de4bbd7 100644
--- a/public/app/features/browse-dashboards/components/utils.ts
+++ b/public/app/features/browse-dashboards/components/utils.ts
@@ -1,7 +1,15 @@
 import { config } from '@grafana/runtime';
 import { contextSrv } from 'app/core/core';
+import { ManagerKind } from 'app/features/apiserver/types';
+import { DashboardViewItem } from 'app/features/search/types';
 
-import { DashboardTreeSelection, DashboardViewItemWithUIItems, BrowseDashboardsPermissions } from '../types';
+import { findItem } from '../state/utils';
+import {
+  DashboardTreeSelection,
+  DashboardViewItemWithUIItems,
+  BrowseDashboardsPermissions,
+  BrowseDashboardsState,
+} from '../types';
 
 import { ResourceRef } from './BulkActions/useBulkActionJob';
 
@@ -96,3 +104,35 @@ export function canSelectItems(permissions: BrowseDashboardsPermissions) {
   const canSelectDashboards = canEditDashboards || canDeleteDashboards;
   return Boolean(canSelectFolders || canSelectDashboards);
 }
+
+/**
+ * Finds the repository name for an item by traversing up the tree to find the root provisioned folder (managed by ManagerKind.Repo)
+ * This should be an edge case where user have multiple provisioned folders and try to managing resources on root folder
+ */
+export function getItemRepositoryUid(
+  item: DashboardViewItem,
+  rootItems: DashboardViewItem[],
+  childrenByParentUID: BrowseDashboardsState['childrenByParentUID']
+): string {
+  // For root provisioned folders, the UID is the repository name
+  if (item.managedBy === ManagerKind.Repo && !item.parentUID && item.kind === 'folder') {
+    return item.uid;
+  }
+
+  // Traverse up the tree to find the root provisioned folder
+  let currentItem = item;
+  while (currentItem.parentUID) {
+    const parent = findItem(rootItems, childrenByParentUID, currentItem.parentUID);
+    if (!parent) {
+      break;
+    }
+
+    if (parent.managedBy === ManagerKind.Repo && !parent.parentUID) {
+      return currentItem.parentUID;
+    }
+
+    currentItem = parent;
+  }
+
+  return 'non_provisioned';
+}
diff --git a/public/app/features/browse-dashboards/state/reducers.ts b/public/app/features/browse-dashboards/state/reducers.ts
index df1505f50d7..7f0004fd242 100644
--- a/public/app/features/browse-dashboards/state/reducers.ts
+++ b/public/app/features/browse-dashboards/state/reducers.ts
@@ -1,5 +1,6 @@
 import { PayloadAction } from '@reduxjs/toolkit';
 
+import { ManagerKind } from 'app/features/apiserver/types';
 import { DashboardViewItem, DashboardViewItemKind } from 'app/features/search/types';
 
 import { GENERAL_FOLDER_UID } from '../../search/constants';
@@ -96,6 +97,11 @@ export function setItemSelectionState(
     return;
   }
 
+  // Prevent selection of root provisioned folders
+  if (item.managedBy === ManagerKind.Repo && !item.parentUID) {
+    return;
+  }
+
   // Selecting a folder selects all children, and unselecting a folder deselects all children
   // so propagate the new selection state to all descendants
   function markChildren(kind: DashboardViewItemKind, uid: string) {
@@ -178,6 +184,11 @@ export function setAllSelection(
           continue;
         }
 
+        // Skip all provisioned resources during "select all" on root level
+        if (child.managedBy === ManagerKind.Repo && !child.parentUID) {
+          continue;
+        }
+
         state.selectedItems[child.kind][child.uid] = isSelected;
 
         if (child.kind !== 'folder') {
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index d5bf489e26b..dab62229722 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -3556,6 +3556,9 @@
       "total_other": "{{count}} item"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": "This item is not in the same repository as the selected items."
+      },
       "collapse-folder-button": "Collapse folder {{title}}",
       "expand-folder-button": "Expand folder {{title}}",
       "name-column": "Name",

From 5f6abae81bbc34be3b81aed4f92ac5a730a50325 Mon Sep 17 00:00:00 2001
From: Victor Cinaglia <victor@grafana.com>
Date: Tue, 12 Aug 2025 11:26:50 -0300
Subject: [PATCH 112/243] Auth: Add subtitle for cloud access policy page
 (#109498)

chore(iam): add subtitle for cloud access policy page
---
 pkg/services/navtree/navtreeimpl/applinks.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/services/navtree/navtreeimpl/applinks.go b/pkg/services/navtree/navtreeimpl/applinks.go
index b4571c88a69..8226304388a 100644
--- a/pkg/services/navtree/navtreeimpl/applinks.go
+++ b/pkg/services/navtree/navtreeimpl/applinks.go
@@ -104,6 +104,10 @@ func (s *ServiceImpl) processAppPlugin(plugin pluginstore.Plugin, c *contextmode
 					link.Id = "standalone-plugin-page-" + include.Path
 					link.SortWeight = pathConfig.SortWeight
 
+					if len(pathConfig.SubTitle) > 0 {
+						link.SubTitle = pathConfig.SubTitle
+					}
+
 					// Check if the section already has a page with the same URL, and in that case override it
 					// (This only happens if it is explicitly set by `navigation.app_standalone_pages` in the INI config)
 					isOverridingCorePage := false
@@ -348,7 +352,11 @@ func (s *ServiceImpl) readNavigationSettings() {
 	}
 
 	s.navigationAppPathConfig = map[string]NavigationAppConfig{
-		"/a/grafana-auth-app": {SectionID: navtree.NavIDCfgAccess, SortWeight: 2},
+		"/a/grafana-auth-app": {
+			SectionID:  navtree.NavIDCfgAccess,
+			SortWeight: 2,
+			SubTitle:   "Use policies to control automated access to metrics, logs, traces, and other Grafana Cloud services",
+		},
 	}
 
 	appSections := s.cfg.Raw.Section("navigation.app_sections")

From 5c5729a25d5057033e33cb833358e9fe14ad36f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Tue, 12 Aug 2025 16:48:13 +0200
Subject: [PATCH 113/243] Provisioning: Fix migration behavior for folder-type
 repositories (#109518)

Fix migration issues for folder sync
---
 .../apis/provisioning/jobs/migrate/clean.go   |  17 ++
 .../provisioning/jobs/migrate/clean_test.go   | 102 ++++++++++-
 .../jobs/migrate/unifiedstorage.go            |  21 ++-
 .../jobs/migrate/unifiedstorage_test.go       | 167 +++++++++++++++++-
 .../apis/provisioning/jobs/migrate/worker.go  |   7 +
 .../provisioning/jobs/migrate/worker_test.go  | 109 ++++++++++++
 6 files changed, 413 insertions(+), 10 deletions(-)

diff --git a/pkg/registry/apis/provisioning/jobs/migrate/clean.go b/pkg/registry/apis/provisioning/jobs/migrate/clean.go
index da1037d2b18..e5cac782ebd 100644
--- a/pkg/registry/apis/provisioning/jobs/migrate/clean.go
+++ b/pkg/registry/apis/provisioning/jobs/migrate/clean.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning/jobs"
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning/repository"
 	"github.com/grafana/grafana/pkg/registry/apis/provisioning/resources"
@@ -45,6 +46,22 @@ func (c *namespaceCleaner) Clean(ctx context.Context, namespace string, progress
 				Action:   repository.FileActionDeleted,
 			}
 
+			// Skip provisioned resources - only delete unprovisioned (unmanaged) resources
+			meta, err := utils.MetaAccessor(item)
+			if err != nil {
+				result.Error = fmt.Errorf("extracting meta accessor for resource %s: %w", result.Name, err)
+				progress.Record(ctx, result)
+				return nil // Continue with next resource
+			}
+
+			manager, _ := meta.GetManagerProperties()
+			// Skip if resource is managed by any provisioning system
+			if manager.Identity != "" {
+				result.Action = repository.FileActionIgnored
+				progress.Record(ctx, result)
+				return nil // Skip this resource
+			}
+
 			if err := client.Delete(ctx, item.GetName(), metav1.DeleteOptions{}); err != nil {
 				result.Error = fmt.Errorf("deleting resource %s/%s %s: %w", result.Group, result.Resource, result.Name, err)
 				progress.Record(ctx, result)
diff --git a/pkg/registry/apis/provisioning/jobs/migrate/clean_test.go b/pkg/registry/apis/provisioning/jobs/migrate/clean_test.go
index 69a7fb5be6b..109dd9f6e45 100644
--- a/pkg/registry/apis/provisioning/jobs/migrate/clean_test.go
+++ b/pkg/registry/apis/provisioning/jobs/migrate/clean_test.go
@@ -139,8 +139,8 @@ func TestNamespaceCleaner_Clean(t *testing.T) {
 		progress.AssertExpectations(t)
 	})
 
-	t.Run("should successfully clean namespace", func(t *testing.T) {
-		// Create a mock dynamic client that returns a list with multiple items
+	t.Run("should only delete unprovisioned resources", func(t *testing.T) {
+		// Create a mock dynamic client that returns a list with mixed provisioned and unprovisioned items
 		mockDynamicClient := &mockDynamicInterface{
 			items: []unstructured.Unstructured{
 				{
@@ -148,7 +148,8 @@ func TestNamespaceCleaner_Clean(t *testing.T) {
 						"apiVersion": "folder.grafana.app/v1alpha1",
 						"kind":       "Folder",
 						"metadata": map[string]interface{}{
-							"name": "folder-1",
+							"name": "unprovisioned-folder",
+							// No manager annotations - this is unprovisioned
 						},
 					},
 				},
@@ -157,7 +158,21 @@ func TestNamespaceCleaner_Clean(t *testing.T) {
 						"apiVersion": "dashboard.grafana.app/v1alpha1",
 						"kind":       "Dashboard",
 						"metadata": map[string]interface{}{
-							"name": "dashboard-1",
+							"name": "provisioned-dashboard",
+							"annotations": map[string]interface{}{
+								"grafana.app/managerKind": "repo",
+								"grafana.app/managerId":   "test-repo",
+							},
+						},
+					},
+				},
+				{
+					Object: map[string]interface{}{
+						"apiVersion": "dashboard.grafana.app/v1alpha1",
+						"kind":       "Dashboard",
+						"metadata": map[string]interface{}{
+							"name": "unprovisioned-dashboard",
+							// No manager annotations - this is unprovisioned
 						},
 					},
 				},
@@ -177,15 +192,88 @@ func TestNamespaceCleaner_Clean(t *testing.T) {
 		progress.On("SetMessage", mock.Anything, "remove unprovisioned folders").Return()
 		progress.On("SetMessage", mock.Anything, "remove unprovisioned dashboards").Return()
 
-		// Expect two successful deletions
+		// Expect only unprovisioned resources to be deleted (2 deletions)
 		progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
 			return result.Action == repository.FileActionDeleted &&
-				result.Name == "dashboard-1" &&
+				result.Name == "unprovisioned-folder" &&
 				result.Error == nil
 		})).Return()
 		progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
 			return result.Action == repository.FileActionDeleted &&
-				result.Name == "folder-1" &&
+				result.Name == "unprovisioned-dashboard" &&
+				result.Error == nil
+		})).Return()
+
+		// Expect provisioned resource to be ignored (1 ignore)
+		progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+			return result.Action == repository.FileActionIgnored &&
+				result.Name == "provisioned-dashboard" &&
+				result.Error == nil
+		})).Return()
+
+		err := cleaner.Clean(context.Background(), "test-namespace", progress)
+		require.NoError(t, err)
+
+		mockClientFactory.AssertExpectations(t)
+		clients.AssertExpectations(t)
+		progress.AssertExpectations(t)
+	})
+
+	t.Run("should skip all provisioned resources", func(t *testing.T) {
+		// Create a mock dynamic client with only provisioned resources
+		mockDynamicClient := &mockDynamicInterface{
+			items: []unstructured.Unstructured{
+				{
+					Object: map[string]interface{}{
+						"apiVersion": "dashboard.grafana.app/v1alpha1",
+						"kind":       "Dashboard",
+						"metadata": map[string]interface{}{
+							"name": "repo-managed-dashboard",
+							"annotations": map[string]interface{}{
+								"grafana.app/managerKind": "repo",
+								"grafana.app/managerId":   "my-repo",
+							},
+						},
+					},
+				},
+				{
+					Object: map[string]interface{}{
+						"apiVersion": "folder.grafana.app/v1alpha1",
+						"kind":       "Folder",
+						"metadata": map[string]interface{}{
+							"name": "file-provisioned-folder",
+							"annotations": map[string]interface{}{
+								"grafana.app/managerKind": "classic-file-provisioning",
+								"grafana.app/managerId":   "file-provisioner",
+							},
+						},
+					},
+				},
+			},
+		}
+
+		clients := &mockClients{}
+		clients.On("ForResource", mock.Anything).
+			Return(mockDynamicClient, schema.GroupVersionKind{}, nil)
+
+		mockClientFactory := resources.NewMockClientFactory(t)
+		mockClientFactory.On("Clients", mock.Anything, "test-namespace").
+			Return(clients, nil)
+
+		cleaner := NewNamespaceCleaner(mockClientFactory)
+		progress := jobs.NewMockJobProgressRecorder(t)
+		progress.On("SetMessage", mock.Anything, "remove unprovisioned folders").Return()
+		progress.On("SetMessage", mock.Anything, "remove unprovisioned dashboards").Return()
+
+		// Expect both resources to be ignored (no deletions)
+		progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+			return result.Action == repository.FileActionIgnored &&
+				result.Name == "repo-managed-dashboard" &&
+				result.Error == nil
+		})).Return()
+		progress.On("Record", mock.Anything, mock.MatchedBy(func(result jobs.JobResourceResult) bool {
+			return result.Action == repository.FileActionIgnored &&
+				result.Name == "file-provisioned-folder" &&
 				result.Error == nil
 		})).Return()
 
diff --git a/pkg/registry/apis/provisioning/jobs/migrate/unifiedstorage.go b/pkg/registry/apis/provisioning/jobs/migrate/unifiedstorage.go
index aa6ce0b596d..a8bb3daaafb 100644
--- a/pkg/registry/apis/provisioning/jobs/migrate/unifiedstorage.go
+++ b/pkg/registry/apis/provisioning/jobs/migrate/unifiedstorage.go
@@ -32,6 +32,24 @@ func NewUnifiedStorageMigrator(
 
 func (m *UnifiedStorageMigrator) Migrate(ctx context.Context, repo repository.ReaderWriter, options provisioning.MigrateJobOptions, progress jobs.JobProgressRecorder) error {
 	namespace := repo.Config().GetNamespace()
+
+	// For folder-type repositories, only run sync (skip export and cleaner)
+	if repo.Config().Spec.Sync.Target == provisioning.SyncTargetTypeFolder {
+		progress.SetMessage(ctx, "pull resources")
+		syncJob := provisioning.Job{
+			Spec: provisioning.JobSpec{
+				Pull: &provisioning.SyncJobOptions{
+					Incremental: false,
+				},
+			},
+		}
+		if err := m.syncWorker.Process(ctx, repo, syncJob, progress); err != nil {
+			return fmt.Errorf("pull resources: %w", err)
+		}
+		return nil
+	}
+
+	// For instance-type repositories, run the full workflow: export -> sync -> clean
 	progress.SetMessage(ctx, "export resources")
 	progress.StrictMaxErrors(1) // strict as we want the entire instance to be managed
 
@@ -48,8 +66,8 @@ func (m *UnifiedStorageMigrator) Migrate(ctx context.Context, repo repository.Re
 
 	// Reset the results after the export as pull will operate on the same resources
 	progress.ResetResults()
-	progress.SetMessage(ctx, "pull resources")
 
+	progress.SetMessage(ctx, "pull resources")
 	syncJob := provisioning.Job{
 		Spec: provisioning.JobSpec{
 			Pull: &provisioning.SyncJobOptions{
@@ -57,7 +75,6 @@ func (m *UnifiedStorageMigrator) Migrate(ctx context.Context, repo repository.Re
 			},
 		},
 	}
-
 	if err := m.syncWorker.Process(ctx, repo, syncJob, progress); err != nil {
 		return fmt.Errorf("pull resources: %w", err)
 	}
diff --git a/pkg/registry/apis/provisioning/jobs/migrate/unifiedstorage_test.go b/pkg/registry/apis/provisioning/jobs/migrate/unifiedstorage_test.go
index 5bc028f138d..9e066ef26a8 100644
--- a/pkg/registry/apis/provisioning/jobs/migrate/unifiedstorage_test.go
+++ b/pkg/registry/apis/provisioning/jobs/migrate/unifiedstorage_test.go
@@ -28,6 +28,11 @@ func TestUnifiedStorageMigrator_Migrate(t *testing.T) {
 						Name:      "test-repo",
 						Namespace: "test-namespace",
 					},
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeInstance,
+						},
+					},
 				})
 				pr.On("SetMessage", mock.Anything, "export resources").Return()
 				pr.On("StrictMaxErrors", 1).Return()
@@ -45,6 +50,11 @@ func TestUnifiedStorageMigrator_Migrate(t *testing.T) {
 						Name:      "test-repo",
 						Namespace: "test-namespace",
 					},
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeInstance,
+						},
+					},
 				})
 				pr.On("SetMessage", mock.Anything, "export resources").Return()
 				pr.On("StrictMaxErrors", 1).Return()
@@ -67,6 +77,11 @@ func TestUnifiedStorageMigrator_Migrate(t *testing.T) {
 						Name:      "test-repo",
 						Namespace: "test-namespace",
 					},
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeInstance,
+						},
+					},
 				})
 				pr.On("SetMessage", mock.Anything, "export resources").Return()
 				pr.On("StrictMaxErrors", 1).Return()
@@ -93,6 +108,11 @@ func TestUnifiedStorageMigrator_Migrate(t *testing.T) {
 						Name:      "test-repo",
 						Namespace: "test-namespace",
 					},
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeInstance,
+						},
+					},
 				})
 				pr.On("SetMessage", mock.Anything, "export resources").Return()
 				pr.On("StrictMaxErrors", 1).Return()
@@ -113,6 +133,144 @@ func TestUnifiedStorageMigrator_Migrate(t *testing.T) {
 			},
 			expectedError: "",
 		},
+		{
+			name: "should only run sync for folder-type repositories",
+			setupMocks: func(nc *MockNamespaceCleaner, ew *jobs.MockWorker, sw *jobs.MockWorker, pr *jobs.MockJobProgressRecorder, rw *repository.MockRepository) {
+				rw.On("Config").Return(&provisioning.Repository{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "test-repo",
+						Namespace: "test-namespace",
+					},
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeFolder,
+						},
+					},
+				})
+				// Export should be skipped - no export-related mocks
+				// Cleaner should also be skipped - no cleaner-related mocks
+				// Only sync job should run
+				pr.On("SetMessage", mock.Anything, "pull resources").Return()
+				sw.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
+					return job.Spec.Pull != nil && !job.Spec.Pull.Incremental
+				}), pr).Return(nil)
+			},
+			expectedError: "",
+		},
+		{
+			name: "should fail when sync job fails for folder-type repositories",
+			setupMocks: func(nc *MockNamespaceCleaner, ew *jobs.MockWorker, sw *jobs.MockWorker, pr *jobs.MockJobProgressRecorder, rw *repository.MockRepository) {
+				rw.On("Config").Return(&provisioning.Repository{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "test-repo",
+						Namespace: "test-namespace",
+					},
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeFolder,
+						},
+					},
+				})
+				// Only sync job should run and fail
+				pr.On("SetMessage", mock.Anything, "pull resources").Return()
+				sw.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
+					return job.Spec.Pull != nil && !job.Spec.Pull.Incremental
+				}), pr).Return(errors.New("folder sync failed"))
+			},
+			expectedError: "pull resources: folder sync failed",
+		},
+		{
+			name: "should run complete workflow for instance-type repositories",
+			setupMocks: func(nc *MockNamespaceCleaner, ew *jobs.MockWorker, sw *jobs.MockWorker, pr *jobs.MockJobProgressRecorder, rw *repository.MockRepository) {
+				rw.On("Config").Return(&provisioning.Repository{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "test-repo",
+						Namespace: "test-namespace",
+					},
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeInstance,
+						},
+					},
+				})
+				// Export should run for instance repositories
+				pr.On("SetMessage", mock.Anything, "export resources").Return()
+				pr.On("StrictMaxErrors", 1).Return()
+				ew.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
+					return job.Spec.Push != nil
+				}), pr).Return(nil)
+				pr.On("ResetResults").Return()
+
+				// Sync job and cleanup should also run
+				pr.On("SetMessage", mock.Anything, "pull resources").Return()
+				sw.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
+					return job.Spec.Pull != nil && !job.Spec.Pull.Incremental
+				}), pr).Return(nil)
+				pr.On("SetMessage", mock.Anything, "clean namespace").Return()
+				nc.On("Clean", mock.Anything, "test-namespace", pr).Return(nil)
+			},
+			expectedError: "",
+		},
+		{
+			name: "should handle empty target type as instance",
+			setupMocks: func(nc *MockNamespaceCleaner, ew *jobs.MockWorker, sw *jobs.MockWorker, pr *jobs.MockJobProgressRecorder, rw *repository.MockRepository) {
+				rw.On("Config").Return(&provisioning.Repository{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "test-repo",
+						Namespace: "test-namespace",
+					},
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: "", // Empty target should default to instance behavior
+						},
+					},
+				})
+				// Should run full workflow like instance type
+				pr.On("SetMessage", mock.Anything, "export resources").Return()
+				pr.On("StrictMaxErrors", 1).Return()
+				ew.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
+					return job.Spec.Push != nil
+				}), pr).Return(nil)
+				pr.On("ResetResults").Return()
+				pr.On("SetMessage", mock.Anything, "pull resources").Return()
+				sw.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
+					return job.Spec.Pull != nil && !job.Spec.Pull.Incremental
+				}), pr).Return(nil)
+				pr.On("SetMessage", mock.Anything, "clean namespace").Return()
+				nc.On("Clean", mock.Anything, "test-namespace", pr).Return(nil)
+			},
+			expectedError: "",
+		},
+		{
+			name: "should pass migrate options to export job",
+			setupMocks: func(nc *MockNamespaceCleaner, ew *jobs.MockWorker, sw *jobs.MockWorker, pr *jobs.MockJobProgressRecorder, rw *repository.MockRepository) {
+				rw.On("Config").Return(&provisioning.Repository{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "test-repo",
+						Namespace: "test-namespace",
+					},
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeInstance,
+						},
+					},
+				})
+				pr.On("SetMessage", mock.Anything, "export resources").Return()
+				pr.On("StrictMaxErrors", 1).Return()
+				// Verify that the export job receives the migrate message
+				ew.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
+					return job.Spec.Push != nil && job.Spec.Push.Message == "test migration message"
+				}), pr).Return(nil)
+				pr.On("ResetResults").Return()
+				pr.On("SetMessage", mock.Anything, "pull resources").Return()
+				sw.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
+					return job.Spec.Pull != nil && !job.Spec.Pull.Incremental
+				}), pr).Return(nil)
+				pr.On("SetMessage", mock.Anything, "clean namespace").Return()
+				nc.On("Clean", mock.Anything, "test-namespace", pr).Return(nil)
+			},
+			expectedError: "",
+		},
 	}
 
 	for _, tt := range tests {
@@ -129,7 +287,14 @@ func TestUnifiedStorageMigrator_Migrate(t *testing.T) {
 
 			migrator := NewUnifiedStorageMigrator(mockNamespaceCleaner, exportWorker, syncWorker)
 
-			err := migrator.Migrate(context.Background(), readerWriter, provisioning.MigrateJobOptions{}, progressRecorder)
+			var migrateOptions provisioning.MigrateJobOptions
+			if tt.name == "should pass migrate options to export job" {
+				migrateOptions = provisioning.MigrateJobOptions{
+					Message: "test migration message",
+				}
+			}
+
+			err := migrator.Migrate(context.Background(), readerWriter, migrateOptions, progressRecorder)
 
 			if tt.expectedError != "" {
 				require.Error(t, err)
diff --git a/pkg/registry/apis/provisioning/jobs/migrate/worker.go b/pkg/registry/apis/provisioning/jobs/migrate/worker.go
index 1293f18afa4..9f441c8e311 100644
--- a/pkg/registry/apis/provisioning/jobs/migrate/worker.go
+++ b/pkg/registry/apis/provisioning/jobs/migrate/worker.go
@@ -55,6 +55,13 @@ func (w *MigrationWorker) Process(ctx context.Context, repo repository.Repositor
 		}
 	}
 
+	// Block migrate for legacy resources if repository type is folder
+	if repo.Config().Spec.Sync.Target == provisioning.SyncTargetTypeFolder {
+		if dualwrite.IsReadingLegacyDashboardsAndFolders(ctx, w.storageStatus) {
+			return errors.New("migration of legacy resources is not supported for folder-type repositories")
+		}
+	}
+
 	if dualwrite.IsReadingLegacyDashboardsAndFolders(ctx, w.storageStatus) {
 		return w.legacyMigrator.Migrate(ctx, rw, *options, progress)
 	}
diff --git a/pkg/registry/apis/provisioning/jobs/migrate/worker_test.go b/pkg/registry/apis/provisioning/jobs/migrate/worker_test.go
index 3993b422492..e7f8a7f3dad 100644
--- a/pkg/registry/apis/provisioning/jobs/migrate/worker_test.go
+++ b/pkg/registry/apis/provisioning/jobs/migrate/worker_test.go
@@ -114,6 +114,7 @@ func TestMigrationWorker_Process(t *testing.T) {
 	tests := []struct {
 		name           string
 		setupMocks     func(*MockMigrator, *MockMigrator, *dualwrite.MockService, *jobs.MockJobProgressRecorder)
+		setupRepo      func(*repository.MockRepository)
 		job            provisioning.Job
 		expectedError  string
 		isLegacyActive bool
@@ -128,6 +129,9 @@ func TestMigrationWorker_Process(t *testing.T) {
 			},
 			setupMocks: func(lm *MockMigrator, um *MockMigrator, ds *dualwrite.MockService, pr *jobs.MockJobProgressRecorder) {
 			},
+			setupRepo: func(repo *repository.MockRepository) {
+				// No Config() call expected since we fail before that
+			},
 			expectedError: "missing migrate settings",
 		},
 		{
@@ -144,6 +148,15 @@ func TestMigrationWorker_Process(t *testing.T) {
 				ds.On("ReadFromUnified", mock.Anything, mock.Anything).Return(false, nil)
 				lm.On("Migrate", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 			},
+			setupRepo: func(repo *repository.MockRepository) {
+				repo.On("Config").Return(&provisioning.Repository{
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeInstance,
+						},
+					},
+				})
+			},
 		},
 		{
 			name: "should use unified storage migrator when legacy storage is not active",
@@ -159,6 +172,15 @@ func TestMigrationWorker_Process(t *testing.T) {
 				ds.On("ReadFromUnified", mock.Anything, mock.Anything).Return(true, nil)
 				um.On("Migrate", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 			},
+			setupRepo: func(repo *repository.MockRepository) {
+				repo.On("Config").Return(&provisioning.Repository{
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeInstance,
+						},
+					},
+				})
+			},
 		},
 		{
 			name: "should propagate migrator errors",
@@ -174,8 +196,92 @@ func TestMigrationWorker_Process(t *testing.T) {
 				ds.On("ReadFromUnified", mock.Anything, mock.Anything).Return(false, nil)
 				lm.On("Migrate", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(errors.New("migration failed"))
 			},
+			setupRepo: func(repo *repository.MockRepository) {
+				repo.On("Config").Return(&provisioning.Repository{
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeInstance,
+						},
+					},
+				})
+			},
 			expectedError: "migration failed",
 		},
+		{
+			name: "should block migration of legacy resources for folder-type repositories",
+			job: provisioning.Job{
+				Spec: provisioning.JobSpec{
+					Action:  provisioning.JobActionMigrate,
+					Migrate: &provisioning.MigrateJobOptions{},
+				},
+			},
+			isLegacyActive: true,
+			setupMocks: func(lm *MockMigrator, um *MockMigrator, ds *dualwrite.MockService, pr *jobs.MockJobProgressRecorder) {
+				pr.On("SetTotal", mock.Anything, 10).Return()
+				ds.On("ReadFromUnified", mock.Anything, mock.Anything).Return(false, nil)
+				// legacyMigrator should not be called as we block before reaching it
+			},
+			setupRepo: func(repo *repository.MockRepository) {
+				repo.On("Config").Return(&provisioning.Repository{
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeFolder,
+						},
+					},
+				})
+			},
+			expectedError: "migration of legacy resources is not supported for folder-type repositories",
+		},
+		{
+			name: "should allow migration of legacy resources for instance-type repositories",
+			job: provisioning.Job{
+				Spec: provisioning.JobSpec{
+					Action:  provisioning.JobActionMigrate,
+					Migrate: &provisioning.MigrateJobOptions{},
+				},
+			},
+			isLegacyActive: true,
+			setupMocks: func(lm *MockMigrator, um *MockMigrator, ds *dualwrite.MockService, pr *jobs.MockJobProgressRecorder) {
+				pr.On("SetTotal", mock.Anything, 10).Return()
+				ds.On("ReadFromUnified", mock.Anything, mock.Anything).Return(false, nil)
+				lm.On("Migrate", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
+			},
+			setupRepo: func(repo *repository.MockRepository) {
+				repo.On("Config").Return(&provisioning.Repository{
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeInstance,
+						},
+					},
+				})
+			},
+			expectedError: "",
+		},
+		{
+			name: "should allow migration for folder-type repositories when legacy storage is not active",
+			job: provisioning.Job{
+				Spec: provisioning.JobSpec{
+					Action:  provisioning.JobActionMigrate,
+					Migrate: &provisioning.MigrateJobOptions{},
+				},
+			},
+			isLegacyActive: false,
+			setupMocks: func(lm *MockMigrator, um *MockMigrator, ds *dualwrite.MockService, pr *jobs.MockJobProgressRecorder) {
+				pr.On("SetTotal", mock.Anything, 10).Return()
+				ds.On("ReadFromUnified", mock.Anything, mock.Anything).Return(true, nil)
+				um.On("Migrate", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
+			},
+			setupRepo: func(repo *repository.MockRepository) {
+				repo.On("Config").Return(&provisioning.Repository{
+					Spec: provisioning.RepositorySpec{
+						Sync: provisioning.SyncOptions{
+							Target: provisioning.SyncTargetTypeFolder,
+						},
+					},
+				})
+			},
+			expectedError: "",
+		},
 	}
 
 	for _, tt := range tests {
@@ -192,6 +298,9 @@ func TestMigrationWorker_Process(t *testing.T) {
 			}
 
 			rw := repository.NewMockRepository(t)
+			if tt.setupRepo != nil {
+				tt.setupRepo(rw)
+			}
 			err := worker.Process(context.Background(), rw, tt.job, progressRecorder)
 
 			if tt.expectedError != "" {

From dd85bc0b17c653a1b4aa90f31e8108fb0cdf3c25 Mon Sep 17 00:00:00 2001
From: Ihor Yeromin <yeryomin.igor@gmail.com>
Date: Tue, 12 Aug 2025 16:59:53 +0200
Subject: [PATCH 114/243] Doc: Canvas zoom to content (#109522)

doc(canvas): zoom to content
---
 .../panels-visualizations/visualizations/canvas/index.md      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/sources/panels-visualizations/visualizations/canvas/index.md b/docs/sources/panels-visualizations/visualizations/canvas/index.md
index a5f4712c502..63daf9b63e8 100644
--- a/docs/sources/panels-visualizations/visualizations/canvas/index.md
+++ b/docs/sources/panels-visualizations/visualizations/canvas/index.md
@@ -262,6 +262,10 @@ Use the following pointer and keyboard strokes:
 
 {{< video-embed src="/media/docs/grafana/2024-01-05-Canvas-Pan-&-Zoom-Enablement-Video.mp4" max-width="750px" alt="Canvas pan and zoom enablement video" >}}
 
+##### Zoom to content
+
+When you toggle on the **Zoom to content** switch, Grafana automatically adjusts the view to fit all visible elements in your canvas visualization into the viewport, adding a small margin around the edges. This makes it easy to reset your view, present content, or switch between devices without losing your framing. The content will re‑fit even if you resize the panel.
+
 ##### Infinite panning
 
 You can enable infinite panning in a canvas when pan and zoom is enabled. This allows you to pan and zoom the canvas and uncover larger designs.

From c662b880fdb2486bb267aa1e2faa951a6a0f37d7 Mon Sep 17 00:00:00 2001
From: Todd Treece <360020+toddtreece@users.noreply.github.com>
Date: Tue, 12 Aug 2025 11:28:17 -0400
Subject: [PATCH 115/243] App Installer: Merge builder and installer admission
 (#109267)

---
 .../apiserver/appinstaller/installer.go       | 37 +++++++++++--------
 pkg/services/apiserver/service.go             | 13 ++++---
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/pkg/services/apiserver/appinstaller/installer.go b/pkg/services/apiserver/appinstaller/installer.go
index 9817f7513bc..5a0360111e5 100644
--- a/pkg/services/apiserver/appinstaller/installer.go
+++ b/pkg/services/apiserver/appinstaller/installer.go
@@ -11,6 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/storage/legacysql/dualwrite"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/admission"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/apiserver/pkg/registry/generic"
 	genericapiserver "k8s.io/apiserver/pkg/server"
@@ -58,27 +59,31 @@ func AddToScheme(
 	return additionalGroupVersions, nil
 }
 
-// RegisterAdmissionPlugins registers admission plugins for app installers
-func RegisterAdmissionPlugins(
-	ctx context.Context,
+// RegisterAdmission combines the existing admission control from builders.
+func RegisterAdmission(
+	existingAdmission admission.Interface,
 	appInstallers []appsdkapiserver.AppInstaller,
-	options *grafanaapiserveroptions.Options,
-) error {
-	logger := logging.FromContext(ctx)
+) (admission.Interface, error) {
+	controllers := []admission.Interface{}
 
 	for _, installer := range appInstallers {
-		plugin := installer.AdmissionPlugin()
-		if plugin != nil {
-			md := installer.ManifestData()
-			if md == nil {
-				return fmt.Errorf("manifest is not initialized for installer for GroupVersions %v", installer.GroupVersions())
-			}
-			pluginName := md.AppName + " admission"
-			options.RecommendedOptions.Admission.Plugins.Register(pluginName, plugin)
-			logger.Info("Registered admission plugin", "app", md.AppName)
+		factory := installer.AdmissionPlugin()
+		if factory == nil {
+			continue
 		}
+
+		admissionInterface, err := factory(nil)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create admission plugin: %w", err)
+		}
+		controllers = append(controllers, admissionInterface)
 	}
-	return nil
+
+	if existingAdmission != nil {
+		controllers = append(controllers, existingAdmission)
+	}
+
+	return admission.NewChainHandler(controllers...), nil
 }
 
 type AuthorizerRegistrar interface {
diff --git a/pkg/services/apiserver/service.go b/pkg/services/apiserver/service.go
index 31777f82a65..755e3b3f17f 100644
--- a/pkg/services/apiserver/service.go
+++ b/pkg/services/apiserver/service.go
@@ -291,11 +291,6 @@ func (s *service) start(ctx context.Context) error {
 
 	o := grafanaapiserveroptions.NewOptions(s.codecs.LegacyCodec(groupVersions...))
 
-	// Register admission plugins from app installers after options are created
-	if err := appinstaller.RegisterAdmissionPlugins(ctx, s.appInstallers, o); err != nil {
-		return err
-	}
-
 	// Register authorizers from app installers
 	appinstaller.RegisterAuthorizers(ctx, s.appInstallers, s.authorizer)
 
@@ -367,6 +362,14 @@ func (s *service) start(ctx context.Context) error {
 		return err
 	}
 
+	serverConfig.AdmissionControl, err = appinstaller.RegisterAdmission(
+		serverConfig.AdmissionControl,
+		s.appInstallers,
+	)
+	if err != nil {
+		return err
+	}
+
 	notFoundHandler := notfoundhandler.New(s.codecs, genericapifilters.NoMuxAndDiscoveryIncompleteKey)
 
 	if err := appinstaller.RegisterPostStartHooks(s.appInstallers, serverConfig); err != nil {

From 7b4fcd486aec033931c415f0d4dce5c00fcb9787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mustafa=20Sencer=20=C3=96zcan?=
 <32759850+mustafasencer@users.noreply.github.com>
Date: Tue, 12 Aug 2025 17:29:50 +0200
Subject: [PATCH 116/243] Revert "fix: unified resource server list queries
 order column" (#109529)

---
 .../unified/resource/storage_backend.go       | 30 ++----
 pkg/storage/unified/sql/backend.go            |  4 +-
 .../unified/sql/data/resource_history_get.sql |  4 +-
 .../sql/data/resource_history_list.sql        |  2 +-
 .../unified/sql/data/resource_list.sql        |  2 +-
 pkg/storage/unified/sql/queries.go            |  9 +-
 ...source_history_get-read object history.sql |  2 +-
 ...sql--resource_history_list-single path.sql |  2 +-
 ...sql--resource_list-filter_on_namespace.sql |  2 +-
 ...source_history_get-read object history.sql |  2 +-
 ...res--resource_history_list-single path.sql |  2 +-
 ...res--resource_list-filter_on_namespace.sql |  2 +-
 ...source_history_get-read object history.sql |  2 +-
 ...ite--resource_history_list-single path.sql |  2 +-
 ...ite--resource_list-filter_on_namespace.sql |  2 +-
 .../unified/testing/storage_backend.go        | 97 +++----------------
 16 files changed, 43 insertions(+), 123 deletions(-)

diff --git a/pkg/storage/unified/resource/storage_backend.go b/pkg/storage/unified/resource/storage_backend.go
index 1fb0ad2e66a..dff33f63b36 100644
--- a/pkg/storage/unified/resource/storage_backend.go
+++ b/pkg/storage/unified/resource/storage_backend.go
@@ -215,6 +215,7 @@ func (k *kvStorageBackend) ListIterator(ctx context.Context, req *resourcepb.Lis
 
 	// Fetch the latest objects
 	keys := make([]MetaDataKey, 0, min(defaultListBufferSize, req.Limit+1))
+	idx := 0
 	for metaKey, err := range k.metaStore.ListResourceKeysAtRevision(ctx, MetaListRequestKey{
 		Namespace: req.Options.Key.Namespace,
 		Group:     req.Options.Key.Group,
@@ -224,15 +225,17 @@ func (k *kvStorageBackend) ListIterator(ctx context.Context, req *resourcepb.Lis
 		if err != nil {
 			return 0, err
 		}
+		// Skip the first offset items. This is not efficient, but it's a simple way to implement it for now.
+		if idx < int(offset) {
+			idx++
+			continue
+		}
 		keys = append(keys, metaKey)
+		// Only fetch the first limit items + 1 to get the next token.
+		if len(keys) >= int(req.Limit+1) {
+			break
+		}
 	}
-
-	sortMetaKeysByResourceVersion(keys, true) // sort ascending for sql parity
-
-	if offset > 0 && int64(len(keys)) > offset {
-		keys = keys[offset:]
-	}
-
 	iter := kvListIterator{
 		keys:         keys,
 		currentIndex: -1,
@@ -430,19 +433,6 @@ func sortByResourceVersion(filteredKeys []DataKey, sortAscending bool) {
 	}
 }
 
-// sortMetaKeysByResourceVersion sorts the metadata keys based on the sortAscending flag
-func sortMetaKeysByResourceVersion(keys []MetaDataKey, sortAscending bool) {
-	if sortAscending {
-		sort.Slice(keys, func(i, j int) bool {
-			return keys[i].ResourceVersion < keys[j].ResourceVersion
-		})
-	} else {
-		sort.Slice(keys, func(i, j int) bool {
-			return keys[i].ResourceVersion > keys[j].ResourceVersion
-		})
-	}
-}
-
 // applyPagination filters keys based on pagination parameters
 func applyPagination(keys []DataKey, lastSeenRV int64, sortAscending bool) []DataKey {
 	if lastSeenRV == 0 {
diff --git a/pkg/storage/unified/sql/backend.go b/pkg/storage/unified/sql/backend.go
index 7733de8ff91..ca3e941eb92 100644
--- a/pkg/storage/unified/sql/backend.go
+++ b/pkg/storage/unified/sql/backend.go
@@ -599,7 +599,7 @@ func (b *backend) listLatest(ctx context.Context, req *resourcepb.ListRequest, c
 		return 0, fmt.Errorf("only works for the 'latest' resource version")
 	}
 
-	iter := &listIter{}
+	iter := &listIter{sortAsc: false}
 	err := b.db.WithTx(ctx, ReadCommittedRO, func(ctx context.Context, tx db.Tx) error {
 		var err error
 		iter.listRV, err = b.fetchLatestRV(ctx, tx, b.dialect, req.Options.Key.Group, req.Options.Key.Resource)
@@ -637,7 +637,7 @@ func (b *backend) listAtRevision(ctx context.Context, req *resourcepb.ListReques
 	defer span.End()
 
 	// Get the RV
-	iter := &listIter{listRV: req.ResourceVersion}
+	iter := &listIter{listRV: req.ResourceVersion, sortAsc: false}
 	if req.NextPageToken != "" {
 		continueToken, err := resource.GetContinueToken(req.NextPageToken)
 		if err != nil {
diff --git a/pkg/storage/unified/sql/data/resource_history_get.sql b/pkg/storage/unified/sql/data/resource_history_get.sql
index fdb90d908b7..434ae8ffa01 100644
--- a/pkg/storage/unified/sql/data/resource_history_get.sql
+++ b/pkg/storage/unified/sql/data/resource_history_get.sql
@@ -29,7 +29,7 @@ WHERE 1 = 1
   AND {{ .Ident "resource_version" }} = {{ .Arg .ExactRV }}
   {{ end }}
 {{ if .SortAscending }}
-ORDER BY {{ .Ident "resource_version" }} ASC
+ORDER BY resource_version ASC
 {{ else }}
-ORDER BY {{ .Ident "resource_version" }} DESC
+ORDER BY resource_version DESC
 {{ end }}
diff --git a/pkg/storage/unified/sql/data/resource_history_list.sql b/pkg/storage/unified/sql/data/resource_history_list.sql
index 58838c331cf..9a0bbe1fa78 100644
--- a/pkg/storage/unified/sql/data/resource_history_list.sql
+++ b/pkg/storage/unified/sql/data/resource_history_list.sql
@@ -50,7 +50,7 @@ SELECT
         AND kv.{{ .Ident "name" }}      = {{ .Arg .Request.Options.Key.Name }}
         {{ end }}
     {{ end }}
-    ORDER BY kv.{{ .Ident "resource_version" }} ASC
+    ORDER BY kv.{{ .Ident "namespace" }} ASC, kv.{{ .Ident "name" }} ASC
     {{ if (gt .Request.Limit 0) }}
     LIMIT {{ .Arg .Request.Limit }} OFFSET {{ .Arg .Request.Offset }}
     {{ end }}
diff --git a/pkg/storage/unified/sql/data/resource_list.sql b/pkg/storage/unified/sql/data/resource_list.sql
index a2ee2f47435..2041618a370 100644
--- a/pkg/storage/unified/sql/data/resource_list.sql
+++ b/pkg/storage/unified/sql/data/resource_list.sql
@@ -23,5 +23,5 @@ SELECT
             AND {{ .Ident "name" }}      = {{ .Arg .Request.Options.Key.Name }}
             {{ end }}
         {{ end }}
-    ORDER BY {{ .Ident "resource_version" }} ASC
+    ORDER BY {{ .Ident "namespace" }} ASC, {{ .Ident "name" }} ASC
 ;
diff --git a/pkg/storage/unified/sql/queries.go b/pkg/storage/unified/sql/queries.go
index 1e0e50ae4af..43ae7f3a45a 100644
--- a/pkg/storage/unified/sql/queries.go
+++ b/pkg/storage/unified/sql/queries.go
@@ -242,13 +242,10 @@ func (r *resourceHistoryReadLatestRVResponse) Results() (*resourceHistoryReadLat
 }
 
 type historyListRequest struct {
-	ResourceVersion int64
-	Limit           int64
-	Offset          int64
-	Folder          string
-	Options         *resourcepb.ListOptions
+	ResourceVersion, Limit, Offset int64
+	Folder                         string
+	Options                        *resourcepb.ListOptions
 }
-
 type sqlResourceHistoryListRequest struct {
 	sqltemplate.SQLTemplate
 	Request  *historyListRequest
diff --git a/pkg/storage/unified/sql/testdata/mysql--resource_history_get-read object history.sql b/pkg/storage/unified/sql/testdata/mysql--resource_history_get-read object history.sql
index 66103fecdeb..4cde1c5f536 100755
--- a/pkg/storage/unified/sql/testdata/mysql--resource_history_get-read object history.sql	
+++ b/pkg/storage/unified/sql/testdata/mysql--resource_history_get-read object history.sql	
@@ -13,4 +13,4 @@ WHERE 1 = 1
   AND `group`     = 'gg'
   AND `resource`  = 'rr'
   AND `name`      = 'name'
-ORDER BY `resource_version` DESC
+ORDER BY resource_version DESC
diff --git a/pkg/storage/unified/sql/testdata/mysql--resource_history_list-single path.sql b/pkg/storage/unified/sql/testdata/mysql--resource_history_list-single path.sql
index 4a49051687d..0599ac2e10f 100755
--- a/pkg/storage/unified/sql/testdata/mysql--resource_history_list-single path.sql	
+++ b/pkg/storage/unified/sql/testdata/mysql--resource_history_list-single path.sql	
@@ -24,6 +24,6 @@ SELECT
         AND maxkv.`name`          = kv.`name`
     WHERE kv.`action`  != 3
         AND kv.`namespace` = 'ns'
-    ORDER BY kv.`resource_version` ASC
+    ORDER BY kv.`namespace` ASC, kv.`name` ASC
     LIMIT 10 OFFSET 0
 ;
diff --git a/pkg/storage/unified/sql/testdata/mysql--resource_list-filter_on_namespace.sql b/pkg/storage/unified/sql/testdata/mysql--resource_list-filter_on_namespace.sql
index ffb9ed43f85..d72fc1ddd1e 100755
--- a/pkg/storage/unified/sql/testdata/mysql--resource_list-filter_on_namespace.sql
+++ b/pkg/storage/unified/sql/testdata/mysql--resource_list-filter_on_namespace.sql
@@ -10,5 +10,5 @@ SELECT
     FROM `resource`
     WHERE 1 = 1
             AND `namespace` = 'ns'
-    ORDER BY `resource_version` ASC
+    ORDER BY `namespace` ASC, `name` ASC
 ;
diff --git a/pkg/storage/unified/sql/testdata/postgres--resource_history_get-read object history.sql b/pkg/storage/unified/sql/testdata/postgres--resource_history_get-read object history.sql
index 680fa3ca0a0..b0b6a310419 100755
--- a/pkg/storage/unified/sql/testdata/postgres--resource_history_get-read object history.sql	
+++ b/pkg/storage/unified/sql/testdata/postgres--resource_history_get-read object history.sql	
@@ -13,4 +13,4 @@ WHERE 1 = 1
   AND "group"     = 'gg'
   AND "resource"  = 'rr'
   AND "name"      = 'name'
-ORDER BY "resource_version" DESC
+ORDER BY resource_version DESC
diff --git a/pkg/storage/unified/sql/testdata/postgres--resource_history_list-single path.sql b/pkg/storage/unified/sql/testdata/postgres--resource_history_list-single path.sql
index 86aa57ad2f8..400b2a502cf 100755
--- a/pkg/storage/unified/sql/testdata/postgres--resource_history_list-single path.sql	
+++ b/pkg/storage/unified/sql/testdata/postgres--resource_history_list-single path.sql	
@@ -24,6 +24,6 @@ SELECT
         AND maxkv."name"          = kv."name"
     WHERE kv."action"  != 3
         AND kv."namespace" = 'ns'
-    ORDER BY kv."resource_version" ASC
+    ORDER BY kv."namespace" ASC, kv."name" ASC
     LIMIT 10 OFFSET 0
 ;
diff --git a/pkg/storage/unified/sql/testdata/postgres--resource_list-filter_on_namespace.sql b/pkg/storage/unified/sql/testdata/postgres--resource_list-filter_on_namespace.sql
index 9268c75bb2b..41131a1520f 100755
--- a/pkg/storage/unified/sql/testdata/postgres--resource_list-filter_on_namespace.sql
+++ b/pkg/storage/unified/sql/testdata/postgres--resource_list-filter_on_namespace.sql
@@ -10,5 +10,5 @@ SELECT
     FROM "resource"
     WHERE 1 = 1
             AND "namespace" = 'ns'
-    ORDER BY "resource_version" ASC
+    ORDER BY "namespace" ASC, "name" ASC
 ;
diff --git a/pkg/storage/unified/sql/testdata/sqlite--resource_history_get-read object history.sql b/pkg/storage/unified/sql/testdata/sqlite--resource_history_get-read object history.sql
index 680fa3ca0a0..b0b6a310419 100755
--- a/pkg/storage/unified/sql/testdata/sqlite--resource_history_get-read object history.sql	
+++ b/pkg/storage/unified/sql/testdata/sqlite--resource_history_get-read object history.sql	
@@ -13,4 +13,4 @@ WHERE 1 = 1
   AND "group"     = 'gg'
   AND "resource"  = 'rr'
   AND "name"      = 'name'
-ORDER BY "resource_version" DESC
+ORDER BY resource_version DESC
diff --git a/pkg/storage/unified/sql/testdata/sqlite--resource_history_list-single path.sql b/pkg/storage/unified/sql/testdata/sqlite--resource_history_list-single path.sql
index 86aa57ad2f8..400b2a502cf 100755
--- a/pkg/storage/unified/sql/testdata/sqlite--resource_history_list-single path.sql	
+++ b/pkg/storage/unified/sql/testdata/sqlite--resource_history_list-single path.sql	
@@ -24,6 +24,6 @@ SELECT
         AND maxkv."name"          = kv."name"
     WHERE kv."action"  != 3
         AND kv."namespace" = 'ns'
-    ORDER BY kv."resource_version" ASC
+    ORDER BY kv."namespace" ASC, kv."name" ASC
     LIMIT 10 OFFSET 0
 ;
diff --git a/pkg/storage/unified/sql/testdata/sqlite--resource_list-filter_on_namespace.sql b/pkg/storage/unified/sql/testdata/sqlite--resource_list-filter_on_namespace.sql
index 9268c75bb2b..41131a1520f 100755
--- a/pkg/storage/unified/sql/testdata/sqlite--resource_list-filter_on_namespace.sql
+++ b/pkg/storage/unified/sql/testdata/sqlite--resource_list-filter_on_namespace.sql
@@ -10,5 +10,5 @@ SELECT
     FROM "resource"
     WHERE 1 = 1
             AND "namespace" = 'ns'
-    ORDER BY "resource_version" ASC
+    ORDER BY "namespace" ASC, "name" ASC
 ;
diff --git a/pkg/storage/unified/testing/storage_backend.go b/pkg/storage/unified/testing/storage_backend.go
index 2390a6e68fb..e3314376715 100644
--- a/pkg/storage/unified/testing/storage_backend.go
+++ b/pkg/storage/unified/testing/storage_backend.go
@@ -175,8 +175,8 @@ func runTestIntegrationBackendHappyPath(t *testing.T, backend resource.StorageBa
 		require.NoError(t, err)
 		require.Nil(t, resp.Error)
 		require.Len(t, resp.Items, 2)
-		require.Contains(t, string(resp.Items[0].Value), "item3 ADDED")
-		require.Contains(t, string(resp.Items[1].Value), "item2 MODIFIED")
+		require.Contains(t, string(resp.Items[0].Value), "item2 MODIFIED")
+		require.Contains(t, string(resp.Items[1].Value), "item3 ADDED")
 		require.GreaterOrEqual(t, resp.ResourceVersion, rv5) // rv5 is the latest resource version
 	})
 
@@ -372,11 +372,11 @@ func runTestIntegrationBackendList(t *testing.T, backend resource.StorageBackend
 		require.NoError(t, err)
 		require.Nil(t, res.Error)
 		require.Len(t, res.Items, 5)
-		// should be sorted by resource_version ASC
+		// should be sorted by key ASC
 		require.Contains(t, string(res.Items[0].Value), "item1 ADDED")
-		require.Contains(t, string(res.Items[1].Value), "item4 ADDED")
-		require.Contains(t, string(res.Items[2].Value), "item5 ADDED")
-		require.Contains(t, string(res.Items[3].Value), "item2 MODIFIED")
+		require.Contains(t, string(res.Items[1].Value), "item2 MODIFIED")
+		require.Contains(t, string(res.Items[2].Value), "item4 ADDED")
+		require.Contains(t, string(res.Items[3].Value), "item5 ADDED")
 		require.Contains(t, string(res.Items[4].Value), "item6 ADDED")
 
 		require.Empty(t, res.NextPageToken)
@@ -399,8 +399,8 @@ func runTestIntegrationBackendList(t *testing.T, backend resource.StorageBackend
 		continueToken, err := resource.GetContinueToken(res.NextPageToken)
 		require.NoError(t, err)
 		require.Contains(t, string(res.Items[0].Value), "item1 ADDED")
-		require.Contains(t, string(res.Items[1].Value), "item4 ADDED")
-		require.Contains(t, string(res.Items[2].Value), "item5 ADDED")
+		require.Contains(t, string(res.Items[1].Value), "item2 MODIFIED")
+		require.Contains(t, string(res.Items[2].Value), "item4 ADDED")
 		require.GreaterOrEqual(t, continueToken.ResourceVersion, rv8)
 	})
 
@@ -438,12 +438,13 @@ func runTestIntegrationBackendList(t *testing.T, backend resource.StorageBackend
 			},
 		})
 		require.NoError(t, err)
+		require.NoError(t, err)
 		require.Nil(t, res.Error)
 		require.Len(t, res.Items, 3)
 		t.Log(res.Items)
 		require.Contains(t, string(res.Items[0].Value), "item1 ADDED")
-		require.Contains(t, string(res.Items[1].Value), "item4 ADDED")
-		require.Contains(t, string(res.Items[2].Value), "item5 ADDED")
+		require.Contains(t, string(res.Items[1].Value), "item2 MODIFIED")
+		require.Contains(t, string(res.Items[2].Value), "item4 ADDED")
 
 		continueToken, err := resource.GetContinueToken(res.NextPageToken)
 		require.NoError(t, err)
@@ -470,84 +471,15 @@ func runTestIntegrationBackendList(t *testing.T, backend resource.StorageBackend
 		require.NoError(t, err)
 		require.Nil(t, res.Error)
 		require.Len(t, res.Items, 2)
-		require.Contains(t, string(res.Items[0].Value), "item5 ADDED")
-		require.Contains(t, string(res.Items[1].Value), "item2 MODIFIED")
+		t.Log(res.Items)
+		require.Contains(t, string(res.Items[0].Value), "item4 ADDED")
+		require.Contains(t, string(res.Items[1].Value), "item5 ADDED")
 
 		continueToken, err = resource.GetContinueToken(res.NextPageToken)
 		require.NoError(t, err)
 		require.Equal(t, rv8, continueToken.ResourceVersion)
 		require.Equal(t, int64(4), continueToken.StartOffset)
 	})
-
-	t.Run("Paginate through latest items one by one", func(t *testing.T) {
-		baseKey := &resourcepb.ResourceKey{
-			Namespace: ns,
-			Group:     "group",
-			Resource:  "resource",
-		}
-		expectedItems := []string{"item1 ADDED", "item4 ADDED", "item5 ADDED", "item2 MODIFIED", "item6 ADDED"}
-		var allItems []*resourcepb.ResourceWrapper
-		var nextPageToken string
-
-		for i, expectedValue := range expectedItems {
-			req := &resourcepb.ListRequest{
-				Limit:         1,
-				NextPageToken: nextPageToken,
-				Options: &resourcepb.ListOptions{
-					Key: baseKey,
-				},
-			}
-
-			res, err := server.List(ctx, req)
-			require.NoError(t, err)
-			require.Nil(t, res.Error)
-			require.Len(t, res.Items, 1)
-			require.Contains(t, string(res.Items[0].Value), expectedValue)
-			allItems = append(allItems, res.Items[0])
-
-			if i < len(expectedItems)-1 {
-				require.NotEmpty(t, res.NextPageToken, "should have a continue token for page %d", i+1)
-				nextPageToken = res.NextPageToken
-			} else {
-				require.Empty(t, res.NextPageToken, "should not have a continue token on the last page")
-			}
-		}
-		require.Len(t, allItems, len(expectedItems))
-	})
-
-	t.Run("Paginate latest with a limit larger than remaining items", func(t *testing.T) {
-		baseKey := &resourcepb.ResourceKey{
-			Namespace: ns,
-			Group:     "group",
-			Resource:  "resource",
-		}
-		// Request first 3 items (out of 5 total)
-		req := &resourcepb.ListRequest{
-			Limit: 3,
-			Options: &resourcepb.ListOptions{
-				Key: baseKey,
-			},
-		}
-		res1, err := server.List(ctx, req)
-		require.NoError(t, err)
-		require.Nil(t, res1.Error)
-		require.Len(t, res1.Items, 3)
-		require.NotEmpty(t, res1.NextPageToken)
-		require.Contains(t, string(res1.Items[0].Value), "item1 ADDED")
-		require.Contains(t, string(res1.Items[1].Value), "item4 ADDED")
-		require.Contains(t, string(res1.Items[2].Value), "item5 ADDED")
-
-		// Request next page with a large limit
-		req.Limit = 10 // Larger than the 2 remaining items
-		req.NextPageToken = res1.NextPageToken
-		res2, err := server.List(ctx, req)
-		require.NoError(t, err)
-		require.Nil(t, res2.Error)
-		require.Len(t, res2.Items, 2) // Should only get the 2 remaining items
-		require.Contains(t, string(res2.Items[0].Value), "item2 MODIFIED")
-		require.Contains(t, string(res2.Items[1].Value), "item6 ADDED")
-		require.Empty(t, res2.NextPageToken, "should be no continue token on the last page")
-	})
 }
 
 func runTestIntegrationBackendListHistory(t *testing.T, backend resource.StorageBackend, nsPrefix string) {
@@ -727,6 +659,7 @@ func runTestIntegrationBackendListHistory(t *testing.T, backend resource.Storage
 		require.NoError(t, err)
 		require.Nil(t, res.Error)
 		require.Len(t, res.Items, 2)
+		t.Log(res.Items)
 		require.Contains(t, string(res.Items[0].Value), "item1 MODIFIED")
 		require.Equal(t, rvHistory2, res.Items[0].ResourceVersion)
 		require.Contains(t, string(res.Items[1].Value), "item1 MODIFIED")

From 2345da5100dc2ffef7175b36ac789a30182d0bf6 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 12 Aug 2025 17:40:08 +0100
Subject: [PATCH 117/243] MultiCombobox: Fix async options to being able to be
 removed (#109473)

---
 .../Combobox/MultiCombobox.test.tsx           | 103 ++++++++++++++++++
 .../src/components/Combobox/MultiCombobox.tsx |  10 +-
 2 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-ui/src/components/Combobox/MultiCombobox.test.tsx b/packages/grafana-ui/src/components/Combobox/MultiCombobox.test.tsx
index f92371b6e3b..4d3c1e0abee 100644
--- a/packages/grafana-ui/src/components/Combobox/MultiCombobox.test.tsx
+++ b/packages/grafana-ui/src/components/Combobox/MultiCombobox.test.tsx
@@ -117,6 +117,39 @@ describe('MultiCombobox', () => {
     expect(onChange).toHaveBeenNthCalledWith(3, [{ label: 'C', value: third }]);
   });
 
+  it('should allow for options to be deselected', async () => {
+    // This test ensures that our fix for async options doesn't break sync options
+    const options = [
+      { label: 'A', value: 'a' },
+      { label: 'B', value: 'b' },
+      { label: 'C', value: 'c' },
+    ];
+    const onChange = jest.fn();
+
+    const ControlledMultiCombobox = (props: MultiComboboxProps<string>) => {
+      const [value, setValue] = React.useState<string[]>(['a']);
+      return (
+        <MultiCombobox
+          {...props}
+          value={value}
+          onChange={(val) => {
+            setValue(val.map((v) => v.value));
+            onChange(val);
+          }}
+        />
+      );
+    };
+
+    render(<ControlledMultiCombobox options={options} value={[]} onChange={onChange} />);
+    const input = screen.getByRole('combobox');
+    await user.click(input);
+
+    // Click on option A to deselect it (it should be selected initially)
+    await user.click(await screen.findByRole('option', { name: 'A' }));
+
+    expect(onChange).toHaveBeenCalledWith([]);
+  });
+
   it('should be able to render a value that is not in the options', async () => {
     const options = [
       { label: 'A', value: 'a' },
@@ -378,6 +411,76 @@ describe('MultiCombobox', () => {
       expect(asyncOptions).toHaveBeenCalledTimes(1);
       expect(asyncOptions).toHaveBeenCalledWith('abc');
     });
+
+    it('should allow deselecting items', async () => {
+      const asyncOptions = jest.fn(() => Promise.resolve(simpleAsyncOptions));
+      render(<MultiCombobox options={asyncOptions} value={['Option 1']} onChange={onChangeHandler} />);
+
+      const input = screen.getByRole('combobox');
+      await user.click(input);
+
+      // Debounce
+      await act(async () => jest.advanceTimersByTime(200));
+
+      // Click on Option 1 to deselect it (it should already be selected via value prop)
+      const item = await screen.findByRole('option', { name: 'Option 1' });
+      await user.click(item);
+
+      // Verify onChange was called to remove the item
+      expect(onChangeHandler).toHaveBeenCalledWith([]);
+    });
+
+    it('should allow deselecting items with async options using ComboboxOption value format', async () => {
+      // This test reproduces the bug where deselection doesn't work with async options
+      // when the value is passed as ComboboxOption objects
+      const asyncOptionsData = [
+        { label: 'Integration A', value: 'a' },
+        { label: 'Integration B', value: 'b' },
+        { label: 'Integration C', value: 'c' },
+      ];
+
+      const asyncOptions = jest.fn(() => Promise.resolve(asyncOptionsData));
+
+      // Use a controlled component to simulate the user's scenario
+      const ControlledComponent = () => {
+        const [selectedValue, setSelectedValue] = React.useState<Array<ComboboxOption<string>>>([
+          { label: 'Integration A', value: 'a' },
+        ]);
+
+        return (
+          <MultiCombobox
+            options={asyncOptions}
+            value={selectedValue}
+            onChange={(options) => {
+              onChangeHandler(options);
+              setSelectedValue(options);
+            }}
+          />
+        );
+      };
+
+      render(<ControlledComponent />);
+
+      const input = screen.getByRole('combobox');
+      await user.click(input);
+
+      // Wait for async options to load
+      await act(async () => jest.advanceTimersByTime(200));
+
+      // Integration A should be selected (shown as pill)
+      const pillRemoveButton = screen.getByRole('button', { name: 'Remove Integration A' });
+      expect(pillRemoveButton).toBeInTheDocument();
+
+      // Click on Integration A in the dropdown to deselect it
+      const item = await screen.findByRole('option', { name: 'Integration A' });
+      await user.click(item);
+
+      // Verify onChange was called to remove the item
+      expect(onChangeHandler).toHaveBeenCalledWith([]);
+
+      // The pill should be removed
+      expect(screen.queryByRole('button', { name: 'Remove Integration A' })).not.toBeInTheDocument();
+    });
   });
 });
 
diff --git a/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx b/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
index bd9a65b705c..e6a3723191c 100644
--- a/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
+++ b/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
@@ -118,7 +118,7 @@ export const MultiCombobox = <T extends string | number>(props: MultiComboboxPro
             break;
         }
       },
-      stateReducer: (state, actionAndChanges) => {
+      stateReducer: (_state, actionAndChanges) => {
         const { changes } = actionAndChanges;
         return {
           ...changes,
@@ -220,7 +220,13 @@ export const MultiCombobox = <T extends string | number>(props: MultiComboboxPro
             }
             setSelectedItems(newSelectedItems);
           } else if (newSelectedItem && isOptionSelected(newSelectedItem)) {
-            removeSelectedItem(newSelectedItem);
+            // Find the actual selected item object that matches the clicked item by value
+            // This is necessary because the clicked item (from async options) may be a different
+            // object reference than the selected item, and useMultipleSelection uses object equality
+            const itemToRemove = selectedItems.find((item) => item.value === newSelectedItem.value);
+            if (itemToRemove) {
+              removeSelectedItem(itemToRemove);
+            }
           } else if (newSelectedItem) {
             addSelectedItem(newSelectedItem);
           }

From edcb6e6895a742cb0b6993741a3ccfe94d3aebec Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Tue, 12 Aug 2025 20:25:19 +0300
Subject: [PATCH 118/243] Provisioning: Fix OpenAPI generation (#109513)

* post-process spec

* update client

* fix the openapi

* revert playlist change

* Fix unmanaged resource counts

---------

Co-authored-by: Roberto Jimenez Sanchez <roberto.jimenez@grafana.com>
---
 pkg/registry/apis/provisioning/register.go    |   10 +-
 pkg/registry/apis/provisioning/routes.go      |    4 +-
 .../provisioning.grafana.app-v0alpha1.json    | 1836 +++--------------
 .../provisioning/v0alpha1/endpoints.gen.ts    |   26 +-
 scripts/process-specs.ts                      |    5 +
 5 files changed, 352 insertions(+), 1529 deletions(-)

diff --git a/pkg/registry/apis/provisioning/register.go b/pkg/registry/apis/provisioning/register.go
index 3956498f944..d22e81d3cf9 100644
--- a/pkg/registry/apis/provisioning/register.go
+++ b/pkg/registry/apis/provisioning/register.go
@@ -793,7 +793,7 @@ func (b *APIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.OpenAPI, err
 	repoprefix := root + "namespaces/{namespace}/repositories/{name}"
 	defs := b.GetOpenAPIDefinitions()(func(path string) spec.Ref { return spec.Ref{} })
 	defsBase := "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1."
-	refsBase := "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1."
+	refsBase := "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1."
 
 	sub := oas.Paths.Paths[repoprefix+"/test"]
 	if sub != nil {
@@ -1076,12 +1076,12 @@ spec:
 	// Add any missing definitions
 	//-----------------------------
 	for k, v := range defs {
-		clean := strings.Replace(k, defsBase, "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.", 1)
+		clean := strings.Replace(k, defsBase, "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.", 1)
 		if oas.Components.Schemas[clean] == nil {
 			oas.Components.Schemas[clean] = &v.Schema
 		}
 	}
-	compBase := "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1."
+	compBase := "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1."
 	schema := oas.Components.Schemas[compBase+"RepositoryViewList"].Properties["items"]
 	schema.Items = &spec.SchemaOrArray{
 		Schema: &spec.Schema{
@@ -1128,6 +1128,10 @@ spec:
 	schema.Items = countSpec
 	oas.Components.Schemas[compBase+"ResourceStats"].Properties["instance"] = schema
 
+	schema = oas.Components.Schemas[compBase+"ResourceStats"].Properties["unmanaged"]
+	schema.Items = countSpec
+	oas.Components.Schemas[compBase+"ResourceStats"].Properties["unmanaged"] = schema
+
 	schema = oas.Components.Schemas[compBase+"ResourceStats"].Properties["managed"]
 	schema.Items = managerSpec
 	oas.Components.Schemas[compBase+"ResourceStats"].Properties["managed"] = schema
diff --git a/pkg/registry/apis/provisioning/routes.go b/pkg/registry/apis/provisioning/routes.go
index 749c4a8d2ed..5136555bf41 100644
--- a/pkg/registry/apis/provisioning/routes.go
+++ b/pkg/registry/apis/provisioning/routes.go
@@ -53,7 +53,7 @@ func (b *APIBuilder) GetAPIRoutes(gv schema.GroupVersion) *builder.APIRoutes {
 														MediaTypeProps: spec3.MediaTypeProps{
 															Schema: &spec.Schema{
 																SchemaProps: spec.SchemaProps{
-																	Ref: spec.MustCreateRef("#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceStats"),
+																	Ref: spec.MustCreateRef("#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceStats"),
 																},
 															},
 														},
@@ -101,7 +101,7 @@ func (b *APIBuilder) GetAPIRoutes(gv schema.GroupVersion) *builder.APIRoutes {
 														MediaTypeProps: spec3.MediaTypeProps{
 															Schema: &spec.Schema{
 																SchemaProps: spec.SchemaProps{
-																	Ref: spec.MustCreateRef("#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RepositoryViewList"),
+																	Ref: spec.MustCreateRef("#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.RepositoryViewList"),
 																},
 															},
 														},
diff --git a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
index dbe70573707..2352079084e 100644
--- a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
@@ -1734,7 +1734,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.JobList"
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.JobList"
                 }
               }
             }
@@ -1757,7 +1757,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.JobSpec"
+                "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.JobSpec"
               },
               "examples": {
                 "incremental": {
@@ -1788,7 +1788,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.Job"
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.Job"
                 }
               }
             }
@@ -1837,7 +1837,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.Job"
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.Job"
                 }
               }
             }
@@ -2527,7 +2527,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RepositoryViewList"
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.RepositoryViewList"
                 }
               }
             }
@@ -2560,7 +2560,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceStats"
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceStats"
                 }
               }
             }
@@ -2571,6 +2571,26 @@
   },
   "components": {
     "schemas": {
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.Author": {
+        "type": "object",
+        "required": [
+          "name",
+          "username"
+        ],
+        "properties": {
+          "avatarURL": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string",
+            "default": ""
+          },
+          "username": {
+            "type": "string",
+            "default": ""
+          }
+        }
+      },
       "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.BitbucketRepositoryConfig": {
         "type": "object",
         "required": [
@@ -2674,6 +2694,59 @@
           }
         }
       },
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.FileItem": {
+        "type": "object",
+        "required": [
+          "path"
+        ],
+        "properties": {
+          "author": {
+            "type": "string"
+          },
+          "hash": {
+            "type": "string"
+          },
+          "modified": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "path": {
+            "type": "string",
+            "default": ""
+          },
+          "size": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      },
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.FileList": {
+        "description": "Information we can get just from the file listing",
+        "type": "object",
+        "required": [
+          "items"
+        ],
+        "properties": {
+          "apiVersion": {
+            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+            "type": "string"
+          },
+          "items": {
+            "type": "array",
+            "items": {
+              "default": {}
+            },
+            "x-kubernetes-list-type": "atomic"
+          },
+          "kind": {
+            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+            "type": "string"
+          },
+          "metadata": {
+            "default": {}
+          }
+        }
+      },
       "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.GitHubRepositoryConfig": {
         "type": "object",
         "required": [
@@ -2886,6 +2959,64 @@
           }
         ]
       },
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoryItem": {
+        "type": "object",
+        "required": [
+          "ref",
+          "message",
+          "authors",
+          "createdAt"
+        ],
+        "properties": {
+          "authors": {
+            "type": "array",
+            "items": {
+              "default": {}
+            },
+            "x-kubernetes-list-type": "atomic"
+          },
+          "createdAt": {
+            "type": "integer",
+            "format": "int64",
+            "default": 0
+          },
+          "message": {
+            "type": "string",
+            "default": ""
+          },
+          "ref": {
+            "type": "string",
+            "default": ""
+          }
+        }
+      },
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.HistoryList": {
+        "description": "HistoryList is a list of versions of a resource",
+        "type": "object",
+        "required": [
+          "items"
+        ],
+        "properties": {
+          "apiVersion": {
+            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+            "type": "string"
+          },
+          "items": {
+            "type": "array",
+            "items": {
+              "default": {}
+            },
+            "x-kubernetes-list-type": "atomic"
+          },
+          "kind": {
+            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+            "type": "string"
+          },
+          "metadata": {
+            "default": {}
+          }
+        }
+      },
       "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.Job": {
         "description": "The repository name and type are stored as labels",
         "type": "object",
@@ -3154,6 +3285,33 @@
           }
         }
       },
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ManagerStats": {
+        "type": "object",
+        "required": [
+          "stats"
+        ],
+        "properties": {
+          "id": {
+            "description": "Manager identity",
+            "type": "string"
+          },
+          "kind": {
+            "description": "Manager kind",
+            "type": "string"
+          },
+          "stats": {
+            "description": "stats",
+            "type": "array",
+            "items": {
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceCount"
+                }
+              ]
+            }
+          }
+        }
+      },
       "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.MigrateJobOptions": {
         "type": "object",
         "properties": {
@@ -3545,6 +3703,112 @@
           }
         }
       },
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.RepositoryView": {
+        "type": "object",
+        "required": [
+          "name",
+          "title",
+          "type",
+          "target",
+          "workflows"
+        ],
+        "properties": {
+          "branch": {
+            "description": "For git, this is the target branch",
+            "type": "string"
+          },
+          "name": {
+            "description": "The k8s name for this repository",
+            "type": "string",
+            "default": ""
+          },
+          "target": {
+            "description": "When syncing, where values are saved\n\nPossible enum values:\n - `\"folder\"` Resources will be saved into a folder managed by this repository It will contain a copy of everything from the remote The folder k8s name will be the same as the repository k8s name\n - `\"instance\"` Resources are saved in the global context Only one repository may specify the `instance` target When this exists, the UI will promote writing to the instance repo rather than the grafana database (where possible)",
+            "type": "string",
+            "default": "",
+            "enum": [
+              "folder",
+              "instance"
+            ]
+          },
+          "title": {
+            "description": "Repository display",
+            "type": "string",
+            "default": ""
+          },
+          "type": {
+            "description": "The repository type\n\nPossible enum values:\n - `\"bitbucket\"`\n - `\"git\"`\n - `\"github\"`\n - `\"gitlab\"`\n - `\"local\"`",
+            "type": "string",
+            "default": "",
+            "enum": [
+              "bitbucket",
+              "git",
+              "github",
+              "gitlab",
+              "local"
+            ]
+          },
+          "workflows": {
+            "description": "The supported workflows",
+            "type": "array",
+            "items": {
+              "type": "string",
+              "default": "",
+              "enum": [
+                "branch",
+                "write"
+              ]
+            }
+          }
+        }
+      },
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.RepositoryViewList": {
+        "description": "Summary shows a view of the configuration that is sanitized and is OK for logged in users to see",
+        "type": "object",
+        "required": [
+          "items"
+        ],
+        "properties": {
+          "apiVersion": {
+            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+            "type": "string"
+          },
+          "availableRepositoryTypes": {
+            "description": "AvailableRepositoryTypes is the list of repository types supported in this instance (e.g. git, bitbucket, github, etc)",
+            "type": "array",
+            "items": {
+              "type": "string",
+              "default": "",
+              "enum": [
+                "bitbucket",
+                "git",
+                "github",
+                "gitlab",
+                "local"
+              ]
+            }
+          },
+          "items": {
+            "type": "array",
+            "items": {
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.RepositoryView"
+                }
+              ]
+            },
+            "x-kubernetes-map-type": "atomic"
+          },
+          "kind": {
+            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+            "type": "string"
+          },
+          "legacyStorage": {
+            "description": "The backend is using legacy storage FIXME: Not sure where this should be exposed... but we need it somewhere The UI should force the onboarding workflow when this is true",
+            "type": "boolean"
+          }
+        }
+      },
       "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceCount": {
         "type": "object",
         "required": [
@@ -3769,6 +4033,59 @@
           }
         }
       },
+      "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceStats": {
+        "description": "Information we can get just from the file listing",
+        "type": "object",
+        "properties": {
+          "apiVersion": {
+            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+            "type": "string"
+          },
+          "instance": {
+            "description": "Stats across all unified storage When legacy storage is still used, this will offer a shim",
+            "type": "array",
+            "items": {
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceCount"
+                }
+              ]
+            },
+            "x-kubernetes-list-type": "atomic"
+          },
+          "kind": {
+            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+            "type": "string"
+          },
+          "managed": {
+            "description": "Stats for each manager",
+            "type": "array",
+            "items": {
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ManagerStats"
+                }
+              ]
+            },
+            "x-kubernetes-list-type": "atomic"
+          },
+          "metadata": {
+            "default": {}
+          },
+          "unmanaged": {
+            "description": "Stats across all unified storage When legacy storage is still used, this will offer a shim",
+            "type": "array",
+            "items": {
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceCount"
+                }
+              ]
+            },
+            "x-kubernetes-list-type": "atomic"
+          }
+        }
+      },
       "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.ResourceType": {
         "type": "object",
         "properties": {
@@ -4094,1513 +4411,6 @@
         "additionalProperties": true,
         "x-kubernetes-preserve-unknown-fields": true
       },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.Author": {
-        "type": "object",
-        "required": [
-          "name",
-          "username"
-        ],
-        "properties": {
-          "avatarURL": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string",
-            "default": ""
-          },
-          "username": {
-            "type": "string",
-            "default": ""
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.BitbucketRepositoryConfig": {
-        "type": "object",
-        "required": [
-          "branch"
-        ],
-        "properties": {
-          "branch": {
-            "description": "The branch to use in the repository.",
-            "type": "string",
-            "default": ""
-          },
-          "encryptedToken": {
-            "description": "Token for accessing the repository, but encrypted. This is not possible to read back to a user decrypted.",
-            "type": "string",
-            "format": "byte",
-            "x-kubernetes-list-type": "atomic"
-          },
-          "path": {
-            "description": "Path is the subdirectory for the Grafana data. If specified, Grafana will ignore anything that is outside this directory in the repository. This is usually something like `grafana/`. Trailing and leading slash are not required. They are always added when needed. The path is relative to the root of the repository, regardless of the leading slash.\n\nWhen specifying something like `grafana-`, we will not look for `grafana-*`; we will only look for files under the directory `/grafana-/`. That means `/grafana-example.json` would not be found.",
-            "type": "string"
-          },
-          "token": {
-            "description": "Token for accessing the repository. If set, it will be encrypted into encryptedToken, then set to an empty string again.",
-            "type": "string"
-          },
-          "tokenUser": {
-            "description": "TokenUser is the user that will be used to access the repository if it's a personal access token.",
-            "type": "string"
-          },
-          "url": {
-            "description": "The repository URL (e.g. `https://bitbucket.org/example/test`).",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.DeleteJobOptions": {
-        "type": "object",
-        "properties": {
-          "paths": {
-            "description": "Paths to be deleted. Examples: - dashboard.json (for a file) - a/b/c/other-dashboard.json (for a file) - nested/deep/ (for a directory) FIXME: we should validate this in admission hooks",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "default": ""
-            }
-          },
-          "ref": {
-            "description": "Ref to the branch or commit hash to delete from",
-            "type": "string"
-          },
-          "resources": {
-            "description": "Resources to delete This option has been created because currently the frontend does not use standarized app platform APIs. For performance and API consistency reasons, the preferred option is it to use the paths.",
-            "type": "array",
-            "items": {
-              "default": {}
-            }
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ErrorDetails": {
-        "type": "object",
-        "required": [
-          "type"
-        ],
-        "properties": {
-          "detail": {
-            "type": "string"
-          },
-          "field": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string",
-            "default": ""
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ExportJobOptions": {
-        "type": "object",
-        "properties": {
-          "branch": {
-            "description": "FIXME: we should validate this in admission hooks Target branch for export (only git)",
-            "type": "string"
-          },
-          "folder": {
-            "description": "The source folder (or empty) to export",
-            "type": "string"
-          },
-          "message": {
-            "description": "Message to use when committing the changes in a single commit",
-            "type": "string"
-          },
-          "path": {
-            "description": "FIXME: we should validate this in admission hooks Prefix in target file system",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.FileItem": {
-        "type": "object",
-        "required": [
-          "path"
-        ],
-        "properties": {
-          "author": {
-            "type": "string"
-          },
-          "hash": {
-            "type": "string"
-          },
-          "modified": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "path": {
-            "type": "string",
-            "default": ""
-          },
-          "size": {
-            "type": "integer",
-            "format": "int64"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.FileList": {
-        "description": "Information we can get just from the file listing",
-        "type": "object",
-        "required": [
-          "items"
-        ],
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "items": {
-            "type": "array",
-            "items": {
-              "default": {}
-            },
-            "x-kubernetes-list-type": "atomic"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "metadata": {
-            "default": {}
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.GitHubRepositoryConfig": {
-        "type": "object",
-        "required": [
-          "branch"
-        ],
-        "properties": {
-          "branch": {
-            "description": "The branch to use in the repository.",
-            "type": "string",
-            "default": ""
-          },
-          "encryptedToken": {
-            "description": "Token for accessing the repository, but encrypted. This is not possible to read back to a user decrypted.",
-            "type": "string",
-            "format": "byte",
-            "x-kubernetes-list-type": "atomic"
-          },
-          "generateDashboardPreviews": {
-            "description": "Whether we should show dashboard previews for pull requests. By default, this is false (i.e. we will not create previews).",
-            "type": "boolean"
-          },
-          "path": {
-            "description": "Path is the subdirectory for the Grafana data. If specified, Grafana will ignore anything that is outside this directory in the repository. This is usually something like `grafana/`. Trailing and leading slash are not required. They are always added when needed. The path is relative to the root of the repository, regardless of the leading slash.\n\nWhen specifying something like `grafana-`, we will not look for `grafana-*`; we will only look for files under the directory `/grafana-/`. That means `/grafana-example.json` would not be found.",
-            "type": "string"
-          },
-          "token": {
-            "description": "Token for accessing the repository. If set, it will be encrypted into encryptedToken, then set to an empty string again.",
-            "type": "string"
-          },
-          "url": {
-            "description": "The repository URL (e.g. `https://github.com/example/test`).",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.GitLabRepositoryConfig": {
-        "type": "object",
-        "required": [
-          "branch"
-        ],
-        "properties": {
-          "branch": {
-            "description": "The branch to use in the repository.",
-            "type": "string",
-            "default": ""
-          },
-          "encryptedToken": {
-            "description": "Token for accessing the repository, but encrypted. This is not possible to read back to a user decrypted.",
-            "type": "string",
-            "format": "byte",
-            "x-kubernetes-list-type": "atomic"
-          },
-          "path": {
-            "description": "Path is the subdirectory for the Grafana data. If specified, Grafana will ignore anything that is outside this directory in the repository. This is usually something like `grafana/`. Trailing and leading slash are not required. They are always added when needed. The path is relative to the root of the repository, regardless of the leading slash.\n\nWhen specifying something like `grafana-`, we will not look for `grafana-*`; we will only look for files under the directory `/grafana-/`. That means `/grafana-example.json` would not be found.",
-            "type": "string"
-          },
-          "token": {
-            "description": "Token for accessing the repository. If set, it will be encrypted into encryptedToken, then set to an empty string again.",
-            "type": "string"
-          },
-          "url": {
-            "description": "The repository URL (e.g. `https://gitlab.com/example/test`).",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.GitRepositoryConfig": {
-        "type": "object",
-        "required": [
-          "branch"
-        ],
-        "properties": {
-          "branch": {
-            "description": "The branch to use in the repository.",
-            "type": "string",
-            "default": ""
-          },
-          "encryptedToken": {
-            "description": "Token for accessing the repository, but encrypted. This is not possible to read back to a user decrypted.",
-            "type": "string",
-            "format": "byte",
-            "x-kubernetes-list-type": "atomic"
-          },
-          "path": {
-            "description": "Path is the subdirectory for the Grafana data. If specified, Grafana will ignore anything that is outside this directory in the repository. This is usually something like `grafana/`. Trailing and leading slash are not required. They are always added when needed. The path is relative to the root of the repository, regardless of the leading slash.\n\nWhen specifying something like `grafana-`, we will not look for `grafana-*`; we will only look for files under the directory `/grafana-/`. That means `/grafana-example.json` would not be found.",
-            "type": "string"
-          },
-          "token": {
-            "description": "Token for accessing the repository. If set, it will be encrypted into encryptedToken, then set to an empty string again.",
-            "type": "string"
-          },
-          "tokenUser": {
-            "description": "TokenUser is the user that will be used to access the repository if it's a personal access token.",
-            "type": "string"
-          },
-          "url": {
-            "description": "The repository URL (e.g. `https://github.com/example/test.git`).",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.HealthStatus": {
-        "type": "object",
-        "required": [
-          "healthy"
-        ],
-        "properties": {
-          "checked": {
-            "description": "When the health was checked last time",
-            "type": "integer",
-            "format": "int64"
-          },
-          "healthy": {
-            "description": "When not healthy, requests will not be executed",
-            "type": "boolean",
-            "default": false
-          },
-          "message": {
-            "description": "Summary messages (can be shown to users) Will only be populated when not healthy",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "default": ""
-            },
-            "x-kubernetes-list-type": "atomic"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.HistoricJob": {
-        "description": "HistoricJob is an append only log, saving all jobs that have been processed.\n\nNOTE: This should not be used directly by any external consumer. When there is a more stable integration with loki (an appropriate append only store) this may be removed without notice.\n\nThe repository name and type are stored as labels.",
-        "type": "object",
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "metadata": {
-            "default": {}
-          },
-          "spec": {
-            "default": {}
-          },
-          "status": {
-            "default": {}
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.HistoricJobList": {
-        "type": "object",
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "items": {
-            "type": "array",
-            "items": {
-              "default": {}
-            }
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "metadata": {
-            "default": {}
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.HistoryItem": {
-        "type": "object",
-        "required": [
-          "ref",
-          "message",
-          "authors",
-          "createdAt"
-        ],
-        "properties": {
-          "authors": {
-            "type": "array",
-            "items": {
-              "default": {}
-            },
-            "x-kubernetes-list-type": "atomic"
-          },
-          "createdAt": {
-            "type": "integer",
-            "format": "int64",
-            "default": 0
-          },
-          "message": {
-            "type": "string",
-            "default": ""
-          },
-          "ref": {
-            "type": "string",
-            "default": ""
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.HistoryList": {
-        "description": "HistoryList is a list of versions of a resource",
-        "type": "object",
-        "required": [
-          "items"
-        ],
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "items": {
-            "type": "array",
-            "items": {
-              "default": {}
-            },
-            "x-kubernetes-list-type": "atomic"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "metadata": {
-            "default": {}
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.Job": {
-        "description": "The repository name and type are stored as labels",
-        "type": "object",
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "metadata": {
-            "default": {}
-          },
-          "spec": {
-            "default": {}
-          },
-          "status": {
-            "default": {}
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.JobList": {
-        "type": "object",
-        "required": [
-          "items"
-        ],
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "items": {
-            "type": "array",
-            "items": {
-              "default": {}
-            }
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "metadata": {
-            "default": {}
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.JobResourceSummary": {
-        "type": "object",
-        "properties": {
-          "create": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "delete": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "error": {
-            "description": "Create or update (export)",
-            "type": "integer",
-            "format": "int64"
-          },
-          "errors": {
-            "description": "Report errors for this resource type This may not be an exhaustive list and recommend looking at the logs for more info",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "default": ""
-            }
-          },
-          "group": {
-            "type": "string"
-          },
-          "noop": {
-            "description": "No action required (useful for sync)",
-            "type": "integer",
-            "format": "int64"
-          },
-          "resource": {
-            "type": "string"
-          },
-          "total": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "update": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "write": {
-            "type": "integer",
-            "format": "int64"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.JobSpec": {
-        "type": "object",
-        "properties": {
-          "action": {
-            "description": "Possible enum values:\n - `\"delete\"` deletes files in the remote repository\n - `\"migrate\"` acts like JobActionExport, then JobActionPull. It also tries to preserve the history.\n - `\"move\"` moves files in the remote repository\n - `\"pr\"` adds additional useful information to a PR, such as comments with preview links and rendered images.\n - `\"pull\"` replicates the remote branch in the local copy of the repository.\n - `\"push\"` replicates the local copy of the repository in the remote branch.",
-            "type": "string",
-            "enum": [
-              "delete",
-              "migrate",
-              "move",
-              "pr",
-              "pull",
-              "push"
-            ]
-          },
-          "delete": {
-            "description": "Delete when the action is `delete`"
-          },
-          "migrate": {
-            "description": "Required when the action is `migrate`"
-          },
-          "move": {
-            "description": "Move when the action is `move`"
-          },
-          "pr": {
-            "description": "Pull request options"
-          },
-          "pull": {
-            "description": "Required when the action is `pull`"
-          },
-          "push": {
-            "description": "Required when the action is `push`"
-          },
-          "repository": {
-            "description": "The the repository reference (for now also in labels) This value is required, but will be popuplated from the job making the request",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.JobStatus": {
-        "description": "The job status",
-        "type": "object",
-        "properties": {
-          "errors": {
-            "type": "array",
-            "items": {
-              "type": "string",
-              "default": ""
-            }
-          },
-          "finished": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "message": {
-            "type": "string"
-          },
-          "progress": {
-            "description": "Optional value 0-100 that can be set while running",
-            "type": "number",
-            "format": "double"
-          },
-          "started": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "state": {
-            "description": "Possible enum values:\n - `\"error\"` Finished with errors\n - `\"pending\"` Job has been submitted, but not processed yet\n - `\"success\"` Finished with success\n - `\"warning\"` Finished with some non-critical errors\n - `\"working\"` The job is running",
-            "type": "string",
-            "enum": [
-              "error",
-              "pending",
-              "success",
-              "warning",
-              "working"
-            ]
-          },
-          "summary": {
-            "description": "Summary of processed actions",
-            "type": "array",
-            "items": {}
-          },
-          "url": {
-            "description": "URLs contains URLs for the reference branch or commit if applicable."
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.LocalRepositoryConfig": {
-        "type": "object",
-        "properties": {
-          "path": {
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ManagerStats": {
-        "type": "object",
-        "required": [
-          "stats"
-        ],
-        "properties": {
-          "id": {
-            "description": "Manager identity",
-            "type": "string"
-          },
-          "kind": {
-            "description": "Manager kind",
-            "type": "string"
-          },
-          "stats": {
-            "description": "stats",
-            "type": "array",
-            "items": {
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceCount"
-                }
-              ]
-            }
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.MigrateJobOptions": {
-        "type": "object",
-        "properties": {
-          "history": {
-            "description": "Preserve history (if possible)",
-            "type": "boolean"
-          },
-          "message": {
-            "description": "Message to use when committing the changes in a single commit",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.MoveJobOptions": {
-        "type": "object",
-        "properties": {
-          "paths": {
-            "description": "Paths to be deleted. Examples: - dashboard.json (for a file) - a/b/c/other-dashboard.json (for a file) - nested/deep/ (for a directory) FIXME: we should validate this in admission hooks",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "default": ""
-            }
-          },
-          "ref": {
-            "description": "Ref to the branch or commit hash that should move",
-            "type": "string"
-          },
-          "resources": {
-            "description": "Resources to move This option has been created because currently the frontend does not use standarized app platform APIs. For performance and API consistency reasons, the preferred option is it to use the paths.",
-            "type": "array",
-            "items": {
-              "default": {}
-            }
-          },
-          "targetPath": {
-            "description": "Destination path for the move (e.g. \"new-location/\")",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.PullRequestJobOptions": {
-        "type": "object",
-        "properties": {
-          "hash": {
-            "description": "The specific commit hash that triggered this notice",
-            "type": "string"
-          },
-          "pr": {
-            "description": "Pull request number (when appropriate)",
-            "type": "integer",
-            "format": "int32"
-          },
-          "ref": {
-            "description": "The branch of commit hash",
-            "type": "string"
-          },
-          "url": {
-            "description": "URL to the originator (eg, PR URL)",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RefItem": {
-        "type": "object",
-        "required": [
-          "name"
-        ],
-        "properties": {
-          "hash": {
-            "description": "The SHA hash of the commit this ref points to",
-            "type": "string"
-          },
-          "name": {
-            "description": "The name of the reference (branch or tag)",
-            "type": "string",
-            "default": ""
-          },
-          "refURL": {
-            "description": "The URL to the reference (branch or tag)",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RefList": {
-        "type": "object",
-        "required": [
-          "items"
-        ],
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "items": {
-            "type": "array",
-            "items": {
-              "default": {}
-            },
-            "x-kubernetes-list-type": "atomic"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "metadata": {
-            "default": {}
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.Repository": {
-        "description": "When this code is changed, make sure to update the code generation. As of writing, this can be done via the hack dir in the root of the repo: ./hack/update-codegen.sh provisioning If you've opened the generated files in this dir at some point in VSCode, you may also have to re-open them to clear errors.",
-        "type": "object",
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "metadata": {
-            "default": {}
-          },
-          "spec": {
-            "default": {}
-          },
-          "status": {
-            "default": {}
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RepositoryList": {
-        "type": "object",
-        "required": [
-          "items"
-        ],
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "items": {
-            "type": "array",
-            "items": {
-              "default": {}
-            },
-            "x-kubernetes-list-type": "atomic"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "metadata": {
-            "default": {}
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RepositorySpec": {
-        "type": "object",
-        "required": [
-          "title",
-          "workflows",
-          "sync",
-          "type"
-        ],
-        "properties": {
-          "bitbucket": {
-            "description": "The repository on Bitbucket. Mutually exclusive with local | github | git."
-          },
-          "description": {
-            "description": "Repository description",
-            "type": "string"
-          },
-          "git": {
-            "description": "The repository on Git. Mutually exclusive with local | github | git."
-          },
-          "github": {
-            "description": "The repository on GitHub. Mutually exclusive with local | github | git."
-          },
-          "gitlab": {
-            "description": "The repository on GitLab. Mutually exclusive with local | github | git."
-          },
-          "local": {
-            "description": "The repository on the local file system. Mutually exclusive with local | github."
-          },
-          "sync": {
-            "description": "Sync settings -- how values are pulled from the repository into grafana",
-            "default": {}
-          },
-          "title": {
-            "description": "The repository display name (shown in the UI)",
-            "type": "string",
-            "default": ""
-          },
-          "type": {
-            "description": "The repository type.  When selected oneOf the values below should be non-nil\n\nPossible enum values:\n - `\"bitbucket\"`\n - `\"git\"`\n - `\"github\"`\n - `\"gitlab\"`\n - `\"local\"`",
-            "type": "string",
-            "default": "",
-            "enum": [
-              "bitbucket",
-              "git",
-              "github",
-              "gitlab",
-              "local"
-            ]
-          },
-          "workflows": {
-            "description": "UI driven Workflow that allow changes to the contends of the repository. The order is relevant for defining the precedence of the workflows. When empty, the repository does not support any edits (eg, readonly)",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "default": "",
-              "enum": [
-                "branch",
-                "write"
-              ]
-            }
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RepositoryStatus": {
-        "description": "The status of a Repository. This is expected never to be created by a kubectl call or similar, and is expected to rarely (if ever) be edited manually. As such, it is also a little less well structured than the spec, such as conditional-but-ever-present fields.",
-        "type": "object",
-        "required": [
-          "observedGeneration",
-          "health",
-          "sync",
-          "webhook"
-        ],
-        "properties": {
-          "health": {
-            "description": "This will get updated with the current health status (and updated periodically)",
-            "default": {}
-          },
-          "observedGeneration": {
-            "description": "The generation of the spec last time reconciliation ran",
-            "type": "integer",
-            "format": "int64",
-            "default": 0
-          },
-          "stats": {
-            "description": "The object count when sync last ran",
-            "type": "array",
-            "items": {
-              "default": {}
-            },
-            "x-kubernetes-list-type": "atomic"
-          },
-          "sync": {
-            "description": "Sync information with the last sync information",
-            "default": {}
-          },
-          "webhook": {
-            "description": "Webhook Information (if applicable)"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RepositoryURLs": {
-        "type": "object",
-        "properties": {
-          "compareURL": {
-            "description": "Compare this version to the target branch",
-            "type": "string"
-          },
-          "newPullRequestURL": {
-            "description": "A URL that will create a new pull request for this branch",
-            "type": "string"
-          },
-          "repositoryURL": {
-            "description": "A URL pointing to the repository this lives in",
-            "type": "string"
-          },
-          "sourceURL": {
-            "description": "A URL pointing to the file or ref in the repository",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RepositoryView": {
-        "type": "object",
-        "required": [
-          "name",
-          "title",
-          "type",
-          "target",
-          "workflows"
-        ],
-        "properties": {
-          "branch": {
-            "description": "For git, this is the target branch",
-            "type": "string"
-          },
-          "name": {
-            "description": "The k8s name for this repository",
-            "type": "string",
-            "default": ""
-          },
-          "target": {
-            "description": "When syncing, where values are saved\n\nPossible enum values:\n - `\"folder\"` Resources will be saved into a folder managed by this repository It will contain a copy of everything from the remote The folder k8s name will be the same as the repository k8s name\n - `\"instance\"` Resources are saved in the global context Only one repository may specify the `instance` target When this exists, the UI will promote writing to the instance repo rather than the grafana database (where possible)",
-            "type": "string",
-            "default": "",
-            "enum": [
-              "folder",
-              "instance"
-            ]
-          },
-          "title": {
-            "description": "Repository display",
-            "type": "string",
-            "default": ""
-          },
-          "type": {
-            "description": "The repository type\n\nPossible enum values:\n - `\"bitbucket\"`\n - `\"git\"`\n - `\"github\"`\n - `\"gitlab\"`\n - `\"local\"`",
-            "type": "string",
-            "default": "",
-            "enum": [
-              "bitbucket",
-              "git",
-              "github",
-              "gitlab",
-              "local"
-            ]
-          },
-          "workflows": {
-            "description": "The supported workflows",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "default": "",
-              "enum": [
-                "branch",
-                "write"
-              ]
-            }
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RepositoryViewList": {
-        "description": "Summary shows a view of the configuration that is sanitized and is OK for logged in users to see",
-        "type": "object",
-        "required": [
-          "items"
-        ],
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "availableRepositoryTypes": {
-            "description": "AvailableRepositoryTypes is the list of repository types supported in this instance (e.g. git, bitbucket, github, etc)",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "default": "",
-              "enum": [
-                "bitbucket",
-                "git",
-                "github",
-                "gitlab",
-                "local"
-              ]
-            }
-          },
-          "items": {
-            "type": "array",
-            "items": {
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.RepositoryView"
-                }
-              ]
-            },
-            "x-kubernetes-map-type": "atomic"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "legacyStorage": {
-            "description": "The backend is using legacy storage FIXME: Not sure where this should be exposed... but we need it somewhere The UI should force the onboarding workflow when this is true",
-            "type": "boolean"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceCount": {
-        "type": "object",
-        "required": [
-          "group",
-          "resource",
-          "count"
-        ],
-        "properties": {
-          "count": {
-            "type": "integer",
-            "format": "int64",
-            "default": 0
-          },
-          "group": {
-            "type": "string",
-            "default": ""
-          },
-          "resource": {
-            "type": "string",
-            "default": ""
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceList": {
-        "description": "Information we can get just from the file listing",
-        "type": "object",
-        "required": [
-          "items"
-        ],
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "items": {
-            "type": "array",
-            "items": {
-              "default": {}
-            },
-            "x-kubernetes-list-type": "atomic"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "metadata": {
-            "default": {}
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceListItem": {
-        "type": "object",
-        "required": [
-          "path",
-          "group",
-          "resource",
-          "name",
-          "hash"
-        ],
-        "properties": {
-          "folder": {
-            "type": "string"
-          },
-          "group": {
-            "type": "string",
-            "default": ""
-          },
-          "hash": {
-            "description": "the k8s identifier",
-            "type": "string",
-            "default": ""
-          },
-          "name": {
-            "type": "string",
-            "default": ""
-          },
-          "path": {
-            "type": "string",
-            "default": ""
-          },
-          "resource": {
-            "type": "string",
-            "default": ""
-          },
-          "time": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "title": {
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceObjects": {
-        "type": "object",
-        "required": [
-          "type"
-        ],
-        "properties": {
-          "action": {
-            "description": "The action required/used for dryRun\n\nPossible enum values:\n - `\"create\"`\n - `\"delete\"`\n - `\"move\"`\n - `\"update\"`",
-            "type": "string",
-            "enum": [
-              "create",
-              "delete",
-              "move",
-              "update"
-            ]
-          },
-          "dryRun": {
-            "description": "The value returned from a dryRun request"
-          },
-          "existing": {
-            "description": "The same value, currently saved in the grafana database"
-          },
-          "file": {
-            "description": "The resource from the repository with all modifications applied eg, the name, folder etc will all be applied to this object"
-          },
-          "type": {
-            "description": "The identified type for this object",
-            "default": {}
-          },
-          "upsert": {
-            "description": "For write events, this will return the value that was added or updated"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceRef": {
-        "type": "object",
-        "properties": {
-          "group": {
-            "description": "Group is the group of the resource, such as \"dashboard.grafana.app\".",
-            "type": "string"
-          },
-          "kind": {
-            "description": "Kind is the type of resource, for example, \"Dashboard\".",
-            "type": "string"
-          },
-          "name": {
-            "description": "Name is the name of the resource, such as a dashboard UID.",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceRepositoryInfo": {
-        "type": "object",
-        "required": [
-          "type",
-          "title",
-          "namespace",
-          "name"
-        ],
-        "properties": {
-          "name": {
-            "description": "The name (identifier)",
-            "type": "string",
-            "default": ""
-          },
-          "namespace": {
-            "description": "The namespace this belongs to",
-            "type": "string",
-            "default": ""
-          },
-          "title": {
-            "description": "The display name for this repository",
-            "type": "string",
-            "default": ""
-          },
-          "type": {
-            "description": "The repository type\n\nPossible enum values:\n - `\"bitbucket\"`\n - `\"git\"`\n - `\"github\"`\n - `\"gitlab\"`\n - `\"local\"`",
-            "type": "string",
-            "default": "",
-            "enum": [
-              "bitbucket",
-              "git",
-              "github",
-              "gitlab",
-              "local"
-            ]
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceStats": {
-        "description": "Information we can get just from the file listing",
-        "type": "object",
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "instance": {
-            "description": "Stats across all unified storage When legacy storage is still used, this will offer a shim",
-            "type": "array",
-            "items": {
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceCount"
-                }
-              ]
-            },
-            "x-kubernetes-list-type": "atomic"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "managed": {
-            "description": "Stats for each manager",
-            "type": "array",
-            "items": {
-              "allOf": [
-                {
-                  "$ref": "#/components/schemas/com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ManagerStats"
-                }
-              ]
-            },
-            "x-kubernetes-list-type": "atomic"
-          },
-          "metadata": {
-            "default": {}
-          },
-          "unmanaged": {
-            "description": "Stats across all unified storage When legacy storage is still used, this will offer a shim",
-            "type": "array",
-            "items": {
-              "default": {}
-            },
-            "x-kubernetes-list-type": "atomic"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceType": {
-        "type": "object",
-        "properties": {
-          "classic": {
-            "description": "For non-k8s native formats, what did this start as\n\nPossible enum values:\n - `\"access-control\"` Access control https://github.com/grafana/grafana/blob/v11.3.1/conf/provisioning/access-control/sample.yaml\n - `\"alerting\"` Alert configuration https://github.com/grafana/grafana/blob/v11.3.1/conf/provisioning/alerting/sample.yaml\n - `\"dashboard\"` Dashboard JSON\n - `\"datasources\"` Datasource definitions eg: https://github.com/grafana/grafana/blob/v11.3.1/conf/provisioning/datasources/sample.yaml",
-            "type": "string",
-            "enum": [
-              "access-control",
-              "alerting",
-              "dashboard",
-              "datasources"
-            ]
-          },
-          "group": {
-            "type": "string"
-          },
-          "kind": {
-            "type": "string"
-          },
-          "resource": {
-            "type": "string"
-          },
-          "version": {
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.ResourceWrapper": {
-        "description": "This is a container type for any resource type",
-        "type": "object",
-        "required": [
-          "repository",
-          "resource"
-        ],
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "errors": {
-            "description": "If errors exist, show them here",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "default": ""
-            },
-            "x-kubernetes-list-type": "atomic"
-          },
-          "hash": {
-            "description": "The repo hash value",
-            "type": "string"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "path": {
-            "description": "Path to the remote file",
-            "type": "string"
-          },
-          "ref": {
-            "description": "The request ref (or branch if exists)",
-            "type": "string"
-          },
-          "repository": {
-            "description": "Basic repository info",
-            "default": {}
-          },
-          "resource": {
-            "description": "Different flavors of the same object",
-            "default": {}
-          },
-          "timestamp": {
-            "description": "The modified time in the remote file system"
-          },
-          "urls": {
-            "description": "Typed links for this file (only supported by external systems, github etc)"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.SyncJobOptions": {
-        "type": "object",
-        "required": [
-          "incremental"
-        ],
-        "properties": {
-          "incremental": {
-            "description": "Incremental synchronization for versioned repositories",
-            "type": "boolean",
-            "default": false
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.SyncOptions": {
-        "type": "object",
-        "required": [
-          "enabled",
-          "target"
-        ],
-        "properties": {
-          "enabled": {
-            "description": "Enabled must be saved as true before any sync job will run",
-            "type": "boolean",
-            "default": false
-          },
-          "intervalSeconds": {
-            "description": "When non-zero, the sync will run periodically",
-            "type": "integer",
-            "format": "int64"
-          },
-          "target": {
-            "description": "Where values should be saved\n\nPossible enum values:\n - `\"folder\"` Resources will be saved into a folder managed by this repository It will contain a copy of everything from the remote The folder k8s name will be the same as the repository k8s name\n - `\"instance\"` Resources are saved in the global context Only one repository may specify the `instance` target When this exists, the UI will promote writing to the instance repo rather than the grafana database (where possible)",
-            "type": "string",
-            "default": "",
-            "enum": [
-              "folder",
-              "instance"
-            ]
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.SyncStatus": {
-        "type": "object",
-        "required": [
-          "state",
-          "message"
-        ],
-        "properties": {
-          "finished": {
-            "description": "When the sync job finished",
-            "type": "integer",
-            "format": "int64"
-          },
-          "incremental": {
-            "description": "Incremental synchronization for versioned repositories",
-            "type": "boolean"
-          },
-          "job": {
-            "description": "The ID for the job that ran this sync",
-            "type": "string"
-          },
-          "lastRef": {
-            "description": "The repository ref when the last successful sync ran",
-            "type": "string"
-          },
-          "message": {
-            "description": "Summary messages (will be shown to users)",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "default": ""
-            },
-            "x-kubernetes-list-type": "atomic"
-          },
-          "scheduled": {
-            "description": "When the next sync check is scheduled",
-            "type": "integer",
-            "format": "int64"
-          },
-          "started": {
-            "description": "When the sync job started",
-            "type": "integer",
-            "format": "int64"
-          },
-          "state": {
-            "description": "pending, running, success, error\n\nPossible enum values:\n - `\"error\"` Finished with errors\n - `\"pending\"` Job has been submitted, but not processed yet\n - `\"success\"` Finished with success\n - `\"warning\"` Finished with some non-critical errors\n - `\"working\"` The job is running",
-            "type": "string",
-            "default": "",
-            "enum": [
-              "error",
-              "pending",
-              "success",
-              "warning",
-              "working"
-            ]
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.TestResults": {
-        "description": "HistoryList is a list of versions of a resource",
-        "type": "object",
-        "required": [
-          "code",
-          "success"
-        ],
-        "properties": {
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "code": {
-            "description": "HTTP status code",
-            "type": "integer",
-            "format": "int32",
-            "default": 0
-          },
-          "errors": {
-            "description": "Field related errors",
-            "type": "array",
-            "items": {
-              "default": {}
-            }
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          },
-          "success": {
-            "description": "Is the connection healthy",
-            "type": "boolean",
-            "default": false
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.WebhookResponse": {
-        "type": "object",
-        "properties": {
-          "added": {
-            "description": "Optional message",
-            "type": "string"
-          },
-          "apiVersion": {
-            "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-            "type": "string"
-          },
-          "code": {
-            "description": "HTTP Status code 200 implies that the payload was understood but nothing is required 202 implies that an async job has been scheduled to handle the request",
-            "type": "integer",
-            "format": "int32"
-          },
-          "job": {
-            "description": "Jobs to be processed When the response is 202 (Accepted) the queued jobs will be returned"
-          },
-          "kind": {
-            "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-            "type": "string"
-          }
-        }
-      },
-      "com.github.grafana.grafana.pkg.apis.provisioning.v0alpha1.WebhookStatus": {
-        "type": "object",
-        "properties": {
-          "encryptedSecret": {
-            "type": "string",
-            "format": "byte"
-          },
-          "id": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "lastEvent": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "secret": {
-            "type": "string"
-          },
-          "subscribedEvents": {
-            "type": "array",
-            "items": {
-              "type": "string",
-              "default": ""
-            }
-          },
-          "url": {
-            "type": "string"
-          }
-        }
-      },
       "io.k8s.apimachinery.pkg.apis.meta.v1.APIResource": {
         "description": "APIResource specifies the name of a resource and whether it is namespaced.",
         "type": "object",
diff --git a/public/app/api/clients/provisioning/v0alpha1/endpoints.gen.ts b/public/app/api/clients/provisioning/v0alpha1/endpoints.gen.ts
index 63f4e3af895..33ee7549eb7 100644
--- a/public/app/api/clients/provisioning/v0alpha1/endpoints.gen.ts
+++ b/public/app/api/clients/provisioning/v0alpha1/endpoints.gen.ts
@@ -853,6 +853,16 @@ export type JobResourceSummary = {
   update?: number;
   write?: number;
 };
+export type RepositoryUrLs = {
+  /** Compare this version to the target branch */
+  compareURL?: string;
+  /** A URL that will create a new pull request for this branch */
+  newPullRequestURL?: string;
+  /** A URL pointing to the repository this lives in */
+  repositoryURL?: string;
+  /** A URL pointing to the file or ref in the repository */
+  sourceURL?: string;
+};
 export type JobStatus = {
   errors?: string[];
   finished?: number;
@@ -869,6 +879,8 @@ export type JobStatus = {
   state?: 'error' | 'pending' | 'success' | 'warning' | 'working';
   /** Summary of processed actions */
   summary?: JobResourceSummary[];
+  /** URLs contains URLs for the reference branch or commit if applicable. */
+  url?: RepositoryUrLs;
 };
 export type Job = {
   /** APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources */
@@ -1176,16 +1188,6 @@ export type ResourceObjects = {
   /** For write events, this will return the value that was added or updated */
   upsert?: Unstructured;
 };
-export type ResourceUrLs = {
-  /** Compare this version to the target branch */
-  compareURL?: string;
-  /** A URL that will create a new pull requeset for this branch */
-  newPullRequestURL?: string;
-  /** A URL pointing to the repository this lives in */
-  repositoryURL?: string;
-  /** A URL pointing to the this file in the repository */
-  sourceURL?: string;
-};
 export type ResourceWrapper = {
   /** APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources */
   apiVersion?: string;
@@ -1206,7 +1208,7 @@ export type ResourceWrapper = {
   /** The modified time in the remote file system */
   timestamp?: Time;
   /** Typed links for this file (only supported by external systems, github etc) */
-  urls?: ResourceUrLs;
+  urls?: RepositoryUrLs;
 };
 export type ResourceListItem = {
   folder?: string;
@@ -1310,6 +1312,8 @@ export type ResourceStats = {
   /** Stats for each manager */
   managed?: ManagerStats[];
   metadata?: any;
+  /** Stats across all unified storage When legacy storage is still used, this will offer a shim */
+  unmanaged?: ResourceCount[];
 };
 export const {
   useListJobQuery,
diff --git a/scripts/process-specs.ts b/scripts/process-specs.ts
index f13fdf7cb74..8ebd24705de 100644
--- a/scripts/process-specs.ts
+++ b/scripts/process-specs.ts
@@ -69,6 +69,11 @@ function processOpenAPISpec(spec: OpenAPIV3.Document) {
   const newSchemas: Record<string, unknown> = {};
   for (const schemaKey of Object.keys(newSpec.components.schemas)) {
     const newKey = simplifySchemaName(schemaKey);
+    if (newSchemas[newKey]) {
+      // This can happen when invalid specs are used, although ignoring the error will work
+      // it is better to fix the spec to avoid confusion.
+      throw new Error(`Duplicate schema key found: ${newKey}. from: ${schemaKey}`);
+    }
 
     const schemaObject = newSpec.components.schemas[schemaKey];
     updateRefs(schemaObject);

From 56c91c2222fc67b8f3d98870af063b29b25912e2 Mon Sep 17 00:00:00 2001
From: Ezequiel Victorero <ezequiel.victorero@grafana.com>
Date: Tue, 12 Aug 2025 16:01:41 -0300
Subject: [PATCH 119/243] ShortURL: App platform migration support for dual
 write (#109221)

---
 apps/shorturl/kinds/shorturl.cue              |   1 +
 apps/shorturl/pkg/apis/shorturl_manifest.go   |  10 +-
 apps/shorturl/pkg/app/app.go                  |  20 +
 pkg/api/dtos/short_url.go                     |   1 +
 pkg/api/short_url.go                          | 210 ++++++-
 pkg/api/short_url_test.go                     |  21 +-
 pkg/registry/apps/shorturl/conversions.go     |  37 ++
 pkg/registry/apps/shorturl/legacy_storage.go  |  62 +-
 pkg/services/shorturls/models.go              |  16 +-
 pkg/services/shorturls/shorturl.go            |   4 +-
 .../shorturls/shorturlimpl/shorturl.go        |  43 +-
 .../shorturls/shorturlimpl/shorturl_test.go   |  73 ++-
 pkg/services/shorturls/shorturlimpl/store.go  |  15 +
 pkg/tests/apis/shorturl/shorturl_test.go      | 539 ++++++++++++++++++
 14 files changed, 1000 insertions(+), 52 deletions(-)
 create mode 100644 pkg/tests/apis/shorturl/shorturl_test.go

diff --git a/apps/shorturl/kinds/shorturl.cue b/apps/shorturl/kinds/shorturl.cue
index d88e10ad3e3..ab6d1c5cff2 100644
--- a/apps/shorturl/kinds/shorturl.cue
+++ b/apps/shorturl/kinds/shorturl.cue
@@ -3,6 +3,7 @@ package kinds
 shorturl: {
 	kind:		"ShortURL"
 	pluralName:	"ShortURLs"
+  validation: operations: ["CREATE","UPDATE"]
 	schema: {
 		spec: {
 			// The original path to where the short url is linking too e.g. https://localhost:3000/eer8i1kictngga/new-dashboard-with-lib-panel
diff --git a/apps/shorturl/pkg/apis/shorturl_manifest.go b/apps/shorturl/pkg/apis/shorturl_manifest.go
index 5cb4b1b2d07..d5198754064 100644
--- a/apps/shorturl/pkg/apis/shorturl_manifest.go
+++ b/apps/shorturl/pkg/apis/shorturl_manifest.go
@@ -35,7 +35,15 @@ var appManifestData = app.ManifestData{
 					Plural:     "ShortURLs",
 					Scope:      "Namespaced",
 					Conversion: false,
-					Schema:     &versionSchemaShortURLv1alpha1,
+					Admission: &app.AdmissionCapabilities{
+						Validation: &app.ValidationCapability{
+							Operations: []app.AdmissionOperation{
+								app.AdmissionOperationCreate,
+								app.AdmissionOperationUpdate,
+							},
+						},
+					},
+					Schema: &versionSchemaShortURLv1alpha1,
 				},
 			},
 		},
diff --git a/apps/shorturl/pkg/app/app.go b/apps/shorturl/pkg/app/app.go
index 519ebd5f187..9cda5c374af 100644
--- a/apps/shorturl/pkg/app/app.go
+++ b/apps/shorturl/pkg/app/app.go
@@ -3,6 +3,8 @@ package app
 import (
 	"context"
 	"fmt"
+	"path"
+	"strings"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/klog/v2"
@@ -41,6 +43,24 @@ func New(cfg app.Config) (app.App, error) {
 		ManagedKinds: []simple.AppManagedKind{
 			{
 				Kind: shorturlv1alpha1.ShortURLKind(),
+				Validator: &simple.Validator{
+					ValidateFunc: func(ctx context.Context, req *app.AdmissionRequest) error {
+						// Cast the incoming object to ShortURL for validation
+						shortURL, ok := req.Object.(*shorturlv1alpha1.ShortURL)
+						if !ok {
+							return fmt.Errorf("expected ShortURL object, got %T", req.Object)
+						}
+
+						relPath := strings.TrimSpace(shortURL.Spec.Path)
+						if path.IsAbs(relPath) {
+							return fmt.Errorf("%w: %s", ErrShortURLAbsolutePath, relPath)
+						}
+						if strings.Contains(relPath, "../") {
+							return fmt.Errorf("%w: %s", ErrShortURLInvalidPath, relPath)
+						}
+						return nil
+					},
+				},
 			},
 		},
 	}
diff --git a/pkg/api/dtos/short_url.go b/pkg/api/dtos/short_url.go
index ca185c491e0..e71fcae3aaa 100644
--- a/pkg/api/dtos/short_url.go
+++ b/pkg/api/dtos/short_url.go
@@ -7,4 +7,5 @@ type ShortURL struct {
 
 type CreateShortURLCmd struct {
 	Path string `json:"path"`
+	UID  string `json:"uid,omitempty"`
 }
diff --git a/pkg/api/short_url.go b/pkg/api/short_url.go
index 9be4bdab028..1731fd52673 100644
--- a/pkg/api/short_url.go
+++ b/pkg/api/short_url.go
@@ -3,46 +3,62 @@ package api
 import (
 	"fmt"
 	"net/http"
-	"strings"
+	"time"
 
+	"github.com/teris-io/shortid"
+
+	"k8s.io/apimachinery/pkg/api/errors"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/client-go/dynamic"
+
+	"github.com/grafana/grafana/apps/shorturl/pkg/apis/shorturl/v1alpha1"
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/middleware"
+	"github.com/grafana/grafana/pkg/registry/apps/shorturl"
+	grafanaapiserver "github.com/grafana/grafana/pkg/services/apiserver"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/shorturls"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/errhttp"
 	"github.com/grafana/grafana/pkg/web"
 )
 
 func (hs *HTTPServer) registerShortURLAPI(apiRoute routing.RouteRegister) {
 	reqSignedIn := middleware.ReqSignedIn
-	apiRoute.Post("/api/short-urls", reqSignedIn, hs.createShortURL)
-	apiRoute.Get("/goto/:uid", reqSignedIn, hs.redirectFromShortURL, hs.Index)
+	if hs.Features.IsEnabledGlobally(featuremgmt.FlagKubernetesShortURLs) {
+		handler := newShortURLK8sHandler(hs)
+		apiRoute.Post("/api/short-urls", reqSignedIn, handler.createKubernetesShortURLsHandler)
+		apiRoute.Get("/api/short-urls/:uid", reqSignedIn, handler.getKubernetesShortURLsHandler)
+		apiRoute.Get("/goto/:uid", reqSignedIn, handler.getKubernetesRedirectFromShortURL, hs.Index)
+	} else {
+		apiRoute.Post("/api/short-urls", reqSignedIn, hs.createShortURL)
+		apiRoute.Get("/api/short-urls/:uid", reqSignedIn, hs.getShortURL)
+		apiRoute.Get("/goto/:uid", reqSignedIn, hs.redirectFromShortURL, hs.Index)
+	}
 }
 
 // createShortURL handles requests to create short URLs.
 func (hs *HTTPServer) createShortURL(c *contextmodel.ReqContext) response.Response {
-	cmd := dtos.CreateShortURLCmd{}
+	cmd := &dtos.CreateShortURLCmd{}
 	if err := web.Bind(c.Req, &cmd); err != nil {
 		return response.Err(shorturls.ErrShortURLBadRequest.Errorf("bad request data: %w", err))
 	}
 	hs.log.Debug("Received request to create short URL", "path", cmd.Path)
-	shortURL, err := hs.ShortURLService.CreateShortURL(c.Req.Context(), c.SignedInUser, cmd.Path)
+	shortURL, err := hs.ShortURLService.CreateShortURL(c.Req.Context(), c.SignedInUser, cmd)
 	if err != nil {
 		return response.Err(err)
 	}
 
-	url := fmt.Sprintf("%s/goto/%s?orgId=%d", strings.TrimSuffix(hs.Cfg.AppURL, "/"), shortURL.Uid, c.GetOrgID())
-	c.Logger.Debug("Created short URL", "url", url)
+	shortURLDTO := hs.ShortURLService.ConvertShortURLToDTO(shortURL, hs.Cfg.AppURL)
+	c.Logger.Debug("Created short URL", "url", shortURLDTO.URL)
 
-	dto := dtos.ShortURL{
-		UID: shortURL.Uid,
-		URL: url,
-	}
-
-	return response.JSON(http.StatusOK, dto)
+	return response.JSON(http.StatusOK, shortURLDTO)
 }
 
 func (hs *HTTPServer) redirectFromShortURL(c *contextmodel.ReqContext) {
@@ -59,11 +75,11 @@ func (hs *HTTPServer) redirectFromShortURL(c *contextmodel.ReqContext) {
 		// we would try to redirect again.
 		if shorturls.ErrShortURLNotFound.Is(err) {
 			hs.log.Debug("Not redirecting short URL since not found", "uid", shortURLUID)
-			c.Redirect(hs.Cfg.AppURL, 308)
+			c.Redirect(hs.Cfg.AppURL, http.StatusPermanentRedirect)
 			return
 		}
 		hs.log.Error("Short URL redirection error", "err", err)
-		c.Redirect(hs.Cfg.AppURL, 307)
+		c.Redirect(hs.Cfg.AppURL, http.StatusTemporaryRedirect)
 		return
 	}
 
@@ -73,5 +89,167 @@ func (hs *HTTPServer) redirectFromShortURL(c *contextmodel.ReqContext) {
 	}
 
 	hs.log.Debug("Redirecting short URL", "path", shortURL.Path)
-	c.Redirect(setting.ToAbsUrl(shortURL.Path), 302)
+	c.Redirect(setting.ToAbsUrl(shortURL.Path), http.StatusFound)
+}
+
+// getShortURL handles requests to get short URLs.
+func (hs *HTTPServer) getShortURL(c *contextmodel.ReqContext) response.Response {
+	shortURLUID := web.Params(c.Req)[":uid"]
+
+	if !util.IsValidShortUID(shortURLUID) {
+		return response.Err(shorturls.ErrShortURLBadRequest.Errorf("invalid uid"))
+	}
+
+	shortURL, err := hs.ShortURLService.GetShortURLByUID(c.Req.Context(), c.SignedInUser, shortURLUID)
+	if err != nil {
+		if shorturls.ErrShortURLNotFound.Is(err) {
+			return response.Err(shorturls.ErrShortURLNotFound.Errorf("shorturl not found: %w", err))
+		}
+	}
+
+	return response.JSON(http.StatusOK, shortURL)
+}
+
+type shortURLK8sHandler struct {
+	namespacer           request.NamespaceMapper
+	gvr                  schema.GroupVersionResource
+	clientConfigProvider grafanaapiserver.DirectRestConfigProvider
+	cfg                  *setting.Cfg
+}
+
+func newShortURLK8sHandler(hs *HTTPServer) *shortURLK8sHandler {
+	gvr := schema.GroupVersionResource{
+		Group:    v1alpha1.ShortURLKind().Group(),
+		Version:  v1alpha1.ShortURLKind().Version(),
+		Resource: v1alpha1.ShortURLKind().Plural(),
+	}
+	return &shortURLK8sHandler{
+		gvr:                  gvr,
+		namespacer:           request.GetNamespaceMapper(hs.Cfg),
+		clientConfigProvider: hs.clientConfigProvider,
+		cfg:                  hs.Cfg,
+	}
+}
+
+func (sk8s *shortURLK8sHandler) getKubernetesShortURLsHandler(c *contextmodel.ReqContext) {
+	client, ok := sk8s.getClient(c)
+	if !ok {
+		return
+	}
+
+	shortURLUID := web.Params(c.Req)[":uid"]
+	if !util.IsValidShortUID(shortURLUID) {
+		c.JsonApiErr(http.StatusBadRequest, "Invalid short URL UID format", fmt.Errorf("invalid short URL UID: %s", shortURLUID))
+		return
+	}
+
+	c.Logger.Debug("Fetching short URL", "uid", shortURLUID)
+	out, err := client.Get(c.Req.Context(), shortURLUID, v1.GetOptions{})
+	if err != nil {
+		sk8s.writeError(c, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, shorturl.UnstructuredToLegacyShortURL(*out))
+}
+
+func (sk8s *shortURLK8sHandler) getKubernetesRedirectFromShortURL(c *contextmodel.ReqContext) {
+	client, ok := sk8s.getClient(c)
+	if !ok {
+		return
+	}
+
+	shortURLUID := web.Params(c.Req)[":uid"]
+	if !util.IsValidShortUID(shortURLUID) {
+		c.Logger.Warn("Invalid short URL UID format", "uid", shortURLUID)
+		c.Redirect(sk8s.cfg.AppURL, http.StatusFound)
+		return
+	}
+
+	// Get Object
+	obj, err := client.Get(c.Req.Context(), shortURLUID, v1.GetOptions{})
+	if err != nil {
+		sk8s.writeError(c, err)
+		return
+	}
+
+	// Modify status
+	status := obj.Object["status"].(map[string]interface{})
+	newTimestamp := time.Now().Unix()
+	status["lastSeenAt"] = newTimestamp
+
+	// Try status subresource first (works in Mode 5), fallback to main resource (works in Mode 0)
+	out, err := client.Update(c.Req.Context(), obj, v1.UpdateOptions{}, "status")
+	if err != nil {
+		c.Logger.Debug("Status subresource update failed, trying main resource", "error", err)
+		// Fallback to main resource update (for Mode 0)
+		out, err = client.Update(c.Req.Context(), obj, v1.UpdateOptions{})
+		if err != nil {
+			c.Logger.Error("Both status and main resource updates failed", "error", err)
+			sk8s.writeError(c, err)
+			return
+		}
+	}
+
+	spec := out.Object["spec"].(map[string]any)
+	path := spec["path"].(string)
+	c.Logger.Debug("Redirecting short URL", "uid", shortURLUID, "path", path)
+	c.Redirect(setting.ToAbsUrl(path), http.StatusFound)
+}
+
+func (sk8s *shortURLK8sHandler) createKubernetesShortURLsHandler(c *contextmodel.ReqContext) {
+	client, ok := sk8s.getClient(c)
+	if !ok {
+		return
+	}
+
+	cmd := dtos.CreateShortURLCmd{}
+	if err := web.Bind(c.Req, &cmd); err != nil {
+		c.Logger.Error("Failed to bind request data", "error", err)
+		c.JsonApiErr(http.StatusBadRequest, "bad request data", err)
+		return
+	}
+
+	c.Logger.Debug("Creating short URL", "path", cmd.Path)
+	obj := shorturl.LegacyCreateCommandToUnstructured(cmd)
+
+	uid, err := shortid.Generate()
+	if err != nil {
+		c.JsonApiErr(http.StatusInternalServerError, "failed to generate uid", err)
+		return
+	}
+	obj.SetGenerateName(uid)
+
+	out, err := client.Create(c.Req.Context(), &obj, v1.CreateOptions{})
+	if err != nil {
+		c.Logger.Error("Failed to create short URL in Kubernetes", "path", cmd.Path, "error", err)
+		sk8s.writeError(c, err)
+		return
+	}
+
+	c.Logger.Info("Successfully created short URL", "path", cmd.Path, "uid", out.GetName())
+	c.JSON(http.StatusOK, shorturl.UnstructuredToLegacyShortURLDTO(*out, sk8s.cfg.AppURL))
+}
+
+//-----------------------------------------------------------------------------------------
+// Utility functions
+//-----------------------------------------------------------------------------------------
+
+func (sk8s *shortURLK8sHandler) getClient(c *contextmodel.ReqContext) (dynamic.ResourceInterface, bool) {
+	dyn, err := dynamic.NewForConfig(sk8s.clientConfigProvider.GetDirectRestConfig(c))
+	if err != nil {
+		c.JsonApiErr(500, "client", err)
+		return nil, false
+	}
+	return dyn.Resource(sk8s.gvr).Namespace(sk8s.namespacer(c.OrgID)), true
+}
+
+func (sk8s *shortURLK8sHandler) writeError(c *contextmodel.ReqContext, err error) {
+	//nolint:errorlint
+	statusError, ok := err.(*errors.StatusError)
+	if ok {
+		c.JsonApiErr(int(statusError.Status().Code), statusError.Status().Message, err)
+		return
+	}
+	errhttp.Write(c.Req.Context(), err, c.Resp)
 }
diff --git a/pkg/api/short_url_test.go b/pkg/api/short_url_test.go
index e84efbc9ce3..09059dc91c9 100644
--- a/pkg/api/short_url_test.go
+++ b/pkg/api/short_url_test.go
@@ -31,9 +31,12 @@ func TestShortURLAPIEndpoint(t *testing.T) {
 			Path:  cmd.Path,
 		}
 		service := &fakeShortURLService{
-			createShortURLFunc: func(ctx context.Context, user *user.SignedInUser, path string) (*shorturls.ShortUrl, error) {
+			createShortURLFunc: func(ctx context.Context, user *user.SignedInUser, cmd *dtos.CreateShortURLCmd) (*shorturls.ShortUrl, error) {
 				return createResp, nil
 			},
+			createConvertShortURLToDTO: func(shortURL *shorturls.ShortUrl, appURL string) *dtos.ShortURL {
+				return &dtos.ShortURL{UID: createResp.Uid, URL: "http://localhost:3000/goto/N1u6L4eGz?orgId=1"}
+			},
 		}
 
 		createShortURLScenario(t, "When calling POST on", "/api/short-urls", "/api/short-urls", cmd, service,
@@ -44,7 +47,7 @@ func TestShortURLAPIEndpoint(t *testing.T) {
 				err := json.NewDecoder(sc.resp.Body).Decode(&shortUrl)
 				require.NoError(t, err)
 				require.Equal(t, 200, sc.resp.Code)
-				require.Equal(t, fmt.Sprintf("/goto/%s?orgId=%d", createResp.Uid, createResp.OrgId), shortUrl.URL)
+				require.Equal(t, fmt.Sprintf("http://localhost:3000/goto/%s?orgId=%d", createResp.Uid, createResp.OrgId), shortUrl.URL)
 			})
 	})
 }
@@ -78,16 +81,17 @@ func createShortURLScenario(t *testing.T, desc string, url string, routePattern
 }
 
 type fakeShortURLService struct {
-	createShortURLFunc func(ctx context.Context, user *user.SignedInUser, path string) (*shorturls.ShortUrl, error)
+	createShortURLFunc         func(ctx context.Context, user *user.SignedInUser, cmd *dtos.CreateShortURLCmd) (*shorturls.ShortUrl, error)
+	createConvertShortURLToDTO func(shortURL *shorturls.ShortUrl, appURL string) *dtos.ShortURL
 }
 
 func (s *fakeShortURLService) GetShortURLByUID(ctx context.Context, user *user.SignedInUser, uid string) (*shorturls.ShortUrl, error) {
 	return nil, nil
 }
 
-func (s *fakeShortURLService) CreateShortURL(ctx context.Context, user *user.SignedInUser, path string) (*shorturls.ShortUrl, error) {
+func (s *fakeShortURLService) CreateShortURL(ctx context.Context, user *user.SignedInUser, cmd *dtos.CreateShortURLCmd) (*shorturls.ShortUrl, error) {
 	if s.createShortURLFunc != nil {
-		return s.createShortURLFunc(ctx, user, path)
+		return s.createShortURLFunc(ctx, user, cmd)
 	}
 
 	return nil, nil
@@ -100,3 +104,10 @@ func (s *fakeShortURLService) UpdateLastSeenAt(ctx context.Context, shortURL *sh
 func (s *fakeShortURLService) DeleteStaleShortURLs(ctx context.Context, cmd *shorturls.DeleteShortUrlCommand) error {
 	return nil
 }
+
+func (s *fakeShortURLService) ConvertShortURLToDTO(shortURL *shorturls.ShortUrl, appURL string) *dtos.ShortURL {
+	if s.createConvertShortURLToDTO != nil {
+		return s.createConvertShortURLToDTO(shortURL, appURL)
+	}
+	return nil
+}
diff --git a/pkg/registry/apps/shorturl/conversions.go b/pkg/registry/apps/shorturl/conversions.go
index 621f3618000..76025dfd966 100644
--- a/pkg/registry/apps/shorturl/conversions.go
+++ b/pkg/registry/apps/shorturl/conversions.go
@@ -2,12 +2,15 @@ package shorturl
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
 
 	shorturl "github.com/grafana/grafana/apps/shorturl/pkg/apis/shorturl/v1alpha1"
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/services/shorturls"
 )
@@ -32,3 +35,37 @@ func convertToK8sResource(v *shorturls.ShortUrl, namespacer request.NamespaceMap
 	}
 	return p
 }
+
+func LegacyCreateCommandToUnstructured(cmd dtos.CreateShortURLCmd) unstructured.Unstructured {
+	obj := unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"metadata": map[string]interface{}{
+				"name": cmd.UID,
+			},
+			"spec": map[string]interface{}{
+				"path": cmd.Path,
+			},
+		},
+	}
+	return obj
+}
+
+func UnstructuredToLegacyShortURLDTO(item unstructured.Unstructured, appURL string) *dtos.ShortURL {
+	url := fmt.Sprintf("%s/goto/%s?orgId=%s", strings.TrimSuffix(appURL, "/"), item.GetName(), item.GetNamespace())
+
+	return &dtos.ShortURL{
+		UID: item.GetName(),
+		URL: url,
+	}
+}
+
+func UnstructuredToLegacyShortURL(item unstructured.Unstructured) *shorturls.ShortUrl {
+	spec := item.Object["spec"].(map[string]interface{})
+	status := item.Object["status"].(map[string]interface{})
+
+	return &shorturls.ShortUrl{
+		Uid:        item.GetName(),
+		Path:       spec["path"].(string),
+		LastSeenAt: status["lastSeenAt"].(int64),
+	}
+}
diff --git a/pkg/registry/apps/shorturl/legacy_storage.go b/pkg/registry/apps/shorturl/legacy_storage.go
index 0b7948d62a5..35f538b5806 100644
--- a/pkg/registry/apps/shorturl/legacy_storage.go
+++ b/pkg/registry/apps/shorturl/legacy_storage.go
@@ -14,6 +14,7 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 
 	shorturl "github.com/grafana/grafana/apps/shorturl/pkg/apis/shorturl/v1alpha1"
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/services/authn"
@@ -112,11 +113,20 @@ func (s *legacyStorage) Create(ctx context.Context,
 		return nil, fmt.Errorf("unsupported identity type")
 	}
 
+	if createValidation != nil {
+		if err := createValidation(ctx, obj.DeepCopyObject()); err != nil {
+			return nil, err
+		}
+	}
 	p, ok := obj.(*shorturl.ShortURL)
 	if !ok {
 		return nil, fmt.Errorf("expected shorturl?")
 	}
-	out, err := s.service.CreateShortURL(ctx, signedInUser, p.Spec.Path)
+	cmd := &dtos.CreateShortURLCmd{
+		Path: p.Spec.Path,
+		UID:  p.Name,
+	}
+	out, err := s.service.CreateShortURL(ctx, signedInUser, cmd)
 	if err != nil {
 		return nil, err
 	}
@@ -131,12 +141,58 @@ func (s *legacyStorage) Update(ctx context.Context,
 	forceAllowCreate bool,
 	options *metav1.UpdateOptions,
 ) (runtime.Object, bool, error) {
-	return nil, false, fmt.Errorf("Update for shorturl not implemented")
+	// For other updates, use the original logic
+	requester, err := identity.GetRequester(ctx)
+	if err != nil {
+		return nil, false, err
+	}
+
+	// Convert identity.Requester to *user.SignedInUser
+	var signedInUser *user.SignedInUser
+	if authnIdentity, ok := requester.(*authn.Identity); ok {
+		signedInUser = authnIdentity.SignedInUser()
+	} else if userIdentity, ok := requester.(*user.SignedInUser); ok {
+		signedInUser = userIdentity
+	} else {
+		return nil, false, fmt.Errorf("unsupported identity type")
+	}
+
+	shortURL, err := s.service.GetShortURLByUID(ctx, signedInUser, name)
+	if err != nil || shortURL == nil {
+		if errors.Is(err, shorturls.ErrShortURLNotFound) || err == nil {
+			err = k8serrors.NewNotFound(schema.GroupResource{
+				Group:    shorturl.ShortURLKind().Group(),
+				Resource: shorturl.ShortURLKind().Plural(),
+			}, name)
+		}
+		return nil, false, err
+	}
+
+	err = s.service.UpdateLastSeenAt(ctx, shortURL)
+	if err != nil {
+		return nil, false, err
+	}
+	// Fetch the updated short URL to return
+	updatedLegacyShortURL, err := s.service.GetShortURLByUID(ctx, signedInUser, name)
+	if err != nil {
+		return nil, false, err
+	}
+
+	return convertToK8sResource(updatedLegacyShortURL, s.namespacer), true, nil
 }
 
 // GracefulDeleter
 func (s *legacyStorage) Delete(ctx context.Context, name string, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions) (runtime.Object, bool, error) {
-	return nil, false, fmt.Errorf("Delete for shorturl not implemented")
+	v, err := s.Get(ctx, name, &metav1.GetOptions{})
+	if err != nil {
+		return v, false, err // includes the not-found error
+	}
+	p, ok := v.(*shorturl.ShortURL)
+	if !ok {
+		return v, false, fmt.Errorf("expected a shorturl response from Get")
+	}
+	err = s.service.DeleteStaleShortURLs(ctx, &shorturls.DeleteShortUrlCommand{Uid: name})
+	return p, true, err // true is instant delete
 }
 
 // CollectionDeleter
diff --git a/pkg/services/shorturls/models.go b/pkg/services/shorturls/models.go
index ffa38d91390..8b284fa13a7 100644
--- a/pkg/services/shorturls/models.go
+++ b/pkg/services/shorturls/models.go
@@ -12,19 +12,21 @@ var (
 	ErrShortURLAbsolutePath = errutil.ValidationFailed("shorturl.absolute-path", errutil.WithPublicMessage("Path should be relative"))
 	ErrShortURLInvalidPath  = errutil.ValidationFailed("shorturl.invalid-path", errutil.WithPublicMessage("Invalid short URL path"))
 	ErrShortURLInternal     = errutil.Internal("shorturl.internal")
+	ErrShortURLConflict     = errutil.Conflict("shorturl.conflict")
 )
 
 type ShortUrl struct {
-	Id         int64
-	OrgId      int64
-	Uid        string
-	Path       string
-	CreatedBy  int64
-	CreatedAt  int64
-	LastSeenAt int64
+	Id         int64  `json:"-"`
+	OrgId      int64  `json:"-"`
+	Uid        string `json:"uid"`
+	Path       string `json:"path"`
+	CreatedBy  int64  `json:"-"`
+	CreatedAt  int64  `json:"-"`
+	LastSeenAt int64  `json:"lastSeenAt"`
 }
 
 type DeleteShortUrlCommand struct {
+	Uid       string
 	OlderThan time.Time
 
 	NumDeleted int64
diff --git a/pkg/services/shorturls/shorturl.go b/pkg/services/shorturls/shorturl.go
index 5472b8e6e57..14852e9432a 100644
--- a/pkg/services/shorturls/shorturl.go
+++ b/pkg/services/shorturls/shorturl.go
@@ -3,12 +3,14 @@ package shorturls
 import (
 	"context"
 
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/services/user"
 )
 
 type Service interface {
 	GetShortURLByUID(ctx context.Context, user *user.SignedInUser, uid string) (*ShortUrl, error)
-	CreateShortURL(ctx context.Context, user *user.SignedInUser, path string) (*ShortUrl, error)
+	CreateShortURL(ctx context.Context, user *user.SignedInUser, cmd *dtos.CreateShortURLCmd) (*ShortUrl, error)
 	UpdateLastSeenAt(ctx context.Context, shortURL *ShortUrl) error
 	DeleteStaleShortURLs(ctx context.Context, cmd *DeleteShortUrlCommand) error
+	ConvertShortURLToDTO(shortURL *ShortUrl, appURL string) *dtos.ShortURL
 }
diff --git a/pkg/services/shorturls/shorturlimpl/shorturl.go b/pkg/services/shorturls/shorturlimpl/shorturl.go
index 5269b9683e5..9f83ef70d66 100644
--- a/pkg/services/shorturls/shorturlimpl/shorturl.go
+++ b/pkg/services/shorturls/shorturlimpl/shorturl.go
@@ -2,13 +2,16 @@ package shorturlimpl
 
 import (
 	"context"
+	"fmt"
 	"path"
 	"strings"
 	"time"
 
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/shorturls"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/util"
 	"github.com/teris-io/shortid"
 )
 
@@ -34,8 +37,8 @@ func (s ShortURLService) UpdateLastSeenAt(ctx context.Context, shortURL *shortur
 	return s.SQLStore.Update(ctx, shortURL)
 }
 
-func (s ShortURLService) CreateShortURL(ctx context.Context, user *user.SignedInUser, relPath string) (*shorturls.ShortUrl, error) {
-	relPath = strings.TrimSpace(relPath)
+func (s ShortURLService) CreateShortURL(ctx context.Context, user *user.SignedInUser, cmd *dtos.CreateShortURLCmd) (*shorturls.ShortUrl, error) {
+	relPath := strings.TrimSpace(cmd.Path)
 
 	if path.IsAbs(relPath) {
 		return nil, shorturls.ErrShortURLAbsolutePath.Errorf("expected relative path: %s", relPath)
@@ -44,9 +47,30 @@ func (s ShortURLService) CreateShortURL(ctx context.Context, user *user.SignedIn
 		return nil, shorturls.ErrShortURLInvalidPath.Errorf("path cannot contain '../': %s", relPath)
 	}
 
-	uid, err := shortid.Generate()
-	if err != nil {
-		return nil, shorturls.ErrShortURLInternal.Errorf("failed to generate uid: %w", err)
+	uid := cmd.UID
+	if uid == "" {
+		var err error
+		uid, err = shortid.Generate()
+		if err != nil {
+			return nil, shorturls.ErrShortURLInternal.Errorf("failed to generate uid: %w", err)
+		}
+	} else {
+		// Ensure the UID is valid
+		if !util.IsValidShortUID(uid) {
+			return nil, shorturls.ErrShortURLBadRequest.Errorf("invalid UID: %s", uid)
+		}
+
+		// Check if the UID already exists
+		existingShortURL, err := s.SQLStore.Get(ctx, user, uid)
+		if err != nil {
+			if !shorturls.ErrShortURLNotFound.Is(err) {
+				return nil, shorturls.ErrShortURLInternal.Errorf("failed to check existing short URL: %w", err)
+			}
+		}
+		if existingShortURL != nil {
+			// If the UID already exists, we return an error
+			return nil, shorturls.ErrShortURLConflict.Errorf("short URL with UID '%s' already exists", uid)
+		}
 	}
 
 	now := time.Now().Unix()
@@ -68,3 +92,12 @@ func (s ShortURLService) CreateShortURL(ctx context.Context, user *user.SignedIn
 func (s ShortURLService) DeleteStaleShortURLs(ctx context.Context, cmd *shorturls.DeleteShortUrlCommand) error {
 	return s.SQLStore.Delete(ctx, cmd)
 }
+
+func (s ShortURLService) ConvertShortURLToDTO(shortURL *shorturls.ShortUrl, appURL string) *dtos.ShortURL {
+	url := fmt.Sprintf("%s/goto/%s?orgId=%d", strings.TrimSuffix(appURL, "/"), shortURL.Uid, shortURL.OrgId)
+
+	return &dtos.ShortURL{
+		UID: shortURL.Uid,
+		URL: url,
+	}
+}
diff --git a/pkg/services/shorturls/shorturlimpl/shorturl_test.go b/pkg/services/shorturls/shorturlimpl/shorturl_test.go
index 71a26545aa3..f733f65173c 100644
--- a/pkg/services/shorturls/shorturlimpl/shorturl_test.go
+++ b/pkg/services/shorturls/shorturlimpl/shorturl_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/shorturls"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -25,11 +26,13 @@ func TestIntegrationShortURLService(t *testing.T) {
 	store := db.InitTestDB(t)
 
 	t.Run("User can create and read short URLs", func(t *testing.T) {
-		const refPath = "mock/path?test=true"
+		cmd := &dtos.CreateShortURLCmd{
+			Path: "mock/path?test=true",
+		}
 
 		service := ShortURLService{SQLStore: &sqlStore{db: store}}
 
-		newShortURL, err := service.CreateShortURL(context.Background(), user, refPath)
+		newShortURL, err := service.CreateShortURL(context.Background(), user, cmd)
 		require.NoError(t, err)
 		require.NotNil(t, newShortURL)
 		require.NotEmpty(t, newShortURL.Uid)
@@ -37,7 +40,7 @@ func TestIntegrationShortURLService(t *testing.T) {
 		existingShortURL, err := service.GetShortURLByUID(context.Background(), user, newShortURL.Uid)
 		require.NoError(t, err)
 		require.NotNil(t, existingShortURL)
-		require.Equal(t, refPath, existingShortURL.Path)
+		require.Equal(t, cmd.Path, existingShortURL.Path)
 
 		t.Run("and update last seen at", func(t *testing.T) {
 			origGetTime := getTime
@@ -59,7 +62,7 @@ func TestIntegrationShortURLService(t *testing.T) {
 		})
 
 		t.Run("and stale short urls can be deleted", func(t *testing.T) {
-			staleShortURL, err := service.CreateShortURL(context.Background(), user, refPath)
+			staleShortURL, err := service.CreateShortURL(context.Background(), user, cmd)
 			require.NoError(t, err)
 			require.NotNil(t, staleShortURL)
 			require.NotEmpty(t, staleShortURL.Uid)
@@ -100,18 +103,25 @@ func TestIntegrationShortURLService(t *testing.T) {
 
 		ctx := context.Background()
 
-		absolutePath := "/path?test=true"
-		newShortURL, err := service.CreateShortURL(ctx, user, absolutePath)
+		cmd := &dtos.CreateShortURLCmd{
+			Path: "/path?test=true",
+		}
+
+		newShortURL, err := service.CreateShortURL(ctx, user, cmd)
 		require.ErrorIs(t, err, shorturls.ErrShortURLAbsolutePath)
 		require.Nil(t, newShortURL)
 
-		relativePath := "path/../test?test=true"
-		newShortURL, err = service.CreateShortURL(ctx, user, relativePath)
+		cmd2 := &dtos.CreateShortURLCmd{
+			Path: "path/../test?test=true",
+		}
+		newShortURL, err = service.CreateShortURL(ctx, user, cmd2)
 		require.ErrorIs(t, err, shorturls.ErrShortURLInvalidPath)
 		require.Nil(t, newShortURL)
 
-		relativePath = "../path/test?test=true"
-		newShortURL, err = service.CreateShortURL(ctx, user, relativePath)
+		cmd3 := &dtos.CreateShortURLCmd{
+			Path: "../path/test?test=true",
+		}
+		newShortURL, err = service.CreateShortURL(ctx, user, cmd3)
 		require.ErrorIs(t, err, shorturls.ErrShortURLInvalidPath)
 		require.Nil(t, newShortURL)
 	})
@@ -121,14 +131,15 @@ func TestIntegrationShortURLService(t *testing.T) {
 
 		ctx := context.Background()
 
-		const refPath = "mock/path?test=true"
-
-		newShortURL1, err := service.CreateShortURL(ctx, user, refPath)
+		cmd := &dtos.CreateShortURLCmd{
+			Path: "mock/path?test=true",
+		}
+		newShortURL1, err := service.CreateShortURL(ctx, user, cmd)
 		require.NoError(t, err)
 		require.NotNil(t, newShortURL1)
 		require.NotEmpty(t, newShortURL1.Uid)
 
-		newShortURL2, err := service.CreateShortURL(ctx, user, refPath)
+		newShortURL2, err := service.CreateShortURL(ctx, user, cmd)
 		require.NoError(t, err)
 		require.NotNil(t, newShortURL2)
 		require.NotEmpty(t, newShortURL2.Uid)
@@ -136,4 +147,38 @@ func TestIntegrationShortURLService(t *testing.T) {
 		require.NotEqual(t, newShortURL1.Uid, newShortURL2.Uid)
 		require.Equal(t, newShortURL1.Path, newShortURL2.Path)
 	})
+
+	t.Run("Create URL providing the UID", func(t *testing.T) {
+		service := ShortURLService{SQLStore: &sqlStore{db: store}}
+
+		ctx := context.Background()
+
+		cmd := &dtos.CreateShortURLCmd{
+			Path: "mock/path?test=true",
+			UID:  "custom-uid",
+		}
+		newShortURL1, err := service.CreateShortURL(ctx, user, cmd)
+		require.NoError(t, err)
+		require.NotNil(t, newShortURL1)
+		require.Equal(t, cmd.UID, newShortURL1.Uid)
+	})
+
+	t.Run("Create URL providing an existing UID should fail", func(t *testing.T) {
+		service := ShortURLService{SQLStore: &sqlStore{db: store}}
+
+		ctx := context.Background()
+
+		cmd := &dtos.CreateShortURLCmd{
+			Path: "mock/path?test=true",
+			UID:  "custom-uid-2",
+		}
+		newShortURL1, err := service.CreateShortURL(ctx, user, cmd)
+		require.NoError(t, err)
+		require.NotNil(t, newShortURL1)
+		require.Equal(t, cmd.UID, newShortURL1.Uid)
+
+		newShortURL2, err := service.CreateShortURL(ctx, user, cmd)
+		require.ErrorIs(t, err, shorturls.ErrShortURLConflict)
+		require.Nil(t, newShortURL2)
+	})
 }
diff --git a/pkg/services/shorturls/shorturlimpl/store.go b/pkg/services/shorturls/shorturlimpl/store.go
index 31600394512..0fe54fc677d 100644
--- a/pkg/services/shorturls/shorturlimpl/store.go
+++ b/pkg/services/shorturls/shorturlimpl/store.go
@@ -58,6 +58,21 @@ func (s sqlStore) Insert(ctx context.Context, shortURL *shorturls.ShortUrl) erro
 }
 
 func (s sqlStore) Delete(ctx context.Context, cmd *shorturls.DeleteShortUrlCommand) error {
+	// If a UID is provided, delete that specific short URL
+	if cmd.Uid != "" {
+		return s.db.WithTransactionalDbSession(ctx, func(session *db.Session) error {
+			var rawSql = "DELETE FROM short_url WHERE uid = ?"
+
+			if result, err := session.Exec(rawSql, cmd.Uid); err != nil {
+				return err
+			} else if cmd.NumDeleted, err = result.RowsAffected(); err != nil {
+				return err
+			}
+			return nil
+		})
+	}
+
+	// Otherwise, delete all stale short URLs older than the specified time
 	return s.db.WithTransactionalDbSession(ctx, func(session *db.Session) error {
 		var rawSql = "DELETE FROM short_url WHERE created_at <= ? AND (last_seen_at IS NULL OR last_seen_at = 0)"
 
diff --git a/pkg/tests/apis/shorturl/shorturl_test.go b/pkg/tests/apis/shorturl/shorturl_test.go
new file mode 100644
index 00000000000..e5d328f9e6b
--- /dev/null
+++ b/pkg/tests/apis/shorturl/shorturl_test.go
@@ -0,0 +1,539 @@
+package shorturl
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/services/shorturls"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/grafana/grafana/pkg/api/dtos"
+	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
+	"github.com/grafana/grafana/pkg/services/apiserver/options"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tests/apis"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
+)
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+var gvr = schema.GroupVersionResource{
+	Group:    "shorturl.grafana.app",
+	Version:  "v1alpha1",
+	Resource: "shorturls",
+}
+
+var RESOURCEGROUP = gvr.GroupResource().String()
+
+func TestIntegrationShortURL(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	t.Run("default setup with k8s flag turned off (legacy APIs)", func(t *testing.T) {
+		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+			AppModeProduction:    true, // do not start extra port 6443
+			DisableAnonymous:     true,
+			EnableFeatureToggles: []string{}, // legacy APIs only
+		})
+		// In this setup, K8s APIs are not available - legacy APIs only
+		doLegacyOnlyTests(t, helper)
+
+		// When no feature toggles are enabled, shortURL K8s APIs should not be available
+		disco := helper.NewDiscoveryClient()
+		groups, err := disco.ServerGroups()
+		require.NoError(t, err)
+
+		hasShortURLGroup := false
+		for _, group := range groups.Groups {
+			if group.Name == "shorturl.grafana.app" {
+				hasShortURLGroup = true
+				break
+			}
+		}
+		require.False(t, hasShortURLGroup, "shortURL K8s APIs should not be available when kubernetesShortURLs feature toggle is disabled")
+	})
+
+	t.Run("with dual write (unified storage, mode 0)", func(t *testing.T) {
+		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+			AppModeProduction:    false, // required for  unified storage
+			DisableAnonymous:     true,
+			APIServerStorageType: options.StorageTypeUnified,
+			EnableFeatureToggles: []string{"kubernetesShortURLs"},
+			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
+				RESOURCEGROUP: {
+					DualWriterMode: grafanarest.Mode0,
+				},
+			},
+		})
+		doLegacyOnlyTests(t, helper)
+	})
+
+	t.Run("with dual write (unified storage, mode 1)", func(t *testing.T) {
+		mode := grafanarest.Mode1
+		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+			AppModeProduction:    false,
+			DisableAnonymous:     true,
+			APIServerStorageType: options.StorageTypeUnified,
+			EnableFeatureToggles: []string{"kubernetesShortURLs"},
+			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
+				RESOURCEGROUP: {
+					DualWriterMode: mode,
+				},
+			},
+		})
+		doDualWriteTests(t, helper, mode)
+	})
+
+	t.Run("with dual write (unified storage, mode 2)", func(t *testing.T) {
+		mode := grafanarest.Mode2
+		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+			AppModeProduction:    false,
+			DisableAnonymous:     true,
+			APIServerStorageType: options.StorageTypeUnified,
+			EnableFeatureToggles: []string{"kubernetesShortURLs"},
+			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
+				RESOURCEGROUP: {
+					DualWriterMode: mode,
+				},
+			},
+		})
+		doDualWriteTests(t, helper, mode)
+	})
+
+	t.Run("with dual write (unified storage, mode 3)", func(t *testing.T) {
+		mode := grafanarest.Mode3
+		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+			AppModeProduction:    false,
+			DisableAnonymous:     true,
+			APIServerStorageType: options.StorageTypeUnified,
+			EnableFeatureToggles: []string{"kubernetesShortURLs"},
+			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
+				RESOURCEGROUP: {
+					DualWriterMode: mode,
+				},
+			},
+		})
+		doDualWriteTests(t, helper, mode)
+	})
+
+	t.Run("with dual write (unified storage, mode 5)", func(t *testing.T) {
+		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+			AppModeProduction:    false,
+			DisableAnonymous:     true,
+			APIServerStorageType: options.StorageTypeUnified,
+			EnableFeatureToggles: []string{"kubernetesShortURLs"},
+			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
+				RESOURCEGROUP: {
+					DualWriterMode: grafanarest.Mode5,
+				},
+			},
+		})
+		doUnifiedOnlyTests(t, helper)
+	})
+}
+
+// doLegacyOnlyTests tests functionality for Mode 0 (legacy only)
+// Only legacy API should be used, no K8s API interaction
+func doLegacyOnlyTests(t *testing.T, helper *apis.K8sTestHelper) {
+	client := helper.GetResourceClient(apis.ResourceClientArgs{
+		User: helper.Org1.Editor,
+		GVR:  gvr,
+	})
+
+	t.Run("Legacy API CRUD", func(t *testing.T) {
+		// Create via legacy API
+		legacyPayload := `{
+			"path": "d/xCmMwXdVz/legacy-only-test"
+		}`
+		legacyCreate := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodPost,
+			Path:   "/api/short-urls",
+			Body:   []byte(legacyPayload),
+		}, &dtos.ShortURL{})
+		require.NotNil(t, legacyCreate.Result)
+		uid := legacyCreate.Result.UID
+		require.NotEmpty(t, uid)
+
+		// Read via legacy API
+		legacyGet := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodGet,
+			Path:   "/api/short-urls/" + uid,
+		}, &shorturls.ShortUrl{})
+		require.NotNil(t, legacyGet.Result)
+		assert.Equal(t, uid, legacyGet.Result.Uid)
+		assert.Equal(t, "d/xCmMwXdVz/legacy-only-test", legacyGet.Result.Path)
+	})
+
+	t.Run("Legacy API redirect functionality", func(t *testing.T) {
+		// Create via legacy API
+		legacyPayload := `{
+			"path": "d/test/legacy-redirect"
+		}`
+		legacyCreate := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodPost,
+			Path:   "/api/short-urls",
+			Body:   []byte(legacyPayload),
+		}, &dtos.ShortURL{})
+		require.NotNil(t, legacyCreate.Result)
+		uid := legacyCreate.Result.UID
+
+		// Test redirect functionality
+		redirectResponse := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodGet,
+			Path:   "/goto/" + uid + "?orgId=default",
+		}, (*interface{})(nil))
+		assert.Equal(t, 302, redirectResponse.Response.StatusCode)
+	})
+}
+
+// doDualWriteTests tests functionality for Modes 1-3 (dual write modes)
+// Both APIs available with cross-API visibility
+func doDualWriteTests(t *testing.T, helper *apis.K8sTestHelper, mode grafanarest.DualWriterMode) {
+	// Check if shortURL K8s APIs are available
+	hasShortURLAPI := checkShortURLAPIAvailable(t, helper)
+	if !hasShortURLAPI {
+		t.Log("ShortURL Kubernetes APIs not available - skipping K8s API tests")
+		return
+	}
+
+	t.Run("Legacy API -> K8s API visibility", func(t *testing.T) {
+		client := helper.GetResourceClient(apis.ResourceClientArgs{
+			User: helper.Org1.Editor,
+			GVR:  gvr,
+		})
+
+		// Create via legacy API
+		legacyPayload := `{
+			"path": "d/xCmMwXdVz/dual-write-test"
+		}`
+		legacyCreate := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodPost,
+			Path:   "/api/short-urls",
+			Body:   []byte(legacyPayload),
+		}, &dtos.ShortURL{})
+		require.NotNil(t, legacyCreate.Result)
+		uid := legacyCreate.Result.UID
+		require.NotEmpty(t, uid)
+
+		// Should be visible via K8s API
+		found, err := client.Resource.Get(context.Background(), uid, metav1.GetOptions{})
+		require.NoError(t, err)
+		assert.Equal(t, uid, found.GetName())
+
+		// Verify cross-API consistency
+		getFromBothAPIs(t, helper, client, uid)
+
+		// Clean up
+		err = client.Resource.Delete(context.Background(), uid, metav1.DeleteOptions{})
+		require.NoError(t, err)
+	})
+
+	t.Run("K8s API -> Legacy API visibility", func(t *testing.T) {
+		client := helper.GetResourceClient(apis.ResourceClientArgs{
+			User: helper.Org1.Editor,
+			GVR:  gvr,
+		})
+
+		// Create via K8s API
+		obj := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodPost,
+			Path:   "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
+			Body:   []byte(`{ "metadata": { "generateName": "test-" }, "spec": { "path": "d/xCmMwXdVz/k8s-dual-write" } }`),
+		}, &unstructured.Unstructured{})
+		require.NotNil(t, obj.Result)
+
+		uid := obj.Result.GetName()
+		assert.NotEmpty(t, uid)
+
+		// Should be visible via legacy API
+		legacyShortURL := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodGet,
+			Path:   "/api/short-urls/" + uid,
+		}, &shorturls.ShortUrl{}).Result
+		require.NotNil(t, legacyShortURL)
+		assert.Equal(t, uid, legacyShortURL.Uid)
+
+		// Verify cross-API consistency
+		getFromBothAPIs(t, helper, client, uid)
+
+		// Clean up
+		err := client.Resource.Delete(context.Background(), uid, metav1.DeleteOptions{})
+		require.NoError(t, err)
+	})
+
+	t.Run("Redirect functionality", func(t *testing.T) {
+		client := helper.GetResourceClient(apis.ResourceClientArgs{
+			User: helper.Org1.Editor,
+			GVR:  gvr,
+		})
+
+		// Create via K8s API
+		obj := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodPost,
+			Path:   "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
+			Body:   []byte(`{ "metadata": { "generateName": "redirect-" }, "spec": { "path": "d/test/redirect" } }`),
+		}, &unstructured.Unstructured{})
+		require.NotNil(t, obj.Result)
+
+		uid := obj.Result.GetName()
+
+		// Test redirect functionality and lastSeenAt update
+		redirectResponse := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodGet,
+			Path:   "/goto/" + uid + "?orgId=default",
+		}, (*interface{})(nil))
+		assert.Equal(t, 302, redirectResponse.Response.StatusCode)
+
+		// Verify lastSeenAt was updated (should be > 0 now)
+		found, err := client.Resource.Get(context.Background(), uid, metav1.GetOptions{})
+		require.NoError(t, err)
+		status, exists := found.Object["status"].(map[string]interface{})
+		assert.True(t, exists)
+		lastSeenAt, exists := status["lastSeenAt"].(int64)
+		assert.True(t, exists)
+
+		assert.Greater(t, lastSeenAt, int64(0))
+
+		// Clean up
+		err = client.Resource.Delete(context.Background(), uid, metav1.DeleteOptions{})
+		require.NoError(t, err)
+	})
+}
+
+// doUnifiedOnlyTests tests functionality for Modes 4-5 (unified only)
+// Only K8s API, no legacy API interaction
+func doUnifiedOnlyTests(t *testing.T, helper *apis.K8sTestHelper) {
+	// Check if shortURL K8s APIs are available
+	hasShortURLAPI := checkShortURLAPIAvailable(t, helper)
+	if !hasShortURLAPI {
+		t.Log("ShortURL Kubernetes APIs not available - skipping K8s API tests")
+		return
+	}
+
+	t.Run("K8s API CRUD (unified storage only)", func(t *testing.T) {
+		client := helper.GetResourceClient(apis.ResourceClientArgs{
+			User: helper.Org1.Editor,
+			GVR:  gvr,
+		})
+
+		// Create via K8s API
+		obj := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodPost,
+			Path:   "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
+			Body:   []byte(`{ "metadata": { "generateName": "unified-" }, "spec": { "path": "d/xCmMwXdVz/unified-only" } }`),
+		}, &unstructured.Unstructured{})
+		require.NotNil(t, obj.Result)
+
+		uid := obj.Result.GetName()
+		assert.NotEmpty(t, uid)
+
+		// Read via K8s API
+		found, err := client.Resource.Get(context.Background(), uid, metav1.GetOptions{})
+		require.NoError(t, err)
+		assert.Equal(t, uid, found.GetName())
+
+		// Should NOT be visible via legacy API in unified-only mode
+		legacyResponse := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodGet,
+			Path:   "/api/short-urls/" + uid,
+		}, (*shorturls.ShortUrl)(nil))
+		// In unified-only mode, legacy API should not see the resource
+		assert.Nil(t, legacyResponse.Result)
+
+		// Clean up
+		err = client.Resource.Delete(context.Background(), uid, metav1.DeleteOptions{})
+		require.NoError(t, err)
+	})
+
+	t.Run("K8s API validation - invalid paths", func(t *testing.T) {
+		client := helper.GetResourceClient(apis.ResourceClientArgs{
+			User: helper.Org1.Editor,
+			GVR:  gvr,
+		})
+
+		testCases := []struct {
+			name          string
+			path          string
+			expectedError string
+		}{
+			{
+				name:          "absolute path should be rejected",
+				path:          "/dashboard/absolute-path",
+				expectedError: "path should be relative",
+			},
+			{
+				name:          "path with directory traversal should be rejected",
+				path:          "d/../../../etc/passwd",
+				expectedError: "invalid short URL path",
+			},
+			{
+				name:          "path with multiple directory traversals should be rejected",
+				path:          "d/some/../path/../../../secret",
+				expectedError: "invalid short URL path",
+			},
+		}
+
+		for _, tc := range testCases {
+			t.Run(tc.name, func(t *testing.T) {
+				// Attempt to create ShortURL with invalid path
+				invalidBody := fmt.Sprintf(`{ "metadata": { "generateName": "invalid-" }, "spec": { "path": "%s" } }`, tc.path)
+				response := apis.DoRequest(helper, apis.RequestParams{
+					User:   client.Args.User,
+					Method: http.MethodPost,
+					Path:   "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
+					Body:   []byte(invalidBody),
+				}, (*unstructured.Unstructured)(nil))
+
+				// Should get a validation error, it should be 400 Bad Request but the validation hook returns 403 Forbidden
+				assert.Equal(t, http.StatusForbidden, response.Response.StatusCode,
+					"Expected 403 for invalid path: %s", tc.path)
+
+				// Check that the error message contains expected validation error
+				assert.Contains(t, string(response.Body), tc.expectedError,
+					"Response should contain validation error message")
+
+				// Should not have created a resource
+				assert.Nil(t, response.Result, "No resource should be created for invalid path")
+			})
+		}
+	})
+
+	t.Run("K8s API validation - valid edge cases", func(t *testing.T) {
+		client := helper.GetResourceClient(apis.ResourceClientArgs{
+			User: helper.Org1.Editor,
+			GVR:  gvr,
+		})
+
+		validPaths := []string{
+			"d/dashboard/valid-path",
+			"dashboard/some-id",
+			"explore?from=123&to=456",
+			"d/abc123/dashboard-with-params?var-test=value",
+		}
+
+		for _, validPath := range validPaths {
+			t.Run(fmt.Sprintf("valid path: %s", validPath), func(t *testing.T) {
+				validBody := fmt.Sprintf(`{ "metadata": { "generateName": "valid-" }, "spec": { "path": "%s" } }`, validPath)
+				response := apis.DoRequest(helper, apis.RequestParams{
+					User:   client.Args.User,
+					Method: http.MethodPost,
+					Path:   "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
+					Body:   []byte(validBody),
+				}, &unstructured.Unstructured{})
+
+				// Should succeed
+				assert.Equal(t, http.StatusCreated, response.Response.StatusCode,
+					"Expected 201 Created for valid path: %s", validPath)
+				assert.NotNil(t, response.Result, "Resource should be created for valid path")
+
+				if response.Result != nil {
+					uid := response.Result.GetName()
+
+					// Clean up
+					err := client.Resource.Delete(context.Background(), uid, metav1.DeleteOptions{})
+					assert.NoError(t, err, "Cleanup should succeed")
+				}
+			})
+		}
+	})
+
+	t.Run("Redirect functionality (unified only)", func(t *testing.T) {
+		client := helper.GetResourceClient(apis.ResourceClientArgs{
+			User: helper.Org1.Editor,
+			GVR:  gvr,
+		})
+
+		// Create via K8s API
+		obj := apis.DoRequest[unstructured.Unstructured](helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodPost,
+			Path:   "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
+			Body:   []byte(`{ "metadata": { "generateName": "redirect-unified-" }, "spec": { "path": "d/test/unified-redirect" } }`),
+		}, &unstructured.Unstructured{})
+		require.NotNil(t, obj.Result)
+
+		uid := obj.Result.GetName()
+
+		// Test redirect functionality
+		redirectResponse := apis.DoRequest(helper, apis.RequestParams{
+			User:   client.Args.User,
+			Method: http.MethodGet,
+			Path:   "/goto/" + uid + "?orgId=default",
+		}, (*interface{})(nil))
+		assert.Equal(t, 302, redirectResponse.Response.StatusCode)
+
+		// Clean up
+		err := client.Resource.Delete(context.Background(), uid, metav1.DeleteOptions{})
+		require.NoError(t, err)
+	})
+}
+
+// Helper function to check if shortURL K8s APIs are available
+func checkShortURLAPIAvailable(t *testing.T, helper *apis.K8sTestHelper) bool {
+	disco := helper.NewDiscoveryClient()
+	groups, err := disco.ServerGroups()
+	if err != nil {
+		t.Logf("Failed to get server groups: %v", err)
+		return false
+	}
+
+	for _, group := range groups.Groups {
+		if group.Name == "shorturl.grafana.app" {
+			return true
+		}
+	}
+	return false
+}
+
+// This does a get with both k8s and legacy API, and verifies the results are the same
+func getFromBothAPIs(t *testing.T,
+	helper *apis.K8sTestHelper,
+	client *apis.K8sResourceClient,
+	uid string,
+) {
+	t.Helper()
+
+	k8sResource, err := client.Resource.Get(context.Background(), uid, metav1.GetOptions{})
+	require.NoError(t, err)
+	assert.Equal(t, uid, k8sResource.GetName())
+
+	// Legacy API: Try to get the shortURL (might not be implemented)
+	legacyShortURL := apis.DoRequest(helper, apis.RequestParams{
+		User:   client.Args.User,
+		Method: http.MethodGet,
+		Path:   "/api/short-urls/" + uid,
+	}, &shorturls.ShortUrl{}).Result
+
+	if legacyShortURL != nil {
+		// If legacy API returns data, verify consistency
+		spec, ok := k8sResource.Object["spec"].(map[string]interface{})
+		require.True(t, ok)
+		status, ok := k8sResource.Object["status"].(map[string]interface{})
+		require.True(t, ok)
+		assert.Equal(t, legacyShortURL.Uid, k8sResource.GetName())
+		assert.Equal(t, legacyShortURL.Path, spec["path"].(string))
+		assert.Equal(t, legacyShortURL.LastSeenAt, status["lastSeenAt"].(int64))
+	}
+}

From 08501677e302a44f0e420de0d3b9784d7e8e0960 Mon Sep 17 00:00:00 2001
From: Alex Spencer <52186778+alexjonspencer1@users.noreply.github.com>
Date: Tue, 12 Aug 2025 12:34:13 -0700
Subject: [PATCH 120/243] SQL Expressions: Add SQL banner (#106865)

* prototype: sql expressions discovery work

* chore: remove compact view work

* chore: cleanup

* chore: moar clean

* chore: use grid instead

* chore: remove no margin + i18n fix

* chore: betterer

* cleanupz

* chore: oh it needs noMargin

* feat: convert to alert

* chore: i18n extract

* i18n

* chore: polish

* fix: change localstorage provider import

* chore: update local storage key name

---------

Co-authored-by: Develer <yeryomin.igor@gmail.com>
---
 .betterer.results                             |   3 -
 .../SqlExpressions/SqlExpressionsBanner.tsx   |  35 +++++
 .../TransformationPickerNg.tsx                | 135 +++++++++---------
 public/locales/en-US/grafana.json             |   3 +
 4 files changed, 108 insertions(+), 68 deletions(-)
 create mode 100644 public/app/features/dashboard/components/TransformationsEditor/SqlExpressions/SqlExpressionsBanner.tsx

diff --git a/.betterer.results b/.betterer.results
index 7c4d3a577f5..505eeefb315 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2079,9 +2079,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"],
       [0, 0, 0, "Add noMargin prop to Card components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "1"]
     ],
-    "public/app/features/dashboard/components/TransformationsEditor/TransformationPickerNg.tsx:5381": [
-      [0, 0, 0, "Add noMargin prop to Card components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "0"]
-    ],
     "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"]
diff --git a/public/app/features/dashboard/components/TransformationsEditor/SqlExpressions/SqlExpressionsBanner.tsx b/public/app/features/dashboard/components/TransformationsEditor/SqlExpressions/SqlExpressionsBanner.tsx
new file mode 100644
index 00000000000..74d73643cda
--- /dev/null
+++ b/public/app/features/dashboard/components/TransformationsEditor/SqlExpressions/SqlExpressionsBanner.tsx
@@ -0,0 +1,35 @@
+import { LocalStorageValueProvider } from '@grafana/data';
+import { Trans, t } from '@grafana/i18n';
+import { Alert, Stack, TextLink } from '@grafana/ui';
+
+const LOCAL_STORAGE_KEY = 'grafana.dashboard.sql-expressions-banner.dismissed';
+
+export const SqlExpressionsBanner = () => (
+  <LocalStorageValueProvider<boolean> storageKey={LOCAL_STORAGE_KEY} defaultValue={false}>
+    {(isDismissed, onDismiss) => {
+      if (isDismissed) {
+        return null;
+      }
+      return (
+        <Alert
+          bottomSpacing={1}
+          title={t('dashboard.transformation-picker-ng.sql-expressions-title', 'SQL Expressions')}
+          severity="info"
+          onRemove={() => onDismiss(true)}
+        >
+          <Stack direction="column" gap={1}>
+            <Trans i18nKey="dashboard.transformation-picker-ng.sql-expressions-message-description">
+              A new way to manipulate and transform the results of data source queries using MySQL-like syntax.
+            </Trans>
+            <TextLink
+              href="https://grafana.com/docs/grafana/latest/panels-visualizations/query-transform-data/sql-expressions/"
+              external
+            >
+              <Trans i18nKey="dashboard.transformation-picker-ng.sql-expressions-message-link">Learn more</Trans>
+            </TextLink>
+          </Stack>
+        </Alert>
+      );
+    }}
+  </LocalStorageValueProvider>
+);
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationPickerNg.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationPickerNg.tsx
index dbc34734758..c0c59070dc0 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationPickerNg.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationPickerNg.tsx
@@ -11,10 +11,24 @@ import {
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
-import { Badge, Card, Drawer, FilterPill, IconButton, Input, Switch, useStyles2, useTheme2 } from '@grafana/ui';
+import {
+  Badge,
+  Card,
+  Drawer,
+  FilterPill,
+  Grid,
+  IconButton,
+  Input,
+  Stack,
+  Switch,
+  useStyles2,
+  useTheme2,
+} from '@grafana/ui';
+import config from 'app/core/config';
 import { PluginStateInfo } from 'app/features/plugins/components/PluginStateInfo';
 import { getCategoriesLabels } from 'app/features/transformers/utils';
 
+import { SqlExpressionsBanner } from './SqlExpressions/SqlExpressionsBanner';
 import { FilterCategory } from './TransformationsEditor';
 
 const VIEW_ALL_VALUE = 'viewAll';
@@ -72,68 +86,65 @@ export function TransformationPickerNg(props: TransformationPickerNgProps) {
       }}
       title={t('dashboard.transformation-picker-ng.title-add-another-transformation', 'Add another transformation')}
     >
-      <div className={styles.searchWrapper}>
-        <Input
-          data-testid={selectors.components.Transforms.searchInput}
-          className={styles.searchInput}
-          value={search ?? ''}
-          placeholder={t(
-            'dashboard.transformation-picker-ng.placeholder-search-for-transformation',
-            'Search for transformation'
-          )}
-          onChange={onSearchChange}
-          onKeyDown={onSearchKeyDown}
-          suffix={suffix}
-          ref={searchInputRef}
-          autoFocus={true}
-        />
-        <div className={styles.showImages}>
-          <span className={styles.illustationSwitchLabel}>
-            <Trans i18nKey="dashboard.transformation-picker-ng.show-images">Show images</Trans>
-          </span>{' '}
-          <Switch
-            value={showIllustrations}
-            onChange={() => onShowIllustrationsChange && onShowIllustrationsChange(!showIllustrations)}
+      <Stack direction="column" gap={2}>
+        {config?.featureToggles?.sqlExpressions && <SqlExpressionsBanner />}
+        <div className={styles.searchWrapper}>
+          <Input
+            data-testid={selectors.components.Transforms.searchInput}
+            className={styles.searchInput}
+            value={search ?? ''}
+            placeholder={t(
+              'dashboard.transformation-picker-ng.placeholder-search-for-transformation',
+              'Search for transformation'
+            )}
+            onChange={onSearchChange}
+            onKeyDown={onSearchKeyDown}
+            suffix={suffix}
+            ref={searchInputRef}
+            autoFocus={true}
           />
-        </div>
-      </div>
-
-      <div className={styles.filterWrapper}>
-        {filterCategoriesLabels.map(([slug, label]) => {
-          return (
-            <FilterPill
-              key={slug}
-              onClick={() => onSelectedFilterChange && onSelectedFilterChange(slug)}
-              label={label}
-              selected={selectedFilter === slug}
+          <Stack direction="row" alignItems="center" gap={0.5}>
+            <span className={styles.switchLabel}>
+              <Trans i18nKey="dashboard.transformation-picker-ng.show-images">Show images</Trans>
+            </span>
+            <Switch
+              value={showIllustrations}
+              onChange={() => onShowIllustrationsChange && onShowIllustrationsChange(!showIllustrations)}
             />
-          );
-        })}
-      </div>
+          </Stack>
+        </div>
 
-      <TransformationsGrid
-        showIllustrations={showIllustrations}
-        transformations={xforms}
-        data={data}
-        onClick={(id) => {
-          onTransformationAdd({ value: id });
-        }}
-      />
+        <Stack direction="row" wrap="wrap" rowGap={1} columnGap={0.5}>
+          {filterCategoriesLabels.map(([slug, label]) => {
+            return (
+              <FilterPill
+                key={slug}
+                onClick={() => onSelectedFilterChange && onSelectedFilterChange(slug)}
+                label={label}
+                selected={selectedFilter === slug}
+              />
+            );
+          })}
+        </Stack>
+
+        <TransformationsGrid
+          showIllustrations={showIllustrations}
+          transformations={xforms}
+          data={data}
+          onClick={(id) => {
+            onTransformationAdd({ value: id });
+          }}
+        />
+      </Stack>
     </Drawer>
   );
 }
 
 function getTransformationPickerStyles(theme: GrafanaTheme2) {
   return {
-    showImages: css({
-      flexBasis: '0',
-      display: 'flex',
-      gap: '8px',
-      alignItems: 'center',
-    }),
     pickerInformationLine: css({
       fontSize: '16px',
-      marginBottom: `${theme.spacing(2)}`,
+      marginBottom: theme.spacing(2),
     }),
     pickerInformationLineHighlight: css({
       verticalAlign: 'middle',
@@ -141,8 +152,8 @@ function getTransformationPickerStyles(theme: GrafanaTheme2) {
     searchWrapper: css({
       display: 'flex',
       flexWrap: 'wrap',
-      columnGap: '27px',
-      rowGap: '16px',
+      columnGap: theme.spacing(2),
+      rowGap: theme.spacing(1),
       width: '100%',
       paddingBottom: theme.spacing(1),
     }),
@@ -150,16 +161,9 @@ function getTransformationPickerStyles(theme: GrafanaTheme2) {
       flexGrow: '1',
       width: 'initial',
     }),
-    illustationSwitchLabel: css({
+    switchLabel: css({
       whiteSpace: 'nowrap',
     }),
-    filterWrapper: css({
-      padding: `${theme.spacing(1)} 0`,
-      display: 'flex',
-      flexWrap: 'wrap',
-      rowGap: `${theme.spacing(1)}`,
-      columnGap: `${theme.spacing(0.5)}`,
-    }),
   };
 }
 
@@ -175,7 +179,7 @@ function TransformationsGrid({ showIllustrations, transformations, onClick, data
   const styles = useStyles2(getTransformationGridStyles);
 
   return (
-    <div className={styles.grid}>
+    <Grid columns={3} gap={1}>
       {transformations.map((transform) => {
         // Check to see if the transform
         // is applicable to the given data
@@ -208,6 +212,7 @@ function TransformationsGrid({ showIllustrations, transformations, onClick, data
             data-testid={selectors.components.TransformTab.newTransform(transform.name)}
             onClick={() => onClick(transform.id)}
             key={transform.id}
+            noMargin
           >
             <Card.Heading className={styles.heading}>
               <div className={styles.titleRow}>
@@ -242,7 +247,7 @@ function TransformationsGrid({ showIllustrations, transformations, onClick, data
           </Card>
         );
       })}
-    </div>
+    </Grid>
   );
 }
 
@@ -266,7 +271,7 @@ function getTransformationGridStyles(theme: GrafanaTheme2) {
       width: '100%',
     }),
     description: css({
-      fontSize: '12px',
+      fontSize: theme.typography.bodySmall.fontSize,
       display: 'flex',
       flexDirection: 'column',
       justifyContent: 'space-between',
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index dab62229722..3081454d389 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -5395,6 +5395,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Search for transformation",
       "show-images": "Show images",
+      "sql-expressions-message-description": "A new way to manipulate and transform the results of data source queries using MySQL-like syntax.",
+      "sql-expressions-message-link": "Learn more",
+      "sql-expressions-title": "SQL Expressions",
       "title-add-another-transformation": "Add another transformation",
       "view-all": "View all"
     },

From 1ce333a572f8e04bb50f1c522f6ab2d4453530b8 Mon Sep 17 00:00:00 2001
From: Alyssa Joyner <58453566+alyssajoyner@users.noreply.github.com>
Date: Tue, 12 Aug 2025 14:23:51 -0600
Subject: [PATCH 121/243] [InfluxDB] Config design improvements (#108562)

---
 .../DataSourceSettings/CertificationKey.tsx   |   5 +-
 .../AdvancedDBConnectionSettings.tsx          |  43 ++++---
 .../editor/config-v2/AdvancedHttpSettings.tsx |  11 +-
 .../editor/config-v2/AuthSettings.test.tsx    |  17 +++
 .../editor/config-v2/AuthSettings.tsx         | 117 ++++++++++++------
 .../editor/config-v2/ConfigEditor.tsx         |  35 ++++--
 .../config-v2/DatabaseConnectionSection.tsx   |  19 +--
 .../config-v2/InfluxFluxDBConnection.tsx      |   7 +-
 .../config-v2/InfluxInfluxQLDBConnection.tsx  |   7 +-
 .../config-v2/InfluxSQLDBConnection.tsx       |   5 +-
 .../editor/config-v2/LeftSideBar.tsx          |   2 +-
 .../config-v2/UrlAndAuthenticationSection.tsx |  15 ++-
 .../components/editor/config-v2/constants.ts  |   5 +-
 .../app/plugins/datasource/influxdb/types.ts  |   1 +
 14 files changed, 191 insertions(+), 98 deletions(-)

diff --git a/packages/grafana-ui/src/components/DataSourceSettings/CertificationKey.tsx b/packages/grafana-ui/src/components/DataSourceSettings/CertificationKey.tsx
index 86f00684e1b..d8382cd2301 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/CertificationKey.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/CertificationKey.tsx
@@ -12,15 +12,16 @@ interface Props {
   label: string;
   hasCert: boolean;
   placeholder: string;
+  useGrow?: boolean;
 
   onChange: (event: ChangeEvent<HTMLTextAreaElement>) => void;
   onClick: (event: MouseEvent<HTMLButtonElement>) => void;
 }
 
-export const CertificationKey = ({ hasCert, label, onChange, onClick, placeholder }: Props) => {
+export const CertificationKey = ({ hasCert, label, onChange, onClick, placeholder, useGrow }: Props) => {
   return (
     <InlineFieldRow>
-      <InlineField label={label} labelWidth={14} disabled={hasCert}>
+      <InlineField label={label} labelWidth={14} disabled={hasCert} grow={useGrow}>
         {hasCert ? (
           <Input type="text" value="configured" width={24} />
         ) : (
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx
index d3254abbdcb..fa7f7089ee7 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx
@@ -11,7 +11,7 @@ import { InlineFieldRow, InlineField, Combobox, InlineSwitch, Input, Space, useS
 
 import { InfluxVersion } from '../../../types';
 
-import { getInlineLabelStyles, HTTP_MODES } from './constants';
+import { DB_SETTINGS_LABEL_WIDTH, getInlineLabelStyles, HTTP_MODES } from './constants';
 import {
   trackInfluxDBConfigV2AdvancedDbConnectionSettingsAutocompleteClicked,
   trackInfluxDBConfigV2AdvancedDbConnectionSettingsHTTPMethodClicked,
@@ -55,13 +55,13 @@ export const AdvancedDbConnectionSettings = (props: Props) => {
             <InlineFieldRow>
               <InlineField
                 label="HTTP Method"
-                labelWidth={30}
+                labelWidth={DB_SETTINGS_LABEL_WIDTH}
                 tooltip="You can use either GET or POST HTTP method to query your InfluxDB database. The POST
                         method allows you to perform heavy requests (with a lots of WHERE clause) while the GET method
                         will restrict you and return an error if the query is too large."
+                grow
               >
                 <Combobox
-                  width={30}
                   value={HTTP_MODES.find((httpMode) => httpMode.value === options.jsonData.httpMode)}
                   options={HTTP_MODES}
                   onChange={onUpdateDatasourceJsonDataOptionSelect(props, 'httpMode')}
@@ -72,28 +72,15 @@ export const AdvancedDbConnectionSettings = (props: Props) => {
             </InlineFieldRow>
           )}
 
-          {options.jsonData.version === InfluxVersion.SQL && (
-            <InlineFieldRow>
-              <InlineField label="Insecure Connection" labelWidth={30}>
-                <InlineSwitch
-                  data-testid="influxdb-v2-config-insecure-switch"
-                  value={options.jsonData.insecureGrpc ?? false}
-                  onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'insecureGrpc')}
-                  onBlur={trackInfluxDBConfigV2AdvancedDbConnectionSettingsInsecureConnectClicked}
-                />
-              </InlineField>
-            </InlineFieldRow>
-          )}
-
           {(options.jsonData.version === InfluxVersion.InfluxQL || options.jsonData.version === InfluxVersion.Flux) && (
             <InlineFieldRow>
               <InlineField
                 label="Min time interval"
-                labelWidth={30}
+                labelWidth={DB_SETTINGS_LABEL_WIDTH}
                 tooltip="A lower limit for the auto group by time interval. Recommended to be set to write frequency, for example 1m if your data is written every minute."
+                grow
               >
                 <Input
-                  className="width-15"
                   data-testid="influxdb-v2-config-time-interval"
                   onBlur={trackInfluxDBConfigV2AdvancedDbConnectionSettingsMinTimeClicked}
                   onChange={onUpdateDatasourceJsonDataOption(props, 'timeInterval')}
@@ -108,11 +95,11 @@ export const AdvancedDbConnectionSettings = (props: Props) => {
             <InlineFieldRow>
               <InlineField
                 label="Autocomplete Range"
-                labelWidth={30}
+                labelWidth={DB_SETTINGS_LABEL_WIDTH}
                 tooltip="This time range is used in the query editor's autocomplete to reduce the execution time of tag filter queries."
+                grow
               >
                 <Input
-                  className="width-15"
                   data-testid="influxdb-v2-config-autocomplete-range"
                   onBlur={trackInfluxDBConfigV2AdvancedDbConnectionSettingsAutocompleteClicked}
                   onChange={onUpdateDatasourceJsonDataOption(props, 'showTagTime')}
@@ -126,11 +113,11 @@ export const AdvancedDbConnectionSettings = (props: Props) => {
           <InlineFieldRow>
             <InlineField
               label="Max series"
-              labelWidth={30}
+              labelWidth={DB_SETTINGS_LABEL_WIDTH}
               tooltip="Limit the number of series/tables that Grafana will process. Lower this number to prevent abuse, and increase it if you have lots of small time series and not all are shown. Defaults to 1000."
+              grow
             >
               <Input
-                className="width-15"
                 data-testid="influxdb-v2-config-max-series"
                 onBlur={trackInfluxDBConfigV2AdvancedDbConnectionSettingsMaxSeriesClicked}
                 onChange={onMaxSeriesChange}
@@ -140,6 +127,18 @@ export const AdvancedDbConnectionSettings = (props: Props) => {
               />
             </InlineField>
           </InlineFieldRow>
+          {options.jsonData.version === InfluxVersion.SQL && (
+            <InlineFieldRow>
+              <InlineField label="Insecure Connection" labelWidth={DB_SETTINGS_LABEL_WIDTH} grow>
+                <InlineSwitch
+                  data-testid="influxdb-v2-config-insecure-switch"
+                  value={options.jsonData.insecureGrpc ?? false}
+                  onChange={onUpdateDatasourceJsonDataOptionChecked(props, 'insecureGrpc')}
+                  onBlur={trackInfluxDBConfigV2AdvancedDbConnectionSettingsInsecureConnectClicked}
+                />
+              </InlineField>
+            </InlineFieldRow>
+          )}
         </>
       )}
     </>
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedHttpSettings.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedHttpSettings.tsx
index 2fe868514d7..8d66374eef1 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedHttpSettings.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedHttpSettings.tsx
@@ -26,9 +26,14 @@ export type Props = DataSourcePluginOptionsEditorProps<InfluxOptions>;
 export const AdvancedHttpSettings = ({ options, onOptionsChange }: Props) => {
   const styles = useStyles2(getInlineLabelStyles);
 
-  const [advancedHttpSettingsIsOpen, setAdvancedHttpSettingsIsOpen] = useState(
-    () => 'keepCookies' in options.jsonData || 'timeout' in options.jsonData
-  );
+  const [advancedHttpSettingsIsOpen, setAdvancedHttpSettingsIsOpen] = useState(() => {
+    const keys = Object.keys(options.jsonData);
+    return (
+      'keepCookies' in options.jsonData ||
+      'timeout' in options.jsonData ||
+      keys.some((key) => key.includes('httpHeaderName'))
+    );
+  });
 
   return (
     <>
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AuthSettings.test.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AuthSettings.test.tsx
index 4a51bb94728..340942d1896 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AuthSettings.test.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AuthSettings.test.tsx
@@ -127,5 +127,22 @@ describe('AuthSettings', () => {
         expect(skipSwitch).not.toBeChecked();
       });
     });
+
+    describe('With Credentials toggle', () => {
+      it('toggles checked state of the switch', () => {
+        const withCredentialsSwitch = screen.getByTestId('influxdb-v2-config-auth-settings-with-credentials');
+
+        // Default unchecked
+        expect(withCredentialsSwitch).not.toBeChecked();
+
+        // Enable
+        fireEvent.click(withCredentialsSwitch);
+        expect(withCredentialsSwitch).toBeChecked();
+
+        // Disable
+        fireEvent.click(withCredentialsSwitch);
+        expect(withCredentialsSwitch).not.toBeChecked();
+      });
+    });
   });
 });
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AuthSettings.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AuthSettings.tsx
index 1f359afb594..dbcf14c3560 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AuthSettings.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AuthSettings.tsx
@@ -1,5 +1,6 @@
 import { cx } from '@emotion/css';
 import { useCallback, useMemo, useState } from 'react';
+import { useWindowSize } from 'react-use';
 
 import {
   onUpdateDatasourceOption,
@@ -7,6 +8,7 @@ import {
   updateDatasourcePluginResetOption,
 } from '@grafana/data';
 import { AuthMethod, convertLegacyAuthProps } from '@grafana/plugin-ui';
+import { config } from '@grafana/runtime';
 import {
   Box,
   CertificationKey,
@@ -20,9 +22,15 @@ import {
   useStyles2,
   Text,
   Stack,
+  InlineLabel,
 } from '@grafana/ui';
 
-import { AUTH_RADIO_BUTTON_OPTIONS, getInlineLabelStyles, RADIO_BUTTON_OPTIONS } from './constants';
+import {
+  AUTH_RADIO_BUTTON_OPTIONS,
+  DB_SETTINGS_LABEL_WIDTH,
+  getInlineLabelStyles,
+  RADIO_BUTTON_OPTIONS,
+} from './constants';
 import {
   trackInfluxDBConfigV2AuthSettingsAuthMethodSelected,
   trackInfluxDBConfigV2AuthSettingsToggleClicked,
@@ -30,6 +38,7 @@ import {
 import { Props } from './types';
 
 type AuthOptionState = {
+  noAuth: boolean;
   basicAuth: boolean;
   tlsClientAuth: boolean;
   caCert: boolean;
@@ -41,10 +50,8 @@ type AuthOptionState = {
 export const AuthSettings = (props: Props) => {
   const { options, onOptionsChange } = props;
   const styles = useStyles2(getInlineLabelStyles);
+  const { width } = useWindowSize();
 
-  /**
-   * Derived props from legacy helpers
-   */
   const authProps = useMemo(
     () =>
       convertLegacyAuthProps({
@@ -54,36 +61,38 @@ export const AuthSettings = (props: Props) => {
     [options, onOptionsChange]
   );
 
-  /**
-   * Selected authentication method. Fallback to the most common if the selected one is missing.
-   */
   const isAuthMethod = (v: unknown): v is AuthMethod =>
     v === AuthMethod.NoAuth || v === AuthMethod.BasicAuth || v === AuthMethod.OAuthForward;
 
-  const selectedMethod = useMemo<AuthMethod | undefined>(() => {
-    if (isAuthMethod(authProps.selectedMethod)) {
-      return authProps.selectedMethod;
-    }
-    return isAuthMethod(authProps.mostCommonMethod) ? authProps.mostCommonMethod : undefined;
-  }, [authProps.selectedMethod, authProps.mostCommonMethod]);
-
-  /**
-   * Local UI state
-   */
   const [authOptions, setAuthOptions] = useState<AuthOptionState>({
-    basicAuth: selectedMethod === AuthMethod.BasicAuth,
+    noAuth: (!options.basicAuth && !options.jsonData.oauthPassThru) ?? false,
+    basicAuth: options.basicAuth ?? false,
     tlsClientAuth: authProps.TLS?.TLSClientAuth.enabled ?? false,
     caCert: authProps.TLS?.selfSignedCertificate.enabled ?? false,
     skipTLS: authProps.TLS?.skipTLSVerification.enabled ?? false,
-    oAuthForward: selectedMethod === AuthMethod.OAuthForward,
+    oAuthForward: options.jsonData.oauthPassThru ?? false,
     withCredentials: options.withCredentials ?? false,
   });
 
-  /**
-   * Expand/collapse top–level section
-   */
-  const [authenticationSettingsIsOpen, setAuthenticationSettingsIsOpen] = useState(
-    Object.values(authOptions).some(Boolean)
+  const selectedMethod = useMemo<AuthMethod | undefined>(() => {
+    if (isAuthMethod(authProps.selectedMethod) && authProps.selectedMethod !== AuthMethod.CrossSiteCredentials) {
+      return authProps.selectedMethod;
+    }
+
+    switch (!!authOptions) {
+      case authOptions.basicAuth:
+        return AuthMethod.BasicAuth;
+      case authOptions.oAuthForward:
+        return AuthMethod.OAuthForward;
+      case authOptions.noAuth:
+        return AuthMethod.NoAuth;
+      default:
+        return undefined;
+    }
+  }, [authProps.selectedMethod, authOptions]);
+
+  const [authenticationSettingsIsOpen, setAuthenticationSettingsIsOpen] = useState(() =>
+    Object.entries(authOptions).some(([key, value]) => key !== 'noAuth' && Boolean(value))
   );
 
   const toggleOpen = useCallback(() => {
@@ -98,8 +107,10 @@ export const AuthSettings = (props: Props) => {
       authProps.onAuthMethodSelect(option);
       setAuthOptions((prev) => ({
         ...prev,
+        noAuth: option === AuthMethod.NoAuth,
         basicAuth: option === AuthMethod.BasicAuth,
         oAuthForward: option === AuthMethod.OAuthForward,
+        withCredentials: prev.withCredentials,
       }));
       trackInfluxDBConfigV2AuthSettingsAuthMethodSelected({ authMethod: option });
     },
@@ -121,7 +132,6 @@ export const AuthSettings = (props: Props) => {
 
   return (
     <Stack direction="column">
-      {/* Header toggle */}
       <Box alignItems="center">
         <InlineField label={<div className={cx(styles.label)}>Auth and TLS/SSL Settings</div>} labelWidth={35}>
           <InlineSwitch
@@ -132,35 +142,33 @@ export const AuthSettings = (props: Props) => {
         </InlineField>
       </Box>
 
-      {/* Collapsible settings body */}
       {authenticationSettingsIsOpen && (
         <Box paddingLeft={1}>
-          {/* Authentication Method */}
-          <Box marginBottom={2}>
+          <Box marginBottom={1}>
             <Field label={<Text element="h5">Authentication Method</Text>} noMargin>
               <Box width="50%" marginY={2}>
                 <RadioButtonGroup
                   options={AUTH_RADIO_BUTTON_OPTIONS}
                   value={selectedMethod}
                   onChange={handleAuthMethodChange}
+                  size={width < 1100 ? 'sm' : 'md'}
                 />
               </Box>
             </Field>
           </Box>
 
-          <Box marginBottom={2}>
-            {/* Basic Auth settings */}
-            {authOptions.basicAuth && (
+          {authOptions.basicAuth && (
+            <Box marginBottom={2}>
               <>
-                <Box display="flex" direction="column" width="60%" marginBottom={2}>
-                  <InlineField label="User" labelWidth={14} grow>
+                <Box display="flex" direction="column" marginBottom={2}>
+                  <InlineField label="User" labelWidth={DB_SETTINGS_LABEL_WIDTH} grow>
                     <Input
                       placeholder="User"
                       onChange={onUpdateDatasourceOption(props, 'basicAuthUser')}
                       value={options.basicAuthUser || ''}
                     />
                   </InlineField>
-                  <InlineField label="Password" labelWidth={14} grow>
+                  <InlineField label="Password" labelWidth={DB_SETTINGS_LABEL_WIDTH} grow>
                     <SecretInput
                       placeholder="Password"
                       isConfigured={options.secureJsonFields.basicAuthPassword || false}
@@ -171,10 +179,38 @@ export const AuthSettings = (props: Props) => {
                   </InlineField>
                 </Box>
               </>
-            )}
+            </Box>
+          )}
+          <Box display="flex" direction="row" alignItems="center" marginBottom={2}>
+            <InlineLabel
+              style={{ width: '150px' }}
+              tooltip={'Whether credentials such as cookies or auth headers should be sent with cross-site requests.'}
+            >
+              With Credentials
+            </InlineLabel>
+            <InlineSwitch
+              data-testid="influxdb-v2-config-auth-settings-with-credentials"
+              value={authOptions.withCredentials}
+              onChange={(e) => {
+                authProps.onAuthMethodSelect(selectedMethod!);
+                onOptionsChange({
+                  ...options,
+                  withCredentials: e.currentTarget.checked,
+                  jsonData: {
+                    ...options.jsonData,
+                    oauthPassThru: selectedMethod === AuthMethod.OAuthForward,
+                  },
+                });
+                setAuthOptions({
+                  ...authOptions,
+                  noAuth: selectedMethod === AuthMethod.NoAuth,
+                  basicAuth: selectedMethod === AuthMethod.BasicAuth,
+                  oAuthForward: selectedMethod === AuthMethod.OAuthForward,
+                  withCredentials: e.currentTarget.checked,
+                });
+              }}
+            />
           </Box>
-
-          {/* TLS Client Auth */}
           <Box marginBottom={2}>
             <Field noMargin>
               <>
@@ -209,6 +245,7 @@ export const AuthSettings = (props: Props) => {
                       onChange={(e) => authProps.TLS?.TLSClientAuth.onClientCertificateChange(e.currentTarget.value)}
                       hasCert={!!authProps.TLS?.TLSClientAuth.clientCertificateConfigured}
                       onClick={() => authProps.TLS?.TLSClientAuth.onClientCertificateReset()}
+                      useGrow={config.featureToggles.newInfluxDSConfigPageDesign}
                     />
                     <CertificationKey
                       label="Client Key"
@@ -216,6 +253,7 @@ export const AuthSettings = (props: Props) => {
                       onChange={(e) => authProps.TLS?.TLSClientAuth.onClientKeyChange(e.currentTarget.value)}
                       hasCert={!!authProps.TLS?.TLSClientAuth.clientKeyConfigured}
                       onClick={() => authProps.TLS?.TLSClientAuth.onClientKeyReset()}
+                      useGrow={config.featureToggles.newInfluxDSConfigPageDesign}
                     />
                   </Box>
                 )}
@@ -223,7 +261,6 @@ export const AuthSettings = (props: Props) => {
             </Field>
           </Box>
 
-          {/* CA Cert */}
           <Box marginBottom={2}>
             <Field noMargin>
               <>
@@ -244,6 +281,7 @@ export const AuthSettings = (props: Props) => {
                       onChange={(e) => authProps.TLS?.selfSignedCertificate.onCertificateChange(e.currentTarget.value)}
                       hasCert={!!authProps.TLS?.selfSignedCertificate.certificateConfigured}
                       onClick={() => authProps.TLS?.selfSignedCertificate.onCertificateReset()}
+                      useGrow={config.featureToggles.newInfluxDSConfigPageDesign}
                     />
                   </Box>
                 )}
@@ -251,9 +289,8 @@ export const AuthSettings = (props: Props) => {
             </Field>
           </Box>
 
-          {/* Skip TLS verify */}
           <Box display="flex" direction="row" alignItems="center">
-            <Label style={{ width: '125px' }}>Skip TLS Verify</Label>
+            <InlineLabel style={{ width: '150px' }}>Skip TLS Verify</InlineLabel>
             <InlineSwitch
               data-testid="influxdb-v2-config-auth-settings-skip-tls-verify"
               value={authOptions.skipTLS}
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/ConfigEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/ConfigEditor.tsx
index 2502adb61e1..dd191d35846 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/ConfigEditor.tsx
@@ -1,32 +1,37 @@
+import { css } from '@emotion/css';
 import React from 'react';
 
-import { Alert, Box, Stack, TextLink } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { Alert, Box, Stack, TextLink, useStyles2 } from '@grafana/ui';
 
 import { DatabaseConnectionSection } from './DatabaseConnectionSection';
 import { LeftSideBar } from './LeftSideBar';
 import { UrlAndAuthenticationSection } from './UrlAndAuthenticationSection';
+import { CONTAINER_MIN_WIDTH } from './constants';
 import { trackInfluxDBConfigV2FeedbackButtonClicked } from './tracking';
 import { Props } from './types';
 
 export const ConfigEditor: React.FC<Props> = ({ onOptionsChange, options }: Props) => {
+  const styles = useStyles2(getStyles);
   return (
     <Stack justifyContent="space-between">
-      <Box width="250px" flex="0 0 250px">
-        <LeftSideBar pdcInjected={options?.jsonData?.pdcInjected!!} />
-      </Box>
-      <Box width="60%" flex="1 1 auto">
+      <div className={styles.hideOnSmallScreen}>
+        <Box width="100%" flex="1 1 auto">
+          <LeftSideBar pdcInjected={options?.jsonData?.pdcInjected!!} />
+        </Box>
+      </div>
+      <Box width="60%" flex="1 1 auto" minWidth={CONTAINER_MIN_WIDTH}>
         <Stack direction="column">
           <Alert severity="info" title="You are viewing a new design for the InfluxDB configuration settings.">
             <>
-              If something isn't working correctly, you can revert to the original configuration page design by
-              disabling the <code>newInfluxDSConfigPageDesign</code> feature flag.{' '}
               <TextLink
                 href="https://docs.google.com/forms/d/e/1FAIpQLSdi-zyX3c51vh937UKhNYYxhljUnFi6dQSlZv50mES9NrK-ig/viewform"
                 external
                 onClick={trackInfluxDBConfigV2FeedbackButtonClicked}
               >
-                Submit feedback.
-              </TextLink>
+                Share your thoughts
+              </TextLink>{' '}
+              to help us make it even better.
             </>
           </Alert>
           <UrlAndAuthenticationSection options={options} onOptionsChange={onOptionsChange} />
@@ -39,3 +44,15 @@ export const ConfigEditor: React.FC<Props> = ({ onOptionsChange, options }: Prop
     </Stack>
   );
 };
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    hideOnSmallScreen: css({
+      width: '250px',
+      flex: '0 0 250px',
+      [theme.breakpoints.down('sm')]: {
+        display: 'none',
+      },
+    }),
+  };
+};
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/DatabaseConnectionSection.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/DatabaseConnectionSection.tsx
index 4635258b8cc..e06fa0baf32 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/DatabaseConnectionSection.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/DatabaseConnectionSection.tsx
@@ -6,12 +6,19 @@ import { AdvancedDbConnectionSettings } from './AdvancedDBConnectionSettings';
 import { InfluxFluxDBConnection } from './InfluxFluxDBConnection';
 import { InfluxInfluxQLDBConnection } from './InfluxInfluxQLDBConnection';
 import { InfluxSQLDBConnection } from './InfluxSQLDBConnection';
-import { CONFIG_SECTION_HEADERS } from './constants';
+import { CONFIG_SECTION_HEADERS, CONTAINER_MIN_WIDTH } from './constants';
 import { Props } from './types';
 
 export const DatabaseConnectionSection = ({ options, onOptionsChange }: Props) => (
   <>
-    <Box borderStyle="solid" borderColor="weak" padding={2} marginBottom={4} id={`${CONFIG_SECTION_HEADERS[1].id}`}>
+    <Box
+      borderStyle="solid"
+      borderColor="weak"
+      padding={2}
+      marginBottom={4}
+      id={`${CONFIG_SECTION_HEADERS[1].id}`}
+      minWidth={CONTAINER_MIN_WIDTH}
+    >
       <CollapsableSection
         label={<Text element="h3">2. {CONFIG_SECTION_HEADERS[1].label}</Text>}
         isOpen={CONFIG_SECTION_HEADERS[1].isOpen}
@@ -26,12 +33,8 @@ export const DatabaseConnectionSection = ({ options, onOptionsChange }: Props) =
             <Alert severity="info" title="Database Access">
               <p>
                 Setting the database for this datasource does not deny access to other databases. The InfluxDB query
-                syntax allows switching the database in the query. For example:
-                <code>SHOW MEASUREMENTS ON _internal</code> or
-                <code>SELECT * FROM &quot;_internal&quot;..&quot;database&quot; LIMIT 10</code>
-                <br />
-                <br />
-                To support data isolation and security, make sure appropriate permissions are configured in InfluxDB.
+                syntax allows switching the database in the query. To support data isolation and security, make sure
+                appropriate permissions are configured in InfluxDB.
               </p>
             </Alert>
           </>
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxFluxDBConnection.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxFluxDBConnection.tsx
index 0436f970742..affb5a0e95b 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxFluxDBConnection.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxFluxDBConnection.tsx
@@ -5,6 +5,7 @@ import {
 } from '@grafana/data';
 import { InlineFieldRow, InlineField, Input, SecretInput } from '@grafana/ui';
 
+import { DB_SETTINGS_LABEL_WIDTH } from './constants';
 import {
   trackInfluxDBConfigV2FluxDBDetailsDefaultBucketInputField,
   trackInfluxDBConfigV2FluxDBDetailsOrgInputField,
@@ -20,7 +21,7 @@ export const InfluxFluxDBConnection = (props: Props) => {
   return (
     <>
       <InlineFieldRow>
-        <InlineField label="Organization" labelWidth={30} grow>
+        <InlineField label="Organization" labelWidth={DB_SETTINGS_LABEL_WIDTH} grow>
           <Input
             id="organization"
             placeholder="myorg"
@@ -31,7 +32,7 @@ export const InfluxFluxDBConnection = (props: Props) => {
         </InlineField>
       </InlineFieldRow>
       <InlineFieldRow>
-        <InlineField labelWidth={30} label="Default Bucket" grow>
+        <InlineField labelWidth={DB_SETTINGS_LABEL_WIDTH} label="Default Bucket" grow>
           <Input
             id="default-bucket"
             onBlur={trackInfluxDBConfigV2FluxDBDetailsDefaultBucketInputField}
@@ -42,7 +43,7 @@ export const InfluxFluxDBConnection = (props: Props) => {
         </InlineField>
       </InlineFieldRow>
       <InlineFieldRow>
-        <InlineField labelWidth={30} label="Token" grow>
+        <InlineField labelWidth={DB_SETTINGS_LABEL_WIDTH} label="Token" grow>
           <SecretInput
             id="token"
             isConfigured={Boolean(secureJsonFields && secureJsonFields.token)}
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxInfluxQLDBConnection.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxInfluxQLDBConnection.tsx
index 5bfd32732a7..cd47977d2c2 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxInfluxQLDBConnection.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxInfluxQLDBConnection.tsx
@@ -6,6 +6,7 @@ import {
 } from '@grafana/data';
 import { InlineFieldRow, InlineField, Input, SecretInput } from '@grafana/ui';
 
+import { DB_SETTINGS_LABEL_WIDTH } from './constants';
 import {
   trackInfluxDBConfigV2InfluxQLDBDetailsDatabaseInputField,
   trackInfluxDBConfigV2InfluxQLDBDetailsPasswordInputField,
@@ -19,7 +20,7 @@ export const InfluxInfluxQLDBConnection = (props: Props) => {
   return (
     <>
       <InlineFieldRow>
-        <InlineField label="Database" labelWidth={30} grow>
+        <InlineField label="Database" labelWidth={DB_SETTINGS_LABEL_WIDTH} grow>
           <Input
             id="database"
             placeholder="mydb"
@@ -30,7 +31,7 @@ export const InfluxInfluxQLDBConnection = (props: Props) => {
         </InlineField>
       </InlineFieldRow>
       <InlineFieldRow>
-        <InlineField label="User" labelWidth={30} grow>
+        <InlineField label="User" labelWidth={DB_SETTINGS_LABEL_WIDTH} grow>
           <Input
             id="user"
             placeholder="myuser"
@@ -41,7 +42,7 @@ export const InfluxInfluxQLDBConnection = (props: Props) => {
         </InlineField>
       </InlineFieldRow>
       <InlineFieldRow>
-        <InlineField label="Password" labelWidth={30} grow>
+        <InlineField label="Password" labelWidth={DB_SETTINGS_LABEL_WIDTH} grow>
           <SecretInput
             id="password"
             isConfigured={Boolean(options.secureJsonFields && options.secureJsonFields.password)}
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxSQLDBConnection.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxSQLDBConnection.tsx
index cdf49743e7e..06deb301a53 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxSQLDBConnection.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/InfluxSQLDBConnection.tsx
@@ -5,6 +5,7 @@ import {
 } from '@grafana/data';
 import { InlineFieldRow, InlineField, Input, SecretInput } from '@grafana/ui';
 
+import { DB_SETTINGS_LABEL_WIDTH } from './constants';
 import {
   trackInfluxDBConfigV2SQLDBDetailsDatabaseInputField,
   trackInfluxDBConfigV2SQLDBDetailsTokenInputField,
@@ -18,7 +19,7 @@ export const InfluxSQLDBConnection = (props: Props) => {
   return (
     <>
       <InlineFieldRow>
-        <InlineField label="Database" labelWidth={30} grow>
+        <InlineField label="Database" labelWidth={DB_SETTINGS_LABEL_WIDTH} grow>
           <Input
             id="database"
             placeholder="mydb"
@@ -29,7 +30,7 @@ export const InfluxSQLDBConnection = (props: Props) => {
         </InlineField>
       </InlineFieldRow>
       <InlineFieldRow>
-        <InlineField labelWidth={30} label="Token" grow>
+        <InlineField labelWidth={DB_SETTINGS_LABEL_WIDTH} label="Token" grow>
           <SecretInput
             id="token"
             isConfigured={Boolean(secureJsonFields && secureJsonFields.token)}
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/LeftSideBar.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/LeftSideBar.tsx
index ab6b7522a68..68d68795fc4 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/LeftSideBar.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/LeftSideBar.tsx
@@ -10,7 +10,7 @@ export const LeftSideBar = ({ pdcInjected }: LeftSideBarProps) => {
   const headers = pdcInjected ? CONFIG_SECTION_HEADERS_WITH_PDC : CONFIG_SECTION_HEADERS;
   return (
     <Stack>
-      <Box flex={1} marginY={5}>
+      <Box flex={1} marginY={10}>
         <Text element="h4">InfluxDB</Text>
         <Box paddingTop={2}>
           {headers.map((header, index) => (
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/UrlAndAuthenticationSection.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/UrlAndAuthenticationSection.tsx
index 49e4a2074aa..be726a65f54 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/UrlAndAuthenticationSection.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/UrlAndAuthenticationSection.tsx
@@ -17,7 +17,7 @@ import { InfluxVersion } from '../../../types';
 
 import { AdvancedHttpSettings } from './AdvancedHttpSettings';
 import { AuthSettings } from './AuthSettings';
-import { CONFIG_SECTION_HEADERS } from './constants';
+import { CONFIG_SECTION_HEADERS, CONTAINER_MIN_WIDTH } from './constants';
 import {
   trackInfluxDBConfigV2ProductSelected,
   trackInfluxDBConfigV2QueryLanguageSelected,
@@ -66,7 +66,14 @@ export const UrlAndAuthenticationSection = (props: Props) => {
   const onUrlChange = (event: React.ChangeEvent<HTMLInputElement>) => onUpdateDatasourceOption(props, 'url')(event);
 
   return (
-    <Box borderStyle="solid" borderColor="weak" padding={2} marginBottom={4} id={`${CONFIG_SECTION_HEADERS[0].id}`}>
+    <Box
+      borderStyle="solid"
+      borderColor="weak"
+      padding={2}
+      marginBottom={4}
+      id={`${CONFIG_SECTION_HEADERS[0].id}`}
+      minWidth={CONTAINER_MIN_WIDTH}
+    >
       <CollapsableSection
         label={<Text element="h3">1. {CONFIG_SECTION_HEADERS[0].label}</Text>}
         isOpen={CONFIG_SECTION_HEADERS[0].isOpen}
@@ -76,7 +83,7 @@ export const UrlAndAuthenticationSection = (props: Props) => {
           available settings and authentication methods in the next steps. If you are unsure what product you are using,
           view the{' '}
           <TextLink href="https://docs.influxdata.com/" external>
-            InfluxDB Docs.
+            InfluxDB Docs
           </TextLink>
           .
         </Text>
@@ -85,7 +92,7 @@ export const UrlAndAuthenticationSection = (props: Props) => {
           <Field label={<div style={{ marginBottom: '5px' }}>URL</div>} noMargin>
             <Input
               data-testid="influxdb-v2-config-url-input"
-              placeholder="http://localhost:3000/"
+              placeholder="http://localhost:8086/"
               onChange={onUrlChange}
               value={options.url || ''}
               onBlur={trackInfluxDBConfigV2URLInputField}
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/constants.ts b/public/app/plugins/datasource/influxdb/components/editor/config-v2/constants.ts
index 07b4b3fc35e..a3c63953d4e 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/constants.ts
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/constants.ts
@@ -50,8 +50,11 @@ export const getInlineLabelStyles = (theme: GrafanaTheme2, transparent = false,
       marginRight: theme.spacing(0.5),
       borderRadius: theme.shape.radius.default,
       border: 'none',
-      width: '240px',
+      width: '220px',
       color: theme.colors.text.primary,
     }),
   };
 };
+
+export const DB_SETTINGS_LABEL_WIDTH = 18;
+export const CONTAINER_MIN_WIDTH = '450px';
diff --git a/public/app/plugins/datasource/influxdb/types.ts b/public/app/plugins/datasource/influxdb/types.ts
index 623e2acf531..c25692bf6d3 100644
--- a/public/app/plugins/datasource/influxdb/types.ts
+++ b/public/app/plugins/datasource/influxdb/types.ts
@@ -18,6 +18,7 @@ export interface InfluxOptions extends DataSourceJsonData {
   dbName?: string;
   product?: string;
   pdcInjected?: boolean;
+  oauthPassThru?: boolean;
 
   // With Flux
   organization?: string;

From 85166512cb83b91015bbe1957fbb5fb0a633df4c Mon Sep 17 00:00:00 2001
From: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
Date: Tue, 12 Aug 2025 16:37:16 -0600
Subject: [PATCH 122/243] Provisioning: Update for standalone (#109524)

---
 pkg/registry/apis/provisioning/register.go | 43 ++++++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/pkg/registry/apis/provisioning/register.go b/pkg/registry/apis/provisioning/register.go
index d22e81d3cf9..5de39950c5c 100644
--- a/pkg/registry/apis/provisioning/register.go
+++ b/pkg/registry/apis/provisioning/register.go
@@ -276,6 +276,27 @@ func (b *APIBuilder) GetAuthorizer() authorizer.Authorizer {
 				return authorizer.DecisionAllow, "", nil
 			}
 
+			info, ok := authlib.AuthInfoFrom(ctx)
+			if ok && authlib.IsIdentityType(info.GetIdentityType(), authlib.TypeAccessPolicy) {
+				res, err := b.access.Check(ctx, info, authlib.CheckRequest{
+					Verb:        a.GetVerb(),
+					Group:       a.GetAPIGroup(),
+					Resource:    a.GetResource(),
+					Name:        a.GetName(),
+					Namespace:   a.GetNamespace(),
+					Subresource: a.GetSubresource(),
+				})
+
+				if err != nil {
+					return authorizer.DecisionDeny, "failed to perform authorization", err
+				}
+
+				if !res.Allowed {
+					return authorizer.DecisionDeny, "permission denied", nil
+				}
+
+				return authorizer.DecisionAllow, "", nil
+			}
 			// Different routes may need different permissions.
 			// * Reading and modifying a repository's configuration requires administrator privileges.
 			// * Reading a repository's limited configuration (/stats & /settings) requires viewer privileges.
@@ -615,18 +636,10 @@ func (b *APIBuilder) GetPostStartHooks() (map[string]genericapiserver.PostStartH
 				return err
 			}
 
-			// When starting with an empty instance -- swith to "mode 4+"
-			err = b.tryRunningOnlyUnifiedStorage()
-			if err != nil {
-				return err
-			}
-
 			// Informer with resync interval used for health check and reconciliation
 			sharedInformerFactory := informers.NewSharedInformerFactory(c, 60*time.Second)
 			repoInformer := sharedInformerFactory.Provisioning().V0alpha1().Repositories()
 			jobInformer := sharedInformerFactory.Provisioning().V0alpha1().Jobs()
-			go repoInformer.Informer().Run(postStartHookCtx.Done())
-			go jobInformer.Informer().Run(postStartHookCtx.Done())
 
 			b.client = c.ProvisioningV0alpha1()
 
@@ -637,6 +650,20 @@ func (b *APIBuilder) GetPostStartHooks() (map[string]genericapiserver.PostStartH
 
 			b.repositoryLister = repoInformer.Lister()
 
+			// if running solely CRUD, skip the rest of the setup
+			if b.localFileResolver == nil {
+				return nil
+			}
+
+			go repoInformer.Informer().Run(postStartHookCtx.Done())
+			go jobInformer.Informer().Run(postStartHookCtx.Done())
+
+			// When starting with an empty instance -- swith to "mode 4+"
+			err = b.tryRunningOnlyUnifiedStorage()
+			if err != nil {
+				return err
+			}
+
 			// Create the repository resources factory
 			usageMetricCollector := usage.MetricCollector(b.tracer, b.repositoryLister, b.unified)
 			b.usageStats.RegisterMetricsFunc(usageMetricCollector)

From 2ecc076bbfca5b9b252de35889d4885a4c199478 Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Wed, 13 Aug 2025 03:08:53 -0400
Subject: [PATCH 123/243] Provisioned Resource Read Only: When repo is read
 only, disable action buttons and display badge (#109494)

* When repo is read only, disable action buttons and display badge

* browse dashboards page, disable checkbox if repo is read only

* clean up

* clean up

* i18n

* added read only status to repository page

* i18n

* fix

* readonly tooltip added local provisioning message

* i18n
---
 .../provisioning/v0alpha1/endpoints.gen.ts    |  5 ++-
 .../NestedFolderPicker/FolderRepo.tsx         | 31 +++++++++++---
 .../BrowseDashboardsPage.tsx                  |  7 +++-
 .../useSelectionRepoValidation.ts             | 20 +++++++++
 .../BulkDeleteProvisionedResource.test.tsx    |  1 +
 .../components/CheckboxCell.tsx               | 15 ++++++-
 .../components/CheckboxHeaderCell.tsx         |  8 +++-
 .../components/CreateNewButton.test.tsx       | 10 +++--
 .../components/CreateNewButton.tsx            | 18 +++++++-
 .../components/FolderActionsButton.tsx        | 12 +++++-
 .../app/features/browse-dashboards/types.ts   |  1 +
 .../scene/NavToolbarActions.tsx               | 41 ++++++++++++++++++-
 .../Repository/RepositoryActions.tsx          |  7 +++-
 .../Repository/RepositoryCard.tsx             |  9 +++-
 .../hooks/useGetResourceRepositoryView.ts     |  4 ++
 .../features/provisioning/utils/repository.ts | 24 +++++++++--
 public/locales/en-US/grafana.json             |  7 +++-
 17 files changed, 192 insertions(+), 28 deletions(-)

diff --git a/public/app/api/clients/provisioning/v0alpha1/endpoints.gen.ts b/public/app/api/clients/provisioning/v0alpha1/endpoints.gen.ts
index 33ee7549eb7..bc262a42bae 100644
--- a/public/app/api/clients/provisioning/v0alpha1/endpoints.gen.ts
+++ b/public/app/api/clients/provisioning/v0alpha1/endpoints.gen.ts
@@ -1013,7 +1013,7 @@ export type RepositorySpec = {
      - `"local"` */
   type: 'bitbucket' | 'git' | 'github' | 'gitlab' | 'local';
   /** UI driven Workflow that allow changes to the contends of the repository. The order is relevant for defining the precedence of the workflows. When empty, the repository does not support any edits (eg, readonly) */
-  workflows: ('branch' | 'write')[];
+  workflows: RepoWorkflows;
 };
 export type HealthStatus = {
   /** When the health was checked last time */
@@ -1258,6 +1258,7 @@ export type WebhookResponse = {
   /** Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds */
   kind?: string;
 };
+export type RepoWorkflows = ('branch' | 'write')[]
 export type RepositoryView = {
   /** For git, this is the target branch */
   branch?: string;
@@ -1281,7 +1282,7 @@ export type RepositoryView = {
      - `"local"` */
   type: 'bitbucket' | 'git' | 'github' | 'gitlab' | 'local';
   /** The supported workflows */
-  workflows: ('branch' | 'write')[];
+  workflows: RepoWorkflows;
 };
 export type RepositoryViewList = {
   /** APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources */
diff --git a/public/app/core/components/NestedFolderPicker/FolderRepo.tsx b/public/app/core/components/NestedFolderPicker/FolderRepo.tsx
index b4d8c2bcf26..be50e30b5be 100644
--- a/public/app/core/components/NestedFolderPicker/FolderRepo.tsx
+++ b/public/app/core/components/NestedFolderPicker/FolderRepo.tsx
@@ -1,6 +1,7 @@
 import { t } from '@grafana/i18n';
-import { Badge } from '@grafana/ui';
-import { useIsProvisionedInstance } from 'app/features/provisioning/hooks/useIsProvisionedInstance';
+import { Badge, Stack } from '@grafana/ui';
+import { useGetResourceRepositoryView } from 'app/features/provisioning/hooks/useGetResourceRepositoryView';
+import { getReadOnlyTooltipText } from 'app/features/provisioning/utils/repository';
 import { NestedFolderDTO } from 'app/features/search/service/types';
 import { FolderDTO, FolderListItemDTO } from 'app/types/folders';
 
@@ -9,11 +10,31 @@ export interface Props {
 }
 
 export function FolderRepo({ folder }: Props) {
-  const isProvisionedInstance = useIsProvisionedInstance();
+  // skip rendering if:
+  // folder is not present
+  // folder have parentUID
+  // folder is not managed
+  const skipRender = !folder || ('parentUID' in folder && folder.parentUID) || !folder.managedBy;
 
-  if (!folder || ('parentUID' in folder && folder.parentUID) || !folder.managedBy || isProvisionedInstance) {
+  const { isReadOnlyRepo, repoType } = useGetResourceRepositoryView({
+    folderName: skipRender ? undefined : folder?.uid,
+  });
+
+  if (skipRender) {
     return null;
   }
 
-  return <Badge color="purple" icon="exchange-alt" tooltip={t('folder-repo.badge-tooltip', 'Provisioned')} />;
+  return (
+    // badge with text and icon only has different height, we will need to adjust the layout using stretch
+    <Stack direction="row" alignItems="stretch">
+      {isReadOnlyRepo && (
+        <Badge
+          color="darkgrey"
+          text={t('folder-repo.read-only-badge', 'Read only')}
+          tooltip={getReadOnlyTooltipText({ isLocal: repoType === 'local' })}
+        />
+      )}
+      <Badge color="purple" icon="exchange-alt" tooltip={t('folder-repo.provisioned-badge', 'Provisioned')} />
+    </Stack>
+  );
 }
diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index 1574433972d..038a32d1af6 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -16,6 +16,7 @@ import { FolderRepo } from '../../core/components/NestedFolderPicker/FolderRepo'
 import { contextSrv } from '../../core/services/context_srv';
 import { ManagerKind } from '../apiserver/types';
 import { buildNavModel, getDashboardsTabID } from '../folders/state/navModel';
+import { useGetResourceRepositoryView } from '../provisioning/hooks/useGetResourceRepositoryView';
 import { useSearchStateManager } from '../search/state/SearchStateManager';
 import { getSearchPlaceholder } from '../search/tempI18nPhrases';
 
@@ -41,6 +42,7 @@ const BrowseDashboardsPage = memo(({ queryParams }: { queryParams: Record<string
   const isSearching = stateManager.hasSearchFilters();
   const location = useLocation();
   const search = useMemo(() => new URLSearchParams(location.search), [location.search]);
+  const { isReadOnlyRepo, repoType } = useGetResourceRepositoryView({ folderName: folderUID });
 
   useEffect(() => {
     stateManager.initStateFromUrl(folderUID);
@@ -109,6 +111,7 @@ const BrowseDashboardsPage = memo(({ queryParams }: { queryParams: Record<string
     canEditDashboards,
     canDeleteFolders,
     canDeleteDashboards,
+    isReadOnlyRepo,
   };
   const onEditTitle = async (newValue: string) => {
     if (folderDTO) {
@@ -160,12 +163,14 @@ const BrowseDashboardsPage = memo(({ queryParams }: { queryParams: Record<string
               <Trans i18nKey="browse-dashboards.actions.button-to-recently-deleted">Recently deleted</Trans>
             </LinkButton>
           )}
-          {folderDTO && <FolderActionsButton folder={folderDTO} />}
+          {folderDTO && <FolderActionsButton folder={folderDTO} repoType={repoType} isReadOnlyRepo={isReadOnlyRepo} />}
           {(canCreateDashboards || canCreateFolders) && (
             <CreateNewButton
               parentFolder={folderDTO}
               canCreateDashboard={canCreateDashboards}
               canCreateFolder={canCreateFolders}
+              repoType={repoType}
+              isReadOnlyRepo={isReadOnlyRepo}
             />
           )}
         </>
diff --git a/public/app/features/browse-dashboards/components/BrowseActions/useSelectionRepoValidation.ts b/public/app/features/browse-dashboards/components/BrowseActions/useSelectionRepoValidation.ts
index 30ee0957c17..cde7e9d56e5 100644
--- a/public/app/features/browse-dashboards/components/BrowseActions/useSelectionRepoValidation.ts
+++ b/public/app/features/browse-dashboards/components/BrowseActions/useSelectionRepoValidation.ts
@@ -1,3 +1,8 @@
+import { skipToken } from '@reduxjs/toolkit/query';
+
+import { config } from '@grafana/runtime';
+import { useGetFrontendSettingsQuery } from 'app/api/clients/provisioning/v0alpha1';
+import { getIsReadOnlyRepo } from 'app/features/provisioning/utils/repository';
 import { useSelector } from 'app/types/store';
 
 import { useChildrenByParentUIDState, rootItemsSelector } from '../../state/hooks';
@@ -7,9 +12,19 @@ import { getItemRepositoryUid } from '../utils';
 
 // This hook is responsible for validating if all selected resources (dashboard folders and dashboards) are in the same repository
 export function useSelectionRepoValidation(selectedItems: Omit<DashboardTreeSelection, 'panel' | '$all'>) {
+  const provisioningEnabled = config.featureToggles.provisioning;
   const childrenByParentUID = useChildrenByParentUIDState();
   const rootItems = useSelector(rootItemsSelector)?.items ?? [];
 
+  const { data: settingsData } = useGetFrontendSettingsQuery(!provisioningEnabled ? skipToken : undefined);
+  // Function to grab repository configuration by UID
+  const getRepositoryByUid = (repoUid: string) => {
+    if (!settingsData?.items || repoUid === 'non_provisioned') {
+      return undefined;
+    }
+    return settingsData.items.find((repo) => repo.name === repoUid);
+  };
+
   const getRepoUid = (uid: string) => {
     const item = findItem(rootItems, childrenByParentUID, uid);
     return item ? getItemRepositoryUid(item, rootItems, childrenByParentUID) : 'non_provisioned';
@@ -26,10 +41,15 @@ export function useSelectionRepoValidation(selectedItems: Omit<DashboardTreeSele
   const isCrossRepo = new Set(repoUIDs).size > 1;
 
   const isInLockedRepo = (uid: string) => !selectedItemsRepoUID || getRepoUid(uid) === selectedItemsRepoUID;
+  const isUidInReadOnlyRepo = (uid: string) => {
+    const repo = getRepositoryByUid(getRepoUid(uid));
+    return repo ? getIsReadOnlyRepo(repo) : false;
+  };
 
   return {
     selectedItemsRepoUID,
     isInLockedRepo,
     isCrossRepo, // true if items are from different repositories
+    isUidInReadOnlyRepo,
   };
 }
diff --git a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
index 65b6686ef14..2a5be2aa309 100644
--- a/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
+++ b/public/app/features/browse-dashboards/components/BulkActions/BulkDeleteProvisionedResource.test.tsx
@@ -118,6 +118,7 @@ describe('BulkDeleteProvisionedResource', () => {
       selectedItemsRepoUID: 'test-folder',
       isInLockedRepo: jest.fn().mockReturnValue(false),
       isCrossRepo: false,
+      isUidInReadOnlyRepo: jest.fn().mockReturnValue(false),
     });
   });
 
diff --git a/public/app/features/browse-dashboards/components/CheckboxCell.tsx b/public/app/features/browse-dashboards/components/CheckboxCell.tsx
index 7867510d940..736e98bbf44 100644
--- a/public/app/features/browse-dashboards/components/CheckboxCell.tsx
+++ b/public/app/features/browse-dashboards/components/CheckboxCell.tsx
@@ -5,6 +5,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
 import { Checkbox, Tooltip, useStyles2 } from '@grafana/ui';
 import { ManagerKind } from 'app/features/apiserver/types';
+import { getReadOnlyTooltipText } from 'app/features/provisioning/utils/repository';
 import { useSelector } from 'app/types/store';
 
 import { DashboardsTreeCellProps, SelectionState } from '../types';
@@ -22,7 +23,7 @@ export default function CheckboxCell({
 
   // Get current selection state for repository validation
   const selectedItems = useSelector((state) => state.browseDashboards.selectedItems);
-  const { selectedItemsRepoUID, isInLockedRepo } = useSelectionRepoValidation(selectedItems);
+  const { selectedItemsRepoUID, isInLockedRepo, isUidInReadOnlyRepo } = useSelectionRepoValidation(selectedItems);
 
   // Early returns for cases where we should show a spacer instead of checkbox
   if (!isSelected) {
@@ -46,11 +47,23 @@ export default function CheckboxCell({
     return <CheckboxSpacer />;
   }
 
+  if ((permissions && permissions.isReadOnlyRepo) || isUidInReadOnlyRepo(item.uid)) {
+    // When the folder is read-only (inherited from repository), disable checkbox with tooltip
+    return (
+      <Tooltip content={getReadOnlyTooltipText({})}>
+        <span>
+          <Checkbox disabled value={false} />
+        </span>
+      </Tooltip>
+    );
+  }
+
   // Check if user can edit this specific item type
   if (permissions && !canEditItemType(item.kind, permissions)) {
     return <CheckboxSpacer />;
   }
 
+  // check if current item uid has different repo uid than selected items
   if (selectedItemsRepoUID && !isInLockedRepo(item.uid)) {
     return (
       <Tooltip
diff --git a/public/app/features/browse-dashboards/components/CheckboxHeaderCell.tsx b/public/app/features/browse-dashboards/components/CheckboxHeaderCell.tsx
index 269c9bfc638..54e17908012 100644
--- a/public/app/features/browse-dashboards/components/CheckboxHeaderCell.tsx
+++ b/public/app/features/browse-dashboards/components/CheckboxHeaderCell.tsx
@@ -3,11 +3,17 @@ import { Checkbox } from '@grafana/ui';
 
 import { DashboardTreeHeaderProps, SelectionState } from '../types';
 
-export default function CheckboxHeaderCell({ isSelected, onAllSelectionChange }: DashboardTreeHeaderProps) {
+export default function CheckboxHeaderCell({
+  isSelected,
+  onAllSelectionChange,
+  permissions,
+}: DashboardTreeHeaderProps) {
   const state = isSelected?.('$all') ?? SelectionState.Unselected;
+  const isReadOnlyRepo = permissions?.isReadOnlyRepo;
 
   return (
     <Checkbox
+      disabled={isReadOnlyRepo}
       value={state === SelectionState.Selected}
       indeterminate={state === SelectionState.Mixed}
       aria-label={t('browse-dashboards.dashboards-tree.select-all-header-checkbox', 'Select all')}
diff --git a/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx b/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
index e5635cdfd4d..370ddcf6f5a 100644
--- a/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
+++ b/public/app/features/browse-dashboards/components/CreateNewButton.test.tsx
@@ -15,7 +15,7 @@ function render(...[ui, options]: Parameters<typeof rtlRender>) {
 }
 
 async function renderAndOpen(folder?: FolderDTO) {
-  render(<CreateNewButton canCreateDashboard canCreateFolder parentFolder={folder} />);
+  render(<CreateNewButton canCreateDashboard canCreateFolder parentFolder={folder} isReadOnlyRepo={false} />);
   const newButton = screen.getByText('New');
   await userEvent.click(newButton);
 }
@@ -42,7 +42,9 @@ describe('NewActionsButton', () => {
   });
 
   it('clicking the "New folder" button opens the drawer', async () => {
-    render(<CreateNewButton canCreateDashboard canCreateFolder parentFolder={mockParentFolder} />);
+    render(
+      <CreateNewButton canCreateDashboard canCreateFolder parentFolder={mockParentFolder} isReadOnlyRepo={false} />
+    );
 
     const newButton = screen.getByText('New');
     await userEvent.click(newButton);
@@ -55,7 +57,7 @@ describe('NewActionsButton', () => {
   });
 
   it('should only render dashboard items when folder creation is disabled', async () => {
-    render(<CreateNewButton canCreateDashboard canCreateFolder={false} />);
+    render(<CreateNewButton canCreateDashboard canCreateFolder={false} isReadOnlyRepo={false} />);
     const newButton = screen.getByText('New');
     await userEvent.click(newButton);
 
@@ -65,7 +67,7 @@ describe('NewActionsButton', () => {
   });
 
   it('should only render folder item when dashboard creation is disabled', async () => {
-    render(<CreateNewButton canCreateDashboard={false} canCreateFolder />);
+    render(<CreateNewButton canCreateDashboard={false} canCreateFolder isReadOnlyRepo={false} />);
     const newButton = screen.getByText('New');
     await userEvent.click(newButton);
 
diff --git a/public/app/features/browse-dashboards/components/CreateNewButton.tsx b/public/app/features/browse-dashboards/components/CreateNewButton.tsx
index 027916de85e..bc8b896b8ae 100644
--- a/public/app/features/browse-dashboards/components/CreateNewButton.tsx
+++ b/public/app/features/browse-dashboards/components/CreateNewButton.tsx
@@ -5,7 +5,9 @@ import { locationUtil } from '@grafana/data';
 import { config, locationService, reportInteraction } from '@grafana/runtime';
 import { Button, Drawer, Dropdown, Icon, Menu, MenuItem } from '@grafana/ui';
 import { useAppNotification } from 'app/core/copy/appNotification';
+import { RepoType } from 'app/features/provisioning/Wizard/types';
 import { useIsProvisionedInstance } from 'app/features/provisioning/hooks/useIsProvisionedInstance';
+import { getReadOnlyTooltipText } from 'app/features/provisioning/utils/repository';
 import {
   getImportPhrase,
   getNewDashboardPhrase,
@@ -24,9 +26,17 @@ interface Props {
   parentFolder?: FolderDTO;
   canCreateFolder: boolean;
   canCreateDashboard: boolean;
+  isReadOnlyRepo: boolean;
+  repoType?: RepoType;
 }
 
-export default function CreateNewButton({ parentFolder, canCreateDashboard, canCreateFolder }: Props) {
+export default function CreateNewButton({
+  parentFolder,
+  canCreateDashboard,
+  canCreateFolder,
+  isReadOnlyRepo,
+  repoType,
+}: Props) {
   const [isOpen, setIsOpen] = useState(false);
   const location = useLocation();
   const [newFolder] = useNewFolderMutation();
@@ -94,7 +104,11 @@ export default function CreateNewButton({ parentFolder, canCreateDashboard, canC
   return (
     <>
       <Dropdown overlay={newMenu} onVisibleChange={setIsOpen}>
-        <Button>
+        <Button
+          disabled={isReadOnlyRepo}
+          tooltip={isReadOnlyRepo ? getReadOnlyTooltipText({ isLocal: repoType === 'local' }) : undefined}
+          variant="secondary"
+        >
           {getNewPhrase()}
           <Icon name={isOpen ? 'angle-up' : 'angle-down'} />
         </Button>
diff --git a/public/app/features/browse-dashboards/components/FolderActionsButton.tsx b/public/app/features/browse-dashboards/components/FolderActionsButton.tsx
index b986d541f7f..c58b310e0e3 100644
--- a/public/app/features/browse-dashboards/components/FolderActionsButton.tsx
+++ b/public/app/features/browse-dashboards/components/FolderActionsButton.tsx
@@ -6,6 +6,8 @@ import { locationService, reportInteraction } from '@grafana/runtime';
 import { Button, Drawer, Dropdown, Icon, Menu, MenuItem } from '@grafana/ui';
 import { Permissions } from 'app/core/components/AccessControl';
 import { appEvents } from 'app/core/core';
+import { RepoType } from 'app/features/provisioning/Wizard/types';
+import { getReadOnlyTooltipText } from 'app/features/provisioning/utils/repository';
 import { ShowModalReactEvent } from 'app/types/events';
 import { FolderDTO } from 'app/types/folders';
 
@@ -20,9 +22,11 @@ import { DeleteProvisionedFolderForm } from './DeleteProvisionedFolderForm';
 
 interface Props {
   folder: FolderDTO;
+  isReadOnlyRepo?: boolean;
+  repoType?: RepoType;
 }
 
-export function FolderActionsButton({ folder }: Props) {
+export function FolderActionsButton({ folder, repoType, isReadOnlyRepo }: Props) {
   const [isOpen, setIsOpen] = useState(false);
   const [showPermissionsDrawer, setShowPermissionsDrawer] = useState(false);
   const [showDeleteProvisionedFolderDrawer, setShowDeleteProvisionedFolderDrawer] = useState(false);
@@ -137,7 +141,11 @@ export function FolderActionsButton({ folder }: Props) {
   return (
     <>
       <Dropdown overlay={menu} onVisibleChange={setIsOpen}>
-        <Button variant="secondary">
+        <Button
+          variant="secondary"
+          disabled={isReadOnlyRepo}
+          tooltip={isReadOnlyRepo ? getReadOnlyTooltipText({ isLocal: repoType === 'local' }) : undefined}
+        >
           <Trans i18nKey="browse-dashboards.folder-actions-button.folder-actions">Folder actions</Trans>
           <Icon name={isOpen ? 'angle-up' : 'angle-down'} />
         </Button>
diff --git a/public/app/features/browse-dashboards/types.ts b/public/app/features/browse-dashboards/types.ts
index 795d3bb794d..5aece134d5e 100644
--- a/public/app/features/browse-dashboards/types.ts
+++ b/public/app/features/browse-dashboards/types.ts
@@ -67,4 +67,5 @@ export interface BrowseDashboardsPermissions {
   canEditDashboards: boolean;
   canDeleteFolders?: boolean;
   canDeleteDashboards?: boolean;
+  isReadOnlyRepo?: boolean;
 }
diff --git a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
index 00dbd0943a3..47fec9cf54a 100644
--- a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
+++ b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
@@ -5,7 +5,17 @@ import { GrafanaTheme2, store } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
 import { config, locationService } from '@grafana/runtime';
-import { Button, ButtonGroup, Dropdown, Icon, Menu, ToolbarButton, ToolbarButtonRow, useStyles2 } from '@grafana/ui';
+import {
+  Badge,
+  Button,
+  ButtonGroup,
+  Dropdown,
+  Icon,
+  Menu,
+  ToolbarButton,
+  ToolbarButtonRow,
+  useStyles2,
+} from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import { NavToolbarSeparator } from 'app/core/components/AppChrome/NavToolbar/NavToolbarSeparator';
 import grafanaConfig from 'app/core/config';
@@ -13,6 +23,8 @@ import { LS_PANEL_COPY_KEY } from 'app/core/constants';
 import { contextSrv } from 'app/core/core';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { playlistSrv } from 'app/features/playlist/PlaylistSrv';
+import { useGetResourceRepositoryView } from 'app/features/provisioning/hooks/useGetResourceRepositoryView';
+import { getReadOnlyTooltipText } from 'app/features/provisioning/utils/repository';
 import { useSelector } from 'app/types/store';
 
 import { shareDashboardType } from '../../dashboard/components/ShareModal/utils';
@@ -75,6 +87,10 @@ export function ToolbarActions({ dashboard }: Props) {
   const isEditingAndShowingDashboard = isEditing && isShowingDashboard;
   const folderRepo = useSelector((state) => selectFolderRepository()(state, meta.folderUid));
   const isManaged = Boolean(dashboard.isManagedRepository() || folderRepo);
+  // Get the repository for the dashboard's folder
+  const { isReadOnlyRepo, repoType } = useGetResourceRepositoryView({
+    folderName: meta.folderUid,
+  });
 
   // Internal only;
   // allows viewer editing without ability to save
@@ -118,6 +134,22 @@ export function ToolbarActions({ dashboard }: Props) {
     },
   });
 
+  if (isReadOnlyRepo) {
+    toolbarActions.push({
+      group: 'icon-actions',
+      condition: true,
+      render: () => {
+        return (
+          <Badge
+            color="darkgrey"
+            text={t('dashboard.toolbar.read-only', 'Read only')}
+            tooltip={getReadOnlyTooltipText({ isLocal: repoType === 'local' })}
+          />
+        );
+      },
+    });
+  }
+
   if (dashboard.isManaged() && meta.canEdit) {
     toolbarActions.push({
       group: 'icon-actions',
@@ -325,12 +357,17 @@ export function ToolbarActions({ dashboard }: Props) {
         onClick={() => {
           dashboard.onEnterEditMode();
         }}
-        tooltip={t('dashboard.toolbar.edit.tooltip', 'Enter edit mode')}
+        tooltip={
+          isReadOnlyRepo
+            ? getReadOnlyTooltipText({ isLocal: repoType === 'local' })
+            : t('dashboard.toolbar.edit.tooltip', 'Enter edit mode')
+        }
         key="edit"
         className={styles.buttonWithExtraMargin}
         variant={config.featureToggles.newDashboardSharingComponent ? 'secondary' : 'primary'}
         size="sm"
         data-testid={selectors.components.NavToolbar.editDashboard.editButton}
+        disabled={isReadOnlyRepo}
       >
         <Trans i18nKey="dashboard.toolbar.edit.label">Edit</Trans>
       </Button>
diff --git a/public/app/features/provisioning/Repository/RepositoryActions.tsx b/public/app/features/provisioning/Repository/RepositoryActions.tsx
index d1b710ee2b2..1eb7ffd0649 100644
--- a/public/app/features/provisioning/Repository/RepositoryActions.tsx
+++ b/public/app/features/provisioning/Repository/RepositoryActions.tsx
@@ -1,10 +1,11 @@
-import { Trans } from '@grafana/i18n';
-import { Button, LinkButton, Stack } from '@grafana/ui';
+import { t, Trans } from '@grafana/i18n';
+import { Badge, Button, LinkButton, Stack } from '@grafana/ui';
 import { Repository } from 'app/api/clients/provisioning/v0alpha1';
 
 import { StatusBadge } from '../Shared/StatusBadge';
 import { PROVISIONING_URL } from '../constants';
 import { getRepoHrefForProvider } from '../utils/git';
+import { getIsReadOnlyWorkflows } from '../utils/repository';
 import { getRepositoryTypeConfig } from '../utils/repositoryTypes';
 
 import { DeleteRepositoryButton } from './DeleteRepositoryButton';
@@ -21,9 +22,11 @@ export function RepositoryActions({ repository }: RepositoryActionsProps) {
   const repoType = repository.spec?.type;
   const repoConfig = repoType ? getRepositoryTypeConfig(repoType) : undefined;
   const providerIcon = repoConfig?.icon || 'external-link-alt';
+  const isReadOnlyRepo = getIsReadOnlyWorkflows(repository.spec?.workflows);
 
   return (
     <Stack>
+      {isReadOnlyRepo && <Badge color="darkgrey" text={t('folder-repo.read-only-badge', 'Read only')} />}
       <StatusBadge repo={repository} />
       {repoHref && (
         <Button variant="secondary" icon={providerIcon} onClick={() => window.open(repoHref, '_blank')}>
diff --git a/public/app/features/provisioning/Repository/RepositoryCard.tsx b/public/app/features/provisioning/Repository/RepositoryCard.tsx
index 488a5afbc66..3336559458e 100644
--- a/public/app/features/provisioning/Repository/RepositoryCard.tsx
+++ b/public/app/features/provisioning/Repository/RepositoryCard.tsx
@@ -1,12 +1,13 @@
 import { ReactNode } from 'react';
 
-import { Trans } from '@grafana/i18n';
-import { Stack, Text, TextLink, Icon, Card, LinkButton } from '@grafana/ui';
+import { t, Trans } from '@grafana/i18n';
+import { Stack, Text, TextLink, Icon, Card, LinkButton, Badge } from '@grafana/ui';
 import { Repository, ResourceCount } from 'app/api/clients/provisioning/v0alpha1';
 
 import { RepoIcon } from '../Shared/RepoIcon';
 import { StatusBadge } from '../Shared/StatusBadge';
 import { PROVISIONING_URL } from '../constants';
+import { getIsReadOnlyWorkflows } from '../utils/repository';
 
 import { DeleteRepositoryButton } from './DeleteRepositoryButton';
 import { SyncRepository } from './SyncRepository';
@@ -16,6 +17,7 @@ interface Props {
 }
 
 export function RepositoryCard({ repository }: Props) {
+  const isReadOnlyRepo = getIsReadOnlyWorkflows(repository.spec?.workflows);
   const { metadata, spec, status } = repository;
   const name = metadata?.name ?? '';
 
@@ -63,6 +65,9 @@ export function RepositoryCard({ repository }: Props) {
         <Stack gap={2} direction="row" alignItems="center">
           {spec?.title && <Text variant="h3">{spec.title}</Text>}
           <StatusBadge repo={repository} />
+          {isReadOnlyRepo && (
+            <Badge color="darkgrey" text={t('provisioning.repository-card.read-only-badge', 'Read only')} />
+          )}
         </Stack>
       </Card.Heading>
 
diff --git a/public/app/features/provisioning/hooks/useGetResourceRepositoryView.ts b/public/app/features/provisioning/hooks/useGetResourceRepositoryView.ts
index 3054b5bdf4b..46f1be54526 100644
--- a/public/app/features/provisioning/hooks/useGetResourceRepositoryView.ts
+++ b/public/app/features/provisioning/hooks/useGetResourceRepositoryView.ts
@@ -5,6 +5,7 @@ import { Folder, useGetFolderQuery } from 'app/api/clients/folder/v1beta1';
 import { RepositoryView, useGetFrontendSettingsQuery } from 'app/api/clients/provisioning/v0alpha1';
 import { AnnoKeyManagerIdentity } from 'app/features/apiserver/types';
 
+import { RepoType } from '../Wizard/types';
 import { getIsReadOnlyRepo } from '../utils/repository';
 
 interface GetResourceRepositoryArgs {
@@ -14,6 +15,7 @@ interface GetResourceRepositoryArgs {
 
 interface RepositoryViewData {
   repository?: RepositoryView;
+  repoType?: RepoType;
   folder?: Folder;
   isLoading?: boolean;
   isInstanceManaged: boolean;
@@ -26,6 +28,7 @@ export const useGetResourceRepositoryView = ({ name, folderName }: GetResourceRe
   const { data: settingsData, isLoading: isSettingsLoading } = useGetFrontendSettingsQuery(
     !provisioningEnabled ? skipToken : undefined
   );
+
   const skipFolderQuery = !folderName || !provisioningEnabled;
   const { data: folder, isLoading: isFolderLoading } = useGetFolderQuery(
     skipFolderQuery ? skipToken : { name: folderName }
@@ -93,5 +96,6 @@ export const useGetResourceRepositoryView = ({ name, folderName }: GetResourceRe
     folder,
     isInstanceManaged,
     isReadOnlyRepo: getIsReadOnlyRepo(instanceRepo),
+    repoType: instanceRepo?.type,
   };
 };
diff --git a/public/app/features/provisioning/utils/repository.ts b/public/app/features/provisioning/utils/repository.ts
index 4e33d5e3922..c30d026196c 100644
--- a/public/app/features/provisioning/utils/repository.ts
+++ b/public/app/features/provisioning/utils/repository.ts
@@ -1,10 +1,28 @@
-import { RepositoryView } from 'app/api/clients/provisioning/v0alpha1';
+import { t } from '@grafana/i18n';
+import { RepositoryView, RepoWorkflows } from 'app/api/clients/provisioning/v0alpha1';
+
+export function getIsReadOnlyWorkflows(workflows?: RepoWorkflows): boolean {
+  // Repository is consider read-only if it has no workflows defined (workflows are required for write operations)
+  return workflows?.length === 0;
+}
 
 export function getIsReadOnlyRepo(repository: RepositoryView | undefined): boolean {
   if (!repository) {
     return false;
   }
 
-  // Repository is consider read-only if it has no workflows defined (workflows are required for write operations)
-  return repository.workflows.length === 0;
+  return getIsReadOnlyWorkflows(repository.workflows);
 }
+
+// Right now we only support local file provisioning message and git provisioned. This can be extend in the future as needed.
+export const getReadOnlyTooltipText = ({ isLocal = false }) => {
+  return isLocal
+    ? t(
+        'provisioning.read-only-local-tooltip',
+        'This folder is read-only and provisioned through file provisioning. To make any changes in the folder, update the connected file repository. To modify the folder settings go to Administration > Provisioning > Repositories.'
+      )
+    : t(
+        'provisioning.read-only-remote-tooltip',
+        'This folder is read-only and provisioned through Git. To make any changes in the folder, update the connected repository. To modify the folder settings go to Administration > Provisioning > Repositories.'
+      );
+};
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 3081454d389..a1d5bb3caac 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -5343,6 +5343,7 @@
       "playlist-next": "Go to next dashboard",
       "playlist-previous": "Go to previous dashboard",
       "playlist-stop": "Stop playlist",
+      "read-only": "Read only",
       "refresh": "Refresh dashboard",
       "save": "Save dashboard",
       "save-dashboard": {
@@ -7505,7 +7506,8 @@
     "loading": "Loading folders..."
   },
   "folder-repo": {
-    "badge-tooltip": "Provisioned"
+    "provisioned-badge": "Provisioned",
+    "read-only-badge": "Read only"
   },
   "folders": {
     "api": {
@@ -11413,6 +11415,8 @@
         "subtitle": "Use this option if you want to sync and manage your entire Grafana instance through external storage."
       }
     },
+    "read-only-local-tooltip": "This folder is read-only and provisioned through file provisioning. To make any changes in the folder, update the connected file repository. To modify the folder settings go to Administration > Provisioning > Repositories.",
+    "read-only-remote-tooltip": "This folder is read-only and provisioned through Git. To make any changes in the folder, update the connected repository. To modify the folder settings go to Administration > Provisioning > Repositories.",
     "recent-jobs": {
       "active-jobs": "active jobs",
       "column-action": "Action",
@@ -11431,6 +11435,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "Read only",
       "settings": "Settings",
       "view": "View"
     },

From 47aa892d2429b8e8e4e1e8e073b33687cdb59396 Mon Sep 17 00:00:00 2001
From: Yulia Shanyrova <yulia.shanyrova@grafana.com>
Date: Wed, 13 Aug 2025 10:18:49 +0200
Subject: [PATCH 124/243] Plugins: Add test-ids for plugin details, remove
 lastCommitDate (#109173)

add test-ids for plugin details, remove lastCommitDate
---
 public/app/features/plugins/admin/api.ts      |  12 +-
 .../admin/components/PluginDetailsPanel.tsx   |  52 ++--
 .../admin/pages/PluginDetails.test.tsx        | 250 +++---------------
 public/app/features/plugins/admin/types.ts    |  57 +---
 public/locales/en-US/grafana.json             |   1 -
 5 files changed, 69 insertions(+), 303 deletions(-)

diff --git a/public/app/features/plugins/admin/api.ts b/public/app/features/plugins/admin/api.ts
index 20440a5ee05..74a072ba054 100644
--- a/public/app/features/plugins/admin/api.ts
+++ b/public/app/features/plugins/admin/api.ts
@@ -35,7 +35,6 @@ export async function getPluginDetails(id: string): Promise<CatalogPluginDetails
     versions,
     statusContext: remote?.statusContext ?? '',
     iam: remote?.json?.iam,
-    lastCommitDate: remote?.lastCommitDate,
     changelog: remote?.changelog || localChangelog,
     licenseUrl: remote?.licenseUrl,
     documentationUrl: remote?.documentationUrl,
@@ -171,9 +170,7 @@ export async function installPlugin(id: string, version?: string) {
   // on the backend.
   return await getBackendSrv().post(
     `${API_ROOT}/${id}/install`,
-    {
-      version,
-    },
+    { version },
     {
       // Error is displayed in the page
       showErrorAlert: false,
@@ -195,9 +192,4 @@ export async function updatePluginSettings(id: string, data: Partial<PluginMeta>
   return response?.data;
 }
 
-export const api = {
-  getRemotePlugins,
-  getInstalledPlugins: getLocalPlugins,
-  installPlugin,
-  uninstallPlugin,
-};
+export const api = { getRemotePlugins, getInstalledPlugins: getLocalPlugins, installPlugin, uninstallPlugin };
diff --git a/public/app/features/plugins/admin/components/PluginDetailsPanel.tsx b/public/app/features/plugins/admin/components/PluginDetailsPanel.tsx
index bf30e8e2a5b..155218a4501 100644
--- a/public/app/features/plugins/admin/components/PluginDetailsPanel.tsx
+++ b/public/app/features/plugins/admin/components/PluginDetailsPanel.tsx
@@ -22,11 +22,7 @@ import { formatDate } from 'app/core/internationalization/dates';
 
 import { CatalogPlugin } from '../types';
 
-type Props = {
-  pluginExtentionsInfo: PageInfoItem[];
-  plugin: CatalogPlugin;
-  width?: string;
-};
+type Props = { pluginExtentionsInfo: PageInfoItem[]; plugin: CatalogPlugin; width?: string };
 
 export function PluginDetailsPanel(props: Props): React.ReactElement | null {
   const { pluginExtentionsInfo, plugin, width = '250px' } = props;
@@ -57,11 +53,19 @@ export function PluginDetailsPanel(props: Props): React.ReactElement | null {
 
   const onClickReportConcern = (pluginId: string) => {
     setReportAbuseModalOpen(true);
-    reportInteraction('plugin_detail_report_concern', {
-      plugin_id: pluginId,
-    });
+    reportInteraction('plugin_detail_report_concern', { plugin_id: pluginId });
   };
 
+  function createTestId(text: string) {
+    // Convert to string and handle null/undefined
+    const str = String(text || '');
+    return str
+      .toLowerCase()
+      .trim()
+      .replace(/[^a-z0-9\s]/g, '')
+      .replace(/\s+/g, '-');
+  }
+
   return (
     <>
       <Stack direction="column" gap={3} shrink={0} grow={0} width={width} data-testid="plugin-details-panel">
@@ -70,35 +74,25 @@ export function PluginDetailsPanel(props: Props): React.ReactElement | null {
             {pluginExtentionsInfo.map((infoItem, index) => {
               return (
                 <Stack key={index} wrap direction="column" gap={0.5}>
-                  <Text color="secondary">{infoItem.label + ':'}</Text>
-                  <div className={styles.pluginVersionDetails}>{infoItem.value}</div>
+                  <Text color="secondary" data-testid={`${createTestId(infoItem.label)}-label`}>
+                    {infoItem.label + ':'}
+                  </Text>
+                  <div data-testid={`${createTestId(infoItem.label)}-value`} className={styles.pluginVersionDetails}>
+                    {infoItem.value}
+                  </div>
                 </Stack>
               );
             })}
             {plugin.updatedAt && (
               <Stack direction="column" gap={0.5}>
-                <Text color="secondary">
+                <Text color="secondary" data-testid="latest-release-date-label">
                   <Trans i18nKey="plugins.details.labels.latestReleaseDate">Latest release date:</Trans>
                 </Text>{' '}
-                <Text>
+                <Text data-testid="latest-release-date-value">
                   {formatDate(new Date(plugin.updatedAt), { day: 'numeric', month: 'short', year: 'numeric' })}
                 </Text>
               </Stack>
             )}
-            {plugin?.details?.lastCommitDate && (
-              <Stack direction="column" gap={0.5}>
-                <Text color="secondary">
-                  <Trans i18nKey="plugins.details.labels.lastCommitDate">Last commit date:</Trans>
-                </Text>{' '}
-                <Text>
-                  {formatDate(new Date(plugin.details.lastCommitDate), {
-                    day: 'numeric',
-                    month: 'short',
-                    year: 'numeric',
-                  })}
-                </Text>
-              </Stack>
-            )}
           </Stack>
         </Box>
         {shouldRenderLinks && (
@@ -271,9 +265,5 @@ export function PluginDetailsPanel(props: Props): React.ReactElement | null {
 }
 
 export const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    pluginVersionDetails: css({
-      wordBreak: 'break-word',
-    }),
-  };
+  return { pluginVersionDetails: css({ wordBreak: 'break-word' }) };
 };
diff --git a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
index b7aaed5cef0..dcd34e386fc 100644
--- a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
+++ b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
@@ -36,13 +36,7 @@ jest.mock('@grafana/runtime', () => {
   return runtime;
 });
 
-jest.mock('../hooks/usePluginConfig.tsx', () => ({
-  usePluginConfig: jest.fn(() => ({
-    value: {
-      meta: {},
-    },
-  })),
-}));
+jest.mock('../hooks/usePluginConfig.tsx', () => ({ usePluginConfig: jest.fn(() => ({ value: { meta: {} } })) }));
 
 jest.mock('app/core/core', () => ({
   contextSrv: {
@@ -53,19 +47,11 @@ jest.mock('app/core/core', () => ({
 
 const renderPluginDetails = (
   pluginOverride: Partial<CatalogPlugin>,
-  {
-    pageId,
-    pluginsStateOverride,
-  }: {
-    pageId?: PluginTabIds;
-    pluginsStateOverride?: ReducerState;
-  } = {}
+  { pageId, pluginsStateOverride }: { pageId?: PluginTabIds; pluginsStateOverride?: ReducerState } = {}
 ) => {
   const plugin = getCatalogPluginMock(pluginOverride);
   const { id } = plugin;
-  const store = configureStore({
-    plugins: pluginsStateOverride || getPluginsStateMock([plugin]),
-  });
+  const store = configureStore({ plugins: pluginsStateOverride || getPluginsStateMock([plugin]) });
 
   return render(
     <Routes>
@@ -86,10 +72,7 @@ describe('Plugin details page', () => {
     dateNow = jest.spyOn(Date, 'now').mockImplementation(() => 1609470000000); // 2021-01-01 04:00:00
 
     // Enabling / disabling the plugin is currently reloading the page to propagate the changes
-    Object.defineProperty(window, 'location', {
-      configurable: true,
-      value: { reload: jest.fn() },
-    });
+    Object.defineProperty(window, 'location', { configurable: true, value: { reload: jest.fn() } });
   });
 
   afterEach(() => {
@@ -106,21 +89,14 @@ describe('Plugin details page', () => {
 
   describe('viewed as user with grafana admin permissions', () => {
     beforeAll(() => {
-      mockUserPermissions({
-        isAdmin: true,
-        isDataSourceEditor: true,
-        isOrgAdmin: true,
-      });
+      mockUserPermissions({ isAdmin: true, isDataSourceEditor: true, isOrgAdmin: true });
     });
 
     // We are doing this very basic test to see if the API fetching and data-munging is working correctly from a high-level.
     it('(SMOKE TEST) - should fetch and merge the remote and local plugin API responses correctly ', async () => {
       const id = 'smoke-test-plugin';
 
-      mockPluginApis({
-        remote: { slug: id },
-        local: { id },
-      });
+      mockPluginApis({ remote: { slug: id }, local: { id } });
 
       const { queryByText } = renderPluginDetails({ id });
 
@@ -139,12 +115,7 @@ describe('Plugin details page', () => {
       // @ts-ignore
       usePluginConfig.mockReturnValue({
         value: {
-          meta: {
-            type: PluginType.app,
-            enabled: false,
-            pinned: false,
-            jsonData: {},
-          },
+          meta: { type: PluginType.app, enabled: false, pinned: false, jsonData: {} },
           configPages: [
             {
               title: 'Config',
@@ -158,11 +129,7 @@ describe('Plugin details page', () => {
         },
       });
 
-      const { queryByText } = renderPluginDetails({
-        name,
-        isInstalled: true,
-        type: PluginType.app,
-      });
+      const { queryByText } = renderPluginDetails({ name, isInstalled: true, type: PluginType.app });
 
       expect(await queryByText(/custom config page/i)).toBeInTheDocument();
     });
@@ -236,34 +203,13 @@ describe('Plugin details page', () => {
 
     it('should display version history if the plugin is published', async () => {
       const versions = [
-        {
-          version: '1.2.0',
-          createdAt: '2018-04-06T20:23:41.000Z',
-          isCompatible: false,
-          grafanaDependency: '>=8.3.0',
-        },
-        {
-          version: '1.1.0',
-          createdAt: '2017-04-06T20:23:41.000Z',
-          isCompatible: true,
-          grafanaDependency: '>=8.0.0',
-        },
-        {
-          version: '1.0.0',
-          createdAt: '2016-04-06T20:23:41.000Z',
-          isCompatible: true,
-          grafanaDependency: '>=7.0.0',
-        },
+        { version: '1.2.0', createdAt: '2018-04-06T20:23:41.000Z', isCompatible: false, grafanaDependency: '>=8.3.0' },
+        { version: '1.1.0', createdAt: '2017-04-06T20:23:41.000Z', isCompatible: true, grafanaDependency: '>=8.0.0' },
+        { version: '1.0.0', createdAt: '2016-04-06T20:23:41.000Z', isCompatible: true, grafanaDependency: '>=7.0.0' },
       ];
 
       const { findByRole, queryByText, getByRole } = renderPluginDetails(
-        {
-          id,
-          details: {
-            links: [],
-            versions,
-          },
-        },
+        { id, details: { links: [], versions } },
         { pageId: PluginTabIds.VERSIONS }
       );
 
@@ -404,11 +350,7 @@ describe('Plugin details page', () => {
     it('should display grafana dependencies for a plugin if they are available', async () => {
       const { queryByText } = renderPluginDetails({
         id,
-        details: {
-          pluginDependencies: [],
-          grafanaDependency: '>=8.0.0',
-          links: [],
-        },
+        details: { pluginDependencies: [], grafanaDependency: '>=8.0.0', links: [] },
       });
 
       // Wait for the dependencies part to be loaded
@@ -419,10 +361,7 @@ describe('Plugin details page', () => {
       // @ts-ignore
       api.uninstallPlugin = jest.fn();
 
-      setBackendSrv({
-        ...originalBackendSrv,
-        get: jest.fn().mockResolvedValue({ panels: [] }),
-      });
+      setBackendSrv({ ...originalBackendSrv, get: jest.fn().mockResolvedValue({ panels: [] }) });
 
       const { queryByText, getByRole, findByRole, user } = renderPluginDetails({
         id,
@@ -432,14 +371,7 @@ describe('Plugin details page', () => {
           pluginDependencies: [],
           grafanaDependency: '>=8.0.0',
           links: [],
-          versions: [
-            {
-              version: '1.0.0',
-              createdAt: '',
-              isCompatible: true,
-              grafanaDependency: '>=8.0.0',
-            },
-          ],
+          versions: [{ version: '1.0.0', createdAt: '', isCompatible: true, grafanaDependency: '>=8.0.0' }],
         },
       });
 
@@ -470,12 +402,7 @@ describe('Plugin details page', () => {
       // Mock the store like if the remote plugins request was rejected
       const pluginsStateOverride = {
         ...state,
-        requests: {
-          ...state.requests,
-          [fetchRemotePlugins.typePrefix]: {
-            status: RequestStatus.Rejected,
-          },
-        },
+        requests: { ...state.requests, [fetchRemotePlugins.typePrefix]: { status: RequestStatus.Rejected } },
       };
 
       // Does not show an Install button
@@ -521,11 +448,7 @@ describe('Plugin details page', () => {
 
     it('should display a "Create" button as a post installation step for installed data source plugins', async () => {
       const name = 'Akumuli';
-      const { queryByText } = renderPluginDetails({
-        name,
-        isInstalled: true,
-        type: PluginType.datasource,
-      });
+      const { queryByText } = renderPluginDetails({ name, isInstalled: true, type: PluginType.datasource });
 
       await waitFor(() => queryByText('Uninstall'));
       expect(queryByText('Add new data source')).toBeInTheDocument();
@@ -546,11 +469,7 @@ describe('Plugin details page', () => {
 
     it('should not display post installation step for panel plugins', async () => {
       const name = 'Akumuli';
-      const { queryByText } = renderPluginDetails({
-        name,
-        isInstalled: true,
-        type: PluginType.panel,
-      });
+      const { queryByText } = renderPluginDetails({ name, isInstalled: true, type: PluginType.panel });
 
       await waitFor(() => queryByText('Uninstall'));
       expect(queryByText('Add new data source')).toBeNull();
@@ -560,21 +479,9 @@ describe('Plugin details page', () => {
       const name = 'Akumuli';
 
       // @ts-ignore
-      usePluginConfig.mockReturnValue({
-        value: {
-          meta: {
-            enabled: false,
-            pinned: false,
-            jsonData: {},
-          },
-        },
-      });
+      usePluginConfig.mockReturnValue({ value: { meta: { enabled: false, pinned: false, jsonData: {} } } });
 
-      const { queryByText, queryByRole } = renderPluginDetails({
-        name,
-        isInstalled: true,
-        type: PluginType.app,
-      });
+      const { queryByText, queryByRole } = renderPluginDetails({ name, isInstalled: true, type: PluginType.app });
 
       await waitFor(() => queryByText('Uninstall'));
 
@@ -586,21 +493,9 @@ describe('Plugin details page', () => {
       const name = 'Akumuli';
 
       // @ts-ignore
-      usePluginConfig.mockReturnValue({
-        value: {
-          meta: {
-            enabled: true,
-            pinned: false,
-            jsonData: {},
-          },
-        },
-      });
+      usePluginConfig.mockReturnValue({ value: { meta: { enabled: true, pinned: false, jsonData: {} } } });
 
-      const { queryByText, queryByRole } = renderPluginDetails({
-        name,
-        isInstalled: true,
-        type: PluginType.app,
-      });
+      const { queryByText, queryByRole } = renderPluginDetails({ name, isInstalled: true, type: PluginType.app });
 
       await waitFor(() => queryByText('Uninstall'));
 
@@ -616,15 +511,7 @@ describe('Plugin details page', () => {
       api.updatePluginSettings = jest.fn();
 
       // @ts-ignore
-      usePluginConfig.mockReturnValue({
-        value: {
-          meta: {
-            enabled: false,
-            pinned: false,
-            jsonData: {},
-          },
-        },
-      });
+      usePluginConfig.mockReturnValue({ value: { meta: { enabled: false, pinned: false, jsonData: {} } } });
 
       const { queryByText, getByRole, user } = renderPluginDetails({
         id,
@@ -641,11 +528,7 @@ describe('Plugin details page', () => {
 
       // Check if the API request was initiated
       expect(api.updatePluginSettings).toHaveBeenCalledTimes(1);
-      expect(api.updatePluginSettings).toHaveBeenCalledWith(id, {
-        enabled: true,
-        pinned: true,
-        jsonData: {},
-      });
+      expect(api.updatePluginSettings).toHaveBeenCalledWith(id, { enabled: true, pinned: true, jsonData: {} });
     });
 
     it('should be possible to disable an app plugin', async () => {
@@ -656,15 +539,7 @@ describe('Plugin details page', () => {
       api.updatePluginSettings = jest.fn();
 
       // @ts-ignore
-      usePluginConfig.mockReturnValue({
-        value: {
-          meta: {
-            enabled: true,
-            pinned: true,
-            jsonData: {},
-          },
-        },
-      });
+      usePluginConfig.mockReturnValue({ value: { meta: { enabled: true, pinned: true, jsonData: {} } } });
 
       const { queryByText, getByRole, user } = renderPluginDetails({
         id,
@@ -681,11 +556,7 @@ describe('Plugin details page', () => {
 
       // Check if the API request was initiated
       expect(api.updatePluginSettings).toHaveBeenCalledTimes(1);
-      expect(api.updatePluginSettings).toHaveBeenCalledWith(id, {
-        enabled: false,
-        pinned: false,
-        jsonData: {},
-      });
+      expect(api.updatePluginSettings).toHaveBeenCalledWith(id, { enabled: false, pinned: false, jsonData: {} });
     });
 
     it('should not display versions tab for plugins not published to gcom', async () => {
@@ -742,37 +613,25 @@ describe('Plugin details page', () => {
     });
 
     it('shows a "angular warning" if the plugin uses Angular', async () => {
-      const { queryByText } = renderPluginDetails({
-        angularDetected: true,
-      });
+      const { queryByText } = renderPluginDetails({ angularDetected: true });
 
       await waitFor(() => expect(queryByText(/angular plugin/i)).toBeInTheDocument);
     });
 
     it('does not show an "angular warning" if the plugin is not using Angular', async () => {
-      const { queryByText } = renderPluginDetails({
-        angularDetected: false,
-      });
+      const { queryByText } = renderPluginDetails({ angularDetected: false });
 
       await waitFor(() => expect(queryByText(/angular plugin/i)).not.toBeInTheDocument);
     });
 
     it('should display a deprecation warning if the plugin is deprecated', async () => {
-      const { findByRole } = renderPluginDetails({
-        id,
-        isInstalled: true,
-        isDeprecated: true,
-      });
+      const { findByRole } = renderPluginDetails({ id, isInstalled: true, isDeprecated: true });
 
       expect(await findByRole('link', { name: 'deprecated' })).toBeInTheDocument();
     });
 
     it('should not display a deprecation warning in the plugin is not deprecated', async () => {
-      const { queryByRole } = renderPluginDetails({
-        id,
-        isInstalled: true,
-        isDeprecated: false,
-      });
+      const { queryByRole } = renderPluginDetails({ id, isInstalled: true, isDeprecated: false });
 
       await waitFor(() => expect(queryByRole('link', { name: 'deprecated' })).not.toBeInTheDocument());
     });
@@ -783,10 +642,7 @@ describe('Plugin details page', () => {
         id,
         isInstalled: true,
         isDeprecated: true,
-        details: {
-          statusContext,
-          links: [],
-        },
+        details: { statusContext, links: [] },
       });
 
       expect(await findByRole('link', { name: 'deprecated' })).toBeInTheDocument();
@@ -800,10 +656,7 @@ describe('Plugin details page', () => {
         id,
         isInstalled: true,
         isDeprecated: true,
-        details: {
-          statusContext,
-          links: [],
-        },
+        details: { statusContext, links: [] },
       });
 
       expect(await findByRole('link', { name: 'deprecated' })).toBeInTheDocument();
@@ -816,11 +669,7 @@ describe('Plugin details page', () => {
 
   describe('viewed as user without grafana admin permissions', () => {
     beforeAll(() => {
-      mockUserPermissions({
-        isAdmin: false,
-        isDataSourceEditor: false,
-        isOrgAdmin: false,
-      });
+      mockUserPermissions({ isAdmin: false, isDataSourceEditor: false, isOrgAdmin: false });
     });
 
     it("should not display an install button for a plugin that isn't installed", async () => {
@@ -858,20 +707,12 @@ describe('Plugin details page', () => {
 
   describe('viewed as user without data source edit permissions', () => {
     beforeAll(() => {
-      mockUserPermissions({
-        isAdmin: true,
-        isDataSourceEditor: false,
-        isOrgAdmin: true,
-      });
+      mockUserPermissions({ isAdmin: true, isDataSourceEditor: false, isOrgAdmin: true });
     });
 
     it('should not display the data source post installation step', async () => {
       const name = 'Akumuli';
-      const { queryByText } = renderPluginDetails({
-        name,
-        isInstalled: true,
-        type: PluginType.app,
-      });
+      const { queryByText } = renderPluginDetails({ name, isInstalled: true, type: PluginType.app });
 
       await waitFor(() => queryByText('Uninstall'));
       expect(queryByText('Add new data source')).toBeNull();
@@ -880,11 +721,7 @@ describe('Plugin details page', () => {
 
   describe('Display plugin details right panel', () => {
     beforeAll(() => {
-      mockUserPermissions({
-        isAdmin: true,
-        isDataSourceEditor: false,
-        isOrgAdmin: true,
-      });
+      mockUserPermissions({ isAdmin: true, isDataSourceEditor: false, isOrgAdmin: true });
     });
 
     it('should display Latest release date and report a concern information', async () => {
@@ -903,21 +740,6 @@ describe('Plugin details page', () => {
       expect(queryByText('Last updated:')).toBeNull();
     });
 
-    it('should display last commit date information', async () => {
-      const id = 'right-panel-test-plugin';
-      const lastCommitDate = '2023-10-26T16:54:55.000Z';
-      const { queryByText } = renderPluginDetails({ id, details: { lastCommitDate, links: [] } });
-      expect(queryByText('Last commit date:')).toBeVisible();
-      expect(queryByText('Oct 26, 2023')).toBeVisible();
-    });
-
-    it('should not display last commit date if there is no lastCommit data', async () => {
-      const id = 'right-panel-test-plugin';
-      const lastCommitDate = undefined;
-      const { queryByText } = renderPluginDetails({ id, details: { lastCommitDate, links: [] } });
-      expect(queryByText('Last commit date:')).toBeNull();
-    });
-
     it('should not display Report Abuse if the plugin is Core', async () => {
       const id = 'right-panel-test-plugin';
       const isCore = true;
diff --git a/public/app/features/plugins/admin/types.ts b/public/app/features/plugins/admin/types.ts
index eaedf1766ee..3cc66bba0b9 100644
--- a/public/app/features/plugins/admin/types.ts
+++ b/public/app/features/plugins/admin/types.ts
@@ -74,16 +74,12 @@ export interface Screenshots {
 export interface CatalogPluginDetails {
   readme?: string;
   versions?: Version[];
-  links: Array<{
-    name: string;
-    url: string;
-  }>;
+  links: Array<{ name: string; url: string }>;
   grafanaDependency?: string;
   pluginDependencies?: PluginDependencies['plugins'];
   statusContext?: string;
   iam?: IdentityAccessManagement;
   changelog?: string;
-  lastCommitDate?: string;
   licenseUrl?: string;
   documentationUrl?: string;
   sponsorshipUrl?: string;
@@ -95,10 +91,7 @@ export interface CatalogPluginDetails {
 }
 
 export interface CatalogPluginInfo {
-  logos: {
-    large: string;
-    small: string;
-  };
+  logos: { large: string; small: string };
   keywords: string[];
 }
 
@@ -115,13 +108,7 @@ export type RemotePlugin = {
   json?: {
     dependencies: PluginDependencies;
     iam?: IdentityAccessManagement;
-    info: {
-      links: Array<{
-        name: string;
-        url: string;
-      }>;
-      screenshots?: Screenshots[] | null;
-    };
+    info: { links: Array<{ name: string; url: string }>; screenshots?: Screenshots[] | null };
   };
   links: Array<{ rel: string; href: string }>;
   name: string;
@@ -129,12 +116,7 @@ export type RemotePlugin = {
   orgName: string;
   orgSlug: string;
   orgUrl: string;
-  packages: {
-    [arch: string]: {
-      packageName: string;
-      downloadUrl: string;
-    };
-  };
+  packages: { [arch: string]: { packageName: string; downloadUrl: string } };
   popularity: number;
   readme?: string;
   signatureType: PluginSignatureType | '';
@@ -154,7 +136,6 @@ export type RemotePlugin = {
   versionSignedByOrgName: string;
   versionStatus: string;
   angularDetected?: boolean;
-  lastCommitDate?: string;
   licenseUrl?: string;
   documentationUrl?: string;
   sponsorshipUrl?: string;
@@ -184,16 +165,10 @@ export type LocalPlugin = WithAccessControlMetadata & {
     author: Rel;
     description: string;
     links?: Rel[];
-    logos: {
-      small: string;
-      large: string;
-    };
+    logos: { small: string; large: string };
     keywords: string[];
     build: Build;
-    screenshots?: Array<{
-      path: string;
-      name: string;
-    }> | null;
+    screenshots?: Array<{ path: string; name: string }> | null;
     version: string;
     updated: string;
   };
@@ -255,11 +230,7 @@ export interface Org {
   avatarUrl: string;
 }
 
-export type CatalogPluginsState = {
-  loading: boolean;
-  error?: Error;
-  plugins: CatalogPlugin[];
-};
+export type CatalogPluginsState = { loading: boolean; error?: Error; plugins: CatalogPlugin[] };
 
 export enum PluginStatus {
   INSTALL = 'INSTALL',
@@ -300,10 +271,7 @@ export enum RequestStatus {
   Fulfilled = 'Fulfilled',
   Rejected = 'Rejected',
 }
-export type RemotePluginResponse = {
-  plugins: RemotePlugin[];
-  error?: Error;
-};
+export type RemotePluginResponse = { plugins: RemotePlugin[]; error?: Error };
 
 export type RequestInfo = {
   status: RequestStatus;
@@ -350,11 +318,6 @@ export type PluginVersion = {
   angularDetected?: boolean;
 };
 
-export type InstancePlugin = {
-  pluginSlug: string;
-  version: string;
-};
+export type InstancePlugin = { pluginSlug: string; version: string };
 
-export type ProvisionedPlugin = {
-  slug: string;
-};
+export type ProvisionedPlugin = { slug: string };
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index a1d5bb3caac..5d551355482 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -10862,7 +10862,6 @@
         "downloads": "Downloads",
         "from": "From",
         "installedVersion": "Installed Version",
-        "lastCommitDate": "Last commit date:",
         "latestReleaseDate": "Latest release date:",
         "latestVersion": "Latest Version",
         "license": "License",

From 28030ce0002bba9696eb2f033f790934710432bc Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Wed, 13 Aug 2025 11:43:22 +0200
Subject: [PATCH 125/243] Dashboard: Add experimental reloadOnParamsChange
 annotation support in v1beta1 API client (#109461)

Warning: This is heavily experimental feature and WILL BE REMOVED in a few months.
---
 public/app/features/apiserver/types.ts       |  9 ++++++++-
 public/app/features/dashboard/api/v1.test.ts | 13 ++++++++++++-
 public/app/features/dashboard/api/v1.ts      |  7 +++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/public/app/features/apiserver/types.ts b/public/app/features/apiserver/types.ts
index 58df8592274..4ab780003ab 100644
--- a/public/app/features/apiserver/types.ts
+++ b/public/app/features/apiserver/types.ts
@@ -67,12 +67,15 @@ export const AnnoKeyDashboardIsSnapshot = 'grafana.app/dashboard-is-snapshot';
 export const AnnoKeyDashboardSnapshotOriginalUrl = 'grafana.app/dashboard-snapshot-original-url';
 /** @deprecated NOT A REAL annotation -- this is just a shim */
 export const AnnoKeyDashboardGnetId = 'grafana.app/dashboard-gnet-id';
-
 /** @deprecated NOT A REAL annotation -- this is just a shim */
 export const AnnoKeyFolderTitle = 'grafana.app/folderTitle';
 /** @deprecated NOT A REAL annotation -- this is just a shim */
 export const AnnoKeyFolderUrl = 'grafana.app/folderUrl';
 
+/** @experimental only provided by proxies for setup with reloadDashboardsOnParamsChange toggle on */
+/** Not intended to be used in production, we will be removing this in short-term future */
+export const AnnoReloadOnParamsChange = 'grafana.app/reloadOnParamsChange';
+
 // labels
 export const DeprecatedInternalId = 'grafana.app/deprecatedInternalID';
 
@@ -89,6 +92,10 @@ type GrafanaAnnotations = {
   [AnnoKeySourcePath]?: string;
   [AnnoKeySourceChecksum]?: string;
   [AnnoKeySourceTimestamp]?: string;
+
+  /** @experimental only provided by proxies for setup with reloadDashboardsOnParamsChange toggle on */
+  /** Not intended to be used in production, we will be removing this in short-term future */
+  [AnnoReloadOnParamsChange]?: boolean;
 };
 
 // Annotations provided by the front-end client
diff --git a/public/app/features/dashboard/api/v1.test.ts b/public/app/features/dashboard/api/v1.test.ts
index c92d083c2fc..f39538a0df4 100644
--- a/public/app/features/dashboard/api/v1.test.ts
+++ b/public/app/features/dashboard/api/v1.test.ts
@@ -1,6 +1,6 @@
 import { GrafanaConfig, locationUtil } from '@grafana/data';
 import { backendSrv } from 'app/core/services/backend_srv';
-import { AnnoKeyFolder } from 'app/features/apiserver/types';
+import { AnnoKeyFolder, AnnoReloadOnParamsChange } from 'app/features/apiserver/types';
 import { DashboardDataDTO } from 'app/types/dashboard';
 
 import { DashboardWithAccessInfo } from './types';
@@ -201,6 +201,17 @@ describe('v1 dashboard API', () => {
     expect(dashboardDTO.meta.folderId).toBeUndefined();
   });
 
+  it('should set reloadOnParamsChange to true if AnnoReloadOnParamsChange is present', async () => {
+    mockGet.mockResolvedValueOnce({
+      ...mockDashboardDto,
+      metadata: { ...mockDashboardDto.metadata, annotations: { [AnnoReloadOnParamsChange]: true } },
+    });
+
+    const api = new K8sDashboardAPI();
+    const result = await api.getDashboardDTO('test');
+    expect(result.meta.reloadOnParamsChange).toBe(true);
+  });
+
   describe('saveDashboard', () => {
     beforeEach(() => {
       locationUtil.initialize({
diff --git a/public/app/features/dashboard/api/v1.ts b/public/app/features/dashboard/api/v1.ts
index d0d61ed3188..62f069c015d 100644
--- a/public/app/features/dashboard/api/v1.ts
+++ b/public/app/features/dashboard/api/v1.ts
@@ -18,6 +18,7 @@ import {
   AnnoKeySourcePath,
   AnnoKeyManagerAllowsEdits,
   ManagerKind,
+  AnnoReloadOnParamsChange,
 } from 'app/features/apiserver/types';
 import { getDashboardUrl } from 'app/features/dashboard-scene/utils/getDashboardUrl';
 import { DeleteDashboardResponse } from 'app/features/manage-dashboards/types';
@@ -141,6 +142,12 @@ export class K8sDashboardAPI implements DashboardAPI<DashboardDTO, Dashboard> {
         },
       };
 
+      /** @experimental only provided by proxies for setup with reloadDashboardsOnParamsChange toggle on */
+      /** Not intended to be used in production, we will be removing this in short-term future */
+      if (dash.metadata.annotations?.[AnnoReloadOnParamsChange]) {
+        result.meta.reloadOnParamsChange = true;
+      }
+
       const annotations = dash.metadata.annotations ?? {};
       const managerKind = annotations[AnnoKeyManagerKind];
 

From 2887099c74cc02b95fa794df002972bbe80a30ca Mon Sep 17 00:00:00 2001
From: "alerting-team[bot]"
 <158350966+alerting-team[bot]@users.noreply.github.com>
Date: Wed, 13 Aug 2025 10:32:15 +0000
Subject: [PATCH 126/243] Alerting: Update alerting module to
 a38b2187d4e1bec5f7c3a8fc885a3117b64b4bd0 (#109580)

[create-pull-request] automated change

Co-authored-by: alexander-akhmetov <1875873+alexander-akhmetov@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index ddf89b0be38..bac8f15dacd 100644
--- a/go.mod
+++ b/go.mod
@@ -85,7 +85,7 @@ require (
 	github.com/googleapis/gax-go/v2 v2.14.2 // @grafana/grafana-backend-group
 	github.com/gorilla/mux v1.8.1 // @grafana/grafana-backend-group
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // @grafana/grafana-app-platform-squad
-	github.com/grafana/alerting v0.0.0-20250808160954-dae4478cb0dc // @grafana/alerting-backend
+	github.com/grafana/alerting v0.0.0-20250812203446-a38b2187d4e1 // @grafana/alerting-backend
 	github.com/grafana/authlib v0.0.0-20250710201142-9542f2f28d43 // @grafana/identity-access-team
 	github.com/grafana/authlib/types v0.0.0-20250710201142-9542f2f28d43 // @grafana/identity-access-team
 	github.com/grafana/dataplane/examples v0.0.1 // @grafana/observability-metrics
diff --git a/go.sum b/go.sum
index 4e04d349097..2d2c164f510 100644
--- a/go.sum
+++ b/go.sum
@@ -1580,8 +1580,8 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20250808160954-dae4478cb0dc h1:y2p0VGthW0XeJ4g1q0x1rsz5Vx+m9WIFgf6vcuIGFDY=
-github.com/grafana/alerting v0.0.0-20250808160954-dae4478cb0dc/go.mod h1:VKxaR93Gff0ZlO2sPcdPVob1a/UzArFEW5zx3Bpyhls=
+github.com/grafana/alerting v0.0.0-20250812203446-a38b2187d4e1 h1:nn19bwMFBGWOvUTxZsdewOfRiXERhKHp0jEira8uQA8=
+github.com/grafana/alerting v0.0.0-20250812203446-a38b2187d4e1/go.mod h1:VKxaR93Gff0ZlO2sPcdPVob1a/UzArFEW5zx3Bpyhls=
 github.com/grafana/authlib v0.0.0-20250710201142-9542f2f28d43 h1:vVPT0i5Y1vI6qzecYStV2yk7cHKrC3Pc7AgvwT5KydQ=
 github.com/grafana/authlib v0.0.0-20250710201142-9542f2f28d43/go.mod h1:1fWkOiL+m32NBgRHZtlZGz2ji868tPZACYbqP3nBRJI=
 github.com/grafana/authlib/types v0.0.0-20250710201142-9542f2f28d43 h1:NlkGMnVi/oUn6Cr90QbJYpQJ4FnjyAIG9Ex5GtTZIzw=

From 94f7602786c859daa9e78d30d01217e61b11718f Mon Sep 17 00:00:00 2001
From: Matheus Macabu <macabu@users.noreply.github.com>
Date: Wed, 13 Aug 2025 13:27:37 +0200
Subject: [PATCH 127/243] App Installer: Revert #109267 and skip ShortURL
 integration tests (#109591)

* Revert "App Installer: Merge builder and installer admission (#109267)"

This reverts commit c662b880fdb2486bb267aa1e2faa951a6a0f37d7.

* ShortURL: Skip integration tests temporarily
---
 .../apiserver/appinstaller/installer.go       | 37 ++++++++-----------
 pkg/services/apiserver/service.go             | 13 +++----
 pkg/tests/apis/shorturl/shorturl_test.go      |  2 +
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/pkg/services/apiserver/appinstaller/installer.go b/pkg/services/apiserver/appinstaller/installer.go
index 5a0360111e5..9817f7513bc 100644
--- a/pkg/services/apiserver/appinstaller/installer.go
+++ b/pkg/services/apiserver/appinstaller/installer.go
@@ -11,7 +11,6 @@ import (
 	"github.com/grafana/grafana/pkg/storage/legacysql/dualwrite"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apiserver/pkg/admission"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/apiserver/pkg/registry/generic"
 	genericapiserver "k8s.io/apiserver/pkg/server"
@@ -59,31 +58,27 @@ func AddToScheme(
 	return additionalGroupVersions, nil
 }
 
-// RegisterAdmission combines the existing admission control from builders.
-func RegisterAdmission(
-	existingAdmission admission.Interface,
+// RegisterAdmissionPlugins registers admission plugins for app installers
+func RegisterAdmissionPlugins(
+	ctx context.Context,
 	appInstallers []appsdkapiserver.AppInstaller,
-) (admission.Interface, error) {
-	controllers := []admission.Interface{}
+	options *grafanaapiserveroptions.Options,
+) error {
+	logger := logging.FromContext(ctx)
 
 	for _, installer := range appInstallers {
-		factory := installer.AdmissionPlugin()
-		if factory == nil {
-			continue
+		plugin := installer.AdmissionPlugin()
+		if plugin != nil {
+			md := installer.ManifestData()
+			if md == nil {
+				return fmt.Errorf("manifest is not initialized for installer for GroupVersions %v", installer.GroupVersions())
+			}
+			pluginName := md.AppName + " admission"
+			options.RecommendedOptions.Admission.Plugins.Register(pluginName, plugin)
+			logger.Info("Registered admission plugin", "app", md.AppName)
 		}
-
-		admissionInterface, err := factory(nil)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create admission plugin: %w", err)
-		}
-		controllers = append(controllers, admissionInterface)
 	}
-
-	if existingAdmission != nil {
-		controllers = append(controllers, existingAdmission)
-	}
-
-	return admission.NewChainHandler(controllers...), nil
+	return nil
 }
 
 type AuthorizerRegistrar interface {
diff --git a/pkg/services/apiserver/service.go b/pkg/services/apiserver/service.go
index 755e3b3f17f..31777f82a65 100644
--- a/pkg/services/apiserver/service.go
+++ b/pkg/services/apiserver/service.go
@@ -291,6 +291,11 @@ func (s *service) start(ctx context.Context) error {
 
 	o := grafanaapiserveroptions.NewOptions(s.codecs.LegacyCodec(groupVersions...))
 
+	// Register admission plugins from app installers after options are created
+	if err := appinstaller.RegisterAdmissionPlugins(ctx, s.appInstallers, o); err != nil {
+		return err
+	}
+
 	// Register authorizers from app installers
 	appinstaller.RegisterAuthorizers(ctx, s.appInstallers, s.authorizer)
 
@@ -362,14 +367,6 @@ func (s *service) start(ctx context.Context) error {
 		return err
 	}
 
-	serverConfig.AdmissionControl, err = appinstaller.RegisterAdmission(
-		serverConfig.AdmissionControl,
-		s.appInstallers,
-	)
-	if err != nil {
-		return err
-	}
-
 	notFoundHandler := notfoundhandler.New(s.codecs, genericapifilters.NoMuxAndDiscoveryIncompleteKey)
 
 	if err := appinstaller.RegisterPostStartHooks(s.appInstallers, serverConfig); err != nil {
diff --git a/pkg/tests/apis/shorturl/shorturl_test.go b/pkg/tests/apis/shorturl/shorturl_test.go
index e5d328f9e6b..ba80e5cf1b6 100644
--- a/pkg/tests/apis/shorturl/shorturl_test.go
+++ b/pkg/tests/apis/shorturl/shorturl_test.go
@@ -36,6 +36,8 @@ var gvr = schema.GroupVersionResource{
 var RESOURCEGROUP = gvr.GroupResource().String()
 
 func TestIntegrationShortURL(t *testing.T) {
+	t.Skip("Skipping due to issue with https://github.com/grafana/grafana/pull/109267")
+
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}

From 48edf1808e70899529656487d5a34713c33b6bb1 Mon Sep 17 00:00:00 2001
From: Alexa Vargas <239999+axelavargas@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:46:45 +0200
Subject: [PATCH 128/243] Query Library: Edit Query Library in explore using
 `queryLibraryRef` (#108863)

* add suport for queryLibraryRef in explore

* add feature flag check on badge

* add test for migrator

* Add QueryEditor.test and useStateSync test

* implement onCancelEditingQuery library

* run i18n extract

* push mod changes

* Revert "push mod changes"

This reverts commit 29c410f126817831c0676f0e0064035942148a71.

* remove queryRef from the URL

* remove queryRef from url in explore page, keep redux logic

* restore tests and remove old queryRef from URL behaviour

* clean up test

* remove unnecessary useCallback from onCancelQueryLibraryEdit

* apply PR suggestions about naming of functions

* rename queryRef to queryLibraryRef

* update missing files with the new queryLibraryRef

* fix i18n check

* Disabled add query buttons when queryLibraryRef is present

* Add unit test to components

* add missing queryLibraryRef after merge

* add placeholder for highlighted code

* clear up queryLibraryRef after sucess update

* add monitoring

* remove unnecessary change

* remove placeholder and integrate highlightQuery

* change "Editing From Query Library" to "Update query from library"

* update tootlip text

* fix interaction importing issue

* updating i18n for query library editing badge

* update copy on saving actions

* keep copy short

---------

Co-authored-by: Juan Cabanas <juan.cabanas@grafana.com>
---
 public/app/core/utils/explore.ts              |   6 +-
 public/app/features/explore/Explore.test.tsx  |  55 +++++++++
 public/app/features/explore/Explore.tsx       |   5 +-
 .../QueryLibrary/QueryLibraryContext.tsx      |   7 +-
 public/app/features/explore/QueryRows.tsx     |  35 +++++-
 .../explore/SecondaryActions.test.tsx         |  17 +++
 .../app/features/explore/SecondaryActions.tsx |   1 +
 .../explore/hooks/useStateSync/index.test.tsx |  31 +++++
 .../app/features/explore/state/explorePane.ts |  21 +++-
 .../query/components/QueryEditorRow.test.tsx  |  48 +++++++-
 .../query/components/QueryEditorRow.tsx       | 116 +++++++++++++++---
 .../query/components/QueryEditorRows.tsx      |   6 +
 public/app/types/explore.ts                   |   5 +
 public/locales/en-US/grafana.json             |   7 +-
 14 files changed, 327 insertions(+), 33 deletions(-)

diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts
index cb22e191a77..f2d7fcedfc1 100644
--- a/public/app/core/utils/explore.ts
+++ b/public/app/core/utils/explore.ts
@@ -93,7 +93,11 @@ export async function getExploreUrl(args: GetExploreUrlArguments): Promise<strin
     .map((q) => q.value);
 
   const exploreState = JSON.stringify({
-    [generateExploreId()]: { range: toURLRange(timeRange.raw), queries: interpolatedQueries, datasource: dsRef?.uid },
+    [generateExploreId()]: {
+      range: toURLRange(timeRange.raw),
+      queries: interpolatedQueries,
+      datasource: dsRef?.uid,
+    },
   });
   return locationUtil.assureBaseUrl(urlUtil.renderUrl('/explore', { panes: exploreState, schemaVersion: 1 }));
 }
diff --git a/public/app/features/explore/Explore.test.tsx b/public/app/features/explore/Explore.test.tsx
index cb47295d59d..3c0936eb7f5 100644
--- a/public/app/features/explore/Explore.test.tsx
+++ b/public/app/features/explore/Explore.test.tsx
@@ -17,6 +17,7 @@ import { configureStore } from 'app/store/configureStore';
 
 import { ContentOutlineContextProvider } from './ContentOutline/ContentOutlineContext';
 import { Explore, Props } from './Explore';
+import { QueryLibraryContextProviderMock } from './QueryLibrary/mocks';
 import { initialExploreState } from './state/main';
 import { scanStopAction } from './state/query';
 import { createEmptyQueryResponse, makeExplorePaneState } from './state/utils';
@@ -110,6 +111,7 @@ const dummyProps: Props = {
   changeDatasource: jest.fn(),
   compact: false,
   changeCompactMode: jest.fn(),
+  queryLibraryRef: undefined,
 };
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
@@ -240,4 +242,57 @@ describe('Explore', () => {
       getBoolMock.mockRestore();
     });
   });
+
+  describe('Query Library Integration', () => {
+    it('should enable add query buttons when queryLibraryRef is undefined', async () => {
+      setup({ queryLibraryRef: undefined });
+
+      // Wait for the Explore component to render
+      await screen.findByTestId(selectors.components.DataSourcePicker.container);
+
+      const addQueryButton = screen.getByRole('button', { name: /Add query$/i });
+      expect(addQueryButton).toBeEnabled();
+    });
+
+    it('should disable add query buttons when queryLibraryRef is set (editing from library)', async () => {
+      setup({ queryLibraryRef: 'library-query-123' });
+
+      // Wait for the Explore component to render
+      await screen.findByTestId(selectors.components.DataSourcePicker.container);
+
+      const addQueryButton = screen.getByRole('button', { name: /Add query$/i });
+      expect(addQueryButton).toBeDisabled();
+    });
+
+    it('should disable both add query and add from library buttons when editing from library', async () => {
+      const store = configureStore({
+        explore: {
+          ...initialExploreState,
+          panes: {
+            left: makeExplorePaneState(),
+          },
+        },
+      });
+      const exploreProps = { ...dummyProps, queryLibraryRef: 'library-query-123' };
+
+      render(
+        <TestProvider store={store}>
+          <QueryLibraryContextProviderMock queryLibraryEnabled={true}>
+            <ContentOutlineContextProvider>
+              <Explore {...exploreProps} />
+            </ContentOutlineContextProvider>
+          </QueryLibraryContextProviderMock>
+        </TestProvider>
+      );
+
+      // Wait for the Explore component to render
+      await screen.findByTestId(selectors.components.DataSourcePicker.container);
+
+      const addQueryButton = screen.getByRole('button', { name: /Add query$/i });
+      const addFromLibraryButton = screen.getByRole('button', { name: /Add query from library/i });
+
+      expect(addQueryButton).toBeDisabled();
+      expect(addFromLibraryButton).toBeDisabled();
+    });
+  });
 });
diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index a88d594c6d1..9261043a36f 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -580,6 +580,7 @@ export class Explore extends PureComponent<Props, ExploreState> {
       setShowQueryInspector,
       splitted,
       compact,
+      queryLibraryRef,
     } = this.props;
     const { contentOutlineVisible } = this.state;
     const styles = getStyles(theme);
@@ -654,7 +655,7 @@ export class Explore extends PureComponent<Props, ExploreState> {
                         <SecondaryActions
                           // do not allow people to add queries with potentially different datasources in correlations editor mode
                           addQueryRowButtonDisabled={
-                            isLive || (isCorrelationsEditorMode && datasourceInstance.meta.mixed)
+                            isLive || (isCorrelationsEditorMode && datasourceInstance.meta.mixed) || !!queryLibraryRef
                           }
                           // We cannot show multiple traces at the same time right now so we do not show add query button.
                           //TODO:unification
@@ -766,6 +767,7 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) {
     supplementaryQueries,
     correlationEditorHelperData,
     compact,
+    queryLibraryRef,
   } = item;
 
   const loading = selectIsWaitingForData(exploreId)(state);
@@ -799,6 +801,7 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) {
     correlationEditorHelperData,
     correlationEditorDetails: explore.correlationEditorDetails,
     exploreActiveDS: selectExploreDSMaps(state),
+    queryLibraryRef,
   };
 }
 
diff --git a/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx b/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx
index eeb7c3d9b1d..411575cb961 100644
--- a/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx
+++ b/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx
@@ -51,7 +51,12 @@ export type QueryLibraryContextType = {
    * Returns a predefined small button that can be used to save a query to the library.
    * @param query
    */
-  renderSaveQueryButton: (query: DataQuery, app?: CoreApp) => ReactNode;
+  renderSaveQueryButton: (
+    query: DataQuery,
+    app?: CoreApp,
+    queryLibraryRef?: string,
+    onUpdateSuccess?: () => void
+  ) => ReactNode;
   queryLibraryEnabled: boolean;
   context: string;
 };
diff --git a/public/app/features/explore/QueryRows.tsx b/public/app/features/explore/QueryRows.tsx
index 7e74a736f8b..80e068924cb 100644
--- a/public/app/features/explore/QueryRows.tsx
+++ b/public/app/features/explore/QueryRows.tsx
@@ -11,7 +11,9 @@ import { getDatasourceSrv } from '../plugins/datasource_srv';
 import { QueryEditorRows } from '../query/components/QueryEditorRows';
 
 import { ContentOutlineItem } from './ContentOutline/ContentOutlineItem';
+import { useQueryLibraryContext } from './QueryLibrary/QueryLibraryContext';
 import { changeDatasource } from './state/datasource';
+import { updateQueryLibraryRefAction } from './state/explorePane';
 import { changeQueries, runQueries } from './state/query';
 import { getExploreItemSelector } from './state/selectors';
 
@@ -32,21 +34,28 @@ const makeSelectors = (exploreId: string) => {
       exploreItemSelector,
       (s: ExploreItemState | undefined) => getDatasourceSrv().getInstanceSettings(s!.datasourceInstance?.uid)!
     ),
+    getQueryLibraryRef: createSelector(exploreItemSelector, (s) => s!.queryLibraryRef),
   };
 };
 
 export const QueryRows = ({ exploreId, isOpen, changeCompactMode }: Props) => {
   const dispatch = useDispatch();
-  const { getQueries, getDatasourceInstanceSettings, getQueryResponse, getHistory, getEventBridge } = useMemo(
-    () => makeSelectors(exploreId),
-    [exploreId]
-  );
+  const { openDrawer } = useQueryLibraryContext();
+  const {
+    getQueries,
+    getDatasourceInstanceSettings,
+    getQueryResponse,
+    getHistory,
+    getEventBridge,
+    getQueryLibraryRef,
+  } = useMemo(() => makeSelectors(exploreId), [exploreId]);
 
   const queries = useSelector(getQueries);
   const dsSettings = useSelector(getDatasourceInstanceSettings);
   const queryResponse = useSelector(getQueryResponse);
   const history = useSelector(getHistory);
   const eventBridge = useSelector(getEventBridge);
+  const queryLibraryRef = useSelector(getQueryLibraryRef);
 
   const onRunQueries = useCallback(() => {
     dispatch(runQueries({ exploreId }));
@@ -89,6 +98,22 @@ export const QueryRows = ({ exploreId, isOpen, changeCompactMode }: Props) => {
     reportInteraction('grafana_query_row_toggle', queryStatus === undefined ? {} : { queryEnabled: queryStatus });
   };
 
+  const onCancelQueryLibraryEdit = () => {
+    // Store the current queryLibraryRef before clearing it
+    const originalQueryRef = queryLibraryRef;
+
+    // Clear the queryLibraryRef to exit editing mode
+    dispatch(updateQueryLibraryRefAction({ exploreId, queryLibraryRef: undefined }));
+
+    // Open drawer with the original query highlighted
+    if (originalQueryRef) {
+      openDrawer([], () => {}, {
+        context: 'explore',
+        highlightQuery: originalQueryRef,
+      });
+    }
+  };
+
   const onQueryOpenChanged = () => {
     // Disables compact mode when query is opened.
     // Compact mode can also be disabled by opening Content Outline.
@@ -112,6 +137,8 @@ export const QueryRows = ({ exploreId, isOpen, changeCompactMode }: Props) => {
       app={CoreApp.Explore}
       history={history}
       eventBus={eventBridge}
+      queryLibraryRef={queryLibraryRef}
+      onCancelQueryLibraryEdit={onCancelQueryLibraryEdit}
       isOpen={isOpen}
       queryRowWrapper={(children, refId) => (
         <ContentOutlineItem
diff --git a/public/app/features/explore/SecondaryActions.test.tsx b/public/app/features/explore/SecondaryActions.test.tsx
index 6ca91429881..37ee5006393 100644
--- a/public/app/features/explore/SecondaryActions.test.tsx
+++ b/public/app/features/explore/SecondaryActions.test.tsx
@@ -64,6 +64,23 @@ describe('SecondaryActions', () => {
     expect(screen.getByRole('button', { name: /Query inspector/i })).toBeInTheDocument();
   });
 
+  it('should disable both add query buttons when addQueryRowButtonDisabled=true and query library is enabled', () => {
+    render(
+      <QueryLibraryContextProviderMock queryLibraryEnabled={true}>
+        <SecondaryActions
+          addQueryRowButtonDisabled={true}
+          onClickAddQueryRowButton={noop}
+          onClickQueryInspectorButton={noop}
+          onSelectQueryFromLibrary={noop}
+        />
+      </QueryLibraryContextProviderMock>
+    );
+
+    expect(screen.getByRole('button', { name: /Add query$/i })).toBeDisabled();
+    expect(screen.getByRole('button', { name: /Add query from library/i })).toBeDisabled();
+    expect(screen.getByRole('button', { name: /Query inspector/i })).toBeInTheDocument();
+  });
+
   it('should map click handlers correctly', async () => {
     const user = userEvent.setup();
 
diff --git a/public/app/features/explore/SecondaryActions.tsx b/public/app/features/explore/SecondaryActions.tsx
index b5b30aaae1d..a54daf81694 100644
--- a/public/app/features/explore/SecondaryActions.tsx
+++ b/public/app/features/explore/SecondaryActions.tsx
@@ -82,6 +82,7 @@ export function SecondaryActions({
                 })
               }
               icon="plus"
+              disabled={addQueryRowButtonDisabled}
             >
               <Trans i18nKey="explore.secondary-actions.add-from-query-library">Add query from library</Trans>
             </ToolbarButton>
diff --git a/public/app/features/explore/hooks/useStateSync/index.test.tsx b/public/app/features/explore/hooks/useStateSync/index.test.tsx
index 841a220d03e..1cceaf833bb 100644
--- a/public/app/features/explore/hooks/useStateSync/index.test.tsx
+++ b/public/app/features/explore/hooks/useStateSync/index.test.tsx
@@ -12,6 +12,7 @@ import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSou
 import { configureStore } from 'app/store/configureStore';
 
 import { makeDatasourceSetup } from '../../spec/helper/setup';
+import { updateQueryLibraryRefAction } from '../../state/explorePane';
 import { splitClose, splitOpen } from '../../state/main';
 
 import { useStateSync } from './';
@@ -584,4 +585,34 @@ describe('useStateSync', () => {
       expect(store.getState().explore.panes['one']?.queries[0]).toMatchObject({ expr: 'b', refId: 'B' });
     });
   });
+
+  it('should keep queryLibraryRef in state but not in URL', async () => {
+    const { store, location } = setup({
+      queryParams: {
+        panes: JSON.stringify({
+          one: {
+            datasource: 'loki-uid',
+            queries: [{ expr: 'test', refId: 'A' }],
+          },
+        }),
+        schemaVersion: 1,
+      },
+    });
+
+    await waitFor(() => {
+      expect(store.getState().explore.panes['one']).toBeDefined();
+    });
+
+    act(() => {
+      store.dispatch(updateQueryLibraryRefAction({ exploreId: 'one', queryLibraryRef: 'library-query-456' }));
+    });
+
+    await waitFor(() => {
+      expect(store.getState().explore.panes['one']?.queryLibraryRef).toBe('library-query-456');
+
+      const search = location.getSearchObject();
+      const panes = search.panes && typeof search.panes === 'string' ? JSON.parse(search.panes) : {};
+      expect(panes.one?.queryLibraryRef).toBeUndefined();
+    });
+  });
 });
diff --git a/public/app/features/explore/state/explorePane.ts b/public/app/features/explore/state/explorePane.ts
index 8cc977a6717..025619cede6 100644
--- a/public/app/features/explore/state/explorePane.ts
+++ b/public/app/features/explore/state/explorePane.ts
@@ -97,6 +97,13 @@ export const changeCorrelationHelperData = createAction<ChangeCorrelationHelperD
   'explore/changeCorrelationHelperData'
 );
 
+export interface UpdateQueryLibraryRefPayload {
+  exploreId: string;
+  queryLibraryRef?: string;
+}
+
+export const updateQueryLibraryRefAction = createAction<UpdateQueryLibraryRefPayload>('explore/updateQueryLibraryRef');
+
 /**
  * Initialize Explore state with state from the URL and the React component.
  * Call this only on components for with the Explore state has not been initialized.
@@ -109,6 +116,7 @@ interface InitializeExplorePayload {
   datasourceInstance?: DataSourceApi;
   compact: boolean;
   eventBridge: EventBusExtended;
+  queryLibraryRef?: string;
 }
 
 const initializeExploreAction = createAction<InitializeExplorePayload>('explore/initializeExploreAction');
@@ -147,6 +155,7 @@ export interface InitializeExploreOptions {
   correlationHelperData?: ExploreCorrelationHelperData;
   position?: number;
   eventBridge: EventBusExtended;
+  queryLibraryRef?: string;
   compact: boolean;
 }
 
@@ -170,6 +179,7 @@ export const initializeExplore = createAsyncThunk(
       compact,
       correlationHelperData,
       eventBridge,
+      queryLibraryRef,
     }: InitializeExploreOptions,
     { dispatch, getState, fulfillWithValue }
   ) => {
@@ -192,6 +202,7 @@ export const initializeExplore = createAsyncThunk(
         history,
         compact,
         eventBridge,
+        queryLibraryRef,
       })
     );
     if (panelsState !== undefined) {
@@ -262,8 +273,15 @@ export const paneReducer = (state: ExploreItemState = makeExplorePaneState(), ac
     };
   }
 
+  if (updateQueryLibraryRefAction.match(action)) {
+    return {
+      ...state,
+      queryLibraryRef: action.payload.queryLibraryRef,
+    };
+  }
+
   if (initializeExploreAction.match(action)) {
-    const { queries, range, datasourceInstance, history, eventBridge, compact } = action.payload;
+    const { queries, range, datasourceInstance, history, eventBridge, compact, queryLibraryRef } = action.payload;
 
     return {
       ...state,
@@ -277,6 +295,7 @@ export const paneReducer = (state: ExploreItemState = makeExplorePaneState(), ac
       queryResponse: createEmptyQueryResponse(),
       cache: [],
       correlations: [],
+      queryLibraryRef,
       compact,
     };
   }
diff --git a/public/app/features/query/components/QueryEditorRow.test.tsx b/public/app/features/query/components/QueryEditorRow.test.tsx
index 3a9d33542f1..8cc33cd4529 100644
--- a/public/app/features/query/components/QueryEditorRow.test.tsx
+++ b/public/app/features/query/components/QueryEditorRow.test.tsx
@@ -5,15 +5,28 @@ import { DataQueryRequest, dateTime, LoadingState, PanelData, toDataFrame } from
 import { DataQuery } from '@grafana/schema';
 import { mockDataSource } from 'app/features/alerting/unified/mocks';
 
-import { DataSourceType } from '../../alerting/unified/utils/datasource';
-
-import { filterPanelDataToQuery, Props, QueryEditorRow } from './QueryEditorRow';
+import { filterPanelDataToQuery, Props, QueryEditorRow, QueryLibraryEditingBadge } from './QueryEditorRow';
 
 const mockDS = mockDataSource({
   name: 'test',
-  type: DataSourceType.Alertmanager,
+  type: 'testdata',
 });
 
+// Mock the QueryLibraryContext
+const mockQueryLibraryContext = {
+  queryLibraryEnabled: true,
+};
+
+jest.mock('app/features/explore/QueryLibrary/QueryLibraryContext', () => ({
+  useQueryLibraryContext: () => mockQueryLibraryContext,
+}));
+
+// Mock the internationalization function
+jest.mock('@grafana/i18n', () => ({
+  ...jest.requireActual('@grafana/i18n'),
+  t: (key: string, defaultValue: string) => defaultValue,
+}));
+
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getDataSourceSrv: () => ({
@@ -392,3 +405,30 @@ describe('QueryEditorRow', () => {
     });
   });
 });
+
+describe('QueryLibraryBadge', () => {
+  beforeEach(() => {
+    mockQueryLibraryContext.queryLibraryEnabled = true;
+  });
+
+  it('should display badge when queryLibraryEnabled is true and queryLibraryRef is provided', () => {
+    render(<QueryLibraryEditingBadge queryLibraryRef="library-query-123" />);
+    expect(screen.getByText('Updating query from library')).toBeInTheDocument();
+  });
+
+  it('should not display badge when queryLibraryEnabled is false', () => {
+    mockQueryLibraryContext.queryLibraryEnabled = false;
+    render(<QueryLibraryEditingBadge queryLibraryRef="library-query-123" />);
+    expect(screen.queryByText('Updating query from library')).not.toBeInTheDocument();
+  });
+
+  it('should not display badge when queryLibraryRef is not provided', () => {
+    render(<QueryLibraryEditingBadge />);
+    expect(screen.queryByText('Updating query from library')).not.toBeInTheDocument();
+  });
+
+  it('should not display badge when queryLibraryRef is empty string', () => {
+    render(<QueryLibraryEditingBadge queryLibraryRef="" />);
+    expect(screen.queryByText('Updating query from library')).not.toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx
index 4a2e1511ae2..65631c9b568 100644
--- a/public/app/features/query/components/QueryEditorRow.tsx
+++ b/public/app/features/query/components/QueryEditorRow.tsx
@@ -22,7 +22,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
 import { getDataSourceSrv, renderLimitedComponents, reportInteraction, usePluginComponents } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
-import { Badge, ErrorBoundaryAlert, List } from '@grafana/ui';
+import { Badge, Divider, ErrorBoundaryAlert, List } from '@grafana/ui';
 import { OperationRowHelp } from 'app/core/components/QueryOperationRow/OperationRowHelp';
 import {
   QueryOperationAction,
@@ -68,6 +68,8 @@ export interface Props<TQuery extends DataQuery> {
   onQueryReplacedFromLibrary?: () => void;
   collapsable?: boolean;
   hideRefId?: boolean;
+  queryLibraryRef?: string;
+  onCancelQueryLibraryEdit?: () => void;
   isOpen?: boolean;
 }
 
@@ -233,6 +235,19 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
     }
   };
 
+  onCancelQueryLibraryEdit = () => {
+    const { query } = this.props;
+    reportInteraction('query_library-update_query_from_explore_cancelled', {
+      datasourceType: query.datasource?.type,
+    });
+    this.props.onCancelQueryLibraryEdit?.();
+  };
+
+  onExitQueryLibraryEditingMode = () => {
+    // Exit query library editing mode after successful update
+    this.props.onCancelQueryLibraryEdit?.();
+  };
+
   onCopyQuery = () => {
     const { query, onAddQuery, onQueryCopied } = this.props;
     const copy = cloneDeep(query);
@@ -326,6 +341,11 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
     );
   };
 
+  renderQueryLibraryEditingBadge = () => {
+    const { queryLibraryRef } = this.props;
+    return <QueryLibraryEditingBadge key="query-library-editing-badge" queryLibraryRef={queryLibraryRef} />;
+  };
+
   renderExtraActions = () => {
     const { query, queries, data, onAddQuery, dataSource, app } = this.props;
 
@@ -363,24 +383,46 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
       hideHideQueryButton: hideHideQueryButton = false,
       onReplace,
       onQueryReplacedFromLibrary,
+      queryLibraryRef,
     } = this.props;
     const { datasource, showingHelp } = this.state;
     const isHidden = !!query.hide;
 
     const hasEditorHelp = datasource?.components?.QueryEditorHelp;
+    const isEditingQueryLibrary = queryLibraryRef !== undefined;
 
     return (
       <>
-        <MaybeQueryLibrarySaveButton query={query} app={this.props.app} />
-        <ReplaceQueryFromLibrary
-          datasourceFilters={datasource?.name ? [datasource.name] : []}
-          onSelectQuery={(query) => {
-            onQueryReplacedFromLibrary?.();
-            onReplace?.(query);
-          }}
+        {isEditingQueryLibrary && this.renderQueryLibraryEditingBadge()}
+        <MaybeQueryLibrarySaveButton
+          query={query}
+          queryLibraryRef={queryLibraryRef}
           app={this.props.app}
+          onUpdateSuccess={this.onExitQueryLibraryEditingMode}
         />
 
+        {!isEditingQueryLibrary && (
+          <ReplaceQueryFromLibrary
+            datasourceFilters={datasource?.name ? [datasource.name] : []}
+            onSelectQuery={(query) => {
+              onQueryReplacedFromLibrary?.();
+              onReplace?.(query);
+            }}
+            app={this.props.app}
+          />
+        )}
+
+        {isEditingQueryLibrary && (
+          <>
+            <QueryOperationAction
+              title={t('query-operation.header.cancel-query-library-edit', 'Discard changes')}
+              icon="times"
+              onClick={this.onCancelQueryLibraryEdit}
+            />
+            <Divider direction="vertical" spacing={0} />
+          </>
+        )}
+
         {hasEditorHelp && (
           <QueryOperationToggleAction
             title={t('query-operation.header.datasource-help', 'Show data source help')}
@@ -390,11 +432,14 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
           />
         )}
         {this.renderExtraActions()}
-        <QueryOperationAction
-          title={t('query-operation.header.duplicate-query', 'Duplicate query')}
-          icon="copy"
-          onClick={this.onCopyQuery}
-        />
+        {!isEditingQueryLibrary && (
+          <QueryOperationAction
+            title={t('query-operation.header.duplicate-query', 'Duplicate query')}
+            icon="copy"
+            onClick={this.onCopyQuery}
+          />
+        )}
+
         {!hideHideQueryButton ? (
           <QueryOperationToggleAction
             dataTestId={selectors.components.QueryEditorRow.actionButton('Hide response')}
@@ -408,11 +453,13 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
             onClick={this.onHideQuery}
           />
         ) : null}
-        <QueryOperationAction
-          title={t('query-operation.header.remove-query', 'Remove query')}
-          icon="trash-alt"
-          onClick={this.onRemoveQuery}
-        />
+        {!isEditingQueryLibrary && (
+          <QueryOperationAction
+            title={t('query-operation.header.remove-query', 'Remove query')}
+            icon="trash-alt"
+            onClick={this.onRemoveQuery}
+          />
+        )}
       </>
     );
   };
@@ -488,6 +535,30 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
   }
 }
 
+export function QueryLibraryEditingBadge(props: { queryLibraryRef?: string }) {
+  const { queryLibraryEnabled } = useQueryLibraryContext();
+  const { queryLibraryRef } = props;
+
+  if (!queryLibraryEnabled || !queryLibraryRef) {
+    return null;
+  }
+
+  return (
+    <Badge
+      color="blue"
+      icon="book"
+      text={t('query-operation.query-library.from-library', 'Updating query from library')}
+      tooltip={t(
+        'query-operation.query-library.editing-tooltip',
+        'Updating query from library\nUID: {{queryLibraryRef}}',
+        {
+          queryLibraryRef,
+        }
+      )}
+    />
+  );
+}
+
 /**
  * Get a version of the PanelData limited to the query we are looking at
  */
@@ -530,9 +601,14 @@ export function filterPanelDataToQuery(data: PanelData, refId: string): PanelDat
 }
 
 // Will render anything only if query library is enabled
-function MaybeQueryLibrarySaveButton(props: { query: DataQuery; app?: CoreApp }) {
+function MaybeQueryLibrarySaveButton(props: {
+  query: DataQuery;
+  app?: CoreApp;
+  queryLibraryRef?: string;
+  onUpdateSuccess?: () => void;
+}) {
   const { renderSaveQueryButton } = useQueryLibraryContext();
-  return renderSaveQueryButton(props.query, props.app);
+  return renderSaveQueryButton(props.query, props.app, props.queryLibraryRef, props.onUpdateSuccess);
 }
 
 interface ReplaceQueryFromLibraryProps<TQuery extends DataQuery> {
diff --git a/public/app/features/query/components/QueryEditorRows.tsx b/public/app/features/query/components/QueryEditorRows.tsx
index b1cc3e70ba2..373638e3901 100644
--- a/public/app/features/query/components/QueryEditorRows.tsx
+++ b/public/app/features/query/components/QueryEditorRows.tsx
@@ -41,6 +41,8 @@ export interface Props {
   onUpdateDatasources?: (datasource: DataSourceRef) => void;
   onQueryReplacedFromLibrary?: () => void;
   queryRowWrapper?: (children: ReactNode, refId: string) => ReactNode;
+  queryLibraryRef?: string;
+  onCancelQueryLibraryEdit?: () => void;
   isOpen?: boolean;
 }
 
@@ -178,6 +180,8 @@ export class QueryEditorRows extends PureComponent<Props> {
       onQueryOpenChanged,
       onQueryReplacedFromLibrary,
       queryRowWrapper,
+      queryLibraryRef,
+      onCancelQueryLibraryEdit,
       isOpen,
     } = this.props;
 
@@ -217,6 +221,8 @@ export class QueryEditorRows extends PureComponent<Props> {
                       range={getTimeSrv().timeRange()}
                       history={history}
                       eventBus={eventBus}
+                      queryLibraryRef={queryLibraryRef}
+                      onCancelQueryLibraryEdit={onCancelQueryLibraryEdit}
                       isOpen={isOpen}
                     />
                   );
diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts
index 8c6912676da..5d4649500b1 100644
--- a/public/app/types/explore.ts
+++ b/public/app/types/explore.ts
@@ -140,6 +140,11 @@ export interface ExploreItemState {
    * Used to distinguish URL state injection versus split view state injection.
    */
   initialized: boolean;
+  /**
+   * Query library reference identifier when editing a query from the query library
+   *
+   */
+  queryLibraryRef?: string;
   /**
    * Log query result to be displayed in the logs result viewer.
    */
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 5d551355482..c0631410c8e 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -11850,6 +11850,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "Discard changes",
       "collapse-row": "Collapse query row",
       "datasource-help": "Show data source help",
       "drag-and-drop": "Drag and drop to reorder",
@@ -11860,7 +11861,11 @@
       "replace-query-from-library": "Replace with query from library",
       "show-response": "Show response"
     },
-    "query-editor-not-exported": "Data source plugin does not export any Query Editor component"
+    "query-editor-not-exported": "Data source plugin does not export any Query Editor component",
+    "query-library": {
+      "editing-tooltip": "Updating query from library\nUID: {{queryLibraryRef}}",
+      "from-library": "Updating query from library"
+    }
   },
   "recently-deleted": {
     "buttons": {

From 3106abf1a6e45d2ae2e818e0c8bcec87629cd05a Mon Sep 17 00:00:00 2001
From: "lean.dev" <34773040+leandro-deveikis@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:01:50 +0100
Subject: [PATCH 129/243] SecretsManager: clear unused metrics and standarize
 labels(#109515)

---
 .../apis/secret/service/metrics/metrics.go    |  52 +------
 .../apis/secret/service/secure_value.go       |   7 +-
 pkg/storage/secret/metadata/decrypt_store.go  |   1 -
 .../secret/metadata/decrypt_store_test.go     |   9 +-
 pkg/storage/secret/metadata/keeper_store.go   | 146 +++++++++++++++---
 .../secret/metadata/metrics/metrics.go        | 128 ++++-----------
 .../secret/metadata/secure_value_store.go     |  67 ++++++--
 7 files changed, 221 insertions(+), 189 deletions(-)

diff --git a/pkg/registry/apis/secret/service/metrics/metrics.go b/pkg/registry/apis/secret/service/metrics/metrics.go
index b179ead20b7..a1167b1e6ce 100644
--- a/pkg/registry/apis/secret/service/metrics/metrics.go
+++ b/pkg/registry/apis/secret/service/metrics/metrics.go
@@ -9,20 +9,17 @@ import (
 const (
 	namespace = "grafana_secrets_manager"
 	subsystem = "service"
+	// labels
+	successLabel = "success"
 )
 
 // SecureValueServiceMetrics is a struct that contains all the metrics for SecureValue.
 type SecureValueServiceMetrics struct {
 	SecureValueCreateDuration *prometheus.HistogramVec
-	SecureValueCreateCount    *prometheus.CounterVec
 	SecureValueUpdateDuration *prometheus.HistogramVec
-	SecureValueUpdateCount    *prometheus.CounterVec
 	SecureValueReadDuration   *prometheus.HistogramVec
-	SecureValueReadCount      *prometheus.CounterVec
 	SecureValueListDuration   *prometheus.HistogramVec
-	SecureValueListCount      *prometheus.CounterVec
 	SecureValueDeleteDuration *prometheus.HistogramVec
-	SecureValueDeleteCount    *prometheus.CounterVec
 }
 
 func newSecureValueServiceMetrics() *SecureValueServiceMetrics {
@@ -33,65 +30,35 @@ func newSecureValueServiceMetrics() *SecureValueServiceMetrics {
 			Name:      "secure_value_create_duration_seconds",
 			Help:      "Duration of Secure Value create operations",
 			Buckets:   prometheus.DefBuckets,
-		}, []string{"success"}),
-		SecureValueCreateCount: prometheus.NewCounterVec(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "secure_value_create_count",
-			Help:      "Count of Secure Value create operations",
-		}, []string{"success"}),
+		}, []string{successLabel}),
 		SecureValueReadDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "secure_value_read_duration_seconds",
 			Help:      "Duration of Secure Value read operations",
 			Buckets:   prometheus.DefBuckets,
-		}, []string{"success"}),
-		SecureValueReadCount: prometheus.NewCounterVec(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "secure_value_read_count",
-			Help:      "Count of Secure Value read operations",
-		}, []string{"success"}),
+		}, []string{successLabel}),
 		SecureValueUpdateDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "secure_value_update_duration_seconds",
 			Help:      "Duration of Secure Value update operations",
 			Buckets:   prometheus.DefBuckets,
-		}, []string{"success"}),
-		SecureValueUpdateCount: prometheus.NewCounterVec(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "secure_value_update_count",
-			Help:      "Count of Secure Value update operations",
-		}, []string{"success"}),
+		}, []string{successLabel}),
 		SecureValueListDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "secure_value_list_duration_seconds",
 			Help:      "Duration of Secure Value list operations",
 			Buckets:   prometheus.DefBuckets,
-		}, []string{"success"}),
-		SecureValueListCount: prometheus.NewCounterVec(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "secure_value_list_count",
-			Help:      "Count of Secure Value list operations",
-		}, []string{"success"}),
+		}, []string{successLabel}),
 		SecureValueDeleteDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "secure_value_delete_duration_seconds",
 			Help:      "Duration of Secure Value delete operations",
 			Buckets:   prometheus.DefBuckets,
-		}, []string{"success"}),
-		SecureValueDeleteCount: prometheus.NewCounterVec(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "secure_value_delete_count",
-			Help:      "Count of Secure Value delete operations",
-		}, []string{"success"}),
+		}, []string{successLabel}),
 	}
 }
 
@@ -107,15 +74,10 @@ func NewSecureValueServiceMetrics(reg prometheus.Registerer) *SecureValueService
 		if reg != nil {
 			reg.MustRegister(
 				m.SecureValueCreateDuration,
-				m.SecureValueCreateCount,
 				m.SecureValueReadDuration,
-				m.SecureValueReadCount,
 				m.SecureValueUpdateDuration,
-				m.SecureValueUpdateCount,
 				m.SecureValueListDuration,
-				m.SecureValueListCount,
 				m.SecureValueDeleteDuration,
-				m.SecureValueDeleteCount,
 			)
 		}
 		metricsInstance = m
diff --git a/pkg/registry/apis/secret/service/secure_value.go b/pkg/registry/apis/secret/service/secure_value.go
index f8b1f91d727..ae3422acc7c 100644
--- a/pkg/registry/apis/secret/service/secure_value.go
+++ b/pkg/registry/apis/secret/service/secure_value.go
@@ -90,7 +90,6 @@ func (s *SecureValueService) Create(ctx context.Context, sv *secretv1beta1.Secur
 		logging.FromContext(ctx).Info("SecureValueService.Create finished", args...)
 
 		s.metrics.SecureValueCreateDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
-		s.metrics.SecureValueCreateCount.WithLabelValues(strconv.FormatBool(success)).Inc()
 	}()
 
 	return s.createNewVersion(ctx, sv, actorUID)
@@ -126,7 +125,6 @@ func (s *SecureValueService) Update(ctx context.Context, newSecureValue *secretv
 		logging.FromContext(ctx).Info("SecureValueService.Update finished", args...)
 
 		s.metrics.SecureValueUpdateDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
-		s.metrics.SecureValueUpdateCount.WithLabelValues(strconv.FormatBool(success)).Inc()
 	}()
 
 	if newSecureValue.Spec.Value == nil {
@@ -231,7 +229,7 @@ func (s *SecureValueService) Read(ctx context.Context, namespace xkube.Namespace
 	defer func() {
 		args := []any{
 			"name", name,
-			"namespace", namespace,
+			"namespace", namespace.String(),
 		}
 
 		success := readErr == nil
@@ -245,7 +243,6 @@ func (s *SecureValueService) Read(ctx context.Context, namespace xkube.Namespace
 		logging.FromContext(ctx).Info("SecureValueService.Read finished", args...)
 
 		s.metrics.SecureValueReadDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
-		s.metrics.SecureValueReadCount.WithLabelValues(strconv.FormatBool(success)).Inc()
 	}()
 
 	defer span.End()
@@ -281,7 +278,6 @@ func (s *SecureValueService) List(ctx context.Context, namespace xkube.Namespace
 		logging.FromContext(ctx).Info("SecureValueService.List finished", args...)
 
 		s.metrics.SecureValueListDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
-		s.metrics.SecureValueListCount.WithLabelValues(strconv.FormatBool(success)).Inc()
 	}()
 
 	user, ok := claims.AuthInfoFrom(ctx)
@@ -353,7 +349,6 @@ func (s *SecureValueService) Delete(ctx context.Context, namespace xkube.Namespa
 		logging.FromContext(ctx).Info("SecureValueService.Delete finished", args...)
 
 		s.metrics.SecureValueDeleteDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
-		s.metrics.SecureValueDeleteCount.WithLabelValues(strconv.FormatBool(success)).Inc()
 	}()
 
 	// TODO: does this need to be for update?
diff --git a/pkg/storage/secret/metadata/decrypt_store.go b/pkg/storage/secret/metadata/decrypt_store.go
index de98a817a86..cd959883824 100644
--- a/pkg/storage/secret/metadata/decrypt_store.go
+++ b/pkg/storage/secret/metadata/decrypt_store.go
@@ -95,7 +95,6 @@ func (s *decryptStorage) Decrypt(ctx context.Context, namespace xkube.Namespace,
 
 		success := decryptErr == nil
 		s.metrics.DecryptDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
-		s.metrics.DecryptRequestCount.WithLabelValues(strconv.FormatBool(success)).Inc()
 	}()
 
 	// Basic authn check before reading a secure value metadata, it is here on purpose.
diff --git a/pkg/storage/secret/metadata/decrypt_store_test.go b/pkg/storage/secret/metadata/decrypt_store_test.go
index 3c35a443794..bc50b29c4a6 100644
--- a/pkg/storage/secret/metadata/decrypt_store_test.go
+++ b/pkg/storage/secret/metadata/decrypt_store_test.go
@@ -292,13 +292,14 @@ func TestIntegrationDecrypt(t *testing.T) {
 		require.NotEmpty(t, exposed)
 		require.Equal(t, "value", exposed.DangerouslyExposeAndConsumeValue())
 
-		require.Len(t, fakeLogger.InfoMsgs, 2)
+		require.Len(t, fakeLogger.InfoMsgs, 3)
 		require.Equal(t, fakeLogger.InfoMsgs[0], "SecureValueMetadataStorage.Read")
-		require.Equal(t, fakeLogger.InfoMsgs[1], "Secrets Audit Log")
+		require.Equal(t, fakeLogger.InfoMsgs[1], "KeeperMetadataStorage.GetKeeperConfig")
+		require.Equal(t, fakeLogger.InfoMsgs[2], "Secrets Audit Log")
 
-		require.Len(t, fakeLogger.InfoArgs, 2)
+		require.Len(t, fakeLogger.InfoArgs, 3)
 		// we only want to check the audit log args
-		args := fakeLogger.InfoArgs[1]
+		args := fakeLogger.InfoArgs[2]
 		require.Contains(t, args, "grafana_decrypter_identity")
 		require.Contains(t, args, "decrypter_identity")
 		for i, arg := range args {
diff --git a/pkg/storage/secret/metadata/keeper_store.go b/pkg/storage/secret/metadata/keeper_store.go
index 92707351ba7..7c9f12860ea 100644
--- a/pkg/storage/secret/metadata/keeper_store.go
+++ b/pkg/storage/secret/metadata/keeper_store.go
@@ -3,6 +3,7 @@ package metadata
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -10,6 +11,7 @@ import (
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
 
+	"github.com/grafana/grafana-app-sdk/logging"
 	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/xkube"
@@ -40,7 +42,7 @@ func ProvideKeeperMetadataStorage(
 	}, nil
 }
 
-func (s *keeperMetadataStorage) Create(ctx context.Context, keeper *secretv1beta1.Keeper, actorUID string) (*secretv1beta1.Keeper, error) {
+func (s *keeperMetadataStorage) Create(ctx context.Context, keeper *secretv1beta1.Keeper, actorUID string) (_ *secretv1beta1.Keeper, createErr error) {
 	start := time.Now()
 	ctx, span := s.tracer.Start(ctx, "KeeperMetadataStorage.Create", trace.WithAttributes(
 		attribute.String("name", keeper.GetName()),
@@ -49,6 +51,26 @@ func (s *keeperMetadataStorage) Create(ctx context.Context, keeper *secretv1beta
 	))
 	defer span.End()
 
+	defer func() {
+		success := createErr == nil
+
+		args := []any{
+			"name", keeper.GetName(),
+			"namespace", keeper.GetNamespace(),
+			"actorUID", actorUID,
+		}
+
+		if !success {
+			span.SetStatus(codes.Error, "KeeperMetadataStorage.Create failed")
+			span.RecordError(createErr)
+			args = append(args, "error", createErr)
+		}
+
+		logging.FromContext(ctx).Info("KeeperMetadataStorage.Create", args...)
+
+		s.metrics.KeeperMetadataCreateDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
+	}()
+
 	row, err := toKeeperCreateRow(keeper, actorUID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create row: %w", err)
@@ -99,13 +121,10 @@ func (s *keeperMetadataStorage) Create(ctx context.Context, keeper *secretv1beta
 		return nil, fmt.Errorf("failed to convert to kubernetes object: %w", err)
 	}
 
-	s.metrics.KeeperMetadataCreateDuration.WithLabelValues(string(createdKeeper.Spec.GetType())).Observe(time.Since(start).Seconds())
-	s.metrics.KeeperMetadataCreateCount.WithLabelValues(string(createdKeeper.Spec.GetType())).Inc()
-
 	return createdKeeper, nil
 }
 
-func (s *keeperMetadataStorage) Read(ctx context.Context, namespace xkube.Namespace, name string, opts contracts.ReadOpts) (*secretv1beta1.Keeper, error) {
+func (s *keeperMetadataStorage) Read(ctx context.Context, namespace xkube.Namespace, name string, opts contracts.ReadOpts) (_ *secretv1beta1.Keeper, readErr error) {
 	start := time.Now()
 	ctx, span := s.tracer.Start(ctx, "KeeperMetadataStorage.Read", trace.WithAttributes(
 		attribute.String("name", name),
@@ -114,6 +133,26 @@ func (s *keeperMetadataStorage) Read(ctx context.Context, namespace xkube.Namesp
 	))
 	defer span.End()
 
+	defer func() {
+		success := readErr == nil
+
+		args := []any{
+			"name", name,
+			"namespace", namespace.String(),
+		}
+
+		args = append(args, "success", success)
+		if !success {
+			span.SetStatus(codes.Error, "KeeperMetadataStorage.Read failed")
+			span.RecordError(readErr)
+			args = append(args, "error", readErr)
+		}
+
+		logging.FromContext(ctx).Info("KeeperMetadataStorage.Read", args...)
+
+		s.metrics.KeeperMetadataGetDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
+	}()
+
 	keeperDB, err := s.read(ctx, namespace.String(), name, opts)
 	if err != nil {
 		return nil, err
@@ -124,9 +163,6 @@ func (s *keeperMetadataStorage) Read(ctx context.Context, namespace xkube.Namesp
 		return nil, fmt.Errorf("failed to convert to kubernetes object: %w", err)
 	}
 
-	s.metrics.KeeperMetadataGetDuration.WithLabelValues(string(keeper.Spec.GetType())).Observe(time.Since(start).Seconds())
-	s.metrics.KeeperMetadataGetCount.WithLabelValues(string(keeper.Spec.GetType())).Inc()
-
 	return keeper, nil
 }
 
@@ -168,7 +204,7 @@ func (s *keeperMetadataStorage) read(ctx context.Context, namespace, name string
 	return &keeper, nil
 }
 
-func (s *keeperMetadataStorage) Update(ctx context.Context, newKeeper *secretv1beta1.Keeper, actorUID string) (*secretv1beta1.Keeper, error) {
+func (s *keeperMetadataStorage) Update(ctx context.Context, newKeeper *secretv1beta1.Keeper, actorUID string) (_ *secretv1beta1.Keeper, updateErr error) {
 	start := time.Now()
 	ctx, span := s.tracer.Start(ctx, "KeeperMetadataStorage.Update", trace.WithAttributes(
 		attribute.String("name", newKeeper.GetName()),
@@ -177,6 +213,25 @@ func (s *keeperMetadataStorage) Update(ctx context.Context, newKeeper *secretv1b
 	))
 	defer span.End()
 
+	defer func() {
+		success := updateErr == nil
+		args := []any{
+			"name", newKeeper.GetName(),
+			"namespace", newKeeper.GetNamespace(),
+			"actorUID", actorUID,
+		}
+
+		args = append(args, "success", success)
+		if !success {
+			span.SetStatus(codes.Error, "KeeperMetadataStorage.Update failed")
+			span.RecordError(updateErr)
+			args = append(args, "error", updateErr)
+		}
+
+		logging.FromContext(ctx).Info("KeeperMetadataStorage.Update", args...)
+		s.metrics.KeeperMetadataUpdateDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
+	}()
+
 	var newRow *keeperDB
 
 	err := s.db.Transaction(ctx, func(ctx context.Context) error {
@@ -239,13 +294,10 @@ func (s *keeperMetadataStorage) Update(ctx context.Context, newKeeper *secretv1b
 		return nil, fmt.Errorf("failed to convert to kubernetes object: %w", err)
 	}
 
-	s.metrics.KeeperMetadataUpdateDuration.WithLabelValues(string(keeper.Spec.GetType())).Observe(time.Since(start).Seconds())
-	s.metrics.KeeperMetadataUpdateCount.WithLabelValues(string(keeper.Spec.GetType())).Inc()
-
 	return keeper, nil
 }
 
-func (s *keeperMetadataStorage) Delete(ctx context.Context, namespace xkube.Namespace, name string) error {
+func (s *keeperMetadataStorage) Delete(ctx context.Context, namespace xkube.Namespace, name string) (delErr error) {
 	start := time.Now()
 	ctx, span := s.tracer.Start(ctx, "KeeperMetadataStorage.Delete", trace.WithAttributes(
 		attribute.String("name", name),
@@ -253,6 +305,26 @@ func (s *keeperMetadataStorage) Delete(ctx context.Context, namespace xkube.Name
 	))
 	defer span.End()
 
+	defer func() {
+		success := delErr == nil
+
+		args := []any{
+			"name", name,
+			"namespace", namespace.String(),
+		}
+
+		args = append(args, "success", success)
+		if !success {
+			span.SetStatus(codes.Error, "KeeperMetadataStorage.Delete failed")
+			span.RecordError(delErr)
+			args = append(args, "error", delErr)
+		}
+
+		logging.FromContext(ctx).Info("KeeperMetadataStorage.Delete", args...)
+
+		s.metrics.KeeperMetadataDeleteDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
+	}()
+
 	req := deleteKeeper{
 		SQLTemplate: sqltemplate.New(s.dialect),
 		Namespace:   namespace.String(),
@@ -279,9 +351,6 @@ func (s *keeperMetadataStorage) Delete(ctx context.Context, namespace xkube.Name
 		return fmt.Errorf("expected 1 row affected, got %d for %s on %s", rowsAffected, name, namespace)
 	}
 
-	s.metrics.KeeperMetadataDeleteDuration.Observe(time.Since(start).Seconds())
-	s.metrics.KeeperMetadataDeleteCount.Inc()
-
 	return nil
 }
 
@@ -294,6 +363,22 @@ func (s *keeperMetadataStorage) List(ctx context.Context, namespace xkube.Namesp
 
 	defer func() {
 		span.SetAttributes(attribute.Int("returnedList.count", len(keeperList)))
+		success := err == nil
+
+		args := []any{
+			"namespace", namespace.String(),
+			"success", success,
+		}
+
+		if !success {
+			span.SetStatus(codes.Error, "KeeperMetadataStorage.List failed")
+			span.RecordError(err)
+			args = append(args, "error", err)
+		}
+
+		logging.FromContext(ctx).Info("KeeperMetadataStorage.List", args...)
+
+		s.metrics.KeeperMetadataListDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
 	}()
 
 	req := listKeeper{
@@ -336,9 +421,6 @@ func (s *keeperMetadataStorage) List(ctx context.Context, namespace xkube.Namesp
 		return nil, fmt.Errorf("read rows error: %w", err)
 	}
 
-	s.metrics.KeeperMetadataListDuration.Observe(time.Since(start).Seconds())
-	s.metrics.KeeperMetadataListCount.Inc()
-
 	return keepers, nil
 }
 
@@ -491,19 +573,39 @@ func (s *keeperMetadataStorage) validateSecureValueReferences(ctx context.Contex
 	return nil
 }
 
-func (s *keeperMetadataStorage) GetKeeperConfig(ctx context.Context, namespace string, name *string, opts contracts.ReadOpts) (secretv1beta1.KeeperConfig, error) {
+func (s *keeperMetadataStorage) GetKeeperConfig(ctx context.Context, namespace string, name *string, opts contracts.ReadOpts) (_ secretv1beta1.KeeperConfig, getErr error) {
 	ctx, span := s.tracer.Start(ctx, "KeeperMetadataStorage.GetKeeperConfig", trace.WithAttributes(
 		attribute.String("namespace", namespace),
 		attribute.Bool("isForUpdate", opts.ForUpdate),
 	))
+	start := time.Now()
 	defer span.End()
 
+	defer func() {
+		success := getErr == nil
+
+		args := []any{
+			"namespace", namespace,
+			"isForUpdate", strconv.FormatBool(opts.ForUpdate),
+		}
+
+		args = append(args, "success", success)
+		if !success {
+			span.SetStatus(codes.Error, "KeeperMetadataStorage.GetKeeperConfig failed")
+			span.RecordError(getErr)
+			args = append(args, "error", getErr)
+		}
+
+		logging.FromContext(ctx).Info("KeeperMetadataStorage.GetKeeperConfig", args...)
+
+		s.metrics.KeeperMetadataGetKeeperConfigDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
+	}()
+
 	// Check if keeper is the systemwide one.
 	if name == nil {
 		return &secretv1beta1.SystemKeeperConfig{}, nil
 	}
 
-	start := time.Now()
 	span.SetAttributes(attribute.String("name", *name))
 
 	// Load keeper config from metadata store, or TODO: keeper cache.
@@ -514,8 +616,6 @@ func (s *keeperMetadataStorage) GetKeeperConfig(ctx context.Context, namespace s
 
 	keeperConfig := toProvider(secretv1beta1.KeeperType(kp.Type), kp.Payload)
 
-	s.metrics.KeeperMetadataGetKeeperConfigDuration.Observe(time.Since(start).Seconds())
-
 	// TODO: this would be a good place to check if credentials are secure values and load them.
 	return keeperConfig, nil
 }
diff --git a/pkg/storage/secret/metadata/metrics/metrics.go b/pkg/storage/secret/metadata/metrics/metrics.go
index f9baba1de64..5d904253dde 100644
--- a/pkg/storage/secret/metadata/metrics/metrics.go
+++ b/pkg/storage/secret/metadata/metrics/metrics.go
@@ -9,33 +9,26 @@ import (
 const (
 	namespace = "grafana_secrets_manager"
 	subsystem = "storage"
+	// labels
+	successLabel = "success"
 )
 
 // StorageMetrics is a struct that contains all the metrics for all operations of secrets storage.
 type StorageMetrics struct {
 	KeeperMetadataCreateDuration          *prometheus.HistogramVec
-	KeeperMetadataCreateCount             *prometheus.CounterVec
 	KeeperMetadataUpdateDuration          *prometheus.HistogramVec
-	KeeperMetadataUpdateCount             *prometheus.CounterVec
-	KeeperMetadataDeleteDuration          prometheus.Histogram
-	KeeperMetadataDeleteCount             prometheus.Counter
+	KeeperMetadataDeleteDuration          *prometheus.HistogramVec
 	KeeperMetadataGetDuration             *prometheus.HistogramVec
-	KeeperMetadataGetCount                *prometheus.CounterVec
-	KeeperMetadataListDuration            prometheus.Histogram
-	KeeperMetadataListCount               prometheus.Counter
-	KeeperMetadataGetKeeperConfigDuration prometheus.Histogram
+	KeeperMetadataListDuration            *prometheus.HistogramVec
+	KeeperMetadataGetKeeperConfigDuration *prometheus.HistogramVec
 
 	SecureValueMetadataCreateDuration *prometheus.HistogramVec
-	SecureValueMetadataCreateCount    *prometheus.CounterVec
-	SecureValueMetadataGetDuration    prometheus.Histogram
-	SecureValueMetadataGetCount       prometheus.Counter
-	SecureValueMetadataListDuration   prometheus.Histogram
-	SecureValueMetadataListCount      prometheus.Counter
-	SecureValueSetExternalIDDuration  prometheus.Histogram
-	SecureValueSetStatusDuration      prometheus.Histogram
+	SecureValueMetadataGetDuration    *prometheus.HistogramVec
+	SecureValueMetadataListDuration   *prometheus.HistogramVec
+	SecureValueSetExternalIDDuration  *prometheus.HistogramVec
+	SecureValueSetStatusDuration      *prometheus.HistogramVec
 
-	DecryptDuration     *prometheus.HistogramVec
-	DecryptRequestCount *prometheus.CounterVec
+	DecryptDuration *prometheus.HistogramVec
 }
 
 func newStorageMetrics() *StorageMetrics {
@@ -47,72 +40,42 @@ func newStorageMetrics() *StorageMetrics {
 			Name:      "keeper_metadata_create_duration_seconds",
 			Help:      "Duration of keeper metadata create operations",
 			Buckets:   prometheus.DefBuckets,
-		}, []string{"keeper_type"}),
-		KeeperMetadataCreateCount: prometheus.NewCounterVec(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "keeper_metadata_create_count",
-			Help:      "Count of keeper metadata create operations",
-		}, []string{"keeper_type"}),
+		}, []string{successLabel}),
 		KeeperMetadataUpdateDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "keeper_metadata_update_duration_seconds",
 			Help:      "Duration of keeper metadata update operations",
 			Buckets:   prometheus.DefBuckets,
-		}, []string{"keeper_type"}),
-		KeeperMetadataUpdateCount: prometheus.NewCounterVec(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "keeper_metadata_update_count",
-			Help:      "Count of keeper metadata update operations",
-		}, []string{"keeper_type"}),
-		KeeperMetadataDeleteDuration: prometheus.NewHistogram(prometheus.HistogramOpts{
+		}, []string{successLabel}),
+		KeeperMetadataDeleteDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "keeper_metadata_delete_duration_seconds",
 			Help:      "Duration of keeper metadata delete operations",
 			Buckets:   prometheus.DefBuckets,
-		}),
-		KeeperMetadataDeleteCount: prometheus.NewCounter(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "keeper_metadata_delete_count",
-			Help:      "Count of keeper metadata delete operations",
-		}),
+		}, []string{successLabel}),
 		KeeperMetadataGetDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "keeper_metadata_get_duration_seconds",
 			Help:      "Duration of keeper metadata get operations",
 			Buckets:   prometheus.DefBuckets,
-		}, []string{"keeper_type"}),
-		KeeperMetadataGetCount: prometheus.NewCounterVec(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "keeper_metadata_get_count",
-			Help:      "Count of keeper metadata get operations",
-		}, []string{"keeper_type"}),
-		KeeperMetadataListDuration: prometheus.NewHistogram(prometheus.HistogramOpts{
+		}, []string{successLabel}),
+		KeeperMetadataListDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "keeper_metadata_list_duration_seconds",
 			Help:      "Duration of keeper metadata list operations",
 			Buckets:   prometheus.DefBuckets,
-		}),
-		KeeperMetadataListCount: prometheus.NewCounter(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "keeper_metadata_list_count",
-			Help:      "Count of keeper metadata list operations",
-		}),
-		KeeperMetadataGetKeeperConfigDuration: prometheus.NewHistogram(prometheus.HistogramOpts{
+		}, []string{successLabel}),
+		KeeperMetadataGetKeeperConfigDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "keeper_metadata_get_keeper_config_duration_seconds",
 			Help:      "Duration of keeper metadata get keeper config operations",
 			Buckets:   prometheus.DefBuckets,
-		}),
+		}, []string{successLabel}),
 
 		// Secure value metrics
 		SecureValueMetadataCreateDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
@@ -121,53 +84,35 @@ func newStorageMetrics() *StorageMetrics {
 			Name:      "secure_value_metadata_create_duration_seconds",
 			Help:      "Duration of secure value metadata create operations",
 			Buckets:   prometheus.DefBuckets,
-		}, []string{"successful"}),
-		SecureValueMetadataCreateCount: prometheus.NewCounterVec(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "secure_value_metadata_create_count",
-			Help:      "Count of secure value metadata create operations",
-		}, []string{"successful"}),
-		SecureValueMetadataGetDuration: prometheus.NewHistogram(prometheus.HistogramOpts{
+		}, []string{successLabel}),
+		SecureValueMetadataGetDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "secure_value_metadata_get_duration_seconds",
 			Help:      "Duration of secure value metadata get operations",
 			Buckets:   prometheus.DefBuckets,
-		}),
-		SecureValueMetadataGetCount: prometheus.NewCounter(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "secure_value_metadata_get_count",
-			Help:      "Count of secure value metadata get operations",
-		}),
-		SecureValueMetadataListDuration: prometheus.NewHistogram(prometheus.HistogramOpts{
+		}, []string{successLabel}),
+		SecureValueMetadataListDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "secure_value_metadata_list_duration_seconds",
 			Help:      "Duration of secure value metadata list operations",
 			Buckets:   prometheus.DefBuckets,
-		}),
-		SecureValueMetadataListCount: prometheus.NewCounter(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "secure_value_metadata_list_count",
-			Help:      "Count of secure value metadata list operations",
-		}),
-		SecureValueSetExternalIDDuration: prometheus.NewHistogram(prometheus.HistogramOpts{
+		}, []string{successLabel}),
+		SecureValueSetExternalIDDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "secure_value_set_external_id_duration_seconds",
 			Help:      "Duration of secure value set external id operations",
 			Buckets:   prometheus.DefBuckets,
-		}),
-		SecureValueSetStatusDuration: prometheus.NewHistogram(prometheus.HistogramOpts{
+		}, []string{successLabel}),
+		SecureValueSetStatusDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: subsystem,
 			Name:      "secure_value_set_status_duration_seconds",
 			Help:      "Duration of secure value set status operations",
 			Buckets:   prometheus.DefBuckets,
-		}),
+		}, []string{successLabel}),
 
 		// Decrypt metrics
 		DecryptDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
@@ -176,13 +121,7 @@ func newStorageMetrics() *StorageMetrics {
 			Name:      "decrypt_duration_seconds",
 			Help:      "Duration of decrypt operations",
 			Buckets:   prometheus.DefBuckets,
-		}, []string{"successful"}),
-		DecryptRequestCount: prometheus.NewCounterVec(prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "decrypt_request_count",
-			Help:      "Count of decrypt operations",
-		}, []string{"successful"}),
+		}, []string{successLabel}),
 	}
 }
 
@@ -199,26 +138,17 @@ func NewStorageMetrics(reg prometheus.Registerer) *StorageMetrics {
 		if reg != nil {
 			reg.MustRegister(
 				m.KeeperMetadataCreateDuration,
-				m.KeeperMetadataCreateCount,
 				m.KeeperMetadataUpdateDuration,
-				m.KeeperMetadataUpdateCount,
 				m.KeeperMetadataDeleteDuration,
-				m.KeeperMetadataDeleteCount,
 				m.KeeperMetadataGetDuration,
-				m.KeeperMetadataGetCount,
 				m.KeeperMetadataListDuration,
-				m.KeeperMetadataListCount,
 				m.KeeperMetadataGetKeeperConfigDuration,
 				m.SecureValueMetadataCreateDuration,
-				m.SecureValueMetadataCreateCount,
 				m.SecureValueMetadataGetDuration,
-				m.SecureValueMetadataGetCount,
 				m.SecureValueMetadataListDuration,
-				m.SecureValueMetadataListCount,
 				m.SecureValueSetExternalIDDuration,
 				m.SecureValueSetStatusDuration,
 				m.DecryptDuration,
-				m.DecryptRequestCount,
 			)
 		}
 
diff --git a/pkg/storage/secret/metadata/secure_value_store.go b/pkg/storage/secret/metadata/secure_value_store.go
index 5782ee9a3e4..448d8ce2698 100644
--- a/pkg/storage/secret/metadata/secure_value_store.go
+++ b/pkg/storage/secret/metadata/secure_value_store.go
@@ -55,13 +55,14 @@ func (s *secureValueMetadataStorage) Create(ctx context.Context, sv *secretv1bet
 	defer span.End()
 
 	defer func() {
+		success := svmCreateErr == nil
+
 		args := []any{
 			"name", name,
 			"namespace", namespace,
 			"actorUID", actorUID,
 		}
 
-		success := svmCreateErr == nil
 		args = append(args, "success", success)
 		if !success {
 			span.SetStatus(codes.Error, "SecureValueMetadataStorage.Create failed")
@@ -72,7 +73,6 @@ func (s *secureValueMetadataStorage) Create(ctx context.Context, sv *secretv1bet
 		logging.FromContext(ctx).Info("SecureValueMetadataStorage.Create", args...)
 
 		s.metrics.SecureValueMetadataCreateDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
-		s.metrics.SecureValueMetadataCreateCount.WithLabelValues(strconv.FormatBool(success)).Inc()
 	}()
 
 	// Set inside the transaction callback
@@ -265,10 +265,22 @@ func (s *secureValueMetadataStorage) Read(ctx context.Context, namespace xkube.N
 	defer span.End()
 
 	defer func() {
-		logging.FromContext(ctx).Info("SecureValueMetadataStorage.Read", "namespace", namespace, "name", name, "success", readErr == nil, "error", readErr)
+		success := readErr == nil
 
-		s.metrics.SecureValueMetadataGetDuration.Observe(time.Since(start).Seconds())
-		s.metrics.SecureValueMetadataGetCount.Inc()
+		args := []any{
+			"name", name,
+			"namespace", namespace.String(),
+			"success", success,
+		}
+
+		if !success {
+			span.SetStatus(codes.Error, "SecureValueMetadataStorage.Read failed")
+			span.RecordError(readErr)
+			args = append(args, "error", readErr)
+		}
+
+		logging.FromContext(ctx).Info("SecureValueMetadataStorage.Read", args...)
+		s.metrics.SecureValueMetadataGetDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
 	}()
 
 	secureValue, err := s.readActiveVersion(ctx, namespace, name, opts)
@@ -284,7 +296,7 @@ func (s *secureValueMetadataStorage) Read(ctx context.Context, namespace xkube.N
 	return secureValueKub, nil
 }
 
-func (s *secureValueMetadataStorage) List(ctx context.Context, namespace xkube.Namespace) (svList []secretv1beta1.SecureValue, error error) {
+func (s *secureValueMetadataStorage) List(ctx context.Context, namespace xkube.Namespace) (svList []secretv1beta1.SecureValue, listErr error) {
 	start := time.Now()
 	ctx, span := s.tracer.Start(ctx, "SecureValueMetadataStorage.List", trace.WithAttributes(
 		attribute.String("namespace", namespace.String()),
@@ -292,7 +304,23 @@ func (s *secureValueMetadataStorage) List(ctx context.Context, namespace xkube.N
 	defer span.End()
 
 	defer func() {
+		success := listErr == nil
 		span.SetAttributes(attribute.Int("returnedList.count", len(svList)))
+
+		args := []any{
+			"namespace", namespace.String(),
+			"success", success,
+		}
+
+		if !success {
+			span.SetStatus(codes.Error, "SecureValueMetadataStorage.List failed")
+			span.RecordError(listErr)
+			args = append(args, "error", listErr)
+		}
+
+		logging.FromContext(ctx).Info("SecureValueMetadataStorage.List", args...)
+
+		s.metrics.SecureValueMetadataListDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
 	}()
 
 	req := listSecureValue{
@@ -344,9 +372,6 @@ func (s *secureValueMetadataStorage) List(ctx context.Context, namespace xkube.N
 		return nil, fmt.Errorf("read rows error: %w", err)
 	}
 
-	s.metrics.SecureValueMetadataListDuration.Observe(time.Since(start).Seconds())
-	s.metrics.SecureValueMetadataListCount.Inc()
-
 	return secureValues, nil
 }
 
@@ -423,7 +448,7 @@ func (s *secureValueMetadataStorage) SetVersionToInactive(ctx context.Context, n
 	return nil
 }
 
-func (s *secureValueMetadataStorage) SetExternalID(ctx context.Context, namespace xkube.Namespace, name string, version int64, externalID contracts.ExternalID) error {
+func (s *secureValueMetadataStorage) SetExternalID(ctx context.Context, namespace xkube.Namespace, name string, version int64, externalID contracts.ExternalID) (setExtIDErr error) {
 	start := time.Now()
 	ctx, span := s.tracer.Start(ctx, "SecureValueMetadataStorage.SetExternalID", trace.WithAttributes(
 		attribute.String("name", name),
@@ -431,8 +456,29 @@ func (s *secureValueMetadataStorage) SetExternalID(ctx context.Context, namespac
 		attribute.String("externalID", externalID.String()),
 		attribute.Int64("version", version),
 	))
+
 	defer span.End()
 
+	defer func() {
+		success := setExtIDErr == nil
+		args := []any{
+			"name", name,
+			"namespace", namespace.String(),
+			"success", success,
+			"version", strconv.FormatInt(version, 10),
+			"externalID", externalID.String(),
+		}
+
+		if !success {
+			span.SetStatus(codes.Error, "SecureValueMetadataStorage.SetExternalID failed")
+			span.RecordError(setExtIDErr)
+			args = append(args, "error", setExtIDErr)
+		}
+
+		logging.FromContext(ctx).Info("SecureValueMetadataStorage.SetExternalID", args...)
+		s.metrics.SecureValueSetExternalIDDuration.WithLabelValues(strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
+	}()
+
 	req := updateExternalIdSecureValue{
 		SQLTemplate: sqltemplate.New(s.dialect),
 		Namespace:   namespace.String(),
@@ -459,7 +505,6 @@ func (s *secureValueMetadataStorage) SetExternalID(ctx context.Context, namespac
 	if modifiedCount > 1 {
 		return fmt.Errorf("secureValueMetadataStorage.SetExternalID: modified more than one secret, this is a bug, check the where condition: modifiedCount=%d", modifiedCount)
 	}
-	s.metrics.SecureValueSetExternalIDDuration.Observe(time.Since(start).Seconds())
 
 	return nil
 }

From 09ee1ecaad74f2da75ad9f7177924f52f8c59a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= <laura.fernandez@grafana.com>
Date: Wed, 13 Aug 2025 15:10:50 +0200
Subject: [PATCH 130/243] Chore: Remove deprecated `VerticalGroup` (#109559)

---
 .betterer.results                                | 16 ++--------------
 .../TransformationPicker.tsx                     |  6 +++---
 .../ValueMappingsEditor/ValueMappingsEditor.tsx  |  6 +++---
 .../transformers/editors/EnumMappingEditor.tsx   | 15 +++++++--------
 .../panel/geomap/editor/MapViewEditor.tsx        |  6 +++---
 .../table/cells/SparklineCellOptionsEditor.tsx   |  6 +++---
 6 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 505eeefb315..dc5c9248073 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2076,8 +2076,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "0"]
     ],
     "public/app/features/dashboard/components/TransformationsEditor/TransformationPicker.tsx:5381": [
-      [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"],
-      [0, 0, 0, "Add noMargin prop to Card components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "1"]
+      [0, 0, 0, "Add noMargin prop to Card components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "0"]
     ],
     "public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -2299,9 +2298,6 @@ exports[`better eslint`] = {
     "public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingEditRow.tsx:5381": [
       [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
     ],
-    "public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditor.tsx:5381": [
-      [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
-    ],
     "public/app/features/dimensions/scale.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -2827,10 +2823,6 @@ exports[`better eslint`] = {
     "public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/transformers/editors/EnumMappingEditor.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"],
-      [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "1"]
-    ],
     "public/app/features/transformers/editors/EnumMappingRow.tsx:5381": [
       [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
     ],
@@ -3747,9 +3739,6 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/geomap/editor/GeomapStyleRulesEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/plugins/panel/geomap/editor/MapViewEditor.tsx:5381": [
-      [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
-    ],
     "public/app/plugins/panel/geomap/editor/StyleEditor.tsx:5381": [
       [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"],
       [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "1"],
@@ -3903,8 +3892,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "1"]
     ],
     "public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx:5381": [
-      [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"],
-      [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "1"]
+      [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "0"]
     ],
     "public/app/plugins/panel/table/migrations.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationPicker.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationPicker.tsx
index 6f2d0f03450..2939ff59ad7 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationPicker.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationPicker.tsx
@@ -4,7 +4,7 @@ import { FormEventHandler, KeyboardEventHandler, ReactNode } from 'react';
 import { DocsId, GrafanaTheme2, LocalStorageValueProvider, TransformerRegistryItem } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
-import { Card, Container, VerticalGroup, Alert, Input, useStyles2 } from '@grafana/ui';
+import { Card, Container, Alert, Input, useStyles2, Stack } from '@grafana/ui';
 import { getDocsLink } from 'app/core/utils/docsLinks';
 import { PluginStateInfo } from 'app/features/plugins/components/PluginStateInfo';
 
@@ -24,7 +24,7 @@ export function TransformationPicker(props: TransformationPickerProps) {
   const { noTransforms, search, xforms, onSearchChange, onSearchKeyDown, onTransformationAdd, suffix } = props;
 
   return (
-    <VerticalGroup>
+    <Stack direction="column">
       {noTransforms && (
         <Container grow={1}>
           <LocalStorageValueProvider<boolean> storageKey={LOCAL_STORAGE_KEY} defaultValue={false}>
@@ -94,7 +94,7 @@ export function TransformationPicker(props: TransformationPickerProps) {
           />
         );
       })}
-    </VerticalGroup>
+    </Stack>
   );
 }
 
diff --git a/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditor.tsx b/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditor.tsx
index f174d063481..943631bb28a 100644
--- a/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditor.tsx
+++ b/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditor.tsx
@@ -3,7 +3,7 @@ import { memo, useCallback, useMemo, useState } from 'react';
 
 import { GrafanaTheme2, MappingType, StandardEditorProps, ValueMapping } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
-import { useStyles2, VerticalGroup, Icon, ColorPicker, Button, Modal } from '@grafana/ui';
+import { useStyles2, Stack, Icon, ColorPicker, Button, Modal } from '@grafana/ui';
 
 import { MediaType, ResourceFolderName, ResourcePickerSize } from '../../types';
 import { ResourcePicker } from '../ResourcePicker';
@@ -43,7 +43,7 @@ export const ValueMappingsEditor = memo((props: Props) => {
   );
 
   return (
-    <VerticalGroup>
+    <Stack direction="column">
       <table className={styles.compactTable}>
         <tbody>
           {rows.map((row, rowIndex) => (
@@ -114,7 +114,7 @@ export const ValueMappingsEditor = memo((props: Props) => {
           showIconPicker={showIconPicker}
         />
       </Modal>
-    </VerticalGroup>
+    </Stack>
   );
 });
 
diff --git a/public/app/features/transformers/editors/EnumMappingEditor.tsx b/public/app/features/transformers/editors/EnumMappingEditor.tsx
index aa641721b58..f54ed0164a6 100644
--- a/public/app/features/transformers/editors/EnumMappingEditor.tsx
+++ b/public/app/features/transformers/editors/EnumMappingEditor.tsx
@@ -6,7 +6,7 @@ import { useEffect, useState } from 'react';
 import { DataFrame, EnumFieldConfig, GrafanaTheme2 } from '@grafana/data';
 import { ConvertFieldTypeTransformerOptions } from '@grafana/data/internal';
 import { Trans } from '@grafana/i18n';
-import { Button, HorizontalGroup, InlineFieldRow, useStyles2, VerticalGroup } from '@grafana/ui';
+import { Button, Stack, useStyles2 } from '@grafana/ui';
 
 import EnumMappingRow from './EnumMappingRow';
 
@@ -119,8 +119,8 @@ export const EnumMappingEditor = ({ input, options, transformIndex, onChange }:
   };
 
   return (
-    <InlineFieldRow>
-      <HorizontalGroup>
+    <Stack direction="column" rowGap={0.5}>
+      <Stack>
         <Button size="sm" icon="plus" onClick={() => generateEnumValues()} className={styles.button}>
           <Trans i18nKey="transformers.enum-mapping-editor.generate-enum-values-from-data">
             Generate enum values from data
@@ -129,9 +129,8 @@ export const EnumMappingEditor = ({ input, options, transformIndex, onChange }:
         <Button size="sm" icon="plus" onClick={() => onAddEnumRow()} className={styles.button}>
           <Trans i18nKey="transformers.enum-mapping-editor.add-enum-value">Add enum value</Trans>
         </Button>
-      </HorizontalGroup>
-
-      <VerticalGroup>
+      </Stack>
+      <Stack>
         <table className={styles.compactTable}>
           <DragDropContext onDragEnd={onDragEnd}>
             <Droppable droppableId="sortable-enum-config-mappings" direction="vertical">
@@ -159,8 +158,8 @@ export const EnumMappingEditor = ({ input, options, transformIndex, onChange }:
             </Droppable>
           </DragDropContext>
         </table>
-      </VerticalGroup>
-    </InlineFieldRow>
+      </Stack>
+    </Stack>
   );
 };
 
diff --git a/public/app/plugins/panel/geomap/editor/MapViewEditor.tsx b/public/app/plugins/panel/geomap/editor/MapViewEditor.tsx
index ed813935d5c..6a6d172eff5 100644
--- a/public/app/plugins/panel/geomap/editor/MapViewEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/MapViewEditor.tsx
@@ -3,7 +3,7 @@ import { useMemo, useCallback } from 'react';
 
 import { StandardEditorProps, SelectableValue } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
-import { Button, InlineField, InlineFieldRow, Select, VerticalGroup } from '@grafana/ui';
+import { Button, InlineField, InlineFieldRow, Select, Stack } from '@grafana/ui';
 import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
 
 import { Options, MapViewConfig, GeomapInstanceState } from '../types';
@@ -99,13 +99,13 @@ export const MapViewEditor = ({
         </InlineField>
       </InlineFieldRow>
 
-      <VerticalGroup>
+      <Stack direction="column">
         <Button variant="secondary" size="sm" fullWidth onClick={onSetCurrentView}>
           <span>
             <Trans i18nKey="geomap.map-view-editor.use-current-map-settings">Use current map settings</Trans>
           </span>
         </Button>
-      </VerticalGroup>
+      </Stack>
     </>
   );
 };
diff --git a/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx b/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx
index 085be091423..bb5b0fd3e7e 100644
--- a/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx
@@ -3,7 +3,7 @@ import { useMemo } from 'react';
 
 import { createFieldConfigRegistry, SetFieldConfigOptionsArgs } from '@grafana/data';
 import { GraphFieldConfig, TableSparklineCellOptions } from '@grafana/schema';
-import { VerticalGroup, Field, useStyles2 } from '@grafana/ui';
+import { Stack, Field, useStyles2 } from '@grafana/ui';
 import { defaultSparklineCellConfig } from '@grafana/ui/internal';
 
 import { getGraphFieldConfig } from '../../timeseries/config';
@@ -52,7 +52,7 @@ export const SparklineCellOptionsEditor = (props: TableCellEditorProps<TableSpar
   const values = { ...defaultSparklineCellConfig, ...cellOptions };
 
   return (
-    <VerticalGroup>
+    <Stack direction="column" gap={0}>
       {registry.list(optionIds.map((id) => `custom.${id}`)).map((item) => {
         if (item.showIf && !item.showIf(values)) {
           return null;
@@ -71,7 +71,7 @@ export const SparklineCellOptionsEditor = (props: TableCellEditorProps<TableSpar
           </Field>
         );
       })}
-    </VerticalGroup>
+    </Stack>
   );
 };
 

From 842fd44e8329030241ca0a60355ecc9c44841386 Mon Sep 17 00:00:00 2001
From: Konrad Lalik <konradlalik@gmail.com>
Date: Wed, 13 Aug 2025 15:30:46 +0200
Subject: [PATCH 131/243] Alerting: Disable group consistency check for GMA
 rules (#109599)

Disable consistency check for GMA rules
---
 .../unified/components/rule-viewer/RuleViewer.tsx         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.tsx
index 7c3dd139d8e..1d8f0e2ea5d 100644
--- a/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.tsx
@@ -48,6 +48,7 @@ import {
   RulePluginOrigin,
   getRulePluginOrigin,
   isFederatedRuleGroup,
+  isGrafanaRuleIdentifier,
   isPausedRule,
   prometheusRuleType,
   rulerRuleType,
@@ -83,12 +84,15 @@ export enum ActiveTab {
 const prometheusRulesPrimary = shouldUsePrometheusRulesPrimary();
 const alertingListViewV2 = shouldUseAlertingListViewV2();
 
-const shouldUseConsistencyCheck = prometheusRulesPrimary || alertingListViewV2;
-
 const RuleViewer = () => {
   const { rule, identifier } = useAlertRule();
   const { pageNav, activeTab } = usePageNav(rule);
 
+  // GMA /api/v1/rules endpoint is strongly consistent, so we don't need to check for consistency
+  const shouldUseConsistencyCheck = isGrafanaRuleIdentifier(identifier)
+    ? false
+    : prometheusRulesPrimary || alertingListViewV2;
+
   // this will be used to track if we are in the process of cloning a rule
   // we want to be able to show a modal if the rule has been provisioned explain the limitations
   // of duplicating provisioned alert rules

From 2e4b10e81cc2aeed0f5f52f7729762e46693c84b Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Wed, 13 Aug 2025 15:34:19 +0200
Subject: [PATCH 132/243] DatasourcePicker: Favorite datasources (#109404)

---
 .github/CODEOWNERS                            |   1 +
 packages/grafana-runtime/src/index.ts         |   1 +
 .../src/utils/useFavoriteDatasources.test.ts  | 271 ++++++++++++++++++
 .../src/utils/useFavoriteDatasources.ts       |  95 ++++++
 .../components/picker/DataSourceCard.tsx      |  44 ++-
 .../components/picker/DataSourceList.tsx      |  36 ++-
 .../components/picker/utils.test.ts           |  16 +-
 .../datasources/components/picker/utils.ts    |  17 +-
 8 files changed, 470 insertions(+), 11 deletions(-)
 create mode 100644 packages/grafana-runtime/src/utils/useFavoriteDatasources.test.ts
 create mode 100644 packages/grafana-runtime/src/utils/useFavoriteDatasources.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2f1e67251d0..61aaa071c43 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -608,6 +608,7 @@
 /packages/grafana-runtime/src/utils/returnToPrevious.ts @grafana/grafana-search-navigate-organise
 /packages/grafana-runtime/src/utils/toDataQueryError.ts @grafana/grafana-datasources-core-services
 /packages/grafana-runtime/src/utils/userStorage* @grafana/plugins-platform-frontend @grafana/grafana-frontend-platform
+/packages/grafana-runtime/src/utils/useFavoriteDatasources* @grafana/plugins-platform-frontend
 
 # @grafana/schema
 /packages/grafana-schema/ @grafana/grafana-app-platform-squad
diff --git a/packages/grafana-runtime/src/index.ts b/packages/grafana-runtime/src/index.ts
index 2250f0db26f..1678d74cdbf 100644
--- a/packages/grafana-runtime/src/index.ts
+++ b/packages/grafana-runtime/src/index.ts
@@ -57,6 +57,7 @@ export { hasPermission, hasPermissionInMetadata, hasAllPermissions, hasAnyPermis
 export { QueryEditorWithMigration } from './components/QueryEditorWithMigration';
 export { type MigrationHandler, isMigrationHandler, migrateQuery, migrateRequest } from './utils/migrationHandler';
 export { usePluginUserStorage } from './utils/userStorage';
+export { useFavoriteDatasources } from './utils/useFavoriteDatasources';
 export { FolderPicker, setFolderPicker } from './components/FolderPicker';
 export {
   type CorrelationsService,
diff --git a/packages/grafana-runtime/src/utils/useFavoriteDatasources.test.ts b/packages/grafana-runtime/src/utils/useFavoriteDatasources.test.ts
new file mode 100644
index 00000000000..0e24c64a751
--- /dev/null
+++ b/packages/grafana-runtime/src/utils/useFavoriteDatasources.test.ts
@@ -0,0 +1,271 @@
+import { renderHook, act, waitFor } from '@testing-library/react';
+
+import { DataSourceInstanceSettings, DataSourcePluginMeta, PluginType, PluginMetaInfo } from '@grafana/data';
+
+import { useFavoriteDatasources } from './useFavoriteDatasources';
+
+// Mock UserStorage
+const mockGetItem = jest.fn();
+const mockSetItem = jest.fn();
+
+jest.mock('./userStorage', () => {
+  return {
+    UserStorage: jest.fn().mockImplementation(() => ({
+      getItem: mockGetItem,
+      setItem: mockSetItem,
+    })),
+  };
+});
+
+describe('useFavoriteDatasources', () => {
+  // Test data helpers
+  const pluginMetaInfo: PluginMetaInfo = {
+    author: { name: '', url: '' },
+    description: '',
+    version: '',
+    updated: '',
+    links: [],
+    logos: { small: '', large: '' },
+    screenshots: [],
+  };
+
+  function createPluginMeta(name: string, builtIn: boolean): DataSourcePluginMeta {
+    return {
+      builtIn,
+      name,
+      id: name,
+      type: PluginType.datasource,
+      baseUrl: '',
+      info: pluginMetaInfo,
+      module: '',
+    };
+  }
+
+  function createDataSource(name: string, id: number, builtIn = false): DataSourceInstanceSettings {
+    return {
+      name: name,
+      uid: `${name}-uid`,
+      meta: createPluginMeta(name, builtIn),
+      id,
+      access: 'direct',
+      jsonData: {},
+      type: name,
+      readOnly: false,
+    };
+  }
+
+  const mockDS1 = createDataSource('prometheus', 1);
+  const mockBuiltInDS = createDataSource('grafana', 4, true);
+
+  beforeEach(() => {
+    mockGetItem.mockReset();
+    mockSetItem.mockReset();
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('initial loading', () => {
+    it('should initialize with empty favorites when no stored data exists', async () => {
+      mockGetItem.mockResolvedValue(null);
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual([]);
+        expect(result.current.initialFavoriteDataSources).toEqual([]);
+      });
+
+      expect(mockGetItem).toHaveBeenCalledWith('favoriteDatasources');
+    });
+
+    it('should load existing favorites from storage', async () => {
+      const storedFavorites = ['prometheus-uid', 'loki-uid'];
+      mockGetItem.mockResolvedValue(JSON.stringify(storedFavorites));
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual(storedFavorites);
+        expect(result.current.initialFavoriteDataSources).toEqual(storedFavorites);
+      });
+    });
+
+    it('should handle non-array data in storage gracefully', async () => {
+      mockGetItem.mockResolvedValue(JSON.stringify({ not: 'an array' }));
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual([]);
+        expect(result.current.initialFavoriteDataSources).toEqual([]);
+      });
+    });
+  });
+
+  describe('addFavoriteDatasource', () => {
+    it('should add a new datasource to favorites', async () => {
+      mockGetItem.mockResolvedValue(JSON.stringify([]));
+      mockSetItem.mockResolvedValue(undefined);
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual([]);
+      });
+
+      act(() => {
+        result.current.addFavoriteDatasource(mockDS1);
+      });
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual(['prometheus-uid']);
+        expect(result.current.initialFavoriteDataSources).toEqual([]);
+      });
+
+      expect(mockSetItem).toHaveBeenCalledWith('favoriteDatasources', JSON.stringify(['prometheus-uid']));
+    });
+
+    it('should not add duplicate datasources', async () => {
+      mockGetItem.mockResolvedValue(JSON.stringify(['prometheus-uid']));
+      mockSetItem.mockResolvedValue(undefined);
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual(['prometheus-uid']);
+      });
+
+      act(() => {
+        result.current.addFavoriteDatasource(mockDS1);
+      });
+
+      // Should not change
+      expect(result.current.favoriteDatasources).toEqual(['prometheus-uid']);
+      expect(mockSetItem).not.toHaveBeenCalled();
+    });
+
+    it('should not add built-in datasources', async () => {
+      mockGetItem.mockResolvedValue(JSON.stringify([]));
+      mockSetItem.mockResolvedValue(undefined);
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual([]);
+      });
+
+      act(() => {
+        result.current.addFavoriteDatasource(mockBuiltInDS);
+      });
+
+      // Should not change
+      expect(result.current.favoriteDatasources).toEqual([]);
+      expect(mockSetItem).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('removeFavoriteDatasource', () => {
+    it('should remove a datasource from favorites', async () => {
+      mockGetItem.mockResolvedValue(JSON.stringify(['prometheus-uid', 'loki-uid']));
+      mockSetItem.mockResolvedValue(undefined);
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual(['prometheus-uid', 'loki-uid']);
+      });
+
+      act(() => {
+        result.current.removeFavoriteDatasource(mockDS1);
+      });
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual(['loki-uid']);
+      });
+
+      expect(mockSetItem).toHaveBeenCalledWith('favoriteDatasources', JSON.stringify(['loki-uid']));
+    });
+
+    it('should handle removing non-existent datasource gracefully', async () => {
+      mockGetItem.mockResolvedValue(JSON.stringify(['loki-uid']));
+      mockSetItem.mockResolvedValue(undefined);
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual(['loki-uid']);
+      });
+
+      act(() => {
+        result.current.removeFavoriteDatasource(mockDS1); // prometheus not in list
+      });
+
+      // Should not change or call setItem since nothing was removed
+      expect(result.current.favoriteDatasources).toEqual(['loki-uid']);
+      expect(mockSetItem).not.toHaveBeenCalled();
+    });
+
+    it('should remove all datasources when removing the last one', async () => {
+      mockGetItem.mockResolvedValue(JSON.stringify(['prometheus-uid']));
+      mockSetItem.mockResolvedValue(undefined);
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual(['prometheus-uid']);
+      });
+
+      act(() => {
+        result.current.removeFavoriteDatasource(mockDS1);
+      });
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual([]);
+      });
+
+      expect(mockSetItem).toHaveBeenCalledWith('favoriteDatasources', JSON.stringify([]));
+    });
+  });
+
+  describe('isFavoriteDatasource', () => {
+    it('should return true for favorited datasource', async () => {
+      mockGetItem.mockResolvedValue(JSON.stringify(['prometheus-uid', 'loki-uid']));
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual(['prometheus-uid', 'loki-uid']);
+      });
+
+      expect(result.current.isFavoriteDatasource('prometheus-uid')).toBe(true);
+      expect(result.current.isFavoriteDatasource('loki-uid')).toBe(true);
+    });
+
+    it('should return false for non-favorited datasource', async () => {
+      mockGetItem.mockResolvedValue(JSON.stringify(['prometheus-uid']));
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual(['prometheus-uid']);
+      });
+
+      expect(result.current.isFavoriteDatasource('loki-uid')).toBe(false);
+      expect(result.current.isFavoriteDatasource('elasticsearch-uid')).toBe(false);
+    });
+
+    it('should return false when no favorites exist', async () => {
+      mockGetItem.mockResolvedValue(null);
+
+      const { result } = renderHook(() => useFavoriteDatasources());
+
+      await waitFor(() => {
+        expect(result.current.favoriteDatasources).toEqual([]);
+      });
+
+      expect(result.current.isFavoriteDatasource('prometheus-uid')).toBe(false);
+    });
+  });
+});
diff --git a/packages/grafana-runtime/src/utils/useFavoriteDatasources.ts b/packages/grafana-runtime/src/utils/useFavoriteDatasources.ts
new file mode 100644
index 00000000000..31bd7c9262e
--- /dev/null
+++ b/packages/grafana-runtime/src/utils/useFavoriteDatasources.ts
@@ -0,0 +1,95 @@
+import { useCallback, useEffect, useState } from 'react';
+
+import { DataSourceInstanceSettings } from '@grafana/data';
+
+import { UserStorage } from './userStorage';
+
+const FAVORITE_DATASOURCES_KEY = 'favoriteDatasources';
+
+/**
+ * A hook for managing favorite data sources using user storage.
+ * This hook provides functionality to store and retrieve a list of favorite data source UIDs
+ * using the backend user storage (with localStorage fallback).
+ *
+ * @returns An object containing:
+ * - An array of favorite data source UIDs
+ * - An array of favorite data source UIDs that were initially loaded from storage
+ * - A function to add a data source to favorites
+ * - A function to remove a data source from favorites
+ * - A function to check if a data source is favorited
+ * @public
+ */
+export function useFavoriteDatasources(): {
+  favoriteDatasources: string[];
+  initialFavoriteDataSources: string[];
+  addFavoriteDatasource: (ds: DataSourceInstanceSettings) => void;
+  removeFavoriteDatasource: (ds: DataSourceInstanceSettings) => void;
+  isFavoriteDatasource: (dsUid: string) => boolean;
+} {
+  const [userStorage] = useState(() => new UserStorage('grafana-runtime'));
+  const [favoriteDatasources, setFavoriteDatasources] = useState<string[]>([]);
+  const [initialFavoriteDataSources, setInitialFavoriteDataSources] = useState<string[]>([]);
+
+  // Load favorites from storage on mount
+  useEffect(() => {
+    const loadFavorites = async () => {
+      const stored = await userStorage.getItem(FAVORITE_DATASOURCES_KEY);
+      if (stored) {
+        const parsed = JSON.parse(stored);
+        setFavoriteDatasources(parsed);
+        setInitialFavoriteDataSources(parsed);
+      }
+    };
+
+    loadFavorites();
+  }, [userStorage]);
+
+  // Helper function to save favorites to storage
+  const saveFavorites = useCallback(
+    async (newFavorites: string[]) => {
+      await userStorage.setItem(FAVORITE_DATASOURCES_KEY, JSON.stringify(newFavorites));
+      setFavoriteDatasources(newFavorites);
+    },
+    [userStorage]
+  );
+
+  const addFavoriteDatasource = useCallback(
+    (ds: DataSourceInstanceSettings) => {
+      if (ds.meta.builtIn) {
+        // Prevent storing built-in datasources (-- Grafana --, -- Mixed --, -- Dashboard --)
+        return;
+      }
+
+      if (!favoriteDatasources.includes(ds.uid)) {
+        const newFavorites = [...favoriteDatasources, ds.uid];
+        saveFavorites(newFavorites);
+      }
+    },
+    [favoriteDatasources, saveFavorites]
+  );
+
+  const removeFavoriteDatasource = useCallback(
+    (ds: DataSourceInstanceSettings) => {
+      const newFavorites = favoriteDatasources.filter((uid) => uid !== ds.uid);
+      if (newFavorites.length !== favoriteDatasources.length) {
+        saveFavorites(newFavorites);
+      }
+    },
+    [favoriteDatasources, saveFavorites]
+  );
+
+  const isFavoriteDatasource = useCallback(
+    (dsUid: string) => {
+      return favoriteDatasources.includes(dsUid);
+    },
+    [favoriteDatasources]
+  );
+
+  return {
+    favoriteDatasources,
+    addFavoriteDatasource,
+    removeFavoriteDatasource,
+    isFavoriteDatasource,
+    initialFavoriteDataSources,
+  };
+}
diff --git a/public/app/features/datasources/components/picker/DataSourceCard.tsx b/public/app/features/datasources/components/picker/DataSourceCard.tsx
index 84403ae4298..c1a5f4d3345 100644
--- a/public/app/features/datasources/components/picker/DataSourceCard.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceCard.tsx
@@ -1,16 +1,26 @@
 import { css, cx } from '@emotion/css';
 
 import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
-import { Card, TagList, useTheme2 } from '@grafana/ui';
+import { Card, TagList, useTheme2, Icon } from '@grafana/ui';
 
 interface DataSourceCardProps {
   ds: DataSourceInstanceSettings;
   onClick: () => void;
   selected: boolean;
   description?: string;
+  isFavorite?: boolean;
+  onToggleFavorite?: (ds: DataSourceInstanceSettings) => void;
 }
 
-export function DataSourceCard({ ds, onClick, selected, description, ...htmlProps }: DataSourceCardProps) {
+export function DataSourceCard({
+  ds,
+  onClick,
+  selected,
+  description,
+  isFavorite = false,
+  onToggleFavorite,
+  ...htmlProps
+}: DataSourceCardProps) {
   const theme = useTheme2();
   const styles = getStyles(theme, ds.meta.builtIn);
 
@@ -26,7 +36,19 @@ export function DataSourceCard({ ds, onClick, selected, description, ...htmlProp
           <span className={styles.name}>
             {ds.name} {ds.isDefault ? <TagList tags={['default']} /> : null}
           </span>
-          <small className={styles.type}>{description || ds.meta.name}</small>
+          <div className={styles.rightSection}>
+            <small className={styles.type}>{description || ds.meta.name}</small>
+            {onToggleFavorite && !ds.meta.builtIn && (
+              <Icon
+                name={isFavorite ? 'favorite' : 'star'}
+                onClick={(e) => {
+                  e.stopPropagation();
+                  onToggleFavorite(ds);
+                }}
+                className={styles.favoriteButton}
+              />
+            )}
+          </div>
         </div>
       </Card.Heading>
       <Card.Figure className={styles.logo}>
@@ -66,6 +88,17 @@ function getStyles(theme: GrafanaTheme2, builtIn = false) {
       whiteSpace: 'nowrap',
       display: 'flex',
       justifyContent: 'space-between',
+      alignItems: 'center',
+    }),
+    rightSection: css({
+      display: 'flex',
+      alignItems: 'center',
+      gap: theme.spacing(1),
+      minWidth: 0,
+      flex: 1,
+      justifyContent: 'flex-end',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
     }),
     logo: css({
       width: '32px',
@@ -92,6 +125,11 @@ function getStyles(theme: GrafanaTheme2, builtIn = false) {
       display: 'flex',
       alignItems: 'center',
     }),
+    favoriteButton: css({
+      flexShrink: 0,
+      pointerEvents: 'auto',
+      zIndex: 1,
+    }),
     separator: css({
       margin: theme.spacing(0, 1),
       color: theme.colors.border.weak,
diff --git a/public/app/features/datasources/components/picker/DataSourceList.tsx b/public/app/features/datasources/components/picker/DataSourceList.tsx
index 067c64fb250..a4c60c64055 100644
--- a/public/app/features/datasources/components/picker/DataSourceList.tsx
+++ b/public/app/features/datasources/components/picker/DataSourceList.tsx
@@ -1,12 +1,12 @@
 import { css, cx } from '@emotion/css';
-import { useRef } from 'react';
+import { useCallback, useRef } from 'react';
 import * as React from 'react';
 import { Observable } from 'rxjs';
 
 import { DataSourceInstanceSettings, DataSourceJsonData, DataSourceRef, GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans } from '@grafana/i18n';
-import { getTemplateSrv } from '@grafana/runtime';
+import { config, getTemplateSrv, useFavoriteDatasources } from '@grafana/runtime';
 import { useStyles2, useTheme2 } from '@grafana/ui';
 
 import { useDatasources, useKeyboardNavigatableList, useRecentlyUsedDataSources } from '../../hooks';
@@ -74,6 +74,27 @@ export function DataSourceList(props: DataSourceListProps) {
     });
 
   const [recentlyUsedDataSources, pushRecentlyUsedDataSource] = useRecentlyUsedDataSources();
+
+  const favoriteDataSourcesHook = config.featureToggles.favoriteDatasources ? useFavoriteDatasources() : null;
+  const storedFavoriteDataSources = favoriteDataSourcesHook?.initialFavoriteDataSources;
+  const isFavoriteDatasource = favoriteDataSourcesHook?.isFavoriteDatasource;
+
+  const toggleFavoriteDatasource = useCallback(
+    (ds: DataSourceInstanceSettings) => {
+      if (!favoriteDataSourcesHook) {
+        return;
+      }
+      const { isFavoriteDatasource, addFavoriteDatasource, removeFavoriteDatasource } = favoriteDataSourcesHook;
+
+      if (isFavoriteDatasource(ds.uid)) {
+        removeFavoriteDatasource(ds);
+      } else {
+        addFavoriteDatasource(ds);
+      }
+    },
+    [favoriteDataSourcesHook]
+  );
+
   const filteredDataSources = props.filter ? dataSources.filter(props.filter) : dataSources;
 
   return (
@@ -86,7 +107,14 @@ export function DataSourceList(props: DataSourceListProps) {
         <EmptyState className={styles.emptyState} onClickCTA={onClickEmptyStateCTA} />
       )}
       {filteredDataSources
-        .sort(getDataSourceCompareFn(current, recentlyUsedDataSources, getDataSourceVariableIDs()))
+        .sort(
+          getDataSourceCompareFn(
+            current,
+            recentlyUsedDataSources,
+            getDataSourceVariableIDs(),
+            storedFavoriteDataSources
+          )
+        )
         .map((ds) => (
           <DataSourceCard
             data-testid="data-source-card"
@@ -97,6 +125,8 @@ export function DataSourceList(props: DataSourceListProps) {
               onChange(ds);
             }}
             selected={isDataSourceMatch(ds, current)}
+            isFavorite={isFavoriteDatasource ? isFavoriteDatasource(ds.uid) : undefined}
+            onToggleFavorite={toggleFavoriteDatasource}
             {...(enableKeyboardNavigation ? navigatableProps : {})}
           />
         ))}
diff --git a/public/app/features/datasources/components/picker/utils.test.ts b/public/app/features/datasources/components/picker/utils.test.ts
index 079fc69f9c0..2e80dc03f34 100644
--- a/public/app/features/datasources/components/picker/utils.test.ts
+++ b/public/app/features/datasources/components/picker/utils.test.ts
@@ -77,6 +77,16 @@ describe('getDataSouceCompareFn', () => {
     ] as DataSourceInstanceSettings[]);
   });
 
+  it('sorts favorite datasources first', () => {
+    dataSources.sort(getDataSourceCompareFn(undefined, [], [], ['c', 'a']));
+    expect(dataSources).toEqual([
+      { uid: 'a', name: 'a', meta: { builtIn: true } },
+      { uid: 'c', name: 'c', meta: { builtIn: false } },
+      { uid: 'b', name: 'b', meta: { builtIn: false } },
+      { uid: 'D', name: 'D', meta: { builtIn: false } },
+    ] as DataSourceInstanceSettings[]);
+  });
+
   it('sorts variables before other datasources', () => {
     dataSources.sort(getDataSourceCompareFn(undefined, [], ['c', 'b']));
     expect(dataSources).toEqual([
@@ -87,7 +97,7 @@ describe('getDataSouceCompareFn', () => {
     ] as DataSourceInstanceSettings[]);
   });
 
-  it('sorts datasources current -> recently used -> variables -> others -> built in', () => {
+  it('sorts datasources current -> favorite -> recently used -> variables -> others -> built in', () => {
     const dataSources = [
       { uid: 'a', name: 'a', meta: { builtIn: true } },
       { uid: 'b', name: 'b', meta: { builtIn: false } },
@@ -97,13 +107,13 @@ describe('getDataSouceCompareFn', () => {
       { uid: 'f', name: 'f', meta: { builtIn: false } },
     ] as DataSourceInstanceSettings[];
 
-    dataSources.sort(getDataSourceCompareFn('c', ['b', 'e'], ['d']));
+    dataSources.sort(getDataSourceCompareFn('c', ['b', 'e'], ['d'], ['f']));
     expect(dataSources).toEqual([
       { uid: 'c', name: 'c', meta: { builtIn: false } },
+      { uid: 'f', name: 'f', meta: { builtIn: false } },
       { uid: 'e', name: 'e', meta: { builtIn: false } },
       { uid: 'b', name: 'b', meta: { builtIn: false } },
       { uid: 'D', name: 'D', meta: { builtIn: false } },
-      { uid: 'f', name: 'f', meta: { builtIn: false } },
       { uid: 'a', name: 'a', meta: { builtIn: true } },
     ] as DataSourceInstanceSettings[]);
   });
diff --git a/public/app/features/datasources/components/picker/utils.ts b/public/app/features/datasources/components/picker/utils.ts
index ff987c26f5b..a3a49a453a5 100644
--- a/public/app/features/datasources/components/picker/utils.ts
+++ b/public/app/features/datasources/components/picker/utils.ts
@@ -48,7 +48,8 @@ export function dataSourceLabel(
 export function getDataSourceCompareFn(
   current: DataSourceRef | DataSourceInstanceSettings | string | null | undefined,
   recentlyUsedDataSources: string[],
-  dataSourceVariablesIDs: string[]
+  dataSourceVariablesIDs: string[],
+  favoriteDatasources: string[] = []
 ) {
   const cmpDataSources = (a: DataSourceInstanceSettings, b: DataSourceInstanceSettings) => {
     const nameA = a.name.toUpperCase();
@@ -61,7 +62,19 @@ export function getDataSourceCompareFn(
       return 1;
     }
 
-    // Sort recently used data sources by latest used, but after current.
+    // Sort favorite data sources after current but before recently used.
+    const aIsFavorite = favoriteDatasources.includes(a.uid);
+    const bIsFavorite = favoriteDatasources.includes(b.uid);
+    if (aIsFavorite && !bIsFavorite) {
+      return -1;
+    } else if (bIsFavorite && !aIsFavorite) {
+      return 1;
+    } else if (aIsFavorite && bIsFavorite) {
+      // If both are favorites, sort alphabetically by name.
+      return nameA < nameB ? -1 : 1;
+    }
+
+    // Sort recently used data sources by latest used, but after current and favorites.
     const aIndex = recentlyUsedDataSources.indexOf(a.uid);
     const bIndex = recentlyUsedDataSources.indexOf(b.uid);
     if (aIndex > -1 && aIndex > bIndex) {

From b4d1c136ceca176882478bf6f8f3c01c6df34a85 Mon Sep 17 00:00:00 2001
From: "grafana-pr-automation[bot]"
 <140550294+grafana-pr-automation[bot]@users.noreply.github.com>
Date: Wed, 13 Aug 2025 13:46:14 +0000
Subject: [PATCH 133/243] I18n: Download translations from Crowdin (#109575)

New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 public/locales/cs-CZ/grafana.json   | 42 +++++++++++++++--------------
 public/locales/de-DE/grafana.json   | 40 ++++++++++++++-------------
 public/locales/es-ES/grafana.json   | 40 ++++++++++++++-------------
 public/locales/fr-FR/grafana.json   | 40 ++++++++++++++-------------
 public/locales/hu-HU/grafana.json   | 40 ++++++++++++++-------------
 public/locales/id-ID/grafana.json   | 39 +++++++++++++++------------
 public/locales/it-IT/grafana.json   | 40 ++++++++++++++-------------
 public/locales/ja-JP/grafana.json   | 39 +++++++++++++++------------
 public/locales/ko-KR/grafana.json   | 39 +++++++++++++++------------
 public/locales/nl-NL/grafana.json   | 40 ++++++++++++++-------------
 public/locales/pl-PL/grafana.json   | 42 +++++++++++++++--------------
 public/locales/pt-BR/grafana.json   | 40 ++++++++++++++-------------
 public/locales/pt-PT/grafana.json   | 40 ++++++++++++++-------------
 public/locales/ru-RU/grafana.json   | 42 +++++++++++++++--------------
 public/locales/sv-SE/grafana.json   | 40 ++++++++++++++-------------
 public/locales/tr-TR/grafana.json   | 40 ++++++++++++++-------------
 public/locales/zh-Hans/grafana.json | 39 +++++++++++++++------------
 public/locales/zh-Hant/grafana.json | 39 +++++++++++++++------------
 18 files changed, 396 insertions(+), 325 deletions(-)

diff --git a/public/locales/cs-CZ/grafana.json b/public/locales/cs-CZ/grafana.json
index 664774758dc..a6da0ea84cd 100644
--- a/public/locales/cs-CZ/grafana.json
+++ b/public/locales/cs-CZ/grafana.json
@@ -3545,28 +3545,18 @@
     "browse-view": {
       "this-folder-is-empty": "Tato složka je prázdná"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Všechny zdroje byly úspěšně odstraněny",
-      "all-moved": "Všechny zdroje byly úspěšně přesunuty",
-      "button-done": "Hotovo",
-      "progress-title": "Úspěch",
-      "failed-alert_one": "Počet selhaných položek: {{count}}",
-      "failed-alert_few": "Počet selhaných položek: {{count}}",
-      "failed-alert_many": "Počet selhaných položek: {{count}}",
-      "failed-alert_other": "Počet selhaných položek: {{count}}"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Zrušit",
       "button-delete": "Odstranit",
       "button-deleting": "Probíhá odstraňování…",
       "delete-warning": "Tímto se smažou vybrané složky a všechny jejich podsložky. Celkem to ovlivní:",
-      "error-path-not-found": "Cesta nebyla nalezena"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Zrušit",
       "button-move": "Přesunout",
       "button-moving": "Probíhá přesouvání…",
-      "deleting": "Odstraňování",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3574,13 +3564,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Obsah souboru nebyl nalezen",
-      "error-path-not-found": "Cesta nebyla nalezena",
-      "error-target-folder-path-missing": "Chybí cesta k cílové složce",
-      "error-title": "Chyba cílové složky",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Tímto se přesunou vybrané složky a všechny jejich podsložky. Celkem to ovlivní:",
-      "moving": "V pohybu",
-      "progress": "Průběh: {{current}} z {{total}}",
       "target-folder": "Cílová složka"
     },
     "counts": {
@@ -3606,6 +3592,9 @@
       "total_other": "{{count}} položka"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Sbalit složku {{title}}",
       "expand-folder-button": "Rozbalit složku {{title}}",
       "name-column": "Název",
@@ -4547,12 +4536,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Zobrazit nebo skrýt dynamicky {{type}} podle hodnoty proměnné.",
           "label": "Proměnná šablony",
           "name": "Název",
           "operator": {
             "equals": "Je rovno",
-            "not-equals": "Není rovno"
+            "matches": "",
+            "not-equals": "Není rovno",
+            "not-matches": ""
           },
           "value": "Hodnota"
         }
@@ -5439,6 +5433,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Hledat transformaci",
       "show-images": "Zobrazit obrázky",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Přidejte další transformaci",
       "view-all": "Zobrazit vše"
     },
@@ -11514,8 +11511,13 @@
       "title-repository-is-unhealthy": "Úložiště je nezdravé"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Zdroje nyní najdete ve svém externím úložišti a jsou zajištěny ve vaší instanci. Od nynějška budou vaše instance a externí úložiště synchronizovány.",
-      "view-repository": "Zobrazit úložiště"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Zkontrolováno:",
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index a8269502d11..0adbd50fce1 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -3519,26 +3519,18 @@
     "browse-view": {
       "this-folder-is-empty": "Dieser Ordner ist leer"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Alle Ressourcen wurden erfolgreich gelöscht",
-      "all-moved": "Alle Ressourcen wurden erfolgreich verschoben",
-      "button-done": "Fertig",
-      "progress-title": "Erfolg",
-      "failed-alert_one": "{{count}} Elemente fehlgeschlagen",
-      "failed-alert_other": "{{count}} Elemente fehlgeschlagen"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Abbrechen",
       "button-delete": "Löschen",
       "button-deleting": "Wird gelöscht …",
       "delete-warning": "Dadurch werden ausgewählte Ordner und deren Unterordner gelöscht. Insgesamt betrifft dies:",
-      "error-path-not-found": "Pfad nicht gefunden"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Abbrechen",
       "button-move": "Verschieben",
       "button-moving": "Wird verschoben ...",
-      "deleting": "Wird gelöscht",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,13 +3538,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Dateiinhalt nicht gefunden",
-      "error-path-not-found": "Pfad nicht gefunden",
-      "error-target-folder-path-missing": "Zielordnerpfad fehlt",
-      "error-title": "Zielordnerfehler",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Dadurch werden ausgewählte Ordner und deren Unterordner verschoben. Insgesamt betrifft dies:",
-      "moving": "Wird verschoben",
-      "progress": "Fortschritt: {{current}} von {{total}}",
       "target-folder": "Zielordner"
     },
     "counts": {
@@ -3568,6 +3556,9 @@
       "total_other": "{{count}} Elemente"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Ordner einklappen {{title}}",
       "expand-folder-button": "Ordner ausklappen {{title}}",
       "name-column": "Name",
@@ -4509,12 +4500,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Zeigen oder verbergen Sie {{type}} dynamisch, basierend auf dem Variablenwert.",
           "label": "Vorlagenvariable",
           "name": "Name",
           "operator": {
             "equals": "Gleich",
-            "not-equals": "Ist ungleich"
+            "matches": "",
+            "not-equals": "Ist ungleich",
+            "not-matches": ""
           },
           "value": "Wert"
         }
@@ -5399,6 +5395,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Nach Transformation suchen",
       "show-images": "Bilder anzeigen",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Weitere Transformation hinzufügen",
       "view-all": "Alles anzeigen"
     },
@@ -11442,8 +11441,13 @@
       "title-repository-is-unhealthy": "Repository nicht in Ordnung"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Ihre Ressourcen befinden sich jetzt in Ihrem externen Speicher und werden in Ihrer Instanz bereitgestellt. Von nun an werden Ihre Instanz und der externe Speicher synchronisiert.",
-      "view-repository": "Repository anzeigen"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Geprüft:",
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index 53931415e45..a2dc9c7d73a 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -3519,26 +3519,18 @@
     "browse-view": {
       "this-folder-is-empty": "Esta carpeta está vacía"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Todos los recursos se han eliminado correctamente",
-      "all-moved": "Todos los recursos se han movido correctamente",
-      "button-done": "Hecho",
-      "progress-title": "Completado",
-      "failed-alert_one": "{{count}} elementos fallidos",
-      "failed-alert_other": "{{count}} elementos fallidos"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Cancelar",
       "button-delete": "Eliminar",
       "button-deleting": "Eliminando...",
       "delete-warning": "Esto eliminará las carpetas seleccionadas y sus subcarpetas. En total, esto afectará a:",
-      "error-path-not-found": "Ruta no encontrada"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Cancelar",
       "button-move": "Mover",
       "button-moving": "Moviendo...",
-      "deleting": "Eliminando",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,13 +3538,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Contenido de archivo no encontrado",
-      "error-path-not-found": "Ruta no encontrada",
-      "error-target-folder-path-missing": "Falta la ruta de la carpeta de destino",
-      "error-title": "Error de carpeta de destino",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Esto moverá las carpetas seleccionadas y sus subcarpetas. En total, esto afectará a:",
-      "moving": "Moviendo",
-      "progress": "Progreso: {{current}} de {{total}}",
       "target-folder": "Carpeta de destino"
     },
     "counts": {
@@ -3568,6 +3556,9 @@
       "total_other": "{{count}} elementos"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Contraer la carpeta {{title}}",
       "expand-folder-button": "Expandir la carpeta {{title}}",
       "name-column": "Nombre",
@@ -4509,12 +4500,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Muestra u oculta el {{type}} dinámicamente en función del valor de la variable.",
           "label": "Variable de plantilla",
           "name": "Nombre",
           "operator": {
             "equals": "Igual a",
-            "not-equals": "No es igual a"
+            "matches": "",
+            "not-equals": "No es igual a",
+            "not-matches": ""
           },
           "value": "Valor"
         }
@@ -5399,6 +5395,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Buscar transformación",
       "show-images": "Mostrar imágenes",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Añadir otra transformación",
       "view-all": "Ver todo"
     },
@@ -11442,8 +11441,13 @@
       "title-repository-is-unhealthy": "El repositorio no está en buen estado"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Tus recursos están ahora en tu almacenamiento externo y aprovisionados en tu instancia. A partir de ahora, tu instancia y el almacenamiento externo estarán sincronizados.",
-      "view-repository": "Ver repositorio"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Revisado:",
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 7949ee8e771..296906ad52d 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -3519,26 +3519,18 @@
     "browse-view": {
       "this-folder-is-empty": "Ce dossier est vide"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Toutes les ressources ont été supprimées avec succès",
-      "all-moved": "Toutes les ressources ont été déplacées avec succès",
-      "button-done": "Terminé",
-      "progress-title": "Succès",
-      "failed-alert_one": "{{count}} éléments ont échoué",
-      "failed-alert_other": "{{count}} éléments ont échoué"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Annuler",
       "button-delete": "Supprimer",
       "button-deleting": "Suppression en cours…",
       "delete-warning": "Cette opération supprimera les dossiers sélectionnés ainsi que leur contenu. Au total, cela affectera :",
-      "error-path-not-found": "Chemin introuvable"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Annuler",
       "button-move": "Déplacer",
       "button-moving": "Déplacement en cours…",
-      "deleting": "Suppression en cours",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,13 +3538,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Contenu du fichier introuvable",
-      "error-path-not-found": "Chemin introuvable",
-      "error-target-folder-path-missing": "Le chemin du dossier de destination est manquant",
-      "error-title": "Erreur de dossier de destination",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Cette opération déplacera les dossiers sélectionnés ainsi que leur contenu. Au total, cela affectera :",
-      "moving": "Déplacement en cours",
-      "progress": "Progression : {{current}} sur {{total}}",
       "target-folder": "Dossier de destination"
     },
     "counts": {
@@ -3568,6 +3556,9 @@
       "total_other": "{{count}} objets"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Réduire le dossier {{title}}",
       "expand-folder-button": "Développer le dossier {{title}}",
       "name-column": "Nom",
@@ -4509,12 +4500,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Afficher ou masquer le {{type}} de manière dynamique en fonction de la valeur de la variable.",
           "label": "Variable de modèle",
           "name": "Nom",
           "operator": {
             "equals": "Égal à",
-            "not-equals": "Inégaux"
+            "matches": "",
+            "not-equals": "Inégaux",
+            "not-matches": ""
           },
           "value": "Valeur"
         }
@@ -5399,6 +5395,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Rechercher une transformation",
       "show-images": "Afficher les images",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Ajouter une autre transformation",
       "view-all": "Tout afficher"
     },
@@ -11442,8 +11441,13 @@
       "title-repository-is-unhealthy": "Le référentiel est en mauvais état"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Vos ressources sont maintenant dans votre stockage externe et mises en service dans votre instance. À partir de maintenant, votre instance et le stockage externe seront synchronisés.",
-      "view-repository": "Afficher le référentiel"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Vérifié :",
diff --git a/public/locales/hu-HU/grafana.json b/public/locales/hu-HU/grafana.json
index b80b0776e1e..cc492f27354 100644
--- a/public/locales/hu-HU/grafana.json
+++ b/public/locales/hu-HU/grafana.json
@@ -3519,26 +3519,18 @@
     "browse-view": {
       "this-folder-is-empty": "A mappa üres"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Minden erőforrás sikeresen törölve lett",
-      "all-moved": "Minden erőforrás sikeresen áthelyezve",
-      "button-done": "Kész",
-      "progress-title": "Sikerült",
-      "failed-alert_one": "{{count}} sikertelen elem",
-      "failed-alert_other": "{{count}} sikertelen elem"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Mégse",
       "button-delete": "Törlés",
       "button-deleting": "Törlés...",
       "delete-warning": "Ezzel a művelettel törli a kijelölt mappákat és minden almappájukat. Összességében ez a következőket érinti:",
-      "error-path-not-found": "Az elérési út nem található"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Mégse",
       "button-move": "Áthelyezés",
       "button-moving": "Áthelyezés...",
-      "deleting": "Törlés",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,13 +3538,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "A fájl tartalma nem található",
-      "error-path-not-found": "Az elérési út nem található",
-      "error-target-folder-path-missing": "A célmappa elérési útvonala hiányzik",
-      "error-title": "Célmappával kapcsolatos hiba",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Ezzel a művelettel áthelyezi a kijelölt mappákat és minden almappájukat. Összességében ez a következőket érinti:",
-      "moving": "Mozgás",
-      "progress": "Haladás: {{total}}/{{current}}",
       "target-folder": "Célmappa"
     },
     "counts": {
@@ -3568,6 +3556,9 @@
       "total_other": "{{count}} tétel"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "{{title}} mappa összecsukása",
       "expand-folder-button": "{{title}} mappa kibontása",
       "name-column": "Név",
@@ -4509,12 +4500,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "A(z) {{type}} dinamikus megjelenítése vagy elrejtése a változóérték alapján.",
           "label": "Sablonváltozó",
           "name": "Név",
           "operator": {
             "equals": "Egyenlő",
-            "not-equals": "Nem egyenlő"
+            "matches": "",
+            "not-equals": "Nem egyenlő",
+            "not-matches": ""
           },
           "value": "Érték"
         }
@@ -5399,6 +5395,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Transzformáció keresése",
       "show-images": "Képek megjelenítése",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Másik transzformáció hozzáadása",
       "view-all": "Összes megjelenítése"
     },
@@ -11442,8 +11441,13 @@
       "title-repository-is-unhealthy": "Az adattár állapota nem megfelelő"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Az erőforrások most a külső tárolóban vannak, és ki lettek építve a példányba. Mostantól a rendszer szinkronizálja a példányt és a külső tárolót.",
-      "view-repository": "Adattár megtekintése"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Ellenőrzés:",
diff --git a/public/locales/id-ID/grafana.json b/public/locales/id-ID/grafana.json
index 27aba8d5dee..1d30de5090f 100644
--- a/public/locales/id-ID/grafana.json
+++ b/public/locales/id-ID/grafana.json
@@ -3506,25 +3506,18 @@
     "browse-view": {
       "this-folder-is-empty": "Folder ini kosong"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Semua sumber daya telah berhasil dihapus",
-      "all-moved": "Semua sumber daya telah berhasil dipindahkan",
-      "button-done": "Selesai",
-      "progress-title": "Berhasil",
-      "failed-alert_other": "{{count}} item gagal"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Batal",
       "button-delete": "Hapus",
       "button-deleting": "Menghapus...",
       "delete-warning": "Ini akan menghapus folder yang dipilih dan turunannya. Secara keseluruhan, ini akan memengaruhi:",
-      "error-path-not-found": "Jalur tidak ditemukan"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Batal",
       "button-move": "Pindahkan",
       "button-moving": "Memindahkan...",
-      "deleting": "Menghapus",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3532,13 +3525,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Isi file tidak ditemukan",
-      "error-path-not-found": "Jalur tidak ditemukan",
-      "error-target-folder-path-missing": "Jalur folder target tidak ada",
-      "error-title": "Kesalahan Folder Target",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Ini akan memindahkan folder yang dipilih dan turunannya. Secara keseluruhan, ini akan memengaruhi:",
-      "moving": "Memindahkan",
-      "progress": "Kemajuan: {{current}} dari {{total}}",
       "target-folder": "Folder Target"
     },
     "counts": {
@@ -3549,6 +3538,9 @@
       "total_other": "{{count}} item"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Ciutkan folder {{title}}",
       "expand-folder-button": "Perluas folder {{title}}",
       "name-column": "Nama",
@@ -4490,12 +4482,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Tampilkan atau sembunyikan {{type}} secara dinamis berdasarkan nilai variabel.",
           "label": "Variabel templat",
           "name": "Nama",
           "operator": {
             "equals": "Sama dengan",
-            "not-equals": "Tidak setara"
+            "matches": "",
+            "not-equals": "Tidak setara",
+            "not-matches": ""
           },
           "value": "Nilai"
         }
@@ -5379,6 +5376,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Cari transformasi",
       "show-images": "Tampilkan gambar",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Tambah transformasi lain",
       "view-all": "Lihat semua"
     },
@@ -11406,8 +11406,13 @@
       "title-repository-is-unhealthy": "Repositori tidak sehat"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Sumber daya Anda sekarang berada di penyimpanan eksternal dan disediakan ke instans Anda. Mulai sekarang, instans Anda dan penyimpanan eksternal akan disinkronkan.",
-      "view-repository": "Lihat repositori"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Diperiksa:",
diff --git a/public/locales/it-IT/grafana.json b/public/locales/it-IT/grafana.json
index e773a15a6b9..93daf4871c2 100644
--- a/public/locales/it-IT/grafana.json
+++ b/public/locales/it-IT/grafana.json
@@ -3519,26 +3519,18 @@
     "browse-view": {
       "this-folder-is-empty": "Questa cartella è vuota"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Tutte le risorse sono state eliminate correttamente",
-      "all-moved": "Tutte le risorse sono state spostate correttamente",
-      "button-done": "Fine",
-      "progress-title": "Operazione riuscita",
-      "failed-alert_one": "{{count}} elementi non riusciti",
-      "failed-alert_other": "{{count}} elementi non riusciti"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Annulla",
       "button-delete": "Elimina",
       "button-deleting": "Eliminazione in corso...",
       "delete-warning": "Questa operazione eliminerà le cartelle selezionate e i relativi discendenti. In totale, questo influenzerà:",
-      "error-path-not-found": "Percorso non trovato"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Annulla",
       "button-move": "Sposta",
       "button-moving": "Spostamento in corso...",
-      "deleting": "Eliminazione",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,13 +3538,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Contenuto del file non trovato",
-      "error-path-not-found": "Percorso non trovato",
-      "error-target-folder-path-missing": "Percorso della cartella di destinazione mancante",
-      "error-title": "Errore cartella di destinazione",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Questa operazione sposterà le cartelle selezionate e i relativi discendenti. In totale, questo influenzerà:",
-      "moving": "Spostamento",
-      "progress": "Avanzamento: {{current}} di {{total}}",
       "target-folder": "Cartella di destinazione"
     },
     "counts": {
@@ -3568,6 +3556,9 @@
       "total_other": "{{count}} articoli"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Comprimi cartella {{title}}",
       "expand-folder-button": "Espandi cartella {{title}}",
       "name-column": "Nome",
@@ -4509,12 +4500,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Mostra o nascondi {{type}} dinamicamente in base al valore della variabile.",
           "label": "Variabile del modello",
           "name": "Nome",
           "operator": {
             "equals": "Uguale",
-            "not-equals": "Non uguale"
+            "matches": "",
+            "not-equals": "Non uguale",
+            "not-matches": ""
           },
           "value": "Valore"
         }
@@ -5399,6 +5395,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Cerca trasformazione",
       "show-images": "Mostra immagini",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Aggiungi un'altra trasformazione",
       "view-all": "Visualizza tutto"
     },
@@ -11442,8 +11441,13 @@
       "title-repository-is-unhealthy": "Il repository non è integro"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Le tue risorse sono ora nella tua memoria esterna e fornite nella tua istanza. D'ora in poi, l'istanza e la memoria esterna saranno sincronizzate.",
-      "view-repository": "Visualizza repository"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Verificato:",
diff --git a/public/locales/ja-JP/grafana.json b/public/locales/ja-JP/grafana.json
index 360ac869e8b..a95dba8e7b1 100644
--- a/public/locales/ja-JP/grafana.json
+++ b/public/locales/ja-JP/grafana.json
@@ -3506,25 +3506,18 @@
     "browse-view": {
       "this-folder-is-empty": "このフォルダは空です"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "すべてのリソースが正常に削除されました",
-      "all-moved": "すべてのリソースが正常に移動されました",
-      "button-done": "完了",
-      "progress-title": "成功",
-      "failed-alert_other": "{{count}}件の項目が失敗しました"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "キャンセル",
       "button-delete": "削除",
       "button-deleting": "削除中…",
       "delete-warning": "これにより、選択したフォルダとその子フォルダが削除されます。影響のある項目は次のとおりです。",
-      "error-path-not-found": "パスが見つかりませんでした"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "キャンセル",
       "button-move": "移動",
       "button-moving": "移動中…",
-      "deleting": "削除しています",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3532,13 +3525,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "ファイルコンテンツが見つかりません。",
-      "error-path-not-found": "パスが見つかりませんでした",
-      "error-target-folder-path-missing": "ターゲットフォルダパスが見つかりません",
-      "error-title": "ターゲットフォルダエラー",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "これにより、選択したフォルダとその子フォルダが移動されます。影響のある項目は次のとおりです。",
-      "moving": "移動中…",
-      "progress": "進捗状況：{{current}}/{{total}}",
       "target-folder": "移動先フォルダ"
     },
     "counts": {
@@ -3549,6 +3538,9 @@
       "total_other": "{{count}}個のアイテム"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "フォルダ{{title}}を折りたたむ",
       "expand-folder-button": "フォルダ{{title}}を展開する",
       "name-column": "名前",
@@ -4490,12 +4482,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "変数の値に基づいて{{type}}を動的に表示または非表示にします。",
           "label": "テンプレート変数",
           "name": "名前",
           "operator": {
             "equals": "等しい",
-            "not-equals": "等しくない"
+            "matches": "",
+            "not-equals": "等しくない",
+            "not-matches": ""
           },
           "value": "値"
         }
@@ -5379,6 +5376,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "変換を検索",
       "show-images": "画像を表示",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "別の変換を追加",
       "view-all": "すべて表示"
     },
@@ -11406,8 +11406,13 @@
       "title-repository-is-unhealthy": "リポジトリに問題があります"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "リソースが外部ストレージに保存され、インスタンスにプロビジョニングされました。今後、インスタンスと外部ストレージは同期されます。",
-      "view-repository": "リポジトリを表示"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "確認済み：",
diff --git a/public/locales/ko-KR/grafana.json b/public/locales/ko-KR/grafana.json
index 16f880b5743..d345bfa6f5c 100644
--- a/public/locales/ko-KR/grafana.json
+++ b/public/locales/ko-KR/grafana.json
@@ -3506,25 +3506,18 @@
     "browse-view": {
       "this-folder-is-empty": "이 폴더는 비어 있습니다"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "모든 리소스가 성공적으로 삭제되었습니다",
-      "all-moved": "모든 리소스가 성공적으로 이동되었습니다",
-      "button-done": "완료됨",
-      "progress-title": "성공",
-      "failed-alert_other": "{{count}}개 항목 실패"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "취소",
       "button-delete": "삭제",
       "button-deleting": "삭제 중…",
       "delete-warning": "이렇게 하면 선택하신 폴더와 하위 폴더가 삭제되며, 전체적으로 다음에 영향을 미칩니다.",
-      "error-path-not-found": "경로를 찾을 수 없습니다"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "취소",
       "button-move": "이동",
       "button-moving": "이동 중...",
-      "deleting": "삭제 중",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3532,13 +3525,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "파일 내용을 찾을 수 없습니다",
-      "error-path-not-found": "경로를 찾을 수 없습니다",
-      "error-target-folder-path-missing": "대상 폴더 경로가 누락되었습니다",
-      "error-title": "대상 폴더 오류",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "이렇게 하면 선택하신 폴더와 하위 폴더가 이동되며, 전체적으로 다음에 영향을 미칩니다.",
-      "moving": "이동 중",
-      "progress": "진행 상태: {{current}}/{{total}}",
       "target-folder": "대상 폴더"
     },
     "counts": {
@@ -3549,6 +3538,9 @@
       "total_other": "항목 {{count}}개"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "{{title}} 폴더 접기",
       "expand-folder-button": "{{title}} 폴더 펼치기",
       "name-column": "이름",
@@ -4490,12 +4482,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "변수 값에 따라 {{type}}을(를) 동적으로 표시하거나 숨깁니다.",
           "label": "템플릿 변수",
           "name": "이름",
           "operator": {
             "equals": "동일함",
-            "not-equals": "다음과 동일하지 않음"
+            "matches": "",
+            "not-equals": "다음과 동일하지 않음",
+            "not-matches": ""
           },
           "value": "값"
         }
@@ -5379,6 +5376,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "변환 검색",
       "show-images": "이미지 표시",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "다른 변환 추가",
       "view-all": "모두 보기"
     },
@@ -11406,8 +11406,13 @@
       "title-repository-is-unhealthy": "리포지토리 상태가 좋지 않습니다"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "이제 리소스가 외부 스토리지에 있으며 인스턴스에 프로비저닝됩니다. 이제부터 인스턴스와 외부 스토리지가 동기화됩니다.",
-      "view-repository": "리포지토리 보기"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "확인됨:",
diff --git a/public/locales/nl-NL/grafana.json b/public/locales/nl-NL/grafana.json
index 2e56446af01..4fc94354a24 100644
--- a/public/locales/nl-NL/grafana.json
+++ b/public/locales/nl-NL/grafana.json
@@ -3519,26 +3519,18 @@
     "browse-view": {
       "this-folder-is-empty": "Deze map is leeg"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Alle bronnen zijn verwijderd",
-      "all-moved": "Alle bronnen zijn verplaatst",
-      "button-done": "Gereed",
-      "progress-title": "Succes",
-      "failed-alert_one": "{{count}} items mislukt",
-      "failed-alert_other": "{{count}} items mislukt"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Annuleren",
       "button-delete": "Verwijderen",
       "button-deleting": "Bezig met verwijderen...",
       "delete-warning": "Hiermee worden geselecteerde mappen en hun afgeleiden verwijderd. In totaal heeft dit invloed op:",
-      "error-path-not-found": "Pad niet gevonden"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Annuleren",
       "button-move": "Verplaatsen",
       "button-moving": "Bezig met verplaatsen...",
-      "deleting": "Verwijderen",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,13 +3538,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Bestandcontent niet gevonden",
-      "error-path-not-found": "Pad niet gevonden",
-      "error-target-folder-path-missing": "Pad naar doelmap ontbreekt",
-      "error-title": "Fout in doelmap",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Hiermee worden geselecteerde mappen en hun afgeleiden verwijderd. In totaal heeft dit invloed op:",
-      "moving": "Verplaatsen",
-      "progress": "Voortgang: {{current}} van {{total}}",
       "target-folder": "Doelmap"
     },
     "counts": {
@@ -3568,6 +3556,9 @@
       "total_other": "{{count}} item"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Map {{title}} samenvouwen",
       "expand-folder-button": "Map {{title}} uitvouwen",
       "name-column": "Naam",
@@ -4509,12 +4500,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "{{type}} dynamisch weergeven of verbergen op basis van de variabele waarde.",
           "label": "Sjabloonvariabele",
           "name": "Naam",
           "operator": {
             "equals": "Gelijk aan",
-            "not-equals": "Is niet gelijk"
+            "matches": "",
+            "not-equals": "Is niet gelijk",
+            "not-matches": ""
           },
           "value": "Waarde"
         }
@@ -5399,6 +5395,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Transformatie zoeken",
       "show-images": "Afbeeldingen weergeven",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Nog een transformatie toevoegen",
       "view-all": "Alles bekijken"
     },
@@ -11442,8 +11441,13 @@
       "title-repository-is-unhealthy": "Repository is ongezond"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Je bronnen bevinden zich nu in je externe opslag en zijn ingericht in je instantie. Vanaf nu worden je instantie en de externe opslag gesynchroniseerd.",
-      "view-repository": "Repository weergeven"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Gecontroleerd:",
diff --git a/public/locales/pl-PL/grafana.json b/public/locales/pl-PL/grafana.json
index 405bba36e8f..67bae129d95 100644
--- a/public/locales/pl-PL/grafana.json
+++ b/public/locales/pl-PL/grafana.json
@@ -3545,28 +3545,18 @@
     "browse-view": {
       "this-folder-is-empty": "Ten folder jest pusty"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Wszystkie zasoby zostały usunięte",
-      "all-moved": "Wszystkie zasoby zostały przeniesione",
-      "button-done": "Gotowe",
-      "progress-title": "Powodzenie",
-      "failed-alert_one": "{{count}} element zakończył się niepowodzeniem",
-      "failed-alert_few": "{{count}} elementy zakończyły się niepowodzeniem",
-      "failed-alert_many": "{{count}} elementów zakończyło się niepowodzeniem",
-      "failed-alert_other": "{{count}} elementu zakończyło się niepowodzeniem"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Anuluj",
       "button-delete": "Usuń",
       "button-deleting": "Usuwanie…",
       "delete-warning": "Spowoduje to usunięcie wybranych folderów i ich elementów podrzędnych. Wpłynie to na następujące elementy:",
-      "error-path-not-found": "Nie znaleziono ścieżki"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Anuluj",
       "button-move": "Przenieś",
       "button-moving": "Przenoszenie…",
-      "deleting": "Usuwanie",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3574,13 +3564,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Nie znaleziono treści pliku",
-      "error-path-not-found": "Nie znaleziono ścieżki",
-      "error-target-folder-path-missing": "Brak ścieżki do folderu docelowego",
-      "error-title": "Błąd folderu docelowego",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Spowoduje to przeniesienie wybranych folderów i ich elementów podrzędnych. Wpłynie to na następujące elementy:",
-      "moving": "Przenoszenie",
-      "progress": "Postęp: {{current}} z {{total}}",
       "target-folder": "Folder docelowy"
     },
     "counts": {
@@ -3606,6 +3592,9 @@
       "total_other": "{{count}} elementu"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Zwiń folder {{title}}",
       "expand-folder-button": "Rozwiń folder {{title}}",
       "name-column": "Nazwa",
@@ -4547,12 +4536,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Pokaż lub ukryj elementy {{type}} dynamicznie na podstawie wartości zmiennej.",
           "label": "Zmienna szablonu",
           "name": "Imię",
           "operator": {
             "equals": "Równa",
-            "not-equals": "Nie równa się"
+            "matches": "",
+            "not-equals": "Nie równa się",
+            "not-matches": ""
           },
           "value": "Wartość"
         }
@@ -5439,6 +5433,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Szukaj transformacji",
       "show-images": "Pokaż obrazki",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Dodaj inną transformację",
       "view-all": "Wyświetl wszystko"
     },
@@ -11514,8 +11511,13 @@
       "title-repository-is-unhealthy": "Repozytorium jest niesprawne"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Zasoby znajdują się teraz w zewnętrznej pamięci masowej i są udostępniane w instancji. Od teraz Twoja instancja i zewnętrzna pamięć masowa będą zsynchronizowane.",
-      "view-repository": "Wyświetl repozytorium"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Sprawdzone:",
diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json
index 223843336b4..da0a7ce7c20 100644
--- a/public/locales/pt-BR/grafana.json
+++ b/public/locales/pt-BR/grafana.json
@@ -3519,26 +3519,18 @@
     "browse-view": {
       "this-folder-is-empty": "Esta pasta está vazia"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Todos os recursos foram excluídos com sucesso",
-      "all-moved": "Todos os recursos foram movidos com sucesso",
-      "button-done": "Concluído",
-      "progress-title": "Sucesso",
-      "failed-alert_one": "{{count}} itens falharam",
-      "failed-alert_other": "{{count}} itens falharam"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Cancelar",
       "button-delete": "Excluir",
       "button-deleting": "Excluindo…",
       "delete-warning": "Isso excluirá as pastas selecionadas e as subpastas delas. No total, isso afetará:",
-      "error-path-not-found": "Diretório não encontrado"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Cancelar",
       "button-move": "Mover",
       "button-moving": "Movendo…",
-      "deleting": "Excluindo",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,13 +3538,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Conteúdo do arquivo não encontrado",
-      "error-path-not-found": "Diretório não encontrado",
-      "error-target-folder-path-missing": "O diretório da pasta de destino está ausente",
-      "error-title": "Erro na pasta de destino",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Isso moverá as pastas selecionadas e as subpastas delas. No total, isso afetará:",
-      "moving": "Movendo",
-      "progress": "Progresso: {{current}} de {{total}}",
       "target-folder": "Pasta de destino"
     },
     "counts": {
@@ -3568,6 +3556,9 @@
       "total_other": "{{count}} itens"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Recolher pasta {{title}}",
       "expand-folder-button": "Expandir pasta {{title}}",
       "name-column": "Nome",
@@ -4509,12 +4500,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Mostre ou oculte {{type}} dinamicamente com base no valor da variável.",
           "label": "Variável de modelo",
           "name": "Nome",
           "operator": {
             "equals": "Iguais",
-            "not-equals": "Não igual a"
+            "matches": "",
+            "not-equals": "Não igual a",
+            "not-matches": ""
           },
           "value": "Valor"
         }
@@ -5399,6 +5395,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Pesquisar por transformação",
       "show-images": "Exibir imagens",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Adicionar outra transformação",
       "view-all": "Ver tudo"
     },
@@ -11442,8 +11441,13 @@
       "title-repository-is-unhealthy": "O repositório está instável"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Seus recursos estão agora no seu armazenamento externo e foram provisionados na sua instância. A partir de agora, sua instância e o armazenamento externo serão sincronizados.",
-      "view-repository": "Visualizar repositório"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Verificado:",
diff --git a/public/locales/pt-PT/grafana.json b/public/locales/pt-PT/grafana.json
index 68e97326cdc..4654ef9a6c5 100644
--- a/public/locales/pt-PT/grafana.json
+++ b/public/locales/pt-PT/grafana.json
@@ -3519,26 +3519,18 @@
     "browse-view": {
       "this-folder-is-empty": "Esta pasta está vazia"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Todos os recursos foram eliminados com sucesso",
-      "all-moved": "Todos os recursos foram movidos com sucesso",
-      "button-done": "Concluído",
-      "progress-title": "Sucesso",
-      "failed-alert_one": "{{count}} elementos falharam",
-      "failed-alert_other": "{{count}} elementos falharam"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Cancelar",
       "button-delete": "Eliminar",
       "button-deleting": "A eliminar...",
       "delete-warning": "Isto eliminará as pastas selecionadas e as suas descendentes. No total, isto afetará:",
-      "error-path-not-found": "Caminho não encontrado"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Cancelar",
       "button-move": "Mover",
       "button-moving": "A mover...",
-      "deleting": "A eliminar",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,13 +3538,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Conteúdo do ficheiro não encontrado",
-      "error-path-not-found": "Caminho não encontrado",
-      "error-target-folder-path-missing": "O caminho da pasta de destino está em falta",
-      "error-title": "Erro de pasta de destino",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Isto eliminará as pastas selecionadas e as suas descendentes. No total, isto afetará:",
-      "moving": "Mudança de local",
-      "progress": "Progresso: {{current}} de {{total}}",
       "target-folder": "Pasta de destino"
     },
     "counts": {
@@ -3568,6 +3556,9 @@
       "total_other": "{{count}} elementos"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Recolher pasta {{title}}",
       "expand-folder-button": "Expandir pasta {{title}}",
       "name-column": "Nome",
@@ -4509,12 +4500,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Mostrar ou ocultar o elemento {{type}} de forma dinâmica com base no valor da variável.",
           "label": "Variável do modelo",
           "name": "Nome",
           "operator": {
             "equals": "Igual a",
-            "not-equals": "Não é igual a"
+            "matches": "",
+            "not-equals": "Não é igual a",
+            "not-matches": ""
           },
           "value": "Valor"
         }
@@ -5399,6 +5395,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Pesquisar por transformação",
       "show-images": "Mostrar imagens",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Adicionar outra transformação",
       "view-all": "Ver tudo"
     },
@@ -11442,8 +11441,13 @@
       "title-repository-is-unhealthy": "O repositório não está em bom estado"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Os seus recursos estão agora no seu armazenamento externo e aprovisionados na sua instância. A partir de agora, a sua instância e o armazenamento externo serão sincronizados.",
-      "view-repository": "Ver repositório"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Verificado:",
diff --git a/public/locales/ru-RU/grafana.json b/public/locales/ru-RU/grafana.json
index 68a4978e25b..ec7a3f152d0 100644
--- a/public/locales/ru-RU/grafana.json
+++ b/public/locales/ru-RU/grafana.json
@@ -3545,28 +3545,18 @@
     "browse-view": {
       "this-folder-is-empty": "Папка пуста"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Все ресурсы удалены",
-      "all-moved": "Все ресурсы перемещены",
-      "button-done": "Готово",
-      "progress-title": "Выполнено",
-      "failed-alert_one": "Ошибка при обработке {{count}} элемента",
-      "failed-alert_few": "Ошибка при обработке {{count}} элементов",
-      "failed-alert_many": "Ошибка при обработке {{count}} элементов",
-      "failed-alert_other": "Ошибка при обработке {{count}} элемента"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Отмена",
       "button-delete": "Удалить",
       "button-deleting": "Удаление...",
       "delete-warning": "Будут удалены выбранные папки и их дочерние элементы. В общей сложности будет удалено:",
-      "error-path-not-found": "Путь не найден"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Отмена",
       "button-move": "Переместить",
       "button-moving": "Перемещение...",
-      "deleting": "Удаление",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3574,13 +3564,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Содержимое файла не найдено",
-      "error-path-not-found": "Путь не найден",
-      "error-target-folder-path-missing": "Путь к целевой папке отсутствует",
-      "error-title": "Ошибка в целевой папке",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Будут перемещены выбранные папки и их дочерние элементы. В общей сложности будет перемещено:",
-      "moving": "Перемещение",
-      "progress": "Прогресс: {{current}} из {{total}}",
       "target-folder": "Целевая папка"
     },
     "counts": {
@@ -3606,6 +3592,9 @@
       "total_other": "{{count}} элемента"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Свернуть папку {{title}}",
       "expand-folder-button": "Развернуть папку {{title}}",
       "name-column": "Имя",
@@ -4547,12 +4536,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Динамически показывать или скрывать {{type}} в зависимости от значения переменной.",
           "label": "Переменная шаблона",
           "name": "Имя",
           "operator": {
             "equals": "Равно",
-            "not-equals": "Не равно"
+            "matches": "",
+            "not-equals": "Не равно",
+            "not-matches": ""
           },
           "value": "Значение"
         }
@@ -5439,6 +5433,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Поиск преобразования",
       "show-images": "Показать изображения",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Добавление другого преобразования",
       "view-all": "Просмотреть все"
     },
@@ -11514,8 +11511,13 @@
       "title-repository-is-unhealthy": "Репозиторий неисправен"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Теперь ваши ресурсы находятся во внешнем хранилище и подготовлены для вашего экземпляра. С этого момента ваш экземпляр и внешнее хранилище будут синхронизироваться.",
-      "view-repository": "Просмотр репозитория"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Проверено:",
diff --git a/public/locales/sv-SE/grafana.json b/public/locales/sv-SE/grafana.json
index be98fb25436..2c84ac80593 100644
--- a/public/locales/sv-SE/grafana.json
+++ b/public/locales/sv-SE/grafana.json
@@ -3519,26 +3519,18 @@
     "browse-view": {
       "this-folder-is-empty": "Denna mapp är tom"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Alla resurser har raderats",
-      "all-moved": "Alla resurser flyttades korrekt",
-      "button-done": "Klar",
-      "progress-title": "Lyckades",
-      "failed-alert_one": "{{count}} objekt misslyckades",
-      "failed-alert_other": "{{count}} objekt misslyckades"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "Avbryt",
       "button-delete": "Radera",
       "button-deleting": "Tar bort …",
       "delete-warning": "Detta kommer att radera valda mappar och alla underordnade mappar. Totalt kommer detta att påverka:",
-      "error-path-not-found": "Sökvägen hittades inte"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "Avbryt",
       "button-move": "Flytta",
       "button-moving": "Flyttar …",
-      "deleting": "Raderar",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,13 +3538,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Filinnehåll hittades inte",
-      "error-path-not-found": "Sökvägen hittades inte",
-      "error-target-folder-path-missing": "Sökväg till målmappen saknas",
-      "error-title": "Fel i målmappen",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Detta kommer att flytta valda mappar och alla underordnade mappar. Totalt kommer detta att påverka:",
-      "moving": "Flyttar",
-      "progress": "Förlopp: {{current}} av {{total}}",
       "target-folder": "Målkatalog"
     },
     "counts": {
@@ -3568,6 +3556,9 @@
       "total_other": "{{count}} objekt"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "Dölj mapp {{title}}",
       "expand-folder-button": "Expandera mapp {{title}}",
       "name-column": "Namn",
@@ -4509,12 +4500,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Visa eller dölj {{type}} dynamiskt baserat på variabelvärdet.",
           "label": "Mallvariabel",
           "name": "Namn",
           "operator": {
             "equals": "Är lika med",
-            "not-equals": "Inte lika med"
+            "matches": "",
+            "not-equals": "Inte lika med",
+            "not-matches": ""
           },
           "value": "Värde"
         }
@@ -5399,6 +5395,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Sök efter transformering",
       "show-images": "Visa bilder",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Lägg till ytterligare en transformering",
       "view-all": "Visa alla"
     },
@@ -11442,8 +11441,13 @@
       "title-repository-is-unhealthy": "Lagringsplatsen är ohälsosam"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Dina resurser finns nu i din externa lagring och provisioneras till din instans. Från och med nu kommer din instans och den externa lagringen att synkroniseras.",
-      "view-repository": "Visa lagringsplats"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Kontrollerad:",
diff --git a/public/locales/tr-TR/grafana.json b/public/locales/tr-TR/grafana.json
index d1ca031350d..507fe49043f 100644
--- a/public/locales/tr-TR/grafana.json
+++ b/public/locales/tr-TR/grafana.json
@@ -3519,26 +3519,18 @@
     "browse-view": {
       "this-folder-is-empty": "Klasör boş"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "Tüm kaynaklar başarıyla silindi",
-      "all-moved": "Tüm kaynaklar başarıyla taşındı",
-      "button-done": "Tamamlandı",
-      "progress-title": "Başarılı",
-      "failed-alert_one": "{{count}} öge başarısız oldu",
-      "failed-alert_other": "{{count}} öge başarısız oldu"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "İptal et",
       "button-delete": "Sil",
       "button-deleting": "Siliniyor...",
       "delete-warning": "Bu işlem, seçilen klasörleri ve alt öğelerini silecektir. Bu işlem toplamda şunları etkileyecektir:",
-      "error-path-not-found": "Yol bulunamadı"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "İptal et",
       "button-move": "Taşı",
       "button-moving": "Taşınıyor...",
-      "deleting": "Siliniyor",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3546,13 +3538,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "Dosya içeriği bulunamadı",
-      "error-path-not-found": "Yol bulunamadı",
-      "error-target-folder-path-missing": "Hedef klasör yolu eksik",
-      "error-title": "Hedef Klasör Hatası",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "Bu işlem, seçilen klasörleri ve alt öğelerini taşıyacaktır. Bu işlem toplamda şunları etkileyecektir:",
-      "moving": "Taşınıyor",
-      "progress": "İlerleme: {{current}} / {{total}}",
       "target-folder": "Hedef Klasör"
     },
     "counts": {
@@ -3568,6 +3556,9 @@
       "total_other": "{{count}} öge"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "{{title}} klasörünü daralt",
       "expand-folder-button": "{{title}} klasörünü genişlet",
       "name-column": "Ad",
@@ -4509,12 +4500,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "Değişken değerine bağlı olarak {{type}} ögesini dinamik şekilde göster veya gizle.",
           "label": "Şablon değişkeni",
           "name": "Ad",
           "operator": {
             "equals": "Eşittir",
-            "not-equals": "Eşit değil"
+            "matches": "",
+            "not-equals": "Eşit değil",
+            "not-matches": ""
           },
           "value": "Değer"
         }
@@ -5399,6 +5395,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "Dönüşüm ara",
       "show-images": "Resimleri göster",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "Başka bir dönüşüm ekle",
       "view-all": "Tümünü görüntüle"
     },
@@ -11442,8 +11441,13 @@
       "title-repository-is-unhealthy": "Depo iyi durumda değil"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "Kaynaklarınız artık harici depolamanızda ve örneğinize sağlanmış durumda. Şu andan itibaren örneğiniz ve harici depolama senkronize edilecektir.",
-      "view-repository": "Depoyu görüntüle"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "Kontrol Eden:",
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index cef3bc0acf0..5a5a946cf40 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -3506,25 +3506,18 @@
     "browse-view": {
       "this-folder-is-empty": "此文件夹为空"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "所有资源已成功删除",
-      "all-moved": "所有资源已成功移动",
-      "button-done": "完成",
-      "progress-title": "成功",
-      "failed-alert_other": "{{count}} 个项目失败"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "取消",
       "button-delete": "删除",
       "button-deleting": "正在删除…",
       "delete-warning": "此操作将删除所选文件夹及其子文件夹。总体而言，这将影响：",
-      "error-path-not-found": "未找到路径"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "取消",
       "button-move": "移动",
       "button-moving": "正在移动…",
-      "deleting": "正在删除",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3532,13 +3525,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "未找到文件内容",
-      "error-path-not-found": "未找到路径",
-      "error-target-folder-path-missing": "缺少目标文件夹路径",
-      "error-title": "目标文件夹错误",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "此操作将移动所选文件夹及其子文件夹。总体而言，这将影响：",
-      "moving": "正在移动",
-      "progress": "进度：{{current}}/{{total}}",
       "target-folder": "目标文件夹"
     },
     "counts": {
@@ -3549,6 +3538,9 @@
       "total_other": "{{count}} 个项目"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "折叠文件夹 {{title}}",
       "expand-folder-button": "展开文件夹 {{title}}",
       "name-column": "名称",
@@ -4490,12 +4482,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "根据变量值动态地显示或隐藏{{type}}。",
           "label": "模板变量",
           "name": "名称",
           "operator": {
             "equals": "等于",
-            "not-equals": "不等于"
+            "matches": "",
+            "not-equals": "不等于",
+            "not-matches": ""
           },
           "value": "值"
         }
@@ -5379,6 +5376,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "搜索转换",
       "show-images": "显示图像",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "添加其他转换",
       "view-all": "查看全部"
     },
@@ -11406,8 +11406,13 @@
       "title-repository-is-unhealthy": "存储库状态不良"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "您的资源现在位于外部存储中，并预配到您的实例中。从现在开始，您的实例和外部存储将被同步。",
-      "view-repository": "查看存储库"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "已检查：",
diff --git a/public/locales/zh-Hant/grafana.json b/public/locales/zh-Hant/grafana.json
index 7dc7bc05844..bd775c3715a 100644
--- a/public/locales/zh-Hant/grafana.json
+++ b/public/locales/zh-Hant/grafana.json
@@ -3506,25 +3506,18 @@
     "browse-view": {
       "this-folder-is-empty": "此資料夾為空"
     },
-    "bulk-action-resources-form": {
-      "all-deleted": "已成功刪除所有資源",
-      "all-moved": "已成功移動所有資源",
-      "button-done": "完成",
-      "progress-title": "成功",
-      "failed-alert_other": "{{count}} 個項目失敗"
-    },
     "bulk-delete-resources-form": {
       "button-cancel": "取消",
       "button-delete": "刪除",
       "button-deleting": "正在刪除…",
       "delete-warning": "這將刪除所選資料夾及其子資料夾。總體而言，這將影響：",
-      "error-path-not-found": "找不到路徑"
+      "error-deleting-resources": ""
     },
     "bulk-move-resources-form": {
       "button-cancel": "取消",
       "button-move": "移動",
       "button-moving": "正在移動…",
-      "deleting": "正在刪除",
+      "button-tooltip": "",
       "error": {
         "read-only-message": "",
         "read-only-saving-message": "",
@@ -3532,13 +3525,9 @@
         "repository-not-found-message": "",
         "repository-not-found-title": ""
       },
-      "error-file-content-not-found": "找不到檔案內容",
-      "error-path-not-found": "找不到路徑",
-      "error-target-folder-path-missing": "缺少目標資料夾路徑",
-      "error-title": "目標資料夾錯誤",
+      "error-moving-resources": "",
+      "error-no-target-folder-path": "",
       "move-warning": "這將移動所選資料夾及其子資料夾。總體而言，這將影響：",
-      "moving": "正在移動",
-      "progress": "進度：已完成 {{current}} 個，共 {{total}} 個",
       "target-folder": "目標資料夾"
     },
     "counts": {
@@ -3549,6 +3538,9 @@
       "total_other": "{{count}} 個項目"
     },
     "dashboards-tree": {
+      "checkbox": {
+        "disabled-not-in-same-repo": ""
+      },
       "collapse-folder-button": "收合資料夾「{{title}}」",
       "expand-folder-button": "展開資料夾「{{title}}」",
       "name-column": "名稱",
@@ -4490,12 +4482,17 @@
           }
         },
         "variable": {
+          "error": {
+            "invalid-regex": ""
+          },
           "info": "根據變數值動態顯示或隱藏{{type}}。",
           "label": "範本變數",
           "name": "名稱（名字）",
           "operator": {
             "equals": "等於",
-            "not-equals": "不等於"
+            "matches": "",
+            "not-equals": "不等於",
+            "not-matches": ""
           },
           "value": "數值"
         }
@@ -5379,6 +5376,9 @@
     "transformation-picker-ng": {
       "placeholder-search-for-transformation": "搜尋轉換",
       "show-images": "顯示圖片",
+      "sql-expressions-message-description": "",
+      "sql-expressions-message-link": "",
+      "sql-expressions-title": "",
       "title-add-another-transformation": "新增另一個轉換",
       "view-all": "檢視全部"
     },
@@ -11406,8 +11406,13 @@
       "title-repository-is-unhealthy": "儲存庫狀態不佳"
     },
     "repository-link": {
+      "delete-or-move-job": {
+        "view-repository": ""
+      },
       "grafana-repository-synced": "您的資源現在位於外部儲存空間中，並佈建到您的執行個體中。從現在開始，您的執行個體和外部儲存空間將會同步。",
-      "view-repository": "檢視儲存庫"
+      "sync-job": {
+        "view-repository": ""
+      }
     },
     "repository-overview": {
       "checked": "已選取：",

From 726c76d99803f244bc226a22418d35dad11178b2 Mon Sep 17 00:00:00 2001
From: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date: Wed, 13 Aug 2025 09:53:13 -0400
Subject: [PATCH 134/243] Improve workflow "Update Alerting Module" (#109565)

* fix url to pull requests
* add default labels
* send message to slack
---
 .github/workflows/alerting-update-module.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/alerting-update-module.yml b/.github/workflows/alerting-update-module.yml
index 0b8d5730618..ea7e5d27e22 100644
--- a/.github/workflows/alerting-update-module.yml
+++ b/.github/workflows/alerting-update-module.yml
@@ -51,7 +51,7 @@ jobs:
         run: |
           TO_COMMIT="$(gh api repos/grafana/alerting/commits/"$BRANCH" --jq '.sha')"
            if [ -z "$TO_COMMIT" ]; then
-            echo "Branch $BRANCH not found in alerting repo, falling back to main branch"
+            echo "Branch $BRANCH not found in alerting repo"
             exit 1
           fi
           echo "to_commit=$TO_COMMIT" >> "$GITHUB_OUTPUT"
@@ -85,7 +85,7 @@ jobs:
           printf "%s\n" "$ALERTING_COMMITS"
 
           # make the list for markdown and replace PR numbers with links
-          ALERTING_COMMITS_FORMATTED="$(echo "$ALERTING_COMMITS" | while read -r line; do echo "- $line" | sed -E 's/\(#([0-9]+)\)/[#\1](https:\/\/github.com\/grafana\/grafana\/pull\/\1)/g'; done)"
+          ALERTING_COMMITS_FORMATTED="$(echo "$ALERTING_COMMITS" | while read -r line; do echo "- $line" | sed -E 's/\(#([0-9]+)\)/[#\1](https:\/\/github.com\/grafana\/alerting\/pull\/\1)/g'; done)"
 
           {
             echo "alerting_commits<<EOF"
@@ -123,6 +123,9 @@ jobs:
           title:  'Alerting: Update alerting module to ${{ steps.latest-commit.outputs.to_commit }}'
           branch: alerting/update-alerting-module
           delete-branch: true
+          labels: |
+            no-changelog
+            no-backport
           body: |
             Updates Grafana Alerting module to latest version.
 
@@ -144,3 +147,14 @@ jobs:
             echo "## Pull Request Created"
             echo "🔗 [View Pull Request]($PR_URL)"
           } >> "$GITHUB_STEP_SUMMARY"
+      - name: Send Slack Message
+        uses: grafana/shared-workflows/actions/send-slack-message@send-slack-message/v2.0.3
+        with:
+          method: 'chat.postMessage'
+          # send to alerting-reviews channel
+          payload-templated: true
+          payload:  |
+            {
+              "channel": "C076RNRRZ2N",
+              "text": "Update alerting module in Grafana ${{ steps.create-pr.outputs.pull-request-url }}"
+            }
\ No newline at end of file

From e358ca1f55dea6caa27fbda3e10c25af3f6ff51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= <laura.fernandez@grafana.com>
Date: Wed, 13 Aug 2025 15:57:38 +0200
Subject: [PATCH 135/243] Chore: Remove deprecated `HorizontalGroup` in geo and
 transformers editors (#109602)

---
 .betterer.results                                    | 12 ------------
 .../app/features/geo/editor/locationModeEditor.tsx   |  4 ++--
 .../calculateHeatmap/editor/AxisEditor.tsx           |  6 +++---
 .../joinByLabels/JoinByLabelsTransformerEditor.tsx   |  6 +++---
 .../partitionByValues/PartitionByValuesEditor.tsx    |  7 ++++---
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index dc5c9248073..d323fe5b2f5 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2400,9 +2400,6 @@ exports[`better eslint`] = {
     "public/app/features/expressions/guards.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/geo/editor/locationModeEditor.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
-    ],
     "public/app/features/geo/gazetteer/gazetteer.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
@@ -2801,9 +2798,6 @@ exports[`better eslint`] = {
     "public/app/features/transformers/FilterByValueTransformer/ValueMatchers/valueMatchersUI.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/features/transformers/calculateHeatmap/editor/AxisEditor.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
-    ],
     "public/app/features/transformers/calculateHeatmap/editor/helper.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -2858,15 +2852,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/transformers/joinByLabels/JoinByLabelsTransformerEditor.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
-    ],
     "public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
-    ],
     "public/app/features/transformers/spatial/optionsHelper.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
diff --git a/public/app/features/geo/editor/locationModeEditor.tsx b/public/app/features/geo/editor/locationModeEditor.tsx
index aacc913123c..1223179ed13 100644
--- a/public/app/features/geo/editor/locationModeEditor.tsx
+++ b/public/app/features/geo/editor/locationModeEditor.tsx
@@ -5,7 +5,7 @@ import { StandardEditorProps, DataFrame, GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
 import { FrameGeometrySource, FrameGeometrySourceMode } from '@grafana/schema';
-import { Alert, HorizontalGroup, Icon, Select, useStyles2 } from '@grafana/ui';
+import { Alert, Icon, Select, useStyles2 } from '@grafana/ui';
 
 import { FrameGeometryField, getGeometryField, getLocationMatchers } from '../utils/location';
 
@@ -103,7 +103,7 @@ export const LocationModeEditor = ({
           onChange(v.value);
         }}
       />
-      <HorizontalGroup className={styles.hGroup}>{dataValidation()}</HorizontalGroup>
+      {dataValidation()}
     </>
   );
 };
diff --git a/public/app/features/transformers/calculateHeatmap/editor/AxisEditor.tsx b/public/app/features/transformers/calculateHeatmap/editor/AxisEditor.tsx
index 7282ddba598..ec7aa9e3aad 100644
--- a/public/app/features/transformers/calculateHeatmap/editor/AxisEditor.tsx
+++ b/public/app/features/transformers/calculateHeatmap/editor/AxisEditor.tsx
@@ -4,7 +4,7 @@ import { SelectableValue, StandardEditorProps, VariableOrigin } from '@grafana/d
 import { t } from '@grafana/i18n';
 import { getTemplateSrv } from '@grafana/runtime';
 import { HeatmapCalculationBucketConfig, HeatmapCalculationMode } from '@grafana/schema';
-import { HorizontalGroup, RadioButtonGroup, ScaleDistribution } from '@grafana/ui';
+import { RadioButtonGroup, ScaleDistribution, Stack } from '@grafana/ui';
 
 import { SuggestionsInput } from '../../suggestionsInput/SuggestionsInput';
 import { numberOrVariableValidator } from '../../utils';
@@ -71,7 +71,7 @@ export const AxisEditor = ({ value, onChange, item }: StandardEditorProps<Heatma
   });
 
   return (
-    <HorizontalGroup>
+    <Stack>
       <RadioButtonGroup
         value={value?.mode || HeatmapCalculationMode.Size}
         options={value?.scale?.type === ScaleDistribution.Log ? logModeOptions : modeOptions}
@@ -98,6 +98,6 @@ export const AxisEditor = ({ value, onChange, item }: StandardEditorProps<Heatma
         }}
         suggestions={variables}
       />
-    </HorizontalGroup>
+    </Stack>
   );
 };
diff --git a/public/app/features/transformers/joinByLabels/JoinByLabelsTransformerEditor.tsx b/public/app/features/transformers/joinByLabels/JoinByLabelsTransformerEditor.tsx
index d7ea6b75503..f7c824abe9c 100644
--- a/public/app/features/transformers/joinByLabels/JoinByLabelsTransformerEditor.tsx
+++ b/public/app/features/transformers/joinByLabels/JoinByLabelsTransformerEditor.tsx
@@ -9,7 +9,7 @@ import {
   TransformerCategory,
 } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
-import { Alert, HorizontalGroup, InlineField, InlineFieldRow, Select, ValuePicker } from '@grafana/ui';
+import { Alert, Stack, InlineField, InlineFieldRow, Select, ValuePicker } from '@grafana/ui';
 
 import { getTransformationContent } from '../docs/getTransformationContent';
 import darkImage from '../images/dark/joinByLabels.svg';
@@ -136,7 +136,7 @@ export function JoinByLabelsTransformerEditor({ input, options, onChange }: Prop
               error="Unable to join by the value label"
               invalid={v === options.value}
             >
-              <HorizontalGroup>
+              <Stack>
                 <Select
                   options={info.joinOptions}
                   value={info.joinOptions.find((o) => o.value === v)}
@@ -153,7 +153,7 @@ export function JoinByLabelsTransformerEditor({ input, options, onChange }: Prop
                     variant="secondary"
                   />
                 )}
-              </HorizontalGroup>
+              </Stack>
             </InlineField>
           </InlineFieldRow>
         ))
diff --git a/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx b/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx
index e217384f051..fce4803ed82 100644
--- a/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx
+++ b/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx
@@ -14,7 +14,7 @@ import {
   InlineFieldRow,
   ValuePicker,
   Button,
-  HorizontalGroup,
+  Stack,
   FieldValidationMessage,
   RadioButtonGroup,
 } from '@grafana/ui';
@@ -119,7 +119,7 @@ export function PartitionByValuesEditor({
           labelWidth={10}
           grow={true}
         >
-          <HorizontalGroup>
+          <Stack>
             {fieldNames.map((name) => (
               <Button key={name} icon="times" variant="secondary" size="md" onClick={() => removeField(name)}>
                 {name}
@@ -133,9 +133,10 @@ export function PartitionByValuesEditor({
                 onChange={addField}
                 label={t('transformers.partition-by-values-editor.label-select-field', 'Select field')}
                 icon="plus"
+                isFullWidth={false}
               />
             )}
-          </HorizontalGroup>
+          </Stack>
         </InlineField>
       </InlineFieldRow>
       <InlineFieldRow>

From fc6690bf6bdace72dbdc6861c7976755044a8902 Mon Sep 17 00:00:00 2001
From: Matheus Macabu <macabu@users.noreply.github.com>
Date: Wed, 13 Aug 2025 16:03:29 +0200
Subject: [PATCH 136/243] IntegrationTests: Increase timeout to 8m (#109598)

Some tests are now taking longer than the 5min timeout
---
 .github/workflows/pr-test-integration.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-test-integration.yml b/.github/workflows/pr-test-integration.yml
index 89b4132d304..3fe89523a45 100644
--- a/.github/workflows/pr-test-integration.yml
+++ b/.github/workflows/pr-test-integration.yml
@@ -47,7 +47,7 @@ jobs:
         run: |
           set -euo pipefail
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/pkgs-with-tests-named.sh -b TestIntegration | ./scripts/ci/backend-tests/shard.sh -N"$SHARD" -d-)"
-          go test -tags=sqlite -timeout=5m -run '^TestIntegration' "${PACKAGES[@]}"
+          go test -tags=sqlite -timeout=8m -run '^TestIntegration' "${PACKAGES[@]}"
   mysql:
     strategy:
       matrix:
@@ -93,7 +93,7 @@ jobs:
         run: |
           set -euo pipefail
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/pkgs-with-tests-named.sh -b TestIntegration | ./scripts/ci/backend-tests/shard.sh -N"$SHARD" -d-)"
-          CGO_ENABLED=0 go test -p=1 -tags=mysql -timeout=5m -run '^TestIntegration' "${PACKAGES[@]}"
+          CGO_ENABLED=0 go test -p=1 -tags=mysql -timeout=8m -run '^TestIntegration' "${PACKAGES[@]}"
   postgres:
     strategy:
       matrix:
@@ -138,7 +138,7 @@ jobs:
         run: |
           set -euo pipefail
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/pkgs-with-tests-named.sh -b TestIntegration | ./scripts/ci/backend-tests/shard.sh -N"$SHARD" -d-)"
-          CGO_ENABLED=0 go test -p=1 -tags=postgres -timeout=5m -run '^TestIntegration' "${PACKAGES[@]}"
+          CGO_ENABLED=0 go test -p=1 -tags=postgres -timeout=8m -run '^TestIntegration' "${PACKAGES[@]}"
 
   # This is the job that is actually required by rulesets.
   # We want to only require one job instead of all the individual tests and shards.

From b9b34223a7e8cd40a496c0d4a2c8386f46136ca7 Mon Sep 17 00:00:00 2001
From: Will Assis <35489495+gassiss@users.noreply.github.com>
Date: Wed, 13 Aug 2025 10:05:15 -0400
Subject: [PATCH 137/243] Unified-storage: search after write feature flag
 (#109597)

create feature flag for experimental search-after-write changes
---
 .../src/types/featureToggles.gen.ts           |  5 +++++
 pkg/services/featuremgmt/registry.go          | 10 ++++++++++
 pkg/services/featuremgmt/toggles_gen.csv      |  1 +
 pkg/services/featuremgmt/toggles_gen.go       |  4 ++++
 pkg/services/featuremgmt/toggles_gen.json     | 19 +++++++++++++++++++
 5 files changed, 39 insertions(+)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 9e53b6cb08b..6b8812ee68e 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -1093,4 +1093,9 @@ export interface FeatureToggles {
   * @default false
   */
   newClickhouseConfigPageDesign?: boolean;
+  /**
+  * Enable experimental search-after-write guarantees to unified-storage search endpoints
+  * @default false
+  */
+  unifiedStorageSearchAfterWriteExperimentalAPI?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 44ff23ec99d..e2ee8daad09 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -1894,6 +1894,16 @@ var (
 			Owner:        grafanaPartnerPluginsSquad,
 			Expression:   "false",
 		},
+		{
+			Name:              "unifiedStorageSearchAfterWriteExperimentalAPI",
+			Description:       "Enable experimental search-after-write guarantees to unified-storage search endpoints",
+			Stage:             FeatureStageExperimental,
+			Owner:             grafanaSearchAndStorageSquad,
+			HideFromAdminPage: true,
+			HideFromDocs:      true,
+			RequiresRestart:   true,
+			Expression:        "false",
+		},
 	}
 )
 
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index da4ec52ac27..fa1853ebe62 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -245,3 +245,4 @@ adhocFiltersInTooltips,experimental,@grafana/datapro,false,false,true
 favoriteDatasources,experimental,@grafana/plugins-platform-backend,false,false,true
 newLogContext,experimental,@grafana/observability-logs,false,false,true
 newClickhouseConfigPageDesign,privatePreview,@grafana/partner-datasources,false,false,false
+unifiedStorageSearchAfterWriteExperimentalAPI,experimental,@grafana/search-and-storage,false,true,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 19fd4691ef5..c77c705182f 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -990,4 +990,8 @@ const (
 	// FlagNewClickhouseConfigPageDesign
 	// Enables new design for the Clickhouse data source configuration page
 	FlagNewClickhouseConfigPageDesign = "newClickhouseConfigPageDesign"
+
+	// FlagUnifiedStorageSearchAfterWriteExperimentalAPI
+	// Enable experimental search-after-write guarantees to unified-storage search endpoints
+	FlagUnifiedStorageSearchAfterWriteExperimentalAPI = "unifiedStorageSearchAfterWriteExperimentalAPI"
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index dab955c2ce5..272c58a23ca 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -3243,6 +3243,25 @@
         "hideFromDocs": true
       }
     },
+    {
+      "metadata": {
+        "name": "unifiedStorageSearchAfterWriteExperimentalAPI",
+        "resourceVersion": "1755089543487",
+        "creationTimestamp": "2025-08-13T12:35:14Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2025-08-13 12:52:23.487521 +0000 UTC"
+        }
+      },
+      "spec": {
+        "description": "Enable experimental search-after-write guarantees to unified-storage search endpoints",
+        "stage": "experimental",
+        "codeowner": "@grafana/search-and-storage",
+        "requiresRestart": true,
+        "hideFromAdminPage": true,
+        "hideFromDocs": true,
+        "expression": "false"
+      }
+    },
     {
       "metadata": {
         "name": "unifiedStorageSearchDualReaderEnabled",

From 813491953676b804a16b184a81e9ada3662b2907 Mon Sep 17 00:00:00 2001
From: Alexa Vargas <239999+axelavargas@users.noreply.github.com>
Date: Wed, 13 Aug 2025 16:42:03 +0200
Subject: [PATCH 138/243] Query Library: Fix Change DS during replace query
 loses query library context (#109511)

* Query Library: Fix Change DS during replace query loses query library target
* add unit tests
---
 public/app/features/explore/QueryRows.tsx     |  4 +--
 .../app/features/explore/state/query.test.ts  | 30 +++++++++++++++++++
 public/app/features/explore/state/query.ts    | 16 ++++++----
 .../query/components/QueryEditorRows.test.tsx | 28 +++++++++++++++++
 .../query/components/QueryEditorRows.tsx      |  8 ++---
 5 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/public/app/features/explore/QueryRows.tsx b/public/app/features/explore/QueryRows.tsx
index 80e068924cb..672d9cee950 100644
--- a/public/app/features/explore/QueryRows.tsx
+++ b/public/app/features/explore/QueryRows.tsx
@@ -62,8 +62,8 @@ export const QueryRows = ({ exploreId, isOpen, changeCompactMode }: Props) => {
   }, [dispatch, exploreId]);
 
   const onChange = useCallback(
-    (newQueries: DataQuery[]) => {
-      dispatch(changeQueries({ exploreId, queries: newQueries }));
+    (newQueries: DataQuery[], options?: { skipAutoImport?: boolean }) => {
+      dispatch(changeQueries({ exploreId, queries: newQueries, options }));
     },
     [dispatch, exploreId]
   );
diff --git a/public/app/features/explore/state/query.test.ts b/public/app/features/explore/state/query.test.ts
index 42e486fa978..4c6fd6a584f 100644
--- a/public/app/features/explore/state/query.test.ts
+++ b/public/app/features/explore/state/query.test.ts
@@ -423,6 +423,36 @@ describe('changeQueries', () => {
       expect(actions.changeQueriesAction).toHaveBeenCalled();
       expect(actions.importQueries).not.toHaveBeenCalled();
     });
+
+    it('should not import queries when skipAutoImport is true', async () => {
+      jest.spyOn(actions, 'importQueries');
+      jest.spyOn(actions, 'changeQueriesAction');
+
+      const { dispatch } = configureStore({
+        ...defaultInitialState,
+        explore: {
+          panes: {
+            left: {
+              ...defaultInitialState.explore.panes.left,
+              datasourceInstance: datasources[0],
+              queries: [{ refId: 'A', datasource: datasources[0].getRef() }],
+            },
+          },
+        },
+      } as unknown as Partial<StoreState>);
+
+      await dispatch(
+        changeQueries({
+          queries: [{ refId: 'A', datasource: datasources[0].getRef(), queryType: 'someValue' }],
+          exploreId: 'left',
+          options: {
+            skipAutoImport: true,
+          },
+        })
+      );
+      expect(actions.changeQueriesAction).toHaveBeenCalled();
+      expect(actions.importQueries).not.toHaveBeenCalled();
+    });
   });
 
   describe('correctly modifies the state', () => {
diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index 63091242c47..251ab4af5d2 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -104,6 +104,9 @@ export const addQueryRowAction = createAction<AddQueryRowPayload>('explore/addQu
 export interface ChangeQueriesPayload {
   exploreId: string;
   queries: DataQuery[];
+  options?: {
+    skipAutoImport?: boolean;
+  };
 }
 export const changeQueriesAction = createAction<ChangeQueriesPayload>('explore/changeQueries');
 
@@ -322,7 +325,7 @@ const getImportableQueries = async (
 
 export const changeQueries = createAsyncThunk<void, ChangeQueriesPayload>(
   'explore/changeQueries',
-  async ({ queries, exploreId }, { getState, dispatch }) => {
+  async ({ queries, exploreId, options }, { getState, dispatch }) => {
     let queriesImported = false;
     const oldQueries = getState().explore.panes[exploreId]!.queries;
     const rootUID = getState().explore.panes[exploreId]!.datasourceInstance?.uid;
@@ -337,10 +340,13 @@ export const changeQueries = createAsyncThunk<void, ChangeQueriesPayload>(
     for (const newQuery of queries) {
       for (const oldQuery of oldQueries) {
         if (newQuery.refId === oldQuery.refId && newQuery.datasource?.type !== oldQuery.datasource?.type) {
-          const queryDatasource = await getDataSourceSrv().get(oldQuery.datasource);
-          const targetDS = await getDataSourceSrv().get({ uid: newQuery.datasource?.uid });
-          await dispatch(importQueries(exploreId, oldQueries, queryDatasource, targetDS, newQuery.refId));
-          queriesImported = true;
+          // Skip automatic import if explicitly requested (e.g., query library replacement)
+          if (!options?.skipAutoImport) {
+            const queryDatasource = await getDataSourceSrv().get(oldQuery.datasource);
+            const targetDS = await getDataSourceSrv().get({ uid: newQuery.datasource?.uid });
+            await dispatch(importQueries(exploreId, oldQueries, queryDatasource, targetDS, newQuery.refId));
+            queriesImported = true;
+          }
         }
 
         if (
diff --git a/public/app/features/query/components/QueryEditorRows.test.tsx b/public/app/features/query/components/QueryEditorRows.test.tsx
index c165c783e2a..849f64a15da 100644
--- a/public/app/features/query/components/QueryEditorRows.test.tsx
+++ b/public/app/features/query/components/QueryEditorRows.test.tsx
@@ -70,6 +70,34 @@ jest.mock('@grafana/runtime', () => ({
 }));
 
 describe('QueryEditorRows', () => {
+  it('Should call onQueriesChange with skipAutoImport when replacing query', () => {
+    const onQueriesChangeMock = jest.fn();
+    const onUpdateDatasourcesMock = jest.fn();
+
+    const testProps = {
+      ...props,
+      onQueriesChange: onQueriesChangeMock,
+      onUpdateDatasources: onUpdateDatasourcesMock,
+    };
+
+    const component = new QueryEditorRows(testProps);
+    const replacementQuery = {
+      refId: 'A',
+      datasource: { uid: 'new-datasource', type: 'prometheus' },
+      expr: 'new query content',
+    };
+
+    component.onReplaceQuery(replacementQuery, 0);
+
+    expect(onQueriesChangeMock).toHaveBeenCalledWith(
+      [
+        { ...replacementQuery, refId: 'A' }, // preserves original refId
+        props.queries[1], // second query unchanged
+      ],
+      { skipAutoImport: true }
+    );
+  });
+
   it('Should render queries', async () => {
     const {
       renderResult: { rerender },
diff --git a/public/app/features/query/components/QueryEditorRows.tsx b/public/app/features/query/components/QueryEditorRows.tsx
index 373638e3901..d5d1888355f 100644
--- a/public/app/features/query/components/QueryEditorRows.tsx
+++ b/public/app/features/query/components/QueryEditorRows.tsx
@@ -23,7 +23,7 @@ export interface Props {
   dsSettings: DataSourceInstanceSettings;
 
   // Query editing
-  onQueriesChange: (queries: DataQuery[]) => void;
+  onQueriesChange: (queries: DataQuery[], options?: { skipAutoImport?: boolean }) => void;
   onAddQuery: (query: DataQuery) => void;
   onRunQueries: () => void;
 
@@ -68,14 +68,14 @@ export class QueryEditorRows extends PureComponent<Props> {
   onReplaceQuery(query: DataQuery, index: number) {
     const { queries, onQueriesChange, onUpdateDatasources, dsSettings } = this.props;
 
-    // Replace old query with new query
+    // Replace old query with new query, preserving the original refId
     const newQueries = queries.map((item, itemIndex) => {
       if (itemIndex === index) {
-        return query;
+        return { ...query, refId: item.refId };
       }
       return item;
     });
-    onQueriesChange(newQueries);
+    onQueriesChange(newQueries, { skipAutoImport: true });
 
     // Update datasources based on the new query set
     if (query.datasource?.uid) {

From 384ec28dfd293a088ef3b2f0642e4d1915460add Mon Sep 17 00:00:00 2001
From: owensmallwood <owen.smallwood@grafana.com>
Date: Wed, 13 Aug 2025 08:50:28 -0600
Subject: [PATCH 139/243] Unified storage bugfix legacy folders getting first
 page (#109554)

* When creating a new continue token, it defaults to page 1. Also use constants for default limit and page number.

* Update tests for continue token.

* When listing legacy folders, the continue token will have all paging info in it. Simplifies paging logic and fixes bug when limit not specified.

* Adds regression test to ensure default page limit is enforced.

* remove test comment
---
 pkg/registry/apis/folders/continue.go         |  6 ++++-
 pkg/registry/apis/folders/continue_test.go    | 10 ++++----
 pkg/registry/apis/folders/legacy_storage.go   | 14 +++--------
 .../apis/folders/legacy_storage_test.go       | 25 +++++++++++++++++++
 4 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/pkg/registry/apis/folders/continue.go b/pkg/registry/apis/folders/continue.go
index 8ff86b627ea..cb186f91612 100644
--- a/pkg/registry/apis/folders/continue.go
+++ b/pkg/registry/apis/folders/continue.go
@@ -14,9 +14,13 @@ type continueToken struct {
 	limit int64
 }
 
+const defaultPageLimit = 100
+const defaultPageNumber = 1
+
 func readContinueToken(options *internalversion.ListOptions) (*continueToken, error) {
 	t := &continueToken{
-		limit: 100, // default page size
+		limit: defaultPageLimit,  // default page size
+		page:  defaultPageNumber, // default page number
 	}
 	if options.Continue == "" {
 		if options.Limit > 0 {
diff --git a/pkg/registry/apis/folders/continue_test.go b/pkg/registry/apis/folders/continue_test.go
index 2763c3522c6..7bde6d4b4e6 100644
--- a/pkg/registry/apis/folders/continue_test.go
+++ b/pkg/registry/apis/folders/continue_test.go
@@ -10,15 +10,15 @@ import (
 func TestContinueToken(t *testing.T) {
 	token, err := readContinueToken(&internalversion.ListOptions{})
 	require.NoError(t, err)
-	require.Equal(t, int64(100), token.limit)
-	require.Equal(t, int64(0), token.page)
+	require.Equal(t, int64(defaultPageLimit), token.limit)
+	require.Equal(t, int64(defaultPageNumber), token.page)
 
 	next := token.GetNextPageToken()
-	require.Equal(t, "MTAwfDE=", next)
+	require.Equal(t, "MTAwfDI=", next)
 	token, err = readContinueToken(&internalversion.ListOptions{Continue: next})
 	require.NoError(t, err)
-	require.Equal(t, int64(100), token.limit)
-	require.Equal(t, int64(1), token.page) // <<< +1
+	require.Equal(t, int64(defaultPageLimit), token.limit)
+	require.Equal(t, int64(defaultPageNumber+1), token.page) // <<< +1
 
 	// Error if the limit has changed
 	_, err = readContinueToken(&internalversion.ListOptions{Continue: next, Limit: 50})
diff --git a/pkg/registry/apis/folders/legacy_storage.go b/pkg/registry/apis/folders/legacy_storage.go
index f71993bfea2..d8ebda1fd65 100644
--- a/pkg/registry/apis/folders/legacy_storage.go
+++ b/pkg/registry/apis/folders/legacy_storage.go
@@ -95,16 +95,10 @@ func (s *legacyStorage) List(ctx context.Context, options *internalversion.ListO
 		SignedInUser: user,
 		OrgID:        orgId,
 	}
-	if options.Continue != "" {
-		query.Page = paging.page
-		query.Limit = paging.limit
-	} else if options.Limit > 0 {
-		query.Limit = options.Limit
-		query.Page = 1
-		// also need to update the paging token so the continue token is correct
-		paging.limit = options.Limit
-		paging.page = 1
-	}
+
+	// paging is always retrieved from the continue token
+	query.Limit = paging.limit
+	query.Page = paging.page
 
 	if options.LabelSelector != nil && options.LabelSelector.Matches(labels.Set{utils.LabelGetFullpath: "true"}) {
 		query.WithFullpath = true
diff --git a/pkg/registry/apis/folders/legacy_storage_test.go b/pkg/registry/apis/folders/legacy_storage_test.go
index 4871c511a20..0edabebb791 100644
--- a/pkg/registry/apis/folders/legacy_storage_test.go
+++ b/pkg/registry/apis/folders/legacy_storage_test.go
@@ -121,6 +121,31 @@ func TestLegacyStorage_List_Pagination(t *testing.T) {
 		require.Equal(t, int64(2), folderService.LastQuery.Limit)
 		require.Equal(t, int64(1), folderService.LastQuery.Page)
 	})
+
+	t.Run("should set page limit to default when no limit is specified in options", func(t *testing.T) {
+		options := &metainternalversion.ListOptions{}
+		folders := make([]*folder.Folder, defaultPageLimit)
+		for i := range folders {
+			folders[i] = &folder.Folder{
+				UID:   fmt.Sprintf("folder-%d", i),
+				Title: fmt.Sprintf("Folder %d", i),
+			}
+		}
+		folderService.ExpectedFolders = folders
+
+		result, err := storage.List(ctx, options)
+		require.NoError(t, err)
+
+		list, ok := result.(*folderv1.FolderList)
+		require.True(t, ok)
+
+		// assert returned continue token is correct and previous paging was correct
+		token, err := base64.StdEncoding.DecodeString(list.Continue)
+		require.NoError(t, err)
+		require.Equal(t, "100|2", string(token))
+		require.Equal(t, int64(defaultPageLimit), folderService.LastQuery.Limit)
+		require.Equal(t, int64(1), folderService.LastQuery.Page)
+	})
 }
 
 func TestLegacyStorage_List_LabelSelector(t *testing.T) {

From e21eda9413e3d0efb227f49431a29aafa57b50ec Mon Sep 17 00:00:00 2001
From: Konrad Lalik <konradlalik@gmail.com>
Date: Wed, 13 Aug 2025 16:54:40 +0200
Subject: [PATCH 140/243] Alerting: Auto refresh contact points in the rule
 form (#109539)

---
 .../ContactPointSelector.tsx                  |  5 ++++-
 .../hooks/v0alpha1/useContactPoints.tsx       | 20 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/grafana-alerting/src/grafana/contactPoints/components/ContactPointSelector/ContactPointSelector.tsx b/packages/grafana-alerting/src/grafana/contactPoints/components/ContactPointSelector/ContactPointSelector.tsx
index 56dacd8dca5..674dbc76dd3 100644
--- a/packages/grafana-alerting/src/grafana/contactPoints/components/ContactPointSelector/ContactPointSelector.tsx
+++ b/packages/grafana-alerting/src/grafana/contactPoints/components/ContactPointSelector/ContactPointSelector.tsx
@@ -17,7 +17,10 @@ export type ContactPointSelectorProps = CustomComboBoxProps<ContactPoint>;
  * @TODO make ComboBox accept a ReactNode so we can use icons and such
  */
 function ContactPointSelector(props: ContactPointSelectorProps) {
-  const { currentData: contactPoints, isLoading } = useListContactPoints();
+  const { currentData: contactPoints, isLoading } = useListContactPoints(
+    {},
+    { refetchOnFocus: true, refetchOnMountOrArgChange: true }
+  );
 
   // Create a mapping of options with their corresponding contact points
   const contactPointOptions = chain(contactPoints?.items)
diff --git a/packages/grafana-alerting/src/grafana/contactPoints/hooks/v0alpha1/useContactPoints.tsx b/packages/grafana-alerting/src/grafana/contactPoints/hooks/v0alpha1/useContactPoints.tsx
index 25d1ab9a6bf..e72577e91d0 100644
--- a/packages/grafana-alerting/src/grafana/contactPoints/hooks/v0alpha1/useContactPoints.tsx
+++ b/packages/grafana-alerting/src/grafana/contactPoints/hooks/v0alpha1/useContactPoints.tsx
@@ -15,6 +15,16 @@ type ListContactPointsHookResult = TypedUseQueryHookResult<
   ReturnType<typeof fetchBaseQuery>
 >;
 
+// Type for the options that can be passed to the hook
+// Based on the pattern used for mutation options in this file
+type ListContactPointsQueryArgs = Parameters<
+  typeof alertingAPI.endpoints.listReceiver.useQuery<ListContactPointsHookResult>
+>[0];
+
+type ListContactPointsQueryOptions = Parameters<
+  typeof alertingAPI.endpoints.listReceiver.useQuery<ListContactPointsHookResult>
+>[1];
+
 /**
  * useListContactPoints is a hook that fetches a list of contact points
  *
@@ -22,9 +32,15 @@ type ListContactPointsHookResult = TypedUseQueryHookResult<
  * to ensure that the returned ContactPoints are correctly typed in the data.items array.
  *
  * It automatically uses the configured namespace for the query.
+ *
+ * @param queryOptions - Optional query options that will be passed to the underlying useListReceiverQuery hook.
+ *                      These options can include refetchOnFocus, refetchOnMountOrArgChange, skip, etc.
  */
-export function useListContactPoints() {
-  return alertingAPI.useListReceiverQuery<ListContactPointsHookResult>({});
+export function useListContactPoints(
+  queryArgs: ListContactPointsQueryArgs = {},
+  queryOptions: ListContactPointsQueryOptions = {}
+) {
+  return alertingAPI.useListReceiverQuery<ListContactPointsHookResult>(queryArgs, queryOptions);
 }
 
 // type narrowing mutations requires us to define a few helper types

From 789a61230d45ecc9742d858c4af233bf67ab17b4 Mon Sep 17 00:00:00 2001
From: Tom Ratcliffe <tom.ratcliffe@grafana.com>
Date: Wed, 13 Aug 2025 15:56:16 +0100
Subject: [PATCH 141/243] Alerting: Fix newly created alert rules not
 immediately showing up in folder view  (#109584)

Fix incorrect tag provided for namespace endpoint
---
 public/app/features/alerting/unified/api/alertRuleApi.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/app/features/alerting/unified/api/alertRuleApi.ts b/public/app/features/alerting/unified/api/alertRuleApi.ts
index faebd9334ed..35569448d9b 100644
--- a/public/app/features/alerting/unified/api/alertRuleApi.ts
+++ b/public/app/features/alerting/unified/api/alertRuleApi.ts
@@ -246,7 +246,9 @@ export const alertRuleApi = alertingApi.injectEndpoints({
         const { path, params } = rulerUrlBuilder(rulerConfig).namespace(namespace);
         return { url: path, params };
       },
-      providesTags: (_result, _error, { namespace }) => [{ type: 'RuleNamespace', id: namespace }],
+      providesTags: (_result, _error, { namespace, rulerConfig }) => [
+        { type: 'RuleNamespace', id: `${rulerConfig.dataSourceUid}/${namespace}` },
+      ],
     }),
 
     // TODO This should be probably a separate ruler API file

From 466aa701799824e0ab93957ebb825e01d0ef0035 Mon Sep 17 00:00:00 2001
From: Kyle Brandt <kyle@grafana.com>
Date: Wed, 13 Aug 2025 11:20:14 -0400
Subject: [PATCH 142/243] Sql Expressions: (Chore) Dedicated logger for
 expr.sql, and pass context (#109549)

---
 pkg/expr/dataplane_test.go             |  2 +-
 pkg/expr/graph.go                      | 12 ++++++------
 pkg/expr/graph_test.go                 |  2 +-
 pkg/expr/nodes.go                      |  6 +++---
 pkg/expr/reader.go                     |  4 +++-
 pkg/expr/reader_test.go                |  2 +-
 pkg/expr/service.go                    |  4 ++--
 pkg/expr/service_sql_test.go           |  8 ++++----
 pkg/expr/service_test.go               |  6 +++---
 pkg/expr/sql/parser.go                 |  8 ++++----
 pkg/expr/sql/parser_test.go            |  2 +-
 pkg/expr/sql_command.go                | 24 ++++++++++++++----------
 pkg/expr/sql_command_test.go           |  6 +++---
 pkg/expr/transform.go                  |  2 +-
 pkg/services/ngalert/eval/eval.go      |  8 ++++----
 pkg/services/ngalert/eval/eval_test.go |  8 ++++----
 pkg/services/ngalert/eval/validate.go  |  2 +-
 17 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/pkg/expr/dataplane_test.go b/pkg/expr/dataplane_test.go
index ac3e7c42f95..a8247a2bb9b 100644
--- a/pkg/expr/dataplane_test.go
+++ b/pkg/expr/dataplane_test.go
@@ -92,7 +92,7 @@ func framesPassThroughService(t *testing.T, frames data.Frames) (data.Frames, er
 		User:    &user.SignedInUser{},
 	}
 
-	pl, err := s.BuildPipeline(req)
+	pl, err := s.BuildPipeline(t.Context(), req)
 	require.NoError(t, err)
 
 	res, err := s.ExecutePipeline(context.Background(), time.Now(), pl)
diff --git a/pkg/expr/graph.go b/pkg/expr/graph.go
index e19b73dd15e..ad60027d988 100644
--- a/pkg/expr/graph.go
+++ b/pkg/expr/graph.go
@@ -175,12 +175,12 @@ func (dp *DataPipeline) GetCommandTypes() []string {
 
 // BuildPipeline builds a graph of the nodes, and returns the nodes in an
 // executable order.
-func (s *Service) buildPipeline(req *Request) (DataPipeline, error) {
+func (s *Service) buildPipeline(ctx context.Context, req *Request) (DataPipeline, error) {
 	if req != nil && len(req.Headers) == 0 {
 		req.Headers = map[string]string{}
 	}
 
-	graph, err := s.buildDependencyGraph(req)
+	graph, err := s.buildDependencyGraph(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -194,8 +194,8 @@ func (s *Service) buildPipeline(req *Request) (DataPipeline, error) {
 }
 
 // buildDependencyGraph returns a dependency graph for a set of queries.
-func (s *Service) buildDependencyGraph(req *Request) (*simple.DirectedGraph, error) {
-	graph, err := s.buildGraph(req)
+func (s *Service) buildDependencyGraph(ctx context.Context, req *Request) (*simple.DirectedGraph, error) {
+	graph, err := s.buildGraph(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -252,7 +252,7 @@ func buildNodeRegistry(g *simple.DirectedGraph) map[string]Node {
 }
 
 // buildGraph creates a new graph populated with nodes for every query.
-func (s *Service) buildGraph(req *Request) (*simple.DirectedGraph, error) {
+func (s *Service) buildGraph(ctx context.Context, req *Request) (*simple.DirectedGraph, error) {
 	dp := simple.NewDirectedGraph()
 
 	for i, query := range req.Queries {
@@ -287,7 +287,7 @@ func (s *Service) buildGraph(req *Request) (*simple.DirectedGraph, error) {
 		case TypeDatasourceNode:
 			node, err = s.buildDSNode(dp, rn, req)
 		case TypeCMDNode:
-			node, err = buildCMDNode(rn, s.features, s.cfg)
+			node, err = buildCMDNode(ctx, rn, s.features, s.cfg)
 		case TypeMLNode:
 			if s.features.IsEnabledGlobally(featuremgmt.FlagMlExpressions) {
 				node, err = s.buildMLNode(dp, rn, req)
diff --git a/pkg/expr/graph_test.go b/pkg/expr/graph_test.go
index dfa9f5f5b0a..bcfee8fb306 100644
--- a/pkg/expr/graph_test.go
+++ b/pkg/expr/graph_test.go
@@ -239,7 +239,7 @@ func TestServicebuildPipeLine(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			nodes, err := s.buildPipeline(tt.req)
+			nodes, err := s.buildPipeline(t.Context(), tt.req)
 			if tt.expectErrContains != "" {
 				require.Error(t, err)
 				require.Contains(t, err.Error(), tt.expectErrContains)
diff --git a/pkg/expr/nodes.go b/pkg/expr/nodes.go
index 300488ae643..f80ddf77db8 100644
--- a/pkg/expr/nodes.go
+++ b/pkg/expr/nodes.go
@@ -107,7 +107,7 @@ func (gn *CMDNode) Execute(ctx context.Context, now time.Time, vars mathexp.Vars
 	return gn.Command.Execute(ctx, now, vars, s.tracer, s.metrics)
 }
 
-func buildCMDNode(rn *rawNode, toggles featuremgmt.FeatureToggles, cfg *setting.Cfg) (*CMDNode, error) {
+func buildCMDNode(ctx context.Context, rn *rawNode, toggles featuremgmt.FeatureToggles, cfg *setting.Cfg) (*CMDNode, error) {
 	commandType, err := GetExpressionCommandType(rn.Query)
 	if err != nil {
 		return nil, fmt.Errorf("invalid command type in expression '%v': %w", rn.RefID, err)
@@ -141,7 +141,7 @@ func buildCMDNode(rn *rawNode, toggles featuremgmt.FeatureToggles, cfg *setting.
 		if err != nil {
 			return nil, err
 		}
-		q, err := reader.ReadQuery(data.NewDataQuery(map[string]any{
+		q, err := reader.ReadQuery(ctx, data.NewDataQuery(map[string]any{
 			"refId": rn.RefID,
 			"type":  rn.QueryType,
 		}), iter)
@@ -164,7 +164,7 @@ func buildCMDNode(rn *rawNode, toggles featuremgmt.FeatureToggles, cfg *setting.
 	case TypeThreshold:
 		node.Command, err = UnmarshalThresholdCommand(rn)
 	case TypeSQL:
-		node.Command, err = UnmarshalSQLCommand(rn, cfg)
+		node.Command, err = UnmarshalSQLCommand(ctx, rn, cfg)
 	default:
 		return nil, fmt.Errorf("expression command type '%v' in expression '%v' not implemented", commandType, rn.RefID)
 	}
diff --git a/pkg/expr/reader.go b/pkg/expr/reader.go
index 62cd6af4539..5c85b9d61fb 100644
--- a/pkg/expr/reader.go
+++ b/pkg/expr/reader.go
@@ -1,6 +1,7 @@
 package expr
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -44,6 +45,7 @@ func NewExpressionQueryReader(features featuremgmt.FeatureToggles) *ExpressionQu
 
 // nolint:gocyclo
 func (h *ExpressionQueryReader) ReadQuery(
+	ctx context.Context,
 	// Properties that have been parsed off the same node
 	common data.DataQuery,
 	// An iterator with context for the full node (include common values)
@@ -135,7 +137,7 @@ func (h *ExpressionQueryReader) ReadQuery(
 			eq.Properties = q
 			// TODO: Cascade limit from Grafana config in this (new Expression Parser) branch of the code
 			cellLimit := 0 // zero means no limit
-			eq.Command, err = NewSQLCommand(common.RefID, q.Format, q.Expression, int64(cellLimit), 0, 0)
+			eq.Command, err = NewSQLCommand(ctx, common.RefID, q.Format, q.Expression, int64(cellLimit), 0, 0)
 		}
 
 	case QueryTypeThreshold:
diff --git a/pkg/expr/reader_test.go b/pkg/expr/reader_test.go
index ee0ec2265f4..39b99a21ac0 100644
--- a/pkg/expr/reader_test.go
+++ b/pkg/expr/reader_test.go
@@ -141,7 +141,7 @@ func TestReaderReduceMode(t *testing.T) {
 
 			reader := NewExpressionQueryReader(featuremgmt.WithFeatures())
 
-			eq, err := reader.ReadQuery(q, iter)
+			eq, err := reader.ReadQuery(t.Context(), q, iter)
 
 			if test.expectError {
 				require.Error(t, err)
diff --git a/pkg/expr/service.go b/pkg/expr/service.go
index 19b124b70d2..b624685c38e 100644
--- a/pkg/expr/service.go
+++ b/pkg/expr/service.go
@@ -102,8 +102,8 @@ func (s *Service) isDisabled() bool {
 }
 
 // BuildPipeline builds a pipeline from a request.
-func (s *Service) BuildPipeline(req *Request) (DataPipeline, error) {
-	return s.buildPipeline(req)
+func (s *Service) BuildPipeline(ctx context.Context, req *Request) (DataPipeline, error) {
+	return s.buildPipeline(ctx, req)
 }
 
 // ExecutePipeline executes an expression pipeline and returns all the results.
diff --git a/pkg/expr/service_sql_test.go b/pkg/expr/service_sql_test.go
index 0a1d991da68..714c1b98d7b 100644
--- a/pkg/expr/service_sql_test.go
+++ b/pkg/expr/service_sql_test.go
@@ -56,14 +56,14 @@ func TestSQLService(t *testing.T) {
 	t.Run("no feature flag no queries for you", func(t *testing.T) {
 		s, req := newMockQueryService(resp, newABSQLQueries(""))
 
-		_, err := s.BuildPipeline(req)
+		_, err := s.BuildPipeline(t.Context(), req)
 		require.Error(t, err, "should not be able to build pipeline without feature flag")
 	})
 
 	t.Run("with feature flag basic select works", func(t *testing.T) {
 		s, req := newMockQueryService(resp, newABSQLQueries("SELECT * FROM A"))
 		s.features = featuremgmt.WithFeatures(featuremgmt.FlagSqlExpressions)
-		pl, err := s.BuildPipeline(req)
+		pl, err := s.BuildPipeline(t.Context(), req)
 		require.NoError(t, err)
 
 		res, err := s.ExecutePipeline(context.Background(), time.Now(), pl)
@@ -83,7 +83,7 @@ func TestSQLService(t *testing.T) {
 
 		s.features = featuremgmt.WithFeatures(featuremgmt.FlagSqlExpressions)
 
-		pl, err := s.BuildPipeline(req)
+		pl, err := s.BuildPipeline(t.Context(), req)
 		require.NoError(t, err)
 
 		rsp, err := s.ExecutePipeline(context.Background(), time.Now(), pl)
@@ -100,7 +100,7 @@ func TestSQLService(t *testing.T) {
 
 		s.features = featuremgmt.WithFeatures(featuremgmt.FlagSqlExpressions)
 
-		pl, err := s.BuildPipeline(req)
+		pl, err := s.BuildPipeline(t.Context(), req)
 		require.NoError(t, err)
 
 		rsp, err := s.ExecutePipeline(context.Background(), time.Now(), pl)
diff --git a/pkg/expr/service_test.go b/pkg/expr/service_test.go
index 779791a7812..42f495d67ac 100644
--- a/pkg/expr/service_test.go
+++ b/pkg/expr/service_test.go
@@ -61,7 +61,7 @@ func TestService(t *testing.T) {
 
 	s, req := newMockQueryService(resp, queries)
 
-	pl, err := s.BuildPipeline(req)
+	pl, err := s.BuildPipeline(t.Context(), req)
 	require.NoError(t, err)
 
 	res, err := s.ExecutePipeline(context.Background(), time.Now(), pl)
@@ -135,7 +135,7 @@ func TestDSQueryError(t *testing.T) {
 
 	s, req := newMockQueryService(resp, queries)
 
-	pl, err := s.BuildPipeline(req)
+	pl, err := s.BuildPipeline(t.Context(), req)
 	require.NoError(t, err)
 
 	res, err := s.ExecutePipeline(context.Background(), time.Now(), pl)
@@ -200,7 +200,7 @@ func TestSQLExpressionCellLimitFromConfig(t *testing.T) {
 			req := &Request{Queries: queries, User: &user.SignedInUser{}}
 
 			// Build the pipeline
-			pipeline, err := s.BuildPipeline(req)
+			pipeline, err := s.BuildPipeline(t.Context(), req)
 			require.NoError(t, err)
 
 			node := pipeline[0]
diff --git a/pkg/expr/sql/parser.go b/pkg/expr/sql/parser.go
index 0e401c94a15..f2308ece9ae 100644
--- a/pkg/expr/sql/parser.go
+++ b/pkg/expr/sql/parser.go
@@ -1,19 +1,19 @@
 package sql
 
 import (
+	"context"
 	"fmt"
 	"sort"
 	"strings"
 
 	"github.com/dolthub/vitess/go/vt/sqlparser"
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
 )
 
-var logger = log.New("sql_expr")
-
 // TablesList returns a list of tables for the sql statement excluding
 // CTEs and the 'dual' table. The list is sorted alphabetically.
-func TablesList(rawSQL string) ([]string, error) {
+func TablesList(ctx context.Context, rawSQL string) ([]string, error) {
+	logger := backend.NewLoggerWith("logger", "expr.sql").FromContext(ctx)
 	stmt, err := sqlparser.Parse(rawSQL)
 	if err != nil {
 		logger.Error("error parsing sql", "error", err.Error(), "sql", rawSQL)
diff --git a/pkg/expr/sql/parser_test.go b/pkg/expr/sql/parser_test.go
index 44ac1ccb102..02d7ce344f7 100644
--- a/pkg/expr/sql/parser_test.go
+++ b/pkg/expr/sql/parser_test.go
@@ -121,7 +121,7 @@ func TestTablesList(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			tables, err := TablesList(tc.sql)
+			tables, err := TablesList(t.Context(), tc.sql)
 			if tc.expectError {
 				require.NotNil(t, err, "expected error for SQL: %s", tc.sql)
 			} else {
diff --git a/pkg/expr/sql_command.go b/pkg/expr/sql_command.go
index 6c80ac717d6..016b1c87f5e 100644
--- a/pkg/expr/sql_command.go
+++ b/pkg/expr/sql_command.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"go.opentelemetry.io/otel/codes"
 
@@ -41,11 +42,11 @@ type SQLCommand struct {
 }
 
 // NewSQLCommand creates a new SQLCommand.
-func NewSQLCommand(refID, format, rawSQL string, intputLimit, outputLimit int64, timeout time.Duration) (*SQLCommand, error) {
+func NewSQLCommand(ctx context.Context, refID, format, rawSQL string, intputLimit, outputLimit int64, timeout time.Duration) (*SQLCommand, error) {
 	if rawSQL == "" {
 		return nil, ErrMissingSQLQuery
 	}
-	tables, err := sql.TablesList(rawSQL)
+	tables, err := sql.TablesList(ctx, rawSQL)
 	if err != nil {
 		logger.Warn("invalid sql query", "sql", rawSQL, "error", err)
 		return nil, ErrInvalidSQLQuery.Build(errutil.TemplateData{
@@ -77,7 +78,8 @@ func NewSQLCommand(refID, format, rawSQL string, intputLimit, outputLimit int64,
 }
 
 // UnmarshalSQLCommand creates a SQLCommand from Grafana's frontend query.
-func UnmarshalSQLCommand(rn *rawNode, cfg *setting.Cfg) (*SQLCommand, error) {
+func UnmarshalSQLCommand(ctx context.Context, rn *rawNode, cfg *setting.Cfg) (*SQLCommand, error) {
+	sqlLogger := backend.NewLoggerWith("logger", "expr.sql").FromContext(ctx)
 	if rn.TimeRange == nil {
 		logger.Error("time range must be specified for refID", "refID", rn.RefID)
 		return nil, fmt.Errorf("time range must be specified for refID %s", rn.RefID)
@@ -85,19 +87,19 @@ func UnmarshalSQLCommand(rn *rawNode, cfg *setting.Cfg) (*SQLCommand, error) {
 
 	expressionRaw, ok := rn.Query["expression"]
 	if !ok {
-		logger.Error("no expression in the query", "query", rn.Query)
+		sqlLogger.Error("no expression in the query", "query", rn.Query)
 		return nil, errors.New("no expression in the query")
 	}
 	expression, ok := expressionRaw.(string)
 	if !ok {
-		logger.Error("expected sql expression to be type string", "expression", expressionRaw)
+		sqlLogger.Error("expected sql expression to be type string", "expression", expressionRaw)
 		return nil, fmt.Errorf("expected sql expression to be type string, but got type %T", expressionRaw)
 	}
 
 	formatRaw := rn.Query["format"]
 	format, _ := formatRaw.(string)
 
-	return NewSQLCommand(rn.RefID, format, expression, cfg.SQLExpressionCellLimit, cfg.SQLExpressionOutputCellLimit, cfg.SQLExpressionTimeout)
+	return NewSQLCommand(ctx, rn.RefID, format, expression, cfg.SQLExpressionCellLimit, cfg.SQLExpressionOutputCellLimit, cfg.SQLExpressionTimeout)
 }
 
 // NeedsVars returns the variable names (refIds) that are dependencies
@@ -111,6 +113,7 @@ func (gr *SQLCommand) NeedsVars() []string {
 func (gr *SQLCommand) Execute(ctx context.Context, now time.Time, vars mathexp.Vars, tracer tracing.Tracer, metrics *metrics.ExprMetrics) (mathexp.Results, error) {
 	_, span := tracer.Start(ctx, "SSE.ExecuteSQL")
 	start := time.Now()
+	sqlLogger := backend.NewLoggerWith("logger", "expr.sql").FromContext(ctx)
 	tc := int64(0)
 	rsp := mathexp.Results{}
 
@@ -122,6 +125,7 @@ func (gr *SQLCommand) Execute(ctx context.Context, now time.Time, vars mathexp.V
 			statusLabel = "error"
 			span.RecordError(rsp.Error)
 			span.SetStatus(codes.Error, rsp.Error.Error())
+			sqlLogger.Error("SQL command execution failed", "error", rsp.Error.Error())
 		}
 		span.End()
 
@@ -134,7 +138,7 @@ func (gr *SQLCommand) Execute(ctx context.Context, now time.Time, vars mathexp.V
 	for _, ref := range gr.varsToQuery {
 		results, ok := vars[ref]
 		if !ok {
-			logger.Warn("no results found for", "ref", ref)
+			sqlLogger.Warn("no results found for", "ref", ref)
 			continue
 		}
 		frames := results.Values.AsDataFrames(ref)
@@ -153,16 +157,16 @@ func (gr *SQLCommand) Execute(ctx context.Context, now time.Time, vars mathexp.V
 		return rsp, nil
 	}
 
-	logger.Debug("Executing query", "query", gr.query, "frames", len(allFrames))
+	sqlLogger.Debug("Executing query", "query", gr.query, "frames", len(allFrames))
 
 	db := sql.DB{}
 	frame, err := db.QueryFrames(ctx, tracer, gr.refID, gr.query, allFrames, sql.WithMaxOutputCells(gr.outputLimit), sql.WithTimeout(gr.timeout))
 	if err != nil {
-		logger.Error("Failed to query frames", "error", err.Error())
 		rsp.Error = err
 		return rsp, nil
 	}
-	logger.Debug("Done Executing query", "query", gr.query, "rows", frame.Rows())
+
+	sqlLogger.Debug("Done Executing query", "query", gr.query, "rows", frame.Rows())
 
 	if frame.Rows() == 0 {
 		rsp.Values = mathexp.Values{
diff --git a/pkg/expr/sql_command_test.go b/pkg/expr/sql_command_test.go
index c4ecdc480f6..dd9b274a8cd 100644
--- a/pkg/expr/sql_command_test.go
+++ b/pkg/expr/sql_command_test.go
@@ -18,7 +18,7 @@ import (
 )
 
 func TestNewCommand(t *testing.T) {
-	cmd, err := NewSQLCommand("a", "", "select a from foo, bar", 0, 0, 0)
+	cmd, err := NewSQLCommand(t.Context(), "a", "", "select a from foo, bar", 0, 0, 0)
 	if err != nil && strings.Contains(err.Error(), "feature is not enabled") {
 		return
 	}
@@ -126,7 +126,7 @@ func TestSQLCommandCellLimits(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			cmd, err := NewSQLCommand("a", "", "select a from foo, bar", tt.limit, 0, 0)
+			cmd, err := NewSQLCommand(t.Context(), "a", "", "select a from foo, bar", tt.limit, 0, 0)
 			require.NoError(t, err, "Failed to create SQL command")
 
 			vars := mathexp.Vars{}
@@ -154,7 +154,7 @@ func TestSQLCommandMetrics(t *testing.T) {
 	m := metrics.NewTestMetrics()
 
 	// Create a command
-	cmd, err := NewSQLCommand("A", "someformat", "select * from foo", 0, 0, 0)
+	cmd, err := NewSQLCommand(t.Context(), "A", "someformat", "select * from foo", 0, 0, 0)
 	require.NoError(t, err)
 
 	// Execute successful command
diff --git a/pkg/expr/transform.go b/pkg/expr/transform.go
index db49522eff1..049bcb117a4 100644
--- a/pkg/expr/transform.go
+++ b/pkg/expr/transform.go
@@ -88,7 +88,7 @@ func (s *Service) TransformData(ctx context.Context, now time.Time, req *Request
 
 	// Build the pipeline from the request, checking for ordering issues (e.g. loops)
 	// and parsing graph nodes from the queries.
-	pipeline, err := s.BuildPipeline(req)
+	pipeline, err := s.BuildPipeline(ctx, req)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/ngalert/eval/eval.go b/pkg/services/ngalert/eval/eval.go
index fec321ddd11..67aa263b24a 100644
--- a/pkg/services/ngalert/eval/eval.go
+++ b/pkg/services/ngalert/eval/eval.go
@@ -45,7 +45,7 @@ type expressionExecutor interface {
 
 type expressionBuilder interface {
 	expressionExecutor
-	BuildPipeline(req *expr.Request) (expr.DataPipeline, error)
+	BuildPipeline(ctx context.Context, req *expr.Request) (expr.DataPipeline, error)
 }
 
 type conditionEvaluator struct {
@@ -849,11 +849,11 @@ func (e *evaluatorImpl) Create(ctx EvaluationContext, condition models.Condition
 	if err != nil {
 		return nil, err
 	}
-	return e.create(condition, req)
+	return e.create(ctx.Ctx, condition, req)
 }
 
-func (e *evaluatorImpl) create(condition models.Condition, req *expr.Request) (ConditionEvaluator, error) {
-	pipeline, err := e.expressionService.BuildPipeline(req)
+func (e *evaluatorImpl) create(ctx context.Context, condition models.Condition, req *expr.Request) (ConditionEvaluator, error) {
+	pipeline, err := e.expressionService.BuildPipeline(ctx, req)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/ngalert/eval/eval_test.go b/pkg/services/ngalert/eval/eval_test.go
index 15a9d464b15..a93ecacd64d 100644
--- a/pkg/services/ngalert/eval/eval_test.go
+++ b/pkg/services/ngalert/eval/eval_test.go
@@ -1539,7 +1539,7 @@ func TestCreate(t *testing.T) {
 
 		factory := evaluatorImpl{
 			expressionService: fakeExpressionService{
-				buildHook: func(req *expr.Request) (expr.DataPipeline, error) {
+				buildHook: func(ctx context.Context, req *expr.Request) (expr.DataPipeline, error) {
 					if request != nil {
 						assert.Fail(t, "BuildPipeline was called twice but should be only once")
 					}
@@ -1562,15 +1562,15 @@ func TestCreate(t *testing.T) {
 
 type fakeExpressionService struct {
 	hook      func(ctx context.Context, now time.Time, pipeline expr.DataPipeline) (*backend.QueryDataResponse, error)
-	buildHook func(req *expr.Request) (expr.DataPipeline, error)
+	buildHook func(ctx context.Context, req *expr.Request) (expr.DataPipeline, error)
 }
 
 func (f fakeExpressionService) ExecutePipeline(ctx context.Context, now time.Time, pipeline expr.DataPipeline) (*backend.QueryDataResponse, error) {
 	return f.hook(ctx, now, pipeline)
 }
 
-func (f fakeExpressionService) BuildPipeline(req *expr.Request) (expr.DataPipeline, error) {
-	return f.buildHook(req)
+func (f fakeExpressionService) BuildPipeline(ctx context.Context, req *expr.Request) (expr.DataPipeline, error) {
+	return f.buildHook(ctx, req)
 }
 
 type fakeNode struct {
diff --git a/pkg/services/ngalert/eval/validate.go b/pkg/services/ngalert/eval/validate.go
index 37c58385102..573426f06c1 100644
--- a/pkg/services/ngalert/eval/validate.go
+++ b/pkg/services/ngalert/eval/validate.go
@@ -50,7 +50,7 @@ func (e *ConditionValidator) Validate(ctx EvaluationContext, condition models.Co
 		case expr.TypeCMDNode:
 		}
 	}
-	pipeline, err := e.expressionService.BuildPipeline(req)
+	pipeline, err := e.expressionService.BuildPipeline(ctx.Ctx, req)
 	if err != nil {
 		return err
 	}

From 587f52cf5b8c480cfe63490a1e77907faa1a263a Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Wed, 13 Aug 2025 17:28:43 +0200
Subject: [PATCH 143/243] Alerting: API to show converted alertmanager
 configurations in the UI (#109353)

What is this feature?

This PR add the backend functionality to support viewing extra Alertmanager configurations (imported with the Prometheus conversion API) in the UI under the feature flag alertingImportAlertmanagerUI. The same flag will be used to enable this in the UI.

This is just the backend part, the full PoC PR is here: #109027

It uses a special datasource UID prefix __grafana-converted-extra-config-{identifier} to identify imported configurations. When the Alertmanager proxy handler detects this prefix:

    GET requests are proxied to either the Grafana Alertmanager service (for alerts, silences, etc.) or the Prometheus conversion API to get the config
    Write operations are not supported
---
 .../src/types/featureToggles.gen.ts           |   5 +
 pkg/services/featuremgmt/registry.go          |   9 +
 pkg/services/featuremgmt/toggles_gen.csv      |   1 +
 pkg/services/featuremgmt/toggles_gen.go       |   4 +
 pkg/services/featuremgmt/toggles_gen.json     |  15 ++
 pkg/services/ngalert/api/api.go               |  24 ++-
 .../ngalert/api/forking_alertmanager.go       | 108 +++++++++-
 .../ngalert/api/forking_alertmanager_test.go  | 203 ++++++++++++++++++
 8 files changed, 354 insertions(+), 15 deletions(-)
 create mode 100644 pkg/services/ngalert/api/forking_alertmanager_test.go

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 6b8812ee68e..1ba87b75cd8 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -1012,6 +1012,11 @@ export interface FeatureToggles {
   */
   alertingImportAlertmanagerAPI?: boolean;
   /**
+  * Enables the UI to see imported Alertmanager configuration
+  * @default false
+  */
+  alertingImportAlertmanagerUI?: boolean;
+  /**
   * Enables image sharing functionality for dashboards
   */
   sharingDashboardImage?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index e2ee8daad09..407d5bb8675 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -1748,6 +1748,15 @@ var (
 			HideFromDocs:      true,
 			Expression:        "false",
 		},
+		{
+			Name:              "alertingImportAlertmanagerUI",
+			Description:       "Enables the UI to see imported Alertmanager configuration",
+			Stage:             FeatureStageExperimental,
+			Owner:             grafanaAlertingSquad,
+			HideFromAdminPage: true,
+			HideFromDocs:      true,
+			Expression:        "false",
+		},
 		{
 			Name:         "sharingDashboardImage",
 			Description:  "Enables image sharing functionality for dashboards",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index fa1853ebe62..da5c86efce9 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -227,6 +227,7 @@ restoreDashboards,experimental,@grafana/grafana-frontend-platform,false,false,fa
 skipTokenRotationIfRecent,GA,@grafana/identity-access-team,false,false,false
 alertEnrichment,experimental,@grafana/alerting-squad,false,false,false
 alertingImportAlertmanagerAPI,experimental,@grafana/alerting-squad,false,false,false
+alertingImportAlertmanagerUI,experimental,@grafana/alerting-squad,false,false,false
 sharingDashboardImage,experimental,@grafana/sharing-squad,false,false,true
 preferLibraryPanelTitle,privatePreview,@grafana/dashboards-squad,false,false,false
 tabularNumbers,GA,@grafana/grafana-frontend-platform,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index c77c705182f..850aeaaf482 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -919,6 +919,10 @@ const (
 	// Enables the API to import Alertmanager configuration
 	FlagAlertingImportAlertmanagerAPI = "alertingImportAlertmanagerAPI"
 
+	// FlagAlertingImportAlertmanagerUI
+	// Enables the UI to see imported Alertmanager configuration
+	FlagAlertingImportAlertmanagerUI = "alertingImportAlertmanagerUI"
+
 	// FlagSharingDashboardImage
 	// Enables image sharing functionality for dashboards
 	FlagSharingDashboardImage = "sharingDashboardImage"
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 272c58a23ca..deabfe2302c 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -242,6 +242,21 @@
         "expression": "false"
       }
     },
+    {
+      "metadata": {
+        "name": "alertingImportAlertmanagerUI",
+        "resourceVersion": "1754585847887",
+        "creationTimestamp": "2025-08-07T16:57:27Z"
+      },
+      "spec": {
+        "description": "Enables the UI to see imported Alertmanager configuration",
+        "stage": "experimental",
+        "codeowner": "@grafana/alerting-squad",
+        "hideFromAdminPage": true,
+        "hideFromDocs": true,
+        "expression": "false"
+      }
+    },
     {
       "metadata": {
         "name": "alertingImportYAMLUI",
diff --git a/pkg/services/ngalert/api/api.go b/pkg/services/ngalert/api/api.go
index a6e3ba62cd5..eefbb6dea30 100644
--- a/pkg/services/ngalert/api/api.go
+++ b/pkg/services/ngalert/api/api.go
@@ -95,6 +95,16 @@ func (api *API) RegisterAPIEndpoints(m *metrics.API) {
 	}
 	ruleAuthzService := accesscontrol.NewRuleService(api.AccessControl)
 
+	convertSrv := NewConvertPrometheusSrv(
+		&api.Cfg.UnifiedAlerting,
+		logger,
+		api.RuleStore,
+		api.DatasourceCache,
+		api.AlertRules,
+		api.FeatureManager,
+		api.MultiOrgAlertmanager,
+	)
+
 	// Register endpoints for proxying to Alertmanager-compatible backends.
 	api.RegisterAlertmanagerApiEndpoints(NewForkingAM(
 		api.DatasourceCache,
@@ -115,6 +125,8 @@ func (api *API) RegisterAPIEndpoints(m *metrics.API) {
 			),
 			receiverAuthz: accesscontrol.NewReceiverAccess[ReceiverStatus](api.AccessControl, false),
 		},
+		convertSrv,
+		api.FeatureManager,
 	), m)
 	// Register endpoints for proxying to Prometheus-compatible backends.
 	api.RegisterPrometheusApiEndpoints(NewForkingProm(
@@ -181,15 +193,5 @@ func (api *API) RegisterAPIEndpoints(m *metrics.API) {
 		hist:   api.Historian,
 	}), m)
 
-	api.RegisterConvertPrometheusApiEndpoints(NewConvertPrometheusApi(
-		NewConvertPrometheusSrv(
-			&api.Cfg.UnifiedAlerting,
-			logger,
-			api.RuleStore,
-			api.DatasourceCache,
-			api.AlertRules,
-			api.FeatureManager,
-			api.MultiOrgAlertmanager,
-		),
-	), m)
+	api.RegisterConvertPrometheusApiEndpoints(NewConvertPrometheusApi(convertSrv), m)
 }
diff --git a/pkg/services/ngalert/api/forking_alertmanager.go b/pkg/services/ngalert/api/forking_alertmanager.go
index df5059b296c..9d76ccb07ff 100644
--- a/pkg/services/ngalert/api/forking_alertmanager.go
+++ b/pkg/services/ngalert/api/forking_alertmanager.go
@@ -1,36 +1,83 @@
 package api
 
 import (
+	"net/http"
+	"strings"
+
+	amv2 "github.com/prometheus/alertmanager/api/v2/models"
+
 	"github.com/grafana/grafana/pkg/api/response"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/web"
 )
 
+const extraConfigPrefix = "~grafana-converted-extra-config-"
+
+type ConvertService interface {
+	RouteConvertPrometheusGetAlertmanagerConfig(ctx *contextmodel.ReqContext) response.Response
+}
+
 type AlertmanagerApiHandler struct {
 	AMSvc           *LotexAM
 	GrafanaSvc      *AlertmanagerSrv
+	ConvertSvc      ConvertService
 	DatasourceCache datasources.CacheService
+	FeatureManager  featuremgmt.FeatureToggles
 }
 
 // NewForkingAM implements a set of routes that proxy to various Alertmanager-compatible backends.
-func NewForkingAM(datasourceCache datasources.CacheService, proxy *LotexAM, grafana *AlertmanagerSrv) *AlertmanagerApiHandler {
+func NewForkingAM(datasourceCache datasources.CacheService, proxy *LotexAM, grafana *AlertmanagerSrv, convertSvc ConvertService, featureManager featuremgmt.FeatureToggles) *AlertmanagerApiHandler {
 	return &AlertmanagerApiHandler{
 		AMSvc:           proxy,
 		GrafanaSvc:      grafana,
+		ConvertSvc:      convertSvc,
 		DatasourceCache: datasourceCache,
+		FeatureManager:  featureManager,
 	}
 }
 
 func (f *AlertmanagerApiHandler) getService(ctx *contextmodel.ReqContext) (*LotexAM, error) {
-	_, err := getDatasourceByUID(ctx, f.DatasourceCache, apimodels.AlertmanagerBackend)
-	if err != nil {
-		return nil, err
+	// If this is not an extra config request, we should check that the datasource exists and is of the correct type.
+	if isExtra, _ := f.isExtraConfig(ctx); !isExtra {
+		_, err := getDatasourceByUID(ctx, f.DatasourceCache, apimodels.AlertmanagerBackend)
+		if err != nil {
+			return nil, err
+		}
 	}
+
 	return f.AMSvc, nil
 }
 
+// isExtraConfig checks if the datasourceUID represents an extra config.
+// Extra configs are the alertmanager configurations that were saved using the Prometheus conversion API.
+func (f *AlertmanagerApiHandler) isExtraConfig(ctx *contextmodel.ReqContext) (bool, string) {
+	// Only enabled if feature flag is on
+	if !f.FeatureManager.IsEnabledGlobally(featuremgmt.FlagAlertingImportAlertmanagerUI) {
+		return false, ""
+	}
+
+	datasourceUID := web.Params(ctx.Req)[":DatasourceUID"]
+	if strings.HasPrefix(datasourceUID, extraConfigPrefix) {
+		identifier := strings.TrimPrefix(datasourceUID, extraConfigPrefix)
+		return true, identifier
+	}
+	return false, ""
+}
+
 func (f *AlertmanagerApiHandler) handleRouteGetAMStatus(ctx *contextmodel.ReqContext, dsUID string) response.Response {
+	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+		status := apimodels.GettableStatus{
+			Cluster: &amv2.ClusterStatus{
+				Status: util.Pointer("ready"),
+			},
+		}
+		return response.JSON(http.StatusOK, status)
+	}
+
 	s, err := f.getService(ctx)
 	if err != nil {
 		return errorToResponse(err)
@@ -40,6 +87,10 @@ func (f *AlertmanagerApiHandler) handleRouteGetAMStatus(ctx *contextmodel.ReqCon
 }
 
 func (f *AlertmanagerApiHandler) handleRouteCreateSilence(ctx *contextmodel.ReqContext, body apimodels.PostableSilence, dsUID string) response.Response {
+	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+		return response.Error(http.StatusForbidden, "Read-only configuration", nil)
+	}
+
 	s, err := f.getService(ctx)
 	if err != nil {
 		return errorToResponse(err)
@@ -49,6 +100,10 @@ func (f *AlertmanagerApiHandler) handleRouteCreateSilence(ctx *contextmodel.ReqC
 }
 
 func (f *AlertmanagerApiHandler) handleRouteDeleteAlertingConfig(ctx *contextmodel.ReqContext, dsUID string) response.Response {
+	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+		return response.Error(http.StatusForbidden, "Read-only configuration", nil)
+	}
+
 	s, err := f.getService(ctx)
 	if err != nil {
 		return errorToResponse(err)
@@ -58,6 +113,10 @@ func (f *AlertmanagerApiHandler) handleRouteDeleteAlertingConfig(ctx *contextmod
 }
 
 func (f *AlertmanagerApiHandler) handleRouteDeleteSilence(ctx *contextmodel.ReqContext, silenceID string, dsUID string) response.Response {
+	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+		return response.Error(http.StatusForbidden, "Read-only configuration", nil)
+	}
+
 	s, err := f.getService(ctx)
 	if err != nil {
 		return errorToResponse(err)
@@ -67,6 +126,23 @@ func (f *AlertmanagerApiHandler) handleRouteDeleteSilence(ctx *contextmodel.ReqC
 }
 
 func (f *AlertmanagerApiHandler) handleRouteGetAlertingConfig(ctx *contextmodel.ReqContext, dsUID string) response.Response {
+	if isExtra, identifier := f.isExtraConfig(ctx); isExtra {
+		ctx.Req.Header.Set(configIdentifierHeader, identifier)
+		ctx.Req.Header.Set("Accept", "application/yaml")
+
+		conversionResp := f.ConvertSvc.RouteConvertPrometheusGetAlertmanagerConfig(ctx)
+		if conversionResp.Status() != http.StatusOK {
+			return conversionResp
+		}
+
+		config, err := yamlExtractor(&apimodels.GettableUserConfig{})(conversionResp.(*response.NormalResponse))
+		if err != nil {
+			return response.Error(http.StatusInternalServerError, "Failed to parse alertmanager config", err)
+		}
+
+		return response.JSON(http.StatusOK, config)
+	}
+
 	s, err := f.getService(ctx)
 	if err != nil {
 		return errorToResponse(err)
@@ -76,6 +152,10 @@ func (f *AlertmanagerApiHandler) handleRouteGetAlertingConfig(ctx *contextmodel.
 }
 
 func (f *AlertmanagerApiHandler) handleRouteGetAMAlertGroups(ctx *contextmodel.ReqContext, dsUID string) response.Response {
+	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+		return f.GrafanaSvc.RouteGetAMAlertGroups(ctx)
+	}
+
 	s, err := f.getService(ctx)
 	if err != nil {
 		return errorToResponse(err)
@@ -85,6 +165,10 @@ func (f *AlertmanagerApiHandler) handleRouteGetAMAlertGroups(ctx *contextmodel.R
 }
 
 func (f *AlertmanagerApiHandler) handleRouteGetAMAlerts(ctx *contextmodel.ReqContext, dsUID string) response.Response {
+	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+		return f.GrafanaSvc.RouteGetAMAlerts(ctx)
+	}
+
 	s, err := f.getService(ctx)
 	if err != nil {
 		return errorToResponse(err)
@@ -94,6 +178,10 @@ func (f *AlertmanagerApiHandler) handleRouteGetAMAlerts(ctx *contextmodel.ReqCon
 }
 
 func (f *AlertmanagerApiHandler) handleRouteGetSilence(ctx *contextmodel.ReqContext, silenceID string, dsUID string) response.Response {
+	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+		return f.GrafanaSvc.RouteGetSilence(ctx, silenceID)
+	}
+
 	s, err := f.getService(ctx)
 	if err != nil {
 		return errorToResponse(err)
@@ -103,6 +191,10 @@ func (f *AlertmanagerApiHandler) handleRouteGetSilence(ctx *contextmodel.ReqCont
 }
 
 func (f *AlertmanagerApiHandler) handleRouteGetSilences(ctx *contextmodel.ReqContext, dsUID string) response.Response {
+	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+		return f.GrafanaSvc.RouteGetSilences(ctx)
+	}
+
 	s, err := f.getService(ctx)
 	if err != nil {
 		return errorToResponse(err)
@@ -112,6 +204,10 @@ func (f *AlertmanagerApiHandler) handleRouteGetSilences(ctx *contextmodel.ReqCon
 }
 
 func (f *AlertmanagerApiHandler) handleRoutePostAlertingConfig(ctx *contextmodel.ReqContext, body apimodels.PostableUserConfig, dsUID string) response.Response {
+	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+		return response.Error(http.StatusForbidden, "Read-only configuration", nil)
+	}
+
 	s, err := f.getService(ctx)
 	if err != nil {
 		return errorToResponse(err)
@@ -123,6 +219,10 @@ func (f *AlertmanagerApiHandler) handleRoutePostAlertingConfig(ctx *contextmodel
 }
 
 func (f *AlertmanagerApiHandler) handleRoutePostAMAlerts(ctx *contextmodel.ReqContext, body apimodels.PostableAlerts, dsUID string) response.Response {
+	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+		return response.Error(http.StatusForbidden, "Read-only configuration", nil)
+	}
+
 	s, err := f.getService(ctx)
 	if err != nil {
 		return errorToResponse(err)
diff --git a/pkg/services/ngalert/api/forking_alertmanager_test.go b/pkg/services/ngalert/api/forking_alertmanager_test.go
new file mode 100644
index 00000000000..46074531398
--- /dev/null
+++ b/pkg/services/ngalert/api/forking_alertmanager_test.go
@@ -0,0 +1,203 @@
+package api
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/api/response"
+	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+func TestAlertmanagerApiHandler_isExtraConfig(t *testing.T) {
+	tests := []struct {
+		name               string
+		datasourceUID      string
+		flagEnabled        bool
+		expectedIsExtra    bool
+		expectedIdentifier string
+	}{
+		{
+			name:               "normal datasource when feature enabled",
+			datasourceUID:      "normal-datasource",
+			flagEnabled:        true,
+			expectedIsExtra:    false,
+			expectedIdentifier: "",
+		},
+		{
+			name:               "extra config when feature enabled",
+			datasourceUID:      "~grafana-converted-extra-config-test-config",
+			flagEnabled:        true,
+			expectedIsExtra:    true,
+			expectedIdentifier: "test-config",
+		},
+		{
+			name:               "extra config when feature disabled",
+			datasourceUID:      "~grafana-converted-extra-config-test-config",
+			flagEnabled:        false,
+			expectedIsExtra:    false,
+			expectedIdentifier: "",
+		},
+		{
+			name:               "empty datasource UID",
+			datasourceUID:      "",
+			flagEnabled:        true,
+			expectedIsExtra:    false,
+			expectedIdentifier: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := &http.Request{}
+			ctx := &contextmodel.ReqContext{
+				Context: &web.Context{
+					Req: req,
+				},
+				SignedInUser: &user.SignedInUser{
+					OrgID: 1,
+				},
+			}
+
+			ctx.Req = web.SetURLParams(req, map[string]string{
+				":DatasourceUID": tt.datasourceUID,
+			})
+
+			var features featuremgmt.FeatureToggles
+			if tt.flagEnabled {
+				features = featuremgmt.WithFeatures(featuremgmt.FlagAlertingImportAlertmanagerUI)
+			} else {
+				features = featuremgmt.WithFeatures()
+			}
+
+			handler := &AlertmanagerApiHandler{
+				FeatureManager: features,
+			}
+
+			isExtra, identifier := handler.isExtraConfig(ctx)
+			assert.Equal(t, tt.expectedIsExtra, isExtra)
+			assert.Equal(t, tt.expectedIdentifier, identifier)
+		})
+	}
+}
+
+func TestAlertmanagerApiHandler_ExtraConfigRouting(t *testing.T) {
+	t.Run("GET status returns ready for extra config", func(t *testing.T) {
+		req := &http.Request{}
+		ctx := &contextmodel.ReqContext{
+			Context: &web.Context{
+				Req: req,
+			},
+			SignedInUser: &user.SignedInUser{
+				OrgID: 1,
+			},
+		}
+
+		ctx.Req = web.SetURLParams(req, map[string]string{
+			":DatasourceUID": "~grafana-converted-extra-config-test",
+		})
+
+		handler := &AlertmanagerApiHandler{
+			FeatureManager: featuremgmt.WithFeatures(featuremgmt.FlagAlertingImportAlertmanagerUI),
+		}
+
+		resp := handler.handleRouteGetAMStatus(ctx, "~grafana-converted-extra-config-test")
+		require.Equal(t, http.StatusOK, resp.Status())
+	})
+
+	t.Run("POST operations return 403 for extra config", func(t *testing.T) {
+		req := &http.Request{}
+		ctx := &contextmodel.ReqContext{
+			Context: &web.Context{
+				Req: req,
+			},
+			SignedInUser: &user.SignedInUser{
+				OrgID: 1,
+			},
+		}
+
+		ctx.Req = web.SetURLParams(req, map[string]string{
+			":DatasourceUID": "~grafana-converted-extra-config-test",
+		})
+
+		handler := &AlertmanagerApiHandler{
+			FeatureManager: featuremgmt.WithFeatures(featuremgmt.FlagAlertingImportAlertmanagerUI),
+		}
+
+		resp := handler.handleRouteCreateSilence(ctx, apimodels.PostableSilence{}, "~grafana-converted-extra-config-test")
+		assert.Equal(t, http.StatusForbidden, resp.Status())
+
+		resp = handler.handleRouteDeleteAlertingConfig(ctx, "~grafana-converted-extra-config-test")
+		assert.Equal(t, http.StatusForbidden, resp.Status())
+
+		resp = handler.handleRoutePostAlertingConfig(ctx, apimodels.PostableUserConfig{}, "~grafana-converted-extra-config-test")
+		assert.Equal(t, http.StatusForbidden, resp.Status())
+
+		resp = handler.handleRoutePostAMAlerts(ctx, apimodels.PostableAlerts{}, "~grafana-converted-extra-config-test")
+		assert.Equal(t, http.StatusForbidden, resp.Status())
+	})
+
+	t.Run("GET extra config", func(t *testing.T) {
+		req := &http.Request{
+			Header: make(http.Header),
+		}
+		ctx := &contextmodel.ReqContext{
+			Context: &web.Context{
+				Req: req,
+			},
+			SignedInUser: &user.SignedInUser{
+				OrgID: 1,
+			},
+		}
+
+		ctx.Req = web.SetURLParams(req, map[string]string{
+			":DatasourceUID": "~grafana-converted-extra-config-test-identifier",
+		})
+
+		mockConvertSvc := &mockConvertService{}
+
+		yamlConfig := `alertmanager_config: |
+  global: {}
+  route:
+    receiver: test-receiver
+  receivers:
+    - name: test-receiver`
+
+		mockResponse := response.Respond(http.StatusOK, yamlConfig).
+			SetHeader("Content-Type", "application/yaml")
+
+		mockConvertSvc.On("RouteConvertPrometheusGetAlertmanagerConfig", mock.Anything).
+			Run(func(args mock.Arguments) {
+				passedCtx := args.Get(0).(*contextmodel.ReqContext)
+				assert.Equal(t, "test-identifier", passedCtx.Req.Header.Get(configIdentifierHeader))
+				assert.Equal(t, "application/yaml", passedCtx.Req.Header.Get("Accept"))
+			}).
+			Return(mockResponse)
+
+		handler := &AlertmanagerApiHandler{
+			FeatureManager: featuremgmt.WithFeatures(featuremgmt.FlagAlertingImportAlertmanagerUI),
+			ConvertSvc:     mockConvertSvc,
+		}
+
+		resp := handler.handleRouteGetAlertingConfig(ctx, "~grafana-converted-extra-config-test-identifier")
+		assert.Equal(t, http.StatusOK, resp.Status())
+
+		mockConvertSvc.AssertExpectations(t)
+	})
+}
+
+type mockConvertService struct {
+	mock.Mock
+}
+
+func (m *mockConvertService) RouteConvertPrometheusGetAlertmanagerConfig(ctx *contextmodel.ReqContext) response.Response {
+	args := m.Called(ctx)
+	return args.Get(0).(response.Response)
+}

From 6527790b64271cafcfadaad6d0350757ed8aa52b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Wed, 13 Aug 2025 17:35:06 +0200
Subject: [PATCH 144/243] Provisioning: Fix flaky tests with better debugging
 and consistent test patterns (#109601)

* Add log after jobs

* Use the same helper to create repository in export job

* Improve the logging

* Fix eventually conditions in helpers

* Fix export job tests

* Format code

* Fix linting

* Fix the format

* Fix linting issue

* Fix innefectual assignment
---
 pkg/tests/apis/provisioning/deletejob_test.go |  13 +-
 pkg/tests/apis/provisioning/exportjob_test.go |  77 ++++---
 pkg/tests/apis/provisioning/helper_test.go    | 197 ++++++++++++++++--
 pkg/tests/apis/provisioning/movejob_test.go   |  10 +
 .../apis/provisioning/repository_test.go      |   2 +
 5 files changed, 251 insertions(+), 48 deletions(-)

diff --git a/pkg/tests/apis/provisioning/deletejob_test.go b/pkg/tests/apis/provisioning/deletejob_test.go
index 85f3d97da13..accef534fc6 100644
--- a/pkg/tests/apis/provisioning/deletejob_test.go
+++ b/pkg/tests/apis/provisioning/deletejob_test.go
@@ -40,6 +40,14 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 
 	t.Run("delete single file", func(t *testing.T) {
 		// FIXME: make the tests in a way that we can simply have a spec and some expectations per scenario.
+
+		// Debug state before delete
+		helper.DebugState(t, repo, "BEFORE DELETE")
+
+		// Verify file exists in repository before attempting delete
+		_, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard1.json")
+		require.NoError(t, err, "dashboard1.json should exist in repository before delete")
+
 		spec := provisioning.JobSpec{
 			Action: provisioning.JobActionDelete,
 			Delete: &provisioning.DeleteJobOptions{
@@ -49,10 +57,13 @@ func TestIntegrationProvisioning_DeleteJob(t *testing.T) {
 		// Create delete job for single file
 		helper.TriggerJobAndWaitForSuccess(t, repo, spec)
 
+		// Debug state after successful delete
+		helper.DebugState(t, repo, "AFTER DELETE")
+
 		// FIXME: create a helper to verify repository files
 
 		// Verify file is deleted from repository
-		_, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard1.json")
+		_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard1.json")
 		require.Error(t, err, "file should be deleted from repository")
 		require.True(t, apierrors.IsNotFound(err), "should be not found error")
 
diff --git a/pkg/tests/apis/provisioning/exportjob_test.go b/pkg/tests/apis/provisioning/exportjob_test.go
index 25c909f6609..79b2203ab47 100644
--- a/pkg/tests/apis/provisioning/exportjob_test.go
+++ b/pkg/tests/apis/provisioning/exportjob_test.go
@@ -43,13 +43,19 @@ func TestProvisioning_ExportUnifiedToRepository(t *testing.T) {
 
 	// Now for the repository.
 	const repo = "local-repository"
-	// FIXME: use the same helper to create the repository
-	createBody := helper.RenderObject(t, "exportunifiedtorepository/repository.json.tmpl", map[string]any{"Name": repo})
-	_, err = helper.Repositories.Resource.Create(ctx, createBody, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create repository")
+	testRepo := TestRepo{
+		Name:               repo,
+		Copies:             map[string]string{}, // No initial files needed for export test
+		ExpectedDashboards: 4,                   // 4 dashboards created above (v0, v1, v2alpha1, v2beta1)
+		ExpectedFolders:    0,                   // No folders expected after sync
+	}
+	helper.CreateRepo(t, testRepo)
 
 	// Now export
+	helper.DebugState(t, repo, "BEFORE EXPORT TO REPOSITORY")
+
 	spec := provisioning.JobSpec{
+		Action: provisioning.JobActionPush,
 		Push: &provisioning.ExportJobOptions{
 			Folder: "", // export entire instance
 			Path:   "", // no prefix necessary for testing
@@ -57,6 +63,8 @@ func TestProvisioning_ExportUnifiedToRepository(t *testing.T) {
 	}
 	helper.TriggerJobAndWaitForSuccess(t, repo, spec)
 
+	helper.DebugState(t, repo, "AFTER EXPORT TO REPOSITORY")
+
 	type props struct {
 		title      string
 		apiVersion string
@@ -117,27 +125,27 @@ func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *tes
 	require.NoError(t, err, "should be able to create second dashboard")
 	dashboard2Name := dashboard2Obj.GetName()
 
-	// FIXME: use same helper to create repository
-	// Create the first repository with sync enabled
+	// Create the first repository with sync enabled and separate filesystem path
 	const repo1 = "first-repository"
 	repo1Path := filepath.Join(helper.ProvisioningPath, repo1)
-	err = os.MkdirAll(repo1Path, 0750)
-	require.NoError(t, err, "should be able to create repository path")
-
-	createBody1 := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo1,
-		"SyncEnabled": true,
-		"SyncTarget":  "folder",
-		"Path":        repo1Path,
-	})
-	_, err = helper.Repositories.Resource.Create(ctx, createBody1, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create first repository")
+	testRepo1 := TestRepo{
+		Name:               repo1,
+		Target:             "folder",
+		Path:               repo1Path,
+		Copies:             map[string]string{}, // No initial files needed for export test
+		ExpectedDashboards: 2,                   // 2 dashboards created above (v1, v2beta1)
+		ExpectedFolders:    1,                   // One folder expected after sync
+	}
+	helper.CreateRepo(t, testRepo1)
 
 	// Print file tree before export
 	printFileTree(t, helper.ProvisioningPath)
 
 	// Initial export
+	helper.DebugState(t, repo1, "BEFORE INITIAL EXPORT")
+
 	spec := provisioning.JobSpec{
+		Action: provisioning.JobActionPush,
 		Push: &provisioning.ExportJobOptions{
 			Folder: "", // export entire instance
 			Path:   "", // no prefix necessary for testing
@@ -145,6 +153,8 @@ func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *tes
 	}
 
 	helper.TriggerJobAndWaitForSuccess(t, repo1, spec)
+
+	helper.DebugState(t, repo1, "AFTER INITIAL EXPORT")
 	helper.SyncAndWait(t, repo1, nil)
 
 	printFileTree(t, helper.ProvisioningPath)
@@ -157,28 +167,24 @@ func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *tes
 	require.NoError(t, err)
 	require.Equal(t, repo1, managedDash2.GetAnnotations()[utils.AnnoKeyManagerIdentity], "dashboard2 should be managed by first repo")
 
-	// FIXME: use helper to create repository
-	// Create second repository - enable sync and set different target
+	// Create second repository - enable sync and set different target with separate filesystem path
 	const repo2 = "second-repository"
 	repo2Path := filepath.Join(helper.ProvisioningPath, repo2)
-	err = os.MkdirAll(repo2Path, 0750)
-	require.NoError(t, err, "should be able to create seconrd repository path")
-
-	printFileTree(t, helper.ProvisioningPath)
-
-	createBody2 := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
-		"Name":        repo2,
-		"SyncEnabled": true,
-		"SyncTarget":  "folder",
-		"Path":        repo2Path,
-	})
-
-	_, err = helper.Repositories.Resource.Create(ctx, createBody2, metav1.CreateOptions{})
-	require.NoError(t, err, "should be able to create second repository")
+	testRepo2 := TestRepo{
+		Name:               repo2,
+		Target:             "folder",
+		Path:               repo2Path,
+		Copies:             map[string]string{}, // No initial files needed for export test
+		ExpectedDashboards: 2,                   // 2 dashboards exist when second repo syncs
+		ExpectedFolders:    2,                   // Two folders expected after sync (repo1 + repo2)
+	}
+	helper.CreateRepo(t, testRepo2)
 
 	// Wait for second repository to sync
 	helper.SyncAndWait(t, repo2, nil)
 
+	printFileTree(t, helper.ProvisioningPath)
+
 	// FIXME: use helpers to check status
 	// Validate that folders for both repositories exist
 	folders, err := helper.Folders.Resource.List(ctx, metav1.ListOptions{})
@@ -214,7 +220,10 @@ func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *tes
 	require.NoError(t, err)
 
 	// Export from second repository - this should only export the unmanaged dashboard3
+	helper.DebugState(t, repo2, "BEFORE SECOND EXPORT")
+
 	spec = provisioning.JobSpec{
+		Action: provisioning.JobActionPush,
 		Push: &provisioning.ExportJobOptions{
 			Folder: "", // export entire instance
 			Path:   "", // no prefix necessary for testing
@@ -222,6 +231,8 @@ func TestIntegrationProvisioning_SecondRepositoryOnlyExportsNewDashboards(t *tes
 	}
 	helper.TriggerJobAndWaitForSuccess(t, repo2, spec)
 
+	helper.DebugState(t, repo2, "AFTER SECOND EXPORT")
+
 	// Wait for both repositories to sync
 	helper.SyncAndWait(t, repo1, nil)
 	helper.SyncAndWait(t, repo2, nil)
diff --git a/pkg/tests/apis/provisioning/helper_test.go b/pkg/tests/apis/provisioning/helper_test.go
index 8ca2f22325b..85ac36e24e9 100644
--- a/pkg/tests/apis/provisioning/helper_test.go
+++ b/pkg/tests/apis/provisioning/helper_test.go
@@ -164,8 +164,16 @@ func (h *provisioningTestHelper) AwaitJobSuccess(t *testing.T, ctx context.Conte
 	t.Helper()
 	job = h.AwaitJob(t, ctx, job)
 	lastErrors := mustNestedStringSlice(job.Object, "status", "errors")
-	require.Empty(t, lastErrors, "historic job '%s' has errors: %v", job.GetName(), lastErrors)
 	lastState := mustNestedString(job.Object, "status", "state")
+
+	repo := job.GetLabels()[jobs.LabelRepository]
+
+	// Debug state if job failed
+	if len(lastErrors) > 0 || lastState != string(provisioning.JobStateSuccess) {
+		h.DebugState(t, repo, fmt.Sprintf("JOB FAILED: %s", job.GetName()))
+	}
+
+	require.Empty(t, lastErrors, "historic job '%s' has errors: %v", job.GetName(), lastErrors)
 	require.Equal(t, string(provisioning.JobStateSuccess), lastState,
 		"historic job '%s' was not successful", job.GetName())
 }
@@ -181,14 +189,13 @@ func (h *provisioningTestHelper) AwaitJob(t *testing.T, ctx context.Context, job
 		result, err := h.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{},
 			"jobs", string(job.GetUID()))
 
-		if apierrors.IsNotFound(err) {
+		if !assert.False(collect, apierrors.IsNotFound(err)) {
 			collect.Errorf("job '%s' not found, still waiting for it to complete", job.GetName())
-			return // continue trying
+			return
 		}
 
+		assert.NoError(collect, err, "failed to get job '%s' to be found", job.GetName())
 		if err != nil {
-			collect.Errorf("failed to get job '%s': %v", job.GetName(), err)
-			collect.FailNow()
 			return
 		}
 
@@ -208,9 +215,11 @@ func (h *provisioningTestHelper) AwaitJobs(t *testing.T, repoName string) {
 		if assert.NoError(collect, err, "failed to list active jobs") {
 			for _, elem := range list.Items {
 				repo, _, err := unstructured.NestedString(elem.Object, "spec", "repository")
-				require.NoError(t, err)
-				if repo == repoName {
-					collect.Errorf("there are still remaining jobs for %s: %+v", repoName, elem)
+				if !assert.NoError(collect, err, "failed to get repository from job spec") {
+					return
+				}
+
+				if !assert.NotEqual(collect, repoName, repo, "there are still remaining jobs for %s: %+v", repoName, elem) {
 					return
 				}
 			}
@@ -243,9 +252,11 @@ func (h *provisioningTestHelper) AwaitJobsWithStates(t *testing.T, repoName stri
 		if assert.NoError(collect, err, "failed to list active jobs") {
 			for _, elem := range list.Items {
 				repo, _, err := unstructured.NestedString(elem.Object, "spec", "repository")
-				require.NoError(t, err)
-				if repo == repoName {
-					collect.Errorf("there are still remaining jobs for %s: %+v", repoName, elem)
+				if !assert.NoError(collect, err, "failed to get repository from job spec") {
+					return
+				}
+
+				if !assert.NotEqual(collect, repoName, repo, "there are still remaining jobs for %s: %+v", repoName, elem) {
 					return
 				}
 			}
@@ -312,9 +323,140 @@ func (h *provisioningTestHelper) CopyToProvisioningPath(t *testing.T, from, to s
 	require.NoError(t, err, "failed to write file to provisioning path")
 }
 
+// DebugState logs the current state of filesystem, repository, and Grafana resources for debugging
+func (h *provisioningTestHelper) DebugState(t *testing.T, repo string, label string) {
+	t.Helper()
+	t.Logf("=== DEBUG STATE: %s ===", label)
+
+	ctx := context.Background()
+
+	// Log filesystem contents using existing tree function
+	printFileTree(t, h.ProvisioningPath)
+
+	// Log all repositories first
+	t.Logf("All repositories:")
+	repos, err := h.Repositories.Resource.List(ctx, metav1.ListOptions{})
+	if err != nil {
+		t.Logf("  ERROR listing repositories: %v", err)
+	} else {
+		t.Logf("  Total repositories: %d", len(repos.Items))
+		for i, repository := range repos.Items {
+			t.Logf("  Repository %d: name=%s", i+1, repository.GetName())
+		}
+	}
+
+	// Log repository files for the specific repo
+	t.Logf("Repository '%s' files:", repo)
+	h.logRepositoryFiles(t, ctx, repo, "  ")
+
+	// Log files for all other repositories too
+	if repos != nil && len(repos.Items) > 1 {
+		t.Logf("Files in other repositories:")
+		for _, repository := range repos.Items {
+			if repository.GetName() != repo {
+				t.Logf("  Repository '%s' files:", repository.GetName())
+				h.logRepositoryFiles(t, ctx, repository.GetName(), "    ")
+			}
+		}
+	}
+
+	// Log Grafana dashboards
+	t.Logf("Grafana dashboards:")
+	dashboards, err := h.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
+	if err != nil {
+		t.Logf("  ERROR listing dashboards: %v", err)
+	} else {
+		t.Logf("  Total dashboards: %d", len(dashboards.Items))
+		for i, dashboard := range dashboards.Items {
+			t.Logf("  Dashboard %d: name=%s, UID=%s", i+1, dashboard.GetName(), dashboard.GetUID())
+		}
+	}
+
+	// Log Grafana folders
+	t.Logf("Grafana folders:")
+	folders, err := h.Folders.Resource.List(ctx, metav1.ListOptions{})
+	if err != nil {
+		t.Logf("  ERROR listing folders: %v", err)
+	} else {
+		t.Logf("  Total folders: %d", len(folders.Items))
+		for i, folder := range folders.Items {
+			t.Logf("  Folder %d: name=%s", i+1, folder.GetName())
+		}
+	}
+
+	t.Logf("=== END DEBUG STATE ===")
+}
+
+// logRepositoryFiles logs repository file structure using the files API
+func (h *provisioningTestHelper) logRepositoryFiles(t *testing.T, ctx context.Context, repoName string, prefix string) {
+	t.Helper()
+
+	// Try to list files at root level
+	files, err := h.Repositories.Resource.Get(ctx, repoName, metav1.GetOptions{}, "files")
+	if err != nil {
+		t.Logf("%sERROR getting repository files: %v", prefix, err)
+		return
+	}
+
+	// The API returns a structured response, we need to extract the actual file data
+	if files.Object != nil {
+		h.logRepositoryObject(t, files.Object, prefix, "")
+	} else {
+		t.Logf("%s(empty repository)", prefix)
+	}
+}
+
+// logRepositoryObject recursively logs repository file structure from API response
+func (h *provisioningTestHelper) logRepositoryObject(t *testing.T, obj map[string]interface{}, prefix string, path string) {
+	t.Helper()
+
+	if obj == nil {
+		return
+	}
+
+	// Skip metadata fields and focus on actual content
+	for key, value := range obj {
+		// Skip Kubernetes metadata fields
+		if key == "kind" || key == "apiVersion" || key == "metadata" {
+			continue
+		}
+
+		// Calculate new path for nested objects
+		var newPath string
+		if path != "" {
+			newPath = path + "/" + key
+		} else {
+			newPath = key
+		}
+
+		switch v := value.(type) {
+		case map[string]interface{}:
+			t.Logf("%s├── %s/", prefix, key)
+			h.logRepositoryObject(t, v, prefix+"  ", newPath)
+		case []interface{}:
+			// Handle lists (like items array)
+			if key == "items" && len(v) > 0 {
+				t.Logf("%s%d items:", prefix, len(v))
+				for i, item := range v {
+					if itemMap, ok := item.(map[string]interface{}); ok {
+						t.Logf("%s├── item %d:", prefix, i+1)
+						h.logRepositoryObject(t, itemMap, prefix+"  ", newPath)
+					}
+				}
+			}
+		default:
+			// This could be file content or metadata
+			if key != "kind" && key != "apiVersion" {
+				t.Logf("%s├── %s", prefix, key)
+			}
+		}
+	}
+}
+
 type TestRepo struct {
 	Name               string
 	Target             string
+	Path               string
 	Values             map[string]any
 	Copies             map[string]string
 	ExpectedDashboards int
@@ -326,22 +468,49 @@ func (h *provisioningTestHelper) CreateRepo(t *testing.T, repo TestRepo) {
 		repo.Target = "instance"
 	}
 
-	localTmp := h.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+	// Use custom path if provided, otherwise use default provisioning path
+	repoPath := h.ProvisioningPath
+	if repo.Path != "" {
+		repoPath = repo.Path
+		// Ensure the directory exists
+		err := os.MkdirAll(repoPath, 0750)
+		require.NoError(t, err, "should be able to create repository path")
+	}
+
+	templateVars := map[string]any{
 		"Name":        repo.Name,
 		"SyncEnabled": true,
 		"SyncTarget":  repo.Target,
-	})
+	}
+	if repo.Path != "" {
+		templateVars["Path"] = repoPath
+	}
+
+	localTmp := h.RenderObject(t, "testdata/local-write.json.tmpl", templateVars)
 
 	_, err := h.Repositories.Resource.Create(t.Context(), localTmp, metav1.CreateOptions{})
 	require.NoError(t, err)
 
 	for from, to := range repo.Copies {
-		h.CopyToProvisioningPath(t, from, to)
+		if repo.Path != "" {
+			// Copy to custom path
+			fullPath := path.Join(repoPath, to)
+			err := os.MkdirAll(path.Dir(fullPath), 0750)
+			require.NoError(t, err, "failed to create directories for custom path")
+			file := h.LoadFile(from)
+			err = os.WriteFile(fullPath, file, 0600)
+			require.NoError(t, err, "failed to write file to custom path")
+		} else {
+			h.CopyToProvisioningPath(t, from, to)
+		}
 	}
 
 	// Trigger and wait for initial sync to populate resources
 	h.SyncAndWait(t, repo.Name, nil)
 
+	// Debug state after initial sync
+	h.DebugState(t, repo.Name, "AFTER INITIAL SYNC")
+
 	// Verify initial state
 	dashboards, err := h.DashboardsV1.Resource.List(t.Context(), metav1.ListOptions{})
 	require.NoError(t, err)
diff --git a/pkg/tests/apis/provisioning/movejob_test.go b/pkg/tests/apis/provisioning/movejob_test.go
index c7058e6f96e..9ef14e75d78 100644
--- a/pkg/tests/apis/provisioning/movejob_test.go
+++ b/pkg/tests/apis/provisioning/movejob_test.go
@@ -36,6 +36,8 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 	helper.CreateRepo(t, testRepo)
 
 	t.Run("move single file", func(t *testing.T) {
+		helper.DebugState(t, repo, "BEFORE MOVE SINGLE FILE")
+
 		spec := provisioning.JobSpec{
 			Action: provisioning.JobActionMove,
 			Move: &provisioning.MoveJobOptions{
@@ -44,6 +46,8 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 			},
 		}
 		helper.TriggerJobAndWaitForSuccess(t, repo, spec)
+
+		helper.DebugState(t, repo, "AFTER MOVE SINGLE FILE")
 		// TODO: This additional sync should not be necessary - the move job should handle sync properly
 		helper.SyncAndWait(t, repo, nil)
 
@@ -80,6 +84,8 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 	})
 
 	t.Run("move multiple files and folder", func(t *testing.T) {
+		helper.DebugState(t, repo, "BEFORE MOVE MULTIPLE FILES")
+
 		// Create move job for multiple files including a folder
 		spec := provisioning.JobSpec{
 			Action: provisioning.JobActionMove,
@@ -89,6 +95,8 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 			},
 		}
 		helper.TriggerJobAndWaitForSuccess(t, repo, spec)
+
+		helper.DebugState(t, repo, "AFTER MOVE MULTIPLE FILES")
 		// TODO: This additional sync should not be necessary - the move job should handle sync properly
 		helper.SyncAndWait(t, repo, nil)
 
@@ -127,6 +135,8 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 	})
 
 	t.Run("move non-existent file", func(t *testing.T) {
+		helper.DebugState(t, repo, "BEFORE MOVE NON-EXISTENT FILE")
+
 		spec := provisioning.JobSpec{
 			Action: provisioning.JobActionMove,
 			Move: &provisioning.MoveJobOptions{
diff --git a/pkg/tests/apis/provisioning/repository_test.go b/pkg/tests/apis/provisioning/repository_test.go
index f2e366fa233..82355bb7604 100644
--- a/pkg/tests/apis/provisioning/repository_test.go
+++ b/pkg/tests/apis/provisioning/repository_test.go
@@ -203,6 +203,8 @@ func TestIntegrationProvisioning_FailInvalidSchema(t *testing.T) {
 	require.Error(t, err, "invalid dashboard shouldn't exist")
 	require.True(t, apierrors.IsNotFound(err))
 
+	helper.DebugState(t, repo, "BEFORE PULL JOB WITH INVALID SCHEMA")
+
 	spec := provisioning.JobSpec{
 		Action: provisioning.JobActionPull,
 		Pull:   &provisioning.SyncJobOptions{},

From 50a3aa31379790e47539b12ea1b89ae900b9068c Mon Sep 17 00:00:00 2001
From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Date: Wed, 13 Aug 2025 11:56:57 -0400
Subject: [PATCH 145/243] Docs: Add table cell types pills and markdown
 (#109411)

Co-authored-by: Paul Marbach <paul.marbach@grafana.com>
---
 .../visualizations/table/index.md             | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/docs/sources/panels-visualizations/visualizations/table/index.md b/docs/sources/panels-visualizations/visualizations/table/index.md
index 10f87a87953..5c1035752b3 100644
--- a/docs/sources/panels-visualizations/visualizations/table/index.md
+++ b/docs/sources/panels-visualizations/visualizations/table/index.md
@@ -242,6 +242,8 @@ If you want to apply a cell type to only some fields instead of all fields, you
 | [Gauge](#gauge)                           | Values are displayed as a horizontal bar gauge. You can set the [Gauge display mode](#gauge-display-mode) and the [Value display](#value-display) options. |
 | [Sparkline](#sparkline)                   | Shows values rendered as a sparkline. |
 | [JSON View](#json-view)                   | Shows values formatted as code. |
+| [Pill](#pill)                             | Displays each item in a comma-separated string in a colored block. |
+| [Markdown + HTML](#markdown--html)        | Displays rich markdown or HTML content. |
 | [Image](#image)                           | Displays an image when the value is a URL or a base64 encoded image. |
 | [Actions](#actions)                       | The cell displays a button that triggers a basic, unauthenticated API call when clicked. |
 <!-- prettier-ignore-end -->
@@ -358,7 +360,37 @@ This enables value inspection from table cells.
 When the switch is toggled on, clicking the inspect icon in a cell opens the **Inspect value** drawer which contains two tabs: **Plain text** and **Code editor**.
 
 Grafana attempts to automatically detect the type of data in the cell and opens the drawer with the associated tab showing.
-However, you can switch back and forth between tabs
+However, you can switch back and forth between tabs.
+
+#### Pill
+
+The **Pill** cell type displays each item in a comma-separated string in a colored block.
+
+{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-table-pills-v12.1.png" max-width="750px" alt="Table using the pill cell type" >}}
+
+The colors applied to each piece of text are maintained throughout the table.
+For example, if the word "test" is first displayed in a red pill, it will always be displayed in a red pill.
+Pill cells also support text wrapping.
+
+The following data formats are supported for the pill cell type:
+
+- Comma-separated values (`cows,chickens,goats`)
+- JSON arrays of uniform (`(["cows","chickens","goats"])`) or mixed (`[1,2,3,"foo",42,"bar"]`) types
+
+#### Markdown + HTML
+
+The **Markdown + HTML** cell type displays rich Markdown or HTML content, rendered using the
+[GitHub-Flavored Markdown](https://github.github.com/gfm/) spec. This is useful if you need to display
+customized, pre-formatted information alongside tabular data, such as formatted strings,
+lists of links, or other dynamic cases.
+
+For this cell type, you can toggle the **Dynamic height** switch, which allows the cell to resize
+dynamically based on the cell content. If you use dynamic height, we strongly recommend that you
+also toggle on **Pagination** to avoid performance issues in larger tables, since enabling
+Dynamic height disables table {{< term "virtualization" >}}virtualization{{< /term >}}.
+
+By default, the HTML rendered is sanitized, and un-sanitized HTML can only be rendered
+in these cells if the [`disable_sanitize_html`](../../../setup-grafana/configure-grafana/_index.md#disable_sanitize_html) option is set to true for your Grafana instance.
 
 #### Image
 

From 31fc7d5d7ae8d7c9d747bcac49cc5ca414cbd49f Mon Sep 17 00:00:00 2001
From: Alex Spencer <52186778+alexjonspencer1@users.noreply.github.com>
Date: Wed, 13 Aug 2025 09:24:04 -0700
Subject: [PATCH 146/243] SQL Expressions: LLM plugin integration - SQL
 suggestions and SQL explanations (#107545)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* init: first pass at AI generated SQL expressions

* chore: fixes to tests

* i18n

* chore: small GenAIButton style update

* lazy load the genAI button - circular dependency issue in our test mocks...?

* chore: polish

* fix: i18n

* feat: make it a whole lot more capable

* chore: extract prompt logic to common file

* chore: consolidate state management to custom hooks

* chore: clean up, update GenAIButton API, etc.

* chore: major sql prompt improvement + plan for future + genAIButton api update

* chore: polish for now

* chore: clean up folder structure

* chore: conditionally use hooks + improve prompt

* chore: betterer....

* chore: polish

* feat: testing 🚀

* chore: polish polish polish

* chore: remove startWithPrompt

* chore: timeout 30

* chore: add experimental badge

* i18n + 60 sec timeout

* chore: MOAR POLISH

* chore: clean up explanation drawer

* chore: update tests

* chore: update FF checks

* chore: get the rendering w/FF correct

* chore: fix tests

* chore: re-work ai tooltips

* chore: cleanup

* chore: handle sql button styling differently

* chore: fix styling last time
---
 .../components/GenAI/GenAIButton.tsx          |  32 ++-
 .../components/GenAI/GenAIHistory.tsx         |  12 +-
 .../dashboard/components/GenAI/hooks.ts       |  19 +-
 .../dashboard/components/GenAI/tracking.ts    |   1 +
 .../expressions/ExpressionQueryEditor.tsx     |   6 +-
 .../GenAI/GenAIExplanationDrawer.tsx          |  29 +++
 .../GenAI/GenAISQLExplainButton.tsx           | 100 ++++++++
 .../GenAI/GenAISQLSuggestionsButton.tsx       | 122 +++++++++
 .../GenAI/GenAISuggestionsDrawer.tsx          | 237 ++++++++++++++++++
 .../GenAI/SuggestionsDrawerButton.tsx         |  40 +++
 .../GenAI/hooks/useSQLExplanations.ts         |  60 +++++
 .../GenAI/hooks/useSQLSuggestions.ts          |  55 ++++
 .../components/GenAI/sqlPromptConfig.ts       | 209 +++++++++++++++
 .../expressions/components/GenAI/utils.ts     |  63 +++++
 .../expressions/components/SqlExpr.test.tsx   | 163 +++++++++++-
 .../expressions/components/SqlExpr.tsx        | 210 ++++++++++++++--
 public/locales/en-US/grafana.json             |  18 ++
 17 files changed, 1329 insertions(+), 47 deletions(-)
 create mode 100644 public/app/features/expressions/components/GenAI/GenAIExplanationDrawer.tsx
 create mode 100644 public/app/features/expressions/components/GenAI/GenAISQLExplainButton.tsx
 create mode 100644 public/app/features/expressions/components/GenAI/GenAISQLSuggestionsButton.tsx
 create mode 100644 public/app/features/expressions/components/GenAI/GenAISuggestionsDrawer.tsx
 create mode 100644 public/app/features/expressions/components/GenAI/SuggestionsDrawerButton.tsx
 create mode 100644 public/app/features/expressions/components/GenAI/hooks/useSQLExplanations.ts
 create mode 100644 public/app/features/expressions/components/GenAI/hooks/useSQLSuggestions.ts
 create mode 100644 public/app/features/expressions/components/GenAI/sqlPromptConfig.ts
 create mode 100644 public/app/features/expressions/components/GenAI/utils.ts

diff --git a/public/app/features/dashboard/components/GenAI/GenAIButton.tsx b/public/app/features/dashboard/components/GenAI/GenAIButton.tsx
index ec51fc91275..8adda16af3a 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIButton.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIButton.tsx
@@ -4,10 +4,10 @@ import * as React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { llm } from '@grafana/llm';
-import { Button, Spinner, useStyles2, Tooltip, Toggletip, Text } from '@grafana/ui';
+import { Button, Spinner, useStyles2, Tooltip, Toggletip, Text, Stack } from '@grafana/ui';
 
 import { GenAIHistory } from './GenAIHistory';
-import { StreamStatus, useLLMStream } from './hooks';
+import { StreamStatus, TIMEOUT, useLLMStream } from './hooks';
 import { AutoGenerateItem, EventTrackingSrc, reportAutoGenerateInteraction } from './tracking';
 import { DEFAULT_LLM_MODEL, Message, sanitizeReply } from './utils';
 
@@ -36,6 +36,10 @@ export interface GenAIButtonProps {
     toggletip will be enabled.
   */
   tooltip?: string;
+  // Optional callback to receive history updates
+  onHistoryChange?: (history: string[]) => void;
+  // Optional timeout for the LLM stream. Default is 10 seconds
+  timeout?: number;
 }
 export const STOP_GENERATION_TEXT = 'Stop generating';
 
@@ -50,13 +54,22 @@ export const GenAIButton = ({
   eventTrackingSrc,
   disabled,
   tooltip,
+  onHistoryChange,
+  timeout = TIMEOUT,
 }: GenAIButtonProps) => {
   const styles = useStyles2(getStyles);
 
   const [history, setHistory] = useState<string[]>([]);
-  const unshiftHistoryEntry = useCallback((historyEntry: string) => {
-    setHistory((h) => [historyEntry, ...h]);
-  }, []);
+  const unshiftHistoryEntry = useCallback(
+    (historyEntry: string) => {
+      setHistory((h) => {
+        const newHistory = [historyEntry, ...h];
+        return newHistory;
+      });
+      onHistoryChange?.([historyEntry, ...history]);
+    },
+    [onHistoryChange, history]
+  );
 
   const onResponse = useCallback(
     (reply: string) => {
@@ -71,6 +84,7 @@ export const GenAIButton = ({
     model,
     temperature,
     onResponse,
+    timeout,
   });
 
   const [showHistory, setShowHistory] = useState(false);
@@ -181,6 +195,7 @@ export const GenAIButton = ({
               onApplySuggestion={onApplySuggestion}
               updateHistory={unshiftHistoryEntry}
               eventTrackingSrc={eventTrackingSrc}
+              timeout={timeout}
             />
           }
           placement="left-start"
@@ -198,7 +213,7 @@ export const GenAIButton = ({
   };
 
   return (
-    <div className={styles.wrapper}>
+    <Stack direction="row" gap={0.5} alignItems="center">
       {isGenerating && <Spinner size="sm" className={styles.spinner} />}
       {isFirstHistoryEntry ? (
         <Tooltip show={showTooltip} interactive content={tooltipContent}>
@@ -207,14 +222,11 @@ export const GenAIButton = ({
       ) : (
         renderButtonWithToggletip()
       )}
-    </div>
+    </Stack>
   );
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  wrapper: css({
-    display: 'flex',
-  }),
   spinner: css({
     color: theme.colors.text.link,
   }),
diff --git a/public/app/features/dashboard/components/GenAI/GenAIHistory.tsx b/public/app/features/dashboard/components/GenAI/GenAIHistory.tsx
index ccac627b42c..e908fe5b611 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIHistory.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIHistory.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import { useState, useCallback } from 'react';
+import { useState, useCallback, useRef } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
@@ -18,6 +18,7 @@ export interface GenAIHistoryProps {
   onApplySuggestion: (suggestion: string) => void;
   updateHistory: (historyEntry: string) => void;
   eventTrackingSrc: EventTrackingSrc;
+  timeout?: number;
 }
 
 const temperature = 0.5;
@@ -28,12 +29,17 @@ export const GenAIHistory = ({
   messages,
   onApplySuggestion,
   updateHistory,
+  timeout,
 }: GenAIHistoryProps) => {
   const styles = useStyles2(getStyles);
 
   const [currentIndex, setCurrentIndex] = useState(1);
   const [customFeedback, setCustomPrompt] = useState('');
 
+  // Keep ref in sync with messages prop to avoid stale closure issues
+  const messagesRef = useRef(messages);
+  messagesRef.current = messages;
+
   const onResponse = useCallback(
     (response: string) => {
       updateHistory(sanitizeReply(response));
@@ -45,6 +51,7 @@ export const GenAIHistory = ({
     model: DEFAULT_LLM_MODEL,
     temperature,
     onResponse,
+    timeout,
   });
 
   const reportInteraction = (item: AutoGenerateItem, otherMetadata?: object) =>
@@ -70,7 +77,7 @@ export const GenAIHistory = ({
   };
 
   const onGenerateWithFeedback = (suggestion: string) => {
-    setMessages((messages) => [...messages, ...getFeedbackMessage(history[currentIndex - 1], suggestion)]);
+    setMessages(() => [...messagesRef.current, ...getFeedbackMessage(history[currentIndex - 1], suggestion)]);
 
     if (suggestion in QuickFeedbackType) {
       reportInteraction(AutoGenerateItem.quickFeedback, { quickFeedbackItem: suggestion });
@@ -104,7 +111,6 @@ export const GenAIHistory = ({
       )}
 
       <GenerationHistoryCarousel history={history} index={currentIndex} onNavigate={onNavigate} />
-
       <div className={styles.actionButtons}>
         <QuickFeedback onSuggestionClick={onGenerateWithFeedback} isGenerating={isStreamGenerating} />
       </div>
diff --git a/public/app/features/dashboard/components/GenAI/hooks.ts b/public/app/features/dashboard/components/GenAI/hooks.ts
index 5809245bf1c..0255336da4a 100644
--- a/public/app/features/dashboard/components/GenAI/hooks.ts
+++ b/public/app/features/dashboard/components/GenAI/hooks.ts
@@ -20,17 +20,19 @@ export enum StreamStatus {
   COMPLETED = 'completed',
 }
 
-export const TIMEOUT = 10000;
+export const TIMEOUT = 10000; // 10 seconds
 
 interface Options {
   model: string;
   temperature: number;
   onResponse?: (response: string) => void;
+  timeout?: number;
 }
 
 const defaultOptions = {
   model: DEFAULT_LLM_MODEL,
   temperature: 1,
+  timeout: TIMEOUT,
 };
 
 interface UseLLMStreamResponse {
@@ -47,7 +49,8 @@ interface UseLLMStreamResponse {
 }
 
 // TODO: Add tests
-export function useLLMStream({ model, temperature, onResponse }: Options = defaultOptions): UseLLMStreamResponse {
+export function useLLMStream(options: Options = defaultOptions): UseLLMStreamResponse {
+  const { model, temperature, onResponse, timeout } = { ...defaultOptions, ...options };
   // The messages array to send to the LLM, updated when the button is clicked.
   const [messages, setMessages] = useState<Message[]>([]);
 
@@ -145,17 +148,17 @@ export function useLLMStream({ model, temperature, onResponse }: Options = defau
 
   // If the stream is generating and we haven't received a reply, it times out.
   useEffect(() => {
-    let timeout: NodeJS.Timeout | undefined;
+    let timeoutId: NodeJS.Timeout | undefined;
     if (streamStatus === StreamStatus.GENERATING && reply === '') {
-      timeout = setTimeout(() => {
-        onError(new Error(`LLM stream timed out after ${TIMEOUT}ms`));
-      }, TIMEOUT);
+      timeoutId = setTimeout(() => {
+        onError(new Error(`LLM stream timed out after ${timeout}ms`));
+      }, timeout);
     }
 
     return () => {
-      clearTimeout(timeout);
+      clearTimeout(timeoutId);
     };
-  }, [streamStatus, reply, onError]);
+  }, [streamStatus, reply, onError, timeout]);
 
   if (asyncError || enabledError) {
     setError(asyncError || enabledError);
diff --git a/public/app/features/dashboard/components/GenAI/tracking.ts b/public/app/features/dashboard/components/GenAI/tracking.ts
index 8327fdf430e..f3b0b25bfeb 100644
--- a/public/app/features/dashboard/components/GenAI/tracking.ts
+++ b/public/app/features/dashboard/components/GenAI/tracking.ts
@@ -9,6 +9,7 @@ export enum EventTrackingSrc {
   dashboardChanges = 'dashboard-changes',
   dashboardTitle = 'dashboard-title',
   dashboardDescription = 'dashboard-description',
+  sqlExpressions = 'sql-expressions',
   unknown = 'unknown',
 }
 
diff --git a/public/app/features/expressions/ExpressionQueryEditor.tsx b/public/app/features/expressions/ExpressionQueryEditor.tsx
index e49d3932c48..de0d59c2920 100644
--- a/public/app/features/expressions/ExpressionQueryEditor.tsx
+++ b/public/app/features/expressions/ExpressionQueryEditor.tsx
@@ -15,7 +15,7 @@ import { Threshold } from './components/Threshold';
 import { ExpressionQuery, ExpressionQueryType, expressionTypes } from './types';
 import { getDefaults } from './utils/expressionTypes';
 
-type Props = QueryEditorProps<DataSourceApi<ExpressionQuery>, ExpressionQuery>;
+export type ExpressionQueryEditorProps = QueryEditorProps<DataSourceApi<ExpressionQuery>, ExpressionQuery>;
 
 const labelWidth = 15;
 
@@ -78,7 +78,7 @@ function useExpressionsCache() {
   return { getCachedExpression, setCachedExpression };
 }
 
-export function ExpressionQueryEditor(props: Props) {
+export function ExpressionQueryEditor(props: ExpressionQueryEditorProps) {
   const { query, queries, onRunQuery, onChange, app } = props;
   const { getCachedExpression, setCachedExpression } = useExpressionsCache();
 
@@ -118,7 +118,7 @@ export function ExpressionQueryEditor(props: Props) {
         return <Threshold onChange={onChange} query={query} labelWidth={labelWidth} refIds={refIds} />;
 
       case ExpressionQueryType.sql:
-        return <SqlExpr onChange={onChange} query={query} refIds={refIds} queries={queries} />;
+        return <SqlExpr onChange={onChange} query={query} refIds={refIds} queries={queries} metadata={props} />;
     }
   };
 
diff --git a/public/app/features/expressions/components/GenAI/GenAIExplanationDrawer.tsx b/public/app/features/expressions/components/GenAI/GenAIExplanationDrawer.tsx
new file mode 100644
index 00000000000..c42bf3d2ad7
--- /dev/null
+++ b/public/app/features/expressions/components/GenAI/GenAIExplanationDrawer.tsx
@@ -0,0 +1,29 @@
+import { renderMarkdown } from '@grafana/data';
+import { Trans } from '@grafana/i18n';
+import { Drawer, Stack, Card } from '@grafana/ui';
+
+interface AIExplanationDrawerProps {
+  isOpen: boolean;
+  onClose: () => void;
+  explanation: string;
+}
+
+export const GenAIExplanationDrawer = ({ isOpen, onClose, explanation }: AIExplanationDrawerProps) => {
+  if (!isOpen) {
+    return null;
+  }
+
+  return (
+    <Drawer
+      onClose={onClose}
+      size="md"
+      title={<Trans i18nKey="sql-expressions.explanation-modal-title">SQL Query Explanation</Trans>}
+    >
+      <Stack direction="column" data-testid="explanation-drawer">
+        <Card noMargin>
+          <div className="markdown-html" dangerouslySetInnerHTML={{ __html: renderMarkdown(explanation) }} />
+        </Card>
+      </Stack>
+    </Drawer>
+  );
+};
diff --git a/public/app/features/expressions/components/GenAI/GenAISQLExplainButton.tsx b/public/app/features/expressions/components/GenAI/GenAISQLExplainButton.tsx
new file mode 100644
index 00000000000..86c5953025a
--- /dev/null
+++ b/public/app/features/expressions/components/GenAI/GenAISQLExplainButton.tsx
@@ -0,0 +1,100 @@
+import { useCallback } from 'react';
+
+import { t } from '@grafana/i18n';
+
+import { GenAIButton } from '../../../dashboard/components/GenAI/GenAIButton';
+import { EventTrackingSrc } from '../../../dashboard/components/GenAI/tracking';
+import { Message, Role } from '../../../dashboard/components/GenAI/utils';
+
+import { getSQLExplanationSystemPrompt, QueryUsageContext } from './sqlPromptConfig';
+
+interface GenAISQLExplainButtonProps {
+  currentQuery: string;
+  onExplain: (explanation: string) => void;
+  refIds: string[];
+  schemas?: unknown; // Reserved for future schema implementation
+  queryContext?: QueryUsageContext;
+}
+
+// AI prompt for explaining SQL expressions
+
+const getExplanationPrompt = (currentQuery: string): string => {
+  if (!currentQuery || currentQuery.trim() === '') {
+    return 'There is no SQL query to explain. Please enter a SQL expression first.';
+  }
+
+  return `${currentQuery}
+
+Explain what this query does in simple terms.`;
+};
+
+/**
+ * Creates messages for the LLM to explain SQL queries
+ *
+ * @param refIds - The list of RefIDs available in the current context
+ * @param currentQuery - The current SQL query to explain
+ * @param schemas - Optional schema information (planned for future implementation)
+ * @param queryContext - Optional query usage context
+ * @returns A list of messages to be sent to the LLM for explaining the SQL query
+ */
+const getSQLExplanationMessages = (
+  refIds: string[],
+  currentQuery: string,
+  schemas?: unknown,
+  queryContext?: QueryUsageContext
+): Message[] => {
+  const systemPrompt = getSQLExplanationSystemPrompt({
+    refIds: refIds.length > 0 ? refIds.join(', ') : 'A',
+    currentQuery: currentQuery.trim() || 'No current query provided',
+    schemas, // Will be utilized once schema extraction is implemented
+    queryContext,
+  });
+
+  const userPrompt = getExplanationPrompt(currentQuery);
+
+  return [
+    {
+      role: Role.system,
+      content: systemPrompt,
+    },
+    {
+      role: Role.user,
+      content: userPrompt,
+    },
+  ];
+};
+
+export const GenAISQLExplainButton = ({
+  currentQuery,
+  onExplain,
+  queryContext,
+  refIds,
+  schemas, // Future implementation will use this for enhanced context
+}: GenAISQLExplainButtonProps) => {
+  const messages = useCallback(() => {
+    return getSQLExplanationMessages(refIds, currentQuery, schemas, queryContext);
+  }, [refIds, currentQuery, schemas, queryContext]);
+
+  const hasQuery = currentQuery && currentQuery.trim() !== '';
+
+  return (
+    <GenAIButton
+      disabled={!hasQuery}
+      eventTrackingSrc={EventTrackingSrc.sqlExpressions}
+      messages={messages}
+      onGenerate={onExplain}
+      temperature={0.3}
+      text={t('sql-expressions.explain-query', 'Explain query')}
+      timeout={60000} // 60 seconds
+      toggleTipTitle={t('sql-expressions.ai-explain-title', 'AI-powered SQL expression explanation')}
+      tooltip={
+        !hasQuery
+          ? t('sql-expressions.explain-empty-query-tooltip', 'Enter a SQL expression to get an explanation')
+          : t(
+              'expressions.sql-expr.tooltip-experimental',
+              'SQL Expressions LLM integration is experimental. Please report any issues to the Grafana team.'
+            )
+      }
+    />
+  );
+};
diff --git a/public/app/features/expressions/components/GenAI/GenAISQLSuggestionsButton.tsx b/public/app/features/expressions/components/GenAI/GenAISQLSuggestionsButton.tsx
new file mode 100644
index 00000000000..3b386879354
--- /dev/null
+++ b/public/app/features/expressions/components/GenAI/GenAISQLSuggestionsButton.tsx
@@ -0,0 +1,122 @@
+import { useCallback } from 'react';
+
+import { t } from '@grafana/i18n';
+
+import { GenAIButton } from '../../../dashboard/components/GenAI/GenAIButton';
+import { EventTrackingSrc } from '../../../dashboard/components/GenAI/tracking';
+import { Message, Role } from '../../../dashboard/components/GenAI/utils';
+
+import { getSQLSuggestionSystemPrompt, QueryUsageContext } from './sqlPromptConfig';
+
+interface GenAISQLSuggestionsButtonProps {
+  currentQuery: string;
+  onGenerate: (suggestion: string) => void;
+  onHistoryUpdate?: (history: string[]) => void;
+  refIds: string[];
+  initialQuery: string;
+  schemas?: unknown; // Reserved for future schema implementation
+  errorContext?: string[];
+  queryContext?: QueryUsageContext;
+}
+
+// AI prompts for different SQL use cases
+
+const getContextualPrompts = (refIds: string[], currentQuery: string): string[] => {
+  const trimmedQuery = currentQuery.trim();
+
+  // If there's a current query, focus more on fixing/improving it
+  if (trimmedQuery) {
+    return [`Improve, fix syntax errors, or optimize this SQL query: ${trimmedQuery}`];
+  }
+
+  // If no current query, focus on suggestions
+  return [
+    `Join, aggregate, filter, calculate percentiles, create time-based 
+    window functions, or generally just make common SQL pattern queries for data from ${refIds.join(', ')}`,
+  ];
+};
+
+/**
+ * Creates messages for the LLM to generate SQL suggestions
+ *
+ * @param refIds - The list of RefIDs available in the current context
+ * @param currentQuery - The current SQL query being edited
+ * @param schemas - Optional schema information (planned for future implementation)
+ * @param errorContext - Optional error context for targeted fixes (planned for future implementation)
+ * @param queryContext - Optional query usage context
+ * @returns A list of messages to be sent to the LLM for generating SQL suggestions
+ */
+const getSQLSuggestionMessages = (
+  refIds: string[],
+  currentQuery: string,
+  schemas?: unknown,
+  errorContext?: string[],
+  queryContext?: QueryUsageContext
+): Message[] => {
+  const trimmedQuery = currentQuery.trim();
+  const queryInstruction = trimmedQuery
+    ? 'Focus on fixing, improving, or enhancing the current query provided above.'
+    : 'Generate a new SQL query based on the available RefIDs and common use cases.';
+
+  const systemPrompt = getSQLSuggestionSystemPrompt({
+    refIds: refIds.length > 0 ? refIds.join(', ') : 'A',
+    currentQuery: trimmedQuery || 'No current query provided',
+    queryInstruction: queryInstruction,
+    schemas, // Will be utilized once schema extraction is implemented
+    errorContext,
+    queryContext,
+  });
+
+  const contextualPrompts = getContextualPrompts(refIds, currentQuery);
+  const selectedPrompt = contextualPrompts[Math.floor(Math.random() * contextualPrompts.length)];
+
+  return [
+    {
+      role: Role.system,
+      content: systemPrompt,
+    },
+    {
+      role: Role.user,
+      content: selectedPrompt,
+    },
+  ];
+};
+
+export const GenAISQLSuggestionsButton = ({
+  currentQuery,
+  onGenerate,
+  onHistoryUpdate,
+  refIds,
+  initialQuery,
+  schemas, // Future implementation will use this for enhanced context
+  errorContext,
+  queryContext,
+}: GenAISQLSuggestionsButtonProps) => {
+  const messages = useCallback(() => {
+    return getSQLSuggestionMessages(refIds, currentQuery, schemas, errorContext, queryContext);
+  }, [refIds, currentQuery, schemas, errorContext, queryContext]);
+
+  const text = !currentQuery || currentQuery === initialQuery ? 'Generate suggestion' : 'Improve query';
+
+  return (
+    <GenAIButton
+      disabled={refIds.length === 0}
+      eventTrackingSrc={EventTrackingSrc.sqlExpressions}
+      messages={messages}
+      onGenerate={onGenerate}
+      onHistoryChange={onHistoryUpdate}
+      temperature={0.3}
+      text={t('sql-expressions.sql-ai-interaction', `{{text}}`, { text })}
+      timeout={60000} // 60 seconds
+      toggleTipTitle={t('sql-expressions.ai-suggestions-title', 'AI-powered SQL expression suggestions')}
+      tooltip={
+        refIds.length === 0
+          ? t('sql-expressions.add-query-tooltip', 'Add at least one data query to generate SQL suggestions')
+          : t(
+              'expressions.sql-expr.tooltip-experimental',
+              'SQL Expressions LLM integration is experimental. Please report any issues to the Grafana team.'
+            )
+      }
+    />
+  );
+};
diff --git a/public/app/features/expressions/components/GenAI/GenAISuggestionsDrawer.tsx b/public/app/features/expressions/components/GenAI/GenAISuggestionsDrawer.tsx
new file mode 100644
index 00000000000..f552febc335
--- /dev/null
+++ b/public/app/features/expressions/components/GenAI/GenAISuggestionsDrawer.tsx
@@ -0,0 +1,237 @@
+import { css } from '@emotion/css';
+
+import { GrafanaTheme2, renderMarkdown } from '@grafana/data';
+import { Trans } from '@grafana/i18n';
+import { CodeEditor, Drawer, useStyles2, Stack, Button, Card, Text, ClipboardButton } from '@grafana/ui';
+
+import { parseSuggestion } from './utils';
+
+interface AISuggestionsDrawerProps {
+  isOpen: boolean;
+  onApplySuggestion: (suggestion: string) => void;
+  onClose: () => void;
+  suggestions: string[];
+}
+
+export const GenAISuggestionsDrawer = ({
+  isOpen,
+  onApplySuggestion,
+  onClose,
+  suggestions,
+}: AISuggestionsDrawerProps) => {
+  const styles = useStyles2(getStyles);
+
+  if (!isOpen) {
+    return null;
+  }
+
+  return (
+    <Drawer
+      onClose={onClose}
+      size="lg"
+      title={<Trans i18nKey="sql-expressions.sql-suggestion-history">SQL Suggestion History</Trans>}
+    >
+      <div className={styles.content} data-testid="suggestions-drawer">
+        <Stack direction="column" gap={3}>
+          <div className={styles.timelineContainer}>
+            {/* Vertical timeline line */}
+            <div className={styles.timelineLine} />
+
+            <div className={styles.suggestionsList}>
+              {suggestions.map((suggestion, index) => {
+                const parsedSuggestion = parseSuggestion(suggestion);
+                const isLatest = index === 0;
+
+                return (
+                  <div key={index} className={styles.timelineItem}>
+                    {/* Timeline node */}
+                    <div
+                      className={`${styles.timelineNode} ${isLatest ? styles.timelineNodeActive : styles.timelineNodeInactive}`}
+                    />
+                    <Card noMargin key={index} className={isLatest ? styles.latestSuggestion : ''}>
+                      <div className={styles.suggestionContent}>
+                        {parsedSuggestion.map(({ type, content, language }, partIndex) => (
+                          <div key={partIndex} className={styles.suggestionPart}>
+                            {type === 'code' ? (
+                              <div className={styles.codeBlock}>
+                                <div className={styles.codeHeader}>
+                                  <Stack direction="row" justifyContent="space-between" alignItems="center">
+                                    <Text variant="bodySmall" weight="bold">
+                                      <Trans
+                                        i18nKey="sql-expressions.code-label"
+                                        values={{ language: language?.toUpperCase() || 'CODE' }}
+                                      >
+                                        {'{{ language }}'}
+                                      </Trans>
+                                    </Text>
+                                    <Stack direction="row" gap={1}>
+                                      <ClipboardButton
+                                        size="sm"
+                                        icon="copy"
+                                        variant="secondary"
+                                        getText={() => content}
+                                      >
+                                        <Trans i18nKey="sql-expressions.copy">Copy</Trans>
+                                      </ClipboardButton>
+                                      <Button
+                                        size="sm"
+                                        variant="primary"
+                                        icon="ai-sparkle"
+                                        onClick={() => onApplySuggestion(content)}
+                                      >
+                                        <Trans i18nKey="sql-expressions.apply">Apply</Trans>
+                                      </Button>
+                                    </Stack>
+                                  </Stack>
+                                </div>
+                                <CodeEditor
+                                  value={content}
+                                  language={language === 'sql' || language === 'mysql' ? 'mysql' : 'sql'}
+                                  width="100%"
+                                  height={Math.max(80, Math.min(300, (content.split('\n').length + 1) * 20))}
+                                  readOnly={true}
+                                  showMiniMap={false}
+                                  showLineNumbers={true}
+                                  monacoOptions={{
+                                    lineNumbers: 'on',
+                                    folding: false,
+                                    minimap: { enabled: false },
+                                    scrollBeyondLastLine: false,
+                                    renderLineHighlight: 'none',
+                                    wordWrap: 'on',
+                                    readOnly: true,
+                                    contextmenu: false,
+                                    padding: { top: 8, bottom: 8 },
+                                    automaticLayout: true,
+                                    fontSize: 13,
+                                    lineHeight: 20,
+                                  }}
+                                />
+                              </div>
+                            ) : (
+                              <div
+                                className="markdown-html"
+                                dangerouslySetInnerHTML={{ __html: renderMarkdown(content) }}
+                              />
+                            )}
+                          </div>
+                        ))}
+                      </div>
+                    </Card>
+                  </div>
+                );
+              })}
+            </div>
+          </div>
+        </Stack>
+      </div>
+    </Drawer>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  content: css({
+    height: '100%',
+    display: 'flex',
+    flexDirection: 'column',
+  }),
+  emptyState: css({
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+    justifyContent: 'center',
+    height: '100%',
+    textAlign: 'center',
+    gap: theme.spacing(2),
+  }),
+  timelineContainer: css({
+    position: 'relative',
+    display: 'flex',
+    flexDirection: 'column',
+    overflow: 'auto',
+    flex: 1,
+    paddingLeft: theme.spacing(4.5), // Space for timeline line and nodes
+  }),
+  timelineLine: css({
+    position: 'absolute',
+    // Offset the 2px width of the timeline line
+    left: `calc(${theme.spacing(1)} + 2px)`,
+    top: theme.spacing(1),
+    bottom: 0,
+    width: '2px',
+    backgroundColor: theme.colors.border.strong,
+    zIndex: 1,
+  }),
+  suggestionsList: css({
+    display: 'flex',
+    flexDirection: 'column',
+    gap: theme.spacing(2),
+    position: 'relative',
+  }),
+  timelineItem: css({
+    position: 'relative',
+    display: 'flex',
+    alignItems: 'flex-start',
+    gap: theme.spacing(2),
+  }),
+  timelineNode: css({
+    position: 'absolute',
+    left: theme.spacing(-4.5), // Position on the timeline line
+    top: theme.spacing(1), // Align with card content
+    width: theme.spacing(3),
+    height: theme.spacing(3),
+    borderRadius: theme.shape.radius.pill,
+    border: `2px solid ${theme.colors.primary.main}`,
+    backgroundColor: theme.colors.background.primary,
+    zIndex: 2,
+    flexShrink: 0,
+  }),
+  timelineNodeActive: css({
+    backgroundColor: theme.colors.primary.main, // Filled circle for current/latest
+    boxShadow: `0 0 0 4px ${theme.colors.background.primary}`, // White ring around filled circle
+  }),
+  timelineNodeInactive: css({
+    backgroundColor: theme.colors.background.primary, // Empty circle for others
+    boxShadow: `0 0 0 4px ${theme.colors.background.primary}`, // White ring around filled circle
+  }),
+  latestSuggestion: css({
+    border: `2px solid ${theme.colors.primary.main}`,
+    position: 'relative',
+    '&::before': {
+      content: '"Latest"',
+      position: 'absolute',
+      top: theme.spacing(-0.5),
+      right: theme.spacing(1),
+      backgroundColor: theme.colors.primary.main,
+      color: theme.colors.primary.contrastText,
+      padding: theme.spacing(0.25, 1),
+      borderRadius: theme.shape.radius.default,
+      fontSize: theme.typography.bodySmall.fontSize,
+      fontWeight: theme.typography.fontWeightMedium,
+    },
+  }),
+  suggestionContent: css({
+    display: 'flex',
+    flexDirection: 'column',
+    gap: theme.spacing(1.5),
+    width: '100%',
+    overflowX: 'auto',
+  }),
+  suggestionPart: css({
+    display: 'block',
+    width: '100%',
+  }),
+  codeBlock: css({
+    border: `1px solid ${theme.colors.border.medium}`,
+    borderRadius: theme.shape.radius.default,
+    overflow: 'hidden',
+    marginBottom: theme.spacing(1),
+    width: '100%',
+    minWidth: '600px',
+  }),
+  codeHeader: css({
+    backgroundColor: theme.colors.background.secondary,
+    padding: theme.spacing(1, 1.5),
+    borderBottom: `1px solid ${theme.colors.border.weak}`,
+  }),
+});
diff --git a/public/app/features/expressions/components/GenAI/SuggestionsDrawerButton.tsx b/public/app/features/expressions/components/GenAI/SuggestionsDrawerButton.tsx
new file mode 100644
index 00000000000..49abd0a20d4
--- /dev/null
+++ b/public/app/features/expressions/components/GenAI/SuggestionsDrawerButton.tsx
@@ -0,0 +1,40 @@
+import { css } from '@emotion/css';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Trans } from '@grafana/i18n';
+import { Button, Stack, Text, useStyles2 } from '@grafana/ui';
+
+interface SuggestionsBadgeProps {
+  suggestions: string[];
+  handleOpenDrawer: () => void;
+}
+
+export const SuggestionsDrawerButton = ({ suggestions, handleOpenDrawer }: SuggestionsBadgeProps) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.buttonWrapper} data-testid="suggestions-badge">
+      <Button variant="secondary" fill="outline" size="sm" onClick={handleOpenDrawer} icon="list-ol">
+        <Stack direction="row" gap={1} alignItems="center">
+          <Trans i18nKey="sql-expressions.suggestions">Suggestions</Trans>
+          <span className={styles.countBadge}>
+            <Text variant="bodySmall" weight="bold">
+              {suggestions.length}
+            </Text>
+          </span>
+        </Stack>
+      </Button>
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  countBadge: css({
+    color: theme.colors.primary.text,
+    fontWeight: 'bold',
+  }),
+  buttonWrapper: css({
+    position: 'relative',
+    display: 'inline-block',
+  }),
+});
diff --git a/public/app/features/expressions/components/GenAI/hooks/useSQLExplanations.ts b/public/app/features/expressions/components/GenAI/hooks/useSQLExplanations.ts
new file mode 100644
index 00000000000..4435fbc1909
--- /dev/null
+++ b/public/app/features/expressions/components/GenAI/hooks/useSQLExplanations.ts
@@ -0,0 +1,60 @@
+import { useState, useMemo } from 'react';
+
+export const useSQLExplanations = (currentExpression: string) => {
+  const [explanation, setExplanation] = useState<string>('');
+  const [isExplanationOpen, setIsExplanationOpen] = useState(false);
+  const [prevExpression, setPrevExpression] = useState<string>(currentExpression);
+
+  /**
+   * Handle new explanation from the AI system
+   * Sets the explanation and opens the modal
+   */
+  const handleExplain = (newExplanation: string) => {
+    setExplanation(newExplanation);
+    setIsExplanationOpen(true);
+  };
+
+  const handleOpenExplanation = () => setIsExplanationOpen(true);
+
+  const handleCloseExplanation = () => setIsExplanationOpen(false);
+
+  /**
+   * Update the previous expression tracker
+   * Should be called when the query expression changes
+   */
+  const updatePrevExpression = (newExpression: string) => {
+    setPrevExpression(newExpression);
+    // Clear explanation when expression changes
+    setExplanation('');
+  };
+
+  const clearExplanation = () => {
+    setExplanation('');
+    setIsExplanationOpen(false);
+  };
+
+  /**
+   * Determine if we should show "View explanation" button vs "Explain query" button
+   * Returns true if there's an existing explanation OR if the expression has changed
+   */
+  const shouldShowViewExplanation = useMemo(() => {
+    return Boolean(explanation) || prevExpression !== currentExpression;
+  }, [explanation, prevExpression, currentExpression]);
+
+  return {
+    // State
+    explanation,
+    isExplanationOpen,
+    prevExpression,
+
+    // Computed state
+    shouldShowViewExplanation,
+
+    // Actions
+    handleExplain,
+    handleOpenExplanation,
+    handleCloseExplanation,
+    updatePrevExpression,
+    clearExplanation,
+  };
+};
diff --git a/public/app/features/expressions/components/GenAI/hooks/useSQLSuggestions.ts b/public/app/features/expressions/components/GenAI/hooks/useSQLSuggestions.ts
new file mode 100644
index 00000000000..4b0eedfdf1a
--- /dev/null
+++ b/public/app/features/expressions/components/GenAI/hooks/useSQLSuggestions.ts
@@ -0,0 +1,55 @@
+import { useState, useRef } from 'react';
+
+export const useSQLSuggestions = () => {
+  const [suggestions, setSuggestions] = useState<string[]>([]);
+  const [isDrawerOpen, setIsDrawerOpen] = useState(false);
+  const prevSuggestionsLengthRef = useRef(0);
+
+  /**
+   * Handle new suggestions from the AI system
+   * Updates the suggestions list and manages unseen suggestions state
+   */
+  const handleHistoryUpdate = (history: string[]) => {
+    setSuggestions(history);
+
+    // Auto-open drawer when new suggestions are received during feedback loop
+    if (history.length > prevSuggestionsLengthRef.current) {
+      setIsDrawerOpen(true);
+    }
+
+    // Update the reference to track suggestion count for next time
+    prevSuggestionsLengthRef.current = history.length;
+  };
+
+  /**
+   * Handle applying a suggestion to the editor
+   * Returns the suggestion for the parent component to handle
+   * i.e., the parent component can then use the suggestions for the editor drawer
+   */
+  const handleApplySuggestion = (suggestion: string) => {
+    setIsDrawerOpen(false);
+    return suggestion;
+  };
+
+  const handleOpenDrawer = () => setIsDrawerOpen(true);
+  const handleCloseDrawer = () => setIsDrawerOpen(false);
+
+  const clearSuggestions = () => {
+    setSuggestions([]);
+    setIsDrawerOpen(false);
+    prevSuggestionsLengthRef.current = 0;
+  };
+
+  return {
+    // state
+    suggestions,
+    isDrawerOpen,
+
+    // actions
+    handleHistoryUpdate,
+    handleApplySuggestion,
+    handleOpenDrawer,
+    handleCloseDrawer,
+    clearSuggestions,
+  };
+};
diff --git a/public/app/features/expressions/components/GenAI/sqlPromptConfig.ts b/public/app/features/expressions/components/GenAI/sqlPromptConfig.ts
new file mode 100644
index 00000000000..5c7d6238334
--- /dev/null
+++ b/public/app/features/expressions/components/GenAI/sqlPromptConfig.ts
@@ -0,0 +1,209 @@
+/**
+ * Configuration file for SQL AI prompts used across expression components
+ * NOTE: Schema and error context information integration is planned for future implementation
+ */
+
+import { DataQuery } from '@grafana/schema';
+
+// Common SQL context information shared across all prompts
+const COMMON_SQL_CONTEXT = {
+  engineInfo: 'MySQL dialectic based on dolthub go-mysql-server. The tables are all in memory',
+  refIdExplanation: 'RefIDs (A, B, C, etc.) represent data from other queries',
+  columnInfo: 'value should always be represented as __value__',
+} as const;
+
+// Template placeholders used in prompts
+const TEMPLATE_PLACEHOLDERS = {
+  refIds: '{refIds}',
+  currentQuery: '{currentQuery}',
+  queryInstruction: '{queryInstruction}',
+  schemaInfo: '{schemaInfo}', // Note: Schema information will be implemented in future updates
+  errorContext: '{errorContext}', // Note: Error context will be implemented in future updates
+  queryContext: '{queryContext}',
+} as const;
+
+export interface QueryUsageContext {
+  panelId?: string;
+  alerting?: boolean;
+  queries?: DataQuery[];
+  dashboardContext?: {
+    dashboardTitle?: string;
+    panelName?: string;
+  };
+  datasources?: string[];
+  totalRows?: number;
+  requestTime?: number;
+  numberOfQueries?: number;
+  seriesData?: unknown;
+}
+
+/**
+ * System prompt for SQL suggestion generation with enhanced context
+ */
+const SQL_SUGGESTION_SYSTEM_PROMPT = `You are a SQL expert for Grafana expressions specializing in time series data analysis.
+IMPORTANT - Current SQL Errors (if any): ${TEMPLATE_PLACEHOLDERS.errorContext}
+
+SQL dialect required by Grafana expressions: ${COMMON_SQL_CONTEXT.engineInfo}
+
+RefIDs context: ${COMMON_SQL_CONTEXT.refIdExplanation}
+Grafana specific context: ${COMMON_SQL_CONTEXT.columnInfo}
+
+Available RefIDs to use in composable queries: ${TEMPLATE_PLACEHOLDERS.refIds}
+
+Current query to be improved: ${TEMPLATE_PLACEHOLDERS.currentQuery}
+
+Schema information to use in composable queries: ${TEMPLATE_PLACEHOLDERS.schemaInfo}
+
+${TEMPLATE_PLACEHOLDERS.queryContext}
+
+Query instruction: ${TEMPLATE_PLACEHOLDERS.queryInstruction}
+
+You may be able to derive schema information from the series data in queryContext.
+
+Given the above data, help users with their SQL query by:
+- **PRIORITY: If there are errors listed above, focus on fixing them first**
+- Fixing syntax errors using available field and data type information
+- Suggesting optimal queries based on actual data schema and patterns.
+- Look at query context stats: totalRows, requestTime, numberOfQueries, and if it looks like performance should be part of the conversation, suggest optimizing for performance. Note indexing is not supported in Grafana expressions.
+- Leveraging time series patterns and Grafana-specific use cases
+
+Guidelines:
+- Use proper field names and types based on schema information
+- Include LIMIT clauses for performance unless aggregating
+- Consider time-based filtering and grouping for time series data
+- Suggest meaningful aggregations for metric data
+- Use appropriate JOIN conditions when correlating multiple RefIDs
+`;
+
+/**
+ * System prompt for SQL explanation generation with enhanced context
+ */
+const SQL_EXPLANATION_SYSTEM_PROMPT = `You are an expert in SQL and Grafana SQL expressions with deep knowledge of time series data.
+
+SQL dialect: ${COMMON_SQL_CONTEXT.engineInfo}
+
+RefIDs: ${COMMON_SQL_CONTEXT.refIdExplanation}
+
+Grafana specific context: ${COMMON_SQL_CONTEXT.columnInfo}
+
+Available RefIDs: ${TEMPLATE_PLACEHOLDERS.refIds}
+
+Schema: ${TEMPLATE_PLACEHOLDERS.schemaInfo}
+
+${TEMPLATE_PLACEHOLDERS.queryContext}
+
+Explain SQL queries clearly and concisely, focusing on:
+- What data is being selected and from which RefIDs
+- How the data is being transformed or aggregated
+- The purpose and business meaning of the query using dashboard and panel name from query context if relevant
+- Performance implications and optimization opportunities. Database columns can not be indexed in context of Grafana sql expressions. Don't focus on 
+  performance unless the query context has a requestTime or totalRows that looks like it could benefit from it.
+- Time series specific patterns and their significance
+
+Provide a clear explanation of what this SQL query does:`;
+
+/**
+ * Generate query context text for prompts
+ */
+const generateQueryContext = (queryContext?: QueryUsageContext): string => {
+  if (!queryContext) {
+    return '';
+  }
+
+  const contextParts = [];
+  if (queryContext.panelId) {
+    contextParts.push(
+      `Panel Type: ${queryContext.panelId}. Please use this to generate suggestions that are relevant to the panel type.`
+    );
+  }
+  if (queryContext.alerting) {
+    contextParts.push(
+      'Context: Alerting rule (focus on boolean/threshold results). Please use this to generate suggestions that are relevant to the alerting rule.'
+    );
+  }
+  if (queryContext.queries) {
+    const queriesText = Array.isArray(queryContext.queries)
+      ? JSON.stringify(queryContext.queries, null, 2)
+      : String(queryContext.queries);
+    contextParts.push(`Queries available to use in the SQL Expression: ${queriesText}`);
+  }
+  if (queryContext.dashboardContext) {
+    const dashboardText =
+      typeof queryContext.dashboardContext === 'object'
+        ? JSON.stringify(queryContext.dashboardContext, null, 2)
+        : String(queryContext.dashboardContext);
+    contextParts.push(`Dashboard context (dashboard title and panel name): ${dashboardText}`);
+  }
+  if (queryContext.datasources) {
+    const datasourcesText = Array.isArray(queryContext.datasources)
+      ? JSON.stringify(queryContext.datasources, null, 2)
+      : String(queryContext.datasources);
+    contextParts.push(`Datasources available to use in the SQL Expression: ${datasourcesText}`);
+  }
+  if (queryContext.totalRows) {
+    contextParts.push(`Total rows in the query: ${queryContext.totalRows}`);
+  }
+  if (queryContext.requestTime) {
+    contextParts.push(`Request time: ${queryContext.requestTime}`);
+  }
+  if (queryContext.numberOfQueries) {
+    contextParts.push(`Number of queries: ${queryContext.numberOfQueries}`);
+  }
+  if (queryContext.seriesData) {
+    const seriesDataText =
+      typeof queryContext.seriesData === 'object'
+        ? JSON.stringify(queryContext.seriesData, null, 2)
+        : String(queryContext.seriesData);
+    contextParts.push(`Series data: ${seriesDataText}`);
+  }
+
+  return contextParts.length
+    ? `Query Context:
+${contextParts.join('\n')}`
+    : '';
+};
+
+/**
+ * Enhanced interface for prompt generation variables
+ */
+export interface SQLPromptVariables {
+  refIds: string;
+  currentQuery: string;
+  queryInstruction: string;
+  schemas?: unknown; // Reserved for future schema implementation
+  errorContext?: string[];
+  queryContext?: QueryUsageContext;
+}
+
+/**
+ * Generate the complete system prompt for SQL suggestions with enhanced context
+ *
+ * Note: Schema information integration is planned for future implementation
+ */
+export const getSQLSuggestionSystemPrompt = (variables: SQLPromptVariables): string => {
+  const queryContext = generateQueryContext(variables.queryContext);
+  const schemaInfo = ''; // Placeholder for future schema information
+  const errorContext = variables.errorContext?.length
+    ? variables.errorContext.join('\n')
+    : 'No current errors detected.';
+
+  return SQL_SUGGESTION_SYSTEM_PROMPT.replaceAll(TEMPLATE_PLACEHOLDERS.refIds, variables.refIds)
+    .replaceAll(TEMPLATE_PLACEHOLDERS.currentQuery, variables.currentQuery)
+    .replaceAll(TEMPLATE_PLACEHOLDERS.queryInstruction, variables.queryInstruction)
+    .replaceAll(TEMPLATE_PLACEHOLDERS.schemaInfo, schemaInfo)
+    .replaceAll(TEMPLATE_PLACEHOLDERS.errorContext, errorContext)
+    .replaceAll(TEMPLATE_PLACEHOLDERS.queryContext, queryContext);
+};
+
+/**
+ * Generate the complete system prompt for SQL explanations with enhanced context
+ */
+export const getSQLExplanationSystemPrompt = (variables: Omit<SQLPromptVariables, 'queryInstruction'>): string => {
+  const queryContext = generateQueryContext(variables.queryContext);
+
+  const schemaInfo = ''; // Placeholder for future schema information
+
+  return SQL_EXPLANATION_SYSTEM_PROMPT.replaceAll(TEMPLATE_PLACEHOLDERS.refIds, variables.refIds)
+    .replaceAll(TEMPLATE_PLACEHOLDERS.schemaInfo, schemaInfo)
+    .replaceAll(TEMPLATE_PLACEHOLDERS.queryContext, queryContext);
+};
diff --git a/public/app/features/expressions/components/GenAI/utils.ts b/public/app/features/expressions/components/GenAI/utils.ts
new file mode 100644
index 00000000000..a51f9e2aeaf
--- /dev/null
+++ b/public/app/features/expressions/components/GenAI/utils.ts
@@ -0,0 +1,63 @@
+/**
+ * Parses AI-generated suggestions that contain mixed content (text and code blocks).
+ *
+ * AI responses often come in markdown format with explanatory text and code blocks
+ * delimited by triple backticks (```). This function separates and structures that
+ * content for proper rendering in the UI.
+ *
+ * @param suggestion - Raw AI suggestion string potentially containing markdown code blocks
+ * @returns Array of parsed parts, each with:
+ *   - type: 'text' for explanatory content, 'code' for SQL queries
+ *   - content: The actual text or code content
+ *   - language: For code blocks, the detected language (defaults to 'sql', normalized to 'mysql')
+ *
+ * Example input: "Here's a query:\n```sql\nSELECT * FROM A\n```\nThis joins data."
+ * Example output: [
+ *   { type: 'text', content: "Here's a query:" },
+ *   { type: 'code', content: 'SELECT * FROM A', language: 'mysql' },
+ *   { type: 'text', content: 'This joins data.' }
+ * ]
+ */
+export const parseSuggestion = (suggestion: string) => {
+  if (!suggestion) {
+    return [];
+  }
+  const parts: Array<{ type: 'text' | 'code'; content: string; language?: string }> = [];
+
+  // Split by triple backticks to find code blocks
+  const segments = suggestion.split(/```/);
+
+  segments.forEach((segment, index) => {
+    if (index % 2 === 0) {
+      // Even indices are text (outside code blocks)
+      if (segment.trim()) {
+        parts.push({ type: 'text', content: segment.trim() });
+      }
+    } else {
+      // Odd indices are code blocks
+      const lines = segment.split('\n');
+      let language = 'sql'; // default language
+      let codeContent = segment;
+
+      // Check if first line specifies a language
+      if (lines[0] && lines[0].trim() && !lines[0].includes(' ')) {
+        language = lines[0].trim().toLowerCase();
+        codeContent = lines.slice(1).join('\n');
+      }
+
+      // Remove trailing newlines
+      codeContent = codeContent.replace(/\n+$/, '');
+
+      if (codeContent.trim()) {
+        const finalLanguage = language === 'mysql' ? 'mysql' : language === 'sql' ? 'mysql' : language;
+        parts.push({
+          type: 'code',
+          content: codeContent.trim(),
+          language: finalLanguage,
+        });
+      }
+    }
+  });
+
+  return parts;
+};
diff --git a/public/app/features/expressions/components/SqlExpr.test.tsx b/public/app/features/expressions/components/SqlExpr.test.tsx
index e63a80133d6..53931e785db 100644
--- a/public/app/features/expressions/components/SqlExpr.test.tsx
+++ b/public/app/features/expressions/components/SqlExpr.test.tsx
@@ -1,8 +1,8 @@
-import { render } from '@testing-library/react';
+import { render, waitFor, fireEvent, act } from 'test/test-utils';
 
-import { ExpressionQuery } from '../types';
+import { ExpressionQuery, ExpressionQueryType } from '../types';
 
-import { SqlExpr } from './SqlExpr';
+import { SqlExpr, SqlExprProps } from './SqlExpr';
 
 jest.mock('@grafana/ui', () => ({
   ...jest.requireActual('@grafana/ui'),
@@ -13,13 +13,54 @@ jest.mock('@grafana/plugin-ui', () => ({
   SQLEditor: () => <div data-testid="sql-editor">SQL Editor Mock</div>,
 }));
 
+// Mock lazy loaded GenAI components
+jest.mock('./GenAI/GenAISQLSuggestionsButton', () => ({
+  GenAISQLSuggestionsButton: ({ currentQuery, initialQuery }: { currentQuery: string; initialQuery: string }) => {
+    const text = !currentQuery || currentQuery === initialQuery ? 'Generate suggestion' : 'Improve query';
+    return <div data-testid="suggestions-button">{text}</div>;
+  },
+}));
+
+jest.mock('./GenAI/GenAISQLExplainButton', () => ({
+  GenAISQLExplainButton: () => <div data-testid="explain-button">Explain query</div>,
+}));
+
+// Mock custom hooks for GenAI features
+jest.mock('./GenAI/hooks/useSQLSuggestions', () => ({
+  useSQLSuggestions: jest.fn(() => ({
+    handleApplySuggestion: jest.fn(),
+    handleHistoryUpdate: jest.fn(),
+    handleCloseDrawer: jest.fn(),
+    handleOpenDrawer: jest.fn(),
+    isDrawerOpen: false,
+    suggestions: [],
+  })),
+}));
+
+jest.mock('./GenAI/hooks/useSQLExplanations', () => ({
+  useSQLExplanations: jest.fn((currentExpression: string) => ({
+    explanation: '',
+    handleCloseExplanation: jest.fn(),
+    handleOpenExplanation: jest.fn(),
+    handleExplain: jest.fn(),
+    isExplanationOpen: false,
+    shouldShowViewExplanation: false,
+    updatePrevExpression: jest.fn(),
+    prevExpression: currentExpression,
+  })),
+}));
+
+// Note: Add more mocks if needed for other lazy components
+
 describe('SqlExpr', () => {
-  it('initializes new expressions with default query', () => {
+  it('initializes new expressions with default query', async () => {
     const onChange = jest.fn();
     const refIds = [{ value: 'A' }];
     const query = { refId: 'expr1', type: 'sql', expression: '' } as ExpressionQuery;
 
-    render(<SqlExpr onChange={onChange} refIds={refIds} query={query} queries={[]} />);
+    await act(async () => {
+      render(<SqlExpr onChange={onChange} refIds={refIds} query={query} queries={[]} />);
+    });
 
     // Verify onChange was called
     expect(onChange).toHaveBeenCalled();
@@ -29,13 +70,15 @@ describe('SqlExpr', () => {
     expect(updatedQuery.expression.toUpperCase()).toContain('SELECT');
   });
 
-  it('preserves existing expressions when mounted', () => {
+  it('preserves existing expressions when mounted', async () => {
     const onChange = jest.fn();
     const refIds = [{ value: 'A' }];
     const existingExpression = 'SELECT 1 AS foo';
     const query = { refId: 'expr1', type: 'sql', expression: existingExpression } as ExpressionQuery;
 
-    render(<SqlExpr onChange={onChange} refIds={refIds} query={query} queries={[]} />);
+    await act(async () => {
+      render(<SqlExpr onChange={onChange} refIds={refIds} query={query} queries={[]} />);
+    });
 
     // Check if onChange was called
     if (onChange.mock.calls.length > 0) {
@@ -48,14 +91,116 @@ describe('SqlExpr', () => {
     expect(query.expression).toBe(existingExpression);
   });
 
-  it('adds alerting format when alerting prop is true', () => {
+  it('adds alerting format when alerting prop is true', async () => {
     const onChange = jest.fn();
     const refIds = [{ value: 'A' }];
     const query = { refId: 'expr1', type: 'sql' } as ExpressionQuery;
 
-    render(<SqlExpr onChange={onChange} refIds={refIds} query={query} alerting queries={[]} />);
+    await act(async () => {
+      render(<SqlExpr onChange={onChange} refIds={refIds} query={query} alerting queries={[]} />);
+    });
 
     const updatedQuery = onChange.mock.calls[0][0];
     expect(updatedQuery.format).toBe('alerting');
   });
 });
+
+describe('SqlExpr with GenAI features', () => {
+  const defaultProps: SqlExprProps = {
+    onChange: jest.fn(),
+    refIds: [{ value: 'A' }],
+    query: { refId: 'expression_1', type: ExpressionQueryType.sql, expression: `SELECT * FROM A LIMIT 10` },
+    queries: [],
+  };
+
+  it('renders GenAI buttons with empty expression', async () => {
+    const customProps = { ...defaultProps, query: { ...defaultProps.query, expression: '' } };
+    const { findByText } = render(<SqlExpr {...customProps} />);
+    expect(await findByText('Generate suggestion')).toBeInTheDocument();
+    expect(await findByText('Explain query')).toBeInTheDocument();
+  });
+
+  it('renders GenAI buttons with non-empty expression', async () => {
+    const { findByText } = render(<SqlExpr {...defaultProps} />);
+    expect(await findByText('Improve query')).toBeInTheDocument();
+    expect(await findByText('Explain query')).toBeInTheDocument();
+  });
+
+  it('renders "Improve query" when currentQuery differs from initialQuery', async () => {
+    const customProps = {
+      ...defaultProps,
+      query: { ...defaultProps.query, expression: 'SELECT * FROM A WHERE value > 10' },
+    };
+    const { findByText } = render(<SqlExpr {...customProps} />);
+    expect(await findByText('Improve query')).toBeInTheDocument();
+  });
+
+  it('renders View explanation button when shouldShowViewExplanation is true', async () => {
+    const { useSQLExplanations } = require('./GenAI/hooks/useSQLExplanations');
+    useSQLExplanations.mockImplementation((currentExpression: string) => ({
+      shouldShowViewExplanation: true,
+    }));
+
+    const { findByText } = render(<SqlExpr {...defaultProps} />);
+    expect(await findByText('View explanation')).toBeInTheDocument();
+  });
+
+  it('renders Explain query button when shouldShowViewExplanation is false', async () => {
+    const { useSQLExplanations } = require('./GenAI/hooks/useSQLExplanations');
+    useSQLExplanations.mockImplementation((currentExpression: string) => ({
+      shouldShowViewExplanation: false,
+    }));
+
+    const { findByText } = render(<SqlExpr {...defaultProps} />);
+    expect(await findByText('Explain query')).toBeInTheDocument();
+  });
+
+  it('renders SuggestionsDrawerButton when there are suggestions', async () => {
+    const { useSQLSuggestions } = require('./GenAI/hooks/useSQLSuggestions');
+    useSQLSuggestions.mockImplementation(() => ({ suggestions: ['suggestion1', 'suggestion2'] }));
+
+    const { findByTestId } = render(<SqlExpr {...defaultProps} />);
+    expect(await findByTestId('suggestions-badge')).toBeInTheDocument();
+  });
+
+  it('does not render SuggestionsDrawerButton when there are no suggestions', async () => {
+    const { useSQLSuggestions } = require('./GenAI/hooks/useSQLSuggestions');
+    useSQLSuggestions.mockImplementation(() => ({ suggestions: [] }));
+
+    const { queryByTestId } = render(<SqlExpr {...defaultProps} />);
+    expect(await waitFor(() => queryByTestId('suggestions-badge'))).not.toBeInTheDocument();
+  });
+
+  it('calls handleOpenExplanation when View explanation is clicked', async () => {
+    const { useSQLExplanations } = require('./GenAI/hooks/useSQLExplanations');
+    const mockHandleOpen = jest.fn();
+    useSQLExplanations.mockImplementation(() => ({
+      shouldShowViewExplanation: true,
+      handleOpenExplanation: mockHandleOpen,
+    }));
+
+    const { findByText } = render(<SqlExpr {...defaultProps} />);
+    const button = await findByText('View explanation');
+    fireEvent.click(button);
+    expect(mockHandleOpen).toHaveBeenCalled();
+  });
+
+  it('renders suggestions drawer when isDrawerOpen is true', async () => {
+    const { useSQLSuggestions } = require('./GenAI/hooks/useSQLSuggestions');
+    useSQLSuggestions.mockImplementation(() => ({
+      isDrawerOpen: true,
+      suggestions: ['suggestion1', 'suggestion2'],
+    }));
+
+    const { findByTestId } = render(<SqlExpr {...defaultProps} />);
+    expect(await findByTestId('suggestions-drawer')).toBeInTheDocument();
+  });
+
+  it('renders explanation drawer when isExplanationOpen is true', async () => {
+    const { useSQLExplanations } = require('./GenAI/hooks/useSQLExplanations');
+    useSQLExplanations.mockImplementation(() => ({ isExplanationOpen: true }));
+
+    const { findByTestId } = render(<SqlExpr {...defaultProps} />);
+    expect(await findByTestId('explanation-drawer')).toBeInTheDocument();
+  });
+});
diff --git a/public/app/features/expressions/components/SqlExpr.tsx b/public/app/features/expressions/components/SqlExpr.tsx
index ac2917b1c40..6b1c467168a 100644
--- a/public/app/features/expressions/components/SqlExpr.tsx
+++ b/public/app/features/expressions/components/SqlExpr.tsx
@@ -1,29 +1,65 @@
 import { css } from '@emotion/css';
-import { useMemo, useRef, useEffect, useState } from 'react';
+import { useMemo, useRef, useEffect, useState, lazy, Suspense } from 'react';
 
-import { SelectableValue } from '@grafana/data';
+import { SelectableValue, GrafanaTheme2 } from '@grafana/data';
+import { Trans } from '@grafana/i18n';
 import { SQLEditor, CompletionItemKind, LanguageDefinition, TableIdentifier } from '@grafana/plugin-ui';
 import { DataQuery } from '@grafana/schema/dist/esm/index';
-import { useStyles2 } from '@grafana/ui';
+import { useStyles2, Stack, Button } from '@grafana/ui';
 
+import { ExpressionQueryEditorProps } from '../ExpressionQueryEditor';
 import { SqlExpressionQuery } from '../types';
 import { fetchSQLFields } from '../utils/metaSqlExpr';
 
+import { useSQLExplanations } from './GenAI/hooks/useSQLExplanations';
+import { useSQLSuggestions } from './GenAI/hooks/useSQLSuggestions';
 import { getSqlCompletionProvider } from './sqlCompletionProvider';
 
+// Lazy load the GenAI components to avoid circular dependencies
+const GenAISQLSuggestionsButton = lazy(() =>
+  import('./GenAI/GenAISQLSuggestionsButton').then((module) => ({
+    default: module.GenAISQLSuggestionsButton,
+  }))
+);
+
+const GenAISQLExplainButton = lazy(() =>
+  import('./GenAI/GenAISQLExplainButton').then((module) => ({
+    default: module.GenAISQLExplainButton,
+  }))
+);
+
+const SuggestionsDrawerButton = lazy(() =>
+  import('./GenAI/SuggestionsDrawerButton').then((module) => ({
+    default: module.SuggestionsDrawerButton,
+  }))
+);
+
+const GenAISuggestionsDrawer = lazy(() =>
+  import('./GenAI/GenAISuggestionsDrawer').then((module) => ({
+    default: module.GenAISuggestionsDrawer,
+  }))
+);
+
+const GenAIExplanationDrawer = lazy(() =>
+  import('./GenAI/GenAIExplanationDrawer').then((module) => ({
+    default: module.GenAIExplanationDrawer,
+  }))
+);
+
 // Account for Monaco editor's border to prevent clipping
 const EDITOR_BORDER_ADJUSTMENT = 2; // 1px border on top and bottom
 
-interface Props {
+export interface SqlExprProps {
   refIds: Array<SelectableValue<string>>;
   query: SqlExpressionQuery;
   queries: DataQuery[] | undefined;
   onChange: (query: SqlExpressionQuery) => void;
   /** Should the `format` property be set to `alerting`? */
   alerting?: boolean;
+  metadata?: ExpressionQueryEditorProps;
 }
 
-export const SqlExpr = ({ onChange, refIds, query, alerting = false, queries }: Props) => {
+export const SqlExpr = ({ onChange, refIds, query, alerting = false, queries, metadata }: SqlExprProps) => {
   const vars = useMemo(() => refIds.map((v) => v.value!), [refIds]);
   const completionProvider = useMemo(
     () =>
@@ -48,12 +84,70 @@ export const SqlExpr = ({ onChange, refIds, query, alerting = false, queries }:
   const containerRef = useRef<HTMLDivElement>(null);
   const [dimensions, setDimensions] = useState({ height: 0 });
 
+  const { handleApplySuggestion, handleHistoryUpdate, handleCloseDrawer, handleOpenDrawer, isDrawerOpen, suggestions } =
+    useSQLSuggestions();
+
+  const {
+    explanation,
+    handleCloseExplanation,
+    handleOpenExplanation,
+    handleExplain,
+    isExplanationOpen,
+    shouldShowViewExplanation,
+    updatePrevExpression,
+  } = useSQLExplanations(query.expression || '');
+
+  const queryContext = useMemo(
+    () => ({
+      alerting,
+      panelId: metadata?.data?.request?.panelPluginId,
+      queries: metadata?.queries,
+      dashboardContext: {
+        dashboardTitle: metadata?.data?.request?.dashboardTitle ?? '',
+        panelName: metadata?.data?.request?.panelName ?? '',
+      },
+      datasources: metadata?.queries?.map((query) => query.datasource?.type ?? '') ?? [],
+      totalRows: metadata?.data?.series.reduce((sum, frame) => sum + frame.length, 0),
+      requestTime: metadata?.data?.request?.endTime
+        ? metadata?.data?.request?.endTime - metadata?.data?.request?.startTime
+        : -1,
+      numberOfQueries: metadata?.data?.request?.targets?.length ?? 0,
+      seriesData: metadata?.data?.series,
+    }),
+    [alerting, metadata]
+  );
+
+  const errorContext = useMemo(() => {
+    if (!metadata?.data) {
+      return [];
+    }
+
+    const errors: string[] = [];
+
+    // Handle multiple errors (preferred)
+    if (metadata.data.errors?.length) {
+      errors.push(...metadata.data.errors.map((err) => err.message).filter((msg): msg is string => Boolean(msg)));
+    }
+    // Handle legacy single error
+    else if (metadata.data.error?.message) {
+      errors.push(metadata.data.error.message);
+    }
+
+    return errors;
+  }, [metadata?.data]);
+
   const onEditorChange = (expression: string) => {
     onChange({
       ...query,
       expression,
       format: alerting ? 'alerting' : undefined,
     });
+    updatePrevExpression(expression);
+  };
+
+  const onApplySuggestion = (suggestion: string) => {
+    onEditorChange(suggestion);
+    handleApplySuggestion(suggestion);
   };
 
   // Set up resize observer to handle container resizing
@@ -81,24 +175,112 @@ export const SqlExpr = ({ onChange, refIds, query, alerting = false, queries }:
   }, []);
 
   return (
-    <div ref={containerRef} className={styles.editorContainer}>
-      <SQLEditor
-        query={query.expression || initialQuery}
-        onChange={onEditorChange}
-        height={dimensions.height - EDITOR_BORDER_ADJUSTMENT}
-        language={EDITOR_LANGUAGE_DEFINITION}
-      />
-    </div>
+    <>
+      <div className={styles.sqlContainer}>
+        <div className={styles.sqlButtons}>
+          <Stack direction="row" gap={1} alignItems="center" justifyContent="end">
+            <Suspense fallback={null}>
+              {shouldShowViewExplanation ? (
+                <Button
+                  fill="outline"
+                  icon="gf-movepane-right"
+                  onClick={handleOpenExplanation}
+                  size="sm"
+                  variant="secondary"
+                >
+                  <Trans i18nKey="sql-expressions.view-explanation">View explanation</Trans>
+                </Button>
+              ) : (
+                <GenAISQLExplainButton
+                  currentQuery={query.expression || ''}
+                  onExplain={handleExplain}
+                  queryContext={queryContext}
+                  refIds={vars}
+                  // schemas={schemas} // Will be added when schema extraction is implemented
+                />
+              )}
+            </Suspense>
+            <Suspense fallback={null}>
+              <GenAISQLSuggestionsButton
+                currentQuery={query.expression || ''}
+                initialQuery={initialQuery}
+                onGenerate={() => {}} // Noop - history is managed via onHistoryUpdate
+                onHistoryUpdate={handleHistoryUpdate}
+                queryContext={queryContext}
+                refIds={vars}
+                errorContext={errorContext} // Will be added when error tracking is implemented
+                // schemas={schemas} // Will be added when schema extraction is implemented
+              />
+            </Suspense>
+          </Stack>
+          {suggestions.length > 0 && (
+            <Suspense fallback={null}>
+              <SuggestionsDrawerButton handleOpenDrawer={handleOpenDrawer} suggestions={suggestions} />
+            </Suspense>
+          )}
+        </div>
+
+        <div ref={containerRef} className={styles.editorContainer}>
+          <SQLEditor
+            query={query.expression || initialQuery}
+            onChange={onEditorChange}
+            height={dimensions.height - EDITOR_BORDER_ADJUSTMENT}
+            language={EDITOR_LANGUAGE_DEFINITION}
+          />
+        </div>
+      </div>
+      <>
+        <Suspense fallback={null}>
+          <GenAISuggestionsDrawer
+            isOpen={isDrawerOpen}
+            onApplySuggestion={onApplySuggestion}
+            onClose={handleCloseDrawer}
+            suggestions={suggestions}
+          />
+        </Suspense>
+        <Suspense fallback={null}>
+          <GenAIExplanationDrawer
+            isOpen={isExplanationOpen}
+            onClose={handleCloseExplanation}
+            explanation={explanation}
+          />
+        </Suspense>
+      </>
+    </>
   );
 };
 
-const getStyles = () => ({
+const getStyles = (theme: GrafanaTheme2) => ({
+  sqlContainer: css({
+    display: 'grid',
+    gridTemplateRows: 'auto 1fr',
+    gridTemplateAreas: `
+      "buttons"
+      "editor"
+    `,
+    gap: theme.spacing(0.5),
+  }),
   editorContainer: css({
+    gridArea: 'editor',
     height: '240px',
     resize: 'vertical',
     overflow: 'auto',
     minHeight: '100px',
   }),
+  // This is NOT ideal. The alternative is to expose SQL buttons as a separate component,
+  // Then consume them in ExpressionQueryEditor. This requires a lot of refactoring and
+  // can be prioritized later.
+  sqlButtons: css({
+    gridArea: 'buttons',
+    justifySelf: 'end',
+    transform: `translateY(${theme.spacing(-4)})`,
+    marginBottom: theme.spacing(-4), // Prevent affecting editor position
+    zIndex: 10, // Ensure buttons appear above other elements
+    position: 'relative', // Required for z-index to work
+    display: 'flex',
+    alignItems: 'center',
+    gap: theme.spacing(1),
+  }),
 });
 
 async function fetchFields(identifier: TableIdentifier, queries: DataQuery[]) {
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index c0631410c8e..13445a18190 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -7490,6 +7490,9 @@
       "label-upsample": "Upsample",
       "tooltip-s-m-h": "10s, 1m, 30m, 1h"
     },
+    "sql-expr": {
+      "tooltip-experimental": "SQL Expressions LLM integration is experimental. Please report any issues to the Grafana team."
+    },
     "threshold": {
       "label-input": "Input"
     }
@@ -12495,6 +12498,21 @@
   "sort-picker": {
     "select-aria-label": "Sort"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "Add at least one data query to generate SQL suggestions",
+    "ai-explain-title": "AI-powered SQL expression explanation",
+    "ai-suggestions-title": "AI-powered SQL expression suggestions",
+    "apply": "Apply",
+    "code-label": "{{ language }}",
+    "copy": "Copy",
+    "explain-empty-query-tooltip": "Enter a SQL expression to get an explanation",
+    "explain-query": "Explain query",
+    "explanation-modal-title": "SQL Query Explanation",
+    "sql-ai-interaction": "{{text}}",
+    "sql-suggestion-history": "SQL Suggestion History",
+    "suggestions": "Suggestions",
+    "view-explanation": "View explanation"
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Layout orientation",

From 5564f699ca45fcbffcf67ce2575ff40a34e263cd Mon Sep 17 00:00:00 2001
From: Tom Ratcliffe <tom.ratcliffe@grafana.com>
Date: Wed, 13 Aug 2025 17:41:00 +0100
Subject: [PATCH 147/243] Folders: Add team folders feature toggle (#109389)

Add team folders feature toggle
---
 .../grafana-data/src/types/featureToggles.gen.ts    |  5 +++++
 pkg/services/featuremgmt/registry.go                |  8 ++++++++
 pkg/services/featuremgmt/toggles_gen.csv            |  1 +
 pkg/services/featuremgmt/toggles_gen.go             |  4 ++++
 pkg/services/featuremgmt/toggles_gen.json           | 13 +++++++++++++
 5 files changed, 31 insertions(+)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 1ba87b75cd8..a8d6dd05efc 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -1103,4 +1103,9 @@ export interface FeatureToggles {
   * @default false
   */
   unifiedStorageSearchAfterWriteExperimentalAPI?: boolean;
+  /**
+  * Enables team folders functionality
+  * @default false
+  */
+  teamFolders?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 407d5bb8675..638579dfed8 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -1913,6 +1913,14 @@ var (
 			RequiresRestart:   true,
 			Expression:        "false",
 		},
+		{
+			Name:         "teamFolders",
+			Description:  "Enables team folders functionality",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: false,
+			Owner:        grafanaFrontendSearchNavOrganise,
+			Expression:   "false",
+		},
 	}
 )
 
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index da5c86efce9..7764d1c9227 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -247,3 +247,4 @@ favoriteDatasources,experimental,@grafana/plugins-platform-backend,false,false,t
 newLogContext,experimental,@grafana/observability-logs,false,false,true
 newClickhouseConfigPageDesign,privatePreview,@grafana/partner-datasources,false,false,false
 unifiedStorageSearchAfterWriteExperimentalAPI,experimental,@grafana/search-and-storage,false,true,false
+teamFolders,experimental,@grafana/grafana-search-navigate-organise,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 850aeaaf482..e50d2bb29f8 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -998,4 +998,8 @@ const (
 	// FlagUnifiedStorageSearchAfterWriteExperimentalAPI
 	// Enable experimental search-after-write guarantees to unified-storage search endpoints
 	FlagUnifiedStorageSearchAfterWriteExperimentalAPI = "unifiedStorageSearchAfterWriteExperimentalAPI"
+
+	// FlagTeamFolders
+	// Enables team folders functionality
+	FlagTeamFolders = "teamFolders"
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index deabfe2302c..71d0603f154 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -3056,6 +3056,19 @@
         "expression": "false"
       }
     },
+    {
+      "metadata": {
+        "name": "teamFolders",
+        "resourceVersion": "1755099058649",
+        "creationTimestamp": "2025-08-13T15:30:58Z"
+      },
+      "spec": {
+        "description": "Enables team folders functionality",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-search-navigate-organise",
+        "expression": "false"
+      }
+    },
     {
       "metadata": {
         "name": "teamHttpHeadersMimir",

From b34642b1880a496c51b6fa826aa52ac5612f3165 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Wed, 13 Aug 2025 19:22:06 +0200
Subject: [PATCH 148/243] Azure: Fix logs editor rendering (#109491)

* Fix logs editor rendering

- Add test

* Type fixes

* Fix schema conditions and add test

* Fix lint

* Update public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.tsx

Co-authored-by: Adam Yeats <16296989+adamyeats@users.noreply.github.com>

* Lint

---------

Co-authored-by: Adam Yeats <16296989+adamyeats@users.noreply.github.com>
---
 .../LogsQueryBuilder/LogsQueryBuilder.tsx     |   2 +-
 .../LogsQueryEditor/LogsQueryEditor.test.tsx  | 124 ++++++++++++++++++
 .../LogsQueryEditor/LogsQueryEditor.tsx       |   6 +-
 .../LogsQueryEditor/TimeManagement.test.tsx   |  19 +++
 .../LogsQueryEditor/TimeManagement.tsx        |  45 ++++---
 5 files changed, 168 insertions(+), 28 deletions(-)

diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryBuilder/LogsQueryBuilder.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryBuilder/LogsQueryBuilder.tsx
index c37ee551b18..fc2df69559c 100644
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryBuilder/LogsQueryBuilder.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryBuilder/LogsQueryBuilder.tsx
@@ -36,7 +36,7 @@ interface LogsQueryBuilderProps {
   query: AzureMonitorQuery;
   basicLogsEnabled: boolean;
   onQueryChange: (newQuery: AzureMonitorQuery) => void;
-  schema: EngineSchema;
+  schema?: EngineSchema;
   templateVariableOptions: SelectableValue<string>;
   datasource: Datasource;
   timeRange?: TimeRange;
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx
index 50b019d8aa0..7553942d04d 100644
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx
@@ -6,6 +6,7 @@ import { dateTime, LoadingState } from '@grafana/data';
 import { ResultFormat } from '../../dataquery.gen';
 import createMockDatasource from '../../mocks/datasource';
 import createMockQuery from '../../mocks/query';
+import { EngineSchema } from '../../types/types';
 
 import LogsQueryEditor from './LogsQueryEditor';
 import { createMockResourcePickerData } from './mocks';
@@ -628,4 +629,127 @@ describe('LogsQueryEditor', () => {
       expect(onChange).toHaveBeenCalledWith(newQuery);
     });
   });
+
+  describe('schema loading and auto-completion', () => {
+    it('loads schema and table plans when resources change and builder mode is set', async () => {
+      const mockSchema: EngineSchema = {
+        clusterType: 'Engine',
+        cluster: {
+          connectionString:
+            '/subscriptions/subscriptionId/resourceGroups/resourceGroup/providers/Microsoft.OperationalInsights/workspaces/la-workspace',
+          databases: [
+            {
+              name: '/subscriptions/subscriptionId/resourceGroups/resourceGroup/providers/Microsoft.OperationalInsights/workspaces/la-workspace',
+              tables: [
+                {
+                  columns: [
+                    {
+                      description: '',
+                      isPreferredFacet: false,
+                      name: 'TenantId',
+                      type: 'string',
+                    },
+                    {
+                      description: 'Date and time when dependency call was recorded.',
+                      isPreferredFacet: false,
+                      name: 'TimeGenerated',
+                      type: 'datetime',
+                    },
+                  ],
+                  description: 'Application Insights dependencies.',
+                  id: 'AppDependencies',
+                  name: 'AppDependencies',
+                  timespanColumn: 'TimeGenerated',
+                  hasData: true,
+                  related: {
+                    solutions: [],
+                    functions: [],
+                    categories: [],
+                  },
+                },
+              ],
+              functions: [],
+              majorVersion: 0,
+              minorVersion: 0,
+              entityGroups: [],
+            },
+          ],
+        },
+        database: {
+          name: '/subscriptions/subscriptionId/resourceGroups/resourceGroup/providers/Microsoft.OperationalInsights/workspaces/la-workspace',
+          tables: [
+            {
+              columns: [
+                {
+                  description: '',
+                  isPreferredFacet: false,
+                  name: 'TenantId',
+                  type: 'string',
+                },
+                {
+                  description: 'Date and time when dependency call was recorded.',
+                  isPreferredFacet: false,
+                  name: 'TimeGenerated',
+                  type: 'datetime',
+                },
+              ],
+              description: 'Application Insights dependencies.',
+              id: 'AppDependencies',
+              name: 'AppDependencies',
+              timespanColumn: 'TimeGenerated',
+              hasData: true,
+              related: {
+                solutions: [],
+                functions: [],
+                categories: [],
+              },
+            },
+          ],
+          functions: [],
+          majorVersion: 0,
+          minorVersion: 0,
+          entityGroups: [],
+        },
+      };
+      const mockDatasource = createMockDatasource();
+      mockDatasource.azureLogAnalyticsDatasource.getKustoSchema = jest.fn().mockResolvedValue(mockSchema);
+      // @ts-ignore: forcibly attach for test
+      mockDatasource.azureMonitorDatasource.getWorkspaceTablePlan = jest.fn().mockResolvedValue('plan');
+      const query = createMockQuery({
+        azureLogAnalytics: {
+          resources: [
+            '/subscriptions/def-456/resourceGroups/dev-3/providers/microsoft.operationalinsights/workspaces/la-workspace',
+          ],
+          mode: require('../../dataquery.gen').LogsEditorMode.Builder,
+        },
+      });
+      const onChange = jest.fn();
+      const onQueryChange = jest.fn();
+
+      await act(async () => {
+        render(
+          <LogsQueryEditor
+            query={query}
+            datasource={mockDatasource}
+            variableOptionGroup={variableOptionGroup}
+            onChange={onChange}
+            onQueryChange={onQueryChange}
+            setError={() => {}}
+            basicLogsEnabled={true}
+          />
+        );
+      });
+
+      await waitFor(() => {
+        expect(mockDatasource.azureLogAnalyticsDatasource.getKustoSchema).toHaveBeenCalledWith(
+          query.azureLogAnalytics?.resources?.[0]
+        );
+      });
+      expect(mockDatasource.azureMonitorDatasource.getWorkspaceTablePlan).toHaveBeenCalledTimes(1);
+      expect(mockDatasource.azureMonitorDatasource.getWorkspaceTablePlan).toHaveBeenCalledWith(
+        query.azureLogAnalytics?.resources,
+        'AppDependencies'
+      );
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx
index 2c7fbced3be..4a4e9a9cea0 100644
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.tsx
@@ -108,11 +108,9 @@ const LogsQueryEditor = ({
             if (schema.database?.tables) {
               schema.database.tables = t;
             }
-            setSchema(schema);
           });
-        } else {
-          setSchema(schema);
         }
+        setSchema(schema);
         setIsLoadingSchema(false);
       });
     }
@@ -281,7 +279,7 @@ const LogsQueryEditor = ({
         !!config.featureToggles.azureMonitorLogsBuilderEditor ? (
           <LogsQueryBuilder
             query={query}
-            schema={schema!}
+            schema={schema}
             basicLogsEnabled={basicLogsEnabled}
             onQueryChange={onQueryChange}
             templateVariableOptions={templateVariableOptions}
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.test.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.test.tsx
index 9d9f2359dea..19d6a36b1bb 100644
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.test.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.test.tsx
@@ -60,6 +60,25 @@ describe('LogsQueryEditor.TimeManagement', () => {
     );
   });
 
+  it('should render correctly even if no tables are in the schema', async () => {
+    const mockDatasource = createMockDatasource();
+    const query = createMockQuery({ azureLogAnalytics: { timeColumn: undefined } });
+    const onChange = jest.fn();
+
+    render(
+      <TimeManagement
+        query={query}
+        datasource={mockDatasource}
+        variableOptionGroup={variableOptionGroup}
+        onQueryChange={onChange}
+        setError={() => {}}
+        schema={FakeSchemaData.getLogAnalyticsFakeEngineSchema([])}
+      />
+    );
+
+    expect(screen.getByText('Time-range')).toBeInTheDocument();
+  });
+
   it('should render the default value if no time columns exist', async () => {
     const mockDatasource = createMockDatasource();
     const query = createMockQuery();
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.tsx
index f66e54ce88b..d3ffac2b868 100644
--- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.tsx
@@ -21,7 +21,7 @@ export function TimeManagement({ query, onQueryChange: onChange, schema }: Azure
       const timeColumnsSet: Set<string> = new Set();
       const defaultColumnsMap: Map<string, SelectableValue> = new Map();
       const db = schema.database;
-      if (db) {
+      if (db && db?.tables?.length > 0) {
         for (const table of db.tables) {
           const cols = table.columns.reduce<SelectableValue[]>((prev, curr, i) => {
             if (curr.type === 'datetime') {
@@ -40,28 +40,27 @@ export function TimeManagement({ query, onQueryChange: onChange, schema }: Azure
             });
           }
         }
-      }
-      setTimeColumns(timeColumnOptions);
-      const defaultColumns = Array.from(defaultColumnsMap.values());
-      setDefaultTimeColumns(defaultColumns);
-
-      // Set default value
-      if (
-        !query.azureLogAnalytics.timeColumn ||
-        (query.azureLogAnalytics.timeColumn &&
-          !timeColumnsSet.has(query.azureLogAnalytics.timeColumn) &&
-          !defaultColumnsMap.has(query.azureLogAnalytics.timeColumn))
-      ) {
-        if (defaultColumns && defaultColumns.length) {
-          setDefaultColumn(defaultColumns[0].value);
-          setDefaultColumn(defaultColumns[0].value);
-          return;
-        } else if (timeColumnOptions && timeColumnOptions.length) {
-          setDefaultColumn(timeColumnOptions[0].value);
-          return;
-        } else {
-          setDefaultColumn('TimeGenerated');
-          return;
+        setTimeColumns(timeColumnOptions);
+        const defaultColumns = Array.from(defaultColumnsMap.values());
+        setDefaultTimeColumns(defaultColumns);
+        // Set default value
+        if (
+          !query.azureLogAnalytics.timeColumn ||
+          (query.azureLogAnalytics.timeColumn &&
+            !timeColumnsSet.has(query.azureLogAnalytics.timeColumn) &&
+            !defaultColumnsMap.has(query.azureLogAnalytics.timeColumn))
+        ) {
+          if (defaultColumns && defaultColumns.length) {
+            setDefaultColumn(defaultColumns[0].value);
+            setDefaultColumn(defaultColumns[0].value);
+            return;
+          } else if (timeColumnOptions && timeColumnOptions.length) {
+            setDefaultColumn(timeColumnOptions[0].value);
+            return;
+          } else {
+            setDefaultColumn('TimeGenerated');
+            return;
+          }
         }
       }
     }

From ee9c73f866e9447e3c01e3ee8928bd5c892f7ab3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 13 Aug 2025 18:09:42 +0000
Subject: [PATCH 149/243] Release: update changelog for main (#109556)

* Update changelog

* Update changelog

* Update changelog

* Update CHANGELOG.md

Manually update changelog with 11.6.5 changes

* Update CHANGELOG.md

Update with 12.0.4 changelog content

* Update CHANGELOG.md

update changelog with 12.1.1 content

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
---
 CHANGELOG.md | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a979b3b88e..596ca47fe22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,68 @@
+<!-- 12.1.1 START -->
+
+# 12.1.1 (2025-08-13)
+
+### Features and enhancements
+
+- **Alerting:** Add rule group name validation to the Prometheus conversion API [#108767](https://github.com/grafana/grafana/pull/108767), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
+- **CloudWatch:** Update grafana/aws-sdk-go with STS endpo… [#109357](https://github.com/grafana/grafana/pull/109357), [@iwysiu](https://github.com/iwysiu)
+- **Go:** Update to 1.24.6 [#109318](https://github.com/grafana/grafana/pull/109318), [@Proximyst](https://github.com/Proximyst)
+
+### Bug fixes
+
+- **Alerting:** Fix active time intervals when time interval is renamed [#108547](https://github.com/grafana/grafana/pull/108547), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Fix subpath handling in the alerting package [#109505](https://github.com/grafana/grafana/pull/109505), [@konrad147](https://github.com/konrad147)
+- **Config:** Fix date_formats options being moved to a different section [#109366](https://github.com/grafana/grafana/pull/109366), [@joshhunt](https://github.com/joshhunt)
+
+<!-- 12.1.1 END -->
+<!-- 12.0.4 START -->
+
+# 12.0.4 (2025-08-13)
+
+### Features and enhancements
+
+- **Go:** Update to 1.24.6 [#109317](https://github.com/grafana/grafana/pull/109317), [@Proximyst](https://github.com/Proximyst)
+
+### Bug fixes
+
+- **Azure:** Fix time management field [#108481](https://github.com/grafana/grafana/pull/108481), [@aangelisc](https://github.com/aangelisc)
+- **Azure:** Fix time management field [#108481](https://github.com/grafana/grafana/pull/108481), [@aangelisc](https://github.com/aangelisc)
+- **Azure:** Fix time management field [#108481](https://github.com/grafana/grafana/pull/108481), [@aangelisc](https://github.com/aangelisc)
+- **Azure:** Fix time management field [#108481](https://github.com/grafana/grafana/pull/108481), [@aangelisc](https://github.com/aangelisc)
+
+<!-- 12.0.4 END -->
+<!-- 11.6.5 START -->
+
+# 11.6.5 (2025-08-13)
+
+### Features and enhancements
+
+- **Alerting:** Bump alerting package to include change to NewTLSClient [#108817](https://github.com/grafana/grafana/pull/108817), [@rwwiv](https://github.com/rwwiv)
+- **Go:** Update to 1.24.6 [#109314](https://github.com/grafana/grafana/pull/109314), [@Proximyst](https://github.com/Proximyst)
+
+<!-- 11.6.5 END -->
+<!-- 11.5.8 START -->
+
+# 11.5.8 (2025-08-12)
+
+### Features and enhancements
+
+- **Go:** Update to 1.24.6 [#109315](https://github.com/grafana/grafana/pull/109315), [@Proximyst](https://github.com/Proximyst)
+
+<!-- 11.5.8 END -->
+<!-- 11.4.8 START -->
+
+# 11.4.8 (2025-08-12)
+
+### Features and enhancements
+
+- **Go:** Update to 1.24.6 [#109316](https://github.com/grafana/grafana/pull/109316), [@Proximyst](https://github.com/Proximyst)
+
+### Bug fixes
+
+- **Dashboards:** Panel react for `timeFrom` and `timeShift` changes using variables [#98659](https://github.com/grafana/grafana/pull/98659), [@Sergej-Vlasov](https://github.com/Sergej-Vlasov)
+
+<!-- 11.4.8 END -->
 <!-- 12.1.0 START -->
 
 # 12.1.0 (2025-07-23)

From 73a132033445c2c7ec40a1844e836c7ce709f9c2 Mon Sep 17 00:00:00 2001
From: Alex Spencer <52186778+alexjonspencer1@users.noreply.github.com>
Date: Wed, 13 Aug 2025 11:43:01 -0700
Subject: [PATCH 150/243] SQL Expressions: Add editor toolbox (#109298)

* init: feature work

* chore: i18n

* feat: add run query + keyboard shortcuts

* chore: i18n

* chore: initial query formatted

* chore: resolve some issues

* chore: a bit of refactor to clean it up

---------

Co-authored-by: Kristina Durivage <kristina.durivage@grafana.com>
---
 .../expressions/ExpressionQueryEditor.tsx     |  11 +-
 .../expressions/components/QueryToolbox.tsx   | 104 ++++++++
 .../expressions/components/SqlExpr.tsx        | 226 ++++++++++++------
 public/locales/en-US/grafana.json             |   9 +
 4 files changed, 279 insertions(+), 71 deletions(-)
 create mode 100644 public/app/features/expressions/components/QueryToolbox.tsx

diff --git a/public/app/features/expressions/ExpressionQueryEditor.tsx b/public/app/features/expressions/ExpressionQueryEditor.tsx
index de0d59c2920..bb5b98bc382 100644
--- a/public/app/features/expressions/ExpressionQueryEditor.tsx
+++ b/public/app/features/expressions/ExpressionQueryEditor.tsx
@@ -118,7 +118,16 @@ export function ExpressionQueryEditor(props: ExpressionQueryEditorProps) {
         return <Threshold onChange={onChange} query={query} labelWidth={labelWidth} refIds={refIds} />;
 
       case ExpressionQueryType.sql:
-        return <SqlExpr onChange={onChange} query={query} refIds={refIds} queries={queries} metadata={props} />;
+        return (
+          <SqlExpr
+            onChange={onChange}
+            query={query}
+            refIds={refIds}
+            queries={queries}
+            metadata={props}
+            onRunQuery={onRunQuery}
+          />
+        );
     }
   };
 
diff --git a/public/app/features/expressions/components/QueryToolbox.tsx b/public/app/features/expressions/components/QueryToolbox.tsx
new file mode 100644
index 00000000000..08a5abf3a99
--- /dev/null
+++ b/public/app/features/expressions/components/QueryToolbox.tsx
@@ -0,0 +1,104 @@
+import { css } from '@emotion/css';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { t } from '@grafana/i18n';
+import { IconButton, useStyles2, Stack, InlineToast, Tooltip, Icon } from '@grafana/ui';
+
+import { SqlExpressionQuery } from '../types';
+
+interface QueryToolboxProps {
+  onFormatCode?: () => void;
+  onExpand?: (isExpanded: boolean) => void;
+  isExpanded?: boolean;
+  query: SqlExpressionQuery;
+}
+
+const SHOW_SUCCESS_DURATION = 2 * 1000;
+
+export const QueryToolbox = ({ onFormatCode, onExpand, isExpanded, query }: QueryToolboxProps): JSX.Element => {
+  const styles = useStyles2(getStyles);
+
+  const [showCopySuccess, setShowCopySuccess] = useState(false);
+  const buttonRef = useRef<HTMLButtonElement>(null);
+
+  useEffect(() => {
+    if (!showCopySuccess) {
+      return;
+    }
+
+    const timeoutId = setTimeout(() => {
+      setShowCopySuccess(false);
+    }, SHOW_SUCCESS_DURATION);
+
+    return () => clearTimeout(timeoutId);
+  }, [showCopySuccess]);
+
+  const copyTextCallback = useCallback(async () => {
+    try {
+      await navigator.clipboard.writeText(query.expression ?? '');
+      setShowCopySuccess(true);
+    } catch (e) {
+      console.error(e);
+    }
+  }, [query.expression]);
+
+  const copiedText = t('clipboard-button.inline-toast.success', 'Copied');
+
+  return (
+    <div className={styles.container}>
+      <Stack alignItems="center" direction="row" gap={1}>
+        {onFormatCode && (
+          <IconButton
+            onClick={onFormatCode}
+            name="brackets-curly"
+            size="xs"
+            tooltip={t('expressions.query-toolbox.tooltip-format-query', 'Format query')}
+          />
+        )}
+        {onExpand && (
+          <IconButton
+            onClick={() => onExpand(!isExpanded)}
+            name={isExpanded ? 'angle-double-up' : 'angle-double-down'}
+            size="xs"
+            tooltip={
+              isExpanded
+                ? t('expressions.query-toolbox.tooltip-collapse-editor', 'Collapse editor')
+                : t('expressions.query-toolbox.tooltip-expand-editor', 'Expand editor')
+            }
+          />
+        )}
+        {showCopySuccess && (
+          <InlineToast placement="top" referenceElement={buttonRef.current}>
+            {copiedText}
+          </InlineToast>
+        )}
+        <IconButton
+          name={showCopySuccess ? 'check' : 'copy'}
+          onClick={copyTextCallback}
+          ref={buttonRef}
+          size="xs"
+          tooltip={t('expressions.query-toolbox.tooltip-copy-query', 'Copy query')}
+          variant={showCopySuccess ? 'primary' : 'secondary'}
+        />
+        {!isExpanded && (
+          <Tooltip content={t('expressions.query-toolbox.tooltip-run-query', 'Hit ctrl/cmd+enter to run query')}>
+            <Icon name="keyboard" />
+          </Tooltip>
+        )}
+      </Stack>
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  container: css({
+    border: `1px solid ${theme.colors.border.medium}`,
+    borderTop: 'none',
+    padding: theme.spacing(1),
+    display: 'flex',
+    flexGrow: 1,
+    justifyContent: 'end',
+    fontSize: theme.typography.bodySmall.fontSize,
+  }),
+});
diff --git a/public/app/features/expressions/components/SqlExpr.tsx b/public/app/features/expressions/components/SqlExpr.tsx
index 6b1c467168a..ab2d25ab5d3 100644
--- a/public/app/features/expressions/components/SqlExpr.tsx
+++ b/public/app/features/expressions/components/SqlExpr.tsx
@@ -1,11 +1,14 @@
 import { css } from '@emotion/css';
-import { useMemo, useRef, useEffect, useState, lazy, Suspense } from 'react';
+import { useMemo, useRef, useEffect, useState, lazy, Suspense, useCallback } from 'react';
+import { useMeasure } from 'react-use';
+import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { SelectableValue, GrafanaTheme2 } from '@grafana/data';
-import { Trans } from '@grafana/i18n';
+import { t, Trans } from '@grafana/i18n';
 import { SQLEditor, CompletionItemKind, LanguageDefinition, TableIdentifier } from '@grafana/plugin-ui';
 import { DataQuery } from '@grafana/schema/dist/esm/index';
-import { useStyles2, Stack, Button } from '@grafana/ui';
+import { formatSQL } from '@grafana/sql';
+import { useStyles2, Stack, Button, Modal } from '@grafana/ui';
 
 import { ExpressionQueryEditorProps } from '../ExpressionQueryEditor';
 import { SqlExpressionQuery } from '../types';
@@ -13,6 +16,7 @@ import { fetchSQLFields } from '../utils/metaSqlExpr';
 
 import { useSQLExplanations } from './GenAI/hooks/useSQLExplanations';
 import { useSQLSuggestions } from './GenAI/hooks/useSQLSuggestions';
+import { QueryToolbox } from './QueryToolbox';
 import { getSqlCompletionProvider } from './sqlCompletionProvider';
 
 // Lazy load the GenAI components to avoid circular dependencies
@@ -54,12 +58,13 @@ export interface SqlExprProps {
   query: SqlExpressionQuery;
   queries: DataQuery[] | undefined;
   onChange: (query: SqlExpressionQuery) => void;
+  onRunQuery?: () => void;
   /** Should the `format` property be set to `alerting`? */
   alerting?: boolean;
   metadata?: ExpressionQueryEditorProps;
 }
 
-export const SqlExpr = ({ onChange, refIds, query, alerting = false, queries, metadata }: SqlExprProps) => {
+export const SqlExpr = ({ onChange, refIds, query, alerting = false, queries, metadata, onRunQuery }: SqlExprProps) => {
   const vars = useMemo(() => refIds.map((v) => v.value!), [refIds]);
   const completionProvider = useMemo(
     () =>
@@ -74,15 +79,21 @@ export const SqlExpr = ({ onChange, refIds, query, alerting = false, queries, me
   const EDITOR_LANGUAGE_DEFINITION: LanguageDefinition = {
     id: 'mysql',
     completionProvider,
+    formatter: formatSQL,
   };
 
-  const initialQuery = `SELECT *
-  FROM ${vars[0]}
-  LIMIT 10`;
+  const initialQuery = `SELECT
+  *
+FROM
+  ${vars[0]}
+LIMIT
+  10`;
 
   const styles = useStyles2(getStyles);
   const containerRef = useRef<HTMLDivElement>(null);
   const [dimensions, setDimensions] = useState({ height: 0 });
+  const [toolboxRef, toolboxMeasure] = useMeasure<HTMLDivElement>();
+  const [isExpanded, setIsExpanded] = useState(false);
 
   const { handleApplySuggestion, handleHistoryUpdate, handleCloseDrawer, handleOpenDrawer, isDrawerOpen, suggestions } =
     useSQLSuggestions();
@@ -150,6 +161,12 @@ export const SqlExpr = ({ onChange, refIds, query, alerting = false, queries, me
     handleApplySuggestion(suggestion);
   };
 
+  const executeQuery = useCallback(() => {
+    if (query.expression && onRunQuery) {
+      onRunQuery();
+    }
+  }, [query.expression, onRunQuery]);
+
   // Set up resize observer to handle container resizing
   useEffect(() => {
     if (!containerRef.current) {
@@ -174,78 +191,139 @@ export const SqlExpr = ({ onChange, refIds, query, alerting = false, queries, me
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  return (
+  // cmd/ctrl + enter to run query
+  useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      const isMac = navigator.userAgent.includes('Mac');
+      const isCmdOrCtrl = isMac ? event.metaKey : event.ctrlKey;
+
+      if (isCmdOrCtrl && event.key === 'Enter') {
+        event.preventDefault();
+        event.stopPropagation();
+        executeQuery();
+      }
+    };
+
+    document.addEventListener('keydown', handleKeyDown, true);
+    return () => document.removeEventListener('keydown', handleKeyDown, true);
+  }, [executeQuery]);
+
+  const renderToolbox = (formatQuery: () => void) => (
+    <div ref={toolboxRef}>
+      <QueryToolbox query={query} onFormatCode={formatQuery} onExpand={setIsExpanded} isExpanded={isExpanded} />
+    </div>
+  );
+
+  const renderSQLButtons = () => (
+    <div className={styles.sqlButtons}>
+      <Stack direction="row" gap={1} alignItems="center" justifyContent="end">
+        <Button icon="play" onClick={executeQuery} size="sm">
+          {t('expressions.sql-expr.button-run-query', 'Run query')}
+        </Button>
+        <Suspense fallback={null}>
+          {shouldShowViewExplanation ? (
+            <Button
+              fill="outline"
+              icon="gf-movepane-right"
+              onClick={handleOpenExplanation}
+              size="sm"
+              variant="secondary"
+            >
+              <Trans i18nKey="sql-expressions.view-explanation">View explanation</Trans>
+            </Button>
+          ) : (
+            <GenAISQLExplainButton
+              currentQuery={query.expression || ''}
+              onExplain={handleExplain}
+              queryContext={queryContext}
+              refIds={vars}
+              // schemas={schemas} // Will be added when schema extraction is implemented
+            />
+          )}
+        </Suspense>
+        <Suspense fallback={null}>
+          <GenAISQLSuggestionsButton
+            currentQuery={query.expression || ''}
+            initialQuery={initialQuery}
+            onGenerate={() => {}} // Noop - history is managed via onHistoryUpdate
+            onHistoryUpdate={handleHistoryUpdate}
+            queryContext={queryContext}
+            refIds={vars}
+            errorContext={errorContext} // Will be added when error tracking is implemented
+            // schemas={schemas} // Will be added when schema extraction is implemented
+          />
+        </Suspense>
+      </Stack>
+      {suggestions.length > 0 && (
+        <Suspense fallback={null}>
+          <SuggestionsDrawerButton handleOpenDrawer={handleOpenDrawer} suggestions={suggestions} />
+        </Suspense>
+      )}
+    </div>
+  );
+
+  const renderSQLEditor = (width?: number, height?: number) => (
     <>
       <div className={styles.sqlContainer}>
-        <div className={styles.sqlButtons}>
-          <Stack direction="row" gap={1} alignItems="center" justifyContent="end">
-            <Suspense fallback={null}>
-              {shouldShowViewExplanation ? (
-                <Button
-                  fill="outline"
-                  icon="gf-movepane-right"
-                  onClick={handleOpenExplanation}
-                  size="sm"
-                  variant="secondary"
-                >
-                  <Trans i18nKey="sql-expressions.view-explanation">View explanation</Trans>
-                </Button>
-              ) : (
-                <GenAISQLExplainButton
-                  currentQuery={query.expression || ''}
-                  onExplain={handleExplain}
-                  queryContext={queryContext}
-                  refIds={vars}
-                  // schemas={schemas} // Will be added when schema extraction is implemented
-                />
-              )}
-            </Suspense>
-            <Suspense fallback={null}>
-              <GenAISQLSuggestionsButton
-                currentQuery={query.expression || ''}
-                initialQuery={initialQuery}
-                onGenerate={() => {}} // Noop - history is managed via onHistoryUpdate
-                onHistoryUpdate={handleHistoryUpdate}
-                queryContext={queryContext}
-                refIds={vars}
-                errorContext={errorContext} // Will be added when error tracking is implemented
-                // schemas={schemas} // Will be added when schema extraction is implemented
-              />
-            </Suspense>
-          </Stack>
-          {suggestions.length > 0 && (
-            <Suspense fallback={null}>
-              <SuggestionsDrawerButton handleOpenDrawer={handleOpenDrawer} suggestions={suggestions} />
-            </Suspense>
-          )}
-        </div>
-
+        {renderSQLButtons()}
         <div ref={containerRef} className={styles.editorContainer}>
           <SQLEditor
             query={query.expression || initialQuery}
             onChange={onEditorChange}
-            height={dimensions.height - EDITOR_BORDER_ADJUSTMENT}
+            width={width}
+            height={height ?? dimensions.height - EDITOR_BORDER_ADJUSTMENT - toolboxMeasure.height}
             language={EDITOR_LANGUAGE_DEFINITION}
-          />
+          >
+            {({ formatQuery }) => renderToolbox(formatQuery)}
+          </SQLEditor>
         </div>
       </div>
-      <>
-        <Suspense fallback={null}>
-          <GenAISuggestionsDrawer
-            isOpen={isDrawerOpen}
-            onApplySuggestion={onApplySuggestion}
-            onClose={handleCloseDrawer}
-            suggestions={suggestions}
-          />
-        </Suspense>
-        <Suspense fallback={null}>
-          <GenAIExplanationDrawer
-            isOpen={isExplanationOpen}
-            onClose={handleCloseExplanation}
-            explanation={explanation}
-          />
-        </Suspense>
-      </>
+      <Suspense fallback={null}>
+        <GenAISuggestionsDrawer
+          isOpen={isDrawerOpen}
+          onApplySuggestion={onApplySuggestion}
+          onClose={handleCloseDrawer}
+          suggestions={suggestions}
+        />
+      </Suspense>
+      <Suspense fallback={null}>
+        <GenAIExplanationDrawer isOpen={isExplanationOpen} onClose={handleCloseExplanation} explanation={explanation} />
+      </Suspense>
+    </>
+  );
+
+  const renderStandaloneEditor = () => (
+    <AutoSizer>
+      {({ width, height }) => (
+        <SQLEditor
+          query={query.expression || initialQuery}
+          onChange={onEditorChange}
+          width={width}
+          height={height ? height - EDITOR_BORDER_ADJUSTMENT - toolboxMeasure.height : undefined}
+          language={EDITOR_LANGUAGE_DEFINITION}
+        >
+          {({ formatQuery }) => renderToolbox(formatQuery)}
+        </SQLEditor>
+      )}
+    </AutoSizer>
+  );
+
+  return (
+    <>
+      {renderSQLEditor()}
+      {isExpanded && (
+        <Modal
+          title={t('expressions.sql-expr.modal-title', 'SQL Editor')}
+          closeOnBackdropClick={false}
+          closeOnEscape={false}
+          className={styles.modal}
+          contentClassName={styles.modalContent}
+          isOpen={isExpanded}
+          onDismiss={() => setIsExpanded(false)}
+        >
+          {renderStandaloneEditor()}
+        </Modal>
+      )}
     </>
   );
 };
@@ -267,6 +345,14 @@ const getStyles = (theme: GrafanaTheme2) => ({
     overflow: 'auto',
     minHeight: '100px',
   }),
+  modal: css({
+    width: '95vw',
+    height: '95vh',
+  }),
+  modalContent: css({
+    height: '100%',
+    paddingTop: 0,
+  }),
   // This is NOT ideal. The alternative is to expose SQL buttons as a separate component,
   // Then consume them in ExpressionQueryEditor. This requires a lot of refactoring and
   // can be prioritized later.
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 13445a18190..646a89bb698 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -7475,6 +7475,13 @@
       "tooltip-title": "Math operator",
       "tooltip-trigger": "Expression"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "Collapse editor",
+      "tooltip-copy-query": "Copy query",
+      "tooltip-expand-editor": "Expand editor",
+      "tooltip-format-query": "Format query",
+      "tooltip-run-query": "Hit ctrl/cmd+enter to run query"
+    },
     "reduce": {
       "label-function": "Function",
       "label-input": "Input",
@@ -7491,6 +7498,8 @@
       "tooltip-s-m-h": "10s, 1m, 30m, 1h"
     },
     "sql-expr": {
+      "button-run-query": "Run query",
+      "modal-title": "SQL Editor",
       "tooltip-experimental": "SQL Expressions LLM integration is experimental. Please report any issues to the Grafana team."
     },
     "threshold": {

From f1dd6db45685c9cf11c89667e709c2c0a5f34b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amon=20Ryan?= <eamonryan@users.noreply.github.com>
Date: Wed, 13 Aug 2025 19:53:19 +0100
Subject: [PATCH 151/243] Service Accounts: Fix typo on page indicating none
 are present (#109560)

* Fix typo for empty state service accounts

* update i18n file

---------

Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com>
---
 public/app/features/serviceaccounts/ServiceAccountsListPage.tsx | 2 +-
 public/locales/en-US/grafana.json                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx b/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
index 9929f0dfe91..66dfefd41f7 100644
--- a/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
@@ -225,7 +225,7 @@ export const ServiceAccountsListPageUnconnected = ({
         {!isLoading && !noServiceAccountsCreated && serviceAccounts.length === 0 && (
           <EmptyState
             variant="not-found"
-            message={t('service-accounts.empty-state.message', 'No services accounts found')}
+            message={t('service-accounts.empty-state.message', 'No service accounts found')}
           />
         )}
         {!isLoading && noServiceAccountsCreated && (
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 646a89bb698..a6114f22e7d 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -12113,7 +12113,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Add service account",
-      "message": "No services accounts found",
+      "message": "No service accounts found",
       "more-info": "Remember, you can provide specific permissions for API access to other applications",
       "title": "You haven't created any service accounts yet"
     }

From d84408e52d0fcd2a916f048561fa7fd51941f936 Mon Sep 17 00:00:00 2001
From: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com>
Date: Wed, 13 Aug 2025 13:51:19 -0600
Subject: [PATCH 152/243] Dashboard Migrations: v19 - panel links (#109495)

* migrate to v19

* clean up

* apply feedback
---
 .../pkg/migration/schemaversion/migrations.go |   3 +-
 .../pkg/migration/schemaversion/v19.go        | 166 ++++++++++
 .../pkg/migration/schemaversion/v19_test.go   | 292 ++++++++++++++++++
 .../testdata/input/v19.panel_links.json       |  73 +++++
 .../testdata/output/v19.panel_links.json      | 206 ++++++++++++
 5 files changed, 739 insertions(+), 1 deletion(-)
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v19.go
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v19_test.go
 create mode 100644 apps/dashboard/pkg/migration/testdata/input/v19.panel_links.json
 create mode 100644 apps/dashboard/pkg/migration/testdata/output/v19.panel_links.json

diff --git a/apps/dashboard/pkg/migration/schemaversion/migrations.go b/apps/dashboard/pkg/migration/schemaversion/migrations.go
index 1f291cb97fb..aa2039aebd2 100644
--- a/apps/dashboard/pkg/migration/schemaversion/migrations.go
+++ b/apps/dashboard/pkg/migration/schemaversion/migrations.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	MIN_VERSION    = 19
+	MIN_VERSION    = 18
 	LATEST_VERSION = 41
 )
 
@@ -38,6 +38,7 @@ type PanelPluginInfoProvider interface {
 
 func GetMigrations(dsInfoProvider DataSourceInfoProvider, panelProvider PanelPluginInfoProvider) map[int]SchemaVersionMigrationFunc {
 	return map[int]SchemaVersionMigrationFunc{
+		19: V19,
 		20: V20,
 		21: V21,
 		22: V22,
diff --git a/apps/dashboard/pkg/migration/schemaversion/v19.go b/apps/dashboard/pkg/migration/schemaversion/v19.go
new file mode 100644
index 00000000000..b9ca23a131b
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v19.go
@@ -0,0 +1,166 @@
+package schemaversion
+
+import (
+	"regexp"
+	"strings"
+)
+
+// V19 migrates panel links to ensure they have proper URL structure and handle legacy properties.
+// This migration converts legacy panel link properties to the new URL-based format.
+//
+// Example before migration:
+//
+//	"panels": [
+//	  {
+//	    "links": [
+//	      {
+//	        "dashboard": "my dashboard",
+//	        "keepTime": true,
+//	        "includeVars": true,
+//	        "params": "customParam"
+//	      }
+//	    ]
+//	  }
+//	]
+//
+// Example after migration:
+//
+//	"panels": [
+//	  {
+//	    "links": [
+//	      {
+//	        "url": "dashboard/db/my-dashboard?$__keepTime&$__includeVars&customParam",
+//	        "title": "",
+//	        "targetBlank": false
+//	      }
+//	    ]
+//	  }
+//	]
+func V19(dashboard map[string]interface{}) error {
+	dashboard["schemaVersion"] = 19
+
+	panels, ok := dashboard["panels"].([]interface{})
+	if !ok {
+		return nil
+	}
+
+	for _, p := range panels {
+		panel, ok := p.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		links, ok := panel["links"].([]interface{})
+		if !ok {
+			continue
+		}
+
+		panel["links"] = upgradePanelLinks(links)
+	}
+
+	return nil
+}
+
+func upgradePanelLinks(links []interface{}) []interface{} {
+	if len(links) == 0 {
+		return links
+	}
+
+	result := []interface{}{}
+	for _, link := range links {
+		linkMap, ok := link.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		result = append(result, upgradePanelLink(linkMap))
+	}
+
+	return result
+}
+
+func upgradePanelLink(link map[string]interface{}) map[string]interface{} {
+	url := buildPanelLinkURL(link)
+
+	result := map[string]interface{}{
+		"url":         url,
+		"title":       getStringValue(link, "title"),
+		"targetBlank": getBoolValue(link, "targetBlank"),
+	}
+
+	return result
+}
+
+// buildPanelLinkURL builds the URL for a panel link based on legacy properties
+func buildPanelLinkURL(link map[string]interface{}) string {
+	var url string
+
+	// Check for existing URL first
+	if existingURL, ok := link["url"].(string); ok && existingURL != "" {
+		url = existingURL
+	} else if dashboard, ok := link["dashboard"].(string); ok && dashboard != "" {
+		// Convert dashboard name to slugified URL
+		url = "dashboard/db/" + slugifyForURL(dashboard)
+	} else if dashUri, ok := link["dashUri"].(string); ok && dashUri != "" {
+		url = "dashboard/" + dashUri
+	} else {
+		// Default fallback
+		url = "/"
+	}
+
+	// Add query parameters
+	params := []string{}
+
+	if getBoolValue(link, "keepTime") {
+		params = append(params, "$__url_time_range")
+	}
+
+	if getBoolValue(link, "includeVars") {
+		params = append(params, "$__all_variables")
+	}
+
+	if customParams, ok := link["params"].(string); ok && customParams != "" {
+		params = append(params, customParams)
+	}
+
+	// Append parameters to URL
+	paramUsed := false
+	for _, param := range params {
+		if param != "" {
+			if paramUsed {
+				url += "&"
+			} else {
+				url += "?"
+				paramUsed = true
+			}
+			url += param
+		}
+	}
+
+	return url
+}
+
+var reNonWordOrSpace = regexp.MustCompile(`[^a-z0-9_ ]+`)
+var reSpaces = regexp.MustCompile(` +`)
+
+// slugifyForURL converts a dashboard name to a URL-friendly slug
+func slugifyForURL(name string) string {
+	name = strings.ToLower(name)
+	name = reNonWordOrSpace.ReplaceAllString(name, "")
+	name = reSpaces.ReplaceAllString(name, "-")
+	return name
+}
+
+func getStringValue(m map[string]interface{}, key string) string {
+	if v, ok := m[key].(string); ok {
+		return v
+	}
+	return ""
+}
+
+func getBoolValue(m map[string]interface{}, key string) bool {
+	if v, ok := m[key].(bool); ok {
+		return v
+	}
+	return false
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/v19_test.go b/apps/dashboard/pkg/migration/schemaversion/v19_test.go
new file mode 100644
index 00000000000..e2f4b5244ab
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v19_test.go
@@ -0,0 +1,292 @@
+package schemaversion_test
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
+)
+
+func TestV19(t *testing.T) {
+	tests := []migrationTestCase{
+		{
+			name: "panel with legacy dashboard link gets upgraded to URL format",
+			input: map[string]interface{}{
+				"title":         "V19 Panel Links Migration Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"dashboard": "my dashboard",
+								"title":     "Dashboard Link",
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V19 Panel Links Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"url":         "dashboard/db/my-dashboard",
+								"title":       "Dashboard Link",
+								"targetBlank": false,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with legacy dashUri link gets upgraded to URL format",
+			input: map[string]interface{}{
+				"title":         "V19 DashUri Links Migration Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"dashUri": "my-dashboard-uid",
+								"title":   "DashUri Link",
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V19 DashUri Links Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"url":         "dashboard/my-dashboard-uid",
+								"title":       "DashUri Link",
+								"targetBlank": false,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with keepTime flag gets upgraded with keepTime parameter",
+			input: map[string]interface{}{
+				"title":         "V19 KeepTime Links Migration Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"url":      "http://example.com",
+								"keepTime": true,
+								"title":    "KeepTime Link",
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V19 KeepTime Links Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"url":         "http://example.com?$__url_time_range",
+								"title":       "KeepTime Link",
+								"targetBlank": false,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with includeVars flag gets upgraded with includeVars parameter",
+			input: map[string]interface{}{
+				"title":         "V19 IncludeVars Links Migration Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"url":         "http://example.com",
+								"includeVars": true,
+								"title":       "IncludeVars Link",
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V19 IncludeVars Links Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"url":         "http://example.com?$__all_variables",
+								"title":       "IncludeVars Link",
+								"targetBlank": false,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with custom params gets upgraded with params in URL",
+			input: map[string]interface{}{
+				"title":         "V19 Custom Params Links Migration Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"url":    "http://example.com",
+								"params": "customParam=value",
+								"title":  "Custom Params Link",
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V19 Custom Params Links Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"url":         "http://example.com?customParam=value",
+								"title":       "Custom Params Link",
+								"targetBlank": false,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with multiple flags and params gets upgraded correctly",
+			input: map[string]interface{}{
+				"title":         "V19 Complex Links Migration Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"dashboard":   "my dashboard",
+								"keepTime":    true,
+								"includeVars": true,
+								"params":      "customParam=value",
+								"title":       "Complex Link",
+								"targetBlank": true,
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V19 Complex Links Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"url":         "dashboard/db/my-dashboard?$__url_time_range&$__all_variables&customParam=value",
+								"title":       "Complex Link",
+								"targetBlank": true,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with existing URL and no legacy properties remains unchanged",
+			input: map[string]interface{}{
+				"title":         "V19 Existing URL Links Migration Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"url":         "http://example.com",
+								"title":       "Existing URL Link",
+								"targetBlank": false,
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V19 Existing URL Links Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+						"links": []interface{}{
+							map[string]interface{}{
+								"url":         "http://example.com",
+								"title":       "Existing URL Link",
+								"targetBlank": false,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "panel with no links remains unchanged",
+			input: map[string]interface{}{
+				"title":         "V19 No Links Migration Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V19 No Links Migration Test Dashboard",
+				"schemaVersion": 19,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id": 1,
+					},
+				},
+			},
+		},
+		{
+			name: "dashboard with no panels remains unchanged",
+			input: map[string]interface{}{
+				"title":         "V19 No Panels Migration Test Dashboard",
+				"schemaVersion": 18,
+			},
+			expected: map[string]interface{}{
+				"title":         "V19 No Panels Migration Test Dashboard",
+				"schemaVersion": 19,
+			},
+		},
+	}
+
+	runMigrationTests(t, tests, schemaversion.V19)
+}
diff --git a/apps/dashboard/pkg/migration/testdata/input/v19.panel_links.json b/apps/dashboard/pkg/migration/testdata/input/v19.panel_links.json
new file mode 100644
index 00000000000..3ddef30484b
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/input/v19.panel_links.json
@@ -0,0 +1,73 @@
+{
+  "title": "V19 Panel Links Migration Test Dashboard",
+  "schemaVersion": 18,
+  "panels": [
+    {
+      "id": 1,
+      "type": "graph",
+      "title": "Panel with legacy dashboard link",
+      "links": [
+        {
+          "dashboard": "my dashboard",
+          "title": "Dashboard Link",
+          "keepTime": true
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "type": "stat",
+      "title": "Panel with dashUri link",
+      "links": [
+        {
+          "dashUri": "my-dashboard-uid",
+          "title": "DashUri Link",
+          "includeVars": true
+        }
+      ]
+    },
+    {
+      "id": 3,
+      "type": "table",
+      "title": "Panel with custom params",
+      "links": [
+        {
+          "url": "http://example.com",
+          "params": "customParam=value",
+          "title": "Custom Params Link"
+        }
+      ]
+    },
+    {
+      "id": 4,
+      "type": "timeseries",
+      "title": "Panel with complex link",
+      "links": [
+        {
+          "dashboard": "complex dashboard",
+          "keepTime": true,
+          "includeVars": true,
+          "params": "param1=value1&param2=value2",
+          "title": "Complex Link",
+          "targetBlank": true
+        }
+      ]
+    },
+    {
+      "id": 5,
+      "type": "gauge",
+      "title": "Panel with existing URL",
+      "links": [
+        {
+          "url": "http://existing-url.com",
+          "title": "Existing URL Link"
+        }
+      ]
+    },
+    {
+      "id": 6,
+      "type": "singlestat",
+      "title": "Panel with no links"
+    }
+  ]
+}
diff --git a/apps/dashboard/pkg/migration/testdata/output/v19.panel_links.json b/apps/dashboard/pkg/migration/testdata/output/v19.panel_links.json
new file mode 100644
index 00000000000..e423c8f6c13
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/output/v19.panel_links.json
@@ -0,0 +1,206 @@
+{
+  "panels": [
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 1,
+      "links": [
+        {
+          "targetBlank": false,
+          "title": "Dashboard Link",
+          "url": "dashboard/db/my-dashboard?$__url_time_range"
+        }
+      ],
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with legacy dashboard link",
+      "type": "graph"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 2,
+      "links": [
+        {
+          "targetBlank": false,
+          "title": "DashUri Link",
+          "url": "dashboard/my-dashboard-uid?$__all_variables"
+        }
+      ],
+      "options": {
+        "justifyMode": "auto",
+        "percentChangeColorMode": "standard",
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with dashUri link",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 3,
+      "links": [
+        {
+          "targetBlank": false,
+          "title": "Custom Params Link",
+          "url": "http://example.com?customParam=value"
+        }
+      ],
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with custom params",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 4,
+      "links": [
+        {
+          "targetBlank": true,
+          "title": "Complex Link",
+          "url": "dashboard/db/complex-dashboard?$__url_time_range\u0026$__all_variables\u0026param1=value1\u0026param2=value2"
+        }
+      ],
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with complex link",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 5,
+      "links": [
+        {
+          "targetBlank": false,
+          "title": "Existing URL Link",
+          "url": "http://existing-url.com"
+        }
+      ],
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with existing URL",
+      "type": "gauge"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "id": 6,
+      "options": {
+        "colorMode": "none",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with no links",
+      "type": "stat"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 41,
+  "title": "V19 Panel Links Migration Test Dashboard"
+}
\ No newline at end of file

From c7e1a3d0fdf34d3d36bf23b134c7ce8e85ec295f Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Wed, 13 Aug 2025 20:51:50 +0100
Subject: [PATCH 153/243] Drawer: Truncate Drawer title to just one line
 (#109540)

* Drawer: Truncate Drawer title to just one line

* restore prev subtitle
---
 .../src/components/Drawer/Drawer.story.tsx    | 84 +++++++++++++++++++
 .../src/components/Drawer/Drawer.tsx          | 12 +--
 2 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx
index 9cb4e548919..b59b7bf1a8d 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx
@@ -140,6 +140,90 @@ LongContent.args = {
   title: 'Drawer title with long content',
 };
 
+export const LongTitle: StoryFn<typeof Drawer> = (args) => {
+  const [isOpen, setIsOpen] = useState(false);
+  return (
+    <>
+      <Button onClick={() => setIsOpen(true)}>Open drawer</Button>
+      {isOpen && (
+        <Drawer {...args} onClose={() => setIsOpen(false)}>
+          <p>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Iaculis nunc sed augue lacus viverra vitae. Malesuada pellentesque elit eget gravida
+            cum sociis. Pretium vulputate sapien nec sagittis aliquam malesuada bibendum arcu. Cras adipiscing enim eu
+            turpis egestas. Ut lectus arcu bibendum at varius. Nulla pellentesque dignissim enim sit amet venenatis
+            urna. Tempus urna et pharetra pharetra massa massa ultricies mi quis. Vitae congue mauris rhoncus aenean.
+            Enim ut tellus elementum sagittis vitae et.
+          </p>
+          <p>
+            Arcu non odio euismod lacinia at quis risus sed vulputate. Sit amet consectetur adipiscing elit ut. Dictum
+            fusce ut placerat orci nulla pellentesque dignissim. Lectus nulla at volutpat diam ut venenatis tellus. Sed
+            cras ornare arcu dui. Eget mauris pharetra et ultrices neque ornare aenean euismod. Mi quis hendrerit dolor
+            magna. Commodo viverra maecenas accumsan lacus vel facilisis. Eget mi proin sed libero enim sed. Magna ac
+            placerat vestibulum lectus mauris ultrices eros in. Mattis nunc sed blandit libero volutpat.
+          </p>
+          <p>
+            Cursus in hac habitasse platea dictumst quisque sagittis purus. Viverra adipiscing at in tellus. Semper eget
+            duis at tellus at urna condimentum. Egestas fringilla phasellus faucibus scelerisque eleifend. Sem nulla
+            pharetra diam sit amet nisl. Ut ornare lectus sit amet est placerat in egestas erat. Id neque aliquam
+            vestibulum morbi blandit cursus risus. In iaculis nunc sed augue. Eu volutpat odio facilisis mauris sit.
+            Quisque egestas diam in arcu cursus euismod. At quis risus sed vulputate odio ut enim blandit volutpat.
+            Cursus risus at ultrices mi tempus imperdiet nulla malesuada. Sed adipiscing diam donec adipiscing tristique
+            risus nec. Id neque aliquam vestibulum morbi. Pretium nibh ipsum consequat nisl vel pretium lectus quam.
+            Platea dictumst quisque sagittis purus sit. Nascetur ridiculus mus mauris vitae ultricies leo.
+          </p>
+          <p>
+            Cursus in hac habitasse platea dictumst quisque sagittis purus. Viverra adipiscing at in tellus. Semper eget
+            duis at tellus at urna condimentum. Egestas fringilla phasellus faucibus scelerisque eleifend. Sem nulla
+            pharetra diam sit amet nisl. Ut ornare lectus sit amet est placerat in egestas erat. Id neque aliquam
+            vestibulum morbi blandit cursus risus. In iaculis nunc sed augue. Eu volutpat odio facilisis mauris sit.
+            Quisque egestas diam in arcu cursus euismod. At quis risus sed vulputate odio ut enim blandit volutpat.
+            Cursus risus at ultrices mi tempus imperdiet nulla malesuada. Sed adipiscing diam donec adipiscing tristique
+            risus nec. Id neque aliquam vestibulum morbi. Pretium nibh ipsum consequat nisl vel pretium lectus quam.
+            Platea dictumst quisque sagittis purus sit. Nascetur ridiculus mus mauris vitae ultricies leo.
+          </p>
+          <p>
+            Cursus in hac habitasse platea dictumst quisque sagittis purus. Viverra adipiscing at in tellus. Semper eget
+            duis at tellus at urna condimentum. Egestas fringilla phasellus faucibus scelerisque eleifend. Sem nulla
+            pharetra diam sit amet nisl. Ut ornare lectus sit amet est placerat in egestas erat. Id neque aliquam
+            vestibulum morbi blandit cursus risus. In iaculis nunc sed augue. Eu volutpat odio facilisis mauris sit.
+            Quisque egestas diam in arcu cursus euismod. At quis risus sed vulputate odio ut enim blandit volutpat.
+            Cursus risus at ultrices mi tempus imperdiet nulla malesuada. Sed adipiscing diam donec adipiscing tristique
+            risus nec. Id neque aliquam vestibulum morbi. Pretium nibh ipsum consequat nisl vel pretium lectus quam.
+            Platea dictumst quisque sagittis purus sit. Nascetur ridiculus mus mauris vitae ultricies leo.
+          </p>
+          <p>
+            Cursus in hac habitasse platea dictumst quisque sagittis purus. Viverra adipiscing at in tellus. Semper eget
+            duis at tellus at urna condimentum. Egestas fringilla phasellus faucibus scelerisque eleifend. Sem nulla
+            pharetra diam sit amet nisl. Ut ornare lectus sit amet est placerat in egestas erat. Id neque aliquam
+            vestibulum morbi blandit cursus risus. In iaculis nunc sed augue. Eu volutpat odio facilisis mauris sit.
+            Quisque egestas diam in arcu cursus euismod. At quis risus sed vulputate odio ut enim blandit volutpat.
+            Cursus risus at ultrices mi tempus imperdiet nulla malesuada. Sed adipiscing diam donec adipiscing tristique
+            risus nec. Id neque aliquam vestibulum morbi. Pretium nibh ipsum consequat nisl vel pretium lectus quam.
+            Platea dictumst quisque sagittis purus sit. Nascetur ridiculus mus mauris vitae ultricies leo.
+          </p>
+          <p>
+            Cursus in hac habitasse platea dictumst quisque sagittis purus. Viverra adipiscing at in tellus. Semper eget
+            duis at tellus at urna condimentum. Egestas fringilla phasellus faucibus scelerisque eleifend. Sem nulla
+            pharetra diam sit amet nisl. Ut ornare lectus sit amet est placerat in egestas erat. Id neque aliquam
+            vestibulum morbi blandit cursus risus. In iaculis nunc sed augue. Eu volutpat odio facilisis mauris sit.
+            Quisque egestas diam in arcu cursus euismod. At quis risus sed vulputate odio ut enim blandit volutpat.
+            Cursus risus at ultrices mi tempus imperdiet nulla malesuada. Sed adipiscing diam donec adipiscing tristique
+            risus nec. Id neque aliquam vestibulum morbi. Pretium nibh ipsum consequat nisl vel pretium lectus quam.
+            Platea dictumst quisque sagittis purus sit. Nascetur ridiculus mus mauris vitae ultricies leo.
+          </p>
+        </Drawer>
+      )}
+    </>
+  );
+};
+LongTitle.args = {
+  title: `This is a very long title! Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
+          incididunt ut labore et dolore magna aliqua. Cursus in hac habitasse platea dictumst quisque sagittis
+          purus. Viverra adipiscing at in tellus. Semper eget duis at tellus at urna condimentum. Egestas fringilla
+          phasellus faucibus scelerisque eleifend. Sem nulla`,
+};
+
 export const WithTabs: StoryFn<typeof Drawer> = (args) => {
   const [isOpen, setIsOpen] = useState(false);
   const [activeTab, setActiveTab] = useState('options');
diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
index 070bef4372e..34a59be9775 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
@@ -13,6 +13,7 @@ import { t } from '@grafana/i18n';
 import { useStyles2 } from '../../themes/ThemeContext';
 import { getDragStyles } from '../DragHandle/DragHandle';
 import { IconButton } from '../IconButton/IconButton';
+import { Stack } from '../Layout/Stack/Stack';
 import { ScrollContainer } from '../ScrollContainer/ScrollContainer';
 import { Text } from '../Text/Text';
 
@@ -154,8 +155,8 @@ export function Drawer({
               />
             </div>
             {typeof title === 'string' ? (
-              <div className={styles.titleWrapper}>
-                <Text element="h3" {...titleProps}>
+              <Stack direction="column">
+                <Text element="h3" truncate {...titleProps}>
                   {title}
                 </Text>
                 {subtitle && (
@@ -163,7 +164,7 @@ export function Drawer({
                     {subtitle}
                   </div>
                 )}
-              </div>
+              </Stack>
             ) : (
               title
             )}
@@ -325,14 +326,9 @@ const getStyles = (theme: GrafanaTheme2) => {
       right: theme.spacing(1),
       top: theme.spacing(1),
     }),
-    titleWrapper: css({
-      label: 'drawer-title',
-      overflowWrap: 'break-word',
-    }),
     subtitle: css({
       label: 'drawer-subtitle',
       color: theme.colors.text.secondary,
-      paddingTop: theme.spacing(1),
     }),
     content: css({
       padding: theme.spacing(theme.components.drawer?.padding ?? 2),

From df70198038de3921a482c025e76e1651bbcbd4c4 Mon Sep 17 00:00:00 2001
From: Kristina <kristina.durivage@grafana.com>
Date: Wed, 13 Aug 2025 15:07:53 -0500
Subject: [PATCH 154/243] Transformations: Group by should not perform
 calculation if operation is not set to calculate (#109430)

Do not perform calculation if operation is not Calculate
---
 .../transformers/groupBy.test.ts              | 159 ++++++++----------
 .../transformations/transformers/groupBy.ts   |   6 +-
 2 files changed, 74 insertions(+), 91 deletions(-)

diff --git a/packages/grafana-data/src/transformations/transformers/groupBy.test.ts b/packages/grafana-data/src/transformations/transformers/groupBy.test.ts
index 169fbd6d470..89bcb6ef7b3 100644
--- a/packages/grafana-data/src/transformations/transformers/groupBy.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupBy.test.ts
@@ -8,6 +8,29 @@ import { transformDataFrame } from '../transformDataFrame';
 import { GroupByOperationID, groupByTransformer, GroupByTransformerOptions } from './groupBy';
 import { DataTransformerID } from './ids';
 
+// returns a simple group by / reducer pair
+const getSimpleGroupByConfig = (
+  groupName: string,
+  valuesName: string,
+  reducer: ReducerID
+): DataTransformerConfig<GroupByTransformerOptions> => {
+  return {
+    id: DataTransformerID.groupBy,
+    options: {
+      fields: {
+        [groupName]: {
+          operation: GroupByOperationID.groupBy,
+          aggregations: [],
+        },
+        [valuesName]: {
+          operation: GroupByOperationID.aggregate,
+          aggregations: [reducer],
+        },
+      },
+    },
+  };
+};
+
 describe('GroupBy transformer', () => {
   beforeAll(() => {
     mockTransformationsRegistry([groupByTransformer]);
@@ -88,21 +111,7 @@ describe('GroupBy transformer', () => {
       ],
     });
 
-    const cfg: DataTransformerConfig<GroupByTransformerOptions> = {
-      id: DataTransformerID.groupBy,
-      options: {
-        fields: {
-          message: {
-            operation: GroupByOperationID.groupBy,
-            aggregations: [],
-          },
-          values: {
-            operation: GroupByOperationID.aggregate,
-            aggregations: [ReducerID.sum],
-          },
-        },
-      },
-    };
+    const cfg = getSimpleGroupByConfig('message', 'values', ReducerID.sum);
 
     await expect(transformDataFrame([cfg], [testSeries])).toEmitValuesWith((received) => {
       const result = received[0];
@@ -208,21 +217,7 @@ describe('GroupBy transformer', () => {
       }),
     ];
 
-    const cfg: DataTransformerConfig<GroupByTransformerOptions> = {
-      id: DataTransformerID.groupBy,
-      options: {
-        fields: {
-          message: {
-            operation: GroupByOperationID.groupBy,
-            aggregations: [],
-          },
-          values: {
-            operation: GroupByOperationID.aggregate,
-            aggregations: [ReducerID.sum],
-          },
-        },
-      },
-    };
+    const cfg = getSimpleGroupByConfig('message', 'values', ReducerID.sum);
 
     await expect(transformDataFrame([cfg], testSeries)).toEmitValuesWith((received) => {
       const result = received[0];
@@ -270,21 +265,7 @@ describe('GroupBy transformer', () => {
       ],
     });
 
-    const cfg: DataTransformerConfig<GroupByTransformerOptions> = {
-      id: DataTransformerID.groupBy,
-      options: {
-        fields: {
-          message: {
-            operation: GroupByOperationID.groupBy,
-            aggregations: [],
-          },
-          values: {
-            operation: GroupByOperationID.aggregate,
-            aggregations: [ReducerID.sum],
-          },
-        },
-      },
-    };
+    const cfg = getSimpleGroupByConfig('message', 'values', ReducerID.sum);
 
     await expect(transformDataFrame([cfg], [testSeries])).toEmitValuesWith((received) => {
       const result = received[0];
@@ -378,21 +359,7 @@ describe('GroupBy transformer', () => {
       ],
     });
 
-    const cfg: DataTransformerConfig<GroupByTransformerOptions> = {
-      id: DataTransformerID.groupBy,
-      options: {
-        fields: {
-          user: {
-            operation: GroupByOperationID.groupBy,
-            aggregations: [],
-          },
-          time: {
-            operation: GroupByOperationID.aggregate,
-            aggregations: [ReducerID.max],
-          },
-        },
-      },
-    };
+    const cfg = getSimpleGroupByConfig('user', 'time', ReducerID.max);
 
     await expect(transformDataFrame([cfg], [testSeries])).toEmitValuesWith((received) => {
       const result = received[0];
@@ -425,21 +392,7 @@ describe('GroupBy transformer', () => {
       ],
     });
 
-    const cfg: DataTransformerConfig<GroupByTransformerOptions> = {
-      id: DataTransformerID.groupBy,
-      options: {
-        fields: {
-          user: {
-            operation: GroupByOperationID.groupBy,
-            aggregations: [],
-          },
-          time: {
-            operation: GroupByOperationID.aggregate,
-            aggregations: [ReducerID.max],
-          },
-        },
-      },
-    };
+    const cfg = getSimpleGroupByConfig('user', 'time', ReducerID.max);
 
     await expect(transformDataFrame([cfg], [testSeries])).toEmitValuesWith((received) => {
       const result = received[0];
@@ -477,21 +430,7 @@ describe('GroupBy transformer', () => {
       ],
     });
 
-    const cfg: DataTransformerConfig<GroupByTransformerOptions> = {
-      id: DataTransformerID.groupBy,
-      options: {
-        fields: {
-          message: {
-            operation: GroupByOperationID.groupBy,
-            aggregations: [],
-          },
-          values: {
-            operation: GroupByOperationID.aggregate,
-            aggregations: [ReducerID.sum],
-          },
-        },
-      },
-    };
+    const cfg = getSimpleGroupByConfig('message', 'values', ReducerID.sum);
 
     await expect(transformDataFrame([cfg], [testSeries])).toEmitValuesWith((received) => {
       const result = received[0];
@@ -513,4 +452,44 @@ describe('GroupBy transformer', () => {
       expect(result[0].fields).toEqual(expected);
     });
   });
+
+  it('should not aggregate fields without an operation', async () => {
+    const testSeries = toDataFrame({
+      name: 'A',
+      fields: [
+        { name: 'category', type: FieldType.string, values: ['A', 'A', 'B', 'B'], config: {} },
+        { name: 'values', type: FieldType.number, values: [1, 2, 3, 4], config: {} },
+      ],
+    });
+
+    // when the operation field is cleared the aggregations are kept in state in case they are needed, but they should not be used by the transformation
+    let cfg = {
+      id: DataTransformerID.groupBy,
+      options: {
+        fields: {
+          category: {
+            operation: GroupByOperationID.groupBy,
+            aggregations: [],
+          },
+          values: {
+            aggregations: [ReducerID.sum],
+            operation: null,
+          },
+        },
+      },
+    };
+
+    await expect(transformDataFrame([cfg], [testSeries])).toEmitValuesWith((received) => {
+      const result = received[0];
+      const expected: Field[] = [
+        {
+          name: 'category',
+          type: FieldType.string,
+          values: ['A', 'B'],
+          config: {},
+        },
+      ];
+      expect(result[0].fields).toEqual(expected);
+    });
+  });
 });
diff --git a/packages/grafana-data/src/transformations/transformers/groupBy.ts b/packages/grafana-data/src/transformations/transformers/groupBy.ts
index f6eb212a138..d76b34d9475 100644
--- a/packages/grafana-data/src/transformations/transformers/groupBy.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupBy.ts
@@ -146,7 +146,11 @@ export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions>
 
 const shouldCalculateField = (field: Field, options: GroupByTransformerOptions): boolean => {
   const fieldName = getFieldDisplayName(field);
-  return Array.isArray(options?.fields[fieldName]?.aggregations) && options?.fields[fieldName].aggregations.length > 0;
+  return (
+    options?.fields[fieldName]?.operation === GroupByOperationID.aggregate &&
+    Array.isArray(options?.fields[fieldName]?.aggregations) &&
+    options?.fields[fieldName].aggregations.length > 0
+  );
 };
 
 /**

From 4a3b8a567f38e11c3737b37ffd8e16a0f534e87d Mon Sep 17 00:00:00 2001
From: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com>
Date: Wed, 13 Aug 2025 15:01:50 -0600
Subject: [PATCH 155/243] Dashboard Migrations: v18 - gauge options (#109496)

* migrate to v19

* migrate to v18

* Update v19.go
---
 .../pkg/migration/schemaversion/migrations.go |   3 +-
 .../pkg/migration/schemaversion/v18.go        | 117 ++++++++++
 .../pkg/migration/schemaversion/v18_test.go   | 219 ++++++++++++++++++
 .../testdata/input/v18.gauge_options.json     |  66 ++++++
 .../testdata/output/v18.gauge_options.json    | 162 +++++++++++++
 5 files changed, 566 insertions(+), 1 deletion(-)
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v18.go
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v18_test.go
 create mode 100644 apps/dashboard/pkg/migration/testdata/input/v18.gauge_options.json
 create mode 100644 apps/dashboard/pkg/migration/testdata/output/v18.gauge_options.json

diff --git a/apps/dashboard/pkg/migration/schemaversion/migrations.go b/apps/dashboard/pkg/migration/schemaversion/migrations.go
index aa2039aebd2..6b9395b2965 100644
--- a/apps/dashboard/pkg/migration/schemaversion/migrations.go
+++ b/apps/dashboard/pkg/migration/schemaversion/migrations.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	MIN_VERSION    = 18
+	MIN_VERSION    = 17
 	LATEST_VERSION = 41
 )
 
@@ -38,6 +38,7 @@ type PanelPluginInfoProvider interface {
 
 func GetMigrations(dsInfoProvider DataSourceInfoProvider, panelProvider PanelPluginInfoProvider) map[int]SchemaVersionMigrationFunc {
 	return map[int]SchemaVersionMigrationFunc{
+		18: V18,
 		19: V19,
 		20: V20,
 		21: V21,
diff --git a/apps/dashboard/pkg/migration/schemaversion/v18.go b/apps/dashboard/pkg/migration/schemaversion/v18.go
new file mode 100644
index 00000000000..275c1123fb5
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v18.go
@@ -0,0 +1,117 @@
+package schemaversion
+
+// V18 migrates gauge panel options from the legacy `options-gauge` format to the new `options` format.
+// This migration restructures gauge panel configuration to use the modern options structure with valueOptions.
+//
+// Example before migration:
+//
+//	"panels": [
+//	  {
+//	    "type": "gauge",
+//	    "options-gauge": {
+//	      "unit": "ms",
+//	      "stat": "last",
+//	      "decimals": 2,
+//	      "prefix": "Value: ",
+//	      "suffix": " ms",
+//	      "thresholds": [
+//	        { "color": "green", "value": 0 },
+//	        { "color": "red", "value": 100 }
+//	      ]
+//	    }
+//	  }
+//	]
+//
+// Example after migration:
+//
+//	"panels": [
+//	  {
+//	    "type": "gauge",
+//	    "options": {
+//	      "valueOptions": {
+//	        "unit": "ms",
+//	        "stat": "last",
+//	        "decimals": 2,
+//	        "prefix": "Value: ",
+//	        "suffix": " ms"
+//	      },
+//	      "thresholds": [
+//	        { "color": "red", "value": 100 },
+//	        { "color": "green", "value": 0 }
+//	      ]
+//	    }
+//	  }
+//	]
+func V18(dashboard map[string]interface{}) error {
+	dashboard["schemaVersion"] = 18
+
+	panels, ok := dashboard["panels"].([]interface{})
+	if !ok {
+		return nil
+	}
+
+	for _, p := range panels {
+		panel, ok := p.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		migrateGaugePanelOptions(panel)
+	}
+
+	return nil
+}
+
+func migrateGaugePanelOptions(panel map[string]interface{}) {
+	optionsGauge, hasOptionsGauge := panel["options-gauge"].(map[string]interface{})
+	if !hasOptionsGauge {
+		return
+	}
+
+	options := map[string]interface{}{}
+
+	valueOptions := map[string]interface{}{}
+	if unit, ok := optionsGauge["unit"]; ok {
+		valueOptions["unit"] = unit
+	}
+	if stat, ok := optionsGauge["stat"]; ok {
+		valueOptions["stat"] = stat
+	}
+	if decimals, ok := optionsGauge["decimals"]; ok {
+		valueOptions["decimals"] = decimals
+	}
+	if prefix, ok := optionsGauge["prefix"]; ok {
+		valueOptions["prefix"] = prefix
+	}
+	if suffix, ok := optionsGauge["suffix"]; ok {
+		valueOptions["suffix"] = suffix
+	}
+
+	options["valueOptions"] = valueOptions
+
+	if thresholds, ok := optionsGauge["thresholds"].([]interface{}); ok && len(thresholds) > 0 {
+		reversedThresholds := make([]interface{}, len(thresholds))
+		for i, threshold := range thresholds {
+			reversedThresholds[len(thresholds)-1-i] = threshold
+		}
+		options["thresholds"] = reversedThresholds
+	}
+
+	// Copy any other properties from options-gauge to options
+	for key, value := range optionsGauge {
+		// Skip properties that were moved to valueOptions or are being deleted
+		if key == "options" || key == "unit" || key == "stat" || key == "decimals" || key == "prefix" || key == "suffix" || key == "thresholds" {
+			continue
+		}
+		options[key] = value
+	}
+
+	panel["options"] = options
+	delete(panel, "options-gauge")
+
+	// Clean up options.options property if it exists
+	// This options prop was due to a bug
+	if panelOptions, ok := panel["options"].(map[string]interface{}); ok {
+		delete(panelOptions, "options")
+	}
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/v18_test.go b/apps/dashboard/pkg/migration/schemaversion/v18_test.go
new file mode 100644
index 00000000000..94fc93f30d5
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v18_test.go
@@ -0,0 +1,219 @@
+package schemaversion_test
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
+)
+
+func TestV18(t *testing.T) {
+	tests := []migrationTestCase{
+		{
+			name: "gauge panel with legacy options-gauge gets migrated to new options format",
+			input: map[string]interface{}{
+				"title":         "V18 Gauge Options Migration Test Dashboard",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    1,
+						"type":  "gauge",
+						"title": "Gauge Panel",
+						"options-gauge": map[string]interface{}{
+							"unit":     "ms",
+							"stat":     "last",
+							"decimals": 2,
+							"prefix":   "Value: ",
+							"suffix":   " ms",
+							"thresholds": []interface{}{
+								map[string]interface{}{"color": "green", "value": 0},
+								map[string]interface{}{"color": "red", "value": 100},
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V18 Gauge Options Migration Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    1,
+						"type":  "gauge",
+						"title": "Gauge Panel",
+						"options": map[string]interface{}{
+							"valueOptions": map[string]interface{}{
+								"unit":     "ms",
+								"stat":     "last",
+								"decimals": 2,
+								"prefix":   "Value: ",
+								"suffix":   " ms",
+							},
+							"thresholds": []interface{}{
+								map[string]interface{}{"color": "red", "value": 100},
+								map[string]interface{}{"color": "green", "value": 0},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "gauge panel with only some gauge options gets migrated correctly",
+			input: map[string]interface{}{
+				"title":         "V18 Partial Gauge Options Migration Test Dashboard",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    1,
+						"type":  "gauge",
+						"title": "Partial Gauge Panel",
+						"options-gauge": map[string]interface{}{
+							"unit":     "percent",
+							"decimals": 1,
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V18 Partial Gauge Options Migration Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    1,
+						"type":  "gauge",
+						"title": "Partial Gauge Panel",
+						"options": map[string]interface{}{
+							"valueOptions": map[string]interface{}{
+								"unit":     "percent",
+								"decimals": 1,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "gauge panel with buggy options property gets cleaned up",
+			input: map[string]interface{}{
+				"title":         "V18 Buggy Options Cleanup Test Dashboard",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    1,
+						"type":  "gauge",
+						"title": "Buggy Gauge Panel",
+						"options-gauge": map[string]interface{}{
+							"unit":     "bytes",
+							"options":  "this should be deleted",
+							"stat":     "avg",
+							"decimals": 0,
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V18 Buggy Options Cleanup Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    1,
+						"type":  "gauge",
+						"title": "Buggy Gauge Panel",
+						"options": map[string]interface{}{
+							"valueOptions": map[string]interface{}{
+								"unit":     "bytes",
+								"stat":     "avg",
+								"decimals": 0,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "gauge panel with additional custom properties gets migrated correctly",
+			input: map[string]interface{}{
+				"title":         "V18 Custom Properties Migration Test Dashboard",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    1,
+						"type":  "gauge",
+						"title": "Custom Gauge Panel",
+						"options-gauge": map[string]interface{}{
+							"unit":           "short",
+							"customProperty": "customValue",
+							"anotherProp":    42,
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V18 Custom Properties Migration Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    1,
+						"type":  "gauge",
+						"title": "Custom Gauge Panel",
+						"options": map[string]interface{}{
+							"valueOptions": map[string]interface{}{
+								"unit": "short",
+							},
+							"customProperty": "customValue",
+							"anotherProp":    42,
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "non-gauge panel remains unchanged",
+			input: map[string]interface{}{
+				"title":         "V18 Non-Gauge Panel Test Dashboard",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    1,
+						"type":  "graph",
+						"title": "Graph Panel",
+						"options": map[string]interface{}{
+							"legend": map[string]interface{}{
+								"show": true,
+							},
+						},
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V18 Non-Gauge Panel Test Dashboard",
+				"schemaVersion": 18,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    1,
+						"type":  "graph",
+						"title": "Graph Panel",
+						"options": map[string]interface{}{
+							"legend": map[string]interface{}{
+								"show": true,
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "dashboard with no panels remains unchanged",
+			input: map[string]interface{}{
+				"title":         "V18 No Panels Test Dashboard",
+				"schemaVersion": 17,
+			},
+			expected: map[string]interface{}{
+				"title":         "V18 No Panels Test Dashboard",
+				"schemaVersion": 18,
+			},
+		},
+	}
+
+	runMigrationTests(t, tests, schemaversion.V18)
+}
diff --git a/apps/dashboard/pkg/migration/testdata/input/v18.gauge_options.json b/apps/dashboard/pkg/migration/testdata/input/v18.gauge_options.json
new file mode 100644
index 00000000000..1e8566dd793
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/input/v18.gauge_options.json
@@ -0,0 +1,66 @@
+{
+  "title": "V18 Gauge Options Migration Test Dashboard",
+  "schemaVersion": 17,
+  "panels": [
+    {
+      "id": 1,
+      "type": "gauge",
+      "title": "Complete Gauge Panel",
+      "options-gauge": {
+        "unit": "ms",
+        "stat": "last",
+        "decimals": 2,
+        "prefix": "Value: ",
+        "suffix": " ms",
+        "thresholds": [
+          {"color": "green", "value": 0},
+          {"color": "yellow", "value": 50},
+          {"color": "red", "value": 100}
+        ]
+      }
+    },
+    {
+      "id": 2,
+      "type": "gauge",
+      "title": "Partial Gauge Panel",
+      "options-gauge": {
+        "unit": "percent",
+        "decimals": 1
+      }
+    },
+    {
+      "id": 3,
+      "type": "gauge",
+      "title": "Buggy Gauge Panel",
+      "options-gauge": {
+        "unit": "bytes",
+        "options": "this should be deleted",
+        "stat": "avg",
+        "decimals": 0
+      }
+    },
+    {
+      "id": 4,
+      "type": "gauge",
+      "title": "Custom Properties Gauge Panel",
+      "options-gauge": {
+        "unit": "short",
+        "customProperty": "customValue",
+        "anotherProp": 42,
+        "thresholds": [
+          {"color": "blue", "value": 10}
+        ]
+      }
+    },
+    {
+      "id": 5,
+      "type": "graph",
+      "title": "Non-Gauge Panel",
+      "options": {
+        "legend": {
+          "show": true
+        }
+      }
+    }
+  ]
+}
diff --git a/apps/dashboard/pkg/migration/testdata/output/v18.gauge_options.json b/apps/dashboard/pkg/migration/testdata/output/v18.gauge_options.json
new file mode 100644
index 00000000000..f6dc7161c1b
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/output/v18.gauge_options.json
@@ -0,0 +1,162 @@
+{
+  "panels": [
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 1,
+      "options": {
+        "thresholds": [
+          {
+            "color": "red",
+            "value": 100
+          },
+          {
+            "color": "yellow",
+            "value": 50
+          },
+          {
+            "color": "green",
+            "value": 0
+          }
+        ],
+        "valueOptions": {
+          "decimals": 2,
+          "prefix": "Value: ",
+          "stat": "last",
+          "suffix": " ms",
+          "unit": "ms"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Complete Gauge Panel",
+      "type": "gauge"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 2,
+      "options": {
+        "valueOptions": {
+          "decimals": 1,
+          "unit": "percent"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Partial Gauge Panel",
+      "type": "gauge"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 3,
+      "options": {
+        "valueOptions": {
+          "decimals": 0,
+          "stat": "avg",
+          "unit": "bytes"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Buggy Gauge Panel",
+      "type": "gauge"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 4,
+      "options": {
+        "anotherProp": 42,
+        "customProperty": "customValue",
+        "thresholds": [
+          {
+            "color": "blue",
+            "value": 10
+          }
+        ],
+        "valueOptions": {
+          "unit": "short"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Custom Properties Gauge Panel",
+      "type": "gauge"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "id": 5,
+      "options": {
+        "legend": {
+          "show": true,
+          "showLegend": true
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Non-Gauge Panel",
+      "type": "graph"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 41,
+  "title": "V18 Gauge Options Migration Test Dashboard"
+}
\ No newline at end of file

From f3394c3f339ba0c7fe381b4f13dc6abe146359fc Mon Sep 17 00:00:00 2001
From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Date: Wed, 13 Aug 2025 17:07:33 -0400
Subject: [PATCH 156/243] Docs: Add text wrap for data links and pill cells
 (#109621)

---
 .../visualizations/table/index.md             | 20 +++++++++++++++++--
 .../shared/visualizations/cell-options.md     |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/docs/sources/panels-visualizations/visualizations/table/index.md b/docs/sources/panels-visualizations/visualizations/table/index.md
index 5c1035752b3..ce09350f660 100644
--- a/docs/sources/panels-visualizations/visualizations/table/index.md
+++ b/docs/sources/panels-visualizations/visualizations/table/index.md
@@ -238,7 +238,7 @@ If you want to apply a cell type to only some fields instead of all fields, you
 | [Auto](#auto)                             | A basic text and number cell. |
 | [Colored text](#colored-text)             | If thresholds, value mappings, or color schemes are set, then the cell text is displayed in the appropriate color. |
 | [Colored background](#colored-background) | If thresholds, value mappings, or color schemes are set, then the cell background is displayed in the appropriate color. |
-| Data links                                | If you've configured data links, when the cell type is **Auto**, the cell text becomes clickable. If you change the cell type to **Data links**, the cell text reflects the titles of the configured data links. To control the application of data link text more granularly, use a **Cell option > Cell type > Data links** field override. |
+| [Data links](#data-links)                 | The cell text reflects the titles of the configured data links.|
 | [Gauge](#gauge)                           | Values are displayed as a horizontal bar gauge. You can set the [Gauge display mode](#gauge-display-mode) and the [Value display](#value-display) options. |
 | [Sparkline](#sparkline)                   | Shows values rendered as a sparkline. |
 | [JSON View](#json-view)                   | Shows values formatted as code. |
@@ -283,12 +283,23 @@ The colored background cell type has the following options:
 | ------ | ----------- |
 | Background display mode | Choose between **Basic** and **Gradient**. |
 | Apply to entire row | Toggle the switch on to apply the background color that's configured for the cell to the whole row. |
-| Wrap text | <p>Toggle the **Wrap text** switch to wrap text in the cell that contains the longest content in your table. To wrap the text _in a specific column only_, use a **Fields with name** [field override](ref:field-override), select the **Cell options > Cell type** override property, and toggle on the **Wrap text** switch.</p><p>Text wrapping is in [public preview](https://grafana.com/docs/release-life-cycle/#public-preview), however, it’s available to use by default.</p> |
+| Wrap text | Toggle the **Wrap text** switch to wrap text in the cell that contains the longest content in your table. To wrap the text _in a specific column only_, use a **Fields with name** [field override](ref:field-override), select the **Cell options > Cell type** override property, and toggle on the **Wrap text** switch. |
 | Cell value inspect | <p>Enables value inspection from table cells. When the switch is toggled on, clicking the inspect icon in a cell opens the **Inspect value** drawer which contains two tabs: **Plain text** and **Code editor**.</p><p>Grafana attempts to automatically detect the type of data in the cell and opens the drawer with the associated tab showing. However, you can switch back and forth between tabs.</p> |
 <!-- prettier-ignore-end -->
 
 <!-- The wrap text and cell value inspect descriptions above should be copied from docs/sources/shared/visualizations/cell-options.md -->
 
+#### Data links
+
+If you've configured data links, when the cell type is **Auto**, the cell text becomes clickable.
+If you change the cell type to **Data links**, the cell text reflects the titles of the configured data links. To control the application of data link text more granularly, use a **Cell option > Cell type > Data links** field override.
+
+Data links cells also support text wrapping.
+Toggle the **Wrap text** switch to wrap text in the cell that contains the longest content in your table.
+To wrap the text _in a specific column only_, use a **Fields with name** [field override](ref:field-override), select the **Cell options > Cell type** override property, and toggle on the **Wrap text** switch.
+
+<!-- The wrap text description above should be copied from docs/sources/shared/visualizations/cell-options.md -->
+
 #### Gauge
 
 With this cell type, cells can be displayed as a graphical gauge, with several different presentation types controlled by the [gauge display mode](#gauge-display-mode) and the [value display](#value-display).
@@ -370,7 +381,12 @@ The **Pill** cell type displays each item in a comma-separated string in a color
 
 The colors applied to each piece of text are maintained throughout the table.
 For example, if the word "test" is first displayed in a red pill, it will always be displayed in a red pill.
+
 Pill cells also support text wrapping.
+Toggle the **Wrap text** switch to wrap text in the cell that contains the longest content in your table.
+To wrap the text _in a specific column only_, use a **Fields with name** [field override](ref:field-override), select the **Cell options > Cell type** override property, and toggle on the **Wrap text** switch.
+
+<!-- The wrap text description above should be copied from docs/sources/shared/visualizations/cell-options.md -->
 
 The following data formats are supported for the pill cell type:
 
diff --git a/docs/sources/shared/visualizations/cell-options.md b/docs/sources/shared/visualizations/cell-options.md
index 03c0e4a76dc..f2382fbee84 100644
--- a/docs/sources/shared/visualizations/cell-options.md
+++ b/docs/sources/shared/visualizations/cell-options.md
@@ -5,6 +5,6 @@ title: Cell options
 <!-- prettier-ignore-start -->
 | Option | Description |
 | ------ | ----------- |
-| Wrap text | <p>Toggle the **Wrap text** switch to wrap text in the cell that contains the longest content in your table. To wrap the text _in a specific column only_, use a **Fields with name** [field override](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-overrides/), select the **Cell options > Cell type** override property, and toggle on the **Wrap text** switch.</p><p>Text wrapping is in [public preview](https://grafana.com/docs/release-life-cycle/#public-preview), however, it’s available to use by default.</p> |
+| Wrap text | Toggle the **Wrap text** switch to wrap text in the cell that contains the longest content in your table. To wrap the text _in a specific column only_, use a **Fields with name** [field override](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-overrides/), select the **Cell options > Cell type** override property, and toggle on the **Wrap text** switch. |
 | Cell value inspect | <p>Enables value inspection from table cells. When the switch is toggled on, clicking the inspect icon in a cell opens the **Inspect value** drawer which contains two tabs: **Plain text** and **Code editor**.</p><p>Grafana attempts to automatically detect the type of data in the cell and opens the drawer with the associated tab showing. However, you can switch back and forth between tabs.</p> |
 <!-- prettier-ignore-end -->

From c5d30f28922353bb22f138700920ddfd2f2f1a0f Mon Sep 17 00:00:00 2001
From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Date: Wed, 13 Aug 2025 17:45:12 -0400
Subject: [PATCH 157/243] Docs: Add wrap header text & freeze columns (#109623)

---
 .../visualizations/table/index.md             | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/sources/panels-visualizations/visualizations/table/index.md b/docs/sources/panels-visualizations/visualizations/table/index.md
index ce09350f660..32191d113b2 100644
--- a/docs/sources/panels-visualizations/visualizations/table/index.md
+++ b/docs/sources/panels-visualizations/visualizations/table/index.md
@@ -197,15 +197,19 @@ This option is only available when you're editing the panel.
 
 ### Table options
 
-| Option               | Description                                                                                                                                                                                                                                                                 |
-| -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Show table header    | Show or hide column names imported from your data source.                                                                                                                                                                                                                   |
-| Cell height          | Set the height of the cell. Choose from **Small**, **Medium**, or **Large**.                                                                                                                                                                                                |
-| Enable pagination    | Toggle the switch to control how many table rows are visible at once. When switched on, the page size automatically adjusts to the height of the table. This option doesn't affect queries.                                                                                 |
+<!-- prettier-ignore-start -->
+| Option               | Description                                               |
+| -------------------- | --------------------------------------------------------- |
+| Show table header    | Show or hide column names imported from your data source. |
+| Frozen columns       | Freeze columns starting from the left side of the table. Enter a value to set how many columns are frozen. |
+| Cell height          | Set the height of the cell. Choose from **Small**, **Medium**, or **Large**. |
+| Enable pagination    | Toggle the switch to control how many table rows are visible at once. When switched on, the page size automatically adjusts to the height of the table. This option doesn't affect queries. |
 | Minimum column width | Define the lower limit of the column width, in pixels. By default, the minimum width of the table column is 150 pixels. For small-screen devices, such as mobile phones or tablets, reduce the value to `50` to allow table-based panels to render correctly in dashboards. |
-| Column width         | Define a column width, in pixels, rather than allowing the width to be set automatically. By default, Grafana calculates the column width based on the table size and the minimum column width.                                                                             |
-| Column alignment     | Set how Grafana should align cell contents. Choose from: **Auto** (default), **Left**, **Center**, or **Right**.                                                                                                                                                            |
-| Column filter        | Temporarily change how column data is displayed. For example, show or hide specific values. For more information, refer to [Column filtering](#column-filtering).                                                                                                           |
+| Column width         | Define a column width, in pixels, rather than allowing the width to be set automatically. By default, Grafana calculates the column width based on the table size and the minimum column width. |
+| Column alignment     | Set how Grafana should align cell contents. Choose from: **Auto** (default), **Left**, **Center**, or **Right**.  |
+| Column filter        | Temporarily change how column data is displayed. For example, show or hide specific values. For more information, refer to [Column filtering](#column-filtering). |
+| Wrap header text     | Enables text wrapping for column headers. |
+<!-- prettier-ignore-end -->
 
 ### Table footer options
 

From 7d7721e30aa6c1945fda4518ed9a907517945312 Mon Sep 17 00:00:00 2001
From: Paul Marbach <paul.marbach@grafana.com>
Date: Wed, 13 Aug 2025 18:04:34 -0400
Subject: [PATCH 158/243] Docs: Sort docs update (#109640)

* Docs: Update documentation on multi-sort for TableNG

* update image for filter docs

* Update docs/sources/panels-visualizations/visualizations/table/index.md

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

* Update docs/sources/panels-visualizations/visualizations/table/index.md

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

---------

Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
---
 .../panels-visualizations/visualizations/table/index.md      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/sources/panels-visualizations/visualizations/table/index.md b/docs/sources/panels-visualizations/visualizations/table/index.md
index 32191d113b2..438c059cfe2 100644
--- a/docs/sources/panels-visualizations/visualizations/table/index.md
+++ b/docs/sources/panels-visualizations/visualizations/table/index.md
@@ -155,7 +155,7 @@ To filter column values, follow these steps:
 
    Grafana displays the filter options for that column.
 
-   {{< figure src="/static/img/docs/tables/filter-column-values.png" max-width="300px" alt="Filter column values" class="docs-image--no-shadow" >}}
+   {{< figure src="/media/docs/grafana/panels-visualizations/filter-column-values_12.2.png" max-width="300px" alt="Filter column values" >}}
 
 1. Click the checkbox next to the values that you want to display or click **Select all**.
 1. Enter text in the search field at the top to show those values in the display so that you can select them rather than scroll to find them.
@@ -178,7 +178,8 @@ To remove the filter, click the blue filter icon and then click **Clear filter**
 
 Click a column title to change the sort order from default to descending to ascending.
 Each time you click, the sort order changes to the next option in the cycle.
-You can sort multiple columns by holding the `Shift` key and clicking the column name.
+You can sort multiple columns by holding the `Cmd` or `Ctrl` key
+and clicking the column name.
 
 {{< figure src="/static/img/docs/tables/sort-descending.png" max-width="350px" alt="Sort descending" class="docs-image--no-shadow" >}}
 

From e165a490b49655b944dc3cb43963076d6ccf72c9 Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Thu, 14 Aug 2025 07:46:12 +0200
Subject: [PATCH 159/243] Alerting: Return merged extra configurations in the
 API (#109636)

---
 pkg/services/ngalert/api/api_alertmanager.go  |   2 +-
 .../ngalert/api/api_convert_prometheus.go     |   4 +-
 .../api/api_convert_prometheus_test.go        |  14 +-
 .../ngalert/api/forking_alertmanager.go       |  56 ++++----
 .../ngalert/api/forking_alertmanager_test.go  | 121 ++++--------------
 .../ngalert/notifier/alertmanager_config.go   |  36 ++++--
 .../notifier/alertmanager_config_test.go      |   8 +-
 .../api_alertmanager_extra_config_test.go     | 109 ++++++++++++++++
 pkg/tests/api/alerting/testing.go             |  10 ++
 9 files changed, 214 insertions(+), 146 deletions(-)
 create mode 100644 pkg/tests/api/alerting/api_alertmanager_extra_config_test.go

diff --git a/pkg/services/ngalert/api/api_alertmanager.go b/pkg/services/ngalert/api/api_alertmanager.go
index cdba800aab8..90dcb26fc74 100644
--- a/pkg/services/ngalert/api/api_alertmanager.go
+++ b/pkg/services/ngalert/api/api_alertmanager.go
@@ -83,7 +83,7 @@ func (srv AlertmanagerSrv) RouteDeleteAlertingConfig(c *contextmodel.ReqContext)
 
 func (srv AlertmanagerSrv) RouteGetAlertingConfig(c *contextmodel.ReqContext) response.Response {
 	canSeeAutogen := c.HasRole(org.RoleAdmin)
-	config, err := srv.mam.GetAlertmanagerConfiguration(c.Req.Context(), c.GetOrgID(), canSeeAutogen)
+	config, err := srv.mam.GetAlertmanagerConfiguration(c.Req.Context(), c.GetOrgID(), canSeeAutogen, false)
 	if err != nil {
 		if errors.Is(err, store.ErrNoAlertmanagerConfiguration) {
 			return ErrResp(http.StatusNotFound, err, "")
diff --git a/pkg/services/ngalert/api/api_convert_prometheus.go b/pkg/services/ngalert/api/api_convert_prometheus.go
index 1d4fd9ac814..d6fb86d31e2 100644
--- a/pkg/services/ngalert/api/api_convert_prometheus.go
+++ b/pkg/services/ngalert/api/api_convert_prometheus.go
@@ -135,7 +135,7 @@ type ConvertPrometheusSrv struct {
 type Alertmanager interface {
 	DeleteExtraConfiguration(ctx context.Context, org int64, identifier string) error
 	SaveAndApplyExtraConfiguration(ctx context.Context, org int64, extraConfig apimodels.ExtraConfiguration) error
-	GetAlertmanagerConfiguration(ctx context.Context, org int64, withAutogen bool) (apimodels.GettableUserConfig, error)
+	GetAlertmanagerConfiguration(ctx context.Context, org int64, withAutogen bool, withMergedExtraConfig bool) (apimodels.GettableUserConfig, error)
 }
 
 func NewConvertPrometheusSrv(
@@ -594,7 +594,7 @@ func (srv *ConvertPrometheusSrv) RouteConvertPrometheusGetAlertmanagerConfig(c *
 
 	identifier := parseConfigIdentifierHeader(c)
 
-	cfg, err := srv.am.GetAlertmanagerConfiguration(ctx, c.GetOrgID(), false)
+	cfg, err := srv.am.GetAlertmanagerConfiguration(ctx, c.GetOrgID(), false, false)
 	if err != nil {
 		logger.Error("failed to get alertmanager configuration", "err", err)
 		return errorToResponse(err)
diff --git a/pkg/services/ngalert/api/api_convert_prometheus_test.go b/pkg/services/ngalert/api/api_convert_prometheus_test.go
index 7b45968ae78..c5f72c93439 100644
--- a/pkg/services/ngalert/api/api_convert_prometheus_test.go
+++ b/pkg/services/ngalert/api/api_convert_prometheus_test.go
@@ -1782,8 +1782,8 @@ func (m *mockAlertmanager) SaveAndApplyExtraConfiguration(ctx context.Context, o
 	return args.Error(0)
 }
 
-func (m *mockAlertmanager) GetAlertmanagerConfiguration(ctx context.Context, org int64, withAutogen bool) (apimodels.GettableUserConfig, error) {
-	args := m.Called(ctx, org, withAutogen)
+func (m *mockAlertmanager) GetAlertmanagerConfiguration(ctx context.Context, org int64, withAutogen bool, withMergedExtraConfig bool) (apimodels.GettableUserConfig, error) {
+	args := m.Called(ctx, org, withAutogen, withMergedExtraConfig)
 	return args.Get(0).(apimodels.GettableUserConfig), args.Error(1)
 }
 
@@ -1912,7 +1912,7 @@ func TestRouteConvertPrometheusGetAlertmanagerConfig(t *testing.T) {
 
 	t.Run("without config identifier header should use default identifier", func(t *testing.T) {
 		mockAM := &mockAlertmanager{}
-		mockAM.On("GetAlertmanagerConfiguration", mock.Anything, orgID, false).Return(apimodels.GettableUserConfig{
+		mockAM.On("GetAlertmanagerConfiguration", mock.Anything, orgID, false, false).Return(apimodels.GettableUserConfig{
 			ExtraConfigs: []apimodels.ExtraConfiguration{
 				{
 					Identifier: defaultConfigIdentifier,
@@ -1935,7 +1935,7 @@ receivers:
 
 	t.Run("with empty config identifier header should use default identifier", func(t *testing.T) {
 		mockAM := &mockAlertmanager{}
-		mockAM.On("GetAlertmanagerConfiguration", mock.Anything, orgID, false).Return(apimodels.GettableUserConfig{
+		mockAM.On("GetAlertmanagerConfiguration", mock.Anything, orgID, false, false).Return(apimodels.GettableUserConfig{
 			ExtraConfigs: []apimodels.ExtraConfiguration{
 				{
 					Identifier: defaultConfigIdentifier,
@@ -1983,7 +1983,7 @@ receivers:
 			},
 		}
 
-		mockAM.On("GetAlertmanagerConfiguration", mock.Anything, int64(1), false).Return(expectedConfig, nil).Once()
+		mockAM.On("GetAlertmanagerConfiguration", mock.Anything, int64(1), false, false).Return(expectedConfig, nil).Once()
 
 		rc := createRequestCtx()
 		rc.Req.Header.Set(configIdentifierHeader, identifier)
@@ -2037,7 +2037,7 @@ receivers:
 			},
 		}
 
-		mockAM.On("GetAlertmanagerConfiguration", mock.Anything, orgID, false).Return(expectedConfig, nil).Once()
+		mockAM.On("GetAlertmanagerConfiguration", mock.Anything, orgID, false, false).Return(expectedConfig, nil).Once()
 
 		rc := createRequestCtx()
 		rc.Req.Header.Set(configIdentifierHeader, identifier)
@@ -2052,7 +2052,7 @@ receivers:
 		ft := featuremgmt.WithFeatures(featuremgmt.FlagAlertingImportAlertmanagerAPI)
 		srv, _, _ := createConvertPrometheusSrv(t, withAlertmanager(mockAM), withFeatureToggles(ft))
 
-		mockAM.On("GetAlertmanagerConfiguration", mock.Anything, orgID, false).Return(apimodels.GettableUserConfig{}, errors.New("config error")).Once()
+		mockAM.On("GetAlertmanagerConfiguration", mock.Anything, orgID, false, false).Return(apimodels.GettableUserConfig{}, errors.New("config error")).Once()
 
 		rc := createRequestCtx()
 		rc.Req.Header.Set(configIdentifierHeader, identifier)
diff --git a/pkg/services/ngalert/api/forking_alertmanager.go b/pkg/services/ngalert/api/forking_alertmanager.go
index 9d76ccb07ff..96e295fc68f 100644
--- a/pkg/services/ngalert/api/forking_alertmanager.go
+++ b/pkg/services/ngalert/api/forking_alertmanager.go
@@ -1,8 +1,8 @@
 package api
 
 import (
+	"errors"
 	"net/http"
-	"strings"
 
 	amv2 "github.com/prometheus/alertmanager/api/v2/models"
 
@@ -11,11 +11,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/store"
+	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/web"
 )
 
-const extraConfigPrefix = "~grafana-converted-extra-config-"
+const withExtraConfigUID = "~grafana-with-extra-config"
 
 type ConvertService interface {
 	RouteConvertPrometheusGetAlertmanagerConfig(ctx *contextmodel.ReqContext) response.Response
@@ -42,7 +44,7 @@ func NewForkingAM(datasourceCache datasources.CacheService, proxy *LotexAM, graf
 
 func (f *AlertmanagerApiHandler) getService(ctx *contextmodel.ReqContext) (*LotexAM, error) {
 	// If this is not an extra config request, we should check that the datasource exists and is of the correct type.
-	if isExtra, _ := f.isExtraConfig(ctx); !isExtra {
+	if isExtra := f.isExtraConfig(ctx); !isExtra {
 		_, err := getDatasourceByUID(ctx, f.DatasourceCache, apimodels.AlertmanagerBackend)
 		if err != nil {
 			return nil, err
@@ -54,22 +56,18 @@ func (f *AlertmanagerApiHandler) getService(ctx *contextmodel.ReqContext) (*Lote
 
 // isExtraConfig checks if the datasourceUID represents an extra config.
 // Extra configs are the alertmanager configurations that were saved using the Prometheus conversion API.
-func (f *AlertmanagerApiHandler) isExtraConfig(ctx *contextmodel.ReqContext) (bool, string) {
+func (f *AlertmanagerApiHandler) isExtraConfig(ctx *contextmodel.ReqContext) bool {
 	// Only enabled if feature flag is on
 	if !f.FeatureManager.IsEnabledGlobally(featuremgmt.FlagAlertingImportAlertmanagerUI) {
-		return false, ""
+		return false
 	}
 
 	datasourceUID := web.Params(ctx.Req)[":DatasourceUID"]
-	if strings.HasPrefix(datasourceUID, extraConfigPrefix) {
-		identifier := strings.TrimPrefix(datasourceUID, extraConfigPrefix)
-		return true, identifier
-	}
-	return false, ""
+	return datasourceUID == withExtraConfigUID
 }
 
 func (f *AlertmanagerApiHandler) handleRouteGetAMStatus(ctx *contextmodel.ReqContext, dsUID string) response.Response {
-	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+	if f.isExtraConfig(ctx) {
 		status := apimodels.GettableStatus{
 			Cluster: &amv2.ClusterStatus{
 				Status: util.Pointer("ready"),
@@ -87,7 +85,7 @@ func (f *AlertmanagerApiHandler) handleRouteGetAMStatus(ctx *contextmodel.ReqCon
 }
 
 func (f *AlertmanagerApiHandler) handleRouteCreateSilence(ctx *contextmodel.ReqContext, body apimodels.PostableSilence, dsUID string) response.Response {
-	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+	if f.isExtraConfig(ctx) {
 		return response.Error(http.StatusForbidden, "Read-only configuration", nil)
 	}
 
@@ -100,7 +98,7 @@ func (f *AlertmanagerApiHandler) handleRouteCreateSilence(ctx *contextmodel.ReqC
 }
 
 func (f *AlertmanagerApiHandler) handleRouteDeleteAlertingConfig(ctx *contextmodel.ReqContext, dsUID string) response.Response {
-	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+	if f.isExtraConfig(ctx) {
 		return response.Error(http.StatusForbidden, "Read-only configuration", nil)
 	}
 
@@ -113,7 +111,7 @@ func (f *AlertmanagerApiHandler) handleRouteDeleteAlertingConfig(ctx *contextmod
 }
 
 func (f *AlertmanagerApiHandler) handleRouteDeleteSilence(ctx *contextmodel.ReqContext, silenceID string, dsUID string) response.Response {
-	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+	if f.isExtraConfig(ctx) {
 		return response.Error(http.StatusForbidden, "Read-only configuration", nil)
 	}
 
@@ -126,18 +124,14 @@ func (f *AlertmanagerApiHandler) handleRouteDeleteSilence(ctx *contextmodel.ReqC
 }
 
 func (f *AlertmanagerApiHandler) handleRouteGetAlertingConfig(ctx *contextmodel.ReqContext, dsUID string) response.Response {
-	if isExtra, identifier := f.isExtraConfig(ctx); isExtra {
-		ctx.Req.Header.Set(configIdentifierHeader, identifier)
-		ctx.Req.Header.Set("Accept", "application/yaml")
-
-		conversionResp := f.ConvertSvc.RouteConvertPrometheusGetAlertmanagerConfig(ctx)
-		if conversionResp.Status() != http.StatusOK {
-			return conversionResp
-		}
-
-		config, err := yamlExtractor(&apimodels.GettableUserConfig{})(conversionResp.(*response.NormalResponse))
+	if f.isExtraConfig(ctx) {
+		canSeeAutogen := ctx.HasRole(org.RoleAdmin)
+		config, err := f.GrafanaSvc.mam.GetAlertmanagerConfiguration(ctx.Req.Context(), ctx.GetOrgID(), canSeeAutogen, true)
 		if err != nil {
-			return response.Error(http.StatusInternalServerError, "Failed to parse alertmanager config", err)
+			if errors.Is(err, store.ErrNoAlertmanagerConfiguration) {
+				return response.Error(http.StatusNotFound, "No configuration found", err)
+			}
+			return response.Error(http.StatusInternalServerError, "Failed to get merged configuration", err)
 		}
 
 		return response.JSON(http.StatusOK, config)
@@ -152,7 +146,7 @@ func (f *AlertmanagerApiHandler) handleRouteGetAlertingConfig(ctx *contextmodel.
 }
 
 func (f *AlertmanagerApiHandler) handleRouteGetAMAlertGroups(ctx *contextmodel.ReqContext, dsUID string) response.Response {
-	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+	if f.isExtraConfig(ctx) {
 		return f.GrafanaSvc.RouteGetAMAlertGroups(ctx)
 	}
 
@@ -165,7 +159,7 @@ func (f *AlertmanagerApiHandler) handleRouteGetAMAlertGroups(ctx *contextmodel.R
 }
 
 func (f *AlertmanagerApiHandler) handleRouteGetAMAlerts(ctx *contextmodel.ReqContext, dsUID string) response.Response {
-	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+	if f.isExtraConfig(ctx) {
 		return f.GrafanaSvc.RouteGetAMAlerts(ctx)
 	}
 
@@ -178,7 +172,7 @@ func (f *AlertmanagerApiHandler) handleRouteGetAMAlerts(ctx *contextmodel.ReqCon
 }
 
 func (f *AlertmanagerApiHandler) handleRouteGetSilence(ctx *contextmodel.ReqContext, silenceID string, dsUID string) response.Response {
-	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+	if f.isExtraConfig(ctx) {
 		return f.GrafanaSvc.RouteGetSilence(ctx, silenceID)
 	}
 
@@ -191,7 +185,7 @@ func (f *AlertmanagerApiHandler) handleRouteGetSilence(ctx *contextmodel.ReqCont
 }
 
 func (f *AlertmanagerApiHandler) handleRouteGetSilences(ctx *contextmodel.ReqContext, dsUID string) response.Response {
-	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+	if f.isExtraConfig(ctx) {
 		return f.GrafanaSvc.RouteGetSilences(ctx)
 	}
 
@@ -204,7 +198,7 @@ func (f *AlertmanagerApiHandler) handleRouteGetSilences(ctx *contextmodel.ReqCon
 }
 
 func (f *AlertmanagerApiHandler) handleRoutePostAlertingConfig(ctx *contextmodel.ReqContext, body apimodels.PostableUserConfig, dsUID string) response.Response {
-	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+	if f.isExtraConfig(ctx) {
 		return response.Error(http.StatusForbidden, "Read-only configuration", nil)
 	}
 
@@ -219,7 +213,7 @@ func (f *AlertmanagerApiHandler) handleRoutePostAlertingConfig(ctx *contextmodel
 }
 
 func (f *AlertmanagerApiHandler) handleRoutePostAMAlerts(ctx *contextmodel.ReqContext, body apimodels.PostableAlerts, dsUID string) response.Response {
-	if isExtra, _ := f.isExtraConfig(ctx); isExtra {
+	if f.isExtraConfig(ctx) {
 		return response.Error(http.StatusForbidden, "Read-only configuration", nil)
 	}
 
diff --git a/pkg/services/ngalert/api/forking_alertmanager_test.go b/pkg/services/ngalert/api/forking_alertmanager_test.go
index 46074531398..96e4c8a654a 100644
--- a/pkg/services/ngalert/api/forking_alertmanager_test.go
+++ b/pkg/services/ngalert/api/forking_alertmanager_test.go
@@ -5,10 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/api/response"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
@@ -18,39 +16,34 @@ import (
 
 func TestAlertmanagerApiHandler_isExtraConfig(t *testing.T) {
 	tests := []struct {
-		name               string
-		datasourceUID      string
-		flagEnabled        bool
-		expectedIsExtra    bool
-		expectedIdentifier string
+		name            string
+		datasourceUID   string
+		flagEnabled     bool
+		expectedIsExtra bool
 	}{
 		{
-			name:               "normal datasource when feature enabled",
-			datasourceUID:      "normal-datasource",
-			flagEnabled:        true,
-			expectedIsExtra:    false,
-			expectedIdentifier: "",
+			name:            "normal datasource when feature enabled",
+			datasourceUID:   "normal-datasource",
+			flagEnabled:     true,
+			expectedIsExtra: false,
 		},
 		{
-			name:               "extra config when feature enabled",
-			datasourceUID:      "~grafana-converted-extra-config-test-config",
-			flagEnabled:        true,
-			expectedIsExtra:    true,
-			expectedIdentifier: "test-config",
+			name:            "extra config when feature enabled",
+			datasourceUID:   "~grafana-with-extra-config",
+			flagEnabled:     true,
+			expectedIsExtra: true,
 		},
 		{
-			name:               "extra config when feature disabled",
-			datasourceUID:      "~grafana-converted-extra-config-test-config",
-			flagEnabled:        false,
-			expectedIsExtra:    false,
-			expectedIdentifier: "",
+			name:            "extra config when feature disabled",
+			datasourceUID:   "~grafana-with-extra-config",
+			flagEnabled:     false,
+			expectedIsExtra: false,
 		},
 		{
-			name:               "empty datasource UID",
-			datasourceUID:      "",
-			flagEnabled:        true,
-			expectedIsExtra:    false,
-			expectedIdentifier: "",
+			name:            "empty datasource UID",
+			datasourceUID:   "",
+			flagEnabled:     true,
+			expectedIsExtra: false,
 		},
 	}
 
@@ -81,9 +74,8 @@ func TestAlertmanagerApiHandler_isExtraConfig(t *testing.T) {
 				FeatureManager: features,
 			}
 
-			isExtra, identifier := handler.isExtraConfig(ctx)
+			isExtra := handler.isExtraConfig(ctx)
 			assert.Equal(t, tt.expectedIsExtra, isExtra)
-			assert.Equal(t, tt.expectedIdentifier, identifier)
 		})
 	}
 }
@@ -101,14 +93,14 @@ func TestAlertmanagerApiHandler_ExtraConfigRouting(t *testing.T) {
 		}
 
 		ctx.Req = web.SetURLParams(req, map[string]string{
-			":DatasourceUID": "~grafana-converted-extra-config-test",
+			":DatasourceUID": "~grafana-with-extra-config",
 		})
 
 		handler := &AlertmanagerApiHandler{
 			FeatureManager: featuremgmt.WithFeatures(featuremgmt.FlagAlertingImportAlertmanagerUI),
 		}
 
-		resp := handler.handleRouteGetAMStatus(ctx, "~grafana-converted-extra-config-test")
+		resp := handler.handleRouteGetAMStatus(ctx, "~grafana-with-extra-config")
 		require.Equal(t, http.StatusOK, resp.Status())
 	})
 
@@ -124,80 +116,23 @@ func TestAlertmanagerApiHandler_ExtraConfigRouting(t *testing.T) {
 		}
 
 		ctx.Req = web.SetURLParams(req, map[string]string{
-			":DatasourceUID": "~grafana-converted-extra-config-test",
+			":DatasourceUID": "~grafana-with-extra-config",
 		})
 
 		handler := &AlertmanagerApiHandler{
 			FeatureManager: featuremgmt.WithFeatures(featuremgmt.FlagAlertingImportAlertmanagerUI),
 		}
 
-		resp := handler.handleRouteCreateSilence(ctx, apimodels.PostableSilence{}, "~grafana-converted-extra-config-test")
+		resp := handler.handleRouteCreateSilence(ctx, apimodels.PostableSilence{}, "~grafana-with-extra-config")
 		assert.Equal(t, http.StatusForbidden, resp.Status())
 
-		resp = handler.handleRouteDeleteAlertingConfig(ctx, "~grafana-converted-extra-config-test")
+		resp = handler.handleRouteDeleteAlertingConfig(ctx, "~grafana-with-extra-config")
 		assert.Equal(t, http.StatusForbidden, resp.Status())
 
-		resp = handler.handleRoutePostAlertingConfig(ctx, apimodels.PostableUserConfig{}, "~grafana-converted-extra-config-test")
+		resp = handler.handleRoutePostAlertingConfig(ctx, apimodels.PostableUserConfig{}, "~grafana-with-extra-config")
 		assert.Equal(t, http.StatusForbidden, resp.Status())
 
-		resp = handler.handleRoutePostAMAlerts(ctx, apimodels.PostableAlerts{}, "~grafana-converted-extra-config-test")
+		resp = handler.handleRoutePostAMAlerts(ctx, apimodels.PostableAlerts{}, "~grafana-with-extra-config")
 		assert.Equal(t, http.StatusForbidden, resp.Status())
 	})
-
-	t.Run("GET extra config", func(t *testing.T) {
-		req := &http.Request{
-			Header: make(http.Header),
-		}
-		ctx := &contextmodel.ReqContext{
-			Context: &web.Context{
-				Req: req,
-			},
-			SignedInUser: &user.SignedInUser{
-				OrgID: 1,
-			},
-		}
-
-		ctx.Req = web.SetURLParams(req, map[string]string{
-			":DatasourceUID": "~grafana-converted-extra-config-test-identifier",
-		})
-
-		mockConvertSvc := &mockConvertService{}
-
-		yamlConfig := `alertmanager_config: |
-  global: {}
-  route:
-    receiver: test-receiver
-  receivers:
-    - name: test-receiver`
-
-		mockResponse := response.Respond(http.StatusOK, yamlConfig).
-			SetHeader("Content-Type", "application/yaml")
-
-		mockConvertSvc.On("RouteConvertPrometheusGetAlertmanagerConfig", mock.Anything).
-			Run(func(args mock.Arguments) {
-				passedCtx := args.Get(0).(*contextmodel.ReqContext)
-				assert.Equal(t, "test-identifier", passedCtx.Req.Header.Get(configIdentifierHeader))
-				assert.Equal(t, "application/yaml", passedCtx.Req.Header.Get("Accept"))
-			}).
-			Return(mockResponse)
-
-		handler := &AlertmanagerApiHandler{
-			FeatureManager: featuremgmt.WithFeatures(featuremgmt.FlagAlertingImportAlertmanagerUI),
-			ConvertSvc:     mockConvertSvc,
-		}
-
-		resp := handler.handleRouteGetAlertingConfig(ctx, "~grafana-converted-extra-config-test-identifier")
-		assert.Equal(t, http.StatusOK, resp.Status())
-
-		mockConvertSvc.AssertExpectations(t)
-	})
-}
-
-type mockConvertService struct {
-	mock.Mock
-}
-
-func (m *mockConvertService) RouteConvertPrometheusGetAlertmanagerConfig(ctx *contextmodel.ReqContext) response.Response {
-	args := m.Called(ctx)
-	return args.Get(0).(response.Response)
 }
diff --git a/pkg/services/ngalert/notifier/alertmanager_config.go b/pkg/services/ngalert/notifier/alertmanager_config.go
index 510f5c25c08..3d4ebba01f9 100644
--- a/pkg/services/ngalert/notifier/alertmanager_config.go
+++ b/pkg/services/ngalert/notifier/alertmanager_config.go
@@ -116,13 +116,14 @@ func (moa *MultiOrgAlertmanager) ApplyConfig(ctx context.Context, orgId int64, d
 
 // GetAlertmanagerConfiguration returns the latest alertmanager configuration for a given org.
 // If withAutogen is true, the configuration will be augmented with autogenerated routes.
-func (moa *MultiOrgAlertmanager) GetAlertmanagerConfiguration(ctx context.Context, org int64, withAutogen bool) (definitions.GettableUserConfig, error) {
+// If withMergedExtraConfig is true, any extra configurations will be merged into the main configuration.
+func (moa *MultiOrgAlertmanager) GetAlertmanagerConfiguration(ctx context.Context, org int64, withAutogen bool, withMergedExtraConfig bool) (definitions.GettableUserConfig, error) {
 	amConfig, err := moa.configStore.GetLatestAlertmanagerConfiguration(ctx, org)
 	if err != nil {
 		return definitions.GettableUserConfig{}, fmt.Errorf("failed to get latest configuration: %w", err)
 	}
 
-	cfg, err := moa.gettableUserConfigFromAMConfigString(ctx, org, amConfig.AlertmanagerConfiguration)
+	cfg, err := moa.gettableUserConfigFromAMConfigString(ctx, org, amConfig.AlertmanagerConfiguration, withMergedExtraConfig)
 	if err != nil {
 		return definitions.GettableUserConfig{}, err
 	}
@@ -197,7 +198,7 @@ func (moa *MultiOrgAlertmanager) GetAppliedAlertmanagerConfigurations(ctx contex
 	gettableHistoricConfigs := make([]*definitions.GettableHistoricUserConfig, 0, len(configs))
 	for _, config := range configs {
 		appliedAt := strfmt.DateTime(time.Unix(config.LastApplied, 0).UTC())
-		gettableConfig, err := moa.gettableUserConfigFromAMConfigString(ctx, org, config.AlertmanagerConfiguration)
+		gettableConfig, err := moa.gettableUserConfigFromAMConfigString(ctx, org, config.AlertmanagerConfiguration, false)
 		if err != nil {
 			// If there are invalid records, skip them and return the valid ones.
 			moa.logger.Warn("Invalid configuration found in alert configuration history table", "id", config.ID, "orgID", org)
@@ -217,7 +218,7 @@ func (moa *MultiOrgAlertmanager) GetAppliedAlertmanagerConfigurations(ctx contex
 	return gettableHistoricConfigs, nil
 }
 
-func (moa *MultiOrgAlertmanager) gettableUserConfigFromAMConfigString(ctx context.Context, orgID int64, config string) (definitions.GettableUserConfig, error) {
+func (moa *MultiOrgAlertmanager) gettableUserConfigFromAMConfigString(ctx context.Context, orgID int64, config string, withMergedExtraConfig bool) (definitions.GettableUserConfig, error) {
 	cfg, err := Load([]byte(config))
 	if err != nil {
 		return definitions.GettableUserConfig{}, fmt.Errorf("failed to unmarshal alertmanager configuration: %w", err)
@@ -228,10 +229,29 @@ func (moa *MultiOrgAlertmanager) gettableUserConfigFromAMConfigString(ctx contex
 		return definitions.GettableUserConfig{}, fmt.Errorf("failed to decrypt external configurations: %w", err)
 	}
 
+	var alertmanagerConfig definitions.PostableApiAlertingConfig
+	var templateFiles map[string]string
+	if withMergedExtraConfig && len(cfg.ExtraConfigs) > 0 {
+		mergeResult, err := cfg.GetMergedAlertmanagerConfig()
+		if err != nil {
+			return definitions.GettableUserConfig{}, fmt.Errorf("failed to merge configuration: %w", err)
+		}
+		alertmanagerConfig = mergeResult.Config
+
+		mergedTemplates := cfg.GetMergedTemplateDefinitions()
+		templateFiles = make(map[string]string, len(mergedTemplates))
+		for _, t := range mergedTemplates {
+			templateFiles[t.Name] = t.Content
+		}
+	} else {
+		alertmanagerConfig = cfg.AlertmanagerConfig
+		templateFiles = cfg.TemplateFiles
+	}
+
 	result := definitions.GettableUserConfig{
-		TemplateFiles: cfg.TemplateFiles,
+		TemplateFiles: templateFiles,
 		AlertmanagerConfig: definitions.GettableApiAlertingConfig{
-			Config: cfg.AlertmanagerConfig.Config,
+			Config: alertmanagerConfig.Config,
 		},
 		ExtraConfigs: cfg.ExtraConfigs,
 	}
@@ -239,13 +259,13 @@ func (moa *MultiOrgAlertmanager) gettableUserConfigFromAMConfigString(ctx contex
 	// First we encrypt the secure settings.
 	// This is done to ensure that any secure settings incorrectly stored in Settings are encrypted and moved to
 	// SecureSettings. This can happen if an integration definition is updated to make a field secure.
-	if err := EncryptReceiverConfigSettings(cfg.AlertmanagerConfig.Receivers, func(ctx context.Context, payload []byte) ([]byte, error) {
+	if err := EncryptReceiverConfigSettings(alertmanagerConfig.Receivers, func(ctx context.Context, payload []byte) ([]byte, error) {
 		return moa.Crypto.Encrypt(ctx, payload, secrets.WithoutScope())
 	}); err != nil {
 		return definitions.GettableUserConfig{}, fmt.Errorf("failed to encrypt receivers: %w", err)
 	}
 
-	for _, recv := range cfg.AlertmanagerConfig.Receivers {
+	for _, recv := range alertmanagerConfig.Receivers {
 		receivers := make([]*definitions.GettableGrafanaReceiver, 0, len(recv.GrafanaManagedReceivers))
 		for _, pr := range recv.GrafanaManagedReceivers {
 			secureFields := make(map[string]bool, len(pr.SecureSettings))
diff --git a/pkg/services/ngalert/notifier/alertmanager_config_test.go b/pkg/services/ngalert/notifier/alertmanager_config_test.go
index 642ca5e3c04..3b12153da98 100644
--- a/pkg/services/ngalert/notifier/alertmanager_config_test.go
+++ b/pkg/services/ngalert/notifier/alertmanager_config_test.go
@@ -48,7 +48,7 @@ receivers:
 		err := mam.SaveAndApplyExtraConfiguration(ctx, orgID, extraConfig)
 		require.NoError(t, err)
 
-		gettableConfig, err := mam.GetAlertmanagerConfiguration(ctx, orgID, false)
+		gettableConfig, err := mam.GetAlertmanagerConfiguration(ctx, orgID, false, false)
 		require.NoError(t, err)
 		require.Len(t, gettableConfig.ExtraConfigs, 1)
 		require.Equal(t, extraConfig.Identifier, gettableConfig.ExtraConfigs[0].Identifier)
@@ -98,7 +98,7 @@ receivers:
 		require.NoError(t, err)
 
 		// Verify only one config exists with updated content
-		gettableConfig, err := mam.GetAlertmanagerConfiguration(ctx, orgID, false)
+		gettableConfig, err := mam.GetAlertmanagerConfiguration(ctx, orgID, false, false)
 		require.NoError(t, err)
 		require.Len(t, gettableConfig.ExtraConfigs, 1)
 		require.Equal(t, identifier, gettableConfig.ExtraConfigs[0].Identifier)
@@ -172,14 +172,14 @@ receivers:
 		err := mam.SaveAndApplyExtraConfiguration(ctx, orgID, extraConfig)
 		require.NoError(t, err)
 
-		gettableConfig, err := mam.GetAlertmanagerConfiguration(ctx, orgID, false)
+		gettableConfig, err := mam.GetAlertmanagerConfiguration(ctx, orgID, false, false)
 		require.NoError(t, err)
 		require.Len(t, gettableConfig.ExtraConfigs, 1)
 
 		err = mam.DeleteExtraConfiguration(ctx, orgID, identifier)
 		require.NoError(t, err)
 
-		gettableConfig, err = mam.GetAlertmanagerConfiguration(ctx, orgID, false)
+		gettableConfig, err = mam.GetAlertmanagerConfiguration(ctx, orgID, false, false)
 		require.NoError(t, err)
 		require.Len(t, gettableConfig.ExtraConfigs, 0)
 	})
diff --git a/pkg/tests/api/alerting/api_alertmanager_extra_config_test.go b/pkg/tests/api/alerting/api_alertmanager_extra_config_test.go
new file mode 100644
index 00000000000..77f5ce83b85
--- /dev/null
+++ b/pkg/tests/api/alerting/api_alertmanager_extra_config_test.go
@@ -0,0 +1,109 @@
+package alerting
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/tests/testinfra"
+)
+
+func TestIntegrationAlertmanagerExtraConfigMerging(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test in short mode")
+	}
+
+	testinfra.SQLiteIntegrationTest(t)
+
+	dir, gpath := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableLegacyAlerting: true,
+		EnableUnifiedAlerting: true,
+		DisableAnonymous:      true,
+		AppModeProduction:     true,
+		EnableFeatureToggles: []string{
+			"alertingImportAlertmanagerAPI",
+			"alertingImportAlertmanagerUI",
+		},
+	})
+
+	grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, gpath)
+	apiClient := newAlertingApiClient(grafanaListedAddr, "admin", "admin")
+
+	t.Run("retrieve merged configuration via extra config datasource", func(t *testing.T) {
+		// first upload standard alertmanager configuration
+		baseConfig := apimodels.PostableUserConfig{}
+		baseConfigJSON := `{
+			"alertmanager_config": {
+				"route": {
+					"receiver": "base-default"
+				},
+				"receivers": [{
+					"name": "base-default",
+					"grafana_managed_receiver_configs": [{
+						"name": "base-email",
+						"type": "email",
+						"settings": {
+							"addresses": "example@grafana.com"
+						}
+					}]
+				}]
+			},
+			"template_files": {
+				"base.tmpl": "{{ define \"base.template\" }}Base Template{{ end }}"
+			}
+		}`
+		err := json.Unmarshal([]byte(baseConfigJSON), &baseConfig)
+		require.NoError(t, err)
+
+		err = env.Server.HTTPServer.AlertNG.MultiOrgAlertmanager.SaveAndApplyAlertmanagerConfiguration(context.Background(), 1, baseConfig)
+		require.NoError(t, err)
+
+		//now add extra configuration
+		extraHeaders := map[string]string{
+			"Content-Type":                      "application/yaml",
+			"X-Grafana-Alerting-Merge-Matchers": "imported=true",
+		}
+
+		extraConfigYAML := `
+route:
+  receiver: extra-webhook
+
+receivers:
+- name: extra-webhook
+  webhook_configs:
+  - url: 'http://external.example.com/webhook'
+`
+
+		extraConfig := apimodels.AlertmanagerUserConfig{
+			AlertmanagerConfig: extraConfigYAML,
+			TemplateFiles: map[string]string{
+				"extra.tmpl": `{{ define "extra.template" }}Extra Template{{ end }}`,
+			},
+		}
+
+		response := apiClient.ConvertPrometheusPostAlertmanagerConfig(t, extraConfig, extraHeaders)
+		require.Equal(t, "success", response.Status)
+
+		// get the merged configuration and check it
+		datasourceUID := "~grafana-with-extra-config"
+		mergedConfig := apiClient.GetAlertmanagerConfigForDatasource(t, datasourceUID)
+
+		receiverNames := make(map[string]bool)
+		for _, recv := range mergedConfig.AlertmanagerConfig.Receivers {
+			receiverNames[recv.Name] = true
+		}
+
+		require.True(t, receiverNames["base-default"])
+		require.True(t, receiverNames["extra-webhook"])
+
+		require.Contains(t, mergedConfig.TemplateFiles, "base.tmpl", "Base template should be present")
+		require.Equal(t, `{{ define "base.template" }}Base Template{{ end }}`, mergedConfig.TemplateFiles["base.tmpl"])
+		require.Contains(t, mergedConfig.TemplateFiles, "extra.tmpl", "Extra template should be present")
+		require.Equal(t, `{{ define "extra.template" }}Extra Template{{ end }}`, mergedConfig.TemplateFiles["extra.tmpl"])
+
+		require.NotNil(t, mergedConfig.AlertmanagerConfig.Route)
+	})
+}
diff --git a/pkg/tests/api/alerting/testing.go b/pkg/tests/api/alerting/testing.go
index b3b7166b2e6..8be4ff183d6 100644
--- a/pkg/tests/api/alerting/testing.go
+++ b/pkg/tests/api/alerting/testing.go
@@ -1053,6 +1053,16 @@ func (a apiClient) GetAlertmanagerConfigWithStatus(t *testing.T) (apimodels.Gett
 	return sendRequestJSON[apimodels.GettableUserConfig](t, req, http.StatusOK)
 }
 
+func (a apiClient) GetAlertmanagerConfigForDatasource(t *testing.T, datasourceUID string) apimodels.GettableUserConfig {
+	t.Helper()
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/alertmanager/%s/config/api/v1/alerts", a.url, datasourceUID), nil)
+	require.NoError(t, err)
+
+	config, status, body := sendRequestJSON[apimodels.GettableUserConfig](t, req, http.StatusOK)
+	requireStatusCode(t, http.StatusOK, status, body)
+	return config
+}
+
 func (a apiClient) GetActiveAlertsWithStatus(t *testing.T) (apimodels.AlertGroups, int, string) {
 	t.Helper()
 	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/alertmanager/grafana/api/v2/alerts/groups", a.url), nil)

From 0705a44b0f0d4c0e3856348c81d59ed1d81918a1 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Thu, 14 Aug 2025 10:33:28 +0200
Subject: [PATCH 160/243] DashboardScenePageStateManager: Pass query params to
 `loadDashboard` when `reloadDashboardsOnParamsChange` enabled (#109543)

* DashboardScenePageStateManager: Pass query params to loadDashboard when reloadDashboardsOnParamsChange enabled

- Extract query param processing into helper function
- Pass processed params to loadDashboard when toggle is on
- Add test coverage for query parameter handling

* review
---
 .../DashboardScenePageStateManager.test.ts    | 139 ++++++++++++++++++
 .../pages/DashboardScenePageStateManager.ts   |  11 +-
 .../features/dashboard-scene/pages/utils.ts   |  48 ++++++
 public/app/features/dashboard/api/v1.ts       |   6 +-
 4 files changed, 199 insertions(+), 5 deletions(-)

diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
index a6bab169cc6..572f91f60d7 100644
--- a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
+++ b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
@@ -36,6 +36,7 @@ jest.mock('@grafana/runtime', () => {
       featureToggles: {
         ...original.config.featureToggles,
         dashboardNewLayouts: false, // Default value
+        reloadDashboardsOnParamsChange: false, // Default value
       },
 
       bootData: {
@@ -122,11 +123,46 @@ const mockDashboardLoader = {
 // Set the mock loader
 setDashboardLoaderSrv(mockDashboardLoader as unknown as DashboardLoaderSrv);
 
+// Test helpers for query parameter processing tests
+const mockTimeAndLocation = (mockNow: Date, queryParams: Record<string, string>) => {
+  const originalDateNow = Date.now;
+  Date.now = jest.fn(() => mockNow.getTime());
+
+  const mockGetSearch = jest.fn().mockReturnValue(new URLSearchParams());
+  const mockGetSearchObject = jest.fn().mockReturnValue(queryParams);
+
+  locationService.getSearch = mockGetSearch;
+  locationService.getSearchObject = mockGetSearchObject;
+
+  return () => {
+    Date.now = originalDateNow;
+  };
+};
+
+const withFeatureToggle = (enabled: boolean, testFn: () => Promise<void>) => async () => {
+  const originalValue = config.featureToggles.reloadDashboardsOnParamsChange;
+  config.featureToggles.reloadDashboardsOnParamsChange = enabled;
+
+  try {
+    await testFn();
+  } finally {
+    config.featureToggles.reloadDashboardsOnParamsChange = originalValue;
+  }
+};
+
+// Test constants
+const MOCK_DASHBOARD = { dashboard: { uid: 'fake-dash', editable: true }, meta: {} };
+const MOCK_NOW = new Date('2023-10-01T12:00:00.000Z');
+
 // Reset the mock between tests
 beforeEach(() => {
   jest.clearAllMocks();
   mockDashboardLoader.loadDashboard.mockReset();
   mockDashboardLoader.loadSnapshot.mockReset();
+
+  // Reset locationService mocks
+  locationService.getSearch = jest.fn().mockReturnValue(new URLSearchParams());
+  locationService.getSearchObject = jest.fn().mockReturnValue({});
 });
 
 describe('DashboardScenePageStateManager v1', () => {
@@ -152,6 +188,109 @@ describe('DashboardScenePageStateManager v1', () => {
       expect(loadDashboardMock.mock.calls.length).toBe(1);
     });
 
+    describe('reloadDashboardsOnParamsChange feature toggle', () => {
+      it(
+        'should process query params when enabled',
+        withFeatureToggle(true, async () => {
+          const cleanup = mockTimeAndLocation(MOCK_NOW, {
+            from: 'now-1h',
+            to: 'now',
+            timezone: 'UTC',
+            extraParam: 'shouldBeRemoved',
+          });
+
+          const expectedFromISO = '2023-10-01T06:00:00.000Z'; // now-1h (calculated by dateMath)
+          const expectedToISO = '2023-10-01T12:00:00.000Z'; // now
+
+          const loadDashboardMock = setupLoadDashboardMock(MOCK_DASHBOARD);
+
+          const loader = new DashboardScenePageStateManager({});
+          await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+
+          // Verify that loadDashboard was called with processed query params
+          expect(loadDashboardMock).toHaveBeenCalledWith(
+            'db',
+            '',
+            'fake-dash',
+            expect.objectContaining({
+              from: expectedFromISO,
+              to: expectedToISO,
+            })
+          );
+
+          // Verify that extra parameters were filtered out (including timezone)
+          const callArgs = loadDashboardMock.mock.calls[0][3];
+          expect(callArgs).not.toHaveProperty('extraParam');
+          expect(callArgs).not.toHaveProperty('timezone'); // timezone is filtered out by design
+
+          cleanup();
+        })
+      );
+
+      it(
+        'should pass undefined query params when disabled',
+        withFeatureToggle(false, async () => {
+          const loadDashboardMock = setupLoadDashboardMock(MOCK_DASHBOARD);
+
+          const loader = new DashboardScenePageStateManager({});
+          await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+
+          // Verify that loadDashboard was called without query params (3 parameters only)
+          expect(loadDashboardMock).toHaveBeenCalledWith('db', '', 'fake-dash');
+        })
+      );
+
+      it(
+        'should filter parameters correctly when enabled',
+        withFeatureToggle(true, async () => {
+          const cleanup = mockTimeAndLocation(MOCK_NOW, {
+            from: 'now-6h',
+            to: 'now',
+            'var-server': 'web-01',
+            'var-env': 'production',
+            scopes: 'scope1,scope2',
+            version: '2',
+            refresh: '5s', // should be filtered out
+            theme: 'dark', // should be filtered out
+            kiosk: 'true', // should be filtered out
+          });
+
+          const expectedFromISO = '2023-10-01T06:00:00.000Z'; // now-6h
+          const expectedToISO = '2023-10-01T12:00:00.000Z'; // now
+
+          const loadDashboardMock = setupLoadDashboardMock(MOCK_DASHBOARD);
+
+          const loader = new DashboardScenePageStateManager({});
+          await loader.loadDashboard({ uid: 'fake-dash', route: DashboardRoutes.Normal });
+
+          const callArgs = loadDashboardMock.mock.calls[0][3];
+
+          // Should keep allowed parameters with specific expected values
+          expect(callArgs).toEqual(
+            expect.objectContaining({
+              from: expectedFromISO,
+              to: expectedToISO,
+              'var-server': 'web-01',
+              'var-env': 'production',
+              scopes: 'scope1,scope2',
+              version: '2',
+            })
+          );
+
+          // Should filter out disallowed parameters
+          expect(callArgs).toEqual(
+            expect.not.objectContaining({
+              refresh: expect.anything(),
+              theme: expect.anything(),
+              kiosk: expect.anything(),
+            })
+          );
+
+          cleanup();
+        })
+      );
+    });
+
     it("should error when the dashboard doesn't exist", async () => {
       setupLoadDashboardMockReject({
         status: 404,
diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts
index 19ddab65c0a..18b4098fa9c 100644
--- a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts
+++ b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts
@@ -36,7 +36,7 @@ import { transformSaveModelSchemaV2ToScene } from '../serialization/transformSav
 import { transformSaveModelToScene } from '../serialization/transformSaveModelToScene';
 import { restoreDashboardStateFromLocalStorage } from '../utils/dashboardSessionState';
 
-import { updateNavModel } from './utils';
+import { processQueryParamsForDashboardLoad, updateNavModel } from './utils';
 
 export interface LoadError {
   status?: number;
@@ -447,7 +447,14 @@ export class DashboardScenePageStateManager extends DashboardScenePageStateManag
           return await dashboardLoaderSrv.loadDashboard('public', '', uid);
         }
         default:
-          rsp = await dashboardLoaderSrv.loadDashboard(type || 'db', slug || '', uid);
+          // If reloadDashboardsOnParamsChange is on, we need to process query params for dashboard load
+          // Since the scene is not yet there, we need to process whatever came through URL
+          if (config.featureToggles.reloadDashboardsOnParamsChange) {
+            const queryParamsObject = processQueryParamsForDashboardLoad();
+            rsp = await dashboardLoaderSrv.loadDashboard(type || 'db', slug || '', uid, queryParamsObject);
+          } else {
+            rsp = await dashboardLoaderSrv.loadDashboard(type || 'db', slug || '', uid);
+          }
 
           if (route === DashboardRoutes.Embedded) {
             rsp.meta.isEmbedded = true;
diff --git a/public/app/features/dashboard-scene/pages/utils.ts b/public/app/features/dashboard-scene/pages/utils.ts
index 2e06429589f..d540e8fbdb5 100644
--- a/public/app/features/dashboard-scene/pages/utils.ts
+++ b/public/app/features/dashboard-scene/pages/utils.ts
@@ -1,3 +1,5 @@
+import { UrlQueryMap, getTimeZone, getDefaultTimeRange, dateMath } from '@grafana/data';
+import { locationService } from '@grafana/runtime';
 import { updateNavIndex } from 'app/core/actions';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { buildNavModel } from 'app/features/folders/state/navModel';
@@ -11,3 +13,49 @@ export async function updateNavModel(folderUid: string) {
     console.warn('Error fetching parent folder', folderUid, 'for dashboard', err);
   }
 }
+
+/**
+ * Processes query parameters for dashboard loading, normalizing time range and filtering allowed parameters
+ */
+export function processQueryParamsForDashboardLoad(): UrlQueryMap {
+  const queryParams = locationService.getSearch();
+  const queryParamsObject = locationService.getSearchObject();
+
+  queryParamsObject.timezone = queryParams.get('timezone') ?? undefined;
+  const now = Date.now();
+  const timeZone = getTimeZone({
+    timeZone: queryParams.get('timezone') ?? undefined,
+  });
+  const defaultTimeRange = getDefaultTimeRange();
+
+  const fromQP = queryParams.get('from');
+  const toQP = queryParams.get('to');
+
+  const to = toQP
+    ? dateMath.toDateTime(toQP, {
+        roundUp: true,
+        timezone: timeZone,
+        now: now,
+      })
+    : undefined;
+
+  const from = fromQP
+    ? dateMath.toDateTime(fromQP, {
+        roundUp: false,
+        timezone: timeZone,
+        now: now,
+      })
+    : undefined;
+
+  queryParamsObject.from = from?.toISOString() ?? defaultTimeRange.from.toISOString();
+  queryParamsObject.to = to?.toISOString() ?? defaultTimeRange.to.toISOString();
+
+  // Remove all properties that are not from, to, scopes, version or start with var-
+  Object.keys(queryParamsObject).forEach((key) => {
+    if (key !== 'from' && key !== 'to' && key !== 'scopes' && key !== 'version' && !key.startsWith('var-')) {
+      delete queryParamsObject[key];
+    }
+  });
+
+  return queryParamsObject;
+}
diff --git a/public/app/features/dashboard/api/v1.ts b/public/app/features/dashboard/api/v1.ts
index 62f069c015d..f14576d9983 100644
--- a/public/app/features/dashboard/api/v1.ts
+++ b/public/app/features/dashboard/api/v1.ts
@@ -1,4 +1,4 @@
-import { locationUtil } from '@grafana/data';
+import { locationUtil, UrlQueryMap } from '@grafana/data';
 import { t } from '@grafana/i18n';
 import { Dashboard } from '@grafana/schema';
 import { Status } from '@grafana/schema/src/schema/dashboard/v2';
@@ -115,9 +115,9 @@ export class K8sDashboardAPI implements DashboardAPI<DashboardDTO, Dashboard> {
     }));
   }
 
-  async getDashboardDTO(uid: string) {
+  async getDashboardDTO(uid: string, params?: UrlQueryMap) {
     try {
-      const dash = await this.client.subresource<DashboardWithAccessInfo<DashboardDataDTO>>(uid, 'dto');
+      const dash = await this.client.subresource<DashboardWithAccessInfo<DashboardDataDTO>>(uid, 'dto', params);
 
       // This could come as conversion error from v0 or v2 to V1.
       if (dash.status?.conversion?.failed && isV2StoredVersion(dash.status.conversion.storedVersion)) {

From c4b018352f629db19281fc99c77cbf6fb43e9236 Mon Sep 17 00:00:00 2001
From: "grafana-pr-automation[bot]"
 <140550294+grafana-pr-automation[bot]@users.noreply.github.com>
Date: Thu, 14 Aug 2025 08:43:46 +0000
Subject: [PATCH 161/243] I18n: Download translations from Crowdin (#109642)

New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 public/locales/cs-CZ/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/de-DE/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/es-ES/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/fr-FR/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/hu-HU/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/id-ID/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/it-IT/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/ja-JP/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/ko-KR/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/nl-NL/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/pl-PL/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/pt-BR/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/pt-PT/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/ru-RU/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/sv-SE/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/tr-TR/grafana.json   | 44 ++++++++++++++++++++++++++---
 public/locales/zh-Hans/grafana.json | 44 ++++++++++++++++++++++++++---
 public/locales/zh-Hant/grafana.json | 44 ++++++++++++++++++++++++++---
 18 files changed, 720 insertions(+), 72 deletions(-)

diff --git a/public/locales/cs-CZ/grafana.json b/public/locales/cs-CZ/grafana.json
index a6da0ea84cd..e5191728bc1 100644
--- a/public/locales/cs-CZ/grafana.json
+++ b/public/locales/cs-CZ/grafana.json
@@ -5381,6 +5381,7 @@
       "playlist-next": "Přejít na další nástěnku",
       "playlist-previous": "Přejít na předchozí nástěnku",
       "playlist-stop": "Zastavit playlist",
+      "read-only": "",
       "refresh": "Obnovit nástěnku",
       "save": "Uložit nástěnku",
       "save-dashboard": {
@@ -7516,6 +7517,13 @@
       "tooltip-title": "Matematický operátor",
       "tooltip-trigger": "Výraz"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Funkce",
       "label-input": "Vstup",
@@ -7531,6 +7539,11 @@
       "label-upsample": "Zvýšit vzorkovací frekvenci",
       "tooltip-s-m-h": "10s, 1m, 30m, 1h"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Vstup"
     }
@@ -7547,7 +7560,8 @@
     "loading": "Načítání složek…"
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10924,7 +10938,6 @@
         "downloads": "Stažení",
         "from": "Od",
         "installedVersion": "Nainstalovaná verze",
-        "lastCommitDate": "Datum posledního nasazení:",
         "latestReleaseDate": "Nejnovější datum vydání:",
         "latestVersion": "Poslední verze",
         "license": "Licence",
@@ -11483,6 +11496,8 @@
         "subtitle": "Tuto možnost použijte, pokud chcete synchronizovat a spravovat celou instanci Grafany prostřednictvím externího úložiště."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "aktivní práce",
       "column-action": "Akce",
@@ -11501,6 +11516,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "Nastavení",
       "view": "Zobrazit"
     },
@@ -11918,6 +11934,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Sbalit řádek dotazu",
       "datasource-help": "Zobrazit nápovědu pro zdroj dat",
       "drag-and-drop": "Přetažením změníte pořadí",
@@ -11928,7 +11945,11 @@
       "replace-query-from-library": "Nahradit dotazem z knihovny",
       "show-response": "Zobrazit odpověď"
     },
-    "query-editor-not-exported": "Doplněk zdroje dat neexportuje žádnou komponentu editoru dotazů"
+    "query-editor-not-exported": "Doplněk zdroje dat neexportuje žádnou komponentu editoru dotazů",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12170,7 +12191,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Přidat účet služby",
-      "message": "Nebyly nalezeny žádné účty služeb",
+      "message": "",
       "more-info": "Nezapomeňte, že můžete poskytnout specifická oprávnění pro přístup API k jiným aplikacím",
       "title": "Dosud jste nevytvořili žádné účty služeb"
     }
@@ -12566,6 +12587,21 @@
   "sort-picker": {
     "select-aria-label": "Třídit"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Orientace rozvržení",
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 0adbd50fce1..773e3bf16fa 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -5343,6 +5343,7 @@
       "playlist-next": "Zum nächsten Dashboard",
       "playlist-previous": "Zum vorherigen Dashboard",
       "playlist-stop": "Wiedergabeliste stoppen",
+      "read-only": "",
       "refresh": "Dashboard aktualisieren",
       "save": "Dashboard speichern",
       "save-dashboard": {
@@ -7474,6 +7475,13 @@
       "tooltip-title": "Mathematik-Operator",
       "tooltip-trigger": "Ausdruck"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Funktion",
       "label-input": "Eingabe",
@@ -7489,6 +7497,11 @@
       "label-upsample": "Upsample",
       "tooltip-s-m-h": "10 s, 1 min., 30 min., 1 h"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Eingabe"
     }
@@ -7505,7 +7518,8 @@
     "loading": "Ordner werden geladen …"
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10860,7 +10874,6 @@
         "downloads": "Downloads",
         "from": "",
         "installedVersion": "Installierte Version",
-        "lastCommitDate": "Letztes Commit-Datum:",
         "latestReleaseDate": "Neuestes Release-Datum:",
         "latestVersion": "Aktuelle Version",
         "license": "Lizenz",
@@ -11413,6 +11426,8 @@
         "subtitle": "Nutzen Sie diese Option, wenn Sie Ihre gesamte Grafana-Instanz über einen externen Speicher synchronisieren und verwalten möchten."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "Aktive Aufträge",
       "column-action": "Aktion",
@@ -11431,6 +11446,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "Einstellungen",
       "view": "Anzeigen"
     },
@@ -11846,6 +11862,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Abfragezeile einklappen",
       "datasource-help": "Datenquellen-Hilfe anzeigen",
       "drag-and-drop": "Ziehen und Ablegen zum Neuordnen",
@@ -11856,7 +11873,11 @@
       "replace-query-from-library": "Mit Abfrage von Bibliothek ersetzen",
       "show-response": "Antwort anzeigen "
     },
-    "query-editor-not-exported": "Datenquellen-Plugin exportiert keine Komponente des Abfrageeditors"
+    "query-editor-not-exported": "Datenquellen-Plugin exportiert keine Komponente des Abfrageeditors",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12092,7 +12113,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Dienstkonto hinzufügen",
-      "message": "Keine Dienstkonten gefunden",
+      "message": "",
       "more-info": "Bitte beachten Sie, dass Sie bestimmte Berechtigungen für den API-Zugriff auf andere Anwendungen vergeben können",
       "title": "Sie haben noch keine Dienstkonten erstellt"
     }
@@ -12486,6 +12507,21 @@
   "sort-picker": {
     "select-aria-label": "Sortieren"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Layout-Ausrichtung",
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index a2dc9c7d73a..14c106de1e6 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -5343,6 +5343,7 @@
       "playlist-next": "Ir al siguiente panel de control",
       "playlist-previous": "Ir al panel de control anterior",
       "playlist-stop": "Detener la lista de reproducción",
+      "read-only": "",
       "refresh": "Actualizar panel de control",
       "save": "Guardar panel de control",
       "save-dashboard": {
@@ -7474,6 +7475,13 @@
       "tooltip-title": "Operador matemático",
       "tooltip-trigger": "Expresión"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Función",
       "label-input": "Entrada",
@@ -7489,6 +7497,11 @@
       "label-upsample": "Aumentar tamaño",
       "tooltip-s-m-h": "10 s, 1 m, 30 m, 1 h"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Entrada"
     }
@@ -7505,7 +7518,8 @@
     "loading": "Cargando carpetas..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10860,7 +10874,6 @@
         "downloads": "Descargas",
         "from": "",
         "installedVersion": "Versión instalada",
-        "lastCommitDate": "Fecha de la última confirmación:",
         "latestReleaseDate": "Fecha último lanzamiento:",
         "latestVersion": "Versión más reciente",
         "license": "Licencia",
@@ -11413,6 +11426,8 @@
         "subtitle": "Utiliza esta opción si quieres sincronizar y administrar toda tu instancia de Grafana a través de un almacenamiento externo."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "trabajos activos",
       "column-action": "Acción",
@@ -11431,6 +11446,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "Configuración",
       "view": "Vista"
     },
@@ -11846,6 +11862,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Contraer la fila de la consulta",
       "datasource-help": "Mostrar la ayuda de la fuente de datos",
       "drag-and-drop": "Arrastrar y soltar para reordenar",
@@ -11856,7 +11873,11 @@
       "replace-query-from-library": "Reemplazar con consulta de la librería",
       "show-response": "Mostrar respuesta"
     },
-    "query-editor-not-exported": "El complemento de la fuente de datos no exporta ningún componente del editor de consultas"
+    "query-editor-not-exported": "El complemento de la fuente de datos no exporta ningún componente del editor de consultas",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12092,7 +12113,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Añadir cuenta de servicio",
-      "message": "No se han encontrado cuentas de servicio",
+      "message": "",
       "more-info": "Recuerda que puedes proporcionar permisos específicos para el acceso a la API a otras aplicaciones",
       "title": "Aún no has creado ninguna cuenta de servicio"
     }
@@ -12486,6 +12507,21 @@
   "sort-picker": {
     "select-aria-label": "Ordenar"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Orientación del diseño",
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 296906ad52d..47935428416 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -5343,6 +5343,7 @@
       "playlist-next": "Accéder au tableau de bord suivant",
       "playlist-previous": "Accéder au tableau de bord précédent",
       "playlist-stop": "Arrêter la liste de lecture",
+      "read-only": "",
       "refresh": "Actualiser le tableau de bord",
       "save": "Enregistrer le tableau de bord",
       "save-dashboard": {
@@ -7474,6 +7475,13 @@
       "tooltip-title": "Opérateur mathématique",
       "tooltip-trigger": "Expression"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Fonction",
       "label-input": "Entrée",
@@ -7489,6 +7497,11 @@
       "label-upsample": "Sur-échantillonner",
       "tooltip-s-m-h": "10 s, 1 m, 30 m, 1 h"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Entrée"
     }
@@ -7505,7 +7518,8 @@
     "loading": "Chargement des dossiers..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10860,7 +10874,6 @@
         "downloads": "Téléchargements",
         "from": "",
         "installedVersion": "Version installée",
-        "lastCommitDate": "Date de la dernière propagation :",
         "latestReleaseDate": "Dernière date de sortie :",
         "latestVersion": "Dernière version",
         "license": "Licence",
@@ -11413,6 +11426,8 @@
         "subtitle": "Utilisez cette option si vous souhaitez synchroniser et gérer l’ensemble de votre instance Grafana via un stockage externe."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "missions actives",
       "column-action": "Action",
@@ -11431,6 +11446,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "Paramètres",
       "view": "Afficher"
     },
@@ -11846,6 +11862,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Réduire la ligne de requête",
       "datasource-help": "Afficher l'aide de la source de données",
       "drag-and-drop": "Glisser et déposer pour réorganiser",
@@ -11856,7 +11873,11 @@
       "replace-query-from-library": "Remplacer par une requête à partir de la bibliothèque",
       "show-response": "Afficher la réponse"
     },
-    "query-editor-not-exported": "Le plugin source de données n'exporte aucun composant de l'éditeur de requête"
+    "query-editor-not-exported": "Le plugin source de données n'exporte aucun composant de l'éditeur de requête",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12092,7 +12113,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Ajouter un compte de service",
-      "message": "Aucun compte de service trouvé",
+      "message": "",
       "more-info": "N'oubliez pas que vous pouvez fournir des autorisations spécifiques pour l'accès à l'API à d'autres applications",
       "title": "Vous n'avez pas encore créé de comptes de service"
     }
@@ -12486,6 +12507,21 @@
   "sort-picker": {
     "select-aria-label": "Trier"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Orientation de la mise en page",
diff --git a/public/locales/hu-HU/grafana.json b/public/locales/hu-HU/grafana.json
index cc492f27354..df5109229fd 100644
--- a/public/locales/hu-HU/grafana.json
+++ b/public/locales/hu-HU/grafana.json
@@ -5343,6 +5343,7 @@
       "playlist-next": "Ugrás a következő irányítópulthoz",
       "playlist-previous": "Ugrás az előző irányítópulthoz",
       "playlist-stop": "Lejátszási lista leállítása",
+      "read-only": "",
       "refresh": "Irányítópult frissítése",
       "save": "Irányítópult mentése",
       "save-dashboard": {
@@ -7474,6 +7475,13 @@
       "tooltip-title": "Matematikai operátor",
       "tooltip-trigger": "Kifejezés"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Függvény",
       "label-input": "Bemenet",
@@ -7489,6 +7497,11 @@
       "label-upsample": "Mintasűrűség növelése",
       "tooltip-s-m-h": "10 mp., 1 p., 30 p., 1 ó."
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Bemenet"
     }
@@ -7505,7 +7518,8 @@
     "loading": "Mappák betöltése..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10860,7 +10874,6 @@
         "downloads": "Letöltések",
         "from": "Kezdet",
         "installedVersion": "Telepített verzió",
-        "lastCommitDate": "Legutóbbi teljesítés dátuma:",
         "latestReleaseDate": "Legújabb kiadás dátuma:",
         "latestVersion": "Legújabb verzió",
         "license": "Licenc",
@@ -11413,6 +11426,8 @@
         "subtitle": "Használja ezt a lehetőséget, ha külső tárolóeszközön keresztül szeretné szinkronizálni és kezelni a teljes Grafana-példányt."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "aktív feladatok",
       "column-action": "Művelet",
@@ -11431,6 +11446,7 @@
       "get-repository-meta": {
         "webhook": "Webkapocs"
       },
+      "read-only-badge": "",
       "settings": "Beállítások",
       "view": "Nézet"
     },
@@ -11846,6 +11862,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Lekérdezési sor összecsukása",
       "datasource-help": "Adatforrás súgójának megjelenítése",
       "drag-and-drop": "Húzza át az átrendezéshez",
@@ -11856,7 +11873,11 @@
       "replace-query-from-library": "Lecserélés könyvtárból származó lekérdezésre",
       "show-response": "Válasz megjelenítése"
     },
-    "query-editor-not-exported": "Az adatforrás-bővítmény nem exportál egyetlen lekérdezésszerkesztő-komponenst sem"
+    "query-editor-not-exported": "Az adatforrás-bővítmény nem exportál egyetlen lekérdezésszerkesztő-komponenst sem",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12092,7 +12113,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Szolgáltatási fiók",
-      "message": "Nem találhatók szolgáltatási fiókok",
+      "message": "",
       "more-info": "Ne feledje, hogy speciális engedélyeket adhat meg az API-hozzáféréshez más alkalmazások számára",
       "title": "Még nem hozott létre szolgáltatási fiókokat"
     }
@@ -12486,6 +12507,21 @@
   "sort-picker": {
     "select-aria-label": "Rendezés"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Elrendezés tájolása",
diff --git a/public/locales/id-ID/grafana.json b/public/locales/id-ID/grafana.json
index 1d30de5090f..c26ae218127 100644
--- a/public/locales/id-ID/grafana.json
+++ b/public/locales/id-ID/grafana.json
@@ -5324,6 +5324,7 @@
       "playlist-next": "Buka dasbor berikutnya",
       "playlist-previous": "Buka dasbor sebelumnya",
       "playlist-stop": "Hentikan daftar putar",
+      "read-only": "",
       "refresh": "Muat ulang dasbor",
       "save": "Simpan dasbor",
       "save-dashboard": {
@@ -7453,6 +7454,13 @@
       "tooltip-title": "Operator matematika",
       "tooltip-trigger": "Ekspresi"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Fungsi",
       "label-input": "Input",
@@ -7468,6 +7476,11 @@
       "label-upsample": "Tingkatkan sample",
       "tooltip-s-m-h": "10 dtk, 1 mnt, 30 mnt, 1 jm"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Input"
     }
@@ -7484,7 +7497,8 @@
     "loading": "Memuat folder..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10828,7 +10842,6 @@
         "downloads": "Unduhan",
         "from": "Dari",
         "installedVersion": "Versi Terinstal",
-        "lastCommitDate": "Tanggal melakukan terakhir:",
         "latestReleaseDate": "Tanggal rilis terbaru:",
         "latestVersion": "Versi Terbaru",
         "license": "Lisensi",
@@ -11378,6 +11391,8 @@
         "subtitle": "Gunakan opsi ini jika Anda ingin menyinkronkan dan mengelola seluruh instans Grafana melalui penyimpanan eksternal."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "pekerjaan aktif",
       "column-action": "Tindakan",
@@ -11396,6 +11411,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "Pengaturan",
       "view": "Lihat"
     },
@@ -11810,6 +11826,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Ciutkan baris kueri",
       "datasource-help": "Tampilkan bantuan sumber data",
       "drag-and-drop": "Seret dan lepas untuk menyusun ulang",
@@ -11820,7 +11837,11 @@
       "replace-query-from-library": "Ganti dengan kueri dari pustaka",
       "show-response": "Tampilkan respons"
     },
-    "query-editor-not-exported": "Plugin sumber data tidak mengekspor komponen Editor Kueri apa pun"
+    "query-editor-not-exported": "Plugin sumber data tidak mengekspor komponen Editor Kueri apa pun",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12053,7 +12074,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Tambahkan akun layanan",
-      "message": "Akun layanan tidak ditemukan",
+      "message": "",
       "more-info": "Ingat, Anda dapat memberikan izin khusus untuk akses API ke aplikasi lain",
       "title": "Anda belum membuat akun layanan"
     }
@@ -12446,6 +12467,21 @@
   "sort-picker": {
     "select-aria-label": "Urutkan"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Orientasi tata letak",
diff --git a/public/locales/it-IT/grafana.json b/public/locales/it-IT/grafana.json
index 93daf4871c2..aa5f1230f91 100644
--- a/public/locales/it-IT/grafana.json
+++ b/public/locales/it-IT/grafana.json
@@ -5343,6 +5343,7 @@
       "playlist-next": "Vai al dashboard successivo",
       "playlist-previous": "Vai al dashboard precedente",
       "playlist-stop": "Interrompi playlist",
+      "read-only": "",
       "refresh": "Aggiorna dashboard",
       "save": "Salva dashboard",
       "save-dashboard": {
@@ -7474,6 +7475,13 @@
       "tooltip-title": "Operatore matematico",
       "tooltip-trigger": "Espressione"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Funzione",
       "label-input": "Inserisci",
@@ -7489,6 +7497,11 @@
       "label-upsample": "Aumenta campionamento",
       "tooltip-s-m-h": "10 s, 1 m, 30 m, 1 h"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Inserisci"
     }
@@ -7505,7 +7518,8 @@
     "loading": "Caricamento delle cartelle in corso..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10860,7 +10874,6 @@
         "downloads": "Download",
         "from": "Da",
         "installedVersion": "Versione installata",
-        "lastCommitDate": "Data dell'ultimo commit:",
         "latestReleaseDate": "Data dell'ultima versione:",
         "latestVersion": "Versione più recente",
         "license": "Licenza",
@@ -11413,6 +11426,8 @@
         "subtitle": "Utilizza questa opzione se desideri sincronizzare e gestire l'intera istanza di Grafana tramite la memoria esterna."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "attività attive",
       "column-action": "Azione",
@@ -11431,6 +11446,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "Impostazioni",
       "view": "Visualizza"
     },
@@ -11846,6 +11862,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Riduci riga della query",
       "datasource-help": "Mostra la guida dell'origine dati",
       "drag-and-drop": "Trascina e rilascia per riordinare",
@@ -11856,7 +11873,11 @@
       "replace-query-from-library": "Sostituisci con query dalla libreria",
       "show-response": "Mostra la risposta"
     },
-    "query-editor-not-exported": "Il plug-in dell'origine dati non esporta alcun componente dell'editor di query"
+    "query-editor-not-exported": "Il plug-in dell'origine dati non esporta alcun componente dell'editor di query",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12092,7 +12113,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Aggiungi account di servizio",
-      "message": "Nessun account di servizio trovato",
+      "message": "",
       "more-info": "Ricorda, puoi fornire autorizzazioni specifiche per l'accesso API ad altre applicazioni",
       "title": "Non hai ancora creato nessun account di servizio"
     }
@@ -12486,6 +12507,21 @@
   "sort-picker": {
     "select-aria-label": "Ordina"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Orientamento del layout",
diff --git a/public/locales/ja-JP/grafana.json b/public/locales/ja-JP/grafana.json
index a95dba8e7b1..2a8f9b10885 100644
--- a/public/locales/ja-JP/grafana.json
+++ b/public/locales/ja-JP/grafana.json
@@ -5324,6 +5324,7 @@
       "playlist-next": "次のダッシュボードに移動",
       "playlist-previous": "前のダッシュボードに戻る",
       "playlist-stop": "プレイリストを停止",
+      "read-only": "",
       "refresh": "ダッシュボードを更新",
       "save": "ダッシュボードを保存",
       "save-dashboard": {
@@ -7453,6 +7454,13 @@
       "tooltip-title": "数学演算子",
       "tooltip-trigger": "式"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "関数",
       "label-input": "入力",
@@ -7468,6 +7476,11 @@
       "label-upsample": "アップサンプリング",
       "tooltip-s-m-h": "10秒、1分、30分、1時間"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "入力"
     }
@@ -7484,7 +7497,8 @@
     "loading": "フォルダを読み込んでいます..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10828,7 +10842,6 @@
         "downloads": "ダウンロード",
         "from": "開始",
         "installedVersion": "インストールされているバージョン",
-        "lastCommitDate": "最終コミット日：",
         "latestReleaseDate": "最新リリース日：",
         "latestVersion": "最新のバージョン",
         "license": "ライセンス",
@@ -11378,6 +11391,8 @@
         "subtitle": "外部ストレージを通じてGrafanaインスタンス全体を同期・管理したい場合は、このオプションを使用してください。"
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "アクティブなジョブ",
       "column-action": "操作",
@@ -11396,6 +11411,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "設定",
       "view": "表示"
     },
@@ -11810,6 +11826,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "クエリ行を折りたたむ",
       "datasource-help": "データソースヘルプを表示",
       "drag-and-drop": "ドラッグアンドドロップで並べ替え",
@@ -11820,7 +11837,11 @@
       "replace-query-from-library": "ライブラリからのクエリに置き換え",
       "show-response": "応答の表示"
     },
-    "query-editor-not-exported": "データソースプラグインは、クエリエディタコンポーネントをエクスポートしません"
+    "query-editor-not-exported": "データソースプラグインは、クエリエディタコンポーネントをエクスポートしません",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12053,7 +12074,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "サービスアカウントを追加",
-      "message": "サービスアカウントが見つかりません",
+      "message": "",
       "more-info": "他のアプリケーションに特定のAPIアクセス権限を提供できることを忘れないでください",
       "title": "まだサービスアカウントを作成していません"
     }
@@ -12446,6 +12467,21 @@
   "sort-picker": {
     "select-aria-label": "並べ替え"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "レイアウトの向き",
diff --git a/public/locales/ko-KR/grafana.json b/public/locales/ko-KR/grafana.json
index d345bfa6f5c..3c565ba3ef3 100644
--- a/public/locales/ko-KR/grafana.json
+++ b/public/locales/ko-KR/grafana.json
@@ -5324,6 +5324,7 @@
       "playlist-next": "다음 대시보드로 이동",
       "playlist-previous": "이전 대시보드로 이동",
       "playlist-stop": "플레이리스트 중지",
+      "read-only": "",
       "refresh": "대시보드 새로 고침",
       "save": "대시보드 저장",
       "save-dashboard": {
@@ -7453,6 +7454,13 @@
       "tooltip-title": "수학 연산자",
       "tooltip-trigger": "표현식"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "함수",
       "label-input": "입력",
@@ -7468,6 +7476,11 @@
       "label-upsample": "업샘플",
       "tooltip-s-m-h": "10초, 1분, 30분, 1시간"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "입력"
     }
@@ -7484,7 +7497,8 @@
     "loading": "폴더 로딩 중..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10828,7 +10842,6 @@
         "downloads": "다운로드",
         "from": "최저",
         "installedVersion": "설치된 버전",
-        "lastCommitDate": "마지막 담당 날짜:",
         "latestReleaseDate": "최신 릴리스 날짜:",
         "latestVersion": "최신 버전",
         "license": "라이선스",
@@ -11378,6 +11391,8 @@
         "subtitle": "외부 스토리지를 통해 전체 Grafana 인스턴스를 동기화하고 관리하려면 이 옵션을 사용하세요."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "활성 작업",
       "column-action": "동작",
@@ -11396,6 +11411,7 @@
       "get-repository-meta": {
         "webhook": "웹훅"
       },
+      "read-only-badge": "",
       "settings": "설정",
       "view": "보기"
     },
@@ -11810,6 +11826,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "쿼리 행 접기",
       "datasource-help": "데이터 소스 도움말 표시",
       "drag-and-drop": "드래그 앤 드롭으로 순서 변경",
@@ -11820,7 +11837,11 @@
       "replace-query-from-library": "라이브러리의 쿼리로 교체",
       "show-response": "응답 표시"
     },
-    "query-editor-not-exported": "데이터 소스 플러그인은 쿼리 편집기 구성 요소를 내보내지 않습니다."
+    "query-editor-not-exported": "데이터 소스 플러그인은 쿼리 편집기 구성 요소를 내보내지 않습니다.",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12053,7 +12074,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "서비스 계정 추가",
-      "message": "찾은 서비스 계정 없음",
+      "message": "",
       "more-info": "다른 애플리케이션에 대한 API 액세스 권한을 특정할 수 있습니다.",
       "title": "아직 생성된 서비스 계정이 없습니다."
     }
@@ -12446,6 +12467,21 @@
   "sort-picker": {
     "select-aria-label": "정렬"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "레이아웃 방향",
diff --git a/public/locales/nl-NL/grafana.json b/public/locales/nl-NL/grafana.json
index 4fc94354a24..77aa8b01d30 100644
--- a/public/locales/nl-NL/grafana.json
+++ b/public/locales/nl-NL/grafana.json
@@ -5343,6 +5343,7 @@
       "playlist-next": "Naar het volgende dashboard",
       "playlist-previous": "Naar het vorige dashboard",
       "playlist-stop": "Afspeellijst stoppen",
+      "read-only": "",
       "refresh": "Dashboard vernieuwen",
       "save": "Dashboard opslaan",
       "save-dashboard": {
@@ -7474,6 +7475,13 @@
       "tooltip-title": "Wiskundige operator",
       "tooltip-trigger": "Expressie"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Functie",
       "label-input": "Invoer",
@@ -7489,6 +7497,11 @@
       "label-upsample": "Upsample",
       "tooltip-s-m-h": "10s, 1m, 30m, 1u"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Invoer"
     }
@@ -7505,7 +7518,8 @@
     "loading": "Mappen laden ..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10860,7 +10874,6 @@
         "downloads": "Downloads",
         "from": "Van",
         "installedVersion": "Geïnstalleerde Versie",
-        "lastCommitDate": "Datum laatste inzet:",
         "latestReleaseDate": "Uiterste releasedatum:",
         "latestVersion": "Nieuwste versie",
         "license": "Licentie",
@@ -11413,6 +11426,8 @@
         "subtitle": "Gebruik deze optie als je je hele Grafana-instantie via externe opslag wilt synchroniseren en beheren."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "actieve taken",
       "column-action": "Actie",
@@ -11431,6 +11446,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "Instellingen",
       "view": "Weergave"
     },
@@ -11846,6 +11862,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Queryrij samenvouwen",
       "datasource-help": "Hulp bij gegevensbron weergeven",
       "drag-and-drop": "Versleep om opnieuw te rangschikken",
@@ -11856,7 +11873,11 @@
       "replace-query-from-library": "Vervangen door query uit bibliotheek",
       "show-response": "Antwoord weergeven"
     },
-    "query-editor-not-exported": "Gegevensbronplug-in exporteert geen Query Editor-component"
+    "query-editor-not-exported": "Gegevensbronplug-in exporteert geen Query Editor-component",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12092,7 +12113,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Serviceaccount toevoegen",
-      "message": "Geen servicesaccounts gevonden",
+      "message": "",
       "more-info": "Vergeet niet dat je specifieke toestemmingen kunt geven voor API-toegang tot andere applicaties",
       "title": "Je hebt nog geen serviceaccounts gemaakt"
     }
@@ -12486,6 +12507,21 @@
   "sort-picker": {
     "select-aria-label": "Sorteren"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Lay-outoriëntatie",
diff --git a/public/locales/pl-PL/grafana.json b/public/locales/pl-PL/grafana.json
index 67bae129d95..25487e1489e 100644
--- a/public/locales/pl-PL/grafana.json
+++ b/public/locales/pl-PL/grafana.json
@@ -5381,6 +5381,7 @@
       "playlist-next": "Przejdź do następnego pulpitu",
       "playlist-previous": "Przejdź do poprzedniego pulpitu",
       "playlist-stop": "Zatrzymaj autoodtwarzanie",
+      "read-only": "",
       "refresh": "Odśwież pulpit",
       "save": "Zapisz pulpit",
       "save-dashboard": {
@@ -7516,6 +7517,13 @@
       "tooltip-title": "Operator matematyczny",
       "tooltip-trigger": "Wyrażenie"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Funkcja",
       "label-input": "Wejście",
@@ -7531,6 +7539,11 @@
       "label-upsample": "Zwiększ próbkowanie",
       "tooltip-s-m-h": "10s, 1m, 30m, 1h"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Wejście"
     }
@@ -7547,7 +7560,8 @@
     "loading": "Ładowanie folderów…"
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10924,7 +10938,6 @@
         "downloads": "Do pobrania",
         "from": "Od",
         "installedVersion": "Zainstalowana wersja",
-        "lastCommitDate": "Data ostatniego zatwierdzenia:",
         "latestReleaseDate": "Data wydania najnowszej wersji:",
         "latestVersion": "Najnowsza wersja",
         "license": "Licencja",
@@ -11483,6 +11496,8 @@
         "subtitle": "Użyj tej opcji, jeśli chcesz synchronizować całą instancję usługi Grafana i zarządzać nią za pośrednictwem zewnętrznej pamięci masowej."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "aktywne zadania",
       "column-action": "Działanie",
@@ -11501,6 +11516,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "Ustawienia",
       "view": "Wyświetl"
     },
@@ -11918,6 +11934,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Zwiń wiersz zapytania",
       "datasource-help": "Pokaż pomoc dotyczącą źródła danych",
       "drag-and-drop": "Przeciągnij i upuść, aby zmienić kolejność",
@@ -11928,7 +11945,11 @@
       "replace-query-from-library": "Zastąp zapytanie z biblioteki",
       "show-response": "Pokaż odpowiedź"
     },
-    "query-editor-not-exported": "Wtyczka źródła danych nie eksportuje żadnego komponentu Edytora zapytań"
+    "query-editor-not-exported": "Wtyczka źródła danych nie eksportuje żadnego komponentu Edytora zapytań",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12170,7 +12191,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Dodaj konto usługi",
-      "message": "Nie znaleziono kont usługi",
+      "message": "",
       "more-info": "Pamiętaj, że możesz nadać określone uprawnienia dostępu do innych aplikacji przez API",
       "title": "Nie utworzono jeszcze żadnych kont usługi"
     }
@@ -12566,6 +12587,21 @@
   "sort-picker": {
     "select-aria-label": "Sortuj"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Orientacja układu",
diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json
index da0a7ce7c20..541d85332c1 100644
--- a/public/locales/pt-BR/grafana.json
+++ b/public/locales/pt-BR/grafana.json
@@ -5343,6 +5343,7 @@
       "playlist-next": "Ir para o próximo painel de controle",
       "playlist-previous": "Ir para o painel de controle anterior",
       "playlist-stop": "Parar lista de reprodução",
+      "read-only": "",
       "refresh": "Atualizar painel de controle",
       "save": "Salvar painel de controle",
       "save-dashboard": {
@@ -7474,6 +7475,13 @@
       "tooltip-title": "Operador matemático",
       "tooltip-trigger": "Expressão"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Função",
       "label-input": "Entrada",
@@ -7489,6 +7497,11 @@
       "label-upsample": "Aumentar taxa de amostragem",
       "tooltip-s-m-h": "10s, 1m, 30m, 1h"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Entrada"
     }
@@ -7505,7 +7518,8 @@
     "loading": "Carregando pastas..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10860,7 +10874,6 @@
         "downloads": "Downloads",
         "from": "",
         "installedVersion": "Versão instalada",
-        "lastCommitDate": "Data do último commit:",
         "latestReleaseDate": "Data de lançamento mais recente:",
         "latestVersion": "Última versão",
         "license": "Licença",
@@ -11413,6 +11426,8 @@
         "subtitle": "Use esta opção se você quiser sincronizar e gerenciar toda a sua instância da Grafana por meio de armazenamento externo."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "tarefas ativas",
       "column-action": "Ação",
@@ -11431,6 +11446,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "Configurações",
       "view": "Visualizar"
     },
@@ -11846,6 +11862,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Recolher linha de consulta",
       "datasource-help": "Mostrar ajuda da fonte de dados",
       "drag-and-drop": "Arraste e solte para reordenar",
@@ -11856,7 +11873,11 @@
       "replace-query-from-library": "Substituir por consulta da biblioteca",
       "show-response": "Mostrar resposta"
     },
-    "query-editor-not-exported": "O plug-in de origem de dados não exporta nenhum componente de editor de consulta"
+    "query-editor-not-exported": "O plug-in de origem de dados não exporta nenhum componente de editor de consulta",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12092,7 +12113,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Adicionar conta de serviço",
-      "message": "Nenhuma conta de serviço encontrada",
+      "message": "",
       "more-info": "Lembre-se de que você pode fornecer permissões específicas de acesso à API para outros aplicativos",
       "title": "Você ainda não criou nenhuma conta de serviço"
     }
@@ -12486,6 +12507,21 @@
   "sort-picker": {
     "select-aria-label": "Ordenar"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Orientação do layout",
diff --git a/public/locales/pt-PT/grafana.json b/public/locales/pt-PT/grafana.json
index 4654ef9a6c5..11216f50b18 100644
--- a/public/locales/pt-PT/grafana.json
+++ b/public/locales/pt-PT/grafana.json
@@ -5343,6 +5343,7 @@
       "playlist-next": "Ir para o próximo painel de controlo",
       "playlist-previous": "Ir para o painel de controlo anterior",
       "playlist-stop": "Parar a lista de reprodução",
+      "read-only": "",
       "refresh": "Atualizar o painel de controlo",
       "save": "Guardar o painel de controlo",
       "save-dashboard": {
@@ -7474,6 +7475,13 @@
       "tooltip-title": "Operador matemático",
       "tooltip-trigger": "Expressão"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Função",
       "label-input": "Entrada",
@@ -7489,6 +7497,11 @@
       "label-upsample": "Aumentar a quantidade de amostras",
       "tooltip-s-m-h": "10s, 1m, 30m, 1h"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Entrada"
     }
@@ -7505,7 +7518,8 @@
     "loading": "A carregar pastas..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10860,7 +10874,6 @@
         "downloads": "Transferências",
         "from": "De",
         "installedVersion": "Versão instalada",
-        "lastCommitDate": "Data do último compromisso:",
         "latestReleaseDate": "Data de lançamento mais recente:",
         "latestVersion": "Versão mais recente",
         "license": "Licença",
@@ -11413,6 +11426,8 @@
         "subtitle": "Utilize esta opção se pretender sincronizar e gerir toda a sua instância Grafana através de um armazenamento externo."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "trabalhos ativos",
       "column-action": "Ação",
@@ -11431,6 +11446,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "Definições",
       "view": "Ver"
     },
@@ -11846,6 +11862,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Recolher linha de consulta",
       "datasource-help": "Mostrar ajuda da origem de dados",
       "drag-and-drop": "Arrastar e largar para reordenar",
@@ -11856,7 +11873,11 @@
       "replace-query-from-library": "Substituir por consulta da biblioteca",
       "show-response": "Mostrar resposta"
     },
-    "query-editor-not-exported": "O plugin de origem de dados não exporta nenhum componente do Editor de Consultas"
+    "query-editor-not-exported": "O plugin de origem de dados não exporta nenhum componente do Editor de Consultas",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12092,7 +12113,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Adicionar conta de serviço",
-      "message": "Não foram encontradas contas de serviços",
+      "message": "",
       "more-info": "Lembre-se de que pode fornecer permissões específicas para acesso à API a outras aplicações",
       "title": "Ainda não criou qualquer conta de serviço"
     }
@@ -12486,6 +12507,21 @@
   "sort-picker": {
     "select-aria-label": "Ordenar"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Orientação do layout",
diff --git a/public/locales/ru-RU/grafana.json b/public/locales/ru-RU/grafana.json
index ec7a3f152d0..ca155804315 100644
--- a/public/locales/ru-RU/grafana.json
+++ b/public/locales/ru-RU/grafana.json
@@ -5381,6 +5381,7 @@
       "playlist-next": "Перейти к следующему дашборду",
       "playlist-previous": "Перейти к предыдущему дашборду",
       "playlist-stop": "Остановить плейлист",
+      "read-only": "",
       "refresh": "Обновить дашборд",
       "save": "Сохранить дашборд",
       "save-dashboard": {
@@ -7516,6 +7517,13 @@
       "tooltip-title": "Математический оператор",
       "tooltip-trigger": "Выражение"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Функция",
       "label-input": "Ввод",
@@ -7531,6 +7539,11 @@
       "label-upsample": "Увеличить частоту выборки",
       "tooltip-s-m-h": "10 с, 1 мин, 30 мин, 1 ч"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Ввод"
     }
@@ -7547,7 +7560,8 @@
     "loading": "Загрузка папок..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10924,7 +10938,6 @@
         "downloads": "Загрузки",
         "from": "Время начала",
         "installedVersion": "Установленная версия",
-        "lastCommitDate": "Дата последней фиксации:",
         "latestReleaseDate": "Дата последнего выпуска:",
         "latestVersion": "Новейшая версия",
         "license": "Лицензия",
@@ -11483,6 +11496,8 @@
         "subtitle": "Используйте этот параметр, если хотите синхронизировать весь экземпляр Grafana и управлять им через внешнее хранилище"
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "активные задания",
       "column-action": "Действие",
@@ -11501,6 +11516,7 @@
       "get-repository-meta": {
         "webhook": "Веб-перехватчик"
       },
+      "read-only-badge": "",
       "settings": "Параметры",
       "view": "Просмотр"
     },
@@ -11918,6 +11934,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Свернуть строку запроса",
       "datasource-help": "Показать справку по источнику данных",
       "drag-and-drop": "Перетащить для изменения порядка",
@@ -11928,7 +11945,11 @@
       "replace-query-from-library": "Замена на запрос из библиотеки",
       "show-response": "Показать ответ"
     },
-    "query-editor-not-exported": "Плагин источника данных не экспортирует компоненты редактора запросов"
+    "query-editor-not-exported": "Плагин источника данных не экспортирует компоненты редактора запросов",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12170,7 +12191,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Добавить служебную учетную запись",
-      "message": "Служебные учетные записи не найдены",
+      "message": "",
       "more-info": "Помните, вы можете предоставлять определенные разрешения на доступ к API других приложений",
       "title": "Вы еще не создали ни одной служебной учетной записи"
     }
@@ -12566,6 +12587,21 @@
   "sort-picker": {
     "select-aria-label": "Сортировать"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Ориентация макета",
diff --git a/public/locales/sv-SE/grafana.json b/public/locales/sv-SE/grafana.json
index 2c84ac80593..e6334c52b39 100644
--- a/public/locales/sv-SE/grafana.json
+++ b/public/locales/sv-SE/grafana.json
@@ -5343,6 +5343,7 @@
       "playlist-next": "Gå till nästa instrumentpanel",
       "playlist-previous": "Gå till föregående instrumentpanel",
       "playlist-stop": "Stoppa spellista",
+      "read-only": "",
       "refresh": "Uppdatera instrumentpanel",
       "save": "Spara instrumentpanel",
       "save-dashboard": {
@@ -7474,6 +7475,13 @@
       "tooltip-title": "Matematisk operator",
       "tooltip-trigger": "Uttryck"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "Funktion",
       "label-input": "Ingång",
@@ -7489,6 +7497,11 @@
       "label-upsample": "Sampla upp",
       "tooltip-s-m-h": "10 s, 1 m, 30 m, 1 h"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Ingång"
     }
@@ -7505,7 +7518,8 @@
     "loading": "Laddar mappar…"
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10860,7 +10874,6 @@
         "downloads": "Nedladdningar",
         "from": "Från",
         "installedVersion": "Installerad version",
-        "lastCommitDate": "Senaste åtagandedatum:",
         "latestReleaseDate": "Senaste utgivningsdatum:",
         "latestVersion": "Senaste versionen",
         "license": "Licens",
@@ -11413,6 +11426,8 @@
         "subtitle": "Använd det här alternativet om du vill synkronisera och hantera hela din Grafana-instans via extern lagring."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "aktiva jobb",
       "column-action": "Åtgärd",
@@ -11431,6 +11446,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "Inställningar",
       "view": "Visa"
     },
@@ -11846,6 +11862,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Dölj frågeraden",
       "datasource-help": "Visa hjälp med datakälla",
       "drag-and-drop": "Ändra ordning genom dra och släpp",
@@ -11856,7 +11873,11 @@
       "replace-query-from-library": "Ersätt med fråga från biblioteket",
       "show-response": "Visa svar"
     },
-    "query-editor-not-exported": "Tilläggsprogram för datakälla exporterar inte någon frågeredigerarkomponent"
+    "query-editor-not-exported": "Tilläggsprogram för datakälla exporterar inte någon frågeredigerarkomponent",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12092,7 +12113,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Lägg till servicekonto",
-      "message": "Inga servicekonton hittades",
+      "message": "",
       "more-info": "Kom ihåg att du kan ange specifika behörigheter för API-åtkomst till andra applikationer",
       "title": "Du har inte skapat några servicekonton ännu"
     }
@@ -12486,6 +12507,21 @@
   "sort-picker": {
     "select-aria-label": "Sortera"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Layoutorientering",
diff --git a/public/locales/tr-TR/grafana.json b/public/locales/tr-TR/grafana.json
index 507fe49043f..30a087df251 100644
--- a/public/locales/tr-TR/grafana.json
+++ b/public/locales/tr-TR/grafana.json
@@ -5343,6 +5343,7 @@
       "playlist-next": "Sonraki panoya git",
       "playlist-previous": "Önceki panoya git",
       "playlist-stop": "Oynatma listesini durdur",
+      "read-only": "",
       "refresh": "Panoyu yenile",
       "save": "Panoyu kaydet",
       "save-dashboard": {
@@ -7474,6 +7475,13 @@
       "tooltip-title": "Matematik işleci",
       "tooltip-trigger": "İfade"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "İşlev",
       "label-input": "Girdi",
@@ -7489,6 +7497,11 @@
       "label-upsample": "Örneklemeyi artır",
       "tooltip-s-m-h": "10 sn, 1 dk, 30 dk, 1 sa"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "Girdi"
     }
@@ -7505,7 +7518,8 @@
     "loading": "Klasörler yükleniyor..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10860,7 +10874,6 @@
         "downloads": "İndirmeler",
         "from": "Başlangıç",
         "installedVersion": "Yüklü Sürüm",
-        "lastCommitDate": "Son yürütme tarihi:",
         "latestReleaseDate": "Son yayın tarihi:",
         "latestVersion": "En Son Sürüm",
         "license": "Lisans",
@@ -11413,6 +11426,8 @@
         "subtitle": "Tüm Grafana örneğinizi haricî depolama üzerinden senkronize edip yönetmek istiyorsanız bu seçeneği kullanın."
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "etkin işler",
       "column-action": "Eylem",
@@ -11431,6 +11446,7 @@
       "get-repository-meta": {
         "webhook": "Web kancası"
       },
+      "read-only-badge": "",
       "settings": "Ayarlar",
       "view": "Görüntüle"
     },
@@ -11846,6 +11862,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "Sorgu satırını daralt",
       "datasource-help": "Veri kaynağı yardımını göster",
       "drag-and-drop": "Yeniden düzenlemek için sürükleyip bırakın",
@@ -11856,7 +11873,11 @@
       "replace-query-from-library": "Kütüphaneden sorguyla değiştir",
       "show-response": "Yanıtı göster"
     },
-    "query-editor-not-exported": "Veri kaynağı eklentisi herhangi bir Sorgu Düzenleyici bileşeni sunmuyor/içermiyor."
+    "query-editor-not-exported": "Veri kaynağı eklentisi herhangi bir Sorgu Düzenleyici bileşeni sunmuyor/içermiyor.",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12092,7 +12113,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "Hizmet hesabı ekle",
-      "message": "Hizmet hesabı bulunamadı",
+      "message": "",
       "more-info": "Diğer uygulamaların API erişimi için özel izinler sağlayabileceğinizi lütfen unutmayın.",
       "title": "Henüz bir hizmet hesabı oluşturmadınız"
     }
@@ -12486,6 +12507,21 @@
   "sort-picker": {
     "select-aria-label": "Sırala"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "Düzen yönü",
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 5a5a946cf40..0fc9a785e15 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -5324,6 +5324,7 @@
       "playlist-next": "前往下一个仪表板",
       "playlist-previous": "前往上一个仪表板",
       "playlist-stop": "停止播放列表",
+      "read-only": "",
       "refresh": "刷新仪表板",
       "save": "保存仪表板",
       "save-dashboard": {
@@ -7453,6 +7454,13 @@
       "tooltip-title": "数学运算符",
       "tooltip-trigger": "表达式"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "功能",
       "label-input": "输入",
@@ -7468,6 +7476,11 @@
       "label-upsample": "升高采样",
       "tooltip-s-m-h": "10 秒、1 分钟、30 分钟、1 小时"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "输入"
     }
@@ -7484,7 +7497,8 @@
     "loading": "正在加载文件夹..."
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10828,7 +10842,6 @@
         "downloads": "下载",
         "from": "",
         "installedVersion": "安装的版本",
-        "lastCommitDate": "上次提交日期：",
         "latestReleaseDate": "最新发布日期：",
         "latestVersion": "最新版本",
         "license": "许可",
@@ -11378,6 +11391,8 @@
         "subtitle": "如果要通过外部存储来同步和管理整个 Grafana 实例，请使用此选项。"
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "活跃的作业",
       "column-action": "操作",
@@ -11396,6 +11411,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "设置",
       "view": "查看"
     },
@@ -11810,6 +11826,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "折叠查询行",
       "datasource-help": "显示数据源帮助",
       "drag-and-drop": "拖放以重新排序",
@@ -11820,7 +11837,11 @@
       "replace-query-from-library": "替换为来自库的查询",
       "show-response": "显示回复"
     },
-    "query-editor-not-exported": "数据源插件不导出任何查询编辑器组件"
+    "query-editor-not-exported": "数据源插件不导出任何查询编辑器组件",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12053,7 +12074,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "添加服务账户",
-      "message": "未找到服务账户",
+      "message": "",
       "more-info": "请记住，您可以为其他应用程序的 API 访问提供特定权限",
       "title": "您尚未创建任何服务账号"
     }
@@ -12446,6 +12467,21 @@
   "sort-picker": {
     "select-aria-label": "排序"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "布局朝向",
diff --git a/public/locales/zh-Hant/grafana.json b/public/locales/zh-Hant/grafana.json
index bd775c3715a..927242a037c 100644
--- a/public/locales/zh-Hant/grafana.json
+++ b/public/locales/zh-Hant/grafana.json
@@ -5324,6 +5324,7 @@
       "playlist-next": "前往下一個儀表板",
       "playlist-previous": "前往上一個儀表板",
       "playlist-stop": "停止播放清單",
+      "read-only": "",
       "refresh": "重新整理儀表板",
       "save": "儲存儀表板",
       "save-dashboard": {
@@ -7453,6 +7454,13 @@
       "tooltip-title": "數學運算子",
       "tooltip-trigger": "表達式"
     },
+    "query-toolbox": {
+      "tooltip-collapse-editor": "",
+      "tooltip-copy-query": "",
+      "tooltip-expand-editor": "",
+      "tooltip-format-query": "",
+      "tooltip-run-query": ""
+    },
     "reduce": {
       "label-function": "功能",
       "label-input": "輸入",
@@ -7468,6 +7476,11 @@
       "label-upsample": "向上取樣",
       "tooltip-s-m-h": "10 秒、1 分鐘、30 分鐘、1 小時"
     },
+    "sql-expr": {
+      "button-run-query": "",
+      "modal-title": "",
+      "tooltip-experimental": ""
+    },
     "threshold": {
       "label-input": "輸入"
     }
@@ -7484,7 +7497,8 @@
     "loading": "正在載入資料夾…"
   },
   "folder-repo": {
-    "badge-tooltip": ""
+    "provisioned-badge": "",
+    "read-only-badge": ""
   },
   "folders": {
     "api": {
@@ -10828,7 +10842,6 @@
         "downloads": "下載量",
         "from": "自",
         "installedVersion": "安裝版本",
-        "lastCommitDate": "上次提交日期：",
         "latestReleaseDate": "最新發佈日期：",
         "latestVersion": "最新版本",
         "license": "授權",
@@ -11378,6 +11391,8 @@
         "subtitle": "若想透過外部儲存空間同步及管理整個 Grafana 執行個體，請使用此選項。"
       }
     },
+    "read-only-local-tooltip": "",
+    "read-only-remote-tooltip": "",
     "recent-jobs": {
       "active-jobs": "進行中的作業",
       "column-action": "動作",
@@ -11396,6 +11411,7 @@
       "get-repository-meta": {
         "webhook": "Webhook"
       },
+      "read-only-badge": "",
       "settings": "設定",
       "view": "檢視"
     },
@@ -11810,6 +11826,7 @@
   },
   "query-operation": {
     "header": {
+      "cancel-query-library-edit": "",
       "collapse-row": "收闔查詢列",
       "datasource-help": "顯示資料來源說明",
       "drag-and-drop": "拖放以重新排序",
@@ -11820,7 +11837,11 @@
       "replace-query-from-library": "替換為來自資料庫的查詢",
       "show-response": "顯示回應"
     },
-    "query-editor-not-exported": "資料來源外掛程式不匯出任何查詢編輯器元件"
+    "query-editor-not-exported": "資料來源外掛程式不匯出任何查詢編輯器元件",
+    "query-library": {
+      "editing-tooltip": "",
+      "from-library": ""
+    }
   },
   "recently-deleted": {
     "buttons": {
@@ -12053,7 +12074,7 @@
   "service-accounts": {
     "empty-state": {
       "button-title": "新增服務帳戶",
-      "message": "未找到服務帳戶",
+      "message": "",
       "more-info": "請記住，您可以為 API 存取其他應用程式提供特定權限",
       "title": "您尚未建立任何服務帳戶"
     }
@@ -12446,6 +12467,21 @@
   "sort-picker": {
     "select-aria-label": "排序"
   },
+  "sql-expressions": {
+    "add-query-tooltip": "",
+    "ai-explain-title": "",
+    "ai-suggestions-title": "",
+    "apply": "",
+    "code-label": "",
+    "copy": "",
+    "explain-empty-query-tooltip": "",
+    "explain-query": "",
+    "explanation-modal-title": "",
+    "sql-ai-interaction": "",
+    "sql-suggestion-history": "",
+    "suggestions": "",
+    "view-explanation": ""
+  },
   "stat": {
     "add-orientation-option": {
       "description-orientation": "版面配置方向",

From d9335b725e409c00a1534194ca786ce4324c38d8 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Thu, 14 Aug 2025 09:45:14 +0100
Subject: [PATCH 162/243] FS: Fix missing SSL certs in docker image (#109632)

---
 devenv/frontend-service/grafana-fs-dev.dockerfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/devenv/frontend-service/grafana-fs-dev.dockerfile b/devenv/frontend-service/grafana-fs-dev.dockerfile
index 61f5389ffb9..b0d7d7ffd01 100644
--- a/devenv/frontend-service/grafana-fs-dev.dockerfile
+++ b/devenv/frontend-service/grafana-fs-dev.dockerfile
@@ -1,5 +1,12 @@
 FROM ubuntu:24.04
 
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    --mount=type=cache,target=/var/cache/apt \
+    set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends ca-certificates; \
+    update-ca-certificates
+
 WORKDIR /grafana
 
 RUN mkdir -p "conf/provisioning/datasources" \

From 7e925a718c40353d071fcbd860abb43b5014b8ef Mon Sep 17 00:00:00 2001
From: Anna Urbiztondo <anna.urbiztondo@grafana.com>
Date: Thu, 14 Aug 2025 11:01:43 +0200
Subject: [PATCH 163/243] [Plugins]: Revamping OSS doc (#108974)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Draft

* Fix?

* Prettier

* Fix?

* Update docs/sources/administration/plugin-management/_index.md

Co-authored-by: David Harris <david.harris@grafana.com>

* Update docs/sources/administration/plugin-management/_index.md

Co-authored-by: David Harris <david.harris@grafana.com>

* Feedback, new docs

* Prettier

* More feedback

* Prettier

* Minor edits

* Edits

* Prettier

* Edits

* Prettier

* Solving conflicts

* Prettier

* Update docs/sources/administration/plugin-management/_index.md

Co-authored-by: David Harris <david.harris@grafana.com>

* Update docs/sources/administration/plugin-management/_index.md

Co-authored-by: David Harris <david.harris@grafana.com>

* Update docs/sources/administration/plugin-management/_index.md

Co-authored-by: David Harris <david.harris@grafana.com>

* Fix?

* Fix?

* fix links?

* Update plugin-integrate.md

* fix link

* fix link?

* Update plugin-install.md

* Update plugin-install.md

* fix link

* fix link

* fix links

* Update plugin-types.md

* Fix?

* Fixing

* More links

* Final touches

* Update docs/sources/administration/plugin-management/plugin-integrate.md

Co-authored-by: David Harris <david.harris@grafana.com>

* Prettier

---------

Co-authored-by: David Harris <david.harris@grafana.com>
Co-authored-by: Irene Rodríguez <irene.rodriguez@grafana.com>
---
 .../plugin-management/_index.md               | 280 +++---------------
 .../plugin-management/customize-nav-bar.md    |  11 +-
 .../plugin-frontend-sandbox.md                |  75 +++++
 .../plugin-management/plugin-install.md       | 101 +++++++
 .../plugin-management/plugin-integrate.md     |  47 +++
 .../plugin-management/plugin-sign.md          |  80 +++++
 .../plugin-management/plugin-types.md         |  64 ++++
 7 files changed, 410 insertions(+), 248 deletions(-)
 create mode 100644 docs/sources/administration/plugin-management/plugin-frontend-sandbox.md
 create mode 100644 docs/sources/administration/plugin-management/plugin-install.md
 create mode 100644 docs/sources/administration/plugin-management/plugin-integrate.md
 create mode 100644 docs/sources/administration/plugin-management/plugin-sign.md
 create mode 100644 docs/sources/administration/plugin-management/plugin-types.md

diff --git a/docs/sources/administration/plugin-management/_index.md b/docs/sources/administration/plugin-management/_index.md
index ac5d102b8f0..050627d6a18 100644
--- a/docs/sources/administration/plugin-management/_index.md
+++ b/docs/sources/administration/plugin-management/_index.md
@@ -16,53 +16,19 @@ weight: 600
 
 # Plugin management
 
-You can enhance your Grafana experience with _plugins_, extensions to Grafana beyond the wide range of visualizations and data sources that are built-in.
+Plugins enhance your Grafana experience with new ways to connect to and visualize data.
 
-This guide shows you how to [install](#install-a-plugin) plugins that are built by Grafana Labs, commercial partners, our community, or plugins that you have [built yourself](/developers/plugin-tools).
+Read on for an overview on how to get started with plugins:
 
-## Types of plugins
+- Plugins are available in the [plugin catalog](#plugin-catalog). They can be built by Grafana Labs, commercial partners, our community, or you can [build a plugin yourself](/developers/plugin-tools).
+- There are three [types of plugins](#types-of-plugins): panel, data source, and app plugins.
+- Learn [how to install](#install-a-plugin), [update](#update-a-plugin) and [verify](#verify-your-plugins) your plugins.
 
-Grafana supports three types of plugins:
+[Advanced options](#advanced-options) allow you to:
 
-- [Panels](/grafana/plugins/panel-plugins) - These plugins make it easy to create and add any kind of panel, to show your data, or improve your favorite dashboards.
-- [Data sources](/grafana/plugins/data-source-plugins) - These plugins allow you to pull data from various data sources such as databases, APIs, log files, and so on, and display it in the form of graphs, charts, and dashboards in Grafana.
-- [Apps](/grafana/plugins/app-plugins) - These plugins enable the bundling of data sources, panels, dashboards, and Grafana pages into a cohesive experience.
-
-## Panel plugins
-
-Add new visualizations to your dashboard with panel plugins, such as the [Clock](/grafana/plugins/grafana-clock-panel), [Mosaic](/grafana/plugins/boazreicher-mosaicplot-panel) and [Variable](/grafana/plugins/volkovlabs-variable-panel) panels.
-
-Use panel plugins when you want to:
-
-- Visualize data returned by data source queries.
-- Navigate between dashboards.
-- Control external systems, such as smart home devices.
-
-## Data source plugins
-
-Data source plugins add support for new databases, such as [Google BigQuery](/grafana/plugins/grafana-bigquery-datasource).
-
-Data source plugins communicate with external sources of data and return the data in a format that Grafana understands. By adding a data source plugin, you can immediately use the data in any of your existing dashboards.
-
-Use data source plugins when you want to query data from external or third-party systems.
-
-## App plugins
-
-Applications, or _app plugins_, bundle data sources and panels to provide a cohesive experience, such as the [Zabbix](/grafana/plugins/alexanderzobnin-zabbix-app) app.
-
-Apps can also add custom pages for things like control panels.
-
-Use app plugins when you want an out-of-the-box monitoring experience.
-
-### Managing access for app plugins
-
-Customize access to app plugins with [RBAC](../roles-and-permissions/access-control/rbac-for-app-plugins/).
-
-By default, the Viewer, Editor and Admin roles have access to all app plugins that their Organization role allows them to access. Access is granted by the `fixed:plugins.app:reader` role.
-
-{{< admonition type="note" >}}
-To prevent users from seeing an app plugin, refer to [these permissions scenarios](../roles-and-permissions/access-control/plan-rbac-rollout-strategy/#prevent-viewers-from-accessing-an-app-plugin).
-{{< /admonition >}}
+- Customize where app plugin pages appear in the navigation menu.
+- Configure backend communication between installed plugins.
+- Improve security by isolating plugins with the Plugin Frontend Sandbox.
 
 ## Plugin catalog
 
@@ -93,6 +59,16 @@ If required, the Grafana plugin catalog can be disabled using the `plugin_admin_
 
 <a id="#plugin-catalog-entry"></a>
 
+### Types of plugins
+
+Grafana supports three types of plugins:
+
+- [Panels](/grafana/plugins/panel-plugins) - These plugins make it easy to create and add any kind of panel, to show your data, or improve your favorite dashboards.
+- [Data sources](/grafana/plugins/data-source-plugins) - These plugins allow you to pull data from various data sources such as databases, APIs, log files, and so on, and display it in the form of graphs, charts, and dashboards in Grafana.
+- [Apps](/grafana/plugins/app-plugins) - These plugins enable the bundling of data sources, panels, dashboards, and Grafana pages into a cohesive experience.
+
+Read more in [Types of plugins](plugin-types).
+
 ### Browse plugins
 
 To browse for available plugins:
@@ -101,94 +77,23 @@ To browse for available plugins:
 1. Use the search to filter based on name, keywords, organization and other metadata.
 1. Click the **Data sources**, **Panels**, or **Applications** buttons to filter by plugin type.
 
+## Manage your plugins
+
+We strongly recommend running the latest plugin version. Use [Grafana Advisor](../grafana-advisor/#plugins) to check the status of your data sources and plugins.
+
 ### Install a plugin
 
-The most common way to install a plugin is through the Grafana UI, but alternative methods are also available.
+The most common way to install a plugin is through the Grafana UI.
 
 1. In Grafana, click **Administration > Plugins and data > Plugins** in the side navigation menu to view all plugins.
 1. Browse and find a plugin.
 1. Click the plugin's logo.
 1. Click **Install**.
 
-There are also additional ways to install plugins depending on your setup.
-
-#### Install a plugin using Grafana CLI
-
-Grafana CLI allows you to install, upgrade, and manage your Grafana plugins using a command line. For more information about Grafana CLI plugin commands, refer to [Plugin commands](../../cli/#plugins-commands).
-
-#### Install a plugin from a ZIP file
-
-This method is typically used for plugins not available in the Plugin Catalog or in environments without internet access.
-
-Download the archive containing the plugin assets, and install it by extracting the archive into the plugin directory. For example:
-
-```bash
-unzip my-plugin-0.2.0.zip -d YOUR_PLUGIN_DIR/my-plugin
-```
-
-The path to the plugin directory is defined in the configuration file. For more information, refer to [Configuration](../../setup-grafana/configure-grafana/#plugins).
-
-#### Install a plugin using Grafana configuration
-
 {{< admonition type="note" >}}
-This feature requires Grafana 11.5.0 or later.
+To see additional ways to install plugins refer to [Install a plugin](plugin-install).
 {{< /admonition >}}
 
-You can install plugins by adding the plugin ID to the `plugins.preinstall` section in the Grafana configuration file. This prevents the plugin from being accidentally uninstalled and can be auto-updated. For more information, refer to [Configuration](../../setup-grafana/configure-grafana/#plugins).
-
-#### Install a plugin in air-gapped environment
-
-Plugin installation usually requires an internet connection. You can check which endpoints are used during the installation on your instance and add them to your instance’s allowlist.
-
-If this is not possible you can go via installing a plugin using [Grafana CLI](#install-a-plugin-using-grafana-cli) or as a [ZIP file](#install-a-plugin-from-a-zip-file).
-
-You can fetch any plugin from Grafana.com API following the download link referenced in the API.
-Here is an example based on `grafana-lokiexplore-app` plugins.
-
-1. Open `https://grafana.com/api/plugins/grafana-lokiexplore-app` and look for `links` section
-1. Find a `download` url which looks something like `https://grafana.com/api/plugins/grafana-lokiexplore-app/versions/1.0.2/download`
-1. Use this URL to download the plugin ZIP file, which you can then install as described above.
-
-#### Install plugins using the Grafana Helm chart
-
-With the Grafana Helm chart, you can install plugins using one of the following methods:
-
-##### Method 1: Using the `plugins` field
-
-Add the plugins you want to install as a list in your values file. For more information about the configuration, refer to [the Helm chart configuration reference](https://github.com/grafana/helm-charts/tree/main/charts/grafana#configuration).
-
-```yaml
-plugins:
-  - https://grafana.com/api/plugins/grafana-oncall-app/versions/v1.9.0/download;grafana-oncall-app
-  - redis-datasource
-```
-
-##### Method 2: Using `GF_PLUGINS_PREINSTALL_SYNC`
-
-Add the following to your `values.yaml` file:
-
-```yaml
-env:
-  # Format: <plugin ID>@[<plugin version>]@<url to plugin zip>
-  GF_PLUGINS_PREINSTALL_SYNC: grafana-oncall-app@1.9.0@https://grafana.com/api/plugins/grafana-oncall-app/versions/v1.9.0/download
-
-  # Or without version and URL (latest version will be used)
-  # GF_PLUGINS_PREINSTALL_SYNC: grafana-oncall-app
-
-  # Multiple plugins (comma-separated)
-  # GF_PLUGINS_PREINSTALL_SYNC: grafana-oncall-app,redis-datasource
-```
-
-##### Method 3: Using `GF_PLUGINS_INSTALL` (Deprecated since 12.1.0)
-
-```yaml
-env:
-  # Comma-separated list of plugin IDs
-  GF_PLUGINS_INSTALL: grafana-oncall-app,redis-datasource
-```
-
-When the installation is complete, a confirmation message will indicate that the plugins were successfully installed.
-
 ### Update a plugin
 
 To update a plugin:
@@ -211,135 +116,26 @@ To uninstall a plugin:
 
 When the update is complete, a confirmation message will indicate the installation was successful.
 
-## Plugin signatures
+### Verify your plugins
 
-Plugin signature verification, also known as _signing_, is a security measure to make sure plugins haven't been tampered with. Upon loading, Grafana checks to see if a plugin is signed or unsigned when inspecting and verifying its digital signature.
+Plugin signature verification, also known as _signing_, is a security measure to make sure plugins haven't been tampered with. Upon loading, Grafana checks to see if a plugin is signed or unsigned. Read more in [Plugin signatures](plugin-sign).
 
-At startup, Grafana verifies the signatures of every plugin in the plugin directory. If a plugin is unsigned, then Grafana neither loads nor starts it. To see the result of this verification for each plugin, navigate to **Configuration** -> **Plugins**.
+## Advanced options
 
-Grafana also writes an error message to the server log:
+### Customize navigation placement of plugin pages
 
-```bash
-WARN[05-26|12:00:00] Some plugin scanning errors were found   errors="plugin '<plugin id>' is unsigned, plugin '<plugin id>' has an invalid signature"
-```
+You can relocate app plugin pages to customize the navigation menu structure, as explained in [Customize navigation placement of plugin pages](customize-nav-bar).
 
-If you are a plugin developer and want to know how to sign your plugin, refer to [Sign a plugin](/developers/plugin-tools/publish-a-plugin/sign-a-plugin).
+### Integrate plugins
 
-| Signature status   | Description                                                                     |
-| ------------------ | ------------------------------------------------------------------------------- |
-| Core               | Core plugin built into Grafana.                                                 |
-| Invalid signature  | The plugin has an invalid signature.                                            |
-| Modified signature | The plugin has changed since it was signed. This may indicate malicious intent. |
-| Unsigned           | The plugin is not signed.                                                       |
-| Signed             | The plugin signature was successfully verified.                                 |
+You can configure your Grafana instance to let the frontends of installed plugins directly communicate locally with the backends of other installed plugins. See how in [Configure backend communication between installed plugins](plugin-integrate).
 
-### Plugin signature levels
+### Isolate plugin code with the Frontend Sandbox
 
-All plugins are signed under a _signature level_. The signature level determines how the plugin can be distributed.
+You can use the [Plugin Frontend Sandbox](plugin-frontend-sandbox) to securely isolate plugin frontend code from the main Grafana application.
 
-| **Plugin Level** | **Description**                                                                                                                                                                                                          |
-| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Private          | <p>Private plugins are for use on your own Grafana. They may not be distributed to the Grafana community, and are not published in the Grafana catalog.</p>                                                              |
-| Community        | <p>Community plugins have dependent technologies that are open source and not for profit.</p><p>Community plugins are published in the official Grafana catalog, and are available to the Grafana community.</p>         |
-| Commercial       | <p>Commercial plugins have dependent technologies that are closed source or commercially backed.</p><p>Commercial plugins are published on the official Grafana catalog, and are available to the Grafana community.</p> |
+### Learn more
 
-### Allow unsigned plugins
-
-{{< admonition type="note" >}}
-Unsigned plugins are not supported in Grafana Cloud.
-{{< /admonition >}}
-
-We strongly recommend that you don't run unsigned plugins in your Grafana instance. However, if you're aware of the risks and you still want to load an unsigned plugin, refer to [Configuration](../../setup-grafana/configure-grafana/#allow_loading_unsigned_plugins).
-
-If you've allowed loading of an unsigned plugin, then Grafana writes a warning message to the server log:
-
-```bash
-WARN[06-01|16:45:59] Running an unsigned plugin   pluginID=<plugin id>
-```
-
-{{< admonition type="note" >}}
-If you're developing a plugin, then you can enable development mode to allow all unsigned plugins.
-{{< /admonition >}}
-
-## Integrate plugins
-
-You can configure your Grafana instance to let the frontends of installed plugins directly communicate locally with the backends of other installed plugins. By default, you can only communicate with plugin backends remotely. You can use this configuration to, for example, enable a [canvas panel](https://grafana.com/docs/grafana/latest/panels-visualizations/visualizations/canvas/) to call an application resource API that is permitted by the `actions_allow_post_url` option.
-
-To enable backend communication between plugins:
-
-1. Set the plugins you want to communicate with. In your configuration file (`grafana.ini` or `custom.ini` depending on your operating system) remove the semicolon to enable and then set the following configuration option:
-
-   ```
-   actions_allow_post_url=
-   ```
-
-   This is a comma-separated list that uses glob matching.
-   - To allow access to all plugins that have a backend:
-
-     ```
-     actions_allow_post_url=/api/plugins/*
-     ```
-
-   - To access to the backend of only one plugin:
-
-     ```
-     actions_allow_post_url=/api/plugins/<GRAFANA_SPECIAL_APP>
-     ```
-
-## Plugin Frontend Sandbox
-
-{{< admonition type="caution" >}}
-Plugin Frontend Sandbox is currently in [public preview](/docs/release-life-cycle/). Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available.
-{{< /admonition >}}
-
-The Plugin Frontend Sandbox is a security feature that isolates plugin frontend code from the main Grafana application.
-When enabled, plugins run in a separate JavaScript context, which provides several security benefits:
-
-- Prevents plugins from modifying parts of the Grafana interface outside their designated areas
-- Stops plugins from interfering with other plugins functionality
-- Protects core Grafana features from being altered by plugins
-- Prevents plugins from modifying global browser objects and behaviors
-
-Plugins running inside the Frontend Sandbox should continue to work normally without any noticeable changes in their intended functionality.
-
-### Enable Frontend Sandbox
-
-The Frontend Sandbox feature is currently behind the `pluginsFrontendSandbox` feature flag. To enable it, you'll need to:
-
-1. Enable the feature flag in your Grafana configuration. For more information about enabling feature flags, refer to [Configure feature toggles](/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/).
-
-2. For self-hosted Grafana installations, add the plugin IDs you want to sandbox in the `security` section using the `enable_frontend_sandbox_for_plugins` configuration option.
-
-For Grafana Cloud users, you can simply use the toggle switch in the plugin catalog page to enable or disable the sandbox for each plugin. By default, the sandbox is disabled for all plugins.
-
-{{< admonition type="note" >}}
-Enabling the Frontend Sandbox might impact the performance of certain plugins. Only disable the sandbox if you fully trust the plugin and understand the security implications.
-{{< /admonition >}}
-
-### Compatibility
-
-The Frontend Sandbox is available in public preview in Grafana >=11.5. It is compatible with all types of plugins including app plugins, panel plugins, and data source plugins. Angular-based plugins are not supported. Plugins developed and signed by Grafana Labs are excluded and cannot be sandboxed.
-
-### When to Use Frontend Sandbox
-
-We strongly recommend enabling the Frontend Sandbox for plugins that allow users to write custom JavaScript code for data visualization or manipulation. These plugins, while powerful, can potentially execute arbitrary JavaScript code in your Grafana instance. The sandbox provides an additional layer of security by restricting what this code can access and modify.
-
-Examples of plugins where the sandbox is particularly important include:
-
-- Panel plugins that allow users to write custom JavaScript code
-- Plugins from untrusted sources
-
-### Troubleshooting
-
-If a plugin isn't functioning correctly with the Frontend Sandbox enabled:
-
-1. Temporarily disable the sandbox for that specific plugin
-1. Test if the plugin works correctly without the sandbox
-1. If the plugin only works with the sandbox disabled, ensure you trust the plugin source before continuing to use it without sandbox protection
-1. Report any sandbox-related issues to the plugin developer
-
-## Learn more
-
-- [Browse plugins](/grafana/plugins)
-- [Develop plugins](/developers/plugin-tools)
-- [Plugin development Community](https://community.grafana.com/c/plugin-development/30)
+- [Browse available plugins](/grafana/plugins)
+- [Develop your own plugins](/developers/plugin-tools)
+- [Reach out to the plugin development Community](https://community.grafana.com/c/plugin-development/30)
diff --git a/docs/sources/administration/plugin-management/customize-nav-bar.md b/docs/sources/administration/plugin-management/customize-nav-bar.md
index 3a4e82880c4..0e227c9a4f3 100644
--- a/docs/sources/administration/plugin-management/customize-nav-bar.md
+++ b/docs/sources/administration/plugin-management/customize-nav-bar.md
@@ -5,7 +5,6 @@ labels:
   products:
     - enterprise
     - oss
-    - cloud
 keywords:
   - grafana
   - plugins
@@ -14,7 +13,7 @@ keywords:
   - customize
   - configuration
   - grafana.ini
-weight: 100
+weight: 300
 ---
 
 # Customize navigation placement of app plugin pages
@@ -73,12 +72,12 @@ org-example-app = explore 50
 /a/org-example-app/logs = alerting 75
 ```
 
-## Understanding page paths
+## Find page paths
 
-To move individual pages, you need to know their paths. Page paths in app plugins follow this format:
-`/a/PLUGIN_ID/PAGE_PATH`
+To move individual pages you need to know their paths. To identify a plugin page path:
 
-You can identify a plugin page path by visiting the page in the browser and observing the URL in the address bar.
+- Visit the page in the browser and check the URL in the address bar.
+- Page paths in app plugins follow the format `/a/PLUGIN_ID/PAGE_PATH`
 
 ## Troubleshooting
 
diff --git a/docs/sources/administration/plugin-management/plugin-frontend-sandbox.md b/docs/sources/administration/plugin-management/plugin-frontend-sandbox.md
new file mode 100644
index 00000000000..19c5c6f72b3
--- /dev/null
+++ b/docs/sources/administration/plugin-management/plugin-frontend-sandbox.md
@@ -0,0 +1,75 @@
+---
+title: Isolate plugin code with the Plugin Frontend Sandbox
+description: Use the Plugin Frontend Sandbox to securely isolate plugin frontend code from the main Grafana application.
+labels:
+  products:
+    - enterprise
+    - oss
+    - cloud
+keywords:
+  - grafana
+  - plugins
+  - plugin
+  - navigation
+  - customize
+  - configuration
+  - grafana.ini
+  - sandbox
+  - frontend
+weight: 400
+---
+
+# Isolate plugin code with the Plugin Frontend Sandbox
+
+{{< admonition type="caution" >}}
+Plugin Frontend Sandbox is currently in [public preview](https://grafana.com/docs/release-life-cycle/). Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available.
+{{< /admonition >}}
+
+The Plugin Frontend Sandbox is a security feature that isolates plugin frontend code from the main Grafana application. When enabled, plugins run in a separate JavaScript context, which provides several security benefits:
+
+- Prevents plugins from modifying parts of the Grafana interface outside their designated areas
+- Stops plugins from interfering with other plugins functionality
+- Protects core Grafana features from being altered by plugins
+- Prevents plugins from modifying global browser objects and behaviors
+
+Plugins running inside the Frontend Sandbox should continue to work normally without any noticeable changes in their intended functionality.
+
+## When to use the Plugin Frontend Sandbox
+
+We strongly recommend enabling the Frontend Sandbox for plugins that allow users to write custom JavaScript code for data visualization or manipulation, since they can potentially execute arbitrary JavaScript code in your Grafana instance. The sandbox provides an additional layer of security by restricting what this code can access and modify.
+
+These are examples of plugins where the sandbox is particularly useful:
+
+- Panel plugins that allow users to write custom JavaScript code
+- Plugins from untrusted sources
+
+## Compatibility and requirements
+
+The following applies:
+
+- The Frontend Sandbox is available in public preview in Grafana >=11.5. It's compatible with all types of plugins including app plugins, panel plugins, and data source plugins.
+- Angular-based plugins are not supported.
+- Plugins developed and signed by Grafana Labs are excluded and cannot be sandboxed.
+
+## Enable the Frontend Sandbox
+
+The Frontend Sandbox feature is currently behind the `pluginsFrontendSandbox` feature flag. To enable it, you need to:
+
+1. Enable the feature flag in your Grafana configuration. For more information about enabling feature flags, refer to [Configure feature toggles](/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/).
+
+2. For self-hosted Grafana installations, add the plugin IDs you want to sandbox in the `security` section using the `enable_frontend_sandbox_for_plugins` configuration option.
+
+For Grafana Cloud users, you can simply use the toggle switch in the plugin catalog page to enable or disable the sandbox for each plugin. By default, the sandbox is disabled for all plugins.
+
+{{< admonition type="note" >}}
+Enabling the Frontend Sandbox might impact the performance of certain plugins. Only disable the sandbox if you fully trust the plugin and understand the security implications.
+{{< /admonition >}}
+
+## Troubleshooting
+
+If a plugin isn't functioning correctly with the Frontend Sandbox enabled:
+
+1. Temporarily disable the sandbox for that specific plugin
+1. Test if the plugin works correctly without the sandbox
+1. If the plugin only works with the sandbox disabled, ensure you trust the plugin source before continuing to use it without sandbox protection
+1. Report any sandbox-related issues to the plugin developer
diff --git a/docs/sources/administration/plugin-management/plugin-install.md b/docs/sources/administration/plugin-management/plugin-install.md
new file mode 100644
index 00000000000..18be4ea58fa
--- /dev/null
+++ b/docs/sources/administration/plugin-management/plugin-install.md
@@ -0,0 +1,101 @@
+---
+title: Install a plugin
+description: Learn about alternative ways to install a plugin.
+labels:
+  products:
+    - enterprise
+    - oss
+    - cloud
+keywords:
+  - grafana
+  - plugins
+  - plugin
+  - navigation
+  - customize
+  - configuration
+  - grafana.ini
+  - sandbox
+  - frontend
+weight: 120
+---
+
+# Install a plugin
+
+Besides the UI, you can use alternative methods to install a plugin depending on your environment or set-up.
+
+## Install a plugin using Grafana CLI
+
+The Grafana CLI allows you to install, upgrade, and manage your Grafana plugins using a command line tool. For more information about Grafana CLI plugin commands, refer to [Plugin commands](/docs/grafana/<GRAFANA_VERSION>/cli/#plugins-commands).
+
+## Install a plugin from a ZIP file
+
+This method is typically used for plugins not available in the Plugin Catalog or in environments without internet access.
+
+Download the archive containing the plugin assets, and install it by extracting the archive into the plugin directory. For example:
+
+```bash
+unzip my-plugin-0.2.0.zip -d YOUR_PLUGIN_DIR/my-plugin
+```
+
+The path to the plugin directory is defined in the configuration file. For more information, refer to [Configuration](/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#plugins).
+
+## Install a plugin using Grafana configuration
+
+{{< admonition type="note" >}}
+This feature requires Grafana 11.5.0 or later.
+{{< /admonition >}}
+
+You can install plugins by adding the plugin ID to the `plugins.preinstall` section in the Grafana configuration file. This prevents the plugin from being accidentally uninstalled and can be auto-updated. For more information, refer to [Configuration](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#preinstall).
+
+## Install a plugin in air-gapped environment
+
+Plugin installation usually requires an Internet connection. You can check which endpoints are used during the installation on your instance and add them to your instance’s allow list.
+
+If this is not possible try installing a plugin using the [Grafana CLI](#install-a-plugin-using-grafana-cli) or as a [ZIP file](#install-a-plugin-from-a-zip-file).
+
+You can fetch any plugin from Grafana.com API following the download link referenced in the API.
+Here's an example based on `grafana-lokiexplore-app` plugins.
+
+1. Open `https://grafana.com/api/plugins/grafana-lokiexplore-app` and look for `links` section
+1. Find a `download` url which looks something like `https://grafana.com/api/plugins/grafana-lokiexplore-app/versions/1.0.2/download`
+1. Use this URL to download the plugin ZIP file, which you can then install as described above.
+
+## Install plugins using the Grafana Helm chart
+
+With the Grafana Helm chart, you can install plugins using one of the methods described in this section. All the YAML snippets install v1.9.0 of the Grafana OnCall App plugin and the Redis data source plugin. When installation is complete you'll get a confirmation message indicating that the plugins were successfully installed.
+
+### Method 1: Use the `plugins` field
+
+Add the plugins you want to install as a list in your values file. For more information about the configuration, refer to [the Helm chart configuration reference](https://github.com/grafana/helm-charts/tree/main/charts/grafana#configuration).
+
+```yaml
+plugins:
+  - https://grafana.com/api/plugins/grafana-oncall-app/versions/v1.9.0/download;grafana-oncall-app
+  - redis-datasource
+```
+
+### Method 2: Use `GF_PLUGINS_PREINSTALL_SYNC`
+
+Add the following to your `values.yaml` file:
+
+```yaml
+env:
+  # Format: <plugin ID>@[<plugin version>]@<url to plugin zip>
+  GF_PLUGINS_PREINSTALL_SYNC: grafana-oncall-app@1.9.0@https://grafana.com/api/plugins/grafana-oncall-app/versions/v1.9.0/download
+
+  # Or without version and URL (latest version will be used)
+  # GF_PLUGINS_PREINSTALL_SYNC: grafana-oncall-app
+
+  # Multiple plugins (comma-separated)
+  # GF_PLUGINS_PREINSTALL_SYNC: grafana-oncall-app,redis-datasource
+```
+
+### Method 3: Use `GF_PLUGINS_INSTALL` (Deprecated since v12.1.0)
+
+Add the following to your `values.yaml` file:
+
+```yaml
+env:
+  # Comma-separated list of plugin IDs
+  GF_PLUGINS_INSTALL: grafana-oncall-app,redis-datasource
+```
diff --git a/docs/sources/administration/plugin-management/plugin-integrate.md b/docs/sources/administration/plugin-management/plugin-integrate.md
new file mode 100644
index 00000000000..7d688d92bd4
--- /dev/null
+++ b/docs/sources/administration/plugin-management/plugin-integrate.md
@@ -0,0 +1,47 @@
+---
+title: Plugin backend communication
+description: Allow plugin frontends to communicate locally with the backends of other installed plugins.
+labels:
+  products:
+    - enterprise
+    - oss
+keywords:
+  - grafana
+  - plugins
+  - plugin
+  - navigation
+  - customize
+  - configuration
+  - grafana.ini
+  - sandbox
+  - frontend
+weight: 350
+---
+
+# Allow plugin backend communication
+
+By default, you can only communicate with plugin backends remotely.
+
+However, you can configure your Grafana instance to let the frontends of installed plugins to directly communicate with the backends of other plugins installed locally. You can use this configuration to, for example, enable a [canvas panel](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/canvas/) to call an application resource API that is permitted by the `actions_allow_post_url` option.
+
+## Integrate your plugins
+
+To enable backend communication between plugins, set the plugins you want to communicate with. In your configuration file (`grafana.ini` or `custom.ini` depending on your operating system), remove the semicolon to enable and then set the following configuration option:
+
+```
+  actions_allow_post_url=
+```
+
+This is a comma-separated list that uses glob matching.
+
+- To allow access to all plugins that have a backend, use:
+
+```
+actions_allow_post_url=/api/plugins/*
+```
+
+- To access the backend of only one plugin, use:
+
+```
+actions_allow_post_url=/api/plugins/<GRAFANA_SPECIAL_APP>
+```
diff --git a/docs/sources/administration/plugin-management/plugin-sign.md b/docs/sources/administration/plugin-management/plugin-sign.md
new file mode 100644
index 00000000000..7850996d0f6
--- /dev/null
+++ b/docs/sources/administration/plugin-management/plugin-sign.md
@@ -0,0 +1,80 @@
+---
+title: Plugin signatures
+description: Sign your plugins to make sure they haven't been tampered with.
+labels:
+  products:
+    - enterprise
+    - oss
+    - cloud
+keywords:
+  - grafana
+  - plugins
+  - plugin
+  - navigation
+  - customize
+  - configuration
+  - grafana.ini
+  - sandbox
+  - frontend
+weight: 200
+---
+
+# Plugin signatures
+
+Plugin signature verification, also known as _signing_, is a security measure to make sure plugins haven't been tampered with. Upon loading, Grafana checks to see if a plugin is signed or unsigned when inspecting and verifying its digital signature.
+
+Learn more at [plugin policies](https://grafana.com/legal/plugins/).
+
+## How does verifiction work?
+
+At startup, Grafana verifies the signatures of every plugin in the plugin directory.
+
+To see the result of this verification for each plugin, navigate to **Configuration** -> **Plugins**. A signature can have any of the following signature status:
+
+| Signature status   | Description                                                                     |
+| ------------------ | ------------------------------------------------------------------------------- |
+| Core               | Core plugin built into Grafana.                                                 |
+| Invalid signature  | The plugin has an invalid signature.                                            |
+| Modified signature | The plugin has changed since it was signed. This may indicate malicious intent. |
+| Unsigned           | The plugin is not signed.                                                       |
+| Signed             | The plugin signature was successfully verified.                                 |
+
+### What happens if a plugin is not signed?
+
+If a plugin is unsigned, then Grafana neither loads nor starts it. Grafana also writes an error message to the server log:
+
+```bash
+WARN[05-26|12:00:00] Some plugin scanning errors were found   errors="plugin '<plugin id>' is unsigned, plugin '<plugin id>' has an invalid signature"
+```
+
+## Plugin signature levels
+
+All plugins are signed under a _signature level_. The signature level determines how the plugin can be distributed.
+
+| **Plugin Level** | **Description**                                                                                                                                                                                                          |
+| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Private          | <p>Private plugins are for use on your own Grafana. They may not be distributed to the Grafana community, and are not published in the Grafana catalog.</p>                                                              |
+| Community        | <p>Community plugins have dependent technologies that are open source and not for profit.</p><p>Community plugins are published in the official Grafana catalog, and are available to the Grafana community.</p>         |
+| Commercial       | <p>Commercial plugins have dependent technologies that are closed source or commercially backed.</p><p>Commercial plugins are published on the official Grafana catalog, and are available to the Grafana community.</p> |
+
+## Allow unsigned plugins
+
+{{< admonition type="note" >}}
+Unsigned plugins are not supported in Grafana Cloud.
+{{< /admonition >}}
+
+We strongly recommend that you don't run unsigned plugins in your Grafana instance. However, if you're aware of the risks and you still want to load an unsigned plugin, refer to [Configuration](/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#allow_loading_unsigned_plugins).
+
+If you've allowed loading of an unsigned plugin, then Grafana writes a warning message to the server log:
+
+```bash
+WARN[06-01|16:45:59] Running an unsigned plugin   pluginID=<plugin id>
+```
+
+{{< admonition type="note" >}}
+If you're developing a plugin, then you can enable development mode to allow all unsigned plugins.
+{{< /admonition >}}
+
+## Sign a plugin you've developed
+
+If you are a plugin developer and want to know how to sign your plugin, refer to [Sign a plugin](https://grafana.com/developers/plugin-tools/publish-a-plugin/sign-a-plugin).
diff --git a/docs/sources/administration/plugin-management/plugin-types.md b/docs/sources/administration/plugin-management/plugin-types.md
new file mode 100644
index 00000000000..fe8cf4de0ff
--- /dev/null
+++ b/docs/sources/administration/plugin-management/plugin-types.md
@@ -0,0 +1,64 @@
+---
+title: Types of plugins
+description: Learn about the types of plugins available in Grafana.
+labels:
+  products:
+    - enterprise
+    - oss
+    - cloud
+keywords:
+  - grafana
+  - plugins
+  - plugin
+  - navigation
+  - customize
+  - configuration
+  - grafana.ini
+  - sandbox
+  - frontend
+weight: 100
+---
+
+# Types of plugins
+
+Grafana supports three types of plugins:
+
+- [Panels](/grafana/plugins/panel-plugins) - These plugins make it easy to create and add any kind of panel, to show your data, or improve your favorite dashboards.
+- [Data sources](/grafana/plugins/data-source-plugins) - These plugins allow you to pull data from various data sources such as databases, APIs, log files, and so on, and display it in the form of graphs, charts, and dashboards in Grafana.
+- [Apps](/grafana/plugins/app-plugins) - These plugins enable the bundling of data sources, panels, dashboards, and Grafana pages into a cohesive experience.
+
+## Panel plugins
+
+Add new visualizations to your dashboard with panel plugins, such as the [Clock](/grafana/plugins/grafana-clock-panel), [Mosaic](/grafana/plugins/boazreicher-mosaicplot-panel) and [Variable](/grafana/plugins/volkovlabs-variable-panel) panels.
+
+Use panel plugins when you want to:
+
+- Visualize data returned by data source queries.
+- Navigate between dashboards.
+- Control external systems, such as smart home devices.
+
+## Data source plugins
+
+Data source plugins add support for new databases, such as [Google BigQuery](/grafana/plugins/grafana-bigquery-datasource).
+
+Data source plugins communicate with external sources of data and return the data in a format that Grafana understands. By adding a data source plugin, you can immediately use the data in any of your existing dashboards.
+
+Use data source plugins when you want to query data from external or third-party systems.
+
+## App plugins
+
+Applications, or app plugins, bundle data sources and panels to provide a cohesive experience, such as the [Zabbix](/grafana/plugins/alexanderzobnin-zabbix-app) app.
+
+Apps can also add custom pages for things like control panels.
+
+Use app plugins when you want an out-of-the-box monitoring experience.
+
+### Managing access for app plugins
+
+Customize access to app plugins with [RBAC](/docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control/rbac-for-app-plugins/).
+
+By default, the Viewer, Editor and Admin roles have access to all app plugins that their Organization role allows them to access. Access is granted by the `fixed:plugins.app:reader` role.
+
+{{< admonition type="note" >}}
+To prevent users from seeing an app plugin, refer to [these permissions scenarios](/docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control/plan-rbac-rollout-strategy/#prevent-viewers-from-accessing-an-app-plugin).
+{{< /admonition >}}

From 96c2f48ad5db18153622804262206513e13e4e13 Mon Sep 17 00:00:00 2001
From: Gareth <email@garethdawson.xyz>
Date: Thu, 14 Aug 2025 10:10:02 +0100
Subject: [PATCH 164/243] Prometheus: Fix docs link in config page (#109385)

fix docs link
---
 packages/grafana-prometheus/src/configuration/ConfigEditor.tsx  | 2 +-
 packages/grafana-prometheus/src/configuration/shared/utils.tsx  | 2 +-
 .../datasource/prometheus/configuration/ConfigEditorPackage.tsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/grafana-prometheus/src/configuration/ConfigEditor.tsx b/packages/grafana-prometheus/src/configuration/ConfigEditor.tsx
index 48c136895a3..2f894e4ead4 100644
--- a/packages/grafana-prometheus/src/configuration/ConfigEditor.tsx
+++ b/packages/grafana-prometheus/src/configuration/ConfigEditor.tsx
@@ -30,7 +30,7 @@ export const ConfigEditor = (props: PrometheusConfigProps) => {
       )}
       <DataSourceDescription
         dataSourceName="Prometheus"
-        docsLink="https://grafana.com/docs/grafana/latest/datasources/prometheus/configure-prometheus-data-source/"
+        docsLink="https://grafana.com/docs/grafana/latest/datasources/prometheus/configure/"
       />
       <hr className={`${styles.hrTopSpace} ${styles.hrBottomSpace}`} />
       <DataSourceHttpSettingsOverhaul
diff --git a/packages/grafana-prometheus/src/configuration/shared/utils.tsx b/packages/grafana-prometheus/src/configuration/shared/utils.tsx
index d063d93956a..699d0e7f706 100644
--- a/packages/grafana-prometheus/src/configuration/shared/utils.tsx
+++ b/packages/grafana-prometheus/src/configuration/shared/utils.tsx
@@ -10,7 +10,7 @@ import { FieldValidationMessage, TextLink } from '@grafana/ui';
  * @returns
  */
 export function docsTip(url?: string) {
-  const docsUrl = 'https://grafana.com/docs/grafana/latest/datasources/prometheus/configure-prometheus-data-source/';
+  const docsUrl = 'https://grafana.com/docs/grafana/latest/datasources/prometheus/configure/';
 
   return (
     <TextLink href={url ? url : docsUrl} external>
diff --git a/public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx b/public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx
index 3b061820c04..68140a80e68 100644
--- a/public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/ConfigEditorPackage.tsx
@@ -39,7 +39,7 @@ export const ConfigEditor = (props: Props) => {
       )}
       <DataSourceDescription
         dataSourceName="Prometheus"
-        docsLink="https://grafana.com/docs/grafana/latest/datasources/prometheus/configure-prometheus-data-source/"
+        docsLink="https://grafana.com/docs/grafana/latest/datasources/prometheus/configure/"
       />
       <hr className={`${styles.hrTopSpace} ${styles.hrBottomSpace}`} />
       <DataSourcehttpSettingsOverhaul

From f81c5dec42059d9d42933bfe2c009a96949d9005 Mon Sep 17 00:00:00 2001
From: Gareth <email@garethdawson.xyz>
Date: Thu, 14 Aug 2025 10:13:17 +0100
Subject: [PATCH 165/243] Tempo: update codeowners (#109478)

* update tempo codeowners

* keep traces and profiling as owners

* update codeowners
---
 .github/CODEOWNERS | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 61aaa071c43..67ef71a4cf9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -303,7 +303,7 @@
 /devenv/docker/blocks/sensugo/ @grafana/grafana-backend-group
 /devenv/docker/blocks/slow_proxy/ @bergquist
 /devenv/docker/blocks/smtp/ @bergquist
-/devenv/docker/blocks/tempo/ @grafana/observability-traces-and-profiling
+/devenv/docker/blocks/tempo/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
 /devenv/docker/blocks/traefik/ @mckn
 /devenv/docker/blocks/zipkin/ @grafana/oss-big-tent
 /devenv/docker/blocks/webdav/ @grafana/alerting-backend
@@ -350,7 +350,7 @@
 /pkg/tsdb/prometheus/ @grafana/oss-big-tent
 /pkg/tsdb/elasticsearch/ @grafana/partner-datasources
 /pkg/tsdb/loki/ @grafana/oss-big-tent
-/pkg/tsdb/tempo/ @grafana/observability-traces-and-profiling
+/pkg/tsdb/tempo/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
 /pkg/tsdb/grafana-pyroscope-datasource/ @grafana/observability-traces-and-profiling
 /pkg/tsdb/parca/ @grafana/oss-big-tent
 
@@ -555,10 +555,10 @@
 /packages/grafana-o11y-ds-frontend/src/IntervalInput/ @grafana/observability-traces-and-profiling
 /packages/grafana-o11y-ds-frontend/src/NodeGraph/ @grafana/observability-traces-and-profiling
 /packages/grafana-o11y-ds-frontend/src/pyroscope/ @grafana/observability-traces-and-profiling
-/packages/grafana-o11y-ds-frontend/src/SpanBar/ @grafana/observability-traces-and-profiling
-/packages/grafana-o11y-ds-frontend/src/TraceToLogs/ @grafana/observability-traces-and-profiling
-/packages/grafana-o11y-ds-frontend/src/TraceToMetrics/ @grafana/observability-traces-and-profiling
-/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/ @grafana/observability-traces-and-profiling
+/packages/grafana-o11y-ds-frontend/src/SpanBar/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
+/packages/grafana-o11y-ds-frontend/src/TraceToLogs/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
+/packages/grafana-o11y-ds-frontend/src/TraceToMetrics/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
+/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
 
 # @grafana/plugin-configs
 /packages/grafana-plugin-configs/ @grafana/plugins-platform-frontend
@@ -644,7 +644,7 @@
 /packages/grafana-schema/src/**/statetimeline @grafana/dataviz-squad
 /packages/grafana-schema/src/**/statushistory @grafana/dataviz-squad
 /packages/grafana-schema/src/**/table @grafana/dataviz-squad
-/packages/grafana-schema/src/**/tempo @grafana/observability-traces-and-profiling
+/packages/grafana-schema/src/**/tempo @grafana/oss-big-tent @grafana/observability-traces-and-profiling
 /packages/grafana-schema/src/**/text @grafana/dataviz-squad
 /packages/grafana-schema/src/**/timeseries @grafana/dataviz-squad
 /packages/grafana-schema/src/**/trend @grafana/dataviz-squad
@@ -1030,7 +1030,7 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
 /public/app/plugins/datasource/prometheus/ @grafana/oss-big-tent
 /public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-datasources
 /public/app/plugins/datasource/zipkin/ @grafana/oss-big-tent
-/public/app/plugins/datasource/tempo/ @grafana/observability-traces-and-profiling
+/public/app/plugins/datasource/tempo/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/grafana-pyroscope-datasource/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/parca/ @grafana/oss-big-tent
 /public/app/plugins/datasource/alertmanager/ @grafana/alerting-squad

From 7bebd624465e60654d3a0b9f5c312dc9b7ac0f19 Mon Sep 17 00:00:00 2001
From: Gareth <email@garethdawson.xyz>
Date: Thu, 14 Aug 2025 10:23:44 +0100
Subject: [PATCH 166/243] Tempo: small refactor to tempo backend (#109581)

* update datasource info struct name

* remove unnecessary abstraction

* update error messages
---
 pkg/tsdb/tempo/metrics_stream.go        |  2 +-
 pkg/tsdb/tempo/search_stream.go         |  2 +-
 pkg/tsdb/tempo/standalone/datasource.go |  9 +--
 pkg/tsdb/tempo/standalone/main.go       |  1 -
 pkg/tsdb/tempo/tempo.go                 | 96 +++++++++++++------------
 pkg/tsdb/tempo/trace.go                 |  4 +-
 pkg/tsdb/tempo/trace_test.go            |  8 +--
 pkg/tsdb/tempo/traceql_query.go         |  4 +-
 pkg/tsdb/tempo/traceql_query_test.go    |  6 +-
 9 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/pkg/tsdb/tempo/metrics_stream.go b/pkg/tsdb/tempo/metrics_stream.go
index 85fac2df83b..cd711ac80f9 100644
--- a/pkg/tsdb/tempo/metrics_stream.go
+++ b/pkg/tsdb/tempo/metrics_stream.go
@@ -24,7 +24,7 @@ type PartialTempoQuery struct {
 	MetricsQueryType *dataquery.MetricsQueryType
 }
 
-func (s *Service) runMetricsStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender, datasource *Datasource) error {
+func (s *Service) runMetricsStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender, datasource *DatasourceInfo) error {
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.tempo.runMetricsStream")
 	defer span.End()
 
diff --git a/pkg/tsdb/tempo/search_stream.go b/pkg/tsdb/tempo/search_stream.go
index 527a1789f32..c78e138e4a7 100644
--- a/pkg/tsdb/tempo/search_stream.go
+++ b/pkg/tsdb/tempo/search_stream.go
@@ -31,7 +31,7 @@ type StreamSender interface {
 	SendBytes(data []byte) error
 }
 
-func (s *Service) runSearchStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender, datasource *Datasource) error {
+func (s *Service) runSearchStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender, datasource *DatasourceInfo) error {
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.tempo.runSearchStream")
 	defer span.End()
 
diff --git a/pkg/tsdb/tempo/standalone/datasource.go b/pkg/tsdb/tempo/standalone/datasource.go
index 087cb4dff71..8d371c07917 100644
--- a/pkg/tsdb/tempo/standalone/datasource.go
+++ b/pkg/tsdb/tempo/standalone/datasource.go
@@ -6,18 +6,19 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+
 	tempo "github.com/grafana/grafana/pkg/tsdb/tempo"
 )
 
-type Datasource struct {
-	Service *tempo.Service
-}
-
 var (
 	_ backend.QueryDataHandler = (*Datasource)(nil)
 	_ backend.StreamHandler    = (*Datasource)(nil)
 )
 
+type Datasource struct {
+	Service *tempo.Service
+}
+
 func NewDatasource(c context.Context, b backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 	return &Datasource{
 		Service: tempo.ProvideService(httpclient.NewProvider()),
diff --git a/pkg/tsdb/tempo/standalone/main.go b/pkg/tsdb/tempo/standalone/main.go
index 6961ead4c20..748c9459e68 100644
--- a/pkg/tsdb/tempo/standalone/main.go
+++ b/pkg/tsdb/tempo/standalone/main.go
@@ -8,7 +8,6 @@ import (
 )
 
 func main() {
-	// Created as described at https://grafana.com/developers/plugin-tools/introduction/backend-plugins
 	if err := datasource.Manage("tempo", NewDatasource, datasource.ManageOpts{}); err != nil {
 		log.DefaultLogger.Error(err.Error())
 		os.Exit(1)
diff --git a/pkg/tsdb/tempo/tempo.go b/pkg/tsdb/tempo/tempo.go
index 96a295b7fac..cbe4893f8e2 100644
--- a/pkg/tsdb/tempo/tempo.go
+++ b/pkg/tsdb/tempo/tempo.go
@@ -21,36 +21,19 @@ type Service struct {
 	logger log.Logger
 }
 
-// Return the file, line, and (full-path) function name of the caller
-func getRunContext() (string, int, string) {
-	pc := make([]uintptr, 10)
-	runtime.Callers(2, pc)
-	f := runtime.FuncForPC(pc[0])
-	file, line := f.FileLine(pc[0])
-	return file, line, f.Name()
-}
-
-// Return a formatted string representing the execution context for the logger
-func logEntrypoint() string {
-	file, line, pathToFunction := getRunContext()
-	parts := strings.Split(pathToFunction, "/")
-	functionName := parts[len(parts)-1]
-	return fmt.Sprintf("%s:%d[%s]", file, line, functionName)
+type DatasourceInfo struct {
+	HTTPClient      *http.Client
+	StreamingClient tempopb.StreamingQuerierClient
+	URL             string
 }
 
 func ProvideService(httpClientProvider *httpclient.Provider) *Service {
 	return &Service{
-		logger: backend.NewLoggerWith("logger", "tsdb.tempo"),
 		im:     datasource.NewInstanceManager(newInstanceSettings(httpClientProvider)),
+		logger: backend.NewLoggerWith("logger", "tsdb.tempo"),
 	}
 }
 
-type Datasource struct {
-	HTTPClient      *http.Client
-	StreamingClient tempopb.StreamingQuerierClient
-	URL             string
-}
-
 func newInstanceSettings(httpClientProvider *httpclient.Provider) datasource.InstanceFactoryFunc {
 	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		ctxLogger := backend.NewLoggerWith("logger", "tsdb.tempo").FromContext(ctx)
@@ -72,7 +55,7 @@ func newInstanceSettings(httpClientProvider *httpclient.Provider) datasource.Ins
 			return nil, err
 		}
 
-		model := &Datasource{
+		model := &DatasourceInfo{
 			HTTPClient:      client,
 			StreamingClient: streamingClient,
 			URL:             settings.URL,
@@ -91,16 +74,34 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 	// loop over queries and execute them individually.
 	for i, q := range req.Queries {
 		ctxLogger.Debug("Processing query", "counter", i, "function", logEntrypoint())
-		if res, err := s.query(ctx, req.PluginContext, q); err != nil {
-			ctxLogger.Error("Error processing query", "error", err)
-			return response, err
-		} else {
-			if res != nil {
-				ctxLogger.Debug("Query processed", "counter", i, "function", logEntrypoint())
-				response.Responses[q.RefID] = *res
-			} else {
-				ctxLogger.Debug("Query resulted in empty response", "counter", i, "function", logEntrypoint())
+
+		var res *backend.DataResponse
+		var err error
+
+		switch q.QueryType {
+		case string(dataquery.TempoQueryTypeTraceId):
+			res, err = s.getTrace(ctx, req.PluginContext, q)
+			if err != nil {
+				ctxLogger.Error("Error processing TraceId query", "error", err)
+				return response, err
 			}
+
+		case string(dataquery.TempoQueryTypeTraceql):
+			res, err = s.runTraceQlQuery(ctx, req.PluginContext, q)
+			if err != nil {
+				ctxLogger.Error("Error processing TraceQL query", "error", err)
+				return response, err
+			}
+
+		default:
+			return nil, fmt.Errorf("unsupported query type: '%s' for query with refID '%s'", q.QueryType, q.RefID)
+		}
+
+		if res != nil {
+			ctxLogger.Debug("Query processed", "counter", i, "function", logEntrypoint())
+			response.Responses[q.RefID] = *res
+		} else {
+			ctxLogger.Debug("Query resulted in empty response", "counter", i, "function", logEntrypoint())
 		}
 	}
 
@@ -108,26 +109,33 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 	return response, nil
 }
 
-func (s *Service) query(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) (*backend.DataResponse, error) {
-	switch query.QueryType {
-	case string(dataquery.TempoQueryTypeTraceId):
-		return s.getTrace(ctx, pCtx, query)
-	case string(dataquery.TempoQueryTypeTraceql):
-		return s.runTraceQlQuery(ctx, pCtx, query)
-	}
-	return nil, fmt.Errorf("unsupported query type: '%s' for query with refID '%s'", query.QueryType, query.RefID)
-}
-
-func (s *Service) getDSInfo(ctx context.Context, pluginCtx backend.PluginContext) (*Datasource, error) {
+func (s *Service) getDSInfo(ctx context.Context, pluginCtx backend.PluginContext) (*DatasourceInfo, error) {
 	i, err := s.im.Get(ctx, pluginCtx)
 	if err != nil {
 		return nil, err
 	}
 
-	instance, ok := i.(*Datasource)
+	instance, ok := i.(*DatasourceInfo)
 	if !ok {
 		return nil, fmt.Errorf("failed to cast datsource info")
 	}
 
 	return instance, nil
 }
+
+// Return the file, line, and (full-path) function name of the caller
+func getRunContext() (string, int, string) {
+	pc := make([]uintptr, 10)
+	runtime.Callers(2, pc)
+	f := runtime.FuncForPC(pc[0])
+	file, line := f.FileLine(pc[0])
+	return file, line, f.Name()
+}
+
+// Return a formatted string representing the execution context for the logger
+func logEntrypoint() string {
+	file, line, pathToFunction := getRunContext()
+	parts := strings.Split(pathToFunction, "/")
+	functionName := parts[len(parts)-1]
+	return fmt.Sprintf("%s:%d[%s]", file, line, functionName)
+}
diff --git a/pkg/tsdb/tempo/trace.go b/pkg/tsdb/tempo/trace.go
index 2536f3988ef..6cc705de502 100644
--- a/pkg/tsdb/tempo/trace.go
+++ b/pkg/tsdb/tempo/trace.go
@@ -135,7 +135,7 @@ func (s *Service) getTrace(ctx context.Context, pCtx backend.PluginContext, quer
 	return result, nil
 }
 
-func (s *Service) performTraceRequest(ctx context.Context, dsInfo *Datasource, apiVersion TraceRequestApiVersion, model *dataquery.TempoQuery, query backend.DataQuery, span trace.Span) (*http.Response, []byte, error) {
+func (s *Service) performTraceRequest(ctx context.Context, dsInfo *DatasourceInfo, apiVersion TraceRequestApiVersion, model *dataquery.TempoQuery, query backend.DataQuery, span trace.Span) (*http.Response, []byte, error) {
 	ctxLogger := s.logger.FromContext(ctx)
 	request, err := s.createRequest(ctx, dsInfo, apiVersion, *model.Query, query.TimeRange.From.Unix(), query.TimeRange.To.Unix())
 
@@ -177,7 +177,7 @@ const (
 	TraceRequestApiVersionV2
 )
 
-func (s *Service) createRequest(ctx context.Context, dsInfo *Datasource, apiVersion TraceRequestApiVersion, traceID string, start int64, end int64) (*http.Request, error) {
+func (s *Service) createRequest(ctx context.Context, dsInfo *DatasourceInfo, apiVersion TraceRequestApiVersion, traceID string, start int64, end int64) (*http.Request, error) {
 	ctxLogger := s.logger.FromContext(ctx)
 	var baseUrl string
 	var tempoQuery string
diff --git a/pkg/tsdb/tempo/trace_test.go b/pkg/tsdb/tempo/trace_test.go
index 78983040050..63932ee66bc 100644
--- a/pkg/tsdb/tempo/trace_test.go
+++ b/pkg/tsdb/tempo/trace_test.go
@@ -12,7 +12,7 @@ import (
 func TestTempo(t *testing.T) {
 	t.Run("createRequest v1 without time range - success", func(t *testing.T) {
 		service := &Service{logger: backend.NewLoggerWith("logger", "tempo-test")}
-		req, err := service.createRequest(context.Background(), &Datasource{}, TraceRequestApiVersionV1, "traceID", 0, 0)
+		req, err := service.createRequest(context.Background(), &DatasourceInfo{}, TraceRequestApiVersionV1, "traceID", 0, 0)
 		require.NoError(t, err)
 		assert.Equal(t, 1, len(req.Header))
 		assert.Equal(t, "/api/traces/traceID", req.URL.String())
@@ -20,7 +20,7 @@ func TestTempo(t *testing.T) {
 
 	t.Run("createRequest v1 with time range - success", func(t *testing.T) {
 		service := &Service{logger: backend.NewLoggerWith("logger", "tempo-test")}
-		req, err := service.createRequest(context.Background(), &Datasource{}, TraceRequestApiVersionV1, "traceID", 1, 2)
+		req, err := service.createRequest(context.Background(), &DatasourceInfo{}, TraceRequestApiVersionV1, "traceID", 1, 2)
 		require.NoError(t, err)
 		assert.Equal(t, 1, len(req.Header))
 		assert.Equal(t, "/api/traces/traceID?start=1&end=2", req.URL.String())
@@ -28,7 +28,7 @@ func TestTempo(t *testing.T) {
 
 	t.Run("createRequest v2 without time range - success", func(t *testing.T) {
 		service := &Service{logger: backend.NewLoggerWith("logger", "tempo-test")}
-		req, err := service.createRequest(context.Background(), &Datasource{}, TraceRequestApiVersionV2, "traceID", 0, 0)
+		req, err := service.createRequest(context.Background(), &DatasourceInfo{}, TraceRequestApiVersionV2, "traceID", 0, 0)
 		require.NoError(t, err)
 		assert.Equal(t, 1, len(req.Header))
 		assert.Equal(t, "/api/v2/traces/traceID", req.URL.String())
@@ -36,7 +36,7 @@ func TestTempo(t *testing.T) {
 
 	t.Run("createRequest v2 with time range - success", func(t *testing.T) {
 		service := &Service{logger: backend.NewLoggerWith("logger", "tempo-test")}
-		req, err := service.createRequest(context.Background(), &Datasource{}, TraceRequestApiVersionV2, "traceID", 1, 2)
+		req, err := service.createRequest(context.Background(), &DatasourceInfo{}, TraceRequestApiVersionV2, "traceID", 1, 2)
 		require.NoError(t, err)
 		assert.Equal(t, 1, len(req.Header))
 		assert.Equal(t, "/api/v2/traces/traceID?start=1&end=2", req.URL.String())
diff --git a/pkg/tsdb/tempo/traceql_query.go b/pkg/tsdb/tempo/traceql_query.go
index 1b5d31edad5..058a7944aa0 100644
--- a/pkg/tsdb/tempo/traceql_query.go
+++ b/pkg/tsdb/tempo/traceql_query.go
@@ -130,7 +130,7 @@ func handleConversionError(ctxLogger log.Logger, span trace.Span, err error) (*b
 	return nil, nil
 }
 
-func (s *Service) performMetricsQuery(ctx context.Context, dsInfo *Datasource, model *dataquery.TempoQuery, query backend.DataQuery, span trace.Span) (*http.Response, []byte, error) {
+func (s *Service) performMetricsQuery(ctx context.Context, dsInfo *DatasourceInfo, model *dataquery.TempoQuery, query backend.DataQuery, span trace.Span) (*http.Response, []byte, error) {
 	ctxLogger := s.logger.FromContext(ctx)
 	request, err := s.createMetricsQuery(ctx, dsInfo, model, query.TimeRange.From.Unix(), query.TimeRange.To.Unix())
 	if err != nil {
@@ -156,7 +156,7 @@ func (s *Service) performMetricsQuery(ctx context.Context, dsInfo *Datasource, m
 	return resp, body, nil
 }
 
-func (s *Service) createMetricsQuery(ctx context.Context, dsInfo *Datasource, query *dataquery.TempoQuery, start int64, end int64) (*http.Request, error) {
+func (s *Service) createMetricsQuery(ctx context.Context, dsInfo *DatasourceInfo, query *dataquery.TempoQuery, start int64, end int64) (*http.Request, error) {
 	ctxLogger := s.logger.FromContext(ctx)
 
 	queryType := "query_range"
diff --git a/pkg/tsdb/tempo/traceql_query_test.go b/pkg/tsdb/tempo/traceql_query_test.go
index cffe2c2273f..2dddec9696e 100644
--- a/pkg/tsdb/tempo/traceql_query_test.go
+++ b/pkg/tsdb/tempo/traceql_query_test.go
@@ -14,7 +14,7 @@ func TestCreateMetricsQuery_Success(t *testing.T) {
 	service := &Service{
 		logger: logger,
 	}
-	dsInfo := &Datasource{
+	dsInfo := &DatasourceInfo{
 		URL: "http://tempo:3100",
 	}
 	queryVal := "{attribute=\"value\"}"
@@ -40,7 +40,7 @@ func TestCreateMetricsQuery_OnlyQuery(t *testing.T) {
 	service := &Service{
 		logger: logger,
 	}
-	dsInfo := &Datasource{
+	dsInfo := &DatasourceInfo{
 		URL: "http://tempo:3100",
 	}
 	queryVal := "{attribute=\"value\"}"
@@ -60,7 +60,7 @@ func TestCreateMetricsQuery_URLParseError(t *testing.T) {
 	service := &Service{
 		logger: logger,
 	}
-	dsInfo := &Datasource{
+	dsInfo := &DatasourceInfo{
 		URL: "http://[::1]:namedport",
 	}
 	queryVal := "{attribute=\"value\"}"

From 751f25914f8e7b6cda93e371fdad657a7f4ebbc5 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Thu, 14 Aug 2025 10:32:01 +0100
Subject: [PATCH 167/243] FS: Fix theme- class name not being set on body
 (#109631)

---
 pkg/services/frontend/index.html | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkg/services/frontend/index.html b/pkg/services/frontend/index.html
index f582df4604e..97dacad25ae 100644
--- a/pkg/services/frontend/index.html
+++ b/pkg/services/frontend/index.html
@@ -262,18 +262,14 @@
           const theme = window.grafanaBootData.user.theme;
           if (theme === "system") {
             const darkQuery = window.matchMedia("(prefers-color-scheme: dark)");
-
-            if (darkQuery.matches) {
-              document.body.classList.add("theme-dark");
-              window.grafanaBootData.user.lightTheme = false;
-            } else {
-              document.body.classList.add("theme-light");
-              window.grafanaBootData.user.lightTheme = true;
-            }
+            window.grafanaBootData.user.lightTheme = !darkQuery.matches;
           }
-          const isLightTheme = window.grafanaBootData.user.lightTheme;
-          cssLink.href = window.grafanaBootData.assets[isLightTheme ? 'light' : 'dark'];
 
+          const isLightTheme = window.grafanaBootData.user.lightTheme;
+
+          document.body.classList.add(isLightTheme ? "theme-light" : "theme-dark");
+
+          cssLink.href = window.grafanaBootData.assets[isLightTheme ? 'light' : 'dark'];
           document.head.appendChild(cssLink);
         }
 

From a38a5e0301be207a8bbbb30ac48af18cbe6a3bc1 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Thu, 14 Aug 2025 10:39:21 +0100
Subject: [PATCH 168/243] Chore: Bump tmp with forced resolution (#109654)

---
 package.json |  3 ++-
 yarn.lock    | 22 +++-------------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 8805a5a5337..1c326a3352d 100644
--- a/package.json
+++ b/package.json
@@ -448,7 +448,8 @@
     "refractor/prismjs": "^1.27.0",
     "@mapbox/jsonlint-lines-primitives": "github:mapbox/jsonlint#commit=e31b7289baedf3e1000d7ae7edd42268212c9954",
     "get-document": "github:webmodules/get-document#commit=a04ccb499d6e0433a368c3bb150b4899b698461f",
-    "gitconfiglocal": "2.1.0"
+    "gitconfiglocal": "2.1.0",
+    "tmp@npm:^0.0.33": "~0.2.1"
   },
   "workspaces": {
     "packages": [
diff --git a/yarn.lock b/yarn.lock
index b6d49c8bb99..bb7ae5d1078 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24726,13 +24726,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"os-tmpdir@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "os-tmpdir@npm:1.0.2"
-  checksum: 10/5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
-  languageName: node
-  linkType: hard
-
 "ospath@npm:^1.2.2":
   version: 1.2.2
   resolution: "ospath@npm:1.2.2"
@@ -30985,19 +30978,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tmp@npm:^0.0.33":
-  version: 0.0.33
-  resolution: "tmp@npm:0.0.33"
-  dependencies:
-    os-tmpdir: "npm:~1.0.2"
-  checksum: 10/09c0abfd165cff29b32be42bc35e80b8c64727d97dedde6550022e88fa9fd39a084660415ed8e3ebaa2aca1ee142f86df8b31d4196d4f81c774a3a20fd4b6abf
-  languageName: node
-  linkType: hard
-
 "tmp@npm:~0.2.1, tmp@npm:~0.2.3":
-  version: 0.2.3
-  resolution: "tmp@npm:0.2.3"
-  checksum: 10/7b13696787f159c9754793a83aa79a24f1522d47b87462ddb57c18ee93ff26c74cbb2b8d9138f571d2e0e765c728fb2739863a672b280528512c6d83d511c6fa
+  version: 0.2.5
+  resolution: "tmp@npm:0.2.5"
+  checksum: 10/dd4b78b32385eab4899d3ae296007b34482b035b6d73e1201c4a9aede40860e90997a1452c65a2d21aee73d53e93cd167d741c3db4015d90e63b6d568a93d7ec
   languageName: node
   linkType: hard
 

From dfae5e5b4dfd1788bcd67fee7ddf5651c766e0e1 Mon Sep 17 00:00:00 2001
From: Matheus Macabu <macabu@users.noreply.github.com>
Date: Thu, 14 Aug 2025 11:50:56 +0200
Subject: [PATCH 169/243] Secrets: Add namespace matches checks to authorizer
 and secure value client (#109651)

* Decrypt: Add namespace matches to authorizer

* SecureValueClient: Add namespace matches when auth checking
---
 pkg/registry/apis/secret/contracts/decrypt.go |   2 +-
 .../apis/secret/decrypt/authorizer.go         |   7 +-
 .../apis/secret/decrypt/authorizer_test.go    | 114 ++++++++++--------
 .../apis/secret/decrypt/noop_authorizer.go    |   3 +-
 .../apis/secret/secure_value_client.go        |   9 ++
 .../apis/secret/secure_value_client_test.go   | 111 +++++++++--------
 pkg/storage/secret/metadata/decrypt_store.go  |   2 +-
 7 files changed, 145 insertions(+), 103 deletions(-)

diff --git a/pkg/registry/apis/secret/contracts/decrypt.go b/pkg/registry/apis/secret/contracts/decrypt.go
index 83e6fc72185..d42b1c7c958 100644
--- a/pkg/registry/apis/secret/contracts/decrypt.go
+++ b/pkg/registry/apis/secret/contracts/decrypt.go
@@ -24,7 +24,7 @@ type DecryptStorage interface {
 
 // DecryptAuthorizer is the interface for authorizing decryption requests.
 type DecryptAuthorizer interface {
-	Authorize(ctx context.Context, secureValueName string, secureValueDecrypters []string) (identity string, allowed bool)
+	Authorize(ctx context.Context, namespace xkube.Namespace, secureValueName string, secureValueDecrypters []string) (identity string, allowed bool)
 }
 
 // DecryptService is the interface for the decrypt service.
diff --git a/pkg/registry/apis/secret/decrypt/authorizer.go b/pkg/registry/apis/secret/decrypt/authorizer.go
index 042ec12e0ab..ca112302e63 100644
--- a/pkg/registry/apis/secret/decrypt/authorizer.go
+++ b/pkg/registry/apis/secret/decrypt/authorizer.go
@@ -11,6 +11,7 @@ import (
 
 	secretv1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/xkube"
 )
 
 // decryptAuthorizer is the authorizer implementation for decrypt operations.
@@ -25,7 +26,7 @@ func ProvideDecryptAuthorizer(tracer trace.Tracer) contracts.DecryptAuthorizer {
 }
 
 // authorize checks whether the auth info token has the right permissions to decrypt the secure value.
-func (a *decryptAuthorizer) Authorize(ctx context.Context, secureValueName string, secureValueDecrypters []string) (id string, isAllowed bool) {
+func (a *decryptAuthorizer) Authorize(ctx context.Context, ns xkube.Namespace, secureValueName string, secureValueDecrypters []string) (id string, isAllowed bool) {
 	ctx, span := a.tracer.Start(ctx, "DecryptAuthorizer.Authorize", trace.WithAttributes(
 		attribute.String("name", secureValueName),
 		attribute.StringSlice("decrypters", secureValueDecrypters),
@@ -44,6 +45,10 @@ func (a *decryptAuthorizer) Authorize(ctx context.Context, secureValueName strin
 		return "", false
 	}
 
+	if !claims.NamespaceMatches(authInfo.GetNamespace(), ns.String()) {
+		return "", false
+	}
+
 	serviceIdentityList, ok := authInfo.GetExtra()[authn.ServiceIdentityKey]
 	if !ok {
 		return "", false
diff --git a/pkg/registry/apis/secret/decrypt/authorizer_test.go b/pkg/registry/apis/secret/decrypt/authorizer_test.go
index 131ec33fb8b..61008b9faf8 100644
--- a/pkg/registry/apis/secret/decrypt/authorizer_test.go
+++ b/pkg/registry/apis/secret/decrypt/authorizer_test.go
@@ -10,43 +10,45 @@ import (
 	"go.opentelemetry.io/otel/trace/noop"
 
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/xkube"
 )
 
 func TestDecryptAuthorizer(t *testing.T) {
 	tracer := noop.NewTracerProvider().Tracer("test")
+	defaultNs := xkube.Namespace("default")
 
 	t.Run("when no auth info is present, it returns false", func(t *testing.T) {
 		ctx := context.Background()
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "", nil)
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.Empty(t, identity)
 		require.False(t, allowed)
 	})
 
 	t.Run("when token permissions are empty, it returns false", func(t *testing.T) {
-		ctx := createAuthContext(context.Background(), "identity", []string{})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{})
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "", nil)
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.NotEmpty(t, identity)
 		require.False(t, allowed)
 	})
 
 	t.Run("when service identity is empty, it returns false", func(t *testing.T) {
-		ctx := createAuthContext(context.Background(), "", []string{})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "", []string{})
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "", nil)
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.Empty(t, identity)
 		require.False(t, allowed)
 	})
 
 	t.Run("when service identity is empty string, it returns false", func(t *testing.T) {
-		ctx := createAuthContext(context.Background(), " ", []string{})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), " ", []string{})
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "", nil)
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.Empty(t, identity)
 		require.False(t, allowed)
 	})
@@ -55,14 +57,14 @@ func TestDecryptAuthorizer(t *testing.T) {
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
 		// nameless
-		ctx := createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues"})
-		identity, allowed := authorizer.Authorize(ctx, "", nil)
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues"})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.NotEmpty(t, identity)
 		require.False(t, allowed)
 
 		// named
-		ctx = createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues/name"})
-		identity, allowed = authorizer.Authorize(ctx, "", nil)
+		ctx = createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues/name"})
+		identity, allowed = authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.NotEmpty(t, identity)
 		require.False(t, allowed)
 	})
@@ -71,32 +73,32 @@ func TestDecryptAuthorizer(t *testing.T) {
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
 		// nameless
-		ctx := createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues:*"})
-		identity, allowed := authorizer.Authorize(ctx, "", nil)
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues:*"})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.NotEmpty(t, identity)
 		require.False(t, allowed)
 
 		// named
-		ctx = createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues/name:something"})
-		identity, allowed = authorizer.Authorize(ctx, "", nil)
+		ctx = createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues/name:something"})
+		identity, allowed = authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.NotEmpty(t, identity)
 		require.False(t, allowed)
 	})
 
 	t.Run("when permission does not have 2 or 3 parts, it returns false", func(t *testing.T) {
-		ctx := createAuthContext(context.Background(), "identity", []string{"secret.grafana.app:decrypt"})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app:decrypt"})
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "", nil)
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.NotEmpty(t, identity)
 		require.False(t, allowed)
 	})
 
 	t.Run("when permission has group that is not `secret.grafana.app`, it returns false", func(t *testing.T) {
-		ctx := createAuthContext(context.Background(), "identity", []string{"wrong.group/securevalues/invalid:decrypt"})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"wrong.group/securevalues/invalid:decrypt"})
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "", nil)
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.NotEmpty(t, identity)
 		require.False(t, allowed)
 	})
@@ -105,23 +107,23 @@ func TestDecryptAuthorizer(t *testing.T) {
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
 		// nameless
-		ctx := createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/invalid-resource:decrypt"})
-		identity, allowed := authorizer.Authorize(ctx, "", nil)
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/invalid-resource:decrypt"})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.NotEmpty(t, identity)
 		require.False(t, allowed)
 
 		// named
-		ctx = createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/invalid-resource/name:decrypt"})
-		identity, allowed = authorizer.Authorize(ctx, "", nil)
+		ctx = createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/invalid-resource/name:decrypt"})
+		identity, allowed = authorizer.Authorize(ctx, defaultNs, "", nil)
 		require.NotEmpty(t, identity)
 		require.False(t, allowed)
 	})
 
 	t.Run("when the allow list is empty, it allows all identities", func(t *testing.T) {
-		ctx := createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues:decrypt"})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues:decrypt"})
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "", []string{"identity"})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", []string{"identity"})
 		require.NotEmpty(t, identity)
 		require.True(t, allowed)
 	})
@@ -130,14 +132,14 @@ func TestDecryptAuthorizer(t *testing.T) {
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
 		// nameless
-		ctx := createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues:decrypt"})
-		identity, allowed := authorizer.Authorize(ctx, "", []string{"group2"})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues:decrypt"})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", []string{"group2"})
 		require.NotEmpty(t, identity)
 		require.False(t, allowed)
 
 		// named
-		ctx = createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues/name:decrypt"})
-		identity, allowed = authorizer.Authorize(ctx, "", []string{"group2"})
+		ctx = createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues/name:decrypt"})
+		identity, allowed = authorizer.Authorize(ctx, defaultNs, "", []string{"group2"})
 		require.NotEmpty(t, identity)
 		require.False(t, allowed)
 	})
@@ -146,20 +148,20 @@ func TestDecryptAuthorizer(t *testing.T) {
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
 		// nameless
-		ctx := createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues:decrypt"})
-		identity, allowed := authorizer.Authorize(ctx, "", []string{"identity"})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues:decrypt"})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", []string{"identity"})
 		require.True(t, allowed)
 		require.Equal(t, "identity", identity)
 
 		// named
-		ctx = createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues/name:decrypt"})
-		identity, allowed = authorizer.Authorize(ctx, "name", []string{"identity"})
+		ctx = createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues/name:decrypt"})
+		identity, allowed = authorizer.Authorize(ctx, defaultNs, "name", []string{"identity"})
 		require.True(t, allowed)
 		require.Equal(t, "identity", identity)
 	})
 
 	t.Run("when there are multiple permissions, some invalid, only valid ones are considered", func(t *testing.T) {
-		ctx := createAuthContext(context.Background(), "identity", []string{
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{
 			"secret.grafana.app/securevalues/name1:decrypt",
 			"secret.grafana.app/securevalues/name2:decrypt",
 			"secret.grafana.app/securevalues/invalid:read",
@@ -168,47 +170,47 @@ func TestDecryptAuthorizer(t *testing.T) {
 		})
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "name1", []string{"identity"})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "name1", []string{"identity"})
 		require.True(t, allowed)
 		require.Equal(t, "identity", identity)
 
-		identity, allowed = authorizer.Authorize(ctx, "name2", []string{"identity"})
+		identity, allowed = authorizer.Authorize(ctx, defaultNs, "name2", []string{"identity"})
 		require.True(t, allowed)
 		require.Equal(t, "identity", identity)
 	})
 
 	t.Run("when empty secure value name with specific permission, it returns false", func(t *testing.T) {
-		ctx := createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues/name:decrypt"})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues/name:decrypt"})
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "", []string{"identity"})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", []string{"identity"})
 		require.Equal(t, "identity", identity)
 		require.False(t, allowed)
 	})
 
 	t.Run("when permission has an extra / but no name, it returns false", func(t *testing.T) {
-		ctx := createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues/:decrypt"})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues/:decrypt"})
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "", []string{"identity"})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", []string{"identity"})
 		require.Equal(t, "identity", identity)
 		require.False(t, allowed)
 	})
 
 	t.Run("when the decrypters list is empty, meaning nothing can decrypt the secure value, it returns false", func(t *testing.T) {
-		ctx := createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues:decrypt"})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues:decrypt"})
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "name", []string{})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "name", []string{})
 		require.Equal(t, "identity", identity)
 		require.False(t, allowed)
 	})
 
 	t.Run("when one of decrypters matches the identity, it returns true", func(t *testing.T) {
-		ctx := createAuthContext(context.Background(), "identity1", []string{"secret.grafana.app/securevalues:decrypt"})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity1", []string{"secret.grafana.app/securevalues:decrypt"})
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		identity, allowed := authorizer.Authorize(ctx, "", []string{"identity1", "identity2", "identity3"})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", []string{"identity1", "identity2", "identity3"})
 		require.Equal(t, "identity1", identity)
 		require.True(t, allowed)
 	})
@@ -216,25 +218,35 @@ func TestDecryptAuthorizer(t *testing.T) {
 	t.Run("permissions must be case-sensitive and return false", func(t *testing.T) {
 		authorizer := ProvideDecryptAuthorizer(tracer)
 
-		ctx := createAuthContext(context.Background(), "identity", []string{"SECRET.grafana.app/securevalues:decrypt"})
-		identity, allowed := authorizer.Authorize(ctx, "", []string{"identity"})
+		ctx := createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"SECRET.grafana.app/securevalues:decrypt"})
+		identity, allowed := authorizer.Authorize(ctx, defaultNs, "", []string{"identity"})
 		require.Equal(t, "identity", identity)
 		require.False(t, allowed)
 
-		ctx = createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/SECUREVALUES:decrypt"})
-		identity, allowed = authorizer.Authorize(ctx, "", []string{"identity"})
+		ctx = createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/SECUREVALUES:decrypt"})
+		identity, allowed = authorizer.Authorize(ctx, defaultNs, "", []string{"identity"})
 		require.Equal(t, "identity", identity)
 		require.False(t, allowed)
 
-		ctx = createAuthContext(context.Background(), "identity", []string{"secret.grafana.app/securevalues:DECRYPT"})
-		identity, allowed = authorizer.Authorize(ctx, "", []string{"identity"})
+		ctx = createAuthContext(context.Background(), defaultNs.String(), "identity", []string{"secret.grafana.app/securevalues:DECRYPT"})
+		identity, allowed = authorizer.Authorize(ctx, defaultNs, "", []string{"identity"})
 		require.Equal(t, "identity", identity)
 		require.False(t, allowed)
 	})
+
+	t.Run("when namespace doesn't match the token's, it returns false", func(t *testing.T) {
+		authorizer := ProvideDecryptAuthorizer(tracer)
+
+		ctx := createAuthContext(context.Background(), "namespace1", "identity", []string{"secret.grafana.app/securevalues:decrypt"})
+		identity, allowed := authorizer.Authorize(ctx, "namespace2", "", []string{"identity"})
+		require.Empty(t, identity)
+		require.False(t, allowed)
+	})
 }
 
-func createAuthContext(ctx context.Context, serviceIdentity string, permissions []string) context.Context {
+func createAuthContext(ctx context.Context, namespace string, serviceIdentity string, permissions []string) context.Context {
 	requester := &identity.StaticRequester{
+		Namespace: namespace,
 		AccessTokenClaims: &authn.Claims[authn.AccessTokenClaims]{
 			Rest: authn.AccessTokenClaims{
 				Permissions:     permissions,
diff --git a/pkg/registry/apis/secret/decrypt/noop_authorizer.go b/pkg/registry/apis/secret/decrypt/noop_authorizer.go
index 079d49b67ab..f2fe29cbc48 100644
--- a/pkg/registry/apis/secret/decrypt/noop_authorizer.go
+++ b/pkg/registry/apis/secret/decrypt/noop_authorizer.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
+	"github.com/grafana/grafana/pkg/registry/apis/secret/xkube"
 )
 
 // NoopAlwaysAllowedAuthorizer is a no-op implementation of the DecryptAuthorizer which always returns `allowed=true`.
@@ -11,6 +12,6 @@ type NoopAlwaysAllowedAuthorizer struct{}
 
 var _ contracts.DecryptAuthorizer = &NoopAlwaysAllowedAuthorizer{}
 
-func (a *NoopAlwaysAllowedAuthorizer) Authorize(ctx context.Context, secureValueName string, secureValueDecrypters []string) (identity string, allowed bool) {
+func (a *NoopAlwaysAllowedAuthorizer) Authorize(context.Context, xkube.Namespace, string, []string) (string, bool) {
 	return "", true
 }
diff --git a/pkg/registry/apis/secret/secure_value_client.go b/pkg/registry/apis/secret/secure_value_client.go
index e34f31abd42..faf1eea4ef1 100644
--- a/pkg/registry/apis/secret/secure_value_client.go
+++ b/pkg/registry/apis/secret/secure_value_client.go
@@ -265,8 +265,17 @@ func (c *secureValueClient) mapError(err error, name string) error {
 }
 
 func (c *secureValueClient) checkAccess(ctx context.Context, name, verb string) error {
+	authInfo, ok := claims.AuthInfoFrom(ctx)
+	if !ok {
+		return apierrors.NewUnauthorized("missing auth info in context")
+	}
+
 	gr := secretv1beta1.SecureValuesResourceInfo.GroupResource()
 
+	if !claims.NamespaceMatches(authInfo.GetNamespace(), c.namespace) {
+		return apierrors.NewForbidden(gr, name, fmt.Errorf("namespace mismatch: %s != %s", authInfo.GetNamespace(), c.namespace))
+	}
+
 	decision, reason, err := c.access.Authorize(ctx, authorizer.AttributesRecord{
 		Verb:            verb,
 		Namespace:       c.namespace,
diff --git a/pkg/registry/apis/secret/secure_value_client_test.go b/pkg/registry/apis/secret/secure_value_client_test.go
index 44e8349c101..480b8c5062f 100644
--- a/pkg/registry/apis/secret/secure_value_client_test.go
+++ b/pkg/registry/apis/secret/secure_value_client_test.go
@@ -1,6 +1,7 @@
 package secret
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -118,61 +119,75 @@ func TestIntegration_SecureValueClient_CRUD(t *testing.T) {
 }
 
 func Test_SecureValueClient_CRUD_NoPermissions(t *testing.T) {
-	setup := testutils.Setup(t)
-
-	validator := validator.ProvideSecureValueValidator()
-
-	client := ProvideSecureValueClient(
-		setup.SecureValueService,
-		validator,
-		setup.AccessClient,
-	)
-
 	ns := "stacks-1234"
-	ctx := testutils.CreateUserAuthContext(t.Context(), ns, nil)
 
-	nsClient, err := client.Client(ctx, ns)
-	require.NoError(t, err)
-	require.NotNil(t, nsClient)
-
-	sv := &secretv1beta1.SecureValue{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-sv",
-			Namespace: ns,
-		},
+	testcases := []struct {
+		name        string
+		ctx         context.Context
+		errorReason metav1.StatusReason
+	}{
+		{"no auth context", context.Background(), metav1.StatusReasonUnauthorized},
+		{"no permissions", testutils.CreateUserAuthContext(t.Context(), ns, nil), metav1.StatusReasonForbidden},
+		{"mismatching namespace", testutils.CreateUserAuthContext(t.Context(), "other-ns", nil), metav1.StatusReasonForbidden},
 	}
 
-	unstructured, err := toUnstructured(sv)
-	require.NoError(t, err)
+	for _, tc := range testcases {
+		t.Run(tc.name, func(t *testing.T) {
+			setup := testutils.Setup(t)
 
-	// Create
-	created, err := nsClient.Create(ctx, unstructured, metav1.CreateOptions{})
-	var apiErr *apierrors.StatusError
-	require.ErrorAs(t, err, &apiErr)
-	require.Equal(t, apiErr.ErrStatus.Reason, metav1.StatusReasonForbidden)
-	require.Nil(t, created)
+			validator := validator.ProvideSecureValueValidator()
 
-	// Read
-	read, err := nsClient.Get(ctx, sv.Name, metav1.GetOptions{})
-	require.ErrorAs(t, err, &apiErr)
-	require.Equal(t, apiErr.ErrStatus.Reason, metav1.StatusReasonForbidden)
-	require.Nil(t, created)
+			client := ProvideSecureValueClient(
+				setup.SecureValueService,
+				validator,
+				setup.AccessClient,
+			)
 
-	// Update
-	updated, err := nsClient.Update(ctx, unstructured, metav1.UpdateOptions{})
-	require.ErrorAs(t, err, &apiErr)
-	require.Equal(t, apiErr.ErrStatus.Reason, metav1.StatusReasonForbidden)
-	require.Nil(t, updated)
+			ctx := tc.ctx
 
-	// List
-	list, err := nsClient.List(ctx, metav1.ListOptions{})
-	require.ErrorAs(t, err, &apiErr)
-	require.Equal(t, apiErr.ErrStatus.Reason, metav1.StatusReasonForbidden)
-	require.Nil(t, list)
+			nsClient, err := client.Client(ctx, ns)
+			require.NoError(t, err)
+			require.NotNil(t, nsClient)
 
-	// Delete
-	err = nsClient.Delete(ctx, sv.Name, metav1.DeleteOptions{})
-	require.ErrorAs(t, err, &apiErr)
-	require.Equal(t, apiErr.ErrStatus.Reason, metav1.StatusReasonForbidden)
-	require.Nil(t, read)
+			sv := &secretv1beta1.SecureValue{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-sv",
+					Namespace: ns,
+				},
+			}
+
+			unstructured, err := toUnstructured(sv)
+			require.NoError(t, err)
+
+			// Create
+			created, err := nsClient.Create(ctx, unstructured, metav1.CreateOptions{})
+			var apiErr *apierrors.StatusError
+			require.ErrorAs(t, err, &apiErr)
+			require.Equal(t, apiErr.ErrStatus.Reason, tc.errorReason)
+			require.Nil(t, created)
+
+			// Read
+			read, err := nsClient.Get(ctx, sv.Name, metav1.GetOptions{})
+			require.ErrorAs(t, err, &apiErr)
+			require.Equal(t, apiErr.ErrStatus.Reason, tc.errorReason)
+			require.Nil(t, read)
+
+			// Update
+			updated, err := nsClient.Update(ctx, unstructured, metav1.UpdateOptions{})
+			require.ErrorAs(t, err, &apiErr)
+			require.Equal(t, apiErr.ErrStatus.Reason, tc.errorReason)
+			require.Nil(t, updated)
+
+			// List
+			list, err := nsClient.List(ctx, metav1.ListOptions{})
+			require.ErrorAs(t, err, &apiErr)
+			require.Equal(t, apiErr.ErrStatus.Reason, tc.errorReason)
+			require.Nil(t, list)
+
+			// Delete
+			err = nsClient.Delete(ctx, sv.Name, metav1.DeleteOptions{})
+			require.ErrorAs(t, err, &apiErr)
+			require.Equal(t, apiErr.ErrStatus.Reason, tc.errorReason)
+		})
+	}
 }
diff --git a/pkg/storage/secret/metadata/decrypt_store.go b/pkg/storage/secret/metadata/decrypt_store.go
index cd959883824..1a827b32d00 100644
--- a/pkg/storage/secret/metadata/decrypt_store.go
+++ b/pkg/storage/secret/metadata/decrypt_store.go
@@ -110,7 +110,7 @@ func (s *decryptStorage) Decrypt(ctx context.Context, namespace xkube.Namespace,
 		return "", contracts.ErrDecryptNotFound
 	}
 
-	decrypterIdentity, authorized := s.decryptAuthorizer.Authorize(ctx, name, sv.Spec.Decrypters)
+	decrypterIdentity, authorized := s.decryptAuthorizer.Authorize(ctx, namespace, name, sv.Spec.Decrypters)
 	if !authorized {
 		return "", contracts.ErrDecryptNotAuthorized
 	}

From ffc7508a466d881b3b09a2b9554bf99d2e829ca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Thu, 14 Aug 2025 12:19:40 +0200
Subject: [PATCH 170/243] Provisioning: Enforce instance repository isolation
 (#109512)

* Fix validation on repository creation

* Fix linting

* Do not count the provided one

* Fix test

* Fix tests
---
 pkg/registry/apis/provisioning/register.go    |  22 +-
 pkg/tests/apis/provisioning/helper_test.go    |  46 ++++
 pkg/tests/apis/provisioning/movejob_test.go   |  15 +-
 .../apis/provisioning/repository_test.go      | 221 +++++++++++++++++-
 4 files changed, 297 insertions(+), 7 deletions(-)

diff --git a/pkg/registry/apis/provisioning/register.go b/pkg/registry/apis/provisioning/register.go
index 5de39950c5c..79559bb2238 100644
--- a/pkg/registry/apis/provisioning/register.go
+++ b/pkg/registry/apis/provisioning/register.go
@@ -612,15 +612,31 @@ func (b *APIBuilder) verifyAgaintsExistingRepositories(cfg *provisioning.Reposit
 	}
 
 	if cfg.Spec.Sync.Target == provisioning.SyncTargetTypeInstance {
+		// Instance sync can only be created if NO other repositories exist
 		for _, v := range all {
-			if v.Name != cfg.Name && v.Spec.Sync.Target == provisioning.SyncTargetTypeInstance {
+			if v.Name != cfg.Name {
 				return field.Forbidden(field.NewPath("spec", "sync", "target"),
-					"Another repository is already targeting root: "+v.Name)
+					"Instance repository can only be created when no other repositories exist. Found: "+v.Name)
+			}
+		}
+	} else {
+		// Folder sync cannot be created if an instance repository exists
+		for _, v := range all {
+			if v.Spec.Sync.Target == provisioning.SyncTargetTypeInstance {
+				return field.Forbidden(field.NewPath("spec", "sync", "target"),
+					"Cannot create folder repository when instance repository exists: "+v.Name)
 			}
 		}
 	}
 
-	if len(all) >= 10 {
+	// Count repositories excluding the current one being created/updated
+	count := 0
+	for _, v := range all {
+		if v.Name != cfg.Name {
+			count++
+		}
+	}
+	if count >= 10 {
 		return field.Forbidden(field.NewPath("spec"),
 			"Maximum number of 10 repositories reached")
 	}
diff --git a/pkg/tests/apis/provisioning/helper_test.go b/pkg/tests/apis/provisioning/helper_test.go
index 85ac36e24e9..894f7bd8174 100644
--- a/pkg/tests/apis/provisioning/helper_test.go
+++ b/pkg/tests/apis/provisioning/helper_test.go
@@ -767,3 +767,49 @@ func countFilesInDir(rootPath string) (int, error) {
 	})
 	return count, err
 }
+
+// CleanupAllRepos deletes all repositories and waits for them to be fully removed
+func (h *provisioningTestHelper) CleanupAllRepos(t *testing.T) {
+	t.Helper()
+	ctx := context.Background()
+
+	// First, get all repositories that exist
+	list, err := h.Repositories.Resource.List(ctx, metav1.ListOptions{})
+	if err != nil || len(list.Items) == 0 {
+		return // Nothing to clean up
+	}
+
+	// Wait for any active jobs to complete before deleting repositories
+	require.EventuallyWithT(t, func(collect *assert.CollectT) {
+		activeJobs, err := h.Jobs.Resource.List(ctx, metav1.ListOptions{})
+		if !assert.NoError(collect, err, "failed to list active jobs") {
+			return
+		}
+		assert.Equal(collect, 0, len(activeJobs.Items), "all active jobs should complete before cleanup")
+	}, time.Second*20, time.Millisecond*100, "active jobs should complete before cleanup")
+
+	// Now delete all repositories with retries
+	require.EventuallyWithT(t, func(collect *assert.CollectT) {
+		list, err := h.Repositories.Resource.List(ctx, metav1.ListOptions{})
+		if !assert.NoError(collect, err) {
+			return
+		}
+
+		for _, repo := range list.Items {
+			err := h.Repositories.Resource.Delete(ctx, repo.GetName(), metav1.DeleteOptions{})
+			// Don't fail if already deleted (404 is OK)
+			if err != nil {
+				assert.True(collect, apierrors.IsNotFound(err), "Should be able to delete repository %s (or it should already be deleted)", repo.GetName())
+			}
+		}
+	}, time.Second*10, time.Millisecond*100, "should be able to delete all repositories")
+
+	// Then wait for repositories to be fully deleted to ensure clean state
+	require.EventuallyWithT(t, func(collect *assert.CollectT) {
+		list, err := h.Repositories.Resource.List(ctx, metav1.ListOptions{})
+		if !assert.NoError(collect, err) {
+			return
+		}
+		assert.Equal(collect, 0, len(list.Items), "repositories should be cleaned up")
+	}, time.Second*15, time.Millisecond*100, "repositories should be cleaned up between subtests")
+}
diff --git a/pkg/tests/apis/provisioning/movejob_test.go b/pkg/tests/apis/provisioning/movejob_test.go
index 9ef14e75d78..770f0f9bce9 100644
--- a/pkg/tests/apis/provisioning/movejob_test.go
+++ b/pkg/tests/apis/provisioning/movejob_test.go
@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -186,14 +187,24 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
 	})
 
 	t.Run("move by resource reference", func(t *testing.T) {
+		// Delete the existing repository to avoid conflicts with validation rules
+		err := helper.Repositories.Resource.Delete(ctx, repo, metav1.DeleteOptions{})
+		require.NoError(t, err)
+
+		// Wait for repository to be fully deleted
+		require.EventuallyWithT(t, func(collect *assert.CollectT) {
+			_, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{})
+			assert.True(collect, apierrors.IsNotFound(err), "repository should be deleted")
+		}, time.Second*5, time.Millisecond*50, "repository should be deleted before creating new one")
+
 		// Create a unique repository for resource reference testing to avoid contamination
 		const refRepo = "move-ref-test-repo"
 		localRefTmp := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
 			"Name":        refRepo,
 			"SyncEnabled": true,
-			"SyncTarget":  "folder",
+			"SyncTarget":  "instance",
 		})
-		_, err := helper.Repositories.Resource.Create(ctx, localRefTmp, metav1.CreateOptions{})
+		_, err = helper.Repositories.Resource.Create(ctx, localRefTmp, metav1.CreateOptions{})
 		require.NoError(t, err)
 
 		// Create modified test files with unique UIDs for ResourceRef testing
diff --git a/pkg/tests/apis/provisioning/repository_test.go b/pkg/tests/apis/provisioning/repository_test.go
index 82355bb7604..e3213517869 100644
--- a/pkg/tests/apis/provisioning/repository_test.go
+++ b/pkg/tests/apis/provisioning/repository_test.go
@@ -3,6 +3,7 @@ package provisioning
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"strings"
 	"testing"
@@ -292,6 +293,12 @@ func TestIntegrationProvisioning_CreatingGitHubRepository(t *testing.T) {
 		assert.Equal(collect, 0, len(found.Items), "expected dashboards to be deleted")
 	}, time.Second*20, time.Millisecond*10, "Expected dashboards to be deleted")
 
+	// Wait for repository to be fully deleted before subtests run
+	require.EventuallyWithT(t, func(collect *assert.CollectT) {
+		_, err := helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{})
+		assert.True(collect, apierrors.IsNotFound(err), "repository should be deleted")
+	}, time.Second*10, time.Millisecond*50, "repository should be deleted before subtests")
+
 	t.Run("github url cleanup", func(t *testing.T) {
 		tests := []struct {
 			name   string
@@ -318,8 +325,9 @@ func TestIntegrationProvisioning_CreatingGitHubRepository(t *testing.T) {
 		for _, test := range tests {
 			t.Run(test.name, func(t *testing.T) {
 				input := helper.RenderObject(t, "testdata/github-readonly.json.tmpl", map[string]any{
-					"Name": test.name,
-					"URL":  test.input,
+					"Name":       test.name,
+					"URL":        test.input,
+					"SyncTarget": "instance",
 				})
 
 				_, err := helper.Repositories.Resource.Create(ctx, input, metav1.CreateOptions{})
@@ -334,11 +342,220 @@ func TestIntegrationProvisioning_CreatingGitHubRepository(t *testing.T) {
 
 				err = helper.Repositories.Resource.Delete(ctx, test.name, metav1.DeleteOptions{})
 				require.NoError(t, err, "failed to delete")
+
+				// Wait for repository to be fully deleted before next test
+				require.EventuallyWithT(t, func(collect *assert.CollectT) {
+					_, err := helper.Repositories.Resource.Get(ctx, test.name, metav1.GetOptions{})
+					assert.True(collect, apierrors.IsNotFound(err), "repository should be deleted")
+				}, time.Second*5, time.Millisecond*50, "repository should be deleted")
 			})
 		}
 	})
 }
 
+func TestIntegrationProvisioning_InstanceSyncValidation(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	t.Run("single instance sync is allowed", func(t *testing.T) {
+		// Ensure clean state
+		helper.CleanupAllRepos(t)
+
+		repoName := "instance-repo-single"
+		testRepo := TestRepo{
+			Name:               repoName,
+			Target:             "instance",
+			Copies:             map[string]string{}, // No files needed for this test
+			ExpectedDashboards: 0,
+			ExpectedFolders:    0,
+		}
+
+		// Create instance sync repository - should succeed
+		helper.CreateRepo(t, testRepo)
+
+		// Clean up at end of test
+		helper.CleanupAllRepos(t)
+	})
+
+	t.Run("instance sync rejected when any other repository exists", func(t *testing.T) {
+		// Ensure clean state
+		helper.CleanupAllRepos(t)
+
+		existingFolderName := "existing-folder-repo"
+		instanceRepoName := "instance-repo-blocked"
+
+		// Create a folder sync repository first
+		folderTestRepo := TestRepo{
+			Name:               existingFolderName,
+			Target:             "folder",
+			Copies:             map[string]string{}, // No files needed for this test
+			ExpectedDashboards: 0,
+			ExpectedFolders:    1, // One folder expected after sync
+		}
+		helper.CreateRepo(t, folderTestRepo)
+
+		// Try to create an instance sync repository - should fail because any other repository exists
+		instanceRepo := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+			"Name":        instanceRepoName,
+			"SyncEnabled": true,
+			"SyncTarget":  "instance",
+		})
+
+		_, err := helper.Repositories.Resource.Create(ctx, instanceRepo, metav1.CreateOptions{FieldValidation: "Strict"})
+		require.Error(t, err, "instance sync repository should be rejected when any other repository exists")
+
+		// Verify the error message mentions that instance can only be created when no other repositories exist
+		statusError := helper.RequireApiErrorStatus(err, metav1.StatusReasonInvalid, http.StatusUnprocessableEntity)
+		require.Contains(t, statusError.Message, "Instance repository can only be created when no other repositories exist. Found: "+existingFolderName)
+
+		// Clean up at end of test
+		helper.CleanupAllRepos(t)
+	})
+
+	t.Run("multiple folder syncs are allowed", func(t *testing.T) {
+		// Ensure clean state
+		helper.CleanupAllRepos(t)
+
+		firstFolderName := "folder-repo-multi-1"
+		secondFolderName := "folder-repo-multi-2"
+
+		// Create first folder sync repository
+		folderTestRepo1 := TestRepo{
+			Name:               firstFolderName,
+			Target:             "folder",
+			Copies:             map[string]string{}, // No files needed for this test
+			ExpectedDashboards: 0,
+			ExpectedFolders:    1, // One folder expected after sync
+		}
+		helper.CreateRepo(t, folderTestRepo1)
+
+		// Create second folder sync repository - should succeed
+		folderTestRepo2 := TestRepo{
+			Name:               secondFolderName,
+			Target:             "folder",
+			Copies:             map[string]string{}, // No files needed for this test
+			ExpectedDashboards: 0,
+			ExpectedFolders:    2, // Two folders expected after sync (1 + 1)
+		}
+		helper.CreateRepo(t, folderTestRepo2)
+
+		// Clean up at end of test
+		helper.CleanupAllRepos(t)
+	})
+
+	t.Run("folder sync is rejected when instance sync exists", func(t *testing.T) {
+		// Ensure clean state
+		helper.CleanupAllRepos(t)
+
+		instanceRepoName := "instance-blocking-folder"
+		folderRepoName := "folder-blocked-by-instance"
+
+		// Create instance sync repository first
+		instanceTestRepo := TestRepo{
+			Name:               instanceRepoName,
+			Target:             "instance",
+			Copies:             map[string]string{}, // No files needed for this test
+			ExpectedDashboards: 0,
+			ExpectedFolders:    0,
+		}
+		helper.CreateRepo(t, instanceTestRepo)
+
+		// Try to create folder sync repository - should fail
+		folderRepo := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+			"Name":        folderRepoName,
+			"SyncEnabled": true,
+			"SyncTarget":  "folder",
+		})
+
+		_, err := helper.Repositories.Resource.Create(ctx, folderRepo, metav1.CreateOptions{FieldValidation: "Strict"})
+		require.Error(t, err, "folder sync repository should be rejected when instance sync exists")
+
+		// Verify the error message mentions the existing instance repository
+		statusError := helper.RequireApiErrorStatus(err, metav1.StatusReasonInvalid, http.StatusUnprocessableEntity)
+		require.Contains(t, statusError.Message, "Cannot create folder repository when instance repository exists: "+instanceRepoName)
+
+		// Clean up at end of test
+		helper.CleanupAllRepos(t)
+	})
+
+	t.Run("instance sync can only be created when no repositories exist", func(t *testing.T) {
+		// Ensure clean state
+		helper.CleanupAllRepos(t)
+
+		// This test verifies that instance sync can ONLY be created when there are no other repositories
+		instanceRepoName := "instance-only-when-empty"
+
+		// First, create instance sync repository when no other repositories exist - should succeed
+		instanceTestRepo := TestRepo{
+			Name:               instanceRepoName,
+			Target:             "instance",
+			Copies:             map[string]string{}, // No files needed for this test
+			ExpectedDashboards: 0,
+			ExpectedFolders:    0,
+		}
+		helper.CreateRepo(t, instanceTestRepo)
+
+		// Now try to create any other repository - should fail
+		otherRepoName := "other-repo-blocked"
+		otherRepo := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+			"Name":        otherRepoName,
+			"SyncEnabled": true,
+			"SyncTarget":  "folder",
+		})
+
+		_, err := helper.Repositories.Resource.Create(ctx, otherRepo, metav1.CreateOptions{FieldValidation: "Strict"})
+		require.Error(t, err, "folder sync repository should be rejected when instance sync exists")
+
+		statusError := helper.RequireApiErrorStatus(err, metav1.StatusReasonInvalid, http.StatusUnprocessableEntity)
+		require.Contains(t, statusError.Message, "Cannot create folder repository when instance repository exists: "+instanceRepoName)
+
+		// Clean up at end of test
+		helper.CleanupAllRepos(t)
+	})
+
+	t.Run("repository limit validation", func(t *testing.T) {
+		// Ensure clean state
+		helper.CleanupAllRepos(t)
+
+		// This test verifies the 10 repository limit validation by actually creating 10 repositories
+
+		// Create 10 repositories - should all succeed
+		for i := 1; i <= 10; i++ {
+			repoName := fmt.Sprintf("limit-test-repo-%d", i)
+			limitTestRepo := TestRepo{
+				Name:               repoName,
+				Target:             "folder",
+				Copies:             map[string]string{}, // No files needed for this test
+				ExpectedDashboards: 0,
+				ExpectedFolders:    i, // Each repository creates a folder, so total = i
+			}
+			helper.CreateRepo(t, limitTestRepo)
+		}
+
+		// Try to create the 11th repository - should fail due to limit
+		eleventhRepoName := "limit-test-repo-11"
+		eleventhRepo := helper.RenderObject(t, "testdata/local-write.json.tmpl", map[string]any{
+			"Name":        eleventhRepoName,
+			"SyncEnabled": true,
+			"SyncTarget":  "folder",
+		})
+
+		_, err := helper.Repositories.Resource.Create(ctx, eleventhRepo, metav1.CreateOptions{FieldValidation: "Strict"})
+		require.Error(t, err, "11th repository should be rejected due to limit")
+
+		// Verify the error message mentions the repository limit
+		statusError := helper.RequireApiErrorStatus(err, metav1.StatusReasonInvalid, http.StatusUnprocessableEntity)
+		require.Contains(t, statusError.Message, "Maximum number of 10 repositories reached")
+
+		// Clean up at end of test
+		helper.CleanupAllRepos(t)
+	})
+}
+
 func TestIntegrationProvisioning_RunLocalRepository(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")

From 9b38ac1c24fa13ac3cb871d127514f126454118e Mon Sep 17 00:00:00 2001
From: Sriram <153843+yesoreyeram@users.noreply.github.com>
Date: Thu, 14 Aug 2025 11:29:17 +0100
Subject: [PATCH 171/243] Prometheus: Fix prometheus data source  hints
 alignment issue (#109656)

fix prometheues ds hints alignment issue
---
 .../src/querybuilder/shared/QueryBuilderHints.tsx          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-prometheus/src/querybuilder/shared/QueryBuilderHints.tsx b/packages/grafana-prometheus/src/querybuilder/shared/QueryBuilderHints.tsx
index 8ffba3bb291..d60dc22f278 100644
--- a/packages/grafana-prometheus/src/querybuilder/shared/QueryBuilderHints.tsx
+++ b/packages/grafana-prometheus/src/querybuilder/shared/QueryBuilderHints.tsx
@@ -38,7 +38,7 @@ export const QueryBuilderHints = ({
   }, [datasource, visualQuery, data, queryModeller]);
 
   return (
-    <>
+    <div className={styles.root}>
       {hints.length > 0 && (
         <div className={styles.container}>
           {hints.map((hint) => {
@@ -75,7 +75,7 @@ export const QueryBuilderHints = ({
           })}
         </div>
       )}
-    </>
+    </div>
   );
 };
 
@@ -83,6 +83,9 @@ QueryBuilderHints.displayName = 'QueryBuilderHints';
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
+    root: css({
+      padding: theme.spacing(0.5),
+    }),
     container: css({
       display: 'flex',
       alignItems: 'start',

From 9453cedb517c20855cb64c0a73b5df93a8436ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Thu, 14 Aug 2025 12:34:41 +0200
Subject: [PATCH 172/243] Update self instrumentation to use alloy and bump
 versions (#109266)

* Update self instrumentation to use alloy and bump versions

* Update devenv/docker/blocks/self-instrumentation/config.alloy

Co-authored-by: Sam DeHaan <dehaansa@gmail.com>

* Add remote write receiver feature to Prometheus configuration in docker-compose.yaml

* Add example for plugin profiling to the doc

---------

Co-authored-by: Sam DeHaan <dehaansa@gmail.com>
---
 .../blocks/self-instrumentation/agent.flow    |  87 ---------------
 .../blocks/self-instrumentation/config.alloy  | 100 ++++++++++++++++++
 .../self-instrumentation/docker-compose.yaml  |  60 +++++------
 .../self-instrumentation/prometheus.yaml      |   6 +-
 .../blocks/self-instrumentation/promtail.yaml |  18 ----
 .../blocks/self-instrumentation/readme.md     |  21 +++-
 .../blocks/self-instrumentation/tempo.yaml    |  45 +++++---
 7 files changed, 179 insertions(+), 158 deletions(-)
 delete mode 100644 devenv/docker/blocks/self-instrumentation/agent.flow
 create mode 100644 devenv/docker/blocks/self-instrumentation/config.alloy
 delete mode 100644 devenv/docker/blocks/self-instrumentation/promtail.yaml

diff --git a/devenv/docker/blocks/self-instrumentation/agent.flow b/devenv/docker/blocks/self-instrumentation/agent.flow
deleted file mode 100644
index d1deb12b5aa..00000000000
--- a/devenv/docker/blocks/self-instrumentation/agent.flow
+++ /dev/null
@@ -1,87 +0,0 @@
-loki.write "default" {
-	endpoint {
-		url = "http://loki:3100/loki/api/v1/push"
-	}
-	external_labels = {}
-}
-
-logging {
-  level  = "debug"
-  format = "json"
-  write_to = [loki.write.default.receiver]
-}
-
-tracing {
-  sampling_fraction = 1
-  write_to = [otelcol.exporter.otlp.tempo.input]
-}
-
-otelcol.exporter.otlp "tempo" {
-  client {
-    endpoint = "tempo:4317"
-    tls {
-      insecure = true
-      insecure_skip_verify = true
-    }
-  }
-}
-
-faro.receiver "frontend" {
-    server {
-        listen_address = "0.0.0.0"
-        listen_port = 12347
-        cors_allowed_origins = ["*"]
-    }
-
-    output {
-        logs   = [loki.write.default.receiver]
-        traces = [otelcol.exporter.otlp.tempo.input]
-    }
-}
-
-pyroscope.write "default" {
-  endpoint {
-    url = "http://pyroscope:4040"
-  }
-}
-
-pyroscope.scrape "default" {
-  targets = [
-    {"__address__" = "host.docker.internal:6000", "service_name"="grafana"},
-  ]
-  forward_to = [pyroscope.write.default.receiver]
-
-  profiling_config {
-    profile.process_cpu {
-      enabled = true
-    }
-
-    profile.godeltaprof_memory {
-      enabled = true
-    }
-
-    profile.memory { // disable memory, use godeltaprof_memory instead
-      enabled = false
-    }
-
-    profile.godeltaprof_mutex {
-      enabled = true
-    }
-
-    profile.mutex { // disable mutex, use godeltaprof_mutex instead
-      enabled = false
-    }
-
-    profile.godeltaprof_block {
-      enabled = true
-    }
-
-    profile.block { // disable block, use godeltaprof_block instead
-      enabled = false
-    }
-
-    profile.goroutine {
-      enabled = true
-    }
-  }
-}
diff --git a/devenv/docker/blocks/self-instrumentation/config.alloy b/devenv/docker/blocks/self-instrumentation/config.alloy
new file mode 100644
index 00000000000..bf480ddf4b8
--- /dev/null
+++ b/devenv/docker/blocks/self-instrumentation/config.alloy
@@ -0,0 +1,100 @@
+loki.write "default" {
+	endpoint {
+		url = "http://loki:3100/loki/api/v1/push"
+	}
+}
+
+// Grafana log file discovery
+local.file_match "grafana_logs" {
+  path_targets = [
+    {
+      __path__ = "/var/log/grafana/*.log",
+    },
+  ]
+}
+
+// Grafana log source
+loki.source.file "grafana" {
+  targets    = local.file_match.grafana_logs.targets
+  forward_to = [loki.relabel.grafana.receiver]
+}
+
+// Add labels to Grafana logs
+loki.relabel "grafana" {
+  rule {
+    action       = "replace"
+    target_label = "job"
+    replacement  = "grafana"
+  }
+
+  rule {
+    action       = "replace"
+    target_label = "service"
+    replacement  = "grafana"
+  }
+
+  forward_to = [loki.write.default.receiver]
+}
+
+logging {
+	level = "debug"
+  format = "json"
+	// Forward internal logs to the local Loki instance.
+	write_to = [loki.write.default.receiver]
+}
+
+tracing {
+	sampling_fraction = 1.0
+
+	// Forward internal spans to the local Tempo instance.
+	write_to = [otelcol.exporter.otlp.tempo.input]
+}
+
+otelcol.receiver.otlp "otlp_receiver" {
+  grpc {
+    endpoint = "0.0.0.0:4317"
+  }
+
+  output {
+    traces = [otelcol.exporter.otlp.tempo.input]
+  }
+}
+
+otelcol.exporter.otlp "tempo" {
+  client {
+    endpoint = "tempo:4317"
+    tls {
+			insecure = true
+		}
+  }
+}
+
+pyroscope.write "default" {
+  // Send profiles to a locally running Pyroscope instance.
+  endpoint {
+    url = "http://pyroscope:4040"
+  }
+}
+
+
+pyroscope.scrape "default" {
+  targets = [
+    {"__address__" = "pyroscope:4040", "service_name"="pyroscope"},
+    {"__address__" = "alloy:12345", "service_name"="alloy"},
+    {"__address__" = "host.docker.internal:6000", "service_name"="grafana"},
+  ]
+  forward_to = [pyroscope.write.default.receiver]
+}
+
+faro.receiver "frontend" {
+    server {
+        listen_address = "0.0.0.0"
+        listen_port = 12347
+        cors_allowed_origins = ["*"]
+    }
+
+    output {
+        logs   = [loki.write.default.receiver]
+        traces = [otelcol.exporter.otlp.tempo.input]
+    }
+}
diff --git a/devenv/docker/blocks/self-instrumentation/docker-compose.yaml b/devenv/docker/blocks/self-instrumentation/docker-compose.yaml
index c7583cd62d3..fb7f7b62090 100644
--- a/devenv/docker/blocks/self-instrumentation/docker-compose.yaml
+++ b/devenv/docker/blocks/self-instrumentation/docker-compose.yaml
@@ -1,56 +1,54 @@
   prometheus:
-    image: prom/prometheus:v2.45.0
+    image: prom/prometheus:v3.5.0
     ports:
-      - "9090:9090"
+      - '9090:9090'
     extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - 'host.docker.internal:host-gateway'
     command: >
-      --enable-feature=remote-write-receiver
       --enable-feature=exemplar-storage
       --enable-feature=native-histograms
+      --web.enable-remote-write-receiver
       --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
+    image: grafana/loki:3.5.3
     ports:
-      - "3100:3100"
+      - '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
+    image: grafana/tempo:2.8.1
     command: -config.file=/etc/tempo.yaml
     volumes:
       - ./docker/blocks/self-instrumentation/tempo.yaml:/etc/tempo.yaml
     ports:
-      - "14268:14268"
-      - "3200:3200"
-      - "4317:4317"
+      - '14268:14268'
+      - '3200:3200'
+      - '4317:4317'
   pyroscope:
-    image: "grafana/pyroscope:latest"
+    image: 'grafana/pyroscope:1.14.0'
     ports:
-      - "4040:4040"
+      - '4040:4040'
     extra_hosts:
-      - "host.docker.internal:host-gateway"
-  agent:
-    image: grafana/agent:v0.37.0
-    environment:
-      - AGENT_MODE=flow
-    entrypoint:
-      - /bin/grafana-agent
+      - 'host.docker.internal:host-gateway'
+  alloy:
+    image: grafana/alloy:v1.10.0
+    command:
       - run
+      - /etc/alloy/config.alloy
+      - --storage.path=/var/lib/alloy/data
       - --server.http.listen-addr=0.0.0.0:12345
-      - /etc/agent/config.river
-    volumes:
-      - ./docker/blocks/self-instrumentation/agent.flow:/etc/agent/config.river
+      - --stability.level=experimental # Enable all functionality
     ports:
-      - "12345:12345"
-      - "12347:12347"
+      - '12345:12345'
+    volumes:
+      - ./docker/blocks/self-instrumentation/config.alloy:/etc/alloy/config.alloy
+      - ../data/log:/var/log/grafana:ro # Mount Grafana logs directory
+    depends_on:
+      - tempo
+      - loki
+      - prometheus
+      - pyroscope
     extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - 'host.docker.internal:host-gateway'
diff --git a/devenv/docker/blocks/self-instrumentation/prometheus.yaml b/devenv/docker/blocks/self-instrumentation/prometheus.yaml
index 5533f0c0fd6..76db0c65b89 100644
--- a/devenv/docker/blocks/self-instrumentation/prometheus.yaml
+++ b/devenv/docker/blocks/self-instrumentation/prometheus.yaml
@@ -1,10 +1,10 @@
 global:
-  scrape_interval:     15s
+  scrape_interval: 15s
   evaluation_interval: 15s
 
 scrape_configs:
   - job_name: grafana
-    scrape_classic_histograms: true
+    always_scrape_classic_histograms: true
     static_configs:
       - targets:
-        - host.docker.internal:3000
+          - host.docker.internal:3000
diff --git a/devenv/docker/blocks/self-instrumentation/promtail.yaml b/devenv/docker/blocks/self-instrumentation/promtail.yaml
deleted file mode 100644
index eb7787ef789..00000000000
--- a/devenv/docker/blocks/self-instrumentation/promtail.yaml
+++ /dev/null
@@ -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: grafana
-  static_configs:
-  - targets:
-      - localhost
-    labels:
-      job: grafana
-      __path__: /var/log/grafana/*log
diff --git a/devenv/docker/blocks/self-instrumentation/readme.md b/devenv/docker/blocks/self-instrumentation/readme.md
index 07fc5856cf6..c7fe04139b4 100644
--- a/devenv/docker/blocks/self-instrumentation/readme.md
+++ b/devenv/docker/blocks/self-instrumentation/readme.md
@@ -18,8 +18,9 @@ format = json
 enabled = true
 custom_endpoint=http://localhost:12347/collect
 
-[tracing.opentelemetry.jaeger]
-address = http://localhost:14268/api/traces
+[tracing.opentelemetry.otlp]
+address = localhost:4317
+insecure = true
 ```
 
 To collect profiles with pyroscope, you need to run Grafana with the following env vars:
@@ -29,3 +30,19 @@ export GF_DIAGNOSTICS_PROFILING_ENABLED=true
 export GF_DIAGNOSTICS_PROFILING_ADDR=0.0.0.0
 make run
 ```
+
+To enable profiling in your plugin add the following to your `custom.ini`:
+
+```ini
+[plugin.grafana-bigquery-datasource]
+profiling_enabled = true
+profiling_port = 6161
+profiling_block_rate = 1
+profiling_mutex_rate = 1
+```
+
+and the following to your `config.alloy` in the `pyroscope.scrape.targets` section:
+
+```yaml
+  {"__address__" = "host.docker.internal:6161", "service_name"="grafana-bigquery-datasource"},
+```
diff --git a/devenv/docker/blocks/self-instrumentation/tempo.yaml b/devenv/docker/blocks/self-instrumentation/tempo.yaml
index acc5c1b8ea6..c1eae73fa74 100644
--- a/devenv/docker/blocks/self-instrumentation/tempo.yaml
+++ b/devenv/docker/blocks/self-instrumentation/tempo.yaml
@@ -1,24 +1,31 @@
+stream_over_http_enabled: true
 server:
   http_listen_port: 3200
+  log_level: info
+
+query_frontend:
+  search:
+    duration_slo: 5s
+    throughput_bytes_slo: 1.073741824e+09
+    metadata_slo:
+      duration_slo: 5s
+      throughput_bytes_slo: 1.073741824e+09
+  trace_by_id:
+    duration_slo: 5s
 
 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:
+  receivers:
     otlp:
       protocols:
-        http:
         grpc:
-    opencensus:
+          endpoint: 'tempo:4317'
+
+ingester:
+  max_block_duration: 5m # cut the headblock when this much time passes. this is being set for demo purposes and should probably be left alone normally
 
 compactor:
   compaction:
-    block_retention: 1h  
+    block_retention: 1h # overall Tempo trace retention. set for demo purposes
 
 metrics_generator:
   registry:
@@ -26,19 +33,23 @@ metrics_generator:
       source: tempo
       cluster: docker-compose
   storage:
-    path: /tmp/tempo/generator/wal
+    path: /var/tempo/generator/wal
     remote_write:
       - url: http://prometheus:9090/api/v1/write
         send_exemplars: true
+  traces_storage:
+    path: /var/tempo/generator/traces
 
 storage:
   trace:
-    backend: local                     # backend configuration to use
+    backend: local # backend configuration to use
     wal:
-      path: /tmp/tempo/wal             # where to store the wal locally
+      path: /var/tempo/wal # where to store the wal locally
     local:
-      path: /tmp/tempo/blocks
+      path: /var/tempo/blocks
 
 overrides:
-  metrics_generator_processors: [service-graphs, span-metrics]
-  
\ No newline at end of file
+  defaults:
+    metrics_generator:
+      processors: [service-graphs, span-metrics, local-blocks] # enables metrics generator
+      generate_native_histograms: both

From d08ea582432a82083605eedee43565dfcdcbab4c Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Thu, 14 Aug 2025 13:39:09 +0200
Subject: [PATCH 173/243] Filter data sources by favorite setting (#109593)

---
 packages/grafana-runtime/src/index.ts         |   2 +-
 .../src/utils/useFavoriteDatasources.test.ts  |  10 ++
 .../src/utils/useFavoriteDatasources.ts       |  32 ++++-
 .../PageActionBar/PageActionBar.tsx           |  96 ++++++++------
 .../components/DataSourcesList.test.tsx       | 121 ++++++++++++++++--
 .../components/DataSourcesList.tsx            |  40 +++++-
 .../components/DataSourcesListHeader.tsx      |  17 ++-
 public/locales/en-US/grafana.json             |   3 +
 8 files changed, 258 insertions(+), 63 deletions(-)

diff --git a/packages/grafana-runtime/src/index.ts b/packages/grafana-runtime/src/index.ts
index 1678d74cdbf..c292d33ce31 100644
--- a/packages/grafana-runtime/src/index.ts
+++ b/packages/grafana-runtime/src/index.ts
@@ -57,7 +57,7 @@ export { hasPermission, hasPermissionInMetadata, hasAllPermissions, hasAnyPermis
 export { QueryEditorWithMigration } from './components/QueryEditorWithMigration';
 export { type MigrationHandler, isMigrationHandler, migrateQuery, migrateRequest } from './utils/migrationHandler';
 export { usePluginUserStorage } from './utils/userStorage';
-export { useFavoriteDatasources } from './utils/useFavoriteDatasources';
+export { useFavoriteDatasources, type FavoriteDatasources } from './utils/useFavoriteDatasources';
 export { FolderPicker, setFolderPicker } from './components/FolderPicker';
 export {
   type CorrelationsService,
diff --git a/packages/grafana-runtime/src/utils/useFavoriteDatasources.test.ts b/packages/grafana-runtime/src/utils/useFavoriteDatasources.test.ts
index 0e24c64a751..9f589cf8846 100644
--- a/packages/grafana-runtime/src/utils/useFavoriteDatasources.test.ts
+++ b/packages/grafana-runtime/src/utils/useFavoriteDatasources.test.ts
@@ -17,6 +17,16 @@ jest.mock('./userStorage', () => {
   };
 });
 
+jest.mock('../config', () => {
+  return {
+    config: {
+      featureToggles: {
+        favoriteDatasources: true,
+      },
+    },
+  };
+});
+
 describe('useFavoriteDatasources', () => {
   // Test data helpers
   const pluginMetaInfo: PluginMetaInfo = {
diff --git a/packages/grafana-runtime/src/utils/useFavoriteDatasources.ts b/packages/grafana-runtime/src/utils/useFavoriteDatasources.ts
index 31bd7c9262e..8f891da8915 100644
--- a/packages/grafana-runtime/src/utils/useFavoriteDatasources.ts
+++ b/packages/grafana-runtime/src/utils/useFavoriteDatasources.ts
@@ -2,16 +2,28 @@ import { useCallback, useEffect, useState } from 'react';
 
 import { DataSourceInstanceSettings } from '@grafana/data';
 
+import { config } from '../config';
+
 import { UserStorage } from './userStorage';
 
 const FAVORITE_DATASOURCES_KEY = 'favoriteDatasources';
 
+export type FavoriteDatasources = {
+  enabled: boolean;
+  favoriteDatasources: string[];
+  initialFavoriteDataSources: string[];
+  addFavoriteDatasource: (ds: DataSourceInstanceSettings) => void;
+  removeFavoriteDatasource: (ds: DataSourceInstanceSettings) => void;
+  isFavoriteDatasource: (dsUid: string) => boolean;
+};
+
 /**
  * A hook for managing favorite data sources using user storage.
  * This hook provides functionality to store and retrieve a list of favorite data source UIDs
  * using the backend user storage (with localStorage fallback).
  *
  * @returns An object containing:
+ * - A boolean indicating if the feature is enabled
  * - An array of favorite data source UIDs
  * - An array of favorite data source UIDs that were initially loaded from storage
  * - A function to add a data source to favorites
@@ -19,13 +31,18 @@ const FAVORITE_DATASOURCES_KEY = 'favoriteDatasources';
  * - A function to check if a data source is favorited
  * @public
  */
-export function useFavoriteDatasources(): {
-  favoriteDatasources: string[];
-  initialFavoriteDataSources: string[];
-  addFavoriteDatasource: (ds: DataSourceInstanceSettings) => void;
-  removeFavoriteDatasource: (ds: DataSourceInstanceSettings) => void;
-  isFavoriteDatasource: (dsUid: string) => boolean;
-} {
+export function useFavoriteDatasources(): FavoriteDatasources {
+  if (!config.featureToggles.favoriteDatasources) {
+    return {
+      enabled: false,
+      favoriteDatasources: [],
+      initialFavoriteDataSources: [],
+      addFavoriteDatasource: () => {},
+      removeFavoriteDatasource: () => {},
+      isFavoriteDatasource: () => false,
+    };
+  }
+
   const [userStorage] = useState(() => new UserStorage('grafana-runtime'));
   const [favoriteDatasources, setFavoriteDatasources] = useState<string[]>([]);
   const [initialFavoriteDataSources, setInitialFavoriteDataSources] = useState<string[]>([]);
@@ -86,6 +103,7 @@ export function useFavoriteDatasources(): {
   );
 
   return {
+    enabled: true,
     favoriteDatasources,
     addFavoriteDatasource,
     removeFavoriteDatasource,
diff --git a/public/app/core/components/PageActionBar/PageActionBar.tsx b/public/app/core/components/PageActionBar/PageActionBar.tsx
index a9a9686fddf..7a1ce445f69 100644
--- a/public/app/core/components/PageActionBar/PageActionBar.tsx
+++ b/public/app/core/components/PageActionBar/PageActionBar.tsx
@@ -1,10 +1,16 @@
-import { PureComponent } from 'react';
+import { css } from '@emotion/css';
 
-import { SelectableValue } from '@grafana/data';
-import { LinkButton, FilterInput, InlineField } from '@grafana/ui';
+import { SelectableValue, GrafanaTheme2 } from '@grafana/data';
+import { LinkButton, FilterInput, InlineField, Checkbox, useStyles2 } from '@grafana/ui';
 
 import { SortPicker } from '../Select/SortPicker';
 
+export type FilterCheckbox = {
+  onChange: (value: boolean) => void;
+  value: boolean;
+  label?: string;
+};
+
 export interface Props {
   searchQuery: string;
   setSearchQuery: (value: string) => void;
@@ -16,41 +22,59 @@ export interface Props {
     value?: string;
     getSortOptions?: () => Promise<SelectableValue[]>;
   };
+  filterCheckbox?: FilterCheckbox;
 }
 
-export default class PageActionBar extends PureComponent<Props> {
-  render() {
-    const {
-      searchQuery,
-      linkButton,
-      setSearchQuery,
-      target,
-      placeholder = 'Search by name or type',
-      sortPicker,
-    } = this.props;
-    const linkProps: Omit<Parameters<typeof LinkButton>[0], 'children'> = {
-      href: linkButton?.href,
-      disabled: linkButton?.disabled,
-    };
+export default function PageActionBar({
+  searchQuery,
+  linkButton,
+  setSearchQuery,
+  target,
+  placeholder = 'Search by name or type',
+  sortPicker,
+  filterCheckbox,
+}: Props) {
+  const styles = useStyles2(getStyles);
+  const linkProps: Omit<Parameters<typeof LinkButton>[0], 'children'> = {
+    href: linkButton?.href,
+    disabled: linkButton?.disabled,
+  };
 
-    if (target) {
-      linkProps.target = target;
-    }
-
-    return (
-      <div className="page-action-bar">
-        <InlineField grow>
-          <FilterInput value={searchQuery} onChange={setSearchQuery} placeholder={placeholder} />
-        </InlineField>
-        {sortPicker && (
-          <SortPicker
-            onChange={sortPicker.onChange}
-            value={sortPicker.value}
-            getSortOptions={sortPicker.getSortOptions}
-          />
-        )}
-        {linkButton && <LinkButton {...linkProps}>{linkButton.title}</LinkButton>}
-      </div>
-    );
+  if (target) {
+    linkProps.target = target;
   }
+
+  return (
+    <div className={styles.container}>
+      <InlineField grow>
+        <FilterInput value={searchQuery} onChange={setSearchQuery} placeholder={placeholder} />
+      </InlineField>
+      {filterCheckbox && (
+        <Checkbox
+          label={filterCheckbox.label}
+          value={filterCheckbox.value}
+          onChange={(event) => filterCheckbox.onChange(event.currentTarget.checked)}
+        />
+      )}
+      {sortPicker && (
+        <SortPicker
+          onChange={sortPicker.onChange}
+          value={sortPicker.value}
+          getSortOptions={sortPicker.getSortOptions}
+        />
+      )}
+      {linkButton && <LinkButton {...linkProps}>{linkButton.title}</LinkButton>}
+    </div>
+  );
 }
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    container: css({
+      display: 'flex',
+      alignItems: 'center',
+      gap: theme.spacing(2),
+      marginBottom: theme.spacing(2),
+    }),
+  };
+};
diff --git a/public/app/features/datasources/components/DataSourcesList.test.tsx b/public/app/features/datasources/components/DataSourcesList.test.tsx
index d495695d0a7..33fc05ace84 100644
--- a/public/app/features/datasources/components/DataSourcesList.test.tsx
+++ b/public/app/features/datasources/components/DataSourcesList.test.tsx
@@ -1,24 +1,69 @@
 import { screen } from '@testing-library/react';
 import { render } from 'test/test-utils';
 
+import { config } from '@grafana/runtime';
+
 import { getMockDataSources } from '../mocks/dataSourcesMocks';
 
-import { DataSourcesListView } from './DataSourcesList';
+import { DataSourcesListView, ViewProps } from './DataSourcesList';
 
-const setup = () => {
-  return render(
-    <DataSourcesListView
-      dataSources={getMockDataSources(3)}
-      dataSourcesCount={3}
-      isLoading={false}
-      hasCreateRights={true}
-      hasWriteRights={true}
-      hasExploreRights={true}
-    />
-  );
+// Mock the useFavoriteDatasources hook
+const mockIsFavoriteDatasource = jest.fn();
+const mockUseFavoriteDatasources = jest.fn(() => ({
+  enabled: true,
+  isFavoriteDatasource: mockIsFavoriteDatasource,
+  favoriteDatasources: [],
+  initialFavoriteDataSources: [],
+  addFavoriteDatasource: jest.fn(),
+  removeFavoriteDatasource: jest.fn(),
+  toggleFavoriteDatasource: jest.fn(),
+}));
+
+jest.mock('@grafana/runtime', () => {
+  const runtime = jest.requireActual('@grafana/runtime');
+  return {
+    ...runtime,
+    useFavoriteDatasources: () => mockUseFavoriteDatasources(),
+    config: {
+      ...runtime.config,
+      featureToggles: {
+        ...runtime.config.featureToggles,
+        favoriteDatasources: true,
+      },
+    },
+  };
+});
+
+// Mock the useQueryParams hook
+const mockUpdateQueryParams = jest.fn();
+const mockUseQueryParams = jest.fn(() => [{ starred: undefined }, mockUpdateQueryParams]);
+
+jest.mock('app/core/hooks/useQueryParams', () => ({
+  useQueryParams: () => mockUseQueryParams(),
+}));
+
+const setup = (overrides: Partial<ViewProps> = {}) => {
+  const defaultProps = {
+    dataSources: getMockDataSources(3),
+    dataSourcesCount: 3,
+    isLoading: false,
+    hasCreateRights: true,
+    hasWriteRights: true,
+    hasExploreRights: true,
+    showFavoritesOnly: false,
+    handleFavoritesCheckboxChange: jest.fn(),
+    ...overrides,
+  };
+
+  return render(<DataSourcesListView {...defaultProps} />);
 };
 
 describe('<DataSourcesList>', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseQueryParams.mockReturnValue([{ starred: undefined }, mockUpdateQueryParams]);
+  });
+
   it('should render action bar', async () => {
     setup();
 
@@ -41,4 +86,56 @@ describe('<DataSourcesList>', () => {
     expect(await screen.findByRole('heading', { name: 'dataSource-0' })).toBeInTheDocument();
     expect(await screen.findByRole('link', { name: 'dataSource-0' })).toBeInTheDocument();
   });
+
+  describe('Favorites functionality', () => {
+    beforeEach(() => {
+      config.featureToggles.favoriteDatasources = true;
+    });
+
+    it('should render favorites checkbox when feature toggle is enabled', async () => {
+      setup({ favoriteDataSources: mockUseFavoriteDatasources() });
+
+      const checkbox = await screen.findByRole('checkbox', { name: 'Starred' });
+      expect(checkbox).toBeInTheDocument();
+      expect(checkbox).not.toBeChecked();
+    });
+
+    it('should not render favorites checkbox when feature toggle is disabled', async () => {
+      config.featureToggles.favoriteDatasources = false;
+
+      setup();
+
+      expect(await screen.findByPlaceholderText('Search by name or type')).toBeInTheDocument();
+      expect(screen.queryByRole('checkbox', { name: 'Starred' })).not.toBeInTheDocument();
+    });
+
+    it('should render favorites checkbox as checked when value is true', async () => {
+      setup({ showFavoritesOnly: true, favoriteDataSources: mockUseFavoriteDatasources() });
+
+      const checkbox = await screen.findByRole('checkbox', { name: 'Starred' });
+      expect(checkbox).toBeChecked();
+    });
+
+    it('should filter datasources to show only favorites when showFavoritesOnly is true', async () => {
+      // Mock the isFavoriteDatasource function to return true for specific datasources
+      const mockIsFavoriteDatasource = jest.fn((uid: string) => uid === 'uid-0' || uid === 'uid-2');
+
+      setup({
+        showFavoritesOnly: true,
+        favoriteDataSources: {
+          ...mockUseFavoriteDatasources(),
+          isFavoriteDatasource: mockIsFavoriteDatasource,
+        },
+      });
+
+      // Should only show 2 datasources (uid-0 and uid-2) instead of all 3
+      const listItems = await screen.findAllByRole('listitem');
+      expect(listItems).toHaveLength(2);
+
+      // Verify the correct datasources are shown
+      expect(screen.getByRole('heading', { name: 'dataSource-0' })).toBeInTheDocument();
+      expect(screen.getByRole('heading', { name: 'dataSource-2' })).toBeInTheDocument();
+      expect(screen.queryByRole('heading', { name: 'dataSource-1' })).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/public/app/features/datasources/components/DataSourcesList.tsx b/public/app/features/datasources/components/DataSourcesList.tsx
index b4337792ebc..94e8135a872 100644
--- a/public/app/features/datasources/components/DataSourcesList.tsx
+++ b/public/app/features/datasources/components/DataSourcesList.tsx
@@ -1,12 +1,13 @@
 import { css } from '@emotion/css';
-import { useEffect } from 'react';
+import { useEffect, useMemo } from 'react';
 import { useLocation } from 'react-router-dom-v5-compat';
 
 import { DataSourceSettings, GrafanaTheme2 } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
-import { config } from '@grafana/runtime';
+import { config, useFavoriteDatasources, FavoriteDatasources } from '@grafana/runtime';
 import { EmptyState, LinkButton, TextLink, useStyles2 } from '@grafana/ui';
 import { contextSrv } from 'app/core/core';
+import { useQueryParams } from 'app/core/hooks/useQueryParams';
 import { AccessControlAction } from 'app/types/accessControl';
 import { StoreState, useSelector } from 'app/types/store';
 
@@ -20,6 +21,12 @@ import { DataSourcesListHeader } from './DataSourcesListHeader';
 
 export function DataSourcesList() {
   const { isLoading } = useLoadDataSources();
+  const favoriteDataSources = useFavoriteDatasources();
+  const [queryParams, updateQueryParams] = useQueryParams();
+  const showFavoritesOnly = !!queryParams.starred;
+  const handleFavoritesCheckboxChange = (value: boolean) => {
+    updateQueryParams({ starred: value ? 'true' : undefined });
+  };
 
   const dataSources = useSelector((state) => getDataSources(state.dataSources));
   const dataSourcesCount = useSelector(({ dataSources }: StoreState) => getDataSourcesCount(dataSources));
@@ -35,6 +42,9 @@ export function DataSourcesList() {
       hasCreateRights={hasCreateRights}
       hasWriteRights={hasWriteRights}
       hasExploreRights={hasExploreRights}
+      showFavoritesOnly={showFavoritesOnly}
+      handleFavoritesCheckboxChange={handleFavoritesCheckboxChange}
+      favoriteDataSources={favoriteDataSources}
     />
   );
 }
@@ -46,18 +56,40 @@ export type ViewProps = {
   hasCreateRights: boolean;
   hasWriteRights: boolean;
   hasExploreRights: boolean;
+  showFavoritesOnly?: boolean;
+  handleFavoritesCheckboxChange?: (value: boolean) => void;
+  favoriteDataSources?: FavoriteDatasources;
 };
 
 export function DataSourcesListView({
-  dataSources,
+  dataSources: allDataSources,
   dataSourcesCount,
   isLoading,
   hasCreateRights,
   hasWriteRights,
   hasExploreRights,
+  showFavoritesOnly,
+  handleFavoritesCheckboxChange,
+  favoriteDataSources,
 }: ViewProps) {
   const styles = useStyles2(getStyles);
   const location = useLocation();
+  const favoritesCheckbox =
+    favoriteDataSources?.enabled && handleFavoritesCheckboxChange && showFavoritesOnly !== undefined
+      ? {
+          onChange: handleFavoritesCheckboxChange,
+          value: showFavoritesOnly,
+          label: t('datasources.list.starred', 'Starred'),
+        }
+      : undefined;
+
+  // Filter data sources based on favorites when enabled
+  const dataSources = useMemo(() => {
+    if (!showFavoritesOnly || !favoriteDataSources?.enabled) {
+      return allDataSources;
+    }
+    return allDataSources.filter((dataSource) => favoriteDataSources?.isFavoriteDatasource(dataSource.uid));
+  }, [allDataSources, showFavoritesOnly, favoriteDataSources]);
 
   useEffect(() => {
     trackDataSourcesListViewed({
@@ -111,7 +143,7 @@ export function DataSourcesListView({
   return (
     <>
       {/* List Header */}
-      <DataSourcesListHeader />
+      <DataSourcesListHeader filterCheckbox={favoritesCheckbox} />
 
       {/* List */}
       {dataSources.length === 0 && !isLoading ? (
diff --git a/public/app/features/datasources/components/DataSourcesListHeader.tsx b/public/app/features/datasources/components/DataSourcesListHeader.tsx
index 26db52a7a33..8735163dec4 100644
--- a/public/app/features/datasources/components/DataSourcesListHeader.tsx
+++ b/public/app/features/datasources/components/DataSourcesListHeader.tsx
@@ -2,7 +2,7 @@ import { debounce } from 'lodash';
 import { useCallback, useMemo } from 'react';
 
 import { SelectableValue } from '@grafana/data';
-import PageActionBar from 'app/core/components/PageActionBar/PageActionBar';
+import PageActionBar, { FilterCheckbox } from 'app/core/components/PageActionBar/PageActionBar';
 import { StoreState, useSelector, useDispatch } from 'app/types/store';
 
 import { setDataSourcesSearchQuery, setIsSortAscending } from '../state/reducers';
@@ -20,8 +20,13 @@ const sortOptions = [
   { label: 'Sort by Z–A', value: descendingSortValue },
 ];
 
-export function DataSourcesListHeader() {
+export interface DataSourcesListHeaderProps {
+  filterCheckbox?: FilterCheckbox;
+}
+
+export function DataSourcesListHeader({ filterCheckbox }: DataSourcesListHeaderProps) {
   const dispatch = useDispatch();
+
   const debouncedTrackSearch = useMemo(
     () =>
       debounce((q) => {
@@ -54,6 +59,12 @@ export function DataSourcesListHeader() {
   };
 
   return (
-    <PageActionBar searchQuery={searchQuery} setSearchQuery={setSearchQuery} key="action-bar" sortPicker={sortPicker} />
+    <PageActionBar
+      searchQuery={searchQuery}
+      setSearchQuery={setSearchQuery}
+      key="action-bar"
+      sortPicker={sortPicker}
+      filterCheckbox={filterCheckbox}
+    />
   );
 }
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index a6114f22e7d..c38a2f7a770 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -6583,6 +6583,9 @@
         "hosted-graphite-prometheus-and-loki": "Hosted Graphite, Prometheus, and Loki"
       }
     },
+    "list": {
+      "starred": "Starred"
+    },
     "new-data-source-view": {
       "cancel": "Cancel",
       "placeholder-filter-by-name-or-type": "Filter by name or type"

From d3df5b8ddd1a4eb3d5e779ea4a47227c8c388cde Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 14 Aug 2025 15:31:24 +0300
Subject: [PATCH 174/243] Secrets: Manage secure values inside any resource
 (#107803)

---
 pkg/apimachinery/utils/meta.go               |  20 +-
 pkg/storage/unified/apistore/prepare.go      | 160 +++++++----
 pkg/storage/unified/apistore/prepare_test.go |  89 ++++--
 pkg/storage/unified/apistore/secure.go       | 149 ++++++++++
 pkg/storage/unified/apistore/secure_test.go  | 281 +++++++++++++++++++
 pkg/storage/unified/apistore/store.go        |  47 ++--
 pkg/storage/unified/resource/errors.go       |  59 +++-
 pkg/storage/unified/resource/secure.go       |  81 ++++++
 pkg/storage/unified/resource/secure_test.go  | 188 +++++++++++++
 pkg/storage/unified/resource/server.go       |  15 +-
 pkg/storage/unified/resource/server_test.go  |   7 +-
 11 files changed, 963 insertions(+), 133 deletions(-)
 create mode 100644 pkg/storage/unified/apistore/secure.go
 create mode 100644 pkg/storage/unified/apistore/secure_test.go
 create mode 100644 pkg/storage/unified/resource/secure.go
 create mode 100644 pkg/storage/unified/resource/secure_test.go

diff --git a/pkg/apimachinery/utils/meta.go b/pkg/apimachinery/utils/meta.go
index bdf9a100540..453099e8add 100644
--- a/pkg/apimachinery/utils/meta.go
+++ b/pkg/apimachinery/utils/meta.go
@@ -869,16 +869,18 @@ func (m *grafanaMetaAccessor) GetSecureValues() (vals common.InlineSecureValues,
 	if ok {
 		vals = make(common.InlineSecureValues, len(u))
 		for k, v := range u {
-			sv, ok := v.(map[string]any)
+			inline, ok := v.(common.InlineSecureValue)
 			if !ok {
-				return nil, fmt.Errorf("unsupported nested secure value: %t", v)
-			}
-			inline := common.InlineSecureValue{}
-			inline.Name, _, _ = unstructured.NestedString(sv, "name")
-			inline.Remove, _, _ = unstructured.NestedBool(sv, "remove")
-			create, _, _ := unstructured.NestedString(sv, "create")
-			if create != "" {
-				inline.Create = common.NewSecretValue(create)
+				sv, ok := v.(map[string]any)
+				if !ok {
+					return nil, fmt.Errorf("unsupported nested secure value: %t", v)
+				}
+				inline.Name, _, _ = unstructured.NestedString(sv, "name")
+				inline.Remove, _, _ = unstructured.NestedBool(sv, "remove")
+				create, _, _ := unstructured.NestedString(sv, "create")
+				if create != "" {
+					inline.Create = common.NewSecretValue(create)
+				}
 			}
 			vals[k] = inline
 		}
diff --git a/pkg/storage/unified/apistore/prepare.go b/pkg/storage/unified/apistore/prepare.go
index 19ca5aeca9c..a7f94a69706 100644
--- a/pkg/storage/unified/apistore/prepare.go
+++ b/pkg/storage/unified/apistore/prepare.go
@@ -5,9 +5,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"math"
 	"time"
 
+	"github.com/dustin/go-humanize"
 	"github.com/google/uuid"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -16,59 +16,97 @@ import (
 	"k8s.io/apiserver/pkg/storage"
 	"k8s.io/klog/v2"
 
-	authtypes "github.com/grafana/authlib/types"
-
+	authlib "github.com/grafana/authlib/types"
+	"github.com/grafana/grafana-app-sdk/logging"
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
+	secrets "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
 )
 
-func logN(n, b float64) float64 {
-	return math.Log(n) / math.Log(b)
+type objectForStorage struct {
+	// The value to save in unistore
+	raw bytes.Buffer
+
+	// Reference to the owner object
+	ref common.ObjectReference
+
+	// apply permissions after create (defined in the resource body)
+	grantPermissions string
+
+	// Synchronous AfterCreate permissions -- allows users to become "admin" of the thing they made
+	permissionCreator permissionCreatorFunc
+
+	// These secrets where created, should be cleaned up if storage fails
+	createdSecureValues []string
+
+	// These should be deleted if storage succeeds
+	deleteSecureValues []string
+
+	// We know something changed
+	// This will ensure that the generation increments
+	hasChanged bool
 }
 
-// Slightly modified function from https://github.com/dustin/go-humanize (MIT).
-func formatBytes(numBytes int) string {
-	base := 1024.0
-	sizes := []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"}
-	if numBytes < 10 {
-		return fmt.Sprintf("%d B", numBytes)
+func (v *objectForStorage) finish(ctx context.Context, err error, secrets secrets.InlineSecureValueSupport) error {
+	if err != nil {
+		// Remove the secure values that were created
+		for _, s := range v.createdSecureValues {
+			if e := secrets.DeleteWhenOwnedByResource(ctx, v.ref, s); e != nil {
+				logging.FromContext(ctx).Warn("unable to clean up new secure value", "name", s, "err", e)
+			}
+		}
+		return err
 	}
-	e := math.Floor(logN(float64(numBytes), base))
-	suffix := sizes[int(e)]
-	val := math.Floor(float64(numBytes)/math.Pow(base, e)*10+0.5) / 10
-	return fmt.Sprintf("%.1f %s", val, suffix)
+
+	// Delete secure values after successfully saving the object
+	if len(v.deleteSecureValues) > 0 {
+		for _, s := range v.deleteSecureValues {
+			if e := secrets.DeleteWhenOwnedByResource(ctx, v.ref, s); e != nil {
+				logging.FromContext(ctx).Warn("unable to clean up new secure value", "name", s, "err", e)
+			}
+		}
+	}
+
+	// Create permissions
+	if v.permissionCreator != nil {
+		return v.permissionCreator(ctx)
+	}
+
+	return nil
 }
 
 // Called on create
-func (s *Storage) prepareObjectForStorage(ctx context.Context, newObject runtime.Object) ([]byte, string, error) {
-	info, ok := authtypes.AuthInfoFrom(ctx)
+func (s *Storage) prepareObjectForStorage(ctx context.Context, newObject runtime.Object) (objectForStorage, error) {
+	v := objectForStorage{}
+	info, ok := authlib.AuthInfoFrom(ctx)
 	if !ok {
-		return nil, "", errors.New("missing auth info")
+		return v, errors.New("missing auth info")
 	}
 
 	obj, err := utils.MetaAccessor(newObject)
 	if err != nil {
-		return nil, "", err
+		return v, err
 	}
 	if obj.GetName() == "" {
-		return nil, "", storage.NewInvalidObjError("", "missing name")
+		return v, storage.NewInvalidObjError("", "missing name")
 	}
 	if obj.GetResourceVersion() != "" {
-		return nil, "", storage.ErrResourceVersionSetOnCreate
+		return v, storage.ErrResourceVersionSetOnCreate
 	}
 	if obj.GetUID() == "" {
 		obj.SetUID(types.UID(uuid.NewString()))
 	}
 	if obj.GetFolder() != "" && !s.opts.EnableFolderSupport {
-		return nil, "", apierrors.NewBadRequest(fmt.Sprintf("folders are not supported for: %s", s.gr.String()))
+		return v, apierrors.NewBadRequest(fmt.Sprintf("folders are not supported for: %s", s.gr.String()))
 	}
 
-	grantPermisions := obj.GetAnnotation(utils.AnnoKeyGrantPermissions)
-	if grantPermisions != "" {
+	v.grantPermissions = obj.GetAnnotation(utils.AnnoKeyGrantPermissions)
+	if v.grantPermissions != "" {
 		obj.SetAnnotation(utils.AnnoKeyGrantPermissions, "") // remove the annotation
 	}
 	if err := checkManagerPropertiesOnCreate(info, obj); err != nil {
-		return nil, "", err
+		return v, err
 	}
 
 	if s.opts.RequireDeprecatedInternalID {
@@ -92,33 +130,37 @@ func (s *Storage) prepareObjectForStorage(ctx context.Context, newObject runtime
 	obj.SetCreatedBy(info.GetUID())
 	obj.SetGeneration(1) // the first time we write
 
-	var buf bytes.Buffer
-	if err = s.codec.Encode(newObject, &buf); err != nil {
-		return nil, "", err
+	err = prepareSecureValues(ctx, s.opts.SecureValues, obj, nil, &v)
+	if err != nil {
+		return v, err
 	}
 
-	val, err := s.handleLargeResources(ctx, obj, buf)
-	return val, grantPermisions, err
+	err = s.codec.Encode(newObject, &v.raw)
+	if err == nil {
+		err = s.handleLargeResources(ctx, obj, &v.raw)
+	}
+	return v, err
 }
 
 // Called on update
-func (s *Storage) prepareObjectForUpdate(ctx context.Context, updateObject runtime.Object, previousObject runtime.Object) ([]byte, error) {
-	info, ok := authtypes.AuthInfoFrom(ctx)
+func (s *Storage) prepareObjectForUpdate(ctx context.Context, updateObject runtime.Object, previousObject runtime.Object) (objectForStorage, error) {
+	v := objectForStorage{}
+	info, ok := authlib.AuthInfoFrom(ctx)
 	if !ok {
-		return nil, errors.New("missing auth info")
+		return v, errors.New("missing auth info")
 	}
 
 	obj, err := utils.MetaAccessor(updateObject)
 	if err != nil {
-		return nil, err
+		return v, err
 	}
 	if obj.GetName() == "" {
-		return nil, fmt.Errorf("updated object must have a name")
+		return v, fmt.Errorf("updated object must have a name")
 	}
 
 	previous, err := utils.MetaAccessor(previousObject)
 	if err != nil {
-		return nil, err
+		return v, err
 	}
 
 	if previous.GetUID() == "" {
@@ -133,7 +175,7 @@ func (s *Storage) prepareObjectForUpdate(ctx context.Context, updateObject runti
 	}
 
 	if obj.GetName() != previous.GetName() {
-		return nil, fmt.Errorf("name mismatch between existing and updated object")
+		return v, fmt.Errorf("name mismatch between existing and updated object")
 	}
 
 	obj.SetCreatedBy(previous.GetCreatedBy())
@@ -148,34 +190,39 @@ func (s *Storage) prepareObjectForUpdate(ctx context.Context, updateObject runti
 		obj.SetDeprecatedInternalID(previousInternalID) // nolint:staticcheck
 	}
 
+	err = prepareSecureValues(ctx, s.opts.SecureValues, obj, previous, &v)
+	if err != nil {
+		return v, err
+	}
+
 	// Check if we should bump the generation
-	changed := obj.GetFolder() != previous.GetFolder()
-	if changed {
+	if obj.GetFolder() != previous.GetFolder() {
 		if !s.opts.EnableFolderSupport {
-			return nil, apierrors.NewBadRequest(fmt.Sprintf("folders are not supported for: %s", s.gr.String()))
+			return v, apierrors.NewBadRequest(fmt.Sprintf("folders are not supported for: %s", s.gr.String()))
 		}
 		// TODO: check that we can move the folder?
+		v.hasChanged = true
 	} else if obj.GetDeletionTimestamp() != nil && previous.GetDeletionTimestamp() == nil {
-		changed = true // bump generation when deleted
-	} else {
+		v.hasChanged = true // bump generation when deleted
+	} else if !v.hasChanged {
 		spec, e1 := obj.GetSpec()
 		oldSpec, e2 := previous.GetSpec()
 		if e1 == nil && e2 == nil {
 			if !apiequality.Semantic.DeepEqual(spec, oldSpec) {
-				changed = true
+				v.hasChanged = true
 			}
 		}
 	}
 
 	// Mark the resource as changed
-	if changed {
+	if v.hasChanged {
 		obj.SetGeneration(previous.GetGeneration() + 1)
 		obj.SetUpdatedBy(info.GetUID())
 		obj.SetUpdatedTimestampMillis(time.Now().UnixMilli())
 
 		// Only validate when the generation has changed
 		if err := checkManagerPropertiesOnUpdateSpec(info, obj, previous); err != nil {
-			return nil, err
+			return v, err
 		}
 	} else {
 		obj.SetGeneration(previous.GetGeneration())
@@ -183,19 +230,20 @@ func (s *Storage) prepareObjectForUpdate(ctx context.Context, updateObject runti
 		obj.SetAnnotation(utils.AnnoKeyUpdatedTimestamp, previous.GetAnnotation(utils.AnnoKeyUpdatedTimestamp))
 	}
 
-	var buf bytes.Buffer
-	if err = s.codec.Encode(updateObject, &buf); err != nil {
-		return nil, err
+	err = s.codec.Encode(updateObject, &v.raw)
+	if err == nil {
+		err = s.handleLargeResources(ctx, obj, &v.raw)
 	}
-	return s.handleLargeResources(ctx, obj, buf)
+	return v, err
 }
 
-func (s *Storage) handleLargeResources(ctx context.Context, obj utils.GrafanaMetaAccessor, buf bytes.Buffer) ([]byte, error) {
+// The bytes buffer will be reset with the proper value
+func (s *Storage) handleLargeResources(ctx context.Context, obj utils.GrafanaMetaAccessor, buf *bytes.Buffer) error {
 	support := s.opts.LargeObjectSupport
 	size := buf.Len()
 	if support != nil && size > support.Threshold() {
 		if support.MaxSize() > 0 && size > support.MaxSize() {
-			return nil, fmt.Errorf("request object is too big (%s > %s)", formatBytes(size), formatBytes(support.MaxSize()))
+			return fmt.Errorf("request object is too big (%s > %s)", humanize.Bytes(uint64(size)), humanize.Bytes(uint64(support.MaxSize())))
 		}
 
 		key := &resourcepb.ResourceKey{
@@ -207,19 +255,17 @@ func (s *Storage) handleLargeResources(ctx context.Context, obj utils.GrafanaMet
 
 		err := support.Deconstruct(ctx, key, s.store, obj, buf.Bytes())
 		if err != nil {
-			return nil, err
+			return err
 		}
 
 		buf.Reset()
 		orig, ok := obj.GetRuntimeObject()
 		if !ok {
-			return nil, fmt.Errorf("error using object as runtime object")
+			return fmt.Errorf("error using object as runtime object")
 		}
 
 		// Now encode the smaller version
-		if err = s.codec.Encode(orig, &buf); err != nil {
-			return nil, err
-		}
+		return s.codec.Encode(orig, buf)
 	}
-	return buf.Bytes(), nil
+	return nil
 }
diff --git a/pkg/storage/unified/apistore/prepare_test.go b/pkg/storage/unified/apistore/prepare_test.go
index b11081dea9b..1501b63da40 100644
--- a/pkg/storage/unified/apistore/prepare_test.go
+++ b/pkg/storage/unified/apistore/prepare_test.go
@@ -15,7 +15,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apiserver/pkg/storage"
 
-	authtypes "github.com/grafana/authlib/types"
+	authlib "github.com/grafana/authlib/types"
 	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
@@ -37,19 +37,19 @@ func TestPrepareObjectForStorage(t *testing.T) {
 		},
 	}
 
-	ctx := authtypes.WithAuthInfo(context.Background(),
-		&identity.StaticRequester{UserID: 1, UserUID: "user-uid", Type: authtypes.TypeUser},
+	ctx := authlib.WithAuthInfo(context.Background(),
+		&identity.StaticRequester{UserID: 1, UserUID: "user-uid", Type: authlib.TypeUser},
 	)
 
 	t.Run("Error getting auth info from context", func(t *testing.T) {
-		_, _, err := s.prepareObjectForStorage(context.Background(), nil)
+		_, err := s.prepareObjectForStorage(context.Background(), nil)
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "missing auth info")
 	})
 
 	t.Run("Error on missing name", func(t *testing.T) {
 		dashboard := dashv1.Dashboard{}
-		_, _, err := s.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
+		_, err := s.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "missing name")
 	})
@@ -58,7 +58,7 @@ func TestPrepareObjectForStorage(t *testing.T) {
 		dashboard := dashv1.Dashboard{}
 		dashboard.Name = "test-name"
 		dashboard.ResourceVersion = "123"
-		_, _, err := s.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
+		_, err := s.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
 		require.Error(t, err)
 		require.Equal(t, storage.ErrResourceVersionSetOnCreate, err)
 	})
@@ -67,10 +67,10 @@ func TestPrepareObjectForStorage(t *testing.T) {
 		dashboard := dashv1.Dashboard{}
 		dashboard.Name = "test-name"
 
-		encodedData, _, err := s.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
+		v, err := s.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
 		require.NoError(t, err)
 
-		newObject, _, err := s.codec.Decode(encodedData, nil, &dashv1.Dashboard{})
+		newObject, _, err := s.codec.Decode(v.raw.Bytes(), nil, &dashv1.Dashboard{})
 		require.NoError(t, err)
 		obj, err := utils.MetaAccessor(newObject)
 		require.NoError(t, err)
@@ -106,10 +106,10 @@ func TestPrepareObjectForStorage(t *testing.T) {
 			TimestampMillis: now.UnixMilli(),
 		})
 
-		encodedData, _, err := s.prepareObjectForStorage(ctx, obj)
+		v, err := s.prepareObjectForStorage(ctx, obj)
 		require.NoError(t, err)
 
-		newObject, _, err := s.codec.Decode(encodedData, nil, &dashv1.Dashboard{})
+		newObject, _, err := s.codec.Decode(v.raw.Bytes(), nil, &dashv1.Dashboard{})
 		require.NoError(t, err)
 		meta, err = utils.MetaAccessor(newObject)
 		require.NoError(t, err)
@@ -133,10 +133,10 @@ func TestPrepareObjectForStorage(t *testing.T) {
 		meta.SetFolder("aaa")
 		require.NoError(t, err)
 
-		encodedData, _, err := s.prepareObjectForStorage(ctx, obj)
+		v, err := s.prepareObjectForStorage(ctx, obj)
 		require.NoError(t, err)
 
-		insertedObject, _, err := s.codec.Decode(encodedData, nil, &dashv1.Dashboard{})
+		insertedObject, _, err := s.codec.Decode(v.raw.Bytes(), nil, &dashv1.Dashboard{})
 		require.NoError(t, err)
 		meta, err = utils.MetaAccessor(insertedObject)
 		require.NoError(t, err)
@@ -148,8 +148,8 @@ func TestPrepareObjectForStorage(t *testing.T) {
 		require.Nil(t, ts)
 
 		// Change the user... and only update metadata
-		ctx = authtypes.WithAuthInfo(context.Background(),
-			&identity.StaticRequester{UserID: 1, UserUID: "user2", Type: authtypes.TypeUser},
+		ctx = authlib.WithAuthInfo(context.Background(),
+			&identity.StaticRequester{UserID: 1, UserUID: "user2", Type: authlib.TypeUser},
 		)
 
 		// Change the status... but generation is the same
@@ -189,9 +189,9 @@ func TestPrepareObjectForStorage(t *testing.T) {
 		dashboard := dashv1.Dashboard{}
 		dashboard.Name = "test-name"
 
-		encodedData, _, err := s.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
+		v, err := s.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
 		require.NoError(t, err)
-		newObject, _, err := s.codec.Decode(encodedData, nil, &dashv1.Dashboard{})
+		newObject, _, err := s.codec.Decode(v.raw.Bytes(), nil, &dashv1.Dashboard{})
 		require.NoError(t, err)
 		obj, err := utils.MetaAccessor(newObject)
 		require.NoError(t, err)
@@ -208,9 +208,9 @@ func TestPrepareObjectForStorage(t *testing.T) {
 		require.NoError(t, err)
 		meta.SetDeprecatedInternalID(1) // nolint:staticcheck
 
-		encodedData, _, err := s.prepareObjectForStorage(ctx, obj)
+		v, err := s.prepareObjectForStorage(ctx, obj)
 		require.NoError(t, err)
-		newObject, _, err := s.codec.Decode(encodedData, nil, &dashv1.Dashboard{})
+		newObject, _, err := s.codec.Decode(v.raw.Bytes(), nil, &dashv1.Dashboard{})
 		require.NoError(t, err)
 		meta, err = utils.MetaAccessor(newObject)
 		require.NoError(t, err)
@@ -225,14 +225,14 @@ func TestPrepareObjectForStorage(t *testing.T) {
 		require.NoError(t, err)
 		meta.SetAnnotation(utils.AnnoKeyGrantPermissions, "default")
 
-		encodedData, p, err := s.prepareObjectForStorage(ctx, obj)
+		v, err := s.prepareObjectForStorage(ctx, obj)
 		require.NoError(t, err)
-		newObject, _, err := s.codec.Decode(encodedData, nil, &dashv1.Dashboard{})
+		newObject, _, err := s.codec.Decode(v.raw.Bytes(), nil, &dashv1.Dashboard{})
 		require.NoError(t, err)
 		meta, err = utils.MetaAccessor(newObject)
 		require.NoError(t, err)
 		require.Empty(t, meta.GetAnnotation(utils.AnnoKeyGrantPermissions))
-		require.Equal(t, p, "default")
+		require.Equal(t, v.grantPermissions, "default")
 	})
 
 	t.Run("calculate generation", func(t *testing.T) {
@@ -295,23 +295,56 @@ func TestPrepareObjectForStorage(t *testing.T) {
 			require.Equal(t, int64(1), out.GetGeneration()) // still 1
 		})
 	})
+
+	t.Run("should fail invalid input", func(t *testing.T) {
+		_, err := s.prepareObjectForStorage(context.Background(), &dashv1.Dashboard{})
+		require.Error(t, err)
+		require.Contains(t, err.Error(), "missing auth info")
+
+		_, err = s.prepareObjectForUpdate(context.Background(), &dashv1.Dashboard{}, &dashv1.Dashboard{})
+		require.Error(t, err)
+		require.Contains(t, err.Error(), "missing auth info")
+
+		_, err = s.prepareObjectForStorage(ctx, &dashv1.Dashboard{})
+		require.Error(t, err)
+		require.Contains(t, err.Error(), "missing name")
+
+		_, err = s.prepareObjectForUpdate(ctx, &dashv1.Dashboard{}, &dashv1.Dashboard{})
+		require.Error(t, err)
+		require.Contains(t, err.Error(), "updated object must have a name")
+
+		_, err = s.prepareObjectForUpdate(ctx, &dashv1.Dashboard{ObjectMeta: v1.ObjectMeta{
+			Name: "test-name",
+		}}, &dashv1.Dashboard{ObjectMeta: v1.ObjectMeta{
+			Name: "not-the-same-name",
+		}})
+		require.Error(t, err)
+		require.Contains(t, err.Error(), "name mismatch between")
+
+		_, err = s.prepareObjectForStorage(ctx, &dashv1.Dashboard{ObjectMeta: v1.ObjectMeta{
+			Name:            "test-name",
+			ResourceVersion: "123", // RV must not be set
+		}})
+		require.Error(t, err)
+		require.Equal(t, storage.ErrResourceVersionSetOnCreate, err)
+	})
 }
 
 func getPreparedObject(t *testing.T, ctx context.Context, s *Storage, obj runtime.Object, old runtime.Object) utils.GrafanaMetaAccessor {
 	t.Helper()
 
-	var raw []byte
+	var v objectForStorage
 	var err error
 
 	if old == nil {
-		raw, _, err = s.prepareObjectForStorage(ctx, obj)
+		v, err = s.prepareObjectForStorage(ctx, obj)
 	} else {
-		raw, err = s.prepareObjectForUpdate(ctx, obj, old)
+		v, err = s.prepareObjectForUpdate(ctx, obj, old)
 	}
 	require.NoError(t, err)
 
 	out := &unstructured.Unstructured{}
-	err = out.UnmarshalJSON(raw)
+	err = out.UnmarshalJSON(v.raw.Bytes())
 	require.NoError(t, err)
 
 	meta, err := utils.MetaAccessor(out)
@@ -324,7 +357,7 @@ func TestPrepareLargeObjectForStorage(t *testing.T) {
 	node, err := snowflake.NewNode(rand.Int64N(1024))
 	require.NoError(t, err)
 
-	ctx := authtypes.WithAuthInfo(context.Background(), &identity.StaticRequester{UserID: 1, UserUID: "user-uid", Type: authtypes.TypeUser})
+	ctx := authlib.WithAuthInfo(context.Background(), &identity.StaticRequester{UserID: 1, UserUID: "user-uid", Type: authlib.TypeUser})
 
 	dashboard := dashv1.Dashboard{}
 	dashboard.Name = "test-name"
@@ -341,7 +374,7 @@ func TestPrepareLargeObjectForStorage(t *testing.T) {
 			},
 		}
 
-		_, _, err := f.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
+		_, err := f.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
 		require.Nil(t, err)
 		require.True(t, los.deconstructed)
 	})
@@ -359,7 +392,7 @@ func TestPrepareLargeObjectForStorage(t *testing.T) {
 			},
 		}
 
-		_, _, err := f.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
+		_, err := f.prepareObjectForStorage(ctx, dashboard.DeepCopyObject())
 		require.Nil(t, err)
 		require.False(t, los.deconstructed)
 	})
diff --git a/pkg/storage/unified/apistore/secure.go b/pkg/storage/unified/apistore/secure.go
new file mode 100644
index 00000000000..3f88ba19a63
--- /dev/null
+++ b/pkg/storage/unified/apistore/secure.go
@@ -0,0 +1,149 @@
+package apistore
+
+import (
+	"context"
+	"fmt"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
+	secret "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
+)
+
+// prepareSecureValues will create any new secure values and register changes inside the provided objectForStorage
+// any call to this function MUST be followed by a call to info.finish(ctx, nil, store) to ensure that the secure values are cleaned up
+func prepareSecureValues(ctx context.Context, store secret.InlineSecureValueSupport, obj utils.GrafanaMetaAccessor, previousObject utils.GrafanaMetaAccessor, v *objectForStorage) (err error) {
+	secure, err := obj.GetSecureValues()
+	if err != nil {
+		return err
+	}
+
+	// Owner reference for inline values
+	v.ref = utils.ToObjectReference(obj)
+
+	var previous common.InlineSecureValues
+	if previousObject == nil {
+		if len(secure) == 0 {
+			return nil // nothing needs to change
+		}
+		if store == nil {
+			return fmt.Errorf("secure value support is not configured (create)")
+		}
+		previous = make(common.InlineSecureValues, 0)
+	} else {
+		// Merge in any values from the previous object and handle remove
+		previous, err = previousObject.GetSecureValues()
+		if err != nil {
+			return err
+		}
+		for _, p := range previous {
+			if p.Name == "" || p.Remove || !p.Create.IsZero() {
+				return fmt.Errorf("invalid state, saved values must only have a name")
+			}
+		}
+
+		// Keep exactly what we had before
+		if len(secure) == 0 {
+			if len(previous) > 0 {
+				return obj.SetSecureValues(previous)
+			}
+			return nil
+		}
+
+		if store == nil {
+			return fmt.Errorf("secure value support is not configured (update)")
+		}
+	}
+
+	for k, val := range secure {
+		before := previous[k]
+		if val.Name == "" {
+			if before.Name != "" { // implicitly delete previous secure value if the same field no longer references it
+				v.deleteSecureValues = append(v.deleteSecureValues, before.Name)
+				delete(previous, k)
+			}
+			if val.Remove {
+				if before.Name == "" {
+					return fmt.Errorf("cannot remove secure value '%s', it did not exist in the previous value", k)
+				}
+				delete(secure, k)
+				v.hasChanged = true
+				continue
+			}
+			if !val.Create.IsZero() {
+				n, err := store.CreateInline(ctx, v.ref, val.Create)
+				if err != nil {
+					return err
+				}
+				v.createdSecureValues = append(v.createdSecureValues, n)
+				v.hasChanged = true
+				secure[k] = common.InlineSecureValue{Name: n}
+				continue
+			}
+			return fmt.Errorf("invalid secure value state: %s", k)
+		}
+
+		// The name changed from the previously stored value
+		if before.Name != "" && before.Name != val.Name {
+			// This can happen when explicitly shifting from an inline value to a shared secret
+			v.deleteSecureValues = append(v.deleteSecureValues, before.Name)
+			v.hasChanged = true
+		}
+
+		delete(previous, k)
+	}
+
+	// Keep all previous values that were not referenced in the update
+	for k, v := range previous {
+		_, found := secure[k]
+		if !found {
+			secure[k] = v // the previous value
+		}
+	}
+
+	return cleanupSecureValues(v, obj, secure)
+}
+
+// make sure the registered changes are unique and valid
+func cleanupSecureValues(v *objectForStorage, obj utils.GrafanaMetaAccessor, secure common.InlineSecureValues) error {
+	// Make sure the deleted list is unique and does not contain any referenced values
+	if len(v.deleteSecureValues) > 0 && len(secure) > 0 {
+		confirm := v.deleteSecureValues
+		v.deleteSecureValues = make([]string, 0, len(v.deleteSecureValues))
+		used := make(map[string]bool, len(secure))
+		for _, v := range secure {
+			used[v.Name] = true
+		}
+		for _, name := range confirm {
+			if _, ok := used[name]; ok {
+				continue
+			}
+			used[name] = true
+			v.deleteSecureValues = append(v.deleteSecureValues, name)
+		}
+	}
+
+	if len(v.deleteSecureValues) > 0 || len(v.createdSecureValues) > 0 {
+		v.hasChanged = true
+	}
+	return obj.SetSecureValues(secure)
+}
+
+// Mutation hook that will delete secure values
+func handleSecureValuesDelete(ctx context.Context, store secret.InlineSecureValueSupport, obj utils.GrafanaMetaAccessor) error {
+	secure, err := obj.GetSecureValues()
+	if err != nil || len(secure) == 0 {
+		return err
+	}
+
+	if store == nil {
+		return fmt.Errorf("secure value support is not configured (delete)")
+	}
+
+	owner := utils.ToObjectReference(obj)
+	for _, v := range secure {
+		if err = store.DeleteWhenOwnedByResource(ctx, owner, v.Name); err != nil {
+			return err
+		}
+	}
+	return obj.SetSecureValues(nil) // remove them from the object
+}
diff --git a/pkg/storage/unified/apistore/secure_test.go b/pkg/storage/unified/apistore/secure_test.go
new file mode 100644
index 00000000000..89408121a67
--- /dev/null
+++ b/pkg/storage/unified/apistore/secure_test.go
@@ -0,0 +1,281 @@
+package apistore
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
+	"github.com/grafana/grafana/pkg/registry/apis/secret"
+)
+
+func TestSecureLifecycle(t *testing.T) {
+	resourceWithSecureValues := func(sv common.InlineSecureValues) utils.GrafanaMetaAccessor {
+		obj, err := utils.MetaAccessor(&unstructured.Unstructured{
+			Object: map[string]any{
+				"apiVersion": "something.grafana.app/v1beta1",
+				"kind":       "CustomKind",
+				"metadata": map[string]any{
+					"namespace": "default",
+					"name":      "test",
+				},
+				"secure": sv,
+			},
+		})
+		require.NoError(t, err)
+		return obj
+	}
+
+	t.Run("create secure values", func(t *testing.T) {
+		secureStore := secret.NewMockInlineSecureValueSupport(t)
+		secureStore.On("CreateInline", mock.Anything, mock.Anything, common.RawSecureValue("SecretAAA")).
+			Return("NameForA", nil).Once()
+		secureStore.On("CreateInline", mock.Anything, mock.Anything, common.RawSecureValue("SecretBBB")).
+			Return("NameForB", nil).Once()
+
+		info := &objectForStorage{}
+		obj := resourceWithSecureValues(common.InlineSecureValues{
+			"a": common.InlineSecureValue{Create: "SecretAAA"},
+			"b": common.InlineSecureValue{Create: "SecretBBB"},
+		})
+
+		err := prepareSecureValues(context.Background(), secureStore, obj, nil, info)
+		require.NoError(t, err)
+		require.True(t, info.hasChanged)
+		require.Equal(t, []string{"NameForA", "NameForB"}, info.createdSecureValues)
+		secure, err := obj.GetSecureValues()
+		require.NoError(t, err)
+		require.JSONEq(t, `{
+			"a": {"name": "NameForA"},
+			"b": {"name": "NameForB"}
+		}`, asJSON(secure, true))
+		secureStore.AssertExpectations(t)
+	})
+
+	t.Run("create secure values with errors", func(t *testing.T) {
+		obj := resourceWithSecureValues(common.InlineSecureValues{
+			"a": common.InlineSecureValue{Create: "SecretAAA"},
+			"b": common.InlineSecureValue{Create: "SecretBBB"},
+		})
+
+		info := &objectForStorage{}
+		expectError := fmt.Errorf("expected error")
+		secureStore := secret.NewMockInlineSecureValueSupport(t)
+		secureStore.On("CreateInline", mock.Anything, mock.Anything, common.RawSecureValue("SecretAAA")).
+			Return("", expectError).Once()
+		err := prepareSecureValues(context.Background(), secureStore, obj, nil, info)
+		require.Error(t, err, "should error when secure value creation fails")
+		require.Equal(t, expectError, err, "error should be propagated")
+		secureStore.AssertExpectations(t)
+	})
+
+	t.Run("change name manually", func(t *testing.T) {
+		secureStore := secret.NewMockInlineSecureValueSupport(t)
+
+		info := &objectForStorage{}
+		previous := resourceWithSecureValues(common.InlineSecureValues{
+			"a": common.InlineSecureValue{Name: "111"},
+			"b": common.InlineSecureValue{Name: "222"},
+			"c": common.InlineSecureValue{Name: "333"},
+		})
+		obj := resourceWithSecureValues(common.InlineSecureValues{
+			"a": common.InlineSecureValue{Name: "222"},
+			"b": common.InlineSecureValue{Name: "333"}, // no change
+			// "c" will be loaded from the previous object without changes
+		})
+
+		err := prepareSecureValues(context.Background(), secureStore, obj, previous, info)
+		require.NoError(t, err)
+		require.True(t, info.hasChanged)
+		require.Empty(t, info.createdSecureValues)
+		require.Equal(t, info.deleteSecureValues, []string{"111"}) // will be removed if storage succeeds
+		secure, err := obj.GetSecureValues()
+		require.NoError(t, err)
+		require.JSONEq(t, `{
+			"a": {"name": "222"},
+			"b": {"name": "333"},
+			"c": {"name": "333"}
+		}`, asJSON(secure, true))
+	})
+
+	t.Run("update without secrets", func(t *testing.T) {
+		secureStore := secret.NewMockInlineSecureValueSupport(t)
+
+		info := &objectForStorage{}
+		previousObject := resourceWithSecureValues(common.InlineSecureValues{
+			"a": common.InlineSecureValue{Name: "NameForA"},
+			"b": common.InlineSecureValue{Name: "NameForB"},
+		})
+		objWithoutSecrets := resourceWithSecureValues(nil)
+
+		// Note that the secure values from the previous object are copied over
+		err := prepareSecureValues(context.Background(), secureStore, objWithoutSecrets, previousObject, info)
+		require.NoError(t, err)
+		require.False(t, info.hasChanged)
+		secure, err := objWithoutSecrets.GetSecureValues()
+		require.NoError(t, err)
+		require.JSONEq(t, `{
+			"a": {"name": "NameForA"},
+			"b": {"name": "NameForB"}
+		}`, asJSON(secure, true))
+	})
+
+	t.Run("remove secure values", func(t *testing.T) {
+		secureStore := secret.NewMockInlineSecureValueSupport(t)
+		previous := resourceWithSecureValues(common.InlineSecureValues{
+			"a": common.InlineSecureValue{Name: "NameForA"},
+			"b": common.InlineSecureValue{Name: "NameForB"},
+			"c": common.InlineSecureValue{Name: "NameForC"},
+		})
+
+		// Remove "b" with an explicit command
+		obj := resourceWithSecureValues(common.InlineSecureValues{
+			"a": common.InlineSecureValue{Name: "NameForA"}, // no change
+			"b": common.InlineSecureValue{Remove: true},
+			// "c" will be loaded from the previous object
+		})
+
+		// Prepare secure values does not change anything when removing
+		info := &objectForStorage{}
+		err := prepareSecureValues(context.Background(), secureStore, obj, previous, info)
+		require.NoError(t, err)
+		require.True(t, info.hasChanged)  // value was removed
+		secureStore.AssertExpectations(t) // nothing called
+
+		secure, err := obj.GetSecureValues()
+		require.NoError(t, err)
+		require.JSONEq(t, `{
+			"a": {"name": "NameForA"},
+			"c": {"name": "NameForC"}
+		}`, asJSON(secure, true))
+
+		// When there is not an error, the finish command will do a real delete
+		owner := utils.ToObjectReference(obj)
+		secureStore.On("DeleteWhenOwnedByResource", mock.Anything, owner, "NameForB").
+			Return(nil).Once()
+		err = info.finish(context.Background(), nil, secureStore)
+		require.NoError(t, err)
+		require.True(t, info.hasChanged)  // value was removed
+		secureStore.AssertExpectations(t) // nothing called
+
+		// When an error exists, no values will be deleted
+		err = fmt.Errorf("expected error")
+		outErr := info.finish(context.Background(), err, secureStore)
+		require.Equal(t, err, outErr, "error should be passed through")
+	})
+
+	t.Run("remove invalid secure values", func(t *testing.T) {
+		secureStore := secret.NewMockInlineSecureValueSupport(t)
+		obj := resourceWithSecureValues(common.InlineSecureValues{
+			"b": common.InlineSecureValue{Remove: true},
+		})
+
+		// Previous values must exist for remove to execute
+		info := &objectForStorage{}
+		err := prepareSecureValues(context.Background(), secureStore, obj, resourceWithSecureValues(nil), info)
+		require.Error(t, err, "should error when previous secure values does not exist")
+		require.Equal(t, "cannot remove secure value 'b', it did not exist in the previous value", err.Error())
+		secureStore.AssertExpectations(t)
+	})
+
+	t.Run("delete resource", func(t *testing.T) {
+		secureStore := secret.NewMockInlineSecureValueSupport(t)
+		obj := resourceWithSecureValues(common.InlineSecureValues{
+			"a": common.InlineSecureValue{Name: "NameForA"},
+		})
+		sv, err := obj.GetSecureValues()
+		require.NoError(t, err)
+		require.Len(t, sv, 1)
+
+		owner := utils.ToObjectReference(obj)
+		secureStore.On("DeleteWhenOwnedByResource", mock.Anything, owner, "NameForA").
+			Return(nil).Once()
+
+		err = handleSecureValuesDelete(context.Background(), secureStore, obj)
+		require.NoError(t, err)
+		secureStore.AssertExpectations(t)
+		sv, err = obj.GetSecureValues()
+		require.NoError(t, err)
+		require.Empty(t, sv, "secure values should be empty after delete")
+
+		// Delete should propagate deletion errors
+		obj = resourceWithSecureValues(common.InlineSecureValues{
+			"a": common.InlineSecureValue{Name: "NameForA"},
+		})
+		expectError := fmt.Errorf("expected error")
+		secureStore = secret.NewMockInlineSecureValueSupport(t)
+		secureStore.On("DeleteWhenOwnedByResource", mock.Anything, owner, "NameForA").
+			Return(expectError).Once()
+		err = handleSecureValuesDelete(context.Background(), secureStore, obj)
+		require.Equal(t, expectError, err, "error should be passed through")
+		secureStore.AssertExpectations(t)
+	})
+
+	t.Run("invalid states", func(t *testing.T) {
+		secureStore := secret.NewMockInlineSecureValueSupport(t)
+
+		info := &objectForStorage{}
+		err := prepareSecureValues(context.Background(), secureStore, resourceWithSecureValues(common.InlineSecureValues{
+			"a": common.InlineSecureValue{}, // MUST have Create, Remove or Name
+		}), nil, info)
+		require.Error(t, err)
+	})
+
+	t.Run("setup errors", func(t *testing.T) {
+		objWithoutSecrets := resourceWithSecureValues(nil)
+		objWithCreateSecret := resourceWithSecureValues(common.InlineSecureValues{
+			"a": common.InlineSecureValue{Create: "SecretAAA"},
+		})
+		invalid, _ := utils.MetaAccessor(&unstructured.Unstructured{
+			Object: map[string]any{
+				"apiVersion": "something.grafana.app/v1beta1",
+				"kind":       "CustomKind",
+				"metadata": map[string]any{
+					"namespace": "default",
+					"name":      "test",
+				},
+				"secure": t, // something NOT a secure value
+			},
+		})
+		info := &objectForStorage{}
+		err := prepareSecureValues(context.Background(), nil, invalid, nil, info)
+		require.Error(t, err, "should error when secure values are not a map")
+
+		err = prepareSecureValues(context.Background(), nil, objWithCreateSecret, invalid, info)
+		require.Error(t, err, "should error when previous secure values are not a map")
+
+		err = prepareSecureValues(context.Background(), nil, objWithCreateSecret, nil, info)
+		require.Error(t, err, "should error when secure value storage is not configured")
+
+		err = prepareSecureValues(context.Background(), nil, objWithCreateSecret, objWithoutSecrets, info)
+		require.Error(t, err, "should error when secure value storage is not configured")
+
+		err = prepareSecureValues(context.Background(), nil, objWithoutSecrets, objWithCreateSecret, info)
+		require.Error(t, err, "should error when previous value does not have a name")
+
+		// DELETE Setup errors
+		err = handleSecureValuesDelete(context.Background(), nil, invalid)
+		require.Error(t, err, "should error when secure values are not a map")
+
+		err = handleSecureValuesDelete(context.Background(), nil, objWithCreateSecret)
+		require.Error(t, err, "should error when secure value storage is not configured")
+	})
+}
+
+func asJSON(v any, pretty bool) string {
+	if v == nil {
+		return ""
+	}
+	if pretty {
+		bytes, _ := json.MarshalIndent(v, "", "  ")
+		return string(bytes)
+	}
+	bytes, _ := json.Marshal(v)
+	return string(bytes)
+}
diff --git a/pkg/storage/unified/apistore/store.go b/pkg/storage/unified/apistore/store.go
index ea2761eb86e..52f36fecdcc 100644
--- a/pkg/storage/unified/apistore/store.go
+++ b/pkg/storage/unified/apistore/store.go
@@ -32,6 +32,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 
 	authtypes "github.com/grafana/authlib/types"
+	"github.com/grafana/grafana-app-sdk/logging"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
 	secrets "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
@@ -186,33 +187,33 @@ func (s *Storage) convertToObject(data []byte, obj runtime.Object) (runtime.Obje
 // in seconds (0 means forever). If no error is returned and out is not nil, out will be
 // set to the read value from database.
 func (s *Storage) Create(ctx context.Context, key string, obj runtime.Object, out runtime.Object, ttl uint64) error {
-	var err error
-	var permissions string
-	req := &resourcepb.CreateRequest{}
-	req.Value, permissions, err = s.prepareObjectForStorage(ctx, obj)
+	v, err := s.prepareObjectForStorage(ctx, obj)
 	if err != nil {
 		return s.handleManagedResourceRouting(ctx, err, resourcepb.WatchEvent_ADDED, key, obj, out)
 	}
-
+	req := &resourcepb.CreateRequest{
+		Value: v.raw.Bytes(),
+	}
 	req.Key, err = s.getKey(key)
 	if err != nil {
 		return err
 	}
 
-	grantPermissions, err := afterCreatePermissionCreator(ctx, req.Key, permissions, obj, s.opts.Permissions)
+	v.permissionCreator, err = afterCreatePermissionCreator(ctx, req.Key, v.grantPermissions, obj, s.opts.Permissions)
 	if err != nil {
 		return err
 	}
 
 	rsp, err := s.store.Create(ctx, req)
 	if err != nil {
-		return resource.GetError(resource.AsErrorResult(err))
+		return v.finish(ctx, resource.GetError(resource.AsErrorResult(err)), s.opts.SecureValues)
 	}
 	if rsp.Error != nil {
+		err = resource.GetError(rsp.Error)
 		if rsp.Error.Code == http.StatusConflict {
-			return storage.NewKeyExistsError(key, 0)
+			err = storage.NewKeyExistsError(key, 0)
 		}
-		return resource.GetError(rsp.Error)
+		return v.finish(ctx, err, s.opts.SecureValues)
 	}
 
 	if _, err := s.convertToObject(req.Value, out); err != nil {
@@ -234,12 +235,7 @@ func (s *Storage) Create(ctx context.Context, key string, obj runtime.Object, ou
 		})
 	}
 
-	// Synchronous AfterCreate permissions -- allows users to become "admin" of the thing they made
-	if grantPermissions != nil {
-		return grantPermissions(ctx)
-	}
-
-	return nil
+	return v.finish(ctx, nil, s.opts.SecureValues)
 }
 
 // Delete removes the specified key and returns the value that existed at that spot.
@@ -308,6 +304,11 @@ func (s *Storage) Delete(
 	if rsp.Error != nil {
 		return resource.GetError(rsp.Error)
 	}
+
+	if err = handleSecureValuesDelete(ctx, s.opts.SecureValues, meta); err != nil {
+		logging.FromContext(ctx).Warn("failed to delete inline secure values", "err", err)
+	}
+
 	if err := s.versioner.UpdateObject(out, uint64(rsp.ResourceVersion)); err != nil {
 		return err
 	}
@@ -591,21 +592,27 @@ func (s *Storage) GuaranteedUpdate(
 		break
 	}
 
-	req.Value, err = s.prepareObjectForUpdate(ctx, updatedObj, existingObj)
+	v, err := s.prepareObjectForUpdate(ctx, updatedObj, existingObj)
 	if err != nil {
 		return s.handleManagedResourceRouting(ctx, err, resourcepb.WatchEvent_MODIFIED, key, updatedObj, destination)
 	}
 
-	var rv uint64
 	// Only update (for real) if the bytes have changed
+	var rv uint64
+	req.Value = v.raw.Bytes()
 	if !bytes.Equal(req.Value, existingBytes) {
 		updateResponse, err := s.store.Update(ctx, req)
 		if err != nil {
-			return resource.GetError(resource.AsErrorResult(err))
+			err = resource.GetError(resource.AsErrorResult(err))
+		} else if updateResponse.Error != nil {
+			err = resource.GetError(updateResponse.Error)
 		}
-		if updateResponse.Error != nil {
-			return resource.GetError(updateResponse.Error)
+
+		// Cleanup secure values
+		if err = v.finish(ctx, err, s.opts.SecureValues); err != nil {
+			return err
 		}
+
 		rv = uint64(updateResponse.ResourceVersion)
 	}
 
diff --git a/pkg/storage/unified/resource/errors.go b/pkg/storage/unified/resource/errors.go
index 903f6e4cff9..79d3911e470 100644
--- a/pkg/storage/unified/resource/errors.go
+++ b/pkg/storage/unified/resource/errors.go
@@ -4,13 +4,14 @@ import (
 	"errors"
 	"net/http"
 
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
+	grpcstatus "google.golang.org/grpc/status"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
-	grpcstatus "google.golang.org/grpc/status"
-
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
 	"github.com/grafana/grafana/pkg/util/scheduler"
 )
@@ -59,6 +60,58 @@ func NewTooManyRequestsError(msg string) *resourcepb.ErrorResult {
 	}
 }
 
+func newInvalidFieldError(
+	obj utils.GrafanaMetaAccessor,
+	detail string,
+	path string,
+	morePath ...string,
+) *resourcepb.ErrorResult {
+	gvk := obj.GetGroupVersionKind()
+	return &resourcepb.ErrorResult{
+		Message: detail,
+		Code:    http.StatusUnprocessableEntity,
+		Reason:  string(metav1.StatusReasonInvalid),
+		Details: &resourcepb.ErrorDetails{
+			Name:  obj.GetName(),
+			Group: gvk.Group,
+			Kind:  gvk.Kind,
+			Uid:   string(obj.GetUID()),
+			Causes: []*resourcepb.ErrorCause{
+				{
+					Reason: string(field.ErrorTypeForbidden),
+					Field:  field.NewPath(path, morePath...).String(),
+				},
+			},
+		},
+	}
+}
+
+func newRequiredFieldError(
+	obj utils.GrafanaMetaAccessor,
+	detail string,
+	path string,
+	morePath ...string,
+) *resourcepb.ErrorResult {
+	gvk := obj.GetGroupVersionKind()
+	return &resourcepb.ErrorResult{
+		Message: detail,
+		Code:    http.StatusUnprocessableEntity,
+		Reason:  string(metav1.StatusReasonInvalid),
+		Details: &resourcepb.ErrorDetails{
+			Name:  obj.GetName(),
+			Group: gvk.Group,
+			Kind:  gvk.Kind,
+			Uid:   string(obj.GetUID()),
+			Causes: []*resourcepb.ErrorCause{
+				{
+					Reason: string(field.ErrorTypeRequired),
+					Field:  field.NewPath(path, morePath...).String(),
+				},
+			},
+		},
+	}
+}
+
 // Convert golang errors to status result errors that can be returned to a client
 func AsErrorResult(err error) *resourcepb.ErrorResult {
 	if err == nil {
diff --git a/pkg/storage/unified/resource/secure.go b/pkg/storage/unified/resource/secure.go
new file mode 100644
index 00000000000..18ff83af7e7
--- /dev/null
+++ b/pkg/storage/unified/resource/secure.go
@@ -0,0 +1,81 @@
+package resource
+
+import (
+	"context"
+	"net/http"
+	"slices"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
+	secrets "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
+	"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
+)
+
+// The "CanReference" check exists to avoid writing references to secrets
+// the user should not allow granting access.  We only check it when the value changes
+func canReferenceSecureValues(ctx context.Context,
+	obj utils.GrafanaMetaAccessor,
+	old utils.GrafanaMetaAccessor,
+	secrets secrets.InlineSecureValueSupport,
+) *resourcepb.ErrorResult {
+	secure, err := obj.GetSecureValues()
+	if err != nil || len(secure) == 0 {
+		return AsErrorResult(err)
+	}
+
+	if secrets == nil {
+		return &resourcepb.ErrorResult{
+			Message: "secure storage not configured",
+			Code:    http.StatusServiceUnavailable,
+			Reason:  string(metav1.StatusReasonServiceUnavailable),
+		}
+	}
+
+	// All references should only set a name
+	names := make([]string, 0, len(secure))
+	for k, v := range secure {
+		if !v.Create.IsZero() {
+			return newInvalidFieldError(obj,
+				"unable to create values in unified storage",
+				"secure", k, "create")
+		}
+		if v.Remove {
+			return newInvalidFieldError(obj,
+				"unable to save the remove command",
+				"secure", k, "remove")
+		}
+		if v.Name == "" {
+			return newRequiredFieldError(obj,
+				"missing name",
+				"secure", k, "name")
+		}
+		names = append(names, v.Name)
+	}
+
+	// This will call the real service to check access, converting any errors to protobuf
+	canReference := func() *resourcepb.ErrorResult {
+		slices.Sort(names)
+		names = slices.Compact(names) //
+		if err := secrets.CanReference(ctx, utils.ToObjectReference(obj), names...); err != nil {
+			return AsErrorResult(err)
+		}
+		return nil
+	}
+
+	// Always check for create
+	if old == nil {
+		return canReference()
+	}
+
+	oldSecureValues, err := old.GetSecureValues()
+	if err != nil || len(secure) != len(oldSecureValues) {
+		return canReference()
+	}
+	for k, v := range secure {
+		if oldSecureValues[k].Name != v.Name {
+			return canReference()
+		}
+	}
+	return nil // no need to check if the values are the same
+}
diff --git a/pkg/storage/unified/resource/secure_test.go b/pkg/storage/unified/resource/secure_test.go
new file mode 100644
index 00000000000..67388c5ae4c
--- /dev/null
+++ b/pkg/storage/unified/resource/secure_test.go
@@ -0,0 +1,188 @@
+package resource
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
+	"github.com/grafana/grafana/pkg/registry/apis/secret"
+)
+
+func TestSecureValues(t *testing.T) {
+	raw := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "playlist.grafana.app/v0alpha1",
+			"kind":       "Playlist",
+			"metadata": map[string]any{
+				"name":      "nn",
+				"namespace": "ns",
+			},
+			"spec": map[string]any{
+				"title": "hello",
+			},
+			"secure": map[string]any{}, // empty
+		},
+	}
+	obj, err := utils.MetaAccessor(raw)
+	require.NoError(t, err)
+	owner := utils.ToObjectReference(obj)
+
+	t.Run("Invalid input", func(t *testing.T) {
+		raw.Object["secure"] = map[string]any{
+			"A": common.InlineSecureValue{
+				Create: common.NewSecretValue("XXX"),
+			},
+		}
+		secureMock := secret.NewMockInlineSecureValueSupport(t)
+		pberr := canReferenceSecureValues(context.Background(), obj, nil, nil)
+		require.Equal(t, http.StatusServiceUnavailable, int(pberr.Code), "missing store")
+
+		t.Run("create", func(t *testing.T) {
+			raw.Object["secure"] = map[string]any{
+				"A": common.InlineSecureValue{
+					Create: common.NewSecretValue("XXX"),
+				},
+			}
+			pberr = canReferenceSecureValues(context.Background(), obj, nil, secureMock)
+			require.Equal(t, http.StatusUnprocessableEntity, int(pberr.Code))
+			require.Equal(t, "secure.A.create", pberr.Details.Causes[0].Field)
+		})
+
+		t.Run("remove", func(t *testing.T) {
+			raw.Object["secure"] = map[string]any{
+				"A": common.InlineSecureValue{
+					Remove: true,
+				},
+			}
+			pberr = canReferenceSecureValues(context.Background(), obj, nil, secureMock)
+			require.Equal(t, http.StatusUnprocessableEntity, int(pberr.Code))
+			require.Equal(t, "secure.A.remove", pberr.Details.Causes[0].Field)
+		})
+
+		t.Run("missing name", func(t *testing.T) {
+			raw.Object["secure"] = map[string]any{
+				"A": common.InlineSecureValue{
+					Name: "", // EMPTY
+				},
+			}
+			pberr = canReferenceSecureValues(context.Background(), obj, nil, secureMock)
+			require.Equal(t, http.StatusUnprocessableEntity, int(pberr.Code))
+			require.Equal(t, "secure.A.name", pberr.Details.Causes[0].Field)
+		})
+
+		secureMock.AssertExpectations(t)
+	})
+
+	t.Run("OnCreate", func(t *testing.T) {
+		raw.Object["secure"] = map[string]any{
+			"A": common.InlineSecureValue{
+				Name: "111",
+			},
+			"B": common.InlineSecureValue{
+				Name: "111", // duplicate reference, but only checked once
+			},
+		}
+		secureMock := secret.NewMockInlineSecureValueSupport(t)
+		secureMock.On("CanReference", mock.Anything, owner, "111").
+			Return(nil).Once()
+
+		pberr := canReferenceSecureValues(context.Background(), obj, nil, secureMock)
+		require.Nil(t, pberr)
+		secureMock.AssertExpectations(t)
+	})
+
+	t.Run("OnUpdate", func(t *testing.T) {
+		raw.Object["secure"] = map[string]any{
+			"A": common.InlineSecureValue{
+				Name: "111",
+			},
+			"B": common.InlineSecureValue{
+				Name: "222",
+			},
+		}
+
+		old, _ := utils.MetaAccessor(&unstructured.Unstructured{})
+		secureMock := secret.NewMockInlineSecureValueSupport(t)
+		secureMock.On("CanReference", mock.Anything, owner, "111", "222").
+			Return(nil).Once()
+
+		pberr := canReferenceSecureValues(context.Background(), obj, old, secureMock)
+		require.Nil(t, pberr)
+		secureMock.AssertExpectations(t)
+	})
+
+	t.Run("OnUpdate with same keys", func(t *testing.T) {
+		raw.Object["secure"] = map[string]any{
+			"A": common.InlineSecureValue{
+				Name: "111",
+			},
+			"B": common.InlineSecureValue{
+				Name: "222",
+			},
+		}
+
+		old, _ := utils.MetaAccessor(&unstructured.Unstructured{
+			Object: map[string]any{
+				"secure": map[string]any{
+					"A": common.InlineSecureValue{
+						Name: "111", // same
+					},
+					"B": common.InlineSecureValue{
+						Name: "Not222",
+					},
+				}}})
+		secureMock := secret.NewMockInlineSecureValueSupport(t)
+		secureMock.On("CanReference", mock.Anything, owner, "111", "222").
+			Return(nil).Once()
+
+		pberr := canReferenceSecureValues(context.Background(), obj, old, secureMock)
+		require.Nil(t, pberr)
+		secureMock.AssertExpectations(t)
+	})
+
+	t.Run("Update without changes should skip CanReference", func(t *testing.T) {
+		raw.Object["secure"] = map[string]any{
+			"A": common.InlineSecureValue{
+				Name: "111",
+			},
+		}
+		secureMock := secret.NewMockInlineSecureValueSupport(t)
+
+		pberr := canReferenceSecureValues(context.Background(), obj, obj, secureMock)
+		require.Nil(t, pberr)
+		secureMock.AssertExpectations(t) // CanReference should not be called
+	})
+
+	t.Run("upstream errors", func(t *testing.T) {
+		raw.Object["secure"] = map[string]any{
+			"A": common.InlineSecureValue{
+				Name: "111",
+			},
+		}
+		secureMock := secret.NewMockInlineSecureValueSupport(t)
+		secureMock.On("CanReference", mock.Anything, owner, "111").
+			Return(fmt.Errorf("nope")).Once() // <<< error in CanReference
+
+		pberr := canReferenceSecureValues(context.Background(), obj, nil, secureMock)
+		require.NotNil(t, pberr)
+		secureMock.AssertExpectations(t)
+
+		// Check CanReference when the old value is invalid
+		old, _ := utils.MetaAccessor(&unstructured.Unstructured{
+			Object: map[string]any{"secure": t}})
+
+		secureMock = secret.NewMockInlineSecureValueSupport(t)
+		secureMock.On("CanReference", mock.Anything, owner, "111").
+			Return(nil).Once()
+		pberr = canReferenceSecureValues(context.Background(), obj, old, secureMock)
+		require.Nil(t, pberr)
+		secureMock.AssertExpectations(t)
+	})
+}
diff --git a/pkg/storage/unified/resource/server.go b/pkg/storage/unified/resource/server.go
index 39e38062fb5..c41b187af16 100644
--- a/pkg/storage/unified/resource/server.go
+++ b/pkg/storage/unified/resource/server.go
@@ -234,7 +234,7 @@ type ResourceServerOptions struct {
 	RingLifecycler *ring.BasicLifecycler
 }
 
-func NewResourceServer(opts ResourceServerOptions) (ResourceServer, error) {
+func NewResourceServer(opts ResourceServerOptions) (*server, error) {
 	if opts.Tracer == nil {
 		opts.Tracer = noop.NewTracerProvider().Tracer("resource-server")
 	}
@@ -473,17 +473,8 @@ func (s *server) newEvent(ctx context.Context, user claims.AuthInfo, key *resour
 	}
 
 	// Verify that this resource can reference secure values
-	secure, err := obj.GetSecureValues()
-	if err != nil {
-		return nil, AsErrorResult(err)
-	}
-	if len(secure) > 0 {
-		if s.secure == nil {
-			return nil, NewBadRequestError("secure storage not configured")
-		}
-
-		// See: https://github.com/grafana/grafana/pull/107803
-		return nil, NewBadRequestError("Saving secure values is not yet supported")
+	if err := canReferenceSecureValues(ctx, obj, event.ObjectOld, s.secure); err != nil {
+		return nil, err
 	}
 
 	if key.Namespace != obj.GetNamespace() {
diff --git a/pkg/storage/unified/resource/server_test.go b/pkg/storage/unified/resource/server_test.go
index da92e67d7c0..b0dff754a18 100644
--- a/pkg/storage/unified/resource/server_test.go
+++ b/pkg/storage/unified/resource/server_test.go
@@ -14,8 +14,7 @@ import (
 	"gocloud.dev/blob/memblob"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
-	claims "github.com/grafana/authlib/types"
-
+	authlib "github.com/grafana/authlib/types"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
@@ -23,14 +22,14 @@ import (
 
 func TestSimpleServer(t *testing.T) {
 	testUserA := &identity.StaticRequester{
-		Type:           claims.TypeUser,
+		Type:           authlib.TypeUser,
 		Login:          "testuser",
 		UserID:         123,
 		UserUID:        "u123",
 		OrgRole:        identity.RoleAdmin,
 		IsGrafanaAdmin: true, // can do anything
 	}
-	ctx := claims.WithAuthInfo(context.Background(), testUserA)
+	ctx := authlib.WithAuthInfo(context.Background(), testUserA)
 
 	bucket := memblob.OpenBucket(nil)
 	if false {

From 9125b9c0142a313efcddb09ccffd0ac1086855b3 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Thu, 14 Aug 2025 13:57:58 +0100
Subject: [PATCH 175/243] Chore: Unpick bootData (#109544)

* set the boot data config correctly

* tighten up grafana/data types

* kick CI

* restore dashboard scopes props

* revert back to class

* add some comments

* kick CI

* add comment
---
 .betterer.results                             |   4 +-
 .../smoke-tests-suite/panels.spec.ts          |   4 +-
 .../panels_smokescreen.spec.ts                |   4 +-
 packages/grafana-data/src/index.ts            |   5 +
 .../matchers/nameMatcher.test.ts              |   7 +-
 .../transformations/matchers/nameMatcher.ts   |   3 +-
 .../transformers/groupingToMatrix.ts          |   3 +-
 .../src/transformations/transformers/utils.ts |   6 -
 packages/grafana-data/src/types/config.ts     | 141 +++++++++++++-----
 packages/grafana-runtime/src/config.ts        | 129 +++++++++-------
 .../DateTimePickers/WeekStartPicker.tsx       |   7 -
 .../src/slate-plugins/suggestions.tsx         |   8 -
 public/app/app.ts                             |   2 +-
 .../useFoldersQuery.test.tsx                  |   3 +-
 public/app/core/config.ts                     |   2 +-
 public/app/core/context/GrafanaContext.ts     |   5 +-
 .../GrafanaJavascriptAgentBackend.test.ts     |   2 +
 public/app/core/utils/explore.test.ts         |   3 +-
 .../unified/rule-editor/formDefaults.test.ts  |   4 +-
 public/app/types/window.d.ts                  |   1 +
 public/test/mocks/getGrafanaContextMock.ts    |   5 +-
 21 files changed, 205 insertions(+), 143 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index d323fe5b2f5..17e26b00966 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -502,8 +502,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Do not use any type assertions.", "5"]
     ],
     "packages/grafana-runtime/src/services/EchoSrv.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
diff --git a/e2e-playwright/smoke-tests-suite/panels.spec.ts b/e2e-playwright/smoke-tests-suite/panels.spec.ts
index c65bd0d28ce..822b0ad90b4 100644
--- a/e2e-playwright/smoke-tests-suite/panels.spec.ts
+++ b/e2e-playwright/smoke-tests-suite/panels.spec.ts
@@ -1,5 +1,5 @@
+import { BootData } from '@grafana/data';
 import { test, expect } from '@grafana/plugin-e2e';
-import { GrafanaBootConfig } from '@grafana/runtime';
 
 test.describe(
   'Panels smokescreen',
@@ -25,7 +25,7 @@ test.describe(
       const panelTypes = await page.evaluate(() => {
         // @grafana/plugin-e2e doesn't export the full bootdata config
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const win = window as typeof window & { grafanaBootData: GrafanaBootConfig['bootData'] };
+        const win = window as typeof window & { grafanaBootData: BootData };
         return win.grafanaBootData?.settings?.panels ?? {};
       });
 
diff --git a/e2e/old-arch/smoke-tests-suite/panels_smokescreen.spec.ts b/e2e/old-arch/smoke-tests-suite/panels_smokescreen.spec.ts
index 4e546c88e1b..36f091803d7 100644
--- a/e2e/old-arch/smoke-tests-suite/panels_smokescreen.spec.ts
+++ b/e2e/old-arch/smoke-tests-suite/panels_smokescreen.spec.ts
@@ -1,4 +1,4 @@
-import { GrafanaBootConfig } from '@grafana/runtime';
+import { BootData } from '@grafana/data';
 
 import { e2e } from '../utils';
 
@@ -22,7 +22,7 @@ describe('Panels smokescreen', () => {
       visitDashboardAtStart: false,
     });
 
-    cy.window().then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
+    cy.window().then((win: Cypress.AUTWindow & { grafanaBootData: BootData }) => {
       // Loop through every panel type and ensure no crash
       Object.entries(win.grafanaBootData.settings.panels).forEach(([_, panel]) => {
         // TODO: Remove Flame Graph check as part of addressing #66803
diff --git a/packages/grafana-data/src/index.ts b/packages/grafana-data/src/index.ts
index c530b03a6aa..d1d302275d1 100644
--- a/packages/grafana-data/src/index.ts
+++ b/packages/grafana-data/src/index.ts
@@ -451,8 +451,11 @@ export { getLinksSupplier } from './field/fieldOverrides';
 // Types
 export { isUnsignedPluginSignature } from './types/pluginSignature';
 export type {
+  AzureSettings,
+  AzureCloudInfo,
   CurrentUserDTO,
   AnalyticsSettings,
+  AppPluginConfig,
   BootData,
   OAuth,
   OAuthSettings,
@@ -460,6 +463,8 @@ export type {
   GrafanaConfig,
   BuildInfo,
   LicenseInfo,
+  PreinstalledPlugin,
+  UnifiedAlertingConfig,
 } from './types/config';
 export { availableIconsIndex, type IconName, isIconName, toIconName } from './types/icon';
 export type { WithAccessControlMetadata } from './types/accesscontrol';
diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts b/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts
index f55bc1fce61..a8259b226d9 100644
--- a/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts
+++ b/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts
@@ -1,19 +1,18 @@
 import { toDataFrame } from '../../dataframe/processDataFrame';
+import { BootData } from '../../types/config';
 import { DataFrame, FieldType } from '../../types/dataFrame';
 import { getFieldMatcher } from '../matchers';
 
 import { FieldMatcherID } from './ids';
 import { ByNamesMatcherMode } from './nameMatcher';
 
-// mock the default window.grafanaBootData settings
-// eslint-disable-next-line
-(window as any).grafanaBootData = {
+window.grafanaBootData = {
   settings: {
     featureToggles: {
       dataplaneFrontendFallback: true,
     },
   },
-};
+} as BootData;
 
 describe('Field Name by Regexp Matcher', () => {
   it('Match all with wildcard regex', () => {
diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
index 52d44a36b19..5a344ed4abd 100644
--- a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
+++ b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
@@ -109,8 +109,7 @@ export function fieldNameFallback(fields: Set<string>) {
 
   // grafana-data does not have access to runtime so we are accessing the window object
   // to get access to the feature toggle
-  // eslint-disable-next-line
-  const useMatcherFallback = (window as any)?.grafanaBootData?.settings?.featureToggles?.dataplaneFrontendFallback;
+  const useMatcherFallback = window.grafanaBootData?.settings?.featureToggles?.dataplaneFrontendFallback;
   if (useMatcherFallback) {
     if (fields.has(TIME_SERIES_VALUE_FIELD_NAME)) {
       fallback = (field: Field, frame: DataFrame) => {
diff --git a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
index 2a9ae7eb03b..39614c52042 100644
--- a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
@@ -28,8 +28,7 @@ const DEFAULT_EMPTY_VALUE = SpecialValue.Empty;
 
 // grafana-data does not have access to runtime so we are accessing the window object
 // to get access to the feature toggle
-// eslint-disable-next-line
-const supportDataplaneFallback = (window as any)?.grafanaBootData?.settings?.featureToggles?.dataplaneFrontendFallback;
+const supportDataplaneFallback = window.grafanaBootData?.settings?.featureToggles?.dataplaneFrontendFallback;
 
 export const groupingToMatrixTransformer: DataTransformerInfo<GroupingToMatrixTransformerOptions> = {
   id: DataTransformerID.groupingToMatrix,
diff --git a/packages/grafana-data/src/transformations/transformers/utils.ts b/packages/grafana-data/src/transformations/transformers/utils.ts
index 29ac89b29ee..9aa4d96a9e8 100644
--- a/packages/grafana-data/src/transformations/transformers/utils.ts
+++ b/packages/grafana-data/src/transformations/transformers/utils.ts
@@ -1,12 +1,6 @@
-import { BootData } from '../../types/config';
 import { DataFrame } from '../../types/dataFrame';
 import { SpecialValue } from '../../types/transformations';
 
-declare global {
-  interface Window {
-    grafanaBootData?: BootData;
-  }
-}
 /**
  * Retrieve the maximum number of fields in a series of a dataframe.
  */
diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts
index 4c9e91e5c95..2ef0d54b2de 100644
--- a/packages/grafana-data/src/types/config.ts
+++ b/packages/grafana-data/src/types/config.ts
@@ -1,6 +1,5 @@
 import { SystemDateFormatSettings } from '../datetime/formats';
 import { MapLayerOptions } from '../geo/layer';
-import { GrafanaTheme2 } from '../themes/types';
 
 import { DataSourceInstanceSettings } from './datasource';
 import { FeatureToggles } from './featureToggles.gen';
@@ -8,9 +7,41 @@ import { IconName } from './icon';
 import { NavLinkDTO } from './navModel';
 import { OrgRole } from './orgs';
 import { PanelPluginMeta } from './panel';
-import { GrafanaTheme } from './theme';
+import { AngularMeta, PluginDependencies, PluginExtensions, PluginLoadingStrategy } from './plugin';
 import { TimeOption } from './time';
 
+export interface AzureSettings {
+  cloud?: string;
+  clouds?: AzureCloudInfo[];
+  managedIdentityEnabled: boolean;
+  workloadIdentityEnabled: boolean;
+  userIdentityEnabled: boolean;
+  userIdentityFallbackCredentialsEnabled: boolean;
+  azureEntraPasswordCredentialsEnabled: boolean;
+}
+
+export interface AzureCloudInfo {
+  name: string;
+  displayName: string;
+}
+
+export type AppPluginConfig = {
+  id: string;
+  path: string;
+  version: string;
+  preload: boolean;
+  angular: AngularMeta;
+  loadingStrategy: PluginLoadingStrategy;
+  dependencies: PluginDependencies;
+  extensions: PluginExtensions;
+  moduleHash?: string;
+};
+
+export type PreinstalledPlugin = {
+  id: string;
+  version: string;
+};
+
 /**
  * Describes the build information that will be available via the Grafana configuration.
  *
@@ -21,7 +52,9 @@ export interface BuildInfo {
   version: string;
   // Version to show in the UI instead of version
   versionString: string;
+  buildstamp: number;
   commit: string;
+  commitShort: string;
   env: string;
   edition: GrafanaEdition;
   latestVersion: string;
@@ -108,8 +141,9 @@ export interface AnalyticsSettings {
   intercomIdentifier?: string;
 }
 
-/** Current user info included in bootData
- *
+/**
+ * Current user info included in bootData.
+ * Corresponds to `window.grafanaBootData.user`
  * @internal
  */
 export interface CurrentUserDTO {
@@ -139,8 +173,9 @@ export interface CurrentUserDTO {
   lightTheme: boolean;
 }
 
-/** Contains essential user and config info
- *
+/**
+ * Contains essential user and config info.
+ * Corresponds to `window.grafanaBootData`.
  * @internal
  */
 export interface BootData {
@@ -155,21 +190,26 @@ export interface BootData {
 
 /**
  * Describes all the different Grafana configuration values available for an instance.
- *
+ * Corresponds to `window.grafanaBootData.settings`.
+ * If you want to access these values, use the `config` object from `@grafana/runtime`.
  * @internal
  */
 export interface GrafanaConfig {
-  publicDashboardAccessToken?: string;
+  publicDashboardAccessToken: string;
   publicDashboardsEnabled: boolean;
   snapshotEnabled: boolean;
   datasources: { [str: string]: DataSourceInstanceSettings };
   panels: { [key: string]: PanelPluginMeta };
+  apps: Record<string, AppPluginConfig>;
   auth: AuthSettings;
   minRefreshInterval: string;
+  appUrl: string;
   appSubUrl: string;
+  azure: AzureSettings;
+  jwtHeaderName: string;
+  jwtUrlLogin: boolean;
   windowTitlePrefix: string;
   buildInfo: BuildInfo;
-  bootData: BootData;
   externalUserMngLinkUrl: string;
   externalUserMngLinkName: string;
   externalUserMngInfo: string;
@@ -178,6 +218,8 @@ export interface GrafanaConfig {
   allowOrgCreate: boolean;
   disableLoginForm: boolean;
   defaultDatasource: string;
+  defaultDatasourceManageAlertsUIToggle: boolean;
+  defaultAllowRecordingRulesTargetAlertsUIToggle: boolean;
   authProxyEnabled: boolean;
   exploreEnabled: boolean;
   queryHistoryEnabled: boolean;
@@ -188,6 +230,9 @@ export interface GrafanaConfig {
   sigV4AuthEnabled: boolean;
   azureAuthEnabled: boolean;
   samlEnabled: boolean;
+  samlName: string;
+  awsAllowedAuthProviders: string[];
+  awsAssumeRoleProvided: boolean;
   autoAssignOrg: boolean;
   verifyEmailEnabled: boolean;
   oauth: OAuthSettings;
@@ -201,57 +246,77 @@ export interface GrafanaConfig {
   disableSanitizeHtml: boolean;
   trustedTypesDefaultPolicyEnabled: boolean;
   cspReportOnlyEnabled: boolean;
+  expressionsEnabled: boolean;
   liveEnabled: boolean;
   liveMessageSizeLimit: number;
-  /** @deprecated Use `theme2` instead. */
-  theme: GrafanaTheme;
-  theme2: GrafanaTheme2;
   anonymousEnabled: boolean;
-  anonymousDeviceLimit: number | undefined;
+  anonymousDeviceLimit: number;
   featureToggles: FeatureToggles;
   licenseInfo: LicenseInfo;
   http2Enabled: boolean;
   dateFormats?: SystemDateFormatSettings;
   grafanaJavascriptAgent: GrafanaJavascriptAgentConfig;
-  geomapDefaultBaseLayer?: MapLayerOptions;
-  geomapDisableCustomBaseLayer?: boolean;
+  geomapDefaultBaseLayerConfig?: MapLayerOptions;
+  geomapDisableCustomBaseLayer: boolean;
   unifiedAlertingEnabled: boolean;
   unifiedAlerting: UnifiedAlertingConfig;
   feedbackLinksEnabled: boolean;
   supportBundlesEnabled: boolean;
   secureSocksDSProxyEnabled: boolean;
-  googleAnalyticsId: string | undefined;
-  googleAnalytics4Id: string | undefined;
+  enableFrontendSandboxForPlugins: string[];
+  googleAnalyticsId: string;
+  googleAnalytics4Id: string;
   googleAnalytics4SendManualPageViews: boolean;
-  rudderstackWriteKey: string | undefined;
-  rudderstackDataPlaneUrl: string | undefined;
-  rudderstackSdkUrl: string | undefined;
-  rudderstackConfigUrl: string | undefined;
-  rudderstackIntegrationsUrl: string | undefined;
+  rudderstackWriteKey: string;
+  rudderstackDataPlaneUrl: string;
+  rudderstackSdkUrl: string;
+  rudderstackConfigUrl: string;
+  rudderstackIntegrationsUrl: string;
+  applicationInsightsConnectionString: string;
+  applicationInsightsEndpointUrl: string;
   analyticsConsoleReporting: boolean;
+  rendererAvailable: boolean;
+  rendererVersion: string;
+  rendererDefaultImageWidth: number;
+  rendererDefaultImageHeight: number;
+  rendererDefaultImageScale: number;
   dashboardPerformanceMetrics: string[];
   panelSeriesLimit: number;
   sqlConnectionLimits: SqlConnectionLimits;
-  sharedWithMeFolderUID?: string;
-  rootFolderUID?: string;
-  localFileSystemAvailable?: boolean;
-  cloudMigrationIsTarget?: boolean;
-  listDashboardScopesEndpoint?: string;
-  listScopesEndpoint?: string;
-  reportingStaticContext?: Record<string, string>;
-  exploreDefaultTimeOffset?: string;
-  exploreHideLogsDownload?: boolean;
+  sharedWithMeFolderUID: string;
+  rootFolderUID: string;
+  localFileSystemAvailable: boolean;
+  cloudMigrationIsTarget: boolean;
+  cloudMigrationPollIntervalMs: number;
+  pluginCatalogURL: string;
+  pluginAdminEnabled: boolean;
+  pluginAdminExternalManageEnabled: boolean;
+  pluginCatalogHiddenPlugins: string[];
+  pluginCatalogManagedPlugins: string[];
+  pluginCatalogPreinstalledPlugins: PreinstalledPlugin[];
+  pluginsCDNBaseURL: string;
+  tokenExpirationDayLimit: number;
+  listDashboardScopesEndpoint: string;
+  listScopesEndpoint: string;
+  reportingStaticContext: Record<string, string>;
+  exploreDefaultTimeOffset: string;
+  exploreHideLogsDownload: boolean;
   quickRanges?: TimeOption[];
 
   // The namespace to use for kubernetes apiserver requests
   namespace: string;
-
-  /**
-   * Language used in Grafana's UI. This is after the user's preference (or deteceted locale) is resolved to one of
-   * Grafana's supported language.
-   */
-  language: string | undefined;
-  regionalFormat: string;
+  caching: {
+    enabled: boolean;
+  };
+  recordedQueries: {
+    enabled: boolean;
+  };
+  reporting: {
+    enabled: boolean;
+  };
+  analytics: {
+    enabled: boolean;
+  };
 }
 
 export interface SqlConnectionLimits {
diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts
index d39d1526b5a..ba898a0860e 100644
--- a/packages/grafana-runtime/src/config.ts
+++ b/packages/grafana-runtime/src/config.ts
@@ -1,18 +1,20 @@
 import { merge } from 'lodash';
 
 import {
+  AppPluginConfig as AppPluginConfigGrafanaData,
   AuthSettings,
+  AzureSettings as AzureSettingsGrafanaData,
   BootData,
   BuildInfo,
   DataSourceInstanceSettings,
   FeatureToggles,
-  GrafanaConfig,
   GrafanaTheme,
   GrafanaTheme2,
   LicenseInfo,
   MapLayerOptions,
   OAuthSettings,
   PanelPluginMeta,
+  PreinstalledPlugin as PreinstalledPluginGrafanaData,
   systemDateFormats,
   SystemDateFormatSettings,
   getThemeById,
@@ -21,8 +23,15 @@ import {
   PluginDependencies,
   PluginExtensions,
   TimeOption,
+  UnifiedAlertingConfig,
+  GrafanaConfig,
+  CurrentUserDTO,
 } from '@grafana/data';
 
+/**
+ * @deprecated Use the type from `@grafana/data`
+ */
+// TODO remove in G13
 export interface AzureSettings {
   cloud?: string;
   clouds?: AzureCloudInfo[];
@@ -33,11 +42,19 @@ export interface AzureSettings {
   azureEntraPasswordCredentialsEnabled: boolean;
 }
 
+/**
+ * @deprecated Use the type from `@grafana/data`
+ */
+// TODO remove in G13
 export interface AzureCloudInfo {
   name: string;
   displayName: string;
 }
 
+/**
+ * @deprecated Use the type from `@grafana/data`
+ */
+// TODO remove in G13
 export type AppPluginConfig = {
   id: string;
   path: string;
@@ -50,25 +67,37 @@ export type AppPluginConfig = {
   moduleHash?: string;
 };
 
+/**
+ * @deprecated Use the type from `@grafana/data`
+ */
+// TODO remove in G13
 export type PreinstalledPlugin = {
   id: string;
   version: string;
 };
 
-export class GrafanaBootConfig implements GrafanaConfig {
+/**
+ * Use to access Grafana config settings in application code.
+ * This takes `window.grafanaBootData.settings` as input and returns a config object.
+ */
+export class GrafanaBootConfig {
   publicDashboardAccessToken?: string;
   publicDashboardsEnabled = true;
   snapshotEnabled = true;
   datasources: { [str: string]: DataSourceInstanceSettings } = {};
   panels: { [key: string]: PanelPluginMeta } = {};
-  apps: Record<string, AppPluginConfig> = {};
+  apps: Record<string, AppPluginConfigGrafanaData> = {};
   auth: AuthSettings = {};
   minRefreshInterval = '';
   appUrl = '';
   appSubUrl = '';
   namespace = 'default';
-  windowTitlePrefix = '';
-  buildInfo: BuildInfo;
+  windowTitlePrefix = 'Grafana - ';
+  buildInfo: BuildInfo = {
+    version: '1.0',
+    commit: '1',
+    env: 'production',
+  } as BuildInfo;
   bootData: BootData;
   externalUserMngLinkUrl = '';
   externalUserMngLinkName = '';
@@ -100,7 +129,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
   disableUserSignUp = false;
   loginHint = '';
   passwordHint = '';
-  loginError: string | undefined = undefined;
+  loginError?: string;
   viewersCanEdit = false;
   disableSanitizeHtml = false;
   trustedTypesDefaultPolicyEnabled = false;
@@ -112,7 +141,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
   theme2: GrafanaTheme2;
   featureToggles: FeatureToggles = {};
   anonymousEnabled = false;
-  anonymousDeviceLimit: number | undefined = undefined;
+  anonymousDeviceLimit?: number;
   licenseInfo: LicenseInfo = {} as LicenseInfo;
   rendererAvailable = false;
   rendererVersion = '';
@@ -137,12 +166,12 @@ export class GrafanaBootConfig implements GrafanaConfig {
   pluginAdminExternalManageEnabled = false;
   pluginCatalogHiddenPlugins: string[] = [];
   pluginCatalogManagedPlugins: string[] = [];
-  pluginCatalogPreinstalledPlugins: PreinstalledPlugin[] = [];
+  pluginCatalogPreinstalledPlugins: PreinstalledPluginGrafanaData[] = [];
   pluginsCDNBaseURL = '';
   expressionsEnabled = false;
   awsAllowedAuthProviders: string[] = [];
   awsAssumeRoleEnabled = false;
-  azure: AzureSettings = {
+  azure: AzureSettingsGrafanaData = {
     managedIdentityEnabled: false,
     workloadIdentityEnabled: false,
     userIdentityEnabled: false,
@@ -155,7 +184,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
   geomapDefaultBaseLayerConfig?: MapLayerOptions;
   geomapDisableCustomBaseLayer?: boolean;
   unifiedAlertingEnabled = false;
-  unifiedAlerting = {
+  unifiedAlerting: UnifiedAlertingConfig = {
     minInterval: '',
     alertStateHistoryBackend: undefined,
     alertStateHistoryPrimary: undefined,
@@ -176,14 +205,14 @@ export class GrafanaBootConfig implements GrafanaConfig {
   analytics = {
     enabled: true,
   };
-  googleAnalyticsId: undefined;
-  googleAnalytics4Id: undefined;
+  googleAnalyticsId?: string;
+  googleAnalytics4Id?: string;
   googleAnalytics4SendManualPageViews = false;
-  rudderstackWriteKey: undefined;
-  rudderstackDataPlaneUrl: undefined;
-  rudderstackSdkUrl: undefined;
-  rudderstackConfigUrl: undefined;
-  rudderstackIntegrationsUrl: undefined;
+  rudderstackWriteKey?: string;
+  rudderstackDataPlaneUrl?: string;
+  rudderstackSdkUrl?: string;
+  rudderstackConfigUrl?: string;
+  rudderstackIntegrationsUrl?: string;
   analyticsConsoleReporting = false;
   dashboardPerformanceMetrics: string[] = [];
   panelSeriesLimit = 0;
@@ -194,17 +223,16 @@ export class GrafanaBootConfig implements GrafanaConfig {
   };
   defaultDatasourceManageAlertsUiToggle = true;
   defaultAllowRecordingRulesTargetAlertsUiToggle = true;
-
-  tokenExpirationDayLimit: undefined;
+  tokenExpirationDayLimit?: number;
   enableFrontendSandboxForPlugins: string[] = [];
-  sharedWithMeFolderUID: string | undefined;
-  rootFolderUID: string | undefined;
-  localFileSystemAvailable: boolean | undefined;
-  cloudMigrationIsTarget: boolean | undefined;
+  sharedWithMeFolderUID?: string;
+  rootFolderUID?: string;
+  localFileSystemAvailable?: boolean;
+  cloudMigrationIsTarget?: boolean;
   cloudMigrationPollIntervalMs = 2000;
   reportingStaticContext?: Record<string, string>;
   exploreDefaultTimeOffset = '1h';
-  exploreHideLogsDownload: boolean | undefined;
+  exploreHideLogsDownload?: boolean;
   quickRanges?: TimeOption[];
 
   /**
@@ -218,30 +246,17 @@ export class GrafanaBootConfig implements GrafanaConfig {
    * This is the regionalFormat that is used for date formatting and other locale-specific features.
    */
   regionalFormat: string;
+  listDashboardScopesEndpoint = '';
+  listScopesEndpoint = '';
 
-  constructor(options: GrafanaBootConfig) {
+  constructor(
+    options: BootData['settings'] & {
+      bootData: BootData;
+    }
+  ) {
     this.bootData = options.bootData;
 
-    const defaults = {
-      datasources: {},
-      windowTitlePrefix: 'Grafana - ',
-      panels: {},
-      playlist_timespan: '1m',
-      unsaved_changes_warning: true,
-      appUrl: '',
-      appSubUrl: '',
-      buildInfo: {
-        version: '1.0',
-        commit: '1',
-        env: 'production',
-      },
-      viewersCanEdit: false,
-      disableSanitizeHtml: false,
-    };
-
-    merge(this, defaults, options);
-
-    this.buildInfo = options.buildInfo || defaults.buildInfo;
+    merge(this, options);
 
     if (this.dateFormats) {
       systemDateFormats.update(this.dateFormats);
@@ -256,9 +271,6 @@ export class GrafanaBootConfig implements GrafanaConfig {
     this.theme = this.theme2.v1;
     this.regionalFormat = options.bootData.user.regionalFormat;
   }
-  geomapDefaultBaseLayer?: MapLayerOptions<any> | undefined;
-  listDashboardScopesEndpoint?: string | undefined;
-  listScopesEndpoint?: string | undefined;
 }
 
 // localstorage key: grafana.featureToggles
@@ -309,7 +321,7 @@ function overrideFeatureTogglesFromUrl(config: GrafanaBootConfig) {
   });
 }
 
-let bootData = (window as any).grafanaBootData;
+let bootData = window.grafanaBootData;
 
 if (!bootData) {
   if (process.env.NODE_ENV !== 'test') {
@@ -317,18 +329,25 @@ if (!bootData) {
   }
 
   bootData = {
-    settings: {},
-    user: {},
+    assets: {
+      dark: '',
+      light: '',
+    },
+    settings: {} as GrafanaConfig,
+    user: {} as CurrentUserDTO,
     navTree: [],
   };
 }
 
-const options = bootData.settings;
-options.bootData = bootData;
-
 /**
  * Use this to access the {@link GrafanaBootConfig} for the current running Grafana instance.
  *
  * @public
  */
-export const config = new GrafanaBootConfig(options);
+export const config = new GrafanaBootConfig({
+  ...bootData.settings,
+  // need to separately include bootData here
+  // this allows people to access the user object on config.bootData.user and maintains backwards compatibility
+  // TODO expose a user object (similar to `GrafanaBootConfig`) and deprecate this recursive bootData
+  bootData,
+});
diff --git a/packages/grafana-ui/src/components/DateTimePickers/WeekStartPicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/WeekStartPicker.tsx
index 99ebf2d3b3a..0207dcb67a8 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/WeekStartPicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/WeekStartPicker.tsx
@@ -1,6 +1,5 @@
 import { useCallback, useMemo } from 'react';
 
-import { BootData } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
 
@@ -23,12 +22,6 @@ export function isWeekStart(value: string): value is WeekStart {
   return ['saturday', 'sunday', 'monday'].includes(value);
 }
 
-declare global {
-  interface Window {
-    grafanaBootData?: BootData;
-  }
-}
-
 /**
  * Returns the system or user defined week start (as defined in bootData)
  * Or you can pass in an override weekStart string and have it be validated and returned as WeekStart type if valid
diff --git a/packages/grafana-ui/src/slate-plugins/suggestions.tsx b/packages/grafana-ui/src/slate-plugins/suggestions.tsx
index 1d22c988822..de89e5c9263 100644
--- a/packages/grafana-ui/src/slate-plugins/suggestions.tsx
+++ b/packages/grafana-ui/src/slate-plugins/suggestions.tsx
@@ -1,8 +1,6 @@
 import { debounce, sortBy } from 'lodash';
 import { Editor, Plugin as SlatePlugin } from 'slate-react';
 
-import { BootData } from '@grafana/data';
-
 import { Typeahead } from '../components/Typeahead/Typeahead';
 import { CompletionItem, SuggestionsState, TypeaheadInput, TypeaheadOutput } from '../types/completion';
 import { SearchFunctionType, SearchFunctionMap } from '../utils/searchFunctions';
@@ -12,12 +10,6 @@ import TOKEN_MARK from './slate-prism/TOKEN_MARK';
 
 export const TYPEAHEAD_DEBOUNCE = 250;
 
-declare global {
-  interface Window {
-    grafanaBootData?: BootData;
-  }
-}
-
 // Commands added to the editor by this plugin.
 interface SuggestionsPluginCommands {
   selectSuggestion: (suggestion: CompletionItem) => Editor;
diff --git a/public/app/app.ts b/public/app/app.ts
index 5c48558c30c..1de53e89c3d 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -216,7 +216,7 @@ export class GrafanaApp {
 
       // Login redirect requires locationUtil to be initialized
       locationUtil.initialize({
-        config,
+        config: window.grafanaBootData.settings,
         getTimeRangeForUrl: getTimeSrv().timeRangeForUrl,
         getVariablesUrlParams: getVariablesUrlParams,
       });
diff --git a/public/app/core/components/NestedFolderPicker/useFoldersQuery.test.tsx b/public/app/core/components/NestedFolderPicker/useFoldersQuery.test.tsx
index cf0f0f67af1..23460388f4e 100644
--- a/public/app/core/components/NestedFolderPicker/useFoldersQuery.test.tsx
+++ b/public/app/core/components/NestedFolderPicker/useFoldersQuery.test.tsx
@@ -1,7 +1,6 @@
 import { ReactNode } from 'react';
 import { act, getWrapper, renderHook, waitFor } from 'test/test-utils';
 
-import { GrafanaConfig } from '@grafana/data';
 import * as runtime from '@grafana/runtime';
 import { setupMockServer } from '@grafana/test-utils/server';
 import { getFolderFixtures } from '@grafana/test-utils/unstable';
@@ -23,7 +22,7 @@ const wrapper = ({ children }: { children: ReactNode }) => {
 };
 
 describe('useFoldersQuery', () => {
-  let configBackup: GrafanaConfig;
+  let configBackup: runtime.GrafanaBootConfig;
 
   beforeAll(() => {
     configBackup = { ...runtime.config };
diff --git a/public/app/core/config.ts b/public/app/core/config.ts
index ac3c63f01c6..6c757c9436a 100644
--- a/public/app/core/config.ts
+++ b/public/app/core/config.ts
@@ -1,6 +1,6 @@
 import { PluginState } from '@grafana/data';
 import { config, GrafanaBootConfig } from '@grafana/runtime';
-export { config, GrafanaBootConfig as Settings };
+export { config, type GrafanaBootConfig as Settings };
 
 let grafanaConfig: GrafanaBootConfig = config;
 
diff --git a/public/app/core/context/GrafanaContext.ts b/public/app/core/context/GrafanaContext.ts
index 1f3bf86372b..edda20034cc 100644
--- a/public/app/core/context/GrafanaContext.ts
+++ b/public/app/core/context/GrafanaContext.ts
@@ -1,7 +1,6 @@
 import { createContext, useCallback, useContext } from 'react';
 
-import { GrafanaConfig } from '@grafana/data';
-import { LocationService, locationService, BackendSrv } from '@grafana/runtime';
+import { LocationService, locationService, BackendSrv, GrafanaBootConfig } from '@grafana/runtime';
 
 import { AppChromeService } from '../components/AppChrome/AppChromeService';
 import { NewFrontendAssetsChecker } from '../services/NewFrontendAssetsChecker';
@@ -10,7 +9,7 @@ import { KeybindingSrv } from '../services/keybindingSrv';
 export interface GrafanaContextType {
   backend: BackendSrv;
   location: LocationService;
-  config: GrafanaConfig;
+  config: GrafanaBootConfig;
   chrome: AppChromeService;
   keybindings: KeybindingSrv;
   newAssetsChecker: NewFrontendAssetsChecker;
diff --git a/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts b/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts
index 6e6188454d8..13d18fb8977 100644
--- a/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts
+++ b/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts
@@ -55,8 +55,10 @@ describe('GrafanaJavascriptAgentEchoBackend', () => {
   });
 
   const buildInfo: BuildInfo = {
+    buildstamp: 12345,
     version: '1.0',
     commit: 'abcd123',
+    commitShort: 'abc',
     env: 'production',
     versionString: 'Grafana v1.0 (abcd123)',
     edition: GrafanaEdition.OpenSource,
diff --git a/public/app/core/utils/explore.test.ts b/public/app/core/utils/explore.test.ts
index d8d2b5343e9..4701cf7e019 100644
--- a/public/app/core/utils/explore.test.ts
+++ b/public/app/core/utils/explore.test.ts
@@ -7,7 +7,6 @@ import {
   LogsSortOrder,
   serializeStateToUrlParam,
 } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 import { RefreshPicker } from '@grafana/ui';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
@@ -174,7 +173,7 @@ describe('getExploreUrl', () => {
     afterAll(() => {
       // Reset locationUtil
       locationUtil.initialize({
-        config,
+        config: window.grafanaBootData.settings,
         getTimeRangeForUrl: getTimeSrv().timeRangeForUrl,
         getVariablesUrlParams: getVariablesUrlParams,
       });
diff --git a/public/app/features/alerting/unified/rule-editor/formDefaults.test.ts b/public/app/features/alerting/unified/rule-editor/formDefaults.test.ts
index 88b3fbed717..8cdff983960 100644
--- a/public/app/features/alerting/unified/rule-editor/formDefaults.test.ts
+++ b/public/app/features/alerting/unified/rule-editor/formDefaults.test.ts
@@ -1,4 +1,3 @@
-import { GrafanaConfig } from '@grafana/data';
 import { config, getDataSourceSrv } from '@grafana/runtime';
 
 import { mockAlertQuery, mockDataSource, mockReduceExpression, mockThresholdExpression } from '../mocks';
@@ -201,8 +200,7 @@ describe('getDefaultManualRouting', () => {
 });
 
 describe('getDefaultFormValues', () => {
-  // This is for Typescript. GrafanaBootConfig returns narrower types than GrafanaConfig
-  const grafanaConfig: GrafanaConfig = config;
+  const grafanaConfig = config;
   const uaConfig = grafanaConfig.unifiedAlerting;
 
   const mockGetInstanceSettings = jest.fn();
diff --git a/public/app/types/window.d.ts b/public/app/types/window.d.ts
index c1614d622cd..3e31de78bd0 100644
--- a/public/app/types/window.d.ts
+++ b/public/app/types/window.d.ts
@@ -4,6 +4,7 @@ export declare global {
     __grafana_app_bundle_loaded: boolean;
     __grafana_public_path__: string;
     __grafana_load_failed: () => void;
+    grafanaBootData: import('@grafana/data').BootData;
 
     /**
      * (Potential) wait for API call to fetch boot data and place it on `window.grafanaBootData`.
diff --git a/public/test/mocks/getGrafanaContextMock.ts b/public/test/mocks/getGrafanaContextMock.ts
index fd6aaec843e..64e704986b7 100644
--- a/public/test/mocks/getGrafanaContextMock.ts
+++ b/public/test/mocks/getGrafanaContextMock.ts
@@ -1,5 +1,4 @@
-import { GrafanaConfig } from '@grafana/data';
-import { LocationService } from '@grafana/runtime';
+import { GrafanaBootConfig, LocationService } from '@grafana/runtime';
 import { AppChromeService } from 'app/core/components/AppChrome/AppChromeService';
 import { GrafanaContextType } from 'app/core/context/GrafanaContext';
 import { NewFrontendAssetsChecker } from 'app/core/services/NewFrontendAssetsChecker';
@@ -14,7 +13,7 @@ export function getGrafanaContextMock(overrides: Partial<GrafanaContextType> = {
     // eslint-disable-next-line
     location: {} as LocationService,
     // eslint-disable-next-line
-    config: { featureToggles: {} } as GrafanaConfig,
+    config: { featureToggles: {} } as GrafanaBootConfig,
     // eslint-disable-next-line
     keybindings: {
       clearAndInitGlobalBindings: jest.fn(),

From 8fd8c6f47624531cacff248110b93d5079b8fd91 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 14 Aug 2025 16:01:29 +0300
Subject: [PATCH 176/243] SecureValues: Add explicit JSON schema (#109648)

---
 .../apis/common/v0alpha1/secure_values.go     |  52 +++++++-
 .../common/v0alpha1/secure_values_test.go     | 126 ++++++++++++++----
 .../common/v0alpha1/zz_generated.openapi.go   |  39 +-----
 pkg/apimachinery/utils/meta_test.go           |  70 +++++++++-
 4 files changed, 221 insertions(+), 66 deletions(-)

diff --git a/pkg/apimachinery/apis/common/v0alpha1/secure_values.go b/pkg/apimachinery/apis/common/v0alpha1/secure_values.go
index 3413753cee4..fd10d9c32a7 100644
--- a/pkg/apimachinery/apis/common/v0alpha1/secure_values.go
+++ b/pkg/apimachinery/apis/common/v0alpha1/secure_values.go
@@ -6,6 +6,9 @@ import (
 	"strconv"
 
 	"gopkg.in/yaml.v3"
+	openapi "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+	ptr "k8s.io/utils/ptr"
 )
 
 const redacted = "[REDACTED]"
@@ -21,7 +24,8 @@ var (
 	_ yaml.Marshaler = (*RawSecureValue)(nil)
 )
 
-// Allow access to a secure value inside
+// Reference a secure value from within an owner resource
+// Only one property is valid at any time: OneOf(name,create,remove)
 // +k8s:openapi-gen=true
 type InlineSecureValue struct {
 	// Create a secure value -- this is only used for POST/PUT
@@ -30,6 +34,8 @@ type InlineSecureValue struct {
 	Create RawSecureValue `json:"create,omitempty"`
 
 	// Name in the secret service (reference)
+	// +k8s:validation:minLength=1
+	// +k8s:validation:maxLength=253
 	Name string `json:"name,omitempty"`
 
 	// Remove this value from the secure value map
@@ -41,6 +47,50 @@ func (v InlineSecureValue) IsZero() bool {
 	return v.Create.IsZero() && v.Name == "" && !v.Remove
 }
 
+// OpenAPIDefinition returns the JSONSchema that manually ensures oneOf(create | name | remove) is set.
+func (InlineSecureValue) OpenAPIDefinition() openapi.OpenAPIDefinition {
+	return openapi.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description:          "Allow access to a secure value inside",
+				AdditionalProperties: &spec.SchemaOrBool{Allows: false},
+				Properties: map[string]spec.Schema{
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Name in the secret service (reference)",
+							Type:        []string{"string"},
+							MinLength:   ptr.To[int64](1),
+							MaxLength:   ptr.To[int64](253),
+							Format:      ""}},
+					"create": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Create a secure value -- this is only used for POST/PUT",
+							MinLength:   ptr.To[int64](1),
+							MaxLength:   ptr.To[int64](24576),
+							Type:        []string{"string"},
+							Format:      ""}},
+					"remove": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Remove this value from the secure value map Values owned by this resource will be deleted if necessary",
+							Type:        []string{"boolean"},
+						}},
+				},
+				OneOf: []spec.Schema{
+					{SchemaProps: spec.SchemaProps{
+						Required: []string{"name"},
+					}},
+					{SchemaProps: spec.SchemaProps{
+						Required: []string{"create"},
+					}},
+					{SchemaProps: spec.SchemaProps{
+						Required: []string{"remove"},
+					}},
+				},
+			},
+		},
+	}
+}
+
 // Collection of secure values
 // +k8s:openapi-gen=true
 type InlineSecureValues = map[string]InlineSecureValue
diff --git a/pkg/apimachinery/apis/common/v0alpha1/secure_values_test.go b/pkg/apimachinery/apis/common/v0alpha1/secure_values_test.go
index 53f180753a9..83dd8ec6762 100644
--- a/pkg/apimachinery/apis/common/v0alpha1/secure_values_test.go
+++ b/pkg/apimachinery/apis/common/v0alpha1/secure_values_test.go
@@ -1,4 +1,4 @@
-package v0alpha1
+package v0alpha1_test
 
 import (
 	"bytes"
@@ -8,40 +8,114 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
+	"k8s.io/kube-openapi/pkg/validation/strfmt"
+	"k8s.io/kube-openapi/pkg/validation/validate"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 )
 
 func TestSecureValues(t *testing.T) {
-	expected := "[REDACTED]"
+	t.Run("redaction", func(t *testing.T) {
+		expected := "[REDACTED]"
 
-	rawValue := "a-password"
-	esv := NewSecretValue(rawValue)
+		rawValue := "a-password"
+		esv := common.NewSecretValue(rawValue)
 
-	// String must not return the exposed secure value.
-	require.Equal(t, expected, esv.String())
+		// String must not return the exposed secure value.
+		require.Equal(t, expected, esv.String())
+		require.Equal(t, expected, esv.GoString())
 
-	// Format/GoString must not return the exposed secure value.
-	require.Equal(t, expected, fmt.Sprintf("%+#v", esv))
-	require.Equal(t, expected, fmt.Sprintf("%v", esv))
-	require.Equal(t, expected, fmt.Sprintf("%s", esv))
+		// Format/GoString must not return the exposed secure value.
+		require.Equal(t, expected, fmt.Sprintf("%+#v", esv))
+		require.Equal(t, expected, fmt.Sprintf("%v", esv))
+		require.Equal(t, expected, fmt.Sprintf("%s", esv))
 
-	buf := new(bytes.Buffer)
-	_, err := fmt.Fprintf(buf, "%#v", esv)
-	require.NoError(t, err)
-	require.Equal(t, expected, buf.String())
+		buf := new(bytes.Buffer)
+		_, err := fmt.Fprintf(buf, "%#v", esv)
+		require.NoError(t, err)
+		require.Equal(t, expected, buf.String())
 
-	// MarshalJSON must not return the exposed secure value.
-	bytes, err := json.Marshal(esv)
-	require.NoError(t, err)
-	require.Equal(t, `"`+expected+`"`, string(bytes))
+		// MarshalJSON must not return the exposed secure value.
+		bytes, err := json.Marshal(esv)
+		require.NoError(t, err)
+		require.Equal(t, `"`+expected+`"`, string(bytes))
 
-	// MarshalYAML must not return the exposed secure value.
-	bytes, err = yaml.Marshal(esv)
-	require.NoError(t, err)
-	require.Equal(t, "'"+expected+"'\n", string(bytes))
+		// MarshalYAML must not return the exposed secure value.
+		bytes, err = yaml.Marshal(esv)
+		require.NoError(t, err)
+		require.Equal(t, "'"+expected+"'\n", string(bytes))
 
-	// DangerouslyExposeAndConsumeValue returns the raw value.
-	require.Equal(t, rawValue, esv.DangerouslyExposeAndConsumeValue())
+		// DangerouslyExposeAndConsumeValue returns the raw value.
+		require.Equal(t, rawValue, esv.DangerouslyExposeAndConsumeValue())
 
-	// Further calls to DangerouslyExposeAndConsumeValue will panic.
-	require.Panics(t, func() { esv.DangerouslyExposeAndConsumeValue() })
+		// Further calls to DangerouslyExposeAndConsumeValue will panic.
+		require.Panics(t, func() { esv.DangerouslyExposeAndConsumeValue() })
+	})
+
+	t.Run("Inline", func(t *testing.T) {
+		t.Run("IsZero", func(t *testing.T) {
+			require.True(t, common.InlineSecureValue{}.IsZero())
+			require.True(t, common.NewSecretValue("").IsZero())
+			require.True(t, common.InlineSecureValue{Remove: false}.IsZero())
+
+			require.False(t, common.NewSecretValue("X").IsZero())
+			require.False(t, common.InlineSecureValue{Name: "X"}.IsZero())
+			require.False(t, common.InlineSecureValue{Remove: true}.IsZero())
+		})
+
+		t.Run("Validate OneOf", func(t *testing.T) {
+			def := common.InlineSecureValue{}.OpenAPIDefinition()
+			// jj, _ := json.MarshalIndent(def.Schema, "", "  ")
+			// fmt.Printf("%s", string(jj))
+			// t.FailNow()
+
+			validator := validate.NewSchemaValidator(&def.Schema, nil, "", strfmt.Default)
+
+			tests := []struct {
+				name  string
+				input map[string]any
+				valid bool
+				err   string
+			}{
+				{
+					name:  "with name",
+					input: map[string]any{"name": "x"},
+					valid: true,
+				},
+				{
+					name:  "with create",
+					input: map[string]any{"create": "x"},
+					valid: true,
+				},
+				{
+					name:  "with remove",
+					input: map[string]any{"remove": true},
+					valid: true,
+				},
+				{
+					name:  "empty",
+					input: map[string]any{},
+					valid: false,
+					err:   "must validate one and only one",
+				},
+				{
+					name:  "with unknown property",
+					input: map[string]any{"unknown": "property"},
+					valid: false,
+					err:   "unknown",
+				},
+			}
+			for _, tt := range tests {
+				t.Run(tt.name, func(t *testing.T) {
+					result := validator.Validate(tt.input)
+					require.Equal(t, tt.valid, result.IsValid())
+					if tt.err == "" {
+						require.NoError(t, result.AsError())
+					} else {
+						require.ErrorContains(t, result.AsError(), tt.err)
+					}
+				})
+			}
+		})
+	})
 }
diff --git a/pkg/apimachinery/apis/common/v0alpha1/zz_generated.openapi.go b/pkg/apimachinery/apis/common/v0alpha1/zz_generated.openapi.go
index 2f92840b5e6..34424e88e3d 100644
--- a/pkg/apimachinery/apis/common/v0alpha1/zz_generated.openapi.go
+++ b/pkg/apimachinery/apis/common/v0alpha1/zz_generated.openapi.go
@@ -11,12 +11,11 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	common "k8s.io/kube-openapi/pkg/common"
 	spec "k8s.io/kube-openapi/pkg/validation/spec"
-	ptr "k8s.io/utils/ptr"
 )
 
 func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
 	return map[string]common.OpenAPIDefinition{
-		"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.InlineSecureValue": schema_apimachinery_apis_common_v0alpha1_InlineSecureValue(ref),
+		"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.InlineSecureValue": InlineSecureValue{}.OpenAPIDefinition(),
 		"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.ObjectReference":   schema_apimachinery_apis_common_v0alpha1_ObjectReference(ref),
 		"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Scope":             schema_apimachinery_apis_common_v0alpha1_Scope(ref),
 		"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.ScopeFilter":       schema_apimachinery_apis_common_v0alpha1_ScopeFilter(ref),
@@ -78,42 +77,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 	}
 }
 
-func schema_apimachinery_apis_common_v0alpha1_InlineSecureValue(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Allow access to a secure value inside",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"create": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Create a secure value -- this is only used for POST/PUT",
-							MinLength:   ptr.To[int64](1),
-							MaxLength:   ptr.To[int64](24576),
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"name": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Name in the secret service (reference)",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"remove": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Remove this value from the secure value map Values owned by this resource will be deleted if necessary",
-							Type:        []string{"boolean"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
 func schema_apimachinery_apis_common_v0alpha1_ObjectReference(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
diff --git a/pkg/apimachinery/utils/meta_test.go b/pkg/apimachinery/utils/meta_test.go
index 54db0fbe976..1e79f267430 100644
--- a/pkg/apimachinery/utils/meta_test.go
+++ b/pkg/apimachinery/utils/meta_test.go
@@ -157,7 +157,10 @@ func TestMetaAccessor(t *testing.T) {
 	}
 
 	t.Run("fails for non resource objects", func(t *testing.T) {
-		_, err := utils.MetaAccessor("hello")
+		_, err := utils.MetaAccessor(nil)
+		require.Error(t, err)
+
+		_, err = utils.MetaAccessor("hello")
 		require.Error(t, err)
 
 		_, err = utils.MetaAccessor(unstructured.Unstructured{})
@@ -174,6 +177,45 @@ func TestMetaAccessor(t *testing.T) {
 		require.NoError(t, err) // Must be a pointer
 	})
 
+	t.Run("get and set properties", func(t *testing.T) {
+		obj, err := utils.MetaAccessor(&unstructured.Unstructured{
+			Object: map[string]any{},
+		})
+		require.NoError(t, err)
+		rv := obj.GetResourceVersion()
+		require.Equal(t, "", rv)
+
+		_, ok := obj.GetRuntimeObject()
+		require.True(t, ok)
+		anno := obj.GetAnnotations()
+		require.Nil(t, anno)
+
+		rvInt, err := obj.GetResourceVersionInt64()
+		require.NoError(t, err)
+		require.Equal(t, int64(0), rvInt)
+
+		obj.SetResourceVersion("not a number")
+		rv = obj.GetResourceVersion()
+		require.Equal(t, "not a number", rv)
+		rvInt, err = obj.GetResourceVersionInt64()
+		require.Error(t, err)
+		require.Equal(t, int64(0), rvInt)
+
+		obj.SetUpdatedBy("updatedBy")
+		require.Equal(t, "updatedBy", obj.GetUpdatedBy())
+		anno = obj.GetAnnotations()
+		require.Len(t, anno, 1) // One key
+		obj.SetAnnotation(utils.AnnoKeyUpdatedBy, "")
+		anno = obj.GetAnnotations()
+		require.Empty(t, anno) // removed the key
+
+		obj.SetCreatedBy("createdBy")
+		require.Equal(t, "createdBy", obj.GetCreatedBy())
+
+		obj.SetFolder("folder")
+		require.Equal(t, "folder", obj.GetFolder())
+	})
+
 	t.Run("get and set grafana labels (unstructured)", func(t *testing.T) {
 		res := &unstructured.Unstructured{
 			Object: map[string]any{},
@@ -593,6 +635,32 @@ func TestMetaAccessor(t *testing.T) {
 		}
 	})
 
+	t.Run("manage secure values", func(t *testing.T) {
+		raw := &unstructured.Unstructured{
+			Object: map[string]any{},
+		}
+		obj, _ := utils.MetaAccessor(raw)
+		sv, err := obj.GetSecureValues()
+		require.NoError(t, err)
+		require.Nil(t, sv)
+
+		err = obj.SetSecureValues(common.InlineSecureValues{
+			"A": common.InlineSecureValue{Name: "NameForA"},
+		})
+		require.NoError(t, err)
+		require.NotNil(t, raw.Object["secure"])
+		sv, err = obj.GetSecureValues()
+		require.NoError(t, err)
+		require.Equal(t, "NameForA", sv["A"].Name)
+
+		// Manually set secure to an invalid property:
+		raw.Object["secure"] = t
+		sv, err = obj.GetSecureValues()
+		require.Error(t, err)
+		require.Nil(t, sv)
+		delete(raw.Object, "secure")
+	})
+
 	t.Run("SourceProperties", func(t *testing.T) {
 		tests := []struct {
 			name           string

From 52e6997f9e79a4560dfde973d01e89402940538b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Irene=20Rodr=C3=ADguez?= <irene.rodriguez@grafana.com>
Date: Thu, 14 Aug 2025 16:11:52 +0200
Subject: [PATCH 177/243] fix broken anchor (#109658)

---
 docs/sources/administration/plugin-management/_index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/administration/plugin-management/_index.md b/docs/sources/administration/plugin-management/_index.md
index 050627d6a18..77e9e57f26f 100644
--- a/docs/sources/administration/plugin-management/_index.md
+++ b/docs/sources/administration/plugin-management/_index.md
@@ -79,7 +79,7 @@ To browse for available plugins:
 
 ## Manage your plugins
 
-We strongly recommend running the latest plugin version. Use [Grafana Advisor](../grafana-advisor/#plugins) to check the status of your data sources and plugins.
+We strongly recommend running the latest plugin version. Use [Grafana Advisor](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/grafana-advisor) to check the status of your data sources and plugins.
 
 ### Install a plugin
 

From 86722758247b0637f59f987496110abb0c92276d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Thu, 14 Aug 2025 16:14:21 +0200
Subject: [PATCH 178/243] datasources: querier: report metrics related to the
 whole request (#109384)

* refactor

* add metric
---
 pkg/registry/apis/query/client/instance_provider.go     | 8 ++++++--
 pkg/registry/apis/query/clientapi/clientapi.go          | 5 +++--
 pkg/registry/apis/query/query.go                        | 7 +++++--
 pkg/registry/apis/query/query_test.go                   | 7 +++++--
 pkg/services/mtdsclient/mt_datasource_client_builder.go | 4 ----
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkg/registry/apis/query/client/instance_provider.go b/pkg/registry/apis/query/client/instance_provider.go
index 8716ae5a41c..96769229daf 100644
--- a/pkg/registry/apis/query/client/instance_provider.go
+++ b/pkg/registry/apis/query/client/instance_provider.go
@@ -25,7 +25,7 @@ type singleTenantInstance struct {
 	cfg      *setting.Cfg
 }
 
-func (t *singleTenantInstance) GetDataSourceClient(_ context.Context, _ data.DataSourceRef, _ map[string]string) (clientapi.QueryDataClient, error) {
+func (t *singleTenantInstance) GetDataSourceClient(_ context.Context, _ data.DataSourceRef) (clientapi.QueryDataClient, error) {
 	return t.client, nil
 }
 
@@ -37,7 +37,7 @@ func NewSingleTenantInstanceProvider(cfg *setting.Cfg, features featuremgmt.Feat
 	}
 }
 
-func (s *singleTenantInstanceProvider) GetInstance(_ context.Context) (clientapi.Instance, error) {
+func (s *singleTenantInstanceProvider) GetInstance(_ context.Context, _ map[string]string) (clientapi.Instance, error) {
 	return &singleTenantInstance{
 		client:   s.client,
 		features: s.features,
@@ -59,3 +59,7 @@ func (s *singleTenantInstance) GetLogger(parent log.Logger) log.Logger {
 	// currently we do not add any extra info
 	return parent.New()
 }
+
+func (s *singleTenantInstance) ReportMetrics() {
+	// we do not report any metrics currently
+}
diff --git a/pkg/registry/apis/query/clientapi/clientapi.go b/pkg/registry/apis/query/clientapi/clientapi.go
index 46f9167199b..c35e28a4b9e 100644
--- a/pkg/registry/apis/query/clientapi/clientapi.go
+++ b/pkg/registry/apis/query/clientapi/clientapi.go
@@ -29,12 +29,13 @@ type InstanceConfigurationSettings struct {
 }
 
 type Instance interface {
-	GetDataSourceClient(ctx context.Context, ref data.DataSourceRef, headers map[string]string) (QueryDataClient, error)
+	GetDataSourceClient(ctx context.Context, ref data.DataSourceRef) (QueryDataClient, error)
 	// fetch information on the grafana instance (e.g. feature toggles)
 	GetSettings() InstanceConfigurationSettings
 	GetLogger(parent log.Logger) log.Logger
+	ReportMetrics() // some metrics are only reported at the end
 }
 
 type InstanceProvider interface {
-	GetInstance(ctx context.Context) (Instance, error)
+	GetInstance(ctx context.Context, headers map[string]string) (Instance, error)
 }
diff --git a/pkg/registry/apis/query/query.go b/pkg/registry/apis/query/query.go
index ae202728a0d..f2b574de933 100644
--- a/pkg/registry/apis/query/query.go
+++ b/pkg/registry/apis/query/query.go
@@ -246,7 +246,7 @@ func handleQuery(ctx context.Context, raw query.QueryDataRequest, b QueryAPIBuil
 
 	headers := ExtractKnownHeaders(httpreq.Header)
 
-	instance, err := b.instanceProvider.GetInstance(ctx)
+	instance, err := b.instanceProvider.GetInstance(ctx, headers)
 	if err != nil {
 		connectLogger.Error("failed to get instance configuration settings", "err", err)
 		responder.Error(err)
@@ -260,7 +260,6 @@ func handleQuery(ctx context.Context, raw query.QueryDataRequest, b QueryAPIBuil
 	mtDsClientBuilder := mtdsclient.NewMtDatasourceClientBuilderWithInstance(
 		instance,
 		ctx,
-		headers,
 		dsQuerierLoggerWithSlug,
 	)
 
@@ -281,6 +280,10 @@ func handleQuery(ctx context.Context, raw query.QueryDataRequest, b QueryAPIBuil
 
 	qdr, err := service.QueryData(ctx, dsQuerierLoggerWithSlug, cache, exprService, mReq, mtDsClientBuilder, headers)
 
+	// tell the `instance` structure that it can now report
+	// metrics that are only reported once during a request
+	instance.ReportMetrics()
+
 	if err != nil {
 		return qdr, err
 	}
diff --git a/pkg/registry/apis/query/query_test.go b/pkg/registry/apis/query/query_test.go
index cd74c0dca0f..a1861361b11 100644
--- a/pkg/registry/apis/query/query_test.go
+++ b/pkg/registry/apis/query/query_test.go
@@ -250,18 +250,21 @@ type mockClient struct {
 	stubbedFrame *data.Frame
 }
 
-func (m mockClient) GetInstance(ctx context.Context) (clientapi.Instance, error) {
+func (m mockClient) GetInstance(ctx context.Context, headers map[string]string) (clientapi.Instance, error) {
 	mclient := mockClient{
 		stubbedFrame: m.stubbedFrame,
 	}
 	return mclient, nil
 }
 
+func (m mockClient) ReportMetrics() {
+}
+
 func (m mockClient) GetLogger(parent log.Logger) log.Logger {
 	return parent.New()
 }
 
-func (m mockClient) GetDataSourceClient(ctx context.Context, ref dataapi.DataSourceRef, headers map[string]string) (clientapi.QueryDataClient, error) {
+func (m mockClient) GetDataSourceClient(ctx context.Context, ref dataapi.DataSourceRef) (clientapi.QueryDataClient, error) {
 	mclient := mockClient{
 		stubbedFrame: m.stubbedFrame,
 	}
diff --git a/pkg/services/mtdsclient/mt_datasource_client_builder.go b/pkg/services/mtdsclient/mt_datasource_client_builder.go
index 3c964aeefd1..5125b975cba 100644
--- a/pkg/services/mtdsclient/mt_datasource_client_builder.go
+++ b/pkg/services/mtdsclient/mt_datasource_client_builder.go
@@ -26,7 +26,6 @@ func NewNullMTDatasourceClientBuilder() MTDatasourceClientBuilder {
 type MtDatasourceClientBuilderWithInstance struct {
 	instance clientapi.Instance
 	ctx      context.Context
-	headers  map[string]string
 	logger   log.Logger
 }
 
@@ -37,7 +36,6 @@ func (b *MtDatasourceClientBuilderWithInstance) BuildClient(pluginId string, uid
 			Type: pluginId,
 			UID:  uid,
 		},
-		b.headers,
 	)
 	if err != nil {
 		b.logger.Debug("failed to get mt ds client", "error", err)
@@ -50,13 +48,11 @@ func (b *MtDatasourceClientBuilderWithInstance) BuildClient(pluginId string, uid
 func NewMtDatasourceClientBuilderWithInstance(
 	instance clientapi.Instance,
 	ctx context.Context,
-	headers map[string]string,
 	logger log.Logger,
 ) MTDatasourceClientBuilder {
 	return &MtDatasourceClientBuilderWithInstance{
 		instance: instance,
 		ctx:      ctx,
-		headers:  headers,
 		logger:   logger,
 	}
 }

From 43cda1f1a4b71d983b993a363b5416731f968388 Mon Sep 17 00:00:00 2001
From: Will Assis <35489495+gassiss@users.noreply.github.com>
Date: Thu, 14 Aug 2025 10:18:09 -0400
Subject: [PATCH 179/243] unified-storage: disable watcher when
 search-after-write feature flag is enabled (#109634)

* disable indexer watcher when search-after-write feature flag is enabled
---
 pkg/storage/unified/resource/search.go      | 61 +++++++++++----------
 pkg/storage/unified/resource/search_test.go |  6 +-
 pkg/storage/unified/resource/server.go      |  5 +-
 pkg/storage/unified/sql/server.go           |  1 +
 4 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/pkg/storage/unified/resource/search.go b/pkg/storage/unified/resource/search.go
index 5fa6ad34fb6..614d0dafb50 100644
--- a/pkg/storage/unified/resource/search.go
+++ b/pkg/storage/unified/resource/search.go
@@ -100,16 +100,17 @@ const tracingPrexfixSearch = "unified_search."
 
 // This supports indexing+search regardless of implementation
 type searchSupport struct {
-	tracer       trace.Tracer
-	log          *slog.Logger
-	storage      StorageBackend
-	search       SearchBackend
-	indexMetrics *BleveIndexMetrics
-	access       types.AccessClient
-	builders     *builderCache
-	initWorkers  int
-	initMinSize  int
-	initMaxSize  int
+	tracer           trace.Tracer
+	log              *slog.Logger
+	storage          StorageBackend
+	search           SearchBackend
+	indexMetrics     *BleveIndexMetrics
+	access           types.AccessClient
+	builders         *builderCache
+	initWorkers      int
+	initMinSize      int
+	initMaxSize      int
+	searchAfterWrite bool
 
 	ring           *ring.Ring
 	ringLifecycler *ring.BasicLifecycler
@@ -133,7 +134,7 @@ var (
 	_ resourcepb.ManagedObjectIndexServer = (*searchSupport)(nil)
 )
 
-func newSearchSupport(opts SearchOptions, storage StorageBackend, access types.AccessClient, blob BlobSupport, tracer trace.Tracer, indexMetrics *BleveIndexMetrics, ring *ring.Ring, ringLifecycler *ring.BasicLifecycler) (support *searchSupport, err error) {
+func newSearchSupport(opts SearchOptions, storage StorageBackend, access types.AccessClient, blob BlobSupport, tracer trace.Tracer, indexMetrics *BleveIndexMetrics, ring *ring.Ring, ringLifecycler *ring.BasicLifecycler, searchAfterWrite bool) (support *searchSupport, err error) {
 	// No backend search support
 	if opts.Backend == nil {
 		return nil, nil
@@ -155,6 +156,7 @@ func newSearchSupport(opts SearchOptions, storage StorageBackend, access types.A
 		initWorkers:           opts.WorkerThreads,
 		initMinSize:           opts.InitMinCount,
 		initMaxSize:           opts.InitMaxCount,
+		searchAfterWrite:      searchAfterWrite,
 		indexMetrics:          indexMetrics,
 		clientIndexEventsChan: opts.IndexEventsChan,
 		indexEventsChan:       make(chan *IndexEvent),
@@ -479,26 +481,29 @@ func (s *searchSupport) init(ctx context.Context) error {
 
 	span.AddEvent("namespaces indexed", trace.WithAttributes(attribute.Int("namespaced_indexed", totalBatchesIndexed)))
 
-	// Now start listening for new events
 	watchctx := context.Background() // new context?
-	events, err := s.storage.WatchWriteEvents(watchctx)
-	if err != nil {
-		return err
-	}
-	go func() {
-		for {
-			v := <-events
-
-			// Skip events during batch updates
-			if v.PreviousRV < 0 {
-				continue
-			}
-
-			s.dispatchEvent(watchctx, v)
+	// don't start watcher when SearchAfterWrite changes are enabled
+	if !s.searchAfterWrite {
+		// Now start listening for new events
+		events, err := s.storage.WatchWriteEvents(watchctx)
+		if err != nil {
+			return err
 		}
-	}()
+		go func() {
+			for {
+				v := <-events
 
-	go s.monitorIndexEvents(ctx)
+				// Skip events during batch updates
+				if v.PreviousRV < 0 {
+					continue
+				}
+
+				s.dispatchEvent(watchctx, v)
+			}
+		}()
+
+		go s.monitorIndexEvents(ctx)
+	}
 
 	// since usage insights is not in unified storage, we need to periodically rebuild the index
 	// to make sure these data points are up to date.
diff --git a/pkg/storage/unified/resource/search_test.go b/pkg/storage/unified/resource/search_test.go
index 5f614b5d9e9..07a95639ed6 100644
--- a/pkg/storage/unified/resource/search_test.go
+++ b/pkg/storage/unified/resource/search_test.go
@@ -248,7 +248,7 @@ func TestBuildIndexes_MaxCountThreshold(t *testing.T) {
 				InitMaxCount:  tt.initMaxSize,
 			}
 
-			support, err := newSearchSupport(opts, storage, nil, nil, noop.NewTracerProvider().Tracer("test"), nil, nil, nil)
+			support, err := newSearchSupport(opts, storage, nil, nil, noop.NewTracerProvider().Tracer("test"), nil, nil, nil, false)
 			require.NoError(t, err)
 			require.NotNil(t, support)
 
@@ -306,7 +306,7 @@ func TestSearchGetOrCreateIndex(t *testing.T) {
 		InitMaxCount:  0,
 	}
 
-	support, err := newSearchSupport(opts, storage, nil, nil, noop.NewTracerProvider().Tracer("test"), nil, nil, nil)
+	support, err := newSearchSupport(opts, storage, nil, nil, noop.NewTracerProvider().Tracer("test"), nil, nil, nil, false)
 	require.NoError(t, err)
 	require.NotNil(t, support)
 
@@ -360,7 +360,7 @@ func TestSearchGetOrCreateIndexWithCancellation(t *testing.T) {
 		InitMaxCount:  0,
 	}
 
-	support, err := newSearchSupport(opts, storage, nil, nil, noop.NewTracerProvider().Tracer("test"), nil, nil, nil)
+	support, err := newSearchSupport(opts, storage, nil, nil, noop.NewTracerProvider().Tracer("test"), nil, nil, nil, false)
 	require.NoError(t, err)
 	require.NotNil(t, support)
 
diff --git a/pkg/storage/unified/resource/server.go b/pkg/storage/unified/resource/server.go
index c41b187af16..1b52245157d 100644
--- a/pkg/storage/unified/resource/server.go
+++ b/pkg/storage/unified/resource/server.go
@@ -232,6 +232,9 @@ type ResourceServerOptions struct {
 
 	Ring           *ring.Ring
 	RingLifecycler *ring.BasicLifecycler
+
+	// Enable strong consistency for searches. When enabled, index is always updated with latest changes before search.
+	SearchAfterWrite bool
 }
 
 func NewResourceServer(opts ResourceServerOptions) (*server, error) {
@@ -315,7 +318,7 @@ func NewResourceServer(opts ResourceServerOptions) (*server, error) {
 
 	if opts.Search.Resources != nil {
 		var err error
-		s.search, err = newSearchSupport(opts.Search, s.backend, s.access, s.blob, opts.Tracer, opts.IndexMetrics, opts.Ring, opts.RingLifecycler)
+		s.search, err = newSearchSupport(opts.Search, s.backend, s.access, s.blob, opts.Tracer, opts.IndexMetrics, opts.Ring, opts.RingLifecycler, opts.SearchAfterWrite)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/storage/unified/sql/server.go b/pkg/storage/unified/sql/server.go
index 1eee524df75..6d2639007db 100644
--- a/pkg/storage/unified/sql/server.go
+++ b/pkg/storage/unified/sql/server.go
@@ -103,6 +103,7 @@ func NewResourceServer(
 	serverOptions.QOSQueue = opts.QOSQueue
 	serverOptions.Ring = opts.Ring
 	serverOptions.RingLifecycler = opts.RingLifecycler
+	serverOptions.SearchAfterWrite = opts.Features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageSearchAfterWriteExperimentalAPI)
 
 	return resource.NewResourceServer(serverOptions)
 }

From af68304af0eb80988fcc15888bc128f07056ce59 Mon Sep 17 00:00:00 2001
From: Lauren <61048546+laurenashleigh@users.noreply.github.com>
Date: Thu, 14 Aug 2025 15:21:03 +0100
Subject: [PATCH 180/243] Alerting: Improve Alert Rules Filter (#109176)

* big WIP

* more WIP

* leftover changes after merge

* bug fix: prevent modal close onclick inside modal

* add logic to filter by data sources

* use MultiComboBox component instead of MultipleDataSourcePicker

* add namespace and evaluation group filtering logic

* remove header section of PopupCard

* set max width on popup

* add contact point field

* add contact point logic and tooltip

* add tracking to filter- track open, apply, clear and values submitted

* add plugins show/hide field

* add plugins show/hide field

* add tests for new filter

* test tracking works as expected

* check v2 filter only shows if feature toggle is on

* tidying up

* fix lint errors

* fix close-on-type bug

* use ContactPointSelector component

* fix close-on-click-outside issue

* Add label dropdown logic

* Add query string to search field

* add test to check filtering by search field updates the filter popup values

* clear search input onClear of filters

* fix lint issues

* add tooltips to search input and datasource fields

* Sort typing in ContactPointSelector

* update translation file

* Add logic to group and list view buttons & refactoring

* update failing test

* update test mocks

* fix failing tests

* fix typecheck errors

* resolve PR comments part 1

* update label dropdown to include info text

* Translation extraction

* resolving PR comments

* move autocomplete logic to reusable hook

* resolve PR comments

* fix typecheck

---------

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
Co-authored-by: Lauren Armstrong <laurenarmstrong@laurenskmacbook.home>
Co-authored-by: Lauren Armstrong <laurenarmstrong@mac.home>
Co-authored-by: Lauren Armstrong <laurenarmstrong@Laurens-Work-MacBook.local>
---
 .../src/components/Combobox/Combobox.tsx      |  12 +-
 .../src/components/Combobox/ComboboxList.tsx  |  24 +-
 .../src/components/Combobox/MultiCombobox.tsx |  15 +-
 .../components/Combobox/getComboboxStyles.ts  |   9 +
 .../src/components/Combobox/types.ts          |   1 +
 .../features/alerting/unified/Analytics.ts    |  29 +-
 .../alerting/unified/components/HoverCard.tsx |  47 +-
 .../components/rules/Filter/RulesFilter.tsx   |   4 +-
 .../rules/Filter/RulesFilter.v1.tsx           |  12 +-
 .../rules/Filter/RulesFilter.v2.tsx           | 763 +++++++++++++-----
 .../rules/Filter/RulesViewModeSelector.tsx    |   4 +-
 .../rules/Filter/useRuleFilterAutocomplete.ts | 186 +++++
 .../unified/components/rules/Filter/utils.ts  |  81 ++
 .../components/rules/RulesFilterV2.test.tsx   | 366 +++++++++
 .../unified/hooks/useFilteredRules.ts         |   6 +-
 public/locales/en-US/grafana.json             |  59 +-
 16 files changed, 1370 insertions(+), 248 deletions(-)
 create mode 100644 public/app/features/alerting/unified/components/rules/Filter/useRuleFilterAutocomplete.ts
 create mode 100644 public/app/features/alerting/unified/components/rules/Filter/utils.ts
 create mode 100644 public/app/features/alerting/unified/components/rules/RulesFilterV2.test.tsx

diff --git a/packages/grafana-ui/src/components/Combobox/Combobox.tsx b/packages/grafana-ui/src/components/Combobox/Combobox.tsx
index 90865d8cb4f..b81d0e601fa 100644
--- a/packages/grafana-ui/src/components/Combobox/Combobox.tsx
+++ b/packages/grafana-ui/src/components/Combobox/Combobox.tsx
@@ -32,6 +32,10 @@ interface ComboboxStaticProps<T extends string | number>
    * Allows the user to set a value which is not in the list of options.
    */
   createCustomValue?: boolean;
+  /**
+   * Custom container for rendering the dropdown menu via Portal
+   */
+  portalContainer?: HTMLElement;
 
   /**
    * An array of options, or a function that returns a promise resolving to an array of options.
@@ -131,6 +135,7 @@ export const Combobox = <T extends string | number>(props: ComboboxProps<T>) =>
     autoFocus,
     onBlur,
     disabled,
+    portalContainer,
     invalid,
   } = props;
 
@@ -383,10 +388,13 @@ export const Combobox = <T extends string | number>(props: ComboboxProps<T>) =>
           'data-testid': dataTestId,
         })}
       />
-      <Portal>
+      <Portal root={portalContainer}>
         <div
           className={cx(styles.menu, !isOpen && styles.menuClosed)}
-          style={floatStyles}
+          style={{
+            ...floatStyles,
+            pointerEvents: 'auto', // Override container's pointer-events: none
+          }}
           {...getMenuProps({
             ref: floatingRef,
             'aria-labelledby': ariaLabelledBy,
diff --git a/packages/grafana-ui/src/components/Combobox/ComboboxList.tsx b/packages/grafana-ui/src/components/Combobox/ComboboxList.tsx
index 5f50a563236..16d1bb11a0c 100644
--- a/packages/grafana-ui/src/components/Combobox/ComboboxList.tsx
+++ b/packages/grafana-ui/src/components/Combobox/ComboboxList.tsx
@@ -120,26 +120,30 @@ export const ComboboxList = <T extends string | number>({
                 className={cx(
                   styles.option,
                   !isMultiSelect && isOptionSelected(item) && styles.optionSelected,
-                  highlightedIndex === virtualRow.index && styles.optionFocused
+                  highlightedIndex === virtualRow.index && !item.infoOption && styles.optionFocused,
+                  item.infoOption && styles.optionInfo
                 )}
                 {...getItemProps({
                   item: item,
                   index: virtualRow.index,
                   id: itemId,
                   'aria-describedby': groupHeaderId,
+                  disabled: item.infoOption,
                 })}
               >
                 {isMultiSelect && (
                   <div className={styles.optionAccessory}>
-                    <Checkbox
-                      key={itemId}
-                      value={allItemsSelected || isOptionSelected(item)}
-                      indeterminate={item.value === ALL_OPTION_VALUE && selectedItems.length > 0 && !allItemsSelected}
-                      aria-labelledby={itemId}
-                      onClick={(e) => {
-                        e.stopPropagation();
-                      }}
-                    />
+                    {!item.infoOption && (
+                      <Checkbox
+                        key={itemId}
+                        value={allItemsSelected || isOptionSelected(item)}
+                        indeterminate={item.value === ALL_OPTION_VALUE && selectedItems.length > 0 && !allItemsSelected}
+                        aria-labelledby={itemId}
+                        onClick={(e) => {
+                          e.stopPropagation();
+                        }}
+                      />
+                    )}
                   </div>
                 )}
 
diff --git a/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx b/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
index e6a3723191c..13dd02742e4 100644
--- a/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
+++ b/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
@@ -30,6 +30,7 @@ interface MultiComboboxBaseProps<T extends string | number>
   onChange: (option: Array<ComboboxOption<T>>) => void;
   isClearable?: boolean;
   enableAllOption?: boolean;
+  portalContainer?: HTMLElement;
 }
 
 export type MultiComboboxProps<T extends string | number> = MultiComboboxBaseProps<T> & AutoSizeConditionals;
@@ -49,6 +50,7 @@ export const MultiCombobox = <T extends string | number>(props: MultiComboboxPro
     createCustomValue = false,
     'aria-labelledby': ariaLabelledBy,
     'data-testid': dataTestId,
+    portalContainer,
   } = props;
 
   const styles = useStyles2(getComboboxStyles);
@@ -197,6 +199,11 @@ export const MultiCombobox = <T extends string | number>(props: MultiComboboxPro
       switch (type) {
         case useCombobox.stateChangeTypes.InputKeyDownEnter:
         case useCombobox.stateChangeTypes.ItemClick:
+          // Don't allow selection of info options
+          if (newSelectedItem?.infoOption) {
+            break;
+          }
+
           // Handle All functionality
           if (newSelectedItem?.value === ALL_OPTION_VALUE) {
             // TODO: fix bug where if the search filtered items list is the
@@ -204,12 +211,11 @@ export const MultiCombobox = <T extends string | number>(props: MultiComboboxPro
             const isAllFilteredSelected = selectedItems.length === options.length - 1;
 
             // if every option is already selected, clear the selection.
-            // otherwise, select all the options (excluding the first ALL_OTION)
-            const realOptions = options.slice(1);
+            // otherwise, select all the options (excluding the first ALL_OPTION and info options)
+            const realOptions = options.slice(1).filter((option) => !option.infoOption);
             let newSelectedItems = isAllFilteredSelected && inputValue === '' ? [] : realOptions;
 
             if (!isAllFilteredSelected && inputValue !== '') {
-              // Select all currently filtered items and deduplicate
               newSelectedItems = [...new Set([...selectedItems, ...realOptions])];
             }
 
@@ -329,12 +335,13 @@ export const MultiCombobox = <T extends string | number>(props: MultiComboboxPro
           </div>
         </span>
       </div>
-      <Portal>
+      <Portal root={portalContainer}>
         <div
           className={cx(styles.menu, !isOpen && styles.menuClosed)}
           style={{
             ...floatStyles,
             width: floatStyles.width + 24, // account for checkbox
+            pointerEvents: 'auto', // Override container's pointer-events: none
           }}
           {...getMenuProps({ ref: floatingRef })}
         >
diff --git a/packages/grafana-ui/src/components/Combobox/getComboboxStyles.ts b/packages/grafana-ui/src/components/Combobox/getComboboxStyles.ts
index 14c87b124ec..15c30dadd82 100644
--- a/packages/grafana-ui/src/components/Combobox/getComboboxStyles.ts
+++ b/packages/grafana-ui/src/components/Combobox/getComboboxStyles.ts
@@ -141,6 +141,15 @@ export const getComboboxStyles = (theme: GrafanaTheme2) => {
         top: 0,
       },
     }),
+    optionInfo: css({
+      label: 'combobox-option-info',
+      color: theme.colors.text.disabled,
+      cursor: 'not-allowed',
+      pointerEvents: 'none',
+      '&:hover': {
+        background: 'transparent',
+      },
+    }),
     clear: css({
       label: 'combobox-clear',
       cursor: 'pointer',
diff --git a/packages/grafana-ui/src/components/Combobox/types.ts b/packages/grafana-ui/src/components/Combobox/types.ts
index 9bc5cde0204..537982d5865 100644
--- a/packages/grafana-ui/src/components/Combobox/types.ts
+++ b/packages/grafana-ui/src/components/Combobox/types.ts
@@ -5,4 +5,5 @@ export type ComboboxOption<T extends string | number = string> = {
   value: T;
   description?: string;
   group?: string;
+  infoOption?: boolean;
 };
diff --git a/public/app/features/alerting/unified/Analytics.ts b/public/app/features/alerting/unified/Analytics.ts
index ebe07e43f9f..2f139066a5b 100644
--- a/public/app/features/alerting/unified/Analytics.ts
+++ b/public/app/features/alerting/unified/Analytics.ts
@@ -1,4 +1,4 @@
-import { isEmpty } from 'lodash';
+import { isEmpty, pickBy } from 'lodash';
 
 import { config, createMonitoringLogger, reportInteraction } from '@grafana/runtime';
 import { contextSrv } from 'app/core/core';
@@ -7,6 +7,7 @@ import { RuleNamespace } from '../../../types/unified-alerting';
 import { RulerRulesConfigDTO } from '../../../types/unified-alerting-dto';
 
 import { Origin } from './components/rule-viewer/tabs/version-history/ConfirmVersionRestoreModal';
+import { AdvancedFilters } from './components/rules/Filter/RulesFilter.v2';
 import { FilterType } from './components/rules/central-state-history/EventListSceneObject';
 import { RulesFilter, getSearchFilterFromQuery } from './search/rulesSearchParser';
 import { RuleFormType } from './types/rule-form';
@@ -330,6 +331,32 @@ export function trackFolderBulkActionsUnpauseFail() {
   reportInteraction('grafana_alerting_folder_bulk_actions_unpause_fail');
 }
 
+export function trackFilterButtonClick() {
+  reportInteraction('grafana_alerting_filter_button_click');
+}
+
+export function trackFilterButtonApplyClick(payload: AdvancedFilters, pluginsFilterEnabled: boolean) {
+  // Filter out empty/default values before tracking
+  const meaningfulValues = pickBy(payload, (value, key) => {
+    if (value === null || value === undefined || value === '') {
+      return false;
+    }
+    if (Array.isArray(value) && value.length === 0) {
+      return false;
+    }
+    if (key === 'plugins' && !pluginsFilterEnabled) {
+      return false;
+    }
+    return true;
+  });
+
+  reportInteraction('grafana_alerting_filter_button_apply_click', meaningfulValues);
+}
+
+export function trackFilterButtonClearClick() {
+  reportInteraction('grafana_alerting_filter_button_clear_click');
+}
+
 export type AlertRuleTrackingProps = {
   user_id: number;
   grafana_version?: string;
diff --git a/public/app/features/alerting/unified/components/HoverCard.tsx b/public/app/features/alerting/unified/components/HoverCard.tsx
index 9e010873aaf..6c5577df37b 100644
--- a/public/app/features/alerting/unified/components/HoverCard.tsx
+++ b/public/app/features/alerting/unified/components/HoverCard.tsx
@@ -17,6 +17,10 @@ export interface PopupCardProps {
   showAfter?: number;
   arrow?: boolean;
   showOn?: 'click' | 'hover';
+  disableBlur?: boolean;
+  isOpen?: boolean;
+  onClose?: () => void;
+  onToggle?: () => void;
 }
 
 export const PopupCard = ({
@@ -29,6 +33,10 @@ export const PopupCard = ({
   wrapperClassName,
   disabled = false,
   showOn = 'hover',
+  disableBlur = false,
+  isOpen,
+  onClose,
+  onToggle,
   ...rest
 }: PopupCardProps) => {
   const popoverRef = useRef<HTMLElement>(null);
@@ -52,19 +60,37 @@ export const PopupCard = ({
   return (
     <PopoverController content={body} hideAfter={100}>
       {(showPopper, hidePopper, popperProps) => {
+        // Use manual control if provided, otherwise use internal state
+        const isManuallyControlled = isOpen !== undefined;
+        const shouldShow = isManuallyControlled ? isOpen : popperProps.show;
+
+        const handleClose = () => {
+          if (onClose) {
+            onClose();
+          } else {
+            hidePopper();
+          }
+        };
+
+        const handleShow = () => {
+          if (!isManuallyControlled) {
+            showPopper();
+          }
+        };
+
         // support hover and click interaction
         const onClickProps = {
-          onClick: showPopper,
+          onClick: onToggle || (isManuallyControlled ? handleClose : showPopper),
         };
 
         const onHoverProps = {
-          onMouseLeave: hidePopper,
-          onMouseEnter: showPopper,
+          onMouseLeave: handleClose,
+          onMouseEnter: handleShow,
         };
 
         const blurFocusProps = {
-          onBlur: hidePopper,
-          onFocus: showPopper,
+          onBlur: handleClose,
+          onFocus: handleShow,
         };
 
         return (
@@ -72,26 +98,29 @@ export const PopupCard = ({
             {popoverRef.current && (
               <GrafanaPopover
                 {...popperProps}
+                show={shouldShow}
                 {...rest}
                 wrapperClassName={classnames(styles.popover, wrapperClassName)}
                 referenceElement={popoverRef.current}
                 renderArrow={arrow}
                 // @TODO
                 // if we want interaction with the content we should not pass blur / focus handlers but then clicking outside doesn't close the popper
-                {...blurFocusProps}
+                {...(disableBlur ? {} : blurFocusProps)}
                 // if we want hover interaction we have to make sure we add the leave / enter handlers
                 {...(showOnHover ? onHoverProps : {})}
+                hidePopper={handleClose}
               />
             )}
 
             {cloneElement(children, {
               ref: popoverRef,
-              onFocus: showPopper,
-              onBlur: hidePopper,
+              onFocus: handleShow,
+              onBlur: disableBlur ? undefined : handleClose,
               tabIndex: 0,
               // make sure we pass the correct interaction handlers here to the element we want to interact with
               ...(showOnHover ? onHoverProps : {}),
-              ...(showOnClick ? onClickProps : {}),
+              // Only add click handling if we have onToggle or not manually controlled
+              ...(showOnClick && (onToggle || !isManuallyControlled) ? onClickProps : {}),
             })}
           </>
         );
diff --git a/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.tsx b/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.tsx
index b904a5c1427..3eea628410f 100644
--- a/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.tsx
+++ b/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.tsx
@@ -7,13 +7,13 @@ import { SupportedView } from './RulesViewModeSelector';
 
 const RulesFilterV2 = lazy(() => import('./RulesFilter.v2'));
 
-interface RulesFilerProps {
+export interface RulesFilterProps {
   onClear?: () => void;
   viewMode?: SupportedView;
   onViewModeChange?: (viewMode: SupportedView) => void;
 }
 
-const RulesFilter = (props: RulesFilerProps) => {
+const RulesFilter = (props: RulesFilterProps) => {
   const newView = config.featureToggles.alertingFilterV2;
   return <Suspense>{newView ? <RulesFilterV2 {...props} /> : <RulesFilterV1 {...props} />}</Suspense>;
 };
diff --git a/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v1.tsx b/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v1.tsx
index ca70ddaa984..d58b0a5abdf 100644
--- a/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v1.tsx
+++ b/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v1.tsx
@@ -24,7 +24,8 @@ import { alertStateToReadable } from '../../../utils/rules';
 import { PopupCard } from '../../HoverCard';
 import { MultipleDataSourcePicker } from '../MultipleDataSourcePicker';
 
-import { RulesViewModeSelector, SupportedView } from './RulesViewModeSelector';
+import { RulesFilterProps } from './RulesFilter';
+import { RulesViewModeSelector } from './RulesViewModeSelector';
 
 const RuleTypeOptions: SelectableValue[] = [
   { label: 'Alert ', value: PromRuleType.Alerting },
@@ -37,15 +38,8 @@ const RuleHealthOptions: SelectableValue[] = [
   { label: 'Error', value: RuleHealth.Error },
 ];
 
-// Contact point selector is not supported in Alerting ListView V2 yet
 const canRenderContactPointSelector = contextSrv.hasPermission(AccessControlAction.AlertingReceiversRead);
 
-interface RulesFilerProps {
-  onClear?: () => void;
-  viewMode?: SupportedView;
-  onViewModeChange?: (viewMode: SupportedView) => void;
-}
-
 const RuleStateOptions = Object.entries(PromAlertingRuleState)
   .filter(([key, value]) => value !== PromAlertingRuleState.Unknown) // Exclude Unknown state from filter options
   .map(([key, value]) => ({
@@ -53,7 +47,7 @@ const RuleStateOptions = Object.entries(PromAlertingRuleState)
     value,
   }));
 
-const RulesFilter = ({ onClear = () => undefined, viewMode, onViewModeChange }: RulesFilerProps) => {
+const RulesFilter = ({ onClear = () => undefined, viewMode, onViewModeChange }: RulesFilterProps) => {
   const styles = useStyles2(getStyles);
   const { pluginsFilterEnabled } = usePluginsFilterStatus();
   const { filterState, hasActiveFilters, searchQuery, setSearchQuery, updateFilters } = useRulesFilter();
diff --git a/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v2.tsx b/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v2.tsx
index 91d76ce107f..8411da2e8d3 100644
--- a/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v2.tsx
+++ b/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v2.tsx
@@ -1,226 +1,623 @@
 import { css } from '@emotion/css';
-import { useCallback, useMemo, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
+import { Controller, SubmitHandler, useForm } from 'react-hook-form';
 
+import { ContactPointSelector } from '@grafana/alerting/unstable';
 import { GrafanaTheme2 } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
 import {
-  Badge,
+  Box,
   Button,
-  Grid,
-  IconButton,
+  Combobox,
+  FilterInput,
+  Icon,
   Input,
-  InteractiveTable,
   Label,
+  MultiCombobox,
   RadioButtonGroup,
-  Select,
   Stack,
-  Tab,
-  TabsBar,
+  Tooltip,
   useStyles2,
 } from '@grafana/ui';
+import { contextSrv } from 'app/core/core';
+import { AccessControlAction } from 'app/types/accessControl';
+import { PromAlertingRuleState, PromRuleType } from 'app/types/unified-alerting-dto';
 
+import { trackFilterButtonApplyClick, trackFilterButtonClearClick, trackFilterButtonClick } from '../../../Analytics';
+import { useRulesFilter } from '../../../hooks/useFilteredRules';
+import { RuleHealth, applySearchFilterToQuery, getSearchFilterFromQuery } from '../../../search/rulesSearchParser';
 import { PopupCard } from '../../HoverCard';
-import MoreButton from '../../MoreButton';
 
-type RulesFilterProps = {
-  onClear?: () => void;
+import { RulesFilterProps } from './RulesFilter';
+import { RulesViewModeSelector } from './RulesViewModeSelector';
+import {
+  useAlertingDataSourceOptions,
+  useLabelOptions,
+  useNamespaceAndGroupOptions,
+} from './useRuleFilterAutocomplete';
+import {
+  emptyAdvancedFilters,
+  formAdvancedFiltersToRuleFilter,
+  searchQueryToDefaultValues,
+  usePluginsFilterStatus,
+  usePortalContainer,
+} from './utils';
+
+const canRenderContactPointSelector = contextSrv.hasPermission(AccessControlAction.AlertingReceiversRead);
+
+/**
+ * Custom hook that creates a DOM container for rendering dropdowns outside of popup stacking contexts.
+ * This prevents dropdowns from appearing behind modals/popups due to CSS stacking context limitations.
+ *
+ * @param zIndex - The z-index value for the portal container
+ * @returns HTMLDivElement container appended to document.body, or undefined during initial render
+ */
+
+export type AdvancedFilters = {
+  namespace?: string | null;
+  groupName?: string | null;
+  ruleName?: string;
+  ruleType?: PromRuleType | '*';
+  ruleState: PromAlertingRuleState | '*';
+  dataSourceNames: string[];
+  labels: string[];
+  ruleHealth?: RuleHealth | '*';
+  dashboardUid?: string;
+  plugins?: 'show' | 'hide';
+  contactPoint?: string | null;
 };
 
-type ActiveTab = 'custom' | 'saved';
+type SearchQueryForm = {
+  query: string;
+};
 
-export default function RulesFilter({ onClear = () => {} }: RulesFilterProps) {
+export default function RulesFilter({ viewMode, onViewModeChange }: RulesFilterProps) {
   const styles = useStyles2(getStyles);
-  const [activeTab, setActiveTab] = useState<ActiveTab>('custom');
 
-  const filterOptions = useMemo(() => {
-    return (
-      <PopupCard
-        showOn="click"
-        placement="bottom-start"
-        content={
-          <div className={styles.content}>
-            {activeTab === 'custom' && <FilterOptions />}
-            {activeTab === 'saved' && <SavedSearches />}
-          </div>
-        }
-        header={
-          <TabsBar hideBorder className={styles.fixTabsMargin}>
-            <Tab
-              active={activeTab === 'custom'}
-              icon="filter"
-              label={t('alerting.rules-filter.filter-options.label-custom-filter', 'Custom filter')}
-              onChangeTab={() => setActiveTab('custom')}
-            />
-            <Tab
-              active={activeTab === 'saved'}
-              icon="bookmark"
-              label={t('alerting.rules-filter.filter-options.label-saved-searches', 'Saved searches')}
-              onChangeTab={() => setActiveTab('saved')}
-            />
-          </TabsBar>
-        }
-      >
-        <IconButton
-          name="filter"
-          aria-label={t('alerting.rules-filter.filter-options.aria-label-show-filters', 'Show filters')}
-        />
-      </PopupCard>
-    );
-  }, [activeTab, styles.content, styles.fixTabsMargin]);
+  const [isPopupOpen, setIsPopupOpen] = useState(false);
+  const { searchQuery, updateFilters, setSearchQuery } = useRulesFilter();
+  const popupRef = useRef<HTMLDivElement>(null);
+  const { pluginsFilterEnabled } = usePluginsFilterStatus();
 
+  // this form will managed the search query string, which is updated either by the user typing in the input or by the advanced filters
+  const { setValue, watch, getValues, handleSubmit } = useForm<SearchQueryForm>({
+    defaultValues: {
+      query: searchQuery,
+    },
+  });
+
+  useEffect(() => {
+    setValue('query', searchQuery);
+  }, [searchQuery, setValue]);
+
+  const submitHandler: SubmitHandler<SearchQueryForm> = (values: SearchQueryForm) => {
+    const parsedFilter = getSearchFilterFromQuery(values.query);
+    updateFilters(parsedFilter);
+  };
+
+  const handleAdvancedFilters: SubmitHandler<AdvancedFilters> = (values) => {
+    const newFilter = formAdvancedFiltersToRuleFilter(values);
+    updateFilters(newFilter);
+
+    const newSearchQuery = applySearchFilterToQuery('', newFilter);
+    setSearchQuery(newSearchQuery);
+
+    trackFilterButtonApplyClick(values, pluginsFilterEnabled);
+    setIsPopupOpen(false); // Should close popup after applying filters?
+  };
+
+  const handleClearFilters = () => {
+    updateFilters(formAdvancedFiltersToRuleFilter(emptyAdvancedFilters));
+    setSearchQuery(undefined);
+  };
+
+  const handleOnToggle = () => {
+    trackFilterButtonClick();
+    setIsPopupOpen(!isPopupOpen);
+  };
+
+  // Handle outside clicks to close the popup
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (isPopupOpen && popupRef.current && event.target instanceof Node && !popupRef.current.contains(event.target)) {
+        // Check if click is on a portal element (combobox dropdown)
+        if (event.target instanceof Element) {
+          const isPortalClick =
+            event.target.closest('[data-popper-placement]') || event.target.closest('[role="listbox"]');
+
+          if (!isPortalClick) {
+            setIsPopupOpen(false);
+          }
+        } else {
+          setIsPopupOpen(false);
+        }
+      }
+    };
+
+    if (isPopupOpen) {
+      document.addEventListener('mousedown', handleClickOutside);
+    }
+
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, [isPopupOpen]);
+
+  const filterButtonLabel = t('alerting.rules-filter.filter-options.aria-label-show-filters', 'Filter');
   return (
-    <Stack direction="column" gap={0}>
-      <Label>
-        <Trans i18nKey="common.search">Search</Trans>
-      </Label>
-      <Stack direction="row">
-        <Input prefix={filterOptions} />
+    <form onSubmit={handleSubmit(submitHandler)} onReset={() => {}}>
+      <Stack direction="column" gap={1}>
+        <Label htmlFor="rulesSearchInput">
+          <Stack gap={0.5} alignItems="center">
+            <span>
+              <Trans i18nKey="alerting.rules-filter.search">Search</Trans>
+            </span>
+            <PopupCard content={<SearchQueryHelp />}>
+              <Icon
+                name="info-circle"
+                size="sm"
+                tabIndex={0}
+                title={t('alerting.rules-filter.title-search-help', 'Search help')}
+              />
+            </PopupCard>
+          </Stack>
+        </Label>
+        <Stack direction="row" alignItems="center" gap={1}>
+          <Box flex={1}>
+            <FilterInput
+              id="rulesSearchInput"
+              data-testid="search-query-input"
+              placeholder={t(
+                'alerting.rules-filter.filter-options.placeholder-search-input',
+                'Search by name or enter filter query...'
+              )}
+              name="searchQuery"
+              onChange={(string) => setValue('query', string)}
+              onBlur={() => {
+                const currentQuery = getValues('query');
+                const parsedFilter = getSearchFilterFromQuery(currentQuery);
+                updateFilters(parsedFilter);
+              }}
+              value={watch('query')}
+            />
+          </Box>
+          {/* the popup card is mounted inside of a portal, so we can't rely on the usual form handling mechanisms of button[type=submit] */}
+          <PopupCard
+            showOn="click"
+            placement="auto"
+            disableBlur={true}
+            isOpen={isPopupOpen}
+            onClose={() => setIsPopupOpen(false)}
+            onToggle={handleOnToggle}
+            content={
+              // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
+              <div
+                ref={popupRef}
+                className={styles.content}
+                onClick={(e) => e.stopPropagation()}
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter' || e.key === ' ') {
+                    e.stopPropagation();
+                  }
+                }}
+                role="dialog"
+                aria-label={t('alerting.rules-filter.filter-options.aria-label', 'Filter options')}
+                tabIndex={-1}
+              >
+                <FilterOptions
+                  onSubmit={handleAdvancedFilters}
+                  onClear={handleClearFilters}
+                  pluginsFilterEnabled={pluginsFilterEnabled}
+                />
+              </div>
+            }
+          >
+            <Button name="filter" icon="filter" variant="secondary" aria-label={filterButtonLabel}>
+              {filterButtonLabel}
+            </Button>
+          </PopupCard>
+          <RulesViewModeSelector viewMode={viewMode} onViewModeChange={onViewModeChange} />
+        </Stack>
       </Stack>
-    </Stack>
+    </form>
   );
 }
 
-const FilterOptions = () => {
+interface FilterOptionsProps {
+  onSubmit: SubmitHandler<AdvancedFilters>;
+  onClear: () => void;
+  pluginsFilterEnabled: boolean;
+}
+
+const FilterOptions = ({ onSubmit, onClear, pluginsFilterEnabled }: FilterOptionsProps) => {
+  const styles = useStyles2(getStyles);
+  const theme = useStyles2((theme) => theme);
+  const { filterState } = useRulesFilter();
+  const isManualResetRef = useRef(false);
+
+  // Create portal container to render dropdowns above the popup modal
+  const portalContainer = usePortalContainer(theme.zIndex.portal + 100);
+
+  const defaultValues = searchQueryToDefaultValues(filterState);
+
+  // Fetch namespace and group data from all sources (optimized for filter UI)
+  const { namespaceOptions, allGroupNames, isLoadingNamespaces, namespacePlaceholder, groupPlaceholder } =
+    useNamespaceAndGroupOptions();
+
+  const { labelOptions, isLoadingGrafanaLabels } = useLabelOptions();
+
+  // Create label options for the multi-select dropdown
+  const dataSourceOptions = useAlertingDataSourceOptions();
+
+  // turn the filterState into form default values
+  const { handleSubmit, reset, register, control } = useForm<AdvancedFilters>({
+    defaultValues,
+  });
+
+  // Update form values when filterState changes (e.g., when popup reopens)
+  useEffect(() => {
+    // Skip if we're in the middle of a manual reset
+    if (isManualResetRef.current) {
+      isManualResetRef.current = false;
+      return;
+    }
+
+    const newDefaultValues = searchQueryToDefaultValues(filterState);
+    reset(newDefaultValues);
+  }, [filterState, reset]);
+
+  const submitAdvancedFilters = handleSubmit(onSubmit);
+
   return (
-    <Stack direction="column" alignItems="end" gap={2}>
-      <Grid columns={2} gap={2} alignItems="center">
-        <Label>
-          <Trans i18nKey="alerting.search.property.namespace">Folder / Namespace</Trans>
-        </Label>
-        <Select options={[]} onChange={() => {}} />
-        <Label>
-          <Trans i18nKey="alerting.search.property.rule-name">Alerting rule name</Trans>
-        </Label>
-        <Input />
-        <Label>
-          <Trans i18nKey="alerting.search.property.evaluation-group">Evaluation group</Trans>
-        </Label>
-        <Input />
-        <Label>
-          <Trans i18nKey="alerting.search.property.labels">Labels</Trans>
-        </Label>
-        <Input />
-        <Label>
-          <Trans i18nKey="alerting.search.property.data-source">Data source</Trans>
-        </Label>
-        <Select options={[]} onChange={() => {}} />
-        <Label>
-          <Trans i18nKey="alerting.search.property.state">State</Trans>
-        </Label>
-        <RadioButtonGroup
-          value={'*'}
-          options={[
-            { label: t('alerting.filter-options.label.all', 'All'), value: '*' },
-            { label: t('alerting.filter-options.label.normal', 'Normal'), value: 'normal' },
-            { label: t('alerting.filter-options.label.pending', 'Pending'), value: 'pending' },
-            { label: t('alerting.filter-options.label.recovering', 'Recovering'), value: 'recovering' },
-            { label: t('alerting.filter-options.label.firing', 'Firing'), value: 'firing' },
-          ]}
-        />
-        <Label>
-          <Trans i18nKey="alerting.search.property.rule-type">Type</Trans>
-        </Label>
-        <RadioButtonGroup
-          value={'*'}
-          options={[
-            { label: t('alerting.filter-options.label.all', 'All'), value: '*' },
-            { label: t('alerting.filter-options.label.alert-rule', 'Alert rule'), value: 'alerting' },
-            { label: t('alerting.filter-options.label.recording-rule', 'Recording rule'), value: 'recording' },
-          ]}
-        />
-        <Label>
-          <Trans i18nKey="alerting.search.property.rule-health">Health</Trans>
-        </Label>
-        <RadioButtonGroup
-          value={'*'}
-          options={[
-            { label: t('alerting.filter-options.label.all', 'All'), value: '*' },
-            { label: t('alerting.filter-options.label.ok', 'OK'), value: 'ok' },
-            { label: t('alerting.filter-options.label.no-data', 'No data'), value: 'no_data' },
-            { label: t('alerting.filter-options.label.error', 'Error'), value: 'error' },
-          ]}
-        />
-      </Grid>
-      <Stack direction="row" alignItems="center">
-        <Button variant="secondary">
-          <Trans i18nKey="common.clear">Clear</Trans>
-        </Button>
-        <Button>
-          <Trans i18nKey="common.apply">Apply</Trans>
-        </Button>
+    <form
+      onSubmit={submitAdvancedFilters}
+      onReset={() => {
+        isManualResetRef.current = true;
+        reset(emptyAdvancedFilters);
+        trackFilterButtonClearClick();
+        onClear();
+      }}
+    >
+      <Stack direction="column" alignItems="end" gap={2}>
+        <div className={styles.grid}>
+          <Label>
+            <Trans i18nKey="alerting.search.property.rule-name">Rule name</Trans>
+          </Label>
+          <Input {...register('ruleName')} data-testid="rule-name-input" />
+          <Label>
+            <Trans i18nKey="alerting.search.property.labels">Labels</Trans>
+          </Label>
+          <Controller
+            name="labels"
+            control={control}
+            render={({ field }) => (
+              <MultiCombobox
+                options={labelOptions}
+                value={field.value}
+                onChange={(selections) => field.onChange(selections.map((s) => s.value))}
+                placeholder={
+                  isLoadingGrafanaLabels
+                    ? t('common.loading', 'Loading...')
+                    : t('alerting.rules-filter.placeholder-labels', 'Select labels')
+                }
+                loading={isLoadingGrafanaLabels}
+                disabled={isLoadingGrafanaLabels || labelOptions.filter((option) => !option.infoOption).length === 0}
+                portalContainer={portalContainer}
+                width="auto"
+                minWidth={40}
+                maxWidth={80}
+              />
+            )}
+          />
+          <Label>
+            <Trans i18nKey="alerting.search.property.namespace">Folder / Namespace</Trans>
+          </Label>
+          <Controller
+            name="namespace"
+            control={control}
+            render={({ field }) => {
+              return (
+                <Combobox<string>
+                  placeholder={namespacePlaceholder}
+                  options={namespaceOptions}
+                  onChange={(option) => field.onChange(option?.value || null)}
+                  value={field.value}
+                  loading={isLoadingNamespaces}
+                  disabled={isLoadingNamespaces || namespaceOptions.length === 0}
+                  isClearable
+                  portalContainer={portalContainer}
+                />
+              );
+            }}
+          />
+          <Label>
+            <Trans i18nKey="alerting.search.property.evaluation-group">Evaluation group</Trans>
+          </Label>
+          <Controller
+            name="groupName"
+            control={control}
+            render={({ field }) => {
+              return (
+                <Combobox<string>
+                  placeholder={groupPlaceholder}
+                  options={allGroupNames.map((name) => ({ label: name, value: name }))}
+                  onChange={(option) => field.onChange(option?.value || null)}
+                  value={field.value}
+                  loading={isLoadingNamespaces}
+                  disabled={isLoadingNamespaces || allGroupNames.length === 0}
+                  isClearable
+                  portalContainer={portalContainer}
+                />
+              );
+            }}
+          />
+          <Label>
+            <Stack gap={0.5} alignItems="center">
+              <span>
+                <Trans i18nKey="alerting.search.property.data-source">Data source</Trans>
+              </span>
+              <Tooltip
+                content={
+                  <div>
+                    <p>
+                      <Trans i18nKey="alerting.rules-filter.configured-alert-rules">
+                        Data sources containing configured alert rules are Mimir or Loki data sources where alert rules
+                        are stored and evaluated in the data source itself.
+                      </Trans>
+                    </p>
+                    <p>
+                      <Trans i18nKey="alerting.rules-filter.manage-alerts">
+                        In these data sources, you can select Manage alerts via Alerting UI to be able to manage these
+                        alert rules in the Grafana UI as well as in the data source where they were configured.
+                      </Trans>
+                    </p>
+                  </div>
+                }
+              >
+                <Icon
+                  name="info-circle"
+                  size="sm"
+                  title={t(
+                    'alerting.rules-filter.data-source-picker-inline-help-title-search-by-data-sources-help',
+                    'Search by data sources help'
+                  )}
+                />
+              </Tooltip>
+            </Stack>
+          </Label>
+          <Controller
+            name="dataSourceNames"
+            control={control}
+            render={({ field }) => (
+              <MultiCombobox
+                options={dataSourceOptions}
+                value={field.value}
+                onChange={(selections) => field.onChange(selections.map((s) => s.value))}
+                placeholder={t('alerting.rules-filter.placeholder-data-sources', 'Select data sources')}
+                portalContainer={portalContainer}
+                width="auto"
+                minWidth={40}
+                maxWidth={80}
+              />
+            )}
+          />
+          {canRenderContactPointSelector && (
+            <>
+              <Label>
+                <Stack gap={0.5} alignItems="center">
+                  <span>
+                    <Trans i18nKey="alerting.contactPointFilter.label">Contact point</Trans>
+                  </span>
+                  <Tooltip
+                    content={
+                      <Trans i18nKey="alerting.rules-filter.contact-point-tooltip">
+                        Filters alert rules which route directly to the selected contact point. Alert rules routed to
+                        notification policies will not be displayed.
+                      </Trans>
+                    }
+                  >
+                    <Icon
+                      name="info-circle"
+                      size="sm"
+                      title={t('alerting.rules-filter.contact-point-tooltip-title', 'Contact point filter help')}
+                    />
+                  </Tooltip>
+                </Stack>
+              </Label>
+              <Controller
+                name="contactPoint"
+                control={control}
+                render={({ field }) => {
+                  return (
+                    <ContactPointSelector
+                      placeholder={t('alerting.rules-filter.placeholder-contact-point', 'Select contact point')}
+                      value={field.value}
+                      isClearable
+                      onChange={(contactPoint) => {
+                        field.onChange(contactPoint?.spec.title || null);
+                      }}
+                      portalContainer={portalContainer}
+                    />
+                  );
+                }}
+              />
+            </>
+          )}
+          <Label>
+            <Trans i18nKey="alerting.search.property.state">State</Trans>
+          </Label>
+          <Controller
+            name="ruleState"
+            control={control}
+            render={({ field }) => (
+              <RadioButtonGroup<AdvancedFilters['ruleState']>
+                options={[
+                  { label: t('common.all', 'All'), value: '*' },
+                  { label: t('alerting.rules.state.firing', 'Firing'), value: PromAlertingRuleState.Firing },
+                  { label: t('alerting.rules.state.normal', 'Normal'), value: PromAlertingRuleState.Inactive },
+                  { label: t('alerting.rules.state.pending', 'Pending'), value: PromAlertingRuleState.Pending },
+                  {
+                    label: t('alerting.rules.state.recovering', 'Recovering'),
+                    value: PromAlertingRuleState.Recovering,
+                  },
+                  { label: t('alerting.rules.state.unknown', 'Unknown'), value: PromAlertingRuleState.Unknown },
+                ]}
+                value={field.value}
+                onChange={field.onChange}
+              />
+            )}
+          />
+          <Label>
+            <Trans i18nKey="alerting.search.property.rule-type">Type</Trans>
+          </Label>
+          <Controller
+            name="ruleType"
+            control={control}
+            render={({ field }) => (
+              <RadioButtonGroup<AdvancedFilters['ruleType']>
+                options={[
+                  { label: t('common.all', 'All'), value: '*' },
+                  { label: t('alerting.rules.type.alert', 'Alert rule'), value: PromRuleType.Alerting },
+                  { label: t('alerting.rules.type.recording', 'Recording rule'), value: PromRuleType.Recording },
+                ]}
+                value={field.value}
+                onChange={field.onChange}
+              />
+            )}
+          />
+          <Label>
+            <Trans i18nKey="alerting.search.property.rule-health">Health</Trans>
+          </Label>
+          <Controller
+            name="ruleHealth"
+            control={control}
+            render={({ field }) => (
+              <RadioButtonGroup<AdvancedFilters['ruleHealth']>
+                options={[
+                  { label: t('common.all', 'All'), value: '*' },
+                  { label: t('alerting.rules.health.ok', 'OK'), value: RuleHealth.Ok },
+                  { label: t('alerting.rules.health.no-data', 'No data'), value: RuleHealth.NoData },
+                  { label: t('alerting.rules.health.error', 'Error'), value: RuleHealth.Error },
+                ]}
+                value={field.value}
+                onChange={field.onChange}
+              />
+            )}
+          />
+          {pluginsFilterEnabled && (
+            <>
+              <Label>
+                <Trans i18nKey="alerting.rules-filter.plugin-rules">Plugin rules</Trans>
+              </Label>
+              <Controller
+                name="plugins"
+                control={control}
+                render={({ field }) => (
+                  <RadioButtonGroup<AdvancedFilters['plugins']>
+                    options={[
+                      { label: t('alerting.rules-filter.label.show', 'Show'), value: 'show' },
+                      { label: t('alerting.rules-filter.label.hide', 'Hide'), value: 'hide' },
+                    ]}
+                    value={field.value}
+                    onChange={field.onChange}
+                  />
+                )}
+              />
+            </>
+          )}
+        </div>
+        <Stack direction="row" alignItems="center">
+          <Button type="reset" variant="secondary" data-testid="filter-clear-button">
+            <Trans i18nKey="common.clear">Clear</Trans>
+          </Button>
+          <Button type="submit" data-testid="filter-apply-button">
+            <Trans i18nKey="common.apply">Apply</Trans>
+          </Button>
+        </Stack>
       </Stack>
-    </Stack>
+    </form>
   );
 };
 
-type TableColumns = {
-  name: string;
-  default?: boolean;
-};
-
-const SavedSearches = () => {
-  const applySearch = useCallback((name: string) => {}, []);
+function SearchQueryHelp() {
+  const styles = useStyles2(helpStyles);
 
   return (
-    <Stack direction="column" gap={2} alignItems="flex-end">
-      <Button variant="secondary" size="sm">
-        <Trans i18nKey="alerting.search.save-query">Save current search</Trans>
-      </Button>
-      <InteractiveTable<TableColumns>
-        columns={[
-          {
-            id: 'name',
-            header: 'Saved search name',
-            cell: ({ row }) => (
-              <Stack alignItems="center">
-                {row.original.name}
-                {row.original.default ? (
-                  <Badge text={t('alerting.saved-searches.text-default', 'Default')} color="blue" />
-                ) : null}
-              </Stack>
-            ),
-          },
-          {
-            id: 'actions',
-            cell: ({ row }) => (
-              <Stack direction="row" alignItems="center">
-                <Button variant="secondary" fill="outline" size="sm" onClick={() => applySearch(row.original.name)}>
-                  <Trans i18nKey="common.apply">Apply</Trans>
-                </Button>
-                <MoreButton size="sm" fill="outline" />
-              </Stack>
-            ),
-          },
-        ]}
-        data={[
-          {
-            name: 'My saved search',
-            default: true,
-          },
-          {
-            name: 'Another saved search',
-          },
-          {
-            name: 'This one has a really long name and some emojis too 🥒',
-          },
-        ]}
-        getRowId={(row) => row.name}
-      />
-      <Button variant="secondary">
-        <Trans i18nKey="common.close">Close</Trans>
-      </Button>
-    </Stack>
+    <div>
+      <div>
+        <Trans i18nKey="alerting.search-query-help.search-syntax">
+          Search syntax allows to query alert rules by the parameters defined below.
+        </Trans>
+      </div>
+      <hr />
+      <div className={styles.grid}>
+        <div>
+          <Trans i18nKey="alerting.search-query-help.filter-type">Filter type</Trans>
+        </div>
+        <div>
+          <Trans i18nKey="alerting.search-query-help.expression">Expression</Trans>
+        </div>
+        <HelpRow
+          title={t('alerting.search-query-help.title-datasources', 'Datasources')}
+          expr="datasource:mimir datasource:prometheus"
+        />
+        <HelpRow
+          title={t('alerting.search-query-help.title-folder-namespace', 'Folder/Namespace')}
+          expr="namespace:global"
+        />
+        <HelpRow title={t('alerting.search-query-help.title-group', 'Group')} expr="group:cpu-usage" />
+        <HelpRow title={t('alerting.search-query-help.title-rule', 'Rule')} expr='rule:"cpu 80%"' />
+        <HelpRow title={t('alerting.search-query-help.title-labels', 'Labels')} expr="label:team=A label:cluster=a1" />
+        <HelpRow title={t('alerting.search-query-help.title-state', 'State')} expr="state:firing|normal|pending" />
+        <HelpRow title={t('alerting.search-query-help.title-type', 'Type')} expr="type:alerting|recording" />
+        <HelpRow title={t('alerting.search-query-help.title-health', 'Health')} expr="health:ok|nodata|error" />
+        <HelpRow
+          title={t('alerting.search-query-help.title-dashboard-uid', 'Dashboard UID')}
+          expr="dashboard:eadde4c7-54e6-4964-85c0-484ab852fd04"
+        />
+        <HelpRow
+          title={t('alerting.search-query-help.title-contact-point', 'Contact point')}
+          expr="contactPoint:slack"
+        />
+      </div>
+    </div>
   );
-};
+}
+
+function HelpRow({ title, expr }: { title: string; expr: string }) {
+  const styles = useStyles2(helpStyles);
+
+  return (
+    <>
+      <div>{title}</div>
+      <code className={styles.code}>{expr}</code>
+    </>
+  );
+}
+
+const helpStyles = (theme: GrafanaTheme2) => ({
+  grid: css({
+    display: 'grid',
+    gridTemplateColumns: 'max-content auto',
+    gap: theme.spacing(1),
+    alignItems: 'center',
+  }),
+  code: css({
+    display: 'block',
+    textAlign: 'center',
+  }),
+});
 
 function getStyles(theme: GrafanaTheme2) {
   return {
     content: css({
       padding: theme.spacing(1),
-      maxWidth: 500,
     }),
-    fixTabsMargin: css({
-      marginTop: theme.spacing(-1),
+    grid: css({
+      display: 'grid',
+      gridTemplateColumns: 'auto 1fr',
+      alignItems: 'center',
+      gap: theme.spacing(2),
     }),
   };
 }
diff --git a/public/app/features/alerting/unified/components/rules/Filter/RulesViewModeSelector.tsx b/public/app/features/alerting/unified/components/rules/Filter/RulesViewModeSelector.tsx
index 661507d6ac8..f467a1395fa 100644
--- a/public/app/features/alerting/unified/components/rules/Filter/RulesViewModeSelector.tsx
+++ b/public/app/features/alerting/unified/components/rules/Filter/RulesViewModeSelector.tsx
@@ -13,8 +13,8 @@ export type SupportedView = 'list' | 'grouped';
 type LegacySupportedView = 'list' | 'grouped' | 'state';
 
 const ViewOptions: Array<SelectableValue<SupportedView>> = [
-  { icon: 'folder', label: 'Grouped', value: 'grouped' },
-  { icon: 'list-ul', label: 'List', value: 'list' },
+  { icon: 'folder', value: 'grouped', label: 'Grouped' },
+  { icon: 'list-ul', value: 'list', label: 'List' },
 ];
 
 interface RulesViewModeSelectorV2Props {
diff --git a/public/app/features/alerting/unified/components/rules/Filter/useRuleFilterAutocomplete.ts b/public/app/features/alerting/unified/components/rules/Filter/useRuleFilterAutocomplete.ts
new file mode 100644
index 00000000000..8210080a1d8
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/Filter/useRuleFilterAutocomplete.ts
@@ -0,0 +1,186 @@
+import { useMemo } from 'react';
+
+import { DataSourceInstanceSettings } from '@grafana/data';
+import { t } from '@grafana/i18n';
+import { getDataSourceSrv } from '@grafana/runtime';
+import { ComboboxOption } from '@grafana/ui';
+import { GrafanaPromRuleGroupDTO } from 'app/types/unified-alerting-dto';
+
+import { alertRuleApi } from '../../../api/alertRuleApi';
+import { GRAFANA_RULER_CONFIG } from '../../../api/featureDiscoveryApi';
+import { prometheusApi } from '../../../api/prometheusApi';
+import { useGetLabelsFromDataSourceName } from '../../../components/rule-editor/useAlertRuleSuggestions';
+import { GRAFANA_RULES_SOURCE_NAME, getRulesDataSources } from '../../../utils/datasource';
+
+export function useNamespaceAndGroupOptions(): {
+  namespaceOptions: Array<ComboboxOption<string>>;
+  allGroupNames: string[];
+  isLoadingNamespaces: boolean;
+  namespacePlaceholder: string;
+  groupPlaceholder: string;
+} {
+  const { currentData: grafanaPromRulesResponse, isLoading: isLoadingGrafanaPromRules } =
+    prometheusApi.endpoints.getGrafanaGroups.useQuery({
+      limitAlerts: 0,
+      groupLimit: 1000,
+    });
+
+  // Transform Grafana groups to namespace structure
+  const grafanaPromRules = useMemo(() => {
+    const groups = grafanaPromRulesResponse?.data?.groups ?? [];
+
+    const namespaceMap = new Map<string, { name: string; groups: GrafanaPromRuleGroupDTO[] }>();
+    groups.forEach((group) => {
+      const namespaceName = group.file || 'default';
+      const existing = namespaceMap.get(namespaceName);
+      if (existing) {
+        existing.groups.push(group);
+      } else {
+        namespaceMap.set(namespaceName, { name: namespaceName, groups: [group] });
+      }
+    });
+
+    return Array.from(namespaceMap.values());
+  }, [grafanaPromRulesResponse]);
+
+  const { isLoading: isLoadingGrafanaRulerRules } = alertRuleApi.endpoints.rulerRules.useQuery({
+    rulerConfig: GRAFANA_RULER_CONFIG,
+  });
+
+  const externalDataSources = useMemo(getRulesDataSources, []);
+
+  const externalPromRulesQueries = externalDataSources.map((ds) =>
+    prometheusApi.endpoints.getGroups.useQuery({
+      ruleSource: { uid: ds.uid },
+      excludeAlerts: true,
+      groupLimit: 500,
+    })
+  );
+
+  const isLoadingNamespaces = useMemo(() => {
+    return (
+      isLoadingGrafanaPromRules ||
+      isLoadingGrafanaRulerRules ||
+      externalPromRulesQueries.some((query) => query.isLoading)
+    );
+  }, [isLoadingGrafanaPromRules, isLoadingGrafanaRulerRules, externalPromRulesQueries]);
+
+  const namespaceOptions = useMemo((): Array<ComboboxOption<string>> => {
+    const grafanaFolders: Array<ComboboxOption<string>> = [];
+    const externalNamespaces: Array<ComboboxOption<string>> = [];
+
+    // Grafana folders
+    grafanaPromRules.forEach((namespace) => {
+      grafanaFolders.push({
+        label: namespace.name,
+        value: namespace.name,
+        description: t('alerting.rules-filter.grafana-folder', 'Grafana folder'),
+      });
+    });
+
+    // External namespaces (dedupe by file)
+    externalPromRulesQueries.forEach((query) => {
+      const namespaces = new Set<string>();
+      query.currentData?.data?.groups?.forEach((group) => {
+        namespaces.add(group.file || 'default');
+      });
+
+      namespaces.forEach((namespaceName) => {
+        if (namespaceName.includes('/') && (namespaceName.endsWith('.yml') || namespaceName.endsWith('.yaml'))) {
+          const filename = namespaceName.split('/').pop() || namespaceName;
+          const maxDescriptionLength = 100;
+          const truncatedDescription =
+            namespaceName.length > maxDescriptionLength
+              ? `${namespaceName.substring(0, maxDescriptionLength)}...`
+              : namespaceName;
+          externalNamespaces.push({ label: filename, value: namespaceName, description: truncatedDescription });
+        } else {
+          const maxLength = 50;
+          const maxDescriptionLength = 100;
+          const truncatedName =
+            namespaceName.length > maxLength ? `${namespaceName.substring(0, maxLength)}...` : namespaceName;
+          const truncatedDescription =
+            namespaceName.length > maxDescriptionLength
+              ? `${namespaceName.substring(0, maxDescriptionLength)}...`
+              : namespaceName;
+          externalNamespaces.push({ label: truncatedName, value: namespaceName, description: truncatedDescription });
+        }
+      });
+    });
+
+    const collator = new Intl.Collator();
+    grafanaFolders.sort((a, b) => collator.compare(a.label ?? '', b.label ?? ''));
+    externalNamespaces.sort((a, b) => collator.compare(a.label ?? '', b.label ?? ''));
+
+    return [...grafanaFolders, ...externalNamespaces];
+  }, [grafanaPromRules, externalPromRulesQueries]);
+
+  const allGroupNames = useMemo(() => {
+    const groupSet = new Set<string>();
+    grafanaPromRules.forEach((namespace) => {
+      namespace.groups.forEach((group) => groupSet.add(group.name));
+    });
+    externalPromRulesQueries.forEach((query) => {
+      query.currentData?.data?.groups?.forEach((group) => {
+        groupSet.add(group.name);
+      });
+    });
+    return Array.from(groupSet).sort();
+  }, [grafanaPromRules, externalPromRulesQueries]);
+
+  const namespacePlaceholder = useMemo(() => {
+    if (isLoadingNamespaces) {
+      return t('common.loading', 'Loading...');
+    }
+    if (namespaceOptions.length === 0) {
+      return t('alerting.rules-filter.no-namespaces', 'No folders available');
+    }
+    return t('alerting.rules-filter.filter-options.placeholder-namespace', 'Select namespace');
+  }, [isLoadingNamespaces, namespaceOptions.length]);
+
+  const groupPlaceholder = useMemo(() => {
+    if (isLoadingNamespaces) {
+      return t('common.loading', 'Loading...');
+    }
+    if (allGroupNames.length === 0) {
+      return t('alerting.rules-filter.no-groups', 'No groups available');
+    }
+    return t('grafana.select-group', 'Select group');
+  }, [isLoadingNamespaces, allGroupNames.length]);
+
+  return { namespaceOptions, allGroupNames, isLoadingNamespaces, namespacePlaceholder, groupPlaceholder };
+}
+
+export function useLabelOptions(): {
+  labelOptions: Array<ComboboxOption<string>>;
+  isLoadingGrafanaLabels: boolean;
+} {
+  const { labels: grafanaLabels, isLoading: isLoadingGrafanaLabels } =
+    useGetLabelsFromDataSourceName(GRAFANA_RULES_SOURCE_NAME);
+
+  const labelOptions = useMemo((): Array<ComboboxOption<string>> => {
+    const infoOption: ComboboxOption<string> = {
+      label: t('label-dropdown-info', "Can't find your label? Enter it manually"),
+      value: '__GRAFANA_LABEL_DROPDOWN_INFO__',
+      infoOption: true,
+    };
+
+    const selectableOptions = Array.from(grafanaLabels.entries())
+      .flatMap(([key, values]) =>
+        Array.from(values).map((value: string) => ({ label: `${key}=${value}`, value: `${key}=${value}` }))
+      )
+      .sort((a, b) => new Intl.Collator().compare(a.label, b.label));
+
+    return [...selectableOptions, infoOption];
+  }, [grafanaLabels]);
+
+  return { labelOptions, isLoadingGrafanaLabels };
+}
+
+export function useAlertingDataSourceOptions(): Array<ComboboxOption<string>> {
+  return useMemo(() => {
+    return getDataSourceSrv()
+      .getList({ alerting: true })
+      .map((ds: DataSourceInstanceSettings) => ({ label: ds.name, value: ds.name }));
+  }, []);
+}
diff --git a/public/app/features/alerting/unified/components/rules/Filter/utils.ts b/public/app/features/alerting/unified/components/rules/Filter/utils.ts
new file mode 100644
index 00000000000..049634634af
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/Filter/utils.ts
@@ -0,0 +1,81 @@
+import { useEffect, useRef } from 'react';
+
+import { useAlertingHomePageExtensions } from '../../../plugins/useAlertingHomePageExtensions';
+import { RulesFilter } from '../../../search/rulesSearchParser';
+
+import { AdvancedFilters } from './RulesFilter.v2';
+
+export function formAdvancedFiltersToRuleFilter(values: AdvancedFilters): RulesFilter {
+  return {
+    freeFormWords: [],
+    ...values,
+    namespace: values.namespace || undefined,
+    groupName: values.groupName || undefined,
+    contactPoint: values.contactPoint || undefined,
+    ruleHealth: values.ruleHealth === '*' ? undefined : values.ruleHealth,
+    ruleState: values.ruleState === '*' ? undefined : values.ruleState,
+    ruleType: values.ruleType === '*' ? undefined : values.ruleType,
+    plugins: values.plugins === 'show' ? undefined : 'hide',
+  };
+}
+
+export const emptyAdvancedFilters: AdvancedFilters = {
+  namespace: null,
+  groupName: null,
+  ruleName: undefined,
+  ruleType: '*',
+  ruleState: '*',
+  dataSourceNames: [],
+  labels: [],
+  ruleHealth: '*',
+  dashboardUid: undefined,
+  plugins: 'show',
+  contactPoint: null,
+};
+
+export function searchQueryToDefaultValues(filterState: RulesFilter): AdvancedFilters {
+  return {
+    namespace: filterState.namespace ?? null,
+    groupName: filterState.groupName ?? null,
+    ruleName: filterState.ruleName,
+    ruleType: filterState.ruleType ?? '*',
+    ruleState: filterState.ruleState ?? '*',
+    dataSourceNames: filterState.dataSourceNames,
+    labels: filterState.labels,
+    ruleHealth: filterState.ruleHealth ?? '*',
+    dashboardUid: filterState.dashboardUid,
+    plugins: filterState.plugins ?? 'show',
+    contactPoint: filterState.contactPoint ?? null,
+  };
+}
+
+export function usePortalContainer(zIndex: number): HTMLElement | undefined {
+  const containerRef = useRef<HTMLDivElement | null>(null);
+
+  useEffect(() => {
+    const container = document.createElement('div');
+    Object.assign(container.style, {
+      position: 'fixed',
+      top: '0',
+      left: '0',
+      width: '100%',
+      height: '100%',
+      pointerEvents: 'none',
+      zIndex: String(zIndex),
+    });
+
+    document.body.appendChild(container);
+    containerRef.current = container;
+
+    return () => {
+      container.remove();
+    };
+  }, [zIndex]);
+
+  return containerRef.current || undefined;
+}
+
+export function usePluginsFilterStatus() {
+  const { components } = useAlertingHomePageExtensions();
+  return { pluginsFilterEnabled: components.length > 0 };
+}
diff --git a/public/app/features/alerting/unified/components/rules/RulesFilterV2.test.tsx b/public/app/features/alerting/unified/components/rules/RulesFilterV2.test.tsx
new file mode 100644
index 00000000000..ecff8085f42
--- /dev/null
+++ b/public/app/features/alerting/unified/components/rules/RulesFilterV2.test.tsx
@@ -0,0 +1,366 @@
+import { render, screen } from 'test/test-utils';
+import { byRole, byTestId } from 'testing-library-selector';
+
+import { ComponentTypeWithExtensionMeta, PluginExtensionComponentMeta, PluginExtensionTypes } from '@grafana/data';
+import { config, locationService, setPluginComponentsHook } from '@grafana/runtime';
+import { setupMswServer } from 'app/features/alerting/unified/mockApi';
+import { grantUserPermissions } from 'app/features/alerting/unified/mocks';
+import { AccessControlAction } from 'app/types/accessControl';
+import { PromAlertingRuleState } from 'app/types/unified-alerting-dto';
+
+import * as analytics from '../../Analytics';
+import { useRulesFilter } from '../../hooks/useFilteredRules';
+import { RulesFilter as RulesFilterType } from '../../search/rulesSearchParser';
+import { setupPluginsExtensionsHook } from '../../testSetup/plugins';
+
+// Grant permission before importing the component since permission check happens at module level
+grantUserPermissions([AccessControlAction.AlertingReceiversRead]);
+
+let mockFilterState: RulesFilterType = {
+  ruleName: '',
+  ruleState: undefined,
+  dataSourceNames: [],
+  freeFormWords: [],
+  labels: [],
+};
+let mockSearchQuery = '';
+const mockUpdateFilters = jest.fn();
+const mockSetSearchQuery = jest.fn();
+const mockClearAll = jest.fn();
+
+jest.mock('../../hooks/useFilteredRules', () => ({
+  useRulesFilter: jest.fn(() => ({
+    searchQuery: mockSearchQuery,
+    filterState: mockFilterState,
+    updateFilters: mockUpdateFilters,
+    setSearchQuery: mockSetSearchQuery,
+    clearAll: mockClearAll,
+    hasActiveFilters: false,
+    activeFilters: [],
+  })),
+}));
+
+import RulesFilter from './Filter/RulesFilter';
+import RulesFilterV2 from './Filter/RulesFilter.v2';
+
+const useRulesFilterMock = useRulesFilter as jest.MockedFunction<typeof useRulesFilter>;
+
+setupMswServer();
+
+jest.spyOn(analytics, 'trackFilterButtonClick');
+jest.spyOn(analytics, 'trackFilterButtonApplyClick');
+jest.spyOn(analytics, 'trackFilterButtonClearClick');
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  getDataSourceSrv: () => ({
+    getList: jest.fn().mockReturnValue([
+      { name: 'Prometheus', uid: 'prometheus-uid' },
+      { name: 'Loki', uid: 'loki-uid' },
+    ]),
+  }),
+}));
+
+jest.mock('./MultipleDataSourcePicker', () => {
+  const original = jest.requireActual('./MultipleDataSourcePicker');
+  return {
+    ...original,
+    MultipleDataSourcePicker: () => null,
+  };
+});
+
+jest.mock('../../plugins/useAlertingHomePageExtensions', () => ({
+  useAlertingHomePageExtensions: jest.fn(() => {
+    const { usePluginComponents } = jest.requireActual('@grafana/runtime');
+    const { PluginExtensionPoints } = jest.requireActual('@grafana/data');
+    return usePluginComponents({
+      extensionPointId: PluginExtensionPoints.AlertingHomePage,
+      limitPerPlugin: 1,
+    });
+  }),
+}));
+
+setupPluginsExtensionsHook();
+
+// Helper function to create mock plugin components
+function createMockComponent(pluginId: string): ComponentTypeWithExtensionMeta<{}> {
+  function MockComponent() {
+    return <div>Test Plugin Component</div>;
+  }
+
+  MockComponent.meta = {
+    id: `test-component-${pluginId}`,
+    pluginId,
+    title: 'Test Component',
+    description: 'Test plugin component',
+    type: PluginExtensionTypes.component,
+  } satisfies PluginExtensionComponentMeta;
+
+  return MockComponent as ComponentTypeWithExtensionMeta<{}>;
+}
+
+const ui = {
+  searchInput: byTestId('search-query-input'),
+  filterButton: byRole('button', { name: 'Filter' }),
+  applyButton: byTestId('filter-apply-button'),
+  clearButton: byTestId('filter-clear-button'),
+  ruleNameInput: byTestId('rule-name-input'),
+};
+
+beforeEach(() => {
+  locationService.replace({ search: '' });
+  jest.clearAllMocks();
+
+  mockFilterState = {
+    ruleName: '',
+    ruleState: undefined,
+    dataSourceNames: [],
+    freeFormWords: [],
+    labels: [],
+  };
+  mockSearchQuery = '';
+  mockUpdateFilters.mockClear();
+  mockSetSearchQuery.mockClear();
+  mockClearAll.mockClear();
+  mockSetSearchQuery.mockImplementation(() => {});
+
+  // Reset plugin components hook to default (no plugins)
+  setPluginComponentsHook(() => ({
+    components: [],
+    isLoading: false,
+  }));
+});
+
+describe('RulesFilter Feature Flag', () => {
+  const originalFeatureToggle = config.featureToggles.alertingFilterV2;
+
+  afterEach(() => {
+    config.featureToggles.alertingFilterV2 = originalFeatureToggle;
+  });
+
+  it('Should render RulesFilterV2 when alertingFilterV2 feature flag is enabled', async () => {
+    config.featureToggles.alertingFilterV2 = true;
+
+    render(<RulesFilter />);
+
+    // Wait for suspense to resolve and check that the V2 filter button is present
+    await screen.findByRole('button', { name: 'Filter' });
+    expect(ui.filterButton.get()).toBeInTheDocument();
+    expect(ui.searchInput.get()).toBeInTheDocument();
+  });
+
+  it('Should render RulesFilterV1 when alertingFilterV2 feature flag is disabled', async () => {
+    config.featureToggles.alertingFilterV2 = false;
+
+    render(<RulesFilter />);
+
+    // Wait for suspense to resolve and check V1 structure
+    await screen.findByText('Search');
+
+    // V1 has search input but no V2-style filter button
+    expect(ui.searchInput.get()).toBeInTheDocument();
+    expect(ui.filterButton.query()).not.toBeInTheDocument();
+
+    // V1 has a help icon next to the search input
+    expect(screen.getByText('Search')).toBeInTheDocument();
+  });
+});
+
+describe('RulesFilterV2', () => {
+  it('Should render component without crashing', () => {
+    render(<RulesFilterV2 />);
+
+    expect(ui.searchInput.get()).toBeInTheDocument();
+    expect(ui.filterButton.get()).toBeInTheDocument();
+  });
+
+  it('Should allow typing in search input', async () => {
+    const { user } = render(<RulesFilterV2 />);
+
+    await user.type(ui.searchInput.get(), 'test search');
+    expect(ui.searchInput.get()).toHaveValue('test search');
+  });
+
+  it('Should open filter popup when filter button is clicked', async () => {
+    const { user } = render(<RulesFilterV2 />);
+    await user.click(ui.filterButton.get());
+    expect(screen.getByRole('button', { name: 'Apply' })).toBeInTheDocument();
+  });
+
+  it('Should close popup when clicking outside', async () => {
+    const { user } = render(<RulesFilterV2 />);
+    await user.click(ui.filterButton.get());
+    expect(screen.getByRole('button', { name: 'Apply' })).toBeInTheDocument();
+    await user.click(document.body);
+    expect(screen.queryByRole('button', { name: 'Apply' })).not.toBeInTheDocument();
+  });
+
+  it('Should clear filters and search field when clicking clear button', async () => {
+    const { user } = render(<RulesFilterV2 />);
+    await user.type(ui.searchInput.get(), 'test');
+    expect(ui.searchInput.get()).toHaveValue('test');
+    await user.click(ui.filterButton.get());
+
+    await user.click(ui.clearButton.get());
+    expect(ui.ruleNameInput.get()).toHaveValue('');
+
+    // Check that setSearchQuery was called with undefined to clear the search
+    expect(mockSetSearchQuery).toHaveBeenCalledWith(undefined);
+  });
+
+  it('Should populate search field with query string when filters are applied via rule name', async () => {
+    const { user } = render(<RulesFilterV2 />);
+
+    await user.click(ui.filterButton.get());
+
+    await user.type(ui.ruleNameInput.get(), 'test');
+
+    // Mock the setSearchQuery to update mockSearchQuery
+    mockSetSearchQuery.mockImplementation((newQuery: string | undefined) => {
+      mockSearchQuery = newQuery ?? '';
+    });
+
+    await user.click(ui.applyButton.get());
+
+    // Check that setSearchQuery was called with the expected query
+    expect(mockSetSearchQuery).toHaveBeenCalledWith('rule:test');
+  });
+
+  it('Should parse search query and call updateFilters when user types directly in search field', async () => {
+    const { user, rerender } = render(<RulesFilterV2 />);
+
+    // Type a search query directly into the search input
+    await user.type(ui.searchInput.get(), 'rule:test state:firing');
+
+    // Trigger the onBlur handler by clicking elsewhere
+    await user.click(document.body);
+
+    // Verify updateFilters was called with the parsed filter
+    expect(mockUpdateFilters).toHaveBeenCalledWith({
+      dataSourceNames: [],
+      freeFormWords: [],
+      labels: [],
+      ruleName: 'test',
+      ruleState: 'firing',
+    });
+
+    // Simulate the filter state update by updating our mock
+    mockFilterState = {
+      dataSourceNames: [],
+      freeFormWords: [],
+      labels: [],
+      ruleName: 'test',
+      ruleState: PromAlertingRuleState.Firing,
+    };
+
+    // Update the mock to return the new state
+    useRulesFilterMock.mockReturnValue({
+      searchQuery: mockSearchQuery,
+      filterState: mockFilterState,
+      updateFilters: mockUpdateFilters,
+      setSearchQuery: mockSetSearchQuery,
+      clearAll: mockClearAll,
+      hasActiveFilters: false,
+      activeFilters: [],
+    });
+
+    // Force a re-render to pick up the new filter state
+    rerender(<RulesFilterV2 />);
+
+    // Open the filter popup
+    await user.click(ui.filterButton.get());
+
+    expect(ui.ruleNameInput.get()).toHaveValue('test');
+
+    const firingRadio = screen.getByRole('radio', { name: 'Firing' });
+    expect(firingRadio).toBeChecked();
+  });
+
+  it('Should handle free-form rule name search in query string', async () => {
+    const { user } = render(<RulesFilterV2 />);
+
+    // Type a free-form search (no filter prefix)
+    await user.type(ui.searchInput.get(), 'test');
+
+    // Trigger the search by pressing Enter
+    await user.keyboard('{Enter}');
+
+    // The search input should retain the value
+    expect(ui.searchInput.get()).toHaveValue('test');
+  });
+
+  describe('Conditional Fields', () => {
+    it('Should show contact point field when user has proper permissions', async () => {
+      // Permission is already mocked to true at module level
+      const { user } = render(<RulesFilterV2 />);
+      await user.click(ui.filterButton.get());
+      expect(screen.getByText('Contact point')).toBeInTheDocument();
+    });
+
+    it('Should show plugin filter when plugins are enabled', async () => {
+      // Mock plugin components to simulate plugins available
+      setPluginComponentsHook(() => ({
+        components: [createMockComponent('test-plugin')],
+        isLoading: false,
+      }));
+
+      const { user } = render(<RulesFilterV2 />);
+      await user.click(ui.filterButton.get());
+      expect(screen.getByText('Plugin rules')).toBeInTheDocument();
+    });
+
+    it('Should hide plugin filter when no plugins are available', async () => {
+      // Mock plugin components to return no components
+      setPluginComponentsHook(() => ({
+        components: [],
+        isLoading: false,
+      }));
+
+      const { user } = render(<RulesFilterV2 />);
+      await user.click(ui.filterButton.get());
+      expect(screen.queryByText('Plugin rules')).not.toBeInTheDocument();
+    });
+  });
+
+  describe('Analytics Tracking', () => {
+    it('Should track filter button clicks when opening popup', async () => {
+      const { user } = render(<RulesFilterV2 />);
+
+      await user.click(ui.filterButton.get());
+
+      expect(analytics.trackFilterButtonClick).toHaveBeenCalledTimes(1);
+    });
+
+    it('Should track clear button clicks', async () => {
+      const { user } = render(<RulesFilterV2 />);
+
+      await user.click(ui.filterButton.get());
+      await user.click(ui.clearButton.get());
+
+      expect(analytics.trackFilterButtonClearClick).toHaveBeenCalledTimes(1);
+    });
+
+    it('Should track apply button clicks with filter values', async () => {
+      const { user } = render(<RulesFilterV2 />);
+
+      await user.click(ui.filterButton.get());
+      await user.click(ui.applyButton.get());
+
+      expect(analytics.trackFilterButtonApplyClick).toHaveBeenCalledTimes(1);
+    });
+
+    it('Should not track filter button click when filter button is clicked to close popup', async () => {
+      const { user } = render(<RulesFilterV2 />);
+
+      await user.click(ui.filterButton.get());
+      expect(analytics.trackFilterButtonClick).toHaveBeenCalledTimes(1);
+
+      await user.click(document.body);
+
+      jest.clearAllMocks();
+
+      await user.click(ui.filterButton.get());
+      expect(analytics.trackFilterButtonClick).toHaveBeenCalledTimes(1);
+    });
+  });
+});
diff --git a/public/app/features/alerting/unified/hooks/useFilteredRules.ts b/public/app/features/alerting/unified/hooks/useFilteredRules.ts
index 544b0db9975..fb78380b180 100644
--- a/public/app/features/alerting/unified/hooks/useFilteredRules.ts
+++ b/public/app/features/alerting/unified/hooks/useFilteredRules.ts
@@ -80,7 +80,11 @@ export function useRulesFilter() {
     }
   }, [queryParams, updateFilters, filterState, updateQueryParams]);
 
-  return { filterState, hasActiveFilters, activeFilters, searchQuery, setSearchQuery, updateFilters };
+  const clearAll = useCallback(() => {
+    updateQueryParams({ search: undefined });
+  }, [updateQueryParams]);
+
+  return { filterState, hasActiveFilters, searchQuery, setSearchQuery, updateFilters, clearAll, activeFilters };
 }
 
 export const useFilteredRules = (namespaces: CombinedRuleNamespace[], filterState: RulesFilter) => {
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index c38a2f7a770..4a294622625 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -1244,20 +1244,6 @@
       "copy-code": "Copy code",
       "download": "Download"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Alert rule",
-        "all": "All",
-        "error": "Error",
-        "firing": "Firing",
-        "no-data": "No data",
-        "normal": "Normal",
-        "ok": "OK",
-        "pending": "Pending",
-        "recording-rule": "Recording rule",
-        "recovering": "Recovering"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "filtered-rule-list"
     },
@@ -2588,12 +2574,28 @@
       "delete-rule": {
         "success": "Rule successfully deleted"
       },
+      "health": {
+        "error": "Error",
+        "no-data": "No data",
+        "ok": "OK"
+      },
       "pause-rule": {
         "success": "Rule evaluation paused"
       },
       "resume-rule": {
         "success": "Rule evaluation resumed"
       },
+      "state": {
+        "firing": "Firing",
+        "normal": "Normal",
+        "pending": "Pending",
+        "recovering": "Recovering",
+        "unknown": "Unknown"
+      },
+      "type": {
+        "alert": "Alert rule",
+        "recording": "Recording rule"
+      },
       "update-rule": {
         "success": "Rule updated successfully"
       }
@@ -2601,20 +2603,29 @@
     "rules-filter": {
       "clear-filters": "Clear filters",
       "configured-alert-rules": "Data sources containing configured alert rules are Mimir or Loki data sources where alert rules are stored and evaluated in the data source itself.",
+      "contact-point-tooltip": "Filters alert rules which route directly to the selected contact point. Alert rules routed to notification policies will not be displayed.",
+      "contact-point-tooltip-title": "Contact point filter help",
       "dashboard": "Dashboard",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Search by data sources help",
       "filter-options": {
-        "aria-label-show-filters": "Show filters",
-        "label-custom-filter": "Custom filter",
-        "label-saved-searches": "Saved searches"
+        "aria-label": "Filter options",
+        "aria-label-show-filters": "Filter",
+        "placeholder-namespace": "Select namespace",
+        "placeholder-search-input": "Search by name or enter filter query..."
       },
+      "grafana-folder": "Grafana folder",
       "health": "Health",
       "label": {
         "hide": "Hide",
         "show": "Show"
       },
       "manage-alerts": "In these data sources, you can select Manage alerts via Alerting UI to be able to manage these alert rules in the Grafana UI as well as in the data source where they were configured.",
+      "no-groups": "No groups available",
+      "no-namespaces": "No folders available",
       "placeholder-all-data-sources": "All data sources",
+      "placeholder-contact-point": "Select contact point",
+      "placeholder-data-sources": "Select data sources",
+      "placeholder-labels": "Select labels",
       "plugin-rules": "Plugin rules",
       "rule-type": "Rule type",
       "rulesSearchInput-placeholder-search": "Search",
@@ -2629,9 +2640,6 @@
       "text-federated": "Federated",
       "text-provisioned": "Provisioned"
     },
-    "saved-searches": {
-      "text-default": "Default"
-    },
     "search": {
       "property": {
         "data-source": "Data source",
@@ -2639,11 +2647,10 @@
         "labels": "Labels",
         "namespace": "Folder / Namespace",
         "rule-health": "Health",
-        "rule-name": "Alerting rule name",
+        "rule-name": "Rule name",
         "rule-type": "Type",
         "state": "State"
-      },
-      "save-query": "Save current search"
+      }
     },
     "search-field-input": {
       "clear": "Clear",
@@ -4096,10 +4103,10 @@
     }
   },
   "common": {
+    "all": "All",
     "apply": "Apply",
     "cancel": "Cancel",
     "clear": "Clear",
-    "close": "Close",
     "collapse": "Collapse",
     "edit": "Edit",
     "help": "Help",
@@ -7874,7 +7881,8 @@
       "edit-pane": {
         "go-back": "Go back"
       }
-    }
+    },
+    "select-group": "Select group"
   },
   "grafana-data": {
     "valueFormats": {
@@ -9063,6 +9071,7 @@
       "sign-up": "Sign up"
     }
   },
+  "label-dropdown-info": "Can't find your label? Enter it manually",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Drag and drop to reorder",

From e285cc2ddcd690b931983c6aa2ac57dd1ada1f5b Mon Sep 17 00:00:00 2001
From: Bogdan Matei <bogdan.matei@grafana.com>
Date: Thu, 14 Aug 2025 17:25:50 +0300
Subject: [PATCH 181/243] Dashboard: Resume tracking changes after save from
 JSON model page (#109607)

---
 .../dashboard-scene/settings/JsonModelEditView.tsx         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx b/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx
index a109dd7f808..df8c7f5f0fd 100644
--- a/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx
+++ b/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx
@@ -73,7 +73,7 @@ export class JsonModelEditView extends SceneObjectBase<JsonModelEditViewState> i
       // FIXME: We could avoid this call by storing the entire dashboard DTO as initial dashboard scene instead of only the spec and metadata
       const dto = await getDashboardAPI('v2').getDashboardDTO(result.uid);
       newDashboardScene = transformSaveModelSchemaV2ToScene(dto);
-      const newState = sceneUtils.cloneSceneObjectState(newDashboardScene.state);
+      const newState = sceneUtils.cloneSceneObjectState(newDashboardScene.state, { key: dashboard.state.key });
 
       dashboard.pauseTrackingChanges();
       dashboard.setInitialSaveModel(dto.spec, dto.metadata);
@@ -84,7 +84,7 @@ export class JsonModelEditView extends SceneObjectBase<JsonModelEditViewState> i
         dashboard: jsonModel,
         meta: dashboard.state.meta,
       });
-      const newState = sceneUtils.cloneSceneObjectState(newDashboardScene.state);
+      const newState = sceneUtils.cloneSceneObjectState(newDashboardScene.state, { key: dashboard.state.key });
 
       dashboard.pauseTrackingChanges();
       dashboard.setInitialSaveModel(jsonModel, dashboard.state.meta);
@@ -92,6 +92,9 @@ export class JsonModelEditView extends SceneObjectBase<JsonModelEditViewState> i
     }
 
     this.setState({ jsonText: this.getJsonText() });
+
+    // We also need to resume tracking changes since the change handler won't see any later edit
+    dashboard.resumeTrackingChanges();
   };
 
   static Component = ({ model }: SceneComponentProps<JsonModelEditView>) => {

From 26fbb553f31e37dc18b2cc42eab76f71bf7059f1 Mon Sep 17 00:00:00 2001
From: Oscar Kilhed <oscar.kilhed@grafana.com>
Date: Thu, 14 Aug 2025 16:33:11 +0200
Subject: [PATCH 182/243] Dynamic dashboards: Fix height of disabled margin
 option pane categories (#109664)

Fix height of disabled margin option pane categories
---
 .../dashboard/components/PanelEditor/OptionsPaneCategory.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
index 6a682292586..7c65fa0c48a 100644
--- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
@@ -214,7 +214,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
   }),
   disabledIcon: css({
     color: theme.colors.text.disabled,
-    marginRight: theme.spacing(1),
+    margin: theme.spacing(1, 1, 1, 0),
   }),
   bodyNested: css({
     position: 'relative',

From a4edc270446f8c86c1d16973bc34abbe41fce90a Mon Sep 17 00:00:00 2001
From: Moustafa Baiou <moustafa.baiou@grafana.com>
Date: Tue, 12 Aug 2025 14:04:20 -0400
Subject: [PATCH 183/243] Alerting: Add store level pagination of rules

This reintroduces store level pagination, without using it in the prometheus API yet.

Related to #108633

Co-authored-by: William Wernert <william.wernert@grafana.com>
---
 pkg/services/ngalert/api/persist.go           |   1 +
 .../ngalert/api/prometheus/api_prometheus.go  | 151 +++++++++++++-
 pkg/services/ngalert/models/alert_rule.go     |  41 ++++
 pkg/services/ngalert/store/alert_rule.go      | 180 ++++++++++++++++
 pkg/services/ngalert/store/alert_rule_test.go | 197 +++++++++++++++++-
 pkg/services/ngalert/tests/fakes/rules.go     |  87 ++++++++
 6 files changed, 651 insertions(+), 6 deletions(-)

diff --git a/pkg/services/ngalert/api/persist.go b/pkg/services/ngalert/api/persist.go
index 2150edbe34c..5a60c2e0637 100644
--- a/pkg/services/ngalert/api/persist.go
+++ b/pkg/services/ngalert/api/persist.go
@@ -23,6 +23,7 @@ type RuleStore interface {
 	GetAlertRuleByUID(ctx context.Context, query *ngmodels.GetAlertRuleByUIDQuery) (*ngmodels.AlertRule, error)
 	GetAlertRulesGroupByRuleUID(ctx context.Context, query *ngmodels.GetAlertRulesGroupByRuleUIDQuery) ([]*ngmodels.AlertRule, error)
 	ListAlertRules(ctx context.Context, query *ngmodels.ListAlertRulesQuery) (ngmodels.RulesGroup, error)
+	ListAlertRulesByGroup(ctx context.Context, query *ngmodels.ListAlertRulesByGroupQuery) (ngmodels.RulesGroup, string, error)
 	ListDeletedRules(ctx context.Context, orgID int64) ([]*ngmodels.AlertRule, error)
 
 	// InsertAlertRules will insert all alert rules passed into the function
diff --git a/pkg/services/ngalert/api/prometheus/api_prometheus.go b/pkg/services/ngalert/api/prometheus/api_prometheus.go
index 2e753a6db1d..ed02dc780c5 100644
--- a/pkg/services/ngalert/api/prometheus/api_prometheus.go
+++ b/pkg/services/ngalert/api/prometheus/api_prometheus.go
@@ -30,7 +30,7 @@ import (
 
 type RuleStoreReader interface {
 	GetUserVisibleNamespaces(context.Context, int64, identity.Requester) (map[string]*folder.Folder, error)
-	ListAlertRules(ctx context.Context, query *ngmodels.ListAlertRulesQuery) (ngmodels.RulesGroup, error)
+	ListAlertRulesStore
 }
 
 type RuleGroupAccessControlService interface {
@@ -244,6 +244,10 @@ type ListAlertRulesStore interface {
 	ListAlertRules(ctx context.Context, query *ngmodels.ListAlertRulesQuery) (ngmodels.RulesGroup, error)
 }
 
+type ListAlertRulesStoreV2 interface {
+	ListAlertRulesByGroup(ctx context.Context, query *ngmodels.ListAlertRulesByGroupQuery) (ngmodels.RulesGroup, string, error)
+}
+
 func (srv PrometheusSrv) RouteGetRuleStatuses(c *contextmodel.ReqContext) response.Response {
 	// As we are using req.Form directly, this triggers a call to ParseForm() if needed.
 	c.Query("")
@@ -400,6 +404,151 @@ func RuleAlertStateMutatorGenerator(manager state.AlertInstanceManager) RuleAler
 	}
 }
 
+func PrepareRuleGroupStatusesV2(log log.Logger, store ListAlertRulesStoreV2, opts RuleGroupStatusesOptions, ruleStatusMutator RuleStatusMutator, alertStateMutator RuleAlertStateMutator, provenanceRecords map[string]ngmodels.Provenance) apimodels.RuleResponse {
+	ruleResponse := apimodels.RuleResponse{
+		DiscoveryBase: apimodels.DiscoveryBase{
+			Status: "success",
+		},
+		Data: apimodels.RuleDiscovery{
+			RuleGroups: []apimodels.RuleGroup{},
+		},
+	}
+
+	dashboardUID := opts.Query.Get("dashboard_uid")
+	panelID, err := getPanelIDFromQuery(opts.Query)
+	if err != nil {
+		ruleResponse.Status = "error"
+		ruleResponse.Error = fmt.Sprintf("invalid panel_id: %s", err.Error())
+		ruleResponse.ErrorType = apiv1.ErrBadData
+		return ruleResponse
+	}
+	if dashboardUID == "" && panelID != 0 {
+		ruleResponse.Status = "error"
+		ruleResponse.Error = "panel_id must be set with dashboard_uid"
+		ruleResponse.ErrorType = apiv1.ErrBadData
+		return ruleResponse
+	}
+
+	limitRulesPerGroup := getInt64WithDefault(opts.Query, "limit_rules", -1)
+	limitAlertsPerRule := getInt64WithDefault(opts.Query, "limit_alerts", -1)
+	matchers, err := getMatchersFromQuery(opts.Query)
+	if err != nil {
+		ruleResponse.Status = "error"
+		ruleResponse.Error = err.Error()
+		ruleResponse.ErrorType = apiv1.ErrBadData
+		return ruleResponse
+	}
+	stateFilterSet, err := getStatesFromQuery(opts.Query)
+	if err != nil {
+		ruleResponse.Status = "error"
+		ruleResponse.Error = err.Error()
+		ruleResponse.ErrorType = apiv1.ErrBadData
+		return ruleResponse
+	}
+
+	healthFilterSet, err := getHealthFromQuery(opts.Query)
+	if err != nil {
+		ruleResponse.Status = "error"
+		ruleResponse.Error = err.Error()
+		ruleResponse.ErrorType = apiv1.ErrBadData
+		return ruleResponse
+	}
+
+	var labelOptions []ngmodels.LabelOption
+	if !getBoolWithDefault(opts.Query, queryIncludeInternalLabels, false) {
+		labelOptions = append(labelOptions, ngmodels.WithoutInternalLabels())
+	}
+
+	if len(opts.AllowedNamespaces) == 0 {
+		log.Debug("User does not have access to any namespaces")
+		return ruleResponse
+	}
+
+	namespaceUIDs := make([]string, 0, len(opts.AllowedNamespaces))
+
+	folderUID := opts.Query.Get("folder_uid")
+	_, exists := opts.AllowedNamespaces[folderUID]
+	if folderUID != "" && exists {
+		namespaceUIDs = append(namespaceUIDs, folderUID)
+	} else {
+		for k := range opts.AllowedNamespaces {
+			namespaceUIDs = append(namespaceUIDs, k)
+		}
+	}
+
+	ruleGroups := opts.Query["rule_group"]
+
+	receiverName := opts.Query.Get("receiver_name")
+
+	maxGroups := getInt64WithDefault(opts.Query, "group_limit", -1)
+	nextToken := opts.Query.Get("group_next_token")
+
+	if maxGroups == 0 {
+		return ruleResponse
+	}
+
+	byGroupQuery := ngmodels.ListAlertRulesByGroupQuery{
+		ListAlertRulesQuery: ngmodels.ListAlertRulesQuery{
+			OrgID:         opts.OrgID,
+			NamespaceUIDs: namespaceUIDs,
+			DashboardUID:  dashboardUID,
+			PanelID:       panelID,
+			RuleGroups:    ruleGroups,
+			ReceiverName:  receiverName,
+		},
+		GroupLimit:         maxGroups,
+		GroupContinueToken: nextToken,
+	}
+	ruleList, continueToken, err := store.ListAlertRulesByGroup(opts.Ctx, &byGroupQuery)
+	if err != nil {
+		ruleResponse.Status = "error"
+		ruleResponse.Error = fmt.Sprintf("failure getting rules: %s", err.Error())
+		ruleResponse.ErrorType = apiv1.ErrServer
+		return ruleResponse
+	}
+
+	ruleNames := opts.Query["rule_name"]
+	ruleNamesSet := make(map[string]struct{}, len(ruleNames))
+	for _, rn := range ruleNames {
+		ruleNamesSet[rn] = struct{}{}
+	}
+
+	groupedRules := getGroupedRules(log, ruleList, ruleNamesSet, opts.AllowedNamespaces)
+	rulesTotals := make(map[string]int64, len(groupedRules))
+	for _, rg := range groupedRules {
+		ruleGroup, totals := toRuleGroup(log, rg.GroupKey, rg.Folder, rg.Rules, provenanceRecords, limitAlertsPerRule, stateFilterSet, matchers, labelOptions, ruleStatusMutator, alertStateMutator)
+		ruleGroup.Totals = totals
+		for k, v := range totals {
+			rulesTotals[k] += v
+		}
+
+		if len(stateFilterSet) > 0 {
+			filterRulesByState(ruleGroup, stateFilterSet)
+		}
+
+		if len(healthFilterSet) > 0 {
+			filterRulesByHealth(ruleGroup, healthFilterSet)
+		}
+
+		if limitRulesPerGroup > -1 && int64(len(ruleGroup.Rules)) > limitRulesPerGroup {
+			ruleGroup.Rules = ruleGroup.Rules[0:limitRulesPerGroup]
+		}
+
+		if len(ruleGroup.Rules) > 0 {
+			ruleResponse.Data.RuleGroups = append(ruleResponse.Data.RuleGroups, *ruleGroup)
+		}
+	}
+
+	ruleResponse.Data.NextToken = continueToken
+
+	// Only return Totals if there is no pagination
+	if maxGroups == -1 {
+		ruleResponse.Data.Totals = rulesTotals
+	}
+
+	return ruleResponse
+}
+
 func PrepareRuleGroupStatuses(log log.Logger, store ListAlertRulesStore, opts RuleGroupStatusesOptions, ruleStatusMutator RuleStatusMutator, alertStateMutator RuleAlertStateMutator, provenanceRecords map[string]ngmodels.Provenance) apimodels.RuleResponse {
 	ruleResponse := apimodels.RuleResponse{
 		DiscoveryBase: apimodels.DiscoveryBase{
diff --git a/pkg/services/ngalert/models/alert_rule.go b/pkg/services/ngalert/models/alert_rule.go
index e21527cd430..f888a2f8467 100644
--- a/pkg/services/ngalert/models/alert_rule.go
+++ b/pkg/services/ngalert/models/alert_rule.go
@@ -2,6 +2,7 @@ package models
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -879,6 +880,46 @@ type GetAlertRulesGroupByRuleUIDQuery struct {
 	OrgID int64
 }
 
+type RuleTypeFilter int
+
+const (
+	RuleTypeFilterAll RuleTypeFilter = iota
+	RuleTypeFilterAlerting
+	RuleTypeFilterRecording
+)
+
+type ListAlertRulesByGroupQuery struct {
+	ListAlertRulesQuery
+	RuleType RuleTypeFilter
+
+	GroupLimit         int64  // Number of groups to fetch
+	GroupContinueToken string // Token for per-group pagination
+}
+
+type GroupCursor struct {
+	NamespaceUID string `json:"n"`
+	RuleGroup    string `json:"g"`
+}
+
+func EncodeGroupCursor(c GroupCursor) string {
+	data, _ := json.Marshal(c)
+	return base64.URLEncoding.EncodeToString(data)
+}
+
+func DecodeGroupCursor(token string) (GroupCursor, error) {
+	var c GroupCursor
+	data, err := base64.URLEncoding.DecodeString(token)
+	if err != nil {
+		return c, fmt.Errorf("failed to decode group token: %w", err)
+	}
+
+	if err := json.Unmarshal(data, &c); err != nil {
+		return c, fmt.Errorf("failed to unmarshal group cursor: %w", err)
+	}
+
+	return c, nil
+}
+
 // ListAlertRulesQuery is the query for listing alert rules
 type ListAlertRulesQuery struct {
 	OrgID         int64
diff --git a/pkg/services/ngalert/store/alert_rule.go b/pkg/services/ngalert/store/alert_rule.go
index c535bbe4379..ab8676c754d 100644
--- a/pkg/services/ngalert/store/alert_rule.go
+++ b/pkg/services/ngalert/store/alert_rule.go
@@ -582,6 +582,186 @@ func (st DBstore) CountInFolders(ctx context.Context, orgID int64, folderUIDs []
 	return count, err
 }
 
+func (st DBstore) ListAlertRulesByGroup(ctx context.Context, query *ngmodels.ListAlertRulesByGroupQuery) (result ngmodels.RulesGroup, nextToken string, err error) {
+	err = st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
+		q := sess.Table("alert_rule")
+
+		if query.OrgID >= 0 {
+			q = q.Where("org_id = ?", query.OrgID)
+		}
+
+		if query.DashboardUID != "" {
+			q = q.Where("dashboard_uid = ?", query.DashboardUID)
+			if query.PanelID != 0 {
+				q = q.Where("panel_id = ?", query.PanelID)
+			}
+		}
+
+		if len(query.NamespaceUIDs) > 0 {
+			args, in := getINSubQueryArgs(query.NamespaceUIDs)
+			q = q.Where(fmt.Sprintf("namespace_uid IN (%s)", strings.Join(in, ",")), args...)
+		}
+
+		if len(query.RuleUIDs) > 0 {
+			args, in := getINSubQueryArgs(query.RuleUIDs)
+			q = q.Where(fmt.Sprintf("uid IN (%s)", strings.Join(in, ",")), args...)
+		}
+
+		var groupsMap map[string]struct{}
+		if len(query.RuleGroups) > 0 {
+			groupsMap = make(map[string]struct{})
+			args, in := getINSubQueryArgs(query.RuleGroups)
+			q = q.Where(fmt.Sprintf("rule_group IN (%s)", strings.Join(in, ",")), args...)
+			for _, group := range query.RuleGroups {
+				groupsMap[group] = struct{}{}
+			}
+		}
+
+		if query.ReceiverName != "" {
+			q, err = st.filterByContentInNotificationSettings(query.ReceiverName, q)
+			if err != nil {
+				return err
+			}
+		}
+
+		if query.TimeIntervalName != "" {
+			q, err = st.filterByContentInNotificationSettings(query.TimeIntervalName, q)
+			if err != nil {
+				return err
+			}
+		}
+
+		if query.HasPrometheusRuleDefinition != nil {
+			q, err = st.filterWithPrometheusRuleDefinition(*query.HasPrometheusRuleDefinition, q)
+			if err != nil {
+				return err
+			}
+		}
+
+		switch query.RuleType {
+		case ngmodels.RuleTypeFilterAlerting:
+			q = q.Where("record = ''")
+		case ngmodels.RuleTypeFilterRecording:
+			q = q.Where("record != ''")
+		case ngmodels.RuleTypeFilterAll:
+			// no additional filter
+		default:
+			return fmt.Errorf("unknown rule type filter %q", query.RuleType)
+		}
+
+		// Order by group first, then by rule index within group
+		q = q.Asc("namespace_uid", "rule_group", "rule_group_idx", "id")
+
+		var cursor ngmodels.GroupCursor
+		if query.GroupContinueToken != "" {
+			// only set the cursor if it's valid, otherwise we'll start from the beginning
+			if cur, err := ngmodels.DecodeGroupCursor(query.GroupContinueToken); err == nil {
+				cursor = cur
+			}
+		}
+
+		// Build group cursor condition
+		if cursor.NamespaceUID != "" {
+			q = buildGroupCursorCondition(q, cursor)
+		}
+
+		// No arbitrary fetch limit - let the loop control pagination
+		alertRules := make([]*ngmodels.AlertRule, 0)
+		rule := new(alertRule)
+		rows, err := q.Rows(rule)
+		if err != nil {
+			return err
+		}
+		defer func() {
+			_ = rows.Close()
+		}()
+
+		// Process rules and implement per-group pagination
+		var groupsFetched int64
+		for rows.Next() {
+			rule := new(alertRule)
+			err = rows.Scan(rule)
+			if err != nil {
+				st.Logger.Error("Invalid rule found in DB store, ignoring it", "func", "ListAlertRulesByGroup", "error", err)
+				continue
+			}
+
+			converted, err := alertRuleToModelsAlertRule(*rule, st.Logger)
+			if err != nil {
+				st.Logger.Error("Invalid rule found in DB store, cannot convert, ignoring it", "func", "ListAlertRulesByGroup", "error", err)
+				continue
+			}
+
+			// Check if we've moved to a new group
+			key := ngmodels.GroupCursor{
+				NamespaceUID: converted.NamespaceUID,
+				RuleGroup:    converted.RuleGroup,
+			}
+			if key != cursor {
+				// Check if we've reached the group limit
+				if query.GroupLimit > 0 && groupsFetched == query.GroupLimit {
+					// Generate next token for the next group
+					nextToken = ngmodels.EncodeGroupCursor(cursor)
+					break
+				}
+
+				// Reset for new group
+				cursor = key
+				groupsFetched++
+			}
+
+			// Apply post-query filters
+			if !shouldIncludeRule(&converted, query, groupsMap) {
+				continue
+			}
+
+			alertRules = append(alertRules, &converted)
+		}
+
+		result = alertRules
+		return nil
+	})
+	return result, nextToken, err
+}
+
+func buildGroupCursorCondition(sess *xorm.Session, c ngmodels.GroupCursor) *xorm.Session {
+	return sess.Where("(namespace_uid > ?)", c.NamespaceUID).
+		Or("(namespace_uid = ? AND rule_group > ?)", c.NamespaceUID, c.RuleGroup)
+}
+
+func shouldIncludeRule(rule *ngmodels.AlertRule, query *ngmodels.ListAlertRulesByGroupQuery, groupsMap map[string]struct{}) bool {
+	if query.ReceiverName != "" {
+		if !slices.ContainsFunc(rule.NotificationSettings, func(settings ngmodels.NotificationSettings) bool {
+			return settings.Receiver == query.ReceiverName
+		}) {
+			return false
+		}
+	}
+
+	if query.TimeIntervalName != "" {
+		if !slices.ContainsFunc(rule.NotificationSettings, func(settings ngmodels.NotificationSettings) bool {
+			return slices.Contains(settings.MuteTimeIntervals, query.TimeIntervalName) ||
+				slices.Contains(settings.ActiveTimeIntervals, query.TimeIntervalName)
+		}) {
+			return false
+		}
+	}
+
+	if query.HasPrometheusRuleDefinition != nil {
+		if *query.HasPrometheusRuleDefinition != rule.HasPrometheusRuleDefinition() {
+			return false
+		}
+	}
+
+	if groupsMap != nil {
+		if _, ok := groupsMap[rule.RuleGroup]; !ok {
+			return false
+		}
+	}
+
+	return true
+}
+
 // ListAlertRules is a handler for retrieving alert rules of specific organisation.
 func (st DBstore) ListAlertRules(ctx context.Context, query *ngmodels.ListAlertRulesQuery) (result ngmodels.RulesGroup, err error) {
 	err = st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
diff --git a/pkg/services/ngalert/store/alert_rule_test.go b/pkg/services/ngalert/store/alert_rule_test.go
index 588f78dd8c2..c3031528013 100644
--- a/pkg/services/ngalert/store/alert_rule_test.go
+++ b/pkg/services/ngalert/store/alert_rule_test.go
@@ -1596,14 +1596,14 @@ func TestIntegrationGetRuleVersions(t *testing.T) {
 
 // createAlertRule creates an alert rule in the database and returns it.
 // If a generator is not specified, uniqueness of primary key is not guaranteed.
-func createRule(t *testing.T, store *DBstore, generator *models.AlertRuleGenerator) *models.AlertRule {
-	t.Helper()
+func createRule(tb testing.TB, store *DBstore, generator *models.AlertRuleGenerator) *models.AlertRule {
+	tb.Helper()
 	if generator == nil {
 		generator = models.RuleGen.With(models.RuleMuts.WithIntervalMatching(store.Cfg.BaseInterval))
 	}
 	rule := generator.GenerateRef()
 	converted, err := alertRuleFromModelsAlertRule(*rule)
-	require.NoError(t, err)
+	require.NoError(tb, err)
 	err = store.SQLStore.WithDbSession(context.Background(), func(sess *db.Session) error {
 		converted.ID = 0
 		_, err := sess.Table(alertRule{}).InsertOne(&converted)
@@ -1622,12 +1622,12 @@ func createRule(t *testing.T, store *DBstore, generator *models.AlertRuleGenerat
 		rule = &r
 		return err
 	})
-	require.NoError(t, err)
+	require.NoError(tb, err)
 
 	return rule
 }
 
-func setupFolderService(t *testing.T, sqlStore db.DB, cfg *setting.Cfg, features featuremgmt.FeatureToggles) folder.Service {
+func setupFolderService(t testing.TB, sqlStore db.DB, cfg *setting.Cfg, features featuremgmt.FeatureToggles) folder.Service {
 	tracer := tracing.InitializeTracerForTest()
 	inProcBus := bus.ProvideBus(tracer)
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
@@ -1735,6 +1735,169 @@ func TestIntegration_AlertRuleVersionsCleanup(t *testing.T) {
 	})
 }
 
+func TestIntegration_ListAlertRulesByGroup(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	sqlStore := db.InitTestDB(t)
+	cfg := setting.NewCfg()
+	cfg.UnifiedAlerting = setting.UnifiedAlertingSettings{
+		BaseInterval: time.Duration(rand.Int64N(100)+1) * time.Second,
+	}
+	folderService := setupFolderService(t, sqlStore, cfg, featuremgmt.WithFeatures())
+	bus := &fakeBus{}
+	orgID := int64(1)
+	ruleGen := models.RuleGen.With(
+		models.RuleMuts.WithIntervalMatching(cfg.UnifiedAlerting.BaseInterval),
+		models.RuleMuts.WithOrgID(orgID),
+	)
+	store := createTestStore(sqlStore, folderService, &logtest.Fake{}, cfg.UnifiedAlerting, bus)
+
+	// set test params
+	numFolders := 10
+	numRules := 50
+	rulesPerGroup := 5
+	totalGroups := numRules / rulesPerGroup // 10
+
+	// create rules with different group names
+	rules, _ := createManyRules(t,
+		store,
+		ruleGen,
+		numFolders,
+		numRules,
+		rulesPerGroup,
+	)
+	// sort rules by folder, then group, then group index
+	slices.SortStableFunc(rules, func(a, b *models.AlertRule) int {
+		if a.NamespaceUID != b.NamespaceUID {
+			return strings.Compare(a.NamespaceUID, b.NamespaceUID)
+		}
+		if a.RuleGroup != b.RuleGroup {
+			return strings.Compare(a.RuleGroup, b.RuleGroup)
+		}
+		return a.RuleGroupIndex - b.RuleGroupIndex
+	})
+
+	t.Run("should return all rules when no limit passed", func(t *testing.T) {
+		result, continueToken, err := store.ListAlertRulesByGroup(context.Background(), &models.ListAlertRulesByGroupQuery{
+			ListAlertRulesQuery: models.ListAlertRulesQuery{OrgID: orgID},
+		})
+		require.NoError(t, err)
+		require.Len(t, result, 50, "should return all rules when no limit is set")
+		require.Empty(t, continueToken, "continue token should be empty when no limit is set")
+	})
+
+	t.Run("should return paginated results when group limit is set", func(t *testing.T) {
+		// random number from 1 to totalGroups - 1 (to ensure we always receive less than totalGroups)
+		groupLimit := rand.Int64N(int64(totalGroups)-1) + 1
+		result, continueToken, err := store.ListAlertRulesByGroup(context.Background(), &models.ListAlertRulesByGroupQuery{
+			ListAlertRulesQuery: models.ListAlertRulesQuery{OrgID: orgID},
+			GroupLimit:          groupLimit,
+		})
+		require.NoError(t, err)
+		expectedRuleCount := groupLimit * int64(rulesPerGroup)
+		require.Len(t, result, int(expectedRuleCount), fmt.Sprintf("should return %d rules when group limit is set", expectedRuleCount))
+		require.NotEmpty(t, continueToken, "continue token should not be empty when limit is set")
+	})
+
+	t.Run("pagination should all for continuation", func(t *testing.T) {
+		groupLimit := int64(2) // fixed group limit for this test
+		result, continueToken, err := store.ListAlertRulesByGroup(context.Background(), &models.ListAlertRulesByGroupQuery{
+			ListAlertRulesQuery: models.ListAlertRulesQuery{OrgID: orgID},
+			GroupLimit:          groupLimit,
+		})
+		require.NoError(t, err)
+		require.Len(t, result, int(groupLimit*int64(rulesPerGroup)), "should return rules for the first two groups")
+		require.NotEmpty(t, continueToken, "continue token should not be empty")
+
+		for i, rule := range result {
+			expected := rules[i].RuleGroup
+			actual := rule.RuleGroup
+			require.Equal(t, expected, actual, "rules should be ordered by group name")
+		}
+
+		resultRules := make([]*models.AlertRule, 0, len(result))
+		resultRules = append(resultRules, result...)
+
+		// Continue from previous, fetching the rest of the rules
+		result, continueToken, err = store.ListAlertRulesByGroup(context.Background(), &models.ListAlertRulesByGroupQuery{
+			ListAlertRulesQuery: models.ListAlertRulesQuery{OrgID: orgID},
+			GroupContinueToken:  continueToken,
+		})
+		require.NoError(t, err)
+		resultRules = append(resultRules, result...)
+		require.Len(t, resultRules, numRules, "should return all rules when continuing from the last token")
+		require.Empty(t, continueToken, "continue token should be empty when all rules are fetched")
+		for i, rule := range resultRules {
+			expected := rules[i].RuleGroup
+			actual := rule.RuleGroup
+			require.Equal(t, expected, actual, "rules should be ordered by group name")
+		}
+	})
+}
+
+func Benchmark_ListAlertRules(b *testing.B) {
+	orgID := int64(1)
+	ruleGen := models.RuleGen
+
+	// init
+	sqlStore := db.InitTestDB(b)
+	cfg := setting.NewCfg()
+	cfg.UnifiedAlerting = setting.UnifiedAlertingSettings{
+		BaseInterval: time.Duration(rand.Int64N(100)) * time.Second,
+	}
+	folderService := setupFolderService(b, sqlStore, cfg, featuremgmt.WithFeatures())
+	bus := &fakeBus{}
+	store := createTestStore(sqlStore, folderService, &logtest.Fake{}, cfg.UnifiedAlerting, bus)
+
+	ruleGen = ruleGen.With(
+		ruleGen.WithIntervalMatching(cfg.UnifiedAlerting.BaseInterval),
+		ruleGen.WithOrgID(orgID),
+	)
+
+	// define benchmark parameters
+	numFolders := 5
+	numRules := 10000
+	rulesPerGroup := 100
+	assert.Greater(b, numRules, rulesPerGroup, "n must be greater than rulesPerGroup")
+	assert.Equal(b, 0, numRules%rulesPerGroup, "n % rulesPerGroup must be zero to create equal groups")
+
+	// create rules and folders (5 folders, each with n/rulesPerGroup rules)
+	_, _ = createManyRules(b,
+		store,
+		ruleGen,
+		numFolders,    // number of folders
+		numRules,      // total number of rules
+		rulesPerGroup, // rules per group
+	)
+
+	b.Run(fmt.Sprintf("list %d rules unpaginated", numRules), func(b *testing.B) {
+		for b.Loop() {
+			_, err := store.ListAlertRules(context.Background(), &models.ListAlertRulesQuery{
+				OrgID: orgID,
+			})
+			if err != nil {
+				b.Fatal(err)
+			}
+		}
+	})
+
+	for _, groupLimit := range []int{1, 2, 5, 10, 50, 100} {
+		b.Run(fmt.Sprintf("list %d groups paginated", groupLimit), func(b *testing.B) {
+			for b.Loop() {
+				_, _, err := store.ListAlertRulesByGroup(context.Background(), &models.ListAlertRulesByGroupQuery{
+					ListAlertRulesQuery: models.ListAlertRulesQuery{OrgID: orgID},
+					GroupLimit:          int64(groupLimit),
+				})
+				if err != nil {
+					b.Fatal(err)
+				}
+			}
+		})
+	}
+}
+
 func TestIntegration_ListAlertRules(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
@@ -1975,3 +2138,27 @@ func (f *fakeBus) Publish(ctx context.Context, msg bus.Msg) error {
 
 	return nil
 }
+
+func createManyRules(tb testing.TB, store *DBstore, ruleGen *models.AlertRuleGenerator, numFolders, numRules, rulesPerGroup int) ([]*models.AlertRule, []string) {
+	tb.Helper()
+
+	require.Greater(tb, numRules, 0, "numRules must be greater than 0")
+	require.Greater(tb, numFolders, 0, "numFolders must be greater than 0")
+	require.Greater(tb, numRules, rulesPerGroup, "numRules must be greater than rulesPerGroup")
+	require.Greater(tb, rulesPerGroup, 0, "rulesPerGroup must be greater than 0")
+	require.Equal(tb, numRules%rulesPerGroup, 0, "numRules % rulesPerGroup must be zero to create equal groups")
+
+	rules := make([]*models.AlertRule, 0, numRules)
+	namespaceUIDs := make([]string, numFolders)
+	for i := range namespaceUIDs {
+		namespaceUIDs[i] = fmt.Sprintf("ns-%d", i)
+	}
+	for i := 0; i < numRules; i++ {
+		gen := ruleGen.With(
+			ruleGen.WithNamespaceUID(namespaceUIDs[i%numFolders]),
+			ruleGen.WithGroupName(fmt.Sprintf("group_%d", i%(numRules/rulesPerGroup))),
+		)
+		rules = append(rules, createRule(tb, store, gen))
+	}
+	return rules, namespaceUIDs
+}
diff --git a/pkg/services/ngalert/tests/fakes/rules.go b/pkg/services/ngalert/tests/fakes/rules.go
index 046522f3214..c17c70bf6c9 100644
--- a/pkg/services/ngalert/tests/fakes/rules.go
+++ b/pkg/services/ngalert/tests/fakes/rules.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"math/rand"
 	"slices"
+	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -185,6 +186,88 @@ func (f *RuleStore) GetAlertRulesGroupByRuleUID(_ context.Context, q *models.Get
 	return ruleList, nil
 }
 
+func (f *RuleStore) ListAlertRulesByGroup(_ context.Context, q *models.ListAlertRulesByGroupQuery) (models.RulesGroup, string, error) {
+	f.mtx.Lock()
+	defer f.mtx.Unlock()
+	f.RecordedOps = append(f.RecordedOps, *q)
+
+	if err := f.Hook(*q); err != nil {
+		return nil, "", err
+	}
+
+	query := &models.ListAlertRulesQuery{
+		OrgID:                       q.OrgID,
+		NamespaceUIDs:               q.NamespaceUIDs,
+		DashboardUID:                q.DashboardUID,
+		PanelID:                     q.PanelID,
+		RuleGroups:                  q.RuleGroups,
+		RuleUIDs:                    q.RuleUIDs,
+		ReceiverName:                q.ReceiverName,
+		HasPrometheusRuleDefinition: q.HasPrometheusRuleDefinition,
+	}
+
+	ruleList, err := f.listAlertRules(query)
+	if err != nil {
+		return nil, "", err
+	}
+
+	// < group limit logic >
+
+	// sort rules to ensure order is consistent, pagination depends on this
+	slices.SortFunc(ruleList, func(a, b *models.AlertRule) int {
+		nsCmp := strings.Compare(a.NamespaceUID, b.NamespaceUID)
+		if nsCmp != 0 {
+			return nsCmp
+		}
+		rgCmp := strings.Compare(a.RuleGroup, b.RuleGroup)
+		if rgCmp != 0 {
+			return rgCmp
+		}
+		return models.RulesGroupComparer(a, b)
+	})
+
+	var nextToken string
+	var cursor models.GroupCursor
+	if q.GroupContinueToken != "" {
+		if cur, err := models.DecodeGroupCursor(q.GroupContinueToken); err == nil {
+			cursor = cur
+		}
+	}
+
+	if q.GroupLimit < 0 {
+		return ruleList, "", nil
+	}
+
+	outputRules := make([]*models.AlertRule, 0, len(ruleList))
+	var groupsFetched int64
+	initialCursor := cursor
+	for _, r := range ruleList {
+		// skip rules before the initial cursor
+		if initialCursor.NamespaceUID != "" &&
+			(strings.Compare(r.NamespaceUID, initialCursor.NamespaceUID) < 0 ||
+				(strings.Compare(r.NamespaceUID, initialCursor.NamespaceUID) == 0 && strings.Compare(r.RuleGroup, initialCursor.RuleGroup) <= 0)) {
+			continue
+		}
+
+		key := models.GroupCursor{
+			NamespaceUID: r.NamespaceUID,
+			RuleGroup:    r.RuleGroup,
+		}
+		if key != cursor {
+			if q.GroupLimit > 0 && groupsFetched == q.GroupLimit {
+				nextToken = models.EncodeGroupCursor(cursor)
+				break
+			}
+			cursor = key
+			groupsFetched++
+		}
+
+		outputRules = append(outputRules, r)
+	}
+
+	return outputRules, nextToken, nil
+}
+
 func (f *RuleStore) ListAlertRules(_ context.Context, q *models.ListAlertRulesQuery) (models.RulesGroup, error) {
 	f.mtx.Lock()
 	defer f.mtx.Unlock()
@@ -194,6 +277,10 @@ func (f *RuleStore) ListAlertRules(_ context.Context, q *models.ListAlertRulesQu
 		return nil, err
 	}
 
+	return f.listAlertRules(q)
+}
+
+func (f *RuleStore) listAlertRules(q *models.ListAlertRulesQuery) (models.RulesGroup, error) {
 	hasDashboard := func(r *models.AlertRule, dashboardUID string, panelID int64) bool {
 		if dashboardUID != "" {
 			if r.DashboardUID == nil || *r.DashboardUID != dashboardUID {

From 57761c7dc4a9751492907435272f66725ad6028a Mon Sep 17 00:00:00 2001
From: Jacob Valdez <jacob.valdez@grafana.com>
Date: Thu, 14 Aug 2025 10:59:55 -0500
Subject: [PATCH 184/243] adding content from PR #109492 (#109684)

---
 .../troubleshooting/har-captures/index.md     | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 docs/sources/troubleshooting/har-captures/index.md

diff --git a/docs/sources/troubleshooting/har-captures/index.md b/docs/sources/troubleshooting/har-captures/index.md
new file mode 100644
index 00000000000..1db407bd84b
--- /dev/null
+++ b/docs/sources/troubleshooting/har-captures/index.md
@@ -0,0 +1,72 @@
+---
+description: Learn how to generate a HAR capture to send to Grafana Labs support for troubleshooting
+keywords:
+  - grafana
+  - troubleshooting
+  - networking
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menutitle: Generate a HAR capture
+title: Generate a HAR capture to send to Grafana Labs support
+weight: 300
+---
+
+# Troubleshoot with HAR captures
+
+Support may request information about the network requests your browser generated in the form of a HAR file.
+
+To generate a HAR capture, follow the steps for your browser:
+
+## Chrome
+
+1. In your Chrome browser, go to the page where the issue is occurring.
+1. Click the menu icon and go to **More Tools** > **Developer Tools**.
+1. In the drawer that opens, click the **Network** tab.
+1. In the upper left hand corner of the drawer, make sure the round Record button is red. If it's grey, click the button to begin recording.
+1. Select the **Preserve log** option box if it isn't already selected.
+1. Click the grey crossed circle button to clear any existing requests from the panel.
+1. Reproduce the issue while recording the network requests.
+1. Click the download button to download the HAR file.
+   <img width="1293" height="239" alt="image" src="https://github.com/user-attachments/assets/2ddd5bd4-d207-4c59-8143-f10009e0cb5d" />
+1. Upload the HAR file to your Grafana Support ticket for investigation.
+
+## Firefox
+
+1. In your Firefox browser, go to the page where the issue is occurring.
+1. Click the menu icon and go to **More Tools** > **Web Developer Tools**.
+1. In the drawer that opens, click the **Network** tab.
+1. In the upper left corner of the drawer, click the trash can icon to clear any existing requests from the recording.
+1. Reproduce the issue while recording the network requests.
+1. To save the HAR file, click the gear icon in the upper right hand corner of the panel and select **Save All As HAR**.
+   <img width="1837" height="196" alt="image" src="https://github.com/user-attachments/assets/785be5e4-10a2-4d16-838a-2b7bb97c8453" />
+1. Upload the HAR file to your Grafana Support ticket for investigation.
+
+## Safari
+
+1. In your Safari browser, go to the page where the issue is occurring.
+1. Open the **Develop** menu option and select **Show Web Inspector**.
+   {{< admonition type="note" >}}
+   The **Show features for web developers** option needs to be enabled for the **Develop** option to appear. For more information, refer to [Use the developer tools in the Develop menu in Safari on Mac](https://support.apple.com/en-ie/guide/safari/sfri20948/mac).
+   {{< /admonition >}}
+1. In the panel that appears, click the **Network** tab.
+1. In the upper right corner of the panel, click the trash can icon to clear any existing requests from the recording.
+1. Reproduce the issue while recording the network requests.
+1. Click the **Export** button to save the HAR file:
+   <img width="1915" height="219" alt="image" src="https://github.com/user-attachments/assets/2bda7bbd-43bf-4ecb-b8f9-f0be92c5a480" />
+1. Upload the HAR file to your Grafana Support ticket for investigation.
+
+## Edge
+
+1. In your Edge browser, go to the page where the issue is occurring.
+1. Click the ... button and go to **More Tools** > **Developer Tools**.
+1. In the panel that appears, click on the **Network** tab.
+1. In the upper left hand corner of the panel, make sure the round Record button is red. If it's grey, click the button to begin recording
+1. Verify that the **Preserve log** option box is checked.
+1. Click the grey crossed circle button to clear any existing requests from the panel.
+1. Reproduce the issue while the network requests are recorded.
+1. Click the download button to save the HAR file:
+   <img width="916" height="305" alt="image" src="https://github.com/user-attachments/assets/54dfd40d-751f-47b4-9824-bc5be1f027fa" />
+1. Upload the HAR file to your Grafana Support ticket for investigation.

From 37b0a490278c9b7dcce10cc40fe0e6e1d1b0b399 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Thu, 14 Aug 2025 17:03:55 +0100
Subject: [PATCH 185/243] Chore: Refactor avoid calling
 `config.bootData.settings` (#109683)

replace config.bootData.settings with just config.
---
 public/app/core/trustedTypePolicies.ts        |  8 +--
 .../actions/dashboardActions.test.ts          |  4 +-
 .../actions/dashboardActions.ts               |  2 +-
 .../inspect/InspectJsonTab.test.tsx           | 18 +++----
 .../DashboardScenePageStateManager.test.ts    | 53 ++++++++----------
 .../DashboardSceneSerializer.test.ts          | 30 +++++------
 .../layoutSerializers/utils.test.ts           | 54 +++++++++----------
 .../serialization/layoutSerializers/utils.ts  |  4 +-
 .../transformSceneToSaveModelSchemaV2.test.ts | 48 ++++++++---------
 .../transformSceneToSaveModelSchemaV2.ts      |  4 +-
 .../api/ResponseTransformers.test.ts          | 54 +++++++++----------
 .../dashboard/api/ResponseTransformers.ts     |  2 +-
 12 files changed, 124 insertions(+), 157 deletions(-)

diff --git a/public/app/core/trustedTypePolicies.ts b/public/app/core/trustedTypePolicies.ts
index 6dedb7f68e8..fa4489847d3 100644
--- a/public/app/core/trustedTypePolicies.ts
+++ b/public/app/core/trustedTypePolicies.ts
@@ -1,7 +1,7 @@
 import { textUtil } from '@grafana/data';
 import { config } from '@grafana/runtime';
 
-const CSP_REPORT_ONLY_ENABLED = config.bootData.settings.cspReportOnlyEnabled;
+const CSP_REPORT_ONLY_ENABLED = config.cspReportOnlyEnabled;
 
 export const defaultTrustedTypesPolicy = {
   createHTML: (string: string, source: string, sink: string) => {
@@ -21,11 +21,7 @@ export const defaultTrustedTypesPolicy = {
   },
 };
 
-if (
-  config.bootData.settings.trustedTypesDefaultPolicyEnabled &&
-  window.trustedTypes &&
-  window.trustedTypes.createPolicy
-) {
+if (config.trustedTypesDefaultPolicyEnabled && window.trustedTypes && window.trustedTypes.createPolicy) {
   // check if browser supports Trusted Types
   window.trustedTypes.createPolicy('default', defaultTrustedTypesPolicy);
 }
diff --git a/public/app/features/commandPalette/actions/dashboardActions.test.ts b/public/app/features/commandPalette/actions/dashboardActions.test.ts
index 15778f6f6c2..a175df93452 100644
--- a/public/app/features/commandPalette/actions/dashboardActions.test.ts
+++ b/public/app/features/commandPalette/actions/dashboardActions.test.ts
@@ -113,7 +113,7 @@ describe('dashboardActions', () => {
       });
 
       it('returns an empty array if anonymous access is not enabled', async () => {
-        config.bootData.settings.anonymousEnabled = false;
+        config.anonymousEnabled = false;
         const searchQuery = 'mySearchQuery';
         const results = await getSearchResultActions(searchQuery);
         expect(grafanaSearcherSpy).not.toHaveBeenCalled();
@@ -121,7 +121,7 @@ describe('dashboardActions', () => {
       });
 
       it('calls the search backend and returns an array of CommandPaletteActions if anonymous access is enabled', async () => {
-        config.bootData.settings.anonymousEnabled = true;
+        config.anonymousEnabled = true;
         const searchQuery = 'mySearchQuery';
         const results = await getSearchResultActions(searchQuery);
         expect(grafanaSearcherSpy).toHaveBeenCalledWith({
diff --git a/public/app/features/commandPalette/actions/dashboardActions.ts b/public/app/features/commandPalette/actions/dashboardActions.ts
index f2d3aea83fa..70a62e57295 100644
--- a/public/app/features/commandPalette/actions/dashboardActions.ts
+++ b/public/app/features/commandPalette/actions/dashboardActions.ts
@@ -51,7 +51,7 @@ export async function getRecentDashboardActions(): Promise<CommandPaletteAction[
 
 export async function getSearchResultActions(searchQuery: string): Promise<CommandPaletteAction[]> {
   // Empty strings should not come through to here
-  if (searchQuery.length === 0 || (!contextSrv.user.isSignedIn && !config.bootData.settings.anonymousEnabled)) {
+  if (searchQuery.length === 0 || (!contextSrv.user.isSignedIn && !config.anonymousEnabled)) {
     return [];
   }
 
diff --git a/public/app/features/dashboard-scene/inspect/InspectJsonTab.test.tsx b/public/app/features/dashboard-scene/inspect/InspectJsonTab.test.tsx
index 5605a573146..9b1d53a6cd9 100644
--- a/public/app/features/dashboard-scene/inspect/InspectJsonTab.test.tsx
+++ b/public/app/features/dashboard-scene/inspect/InspectJsonTab.test.tsx
@@ -73,18 +73,12 @@ jest.mock('@grafana/runtime', () => ({
   },
   config: {
     ...jest.requireActual('@grafana/runtime').config,
-    bootData: {
-      ...jest.requireActual('@grafana/runtime').config.bootData,
-      settings: {
-        ...jest.requireActual('@grafana/runtime').config.bootData.settings,
-        defaultDatasource: 'ds1',
-        datasources: {
-          ds1: {
-            name: 'ds-uid',
-            meta: {
-              id: 'grafana',
-            },
-          },
+    defaultDatasource: 'ds1',
+    datasources: {
+      ds1: {
+        name: 'ds-uid',
+        meta: {
+          id: 'grafana',
         },
       },
     },
diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
index 572f91f60d7..0911ba9b6f2 100644
--- a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
+++ b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
@@ -38,39 +38,32 @@ jest.mock('@grafana/runtime', () => {
         dashboardNewLayouts: false, // Default value
         reloadDashboardsOnParamsChange: false, // Default value
       },
-
-      bootData: {
-        ...original.config.bootData,
-        settings: {
-          ...original.config.bootData.settings,
-          datasources: {
-            'gdev-testdata': {
-              id: 7,
-              uid: 'abc',
-              type: 'grafana-testdata-datasource',
-              name: 'gdev-testdata',
-              meta: {
-                id: 'grafana-testdata-datasource',
-                type: 'datasource',
-                name: 'TestData',
-                aliasIDs: ['testdata'],
-              },
-            },
-            '-- Grafana --': {
-              id: -1,
-              uid: 'grafana',
-              type: 'datasource',
-              name: '-- Grafana --',
-              meta: {
-                id: 'grafana',
-                type: 'datasource',
-                name: '-- Grafana --',
-              },
-            },
+      datasources: {
+        'gdev-testdata': {
+          id: 7,
+          uid: 'abc',
+          type: 'grafana-testdata-datasource',
+          name: 'gdev-testdata',
+          meta: {
+            id: 'grafana-testdata-datasource',
+            type: 'datasource',
+            name: 'TestData',
+            aliasIDs: ['testdata'],
+          },
+        },
+        '-- Grafana --': {
+          id: -1,
+          uid: 'grafana',
+          type: 'datasource',
+          name: '-- Grafana --',
+          meta: {
+            id: 'grafana',
+            type: 'datasource',
+            name: '-- Grafana --',
           },
-          defaultDatasource: 'gdev-testdata',
         },
       },
+      defaultDatasource: 'gdev-testdata',
     },
   };
 });
diff --git a/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts b/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts
index 5987962f3ff..785e6fe06d9 100644
--- a/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts
+++ b/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts
@@ -46,22 +46,20 @@ jest.mock('@grafana/runtime', () => ({
       user: {
         timezone: 'UTC',
       },
-      settings: {
-        defaultDatasource: '-- Grafana --',
-        datasources: {
-          '-- Grafana --': {
-            name: 'Grafana',
-            meta: { id: 'grafana' },
-            type: 'datasource',
-            uid: 'grafana',
-          },
-          prometheus: {
-            name: 'prometheus',
-            meta: { id: 'prometheus' },
-            type: 'datasource',
-            uid: 'prometheus-uid',
-          },
-        },
+    },
+    defaultDatasource: '-- Grafana --',
+    datasources: {
+      '-- Grafana --': {
+        name: 'Grafana',
+        meta: { id: 'grafana' },
+        type: 'datasource',
+        uid: 'grafana',
+      },
+      prometheus: {
+        name: 'prometheus',
+        meta: { id: 'prometheus' },
+        type: 'datasource',
+        uid: 'prometheus-uid',
       },
     },
   },
diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.test.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.test.ts
index 1c177f84996..d703b6e233d 100644
--- a/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.test.ts
+++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.test.ts
@@ -9,35 +9,31 @@ jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   config: {
     ...jest.requireActual('@grafana/runtime').config,
-    bootData: {
-      settings: {
-        defaultDatasource: 'default-ds-prometheus',
-        datasources: {
-          'default-ds-prometheus': {
-            uid: 'default-prometheus-uid',
-            name: 'Default Prometheus',
-            meta: { id: 'prometheus' },
-            type: 'datasource',
-          },
-          prometheus: {
-            uid: 'prometheus-uid',
-            name: 'Prometheus',
-            meta: { id: 'prometheus' },
-            type: 'datasource',
-          },
-          loki: {
-            uid: 'loki-uid',
-            name: 'Loki',
-            meta: { id: 'loki' },
-            type: 'datasource',
-          },
-          '-- Grafana --': {
-            uid: 'grafana',
-            name: 'Grafana',
-            meta: { id: 'grafana' },
-            type: 'datasource',
-          },
-        },
+    defaultDatasource: 'default-ds-prometheus',
+    datasources: {
+      'default-ds-prometheus': {
+        uid: 'default-prometheus-uid',
+        name: 'Default Prometheus',
+        meta: { id: 'prometheus' },
+        type: 'datasource',
+      },
+      prometheus: {
+        uid: 'prometheus-uid',
+        name: 'Prometheus',
+        meta: { id: 'prometheus' },
+        type: 'datasource',
+      },
+      loki: {
+        uid: 'loki-uid',
+        name: 'Loki',
+        meta: { id: 'loki' },
+        type: 'datasource',
+      },
+      '-- Grafana --': {
+        uid: 'grafana',
+        name: 'Grafana',
+        meta: { id: 'grafana' },
+        type: 'datasource',
       },
     },
     featureToggles: {
diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts
index 2a3208bac14..8f0736a7a9b 100644
--- a/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts
+++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts
@@ -234,8 +234,8 @@ export function getDataSourceForQuery(querySpecDS: DataSourceRef | undefined | n
   }
 
   // Otherwise try to infer datasource based on query kind (kind = ds type)
-  const defaultDatasource = config.bootData.settings.defaultDatasource;
-  const dsList = config.bootData.settings.datasources;
+  const defaultDatasource = config.defaultDatasource;
+  const dsList = config.datasources;
 
   // First check if the default datasource matches the query type
   if (dsList && dsList[defaultDatasource] && dsList[defaultDatasource].meta.id === queryKind) {
diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts
index 56fcdbaef42..190a590f1ad 100644
--- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts
@@ -108,33 +108,29 @@ jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   config: {
     ...jest.requireActual('@grafana/runtime').config,
-    bootData: {
-      settings: {
-        defaultDatasource: 'loki',
-        datasources: {
-          Prometheus: {
-            name: 'Prometheus',
-            meta: { id: 'prometheus' },
-            type: 'datasource',
-          },
-          '-- Grafana --': {
-            name: 'Grafana',
-            meta: { id: 'grafana' },
-            type: 'datasource',
-          },
-          loki: {
-            name: 'Loki',
-            meta: {
-              id: 'loki',
-              name: 'Loki',
-              type: 'datasource',
-              info: { version: '1.0.0' },
-              module: 'app/plugins/datasource/loki/module',
-              baseUrl: '/plugins/loki',
-            },
-            type: 'datasource',
-          },
+    defaultDatasource: 'loki',
+    datasources: {
+      Prometheus: {
+        name: 'Prometheus',
+        meta: { id: 'prometheus' },
+        type: 'datasource',
+      },
+      '-- Grafana --': {
+        name: 'Grafana',
+        meta: { id: 'grafana' },
+        type: 'datasource',
+      },
+      loki: {
+        name: 'Loki',
+        meta: {
+          id: 'loki',
+          name: 'Loki',
+          type: 'datasource',
+          info: { version: '1.0.0' },
+          module: 'app/plugins/datasource/loki/module',
+          baseUrl: '/plugins/loki',
         },
+        type: 'datasource',
       },
     },
   },
diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts
index d0fe90719f1..d13905c0a58 100644
--- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts
@@ -478,10 +478,10 @@ export function getAnnotationQueryKind(annotationQuery: AnnotationQuery): string
 
 export function getDefaultDataSourceRef(): DataSourceRef {
   // we need to return the default datasource configured in the BootConfig
-  const defaultDatasource = config.bootData.settings.defaultDatasource;
+  const defaultDatasource = config.defaultDatasource;
 
   // get default datasource type
-  const dsList = config.bootData.settings.datasources;
+  const dsList = config.datasources;
   const ds = dsList[defaultDatasource];
 
   return { type: ds.meta.id, uid: ds.name }; // in the datasource list from bootData "id" is the type
diff --git a/public/app/features/dashboard/api/ResponseTransformers.test.ts b/public/app/features/dashboard/api/ResponseTransformers.test.ts
index 89e2d70a5a9..835f2a29866 100644
--- a/public/app/features/dashboard/api/ResponseTransformers.test.ts
+++ b/public/app/features/dashboard/api/ResponseTransformers.test.ts
@@ -39,39 +39,33 @@ jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   config: {
     ...jest.requireActual('@grafana/runtime').config,
-    bootData: {
-      ...jest.requireActual('@grafana/runtime').config.bootData,
-      settings: {
-        ...jest.requireActual('@grafana/runtime').config.bootData.settings,
-        datasources: {
-          PromTest: {
-            uid: 'xyz-abc',
-            name: 'PromTest',
-            id: 'prometheus',
-            meta: {
-              id: 'prometheus',
-              name: 'PromTest',
-              type: 'datasource',
-            },
-            isDefault: true,
-            apiVersion: 'v2',
-          },
-          '-- Grafana --': {
-            uid: 'grafana',
-            name: '-- Grafana --',
-            id: 'grafana',
-            meta: {
-              id: 'grafana',
-              name: '-- Grafana --',
-              type: 'datasource',
-            },
-            isDefault: false,
-          },
+    datasources: {
+      PromTest: {
+        uid: 'xyz-abc',
+        name: 'PromTest',
+        id: 'prometheus',
+        meta: {
+          id: 'prometheus',
+          name: 'PromTest',
+          type: 'datasource',
         },
-
-        defaultDatasource: 'PromTest',
+        isDefault: true,
+        apiVersion: 'v2',
+      },
+      '-- Grafana --': {
+        uid: 'grafana',
+        name: '-- Grafana --',
+        id: 'grafana',
+        meta: {
+          id: 'grafana',
+          name: '-- Grafana --',
+          type: 'datasource',
+        },
+        isDefault: false,
       },
     },
+
+    defaultDatasource: 'PromTest',
   },
 }));
 
diff --git a/public/app/features/dashboard/api/ResponseTransformers.ts b/public/app/features/dashboard/api/ResponseTransformers.ts
index a8960b0874e..ac0a7444125 100644
--- a/public/app/features/dashboard/api/ResponseTransformers.ts
+++ b/public/app/features/dashboard/api/ResponseTransformers.ts
@@ -440,7 +440,7 @@ export function getDefaultDatasource(): DataSourceRef {
 
   if (configDefaultDS.uid && !configDefaultDS.apiVersion) {
     // get api version from config
-    const dsInstance = config.bootData.settings.datasources[configDefaultDS.uid];
+    const dsInstance = config.datasources[configDefaultDS.uid];
     configDefaultDS.apiVersion = dsInstance.apiVersion ?? undefined;
   }
 

From 4d067059c945f19c0429bd59b20c9b2e92a18908 Mon Sep 17 00:00:00 2001
From: Luminessa Starlight <git@samsch.org>
Date: Thu, 14 Aug 2025 14:01:25 -0400
Subject: [PATCH 186/243] Accessibility: Ensure dashboard edit panel inputs
 have accessible labels (#109546)

* update instantiations of OptionsPaneItemDescriptor to pass IDs - obvious changes

* update instantiations of OptionsPaneItemDescriptor to pass IDs - iffy changes

* update editors to pass ID through or note a missing label

* update playwright tests

* fix unit tests

* grafana ui components updated to pass ID through

* update components to pass ID through

* add missing input IDs

* better default ID handling

* remove TS note

* revert accidental non-html id change

* kick CI

* fix old-arch e2e tests

* change to plain useId calls

---------

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 ...shboards-edit-panel-transparent-bg.spec.ts |  2 +-
 .../panels-suite/table-kitchenSink.spec.ts    |  4 +-
 .../panels-suite/geomap-map-controls.spec.ts  | 10 ++---
 .../components/ColorPicker/ColorPicker.tsx    |  3 +-
 .../ColorPicker/ColorPickerPopover.tsx        |  1 +
 .../components/MatchersUI/FieldNamePicker.tsx |  3 +-
 .../MatchersUI/FieldsByFrameRefIdMatcher.tsx  |  8 +++-
 .../src/components/UnitPicker/UnitPicker.tsx  |  4 +-
 .../NestedFolderPicker/NestedFolderPicker.tsx |  5 +++
 .../core/components/OptionsUI/NumberInput.tsx |  2 +
 .../app/core/components/OptionsUI/color.tsx   |  4 +-
 .../core/components/OptionsUI/multiSelect.tsx |  3 +-
 .../app/core/components/OptionsUI/number.tsx  |  3 +-
 .../app/core/components/OptionsUI/select.tsx  |  3 +-
 .../app/core/components/OptionsUI/slider.tsx  |  4 +-
 .../app/core/components/OptionsUI/string.tsx  |  3 +-
 .../app/core/components/OptionsUI/units.tsx   |  6 +--
 .../ConditionalRenderingEditor.tsx            |  3 ++
 .../edit-pane/DashboardEditableElement.tsx    |  5 ++-
 .../edit-pane/VizPanelEditableElement.tsx     | 12 +++---
 .../panel-edit/getPanelFrameOptions.tsx       |  8 ++--
 .../layout-auto-grid/AutoGridItemEditor.tsx   |  4 +-
 .../DashboardGridItemEditor.tsx               |  9 ++--
 .../SceneGridRowEditableElement.tsx           | 14 ++++---
 .../scene/layout-rows/RowItemEditor.tsx       | 24 +++++++----
 .../scene/layout-tabs/TabItemEditor.tsx       | 13 ++++--
 .../variables/VariableEditableElement.tsx     | 18 +++++---
 .../components/CustomVariableForm.tsx         |  7 +++-
 .../editors/ConstantVariableEditor.tsx        |  7 +++-
 .../editors/CustomVariableEditor.tsx          |  7 +++-
 .../editors/DataSourceVariableEditor.tsx      | 18 ++++++--
 .../editors/SystemVariableEditor.tsx          |  1 -
 .../useVariableSelectionOptionsCategory.tsx   | 41 +++++++++++++-----
 .../PanelEditor/OptionsPaneItemDescriptor.tsx |  6 +--
 .../PanelEditor/getFieldOverrideElements.tsx  | 42 +++++--------------
 .../PanelEditor/getLibraryPanelOptions.tsx    |  8 +++-
 .../PanelEditor/getPanelFrameOptions.tsx      | 22 ++++++----
 .../PanelEditor/getVisualizationOptions.tsx   | 21 +++++++---
 .../state/OptionSearchEngine.test.ts          | 14 +++++++
 .../editors/ColorDimensionEditor.tsx          |  3 +-
 .../editors/ScalarDimensionEditor.tsx         |  5 ++-
 .../editors/ScaleDimensionEditor.tsx          | 15 ++++---
 .../editors/TextDimensionEditor.tsx           |  9 +++-
 .../geo/editor/locationModeEditor.tsx         |  2 +
 public/app/plugins/panel/alertlist/module.tsx |  3 +-
 .../geomap/editor/FrameSelectionEditor.tsx    |  3 +-
 .../panel/geomap/editor/MapViewEditor.tsx     |  8 +++-
 .../panel/geomap/editor/StyleEditor.tsx       | 31 +++++++++++++-
 .../plugins/panel/table/PaginationEditor.tsx  |  4 +-
 .../panel/table/TableCellOptionEditor.tsx     |  5 ++-
 .../table/cells/AutoCellOptionsEditor.tsx     |  6 ++-
 .../ColorBackgroundCellOptionsEditor.tsx      | 10 ++++-
 .../table/cells/ImageCellOptionsEditor.tsx    |  9 ++--
 .../cells/SparklineCellOptionsEditor.tsx      |  5 ++-
 .../table/table-new/PaginationEditor.tsx      |  3 +-
 .../table/table-new/TableCellOptionEditor.tsx |  5 ++-
 .../ColorBackgroundCellOptionsEditor.tsx      |  5 +++
 .../cells/ImageCellOptionsEditor.tsx          |  9 ++--
 .../cells/SparklineCellOptionsEditor.tsx      |  5 ++-
 .../table-new/cells/TextWrapOptionsEditor.tsx |  5 +++
 .../plugins/panel/xychart/SeriesEditor.tsx    | 13 +++++-
 61 files changed, 369 insertions(+), 166 deletions(-)

diff --git a/e2e-playwright/dashboard-new-layouts/dashboards-edit-panel-transparent-bg.spec.ts b/e2e-playwright/dashboard-new-layouts/dashboards-edit-panel-transparent-bg.spec.ts
index d483b7b8005..a7ef95b1f4d 100644
--- a/e2e-playwright/dashboard-new-layouts/dashboards-edit-panel-transparent-bg.spec.ts
+++ b/e2e-playwright/dashboard-new-layouts/dashboards-edit-panel-transparent-bg.spec.ts
@@ -34,7 +34,7 @@ test.describe(
       const initialBackground = await panelTitle.evaluate((el) => getComputedStyle(el).background);
       expect(initialBackground).not.toMatch(/rgba\(0, 0, 0, 0\)/);
 
-      await page.locator('#transparent-background').click({ force: true });
+      await page.getByRole('switch', { name: 'Transparent background' }).click({ force: true });
 
       const transparentBackground = await panelTitle.evaluate((el) => getComputedStyle(el).background);
       expect(transparentBackground).toMatch(/rgba\(0, 0, 0, 0\)/);
diff --git a/e2e-playwright/panels-suite/table-kitchenSink.spec.ts b/e2e-playwright/panels-suite/table-kitchenSink.spec.ts
index 5ddb7c4d4e4..237ea5272a9 100644
--- a/e2e-playwright/panels-suite/table-kitchenSink.spec.ts
+++ b/e2e-playwright/panels-suite/table-kitchenSink.spec.ts
@@ -95,8 +95,8 @@ test.describe('Panels test: Table - Kitchen Sink', { tag: ['@panels', '@table']
     await dashboardPage
       .getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.fieldLabel('Cell options Cell value inspect'))
       .first()
-      .locator('label[for="custom.inspect"]')
-      .click();
+      .getByRole('switch', { name: 'Cell value inspect' })
+      .click({ force: true });
     await loremIpsumCell.hover();
     await expect(getCellHeight(page, 1, longTextColIdx)).resolves.toBeLessThan(100);
 
diff --git a/e2e/old-arch/panels-suite/geomap-map-controls.spec.ts b/e2e/old-arch/panels-suite/geomap-map-controls.spec.ts
index b344dae5abe..fcadcb55a47 100644
--- a/e2e/old-arch/panels-suite/geomap-map-controls.spec.ts
+++ b/e2e/old-arch/panels-suite/geomap-map-controls.spec.ts
@@ -17,35 +17,35 @@ describe('Geomap layer controls options', () => {
     e2e.components.PanelEditor.showZoomField()
       .should('be.visible')
       .within(() => {
-        cy.get('input[type="checkbox"]').check({ force: true }).should('be.checked');
+        cy.get('input[type="checkbox"]').check({ force: true });
       });
 
     // Show attribution
     e2e.components.PanelEditor.showAttributionField()
       .should('be.visible')
       .within(() => {
-        cy.get('input[type="checkbox"]').check({ force: true }).should('be.checked');
+        cy.get('input[type="checkbox"]').check({ force: true });
       });
 
     // Show scale
     e2e.components.PanelEditor.showScaleField()
       .should('be.visible')
       .within(() => {
-        cy.get('input[type="checkbox"]').check({ force: true }).should('be.checked');
+        cy.get('input[type="checkbox"]').check({ force: true });
       });
 
     // Show measure tool
     e2e.components.PanelEditor.showMeasureField()
       .should('be.visible')
       .within(() => {
-        cy.get('input[type="checkbox"]').check({ force: true }).should('be.checked');
+        cy.get('input[type="checkbox"]').check({ force: true });
       });
 
     // Show debug
     e2e.components.PanelEditor.showDebugField()
       .should('be.visible')
       .within(() => {
-        cy.get('input[type="checkbox"]').check({ force: true }).should('be.checked');
+        cy.get('input[type="checkbox"]').check({ force: true });
       });
 
     e2e.components.Panels.Panel.content({ timeout: TIMEOUT })
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx
index 5b23a4fefa6..43daedcbdb6 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx
@@ -37,7 +37,7 @@ export const colorPickerFactory = <T extends ColorPickerProps>(
     pickerTriggerRef = createRef<any>();
 
     render() {
-      const { theme, children, onChange, color } = this.props;
+      const { theme, children, onChange, color, id } = this.props;
       const styles = getStyles(theme);
       const popoverElement = React.createElement(popover, {
         ...{ ...this.props, children: null },
@@ -67,6 +67,7 @@ export const colorPickerFactory = <T extends ColorPickerProps>(
                   })
                 ) : (
                   <ColorSwatch
+                    id={id}
                     ref={this.pickerTriggerRef}
                     onClick={showPopper}
                     onMouseLeave={hidePopper}
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx
index c8c9f441978..a8204411b24 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx
@@ -22,6 +22,7 @@ export interface ColorPickerProps extends Themeable2 {
   color: string;
   onChange: ColorPickerChangeHandler;
   enableNamedColors?: boolean;
+  id?: string;
 }
 
 export interface Props<T> extends ColorPickerProps, PopoverContentProps {
diff --git a/packages/grafana-ui/src/components/MatchersUI/FieldNamePicker.tsx b/packages/grafana-ui/src/components/MatchersUI/FieldNamePicker.tsx
index 63240a9b0eb..cce936f01f7 100644
--- a/packages/grafana-ui/src/components/MatchersUI/FieldNamePicker.tsx
+++ b/packages/grafana-ui/src/components/MatchersUI/FieldNamePicker.tsx
@@ -10,7 +10,7 @@ import { useFieldDisplayNames, useSelectOptions, frameHasName } from './utils';
 type Props = StandardEditorProps<string, FieldNamePickerConfigSettings>;
 
 // Pick a field name out of the fields
-export const FieldNamePicker = ({ value, onChange, context, item }: Props) => {
+export const FieldNamePicker = ({ value, onChange, context, item, id }: Props) => {
   const settings: FieldNamePickerConfigSettings = item.settings ?? {};
   const names = useFieldDisplayNames(context.data, settings?.filter);
   const selectOptions = useSelectOptions(names, value, undefined, undefined, settings.baseNameMode);
@@ -29,6 +29,7 @@ export const FieldNamePicker = ({ value, onChange, context, item }: Props) => {
   return (
     <>
       <Select
+        inputId={id}
         value={selectedOption}
         placeholder={
           settings.placeholderText ?? t('grafana-ui.matchers-ui.field-name-picker.placeholder', 'Select field')
diff --git a/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx b/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx
index 30899db375a..2fc492d4f22 100644
--- a/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx
+++ b/packages/grafana-ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher.tsx
@@ -41,10 +41,11 @@ export interface Props {
   data: DataFrame[];
   onChange: (value: string) => void;
   placeholder?: string;
+  id?: string;
 }
 
 // Not exported globally... but used in grafana core
-export function RefIDPicker({ value, data, onChange, placeholder }: Props) {
+export function RefIDPicker({ value, data, onChange, placeholder, id }: Props) {
   const listOfRefIds = useMemo(() => getListOfQueryRefIds(data), [data]);
 
   const [priorSelectionState, updatePriorSelectionState] = useState<{
@@ -77,6 +78,7 @@ export function RefIDPicker({ value, data, onChange, placeholder }: Props) {
   }
   return (
     <Select
+      inputId={id}
       options={listOfRefIds}
       onChange={onFilterChange}
       isClearable={true}
@@ -114,9 +116,10 @@ export interface MultiProps {
   data: DataFrame[];
   onChange: (value: string[]) => void;
   placeholder?: string;
+  id?: string;
 }
 
-export function RefIDMultiPicker({ value, data, onChange, placeholder }: MultiProps) {
+export function RefIDMultiPicker({ value, data, onChange, placeholder, id }: MultiProps) {
   const listOfRefIds = useMemo(() => getListOfQueryRefIds(data), [data]);
 
   const [priorSelectionState, updatePriorSelectionState] = useState<{
@@ -172,6 +175,7 @@ export function RefIDMultiPicker({ value, data, onChange, placeholder }: MultiPr
   }
   return (
     <MultiSelect
+      inputId={id}
       options={listOfRefIds}
       onChange={onFilterChange}
       isClearable={true}
diff --git a/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx b/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx
index 2709bfa067c..dff45cb2a18 100644
--- a/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx
+++ b/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx
@@ -9,6 +9,7 @@ export interface UnitPickerProps {
   onChange: (item?: string) => void;
   value?: string;
   width?: number;
+  id?: string;
 }
 
 function formatCreateLabel(input: string) {
@@ -21,7 +22,7 @@ export class UnitPicker extends PureComponent<UnitPickerProps> {
   };
 
   render() {
-    const { value, width } = this.props;
+    const { value, width, id } = this.props;
 
     // Set the current selection
     let current: SelectableValue<string> | undefined = undefined;
@@ -56,6 +57,7 @@ export class UnitPicker extends PureComponent<UnitPickerProps> {
 
     return (
       <Cascader
+        id={id}
         width={width}
         initialValue={current && current.label}
         allowCustomValue
diff --git a/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx b/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx
index 042ec10f9ce..27b34e2f41e 100644
--- a/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx
+++ b/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx
@@ -44,6 +44,9 @@ export interface NestedFolderPickerProps {
 
   /* Whether the picker should be clearable */
   clearable?: boolean;
+
+  /* HTML ID for the button element for form labels */
+  id?: string;
 }
 
 const debouncedSearch = debounce(getSearchResults, 300);
@@ -68,6 +71,7 @@ export function NestedFolderPicker({
   excludeUIDs,
   permission = 'edit',
   onChange,
+  id,
 }: NestedFolderPickerProps) {
   const styles = useStyles2(getStyles);
   const selectedFolder = useGetFolderQueryFacade(value);
@@ -283,6 +287,7 @@ export function NestedFolderPicker({
   if (!overlayOpen) {
     return (
       <Trigger
+        id={id}
         label={labelComponent}
         handleClearSelection={clearable && value !== undefined ? handleClearSelection : undefined}
         invalid={invalid}
diff --git a/public/app/core/components/OptionsUI/NumberInput.tsx b/public/app/core/components/OptionsUI/NumberInput.tsx
index f5ba98492b7..b96893096d8 100644
--- a/public/app/core/components/OptionsUI/NumberInput.tsx
+++ b/public/app/core/components/OptionsUI/NumberInput.tsx
@@ -5,6 +5,7 @@ import * as React from 'react';
 import { Field, Input } from '@grafana/ui';
 
 interface Props {
+  id?: string;
   value?: number;
   placeholder?: string;
   autoFocus?: boolean;
@@ -101,6 +102,7 @@ export class NumberInput extends PureComponent<Props, State> {
     return (
       <Input
         type="number"
+        id={this.props.id}
         ref={this.inputRef}
         min={this.props.min}
         max={this.props.max}
diff --git a/public/app/core/components/OptionsUI/color.tsx b/public/app/core/components/OptionsUI/color.tsx
index ff9c13faa53..0ffc4e7b1aa 100644
--- a/public/app/core/components/OptionsUI/color.tsx
+++ b/public/app/core/components/OptionsUI/color.tsx
@@ -14,6 +14,7 @@ export interface ColorValueEditorSettings {
 }
 
 interface Props {
+  id?: string;
   value?: string;
   onChange: (value: string | undefined) => void;
   settings?: ColorValueEditorSettings;
@@ -25,7 +26,7 @@ interface Props {
 /**
  * @alpha
  * */
-export const ColorValueEditor = ({ value, settings, onChange, details }: Props) => {
+export const ColorValueEditor = ({ value, settings, onChange, details, id }: Props) => {
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
 
@@ -37,6 +38,7 @@ export const ColorValueEditor = ({ value, settings, onChange, details }: Props)
             <div className={styles.colorPicker}>
               <ColorSwatch
                 ref={ref}
+                id={id}
                 onClick={showColorPicker}
                 onMouseLeave={hideColorPicker}
                 color={value ? theme.visualization.getColorByName(value) : theme.components.input.borderColor}
diff --git a/public/app/core/components/OptionsUI/multiSelect.tsx b/public/app/core/components/OptionsUI/multiSelect.tsx
index bf2b5b9e5eb..41cbecb5ca9 100644
--- a/public/app/core/components/OptionsUI/multiSelect.tsx
+++ b/public/app/core/components/OptionsUI/multiSelect.tsx
@@ -55,11 +55,12 @@ export class MultiSelectValueEditor<T> extends PureComponent<Props<T>, State<T>>
 
   render() {
     const { options, isLoading } = this.state;
-    const { value, onChange, item } = this.props;
+    const { value, onChange, item, id } = this.props;
 
     const { settings } = item;
     return (
       <MultiSelect<T>
+        inputId={id}
         isLoading={isLoading}
         value={value}
         defaultValue={value}
diff --git a/public/app/core/components/OptionsUI/number.tsx b/public/app/core/components/OptionsUI/number.tsx
index e7b0db58bbe..cd69f2b0370 100644
--- a/public/app/core/components/OptionsUI/number.tsx
+++ b/public/app/core/components/OptionsUI/number.tsx
@@ -6,7 +6,7 @@ import { NumberInput } from './NumberInput';
 
 type Props = StandardEditorProps<number, NumberFieldConfigSettings>;
 
-export const NumberValueEditor = ({ value, onChange, item }: Props) => {
+export const NumberValueEditor = ({ value, onChange, item, id }: Props) => {
   const { settings } = item;
 
   const onValueChange = useCallback(
@@ -18,6 +18,7 @@ export const NumberValueEditor = ({ value, onChange, item }: Props) => {
 
   return (
     <NumberInput
+      id={id}
       value={value}
       min={settings?.min}
       max={settings?.max}
diff --git a/public/app/core/components/OptionsUI/select.tsx b/public/app/core/components/OptionsUI/select.tsx
index f3fc4a5439b..9f3f2767b1c 100644
--- a/public/app/core/components/OptionsUI/select.tsx
+++ b/public/app/core/components/OptionsUI/select.tsx
@@ -51,7 +51,7 @@ export class SelectValueEditor<T> extends PureComponent<Props<T>, State<T>> {
 
   render() {
     const { options, isLoading } = this.state;
-    const { value, onChange, item } = this.props;
+    const { value, onChange, item, id } = this.props;
 
     const { settings } = item;
     let current = options.find((v) => v.value === value);
@@ -63,6 +63,7 @@ export class SelectValueEditor<T> extends PureComponent<Props<T>, State<T>> {
     }
     return (
       <Select<T>
+        inputId={id}
         isLoading={isLoading}
         value={current}
         defaultValue={value}
diff --git a/public/app/core/components/OptionsUI/slider.tsx b/public/app/core/components/OptionsUI/slider.tsx
index b9bb41bbd90..01835ea9a38 100644
--- a/public/app/core/components/OptionsUI/slider.tsx
+++ b/public/app/core/components/OptionsUI/slider.tsx
@@ -11,7 +11,7 @@ import { NumberInput } from './NumberInput';
 
 type Props = StandardEditorProps<number, SliderFieldConfigSettings>;
 
-export const SliderValueEditor = ({ value, onChange, item }: Props) => {
+export const SliderValueEditor = ({ value, onChange, item, id }: Props) => {
   // Input reference
   const inputRef = useRef<HTMLSpanElement>(null);
 
@@ -109,7 +109,7 @@ export const SliderValueEditor = ({ value, onChange, item }: Props) => {
           included={included}
         />
         <span className={stylesSlider.numberInputWrapper} ref={inputRef}>
-          <NumberInput value={sliderValue} onChange={onSliderInputChange} max={max} min={min} step={step} />
+          <NumberInput id={id} value={sliderValue} onChange={onSliderInputChange} max={max} min={min} step={step} />
         </span>
       </div>
     </div>
diff --git a/public/app/core/components/OptionsUI/string.tsx b/public/app/core/components/OptionsUI/string.tsx
index 8001bf096af..7ec4635f7c8 100644
--- a/public/app/core/components/OptionsUI/string.tsx
+++ b/public/app/core/components/OptionsUI/string.tsx
@@ -8,7 +8,7 @@ interface Props extends StandardEditorProps<string, StringFieldConfigSettings> {
   suffix?: ReactNode;
 }
 
-export const StringValueEditor = ({ value, onChange, item, suffix }: Props) => {
+export const StringValueEditor = ({ value, onChange, item, suffix, id }: Props) => {
   const Component = item.settings?.useTextarea ? TextArea : Input;
   const onValueChange = useCallback(
     (
@@ -36,6 +36,7 @@ export const StringValueEditor = ({ value, onChange, item, suffix }: Props) => {
 
   return (
     <Component
+      id={id}
       placeholder={item.settings?.placeholder}
       defaultValue={value || ''}
       rows={(item.settings?.useTextarea && item.settings.rows) || 5}
diff --git a/public/app/core/components/OptionsUI/units.tsx b/public/app/core/components/OptionsUI/units.tsx
index 93731b715f6..070864e1c48 100644
--- a/public/app/core/components/OptionsUI/units.tsx
+++ b/public/app/core/components/OptionsUI/units.tsx
@@ -6,14 +6,14 @@ import { IconButton, UnitPicker, useStyles2 } from '@grafana/ui';
 
 type Props = StandardEditorProps<string, UnitFieldConfigSettings>;
 
-export function UnitValueEditor({ value, onChange, item }: Props) {
+export function UnitValueEditor({ value, onChange, item, id }: Props) {
   const styles = useStyles2(getStyles);
 
   if (item?.settings?.isClearable && value != null) {
     return (
       <div className={styles.wrapper}>
         <span className={styles.first}>
-          <UnitPicker value={value} onChange={onChange} />
+          <UnitPicker value={value} onChange={onChange} id={id} />
         </span>
         <IconButton
           name="times"
@@ -23,7 +23,7 @@ export function UnitValueEditor({ value, onChange, item }: Props) {
       </div>
     );
   }
-  return <UnitPicker value={value} onChange={onChange} />;
+  return <UnitPicker value={value} onChange={onChange} id={id} />;
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingEditor.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingEditor.tsx
index bab710c70c2..9df4bd0de02 100644
--- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingEditor.tsx
+++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingEditor.tsx
@@ -1,3 +1,5 @@
+import { v4 as uuidv4 } from 'uuid';
+
 import { t } from '@grafana/i18n';
 import { Icon, Stack, Tooltip } from '@grafana/ui';
 import { OptionsPaneCategoryDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor';
@@ -29,6 +31,7 @@ export function useConditionalRenderingEditor(
   }).addItem(
     new OptionsPaneItemDescriptor({
       title,
+      id: uuidv4(),
       render: () => <conditionalRendering.Component model={conditionalRendering} />,
     })
   );
diff --git a/public/app/features/dashboard-scene/edit-pane/DashboardEditableElement.tsx b/public/app/features/dashboard-scene/edit-pane/DashboardEditableElement.tsx
index 93e5ec503d8..730c16aa410 100644
--- a/public/app/features/dashboard-scene/edit-pane/DashboardEditableElement.tsx
+++ b/public/app/features/dashboard-scene/edit-pane/DashboardEditableElement.tsx
@@ -1,4 +1,5 @@
 import { ReactNode, useMemo, useRef } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
 import { Trans, t } from '@grafana/i18n';
 import { SceneObject } from '@grafana/scenes';
@@ -38,8 +39,8 @@ export class DashboardEditableElement implements EditableDashboardElement {
     const { body } = dashboard.useState();
 
     const dashboardOptions = useMemo(() => {
-      const dashboardTitleInputId = 'dashboard-title-input';
-      const dashboardDescriptionInputId = 'dashboard-description-input';
+      const dashboardTitleInputId = uuidv4();
+      const dashboardDescriptionInputId = uuidv4();
       const editPaneHeaderOptions = new OptionsPaneCategoryDescriptor({ title: '', id: 'dashboard-options' })
         .addItem(
           new OptionsPaneItemDescriptor({
diff --git a/public/app/features/dashboard-scene/edit-pane/VizPanelEditableElement.tsx b/public/app/features/dashboard-scene/edit-pane/VizPanelEditableElement.tsx
index 574028a75d8..c5c55bbaf61 100644
--- a/public/app/features/dashboard-scene/edit-pane/VizPanelEditableElement.tsx
+++ b/public/app/features/dashboard-scene/edit-pane/VizPanelEditableElement.tsx
@@ -1,4 +1,5 @@
 import { useMemo } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
 import { Trans, t } from '@grafana/i18n';
 import { locationService } from '@grafana/runtime';
@@ -48,13 +49,14 @@ export class VizPanelEditableElement implements EditableDashboardElement, BulkAc
         .addItem(
           new OptionsPaneItemDescriptor({
             title: '',
+            id: uuidv4(),
             render: () => <OpenPanelEditViz panel={this.panel} />,
           })
         )
         .addItem(
           new OptionsPaneItemDescriptor({
             title: t('dashboard.viz-panel.options.title-option', 'Title'),
-            id: 'PanelFrameTitle',
+            id: uuidv4(),
             value: panel.state.title,
             popularRank: 1,
             render: (descriptor) => (
@@ -65,7 +67,7 @@ export class VizPanelEditableElement implements EditableDashboardElement, BulkAc
         .addItem(
           new OptionsPaneItemDescriptor({
             title: t('dashboard.viz-panel.options.description', 'Description'),
-            id: 'description-text-area',
+            id: uuidv4(),
             value: panel.state.description,
             render: (descriptor) => <PanelDescriptionTextArea id={descriptor.props.id} panel={panel} />,
           })
@@ -73,7 +75,7 @@ export class VizPanelEditableElement implements EditableDashboardElement, BulkAc
         .addItem(
           new OptionsPaneItemDescriptor({
             title: t('dashboard.viz-panel.options.transparent-background', 'Transparent background'),
-            id: 'transparent-background',
+            id: uuidv4(),
             render: (descriptor) => <PanelBackgroundSwitch id={descriptor.props.id} panel={panel} />,
           })
         );
@@ -133,9 +135,7 @@ export class VizPanelEditableElement implements EditableDashboardElement, BulkAc
   }
 }
 
-type OpenPanelEditVizProps = {
-  panel: VizPanel;
-};
+type OpenPanelEditVizProps = { panel: VizPanel };
 
 const OpenPanelEditViz = ({ panel }: OpenPanelEditVizProps) => {
   return (
diff --git a/public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx b/public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx
index 366fcdc81e4..a46c113c7c9 100644
--- a/public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
 import { CoreApp } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -37,7 +38,7 @@ export function getPanelFrameOptions(panel: VizPanel): OptionsPaneCategoryDescri
     .addItem(
       new OptionsPaneItemDescriptor({
         title: t('dashboard-scene.get-panel-frame-options.title.title', 'Title'),
-        id: 'PanelFrameTitle',
+        id: uuidv4(),
         value: panel.state.title,
         popularRank: 1,
         render: function renderTitle(descriptor) {
@@ -55,7 +56,7 @@ export function getPanelFrameOptions(panel: VizPanel): OptionsPaneCategoryDescri
     .addItem(
       new OptionsPaneItemDescriptor({
         title: t('dashboard-scene.get-panel-frame-options.title.description', 'Description'),
-        id: 'description-text-area',
+        id: uuidv4(),
         value: panel.state.description,
         render: function renderDescription(descriptor) {
           return <PanelDescriptionTextArea id={descriptor.props.id} panel={panel} />;
@@ -71,7 +72,7 @@ export function getPanelFrameOptions(panel: VizPanel): OptionsPaneCategoryDescri
     .addItem(
       new OptionsPaneItemDescriptor({
         title: t('dashboard-scene.get-panel-frame-options.title.transparent-background', 'Transparent background'),
-        id: 'transparent-background',
+        id: uuidv4(),
         render: function renderTransparent(descriptor) {
           return <PanelBackgroundSwitch id={descriptor.props.id} panel={panel} />;
         },
@@ -86,6 +87,7 @@ export function getPanelFrameOptions(panel: VizPanel): OptionsPaneCategoryDescri
       }).addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard-scene.get-panel-frame-options.title.panel-links', 'Panel links'),
+          id: uuidv4(),
           render: () => <ScenePanelLinksEditor panelLinks={panelLinksObject ?? undefined} />,
         })
       )
diff --git a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemEditor.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemEditor.tsx
index dc20ec7a8bd..93804685fcb 100644
--- a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemEditor.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemEditor.tsx
@@ -1,3 +1,5 @@
+import { v4 as uuidv4 } from 'uuid';
+
 import { t } from '@grafana/i18n';
 import { OptionsPaneCategoryDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor';
 import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor';
@@ -16,7 +18,7 @@ export function getOptions(model: AutoGridItem): OptionsPaneCategoryDescriptor[]
   }).addItem(
     new OptionsPaneItemDescriptor({
       title: t('dashboard.auto-grid.item-options.repeat.variable.title', 'Repeat by variable'),
-      id: 'repeat-by-variable-select',
+      id: uuidv4(),
       description: t(
         'dashboard.auto-grid.item-options.repeat.variable.description',
         'Repeat this panel for each value in the selected variable. This is not visible while in edit mode. You need to go back to dashboard and then update the variable or reload the dashboard.'
diff --git a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx
index 3b18200fadc..e5b39a60c59 100644
--- a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx
@@ -1,4 +1,5 @@
 import { useCallback } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
 import { SelectableValue } from '@grafana/data';
 import { t } from '@grafana/i18n';
@@ -21,7 +22,7 @@ export function getDashboardGridItemOptions(gridItem: DashboardGridItem): Option
     .addItem(
       new OptionsPaneItemDescriptor({
         title: t('dashboard.default-layout.item-options.repeat.variable.title', 'Repeat by variable'),
-        id: 'repeat-by-variable-select',
+        id: uuidv4(),
         description: t(
           'dashboard.default-layout.item-options.repeat.variable.description',
           'Repeat this panel for each value in the selected variable. This is not visible while in edit mode. You need to go back to dashboard and then update the variable or reload the dashboard.'
@@ -42,11 +43,12 @@ export function getDashboardGridItemOptions(gridItem: DashboardGridItem): Option
     .addItem(
       new OptionsPaneItemDescriptor({
         title: t('dashboard.default-layout.item-options.repeat.max', 'Max per row'),
+        id: uuidv4(),
         useShowIf: () => {
           const { variableName, repeatDirection } = gridItem.useState();
           return Boolean(variableName) && repeatDirection === 'h';
         },
-        render: () => <MaxPerRowOption gridItem={gridItem} />,
+        render: (descriptor) => <MaxPerRowOption id={descriptor.props.id} gridItem={gridItem} />,
       })
     );
 
@@ -81,7 +83,7 @@ function RepeatDirectionOption({ gridItem }: OptionComponentProps) {
   );
 }
 
-function MaxPerRowOption({ gridItem }: OptionComponentProps) {
+function MaxPerRowOption({ gridItem, id }: OptionComponentProps & { id?: string }) {
   const { maxPerRow } = gridItem.useState();
   const maxPerRowOptions: Array<SelectableValue<number>> = [2, 3, 4, 6, 8, 12].map((value) => ({
     label: value.toString(),
@@ -90,6 +92,7 @@ function MaxPerRowOption({ gridItem }: OptionComponentProps) {
 
   return (
     <Select
+      id={id}
       options={maxPerRowOptions}
       value={maxPerRow ?? 4}
       onChange={(value) => {
diff --git a/public/app/features/dashboard-scene/scene/layout-default/SceneGridRowEditableElement.tsx b/public/app/features/dashboard-scene/scene/layout-default/SceneGridRowEditableElement.tsx
index 17be830a0bd..58db7ebb8da 100644
--- a/public/app/features/dashboard-scene/scene/layout-default/SceneGridRowEditableElement.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-default/SceneGridRowEditableElement.tsx
@@ -1,4 +1,5 @@
 import { useMemo } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
@@ -46,7 +47,8 @@ export class SceneGridRowEditableElement implements EditableDashboardElement, Bu
       }).addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.default-layout.row-options.form.title', 'Title'),
-          render: () => <RowTitleInput row={row} />,
+          id: uuidv4(),
+          render: (descriptor) => <RowTitleInput id={descriptor.props.id} row={row} />,
         })
       );
     }, [row]);
@@ -61,7 +63,8 @@ export class SceneGridRowEditableElement implements EditableDashboardElement, Bu
       }).addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.default-layout.row-options.repeat.variable.title', 'Variable'),
-          render: () => <RowRepeatSelect row={row} dashboard={dashboard} />,
+          id: uuidv4(),
+          render: (descriptor) => <RowRepeatSelect id={descriptor.props.id} row={row} dashboard={dashboard} />,
         })
       );
     }, [row]);
@@ -78,13 +81,13 @@ export class SceneGridRowEditableElement implements EditableDashboardElement, Bu
   }
 }
 
-function RowTitleInput({ row }: { row: SceneGridRow }) {
+function RowTitleInput({ row, id }: { row: SceneGridRow; id?: string }) {
   const { title } = row.useState();
 
-  return <Input value={title} onChange={(e) => row.setState({ title: e.currentTarget.value })} />;
+  return <Input id={id} value={title} onChange={(e) => row.setState({ title: e.currentTarget.value })} />;
 }
 
-function RowRepeatSelect({ row, dashboard }: { row: SceneGridRow; dashboard: DashboardScene }) {
+function RowRepeatSelect({ row, dashboard, id }: { row: SceneGridRow; dashboard: DashboardScene; id?: string }) {
   const { $behaviors, children } = row.useState();
   let repeatBehavior = $behaviors?.find((b) => b instanceof RowRepeaterBehavior);
   const vizPanels = useMemo(
@@ -104,6 +107,7 @@ function RowRepeatSelect({ row, dashboard }: { row: SceneGridRow; dashboard: Das
   return (
     <>
       <RepeatRowSelect2
+        id={id}
         sceneContext={dashboard}
         repeat={repeatBehavior?.state.variableName}
         onChange={(repeat) => {
diff --git a/public/app/features/dashboard-scene/scene/layout-rows/RowItemEditor.tsx b/public/app/features/dashboard-scene/scene/layout-rows/RowItemEditor.tsx
index 396e4075587..a05393bca37 100644
--- a/public/app/features/dashboard-scene/scene/layout-rows/RowItemEditor.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-rows/RowItemEditor.tsx
@@ -1,4 +1,5 @@
-import { useMemo } from 'react';
+import { useId, useMemo } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
@@ -32,13 +33,15 @@ export function useEditOptions(model: RowItem, isNewElement: boolean): OptionsPa
         .addItem(
           new OptionsPaneItemDescriptor({
             title: t('dashboard.rows-layout.row-options.row.fill-screen', 'Fill screen'),
-            render: () => <FillScreenSwitch row={model} />,
+            id: uuidv4(),
+            render: (descriptor) => <FillScreenSwitch id={descriptor.props.id} row={model} />,
           })
         )
         .addItem(
           new OptionsPaneItemDescriptor({
             title: t('dashboard.rows-layout.row-options.row.hide-header', 'Hide row header'),
-            render: () => <RowHeaderSwitch row={model} />,
+            id: uuidv4(),
+            render: (descriptor) => <RowHeaderSwitch id={descriptor.props.id} row={model} />,
           })
         ),
     [model, isNewElement]
@@ -53,11 +56,12 @@ export function useEditOptions(model: RowItem, isNewElement: boolean): OptionsPa
       }).addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.rows-layout.row-options.repeat.variable.title', 'Repeat by variable'),
+          id: uuidv4(),
           description: t(
             'dashboard.rows-layout.row-options.repeat.variable.description',
             'Repeat this row for each value in the selected variable.'
           ),
-          render: () => <RowRepeatSelect row={model} />,
+          render: (descriptor) => <RowRepeatSelect id={descriptor.props.id} row={model} />,
         })
       ),
     [model]
@@ -94,6 +98,7 @@ function RowTitleInput({ row, isNewElement }: { row: RowItem; isNewElement: bool
       }
     >
       <Input
+        id={useId()}
         ref={ref}
         title={t('dashboard.rows-layout.row-options.title-option', 'Title')}
         value={title}
@@ -103,19 +108,19 @@ function RowTitleInput({ row, isNewElement }: { row: RowItem; isNewElement: bool
   );
 }
 
-function RowHeaderSwitch({ row }: { row: RowItem }) {
+function RowHeaderSwitch({ row, id }: { row: RowItem; id?: string }) {
   const { hideHeader: isHeaderHidden = false } = row.useState();
 
-  return <Switch value={isHeaderHidden} onChange={() => row.onHeaderHiddenToggle()} />;
+  return <Switch id={id} value={isHeaderHidden} onChange={() => row.onHeaderHiddenToggle()} />;
 }
 
-function FillScreenSwitch({ row }: { row: RowItem }) {
+function FillScreenSwitch({ row, id }: { row: RowItem; id?: string }) {
   const { fillScreen } = row.useState();
 
-  return <Switch value={fillScreen} onChange={() => row.onChangeFillScreen(!fillScreen)} />;
+  return <Switch id={id} value={fillScreen} onChange={() => row.onChangeFillScreen(!fillScreen)} />;
 }
 
-function RowRepeatSelect({ row }: { row: RowItem }) {
+function RowRepeatSelect({ row, id }: { row: RowItem; id?: string }) {
   const { layout } = row.useState();
   const dashboard = useDashboard(row);
 
@@ -131,6 +136,7 @@ function RowRepeatSelect({ row }: { row: RowItem }) {
   return (
     <>
       <RepeatRowSelect2
+        id={id}
         sceneContext={dashboard}
         repeat={row.state.repeatByVariable}
         onChange={(repeat) => row.onChangeRepeat(repeat)}
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemEditor.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemEditor.tsx
index 0a2b0b3f30e..0c34c8a7776 100644
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemEditor.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemEditor.tsx
@@ -1,4 +1,5 @@
 import { useMemo } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
@@ -24,7 +25,8 @@ export function useEditOptions(model: TabItem, isNewElement: boolean): OptionsPa
       new OptionsPaneCategoryDescriptor({ title: '', id: 'tab-item-options' }).addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.tabs-layout.tab-options.title-option', 'Title'),
-          render: () => <TabTitleInput tab={model} isNewElement={isNewElement} />,
+          id: uuidv4(),
+          render: (descriptor) => <TabTitleInput id={descriptor.props.id} tab={model} isNewElement={isNewElement} />,
         })
       ),
     [model, isNewElement]
@@ -39,11 +41,12 @@ export function useEditOptions(model: TabItem, isNewElement: boolean): OptionsPa
       }).addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.tabs-layout.tab-options.repeat.variable.title', 'Repeat by variable'),
+          id: uuidv4(),
           description: t(
             'dashboard.tabs-layout.tab-options.repeat.variable.description',
             'Repeat this tab for each value in the selected variable.'
           ),
-          render: () => <TabRepeatSelect tab={model} />,
+          render: (descriptor) => <TabRepeatSelect id={descriptor.props.id} tab={model} />,
         })
       ),
     [model]
@@ -65,7 +68,7 @@ export function useEditOptions(model: TabItem, isNewElement: boolean): OptionsPa
   return editOptions;
 }
 
-function TabTitleInput({ tab, isNewElement }: { tab: TabItem; isNewElement: boolean }) {
+function TabTitleInput({ tab, isNewElement, id }: { tab: TabItem; isNewElement: boolean; id?: string }) {
   const { title } = tab.useState();
 
   const ref = useEditPaneInputAutoFocus({ autoFocus: isNewElement });
@@ -79,6 +82,7 @@ function TabTitleInput({ tab, isNewElement }: { tab: TabItem; isNewElement: bool
       }
     >
       <Input
+        id={id}
         ref={ref}
         title={t('dashboard.tabs-layout.tab-options.title-option', 'Title')}
         value={title}
@@ -88,7 +92,7 @@ function TabTitleInput({ tab, isNewElement }: { tab: TabItem; isNewElement: bool
   );
 }
 
-function TabRepeatSelect({ tab }: { tab: TabItem }) {
+function TabRepeatSelect({ tab, id }: { tab: TabItem; id?: string }) {
   const { layout } = tab.useState();
   const dashboard = useDashboard(tab);
 
@@ -104,6 +108,7 @@ function TabRepeatSelect({ tab }: { tab: TabItem }) {
   return (
     <>
       <RepeatRowSelect2
+        id={id}
         sceneContext={dashboard}
         repeat={tab.state.repeatByVariable}
         onChange={(repeat) => tab.onChangeRepeat(repeat)}
diff --git a/public/app/features/dashboard-scene/settings/variables/VariableEditableElement.tsx b/public/app/features/dashboard-scene/settings/variables/VariableEditableElement.tsx
index 86450b91f92..862a51ee1ac 100644
--- a/public/app/features/dashboard-scene/settings/variables/VariableEditableElement.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/VariableEditableElement.tsx
@@ -1,4 +1,5 @@
-import { FormEvent, useMemo, useRef, useState } from 'react';
+import { FormEvent, useId, useMemo, useRef, useState } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
 import { VariableHide } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -63,14 +64,16 @@ export class VariableEditableElement implements EditableDashboardElement, BulkAc
         .addItem(
           new OptionsPaneItemDescriptor({
             title: t('dashboard.edit-pane.variable.label', 'Label'),
+            id: uuidv4(),
             description: t('dashboard.edit-pane.variable.label-description', 'Optional display name'),
-            render: () => <VariableLabelInput variable={variable} />,
+            render: (descriptor) => <VariableLabelInput id={descriptor.props.id} variable={variable} />,
           })
         )
         .addItem(
           new OptionsPaneItemDescriptor({
             title: t('dashboard.edit-pane.variable.description', 'Description'),
-            render: () => <VariableDescriptionTextArea variable={variable} />,
+            id: uuidv4(),
+            render: (descriptor) => <VariableDescriptionTextArea id={descriptor.props.id} variable={variable} />,
           })
         )
         .addItem(
@@ -117,6 +120,7 @@ export class VariableEditableElement implements EditableDashboardElement, BulkAc
 
 interface VariableInputProps {
   variable: SceneVariable;
+  id?: string;
 }
 
 function VariableNameInput({ variable, isNewElement }: { variable: SceneVariable; isNewElement: boolean }) {
@@ -138,6 +142,7 @@ function VariableNameInput({ variable, isNewElement }: { variable: SceneVariable
   return (
     <Field label={t('dashboard.edit-pane.variable.name', 'Name')} invalid={!!nameError} error={nameError}>
       <Input
+        id={useId()}
         ref={ref}
         value={name}
         onFocus={() => {
@@ -171,12 +176,13 @@ function VariableNameInput({ variable, isNewElement }: { variable: SceneVariable
   );
 }
 
-function VariableLabelInput({ variable }: VariableInputProps) {
+function VariableLabelInput({ variable, id }: VariableInputProps) {
   const { label } = variable.useState();
   const oldLabel = useRef(label ?? '');
 
   return (
     <Input
+      id={id}
       value={label}
       onFocus={() => {
         oldLabel.current = label ?? '';
@@ -201,13 +207,13 @@ function VariableLabelInput({ variable }: VariableInputProps) {
   );
 }
 
-function VariableDescriptionTextArea({ variable }: VariableInputProps) {
+function VariableDescriptionTextArea({ variable, id }: VariableInputProps) {
   const { description } = variable.useState();
   const oldDescription = useRef(description ?? '');
 
   return (
     <TextArea
-      id="description-text-area"
+      id={id}
       value={description ?? ''}
       placeholder={t('dashboard.edit-pane.variable.description-placeholder', 'Descriptive text')}
       onFocus={() => {
diff --git a/public/app/features/dashboard-scene/settings/variables/components/CustomVariableForm.tsx b/public/app/features/dashboard-scene/settings/variables/components/CustomVariableForm.tsx
index bdc98b74a94..71e001ddd84 100644
--- a/public/app/features/dashboard-scene/settings/variables/components/CustomVariableForm.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/components/CustomVariableForm.tsx
@@ -1,5 +1,6 @@
 import { FormEvent } from 'react';
 import { lastValueFrom } from 'rxjs';
+import { v4 as uuidv4 } from 'uuid';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
@@ -80,12 +81,13 @@ export function getCustomVariableOptions(variable: SceneVariable): OptionsPaneIt
   return [
     new OptionsPaneItemDescriptor({
       title: t('dashboard.edit-pane.variable.custom-options.values', 'Values separated by comma'),
-      render: () => <ValuesTextField variable={variable} />,
+      id: uuidv4(),
+      render: (descriptor) => <ValuesTextField id={descriptor.props.id} variable={variable} />,
     }),
   ];
 }
 
-function ValuesTextField({ variable }: { variable: CustomVariable }) {
+function ValuesTextField({ variable, id }: { variable: CustomVariable; id?: string }) {
   const { query } = variable.useState();
 
   const onBlur = async (event: FormEvent<HTMLTextAreaElement>) => {
@@ -95,6 +97,7 @@ function ValuesTextField({ variable }: { variable: CustomVariable }) {
 
   return (
     <TextArea
+      id={id}
       rows={2}
       defaultValue={query}
       onBlur={onBlur}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/ConstantVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/ConstantVariableEditor.tsx
index 6801eaf04fb..dac8fddbf33 100644
--- a/public/app/features/dashboard-scene/settings/variables/editors/ConstantVariableEditor.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/editors/ConstantVariableEditor.tsx
@@ -1,5 +1,6 @@
 import { FormEvent } from 'react';
 import { lastValueFrom } from 'rxjs';
+import { v4 as uuidv4 } from 'uuid';
 
 import { t } from '@grafana/i18n';
 import { ConstantVariable, SceneVariable } from '@grafana/scenes';
@@ -31,12 +32,13 @@ export function getConstantVariableOptions(variable: SceneVariable): OptionsPane
   return [
     new OptionsPaneItemDescriptor({
       title: t('dashboard-scene.constant-variable-form.label-value', 'Value'),
-      render: () => <ConstantValueInput variable={variable} />,
+      id: uuidv4(),
+      render: (descriptor) => <ConstantValueInput id={descriptor.props.id} variable={variable} />,
     }),
   ];
 }
 
-function ConstantValueInput({ variable }: { variable: ConstantVariable }) {
+function ConstantValueInput({ variable, id }: { variable: ConstantVariable; id?: string }) {
   const { value } = variable.useState();
 
   const onBlur = async (event: FormEvent<HTMLInputElement>) => {
@@ -46,6 +48,7 @@ function ConstantValueInput({ variable }: { variable: ConstantVariable }) {
 
   return (
     <Input
+      id={id}
       defaultValue={value.toString()}
       onBlur={onBlur}
       placeholder={t('dashboard-scene.constant-variable-form.placeholder-your-metric-prefix', 'Your metric prefix')}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor.tsx
index e262a49a2c5..3068607597f 100644
--- a/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor.tsx
@@ -1,5 +1,6 @@
 import { FormEvent } from 'react';
 import { lastValueFrom } from 'rxjs';
+import { v4 as uuidv4 } from 'uuid';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
@@ -58,12 +59,13 @@ export function getCustomVariableOptions(variable: SceneVariable): OptionsPaneIt
   return [
     new OptionsPaneItemDescriptor({
       title: t('dashboard.edit-pane.variable.custom-options.values', 'Values separated by comma'),
-      render: () => <ValuesTextField variable={variable} />,
+      id: uuidv4(),
+      render: ({ props }) => <ValuesTextField id={props.id} variable={variable} />,
     }),
   ];
 }
 
-function ValuesTextField({ variable }: { variable: CustomVariable }) {
+function ValuesTextField({ variable, id }: { variable: CustomVariable; id?: string }) {
   const { query } = variable.useState();
 
   const onBlur = async (event: FormEvent<HTMLTextAreaElement>) => {
@@ -73,6 +75,7 @@ function ValuesTextField({ variable }: { variable: CustomVariable }) {
 
   return (
     <TextArea
+      id={id}
       rows={2}
       defaultValue={query}
       onBlur={onBlur}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/DataSourceVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/DataSourceVariableEditor.tsx
index 85248358c43..249ad3b2f6c 100644
--- a/public/app/features/dashboard-scene/settings/variables/editors/DataSourceVariableEditor.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/editors/DataSourceVariableEditor.tsx
@@ -1,5 +1,6 @@
 import React, { FormEvent } from 'react';
 import { lastValueFrom } from 'rxjs';
+import { v4 as uuidv4 } from 'uuid';
 
 import { SelectableValue } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -80,20 +81,27 @@ export function getDataSourceVariableOptions(variable: SceneVariable): OptionsPa
   return [
     new OptionsPaneItemDescriptor({
       title: t('dashboard.edit-pane.variable.datasource-options.type', 'Type'),
-      render: () => <DataSourceTypeSelect variable={variable} />,
+      id: uuidv4(),
+      render: ({ props }) => <DataSourceTypeSelect id={props.id} variable={variable} />,
     }),
     new OptionsPaneItemDescriptor({
       title: t('dashboard.edit-pane.variable.datasource-options.name-filter', 'Name filter'),
+      id: uuidv4(),
       description: t(
         'dashboard.edit-pane.variable.datasource-options.name-filter-description',
         'Regex filter for which data source instances to include. Leave empty for all.'
       ),
-      render: () => <DataSourceNameFilter variable={variable} />,
+      render: ({ props }) => <DataSourceNameFilter id={props.id} variable={variable} />,
     }),
   ];
 }
 
-function DataSourceTypeSelect({ variable }: { variable: DataSourceVariable }) {
+interface InputProps {
+  variable: DataSourceVariable;
+  id?: string;
+}
+
+function DataSourceTypeSelect({ variable, id }: InputProps) {
   const { pluginId } = variable.useState();
   const options = getOptionDataSourceTypes();
 
@@ -104,6 +112,7 @@ function DataSourceTypeSelect({ variable }: { variable: DataSourceVariable }) {
 
   return (
     <Combobox
+      id={id}
       options={options}
       value={pluginId}
       onChange={onChange}
@@ -113,7 +122,7 @@ function DataSourceTypeSelect({ variable }: { variable: DataSourceVariable }) {
   );
 }
 
-function DataSourceNameFilter({ variable }: { variable: DataSourceVariable }) {
+function DataSourceNameFilter({ variable, id }: InputProps) {
   const { regex } = variable.useState();
 
   const onBlur = async (evt: React.FormEvent<HTMLInputElement>) => {
@@ -123,6 +132,7 @@ function DataSourceNameFilter({ variable }: { variable: DataSourceVariable }) {
 
   return (
     <Input
+      id={id}
       defaultValue={regex}
       onBlur={onBlur}
       data-testid={selectors.pages.Dashboard.Settings.Variables.Edit.DatasourceVariable.nameFilter}
diff --git a/public/app/features/dashboard-scene/settings/variables/editors/SystemVariableEditor.tsx b/public/app/features/dashboard-scene/settings/variables/editors/SystemVariableEditor.tsx
index d7a55ae5dad..c0c958c21a8 100644
--- a/public/app/features/dashboard-scene/settings/variables/editors/SystemVariableEditor.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/editors/SystemVariableEditor.tsx
@@ -9,7 +9,6 @@ export function getSystemVariableOptions(variable: SceneVariable): OptionsPaneIt
 
   return [
     new OptionsPaneItemDescriptor({
-      title: '',
       render: () => {
         return (
           <Stack direction="column">
diff --git a/public/app/features/dashboard-scene/settings/variables/useVariableSelectionOptionsCategory.tsx b/public/app/features/dashboard-scene/settings/variables/useVariableSelectionOptionsCategory.tsx
index cb64f93a829..21fffe38917 100644
--- a/public/app/features/dashboard-scene/settings/variables/useVariableSelectionOptionsCategory.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/useVariableSelectionOptionsCategory.tsx
@@ -1,4 +1,5 @@
 import { useCallback, useMemo, useRef } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
 import { t } from '@grafana/i18n';
 import { MultiValueVariable, SceneVariableValueChangedEvent } from '@grafana/scenes';
@@ -16,22 +17,25 @@ export function useVariableSelectionOptionsCategory(variable: MultiValueVariable
       .addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.edit-pane.variable.selection-options.multi-value', 'Multi-value'),
-          render: () => <MultiValueSwitch variable={variable} />,
+          id: uuidv4(),
+          render: (descriptor) => <MultiValueSwitch id={descriptor.props.id} variable={variable} />,
         })
       )
       .addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.edit-pane.variable.selection-options.include-all', 'Include All value'),
+          id: uuidv4(),
           description: t(
             'dashboard.edit-pane.variable.selection-options.include-all-description',
             'Enables a single option that represent all values'
           ),
-          render: () => <IncludeAllSwitch variable={variable} />,
+          render: (descriptor) => <IncludeAllSwitch id={descriptor.props.id} variable={variable} />,
         })
       )
       .addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.edit-pane.variable.selection-options.custom-all-value', 'Custom all value'),
+          id: uuidv4(),
           description: t(
             'dashboard.edit-pane.variable.selection-options.custom-all-value-description',
             'A wildcard regex or other value to represent All'
@@ -39,46 +43,61 @@ export function useVariableSelectionOptionsCategory(variable: MultiValueVariable
           useShowIf: () => {
             return variable.useState().includeAll ?? false;
           },
-          render: () => <CustomAllValueInput variable={variable} />,
+          render: (descriptor) => <CustomAllValueInput id={descriptor.props.id} variable={variable} />,
         })
       )
       .addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.edit-pane.variable.selection-options.allow-custom-values', 'Allow custom values'),
+          id: uuidv4(),
           description: t(
             'dashboard.edit-pane.variable.selection-options.allow-custom-values-description',
             'Enables users to enter values'
           ),
-          render: () => <AllowCustomSwitch variable={variable} />,
+          render: (descriptor) => <AllowCustomSwitch id={descriptor.props.id} variable={variable} />,
         })
       );
   }, [variable]);
 }
 
-function MultiValueSwitch({ variable }: { variable: MultiValueVariable }) {
+interface InputProps {
+  variable: MultiValueVariable;
+  id?: string;
+}
+
+function MultiValueSwitch({ variable, id }: InputProps) {
   const { isMulti } = variable.useState();
 
-  return <Switch value={isMulti} onChange={(evt) => variable.setState({ isMulti: evt.currentTarget.checked })} />;
+  return (
+    <Switch id={id} value={isMulti} onChange={(evt) => variable.setState({ isMulti: evt.currentTarget.checked })} />
+  );
 }
 
-function IncludeAllSwitch({ variable }: { variable: MultiValueVariable }) {
+function IncludeAllSwitch({ variable, id }: InputProps) {
   const { includeAll } = variable.useState();
 
-  return <Switch value={includeAll} onChange={(evt) => variable.setState({ includeAll: evt.currentTarget.checked })} />;
+  return (
+    <Switch
+      id={id}
+      value={includeAll}
+      onChange={(evt) => variable.setState({ includeAll: evt.currentTarget.checked })}
+    />
+  );
 }
 
-function AllowCustomSwitch({ variable }: { variable: MultiValueVariable }) {
+function AllowCustomSwitch({ variable, id }: InputProps) {
   const { allowCustomValue } = variable.useState();
 
   return (
     <Switch
+      id={id}
       value={allowCustomValue}
       onChange={(evt) => variable.setState({ allowCustomValue: evt.currentTarget.checked })}
     />
   );
 }
 
-function CustomAllValueInput({ variable }: { variable: MultiValueVariable }) {
+function CustomAllValueInput({ variable, id }: InputProps) {
   const { allValue } = variable.useState();
   const ref = useRef<HTMLInputElement>(null);
 
@@ -97,5 +116,5 @@ function CustomAllValueInput({ variable }: { variable: MultiValueVariable }) {
     [variable]
   );
 
-  return <Input ref={ref} defaultValue={allValue ?? ''} onBlur={onInputBlur} />;
+  return <Input id={id} ref={ref} defaultValue={allValue ?? ''} onBlur={onInputBlur} />;
 }
diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor.tsx
index b512ee41b1b..0b0154628f6 100644
--- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor.tsx
@@ -24,6 +24,7 @@ export interface OptionsPaneItemInfo {
   useShowIf?: () => boolean;
   overrides?: OptionPaneItemOverrideInfo[];
   addon?: ReactNode;
+  /** Must be unique on the page! */
   id?: string;
 }
 
@@ -35,10 +36,7 @@ export class OptionsPaneItemDescriptor {
   props: OptionsPaneItemInfo;
 
   constructor(props: OptionsPaneItemInfo) {
-    this.props = { ...props, id: props.id ?? props.title };
-    if (this.props.id === '') {
-      this.props.id = uniqueId();
-    }
+    this.props = { ...props, id: props.id || uniqueId() };
   }
 
   render(searchQuery?: string) {
diff --git a/public/app/features/dashboard/components/PanelEditor/getFieldOverrideElements.tsx b/public/app/features/dashboard/components/PanelEditor/getFieldOverrideElements.tsx
index ce2bb20f8e8..637adecffb1 100644
--- a/public/app/features/dashboard/components/PanelEditor/getFieldOverrideElements.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/getFieldOverrideElements.tsx
@@ -1,6 +1,7 @@
 import { css } from '@emotion/css';
 import { cloneDeep } from 'lodash';
 import * as React from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
 import {
   FieldConfigOptionsRegistry,
@@ -59,13 +60,7 @@ export function getFieldOverrideCategories(
       ...currentFieldConfig,
       overrides: [
         ...currentFieldConfig.overrides,
-        {
-          matcher: {
-            id: info.id,
-            options: info.defaultOptions,
-          },
-          properties: [],
-        },
+        { matcher: { id: info.id, options: info.defaultOptions }, properties: [] },
       ],
     });
   };
@@ -109,18 +104,12 @@ export function getFieldOverrideCategories(
     });
 
     const onMatcherConfigChange = (options: unknown) => {
-      onOverrideChange(idx, {
-        ...override,
-        matcher: { ...override.matcher, options },
-      });
+      onOverrideChange(idx, { ...override, matcher: { ...override.matcher, options } });
     };
 
     const onDynamicConfigValueAdd = (override: ConfigOverrideRule, value: SelectableValue<string>) => {
       const registryItem = registry.get(value.value!);
-      const propertyConfig: DynamicConfigValue = {
-        id: registryItem.id,
-        value: registryItem.defaultValue,
-      };
+      const propertyConfig: DynamicConfigValue = { id: registryItem.id, value: registryItem.defaultValue };
 
       const properties = override.properties ?? [];
       properties.push(propertyConfig);
@@ -131,13 +120,15 @@ export function getFieldOverrideCategories(
     /**
      * Add override matcher UI element
      */
+    const htmlId = uuidv4();
     category.addItem(
       new OptionsPaneItemDescriptor({
+        id: htmlId,
         title: matcherUi.name,
         render: function renderMatcherUI() {
           return (
             <matcherUi.component
-              id={`${matcherUi.matcher.id}-${idx}`}
+              id={htmlId}
               matcher={matcherUi.matcher}
               data={data ?? []}
               options={override.matcher.options}
@@ -173,10 +164,7 @@ export function getFieldOverrideCategories(
       };
 
       const onPropertyRemove = () => {
-        onOverrideChange(idx, {
-          ...override,
-          properties: override.properties.filter((_, i) => i !== propIdx),
-        });
+        onOverrideChange(idx, { ...override, properties: override.properties.filter((_, i) => i !== propIdx) });
       };
 
       /**
@@ -184,7 +172,6 @@ export function getFieldOverrideCategories(
        */
       category.addItem(
         new OptionsPaneItemDescriptor({
-          title: registryItemForProperty.name,
           skipField: true,
           render: function renderPropertyEditor() {
             return (
@@ -210,7 +197,6 @@ export function getFieldOverrideCategories(
     if (!isSystemOverride && override.matcher.options) {
       category.addItem(
         new OptionsPaneItemDescriptor({
-          title: '----------',
           skipField: true,
           render: function renderAddPropertyButton() {
             return (
@@ -274,11 +260,7 @@ function getOverrideProperties(registry: FieldConfigOptionsRegistry) {
       if (item.category) {
         label = [...item.category, item.name].join(' > ');
       }
-      return {
-        label,
-        value: item.id,
-        description: item.description,
-      };
+      return { label, value: item.id, description: item.description };
     });
 }
 
@@ -288,9 +270,5 @@ function AddOverrideButtonContainer({ children }: { children: React.ReactNode })
 }
 
 function getBorderTopStyles(theme: GrafanaTheme2) {
-  return css({
-    borderTop: `1px solid ${theme.colors.border.weak}`,
-    padding: `${theme.spacing(2)}`,
-    display: 'flex',
-  });
+  return css({ borderTop: `1px solid ${theme.colors.border.weak}`, padding: `${theme.spacing(2)}`, display: 'flex' });
 }
diff --git a/public/app/features/dashboard/components/PanelEditor/getLibraryPanelOptions.tsx b/public/app/features/dashboard/components/PanelEditor/getLibraryPanelOptions.tsx
index 9d3f6793e73..019d0d79d10 100644
--- a/public/app/features/dashboard/components/PanelEditor/getLibraryPanelOptions.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/getLibraryPanelOptions.tsx
@@ -1,3 +1,5 @@
+import { v4 as uuidv4 } from 'uuid';
+
 import { t } from '@grafana/i18n';
 import { Input } from '@grafana/ui';
 import { LibraryPanelInformation } from 'app/features/library-panels/components/LibraryPanelInfo/LibraryPanelInfo';
@@ -24,12 +26,13 @@ export function getLibraryPanelOptionsCategory(props: OptionPaneRenderProps): Op
       .addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.get-library-panel-options-category.title.name', 'Name'),
+          id: uuidv4(),
           value: panel.libraryPanel.name,
           popularRank: 1,
-          render: function renderName() {
+          render: function renderName(descriptor) {
             return (
               <Input
-                id="LibraryPanelFrameName"
+                id={descriptor.props.id}
                 defaultValue={panel.libraryPanel.name}
                 onBlur={(e) =>
                   onPanelConfigChange('libraryPanel', { ...panel.libraryPanel, name: e.currentTarget.value })
@@ -42,6 +45,7 @@ export function getLibraryPanelOptionsCategory(props: OptionPaneRenderProps): Op
       .addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.get-library-panel-options-category.title.information', 'Information'),
+          id: uuidv4(),
           render: function renderLibraryPanelInformation() {
             return <LibraryPanelInformation panel={panel} formatDate={dashboard.formatDate} />;
           },
diff --git a/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx b/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx
index c87c50f1429..ebe82ed0223 100644
--- a/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx
@@ -1,3 +1,5 @@
+import { v4 as uuidv4 } from 'uuid';
+
 import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
 import { config } from '@grafana/runtime';
@@ -20,8 +22,11 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
     isOpenDefault: true,
   });
 
+  const panelFrameTitleId = uuidv4();
+  const descriptionId = uuidv4();
+
   const setPanelTitle = (title: string) => {
-    const input = document.getElementById('PanelFrameTitle');
+    const input = document.getElementById(panelFrameTitleId);
     if (input instanceof HTMLInputElement) {
       input.value = title;
       onPanelConfigChange('title', title);
@@ -29,7 +34,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
   };
 
   const setPanelDescription = (description: string) => {
-    const input = document.getElementById('description-text-area');
+    const input = document.getElementById(descriptionId);
     if (input instanceof HTMLTextAreaElement) {
       input.value = description;
       onPanelConfigChange('description', description);
@@ -40,7 +45,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
     .addItem(
       new OptionsPaneItemDescriptor({
         title: t('dashboard.get-panel-frame-category.title.title', 'Title'),
-        id: 'PanelFrameTitle',
+        id: panelFrameTitleId,
         value: panel.title,
         popularRank: 1,
         render: function renderTitle(descriptor) {
@@ -65,7 +70,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
     .addItem(
       new OptionsPaneItemDescriptor({
         title: t('dashboard.get-panel-frame-category.title.description', 'Description'),
-        id: 'description-text-area',
+        id: descriptionId,
         description: panel.description,
         value: panel.description,
         render: function renderDescription(descriptor) {
@@ -86,7 +91,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
     .addItem(
       new OptionsPaneItemDescriptor({
         title: t('dashboard.get-panel-frame-category.title.transparent-background', 'Transparent background'),
-        id: 'transparent-background',
+        id: uuidv4(),
         render: function renderTransparent(descriptor) {
           return (
             <Switch
@@ -108,6 +113,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
       }).addItem(
         new OptionsPaneItemDescriptor({
           title: t('dashboard.get-panel-frame-category.title.panel-links', 'Panel links'),
+          id: uuidv4(),
           render: function renderLinks() {
             return (
               <DataLinksInlineEditor
@@ -130,7 +136,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
         .addItem(
           new OptionsPaneItemDescriptor({
             title: t('dashboard.get-panel-frame-category.title.repeat-by-variable', 'Repeat by variable'),
-            id: 'repeat-by-variable-select',
+            id: uuidv4(),
             description:
               'Repeat this panel for each value in the selected variable. This is not visible while in edit mode. You need to go back to dashboard and then update the variable or reload the dashboard.',
             render: function renderRepeatOptions(descriptor) {
@@ -175,11 +181,13 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
         .addItem(
           new OptionsPaneItemDescriptor({
             title: t('dashboard.get-panel-frame-category.title.max-per-row', 'Max per row'),
+            id: uuidv4(),
             showIf: () => Boolean(panel.repeat && panel.repeatDirection === 'h'),
-            render: function renderOption() {
+            render: function renderOption(descriptor) {
               const maxPerRowOptions = [2, 3, 4, 6, 8, 12].map((value) => ({ label: value.toString(), value }));
               return (
                 <Select
+                  id={descriptor.props.id}
                   options={maxPerRowOptions}
                   value={panel.maxPerRow}
                   onChange={(value) => onPanelConfigChange('maxPerRow', value.value)}
diff --git a/public/app/features/dashboard/components/PanelEditor/getVisualizationOptions.tsx b/public/app/features/dashboard/components/PanelEditor/getVisualizationOptions.tsx
index 843bf0700bd..c5fd5ba8a0b 100644
--- a/public/app/features/dashboard/components/PanelEditor/getVisualizationOptions.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/getVisualizationOptions.tsx
@@ -1,4 +1,5 @@
 import { get as lodashGet } from 'lodash';
+import { v4 as uuiv4 } from 'uuid';
 
 import {
   EventBus,
@@ -130,9 +131,12 @@ export function getVisualizationOptions(props: OptionPaneRenderProps): OptionsPa
       category.props.itemsCount = fieldOption.getItemsCount(value);
     }
 
+    const htmlId = uuiv4();
+
     category.addItem(
       new OptionsPaneItemDescriptor({
         title: fieldOption.name,
+        id: htmlId,
         description: fieldOption.description,
         overrides: getOptionOverrides(fieldOption, currentFieldConfig, data?.series),
         render: function renderEditor() {
@@ -142,7 +146,7 @@ export function getVisualizationOptions(props: OptionPaneRenderProps): OptionsPa
             );
           };
 
-          return <Editor value={value} onChange={onChange} item={fieldOption} context={context} id={fieldOption.id} />;
+          return <Editor value={value} onChange={onChange} item={fieldOption} context={context} id={htmlId} />;
         },
       })
     );
@@ -165,12 +169,13 @@ export function getLibraryVizPanelOptionsCategory(libraryPanel: LibraryPanelBeha
     .addItem(
       new OptionsPaneItemDescriptor({
         title: t('dashboard.get-library-viz-panel-options-category.title.name', 'Name'),
+        id: uuiv4(),
         value: libraryPanel,
         popularRank: 1,
-        render: function renderName() {
+        render: function renderName(descriptor) {
           return (
             <Input
-              id="LibraryPanelFrameName"
+              id={descriptor.props.id}
               data-testid="library panel name input"
               defaultValue={libraryPanel.state.name}
               onBlur={(e) => libraryPanel.setState({ name: e.currentTarget.value })}
@@ -264,9 +269,12 @@ export function getVisualizationOptions2(props: OptionPaneRenderProps2): Options
       category.props.itemsCount = fieldOption.getItemsCount(value);
     }
 
+    const htmlId = uuiv4();
+
     category.addItem(
       new OptionsPaneItemDescriptor({
         title: fieldOption.name,
+        id: htmlId,
         description: fieldOption.description,
         overrides: getOptionOverrides(fieldOption, currentFieldConfig, data?.series),
         render: function renderEditor() {
@@ -277,7 +285,7 @@ export function getVisualizationOptions2(props: OptionPaneRenderProps2): Options
             );
           };
 
-          return <Editor value={value} onChange={onChange} item={fieldOption} context={context} id={fieldOption.id} />;
+          return <Editor value={value} onChange={onChange} item={fieldOption} context={context} id={htmlId} />;
         },
       })
     );
@@ -330,10 +338,13 @@ export function fillOptionsPaneItems(
       continue;
     }
 
+    const htmlId = uuiv4();
+
     const Editor = pluginOption.editor;
     category.addItem(
       new OptionsPaneItemDescriptor({
         title: pluginOption.name,
+        id: htmlId,
         description: pluginOption.description,
         render: function renderEditor() {
           return (
@@ -344,7 +355,7 @@ export function fillOptionsPaneItems(
               }}
               item={pluginOption}
               context={context}
-              id={pluginOption.id}
+              id={htmlId}
             />
           );
         },
diff --git a/public/app/features/dashboard/components/PanelEditor/state/OptionSearchEngine.test.ts b/public/app/features/dashboard/components/PanelEditor/state/OptionSearchEngine.test.ts
index 43787af8f58..6165901fcde 100644
--- a/public/app/features/dashboard/components/PanelEditor/state/OptionSearchEngine.test.ts
+++ b/public/app/features/dashboard/components/PanelEditor/state/OptionSearchEngine.test.ts
@@ -1,3 +1,5 @@
+import { v4 as uuiv4 } from 'uuid';
+
 import { OptionsPaneCategoryDescriptor } from '../OptionsPaneCategoryDescriptor';
 import { OptionsPaneItemDescriptor } from '../OptionsPaneItemDescriptor';
 
@@ -51,18 +53,21 @@ function getOptionCategories(): OptionsPaneCategoryDescriptor[] {
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'Title',
+          id: uuiv4(),
           render: jest.fn(),
         })
       )
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'Min',
+          id: uuiv4(),
           render: jest.fn(),
         })
       )
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'ASDSADASDSADA',
+          id: uuiv4(),
           description: 'DescriptionMatch',
           render: jest.fn(),
         })
@@ -74,18 +79,21 @@ function getOptionCategories(): OptionsPaneCategoryDescriptor[] {
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'Min',
+          id: uuiv4(),
           render: jest.fn(),
         })
       )
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'DescriptionMatch',
+          id: uuiv4(),
           render: jest.fn(),
         })
       )
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'Frame',
+          id: uuiv4(),
           render: jest.fn(),
         })
       ),
@@ -101,18 +109,21 @@ function getOverrides(): OptionsPaneCategoryDescriptor[] {
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'Match by name',
+          id: uuiv4(),
           render: jest.fn(),
         })
       )
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'Min',
+          id: uuiv4(),
           render: jest.fn(),
         })
       )
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'Max',
+          id: uuiv4(),
           render: jest.fn(),
         })
       ),
@@ -123,18 +134,21 @@ function getOverrides(): OptionsPaneCategoryDescriptor[] {
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'Match by name',
+          id: uuiv4(),
           render: jest.fn(),
         })
       )
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'Threshold',
+          id: uuiv4(),
           render: jest.fn(),
         })
       )
       .addItem(
         new OptionsPaneItemDescriptor({
           title: 'Max',
+          id: uuiv4(),
           render: jest.fn(),
         })
       ),
diff --git a/public/app/features/dimensions/editors/ColorDimensionEditor.tsx b/public/app/features/dimensions/editors/ColorDimensionEditor.tsx
index a8c7d5af8c5..1b991bdd668 100644
--- a/public/app/features/dimensions/editors/ColorDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/ColorDimensionEditor.tsx
@@ -21,7 +21,7 @@ export const ColorDimensionEditor = (props: StandardEditorProps<ColorDimensionCo
     }),
     []
   );
-  const { value, context, onChange, item } = props;
+  const { value, context, onChange, item, id } = props;
 
   const defaultColor = 'dark-green';
 
@@ -71,6 +71,7 @@ export const ColorDimensionEditor = (props: StandardEditorProps<ColorDimensionCo
     <>
       <div className={styles.container}>
         <Select
+          inputId={id}
           value={selectedOption}
           options={selectOptions}
           onChange={onSelectChange}
diff --git a/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx b/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx
index a88c7334571..13b0843dcd5 100644
--- a/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import { useCallback, useMemo } from 'react';
+import { useCallback, useId, useMemo } from 'react';
 
 import { FieldType, GrafanaTheme2, SelectableValue, StandardEditorProps } from '@grafana/data';
 import { t } from '@grafana/i18n';
@@ -92,6 +92,8 @@ export const ScalarDimensionEditor = ({ value, context, onChange, item }: Props)
     [onChange, value]
   );
 
+  const valueInputId = useId();
+
   const val = value ?? {};
   const mode = value?.mode ?? ScalarDimensionMode.Mod;
   const selectedOption = isFixed ? fixedValueOption : selectOptions.find((v) => v.value === fieldName);
@@ -119,6 +121,7 @@ export const ScalarDimensionEditor = ({ value, context, onChange, item }: Props)
               grow={true}
             >
               <NumberInput
+                id={valueInputId}
                 value={val?.fixed ?? DEFAULT_VALUE}
                 onChange={onValueChange}
                 max={settings?.max}
diff --git a/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx b/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx
index d5eb712d47d..52b8a333f6a 100644
--- a/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import { useCallback, useMemo } from 'react';
+import { useCallback, useId, useMemo } from 'react';
 
 import { GrafanaTheme2, SelectableValue, StandardEditorProps } from '@grafana/data';
 import { t } from '@grafana/i18n';
@@ -12,7 +12,7 @@ import { validateScaleOptions, validateScaleConfig } from '../scale';
 import { ScaleDimensionOptions } from '../types';
 
 export const ScaleDimensionEditor = (props: StandardEditorProps<ScaleDimensionConfig, ScaleDimensionOptions>) => {
-  const { value, context, onChange, item } = props;
+  const { value, context, onChange, item, id } = props;
   const { settings } = item;
   const styles = useStyles2(getStyles);
 
@@ -95,12 +95,17 @@ export const ScaleDimensionEditor = (props: StandardEditorProps<ScaleDimensionCo
     [validateAndDoChange, value]
   );
 
+  const valueInputId = useId();
+  const minInputId = useId();
+  const maxInputId = useId();
+
   const val = value ?? {};
   const selectedOption = isFixed ? fixedValueOption : selectOptions.find((v) => v.value === fieldName);
   return (
     <>
       <div>
         <Select
+          inputId={id}
           value={selectedOption}
           options={selectOptions}
           onChange={onSelectChange}
@@ -111,7 +116,7 @@ export const ScaleDimensionEditor = (props: StandardEditorProps<ScaleDimensionCo
         {isFixed && (
           <InlineFieldRow>
             <InlineField label={t('dimensions.scale-dimension-editor.label-value', 'Value')} labelWidth={8} grow={true}>
-              <NumberInput value={val.fixed} {...minMaxStep} onChange={onValueChange} />
+              <NumberInput id={valueInputId} value={val.fixed} {...minMaxStep} onChange={onValueChange} />
             </InlineField>
           </InlineFieldRow>
         )}
@@ -119,12 +124,12 @@ export const ScaleDimensionEditor = (props: StandardEditorProps<ScaleDimensionCo
           <>
             <InlineFieldRow>
               <InlineField label={t('dimensions.scale-dimension-editor.label-min', 'Min')} labelWidth={8} grow={true}>
-                <NumberInput value={val.min} {...minMaxStep} onChange={onMinChange} />
+                <NumberInput id={minInputId} value={val.min} {...minMaxStep} onChange={onMinChange} />
               </InlineField>
             </InlineFieldRow>
             <InlineFieldRow>
               <InlineField label={t('dimensions.scale-dimension-editor.label-max', 'Max')} labelWidth={8} grow={true}>
-                <NumberInput value={val.max} {...minMaxStep} onChange={onMaxChange} />
+                <NumberInput id={maxInputId} value={val.max} {...minMaxStep} onChange={onMaxChange} />
               </InlineField>
             </InlineFieldRow>
           </>
diff --git a/public/app/features/dimensions/editors/TextDimensionEditor.tsx b/public/app/features/dimensions/editors/TextDimensionEditor.tsx
index 325af4b0c4b..65f4f2f9aaa 100644
--- a/public/app/features/dimensions/editors/TextDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/TextDimensionEditor.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from 'react';
+import { useCallback, useId } from 'react';
 
 import {
   FieldNamePickerConfigSettings,
@@ -74,6 +74,10 @@ export const TextDimensionEditor = ({ value, context, onChange }: Props) => {
     onFixedChange('');
   };
 
+  const fieldInputId = useId();
+  const valueInputId = useId();
+  const templateInputId = useId();
+
   const mode = value?.mode ?? TextDimensionMode.Fixed;
   return (
     <>
@@ -94,6 +98,7 @@ export const TextDimensionEditor = ({ value, context, onChange }: Props) => {
             grow={true}
           >
             <FieldNamePicker
+              id={fieldInputId}
               context={context}
               value={value.field ?? ''}
               onChange={onFieldChange}
@@ -110,6 +115,7 @@ export const TextDimensionEditor = ({ value, context, onChange }: Props) => {
             grow={true}
           >
             <StringValueEditor
+              id={valueInputId}
               context={context}
               value={value?.fixed}
               onChange={onFixedChange}
@@ -138,6 +144,7 @@ export const TextDimensionEditor = ({ value, context, onChange }: Props) => {
             grow={true}
           >
             <StringValueEditor // This could be a code editor
+              id={templateInputId}
               context={context}
               value={value?.fixed}
               onChange={onFixedChange}
diff --git a/public/app/features/geo/editor/locationModeEditor.tsx b/public/app/features/geo/editor/locationModeEditor.tsx
index 1223179ed13..9bde36e7c16 100644
--- a/public/app/features/geo/editor/locationModeEditor.tsx
+++ b/public/app/features/geo/editor/locationModeEditor.tsx
@@ -21,6 +21,7 @@ export const LocationModeEditor = ({
   onChange,
   context,
   item,
+  id,
 }: StandardEditorProps<string, ModeEditorSettings, unknown, unknown>) => {
   const [info, setInfo] = useState<FrameGeometryField>();
 
@@ -97,6 +98,7 @@ export const LocationModeEditor = ({
   return (
     <>
       <Select
+        inputId={id}
         options={MODE_OPTIONS}
         value={value}
         onChange={(v) => {
diff --git a/public/app/plugins/panel/alertlist/module.tsx b/public/app/plugins/panel/alertlist/module.tsx
index 9e8df21539e..180089d0ad5 100644
--- a/public/app/plugins/panel/alertlist/module.tsx
+++ b/public/app/plugins/panel/alertlist/module.tsx
@@ -128,11 +128,12 @@ const unifiedAlertList = new PanelPlugin<UnifiedAlertListOptions>(UnifiedAlertLi
       description: t('alertlist.description-datasource', 'Filter from alert source'),
       id: 'datasource',
       defaultValue: null,
-      editor: function RenderDatasourcePicker(props) {
+      editor: function RenderDatasourcePicker({ id, ...props }) {
         return (
           <Stack gap={1}>
             <DataSourcePicker
               {...props}
+              inputId={id}
               type={SUPPORTED_RULE_SOURCE_TYPES}
               noDefault
               current={props.value}
diff --git a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
index a5a920ce3d1..597aeb657bd 100644
--- a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
@@ -6,7 +6,7 @@ import { RefIDMultiPicker, RefIDPicker, stringsToRegexp } from '@grafana/ui/inte
 
 type Props = StandardEditorProps<MatcherConfig>;
 
-export const FrameSelectionEditor = ({ value, context, onChange }: Props) => {
+export const FrameSelectionEditor = ({ value, context, onChange, id }: Props) => {
   const onFilterChange = useCallback(
     (v: string) => {
       onChange(
@@ -23,6 +23,7 @@ export const FrameSelectionEditor = ({ value, context, onChange }: Props) => {
 
   return (
     <RefIDPicker
+      id={id}
       value={value?.options}
       onChange={onFilterChange}
       data={context.data}
diff --git a/public/app/plugins/panel/geomap/editor/MapViewEditor.tsx b/public/app/plugins/panel/geomap/editor/MapViewEditor.tsx
index 6a6d172eff5..addce95621e 100644
--- a/public/app/plugins/panel/geomap/editor/MapViewEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/MapViewEditor.tsx
@@ -1,5 +1,5 @@
 import { toLonLat } from 'ol/proj';
-import { useMemo, useCallback } from 'react';
+import { useMemo, useCallback, useId } from 'react';
 
 import { StandardEditorProps, SelectableValue } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
@@ -63,11 +63,14 @@ export const MapViewEditor = ({
     [value, onChange]
   );
 
+  const viewInputId = useId();
+  const zoomInputId = useId();
+
   return (
     <>
       <InlineFieldRow>
         <InlineField label={t('geomap.map-view-editor.label-view', 'View')} labelWidth={labelWidth} grow={true}>
-          <Select options={views.options} value={views.current} onChange={onSelectView} />
+          <Select inputId={viewInputId} options={views.options} value={views.current} onChange={onSelectView} />
         </InlineField>
       </InlineFieldRow>
       {value.id === MapCenterID.Coordinates && (
@@ -88,6 +91,7 @@ export const MapViewEditor = ({
           grow={true}
         >
           <NumberInput
+            id={zoomInputId}
             value={value?.zoom ?? 1}
             min={1}
             max={18}
diff --git a/public/app/plugins/panel/geomap/editor/StyleEditor.tsx b/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
index c7f07fb2dba..c8dd68c4acb 100644
--- a/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
@@ -1,5 +1,5 @@
 import { capitalize } from 'lodash';
-import { useMemo } from 'react';
+import { useId, useMemo } from 'react';
 import { useObservable } from 'react-use';
 import { Observable, of } from 'rxjs';
 
@@ -121,6 +121,21 @@ export const StyleEditor = (props: Props) => {
   const hasTextLabel = styleUsesText(value);
   const maxFiles = 2000;
 
+  const symbolId = useId();
+  const rotationAngleId = useId();
+  const colorId = useId();
+  const opacityId = useId();
+  const sizeId = useId();
+  const symbol1Id = useId();
+  const symbolVertId = useId();
+  const color1Id = useId();
+  const fillOpacityId = useId();
+  const rotationAngle1Id = useId();
+  const textId = useId();
+  const fontSizeId = useId();
+  const xOffsetId = useId();
+  const yOffsetId = useId();
+
   // Simple fixed value display
   if (settings?.simpleFixedValues) {
     return (
@@ -130,6 +145,7 @@ export const StyleEditor = (props: Props) => {
             <InlineFieldRow>
               <InlineField label={t('geomap.style-editor.label-symbol', 'Symbol')}>
                 <ResourceDimensionEditor
+                  id={symbolId}
                   value={value?.symbol ?? defaultStyleConfig.symbol}
                   context={context}
                   onChange={onSymbolChange}
@@ -155,6 +171,7 @@ export const StyleEditor = (props: Props) => {
             </InlineFieldRow>
             <Field label={t('geomap.style-editor.label-rotation-angle', 'Rotation angle')}>
               <ScalarDimensionEditor
+                id={rotationAngleId}
                 value={value?.rotation ?? defaultStyleConfig.rotation}
                 context={context}
                 onChange={onRotationChange}
@@ -174,6 +191,7 @@ export const StyleEditor = (props: Props) => {
           <InlineField label={t('geomap.style-editor.label-color', 'Color')} labelWidth={10}>
             <InlineLabel width={4}>
               <ColorPicker
+                id={colorId}
                 color={value?.color?.fixed ?? defaultStyleConfig.color.fixed}
                 onChange={(v) => {
                   onColorChange({ fixed: v });
@@ -185,6 +203,7 @@ export const StyleEditor = (props: Props) => {
         <InlineFieldRow>
           <InlineField label={t('geomap.style-editor.label-opacity', 'Opacity')} labelWidth={10} grow>
             <SliderValueEditor
+              id={opacityId}
               value={value?.opacity ?? defaultStyleConfig.opacity}
               context={context}
               onChange={onOpacityChange}
@@ -208,6 +227,7 @@ export const StyleEditor = (props: Props) => {
     <>
       <Field label={t('geomap.style-editor.label-size', 'Size')}>
         <ScaleDimensionEditor
+          id={sizeId}
           value={value?.size ?? defaultStyleConfig.size}
           context={context}
           onChange={onSizeChange}
@@ -225,6 +245,7 @@ export const StyleEditor = (props: Props) => {
         <>
           <Field label={t('geomap.style-editor.label-symbol', 'Symbol')}>
             <ResourceDimensionEditor
+              id={symbol1Id}
               value={value?.symbol ?? defaultStyleConfig.symbol}
               context={context}
               onChange={onSymbolChange}
@@ -249,6 +270,7 @@ export const StyleEditor = (props: Props) => {
           </Field>
           <Field label={t('geomap.style-editor.label-symbol-vertical-align', 'Symbol vertical align')}>
             <RadioButtonGroup
+              id={symbolVertId}
               value={value?.symbolAlign?.vertical ?? defaultStyleConfig.symbolAlign.vertical}
               onChange={onAlignVerticalChange}
               options={[
@@ -288,6 +310,7 @@ export const StyleEditor = (props: Props) => {
       )}
       <Field label={t('geomap.style-editor.label-color', 'Color')}>
         <ColorDimensionEditor
+          id={color1Id}
           value={value?.color ?? defaultStyleConfig.color}
           context={context}
           onChange={onColorChange}
@@ -296,6 +319,7 @@ export const StyleEditor = (props: Props) => {
       </Field>
       <Field label={t('geomap.style-editor.label-fill-opacity', 'Fill opacity')}>
         <SliderValueEditor
+          id={fillOpacityId}
           value={value?.opacity ?? defaultStyleConfig.opacity}
           context={context}
           onChange={onOpacityChange}
@@ -313,6 +337,7 @@ export const StyleEditor = (props: Props) => {
       {settings?.displayRotation && (
         <Field label={t('geomap.style-editor.label-rotation-angle', 'Rotation angle')}>
           <ScalarDimensionEditor
+            id={rotationAngle1Id}
             value={value?.rotation ?? defaultStyleConfig.rotation}
             context={context}
             onChange={onRotationChange}
@@ -329,6 +354,7 @@ export const StyleEditor = (props: Props) => {
       )}
       <Field label={t('geomap.style-editor.label-text-label', 'Text label')}>
         <TextDimensionEditor
+          id={textId}
           value={value?.text ?? defaultTextConfig}
           context={context}
           onChange={onTextChange}
@@ -341,6 +367,7 @@ export const StyleEditor = (props: Props) => {
           <HorizontalGroup>
             <Field label={t('geomap.style-editor.label-font-size', 'Font size')}>
               <NumberValueEditor
+                id={fontSizeId}
                 value={value?.textConfig?.fontSize ?? defaultStyleConfig.textConfig.fontSize}
                 context={context}
                 onChange={onTextFontSizeChange}
@@ -349,6 +376,7 @@ export const StyleEditor = (props: Props) => {
             </Field>
             <Field label={t('geomap.style-editor.label-x-offset', 'X offset')}>
               <NumberValueEditor
+                id={xOffsetId}
                 value={value?.textConfig?.offsetX ?? defaultStyleConfig.textConfig.offsetX}
                 context={context}
                 onChange={onTextOffsetXChange}
@@ -357,6 +385,7 @@ export const StyleEditor = (props: Props) => {
             </Field>
             <Field label={t('geomap.style-editor.label-y-offset', 'Y offset')}>
               <NumberValueEditor
+                id={yOffsetId}
                 value={value?.textConfig?.offsetY ?? defaultStyleConfig.textConfig.offsetY}
                 context={context}
                 onChange={onTextOffsetYChange}
diff --git a/public/app/plugins/panel/table/PaginationEditor.tsx b/public/app/plugins/panel/table/PaginationEditor.tsx
index 0bfa20b565b..b13d3f8bee4 100644
--- a/public/app/plugins/panel/table/PaginationEditor.tsx
+++ b/public/app/plugins/panel/table/PaginationEditor.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { StandardEditorProps } from '@grafana/data';
 import { Switch } from '@grafana/ui';
 
-export function PaginationEditor({ onChange, value, context }: StandardEditorProps<boolean>) {
+export function PaginationEditor({ onChange, value, context, id }: StandardEditorProps<boolean>) {
   const changeValue = (event: React.FormEvent<HTMLInputElement> | undefined) => {
     if (event?.currentTarget.checked) {
       context.options.footer.show = false;
@@ -11,5 +11,5 @@ export function PaginationEditor({ onChange, value, context }: StandardEditorPro
     onChange(event?.currentTarget.checked);
   };
 
-  return <Switch value={Boolean(value)} onChange={changeValue} />;
+  return <Switch value={Boolean(value)} onChange={changeValue} id={id} />;
 }
diff --git a/public/app/plugins/panel/table/TableCellOptionEditor.tsx b/public/app/plugins/panel/table/TableCellOptionEditor.tsx
index c0fd5e0e5ea..a28996a2b6d 100644
--- a/public/app/plugins/panel/table/TableCellOptionEditor.tsx
+++ b/public/app/plugins/panel/table/TableCellOptionEditor.tsx
@@ -23,9 +23,10 @@ export interface TableCellEditorProps<T> {
 interface Props {
   value: TableCellOptions;
   onChange: (v: TableCellOptions) => void;
+  id?: string;
 }
 
-export const TableCellOptionEditor = ({ value, onChange }: Props) => {
+export const TableCellOptionEditor = ({ value, onChange, id }: Props) => {
   const cellType = value.type;
   const styles = useStyles2(getStyles);
   const currentMode = cellDisplayModeOptions.find((o) => o.value!.type === cellType)!;
@@ -60,7 +61,7 @@ export const TableCellOptionEditor = ({ value, onChange }: Props) => {
   return (
     <div className={styles.fixBottomMargin}>
       <Field>
-        <Select options={cellDisplayModeOptions} value={currentMode} onChange={onCellTypeChange} />
+        <Select inputId={id} options={cellDisplayModeOptions} value={currentMode} onChange={onCellTypeChange} />
       </Field>
       {(cellType === TableCellDisplayMode.Auto || cellType === TableCellDisplayMode.ColorText) && (
         <AutoCellOptionsEditor cellOptions={value} onChange={onCellOptionsChange} />
diff --git a/public/app/plugins/panel/table/cells/AutoCellOptionsEditor.tsx b/public/app/plugins/panel/table/cells/AutoCellOptionsEditor.tsx
index e97d481e0b3..a6b75e47e2e 100644
--- a/public/app/plugins/panel/table/cells/AutoCellOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/cells/AutoCellOptionsEditor.tsx
@@ -1,3 +1,5 @@
+import { useId } from 'react';
+
 import { t } from '@grafana/i18n';
 import { TableAutoCellOptions, TableColorTextCellOptions } from '@grafana/schema';
 import { Field, Switch } from '@grafana/ui';
@@ -13,6 +15,8 @@ export const AutoCellOptionsEditor = ({
     onChange(cellOptions);
   };
 
+  const htmlId = useId();
+
   return (
     <Field
       label={t('table.auto-cell-options-editor.label-wrap-text', 'Wrap text')}
@@ -21,7 +25,7 @@ export const AutoCellOptionsEditor = ({
         'If selected text will be wrapped to the width of text in the configured column'
       )}
     >
-      <Switch value={cellOptions.wrapText} onChange={onWrapTextChange} />
+      <Switch id={htmlId} value={cellOptions.wrapText} onChange={onWrapTextChange} />
     </Field>
   );
 };
diff --git a/public/app/plugins/panel/table/cells/ColorBackgroundCellOptionsEditor.tsx b/public/app/plugins/panel/table/cells/ColorBackgroundCellOptionsEditor.tsx
index 33c3761493d..a6cac1705b9 100644
--- a/public/app/plugins/panel/table/cells/ColorBackgroundCellOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/cells/ColorBackgroundCellOptionsEditor.tsx
@@ -1,3 +1,5 @@
+import { useId } from 'react';
+
 import { SelectableValue } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
 import { TableCellBackgroundDisplayMode, TableColoredBackgroundCellOptions } from '@grafana/schema';
@@ -31,12 +33,16 @@ export const ColorBackgroundCellOptionsEditor = ({
     onChange(cellOptions);
   };
 
+  const applyToRowSwitchId = useId();
+  const wrapTextSwitchId = useId();
+
   const label = (
     <Label
       description={t(
         'table.color-background-cell-options-editor.description-wrap-text',
         'If selected text will be wrapped to the width of text in the configured column'
       )}
+      htmlFor={wrapTextSwitchId}
     >
       <Trans i18nKey="table.color-background-cell-options-editor.wrap-text">Wrap text</Trans>{' '}
       <Badge
@@ -65,10 +71,10 @@ export const ColorBackgroundCellOptionsEditor = ({
           'If selected the entire row will be colored as this cell would be.'
         )}
       >
-        <Switch value={cellOptions.applyToRow} onChange={onColorRowChange} />
+        <Switch id={applyToRowSwitchId} value={cellOptions.applyToRow} onChange={onColorRowChange} />
       </Field>
       <Field label={label}>
-        <Switch value={cellOptions.wrapText} onChange={onWrapTextChange} />
+        <Switch id={wrapTextSwitchId} value={cellOptions.wrapText} onChange={onWrapTextChange} />
       </Field>
     </>
   );
diff --git a/public/app/plugins/panel/table/cells/ImageCellOptionsEditor.tsx b/public/app/plugins/panel/table/cells/ImageCellOptionsEditor.tsx
index 75233f4fefe..f0a65ae2b6f 100644
--- a/public/app/plugins/panel/table/cells/ImageCellOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/cells/ImageCellOptionsEditor.tsx
@@ -1,4 +1,4 @@
-import { FormEvent } from 'react';
+import { FormEvent, useId } from 'react';
 
 import { t } from '@grafana/i18n';
 import { TableImageCellOptions } from '@grafana/schema';
@@ -17,6 +17,9 @@ export const ImageCellOptionsEditor = ({ cellOptions, onChange }: TableCellEdito
     onChange(cellOptions);
   };
 
+  const altTextInputId = useId();
+  const titleTextInputId = useId();
+
   return (
     <>
       <Field
@@ -26,7 +29,7 @@ export const ImageCellOptionsEditor = ({ cellOptions, onChange }: TableCellEdito
           "Alternative text that will be displayed if an image can't be displayed or for users who use a screen reader"
         )}
       >
-        <Input onChange={onAltChange} defaultValue={cellOptions.alt} />
+        <Input id={altTextInputId} onChange={onAltChange} defaultValue={cellOptions.alt} />
       </Field>
 
       <Field
@@ -36,7 +39,7 @@ export const ImageCellOptionsEditor = ({ cellOptions, onChange }: TableCellEdito
           'Text that will be displayed when the image is hovered by a cursor'
         )}
       >
-        <Input onChange={onTitleChange} defaultValue={cellOptions.title} />
+        <Input id={titleTextInputId} onChange={onTitleChange} defaultValue={cellOptions.title} />
       </Field>
     </>
   );
diff --git a/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx b/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx
index bb5b0fd3e7e..5a3c62fe62a 100644
--- a/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import { useMemo } from 'react';
+import { useId, useMemo } from 'react';
 
 import { createFieldConfigRegistry, SetFieldConfigOptionsArgs } from '@grafana/data';
 import { GraphFieldConfig, TableSparklineCellOptions } from '@grafana/schema';
@@ -51,6 +51,8 @@ export const SparklineCellOptionsEditor = (props: TableCellEditorProps<TableSpar
 
   const values = { ...defaultSparklineCellConfig, ...cellOptions };
 
+  const htmlIdBase = useId();
+
   return (
     <Stack direction="column" gap={0}>
       {registry.list(optionIds.map((id) => `custom.${id}`)).map((item) => {
@@ -67,6 +69,7 @@ export const SparklineCellOptionsEditor = (props: TableCellEditorProps<TableSpar
               value={(isOptionKey(path, values) ? values[path] : undefined) ?? item.defaultValue}
               item={item}
               context={{ data: [] }}
+              id={`${htmlIdBase}${item.id}`}
             />
           </Field>
         );
diff --git a/public/app/plugins/panel/table/table-new/PaginationEditor.tsx b/public/app/plugins/panel/table/table-new/PaginationEditor.tsx
index ccd9451ee3f..6edb59b612b 100644
--- a/public/app/plugins/panel/table/table-new/PaginationEditor.tsx
+++ b/public/app/plugins/panel/table/table-new/PaginationEditor.tsx
@@ -4,7 +4,7 @@ import { StandardEditorProps } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Switch } from '@grafana/ui';
 
-export function PaginationEditor({ onChange, value }: StandardEditorProps<boolean>) {
+export function PaginationEditor({ onChange, value, id }: StandardEditorProps<boolean>) {
   const changeValue = (event: React.FormEvent<HTMLInputElement> | undefined) => {
     onChange(event?.currentTarget.checked);
   };
@@ -14,6 +14,7 @@ export function PaginationEditor({ onChange, value }: StandardEditorProps<boolea
       label={selectors.components.PanelEditor.OptionsPane.fieldLabel(`Enable pagination`)}
       value={Boolean(value)}
       onChange={changeValue}
+      id={id}
     />
   );
 }
diff --git a/public/app/plugins/panel/table/table-new/TableCellOptionEditor.tsx b/public/app/plugins/panel/table/table-new/TableCellOptionEditor.tsx
index b70723695cb..49fc8daa039 100644
--- a/public/app/plugins/panel/table/table-new/TableCellOptionEditor.tsx
+++ b/public/app/plugins/panel/table/table-new/TableCellOptionEditor.tsx
@@ -25,6 +25,7 @@ export interface TableCellEditorProps<T> {
 interface Props {
   value: TableCellOptions;
   onChange: (v: TableCellOptions) => void;
+  id?: string;
 }
 
 const TEXT_WRAP_CELL_TYPES = new Set([
@@ -40,7 +41,7 @@ function isTextWrapCellType(value: TableCellOptions): value is TableCellOptions
   return TEXT_WRAP_CELL_TYPES.has(value.type);
 }
 
-export const TableCellOptionEditor = ({ value, onChange }: Props) => {
+export const TableCellOptionEditor = ({ value, onChange, id }: Props) => {
   const cellType = value.type;
   const styles = useStyles2(getStyles);
   const cellDisplayModeOptions: Array<ComboboxOption<TableCellOptions['type']>> = [
@@ -92,7 +93,7 @@ export const TableCellOptionEditor = ({ value, onChange }: Props) => {
   return (
     <div className={styles.fixBottomMargin}>
       <Field>
-        <Combobox options={cellDisplayModeOptions} value={currentMode} onChange={onCellTypeChange} />
+        <Combobox id={id} options={cellDisplayModeOptions} value={currentMode} onChange={onCellTypeChange} />
       </Field>
       {isTextWrapCellType(value) && <TextWrapOptionsEditor cellOptions={value} onChange={onCellOptionsChange} />}
       {cellType === TableCellDisplayMode.Gauge && (
diff --git a/public/app/plugins/panel/table/table-new/cells/ColorBackgroundCellOptionsEditor.tsx b/public/app/plugins/panel/table/table-new/cells/ColorBackgroundCellOptionsEditor.tsx
index 33d85539ec4..ab590fe11f3 100644
--- a/public/app/plugins/panel/table/table-new/cells/ColorBackgroundCellOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/table-new/cells/ColorBackgroundCellOptionsEditor.tsx
@@ -1,3 +1,5 @@
+import { useId } from 'react';
+
 import { SelectableValue } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
@@ -26,6 +28,8 @@ export const ColorBackgroundCellOptionsEditor = ({
     onChange(cellOptions);
   };
 
+  const htmlId = useId();
+
   return (
     <>
       <Field
@@ -47,6 +51,7 @@ export const ColorBackgroundCellOptionsEditor = ({
         )}
       >
         <Switch
+          id={htmlId}
           label={selectors.components.PanelEditor.OptionsPane.fieldLabel(`Apply to entire row`)}
           value={cellOptions.applyToRow}
           onChange={onColorRowChange}
diff --git a/public/app/plugins/panel/table/table-new/cells/ImageCellOptionsEditor.tsx b/public/app/plugins/panel/table/table-new/cells/ImageCellOptionsEditor.tsx
index 75233f4fefe..f0a65ae2b6f 100644
--- a/public/app/plugins/panel/table/table-new/cells/ImageCellOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/table-new/cells/ImageCellOptionsEditor.tsx
@@ -1,4 +1,4 @@
-import { FormEvent } from 'react';
+import { FormEvent, useId } from 'react';
 
 import { t } from '@grafana/i18n';
 import { TableImageCellOptions } from '@grafana/schema';
@@ -17,6 +17,9 @@ export const ImageCellOptionsEditor = ({ cellOptions, onChange }: TableCellEdito
     onChange(cellOptions);
   };
 
+  const altTextInputId = useId();
+  const titleTextInputId = useId();
+
   return (
     <>
       <Field
@@ -26,7 +29,7 @@ export const ImageCellOptionsEditor = ({ cellOptions, onChange }: TableCellEdito
           "Alternative text that will be displayed if an image can't be displayed or for users who use a screen reader"
         )}
       >
-        <Input onChange={onAltChange} defaultValue={cellOptions.alt} />
+        <Input id={altTextInputId} onChange={onAltChange} defaultValue={cellOptions.alt} />
       </Field>
 
       <Field
@@ -36,7 +39,7 @@ export const ImageCellOptionsEditor = ({ cellOptions, onChange }: TableCellEdito
           'Text that will be displayed when the image is hovered by a cursor'
         )}
       >
-        <Input onChange={onTitleChange} defaultValue={cellOptions.title} />
+        <Input id={titleTextInputId} onChange={onTitleChange} defaultValue={cellOptions.title} />
       </Field>
     </>
   );
diff --git a/public/app/plugins/panel/table/table-new/cells/SparklineCellOptionsEditor.tsx b/public/app/plugins/panel/table/table-new/cells/SparklineCellOptionsEditor.tsx
index 5bc554b7f5d..b85f2edf098 100644
--- a/public/app/plugins/panel/table/table-new/cells/SparklineCellOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/table-new/cells/SparklineCellOptionsEditor.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import { useMemo } from 'react';
+import { useId, useMemo } from 'react';
 
 import { createFieldConfigRegistry, SetFieldConfigOptionsArgs } from '@grafana/data';
 import { GraphFieldConfig, TableSparklineCellOptions } from '@grafana/schema';
@@ -51,6 +51,8 @@ export const SparklineCellOptionsEditor = (props: TableCellEditorProps<TableSpar
 
   const values = { ...defaultSparklineCellConfig, ...cellOptions };
 
+  const htmlIdBase = useId();
+
   return (
     <VerticalGroup>
       {registry.list(optionIds.map((id) => `custom.${id}`)).map((item) => {
@@ -67,6 +69,7 @@ export const SparklineCellOptionsEditor = (props: TableCellEditorProps<TableSpar
               value={(isOptionKey(path, values) ? values[path] : undefined) ?? item.defaultValue}
               item={item}
               context={{ data: [] }}
+              id={`${htmlIdBase}-${item.id}`}
             />
           </Field>
         );
diff --git a/public/app/plugins/panel/table/table-new/cells/TextWrapOptionsEditor.tsx b/public/app/plugins/panel/table/table-new/cells/TextWrapOptionsEditor.tsx
index 74ddaa092ea..2daef64561e 100644
--- a/public/app/plugins/panel/table/table-new/cells/TextWrapOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/table-new/cells/TextWrapOptionsEditor.tsx
@@ -1,3 +1,5 @@
+import { useId } from 'react';
+
 import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
 import { TableCellOptions, TableWrapTextOptions } from '@grafana/schema';
@@ -15,10 +17,13 @@ export const TextWrapOptionsEditor = ({
     onChange(cellOptions);
   };
 
+  const htmlId = useId();
+
   return (
     <>
       <Field label={t('table.text-wrap-options.label-wrap-text', 'Wrap text')}>
         <Switch
+          id={htmlId}
           label={selectors.components.PanelEditor.OptionsPane.fieldLabel(`Wrap text`)}
           value={cellOptions.wrapText}
           onChange={onWrapTextChange}
diff --git a/public/app/plugins/panel/xychart/SeriesEditor.tsx b/public/app/plugins/panel/xychart/SeriesEditor.tsx
index 54bc8085154..6fb25ef6974 100644
--- a/public/app/plugins/panel/xychart/SeriesEditor.tsx
+++ b/public/app/plugins/panel/xychart/SeriesEditor.tsx
@@ -1,5 +1,5 @@
 import { css, cx } from '@emotion/css';
-import { Fragment, useState } from 'react';
+import { Fragment, useId, useState } from 'react';
 import { usePrevious } from 'react-use';
 
 import {
@@ -77,6 +77,12 @@ export const SeriesEditor = ({
     });
   });
 
+  const frameInputId = useId();
+  const xFieldInputId = useId();
+  const yFieldInputId = useId();
+  const sizeFieldInputId = useId();
+  const colorFieldInputId = useId();
+
   return (
     <>
       {mapping === SeriesMapping.Manual && (
@@ -129,6 +135,7 @@ export const SeriesEditor = ({
         <Fragment key={formKey}>
           <Field label={t('xychart.series-editor.label-frame', 'Frame')}>
             <Select
+              inputId={frameInputId}
               placeholder={
                 mapping === SeriesMapping.Auto
                   ? t('xychart.series-editor.placeholder-all-frames', 'All frames')
@@ -158,6 +165,7 @@ export const SeriesEditor = ({
           </Field>
           <Field label={t('xychart.series-editor.label-x-field', 'X field')}>
             <FieldNamePicker
+              id={xFieldInputId}
               value={series.x?.matcher.options as string}
               context={context}
               onChange={(fieldName) => {
@@ -195,6 +203,7 @@ export const SeriesEditor = ({
           </Field>
           <Field label={t('xychart.series-editor.label-y-field', 'Y field')}>
             <FieldNamePicker
+              id={yFieldInputId}
               value={series.y?.matcher?.options as string}
               context={context}
               onChange={(fieldName) => {
@@ -233,6 +242,7 @@ export const SeriesEditor = ({
           </Field>
           <Field label={t('xychart.series-editor.label-size-field', 'Size field')}>
             <FieldNamePicker
+              id={sizeFieldInputId}
               value={series.size?.matcher?.options as string}
               context={context}
               onChange={(fieldName) => {
@@ -268,6 +278,7 @@ export const SeriesEditor = ({
           </Field>
           <Field label={t('xychart.series-editor.label-color-field', 'Color field')}>
             <FieldNamePicker
+              id={colorFieldInputId}
               value={series.color?.matcher?.options as string}
               context={context}
               onChange={(fieldName) => {

From 4954438cb5a2259e89ae5531b417107ec1df2ca9 Mon Sep 17 00:00:00 2001
From: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
Date: Thu, 14 Aug 2025 12:18:56 -0600
Subject: [PATCH 187/243] Chore: Fix reusable workflow reference in
 release-comms (#109698)

Fix reusable workflow reference in release-comms

Use full repository path for create-security-branch workflow
to resolve linter errors about unable to find reusable workflow.
---
 .github/workflows/release-comms.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-comms.yml b/.github/workflows/release-comms.yml
index 7d149fad297..58ebe84dbc0 100644
--- a/.github/workflows/release-comms.yml
+++ b/.github/workflows/release-comms.yml
@@ -80,7 +80,7 @@ jobs:
   create_security_branch_grafana:
     name: Create security branch (Grafana Security Mirror)
     needs: setup
-    uses: ./.github/workflows/create-security-branch.yml
+    uses: grafana/grafana/.github/workflows/create-security-branch.yml@main
     with:
       release_branch: ${{ needs.setup.outputs.release_branch }}
       security_branch_number: "01"
@@ -88,7 +88,7 @@ jobs:
   create_security_branch_enterprise:
     name: Create security branch (Enterprise)
     needs: setup
-    uses: ./.github/workflows/create-security-branch.yml
+    uses: grafana/grafana/.github/workflows/create-security-branch.yml@main
     with:
       release_branch: ${{ needs.setup.outputs.release_branch }}
       security_branch_number: "01"

From 6305d6daeda5e006190bc7edfee8af81cdd51353 Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Thu, 14 Aug 2025 14:27:06 -0400
Subject: [PATCH 188/243] Provision Bulk Action: Add pull request button
 (#109622)

* Provision Bulk Action: pull request link
* Add view branch and compare branch button
---
 .../clients/provisioning/v0alpha1/index.ts    | 13 +++++---
 .../features/provisioning/Job/JobContent.tsx  | 10 +++++-
 .../Repository/PullRequestButtons.tsx         | 31 +++++++++++++++++++
 public/locales/en-US/grafana.json             |  3 ++
 4 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 public/app/features/provisioning/Repository/PullRequestButtons.tsx

diff --git a/public/app/api/clients/provisioning/v0alpha1/index.ts b/public/app/api/clients/provisioning/v0alpha1/index.ts
index eb200d83d01..d99727c062c 100644
--- a/public/app/api/clients/provisioning/v0alpha1/index.ts
+++ b/public/app/api/clients/provisioning/v0alpha1/index.ts
@@ -132,12 +132,17 @@ export const provisioningAPIv0alpha1 = generatedAPI.enhanceEndpoints({
       },
     },
     createRepositoryJobs: {
-      onQueryStarted: async (_, { queryFulfilled, dispatch }) => {
+      onQueryStarted: async ({ jobSpec }, { queryFulfilled, dispatch }) => {
         try {
+          const showMsg = jobSpec.action === 'pull' || jobSpec.action === 'migrate';
           await queryFulfilled;
-          dispatch(
-            notifyApp(createSuccessNotification(t('provisioning.sync-repository.success-pull-started', 'Pull started')))
-          );
+          if (showMsg) {
+            dispatch(
+              notifyApp(
+                createSuccessNotification(t('provisioning.sync-repository.success-pull-started', 'Pull started'))
+              )
+            );
+          }
         } catch (e) {
           if (e instanceof Error) {
             dispatch(
diff --git a/public/app/features/provisioning/Job/JobContent.tsx b/public/app/features/provisioning/Job/JobContent.tsx
index 0e469937b88..9b58c2f8143 100644
--- a/public/app/features/provisioning/Job/JobContent.tsx
+++ b/public/app/features/provisioning/Job/JobContent.tsx
@@ -4,6 +4,7 @@ import { Trans, t } from '@grafana/i18n';
 import { ControlledCollapse, Spinner, Stack, Text } from '@grafana/ui';
 import { Job } from 'app/api/clients/provisioning/v0alpha1';
 
+import { PullRequestButtons } from '../Repository/PullRequestButtons';
 import { RepositoryLink } from '../Repository/RepositoryLink';
 import ProgressBar from '../Shared/ProgressBar';
 import { StepStatusInfo } from '../Wizard/types';
@@ -26,6 +27,7 @@ export function JobContent({ jobType, job, isFinishedJob = false, onStatusChange
 
   const { state, message, progress, summary, errors } = job.status;
   const repoName = job.metadata?.labels?.['provisioning.grafana.app/repository'];
+  const pullRequestURL = job.status?.url?.newPullRequestURL;
 
   // Update step status based on job state
   useEffect(() => {
@@ -95,7 +97,13 @@ export function JobContent({ jobType, job, isFinishedJob = false, onStatusChange
           </Stack>
         )}
         {state === 'success' ? (
-          <RepositoryLink name={repoName} jobType={jobType} />
+          <Stack direction="row" gap={1}>
+            {pullRequestURL ? (
+              <PullRequestButtons urls={job.status?.url} jobType={jobType} />
+            ) : (
+              <RepositoryLink name={repoName} jobType={jobType} />
+            )}
+          </Stack>
         ) : (
           <ControlledCollapse label={t('provisioning.job-status.label-view-details', 'View details')} isOpen={false}>
             <pre>{JSON.stringify(job, null, 2)}</pre>
diff --git a/public/app/features/provisioning/Repository/PullRequestButtons.tsx b/public/app/features/provisioning/Repository/PullRequestButtons.tsx
new file mode 100644
index 00000000000..c7c3101161e
--- /dev/null
+++ b/public/app/features/provisioning/Repository/PullRequestButtons.tsx
@@ -0,0 +1,31 @@
+import { Trans } from '@grafana/i18n';
+import { LinkButton } from '@grafana/ui';
+import { RepositoryUrLs } from 'app/api/clients/provisioning/v0alpha1';
+
+interface Props {
+  jobType?: 'sync' | 'delete' | 'move';
+  urls?: RepositoryUrLs;
+}
+export function PullRequestButtons({ urls, jobType }: Props) {
+  const pullRequestURL = urls?.newPullRequestURL;
+  const compareURL = urls?.compareURL;
+  const branchURL = urls?.sourceURL;
+
+  if (jobType === 'sync') {
+    return null;
+  }
+
+  return (
+    <>
+      <LinkButton href={branchURL} icon="external-link-alt" variant="secondary" target="_blank">
+        <Trans i18nKey="provisioning.repository-link.delete-or-move-job.view-branch">View branch</Trans>
+      </LinkButton>
+      <LinkButton href={compareURL} icon="external-link-alt" variant="secondary" target="_blank">
+        <Trans i18nKey="provisioning.repository-link.delete-or-move-job.compare-branch">Compare branch</Trans>
+      </LinkButton>
+      <LinkButton href={pullRequestURL} icon="external-link-alt" variant="secondary" target="_blank">
+        <Trans i18nKey="provisioning.repository-link.delete-or-move-job.open-pull-request">Open pull request</Trans>
+      </LinkButton>
+    </>
+  );
+}
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 4a294622625..2cf0531c0d8 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -11470,6 +11470,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "Compare branch",
+        "open-pull-request": "Open pull request",
+        "view-branch": "View branch",
         "view-repository": "View repository"
       },
       "grafana-repository-synced": "Your resources are now in your external storage and provisioned into your instance. From now on, your instance and the external storage will be synchronized.",

From a50e44c27a4a36593b71989a0b3ea1228d0d4487 Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Thu, 14 Aug 2025 15:32:57 -0400
Subject: [PATCH 189/243] RepositoryResources: hide history button when repo
 type is pure git (#109628)

* RepositoryResources: hide history button when repo type is pure git

* hide history button from file page

* hide history button from file page and file history detail page
---
 .../provisioning/File/FileHistoryPage.tsx     | 28 ++++++++++++++-----
 .../features/provisioning/File/FilesView.tsx  | 11 ++++++--
 .../app/features/provisioning/File/utils.ts   |  4 +++
 .../Repository/RepositoryResources.tsx        | 16 ++++++++---
 public/locales/en-US/grafana.json             |  4 ++-
 5 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 public/app/features/provisioning/File/utils.ts

diff --git a/public/app/features/provisioning/File/FileHistoryPage.tsx b/public/app/features/provisioning/File/FileHistoryPage.tsx
index 78385deac55..f1a4274ada7 100644
--- a/public/app/features/provisioning/File/FileHistoryPage.tsx
+++ b/public/app/features/provisioning/File/FileHistoryPage.tsx
@@ -1,25 +1,36 @@
+import { skipToken } from '@reduxjs/toolkit/query';
 import { useParams } from 'react-router-dom-v5-compat';
 
-import { Trans } from '@grafana/i18n';
+import { Trans, t } from '@grafana/i18n';
 import { Card, EmptyState, Spinner, Stack, Text, TextLink, UserIcon } from '@grafana/ui';
 import {
   useGetRepositoryHistoryWithPathQuery,
   useGetRepositoryStatusQuery,
 } from 'app/api/clients/provisioning/v0alpha1';
 import { Page } from 'app/core/components/Page/Page';
+import { useUrlParams } from 'app/core/navigation/hooks';
 import { isNotFoundError } from 'app/features/alerting/unified/api/util';
 
 import { PROVISIONING_URL } from '../constants';
 import { HistoryListResponse } from '../types';
 import { formatTimestamp } from '../utils/time';
 
+import { isFileHistorySupported } from './utils';
+
 export default function FileHistoryPage() {
   const params = useParams();
   const name = params['name'] ?? '';
   const path = params['*'] ?? '';
+  const [urlParams] = useUrlParams();
+  const repoType = urlParams.get('repo_type');
+  const historyNotSupported = !isFileHistorySupported(repoType);
   const query = useGetRepositoryStatusQuery({ name });
-  const history = useGetRepositoryHistoryWithPathQuery({ name, path });
-  const notFound = query.isError && isNotFoundError(query.error);
+  const history = useGetRepositoryHistoryWithPathQuery(historyNotSupported ? skipToken : { name, path });
+  const notFound = (query.isError && isNotFoundError(query.error)) || historyNotSupported;
+
+  const notFoundErrorMsg = historyNotSupported
+    ? t('provisioning.file-history-page.history-not-supported', 'File history is not supported for this repository')
+    : t('provisioning.file-history-page.repository-not-found', 'Repository not found');
 
   return (
     <Page
@@ -31,11 +42,14 @@ export default function FileHistoryPage() {
     >
       <Page.Contents isLoading={false}>
         {notFound ? (
-          <EmptyState message={`Repository not found`} variant="not-found">
+          <EmptyState message={notFoundErrorMsg} variant="not-found">
             <Text element={'p'}>
-              <Trans i18nKey="provisioning.file-history-page.repository-config-exists-configuration">
-                Make sure the repository config exists in the configuration file.
-              </Trans>
+              {/* only show detail message if repoType is not git */}
+              {repoType !== 'git' && (
+                <Trans i18nKey="provisioning.file-history-page.repository-config-exists-configuration">
+                  Make sure the repository config exists in the configuration file.
+                </Trans>
+              )}
             </Text>
             <TextLink href={PROVISIONING_URL}>
               <Trans i18nKey="provisioning.file-history-page.back-to-repositories">Back to repositories</Trans>
diff --git a/public/app/features/provisioning/File/FilesView.tsx b/public/app/features/provisioning/File/FilesView.tsx
index 0df6f7340a4..37a55b9bca5 100644
--- a/public/app/features/provisioning/File/FilesView.tsx
+++ b/public/app/features/provisioning/File/FilesView.tsx
@@ -7,6 +7,8 @@ import { Repository, useGetRepositoryFilesQuery } from 'app/api/clients/provisio
 import { PROVISIONING_URL } from '../constants';
 import { FileDetails } from '../types';
 
+import { isFileHistorySupported } from './utils';
+
 interface FilesViewProps {
   repo: Repository;
 }
@@ -20,6 +22,7 @@ export function FilesView({ repo }: FilesViewProps) {
   const data = [...(query.data?.items ?? [])].filter((file) =>
     file.path.toLowerCase().includes(searchQuery.toLowerCase())
   );
+  const showHistoryBtn = isFileHistorySupported(repo.spec?.type);
 
   const columns: Array<Column<FileDetails>> = [
     {
@@ -57,9 +60,11 @@ export function FilesView({ repo }: FilesViewProps) {
                 <Trans i18nKey="provisioning.files-view.columns.view">View</Trans>
               </LinkButton>
             )}
-            <LinkButton href={`${PROVISIONING_URL}/${name}/history/${path}`}>
-              <Trans i18nKey="provisioning.files-view.columns.history">History</Trans>
-            </LinkButton>
+            {showHistoryBtn && (
+              <LinkButton href={`${PROVISIONING_URL}/${name}/history/${path}?repo_type=${repo.spec?.type}`}>
+                <Trans i18nKey="provisioning.files-view.columns.history">History</Trans>
+              </LinkButton>
+            )}
           </Stack>
         );
       },
diff --git a/public/app/features/provisioning/File/utils.ts b/public/app/features/provisioning/File/utils.ts
new file mode 100644
index 00000000000..4856787eadf
--- /dev/null
+++ b/public/app/features/provisioning/File/utils.ts
@@ -0,0 +1,4 @@
+export function isFileHistorySupported(repoType?: string | null): boolean {
+  const supportedRepoTypes = new Set(['github', 'gitlab', 'bitbucket']);
+  return !!repoType && supportedRepoTypes.has(repoType);
+}
diff --git a/public/app/features/provisioning/Repository/RepositoryResources.tsx b/public/app/features/provisioning/Repository/RepositoryResources.tsx
index e7c0554152f..fdffe1cea74 100644
--- a/public/app/features/provisioning/Repository/RepositoryResources.tsx
+++ b/public/app/features/provisioning/Repository/RepositoryResources.tsx
@@ -4,6 +4,7 @@ import { Trans, t } from '@grafana/i18n';
 import { CellProps, Column, FilterInput, InteractiveTable, Link, LinkButton, Spinner, Stack } from '@grafana/ui';
 import { Repository, ResourceListItem, useGetRepositoryResourcesQuery } from 'app/api/clients/provisioning/v0alpha1';
 
+import { isFileHistorySupported } from '../File/utils';
 import { PROVISIONING_URL } from '../constants';
 
 interface RepoProps {
@@ -23,6 +24,9 @@ export function RepositoryResources({ repo }: RepoProps) {
     Resource.path.toLowerCase().includes(searchQuery.toLowerCase())
   );
 
+  // hide history button when repo type is pure git as it won't be implemented.
+  const historySupported = isFileHistorySupported(repo.spec?.type);
+
   const columns: Array<Column<ResourceListItem>> = useMemo(
     () => [
       {
@@ -98,15 +102,19 @@ export function RepositoryResources({ repo }: RepoProps) {
                   <Trans i18nKey="provisioning.repository-resources.columns.view-folder">View</Trans>
                 </LinkButton>
               )}
-              <LinkButton href={`${PROVISIONING_URL}/${repo.metadata?.name}/history/${path}`}>
-                <Trans i18nKey="provisioning.repository-resources.columns.history">History</Trans>
-              </LinkButton>
+              {historySupported && (
+                <LinkButton
+                  href={`${PROVISIONING_URL}/${repo.metadata?.name}/history/${path}?repo_type=${repo.spec?.type}`}
+                >
+                  <Trans i18nKey="provisioning.repository-resources.columns.history">History</Trans>
+                </LinkButton>
+              )}
             </Stack>
           );
         },
       },
     ],
-    [repo.metadata?.name]
+    [repo.metadata?.name, historySupported, repo.spec?.type]
   );
 
   if (query.isLoading) {
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 2cf0531c0d8..9eecf0099ab 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -11272,7 +11272,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Back to repositories",
-      "repository-config-exists-configuration": "Make sure the repository config exists in the configuration file."
+      "history-not-supported": "File history is not supported for this repository",
+      "repository-config-exists-configuration": "Make sure the repository config exists in the configuration file.",
+      "repository-not-found": "Repository not found"
     },
     "file-status-page": {
       "save": "Save",

From 03811b26a09f771d14ddedf0fa046d8afefc6b51 Mon Sep 17 00:00:00 2001
From: Juan Cabanas <juan.cabanas@grafana.com>
Date: Thu, 14 Aug 2025 17:06:24 -0300
Subject: [PATCH 190/243] QueryLibrary: Change context params (#109294)

---
 .../PanelDataPane/PanelDataQueriesTab.tsx     |  8 +++-
 .../QueryLibrary/QueryLibraryContext.tsx      | 46 +++++++------------
 .../features/explore/QueryLibrary/mocks.tsx   |  3 +-
 .../features/explore/QueryLibrary/types.ts    | 24 +++++++++-
 public/app/features/explore/QueryRows.tsx     |  9 ++--
 .../RichHistory/RichHistoryAddToLibrary.tsx   | 27 ++++++++++-
 .../app/features/explore/SecondaryActions.tsx |  6 ++-
 .../explore/spec/helper/interactions.ts       |  6 ++-
 .../query/components/QueryEditorRow.tsx       | 30 ++++++------
 9 files changed, 104 insertions(+), 55 deletions(-)

diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
index 668b8612851..0ed01ae59b7 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
@@ -394,8 +394,12 @@ export function PanelDataQueriesTabRendered({ model }: SceneComponentProps<Panel
               <Button
                 icon="plus"
                 onClick={() =>
-                  openQueryLibraryDrawer(getDatasourceNames(datasource, queries), onSelectQueryFromLibrary, {
-                    context: CoreApp.PanelEditor,
+                  openQueryLibraryDrawer({
+                    datasourceFilters: getDatasourceNames(datasource, queries),
+                    onSelectQuery: onSelectQueryFromLibrary,
+                    options: {
+                      context: CoreApp.PanelEditor,
+                    },
                   })
                 }
                 variant="secondary"
diff --git a/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx b/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx
index 411575cb961..1e0e571f8e4 100644
--- a/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx
+++ b/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx
@@ -3,7 +3,14 @@ import { createContext, ReactNode, useContext } from 'react';
 import { CoreApp } from '@grafana/data';
 import { DataQuery } from '@grafana/schema';
 
-import { OnSelectQueryType } from './types';
+import { OnSelectQueryType, QueryTemplate } from './types';
+
+export type QueryLibraryDrawerOptions = {
+  datasourceFilters?: string[];
+  onSelectQuery?: OnSelectQueryType;
+  options?: { isReplacingQuery?: boolean; onSave?: () => void; context?: string; highlightQuery?: string };
+  query?: DataQuery;
+};
 
 /**
  * Context with state and action to interact with Query Library. The Query Library feature consists of a drawer
@@ -16,36 +23,15 @@ export type QueryLibraryContextType = {
   /**
    * Opens a drawer with query library.
    * @param datasourceFilters Data source names that will be used for initial filter in the library.
-   * @param queryActionButton Action button will be shown in the library next to the query and can implement context
-   *   specific actions with the library, like running the query or updating some query in the current app.
+   * @param onSelectQuery Callback to be called when a query is selected from the library.
    * @param options.context Used for QueryEditor. Should identify the context this is called from, like 'explore' or
    *   'dashboard'.
+   * @param newQuery New query to be added to the library.
    */
-  openDrawer: (
-    datasourceFilters: string[],
-    onSelectQuery: OnSelectQueryType,
-    options?: {
-      isReplacingQuery?: boolean;
-      context?: string;
-      highlightQuery?: string;
-    }
-  ) => void;
+  openDrawer: (options: QueryLibraryDrawerOptions) => void;
   closeDrawer: () => void;
   isDrawerOpen: boolean;
-
-  /**
-   * Opens a modal for adding a query to the library.
-   * @param query Query to be saved
-   * @param options.onSave Callback that will be called after the query is saved.
-   * @param options.context Used for rendering QueryEditor. Should identify the context this is called from, like 'explore' or
-   *   'dashboard'.
-   * @param options.title Default title for the modal, can be overridden by the query title.
-   */
-  openAddQueryModal: (
-    query: DataQuery,
-    options?: { onSave?: () => void; context?: string; title?: string; isDuplicating?: boolean }
-  ) => void;
-  closeAddQueryModal: () => void;
+  onSave?: () => void;
 
   /**
    * Returns a predefined small button that can be used to save a query to the library.
@@ -55,10 +41,12 @@ export type QueryLibraryContextType = {
     query: DataQuery,
     app?: CoreApp,
     queryLibraryRef?: string,
-    onUpdateSuccess?: () => void
+    onUpdateSuccess?: () => void,
+    onSelectQuery?: (query: DataQuery) => void
   ) => ReactNode;
   queryLibraryEnabled: boolean;
   context: string;
+  setNewQuery: (query?: QueryTemplate) => void;
 };
 
 export const QueryLibraryContext = createContext<QueryLibraryContextType>({
@@ -66,8 +54,8 @@ export const QueryLibraryContext = createContext<QueryLibraryContextType>({
   closeDrawer: () => {},
   isDrawerOpen: false,
 
-  openAddQueryModal: () => {},
-  closeAddQueryModal: () => {},
+  setNewQuery: () => {},
+  onSave: () => {},
 
   renderSaveQueryButton: () => {
     return null;
diff --git a/public/app/features/explore/QueryLibrary/mocks.tsx b/public/app/features/explore/QueryLibrary/mocks.tsx
index e59732870a9..ccb6b1c6b99 100644
--- a/public/app/features/explore/QueryLibrary/mocks.tsx
+++ b/public/app/features/explore/QueryLibrary/mocks.tsx
@@ -13,11 +13,10 @@ export function QueryLibraryContextProviderMock(props: PropsWithChildren<Props>)
         openDrawer: jest.fn(),
         closeDrawer: jest.fn(),
         isDrawerOpen: false,
-        openAddQueryModal: jest.fn(),
-        closeAddQueryModal: jest.fn(),
         renderSaveQueryButton: jest.fn(),
         queryLibraryEnabled: Boolean(props.queryLibraryEnabled),
         context: 'explore',
+        setNewQuery: jest.fn(),
       }}
     >
       {props.children}
diff --git a/public/app/features/explore/QueryLibrary/types.ts b/public/app/features/explore/QueryLibrary/types.ts
index 50db96feeb0..1877b30c3df 100644
--- a/public/app/features/explore/QueryLibrary/types.ts
+++ b/public/app/features/explore/QueryLibrary/types.ts
@@ -1,3 +1,25 @@
-import { DataQuery } from '@grafana/schema';
+import { DataQuery, DataSourceRef } from '@grafana/schema';
+
+export type User = {
+  uid: string;
+  displayName?: string;
+  avatarUrl?: string;
+};
 
 export type OnSelectQueryType = (query: DataQuery) => void;
+
+export type QueryTemplate = {
+  query: DataQuery;
+  datasourceName?: string;
+  title?: string;
+  description?: string;
+  tags?: string[];
+  isLocked?: boolean;
+  isVisible?: boolean;
+  queryText?: string;
+  datasourceRef?: DataSourceRef | null;
+  datasourceType?: string;
+  createdAtTimestamp?: number;
+  user?: User;
+  uid?: string;
+};
diff --git a/public/app/features/explore/QueryRows.tsx b/public/app/features/explore/QueryRows.tsx
index 672d9cee950..16beb902c36 100644
--- a/public/app/features/explore/QueryRows.tsx
+++ b/public/app/features/explore/QueryRows.tsx
@@ -107,9 +107,12 @@ export const QueryRows = ({ exploreId, isOpen, changeCompactMode }: Props) => {
 
     // Open drawer with the original query highlighted
     if (originalQueryRef) {
-      openDrawer([], () => {}, {
-        context: 'explore',
-        highlightQuery: originalQueryRef,
+      openDrawer({
+        datasourceFilters: [],
+        options: {
+          context: 'explore',
+          highlightQuery: originalQueryRef,
+        },
       });
     }
   };
diff --git a/public/app/features/explore/RichHistory/RichHistoryAddToLibrary.tsx b/public/app/features/explore/RichHistory/RichHistoryAddToLibrary.tsx
index e99c0e6cebc..9082d02bfc2 100644
--- a/public/app/features/explore/RichHistory/RichHistoryAddToLibrary.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryAddToLibrary.tsx
@@ -1,10 +1,14 @@
 import { useState } from 'react';
 
 import { t } from '@grafana/i18n';
+import { reportInteraction } from '@grafana/runtime';
 import { DataQuery } from '@grafana/schema';
 import { Button } from '@grafana/ui';
+import { useDispatch, useSelector } from 'app/types/store';
 
 import { useQueryLibraryContext } from '../QueryLibrary/QueryLibraryContext';
+import { changeQueries } from '../state/query';
+import { selectExploreDSMaps } from '../state/selectors';
 
 type Props = {
   query: DataQuery;
@@ -12,7 +16,17 @@ type Props = {
 
 export const RichHistoryAddToLibrary = ({ query }: Props) => {
   const [hasBeenSaved, setHasBeenSaved] = useState(false);
-  const { openAddQueryModal, queryLibraryEnabled } = useQueryLibraryContext();
+  const { openDrawer, queryLibraryEnabled } = useQueryLibraryContext();
+  const dispatch = useDispatch();
+  const exploreActiveDS = useSelector(selectExploreDSMaps);
+  const exploreId = exploreActiveDS.exploreToDS[0]?.exploreId;
+
+  const onSelectQuery = (newQuery: DataQuery) => {
+    reportInteraction('grafana_explore_query_replaced_from_library');
+    if (exploreId) {
+      dispatch(changeQueries({ exploreId, queries: [newQuery] }));
+    }
+  };
 
   const buttonLabel = t('explore.rich-history-card.add-to-library', 'Add to library');
 
@@ -22,7 +36,16 @@ export const RichHistoryAddToLibrary = ({ query }: Props) => {
         variant="secondary"
         aria-label={buttonLabel}
         onClick={() => {
-          openAddQueryModal(query, { onSave: () => setHasBeenSaved(true), context: 'rich-history' });
+          openDrawer({
+            query,
+            onSelectQuery,
+            options: {
+              onSave: () => {
+                setHasBeenSaved(true);
+              },
+              context: 'rich-history',
+            },
+          });
         }}
       >
         {buttonLabel}
diff --git a/public/app/features/explore/SecondaryActions.tsx b/public/app/features/explore/SecondaryActions.tsx
index a54daf81694..d3672f6fc32 100644
--- a/public/app/features/explore/SecondaryActions.tsx
+++ b/public/app/features/explore/SecondaryActions.tsx
@@ -77,8 +77,10 @@ export function SecondaryActions({
               aria-label={t('explore.secondary-actions.add-from-query-library', 'Add query from library')}
               variant="canvas"
               onClick={() =>
-                openQueryLibraryDrawer(activeDatasources, onSelectQueryFromLibrary, {
-                  context: CoreApp.Explore,
+                openQueryLibraryDrawer({
+                  datasourceFilters: activeDatasources,
+                  onSelectQuery: onSelectQueryFromLibrary,
+                  options: { context: CoreApp.Explore },
                 })
               }
               icon="plus"
diff --git a/public/app/features/explore/spec/helper/interactions.ts b/public/app/features/explore/spec/helper/interactions.ts
index a83dfb2d9c8..840eccdee1a 100644
--- a/public/app/features/explore/spec/helper/interactions.ts
+++ b/public/app/features/explore/spec/helper/interactions.ts
@@ -56,7 +56,11 @@ export const addQueryHistoryToQueryLibrary = async () => {
 };
 
 export const submitAddToQueryLibrary = async ({ title }: { title: string }) => {
-  const input = within(screen.getByRole('dialog')).getByLabelText('Title');
+  const container = screen.getByRole('dialog', {
+    name: /Drawer title/i,
+  });
+
+  const input = within(container).getByRole('textbox', { name: /title/i });
   await userEvent.type(input, title);
   const saveButton = screen.getByRole('button', {
     name: /^save$/i,
diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx
index 65631c9b568..a8bda63f862 100644
--- a/public/app/features/query/components/QueryEditorRow.tsx
+++ b/public/app/features/query/components/QueryEditorRow.tsx
@@ -290,6 +290,11 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
     this.onToggleHelp();
   };
 
+  onSelectQueryFromLibrary = (query: DataQuery) => {
+    this.props.onQueryReplacedFromLibrary?.();
+    this.props.onReplace?.(query);
+  };
+
   renderCollapsedText(): string | null {
     const { datasource } = this.state;
     if (datasource?.getQueryDisplayText) {
@@ -378,13 +383,7 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
   };
 
   renderActions = (props: QueryOperationRowRenderProps) => {
-    const {
-      query,
-      hideHideQueryButton: hideHideQueryButton = false,
-      onReplace,
-      onQueryReplacedFromLibrary,
-      queryLibraryRef,
-    } = this.props;
+    const { query, hideHideQueryButton: hideHideQueryButton = false, queryLibraryRef } = this.props;
     const { datasource, showingHelp } = this.state;
     const isHidden = !!query.hide;
 
@@ -398,16 +397,14 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
           query={query}
           queryLibraryRef={queryLibraryRef}
           app={this.props.app}
+          onSelectQuery={this.onSelectQueryFromLibrary}
           onUpdateSuccess={this.onExitQueryLibraryEditingMode}
         />
 
         {!isEditingQueryLibrary && (
           <ReplaceQueryFromLibrary
             datasourceFilters={datasource?.name ? [datasource.name] : []}
-            onSelectQuery={(query) => {
-              onQueryReplacedFromLibrary?.();
-              onReplace?.(query);
-            }}
+            onSelectQuery={this.onSelectQueryFromLibrary}
             app={this.props.app}
           />
         )}
@@ -606,9 +603,16 @@ function MaybeQueryLibrarySaveButton(props: {
   app?: CoreApp;
   queryLibraryRef?: string;
   onUpdateSuccess?: () => void;
+  onSelectQuery: (query: DataQuery) => void;
 }) {
   const { renderSaveQueryButton } = useQueryLibraryContext();
-  return renderSaveQueryButton(props.query, props.app, props.queryLibraryRef, props.onUpdateSuccess);
+  return renderSaveQueryButton(
+    props.query,
+    props.app,
+    props.queryLibraryRef,
+    props.onUpdateSuccess,
+    props.onSelectQuery
+  );
 }
 
 interface ReplaceQueryFromLibraryProps<TQuery extends DataQuery> {
@@ -625,7 +629,7 @@ function ReplaceQueryFromLibrary<TQuery extends DataQuery>({
   const { openDrawer, queryLibraryEnabled } = useQueryLibraryContext();
 
   const onReplaceQueryFromLibrary = () => {
-    openDrawer(datasourceFilters, onSelectQuery, { isReplacingQuery: true, context: app });
+    openDrawer({ datasourceFilters, onSelectQuery, options: { isReplacingQuery: true, context: app } });
   };
 
   return queryLibraryEnabled ? (

From 17444fdc0d6e1c6b577fb985a46491e655e034fa Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Thu, 14 Aug 2025 22:19:43 +0200
Subject: [PATCH 191/243] Alerting: Add keepFiringFor and
 missing_series_evals_to_resolve to file provisioning (#109699)

---
 .../definitions/provisioning_alert_rules.go   |  2 +-
 .../provisioning/alerting/rules_types.go      | 50 +++++++++++++------
 .../api/alerting/api_provisioning_test.go     |  9 ++++
 .../test-data/provisioning-rules.yaml         |  4 ++
 pkg/tests/api/alerting/testing.go             |  8 +++
 5 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
index 23e036b0b9a..0d91080064b 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
@@ -273,7 +273,7 @@ type AlertRuleExport struct {
 	NoDataState   *NoDataState         `json:"noDataState,omitempty" yaml:"noDataState,omitempty" hcl:"no_data_state"`
 	ExecErrState  *ExecutionErrorState `json:"execErrState,omitempty" yaml:"execErrState,omitempty" hcl:"exec_err_state"`
 	For           model.Duration       `json:"for,omitempty" yaml:"for,omitempty"`
-	KeepFiringFor model.Duration       `json:"keepFiringFor,omitempty" yaml:"keepFiringFor,omitempty" hcl:"keep_firing_for"`
+	KeepFiringFor model.Duration       `json:"keepFiringFor,omitempty" yaml:"keepFiringFor,omitempty"`
 	// ForString and KeepFiringForString are used to:
 	// - Only export the for field for HCL if it is non-zero.
 	// - Format the Prometheus model.Duration type properly for HCL.
diff --git a/pkg/services/provisioning/alerting/rules_types.go b/pkg/services/provisioning/alerting/rules_types.go
index 9c92b7255ac..b5b28072beb 100644
--- a/pkg/services/provisioning/alerting/rules_types.go
+++ b/pkg/services/provisioning/alerting/rules_types.go
@@ -62,21 +62,23 @@ func (ruleGroupV1 *AlertRuleGroupV1) MapToModel() (models.AlertRuleGroupWithFold
 }
 
 type AlertRuleV1 struct {
-	UID                  values.StringValue      `json:"uid" yaml:"uid"`
-	Title                values.StringValue      `json:"title" yaml:"title"`
-	Condition            values.StringValue      `json:"condition" yaml:"condition"`
-	Data                 []QueryV1               `json:"data" yaml:"data"`
-	DasboardUID          values.StringValue      `json:"dasboardUid" yaml:"dasboardUid"` // TODO: Grandfathered typo support. TODO: This should be removed in V2.
-	DashboardUID         values.StringValue      `json:"dashboardUid" yaml:"dashboardUid"`
-	PanelID              values.Int64Value       `json:"panelId" yaml:"panelId"`
-	NoDataState          values.StringValue      `json:"noDataState" yaml:"noDataState"`
-	ExecErrState         values.StringValue      `json:"execErrState" yaml:"execErrState"`
-	For                  values.StringValue      `json:"for" yaml:"for"`
-	Annotations          values.StringMapValue   `json:"annotations" yaml:"annotations"`
-	Labels               values.StringMapValue   `json:"labels" yaml:"labels"`
-	IsPaused             values.BoolValue        `json:"isPaused" yaml:"isPaused"`
-	NotificationSettings *NotificationSettingsV1 `json:"notification_settings" yaml:"notification_settings"`
-	Record               *RecordV1               `json:"record" yaml:"record"`
+	UID                         values.StringValue      `json:"uid" yaml:"uid"`
+	Title                       values.StringValue      `json:"title" yaml:"title"`
+	Condition                   values.StringValue      `json:"condition" yaml:"condition"`
+	Data                        []QueryV1               `json:"data" yaml:"data"`
+	DasboardUID                 values.StringValue      `json:"dasboardUid" yaml:"dasboardUid"` // TODO: Grandfathered typo support. TODO: This should be removed in V2.
+	DashboardUID                values.StringValue      `json:"dashboardUid" yaml:"dashboardUid"`
+	PanelID                     values.Int64Value       `json:"panelId" yaml:"panelId"`
+	NoDataState                 values.StringValue      `json:"noDataState" yaml:"noDataState"`
+	ExecErrState                values.StringValue      `json:"execErrState" yaml:"execErrState"`
+	For                         values.StringValue      `json:"for" yaml:"for"`
+	KeepFiringFor               values.StringValue      `json:"keepFiringFor" yaml:"keepFiringFor"`
+	MissingSeriesEvalsToResolve values.Int64Value       `json:"missing_series_evals_to_resolve" yaml:"missing_series_evals_to_resolve"`
+	Annotations                 values.StringMapValue   `json:"annotations" yaml:"annotations"`
+	Labels                      values.StringMapValue   `json:"labels" yaml:"labels"`
+	IsPaused                    values.BoolValue        `json:"isPaused" yaml:"isPaused"`
+	NotificationSettings        *NotificationSettingsV1 `json:"notification_settings" yaml:"notification_settings"`
+	Record                      *RecordV1               `json:"record" yaml:"record"`
 }
 
 func withFallback(value, fallback string) *string {
@@ -108,6 +110,24 @@ func (rule *AlertRuleV1) mapToModel(orgID int64) (models.AlertRule, error) {
 	}
 	alertRule.For = time.Duration(duration)
 
+	keepFiringForDuration := model.Duration(0)
+	if rule.KeepFiringFor.Value() != "" {
+		var err error
+		keepFiringForDuration, err = model.ParseDuration(rule.KeepFiringFor.Value())
+		if err != nil {
+			return models.AlertRule{}, fmt.Errorf("rule '%s' failed to parse 'keepFiringFor' field: %w", alertRule.Title, err)
+		}
+	}
+	alertRule.KeepFiringFor = time.Duration(keepFiringForDuration)
+
+	if rule.MissingSeriesEvalsToResolve.Raw != "" {
+		missingSeriesEvalsToResolve := rule.MissingSeriesEvalsToResolve.Value()
+		if missingSeriesEvalsToResolve < 0 {
+			return models.AlertRule{}, fmt.Errorf("rule '%s' failed to parse 'missing_series_evals_to_resolve' field: cannot be negative", alertRule.Title)
+		}
+		alertRule.MissingSeriesEvalsToResolve = &missingSeriesEvalsToResolve
+	}
+
 	dasboardUID := rule.DasboardUID.Value()
 	dashboardUID := rule.DashboardUID.Value()
 	alertRule.DashboardUID = withFallback(dashboardUID, dasboardUID) // Use correct spelling over supported typo.
diff --git a/pkg/tests/api/alerting/api_provisioning_test.go b/pkg/tests/api/alerting/api_provisioning_test.go
index 15ec7028e04..57cf2ea0de3 100644
--- a/pkg/tests/api/alerting/api_provisioning_test.go
+++ b/pkg/tests/api/alerting/api_provisioning_test.go
@@ -1028,6 +1028,15 @@ func TestIntegrationExportFileProvision(t *testing.T) {
 		require.Equal(t, http.StatusOK, status)
 		require.Greater(t, len(data), 0)
 
+		t.Run("provisioned alert rules should have proper data", func(t *testing.T) {
+			provisionedRule, status, _ := apiClient.GetProvisioningAlertRule(t, "my_id_1")
+			require.Equal(t, http.StatusOK, status)
+
+			require.Equal(t, model.Duration(time.Second*120), provisionedRule.KeepFiringFor)
+			require.NotNil(t, provisionedRule.MissingSeriesEvalsToResolve)
+			require.Equal(t, int64(3), *provisionedRule.MissingSeriesEvalsToResolve)
+		})
+
 		t.Run("exported alert rules should escape $ characters", func(t *testing.T) {
 			// call export endpoint
 			status, exportRaw := apiClient.ExportRulesWithStatus(t, &definitions.AlertRulesExportParameters{
diff --git a/pkg/tests/api/alerting/test-data/provisioning-rules.yaml b/pkg/tests/api/alerting/test-data/provisioning-rules.yaml
index 3d916fcb7d4..52000630a54 100644
--- a/pkg/tests/api/alerting/test-data/provisioning-rules.yaml
+++ b/pkg/tests/api/alerting/test-data/provisioning-rules.yaml
@@ -62,6 +62,10 @@ groups:
         execErrState: Alerting
         # <duration, required> for how long should the alert fire before alerting
         for: 60s
+        # <duration> for how long the alert should keep firing after condition stops being true
+        keepFiringFor: 120s
+        # <int> number of evaluation intervals required to resolve alert when data is missing
+        missing_series_evals_to_resolve: 3
         # <map<string, string>> a map of strings to pass around any data
         annotations:
           some_key: some_value
diff --git a/pkg/tests/api/alerting/testing.go b/pkg/tests/api/alerting/testing.go
index 8be4ff183d6..48a516ed87c 100644
--- a/pkg/tests/api/alerting/testing.go
+++ b/pkg/tests/api/alerting/testing.go
@@ -1487,6 +1487,14 @@ func createUser(t *testing.T, db db.DB, cfg *setting.Cfg, cmd user.CreateUserCom
 	return u.ID
 }
 
+func (a apiClient) GetProvisioningAlertRule(t *testing.T, ruleUID string) (apimodels.ProvisionedAlertRule, int, string) {
+	t.Helper()
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/v1/provisioning/alert-rules/%s", a.url, ruleUID), nil)
+	require.NoError(t, err)
+
+	return sendRequestJSON[apimodels.ProvisionedAlertRule](t, req, http.StatusOK)
+}
+
 func (a apiClient) GetProvisioningAlertRuleExport(t *testing.T, ruleUID string, params *apimodels.ExportQueryParams) (int, string) {
 	t.Helper()
 	u, err := url.Parse(fmt.Sprintf("%s/api/v1/provisioning/alert-rules/%s/export", a.url, ruleUID))

From cc651e2e6ec70e784509d532af5579ab99c298ba Mon Sep 17 00:00:00 2001
From: Jesse David Peterson <jesdavpet@users.noreply.github.com>
Date: Thu, 14 Aug 2025 16:46:53 -0400
Subject: [PATCH 192/243] PieChart: Add panel options for ascending/descending
 sort, and no sorting (#109564)

* Add PieSortOption.

* Add sorting options to pie chart panel options.

* Fix that sorting is not part of the panel options.

* Implement custom sorting in piechart and piechart legend.

* Update piechart documentation

* Fix default and clockwise/counterclockwise confusion.

* refactor(piechart): use asc/desc terminology instead of clockwise

* fix(piechart): simplify comparator sort, avoid a/b swap mutation

* fix(pichart): remove redundant sorting from Pie component invocation

* refactor(piechart): hoist comparator for sorting display values

* docs(piechart): include recommendations from @imatwawanaimatwawana

* test(piechart): add test coverage for new sorting comparator

* chore(piechart): regenerate Cue schema files

* docs(piechart): apply suggestions from @imatwawana code review

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

* fix(piechart): fix typo, match punctuation in option description

* chore(piechart): update schema to use existing `common.SortOrder` instead of custom

Co-authored-by: Paul Marbach <paul.marbach@grafana.com>

---------

Co-authored-by: Lukas Wieg <lukaswieg@googlemail.com>
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Co-authored-by: Paul Marbach <paul.marbach@grafana.com>
---
 .../visualizations/pie-chart/index.md         |  9 ++++
 .../panelcfg/x/PieChartPanelCfg_types.gen.ts  |  1 +
 .../app/plugins/panel/piechart/PieChart.tsx   |  5 +-
 .../panel/piechart/PieChartPanel.test.tsx     | 49 ++++++++++++++++++-
 .../plugins/panel/piechart/PieChartPanel.tsx  | 38 +++++++++-----
 public/app/plugins/panel/piechart/module.tsx  | 14 ++++++
 .../app/plugins/panel/piechart/panelcfg.cue   |  1 +
 .../plugins/panel/piechart/panelcfg.gen.ts    |  1 +
 8 files changed, 104 insertions(+), 14 deletions(-)

diff --git a/docs/sources/panels-visualizations/visualizations/pie-chart/index.md b/docs/sources/panels-visualizations/visualizations/pie-chart/index.md
index 679f4e61f3b..0c46b734d1d 100644
--- a/docs/sources/panels-visualizations/visualizations/pie-chart/index.md
+++ b/docs/sources/panels-visualizations/visualizations/pie-chart/index.md
@@ -136,6 +136,15 @@ Select the pie chart display style. Choose from **Pie** or **Donut**.
 
 ![Pie chart types](/media/docs/grafana/panels-visualizations/screenshot-pie-chart-types.png)
 
+#### Slice sorting
+
+By default, the pie chart is sorted so that the slices decrease in size clockwise around the circle.
+You can configure the sorting of the slices, and by extension the legend, with the following options:
+
+- **Descending** - The slices decrease in size, clockwise (default).
+- **Ascending** - The slices increase in size, clockwise.
+- **None** - No sorting is applied. The original order of the data is maintained.
+
 #### Labels
 
 Select labels to display on the pie chart. You can select more than one.
diff --git a/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
index c5f420a0b11..913fa45c9ac 100644
--- a/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
@@ -54,6 +54,7 @@ export interface Options extends common.OptionsWithTooltip, common.SingleStatBas
   displayLabels: Array<PieChartLabels>;
   legend: PieChartLegendOptions;
   pieType: PieChartType;
+  sort: common.SortOrder;
 }
 
 export const defaultOptions: Partial<Options> = {
diff --git a/public/app/plugins/panel/piechart/PieChart.tsx b/public/app/plugins/panel/piechart/PieChart.tsx
index 3abbe438cfb..0619a92e2c5 100644
--- a/public/app/plugins/panel/piechart/PieChart.tsx
+++ b/public/app/plugins/panel/piechart/PieChart.tsx
@@ -18,7 +18,7 @@ import {
   DataHoverEvent,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { VizTooltipOptions } from '@grafana/schema';
+import { SortOrder, VizTooltipOptions } from '@grafana/schema';
 import {
   useTheme2,
   useStyles2,
@@ -40,6 +40,7 @@ interface PieChartProps {
   width: number;
   fieldDisplayValues: FieldDisplay[];
   pieType: PieChartType;
+  sort: SortOrder;
   highlightedTitle?: string;
   displayLabels?: PieChartLabels[];
   useGradients?: boolean; // not used?
@@ -49,6 +50,7 @@ interface PieChartProps {
 export const PieChart = ({
   fieldDisplayValues,
   pieType,
+  sort,
   width,
   height,
   highlightedTitle,
@@ -105,6 +107,7 @@ export const PieChart = ({
           <Pie
             data={filteredFieldDisplayValues}
             pieValue={getValue}
+            pieSortValues={() => 0}
             outerRadius={layout.outerRadius}
             innerRadius={layout.innerRadius}
             cornerRadius={3}
diff --git a/public/app/plugins/panel/piechart/PieChartPanel.test.tsx b/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
index 059877f28bb..7358062953c 100644
--- a/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
+++ b/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
@@ -13,7 +13,7 @@ import {
 } from '@grafana/data';
 import { LegendDisplayMode, SortOrder, TooltipDisplayMode } from '@grafana/schema';
 
-import { PieChartPanel } from './PieChartPanel';
+import { PieChartPanel, comparePieChartItemsByValue } from './PieChartPanel';
 import { Options, PieChartType, PieChartLegendValues } from './panelcfg.gen';
 
 jest.mock('react-use', () => ({
@@ -165,6 +165,52 @@ describe('PieChartPanel', () => {
   });
 });
 
+describe('comparePieChartItemsByValue', () => {
+  const makeFieldDisplay = (n: number) =>
+    ({ display: { numeric: n } }) as unknown as import('@grafana/data').FieldDisplay;
+
+  it.each([
+    {
+      name: 'always: NaN a sorts after 1',
+      sort: SortOrder.Descending,
+      a: makeFieldDisplay(NaN),
+      b: makeFieldDisplay(1),
+      expected: 1,
+    },
+    {
+      name: 'always: NaN b sorts before 1',
+      sort: SortOrder.Descending,
+      a: makeFieldDisplay(1),
+      b: makeFieldDisplay(NaN),
+      expected: -1,
+    },
+    {
+      name: 'descending: larger a sorts before smaller b (negative)',
+      sort: SortOrder.Descending,
+      a: makeFieldDisplay(10),
+      b: makeFieldDisplay(5),
+      expected: -5,
+    },
+    {
+      name: 'ascending: smaller a sorts before larger b (negative)',
+      sort: SortOrder.Ascending,
+      a: makeFieldDisplay(5),
+      b: makeFieldDisplay(10),
+      expected: -5,
+    },
+    {
+      name: 'none: comparator returns 0 regardless of values',
+      sort: SortOrder.None,
+      a: makeFieldDisplay(5),
+      b: makeFieldDisplay(10),
+      expected: 0,
+    },
+  ])('$name', ({ sort, a, b, expected }) => {
+    const cmp = comparePieChartItemsByValue(sort);
+    expect(cmp(a, b)).toBe(expected);
+  });
+});
+
 const setup = (propsOverrides?: {}) => {
   const fieldConfig: FieldConfigSource = {
     defaults: {},
@@ -173,6 +219,7 @@ const setup = (propsOverrides?: {}) => {
 
   const options: Options = {
     pieType: PieChartType.Pie,
+    sort: SortOrder.Descending,
     displayLabels: [],
     legend: {
       displayMode: LegendDisplayMode.List,
diff --git a/public/app/plugins/panel/piechart/PieChartPanel.tsx b/public/app/plugins/panel/piechart/PieChartPanel.tsx
index ae7bc3624b7..0deabf1da10 100644
--- a/public/app/plugins/panel/piechart/PieChartPanel.tsx
+++ b/public/app/plugins/panel/piechart/PieChartPanel.tsx
@@ -11,7 +11,7 @@ import {
   PanelProps,
 } from '@grafana/data';
 import { PanelDataErrorView } from '@grafana/runtime';
-import { HideSeriesConfig, LegendDisplayMode } from '@grafana/schema';
+import { HideSeriesConfig, SortOrder, LegendDisplayMode } from '@grafana/schema';
 import {
   SeriesVisibilityChangeBehavior,
   usePanelContext,
@@ -67,6 +67,7 @@ export function PieChartPanel(props: Props) {
             fieldDisplayValues={fieldDisplayValues}
             tooltipOptions={options.tooltip}
             pieType={options.pieType}
+            sort={options.sort}
             displayLabels={options.displayLabels}
           />
         );
@@ -81,19 +82,12 @@ function getLegend(props: Props, displayValues: FieldDisplay[]) {
   if (legendOptions.showLegend === false) {
     return undefined;
   }
+
+  const sortedDisplayValues = displayValues.sort(comparePieChartItemsByValue(props.options.sort));
+
   const total = displayValues.filter(filterDisplayItems).reduce(sumDisplayItemsReducer, 0);
 
-  const legendItems: VizLegendItem[] = displayValues
-    // Since the pie chart is always sorted, let's sort the legend as well.
-    .sort((a, b) => {
-      if (isNaN(a.display.numeric)) {
-        return 1;
-      } else if (isNaN(b.display.numeric)) {
-        return -1;
-      } else {
-        return b.display.numeric - a.display.numeric;
-      }
-    })
+  const legendItems: VizLegendItem[] = sortedDisplayValues
     .map<VizLegendItem | undefined>((value: FieldDisplay, idx: number) => {
       const hideFrom: HideSeriesConfig = value.field.custom?.hideFrom ?? {};
 
@@ -151,6 +145,26 @@ function getLegend(props: Props, displayValues: FieldDisplay[]) {
   );
 }
 
+export function comparePieChartItemsByValue(sort: SortOrder): (a: FieldDisplay, b: FieldDisplay) => number {
+  return function (a: FieldDisplay, b: FieldDisplay) {
+    if (isNaN(a.display.numeric)) {
+      return 1;
+    }
+    if (isNaN(b.display.numeric)) {
+      return -1;
+    }
+
+    if (sort === SortOrder.Descending) {
+      return b.display.numeric - a.display.numeric;
+    }
+    if (sort === SortOrder.Ascending) {
+      return a.display.numeric - b.display.numeric;
+    }
+
+    return 0;
+  };
+}
+
 function hasFrames(fieldDisplayValues: FieldDisplay[]) {
   return fieldDisplayValues.some((fd) => fd.view?.dataFrame.length);
 }
diff --git a/public/app/plugins/panel/piechart/module.tsx b/public/app/plugins/panel/piechart/module.tsx
index 111c481f533..33726bf3a0f 100644
--- a/public/app/plugins/panel/piechart/module.tsx
+++ b/public/app/plugins/panel/piechart/module.tsx
@@ -1,5 +1,6 @@
 import { FieldColorModeId, FieldConfigProperty, PanelPlugin } from '@grafana/data';
 import { t } from '@grafana/i18n';
+import { SortOrder } from '@grafana/schema/dist/esm/index';
 import { commonOptionsBuilder } from '@grafana/ui';
 import { optsWithHideZeros } from '@grafana/ui/internal';
 
@@ -48,6 +49,19 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(PieChartPanel)
         },
         defaultValue: PieChartType.Pie,
       })
+      .addSelect({
+        name: 'Slice sorting',
+        description: 'Select how to sort the pie slices',
+        path: 'sort',
+        settings: {
+          options: [
+            { value: SortOrder.Descending, label: 'Descending' },
+            { value: SortOrder.Ascending, label: 'Ascending' },
+            { value: SortOrder.None, label: 'None' },
+          ],
+        },
+        defaultValue: SortOrder.Descending,
+      })
       .addMultiSelect({
         name: t('piechart.name-labels', 'Labels'),
         category,
diff --git a/public/app/plugins/panel/piechart/panelcfg.cue b/public/app/plugins/panel/piechart/panelcfg.cue
index 5a75d388dd4..1ac2f4a1639 100644
--- a/public/app/plugins/panel/piechart/panelcfg.cue
+++ b/public/app/plugins/panel/piechart/panelcfg.cue
@@ -46,6 +46,7 @@ composableKinds: PanelCfg: {
 					common.OptionsWithTooltip
 					common.SingleStatBaseOptions
 					pieType: PieChartType
+				sort: common.SortOrder
 					displayLabels: [...PieChartLabels]
 					legend: PieChartLegendOptions
 				} @cuetsy(kind="interface")
diff --git a/public/app/plugins/panel/piechart/panelcfg.gen.ts b/public/app/plugins/panel/piechart/panelcfg.gen.ts
index 494d6678173..9afffa589b3 100644
--- a/public/app/plugins/panel/piechart/panelcfg.gen.ts
+++ b/public/app/plugins/panel/piechart/panelcfg.gen.ts
@@ -52,6 +52,7 @@ export interface Options extends common.OptionsWithTooltip, common.SingleStatBas
   displayLabels: Array<PieChartLabels>;
   legend: PieChartLegendOptions;
   pieType: PieChartType;
+  sort: common.SortOrder;
 }
 
 export const defaultOptions: Partial<Options> = {

From 9a47dd2a7ecf27ecc22c2a0de74391a2f9e866e9 Mon Sep 17 00:00:00 2001
From: Paul Marbach <paul.marbach@grafana.com>
Date: Thu, 14 Aug 2025 17:38:54 -0400
Subject: [PATCH 193/243] Sparkline: Properly handle flat data (min === max)
 (#109702)

---
 .../src/components/Sparkline/Sparkline.tsx    | 23 +----
 .../src/components/Sparkline/utils.test.ts    | 90 ++++++++++++++++++-
 .../src/components/Sparkline/utils.ts         | 37 ++++++++
 .../src/components/Table/TableNG/TableNG.tsx  |  3 +
 4 files changed, 130 insertions(+), 23 deletions(-)

diff --git a/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx b/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx
index 6d4547e3fbe..8de8ed1b893 100644
--- a/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx
+++ b/packages/grafana-ui/src/components/Sparkline/Sparkline.tsx
@@ -26,7 +26,7 @@ import { UPlotChart } from '../uPlot/Plot';
 import { UPlotConfigBuilder } from '../uPlot/config/UPlotConfigBuilder';
 import { preparePlotData2, getStackingGroups } from '../uPlot/utils';
 
-import { preparePlotFrame } from './utils';
+import { getYRange, preparePlotFrame } from './utils';
 
 export interface SparklineProps extends Themeable2 {
   width: number;
@@ -102,26 +102,7 @@ export class Sparkline extends PureComponent<SparklineProps, State> {
   }
 
   getYRange(field: Field): Range.MinMax {
-    let { min, max } = this.state.alignedDataFrame.fields[1].state?.range!;
-    const noValue = +this.state.alignedDataFrame.fields[1].config?.noValue!;
-
-    if (!Number.isNaN(noValue)) {
-      min = Math.min(min!, +noValue);
-      max = Math.max(max!, +noValue);
-    }
-
-    if (min === max) {
-      if (min === 0) {
-        max = 100;
-      } else {
-        min = 0;
-        max! *= 2;
-      }
-
-      return [min, max!];
-    }
-
-    return [Math.max(min!, field.config.min ?? -Infinity), Math.min(max!, field.config.max ?? Infinity)];
+    return getYRange(field, this.state.alignedDataFrame);
   }
 
   prepareConfig(data: DataFrame) {
diff --git a/packages/grafana-ui/src/components/Sparkline/utils.test.ts b/packages/grafana-ui/src/components/Sparkline/utils.test.ts
index d563d83f334..9eb914af438 100644
--- a/packages/grafana-ui/src/components/Sparkline/utils.test.ts
+++ b/packages/grafana-ui/src/components/Sparkline/utils.test.ts
@@ -1,6 +1,6 @@
-import { FieldSparkline, FieldType } from '@grafana/data';
+import { Field, FieldSparkline, FieldType } from '@grafana/data';
 
-import { preparePlotFrame } from './utils';
+import { getYRange, preparePlotFrame } from './utils';
 
 describe('Prepare Sparkline plot frame', () => {
   it('should return sorted array if x-axis numeric', () => {
@@ -91,3 +91,89 @@ describe('Prepare Sparkline plot frame', () => {
     expect(frame.fields[1].values).toEqual([2, null, 3, null, null, 1]);
   });
 });
+
+describe('Get y range', () => {
+  const defaultYField: Field = {
+    name: 'y',
+    values: [1, 2, 3, 4, 5],
+    type: FieldType.number,
+    config: {},
+    state: { range: { min: 1, max: 5, delta: 4 } },
+  };
+  const straightLineYField: Field = {
+    name: 'y',
+    values: [2, 2, 2, 2, 2],
+    type: FieldType.number,
+    config: {},
+    state: { range: { min: 2, max: 2, delta: 0 } },
+  };
+  const straightLineNegYField: Field = {
+    name: 'y',
+    values: [-2, -2, -2, -2, -2],
+    type: FieldType.number,
+    config: {},
+    state: { range: { min: -2, max: -2, delta: 0 } },
+  };
+  const xField: Field = {
+    name: 'x',
+    values: [1000, 2000, 3000, 4000, 5000],
+    type: FieldType.time,
+    config: {},
+  };
+  const getAlignedFrame = (yField: Field) => ({
+    refId: 'sparkline',
+    fields: [xField, yField],
+    length: yField.values.length,
+  });
+  it.each([
+    {
+      description: 'inferred min and max',
+      field: defaultYField,
+      expected: [1, 5],
+    },
+    {
+      description: 'min from config',
+      field: { ...defaultYField, config: { min: 3 }, state: { range: { min: 3, max: 5, delta: 2 } } },
+      expected: [3, 5],
+    },
+    {
+      description: 'max from config',
+      field: { ...defaultYField, config: { max: 30 }, state: { range: { min: 1, max: 30, delta: 29 } } },
+      expected: [1, 30],
+    },
+    {
+      description: 'no value is set',
+      field: { ...defaultYField, config: { noValue: '0' } },
+      expected: [0, 5],
+    },
+    {
+      description: 'NaN no value is set',
+      field: { ...defaultYField, config: { noValue: 'foo' } },
+      expected: [1, 5],
+    },
+    {
+      description: 'straight line',
+      field: straightLineYField,
+      expected: [0, 4],
+    },
+    {
+      description: 'straight line, negative values',
+      field: straightLineNegYField,
+      expected: [-4, 0],
+    },
+    {
+      description: 'straight line with config min and max',
+      field: { ...straightLineYField, config: { min: 1, max: 3 }, state: { range: { min: 1, max: 3, delta: 2 } } },
+      expected: [1, 3],
+    },
+    {
+      description: 'straight line with config no value',
+      field: { ...straightLineYField, config: { noValue: '0' } },
+      expected: [0, 2],
+    },
+  ])(`should return correct range for $description`, ({ field, expected }) => {
+    const actual = getYRange(field, getAlignedFrame(field));
+    expect(actual).toEqual(expected);
+    expect(actual[0]).toBeLessThan(actual[1]!);
+  });
+});
diff --git a/packages/grafana-ui/src/components/Sparkline/utils.ts b/packages/grafana-ui/src/components/Sparkline/utils.ts
index aa77fd64dc4..5c2afd8a1cb 100644
--- a/packages/grafana-ui/src/components/Sparkline/utils.ts
+++ b/packages/grafana-ui/src/components/Sparkline/utils.ts
@@ -1,3 +1,5 @@
+import { Range } from 'uplot';
+
 import {
   DataFrame,
   FieldConfig,
@@ -6,6 +8,7 @@ import {
   isLikelyAscendingVector,
   sortDataFrame,
   applyNullInsertThreshold,
+  Field,
 } from '@grafana/data';
 import { GraphFieldConfig } from '@grafana/schema';
 
@@ -48,3 +51,37 @@ export function preparePlotFrame(sparkline: FieldSparkline, config?: FieldConfig
     refFieldPseudoMax: sparkline.timeRange?.to.valueOf(),
   });
 }
+
+/**
+ * apply configuration defaults and ensure that the range is never two equal values.
+ */
+export function getYRange(field: Field, alignedFrame: DataFrame): Range.MinMax {
+  let { min, max } = alignedFrame.fields[1].state?.range!;
+
+  // enure that the min/max from the field config are respected
+  min = Math.max(min!, field.config.min ?? -Infinity);
+  max = Math.min(max!, field.config.max ?? Infinity);
+
+  // if noValue is set, ensure that it is included in the range as well
+  const noValue = +alignedFrame.fields[1].config?.noValue!;
+  if (!Number.isNaN(noValue)) {
+    min = Math.min(min, noValue);
+    max = Math.max(max, noValue);
+  }
+
+  // if min and max are equal after all of that, create a range
+  // that allows the sparkline to be visible in the center of the viz
+  if (min === max) {
+    if (min === 0) {
+      max = 100;
+    } else if (min < 0) {
+      max = 0;
+      min *= 2;
+    } else {
+      min = 0;
+      max *= 2;
+    }
+  }
+
+  return [min, max];
+}
diff --git a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
index a3e532f7cad..b0f720fbe10 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
@@ -97,6 +97,7 @@ export function TableNG(props: TableNGProps) {
     onSortByChange,
     showTypeIcons,
     structureRev,
+    timeRange,
     transparent,
     width,
   } = props;
@@ -461,6 +462,7 @@ export function TableNG(props: TableNGProps) {
                 theme,
                 value,
                 width,
+                timeRange,
                 cellInspect,
                 showFilters,
                 getActions: getCellActions,
@@ -646,6 +648,7 @@ export function TableNG(props: TableNGProps) {
     showTypeIcons,
     sortColumns,
     styles,
+    timeRange,
     theme,
     visibleFields,
     widths,

From 1ff39510d3d17b35e9cbc8453d01221017e1628b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?=
 <roberto.jimenez@grafana.com>
Date: Fri, 15 Aug 2025 09:05:53 +0200
Subject: [PATCH 194/243] Provisioning: Check For Resource Ownership Before
 Operations (#109582)

---
 pkg/registry/apis/provisioning/files.go       |  10 +-
 .../apis/provisioning/resources/dualwriter.go |  31 ++-
 .../apis/provisioning/resources/parser.go     |  90 ++++++++-
 .../provisioning/resources/repository_test.go | 130 ++++++++++++
 .../apis/provisioning/resources/resources.go  |  52 +++++
 pkg/registry/apis/provisioning/response.go    |  18 ++
 pkg/tests/apis/provisioning/files_test.go     | 188 ++++++++++++++++++
 pkg/tests/apis/provisioning/helper_test.go    |  13 +-
 pkg/tests/apis/provisioning/pulljob_test.go   | 141 +++++++++++++
 9 files changed, 647 insertions(+), 26 deletions(-)
 create mode 100644 pkg/registry/apis/provisioning/response.go
 create mode 100644 pkg/tests/apis/provisioning/pulljob_test.go

diff --git a/pkg/registry/apis/provisioning/files.go b/pkg/registry/apis/provisioning/files.go
index 1df860b9738..8fe1a933e37 100644
--- a/pkg/registry/apis/provisioning/files.go
+++ b/pkg/registry/apis/provisioning/files.go
@@ -135,7 +135,7 @@ func (c *filesConnector) Connect(ctx context.Context, name string, opts runtime.
 		case http.MethodGet:
 			resource, err := dualReadWriter.Read(ctx, opts.Path, opts.Ref)
 			if err != nil {
-				responder.Error(err)
+				respondWithError(responder, err)
 				return
 			}
 			obj = resource.AsResourceWrapper()
@@ -153,7 +153,7 @@ func (c *filesConnector) Connect(ctx context.Context, name string, opts runtime.
 
 				resource, err := dualReadWriter.MoveResource(ctx, opts)
 				if err != nil {
-					responder.Error(err)
+					respondWithError(responder, err)
 					return
 				}
 				obj = resource.AsResourceWrapper()
@@ -169,7 +169,7 @@ func (c *filesConnector) Connect(ctx context.Context, name string, opts runtime.
 				var resource *resources.ParsedResource
 				resource, err = dualReadWriter.CreateResource(ctx, opts)
 				if err != nil {
-					responder.Error(err)
+					respondWithError(responder, err)
 					return
 				}
 				obj = resource.AsResourceWrapper()
@@ -187,7 +187,7 @@ func (c *filesConnector) Connect(ctx context.Context, name string, opts runtime.
 
 				resource, err := dualReadWriter.UpdateResource(ctx, opts)
 				if err != nil {
-					responder.Error(err)
+					respondWithError(responder, err)
 					return
 				}
 				obj = resource.AsResourceWrapper()
@@ -195,7 +195,7 @@ func (c *filesConnector) Connect(ctx context.Context, name string, opts runtime.
 		case http.MethodDelete:
 			resource, err := dualReadWriter.Delete(ctx, opts)
 			if err != nil {
-				responder.Error(err)
+				respondWithError(responder, err)
 				return
 			}
 			obj = resource.AsResourceWrapper()
diff --git a/pkg/registry/apis/provisioning/resources/dualwriter.go b/pkg/registry/apis/provisioning/resources/dualwriter.go
index bfe4ca499a6..24e605847e2 100644
--- a/pkg/registry/apis/provisioning/resources/dualwriter.go
+++ b/pkg/registry/apis/provisioning/resources/dualwriter.go
@@ -62,7 +62,7 @@ func (r *DualReadWriter) Read(ctx context.Context, path string, ref string) (*Pa
 
 	// Fail as we use the dry run for this response and it's not about updating the resource
 	if err := parsed.DryRun(ctx); err != nil {
-		return nil, apierrors.NewBadRequest(fmt.Sprintf("Dry run failed: %v", err))
+		return nil, fmt.Errorf("error running dryRun: %w", err)
 	}
 
 	// Authorize based on the existing resource
@@ -105,25 +105,22 @@ func (r *DualReadWriter) Delete(ctx context.Context, opts DualWriteOptions) (*Pa
 	}
 
 	parsed.Action = provisioning.ResourceActionDelete
+
+	// Use the parser's DryRun method like create/update operations
+	if !opts.SkipDryRun {
+		if err := parsed.DryRun(ctx); err != nil {
+			return nil, fmt.Errorf("error running dryRun for delete: %w", err)
+		}
+	}
+
 	err = r.repo.Delete(ctx, opts.Path, opts.Ref, opts.Message)
 	if err != nil {
 		return nil, fmt.Errorf("delete file from repository: %w", err)
 	}
 
-	// Delete the file in the grafana database
+	// Delete the file in the grafana database using the parser's Run method
 	if opts.Ref == "" {
-		ctx, _, err := identity.WithProvisioningIdentity(ctx, parsed.Obj.GetNamespace())
-		if err != nil {
-			return parsed, err
-		}
-
-		// FIXME: empty folders with no repository files will remain in the system
-		// until the next reconciliation.
-		err = parsed.Client.Delete(ctx, parsed.Obj.GetName(), metav1.DeleteOptions{})
-		if apierrors.IsNotFound(err) {
-			err = nil // ignorable
-		}
-
+		err = parsed.Run(ctx)
 		if err != nil {
 			return nil, fmt.Errorf("delete resource from storage: %w", err)
 		}
@@ -224,13 +221,12 @@ func (r *DualReadWriter) createOrUpdate(ctx context.Context, create bool, opts D
 			logger := logging.FromContext(ctx).With("path", opts.Path, "name", parsed.Obj.GetName(), "ref", opts.Ref)
 			logger.Warn("failed to dry run resource on create", "error", err)
 
-			// TODO: return this as a 400 rather than 500
-			return nil, fmt.Errorf("error running dryRun %w", err)
+			return nil, fmt.Errorf("error running dryRun: %w", err)
 		}
 	}
 
 	if len(parsed.Errors) > 0 {
-		// TODO: return this as a 400 rather than 500
+		// Now returns BadRequest (400) for validation errors
 		return nil, fmt.Errorf("errors while parsing file [%v]", parsed.Errors)
 	}
 
@@ -449,6 +445,7 @@ func (r *DualReadWriter) moveFile(ctx context.Context, opts DualWriteOptions) (*
 	// Perform the move operation in the repository
 	// If we have new content, we need to update the file content as part of the move
 	if len(opts.Data) > 0 {
+		// FIXME: I think we should MOVE + UPDATE instead of Delete / Create
 		// For moves with content updates, we need to delete the old file and create the new one
 		if err = r.repo.Delete(ctx, opts.OriginalPath, opts.Ref, opts.Message); err != nil {
 			return nil, fmt.Errorf("delete original file in repository: %w", err)
diff --git a/pkg/registry/apis/provisioning/resources/parser.go b/pkg/registry/apis/provisioning/resources/parser.go
index 8c6c3b94587..35b94007390 100644
--- a/pkg/registry/apis/provisioning/resources/parser.go
+++ b/pkg/registry/apis/provisioning/resources/parser.go
@@ -168,8 +168,8 @@ func (r *parser) Parse(ctx context.Context, info *repository.FileInfo) (parsed *
 	if obj.GetNamespace() != "" && obj.GetNamespace() != r.repo.Namespace {
 		return nil, apierrors.NewBadRequest("the file namespace does not match target namespace")
 	}
-
 	obj.SetNamespace(r.repo.Namespace)
+
 	parsed.Meta.SetManagerProperties(utils.ManagerProperties{
 		Kind:     utils.ManagerKindRepo,
 		Identity: r.repo.Name,
@@ -232,9 +232,48 @@ func (f *ParsedResource) DryRun(ctx context.Context) error {
 		fieldValidation = "Ignore" // FIXME: temporary while we improve validation
 	}
 
+	// Handle deletion action separately
+	if f.Action == provisioning.ResourceActionDelete {
+		// For delete, we need the existing resource to validate deletion
+		f.Existing, err = f.Client.Get(ctx, f.Obj.GetName(), metav1.GetOptions{})
+		if err != nil {
+			if apierrors.IsNotFound(err) {
+				// Resource doesn't exist, nothing to delete - this is fine for dry run
+				return nil
+			}
+			return fmt.Errorf("failed to get existing resource for delete dry run: %w", err)
+		}
+
+		// Check for ownership conflicts
+		requestingManager := utils.ManagerProperties{
+			Kind:     utils.ManagerKindRepo,
+			Identity: f.Repo.Name,
+		}
+		if err := CheckResourceOwnership(f.Existing, f.Obj.GetName(), requestingManager); err != nil {
+			return err
+		}
+
+		// For delete dry run, we simulate the delete operation
+		// The dry run response will be the existing resource that would be deleted
+		f.DryRunResponse = f.Existing.DeepCopy()
+		return nil
+	}
+
 	// FIXME: shouldn't we check for the specific error?
 	// Dry run CREATE or UPDATE
 	f.Existing, _ = f.Client.Get(ctx, f.Obj.GetName(), metav1.GetOptions{})
+
+	// Check for ownership conflicts after fetching existing resource
+	requestingManager := utils.ManagerProperties{
+		Kind:     utils.ManagerKindRepo,
+		Identity: f.Repo.Name,
+	}
+
+	// Check for ownership conflicts after fetching existing resource
+	if err := CheckResourceOwnership(f.Existing, f.Obj.GetName(), requestingManager); err != nil {
+		return err
+	}
+
 	if f.Existing == nil {
 		f.Action = provisioning.ResourceActionCreate
 		f.DryRunResponse, err = f.Client.Create(ctx, f.Obj, metav1.CreateOptions{
@@ -268,6 +307,55 @@ func (f *ParsedResource) Run(ctx context.Context) error {
 		fieldValidation = "Ignore" // FIXME: temporary while we improve validation
 	}
 
+	// Check for ownership conflicts
+	requestingManager := utils.ManagerProperties{
+		Kind:     utils.ManagerKindRepo,
+		Identity: f.Repo.Name,
+	}
+
+	// Handle deletion action
+	if f.Action == provisioning.ResourceActionDelete {
+		// If we don't have existing resource from DryRun, fetch it now
+		if f.DryRunResponse == nil {
+			f.Existing, err = f.Client.Get(ctx, f.Obj.GetName(), metav1.GetOptions{})
+			if err != nil {
+				if apierrors.IsNotFound(err) {
+					// Resource doesn't exist, nothing to delete - this is fine
+					return nil
+				}
+				return fmt.Errorf("failed to get existing resource for delete: %w", err)
+			}
+		}
+
+		// Check ownership with the existing resource
+		if err := CheckResourceOwnership(f.Existing, f.Obj.GetName(), requestingManager); err != nil {
+			return err
+		}
+
+		// Perform the actual delete
+		err = f.Client.Delete(ctx, f.Obj.GetName(), metav1.DeleteOptions{})
+		if apierrors.IsNotFound(err) {
+			err = nil // ignorable - resource was already deleted
+		}
+
+		// Set the deleted resource as the result
+		if err == nil && f.Existing != nil {
+			f.Upsert = f.Existing.DeepCopy()
+		}
+
+		return err
+	}
+
+	// If we don't have existing resource from DryRun, fetch it now
+	if f.DryRunResponse == nil {
+		f.Existing, _ = f.Client.Get(ctx, f.Obj.GetName(), metav1.GetOptions{})
+	}
+
+	// Check ownership with the existing resource (if any)
+	if err := CheckResourceOwnership(f.Existing, f.Obj.GetName(), requestingManager); err != nil {
+		return err
+	}
+
 	// If we have already tried loading existing, start with create
 	if f.DryRunResponse != nil && f.Existing == nil {
 		f.Action = provisioning.ResourceActionCreate
diff --git a/pkg/registry/apis/provisioning/resources/repository_test.go b/pkg/registry/apis/provisioning/resources/repository_test.go
index c53512c3c0a..0c1c97f564f 100644
--- a/pkg/registry/apis/provisioning/resources/repository_test.go
+++ b/pkg/registry/apis/provisioning/resources/repository_test.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -435,3 +436,132 @@ func (m *MockDynamicResourceInterface) ApplyStatus(ctx context.Context, name str
 
 // Ensure MockDynamicResourceInterface implements dynamic.ResourceInterface
 var _ dynamic.ResourceInterface = (*MockDynamicResourceInterface)(nil)
+
+func TestCheckResourceOwnership(t *testing.T) {
+	tests := []struct {
+		name              string
+		existingResource  *unstructured.Unstructured
+		requestingManager utils.ManagerProperties
+		expectError       bool
+		expectedMessage   string
+	}{
+		{
+			name:             "no existing resource - allow operation",
+			existingResource: nil, // Explicitly nil to represent non-existing resource
+			requestingManager: utils.ManagerProperties{
+				Kind:     utils.ManagerKindRepo,
+				Identity: "repo-1",
+			},
+			expectError: false,
+		},
+		{
+			name: "existing resource with no manager - allow operation",
+			existingResource: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"name": "test-resource",
+					},
+				},
+			},
+			requestingManager: utils.ManagerProperties{
+				Kind:     utils.ManagerKindRepo,
+				Identity: "repo-1",
+			},
+			expectError: false,
+		},
+		{
+			name: "same manager - allow operation",
+			existingResource: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"name": "test-resource",
+						"annotations": map[string]interface{}{
+							utils.AnnoKeyManagerKind:     "repo",
+							utils.AnnoKeyManagerIdentity: "repo-1",
+						},
+					},
+				},
+			},
+			requestingManager: utils.ManagerProperties{
+				Kind:     utils.ManagerKindRepo,
+				Identity: "repo-1",
+			},
+			expectError: false,
+		},
+		{
+			name: "different manager but allows edits - allow operation",
+			existingResource: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"name": "test-resource",
+						"annotations": map[string]interface{}{
+							utils.AnnoKeyManagerKind:        "repo",
+							utils.AnnoKeyManagerIdentity:    "repo-1",
+							utils.AnnoKeyManagerAllowsEdits: "true",
+						},
+					},
+				},
+			},
+			requestingManager: utils.ManagerProperties{
+				Kind:     utils.ManagerKindRepo,
+				Identity: "repo-2",
+			},
+			expectError: false,
+		},
+		{
+			name: "different manager and doesn't allow edits - deny operation",
+			existingResource: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"name": "test-resource",
+						"annotations": map[string]interface{}{
+							utils.AnnoKeyManagerKind:     "repo",
+							utils.AnnoKeyManagerIdentity: "repo-1",
+						},
+					},
+				},
+			},
+			requestingManager: utils.ManagerProperties{
+				Kind:     utils.ManagerKindRepo,
+				Identity: "repo-2",
+			},
+			expectError:     true,
+			expectedMessage: "resource 'test-resource' is managed by repo 'repo-1' and cannot be modified by repo 'repo-2'",
+		},
+		{
+			name: "different manager types - deny operation",
+			existingResource: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"name": "test-resource",
+						"annotations": map[string]interface{}{
+							utils.AnnoKeyManagerKind:     "terraform",
+							utils.AnnoKeyManagerIdentity: "tf-stack-1",
+						},
+					},
+				},
+			},
+			requestingManager: utils.ManagerProperties{
+				Kind:     utils.ManagerKindRepo,
+				Identity: "repo-1",
+			},
+			expectError:     true,
+			expectedMessage: "resource 'test-resource' is managed by terraform 'tf-stack-1' and cannot be modified by repo 'repo-1'",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Test the package-level ownership check function directly
+			err := CheckResourceOwnership(tt.existingResource, "test-resource", tt.requestingManager)
+
+			if tt.expectError {
+				require.Error(t, err)
+				assert.Contains(t, err.Error(), tt.expectedMessage)
+				assert.True(t, apierrors.IsBadRequest(err))
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
diff --git a/pkg/registry/apis/provisioning/resources/resources.go b/pkg/registry/apis/provisioning/resources/resources.go
index ec5942c21ec..cbd5cb120c6 100644
--- a/pkg/registry/apis/provisioning/resources/resources.go
+++ b/pkg/registry/apis/provisioning/resources/resources.go
@@ -25,6 +25,19 @@ var (
 	ErrMissingName         = field.Required(field.NewPath("name", "metadata", "name"), "missing name in resource")
 )
 
+// NewResourceOwnershipConflictError creates a BadRequest error for when a resource
+// is owned by a different repository or manager and cannot be modified
+func NewResourceOwnershipConflictError(resourceName string, currentManager utils.ManagerProperties, requestingManager utils.ManagerProperties) error {
+	message := fmt.Sprintf("resource '%s' is managed by %s '%s' and cannot be modified by %s '%s'",
+		resourceName,
+		currentManager.Kind,
+		currentManager.Identity,
+		requestingManager.Kind,
+		requestingManager.Identity)
+
+	return apierrors.NewBadRequest(message)
+}
+
 type WriteOptions struct {
 	Path string
 	Ref  string
@@ -54,6 +67,45 @@ func NewResourcesManager(repo repository.ReaderWriter, folders *FolderManager, p
 	}
 }
 
+// CheckResourceOwnership validates that the requesting manager can modify the existing resource
+// Returns an error if the existing resource is owned by a different manager that doesn't allow edits
+// If existingResource is nil, no ownership conflict exists (new resource)
+// This is a package-level function that can be used without a ResourcesManager instance
+func CheckResourceOwnership(existingResource *unstructured.Unstructured, resourceName string, requestingManager utils.ManagerProperties) error {
+	if existingResource == nil {
+		// Resource doesn't exist, so no ownership conflict
+		return nil
+	}
+
+	// Check if the existing resource has manager properties
+	existingMeta, err := utils.MetaAccessor(existingResource)
+	if err != nil {
+		// If we can't get metadata, allow the operation
+		return nil
+	}
+
+	currentManager, hasManager := existingMeta.GetManagerProperties()
+	if !hasManager {
+		// No manager information, so no ownership conflict
+		return nil
+	}
+
+	// Check if this is the same manager
+	if currentManager.Kind == requestingManager.Kind && currentManager.Identity == requestingManager.Identity {
+		// Same manager, no conflict
+		return nil
+	}
+
+	// Check if the current manager allows edits
+	if currentManager.AllowsEdits {
+		// Manager allows edits from others, no conflict
+		return nil
+	}
+
+	// Different manager and edits not allowed - return ownership conflict error
+	return NewResourceOwnershipConflictError(resourceName, currentManager, requestingManager)
+}
+
 // CreateResource writes an object to the repository
 func (r *ResourcesManager) WriteResourceFileFromObject(ctx context.Context, obj *unstructured.Unstructured, options WriteOptions) (string, error) {
 	if err := ctx.Err(); err != nil {
diff --git a/pkg/registry/apis/provisioning/response.go b/pkg/registry/apis/provisioning/response.go
new file mode 100644
index 00000000000..20fab310c68
--- /dev/null
+++ b/pkg/registry/apis/provisioning/response.go
@@ -0,0 +1,18 @@
+package provisioning
+
+import (
+	"errors"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apiserver/pkg/registry/rest"
+)
+
+// respondWithError checks if the provided error contains an API error and unwraps it before passing it to the responder.
+func respondWithError(responder rest.Responder, err error) {
+	var statusErr *apierrors.StatusError
+	if errors.As(err, &statusErr) {
+		responder.Error(statusErr)
+	} else {
+		responder.Error(err)
+	}
+}
diff --git a/pkg/tests/apis/provisioning/files_test.go b/pkg/tests/apis/provisioning/files_test.go
index 0867bce6c9a..afe7bfd62b9 100644
--- a/pkg/tests/apis/provisioning/files_test.go
+++ b/pkg/tests/apis/provisioning/files_test.go
@@ -2,9 +2,11 @@ package provisioning
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
+	"path"
 	"testing"
 
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
@@ -390,3 +392,189 @@ func TestIntegrationProvisioning_MoveResources(t *testing.T) {
 		})
 	})
 }
+
+func TestIntegrationProvisioning_FilesOwnershipProtection(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	// Create first repository targeting "folder-1" with its own subdirectory
+	const repo1 = "ownership-repo-1"
+	helper.CreateRepo(t, TestRepo{
+		Name:   repo1,
+		Path:   path.Join(helper.ProvisioningPath, "repo1"),
+		Target: "folder",
+		Copies: map[string]string{
+			"testdata/all-panels.json": "dashboard1.json",
+		},
+		ExpectedDashboards: 1,
+		ExpectedFolders:    1,
+	})
+
+	// Create second repository targeting "folder-2" with its own subdirectory
+	const repo2 = "ownership-repo-2"
+	path2 := path.Join(helper.ProvisioningPath, "repo2")
+	helper.CreateRepo(t, TestRepo{
+		Name:   repo2,
+		Path:   path2,
+		Target: "folder",
+		Copies: map[string]string{
+			"testdata/timeline-demo.json": "dashboard2.json",
+		},
+		ExpectedDashboards: 2, // Total across both repos
+		ExpectedFolders:    2, // Total across both repos
+	})
+
+	t.Run("CREATE file with UID already owned by different repository - should fail", func(t *testing.T) {
+		// Try to create a dashboard in repo2 that has the same UID as the one in repo1
+		// The all-panels.json has UID "n1jR8vnnz" which is already owned by repo1
+		result := helper.AdminREST.Post().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo2). // Using repo2 to try to create resource with same UID as repo1
+			SubResource("files", "conflicting-dashboard.json").
+			Body(helper.LoadFile("testdata/all-panels.json")). // Same file = same UID
+			SetHeader("Content-Type", "application/json").
+			Do(ctx)
+
+		// This should fail with ownership conflict
+		require.Error(t, result.Error(), "creating resource with UID already owned by different repository should fail")
+
+		// Get detailed error information
+		err := result.Error()
+		t.Logf("CREATE operation error: %T - %v", err, err)
+		if statusErr := apierrors.APIStatus(nil); errors.As(err, &statusErr) {
+			t.Logf("Status error details: code=%d, reason=%s, message=%s",
+				statusErr.Status().Code, statusErr.Status().Reason, statusErr.Status().Message)
+		}
+
+		// Verify it returns BadRequest (400) for ownership conflicts
+		if !apierrors.IsBadRequest(err) {
+			t.Errorf("Expected BadRequest error but got: %T - %v", err, err)
+			return
+		}
+
+		// Check error message contains ownership conflict information
+		errorMsg := err.Error()
+		t.Logf("Error message: %s", errorMsg)
+		require.Contains(t, errorMsg, fmt.Sprintf("managed by repo '%s'", repo1))
+		require.Contains(t, errorMsg, fmt.Sprintf("cannot be modified by repo '%s'", repo2))
+	})
+
+	t.Run("UPDATE with UID already owned by different repository - should fail", func(t *testing.T) {
+		// Try to update the dashboard owned by repo1 using repo2
+		result := helper.AdminREST.Put().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo2). // Using repo2 to try to update repo1's resource
+			SubResource("files", "conflicting-update.json").
+			Body(helper.LoadFile("testdata/all-panels.json")). // Same UID as repo1's dashboard
+			SetHeader("Content-Type", "application/json").
+			Do(ctx)
+
+		// This should fail with ownership conflict
+		require.Error(t, result.Error(), "updating resource owned by different repository should fail")
+
+		// Get detailed error information
+		err := result.Error()
+		t.Logf("UPDATE operation error: %T - %v", err, err)
+		if statusErr := apierrors.APIStatus(nil); errors.As(err, &statusErr) {
+			t.Logf("Status error details: code=%d, reason=%s, message=%s",
+				statusErr.Status().Code, statusErr.Status().Reason, statusErr.Status().Message)
+		}
+
+		// Verify it returns BadRequest (400) for ownership conflicts
+		if !apierrors.IsBadRequest(err) {
+			t.Errorf("Expected BadRequest error but got: %T - %v", err, err)
+			return
+		}
+
+		// Check error message contains ownership conflict information
+		errorMsg := err.Error()
+		t.Logf("Error message: %s", errorMsg)
+		require.Contains(t, errorMsg, fmt.Sprintf("managed by repo '%s'", repo1))
+		require.Contains(t, errorMsg, fmt.Sprintf("cannot be modified by repo '%s'", repo2))
+	})
+
+	t.Run("DELETE resource owned by different repository - should fail", func(t *testing.T) {
+		// Create a file manually in the second repo which is already in first one
+		helper.CopyToProvisioningPath(t, "testdata/all-panels.json", "repo2/conflicting-delete.json")
+		printFileTree(t, helper.ProvisioningPath)
+
+		result := helper.AdminREST.Delete().
+			Namespace("default").
+			Resource("repositories").
+			Name(repo2).
+			SubResource("files", "conflicting-delete.json").
+			SetHeader("Content-Type", "application/json").
+			Do(ctx)
+
+		// This should fail with ownership conflict
+		require.Error(t, result.Error(), "deleting resource owned by different repository should fail")
+
+		// Get detailed error information
+		err := result.Error()
+		t.Logf("DELETE operation error: %T - %v", err, err)
+		if statusErr := apierrors.APIStatus(nil); errors.As(err, &statusErr) {
+			t.Logf("Status error details: code=%d, reason=%s, message=%s",
+				statusErr.Status().Code, statusErr.Status().Reason, statusErr.Status().Message)
+		}
+
+		// Verify it returns BadRequest (400) for ownership conflicts
+		if !apierrors.IsBadRequest(err) {
+			t.Errorf("Expected BadRequest error but got: %T - %v", err, err)
+			return
+		}
+
+		// Check error message contains ownership conflict information
+		errorMsg := err.Error()
+		t.Logf("Error message: %s", errorMsg)
+		require.Contains(t, errorMsg, fmt.Sprintf("managed by repo '%s'", repo1))
+		require.Contains(t, errorMsg, fmt.Sprintf("cannot be modified by repo '%s'", repo2))
+	})
+
+	t.Run("MOVE and UPDATE file with UID already owned by different repository - should fail", func(t *testing.T) {
+		resp := helper.postFilesRequest(t, repo2, filesPostOptions{
+			targetPath:   "moved-dashboard.json",
+			originalPath: path.Join("dashboard2.json"),
+			message:      "attempt to move file from different repository",
+			body:         string(helper.LoadFile("testdata/all-panels.json")), // Content to move with the conflicting UID
+		})
+		// nolint:errcheck
+		defer resp.Body.Close()
+
+		// This should fail with ownership conflict
+		require.NotEqual(t, http.StatusOK, resp.StatusCode, "moving resource owned by different repository should fail")
+		// Read response body to check error message
+		body, err := io.ReadAll(resp.Body)
+		require.NoError(t, err)
+		errorMsg := string(body)
+
+		// Log detailed error information
+		t.Logf("MOVE operation HTTP status: %d", resp.StatusCode)
+		t.Logf("MOVE operation error response: %s", errorMsg)
+
+		require.Equal(t, http.StatusBadRequest, resp.StatusCode, "should return BadRequest (400) for ownership conflict")
+		// Check error message contains ownership conflict information
+		require.Contains(t, errorMsg, fmt.Sprintf("managed by repo '%s'", repo1))
+		require.Contains(t, errorMsg, fmt.Sprintf("cannot be modified by repo '%s'", repo2))
+	})
+
+	t.Run("verify original resources remain intact", func(t *testing.T) {
+		const allPanelsUID = "n1jR8vnnz" // UID from all-panels.json (repo1)
+		const timelineUID = "mIJjFy8Kz"  // UID from timeline-demo.json (repo2)
+
+		// Verify repo1's dashboard is still owned by repo1
+		dashboard1, err := helper.DashboardsV1.Resource.Get(ctx, allPanelsUID, metav1.GetOptions{})
+		require.NoError(t, err, "repo1's dashboard should still exist")
+		require.Equal(t, repo1, dashboard1.GetAnnotations()[utils.AnnoKeyManagerIdentity], "repo1's dashboard should still be owned by repo1")
+
+		// Verify repo2's dashboard is still owned by repo2
+		dashboard2, err := helper.DashboardsV1.Resource.Get(ctx, timelineUID, metav1.GetOptions{})
+		require.NoError(t, err, "repo2's dashboard should still exist")
+		require.Equal(t, repo2, dashboard2.GetAnnotations()[utils.AnnoKeyManagerIdentity], "repo2's dashboard should still be owned by repo2")
+	})
+}
diff --git a/pkg/tests/apis/provisioning/helper_test.go b/pkg/tests/apis/provisioning/helper_test.go
index 894f7bd8174..554ad36bff8 100644
--- a/pkg/tests/apis/provisioning/helper_test.go
+++ b/pkg/tests/apis/provisioning/helper_test.go
@@ -315,6 +315,7 @@ func (h *provisioningTestHelper) RenderObject(t *testing.T, filePath string, val
 // The from path is relative to test file's directory.
 func (h *provisioningTestHelper) CopyToProvisioningPath(t *testing.T, from, to string) {
 	fullPath := path.Join(h.ProvisioningPath, to)
+	t.Logf("Copying file from '%s' to provisioning path '%s'", from, fullPath)
 	err := os.MkdirAll(path.Dir(fullPath), 0750)
 	require.NoError(t, err, "failed to create directories for provisioning path")
 
@@ -439,15 +440,21 @@ func (h *provisioningTestHelper) logRepositoryObject(t *testing.T, obj map[strin
 				t.Logf("%s%d items:", prefix, len(v))
 				for i, item := range v {
 					if itemMap, ok := item.(map[string]interface{}); ok {
-						t.Logf("%s├── item %d:", prefix, i+1)
+						// Try to get the actual file path from the item
+						if pathVal, exists := itemMap["path"]; exists {
+							t.Logf("%s├── %v", prefix, pathVal)
+						} else {
+							t.Logf("%s├── item %d:", prefix, i+1)
+						}
 						h.logRepositoryObject(t, itemMap, prefix+"  ", newPath)
 					}
 				}
 			}
 		default:
 			// This could be file content or metadata
-			if key != "kind" && key != "apiVersion" {
-				t.Logf("%s├── %s", prefix, key)
+			// Skip common metadata fields that are not useful for debugging
+			if key != "kind" && key != "apiVersion" && key != "path" && key != "size" && key != "hash" {
+				t.Logf("%s├── %s: %v", prefix, key, value)
 			}
 		}
 	}
diff --git a/pkg/tests/apis/provisioning/pulljob_test.go b/pkg/tests/apis/provisioning/pulljob_test.go
new file mode 100644
index 00000000000..2af5ca64654
--- /dev/null
+++ b/pkg/tests/apis/provisioning/pulljob_test.go
@@ -0,0 +1,141 @@
+package provisioning
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
+)
+
+func TestIntegrationProvisioning_PullJobOwnershipProtection(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	helper := runGrafana(t)
+	ctx := context.Background()
+
+	// Create two repositories with folder targets and separate paths to avoid file conflicts
+	const repo1 = "pulljob-repo-1"
+	const repo2 = "pulljob-repo-2"
+
+	// Create first repository targeting "folder" with its own subdirectory
+	helper.CreateRepo(t, TestRepo{
+		Name:   repo1,
+		Path:   path.Join(helper.ProvisioningPath, "repo1"),
+		Target: "folder",
+		Copies: map[string]string{
+			"testdata/all-panels.json": "dashboard1.json",
+		},
+		ExpectedDashboards: 1,
+		ExpectedFolders:    1,
+	})
+
+	// Create second repository targeting "folder" with its own subdirectory
+	helper.CreateRepo(t, TestRepo{
+		Name:   repo2,
+		Path:   path.Join(helper.ProvisioningPath, "repo2"),
+		Target: "folder",
+		Copies: map[string]string{
+			"testdata/timeline-demo.json": "dashboard2.json",
+		},
+		ExpectedDashboards: 2, // Total across both repos
+		ExpectedFolders:    2, // Total across both repos
+	})
+
+	// Test: Pull job should fail when trying to manage resources owned by another repository
+	t.Run("pull job should fail when trying to manage resources owned by another repository", func(t *testing.T) {
+		// Step 1: Try to add a file with the same UID as repo1's dashboard to repo2's directory
+		// This simulates a scenario where repo2 tries to manage a resource that repo1 already owns
+		const allPanelsUID = "n1jR8vnnz" // UID from all-panels.json (owned by repo1)
+
+		// Copy the same file (same UID) to repo2's directory to create ownership conflict
+		conflictingFilePath := "repo2/conflicting-dashboard.json"
+		helper.CopyToProvisioningPath(t, "testdata/all-panels.json", conflictingFilePath)
+		printFileTree(t, helper.ProvisioningPath)
+
+		// Step 2: Try to pull repo2 - should fail due to ownership conflict
+		job := helper.TriggerJobAndWaitForComplete(t, repo2, provisioning.JobSpec{
+			Action: provisioning.JobActionPull,
+			Pull:   &provisioning.SyncJobOptions{},
+		})
+
+		// Step 3: Verify the job failed with ownership conflict error
+		jobObj := &provisioning.Job{}
+		err := runtime.DefaultUnstructuredConverter.FromUnstructured(job.Object, jobObj)
+		require.NoError(t, err)
+
+		// The job completes with "warning" state instead of "error" state when it doesn't have too many errors
+		t.Logf("Job state: %s", jobObj.Status.State)
+		t.Logf("Job errors: %v", jobObj.Status.Errors)
+
+		require.Equal(t, provisioning.JobStateWarning, jobObj.Status.State, "job should complete with warnings due to ownership conflicts")
+		require.NotEmpty(t, jobObj.Status.Errors, "should have error details")
+
+		// Check that error mentions ownership conflict
+		found := false
+		for _, errMsg := range jobObj.Status.Errors {
+			t.Logf("Error message: %s", errMsg)
+			if assert.Contains(t, errMsg, fmt.Sprintf("managed by repo '%s'", repo1)) &&
+				assert.Contains(t, errMsg, fmt.Sprintf("cannot be modified by repo '%s'", repo2)) {
+				found = true
+				break
+			}
+		}
+		require.True(t, found, "should have ownership conflict error")
+
+		// Step 4: Verify original resource is still owned by repo1 and unchanged
+		originalDashboard, err := helper.DashboardsV1.Resource.Get(ctx, allPanelsUID, metav1.GetOptions{})
+		require.NoError(t, err, "original dashboard should still exist")
+		require.Equal(t, repo1, originalDashboard.GetAnnotations()[utils.AnnoKeyManagerIdentity], "ownership should remain with repo1")
+
+		// Clean up the conflicting file for subsequent tests
+		err = os.Remove(filepath.Join(helper.ProvisioningPath, conflictingFilePath))
+		require.NoError(t, err, "should clean up conflicting file")
+	})
+
+	// Test: Repositories should not delete resources owned by other repositories during pull
+	t.Run("repositories should not delete resources owned by other repositories during pull", func(t *testing.T) {
+		// Both repositories were created with their own resources (repo1 has all-panels.json, repo2 has timeline-demo.json)
+		// Verify that pulling one repository doesn't affect the other's resources
+
+		// Step 1: Verify both repositories have their own resources
+		const allPanelsUID = "n1jR8vnnz" // UID from all-panels.json (repo1)
+		const timelineUID = "mIJjFy8Kz"  // UID from timeline-demo.json (repo2)
+
+		repo1Dashboard, err := helper.DashboardsV1.Resource.Get(ctx, allPanelsUID, metav1.GetOptions{})
+		require.NoError(t, err, "repo1's dashboard should exist")
+		require.Equal(t, repo1, repo1Dashboard.GetAnnotations()[utils.AnnoKeyManagerIdentity], "should be owned by repo1")
+
+		repo2Dashboard, err := helper.DashboardsV1.Resource.Get(ctx, timelineUID, metav1.GetOptions{})
+		require.NoError(t, err, "repo2's dashboard should exist")
+		require.Equal(t, repo2, repo2Dashboard.GetAnnotations()[utils.AnnoKeyManagerIdentity], "should be owned by repo2")
+
+		// Step 2: Pull repo1 (which doesn't manage repo2's resource) - should complete successfully
+		helper.SyncAndWait(t, repo1, nil)
+
+		// Step 3: Verify that repo2's resource is still intact after repo1's pull
+		persistentRepo2Dashboard, err := helper.DashboardsV1.Resource.Get(ctx, timelineUID, metav1.GetOptions{})
+		require.NoError(t, err, "repo2's dashboard should still exist after repo1 pull")
+		require.Equal(t, repo2, persistentRepo2Dashboard.GetAnnotations()[utils.AnnoKeyManagerIdentity], "ownership should remain with repo2")
+		require.Equal(t, repo2Dashboard.GetResourceVersion(), persistentRepo2Dashboard.GetResourceVersion(), "repo2's resource should not be modified by repo1 pull")
+
+		// Step 4: Pull repo2 and verify repo1's resource is still intact
+		helper.SyncAndWait(t, repo2, nil)
+
+		persistentRepo1Dashboard, err := helper.DashboardsV1.Resource.Get(ctx, allPanelsUID, metav1.GetOptions{})
+		require.NoError(t, err, "repo1's dashboard should still exist after repo2 pull")
+		require.Equal(t, repo1, persistentRepo1Dashboard.GetAnnotations()[utils.AnnoKeyManagerIdentity], "ownership should remain with repo1")
+		require.Equal(t, repo1Dashboard.GetResourceVersion(), persistentRepo1Dashboard.GetResourceVersion(), "repo1's resource should not be modified by repo2 pull")
+	})
+}

From 5007f362f3eb21e6611abb22185fe25ed1d7abb1 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 15 Aug 2025 10:58:50 +0300
Subject: [PATCH 195/243] Chore: fix flakey secure value test (#109724)

---
 pkg/storage/unified/apistore/secure_test.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/storage/unified/apistore/secure_test.go b/pkg/storage/unified/apistore/secure_test.go
index 89408121a67..d9df5de79ca 100644
--- a/pkg/storage/unified/apistore/secure_test.go
+++ b/pkg/storage/unified/apistore/secure_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"slices"
 	"testing"
 
 	"github.com/stretchr/testify/mock"
@@ -48,6 +49,7 @@ func TestSecureLifecycle(t *testing.T) {
 		err := prepareSecureValues(context.Background(), secureStore, obj, nil, info)
 		require.NoError(t, err)
 		require.True(t, info.hasChanged)
+		slices.Sort(info.createdSecureValues) // keep a predictable order
 		require.Equal(t, []string{"NameForA", "NameForB"}, info.createdSecureValues)
 		secure, err := obj.GetSecureValues()
 		require.NoError(t, err)

From d4395aeec33fcaf2deef77d3278035586f0a5b3a Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Fri, 15 Aug 2025 11:48:06 +0300
Subject: [PATCH 196/243] Chore: Use cli.Context instead of background context
 in RunServer function (#109553)

Use cli.Context instead of background context in RunServer function
---
 pkg/cmd/grafana-server/commands/cli.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkg/cmd/grafana-server/commands/cli.go b/pkg/cmd/grafana-server/commands/cli.go
index 57083f93fd2..8850132105f 100644
--- a/pkg/cmd/grafana-server/commands/cli.go
+++ b/pkg/cmd/grafana-server/commands/cli.go
@@ -106,15 +106,13 @@ func RunServer(opts standalone.BuildInfo, cli *cli.Context) error {
 
 	metrics.SetBuildInformation(metrics.ProvideRegisterer(), opts.Version, opts.Commit, opts.BuildBranch, getBuildstamp(opts))
 
-	ctx := context.Background()
-
 	// Initialize the OpenFeature feature flag system
 	if err := featuremgmt.InitOpenFeatureWithCfg(cfg); err != nil {
 		return err
 	}
 
 	s, err := server.Initialize(
-		ctx,
+		cli.Context,
 		cfg,
 		server.Options{
 			PidFile:     PidFile,
@@ -128,7 +126,7 @@ func RunServer(opts standalone.BuildInfo, cli *cli.Context) error {
 		return err
 	}
 
-	go listenToSystemSignals(ctx, s)
+	go listenToSystemSignals(cli.Context, s)
 	return s.Run()
 }
 

From 2f96801218430c2fd25efb718e43b0eea74081c8 Mon Sep 17 00:00:00 2001
From: "grafana-pr-automation[bot]"
 <140550294+grafana-pr-automation[bot]@users.noreply.github.com>
Date: Fri, 15 Aug 2025 10:54:06 +0000
Subject: [PATCH 197/243] I18n: Download translations from Crowdin (#109715)

New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 public/locales/cs-CZ/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/de-DE/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/es-ES/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/fr-FR/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/hu-HU/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/id-ID/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/it-IT/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/ja-JP/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/ko-KR/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/nl-NL/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/pl-PL/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/pt-BR/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/pt-PT/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/ru-RU/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/sv-SE/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/tr-TR/grafana.json   | 69 ++++++++++++++++++-----------
 public/locales/zh-Hans/grafana.json | 69 ++++++++++++++++++-----------
 public/locales/zh-Hant/grafana.json | 69 ++++++++++++++++++-----------
 18 files changed, 774 insertions(+), 468 deletions(-)

diff --git a/public/locales/cs-CZ/grafana.json b/public/locales/cs-CZ/grafana.json
index e5191728bc1..1fa39d98edf 100644
--- a/public/locales/cs-CZ/grafana.json
+++ b/public/locales/cs-CZ/grafana.json
@@ -1256,20 +1256,6 @@
       "copy-code": "Kopírovat kód",
       "download": "Stáhnout"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Pravidlo výstrahy",
-        "all": "Vše",
-        "error": "Chyba",
-        "firing": "Spuštěno",
-        "no-data": "Žádná data",
-        "normal": "Normální",
-        "ok": "OK",
-        "pending": "Nevyřízeno",
-        "recording-rule": "Pravidlo nahrávání",
-        "recovering": "Probíhá obnovení"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "seznam filtrovaných pravidel"
     },
@@ -2614,12 +2600,28 @@
       "delete-rule": {
         "success": "Pravidlo bylo úspěšně odstraněno"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Hodnocení pravidla bylo pozastaveno"
       },
       "resume-rule": {
         "success": "Hodnocení pravidla bylo obnoveno"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Pravidlo bylo úspěšně aktualizováno"
       }
@@ -2627,20 +2629,29 @@
     "rules-filter": {
       "clear-filters": "Vymazat filtry",
       "configured-alert-rules": "Zdroje dat obsahující nakonfigurovaná pravidla výstrah jsou zdroje dat Mimir nebo Loki, kde jsou pravidla výstrah uložena a vyhodnocena přímo ve zdroji dat.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Nástěnka",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Nápověda pro hledání podle zdrojů dat",
       "filter-options": {
-        "aria-label-show-filters": "Zobrazit filtry",
-        "label-custom-filter": "Vlastní filtr",
-        "label-saved-searches": "Uložená hledání"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Kondice",
       "label": {
         "hide": "Skrýt",
         "show": "Zobrazit"
       },
       "manage-alerts": "V těchto zdrojích dat můžete prostřednictvím uživatelského rozhraní upozorňování vybrat možnost Správa upozorňování. Odtud můžete spravovat tato pravidla výstrah v uživatelském rozhraní Grafana i ve zdroji dat, kde byla nakonfigurována.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Všechny zdroje dat",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Pravidla pluginu",
       "rule-type": "Typ pravidla",
       "rulesSearchInput-placeholder-search": "Hledat",
@@ -2655,9 +2666,6 @@
       "text-federated": "Federované",
       "text-provisioned": "Zajištěno"
     },
-    "saved-searches": {
-      "text-default": "Výchozí"
-    },
     "search": {
       "property": {
         "data-source": "Zdroj dat",
@@ -2665,11 +2673,10 @@
         "labels": "Štítky",
         "namespace": "Složka / jmenný prostor",
         "rule-health": "Kondice",
-        "rule-name": "Název pravidla výstrahy",
+        "rule-name": "",
         "rule-type": "Typ",
         "state": "Stav"
-      },
-      "save-query": "Uložit současné hledání"
+      }
     },
     "search-field-input": {
       "clear": "Vymazat",
@@ -4132,10 +4139,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Použít",
     "cancel": "Zrušit",
     "clear": "Vymazat",
-    "close": "Zavřít",
     "collapse": "Sbalit",
     "edit": "Upravit",
     "help": "Nápověda",
@@ -6625,6 +6632,9 @@
         "hosted-graphite-prometheus-and-loki": "Hostuje Graphite, Prometheus a Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Zrušit",
       "placeholder-filter-by-name-or-type": "Filtrovat podle názvu nebo typu"
@@ -7913,7 +7923,8 @@
       "edit-pane": {
         "go-back": "Přejít zpět"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9106,6 +9117,7 @@
       "sign-up": "Registrovat se"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Přetažením změníte pořadí",
@@ -11330,7 +11342,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Zpět na úložiště",
-      "repository-config-exists-configuration": "Ujistěte se, že konfigurace úložiště existuje v konfiguračním souboru."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Ujistěte se, že konfigurace úložiště existuje v konfiguračním souboru.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Uložit",
@@ -11528,6 +11542,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Zdroje nyní najdete ve svém externím úložišti a jsou zajištěny ve vaší instanci. Od nynějška budou vaše instance a externí úložiště synchronizovány.",
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 773e3bf16fa..240c290546e 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -1244,20 +1244,6 @@
       "copy-code": "Code kopieren",
       "download": "Download"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Warnregel",
-        "all": "Alle",
-        "error": "Fehler",
-        "firing": "Auslösung",
-        "no-data": "Keine Daten",
-        "normal": "Normal",
-        "ok": "OK",
-        "pending": "Ausstehend",
-        "recording-rule": "Aufnahmeregel",
-        "recovering": "Wird wiederhergestellt"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "gefilterte Regelliste"
     },
@@ -2588,12 +2574,28 @@
       "delete-rule": {
         "success": "Regel erfolgreich gelöscht"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Regelevaluierung pausiert"
       },
       "resume-rule": {
         "success": "Regelevaluierung fortgesetzt"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Regel erfolgreich aktualisiert"
       }
@@ -2601,20 +2603,29 @@
     "rules-filter": {
       "clear-filters": "Filter zurücksetzen",
       "configured-alert-rules": "Datenquellen mit konfigurierten Warnregeln sind Mimir- oder Loki-Datenquellen, wobei die Warnregeln in der Datenquelle selbst gespeichert und bewertet werden.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Dashboard",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Hilfe für Suche nach Datenquellen",
       "filter-options": {
-        "aria-label-show-filters": "Filter anzeigen",
-        "label-custom-filter": "Benutzerdefinierter Filter",
-        "label-saved-searches": "Gespeicherte Suchen"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Zustand",
       "label": {
         "hide": "Ausblenden",
         "show": "Anzeigen"
       },
       "manage-alerts": "In diesen Datenquellen können Sie über die Alerting-Benutzeroberfläche „Warnungen verwalten“ auswählen, um diese Warnregeln sowohl in der Grafana-Benutzeroberfläche als auch in der Datenquelle, in der sie konfiguriert wurden, verwalten zu können.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Alle Datenquellen",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Plugin-Regeln",
       "rule-type": "Regelart",
       "rulesSearchInput-placeholder-search": "Suche",
@@ -2629,9 +2640,6 @@
       "text-federated": "Verbunden",
       "text-provisioned": "Bereitgestellt"
     },
-    "saved-searches": {
-      "text-default": "Standard"
-    },
     "search": {
       "property": {
         "data-source": "Datenquelle",
@@ -2639,11 +2647,10 @@
         "labels": "Labels",
         "namespace": "Ordner / Namensraum",
         "rule-health": "Zustand",
-        "rule-name": "Name der Warnregel",
+        "rule-name": "",
         "rule-type": "Typ",
         "state": "Status"
-      },
-      "save-query": "Aktuelle Suche speichern"
+      }
     },
     "search-field-input": {
       "clear": "Löschen",
@@ -4096,10 +4103,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Anwenden",
     "cancel": "Abbrechen",
     "clear": "Löschen",
-    "close": "Schließen",
     "collapse": "Einklappen",
     "edit": "Bearbeiten",
     "help": "Hilfe",
@@ -6583,6 +6590,9 @@
         "hosted-graphite-prometheus-and-loki": "Hosted Graphite, Prometheus und Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Abbrechen",
       "placeholder-filter-by-name-or-type": "Nach Name oder Typ filtern"
@@ -7871,7 +7881,8 @@
       "edit-pane": {
         "go-back": "Zurückgehen"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9060,6 +9071,7 @@
       "sign-up": "Registrieren"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Ziehen und Ablegen zum Neuordnen",
@@ -11260,7 +11272,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Zurück zu den Repositorys",
-      "repository-config-exists-configuration": "Achten Sie darauf, dass die Repository-config in der Konfigurationsdatei vorhanden ist."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Achten Sie darauf, dass die Repository-config in der Konfigurationsdatei vorhanden ist.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Speichern",
@@ -11458,6 +11472,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Ihre Ressourcen befinden sich jetzt in Ihrem externen Speicher und werden in Ihrer Instanz bereitgestellt. Von nun an werden Ihre Instanz und der externe Speicher synchronisiert.",
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index 14c106de1e6..66adde7b8ce 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -1244,20 +1244,6 @@
       "copy-code": "Copiar código",
       "download": "Descargar"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Regla de alerta",
-        "all": "Todo",
-        "error": "Error",
-        "firing": "Activada",
-        "no-data": "Sin datos",
-        "normal": "Normal",
-        "ok": "Aceptar",
-        "pending": "Pendiente",
-        "recording-rule": "Registrando regla",
-        "recovering": "En recuperación"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "lista-reglas-filtradas"
     },
@@ -2588,12 +2574,28 @@
       "delete-rule": {
         "success": "Regla eliminada correctamente"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Evaluación de reglas en pausa"
       },
       "resume-rule": {
         "success": "Evaluación de reglas reanudada"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Regla actualizada correctamente"
       }
@@ -2601,20 +2603,29 @@
     "rules-filter": {
       "clear-filters": "Borrar filtros",
       "configured-alert-rules": "Las fuentes de datos que contienen reglas de alerta configuradas son fuentes de datos Mimir o Loki donde las reglas de alerta se almacenan y evalúan en la propia fuente de datos.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Panel de control",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Ayuda para buscar por fuentes de datos",
       "filter-options": {
-        "aria-label-show-filters": "Mostrar filtros",
-        "label-custom-filter": "Filtro personalizado",
-        "label-saved-searches": "Búsquedas guardadas"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Salud",
       "label": {
         "hide": "Ocultar",
         "show": "Mostrar"
       },
       "manage-alerts": "En estas fuentes de datos, puedes seleccionar Gestionar alertas a través de la interfaz de usuario de Alerting para poder administrar estas reglas de alerta en la interfaz de usuario de Grafana, así como en la fuente de datos donde se configuraron.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Todas las fuentes de datos",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Reglas del plugin",
       "rule-type": "Tipo de regla",
       "rulesSearchInput-placeholder-search": "Buscar",
@@ -2629,9 +2640,6 @@
       "text-federated": "Federado",
       "text-provisioned": "Provisionado"
     },
-    "saved-searches": {
-      "text-default": "Por defecto"
-    },
     "search": {
       "property": {
         "data-source": "Fuente de datos",
@@ -2639,11 +2647,10 @@
         "labels": "Etiquetas",
         "namespace": "Carpeta/espacio de nombre",
         "rule-health": "Salud",
-        "rule-name": "Nombre de la regla de alerta",
+        "rule-name": "",
         "rule-type": "Tipo",
         "state": "Estado"
-      },
-      "save-query": "Guardar búsqueda actual"
+      }
     },
     "search-field-input": {
       "clear": "Borrar",
@@ -4096,10 +4103,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Aplicar",
     "cancel": "Cancelar",
     "clear": "Borrar",
-    "close": "Cerrar",
     "collapse": "Contraer",
     "edit": "Editar",
     "help": "Ayuda",
@@ -6583,6 +6590,9 @@
         "hosted-graphite-prometheus-and-loki": "Graphite, Prometheus y Loki alojados"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Cancelar",
       "placeholder-filter-by-name-or-type": "Filtrar por nombre o tipo"
@@ -7871,7 +7881,8 @@
       "edit-pane": {
         "go-back": "Volver"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9060,6 +9071,7 @@
       "sign-up": "Regístrate"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Arrastrar y soltar para reordenar",
@@ -11260,7 +11272,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Volver a los repositorios",
-      "repository-config-exists-configuration": "Asegúrate de que la configuración del repositorio exista en el archivo de configuración."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Asegúrate de que la configuración del repositorio exista en el archivo de configuración.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Guardar",
@@ -11458,6 +11472,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Tus recursos están ahora en tu almacenamiento externo y aprovisionados en tu instancia. A partir de ahora, tu instancia y el almacenamiento externo estarán sincronizados.",
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 47935428416..7d755fbc70e 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -1244,20 +1244,6 @@
       "copy-code": "Copier le code",
       "download": "Télécharger"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Règle d'alerte",
-        "all": "Tout",
-        "error": "Erreur",
-        "firing": "Déclenchement",
-        "no-data": "Aucune donnée",
-        "normal": "Normal",
-        "ok": "OK",
-        "pending": "En attente",
-        "recording-rule": "Règle d'enregistrement",
-        "recovering": "En récupération"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "liste-de-règles-filtrées"
     },
@@ -2588,12 +2574,28 @@
       "delete-rule": {
         "success": "Règle supprimée avec succès"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Évaluation de la règle suspendue"
       },
       "resume-rule": {
         "success": "Évaluation de la règle reprise"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Règle mise à jour avec succès"
       }
@@ -2601,20 +2603,29 @@
     "rules-filter": {
       "clear-filters": "Supprimer les filtres",
       "configured-alert-rules": "Les sources de données contenant des règles d’alerte configurées sont des sources de données Mimir ou Loki où les règles d’alerte sont stockées et évaluées dans la source de données elle-même.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Tableau de bord",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Aide à la recherche par sources de données",
       "filter-options": {
-        "aria-label-show-filters": "Afficher les filtres",
-        "label-custom-filter": "Filtre personnalisé",
-        "label-saved-searches": "Recherches enregistrées"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Santé",
       "label": {
         "hide": "Masquer",
         "show": "Afficher"
       },
       "manage-alerts": "Dans ces sources de données, vous pouvez sélectionner Gérer les alertes via l’interface utilisateur d’alerte pour pouvoir gérer ces règles d’alerte dans l’interface utilisateur Grafana, ainsi que dans la source de données où elles ont été configurées.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Toutes les sources de données",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Règles de plugin",
       "rule-type": "Type de règle",
       "rulesSearchInput-placeholder-search": "Rechercher",
@@ -2629,9 +2640,6 @@
       "text-federated": "Fédéré",
       "text-provisioned": "Mis en service"
     },
-    "saved-searches": {
-      "text-default": "Par défaut"
-    },
     "search": {
       "property": {
         "data-source": "Source de données",
@@ -2639,11 +2647,10 @@
         "labels": "Étiquettes",
         "namespace": "Dossier/Espace de noms",
         "rule-health": "Santé",
-        "rule-name": "Nom de la règle d'alerte",
+        "rule-name": "",
         "rule-type": "Type",
         "state": "État"
-      },
-      "save-query": "Enregistrer la recherche courante"
+      }
     },
     "search-field-input": {
       "clear": "Effacer",
@@ -4096,10 +4103,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Appliquer",
     "cancel": "Annuler",
     "clear": "Effacer",
-    "close": "Fermer",
     "collapse": "Réduire",
     "edit": "Modifier",
     "help": "Aide",
@@ -6583,6 +6590,9 @@
         "hosted-graphite-prometheus-and-loki": "Graphite, Prometheus et Loki hébergés"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Annuler",
       "placeholder-filter-by-name-or-type": "Filtrer par nom ou par type"
@@ -7871,7 +7881,8 @@
       "edit-pane": {
         "go-back": "Retour"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9060,6 +9071,7 @@
       "sign-up": "Inscription"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Glisser et déposer pour réorganiser",
@@ -11260,7 +11272,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Retour aux référentiels",
-      "repository-config-exists-configuration": "Assurez-vous que la configuration du référentiel existe dans le fichier de configuration."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Assurez-vous que la configuration du référentiel existe dans le fichier de configuration.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Enregistrer",
@@ -11458,6 +11472,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Vos ressources sont maintenant dans votre stockage externe et mises en service dans votre instance. À partir de maintenant, votre instance et le stockage externe seront synchronisés.",
diff --git a/public/locales/hu-HU/grafana.json b/public/locales/hu-HU/grafana.json
index df5109229fd..79d14e41eef 100644
--- a/public/locales/hu-HU/grafana.json
+++ b/public/locales/hu-HU/grafana.json
@@ -1244,20 +1244,6 @@
       "copy-code": "Kód másolása",
       "download": "Letöltés"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Riasztási szabály",
-        "all": "Összes",
-        "error": "Hiba",
-        "firing": "Aktív",
-        "no-data": "Nincs adat",
-        "normal": "Normál",
-        "ok": "OK",
-        "pending": "Függőben",
-        "recording-rule": "Felvételi szabály",
-        "recovering": "Helyreállítás"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "szűrt-szabálylista"
     },
@@ -2588,12 +2574,28 @@
       "delete-rule": {
         "success": "Szabály törlése sikeres"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Szabályértékelés szüneteltetve"
       },
       "resume-rule": {
         "success": "Szabályértékelés folytatva"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Szabály sikeresen frissítve"
       }
@@ -2601,20 +2603,29 @@
     "rules-filter": {
       "clear-filters": "Szűrők törlése",
       "configured-alert-rules": "A konfigurált riasztási szabályokat tartalmazó adatforrások a Mimir- vagy Loki-adatforrások, ahol a riasztási szabályokat magában az adatforrásban tárolja és értékeli a rendszer.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Irányítópult",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Adatforrások alapján történő keresés súgója",
       "filter-options": {
-        "aria-label-show-filters": "Szűrők megjelenítése",
-        "label-custom-filter": "Egyéni szűrő",
-        "label-saved-searches": "Mentett keresések"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Állapot",
       "label": {
         "hide": "Elrejtés",
         "show": "Megjelenítés"
       },
       "manage-alerts": "Ezekben az adatforrásokban kiválaszthatja a Riasztások kezelése az Alerting felületén keresztül lehetőséget, hogy kezelhesse ezeket a riasztási szabályokat a Grafana kezelőfelületén, valamint abban az adatforrásban, ahol konfigurálták őket.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Összes adatforrás",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Bővítményszabályok",
       "rule-type": "Szabálytípus",
       "rulesSearchInput-placeholder-search": "Keresés",
@@ -2629,9 +2640,6 @@
       "text-federated": "Összevont",
       "text-provisioned": "Kiépítve"
     },
-    "saved-searches": {
-      "text-default": "Alapértelmezett"
-    },
     "search": {
       "property": {
         "data-source": "Adatforrás",
@@ -2639,11 +2647,10 @@
         "labels": "Címkék",
         "namespace": "Mappa/névtér",
         "rule-health": "Állapot",
-        "rule-name": "Riasztási szabály neve",
+        "rule-name": "",
         "rule-type": "Típus",
         "state": "Állapot"
-      },
-      "save-query": "Aktuális keresés mentése"
+      }
     },
     "search-field-input": {
       "clear": "Törlés",
@@ -4096,10 +4103,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Alkalmaz",
     "cancel": "Mégse",
     "clear": "Törlés",
-    "close": "Bezárás",
     "collapse": "Összecsukás",
     "edit": "Szerkesztés",
     "help": "Súgó",
@@ -6583,6 +6590,9 @@
         "hosted-graphite-prometheus-and-loki": "Üzemeltetett Graphite, Prometheus és Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Mégse",
       "placeholder-filter-by-name-or-type": "Szűrés név vagy típus alapján"
@@ -7871,7 +7881,8 @@
       "edit-pane": {
         "go-back": "Visszalépés"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9060,6 +9071,7 @@
       "sign-up": "Regisztráció"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Húzza át az átrendezéshez",
@@ -11260,7 +11272,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Vissza az adattárakhoz",
-      "repository-config-exists-configuration": "Győződjön meg arról, hogy a tároló konfigurációja létezik a konfigurációs fájlban."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Győződjön meg arról, hogy a tároló konfigurációja létezik a konfigurációs fájlban.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Mentés",
@@ -11458,6 +11472,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Az erőforrások most a külső tárolóban vannak, és ki lettek építve a példányba. Mostantól a rendszer szinkronizálja a példányt és a külső tárolót.",
diff --git a/public/locales/id-ID/grafana.json b/public/locales/id-ID/grafana.json
index c26ae218127..65c93fa1cc8 100644
--- a/public/locales/id-ID/grafana.json
+++ b/public/locales/id-ID/grafana.json
@@ -1238,20 +1238,6 @@
       "copy-code": "Salin kode",
       "download": "Unduh"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Aturan peringatan",
-        "all": "Semua",
-        "error": "Kesalahan",
-        "firing": "Dipicu",
-        "no-data": "Tidak ada data",
-        "normal": "Normal",
-        "ok": "OK",
-        "pending": "Tertunda",
-        "recording-rule": "Aturan pencatatan",
-        "recovering": "Memulihkan"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "filtered-rule-list"
     },
@@ -2575,12 +2561,28 @@
       "delete-rule": {
         "success": "Aturan berhasil dihapus"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Evaluasi aturan dijeda"
       },
       "resume-rule": {
         "success": "Evaluasi aturan dilanjutkan"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Aturan berhasil diperbarui"
       }
@@ -2588,20 +2590,29 @@
     "rules-filter": {
       "clear-filters": "Hapus filter",
       "configured-alert-rules": "Sumber data yang berisi aturan peringatan yang dikonfigurasi adalah sumber data Mimir atau Loki tempat aturan peringatan disimpan dan dievaluasi dalam sumber data itu sendiri.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Dasbor",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Cari berdasarkan bantuan sumber data",
       "filter-options": {
-        "aria-label-show-filters": "Tampilkan filter",
-        "label-custom-filter": "Filter kustom",
-        "label-saved-searches": "Pencarian tersimpan"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Kesehatan",
       "label": {
         "hide": "Sembunyikan",
         "show": "Tampilkan"
       },
       "manage-alerts": "Dalam sumber data ini, Anda dapat memilih Kelola peringatan melalui UI Alerting untuk dapat mengelola aturan peringatan ini di UI Grafana serta di sumber data tempat mereka dikonfigurasi.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Semua sumber data",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Aturan plugin",
       "rule-type": "Jenis aturan",
       "rulesSearchInput-placeholder-search": "Cari",
@@ -2616,9 +2627,6 @@
       "text-federated": "Federasi",
       "text-provisioned": "Disediakan"
     },
-    "saved-searches": {
-      "text-default": "Default"
-    },
     "search": {
       "property": {
         "data-source": "Sumber data",
@@ -2626,11 +2634,10 @@
         "labels": "Label",
         "namespace": "Folder / Ruang nama",
         "rule-health": "Kesehatan",
-        "rule-name": "Nama aturan Alerting",
+        "rule-name": "",
         "rule-type": "Jenis",
         "state": "Status"
-      },
-      "save-query": "Simpan pencarian saat ini"
+      }
     },
     "search-field-input": {
       "clear": "Hapus",
@@ -4078,10 +4085,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Terapkan",
     "cancel": "Batalkan",
     "clear": "Hapus",
-    "close": "Tutup",
     "collapse": "Ciutkan",
     "edit": "Edit",
     "help": "Bantuan",
@@ -6562,6 +6569,9 @@
         "hosted-graphite-prometheus-and-loki": "Graphite, Prometheus, dan Loki yang di-hosting"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Batalkan",
       "placeholder-filter-by-name-or-type": "Filter berdasarkan nama atau jenis"
@@ -7850,7 +7860,8 @@
       "edit-pane": {
         "go-back": "Kembali"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9037,6 +9048,7 @@
       "sign-up": "Daftar"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Seret dan lepas untuk menyusun ulang",
@@ -11225,7 +11237,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Kembali ke repositori",
-      "repository-config-exists-configuration": "Pastikan konfigurasi repositori ada dalam file konfigurasi."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Pastikan konfigurasi repositori ada dalam file konfigurasi.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Simpan",
@@ -11423,6 +11437,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Sumber daya Anda sekarang berada di penyimpanan eksternal dan disediakan ke instans Anda. Mulai sekarang, instans Anda dan penyimpanan eksternal akan disinkronkan.",
diff --git a/public/locales/it-IT/grafana.json b/public/locales/it-IT/grafana.json
index aa5f1230f91..efb18cf2b4a 100644
--- a/public/locales/it-IT/grafana.json
+++ b/public/locales/it-IT/grafana.json
@@ -1244,20 +1244,6 @@
       "copy-code": "Copia codice",
       "download": "Scarica"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Regola avviso",
-        "all": "Tutti",
-        "error": "Errore",
-        "firing": "In attivazione",
-        "no-data": "Nessun dato",
-        "normal": "Normale",
-        "ok": "OK",
-        "pending": "In sospeso",
-        "recording-rule": "Regola di registrazione",
-        "recovering": "Recupero in corso"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "elenco-regole-filtrate"
     },
@@ -2588,12 +2574,28 @@
       "delete-rule": {
         "success": "Regola eliminata correttamente"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Valutazione della regola sospesa"
       },
       "resume-rule": {
         "success": "Valutazione della regola ripresa"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Regola aggiornata con successo"
       }
@@ -2601,20 +2603,29 @@
     "rules-filter": {
       "clear-filters": "Cancella i filtri",
       "configured-alert-rules": "Le origini dei dati contenenti regole di avviso configurate sono origini dati Mimir o Loki in cui le regole di avviso vengono archiviate e valutate nell'origine dei dati stessa.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Dashboard",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Guida per la ricerca in base alle fonti dei dati",
       "filter-options": {
-        "aria-label-show-filters": "Mostra filtri",
-        "label-custom-filter": "Filtro personalizzato",
-        "label-saved-searches": "Ricerche salvate"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Stato",
       "label": {
         "hide": "Nascondi",
         "show": "Mostra"
       },
       "manage-alerts": "In queste origini dei dati, è possibile selezionare Gestisci avvisi tramite l'interfaccia utente di avviso per poter gestire queste regole di avviso nell'interfaccia utente di Grafana e nell'origine dei dati in cui sono state configurate.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Tutte le fonti dei dati",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Regole dei componenti aggiuntivi",
       "rule-type": "Tipo di regola",
       "rulesSearchInput-placeholder-search": "Cerca",
@@ -2629,9 +2640,6 @@
       "text-federated": "Federato",
       "text-provisioned": "Fornito"
     },
-    "saved-searches": {
-      "text-default": "Predefinito"
-    },
     "search": {
       "property": {
         "data-source": "Sorgente dati",
@@ -2639,11 +2647,10 @@
         "labels": "Etichette",
         "namespace": "Cartella/Spazio dei nomi",
         "rule-health": "Stato",
-        "rule-name": "Nome della regola di avviso",
+        "rule-name": "",
         "rule-type": "Tipo",
         "state": "Stato"
-      },
-      "save-query": "Salva ricerca corrente"
+      }
     },
     "search-field-input": {
       "clear": "Cancella",
@@ -4096,10 +4103,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Applica",
     "cancel": "Annulla",
     "clear": "Cancella",
-    "close": "Chiudi",
     "collapse": "Riduci",
     "edit": "Modifica",
     "help": "Guida",
@@ -6583,6 +6590,9 @@
         "hosted-graphite-prometheus-and-loki": "Graphite, Prometheus e Loki in hosting"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Annulla",
       "placeholder-filter-by-name-or-type": "Filtra per nome o tipo"
@@ -7871,7 +7881,8 @@
       "edit-pane": {
         "go-back": "Torna indietro"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9060,6 +9071,7 @@
       "sign-up": "Registrati"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Trascina e rilascia per riordinare",
@@ -11260,7 +11272,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Torna ai repository",
-      "repository-config-exists-configuration": "Assicurati che la configurazione del repository esista nel file di configurazione."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Assicurati che la configurazione del repository esista nel file di configurazione.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Salva",
@@ -11458,6 +11472,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Le tue risorse sono ora nella tua memoria esterna e fornite nella tua istanza. D'ora in poi, l'istanza e la memoria esterna saranno sincronizzate.",
diff --git a/public/locales/ja-JP/grafana.json b/public/locales/ja-JP/grafana.json
index 2a8f9b10885..ac8a71b1a7e 100644
--- a/public/locales/ja-JP/grafana.json
+++ b/public/locales/ja-JP/grafana.json
@@ -1238,20 +1238,6 @@
       "copy-code": "コードをコピー",
       "download": "ダウンロード"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "アラートルール",
-        "all": "すべて",
-        "error": "エラー",
-        "firing": "発生中",
-        "no-data": "データなし",
-        "normal": "通常",
-        "ok": "OK",
-        "pending": "保留",
-        "recording-rule": "録画ルール",
-        "recovering": "復元中"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "フィルター済みルールリスト"
     },
@@ -2575,12 +2561,28 @@
       "delete-rule": {
         "success": "正常に削除されました"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "ルール評価が一時停止しました"
       },
       "resume-rule": {
         "success": "ルール評価が再開されました"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "ルールの更新に成功しました"
       }
@@ -2588,20 +2590,29 @@
     "rules-filter": {
       "clear-filters": "フィルタをクリア",
       "configured-alert-rules": "アラートルールが設定されているデータソースは、MimirまたはLokiデータソースで、アラートルールはデータソース自体に保存され評価されます。",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "ダッシュボード",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "データソースで検索ヘルプ",
       "filter-options": {
-        "aria-label-show-filters": "フィルターを表示",
-        "label-custom-filter": "カスタムフィルター",
-        "label-saved-searches": "保存済みの検索"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "健康",
       "label": {
         "hide": "非表示",
         "show": "表示"
       },
       "manage-alerts": "これらのデータソースでは、「アラートUI経由で管理」を選択すると、Grafana UIとアラートルールが設定されたデータソースの両方でこれらのアラートルールを管理できます。",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "すべてのデータソース",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "プラグインルール",
       "rule-type": "ルールタイプ",
       "rulesSearchInput-placeholder-search": "検索",
@@ -2616,9 +2627,6 @@
       "text-federated": "フェデレーション",
       "text-provisioned": "プロビジョニング済み"
     },
-    "saved-searches": {
-      "text-default": "初期設定"
-    },
     "search": {
       "property": {
         "data-source": "データソース",
@@ -2626,11 +2634,10 @@
         "labels": "ラベル",
         "namespace": "フォルダ/名前空間",
         "rule-health": "健康",
-        "rule-name": "アラートルール名",
+        "rule-name": "",
         "rule-type": "タイプ",
         "state": "ステート"
-      },
-      "save-query": "現在の検索を保存"
+      }
     },
     "search-field-input": {
       "clear": "消去",
@@ -4078,10 +4085,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "適用",
     "cancel": "キャンセル",
     "clear": "消去",
-    "close": "閉じる",
     "collapse": "折りたたみ表示",
     "edit": "編集",
     "help": "ヘルプ",
@@ -6562,6 +6569,9 @@
         "hosted-graphite-prometheus-and-loki": "Hosted Graphite、Prometheus、Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "キャンセル",
       "placeholder-filter-by-name-or-type": "名前または種類で絞り込む"
@@ -7850,7 +7860,8 @@
       "edit-pane": {
         "go-back": "戻る"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9037,6 +9048,7 @@
       "sign-up": "サインアップ"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "ドラッグアンドドロップで並べ替え",
@@ -11225,7 +11237,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "リポジトリに戻る",
-      "repository-config-exists-configuration": "リポジトリ設定が設定ファイルに含まれていることを確認してください。"
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "リポジトリ設定が設定ファイルに含まれていることを確認してください。",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "保存",
@@ -11423,6 +11437,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "リソースが外部ストレージに保存され、インスタンスにプロビジョニングされました。今後、インスタンスと外部ストレージは同期されます。",
diff --git a/public/locales/ko-KR/grafana.json b/public/locales/ko-KR/grafana.json
index 3c565ba3ef3..e57a49e67dd 100644
--- a/public/locales/ko-KR/grafana.json
+++ b/public/locales/ko-KR/grafana.json
@@ -1238,20 +1238,6 @@
       "copy-code": "코드 복사",
       "download": "다운로드"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "경고 규칙",
-        "all": "전체",
-        "error": "오류",
-        "firing": "발생 중",
-        "no-data": "데이터 없음",
-        "normal": "정상",
-        "ok": "확인",
-        "pending": "보류 중",
-        "recording-rule": "기록 규칙",
-        "recovering": "복구 중"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "필터링된-규칙-목록"
     },
@@ -2575,12 +2561,28 @@
       "delete-rule": {
         "success": "규칙 삭제 완료"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "규칙 평가 일시 중지됨"
       },
       "resume-rule": {
         "success": "규칙 평가 재개됨"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "규칙 업데이트됨"
       }
@@ -2588,20 +2590,29 @@
     "rules-filter": {
       "clear-filters": "필터 초기화",
       "configured-alert-rules": "구성된 경고 규칙을 포함하는 데이터 소스는 경고 규칙이 데이터 소스 자체에 저장되고 평가되는 Mimir 또는 Loki 데이터 소스입니다.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "대시보드",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "데이터 소스로 검색 도움말",
       "filter-options": {
-        "aria-label-show-filters": "필터 표시",
-        "label-custom-filter": "사용자 지정 필터",
-        "label-saved-searches": "저장된 검색"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "상태",
       "label": {
         "hide": "숨기기",
         "show": "표시"
       },
       "manage-alerts": "이러한 데이터 소스에서 경고 UI를 통해 '경고 관리'를 선택하면 Grafana UI와 경고 규칙이 구성된 데이터 소스에서 이러한 경고 규칙을 관리할 수 있습니다.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "모든 데이터 소스",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "플러그인 규칙",
       "rule-type": "규칙 유형",
       "rulesSearchInput-placeholder-search": "검색",
@@ -2616,9 +2627,6 @@
       "text-federated": "연합됨",
       "text-provisioned": "프로비저닝됨"
     },
-    "saved-searches": {
-      "text-default": "기본값"
-    },
     "search": {
       "property": {
         "data-source": "데이터 소스",
@@ -2626,11 +2634,10 @@
         "labels": "라벨",
         "namespace": "폴더 / 네임스페이스",
         "rule-health": "상태",
-        "rule-name": "경고 규칙 이름",
+        "rule-name": "",
         "rule-type": "유형",
         "state": "상태"
-      },
-      "save-query": "현재 검색 저장"
+      }
     },
     "search-field-input": {
       "clear": "초기화",
@@ -4078,10 +4085,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "적용",
     "cancel": "취소",
     "clear": "초기화",
-    "close": "닫기",
     "collapse": "접기",
     "edit": "편집",
     "help": "도움말",
@@ -6562,6 +6569,9 @@
         "hosted-graphite-prometheus-and-loki": "호스팅된 Graphite, Prometheus, Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "취소",
       "placeholder-filter-by-name-or-type": "이름 또는 유형으로 필터링"
@@ -7850,7 +7860,8 @@
       "edit-pane": {
         "go-back": "뒤로 가기"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9037,6 +9048,7 @@
       "sign-up": "회원 가입"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "드래그 앤 드롭으로 순서 변경",
@@ -11225,7 +11237,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "리포지토리로 돌아가기",
-      "repository-config-exists-configuration": "리포지토리 구성이 구성 파일에 있는지 확인하세요."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "리포지토리 구성이 구성 파일에 있는지 확인하세요.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "저장",
@@ -11423,6 +11437,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "이제 리소스가 외부 스토리지에 있으며 인스턴스에 프로비저닝됩니다. 이제부터 인스턴스와 외부 스토리지가 동기화됩니다.",
diff --git a/public/locales/nl-NL/grafana.json b/public/locales/nl-NL/grafana.json
index 77aa8b01d30..f0e600e4cd6 100644
--- a/public/locales/nl-NL/grafana.json
+++ b/public/locales/nl-NL/grafana.json
@@ -1244,20 +1244,6 @@
       "copy-code": "Kopieer code",
       "download": "Downloaden"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Waarschuwingsregel",
-        "all": "Alle",
-        "error": "Fout",
-        "firing": "Geactiveerd",
-        "no-data": "Geen gegevens",
-        "normal": "Normaal",
-        "ok": "OK",
-        "pending": "In afwachting",
-        "recording-rule": "Opnameregel",
-        "recovering": "Herstellen"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "gefilterde-regels-lijst"
     },
@@ -2588,12 +2574,28 @@
       "delete-rule": {
         "success": "Regel is verwijderd"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Regelevaluatie is gepauzeerd"
       },
       "resume-rule": {
         "success": "Regelevaluatie is hervat"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Regel is aangepast"
       }
@@ -2601,20 +2603,29 @@
     "rules-filter": {
       "clear-filters": "Filters wissen",
       "configured-alert-rules": "Gegevensbronnen met geconfigureerde waarschuwingsregels zijn Mimir- of Loki-gegevensbronnen waar waarschuwingsregels worden opgeslagen en geëvalueerd in de gegevensbron zelf.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Dashboard",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Zoeken op hulp bij gegevensbronnen",
       "filter-options": {
-        "aria-label-show-filters": "Filters tonen",
-        "label-custom-filter": "Aangepaste filter",
-        "label-saved-searches": "Opgeslagen zoekopdrachten"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Gezondheid",
       "label": {
         "hide": "Verbergen",
         "show": "Tonen"
       },
       "manage-alerts": "In deze gegevensbronnen kun je waarschuwingen beheren via de waarschuwingsinterface om deze waarschuwingsregels te kunnen beheren in de Grafana-gebruikersinterface en in de gegevensbron waar ze zijn geconfigureerd.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Alle gegevensbronnen",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Plug-inregels",
       "rule-type": "Regeltype",
       "rulesSearchInput-placeholder-search": "Zoeken",
@@ -2629,9 +2640,6 @@
       "text-federated": "Federatief",
       "text-provisioned": "Provisioned"
     },
-    "saved-searches": {
-      "text-default": "Standaard"
-    },
     "search": {
       "property": {
         "data-source": "Gegevensbron",
@@ -2639,11 +2647,10 @@
         "labels": "Labels",
         "namespace": "Map/Naamruimte",
         "rule-health": "Gezondheid",
-        "rule-name": "Naam waarschuwingsregel",
+        "rule-name": "",
         "rule-type": "Type",
         "state": "Status"
-      },
-      "save-query": "Huidige zoekopdracht opslaan"
+      }
     },
     "search-field-input": {
       "clear": "Wissen",
@@ -4096,10 +4103,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Toepassen",
     "cancel": "Annuleren",
     "clear": "Wissen",
-    "close": "Sluiten",
     "collapse": "Samenvouwen",
     "edit": "Bewerken",
     "help": "Help",
@@ -6583,6 +6590,9 @@
         "hosted-graphite-prometheus-and-loki": "Gehost Graphite, Prometheus en Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Annuleren",
       "placeholder-filter-by-name-or-type": "Filteren op naam of type"
@@ -7871,7 +7881,8 @@
       "edit-pane": {
         "go-back": "Ga terug"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9060,6 +9071,7 @@
       "sign-up": "Registreren"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Versleep om opnieuw te rangschikken",
@@ -11260,7 +11272,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Terug naar repositories",
-      "repository-config-exists-configuration": "Zorg ervoor dat de repository-configuratie in het configuratiebestand bestaat."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Zorg ervoor dat de repository-configuratie in het configuratiebestand bestaat.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Opslaan",
@@ -11458,6 +11472,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Je bronnen bevinden zich nu in je externe opslag en zijn ingericht in je instantie. Vanaf nu worden je instantie en de externe opslag gesynchroniseerd.",
diff --git a/public/locales/pl-PL/grafana.json b/public/locales/pl-PL/grafana.json
index 25487e1489e..31d91d16bfb 100644
--- a/public/locales/pl-PL/grafana.json
+++ b/public/locales/pl-PL/grafana.json
@@ -1256,20 +1256,6 @@
       "copy-code": "Kopiuj kod",
       "download": "Pobierz"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Reguła alertu",
-        "all": "Wszystkie",
-        "error": "Błąd",
-        "firing": "Uruchamianie",
-        "no-data": "Brak danych",
-        "normal": "Normalny",
-        "ok": "OK",
-        "pending": "Oczekujący",
-        "recording-rule": "Reguła rejestracji",
-        "recovering": "Przywracanie"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "filtrowana lista reguł"
     },
@@ -2614,12 +2600,28 @@
       "delete-rule": {
         "success": "Reguła usunięta poprawnie"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Ocena reguły wstrzymana"
       },
       "resume-rule": {
         "success": "Ocena reguły wznowiona"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Reguła zaktualizowana pomyślnie"
       }
@@ -2627,20 +2629,29 @@
     "rules-filter": {
       "clear-filters": "Wyczyść filtry",
       "configured-alert-rules": "Źródła danych zawierające skonfigurowane reguły alertów to źródła danych Mimir lub Loki, w przypadku których reguły alertów są przechowywane i oceniane w samym źródle danych.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Pulpit",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Wyszukiwanie według źródeł danych – pomoc",
       "filter-options": {
-        "aria-label-show-filters": "Pokaż filtry",
-        "label-custom-filter": "Filtr niestandardowy",
-        "label-saved-searches": "Zapisane wyszukiwania"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Zdrowie",
       "label": {
         "hide": "Ukryj",
         "show": "Pokaż"
       },
       "manage-alerts": "W tych źródłach danych możesz wybrać „Zarządzaj alertami za pośrednictwem interfejsu alertów”, aby móc zarządzać tymi regułami alertów w interfejsie Grafany, a także w źródle danych, w którym zostały skonfigurowane.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Wszystkie źródła danych",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Reguły dotyczące wtyczek",
       "rule-type": "Typ reguły",
       "rulesSearchInput-placeholder-search": "Szukaj",
@@ -2655,9 +2666,6 @@
       "text-federated": "Federacja",
       "text-provisioned": "Po aprowizacji"
     },
-    "saved-searches": {
-      "text-default": "Domyślny"
-    },
     "search": {
       "property": {
         "data-source": "Źródło danych",
@@ -2665,11 +2673,10 @@
         "labels": "Etykiety",
         "namespace": "Folder / przestrzeń nazw",
         "rule-health": "Zdrowie",
-        "rule-name": "Nazwa reguły alertu",
+        "rule-name": "",
         "rule-type": "Typ",
         "state": "Stan"
-      },
-      "save-query": "Zapisz bieżące wyszukiwanie"
+      }
     },
     "search-field-input": {
       "clear": "Wyczyść",
@@ -4132,10 +4139,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Zastosuj",
     "cancel": "Anuluj",
     "clear": "Wyczyść",
-    "close": "Zamknij",
     "collapse": "Zwiń",
     "edit": "Edytuj",
     "help": "Pomoc",
@@ -6625,6 +6632,9 @@
         "hosted-graphite-prometheus-and-loki": "Hostowane systemy Graphite, Prometheus i Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Anuluj",
       "placeholder-filter-by-name-or-type": "Filtruj według nazwy lub typu"
@@ -7913,7 +7923,8 @@
       "edit-pane": {
         "go-back": "Wróć"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9106,6 +9117,7 @@
       "sign-up": "Zarejestruj się"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Przeciągnij i upuść, aby zmienić kolejność",
@@ -11330,7 +11342,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Wróć do repozytoriów",
-      "repository-config-exists-configuration": "Upewnij się, że konfiguracja repozytorium istnieje w pliku konfiguracyjnym."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Upewnij się, że konfiguracja repozytorium istnieje w pliku konfiguracyjnym.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Zapisz",
@@ -11528,6 +11542,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Zasoby znajdują się teraz w zewnętrznej pamięci masowej i są udostępniane w instancji. Od teraz Twoja instancja i zewnętrzna pamięć masowa będą zsynchronizowane.",
diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json
index 541d85332c1..aa8ff990931 100644
--- a/public/locales/pt-BR/grafana.json
+++ b/public/locales/pt-BR/grafana.json
@@ -1244,20 +1244,6 @@
       "copy-code": "Copiar código",
       "download": "Baixar"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Regra de alerta",
-        "all": "Tudo",
-        "error": "Erro",
-        "firing": "Ativo",
-        "no-data": "Sem dados",
-        "normal": "Normal",
-        "ok": "OK",
-        "pending": "Pendente",
-        "recording-rule": "Regra de registro",
-        "recovering": "Recuperando"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "filtered-rule-list"
     },
@@ -2588,12 +2574,28 @@
       "delete-rule": {
         "success": "Regra excluída"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Avaliação de regra pausada"
       },
       "resume-rule": {
         "success": "Avaliação de regra retomada"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Regra atualizada"
       }
@@ -2601,20 +2603,29 @@
     "rules-filter": {
       "clear-filters": "Limpar filtros",
       "configured-alert-rules": "As fontes de dados que contêm regras de alerta configuradas são fontes de dados Mimir ou Loki, nas quais as regras de alerta são armazenadas e avaliadas na própria fonte de dados.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Painel de controle",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Ajuda para pesquisar por fontes de dados",
       "filter-options": {
-        "aria-label-show-filters": "Exibir filtros",
-        "label-custom-filter": "Filtro personalizado",
-        "label-saved-searches": "Pesquisas salvas"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Integridade",
       "label": {
         "hide": "Ocultar",
         "show": "Exibir"
       },
       "manage-alerts": "Nessas fontes de dados, você pode selecionar Gerenciar alertas via Interface de Envio de Alertas para gerenciar essas regras de alerta na interface da Grafana, bem como na fonte de dados onde foram configuradas.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Todas as fontes de dados",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Regras de plug-in",
       "rule-type": "Tipo de regra",
       "rulesSearchInput-placeholder-search": "Pesquisar",
@@ -2629,9 +2640,6 @@
       "text-federated": "Federado",
       "text-provisioned": "Provisionado"
     },
-    "saved-searches": {
-      "text-default": "Padrão"
-    },
     "search": {
       "property": {
         "data-source": "Fonte de dados",
@@ -2639,11 +2647,10 @@
         "labels": "Etiquetas",
         "namespace": "Pasta/Nomenclatura",
         "rule-health": "Integridade",
-        "rule-name": "Nome da regra de alerta",
+        "rule-name": "",
         "rule-type": "Tipo",
         "state": "Estado"
-      },
-      "save-query": "Salvar pesquisa atual"
+      }
     },
     "search-field-input": {
       "clear": "Limpar",
@@ -4096,10 +4103,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Aplicar",
     "cancel": "Cancelar",
     "clear": "Limpar",
-    "close": "Fechar",
     "collapse": "Recolher",
     "edit": "Editar",
     "help": "Ajuda",
@@ -6583,6 +6590,9 @@
         "hosted-graphite-prometheus-and-loki": "Graphite, Prometheus e Loki hospedados"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Cancelar",
       "placeholder-filter-by-name-or-type": "Filtrar por nome ou tipo"
@@ -7871,7 +7881,8 @@
       "edit-pane": {
         "go-back": "Voltar"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9060,6 +9071,7 @@
       "sign-up": "Inscreva-se"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Arraste e solte para reordenar",
@@ -11260,7 +11272,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Voltar para os repositórios",
-      "repository-config-exists-configuration": "Verifique se a configuração do repositório existe no arquivo de configuração."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Verifique se a configuração do repositório existe no arquivo de configuração.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Salvar",
@@ -11458,6 +11472,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Seus recursos estão agora no seu armazenamento externo e foram provisionados na sua instância. A partir de agora, sua instância e o armazenamento externo serão sincronizados.",
diff --git a/public/locales/pt-PT/grafana.json b/public/locales/pt-PT/grafana.json
index 11216f50b18..0deefd6e90a 100644
--- a/public/locales/pt-PT/grafana.json
+++ b/public/locales/pt-PT/grafana.json
@@ -1244,20 +1244,6 @@
       "copy-code": "Copiar código",
       "download": "Transferir"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Regra de alerta",
-        "all": "Todos",
-        "error": "Erro",
-        "firing": "Ativado",
-        "no-data": "Sem dados",
-        "normal": "Normal",
-        "ok": "OK",
-        "pending": "Pendente",
-        "recording-rule": "Regra de gravação",
-        "recovering": "A recuperar"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "lista de regras filtradas"
     },
@@ -2588,12 +2574,28 @@
       "delete-rule": {
         "success": "Regra eliminada com sucesso"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Avaliação de regra pausada"
       },
       "resume-rule": {
         "success": "Avaliação de regra retomada"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Regra atualizada com sucesso"
       }
@@ -2601,20 +2603,29 @@
     "rules-filter": {
       "clear-filters": "Limpar filtros",
       "configured-alert-rules": "As origens de dados que contêm regras de alerta configuradas são origens de dados Mimir ou Loki onde as regras de alerta são armazenadas e avaliadas na própria origem de dados.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Painel de controlo",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Ajuda para pesquisar por origens de dados",
       "filter-options": {
-        "aria-label-show-filters": "Mostrar filtros",
-        "label-custom-filter": "Filtro personalizado",
-        "label-saved-searches": "Pesquisas guardadas"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Saúde",
       "label": {
         "hide": "Ocultar",
         "show": "Mostrar"
       },
       "manage-alerts": "Nestas origens de dados, pode selecionar Gerir alertas através da interface do utilizador Alerting para poder gerir estas regras de alerta na interface do utilizador Grafana, bem como na origem de dados onde foram configuradas.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Todas as origens de dados",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Regras de plugin",
       "rule-type": "Tipo de regra",
       "rulesSearchInput-placeholder-search": "Pesquisar",
@@ -2629,9 +2640,6 @@
       "text-federated": "Federado",
       "text-provisioned": "Aprovisionado"
     },
-    "saved-searches": {
-      "text-default": "Predefinição"
-    },
     "search": {
       "property": {
         "data-source": "Origem dos dados",
@@ -2639,11 +2647,10 @@
         "labels": "Etiquetas",
         "namespace": "Pasta/Espaço de nomes",
         "rule-health": "Saúde",
-        "rule-name": "Nome da regra de alerta",
+        "rule-name": "",
         "rule-type": "Tipo",
         "state": "Estado"
-      },
-      "save-query": "Guardar a pesquisa atual"
+      }
     },
     "search-field-input": {
       "clear": "Limpar",
@@ -4096,10 +4103,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Aplicar",
     "cancel": "Cancelar",
     "clear": "Limpar",
-    "close": "Fechar",
     "collapse": "Recolher",
     "edit": "Editar",
     "help": "Ajuda",
@@ -6583,6 +6590,9 @@
         "hosted-graphite-prometheus-and-loki": "Graphite, Prometheus e Loki hospedados"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Cancelar",
       "placeholder-filter-by-name-or-type": "Filtrar por nome ou tipo"
@@ -7871,7 +7881,8 @@
       "edit-pane": {
         "go-back": "Voltar"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9060,6 +9071,7 @@
       "sign-up": "Registe-se"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Arrastar e largar para reordenar",
@@ -11260,7 +11272,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Voltar aos repositórios",
-      "repository-config-exists-configuration": "Certifique-se de que a configuração do repositório existe no ficheiro de configuração."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Certifique-se de que a configuração do repositório existe no ficheiro de configuração.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Guardar",
@@ -11458,6 +11472,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Os seus recursos estão agora no seu armazenamento externo e aprovisionados na sua instância. A partir de agora, a sua instância e o armazenamento externo serão sincronizados.",
diff --git a/public/locales/ru-RU/grafana.json b/public/locales/ru-RU/grafana.json
index ca155804315..a63197e85eb 100644
--- a/public/locales/ru-RU/grafana.json
+++ b/public/locales/ru-RU/grafana.json
@@ -1256,20 +1256,6 @@
       "copy-code": "Копировать код",
       "download": "Загрузить"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Правило оповещения",
-        "all": "Все",
-        "error": "Ошибка",
-        "firing": "Активно",
-        "no-data": "Нет данных",
-        "normal": "Нормальное",
-        "ok": "OK",
-        "pending": "Ожидание",
-        "recording-rule": "Правило записи",
-        "recovering": "Восстановление"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "список-отфильтрованных-правил"
     },
@@ -2614,12 +2600,28 @@
       "delete-rule": {
         "success": "Правило удалено"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Оценка правила приостановлена"
       },
       "resume-rule": {
         "success": "Оценка правила возобновлена"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Правило обновлено"
       }
@@ -2627,20 +2629,29 @@
     "rules-filter": {
       "clear-filters": "Очистить фильтры",
       "configured-alert-rules": "Источники данных, содержащие настроенные правила оповещений принадлежат к источникам Mimir или Loki, где правила оповещения хранятся и оцениваются в самом источнике данных.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Дашборд",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Справка по поиску по источникам данных",
       "filter-options": {
-        "aria-label-show-filters": "Показать фильтры",
-        "label-custom-filter": "Пользовательский фильтр",
-        "label-saved-searches": "Сохраненные поиски"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Работоспособность",
       "label": {
         "hide": "Скрыть",
         "show": "Показать"
       },
       "manage-alerts": "В этих источниках данных можно выбрать параметр «Управление оповещениями через пользовательский интерфейс Alerting», чтобы иметь возможность управлять этими правилами оповещения в пользовательском интерфейсе Grafana, а также в источнике данных, где они были установлены.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Все источники данных",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Правила плагинов",
       "rule-type": "Тип правила",
       "rulesSearchInput-placeholder-search": "Поиск",
@@ -2655,9 +2666,6 @@
       "text-federated": "Федеративная",
       "text-provisioned": "Подготовлено"
     },
-    "saved-searches": {
-      "text-default": "По умолчанию"
-    },
     "search": {
       "property": {
         "data-source": "Источник данных",
@@ -2665,11 +2673,10 @@
         "labels": "Метки",
         "namespace": "Папка / пространство имен",
         "rule-health": "Работоспособность",
-        "rule-name": "Имя правила оповещения",
+        "rule-name": "",
         "rule-type": "Тип",
         "state": "Состояние"
-      },
-      "save-query": "Сохранить текущий поиск"
+      }
     },
     "search-field-input": {
       "clear": "Очистить",
@@ -4132,10 +4139,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Применить",
     "cancel": "Отмена",
     "clear": "Очистить",
-    "close": "Закрыть",
     "collapse": "Свернуть",
     "edit": "Редактировать",
     "help": "Справка",
@@ -6625,6 +6632,9 @@
         "hosted-graphite-prometheus-and-loki": "Hosted Graphite, Prometheus и Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Отмена",
       "placeholder-filter-by-name-or-type": "Фильтр по названию или типу"
@@ -7913,7 +7923,8 @@
       "edit-pane": {
         "go-back": "Назад"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9106,6 +9117,7 @@
       "sign-up": "Зарегистрироваться"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Перетащить для изменения порядка",
@@ -11330,7 +11342,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Назад к репозиториям",
-      "repository-config-exists-configuration": "Убедитесь, что конфигурация репозитория существует в файле конфигурации."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Убедитесь, что конфигурация репозитория существует в файле конфигурации.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Сохранить",
@@ -11528,6 +11542,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Теперь ваши ресурсы находятся во внешнем хранилище и подготовлены для вашего экземпляра. С этого момента ваш экземпляр и внешнее хранилище будут синхронизироваться.",
diff --git a/public/locales/sv-SE/grafana.json b/public/locales/sv-SE/grafana.json
index e6334c52b39..779c6496df6 100644
--- a/public/locales/sv-SE/grafana.json
+++ b/public/locales/sv-SE/grafana.json
@@ -1244,20 +1244,6 @@
       "copy-code": "Kopiera kod",
       "download": "Ladda ner"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Varningsregel",
-        "all": "Alla",
-        "error": "Fel",
-        "firing": "Utlöst",
-        "no-data": "Inga data",
-        "normal": "Normal ",
-        "ok": "OK",
-        "pending": "Väntande",
-        "recording-rule": "Inspelningsregel",
-        "recovering": "Återställer"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "filtrerad regellista"
     },
@@ -2588,12 +2574,28 @@
       "delete-rule": {
         "success": "Regeln har raderats"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Regelutvärdering pausad"
       },
       "resume-rule": {
         "success": "Regelutvärdering återupptagen"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Regeln uppdaterades"
       }
@@ -2601,20 +2603,29 @@
     "rules-filter": {
       "clear-filters": "Rensa filter",
       "configured-alert-rules": "Datakällor som innehåller konfigurerade larmregler är Mimir- eller Loki-datakällor där larmregler lagras och utvärderas i själva datakällan.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Instrumentpanel",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Hjälp för sökning efter datakällor",
       "filter-options": {
-        "aria-label-show-filters": "Visa filter",
-        "label-custom-filter": "Anpassa filter",
-        "label-saved-searches": "Sparade sökningar"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Hälsa",
       "label": {
         "hide": "Dölj",
         "show": "Visa"
       },
       "manage-alerts": "I dessa datakällor kan du välja Hantera larm via larmgränssnittet för att kunna hantera dessa larmregler i Grafana-gränssnittet samt i datakällan där de konfigurerades.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Alla datakällor",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Tilläggsregler",
       "rule-type": "Typ av regel",
       "rulesSearchInput-placeholder-search": "Sök",
@@ -2629,9 +2640,6 @@
       "text-federated": "Federerade",
       "text-provisioned": "Provisionerad"
     },
-    "saved-searches": {
-      "text-default": "Standard"
-    },
     "search": {
       "property": {
         "data-source": "Datakälla",
@@ -2639,11 +2647,10 @@
         "labels": "Etiketter",
         "namespace": "Mapp/namnområde",
         "rule-health": "Hälsa",
-        "rule-name": "Namn för varningsregel",
+        "rule-name": "",
         "rule-type": "Typ",
         "state": "Tillstånd"
-      },
-      "save-query": "Spara aktuell sökning"
+      }
     },
     "search-field-input": {
       "clear": "Rensa",
@@ -4096,10 +4103,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Tillämpa",
     "cancel": "Avbryt",
     "clear": "Rensa",
-    "close": "Stäng",
     "collapse": "Minimera",
     "edit": "Redigera",
     "help": "Hjälp",
@@ -6583,6 +6590,9 @@
         "hosted-graphite-prometheus-and-loki": "Hosted Graphite, Prometheus och Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "Avbryt",
       "placeholder-filter-by-name-or-type": "Filtrera efter namn eller typ"
@@ -7871,7 +7881,8 @@
       "edit-pane": {
         "go-back": "Tillbaka"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9060,6 +9071,7 @@
       "sign-up": "Registrera dig"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Ändra ordning genom dra och släpp",
@@ -11260,7 +11272,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Tillbaka till lagringsplatserna",
-      "repository-config-exists-configuration": "Verifiera att lagringsplatskonfigurationen finns i konfigurationsfilen."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Verifiera att lagringsplatskonfigurationen finns i konfigurationsfilen.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Spara",
@@ -11458,6 +11472,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Dina resurser finns nu i din externa lagring och provisioneras till din instans. Från och med nu kommer din instans och den externa lagringen att synkroniseras.",
diff --git a/public/locales/tr-TR/grafana.json b/public/locales/tr-TR/grafana.json
index 30a087df251..e1b34771801 100644
--- a/public/locales/tr-TR/grafana.json
+++ b/public/locales/tr-TR/grafana.json
@@ -1244,20 +1244,6 @@
       "copy-code": "Kodu kopyala",
       "download": "İndir"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "Uyarı kuralı",
-        "all": "Tümü",
-        "error": "Hata",
-        "firing": "Tetikleme",
-        "no-data": "Veri yok",
-        "normal": "Normal",
-        "ok": "Tamam",
-        "pending": "Bekliyor",
-        "recording-rule": "Kayıt kuralı",
-        "recovering": "Geri yükleniyor"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "filtrelenmiş-kural-listesi"
     },
@@ -2588,12 +2574,28 @@
       "delete-rule": {
         "success": "Kural başarıyla silindi"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "Kural değerlendirmesi duraklatıldı"
       },
       "resume-rule": {
         "success": "Kural değerlendirmesi devam ettirildi"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "Kural başarıyla güncellendi"
       }
@@ -2601,20 +2603,29 @@
     "rules-filter": {
       "clear-filters": "Filtreleri temizle",
       "configured-alert-rules": "Yapılandırılmış uyarı kurallarını içeren veri kaynakları, uyarı kurallarının kaydedilip değerlendirildiği Mimir veya Loki veri kaynaklarıdır.",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "Pano",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "Veri kaynaklarına göre arama yardımı",
       "filter-options": {
-        "aria-label-show-filters": "Filtreleri göster",
-        "label-custom-filter": "Özel filtre",
-        "label-saved-searches": "Kayıtlı aramalar"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "Sağlık",
       "label": {
         "hide": "Gizle",
         "show": "Göster"
       },
       "manage-alerts": "Bu veri kaynaklarında hem Grafana arayüzünde hem de yapılandırıldıkları veri kaynağında bu uyarı kurallarını yönetebilmek için \"Uyarı Yönetimi\" arayüzü üzerinden yönetimi seçebilirsiniz.",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "Tüm veri kaynakları",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "Eklenti kuralları",
       "rule-type": "Kural türü",
       "rulesSearchInput-placeholder-search": "Ara",
@@ -2629,9 +2640,6 @@
       "text-federated": "Şirket dışı",
       "text-provisioned": "Sağlanan"
     },
-    "saved-searches": {
-      "text-default": "Varsayılan"
-    },
     "search": {
       "property": {
         "data-source": "Veri kaynağı",
@@ -2639,11 +2647,10 @@
         "labels": "Etiketler",
         "namespace": "Klasör/Ad alanı",
         "rule-health": "Sağlık",
-        "rule-name": "Uyarı kuralı adı",
+        "rule-name": "",
         "rule-type": "Tür",
         "state": "Durum"
-      },
-      "save-query": "Mevcut aramayı kaydet"
+      }
     },
     "search-field-input": {
       "clear": "Temizle",
@@ -4096,10 +4103,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "Uygula",
     "cancel": "İptal",
     "clear": "Temizle",
-    "close": "Kapat",
     "collapse": "Daralt",
     "edit": "Düzenle",
     "help": "Yardım",
@@ -6583,6 +6590,9 @@
         "hosted-graphite-prometheus-and-loki": "Barındırılan Graphite, Prometheus ve Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "İptal",
       "placeholder-filter-by-name-or-type": "Ada veya türe göre filtrele"
@@ -7871,7 +7881,8 @@
       "edit-pane": {
         "go-back": "Geri dön"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9060,6 +9071,7 @@
       "sign-up": "Kaydol"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "Yeniden düzenlemek için sürükleyip bırakın",
@@ -11260,7 +11272,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "Depolara geri dön",
-      "repository-config-exists-configuration": "Depo yapılandırmasının yapılandırma dosyasında mevcut olduğundan emin olun."
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "Depo yapılandırmasının yapılandırma dosyasında mevcut olduğundan emin olun.",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "Kaydet",
@@ -11458,6 +11472,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "Kaynaklarınız artık harici depolamanızda ve örneğinize sağlanmış durumda. Şu andan itibaren örneğiniz ve harici depolama senkronize edilecektir.",
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 0fc9a785e15..9b6bea0ce32 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -1238,20 +1238,6 @@
       "copy-code": "复制代码",
       "download": "下载"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "提醒规则",
-        "all": "全部",
-        "error": "错误",
-        "firing": "触发中",
-        "no-data": "没有数据",
-        "normal": "正常",
-        "ok": "好",
-        "pending": "待处理",
-        "recording-rule": "录制规则",
-        "recovering": "正在恢复"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "筛选规则列表"
     },
@@ -2575,12 +2561,28 @@
       "delete-rule": {
         "success": "规则已成功删除"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "规则评估已暂停"
       },
       "resume-rule": {
         "success": "规则评估已恢复"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "规则已成功更新"
       }
@@ -2588,20 +2590,29 @@
     "rules-filter": {
       "clear-filters": "清除筛选器",
       "configured-alert-rules": "包含已配置警报规则的数据源是 Mimir 或 Loki 数据源，其中警报规则在数据源中存储和评估。",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "仪表板",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "按数据源帮助搜索",
       "filter-options": {
-        "aria-label-show-filters": "显示筛选器",
-        "label-custom-filter": "自定义筛选器",
-        "label-saved-searches": "保存的搜索"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "健康",
       "label": {
         "hide": "隐藏",
         "show": "显示"
       },
       "manage-alerts": "在这些数据源中，您可以选择通过警报用户界面管理警报，以便能够在 Grafana 用户界面以及在其配置所在的数据源中管理这些警报规则。",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "所有数据源",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "插件规则",
       "rule-type": "规则类型",
       "rulesSearchInput-placeholder-search": "搜索",
@@ -2616,9 +2627,6 @@
       "text-federated": "联合",
       "text-provisioned": "已预置"
     },
-    "saved-searches": {
-      "text-default": "默认"
-    },
     "search": {
       "property": {
         "data-source": "数据源",
@@ -2626,11 +2634,10 @@
         "labels": "标签",
         "namespace": "文件夹/命名空间",
         "rule-health": "健康",
-        "rule-name": "提醒规则名称",
+        "rule-name": "",
         "rule-type": "类型",
         "state": "状态"
-      },
-      "save-query": "保存当前搜索"
+      }
     },
     "search-field-input": {
       "clear": "清除",
@@ -4078,10 +4085,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "应用",
     "cancel": "取消",
     "clear": "清除",
-    "close": "关闭",
     "collapse": "收起",
     "edit": "编辑",
     "help": "帮助",
@@ -6562,6 +6569,9 @@
         "hosted-graphite-prometheus-and-loki": "托管 Graphite、Prometheus 和 Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "取消",
       "placeholder-filter-by-name-or-type": "按名称或类型筛选"
@@ -7850,7 +7860,8 @@
       "edit-pane": {
         "go-back": "返回"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9037,6 +9048,7 @@
       "sign-up": "注册"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "拖放以重新排序",
@@ -11225,7 +11237,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "回到存储库",
-      "repository-config-exists-configuration": "确保存储库配置存在于配置文件中。"
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "确保存储库配置存在于配置文件中。",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "保存",
@@ -11423,6 +11437,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "您的资源现在位于外部存储中，并预配到您的实例中。从现在开始，您的实例和外部存储将被同步。",
diff --git a/public/locales/zh-Hant/grafana.json b/public/locales/zh-Hant/grafana.json
index 927242a037c..bb76f7d6bb5 100644
--- a/public/locales/zh-Hant/grafana.json
+++ b/public/locales/zh-Hant/grafana.json
@@ -1238,20 +1238,6 @@
       "copy-code": "複製代碼",
       "download": "下載"
     },
-    "filter-options": {
-      "label": {
-        "alert-rule": "警報規則",
-        "all": "全部",
-        "error": "錯誤",
-        "firing": "觸發",
-        "no-data": "沒有資料",
-        "normal": "一般",
-        "ok": "確定",
-        "pending": "待處理",
-        "recording-rule": "錄製規則",
-        "recovering": "正在還原"
-      }
-    },
     "filter-view-results": {
       "aria-label-filteredrulelist": "filtered-rule-list"
     },
@@ -2575,12 +2561,28 @@
       "delete-rule": {
         "success": "已成功刪除規則"
       },
+      "health": {
+        "error": "",
+        "no-data": "",
+        "ok": ""
+      },
       "pause-rule": {
         "success": "規則評估已暫停"
       },
       "resume-rule": {
         "success": "規則評估已恢復"
       },
+      "state": {
+        "firing": "",
+        "normal": "",
+        "pending": "",
+        "recovering": "",
+        "unknown": ""
+      },
+      "type": {
+        "alert": "",
+        "recording": ""
+      },
       "update-rule": {
         "success": "已成功更新規則"
       }
@@ -2588,20 +2590,29 @@
     "rules-filter": {
       "clear-filters": "清除篩選",
       "configured-alert-rules": "包含已設定警報規則的資料來源是 Mimir 或 Loki 資料來源，其中警報規則儲存在資料來源本身並進行評估。",
+      "contact-point-tooltip": "",
+      "contact-point-tooltip-title": "",
       "dashboard": "儀表板",
       "data-source-picker-inline-help-title-search-by-data-sources-help": "按資料來源搜尋說明",
       "filter-options": {
-        "aria-label-show-filters": "顯示篩選條件",
-        "label-custom-filter": "自訂篩選條件",
-        "label-saved-searches": "搜尋紀錄"
+        "aria-label": "",
+        "aria-label-show-filters": "",
+        "placeholder-namespace": "",
+        "placeholder-search-input": ""
       },
+      "grafana-folder": "",
       "health": "使用情況",
       "label": {
         "hide": "隱藏",
         "show": "顯示"
       },
       "manage-alerts": "在這些資料來源中，您可以選擇透過警報 UI 管理警報，以便在 Grafana UI 以及在其設定的資料來源中管理這些警報規則。",
+      "no-groups": "",
+      "no-namespaces": "",
       "placeholder-all-data-sources": "所有資料來源",
+      "placeholder-contact-point": "",
+      "placeholder-data-sources": "",
+      "placeholder-labels": "",
       "plugin-rules": "外掛程式規則",
       "rule-type": "規則類型",
       "rulesSearchInput-placeholder-search": "搜尋",
@@ -2616,9 +2627,6 @@
       "text-federated": "聯合",
       "text-provisioned": "已佈建"
     },
-    "saved-searches": {
-      "text-default": "預設值"
-    },
     "search": {
       "property": {
         "data-source": "資料來源",
@@ -2626,11 +2634,10 @@
         "labels": "標籤",
         "namespace": "資料夾／命名空間",
         "rule-health": "使用情況",
-        "rule-name": "警報規則名稱",
+        "rule-name": "",
         "rule-type": "類型",
         "state": "狀態"
-      },
-      "save-query": "儲存目前的搜尋"
+      }
     },
     "search-field-input": {
       "clear": "清除",
@@ -4078,10 +4085,10 @@
     }
   },
   "common": {
+    "all": "",
     "apply": "套用",
     "cancel": "取消",
     "clear": "清除",
-    "close": "關閉",
     "collapse": "收闔",
     "edit": "編輯",
     "help": "說明",
@@ -6562,6 +6569,9 @@
         "hosted-graphite-prometheus-and-loki": "托管 Graphite, Prometheus 和 Loki"
       }
     },
+    "list": {
+      "starred": ""
+    },
     "new-data-source-view": {
       "cancel": "取消",
       "placeholder-filter-by-name-or-type": "按名稱或類型篩選"
@@ -7850,7 +7860,8 @@
       "edit-pane": {
         "go-back": "返回"
       }
-    }
+    },
+    "select-group": ""
   },
   "grafana-data": {
     "valueFormats": {
@@ -9037,6 +9048,7 @@
       "sign-up": "註冊"
     }
   },
+  "label-dropdown-info": "",
   "layers": {
     "layer-drag-drop-list": {
       "draggable-aria-label": "拖放以重新排序",
@@ -11225,7 +11237,9 @@
     },
     "file-history-page": {
       "back-to-repositories": "返回至儲存庫",
-      "repository-config-exists-configuration": "請確認儲存庫設定存在於設定檔案中。"
+      "history-not-supported": "",
+      "repository-config-exists-configuration": "請確認儲存庫設定存在於設定檔案中。",
+      "repository-not-found": ""
     },
     "file-status-page": {
       "save": "儲存",
@@ -11423,6 +11437,9 @@
     },
     "repository-link": {
       "delete-or-move-job": {
+        "compare-branch": "",
+        "open-pull-request": "",
+        "view-branch": "",
         "view-repository": ""
       },
       "grafana-repository-synced": "您的資源現在位於外部儲存空間中，並佈建到您的執行個體中。從現在開始，您的執行個體和外部儲存空間將會同步。",

From 8046a78f9f5682cf84a66d5d364eaa4a57a4013f Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Fri, 15 Aug 2025 11:59:43 +0100
Subject: [PATCH 198/243] FS: Add tempo tracing to dev stack (#109682)

* add tempo

* trying to debug trace propagation

* add extra header

* change header to inject

* very debug logging

* set GF_TRACING_OPENTELEMETRY_OTLP_PROPAGATION

* clean up config

* undo temp debug logging
---
 devenv/frontend-service/Tiltfile              |  6 ++-
 .../configs/alloy/_databases.alloy            | 30 ++++++++++++
 .../configs/alloy/otel-receiver.alloy         | 13 +++++
 .../frontend-service/{ => configs}/nginx.conf | 29 +++++++++--
 devenv/frontend-service/configs/tempo.yaml    | 48 +++++++++++++++++++
 devenv/frontend-service/docker-compose.yaml   | 41 ++++++++++++++--
 .../provisioning/datasources/default.yaml     | 13 +++++
 devenv/frontend-service/proxy.dockerfile      | 21 ++++++--
 8 files changed, 187 insertions(+), 14 deletions(-)
 create mode 100644 devenv/frontend-service/configs/alloy/otel-receiver.alloy
 rename devenv/frontend-service/{ => configs}/nginx.conf (83%)
 create mode 100644 devenv/frontend-service/configs/tempo.yaml

diff --git a/devenv/frontend-service/Tiltfile b/devenv/frontend-service/Tiltfile
index 885d8eddaf3..a753e475e80 100644
--- a/devenv/frontend-service/Tiltfile
+++ b/devenv/frontend-service/Tiltfile
@@ -69,6 +69,8 @@ dc_resource("frontend-service",
 )
 dc_resource("alloy", labels=["observability"])
 dc_resource("loki", labels=["observability"])
+dc_resource("tempo-init", labels=["observability"])
+dc_resource("tempo", labels=["observability"])
 
 # paths in tilt files are confusing....
 # - if tilt is dealing the the path, it is relative to the Tiltfile
@@ -111,10 +113,10 @@ docker_build('grafana-proxy',
 
   # Path relative to the docker context (this folder)
   only=[
-    "./nginx.conf",
+    "./configs/nginx.conf",
   ],
   live_update = [
-    sync('./nginx.conf', '/etc/nginx/conf.d/default.conf'),
+    sync('./configs/nginx.conf', '/etc/nginx/conf.d/default.conf'),
     restart_container()
   ]
 )
diff --git a/devenv/frontend-service/configs/alloy/_databases.alloy b/devenv/frontend-service/configs/alloy/_databases.alloy
index eb1766c1346..9e050d70fd9 100644
--- a/devenv/frontend-service/configs/alloy/_databases.alloy
+++ b/devenv/frontend-service/configs/alloy/_databases.alloy
@@ -1,3 +1,5 @@
+//
+// Logs
 loki.relabel "publish_logs" {
 	rule {
 		action       = "replace"
@@ -13,3 +15,31 @@ loki.write "tilt_loki" {
 		url = "http://loki:3100/loki/api/v1/push"
 	}
 }
+
+//
+// Traces
+otelcol.processor.transform "publish_traces" {
+	error_mode = "ignore"
+
+	trace_statements {
+		context    = "resource"
+		statements = [
+			string.format(`set(attributes["instance"], "%s")`, constants.hostname),
+		]
+	}
+
+	output {
+		traces = [otelcol.exporter.otlp.tilt_tempo.input]
+	}
+}
+
+otelcol.exporter.otlp "tilt_tempo" {
+	client {
+		endpoint = "tempo:4317"
+
+		tls {
+			insecure             = true
+			insecure_skip_verify = true
+		}
+	}
+}
diff --git a/devenv/frontend-service/configs/alloy/otel-receiver.alloy b/devenv/frontend-service/configs/alloy/otel-receiver.alloy
new file mode 100644
index 00000000000..df6b7d53178
--- /dev/null
+++ b/devenv/frontend-service/configs/alloy/otel-receiver.alloy
@@ -0,0 +1,13 @@
+//
+// Traces
+otelcol.receiver.otlp "grafana_dev" {
+	output {
+		metrics = []
+		logs    = []
+		traces  = [otelcol.processor.transform.publish_traces.input]
+	}
+
+	grpc {
+		endpoint = "0.0.0.0:4317"
+	}
+}
diff --git a/devenv/frontend-service/nginx.conf b/devenv/frontend-service/configs/nginx.conf
similarity index 83%
rename from devenv/frontend-service/nginx.conf
rename to devenv/frontend-service/configs/nginx.conf
index 5e2ad228eb3..0636ff0a231 100644
--- a/devenv/frontend-service/nginx.conf
+++ b/devenv/frontend-service/configs/nginx.conf
@@ -1,3 +1,9 @@
+otel_exporter {
+  endpoint alloy:4317;
+}
+
+otel_service_name "proxy";
+
 ###
 # Instance
 ###
@@ -14,10 +20,19 @@ map "$request_method:$cookie_fs_unavailable" $reject_login {
   "POST:1" 1;
 }
 
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+}
+
 server {
   listen 80;
   server_name _;
 
+  otel_trace         on;
+  otel_trace_context inject;
+  otel_span_name "$request_method Request";
+
   location ~ ^/-/down/?$ {
     add_header Set-Cookie "fs_unavailable=true; Max-Age=60; Path=/; HttpOnly" always;
     return 302 $scheme://$http_host/;
@@ -58,9 +73,11 @@ server {
   }
 
   # API calls go to the backend
-  # Cheat with app plugin paths and route them to the backend. These should come from
-  # the Plugin CDN
   location ~ ^/(api|apis|avatar|bootdata|render|logout|public\/plugins) {
+    # Add debug headers to the response
+    add_header Nginx-Trace-Id $otel_trace_id always;
+    add_header Nginx-Route "backend" always;
+
     if ($cookie_fs_unavailable) {
       add_header Content-Type application/json always;
       return 503 '{"code":"Loading", "message": "Soon!"}';
@@ -71,12 +88,18 @@ server {
     proxy_set_header X-Real-IP         $remote_addr;
     proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header Upgrade    $http_upgrade;
+
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
   }
 
   # Everything else to the frontend
   location / {
+    # Add debug headers to the response
+    add_header Nginx-Trace-Id $otel_trace_id always;
+    add_header Nginx-Route "frontend" always;
+
     proxy_pass http://frontend;
     proxy_set_header Host              $host;
     proxy_set_header X-Real-IP         $remote_addr;
diff --git a/devenv/frontend-service/configs/tempo.yaml b/devenv/frontend-service/configs/tempo.yaml
new file mode 100644
index 00000000000..58457e755c8
--- /dev/null
+++ b/devenv/frontend-service/configs/tempo.yaml
@@ -0,0 +1,48 @@
+stream_over_http_enabled: true
+
+server:
+  http_listen_port: 3200
+  log_level: info
+
+distributor:
+  usage:
+    cost_attribution:
+      enabled: true
+  receivers:
+    otlp:
+      protocols:
+        grpc:
+          endpoint: 'tempo:4317'
+        http:
+          endpoint: 'tempo:4318'
+
+storage:
+  trace:
+    backend: local # Specify local storage explicitly
+
+    # The Write-Ahead Log (WAL) is a logging mechanism used to ensure data integrity. In the context of Tempo,
+    # the WAL is used to record changes to trace data before they are committed to the main storage.
+    #This helps in recovering data in case of a failure. The WAL stores these changes in a sequential log file,
+    #which can be replayed to reconstruct the state of the system.
+    wal:
+      path: /var/lib/tempo/wal
+    # indicates that the storage backend is local, meaning the data will be stored on the local filesystem.
+    local:
+      path: /var/lib/tempo/blocks # Path for block storage
+
+metrics_generator:
+  registry:
+    external_labels:
+      source: tempo
+      cluster: docker-compose
+  storage:
+    path: /var/lib/tempo/generator/wal
+    remote_write:
+      - url: http://prometheus:9090/api/v1/write
+        send_exemplars: true
+  traces_storage:
+    path: /var/lib/tempo/generator/traces
+  processor:
+    local_blocks:
+      filter_server_spans: false
+      flush_to_storage: true
diff --git a/devenv/frontend-service/docker-compose.yaml b/devenv/frontend-service/docker-compose.yaml
index 9e6939d6e97..3a238ba890d 100644
--- a/devenv/frontend-service/docker-compose.yaml
+++ b/devenv/frontend-service/docker-compose.yaml
@@ -30,15 +30,18 @@ services:
       - ./provisioning/dashboards:/grafana/conf/provisioning/dashboards
       - ../dev-dashboards:/grafana/conf/dev-dashboards
     environment:
+      OTEL_BSP_SCHEDULE_DELAY: 500
       GF_DEFAULT_APP_MODE: development
       GF_PANELS_ENABLE_ALPHA: true
       GF_SERVER_CDN_URL: http://localhost:3010
       GF_FEATURE_TOGGLES_ENABLE: multiTenantFrontend
-      GF_DATABASE_TYPE: postgres
-      GF_DATABASE_HOST: postgres
-      GF_DATABASE_NAME: grafana
-      GF_DATABASE_USER: grafana
-      GF_DATABASE_PASSWORD: grafana
+      GF_DATABASE_URL: postgres://grafana:grafana@postgres:5432/grafana
+      GF_SERVER_ROUTER_LOGGING: true
+      GF_LOG_LEVEL: info
+      GF_AUTH_LOGIN_COOKIE_NAME: grafana_fs_dev_login # set a custom cookie name to not conflict with other instances running on localhost
+      OTEL_SERVICE_NAME: grafana-api
+      GF_TRACING_OPENTELEMETRY_OTLP_ADDRESS: 'alloy:4317'
+      GF_TRACING_OPENTELEMETRY_OTLP_PROPAGATION: jaeger,w3c
     ports:
       - '3011:3000'
     labels:
@@ -55,10 +58,16 @@ services:
     labels:
       - 'alloy.logs=true'
     environment:
+      OTEL_BSP_SCHEDULE_DELAY: 500
       GF_DEFAULT_APP_MODE: development
       GF_DEFAULT_TARGET: frontend-server
       GF_SECURITY_CONTENT_SECURITY_POLICY: false
       GF_SERVER_CDN_URL: http://localhost:3010
+      GF_SERVER_ROUTER_LOGGING: true
+      GF_LOG_LEVEL: info
+      OTEL_SERVICE_NAME: frontend-service
+      GF_TRACING_OPENTELEMETRY_OTLP_ADDRESS: 'alloy:4317'
+      GF_TRACING_OPENTELEMETRY_OTLP_PROPAGATION: jaeger,w3c
 
   postgres:
     image: postgres:16.1-alpine3.19
@@ -95,8 +104,30 @@ services:
     labels:
       - 'alloy.logs=true'
 
+  tempo-init:
+    image: grafana/tempo
+    user: root
+    entrypoint:
+      - 'chown'
+      - '10001:10001'
+      - '/var/tempo'
+    volumes:
+      - tempo-data:/var/tempo
+
+  tempo:
+    image: grafana/tempo
+    volumes:
+      - tempo-data:/var/lib/tempo
+      - ./configs/tempo.yaml:/etc/tempo/tempo.yaml
+    command: ['-config.file=/etc/tempo/tempo.yaml']
+
+    depends_on:
+      tempo-init:
+        condition: service_completed_successfully
+
 volumes:
   backend-data:
   postgres-data:
   alloy-data:
   loki-data:
+  tempo-data:
diff --git a/devenv/frontend-service/provisioning/datasources/default.yaml b/devenv/frontend-service/provisioning/datasources/default.yaml
index c99a93fd0b2..005bd631498 100644
--- a/devenv/frontend-service/provisioning/datasources/default.yaml
+++ b/devenv/frontend-service/provisioning/datasources/default.yaml
@@ -12,3 +12,16 @@ datasources:
     uid: fs-loki
     type: loki
     url: http://loki:3100
+
+  - name: Tempo Traces
+    uid: fs-tempo
+    type: tempo
+    url: http://tempo:3200
+    jsonData:
+      tracesToLogsV2:
+        # Field with an internal link pointing to a logs data source in Grafana.
+        # datasourceUid value must match the uid value of the logs data source.
+        datasourceUid: 'fs-loki'
+        spanStartTimeShift: '-1m'
+        spanEndTimeShift: '1m'
+        filterByTraceID: true
diff --git a/devenv/frontend-service/proxy.dockerfile b/devenv/frontend-service/proxy.dockerfile
index cd66cfd1187..9e0d8a4ceea 100644
--- a/devenv/frontend-service/proxy.dockerfile
+++ b/devenv/frontend-service/proxy.dockerfile
@@ -1,5 +1,18 @@
-# Runtime stage - just a simple nginx to serve static files
-# We bake the config into the image so we can live-update it with Tilt when it changes
-FROM nginx:alpine
+FROM nginx:1.29.0-alpine
 
-COPY nginx.conf /etc/nginx/conf.d/default.conf
+RUN apk add --no-cache openssl curl ca-certificates
+
+RUN printf "%s%s%s%s\n" \
+    "@nginx " \
+    "http://nginx.org/packages/mainline/alpine/v" \
+    `egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release` \
+    "/main" \
+    | tee -a /etc/apk/repositories
+
+RUN curl -o /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub
+RUN mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/
+RUN apk add --no-cache nginx-module-otel@nginx --force-overwrite
+
+RUN sed -i '1iload_module modules/ngx_otel_module.so;' /etc/nginx/nginx.conf
+
+COPY configs/nginx.conf /etc/nginx/conf.d/default.conf

From 68208577d34b0c6f500a681025a520aae17d094d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 15 Aug 2025 13:32:19 +0200
Subject: [PATCH 199/243] Dashboard: Inspect drawer can no longer be opened
 with url or linked to (#109617)

* Inspect: Remove url state support

* Fixes

* fix e2e

* fix lint

* fix lint

* fix test

* Update
---
 .../various-suite/inspect-drawer.spec.ts      |  3 +-
 .../inspect/PanelInspectDrawer.test.tsx       | 76 -------------------
 .../inspect/PanelInspectDrawer.tsx            | 48 +++---------
 .../pages/DashboardScenePage.test.tsx         |  2 +-
 .../PanelDataQueriesTab.test.tsx              | 10 +--
 .../PanelDataPane/PanelDataQueriesTab.tsx     | 12 +--
 .../dashboard-scene/scene/DashboardScene.tsx  |  2 -
 .../scene/DashboardSceneUrlSync.test.ts       | 12 ---
 .../scene/DashboardSceneUrlSync.ts            | 44 +----------
 .../scene/PanelMenuBehavior.test.tsx          |  3 +-
 .../scene/PanelMenuBehavior.tsx               | 24 ++----
 .../scene/keyboardShortcuts.ts                | 14 +---
 .../dashboard-scene/utils/urlBuilders.ts      |  7 --
 13 files changed, 35 insertions(+), 222 deletions(-)
 delete mode 100644 public/app/features/dashboard-scene/inspect/PanelInspectDrawer.test.tsx

diff --git a/e2e-playwright/various-suite/inspect-drawer.spec.ts b/e2e-playwright/various-suite/inspect-drawer.spec.ts
index 60f0dd42b06..4d18de6677b 100644
--- a/e2e-playwright/various-suite/inspect-drawer.spec.ts
+++ b/e2e-playwright/various-suite/inspect-drawer.spec.ts
@@ -61,8 +61,7 @@ test.describe(
       await expect(queryTab).toBeVisible();
 
       // Query should be the active tab
-      const activeTab = page.locator('a[class*="-activeTabStyle"]');
-      await expect(activeTab).toHaveText('Query');
+      await expect(queryTab).toHaveClass(/.*-activeTabStyle/);
 
       const queryContent = dashboardPage.getByGrafanaSelector(selectors.components.PanelInspector.Query.content);
       await expect(queryContent).toBeVisible();
diff --git a/public/app/features/dashboard-scene/inspect/PanelInspectDrawer.test.tsx b/public/app/features/dashboard-scene/inspect/PanelInspectDrawer.test.tsx
deleted file mode 100644
index 49998fa30d9..00000000000
--- a/public/app/features/dashboard-scene/inspect/PanelInspectDrawer.test.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { locationService } from '@grafana/runtime';
-
-import { DashboardScene, DashboardSceneState } from '../scene/DashboardScene';
-import { DefaultGridLayoutManager } from '../scene/layout-default/DefaultGridLayoutManager';
-
-import { onPanelInspectClose } from './PanelInspectDrawer';
-
-describe('onPanelInspectClose', () => {
-  test('when on default home dashboard page', async () => {
-    locationService.push('/');
-
-    const { scene } = await buildTestScene({
-      url: '',
-      slug: '',
-    });
-
-    onPanelInspectClose(scene);
-    expect(locationService.getLocation().pathname).toBe('/');
-  });
-
-  test('when on custom home dashboard page with uid defined', async () => {
-    locationService.push('/');
-
-    const { scene } = await buildTestScene(
-      {
-        url: '',
-        slug: '',
-      },
-      'home-dash '
-    );
-
-    onPanelInspectClose(scene);
-    expect(locationService.getLocation().pathname).toBe('/');
-  });
-
-  test('when on new dashboard page', async () => {
-    locationService.push('/dashboard/new');
-    const { scene } = await buildTestScene(
-      {
-        url: '',
-        slug: '',
-      },
-      ''
-    );
-
-    onPanelInspectClose(scene);
-    expect(locationService.getLocation().pathname).toBe('/dashboard/new');
-  });
-
-  test('when on a dashboard page', async () => {
-    const { scene } = await buildTestScene(
-      {
-        slug: 'dash-slug',
-        url: '/d/dash-uid/dash-slug',
-      },
-      'dash-uid'
-    );
-
-    onPanelInspectClose(scene);
-    expect(locationService.getLocation().pathname).toBe('/d/dash-uid/dash-slug');
-  });
-});
-
-async function buildTestScene(metaOverride?: DashboardSceneState['meta'], uid = 'dash-1') {
-  const scene = new DashboardScene({
-    title: 'hello',
-    uid,
-    meta: {
-      canEdit: true,
-      ...metaOverride,
-    },
-    body: DefaultGridLayoutManager.fromVizPanels([]),
-  });
-
-  return { scene };
-}
diff --git a/public/app/features/dashboard-scene/inspect/PanelInspectDrawer.tsx b/public/app/features/dashboard-scene/inspect/PanelInspectDrawer.tsx
index de6cb8ba6cd..bbcf72b0bcf 100644
--- a/public/app/features/dashboard-scene/inspect/PanelInspectDrawer.tsx
+++ b/public/app/features/dashboard-scene/inspect/PanelInspectDrawer.tsx
@@ -1,8 +1,4 @@
-import { useLocation } from 'react-router-dom-v5-compat';
-
-import { locationUtil } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
-import { locationService } from '@grafana/runtime';
 import {
   SceneComponentProps,
   SceneObjectBase,
@@ -16,8 +12,6 @@ import { getDataSourceWithInspector } from 'app/features/dashboard/components/In
 import { supportsDataQuery } from 'app/features/dashboard/components/PanelEditor/utils';
 import { InspectTab } from 'app/features/inspector/types';
 
-import { DashboardScene } from '../scene/DashboardScene';
-import { getDashboardUrl } from '../utils/getDashboardUrl';
 import { getDashboardSceneFor } from '../utils/utils';
 
 import { HelpWizard } from './HelpWizard/HelpWizard';
@@ -30,6 +24,7 @@ import { SceneInspectTab } from './types';
 
 interface PanelInspectDrawerState extends SceneObjectState {
   tabs?: SceneInspectTab[];
+  currentTab: InspectTab;
   panelRef: SceneObjectRef<VizPanel>;
   pluginNotLoaded?: boolean;
   canEdit?: boolean;
@@ -93,26 +88,21 @@ export class PanelInspectDrawer extends SceneObjectBase<PanelInspectDrawerState>
   }
 
   onClose = () => {
-    onPanelInspectClose(getDashboardSceneFor(this));
+    getDashboardSceneFor(this).closeModal();
   };
 }
 
 function PanelInspectRenderer({ model }: SceneComponentProps<PanelInspectDrawer>) {
-  const { tabs, pluginNotLoaded, panelRef } = model.useState();
-  const location = useLocation();
-
-  const queryParams = new URLSearchParams(location.search);
+  const { tabs, pluginNotLoaded, panelRef, currentTab } = model.useState();
 
   if (!tabs) {
     return null;
   }
 
-  const urlTab = queryParams.get('inspectTab');
-  const currentTab = tabs.find((tab) => tab.getTabValue() === urlTab) ?? tabs[0];
-
   const vizPanel = panelRef!.resolve();
+  const activeTab = tabs.find((tab) => tab.getTabValue() === currentTab) ?? tabs[0];
 
-  if (urlTab === InspectTab.Help) {
+  if (currentTab === InspectTab.Help) {
     return <HelpWizard panel={vizPanel} onClose={model.onClose} />;
   }
 
@@ -128,8 +118,10 @@ function PanelInspectRenderer({ model }: SceneComponentProps<PanelInspectDrawer>
               <Tab
                 key={tab.state.key!}
                 label={tab.getTabLabel()}
-                active={tab === currentTab}
-                href={locationUtil.getUrlForPartial(location, { inspectTab: tab.getTabValue() })}
+                active={tab === activeTab}
+                onChangeTab={() => {
+                  model.setState({ currentTab: tab.getTabValue() });
+                }}
               />
             );
           })}
@@ -145,27 +137,7 @@ function PanelInspectRenderer({ model }: SceneComponentProps<PanelInspectDrawer>
           </Trans>
         </Alert>
       )}
-      {currentTab && currentTab.Component && <currentTab.Component model={currentTab} />}
+      {activeTab.Component && <activeTab.Component model={activeTab} />}
     </Drawer>
   );
 }
-
-export function onPanelInspectClose(dashboard: DashboardScene) {
-  const meta = dashboard.state.meta;
-  // Checking for location here as well, otherwise down below isHomeDashboard will be set to true
-  // as it doesn't have uid neither slug nor url.
-  const isNew = !dashboard.state.uid && locationService.getLocation().pathname === '/dashboard/new';
-
-  locationService.push(
-    getDashboardUrl({
-      uid: dashboard.state.uid,
-      slug: dashboard.state.meta.slug,
-      currentQueryParams: locationService.getLocation().search,
-      updateQuery: {
-        inspect: null,
-        inspectTab: null,
-      },
-      isHomeDashboard: !meta.url && !meta.slug && !isNew,
-    })
-  );
-}
diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx b/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx
index 016e72010bf..9a6b5194abb 100644
--- a/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx
+++ b/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx
@@ -212,7 +212,7 @@ describe('DashboardScenePage', () => {
 
     expect(await screen.findByText('Inspect: Panel B')).toBeInTheDocument();
 
-    act(() => locationService.partial({ inspect: null }));
+    await userEvent.click(screen.getByTestId(selectors.components.Drawer.General.close));
 
     expect(screen.queryByText('Inspect: Panel B')).not.toBeInTheDocument();
   });
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx
index d48bf63a8d8..e3cb5a4f4b1 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx
@@ -18,12 +18,12 @@ import {
 } from '@grafana/data';
 import { getPanelPlugin } from '@grafana/data/test';
 import { selectors } from '@grafana/e2e-selectors';
-import { config, locationService } from '@grafana/runtime';
+import { config } from '@grafana/runtime';
 import { PANEL_EDIT_LAST_USED_DATASOURCE } from 'app/features/dashboard/utils/dashboard';
-import { InspectTab } from 'app/features/inspector/types';
 import { SHARED_DASHBOARD_QUERY, DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/constants';
 import { DashboardDataDTO } from 'app/types/dashboard';
 
+import { PanelInspectDrawer } from '../../inspect/PanelInspectDrawer';
 import { PanelTimeRange, PanelTimeRangeState } from '../../scene/PanelTimeRange';
 import { transformSaveModelToScene } from '../../serialization/transformSaveModelToScene';
 import { findVizPanelByKey } from '../../utils/utils';
@@ -604,12 +604,10 @@ describe('PanelDataQueriesTab', () => {
 
     describe('query inspection', () => {
       it('allows query inspection from the tab', async () => {
-        const { queriesTab } = await setupScene('panel-1');
+        const { queriesTab, scene } = await setupScene('panel-1');
         queriesTab.onOpenInspector();
 
-        const params = locationService.getSearchObject();
-        expect(params.inspect).toBe('1');
-        expect(params.inspectTab).toBe(InspectTab.Query);
+        expect(scene.state.overlay).toBeInstanceOf(PanelInspectDrawer);
       });
     });
 
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
index 0ed01ae59b7..4295ddb38d4 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
@@ -1,7 +1,7 @@
 import { CoreApp, DataSourceApi, DataSourceInstanceSettings, getDataSourceRef } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { t, Trans } from '@grafana/i18n';
-import { config, getDataSourceSrv, locationService } from '@grafana/runtime';
+import { config, getDataSourceSrv } from '@grafana/runtime';
 import {
   SceneObjectBase,
   SceneComponentProps,
@@ -21,6 +21,7 @@ import { dataSource as expressionDatasource } from 'app/features/expressions/Exp
 import { ExpressionTypeDropdown } from 'app/features/expressions/components/ExpressionTypeDropdown';
 import { ExpressionQueryType } from 'app/features/expressions/types';
 import { getDefaults } from 'app/features/expressions/utils/expressionTypes';
+import { InspectTab } from 'app/features/inspector/types';
 import { GroupActionComponents } from 'app/features/query/components/QueryActionComponent';
 import { QueryEditorRows } from 'app/features/query/components/QueryEditorRows';
 import { QueryGroupTopSection } from 'app/features/query/components/QueryGroup';
@@ -32,8 +33,9 @@ import { MIXED_DATASOURCE_NAME } from '../../../../plugins/datasource/mixed/Mixe
 import { useQueryLibraryContext } from '../../../explore/QueryLibrary/QueryLibraryContext';
 import { ExpressionDatasourceUID } from '../../../expressions/types';
 import { getDatasourceSrv } from '../../../plugins/datasource_srv';
+import { PanelInspectDrawer } from '../../inspect/PanelInspectDrawer';
 import { PanelTimeRange } from '../../scene/PanelTimeRange';
-import { getDashboardSceneFor, getPanelIdForVizPanel, getQueryRunnerFor } from '../../utils/utils';
+import { getDashboardSceneFor, getQueryRunnerFor } from '../../utils/utils';
 import { getUpdatedHoverHeader } from '../getPanelFrameOptions';
 
 import { PanelDataPaneTab, TabId, PanelDataTabHeaderProps } from './types';
@@ -171,10 +173,8 @@ export class PanelDataQueriesTab extends SceneObjectBase<PanelDataQueriesTabStat
   }
 
   public onOpenInspector = () => {
-    const panel = this.state.panelRef.resolve();
-    const panelId = getPanelIdForVizPanel(panel);
-
-    locationService.partial({ inspect: panelId, inspectTab: 'query' });
+    const dashboard = getDashboardSceneFor(this);
+    dashboard.showModal(new PanelInspectDrawer({ panelRef: this.state.panelRef, currentTab: InspectTab.Query }));
   };
 
   public onChangeDataSource = async (newSettings: DataSourceInstanceSettings, defaultQueries?: SceneDataQuery[]) => {
diff --git a/public/app/features/dashboard-scene/scene/DashboardScene.tsx b/public/app/features/dashboard-scene/scene/DashboardScene.tsx
index 48581e303ae..0dc7501cbc1 100644
--- a/public/app/features/dashboard-scene/scene/DashboardScene.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardScene.tsx
@@ -129,8 +129,6 @@ export interface DashboardSceneState extends SceneObjectState {
   meta: Omit<DashboardMeta, 'isNew'>;
   /** Version of the dashboard */
   version?: number;
-  /** Panel to inspect */
-  inspectPanelKey?: string;
   /** Panel to view in fullscreen */
   viewPanelScene?: ViewPanelScene;
   /** Edit view */
diff --git a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts
index 9dbd47cf919..4bad8552455 100644
--- a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts
+++ b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts
@@ -12,18 +12,6 @@ import { DashboardRepeatsProcessedEvent } from './types/DashboardRepeatsProcesse
 
 describe('DashboardSceneUrlSync', () => {
   describe('Given a standard scene', () => {
-    it('Should set inspectPanelKey when url has inspect key', () => {
-      const scene = buildTestScene();
-      scene.urlSync?.updateFromUrl({ inspect: '2' });
-      expect(scene.state.inspectPanelKey).toBe('2');
-    });
-
-    it('Should handle inspect key that is not found', () => {
-      const scene = buildTestScene();
-      scene.urlSync?.updateFromUrl({ inspect: '12321' });
-      expect(scene.state.inspectPanelKey).toBe(undefined);
-    });
-
     it('Should set viewPanelKey when url has viewPanel', () => {
       const scene = buildTestScene();
       scene.urlSync?.updateFromUrl({ viewPanel: '2' });
diff --git a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts
index e19a7331d5c..b145635bb39 100644
--- a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts
+++ b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts
@@ -7,7 +7,6 @@ import appEvents from 'app/core/app_events';
 import { contextSrv } from 'app/core/core';
 import { KioskMode } from 'app/types/dashboard';
 
-import { PanelInspectDrawer } from '../inspect/PanelInspectDrawer';
 import { buildPanelEditScene } from '../panel-edit/PanelEditor';
 import { createDashboardEditViewFor } from '../settings/utils';
 import { ShareDrawer } from '../sharing/ShareDrawer/ShareDrawer';
@@ -23,7 +22,6 @@ import { DashboardRepeatsProcessedEvent } from './types/DashboardRepeatsProcesse
 
 export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
   private _viewEventSub?: Unsubscribable;
-  private _inspectEventSub?: Unsubscribable;
 
   constructor(private _scene: DashboardScene) {}
 
@@ -35,7 +33,6 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
     const state = this._scene.state;
 
     return {
-      inspect: state.inspectPanelKey,
       autofitpanels: this.getAutoFitPanels(),
       viewPanel: state.viewPanelScene?.getUrlKey(),
       editview: state.editview?.getUrlKey(),
@@ -55,7 +52,7 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
   }
 
   updateFromUrl(values: SceneObjectUrlValues): void {
-    const { inspectPanelKey, viewPanelScene, isEditing, editPanel, shareView } = this._scene.state;
+    const { viewPanelScene, isEditing, editPanel, shareView } = this._scene.state;
     const update: Partial<DashboardSceneState> = {};
 
     if (typeof values.editview === 'string' && this._scene.canEditDashboard()) {
@@ -75,30 +72,6 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
       update.editview = undefined;
     }
 
-    // Handle inspect object state
-    if (typeof values.inspect === 'string') {
-      let panel = findVizPanelByKey(this._scene, values.inspect);
-      if (!panel) {
-        // If we are trying to view a repeat clone that can't be found it might be that the repeats have not been processed yet
-        // Here we check if the key contains the clone key so we force the repeat processing
-        // It doesn't matter if the element or the ancestors are clones or not, just that the key contains the clone key
-        if (containsCloneKey(values.inspect)) {
-          this._handleInspectRepeatClone(values.inspect);
-          return;
-        }
-
-        appEvents.emit(AppEvents.alertError, ['Panel not found']);
-        locationService.partial({ inspect: null });
-        return;
-      }
-
-      update.inspectPanelKey = values.inspect;
-      update.overlay = new PanelInspectDrawer({ panelRef: panel.getRef() });
-    } else if (inspectPanelKey) {
-      update.inspectPanelKey = undefined;
-      update.overlay = undefined;
-    }
-
     // Handle view panel state
     if (typeof values.viewPanel === 'string') {
       const panel = findVizPanelByKey(this._scene, values.viewPanel);
@@ -186,21 +159,6 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
     }
   }
 
-  private _handleInspectRepeatClone(inspect: string) {
-    if (!this._inspectEventSub) {
-      this._inspectEventSub = this._scene.subscribeToEvent(DashboardRepeatsProcessedEvent, () => {
-        const panel = findVizPanelByKey(this._scene, inspect);
-        if (panel) {
-          this._inspectEventSub?.unsubscribe();
-          this._scene.setState({
-            inspectPanelKey: inspect,
-            overlay: new PanelInspectDrawer({ panelRef: panel.getRef() }),
-          });
-        }
-      });
-    }
-  }
-
   private _handleViewRepeatClone(viewPanel: string) {
     if (!this._viewEventSub) {
       this._viewEventSub = this._scene.subscribeToEvent(DashboardRepeatsProcessedEvent, () => {
diff --git a/public/app/features/dashboard-scene/scene/PanelMenuBehavior.test.tsx b/public/app/features/dashboard-scene/scene/PanelMenuBehavior.test.tsx
index 10191b32a58..8d841b7d1dc 100644
--- a/public/app/features/dashboard-scene/scene/PanelMenuBehavior.test.tsx
+++ b/public/app/features/dashboard-scene/scene/PanelMenuBehavior.test.tsx
@@ -90,8 +90,7 @@ describe('panelMenuBehavior', () => {
     expect(getExploreArgs.queries).toEqual([{ query: 'QueryA', refId: 'A' }]);
     expect(getExploreArgs.scopedVars?.__sceneObject?.value).toBe(panel);
 
-    // verify inspect url keeps url params and adds inspect=<panel-key>
-    expect(menu.state.items?.[4].href).toBe('/d/dash-1?from=now-5m&to=now&inspect=panel-12');
+    expect(menu.state.items?.[4].text).toBe('Inspect');
     expect(menu.state.items?.[4].subMenu).toBeDefined();
 
     expect(menu.state.items?.[4].subMenu?.length).toBe(3);
diff --git a/public/app/features/dashboard-scene/scene/PanelMenuBehavior.tsx b/public/app/features/dashboard-scene/scene/PanelMenuBehavior.tsx
index d10b2ab5b65..d02e94516dd 100644
--- a/public/app/features/dashboard-scene/scene/PanelMenuBehavior.tsx
+++ b/public/app/features/dashboard-scene/scene/PanelMenuBehavior.tsx
@@ -32,11 +32,12 @@ import { dispatch } from 'app/store/store';
 import { AccessControlAction } from 'app/types/accessControl';
 import { ShowConfirmModalEvent } from 'app/types/events';
 
+import { PanelInspectDrawer } from '../inspect/PanelInspectDrawer';
 import { ShareDrawer } from '../sharing/ShareDrawer/ShareDrawer';
 import { ShareModal } from '../sharing/ShareModal';
 import { isInCloneChain } from '../utils/clone';
 import { DashboardInteractions } from '../utils/interactions';
-import { getEditPanelUrl, getInspectUrl, getViewPanelUrl, tryGetExploreUrlForPanel } from '../utils/urlBuilders';
+import { getEditPanelUrl, getViewPanelUrl, tryGetExploreUrlForPanel } from '../utils/urlBuilders';
 import { getDashboardSceneFor, getPanelIdForVizPanel, getQueryRunnerFor, isLibraryPanel } from '../utils/utils';
 
 import { DashboardScene } from './DashboardScene';
@@ -290,7 +291,7 @@ export function panelMenuBehavior(menu: VizPanelMenu) {
         iconClassName: 'question-circle',
         onClick: (e: React.MouseEvent) => {
           e.preventDefault();
-          onInspectPanel(panel, InspectTab.Help);
+          dashboard.showModal(new PanelInspectDrawer({ panelRef: panel.getRef(), currentTab: InspectTab.Help }));
         },
       });
     }
@@ -404,20 +405,18 @@ function getInspectMenuItem(
   if (plugin && !plugin.meta.skipDataQuery) {
     inspectSubMenu.push({
       text: t('panel.header-menu.inspect-data', `Data`),
-      href: getInspectUrl(panel, InspectTab.Data),
       onClick: (e) => {
         e.preventDefault();
-        locationService.partial({ inspect: panel.state.key, inspectTab: InspectTab.Data });
+        dashboard.showModal(new PanelInspectDrawer({ panelRef: panel.getRef(), currentTab: InspectTab.Data }));
       },
     });
 
     if (dashboard instanceof DashboardScene && dashboard.state.meta.canEdit) {
       inspectSubMenu.push({
         text: t('panel.header-menu.query', `Query`),
-        href: getInspectUrl(panel, InspectTab.Query),
         onClick: (e) => {
           e.preventDefault();
-          locationService.partial({ inspect: panel.state.key, inspectTab: InspectTab.Query });
+          dashboard.showModal(new PanelInspectDrawer({ panelRef: panel.getRef(), currentTab: InspectTab.Query }));
         },
       });
     }
@@ -425,10 +424,9 @@ function getInspectMenuItem(
 
   inspectSubMenu.push({
     text: t('panel.header-menu.inspect-json', `Panel JSON`),
-    href: getInspectUrl(panel, InspectTab.JSON),
     onClick: (e) => {
       e.preventDefault();
-      locationService.partial({ inspect: panel.state.key, inspectTab: InspectTab.JSON });
+      dashboard.showModal(new PanelInspectDrawer({ panelRef: panel.getRef(), currentTab: InspectTab.JSON }));
     },
   });
 
@@ -436,10 +434,9 @@ function getInspectMenuItem(
     text: t('panel.header-menu.inspect', `Inspect`),
     iconClassName: 'info-circle',
     shortcut: 'i',
-    href: getInspectUrl(panel),
     onClick: (e) => {
       if (!e.isDefaultPrevented()) {
-        locationService.partial({ inspect: panel.state.key, inspectTab: InspectTab.Data });
+        dashboard.showModal(new PanelInspectDrawer({ panelRef: panel.getRef(), currentTab: InspectTab.Data }));
       }
     },
     subMenu: inspectSubMenu.length > 0 ? inspectSubMenu : undefined,
@@ -582,10 +579,3 @@ export function toggleVizPanelLegend(vizPanel: VizPanel): void {
 function hasLegendOptions(optionsWithLegend: unknown): optionsWithLegend is OptionsWithLegend {
   return optionsWithLegend != null && typeof optionsWithLegend === 'object' && 'legend' in optionsWithLegend;
 }
-
-const onInspectPanel = (vizPanel: VizPanel, tab?: InspectTab) => {
-  locationService.partial({
-    inspect: vizPanel.state.key,
-    inspectTab: tab,
-  });
-};
diff --git a/public/app/features/dashboard-scene/scene/keyboardShortcuts.ts b/public/app/features/dashboard-scene/scene/keyboardShortcuts.ts
index 0d7ad8f85a8..a4f2ef2e2fd 100644
--- a/public/app/features/dashboard-scene/scene/keyboardShortcuts.ts
+++ b/public/app/features/dashboard-scene/scene/keyboardShortcuts.ts
@@ -4,13 +4,15 @@ import { sceneGraph, VizPanel } from '@grafana/scenes';
 import appEvents from 'app/core/app_events';
 import { KeybindingSet } from 'app/core/services/KeybindingSet';
 import { contextSrv } from 'app/core/services/context_srv';
+import { InspectTab } from 'app/features/inspector/types';
 import { AccessControlAction } from 'app/types/accessControl';
 
 import { shareDashboardType } from '../../dashboard/components/ShareModal/utils';
+import { PanelInspectDrawer } from '../inspect/PanelInspectDrawer';
 import { ShareDrawer } from '../sharing/ShareDrawer/ShareDrawer';
 import { ShareModal } from '../sharing/ShareModal';
 import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
-import { getEditPanelUrl, getInspectUrl, getViewPanelUrl, tryGetExploreUrlForPanel } from '../utils/urlBuilders';
+import { getEditPanelUrl, getViewPanelUrl, tryGetExploreUrlForPanel } from '../utils/urlBuilders';
 import { getPanelIdForVizPanel } from '../utils/utils';
 
 import { DashboardScene } from './DashboardScene';
@@ -111,15 +113,7 @@ export function setupKeyboardShortcuts(scene: DashboardScene) {
   keybindings.addBinding({
     key: 'i',
     onTrigger: withFocusedPanel(scene, async (vizPanel: VizPanel) => {
-      if (scene.state.inspectPanelKey) {
-        locationService.push(
-          locationUtil.getUrlForPartial(locationService.getLocation(), {
-            inspect: undefined,
-          })
-        );
-      } else {
-        locationService.push(locationUtil.stripBaseFromUrl(getInspectUrl(vizPanel)));
-      }
+      scene.showModal(new PanelInspectDrawer({ panelRef: vizPanel.getRef(), currentTab: InspectTab.Data }));
     }),
   });
 
diff --git a/public/app/features/dashboard-scene/utils/urlBuilders.ts b/public/app/features/dashboard-scene/utils/urlBuilders.ts
index 1ee1b37ca94..f79f2e5fa7c 100644
--- a/public/app/features/dashboard-scene/utils/urlBuilders.ts
+++ b/public/app/features/dashboard-scene/utils/urlBuilders.ts
@@ -3,7 +3,6 @@ import { locationService } from '@grafana/runtime';
 import { sceneGraph, VizPanel } from '@grafana/scenes';
 import { contextSrv } from 'app/core/core';
 import { getExploreUrl } from 'app/core/utils/explore';
-import { InspectTab } from 'app/features/inspector/types';
 
 import { getQueryRunnerFor } from './utils';
 
@@ -18,12 +17,6 @@ export function getEditPanelUrl(panelId: number) {
   return locationUtil.getUrlForPartial(locationService.getLocation(), { editPanel: panelId, viewPanel: undefined });
 }
 
-export function getInspectUrl(vizPanel: VizPanel, inspectTab?: InspectTab) {
-  const inspect = vizPanel.state.key?.replace('-view', '');
-
-  return locationUtil.getUrlForPartial(locationService.getLocation(), { inspect, inspectTab });
-}
-
 export function tryGetExploreUrlForPanel(vizPanel: VizPanel): Promise<string | undefined> {
   //const dashboard = panel.getRoot();
   const panelPlugin = vizPanel.getPlugin();

From de04be4cfe8541be7d32d663d3cfd5c3ac140bd5 Mon Sep 17 00:00:00 2001
From: Tom Ratcliffe <tom.ratcliffe@grafana.com>
Date: Fri, 15 Aug 2025 13:27:37 +0100
Subject: [PATCH 200/243] Chore: Skip database integration tests when files are
 not changed (#103923)

---
 .github/workflows/pr-test-integration.yml | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/.github/workflows/pr-test-integration.yml b/.github/workflows/pr-test-integration.yml
index 3fe89523a45..6a2bb5cede7 100644
--- a/.github/workflows/pr-test-integration.yml
+++ b/.github/workflows/pr-test-integration.yml
@@ -18,7 +18,27 @@ concurrency:
 permissions: {}
 
 jobs:
+  detect-changes:
+    name: Detect whether code changed
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      changed: ${{ steps.detect-changes.outputs.backend }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: true # required to get more history in the changed-files action
+          fetch-depth: 2
+      - name: Detect changes
+        id: detect-changes
+        uses: ./.github/actions/change-detection
+        with:
+          self: .github/workflows/pr-test-integration.yml
+
   sqlite:
+    needs: detect-changes
+    if: needs.detect-changes.outputs.changed == 'true'
     strategy:
       matrix:
         shard: [
@@ -49,6 +69,8 @@ jobs:
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/pkgs-with-tests-named.sh -b TestIntegration | ./scripts/ci/backend-tests/shard.sh -N"$SHARD" -d-)"
           go test -tags=sqlite -timeout=8m -run '^TestIntegration' "${PACKAGES[@]}"
   mysql:
+    needs: detect-changes
+    if: needs.detect-changes.outputs.changed == 'true'
     strategy:
       matrix:
         shard: [
@@ -95,6 +117,8 @@ jobs:
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/pkgs-with-tests-named.sh -b TestIntegration | ./scripts/ci/backend-tests/shard.sh -N"$SHARD" -d-)"
           CGO_ENABLED=0 go test -p=1 -tags=mysql -timeout=8m -run '^TestIntegration' "${PACKAGES[@]}"
   postgres:
+    needs: detect-changes
+    if: needs.detect-changes.outputs.changed == 'true'
     strategy:
       matrix:
         shard: [

From 42e0afa5c1141b5e8b34cd164f04b75982420b2b Mon Sep 17 00:00:00 2001
From: Luminessa Starlight <git@samsch.org>
Date: Fri, 15 Aug 2025 09:11:04 -0400
Subject: [PATCH 201/243] Chore: Removed unused style definition (#109714)

removed unused style from #109602
---
 public/app/features/geo/editor/locationModeEditor.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/public/app/features/geo/editor/locationModeEditor.tsx b/public/app/features/geo/editor/locationModeEditor.tsx
index 9bde36e7c16..758a99b6f4f 100644
--- a/public/app/features/geo/editor/locationModeEditor.tsx
+++ b/public/app/features/geo/editor/locationModeEditor.tsx
@@ -120,11 +120,5 @@ const getStyles = (theme: GrafanaTheme2) => {
       marginTop: '5px',
       padding: theme.spacing(0.25),
     }),
-    // TODO apply styling to horizontal group (currently not working)
-    hGroup: css({
-      '& div': {
-        width: '100%',
-      },
-    }),
   };
 };

From 8dd598942f6eb16315b12c7b200e86fb61d640cc Mon Sep 17 00:00:00 2001
From: Oscar Kilhed <oscar.kilhed@grafana.com>
Date: Fri, 15 Aug 2025 16:24:30 +0200
Subject: [PATCH 202/243] Dashboards: Fix reporting of save dashboard
 interaction (#109701)

Fix reporting of save dashboard interaction
---
 public/app/features/dashboard-scene/saving/useSaveDashboard.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/dashboard-scene/saving/useSaveDashboard.ts b/public/app/features/dashboard-scene/saving/useSaveDashboard.ts
index c5e2be5151b..4d99b26648c 100644
--- a/public/app/features/dashboard-scene/saving/useSaveDashboard.ts
+++ b/public/app/features/dashboard-scene/saving/useSaveDashboard.ts
@@ -71,7 +71,7 @@ export function useSaveDashboard(isCopy = false) {
             url: resultData.url,
           });
         } else {
-          reportInteraction(`grafana_dashboard_${resultData.uid ? 'saved' : 'created'}`, {
+          reportInteraction(`grafana_dashboard_${options.isNew ? 'created' : 'saved'}`, {
             name: saveModel.title,
             url: resultData.url,
           });

From 44b7d941b4467d119fae922009449322c6ff26c1 Mon Sep 17 00:00:00 2001
From: Oscar Kilhed <oscar.kilhed@grafana.com>
Date: Fri, 15 Aug 2025 16:37:54 +0200
Subject: [PATCH 203/243] Dynamic dashboards: Show disabled conditional
 rendering when not supported (#109663)

* Show disabled conditional rendering when not supported

* don't create unessecary sceneObjects

* fix i18n identifier strings

* Update i18n
---
 .../ConditionalRenderingEditor.tsx            | 45 ++++++++++++++-----
 .../DashboardGridItemEditor.tsx               | 11 ++++-
 public/locales/en-US/grafana.json             |  4 ++
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingEditor.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingEditor.tsx
index 9df4bd0de02..8d0a0614778 100644
--- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingEditor.tsx
+++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingEditor.tsx
@@ -6,25 +6,50 @@ import { OptionsPaneCategoryDescriptor } from 'app/features/dashboard/components
 import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor';
 
 import { ConditionalRendering } from './ConditionalRendering';
+import { ConditionalRenderingGroup } from './ConditionalRenderingGroup';
+
+let placeholderConditionalRendering: ConditionalRendering | undefined;
+function getPlaceholderConditionalRendering(): ConditionalRendering {
+  if (!placeholderConditionalRendering) {
+    placeholderConditionalRendering = new ConditionalRendering({
+      rootGroup: new ConditionalRenderingGroup({
+        visibility: 'show',
+        condition: 'and',
+        value: [],
+      }),
+    });
+  }
+  return placeholderConditionalRendering;
+}
 
 export function useConditionalRenderingEditor(
-  conditionalRendering?: ConditionalRendering
-): OptionsPaneCategoryDescriptor | null {
-  if (!conditionalRendering) {
-    return null;
-  }
-
+  conditionalRendering?: ConditionalRendering,
+  disabledText?: string
+): OptionsPaneCategoryDescriptor {
   const title = t('dashboard.conditional-rendering.root.title', 'Show / hide rules');
 
+  const conditionalRenderingToRender = conditionalRendering ?? getPlaceholderConditionalRendering();
+
   return new OptionsPaneCategoryDescriptor({
     title,
+    disabledText: conditionalRendering
+      ? undefined
+      : (disabledText ??
+        t(
+          'dashboard.conditional-rendering.editor.unsupported-item-type',
+          'Conditional rendering not supported for this item type'
+        )),
     id: 'conditional-rendering-options',
     renderTitle: () => (
       <Stack direction="row" gap={1} alignItems="center">
         <div>{title}</div>
-        <Tooltip content={conditionalRendering.info}>
-          <Icon name={!conditionalRendering.evaluate() ? 'eye-slash' : 'eye'} />
-        </Tooltip>
+        {conditionalRendering ? (
+          <Tooltip content={conditionalRenderingToRender.info}>
+            <Icon name={!conditionalRenderingToRender.evaluate() ? 'eye-slash' : 'eye'} />
+          </Tooltip>
+        ) : (
+          <Icon name="eye-slash" />
+        )}
       </Stack>
     ),
     isOpenDefault: true,
@@ -32,7 +57,7 @@ export function useConditionalRenderingEditor(
     new OptionsPaneItemDescriptor({
       title,
       id: uuidv4(),
-      render: () => <conditionalRendering.Component model={conditionalRendering} />,
+      render: () => <conditionalRenderingToRender.Component model={conditionalRenderingToRender} />,
     })
   );
 }
diff --git a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx
index e5b39a60c59..9f822fe01e7 100644
--- a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx
@@ -9,6 +9,7 @@ import { OptionsPaneCategoryDescriptor } from 'app/features/dashboard/components
 import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor';
 import { RepeatRowSelect2 } from 'app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect';
 
+import { useConditionalRenderingEditor } from '../../conditional-rendering/ConditionalRenderingEditor';
 import { dashboardEditActions } from '../../edit-pane/shared';
 
 import { DashboardGridItem } from './DashboardGridItem';
@@ -52,7 +53,15 @@ export function getDashboardGridItemOptions(gridItem: DashboardGridItem): Option
       })
     );
 
-  return [repeatCategory];
+  const conditionalRenderingCategory = useConditionalRenderingEditor(
+    undefined,
+    t(
+      'dashboard.conditional-rendering.editor.not-supported-for-custom-grid',
+      'Conditional rendering is not supported for the custom grid layout. Switch to auto grid to use conditional rendering.'
+    )
+  );
+
+  return [repeatCategory, conditionalRenderingCategory];
 }
 
 interface OptionComponentProps {
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 9eecf0099ab..d39902baac5 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -4522,6 +4522,10 @@
           "value": "Value"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "Conditional rendering is not supported for the custom grid layout. Switch to auto grid to use conditional rendering.",
+        "unsupported-item-type": "Conditional rendering not supported for this item type"
+      },
       "overlay": {
         "tooltip": "Element is hidden due to conditional rendering."
       },

From 79f45102608442fbc6b70e5346e02564615d9a99 Mon Sep 17 00:00:00 2001
From: Brendan O'Handley <brendan.ohandley@grafana.com>
Date: Fri, 15 Aug 2025 09:47:19 -0500
Subject: [PATCH 204/243] Prometheus: Export interpolateQueryExpr for metrics
 drilldown links (#109713)

export interpolateQueryExpr for metrics drilldown links
---
 packages/grafana-prometheus/src/datasource.ts | 19 ++-------------
 packages/grafana-prometheus/src/escaping.ts   | 23 +++++++++++++++++++
 packages/grafana-prometheus/src/index.ts      |  1 +
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/packages/grafana-prometheus/src/datasource.ts b/packages/grafana-prometheus/src/datasource.ts
index 2239b63be54..ad66ab1504f 100644
--- a/packages/grafana-prometheus/src/datasource.ts
+++ b/packages/grafana-prometheus/src/datasource.ts
@@ -47,7 +47,7 @@ import {
   InstantQueryRefIdIndex,
   SUGGESTIONS_LIMIT,
 } from './constants';
-import { prometheusRegularEscape, prometheusSpecialRegexEscape } from './escaping';
+import { interpolateQueryExpr, prometheusRegularEscape } from './escaping';
 import {
   exportToAbstractQuery,
   importFromAbstractQuery,
@@ -379,22 +379,7 @@ export class PrometheusDatasource
   }
 
   interpolateQueryExpr(value: string | string[] = [], variable: QueryVariableModel | CustomVariableModel) {
-    // if no multi or include all do not regexEscape
-    if (!variable.multi && !variable.includeAll) {
-      return prometheusRegularEscape(value);
-    }
-
-    if (typeof value === 'string') {
-      return prometheusSpecialRegexEscape(value);
-    }
-
-    const escapedValues = value.map((val) => prometheusSpecialRegexEscape(val));
-
-    if (escapedValues.length === 1) {
-      return escapedValues[0];
-    }
-
-    return '(' + escapedValues.join('|') + ')';
+    return interpolateQueryExpr(value, variable);
   }
 
   targetContainsTemplate(target: PromQuery) {
diff --git a/packages/grafana-prometheus/src/escaping.ts b/packages/grafana-prometheus/src/escaping.ts
index 01a01ec558c..bb8daadfbd8 100644
--- a/packages/grafana-prometheus/src/escaping.ts
+++ b/packages/grafana-prometheus/src/escaping.ts
@@ -1,8 +1,31 @@
 // NOTE: these two functions are similar to the escapeLabelValueIn* functions
 // in language_utils.ts, but they are not exactly the same algorithm, and we found
 
+import { QueryVariableModel, CustomVariableModel } from '@grafana/data';
 import { config } from '@grafana/runtime';
 
+export function interpolateQueryExpr(
+  value: string | string[] = [],
+  variable: QueryVariableModel | CustomVariableModel
+) {
+  // if no multi or include all do not regexEscape
+  if (!variable.multi && !variable.includeAll) {
+    return prometheusRegularEscape(value);
+  }
+
+  if (typeof value === 'string') {
+    return prometheusSpecialRegexEscape(value);
+  }
+
+  const escapedValues = value.map((val) => prometheusSpecialRegexEscape(val));
+
+  if (escapedValues.length === 1) {
+    return escapedValues[0];
+  }
+
+  return '(' + escapedValues.join('|') + ')';
+}
+
 // no way to reuse one in the another or vice versa.
 export function prometheusRegularEscape<T>(value: T) {
   if (typeof value !== 'string') {
diff --git a/packages/grafana-prometheus/src/index.ts b/packages/grafana-prometheus/src/index.ts
index 1afbe8a3fa4..d0539d46591 100644
--- a/packages/grafana-prometheus/src/index.ts
+++ b/packages/grafana-prometheus/src/index.ts
@@ -58,6 +58,7 @@ export { PrometheusDatasource } from './datasource';
 // The parts
 export { addLabelToQuery } from './add_label_to_query';
 export { type QueryEditorMode, type PromQueryFormat, type Prometheus } from './dataquery';
+export { interpolateQueryExpr } from './escaping';
 export { loadResources } from './loadResources';
 export { PrometheusMetricFindQuery } from './metric_find_query';
 export { promqlGrammar } from './promql';

From 5270d8e53fd9a01aa180bb9198ac1957329c1c2d Mon Sep 17 00:00:00 2001
From: maicon <maiconscosta@gmail.com>
Date: Fri, 15 Aug 2025 12:57:42 -0300
Subject: [PATCH 205/243] fix(unified-storage): remove permissions after
 executing on both stores (#109722)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
Co-authored-by: Jean-Philippe Quéméner <jeanphilippe.quemener@grafana.com>
---
 go.mod                                        |  2 +-
 go.sum                                        |  4 +--
 go.work.sum                                   |  7 ++++
 pkg/apimachinery/utils/folder_key.go          | 20 +++++++++++
 pkg/build/go.mod                              |  2 +-
 pkg/build/go.sum                              |  4 +--
 .../datamigrations/to_unified_storage.go      |  1 +
 pkg/extensions/enterprise_imports.go          |  2 +-
 .../apis/dashboard/dashboard_storage.go       | 35 +++++++++++++++++++
 pkg/registry/apis/dashboard/legacy/migrate.go |  4 ++-
 .../apis/dashboard/legacy/sql_dashboards.go   |  8 +++--
 pkg/registry/apis/dashboard/register.go       | 12 +++++--
 pkg/registry/apis/folders/folder_storage.go   | 20 ++++++++++-
 pkg/registry/apis/folders/legacy_storage.go   |  4 ++-
 pkg/server/wire_gen.go                        |  8 ++---
 pkg/services/dashboards/database/database.go  | 18 ++++++----
 pkg/services/dashboards/models.go             |  1 +
 pkg/services/folder/folderimpl/folder.go      |  2 +-
 pkg/services/folder/model.go                  |  3 +-
 pkg/storage/legacysql/dualwrite/dualwriter.go | 10 ++++++
 20 files changed, 141 insertions(+), 26 deletions(-)
 create mode 100644 pkg/apimachinery/utils/folder_key.go
 create mode 100644 pkg/registry/apis/dashboard/dashboard_storage.go

diff --git a/go.mod b/go.mod
index bac8f15dacd..e5f070f04d1 100644
--- a/go.mod
+++ b/go.mod
@@ -518,7 +518,7 @@ require (
 	github.com/oklog/ulid/v2 v2.1.0 // indirect
 	github.com/open-feature/go-sdk-contrib/providers/ofrep v0.1.5 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/perimeterx/marshmallow v1.1.5 // indirect
diff --git a/go.sum b/go.sum
index 2d2c164f510..45bec762338 100644
--- a/go.sum
+++ b/go.sum
@@ -2108,8 +2108,8 @@ github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQ
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
-github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
+github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
 github.com/openfga/api/proto v0.0.0-20250127102726-f9709139a369 h1:wEsCZ4oBuu8LfEJ3VXbveXO8uEhCthrxA40WSvxO044=
 github.com/openfga/api/proto v0.0.0-20250127102726-f9709139a369/go.mod h1:m74TNgnAAIJ03gfHcx+xaRWnr+IbQy3y/AVNwwCFrC0=
 github.com/openfga/language/pkg/go v0.2.0-beta.2.0.20250220223040-ed0cfba54336 h1:pYuYanFfgYrvDoSu/nnThT9P60mw5Yx7PMEI7FYychM=
diff --git a/go.work.sum b/go.work.sum
index 66413aede3c..9702910b972 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -629,6 +629,8 @@ github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3 h1:ZSTrOEhi
 github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 h1:G1bPvciwNyF7IUmKXNt9Ak3m6u9DE1rF+RmtIkBpVdA=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/atc0005/go-teams-notify/v2 v2.13.0 h1:nbDeHy89NjYlF/PEfLVF6lsserY9O5SnN1iOIw3AxXw=
 github.com/atc0005/go-teams-notify/v2 v2.13.0/go.mod h1:WSv9moolRsBcpZbwEf6gZxj7h0uJlJskJq5zkEWKO8Y=
 github.com/aws/aws-lambda-go v1.47.0 h1:0H8s0vumYx/YKs4sE7YM0ktwL2eWse+kfopsRI1sXVI=
@@ -639,6 +641,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesis v1.33.0 h1:JPXkrQk5OS/+Q81fKH97Ll/V
 github.com/aws/aws-sdk-go-v2/service/kinesis v1.33.0/go.mod h1:dJngkoVMrq0K7QvRkdRZYM4NUp6cdWa2GBdpm8zoY8U=
 github.com/aws/aws-sdk-go-v2/service/kms v1.35.3 h1:UPTdlTOwWUX49fVi7cymEN6hDqCwe3LNv1vi7TXUutk=
 github.com/aws/aws-sdk-go-v2/service/kms v1.35.3/go.mod h1:gjDP16zn+WWalyaUqwCCioQ8gU8lzttCCc9jYsiQI/8=
+github.com/aws/aws-sdk-go-v2/service/kms v1.38.1 h1:tecq7+mAav5byF+Mr+iONJnCBf4B4gon8RSp4BrweSc=
+github.com/aws/aws-sdk-go-v2/service/kms v1.38.1/go.mod h1:cQn6tAF77Di6m4huxovNM7NVAozWTZLsDRp9t8Z/WYk=
 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.4 h1:NgRFYyFpiMD62y4VPXh4DosPFbZd4vdMVBWKk0VmWXc=
 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.4/go.mod h1:TKKN7IQoM7uTnyuFm9bm9cw5P//ZYTl4m3htBWQ1G/c=
 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.35.2 h1:vlYXbindmagyVA3RS2SPd47eKZ00GZZQcr+etTviHtc=
@@ -1191,6 +1195,8 @@ github.com/mithrandie/readline-csvq v1.3.0 h1:VTJEOGouJ8j27jJCD4kBBbNTxM0OdBvE1a
 github.com/mithrandie/readline-csvq v1.3.0/go.mod h1:FKyYqDgf/G4SNov7SMFXRWO6LQLXIOeTog/NB97FZl0=
 github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
 github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU=
+github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
 github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
 github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
 github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
@@ -1203,6 +1209,7 @@ github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8
 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I=
 github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8 h1:P48LjvUQpTReR3TQRbxSeSBsMXzfK0uol7eRcr7VBYQ=
 github.com/natefinch/atomic v1.0.1 h1:ZPYKxkqQOx3KZ+RsbnP/YsgvxWQPGxjC0oBt2AhwV0A=
 github.com/natefinch/atomic v1.0.1/go.mod h1:N/D/ELrljoqDyT3rZrsUmtsuzvHkeB/wWjHV22AZRbM=
diff --git a/pkg/apimachinery/utils/folder_key.go b/pkg/apimachinery/utils/folder_key.go
new file mode 100644
index 00000000000..a7f6d4cd03e
--- /dev/null
+++ b/pkg/apimachinery/utils/folder_key.go
@@ -0,0 +1,20 @@
+package utils
+
+import (
+	"context"
+)
+
+type folderRemovePermissions string
+
+const removePermissionKey = folderRemovePermissions("RemovePermission")
+
+func SetFolderRemovePermissions(ctx context.Context, value bool) context.Context {
+	return context.WithValue(ctx, removePermissionKey, value)
+}
+
+func GetFolderRemovePermissions(ctx context.Context, defaultVal bool) bool {
+	if val, ok := ctx.Value(removePermissionKey).(bool); ok {
+		return val
+	}
+	return defaultVal
+}
diff --git a/pkg/build/go.mod b/pkg/build/go.mod
index 909811de4a1..3012a2bab49 100644
--- a/pkg/build/go.mod
+++ b/pkg/build/go.mod
@@ -62,7 +62,7 @@ require (
 	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
diff --git a/pkg/build/go.sum b/pkg/build/go.sum
index d49747c61fb..abb46b91775 100644
--- a/pkg/build/go.sum
+++ b/pkg/build/go.sum
@@ -207,8 +207,8 @@ github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQ
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
-github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
+github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
diff --git a/pkg/cmd/grafana-cli/commands/datamigrations/to_unified_storage.go b/pkg/cmd/grafana-cli/commands/datamigrations/to_unified_storage.go
index 89053e6b932..f6bdc211f15 100644
--- a/pkg/cmd/grafana-cli/commands/datamigrations/to_unified_storage.go
+++ b/pkg/cmd/grafana-cli/commands/datamigrations/to_unified_storage.go
@@ -81,6 +81,7 @@ func ToUnifiedStorage(c utils.CommandLine, cfg *setting.Cfg, sqlStore db.DB) err
 		provisioning,
 		nil, // no librarypanels.Service
 		sort.ProvideService(),
+		nil, // we don't delete during migration, and this is only need to delete permission.
 		acimpl.ProvideAccessControl(featuremgmt.WithFeatures()),
 		featureToggles,
 	)
diff --git a/pkg/extensions/enterprise_imports.go b/pkg/extensions/enterprise_imports.go
index 3585c68ebf3..d33ccf561aa 100644
--- a/pkg/extensions/enterprise_imports.go
+++ b/pkg/extensions/enterprise_imports.go
@@ -27,6 +27,7 @@ import (
 	_ "github.com/robfig/cron/v3"
 	_ "github.com/russellhaering/goxmldsig"
 	_ "github.com/spf13/cobra" // used by the standalone apiserver cli
+	_ "github.com/spyzhov/ajson"
 	_ "github.com/stretchr/testify/require"
 	_ "gocloud.dev/secrets/awskms"
 	_ "gocloud.dev/secrets/azurekeyvault"
@@ -52,5 +53,4 @@ import (
 	_ "github.com/grafana/e2e"
 	_ "github.com/grafana/gofpdf"
 	_ "github.com/grafana/gomemcache/memcache"
-	_ "github.com/spyzhov/ajson"
 )
diff --git a/pkg/registry/apis/dashboard/dashboard_storage.go b/pkg/registry/apis/dashboard/dashboard_storage.go
new file mode 100644
index 00000000000..d2d54c8d815
--- /dev/null
+++ b/pkg/registry/apis/dashboard/dashboard_storage.go
@@ -0,0 +1,35 @@
+package dashboard
+
+import (
+	"context"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+)
+
+// dashboardStoragePermissionWrapper is a wrapper around the grafanarest.Storage that adds dashboard permissions handling
+// when dual writing is enabled.
+type dashboardStoragePermissionWrapper struct {
+	dashboardPermissionsSvc accesscontrol.DashboardPermissionsService
+	grafanarest.Storage
+}
+
+func (d dashboardStoragePermissionWrapper) Delete(ctx context.Context, name string, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions) (runtime.Object, bool, error) {
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, false, err
+	}
+	obj, async, err := d.Storage.Delete(ctx, name, deleteValidation, options)
+	if err != nil {
+		return obj, async, err
+	}
+	if accessErr := d.dashboardPermissionsSvc.DeleteResourcePermissions(ctx, info.OrgID, name); accessErr != nil {
+		return obj, async, accessErr
+	}
+	return obj, async, nil
+}
diff --git a/pkg/registry/apis/dashboard/legacy/migrate.go b/pkg/registry/apis/dashboard/legacy/migrate.go
index 73d01caaade..bdc47bf985a 100644
--- a/pkg/registry/apis/dashboard/legacy/migrate.go
+++ b/pkg/registry/apis/dashboard/legacy/migrate.go
@@ -11,6 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	authlib "github.com/grafana/authlib/types"
+
 	dashboard "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
 	folders "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
@@ -51,11 +52,12 @@ func ProvideLegacyMigrator(
 	sql db.DB, // direct access to tables
 	provisioning provisioning.ProvisioningService, // only needed for dashboard settings
 	libraryPanelSvc librarypanels.Service,
+	dashboardPermissionSvc accesscontrol.DashboardPermissionsService,
 	accessControl accesscontrol.AccessControl,
 	features featuremgmt.FeatureToggles,
 ) LegacyMigrator {
 	dbp := legacysql.NewDatabaseProvider(sql)
-	return NewDashboardAccess(dbp, authlib.OrgNamespaceFormatter, nil, provisioning, libraryPanelSvc, sort.ProvideService(), accessControl, features)
+	return NewDashboardAccess(dbp, authlib.OrgNamespaceFormatter, nil, provisioning, libraryPanelSvc, sort.ProvideService(), dashboardPermissionSvc, accessControl, features)
 }
 
 type BlobStoreInfo struct {
diff --git a/pkg/registry/apis/dashboard/legacy/sql_dashboards.go b/pkg/registry/apis/dashboard/legacy/sql_dashboards.go
index f019a39a799..ae5e54393e3 100644
--- a/pkg/registry/apis/dashboard/legacy/sql_dashboards.go
+++ b/pkg/registry/apis/dashboard/legacy/sql_dashboards.go
@@ -15,6 +15,7 @@ import (
 	"k8s.io/utils/ptr"
 
 	claims "github.com/grafana/authlib/types"
+
 	dashboardOG "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard"
 	dashboardV0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
 	dashboardV1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
@@ -66,8 +67,9 @@ type dashboardSqlAccess struct {
 	invalidDashboardParseFallbackEnabled bool
 
 	// Use for writing (not reading)
-	dashStore             dashboards.Store
-	dashboardSearchClient legacysearcher.DashboardSearchClient
+	dashStore              dashboards.Store
+	dashboardSearchClient  legacysearcher.DashboardSearchClient
+	dashboardPermissionSvc accesscontrol.DashboardPermissionsService
 
 	accessControl   accesscontrol.AccessControl
 	libraryPanelSvc librarypanels.Service
@@ -84,6 +86,7 @@ func NewDashboardAccess(sql legacysql.LegacyDatabaseProvider,
 	provisioning provisioning.ProvisioningService,
 	libraryPanelSvc librarypanels.Service,
 	sorter sort.Service,
+	dashboardPermissionSvc accesscontrol.DashboardPermissionsService,
 	accessControl accesscontrol.AccessControl,
 	features featuremgmt.FeatureToggles,
 ) DashboardAccess {
@@ -94,6 +97,7 @@ func NewDashboardAccess(sql legacysql.LegacyDatabaseProvider,
 		dashStore:                            dashStore,
 		provisioning:                         provisioning,
 		dashboardSearchClient:                *dashboardSearchClient,
+		dashboardPermissionSvc:               dashboardPermissionSvc,
 		libraryPanelSvc:                      libraryPanelSvc,
 		accessControl:                        accessControl,
 		log:                                  log.New("dashboard.legacysql"),
diff --git a/pkg/registry/apis/dashboard/register.go b/pkg/registry/apis/dashboard/register.go
index f2ed3ee138c..3014893ea71 100644
--- a/pkg/registry/apis/dashboard/register.go
+++ b/pkg/registry/apis/dashboard/register.go
@@ -20,6 +20,7 @@ import (
 	"k8s.io/kube-openapi/pkg/validation/spec"
 
 	claims "github.com/grafana/authlib/types"
+
 	internal "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard"
 	dashv0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
 	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
@@ -82,6 +83,7 @@ type DashboardsAPIBuilder struct {
 	unified                      resource.ResourceClient
 	dashboardProvisioningService dashboards.DashboardProvisioningService
 	dashboardPermissions         dashboards.PermissionsRegistrationService
+	dashboardPermissionsSvc      accesscontrol.DashboardPermissionsService
 	scheme                       *runtime.Scheme
 	search                       *SearchHandler
 	dashStore                    dashboards.Store
@@ -105,6 +107,7 @@ func RegisterAPIService(
 	pluginStore pluginstore.Store,
 	datasourceService datasources.DataSourceService,
 	dashboardPermissions dashboards.PermissionsRegistrationService,
+	dashboardPermissionsSvc accesscontrol.DashboardPermissionsService,
 	accessControl accesscontrol.AccessControl,
 	accessClient claims.AccessClient,
 	provisioning provisioning.ProvisioningService,
@@ -130,6 +133,7 @@ func RegisterAPIService(
 
 		dashboardService:             dashboardService,
 		dashboardPermissions:         dashboardPermissions,
+		dashboardPermissionsSvc:      dashboardPermissionsSvc,
 		features:                     features,
 		accessControl:                accessControl,
 		accessClient:                 accessClient,
@@ -145,7 +149,7 @@ func RegisterAPIService(
 		folderClient:                 folderClient,
 
 		legacy: &DashboardStorage{
-			Access:           legacy.NewDashboardAccess(dbp, namespacer, dashStore, provisioning, libraryPanelSvc, sorter, accessControl, features),
+			Access:           legacy.NewDashboardAccess(dbp, namespacer, dashStore, provisioning, libraryPanelSvc, sorter, dashboardPermissionsSvc, accessControl, features),
 			DashboardService: dashboardService,
 		},
 		reg: reg,
@@ -530,10 +534,14 @@ func (b *DashboardsAPIBuilder) storageForVersion(
 	}
 
 	gr := dashboards.GroupResource()
-	storage[dashboards.StoragePath()], err = opts.DualWriteBuilder(gr, legacyStore, store)
+	dw, err := opts.DualWriteBuilder(gr, legacyStore, store)
 	if err != nil {
 		return err
 	}
+	storage[dashboards.StoragePath()] = dashboardStoragePermissionWrapper{
+		dashboardPermissionsSvc: b.dashboardPermissionsSvc,
+		Storage:                 dw,
+	}
 
 	// Register the DTO endpoint that will consolidate all dashboard bits
 	storage[dashboards.StoragePath("dto")], err = NewDTOConnector(
diff --git a/pkg/registry/apis/folders/folder_storage.go b/pkg/registry/apis/folders/folder_storage.go
index b2084051824..3e544d46cb8 100644
--- a/pkg/registry/apis/folders/folder_storage.go
+++ b/pkg/registry/apis/folders/folder_storage.go
@@ -10,11 +10,13 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 
 	claims "github.com/grafana/authlib/types"
+
 	folders "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1"
 	"github.com/grafana/grafana/pkg/api/apierrors"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/services/dashboards/dashboardaccess"
@@ -127,7 +129,23 @@ func (s *folderStorage) Update(ctx context.Context,
 
 // GracefulDeleter
 func (s *folderStorage) Delete(ctx context.Context, name string, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions) (runtime.Object, bool, error) {
-	return s.store.Delete(ctx, name, deleteValidation, options)
+	info, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, false, err
+	}
+
+	obj, async, err := s.store.Delete(ctx, name, deleteValidation, options)
+	if err != nil {
+		return obj, async, err
+	}
+
+	if accessErr := s.folderPermissionsSvc.DeleteResourcePermissions(ctx, info.OrgID, name); accessErr != nil {
+		// TODO: add a proper logger to this struct.
+		logger := log.New().FromContext(ctx)
+		logger.Warn("failed to delete folder permission after successfully deleting folder resource", "folder", name, "error", accessErr)
+	}
+
+	return obj, async, err
 }
 
 // GracefulDeleter
diff --git a/pkg/registry/apis/folders/legacy_storage.go b/pkg/registry/apis/folders/legacy_storage.go
index d8ebda1fd65..4ae4a94a7f5 100644
--- a/pkg/registry/apis/folders/legacy_storage.go
+++ b/pkg/registry/apis/folders/legacy_storage.go
@@ -315,13 +315,15 @@ func (s *legacyStorage) Delete(ctx context.Context, name string, deleteValidatio
 	if !ok {
 		return v, false, fmt.Errorf("expected a folder response from Get")
 	}
+
 	err = s.service.DeleteLegacy(ctx, &folder.DeleteFolderCommand{
 		UID:          name,
 		OrgID:        info.OrgID,
 		SignedInUser: user,
 
 		// This would cascade delete into alert rules
-		ForceDeleteRules: false,
+		ForceDeleteRules:  false,
+		RemovePermissions: utils.GetFolderRemovePermissions(ctx, true),
 	})
 	return p, true, err // true is instant delete
 }
diff --git a/pkg/server/wire_gen.go b/pkg/server/wire_gen.go
index 9779e16a121..11a06b02dbb 100644
--- a/pkg/server/wire_gen.go
+++ b/pkg/server/wire_gen.go
@@ -785,7 +785,7 @@ func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api
 	identitySynchronizer := authnimpl.ProvideIdentitySynchronizer(authnimplService)
 	ldapImpl := service12.ProvideService(cfg, featureToggles, ssosettingsimplService)
 	apiService := api4.ProvideService(cfg, routeRegisterImpl, accessControl, userService, authinfoimplService, ossGroups, identitySynchronizer, orgService, ldapImpl, userAuthTokenService, bundleregistryService)
-	dashboardsAPIBuilder := dashboard.RegisterAPIService(cfg, featureToggles, apiserverService, dashboardService, dashboardProvisioningService, pluginstoreService, service15, dashboardServiceImpl, accessControl, accessClient, provisioningServiceImpl, dashboardsStore, registerer, sqlStore, tracingService, resourceClient, dualwriteService, sortService, quotaService, dashboardFolderStoreImpl, libraryPanelService, eventualRestConfigProvider, userService)
+	dashboardsAPIBuilder := dashboard.RegisterAPIService(cfg, featureToggles, apiserverService, dashboardService, dashboardProvisioningService, pluginstoreService, service15, dashboardServiceImpl, dashboardPermissionsService, accessControl, accessClient, provisioningServiceImpl, dashboardsStore, registerer, sqlStore, tracingService, resourceClient, dualwriteService, sortService, quotaService, dashboardFolderStoreImpl, libraryPanelService, eventualRestConfigProvider, userService)
 	snapshotsAPIBuilder := dashboardsnapshot.RegisterAPIService(serviceImpl, apiserverService, cfg, featureToggles, sqlStore, registerer)
 	featureFlagAPIBuilder := featuretoggle.RegisterAPIService(featureManager, accessControl, apiserverService, cfg, registerer)
 	dataSourceAPIBuilder, err := datasource.RegisterAPIService(featureToggles, apiserverService, middlewareHandler, scopedPluginDatasourceProvider, plugincontextProvider, pluginstoreService, accessControl, registerer)
@@ -805,7 +805,7 @@ func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api
 	}
 	userStorageAPIBuilder := userstorage.RegisterAPIService(featureToggles, apiserverService, registerer)
 	factory := github.ProvideFactory()
-	legacyMigrator := legacy.ProvideLegacyMigrator(sqlStore, provisioningServiceImpl, libraryPanelService, accessControl, featureToggles)
+	legacyMigrator := legacy.ProvideLegacyMigrator(sqlStore, provisioningServiceImpl, libraryPanelService, dashboardPermissionsService, accessControl, featureToggles)
 	decryptAuthorizer := decrypt.ProvideDecryptAuthorizer(tracer)
 	decryptStorage, err := metadata.ProvideDecryptStorage(tracer, ossKeeperService, keeperMetadataStorage, secureValueMetadataStorage, decryptAuthorizer, registerer)
 	if err != nil {
@@ -1364,7 +1364,7 @@ func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interfac
 	identitySynchronizer := authnimpl.ProvideIdentitySynchronizer(authnimplService)
 	ldapImpl := service12.ProvideService(cfg, featureToggles, ssosettingsimplService)
 	apiService := api4.ProvideService(cfg, routeRegisterImpl, accessControl, userService, authinfoimplService, ossGroups, identitySynchronizer, orgService, ldapImpl, userAuthTokenService, bundleregistryService)
-	dashboardsAPIBuilder := dashboard.RegisterAPIService(cfg, featureToggles, apiserverService, dashboardService, dashboardProvisioningService, pluginstoreService, service15, dashboardServiceImpl, accessControl, accessClient, provisioningServiceImpl, dashboardsStore, registerer, sqlStore, tracingService, resourceClient, dualwriteService, sortService, quotaService, dashboardFolderStoreImpl, libraryPanelService, eventualRestConfigProvider, userService)
+	dashboardsAPIBuilder := dashboard.RegisterAPIService(cfg, featureToggles, apiserverService, dashboardService, dashboardProvisioningService, pluginstoreService, service15, dashboardServiceImpl, dashboardPermissionsService, accessControl, accessClient, provisioningServiceImpl, dashboardsStore, registerer, sqlStore, tracingService, resourceClient, dualwriteService, sortService, quotaService, dashboardFolderStoreImpl, libraryPanelService, eventualRestConfigProvider, userService)
 	snapshotsAPIBuilder := dashboardsnapshot.RegisterAPIService(serviceImpl, apiserverService, cfg, featureToggles, sqlStore, registerer)
 	featureFlagAPIBuilder := featuretoggle.RegisterAPIService(featureManager, accessControl, apiserverService, cfg, registerer)
 	dataSourceAPIBuilder, err := datasource.RegisterAPIService(featureToggles, apiserverService, middlewareHandler, scopedPluginDatasourceProvider, plugincontextProvider, pluginstoreService, accessControl, registerer)
@@ -1384,7 +1384,7 @@ func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interfac
 	}
 	userStorageAPIBuilder := userstorage.RegisterAPIService(featureToggles, apiserverService, registerer)
 	factory := github.ProvideFactory()
-	legacyMigrator := legacy.ProvideLegacyMigrator(sqlStore, provisioningServiceImpl, libraryPanelService, accessControl, featureToggles)
+	legacyMigrator := legacy.ProvideLegacyMigrator(sqlStore, provisioningServiceImpl, libraryPanelService, dashboardPermissionsService, accessControl, featureToggles)
 	decryptAuthorizer := decrypt.ProvideDecryptAuthorizer(tracer)
 	decryptStorage, err := metadata.ProvideDecryptStorage(tracer, ossKeeperService, keeperMetadataStorage, secureValueMetadataStorage, decryptAuthorizer, registerer)
 	if err != nil {
diff --git a/pkg/services/dashboards/database/database.go b/pkg/services/dashboards/database/database.go
index a8c7419921d..b6bfc346f51 100644
--- a/pkg/services/dashboards/database/database.go
+++ b/pkg/services/dashboards/database/database.go
@@ -589,14 +589,20 @@ func (d *dashboardStore) deleteDashboard(cmd *dashboards.DeleteDashboardCommand,
 			return err
 		}
 
-		// remove all access control permission with folder scope
-		err := d.deleteResourcePermissions(sess, dashboard.OrgID, dashboards.ScopeFoldersProvider.GetResourceScopeUID(dashboard.UID))
-		if err != nil {
-			return err
+		// While migrating to unified storage, we might execute commands in both stores, so we delete the permissions
+		// only when the command is executed on both stores, thus we can skip it here.
+		if cmd.RemovePermissions {
+			if err := d.deleteResourcePermissions(sess, dashboard.OrgID, dashboards.ScopeFoldersProvider.GetResourceScopeUID(dashboard.UID)); err != nil {
+				return err
+			}
 		}
 	} else {
-		if err := d.deleteResourcePermissions(sess, dashboard.OrgID, ac.GetResourceScopeUID("dashboards", dashboard.UID)); err != nil {
-			return err
+		// While migrating to unified storage, we might execute commands in both stores, so we delete the permissions
+		// only when the command is executed on both stores, thus we can skip it here.
+		if cmd.RemovePermissions {
+			if err := d.deleteResourcePermissions(sess, dashboard.OrgID, ac.GetResourceScopeUID("dashboards", dashboard.UID)); err != nil {
+				return err
+			}
 		}
 	}
 
diff --git a/pkg/services/dashboards/models.go b/pkg/services/dashboards/models.go
index 9dbe4696d1b..f48fafc6a81 100644
--- a/pkg/services/dashboards/models.go
+++ b/pkg/services/dashboards/models.go
@@ -233,6 +233,7 @@ type DeleteDashboardCommand struct {
 	UID                    string
 	OrgID                  int64
 	ForceDeleteFolderRules bool
+	RemovePermissions      bool
 }
 
 type DeleteOrphanedProvisionedDashboardsCommand struct {
diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index 62fc24bbd86..3cf952ebd64 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -996,7 +996,7 @@ func (s *Service) legacyDelete(ctx context.Context, cmd *folder.DeleteFolderComm
 	// Delete all dashboards in the folders
 	for _, folderUID := range folderUIDs {
 		// nolint:staticcheck
-		deleteCmd := dashboards.DeleteDashboardCommand{OrgID: cmd.OrgID, UID: folderUID, ForceDeleteFolderRules: cmd.ForceDeleteRules}
+		deleteCmd := dashboards.DeleteDashboardCommand{OrgID: cmd.OrgID, UID: folderUID, ForceDeleteFolderRules: cmd.ForceDeleteRules, RemovePermissions: cmd.RemovePermissions}
 		if err := s.dashboardStore.DeleteDashboard(ctx, &deleteCmd); err != nil {
 			return toFolderError(err)
 		}
diff --git a/pkg/services/folder/model.go b/pkg/services/folder/model.go
index b19cf1ddae0..3d09d372896 100644
--- a/pkg/services/folder/model.go
+++ b/pkg/services/folder/model.go
@@ -170,7 +170,8 @@ type DeleteFolderCommand struct {
 	OrgID            int64  `json:"orgId" xorm:"org_id"`
 	ForceDeleteRules bool   `json:"forceDeleteRules"`
 
-	SignedInUser identity.Requester `json:"-"`
+	SignedInUser      identity.Requester `json:"-"`
+	RemovePermissions bool               `json:"-"`
 }
 
 // GetFolderQuery is used for all folder Get requests. Only one of UID, ID, or
diff --git a/pkg/storage/legacysql/dualwrite/dualwriter.go b/pkg/storage/legacysql/dualwrite/dualwriter.go
index afb97bb5432..7907db3af65 100644
--- a/pkg/storage/legacysql/dualwrite/dualwriter.go
+++ b/pkg/storage/legacysql/dualwrite/dualwriter.go
@@ -277,10 +277,20 @@ func (d *dualWriter) Delete(ctx context.Context, name string, deleteValidation r
 	// we want to delete from legacy first, otherwise if the delete from unistore was successful,
 	// but legacy failed, the user would get a failure, but not be able to retry the delete
 	// as they would not be able to see the object in unistore anymore.
+
+	// By setting RemovePermissions to false in the context, we will skip the deletion of permissions
+	// in the legacy store. This is needed as otherwise the permissions would be missing when executing
+	// the delete operation in the unified storage store.
+	ctx = utils.SetFolderRemovePermissions(ctx, false)
+
 	objFromLegacy, asyncLegacy, err := d.legacy.Delete(ctx, name, deleteValidation, options)
 	if err != nil && (!d.readUnified || !d.errorIsOK && !apierrors.IsNotFound(err)) {
 		return nil, false, err
 	}
+
+	// We can now flip it again.
+	ctx = utils.SetFolderRemovePermissions(ctx, true)
+
 	// If unified storage is our primary store, just delete it and return
 	if d.readUnified {
 		objFromStorage, asyncStorage, err := d.unified.Delete(ctx, name, deleteValidation, options)

From e1843bf1ae63afb46c3bdde7ff14905b48df3b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Fri, 15 Aug 2025 18:05:12 +0200
Subject: [PATCH 206/243] datasources: allow special http header to opt-in to
 new-mode query handling (#109349)

datasources: allow opt-in to new features using a http header

Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>
---
 pkg/api/ds_query.go                      | 11 ++++++++-
 pkg/services/query/query.go              | 19 +++++++++++----
 pkg/services/query/query_service_mock.go | 30 ++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/pkg/api/ds_query.go b/pkg/api/ds_query.go
index eee746165b2..23827fdcb34 100644
--- a/pkg/api/ds_query.go
+++ b/pkg/api/ds_query.go
@@ -71,7 +71,16 @@ func (hs *HTTPServer) QueryMetricsV2(c *contextmodel.ReqContext) response.Respon
 		return response.Error(http.StatusBadRequest, "bad request data", err)
 	}
 
-	resp, err := hs.queryDataService.QueryData(c.Req.Context(), c.SignedInUser, c.SkipDSCache, reqDTO)
+	handleTimeInQuery := c.Req.Header.Get("X-Query-V2") == "true"
+
+	var resp *backend.QueryDataResponse
+	var err error
+	if handleTimeInQuery {
+		resp, err = hs.queryDataService.QueryDataNew(c.Req.Context(), c.SignedInUser, c.SkipDSCache, reqDTO)
+	} else {
+		resp, err = hs.queryDataService.QueryData(c.Req.Context(), c.SignedInUser, c.SkipDSCache, reqDTO)
+	}
+
 	if err != nil {
 		return hs.handleQueryMetricsError(err)
 	}
diff --git a/pkg/services/query/query.go b/pkg/services/query/query.go
index 55fdb542c4f..6bbe0252755 100644
--- a/pkg/services/query/query.go
+++ b/pkg/services/query/query.go
@@ -70,6 +70,9 @@ func ProvideService(
 type Service interface {
 	Run(ctx context.Context) error
 	QueryData(ctx context.Context, user identity.Requester, skipDSCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error)
+
+	// this is more "forward compatible", for example supports per-query time ranges
+	QueryDataNew(ctx context.Context, user identity.Requester, skipDSCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error)
 }
 
 // Gives us compile time error if the service does not adhere to the contract of the interface
@@ -86,7 +89,6 @@ type ServiceImpl struct {
 	concurrentQueryLimit       int
 	mtDatasourceClientBuilder  mtdsclient.MTDatasourceClientBuilder
 	headers                    map[string]string
-	supportLocalTimeRange      bool
 }
 
 // Run ServiceImpl.
@@ -96,7 +98,7 @@ func (s *ServiceImpl) Run(ctx context.Context) error {
 }
 
 // QueryData processes queries and returns query responses. It handles queries to single or mixed datasources, as well as expressions.
-func (s *ServiceImpl) QueryData(ctx context.Context, user identity.Requester, skipDSCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error) {
+func (s *ServiceImpl) queryData(ctx context.Context, user identity.Requester, skipDSCache bool, reqDTO dtos.MetricRequest, supportLocaltimeRange bool) (*backend.QueryDataResponse, error) {
 	fromAlert := false
 	for header, val := range s.headers {
 		if header == models.FromAlertHeaderName && val == "true" {
@@ -104,7 +106,7 @@ func (s *ServiceImpl) QueryData(ctx context.Context, user identity.Requester, sk
 		}
 	}
 	// Parse the request into parsed queries grouped by datasource uid
-	parsedReq, err := s.parseMetricRequest(ctx, user, skipDSCache, reqDTO, s.supportLocalTimeRange)
+	parsedReq, err := s.parseMetricRequest(ctx, user, skipDSCache, reqDTO, supportLocaltimeRange)
 	if err != nil {
 		return nil, err
 	}
@@ -121,6 +123,14 @@ func (s *ServiceImpl) QueryData(ctx context.Context, user identity.Requester, sk
 	return s.executeConcurrentQueries(ctx, user, skipDSCache, reqDTO, parsedReq.parsedQueries)
 }
 
+func (s *ServiceImpl) QueryData(ctx context.Context, user identity.Requester, skipDSCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error) {
+	return s.queryData(ctx, user, skipDSCache, reqDTO, false)
+}
+
+func (s *ServiceImpl) QueryDataNew(ctx context.Context, user identity.Requester, skipDSCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error) {
+	return s.queryData(ctx, user, skipDSCache, reqDTO, true)
+}
+
 // splitResponse contains the results of a concurrent data source query - the response and any headers
 type splitResponse struct {
 	responses backend.Responses
@@ -223,9 +233,8 @@ func QueryData(ctx context.Context, log log.Logger, dscache datasources.CacheSer
 		mtDatasourceClientBuilder:  mtDatasourceClientBuilder,
 		headers:                    headers,
 		concurrentQueryLimit:       16, // TODO: make it configurable
-		supportLocalTimeRange:      true,
 	}
-	return s.QueryData(ctx, nil, false, reqDTO)
+	return s.QueryDataNew(ctx, nil, false, reqDTO)
 }
 
 // handleExpressions handles queries when there is an expression.
diff --git a/pkg/services/query/query_service_mock.go b/pkg/services/query/query_service_mock.go
index 800c822290d..22c08118941 100644
--- a/pkg/services/query/query_service_mock.go
+++ b/pkg/services/query/query_service_mock.go
@@ -49,6 +49,36 @@ func (_m *FakeQueryService) QueryData(ctx context.Context, user identity.Request
 	return r0, r1
 }
 
+// QueryDataNew provides a mock function with given fields: ctx, user, skipDSCache, reqDTO
+func (_m *FakeQueryService) QueryDataNew(ctx context.Context, user identity.Requester, skipDSCache bool, reqDTO dtos.MetricRequest) (*backend.QueryDataResponse, error) {
+	ret := _m.Called(ctx, user, skipDSCache, reqDTO)
+
+	if len(ret) == 0 {
+		panic("no return value specified for QueryDataNew")
+	}
+
+	var r0 *backend.QueryDataResponse
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, identity.Requester, bool, dtos.MetricRequest) (*backend.QueryDataResponse, error)); ok {
+		return rf(ctx, user, skipDSCache, reqDTO)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, identity.Requester, bool, dtos.MetricRequest) *backend.QueryDataResponse); ok {
+		r0 = rf(ctx, user, skipDSCache, reqDTO)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*backend.QueryDataResponse)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, identity.Requester, bool, dtos.MetricRequest) error); ok {
+		r1 = rf(ctx, user, skipDSCache, reqDTO)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // Run provides a mock function with given fields: ctx
 func (_m *FakeQueryService) Run(ctx context.Context) error {
 	ret := _m.Called(ctx)

From 23c8ee8fc19ac8cefeb98e9d3453a73ed25f7de7 Mon Sep 17 00:00:00 2001
From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Date: Fri, 15 Aug 2025 12:26:59 -0400
Subject: [PATCH 207/243] Docs: Add config options alias (#109712)

---
 .../panels-visualizations/configure-standard-options/index.md    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/sources/panels-visualizations/configure-standard-options/index.md b/docs/sources/panels-visualizations/configure-standard-options/index.md
index 2e737ed7de2..c4ed1caa981 100644
--- a/docs/sources/panels-visualizations/configure-standard-options/index.md
+++ b/docs/sources/panels-visualizations/configure-standard-options/index.md
@@ -7,6 +7,7 @@ aliases:
   - ../panels/reference-standard-field-definitions/
   - ../panels/standard-field-definitions/
   - ../panels/working-with-panels/format-standard-fields/
+  - ../panels/field-configuration-options/ # /docs/grafana/latest/panels/field-configuration-options/
 keywords:
   - panel
   - dashboard

From 0eb79b3f532320dbc70584c519779e7a31d95f26 Mon Sep 17 00:00:00 2001
From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Date: Fri, 15 Aug 2025 12:27:35 -0400
Subject: [PATCH 208/243] Docs: Fix broken links (#109703)

---
 docs/sources/dashboards/_index.md                               | 2 +-
 .../sources/panels-visualizations/visualizations/table/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sources/dashboards/_index.md b/docs/sources/dashboards/_index.md
index e42a1d654d3..c919c48debb 100644
--- a/docs/sources/dashboards/_index.md
+++ b/docs/sources/dashboards/_index.md
@@ -1,7 +1,7 @@
 ---
 aliases:
   - features/dashboard/dashboards/ # /docs/grafana/latest/features/dashboard/dashboards/
-  - dashboards/previews/ # /docs/grafana/latest/dashboards/previews/
+  - ./dashboards/previews/ # /docs/grafana/latest/dashboards/previews/
 labels:
   products:
     - cloud
diff --git a/docs/sources/panels-visualizations/visualizations/table/index.md b/docs/sources/panels-visualizations/visualizations/table/index.md
index 438c059cfe2..cc6e5f46441 100644
--- a/docs/sources/panels-visualizations/visualizations/table/index.md
+++ b/docs/sources/panels-visualizations/visualizations/table/index.md
@@ -411,7 +411,7 @@ also toggle on **Pagination** to avoid performance issues in larger tables, sinc
 Dynamic height disables table {{< term "virtualization" >}}virtualization{{< /term >}}.
 
 By default, the HTML rendered is sanitized, and un-sanitized HTML can only be rendered
-in these cells if the [`disable_sanitize_html`](../../../setup-grafana/configure-grafana/_index.md#disable_sanitize_html) option is set to true for your Grafana instance.
+in these cells if the [`disable_sanitize_html`](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#disable_sanitize_html) option is set to true for your Grafana instance.
 
 #### Image
 

From 6d97f053498ab8fd103049ba21c23cab86a9bdea Mon Sep 17 00:00:00 2001
From: Paul Marbach <paul.marbach@grafana.com>
Date: Fri, 15 Aug 2025 16:38:57 -0400
Subject: [PATCH 209/243] Modal: Use default Portal root element to render
 Modals (#109271)

* Table: Fix z-index conflict between DataLinksActionTooltip and ActionConfirmModal

* add an action to the kitchen sink Info column

* don't need the class for z-index

* fix this issue across a variety of viz types

* kill tooltip container in TableNG

---------

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 .../panel-table/table_kitchen_sink.json        | 18 +++++++++++++++++-
 .../src/components/Portal/Portal.tsx           |  4 +++-
 .../Table/DataLinksActionsTooltip.tsx          |  6 +++---
 .../uPlot/plugins/TooltipPlugin2.tsx           |  2 +-
 public/app/AppWrapper.tsx                      | 17 ++++++++++-------
 .../panel/canvas/components/CanvasTooltip.tsx  |  6 +++---
 6 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/devenv/dev-dashboards/panel-table/table_kitchen_sink.json b/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
index 257893982e0..2e2fb5ccd8f 100644
--- a/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
+++ b/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
@@ -100,6 +100,22 @@
                     "url": "https://google.com/search?q=${__value:percentencode}"
                   }
                 ]
+              },
+              {
+                "id": "actions",
+                "value": [
+                  {
+                    "fetch": {
+                      "body": "{}",
+                      "headers": [["Content-Type", "application/json"]],
+                      "method": "GET",
+                      "queryParams": [],
+                      "url": "https://grafana.com"
+                    },
+                    "title": "My action",
+                    "type": "fetch"
+                  }
+                ]
               }
             ]
           },
@@ -1673,5 +1689,5 @@
   "timezone": "",
   "title": "Panel Tests - Table - Kitchen Sink",
   "uid": "dcb9f5e9-8066-4397-889e-864b99555dbb",
-  "version": 8
+  "version": 9
 }
diff --git a/packages/grafana-ui/src/components/Portal/Portal.tsx b/packages/grafana-ui/src/components/Portal/Portal.tsx
index a3f2215bd1f..351eda67b2d 100644
--- a/packages/grafana-ui/src/components/Portal/Portal.tsx
+++ b/packages/grafana-ui/src/components/Portal/Portal.tsx
@@ -11,6 +11,8 @@ import { useStyles2, useTheme2 } from '../../themes/ThemeContext';
 interface Props {
   className?: string;
   root?: HTMLElement;
+  // the zIndex of the node; defaults to theme.zIndex.portal
+  zIndex?: number;
   forwardedRef?: React.ForwardedRef<HTMLDivElement>;
 }
 
@@ -26,7 +28,7 @@ export function Portal(props: PropsWithChildren<Props>) {
       node.current.className = className;
     }
     node.current.style.position = 'relative';
-    node.current.style.zIndex = `${theme.zIndex.portal}`;
+    node.current.style.zIndex = `${props.zIndex ?? theme.zIndex.portal}`;
   }
 
   useLayoutEffect(() => {
diff --git a/packages/grafana-ui/src/components/Table/DataLinksActionsTooltip.tsx b/packages/grafana-ui/src/components/Table/DataLinksActionsTooltip.tsx
index 6686f76d49b..d0c9a479042 100644
--- a/packages/grafana-ui/src/components/Table/DataLinksActionsTooltip.tsx
+++ b/packages/grafana-ui/src/components/Table/DataLinksActionsTooltip.tsx
@@ -5,7 +5,7 @@ import { useMemo, ReactNode } from 'react';
 import { ActionModel, GrafanaTheme2, LinkModel } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
-import { useStyles2 } from '../../themes/ThemeContext';
+import { useStyles2, useTheme2 } from '../../themes/ThemeContext';
 import { Portal } from '../Portal/Portal';
 import { VizTooltipFooter } from '../VizTooltip/VizTooltipFooter';
 import { VizTooltipWrapper } from '../VizTooltip/VizTooltipWrapper';
@@ -25,6 +25,7 @@ interface Props {
  * @internal
  */
 export const DataLinksActionsTooltip = ({ links, actions, value, coords, onTooltipClose }: Props) => {
+  const theme = useTheme2();
   const styles = useStyles2(getStyles);
 
   // the order of middleware is important!
@@ -83,7 +84,7 @@ export const DataLinksActionsTooltip = ({ links, actions, value, coords, onToolt
     <>
       {/* TODO: we can remove `value` from this component when tableNextGen is fully rolled out */}
       {value}
-      <Portal>
+      <Portal zIndex={theme.zIndex.tooltip}>
         <div
           ref={refCallback}
           {...getReferenceProps()}
@@ -119,7 +120,6 @@ export const renderSingleLink = (link: LinkModel, children: ReactNode, className
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     tooltipWrapper: css({
-      zIndex: theme.zIndex.portal,
       whiteSpace: 'pre',
       borderRadius: theme.shape.radius.default,
       background: theme.colors.background.primary,
diff --git a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx
index 703b6a85ed1..17147e8661b 100644
--- a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx
+++ b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx
@@ -749,7 +749,7 @@ const getStyles = (theme: GrafanaTheme2, maxWidth?: number) => ({
   tooltipWrapper: css({
     top: 0,
     left: 0,
-    zIndex: theme.zIndex.portal,
+    zIndex: theme.zIndex.tooltip,
     whiteSpace: 'pre',
     borderRadius: theme.shape.radius.default,
     position: 'fixed',
diff --git a/public/app/AppWrapper.tsx b/public/app/AppWrapper.tsx
index 74a71d9711b..1d5a84f954b 100644
--- a/public/app/AppWrapper.tsx
+++ b/public/app/AppWrapper.tsx
@@ -1,3 +1,4 @@
+import { UNSAFE_PortalProvider } from '@react-aria/overlays';
 import { Action, KBarProvider } from 'kbar';
 import { Component, ComponentType, Fragment, ReactNode } from 'react';
 import CacheProvider from 'react-inlinesvg/provider';
@@ -5,7 +6,7 @@ import { Provider } from 'react-redux';
 import { Route, Routes } from 'react-router-dom-v5-compat';
 
 import { config, navigationLogger, reportInteraction } from '@grafana/runtime';
-import { ErrorBoundaryAlert, PortalContainer, TimeRangeProvider } from '@grafana/ui';
+import { ErrorBoundaryAlert, getPortalContainer, PortalContainer, TimeRangeProvider } from '@grafana/ui';
 import { getAppRoutes } from 'app/routes/routes';
 import { store } from 'app/store/store';
 
@@ -122,12 +123,14 @@ export class AppWrapper extends Component<AppWrapperProps, AppWrapperState> {
                     <ScopesContextProvider>
                       <ExtensionRegistriesProvider registries={pluginExtensionRegistries}>
                         <MaybeExtensionSidebarProvider>
-                          <GlobalStylesWrapper />
-                          <div className="grafana-app">
-                            <RouterWrapper {...routerWrapperProps} />
-                            <LiveConnectionWarning />
-                            <PortalContainer />
-                          </div>
+                          <UNSAFE_PortalProvider getContainer={getPortalContainer}>
+                            <GlobalStylesWrapper />
+                            <div className="grafana-app">
+                              <RouterWrapper {...routerWrapperProps} />
+                              <LiveConnectionWarning />
+                              <PortalContainer />
+                            </div>
+                          </UNSAFE_PortalProvider>
                         </MaybeExtensionSidebarProvider>
                       </ExtensionRegistriesProvider>
                     </ScopesContextProvider>
diff --git a/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx b/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx
index aa0e29741c5..32e953d6087 100644
--- a/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx
+++ b/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx
@@ -14,7 +14,7 @@ import {
   ValueLinkConfig,
   ActionModel,
 } from '@grafana/data';
-import { Portal, useStyles2, VizTooltipContainer } from '@grafana/ui';
+import { Portal, useStyles2, useTheme2, VizTooltipContainer } from '@grafana/ui';
 import {
   VizTooltipContent,
   VizTooltipFooter,
@@ -33,6 +33,7 @@ interface Props {
 }
 
 export const CanvasTooltip = ({ scene }: Props) => {
+  const theme = useTheme2();
   const styles = useStyles2(getStyles);
 
   const onClose = () => {
@@ -139,7 +140,7 @@ export const CanvasTooltip = ({ scene }: Props) => {
   return (
     <>
       {scene.tooltipPayload?.element && scene.tooltipPayload.anchorPoint && (
-        <Portal>
+        <Portal zIndex={theme.zIndex.tooltip}>
           <VizTooltipContainer
             className={cx(styles.tooltipWrapper, scene.tooltipPayload.isOpen && styles.pinned)}
             position={{ x: scene.tooltipPayload.anchorPoint.x, y: scene.tooltipPayload.anchorPoint.y }}
@@ -167,7 +168,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
   tooltipWrapper: css({
     top: 0,
     left: 0,
-    zIndex: theme.zIndex.portal,
     whiteSpace: 'pre',
     borderRadius: theme.shape.radius.default,
     position: 'fixed',

From 0d3eec0e3b26e31bd741604c059d84ff1e224a59 Mon Sep 17 00:00:00 2001
From: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>
Date: Fri, 15 Aug 2025 14:37:51 -0700
Subject: [PATCH 210/243] Geomap: Fix layer drag drop list (#109704)

---
 .../Layers/LayerDragDropList.test.tsx         | 66 ++++++++++++++++++-
 .../components/Layers/LayerDragDropList.tsx   |  8 ++-
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/public/app/core/components/Layers/LayerDragDropList.test.tsx b/public/app/core/components/Layers/LayerDragDropList.test.tsx
index ae581c0f579..b9fb1a07ec1 100644
--- a/public/app/core/components/Layers/LayerDragDropList.test.tsx
+++ b/public/app/core/components/Layers/LayerDragDropList.test.tsx
@@ -1,4 +1,5 @@
-import { render, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import { DATA_TEST_ID, LayerDragDropList, LayerDragDropListProps } from './LayerDragDropList';
 
@@ -47,6 +48,69 @@ describe('LayerDragDropList', () => {
     expect(screen.queryAllByLabelText('Drag and drop to reorder').length).toEqual(0);
   });
 
+  it('calls onDelete when delete button is clicked', async () => {
+    const user = userEvent.setup();
+    const { props } = renderScenario({ showActions: () => true });
+
+    const deleteButtons = screen.getAllByLabelText('Remove');
+    await user.click(deleteButtons[0]);
+
+    expect(props.onDelete).toHaveBeenCalledTimes(1);
+    expect(props.onDelete).toHaveBeenCalledWith({ name: layerTwoName, getName: expect.any(Function) });
+  });
+
+  it('calls onDuplicate when duplicate button is clicked', async () => {
+    const user = userEvent.setup();
+    const { props } = renderScenario({ showActions: () => true });
+
+    const duplicateButtons = screen.getAllByLabelText('Duplicate');
+    await user.click(duplicateButtons[0]);
+
+    expect(props.onDuplicate).toHaveBeenCalledTimes(1);
+    expect(props.onDuplicate).toHaveBeenCalledWith({ name: layerTwoName, getName: expect.any(Function) });
+  });
+
+  it('calls onSelect when layer row is clicked', async () => {
+    const user = userEvent.setup();
+    const { props } = renderScenario({});
+
+    const layerRows = screen.getAllByRole('button');
+    await user.click(layerRows[0]);
+
+    expect(props.onSelect).toHaveBeenCalledTimes(1);
+    expect(props.onSelect).toHaveBeenCalledWith({ name: layerTwoName, getName: expect.any(Function) });
+  });
+
+  it('calls onSelect when Enter key is pressed on layer row', () => {
+    const { props } = renderScenario({});
+
+    const layerRows = screen.getAllByRole('button');
+    fireEvent.keyDown(layerRows[0], { key: 'Enter' });
+
+    expect(props.onSelect).toHaveBeenCalledTimes(1);
+    expect(props.onSelect).toHaveBeenCalledWith({ name: layerTwoName, getName: expect.any(Function) });
+  });
+
+  it('calls onSelect when Space key is pressed on layer row', () => {
+    const { props } = renderScenario({});
+
+    const layerRows = screen.getAllByRole('button');
+    fireEvent.keyDown(layerRows[0], { key: ' ' });
+
+    expect(props.onSelect).toHaveBeenCalledTimes(1);
+    expect(props.onSelect).toHaveBeenCalledWith({ name: layerTwoName, getName: expect.any(Function) });
+  });
+
+  it('does not call onSelect when other keys are pressed on layer row', () => {
+    const { props } = renderScenario({});
+
+    const layerRows = screen.getAllByRole('button');
+    fireEvent.keyDown(layerRows[0], { key: 'Tab' });
+    fireEvent.keyDown(layerRows[0], { key: 'Escape' });
+
+    expect(props.onSelect).not.toHaveBeenCalled();
+  });
+
   function renderScenario(overrides: Partial<LayerDragDropListProps<testLayer>>) {
     const testLayers = [
       { name: layerOneName, getName: () => layerOneName },
diff --git a/public/app/core/components/Layers/LayerDragDropList.tsx b/public/app/core/components/Layers/LayerDragDropList.tsx
index 9966f7cb1ff..d90dfdf04af 100644
--- a/public/app/core/components/Layers/LayerDragDropList.tsx
+++ b/public/app/core/components/Layers/LayerDragDropList.tsx
@@ -66,7 +66,13 @@ export const LayerDragDropList = <T extends LayerElement>({
                         ref={provided.innerRef}
                         {...provided.draggableProps}
                         {...provided.dragHandleProps}
-                        onMouseDown={() => onSelect(element)}
+                        onClick={() => onSelect(element)}
+                        onKeyDown={(e) => {
+                          if (e.key === 'Enter' || e.key === ' ') {
+                            e.preventDefault();
+                            onSelect(element);
+                          }
+                        }}
                         role="button"
                         tabIndex={0}
                       >

From 9ba1987478b83143df7642d18b9f467fb4e2f054 Mon Sep 17 00:00:00 2001
From: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date: Fri, 15 Aug 2025 20:19:27 -0400
Subject: [PATCH 211/243] Alerting: Update alertRuleVersions.EqualSpec to
 ignore RuleGroupIndex (#109740)

---
 pkg/services/ngalert/store/models.go      |   3 +-
 pkg/services/ngalert/store/models_test.go | 223 ++++++++++++++++++++++
 2 files changed, 224 insertions(+), 2 deletions(-)
 create mode 100644 pkg/services/ngalert/store/models_test.go

diff --git a/pkg/services/ngalert/store/models.go b/pkg/services/ngalert/store/models.go
index 7f40ccd30ac..f7b6858a86e 100644
--- a/pkg/services/ngalert/store/models.go
+++ b/pkg/services/ngalert/store/models.go
@@ -72,14 +72,13 @@ type alertRuleVersion struct {
 }
 
 // EqualSpec compares two alertRuleVersion objects for equality based on their specifications and returns true if they match.
-// The comparison is very basic and can produce false-negative. Fields excluded: ID, ParentVersion, RestoredFrom, Version, Created and CreatedBy
+// The comparison is very basic and can produce false-negative. Fields excluded: ID, ParentVersion, RestoredFrom, Version, Created, RuleGroupIndex and CreatedBy
 func (a alertRuleVersion) EqualSpec(b alertRuleVersion) bool {
 	return a.RuleOrgID == b.RuleOrgID &&
 		a.RuleGUID == b.RuleGUID &&
 		a.RuleUID == b.RuleUID &&
 		a.RuleNamespaceUID == b.RuleNamespaceUID &&
 		a.RuleGroup == b.RuleGroup &&
-		a.RuleGroupIndex == b.RuleGroupIndex &&
 		a.Title == b.Title &&
 		a.Condition == b.Condition &&
 		a.Data == b.Data &&
diff --git a/pkg/services/ngalert/store/models_test.go b/pkg/services/ngalert/store/models_test.go
new file mode 100644
index 00000000000..e37598c3714
--- /dev/null
+++ b/pkg/services/ngalert/store/models_test.go
@@ -0,0 +1,223 @@
+package store
+
+import (
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana/pkg/util"
+)
+
+func TestAlertRuleVersion_EqualSpec(t *testing.T) {
+	baseVersion := alertRuleVersion{
+		RuleOrgID:                   1,
+		RuleGUID:                    "guid1",
+		RuleUID:                     "uid1",
+		RuleGroup:                   "group1",
+		Title:                       "Sample",
+		Condition:                   "cond",
+		Data:                        "data",
+		IntervalSeconds:             60,
+		Record:                      "record",
+		NoDataState:                 "state1",
+		ExecErrState:                "state2",
+		For:                         time.Minute,
+		Annotations:                 `{ "test": "annotation" }`,
+		Labels:                      `{ "test": "label" }`,
+		IsPaused:                    true,
+		NotificationSettings:        `{ some json object }`,
+		Metadata:                    `{ some json object }`,
+		MissingSeriesEvalsToResolve: util.Pointer(int64(10)),
+	}
+
+	tests := []struct {
+		name   string
+		a      alertRuleVersion
+		b      alertRuleVersion
+		expect bool
+	}{
+		{
+			name:   "equal versions",
+			a:      baseVersion,
+			b:      baseVersion,
+			expect: true,
+		},
+		{
+			name:   "different RuleOrgID",
+			a:      baseVersion,
+			b:      func() alertRuleVersion { v := baseVersion; v.RuleOrgID = 2; return v }(),
+			expect: false,
+		},
+		{
+			name:   "different RuleGUID",
+			a:      baseVersion,
+			b:      func() alertRuleVersion { v := baseVersion; v.RuleGUID = "guid2"; return v }(),
+			expect: false,
+		},
+		{
+			name:   "different Title",
+			a:      baseVersion,
+			b:      func() alertRuleVersion { v := baseVersion; v.Title = "Title2"; return v }(),
+			expect: false,
+		},
+		{
+			name:   "nil MissingSeriesEvalsToResolve in one version",
+			a:      func() alertRuleVersion { v := baseVersion; v.MissingSeriesEvalsToResolve = nil; return v }(),
+			b:      baseVersion,
+			expect: false,
+		},
+		{
+			name:   "both MissingSeriesEvalsToResolve nil",
+			a:      func() alertRuleVersion { v := baseVersion; v.MissingSeriesEvalsToResolve = nil; return v }(),
+			b:      func() alertRuleVersion { v := baseVersion; v.MissingSeriesEvalsToResolve = nil; return v }(),
+			expect: true,
+		},
+		{
+			name:   "different NotificationSettings",
+			a:      baseVersion,
+			b:      func() alertRuleVersion { v := baseVersion; v.NotificationSettings = "notify2"; return v }(),
+			expect: false,
+		},
+		{
+			name: "complex mismatch",
+			a:    baseVersion,
+			b: func() alertRuleVersion {
+				v := baseVersion
+				v.RuleOrgID = 2
+				v.RuleGUID = "guid2"
+				v.Title = "Title2"
+				return v
+			}(),
+			expect: false,
+		},
+		{
+			name:   "different For durations",
+			a:      baseVersion,
+			b:      func() alertRuleVersion { v := baseVersion; v.For = 2 * time.Minute; return v }(),
+			expect: false,
+		},
+		{
+			name: "exact match including bools and other types",
+			a: func() alertRuleVersion {
+				v := baseVersion
+				v.IsPaused = true
+				v.Metadata = "meta1"
+				v.Labels = "label1"
+				return v
+			}(),
+			b: func() alertRuleVersion {
+				v := baseVersion
+				v.IsPaused = true
+				v.Metadata = "meta1"
+				v.Labels = "label1"
+				return v
+			}(),
+			expect: true,
+		},
+		{
+			name: "different ID but otherwise equal",
+			a: func() alertRuleVersion {
+				v := baseVersion
+				v.ID = 1
+				return v
+			}(),
+			b: func() alertRuleVersion {
+				v := baseVersion
+				v.ID = 2
+				return v
+			}(),
+			expect: true,
+		},
+		{
+			name: "different ParentVersion but otherwise equal",
+			a: func() alertRuleVersion {
+				v := baseVersion
+				v.ParentVersion = 1
+				return v
+			}(),
+			b: func() alertRuleVersion {
+				v := baseVersion
+				v.ParentVersion = 2
+				return v
+			}(),
+			expect: true,
+		},
+		{
+			name: "different RestoredFrom but otherwise equal",
+			a: func() alertRuleVersion {
+				v := baseVersion
+				v.RestoredFrom = 1
+				return v
+			}(),
+			b: func() alertRuleVersion {
+				v := baseVersion
+				v.RestoredFrom = 2
+				return v
+			}(),
+			expect: true,
+		},
+		{
+			name: "different Version but otherwise equal",
+			a: func() alertRuleVersion {
+				v := baseVersion
+				v.Version = 1
+				return v
+			}(),
+			b: func() alertRuleVersion {
+				v := baseVersion
+				v.Version = 2
+				return v
+			}(),
+			expect: true,
+		},
+		{
+			name: "different Created but otherwise equal",
+			a: func() alertRuleVersion {
+				v := baseVersion
+				v.Created = time.Now()
+				return v
+			}(),
+			b: func() alertRuleVersion {
+				v := baseVersion
+				v.Created = time.Now().Add(time.Hour)
+				return v
+			}(),
+			expect: true,
+		},
+		{
+			name: "different RuleGroupIndex but otherwise equal",
+			a: func() alertRuleVersion {
+				v := baseVersion
+				v.RuleGroupIndex = 1
+				return v
+			}(),
+			b: func() alertRuleVersion {
+				v := baseVersion
+				v.RuleGroupIndex = 2
+				return v
+			}(),
+			expect: true,
+		},
+		{
+			name: "different CreatedBy but otherwise equal",
+			a: func() alertRuleVersion {
+				v := baseVersion
+				v.CreatedBy = util.Pointer("user1")
+				return v
+			}(),
+			b: func() alertRuleVersion {
+				v := baseVersion
+				v.CreatedBy = util.Pointer("user2")
+				return v
+			}(),
+			expect: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := tt.a.EqualSpec(tt.b); got != tt.expect {
+				t.Errorf("EqualSpec() = %v, expect %v", got, tt.expect)
+			}
+		})
+	}
+}

From afa09154f715728b39e4b81ec837869469580d83 Mon Sep 17 00:00:00 2001
From: "grafana-pr-automation[bot]"
 <140550294+grafana-pr-automation[bot]@users.noreply.github.com>
Date: Sat, 16 Aug 2025 00:40:01 +0000
Subject: [PATCH 212/243] I18n: Download translations from Crowdin (#109765)

New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 public/locales/cs-CZ/grafana.json   | 4 ++++
 public/locales/de-DE/grafana.json   | 4 ++++
 public/locales/es-ES/grafana.json   | 4 ++++
 public/locales/fr-FR/grafana.json   | 4 ++++
 public/locales/hu-HU/grafana.json   | 4 ++++
 public/locales/id-ID/grafana.json   | 4 ++++
 public/locales/it-IT/grafana.json   | 4 ++++
 public/locales/ja-JP/grafana.json   | 4 ++++
 public/locales/ko-KR/grafana.json   | 4 ++++
 public/locales/nl-NL/grafana.json   | 4 ++++
 public/locales/pl-PL/grafana.json   | 4 ++++
 public/locales/pt-BR/grafana.json   | 4 ++++
 public/locales/pt-PT/grafana.json   | 4 ++++
 public/locales/ru-RU/grafana.json   | 4 ++++
 public/locales/sv-SE/grafana.json   | 4 ++++
 public/locales/tr-TR/grafana.json   | 4 ++++
 public/locales/zh-Hans/grafana.json | 4 ++++
 public/locales/zh-Hant/grafana.json | 4 ++++
 18 files changed, 72 insertions(+)

diff --git a/public/locales/cs-CZ/grafana.json b/public/locales/cs-CZ/grafana.json
index 1fa39d98edf..8491d881dec 100644
--- a/public/locales/cs-CZ/grafana.json
+++ b/public/locales/cs-CZ/grafana.json
@@ -4558,6 +4558,10 @@
           "value": "Hodnota"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "Prvek je skrytý kvůli podmíněnému vykreslení."
       },
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 240c290546e..e9264c7eba0 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -4522,6 +4522,10 @@
           "value": "Wert"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "Das Element wird aufgrund von bedingtem Rendering ausgeblendet."
       },
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index 66adde7b8ce..79877c58cd2 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -4522,6 +4522,10 @@
           "value": "Valor"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "El elemento está oculto debido al renderizado condicional."
       },
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 7d755fbc70e..2b1bee06c06 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -4522,6 +4522,10 @@
           "value": "Valeur"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "L’élément est masqué en raison du rendu conditionnel."
       },
diff --git a/public/locales/hu-HU/grafana.json b/public/locales/hu-HU/grafana.json
index 79d14e41eef..cb747ac51ef 100644
--- a/public/locales/hu-HU/grafana.json
+++ b/public/locales/hu-HU/grafana.json
@@ -4522,6 +4522,10 @@
           "value": "Érték"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "Az elem rejtve van a feltételes renderelés miatt."
       },
diff --git a/public/locales/id-ID/grafana.json b/public/locales/id-ID/grafana.json
index 65c93fa1cc8..c13df950160 100644
--- a/public/locales/id-ID/grafana.json
+++ b/public/locales/id-ID/grafana.json
@@ -4504,6 +4504,10 @@
           "value": "Nilai"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "Elemen disembunyikan karena rendering bersyarat."
       },
diff --git a/public/locales/it-IT/grafana.json b/public/locales/it-IT/grafana.json
index efb18cf2b4a..27e3a2b91a8 100644
--- a/public/locales/it-IT/grafana.json
+++ b/public/locales/it-IT/grafana.json
@@ -4522,6 +4522,10 @@
           "value": "Valore"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "L'elemento è nascosto a causa del rendering condizionale."
       },
diff --git a/public/locales/ja-JP/grafana.json b/public/locales/ja-JP/grafana.json
index ac8a71b1a7e..de5e9876d86 100644
--- a/public/locales/ja-JP/grafana.json
+++ b/public/locales/ja-JP/grafana.json
@@ -4504,6 +4504,10 @@
           "value": "値"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "条件付きレンダリング設定のため、要素は非表示になっています。"
       },
diff --git a/public/locales/ko-KR/grafana.json b/public/locales/ko-KR/grafana.json
index e57a49e67dd..d4fbcf252d6 100644
--- a/public/locales/ko-KR/grafana.json
+++ b/public/locales/ko-KR/grafana.json
@@ -4504,6 +4504,10 @@
           "value": "값"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "조건부 렌더링으로 인해 요소가 숨겨져 있습니다."
       },
diff --git a/public/locales/nl-NL/grafana.json b/public/locales/nl-NL/grafana.json
index f0e600e4cd6..56d616c084c 100644
--- a/public/locales/nl-NL/grafana.json
+++ b/public/locales/nl-NL/grafana.json
@@ -4522,6 +4522,10 @@
           "value": "Waarde"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "Element is verborgen vanwege voorwaardelijke weergave."
       },
diff --git a/public/locales/pl-PL/grafana.json b/public/locales/pl-PL/grafana.json
index 31d91d16bfb..1fdcb666770 100644
--- a/public/locales/pl-PL/grafana.json
+++ b/public/locales/pl-PL/grafana.json
@@ -4558,6 +4558,10 @@
           "value": "Wartość"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "Element jest ukryty z powodu renderowania warunkowego."
       },
diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json
index aa8ff990931..df790a5f15c 100644
--- a/public/locales/pt-BR/grafana.json
+++ b/public/locales/pt-BR/grafana.json
@@ -4522,6 +4522,10 @@
           "value": "Valor"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "O elemento está oculto devido à renderização condicional."
       },
diff --git a/public/locales/pt-PT/grafana.json b/public/locales/pt-PT/grafana.json
index 0deefd6e90a..5e89dd7c9d2 100644
--- a/public/locales/pt-PT/grafana.json
+++ b/public/locales/pt-PT/grafana.json
@@ -4522,6 +4522,10 @@
           "value": "Valor"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "O elemento está oculto devido à renderização condicional."
       },
diff --git a/public/locales/ru-RU/grafana.json b/public/locales/ru-RU/grafana.json
index a63197e85eb..15055efc1ad 100644
--- a/public/locales/ru-RU/grafana.json
+++ b/public/locales/ru-RU/grafana.json
@@ -4558,6 +4558,10 @@
           "value": "Значение"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "Элемент скрыт из-за условной визуализации."
       },
diff --git a/public/locales/sv-SE/grafana.json b/public/locales/sv-SE/grafana.json
index 779c6496df6..bdfd29f12dd 100644
--- a/public/locales/sv-SE/grafana.json
+++ b/public/locales/sv-SE/grafana.json
@@ -4522,6 +4522,10 @@
           "value": "Värde"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "Elementet är dolt på grund av villkorsstyrd rendering."
       },
diff --git a/public/locales/tr-TR/grafana.json b/public/locales/tr-TR/grafana.json
index e1b34771801..df09e65789d 100644
--- a/public/locales/tr-TR/grafana.json
+++ b/public/locales/tr-TR/grafana.json
@@ -4522,6 +4522,10 @@
           "value": "Değer"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "Koşullu oluşturma nedeniyle öge gizlendi."
       },
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 9b6bea0ce32..331b0caca13 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -4504,6 +4504,10 @@
           "value": "值"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "由于条件渲染，元素已被隐藏。"
       },
diff --git a/public/locales/zh-Hant/grafana.json b/public/locales/zh-Hant/grafana.json
index bb76f7d6bb5..5dd05e6a466 100644
--- a/public/locales/zh-Hant/grafana.json
+++ b/public/locales/zh-Hant/grafana.json
@@ -4504,6 +4504,10 @@
           "value": "數值"
         }
       },
+      "editor": {
+        "not-supported-for-custom-grid": "",
+        "unsupported-item-type": ""
+      },
       "overlay": {
         "tooltip": "由於條件轉譯，元素已被隱藏。"
       },

From 2695ed91d10b7d400f602b674f10020f3a6d8ae8 Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matias.chomicki@grafana.com>
Date: Sat, 16 Aug 2025 16:47:37 +0200
Subject: [PATCH 213/243] Logs: fix running condition causing LogList to not be
 rendered (#109768)

---
 public/app/features/explore/Logs/Logs.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/features/explore/Logs/Logs.tsx b/public/app/features/explore/Logs/Logs.tsx
index fbac705c277..629f9ee37c2 100644
--- a/public/app/features/explore/Logs/Logs.tsx
+++ b/public/app/features/explore/Logs/Logs.tsx
@@ -1125,9 +1125,9 @@ const UnthemedLogs: React.FunctionComponent<Props> = (props: Props) => {
                 />
               </>
             )}
-          {config.featureToggles.newLogsPanel && visualisationType === 'logs' && hasData && (
+          {config.featureToggles.newLogsPanel && visualisationType === 'logs' && (
             <div data-testid="logRows" ref={logsContainerRef} className={styles.logRowsWrapper}>
-              {logsContainerRef.current && (
+              {logsContainerRef.current && hasData && (
                 <LogList
                   app={CoreApp.Explore}
                   containerElement={logsContainerRef.current}

From 44be5d91c22f7341b806112d2e8fd3f0bf352726 Mon Sep 17 00:00:00 2001
From: Anna Urbiztondo <anna.urbiztondo@grafana.com>
Date: Mon, 18 Aug 2025 10:49:37 +0200
Subject: [PATCH 214/243] 17884: Support feedback - CLI (#109776)

* Support feedback

* Prettier
---
 .../grafana-cli/set-up-grafana-cli.md         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/docs/sources/observability-as-code/grafana-cli/set-up-grafana-cli.md b/docs/sources/observability-as-code/grafana-cli/set-up-grafana-cli.md
index fb64ae00625..d2498b15ee9 100644
--- a/docs/sources/observability-as-code/grafana-cli/set-up-grafana-cli.md
+++ b/docs/sources/observability-as-code/grafana-cli/set-up-grafana-cli.md
@@ -19,10 +19,14 @@ weight: 200
 
 You can configure Grafana CLI in two ways: using environment variables or through a configuration file.
 
-- **Environment variables** are ideal for CI environments and support a single context.
+- **Environment variables** are ideal for CI environments and support a single context. A full list of supported environment variables is available in the [reference documentation](https://github.com/grafana/grafanactl/blob/main/docs/reference/environment-variables/index.md#environment-variables-reference).
 - **Configuration files** can manage multiple contexts, making it easier to switch between different Grafana instances.
 
-## Use environment variables
+{{< admonition type="note" >}}
+Configuration items may change depending on your set-up. For example, use `org-id` for Grafana on-prem, but use `stack-id` for Grafana Cloud.
+{{< /admonition >}}
+
+## Configure Grafana CLI with environment variables
 
 Grafana CLI communicates with Grafana via its REST API, which requires authentication credentials.
 
@@ -37,15 +41,13 @@ Depending on your authentication method, you may also need to set:
 - A [token](https://github.com/grafana/grafanactl/blob/main/docs/reference/environment-variables/index.md#grafana_token) for a [Grafana service account](https://grafana.com/docs/grafana/latest/administration/service-accounts/) (recommended)
 - A [username](https://github.com/grafana/grafanactl/blob/main/docs/reference/environment-variables/index.md#grafana_user) and [password](https://github.com/grafana/grafanactl/blob/main/docs/reference/environment-variables/index.md#grafana_password) for basic authentication
 
-To persist your configuration, consider [creating a context](#defining-contexts).
+To persist your configuration, consider [creating a context](#use-configuration-contexts).
 
-A full list of supported environment variables is available in the [reference documentation](https://github.com/grafana/grafanactl/blob/main/docs/reference/environment-variables/index.md#environment-variables-reference).
+### Use configuration contexts
 
-## Define contexts
+Contexts allow you to easily switch between multiple Grafana instances.
 
-Contexts allow you to easily switch between multiple Grafana instances. By default, the CLI uses a context named `default`.
-
-To configure the `default` context:
+By default, the CLI uses a context named `default`. To configure it use:
 
 ```bash
 grafanactl config set contexts.default.grafana.server http://localhost:3000
@@ -70,7 +72,7 @@ grafanactl config set contexts.staging.grafana.org-id 1
 In these examples, `default` and `staging` are the names of the contexts.
 {{< /admonition >}}
 
-## Configuration file
+## Configure Grafana CLI with configuration files
 
 Grafana CLI stores its configuration in a YAML file. The CLI determines the configuration file location in the following order:
 

From 1a82bb476782e9e466420c1c863bf640d58e2f19 Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Mon, 18 Aug 2025 11:42:28 +0200
Subject: [PATCH 215/243] Alerting: Fix duplication of imported Prometheus
 alert rules (#109770)

---
 .../rule-editor/query-and-alert-condition/reducer.ts           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts
index b3499b8c520..372e028bbcc 100644
--- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts
+++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts
@@ -247,8 +247,9 @@ export const queriesAndExpressionsReducer = createReducer(initialState, (builder
 
       const dataQuery = updatedQueries.at(0);
       const isInstantDataQuery = dataQuery ? getInstantFromDataQuery(dataQuery) : false;
+      const hasReducer = expressionQueries.some((q) => isReducerExpression(q.model));
+      const shouldRemoveReducer = isInstantDataQuery && expressionQueries.length === 2 && hasReducer;
 
-      const shouldRemoveReducer = isInstantDataQuery && expressionQueries.length === 2;
       if (shouldRemoveReducer) {
         const reduceExpressionIndex = state.queries.findIndex(
           (query) =>

From b7ff1b3ac8d9e400741599e41179d128153629aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= <laura.fernandez@grafana.com>
Date: Mon, 18 Aug 2025 11:55:53 +0200
Subject: [PATCH 216/243] Chore: Remove deprecated `HorizontalGroup` in
 plugins/panel (#109618)

---
 .betterer.results                             | 22 ++++---------------
 .../panel/barchart/TickSpacingEditor.tsx      |  6 ++---
 .../panel/geomap/editor/StyleEditor.tsx       | 14 +++---------
 .../panel/timeseries/InsertNullsEditor.tsx    |  6 ++---
 .../panel/timeseries/LineStyleEditor.tsx      |  6 ++---
 .../panel/timeseries/SpanNullsEditor.tsx      |  6 ++---
 .../annotations2/AnnotationTooltip2.tsx       | 12 +++++-----
 7 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 17e26b00966..a217b42a0a5 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -3663,9 +3663,6 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/annolist/AnnotationListItem.tsx:5381": [
       [0, 0, 0, "Add noMargin prop to Card components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "0"]
     ],
-    "public/app/plugins/panel/barchart/TickSpacingEditor.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
-    ],
     "public/app/plugins/panel/barchart/bars.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
@@ -3728,7 +3725,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/plugins/panel/geomap/editor/StyleEditor.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"],
+      [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "0"],
       [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "1"],
       [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "2"],
       [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "3"],
@@ -3742,7 +3739,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "11"],
       [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "12"],
       [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "13"],
-      [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "14"],
+      [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.", "17"],
@@ -3753,8 +3750,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "22"],
       [0, 0, 0, "Do not use any type assertions.", "23"],
       [0, 0, 0, "Do not use any type assertions.", "24"],
-      [0, 0, 0, "Do not use any type assertions.", "25"],
-      [0, 0, 0, "Do not use any type assertions.", "26"]
+      [0, 0, 0, "Do not use any type assertions.", "25"]
     ],
     "public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -3923,15 +3919,6 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/text/textPanelMigrationHandler.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/panel/timeseries/InsertNullsEditor.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
-    ],
-    "public/app/plugins/panel/timeseries/LineStyleEditor.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
-    ],
-    "public/app/plugins/panel/timeseries/SpanNullsEditor.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
-    ],
     "public/app/plugins/panel/timeseries/migrations.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -3956,8 +3943,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationTooltip2.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/panel/xychart/SeriesEditor.tsx:5381": [
       [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "0"],
diff --git a/public/app/plugins/panel/barchart/TickSpacingEditor.tsx b/public/app/plugins/panel/barchart/TickSpacingEditor.tsx
index da553368a0f..3a6db390241 100644
--- a/public/app/plugins/panel/barchart/TickSpacingEditor.tsx
+++ b/public/app/plugins/panel/barchart/TickSpacingEditor.tsx
@@ -1,6 +1,6 @@
 import { SelectableValue, StandardEditorProps } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { Checkbox, HorizontalGroup, RadioButtonGroup, Tooltip } from '@grafana/ui';
+import { Checkbox, Stack, RadioButtonGroup, Tooltip } from '@grafana/ui';
 
 export const TickSpacingEditor = (props: StandardEditorProps<number>) => {
   const GAPS_OPTIONS: Array<SelectableValue<number>> = [
@@ -53,7 +53,7 @@ export const TickSpacingEditor = (props: StandardEditorProps<number>) => {
   };
 
   return (
-    <HorizontalGroup>
+    <Stack>
       <RadioButtonGroup value={gap.value} options={GAPS_OPTIONS} onChange={onSpacingChange} />
       {value !== 0 && (
         <Tooltip
@@ -68,6 +68,6 @@ export const TickSpacingEditor = (props: StandardEditorProps<number>) => {
           </div>
         </Tooltip>
       )}
-    </HorizontalGroup>
+    </Stack>
   );
 };
diff --git a/public/app/plugins/panel/geomap/editor/StyleEditor.tsx b/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
index c8dd68c4acb..a880846f2b1 100644
--- a/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/StyleEditor.tsx
@@ -12,15 +12,7 @@ import {
   TextDimensionConfig,
   ScalarDimensionConfig,
 } from '@grafana/schema';
-import {
-  ColorPicker,
-  Field,
-  HorizontalGroup,
-  InlineField,
-  InlineFieldRow,
-  InlineLabel,
-  RadioButtonGroup,
-} from '@grafana/ui';
+import { ColorPicker, Field, Stack, InlineField, InlineFieldRow, InlineLabel, RadioButtonGroup } from '@grafana/ui';
 import { NumberValueEditor } from 'app/core/components/OptionsUI/number';
 import { SliderValueEditor } from 'app/core/components/OptionsUI/slider';
 import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor';
@@ -364,7 +356,7 @@ export const StyleEditor = (props: Props) => {
 
       {hasTextLabel && (
         <>
-          <HorizontalGroup>
+          <Stack>
             <Field label={t('geomap.style-editor.label-font-size', 'Font size')}>
               <NumberValueEditor
                 id={fontSizeId}
@@ -392,7 +384,7 @@ export const StyleEditor = (props: Props) => {
                 item={{} as FieldConfigPropertyItem}
               />
             </Field>
-          </HorizontalGroup>
+          </Stack>
           <Field label={t('geomap.style-editor.label-align', 'Align')}>
             <RadioButtonGroup
               value={value?.textConfig?.textAlign ?? defaultStyleConfig.textConfig.textAlign}
diff --git a/public/app/plugins/panel/timeseries/InsertNullsEditor.tsx b/public/app/plugins/panel/timeseries/InsertNullsEditor.tsx
index dcd724f7057..4dbdc2d31e0 100644
--- a/public/app/plugins/panel/timeseries/InsertNullsEditor.tsx
+++ b/public/app/plugins/panel/timeseries/InsertNullsEditor.tsx
@@ -1,6 +1,6 @@
 import { StandardEditorProps, SelectableValue } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { HorizontalGroup, RadioButtonGroup } from '@grafana/ui';
+import { Stack, RadioButtonGroup } from '@grafana/ui';
 
 import { InputPrefix, NullsThresholdInput } from './NullsThresholdInput';
 
@@ -21,7 +21,7 @@ export const InsertNullsEditor = ({ value, onChange, item }: Props) => {
   DISCONNECT_OPTIONS[1].value = isThreshold ? value : 3600000; // 1h
 
   return (
-    <HorizontalGroup>
+    <Stack>
       <RadioButtonGroup value={value} options={DISCONNECT_OPTIONS} onChange={onChange} />
       {isThreshold && (
         <NullsThresholdInput
@@ -31,6 +31,6 @@ export const InsertNullsEditor = ({ value, onChange, item }: Props) => {
           isTime={item.settings?.isTime ?? false}
         />
       )}
-    </HorizontalGroup>
+    </Stack>
   );
 };
diff --git a/public/app/plugins/panel/timeseries/LineStyleEditor.tsx b/public/app/plugins/panel/timeseries/LineStyleEditor.tsx
index dc83dd1bfcb..d10fd52bea0 100644
--- a/public/app/plugins/panel/timeseries/LineStyleEditor.tsx
+++ b/public/app/plugins/panel/timeseries/LineStyleEditor.tsx
@@ -3,7 +3,7 @@ import { useMemo } from 'react';
 import { StandardEditorProps, SelectableValue } from '@grafana/data';
 import { t } from '@grafana/i18n';
 import { LineStyle } from '@grafana/schema';
-import { HorizontalGroup, IconButton, RadioButtonGroup, Select } from '@grafana/ui';
+import { IconButton, RadioButtonGroup, Select, Stack } from '@grafana/ui';
 
 type LineFill = 'solid' | 'dash' | 'dot';
 
@@ -72,7 +72,7 @@ export const LineStyleEditor = ({ value, onChange }: Props) => {
   }, [value, options]);
 
   return (
-    <HorizontalGroup>
+    <Stack wrap={true} alignItems="flex-end">
       <RadioButtonGroup
         value={value?.fill || 'solid'}
         options={lineFillOptions}
@@ -121,7 +121,7 @@ export const LineStyleEditor = ({ value, onChange }: Props) => {
           </div>
         </>
       )}
-    </HorizontalGroup>
+    </Stack>
   );
 };
 
diff --git a/public/app/plugins/panel/timeseries/SpanNullsEditor.tsx b/public/app/plugins/panel/timeseries/SpanNullsEditor.tsx
index 558580299a4..0ced4d554ae 100644
--- a/public/app/plugins/panel/timeseries/SpanNullsEditor.tsx
+++ b/public/app/plugins/panel/timeseries/SpanNullsEditor.tsx
@@ -1,6 +1,6 @@
 import { StandardEditorProps, SelectableValue } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { HorizontalGroup, RadioButtonGroup } from '@grafana/ui';
+import { Stack, RadioButtonGroup } from '@grafana/ui';
 
 import { InputPrefix, NullsThresholdInput } from './NullsThresholdInput';
 
@@ -25,7 +25,7 @@ export const SpanNullsEditor = ({ value, onChange, item }: Props) => {
   GAPS_OPTIONS[2].value = isThreshold ? value : 3600000; // 1h
 
   return (
-    <HorizontalGroup>
+    <Stack wrap={true}>
       <RadioButtonGroup value={value} options={GAPS_OPTIONS} onChange={onChange} />
       {isThreshold && (
         <NullsThresholdInput
@@ -35,6 +35,6 @@ export const SpanNullsEditor = ({ value, onChange, item }: Props) => {
           isTime={item.settings?.isTime ?? false}
         />
       )}
-    </HorizontalGroup>
+    </Stack>
   );
 };
diff --git a/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationTooltip2.tsx b/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationTooltip2.tsx
index 33d6eb0e013..018aff532f8 100644
--- a/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationTooltip2.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationTooltip2.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 
 import { GrafanaTheme2, dateTimeFormat, systemDateFormats, textUtil } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { HorizontalGroup, IconButton, Tag, usePanelContext, useStyles2 } from '@grafana/ui';
+import { Stack, IconButton, Tag, usePanelContext, useStyles2 } from '@grafana/ui';
 import alertDef from 'app/features/alerting/state/alertDef';
 
 interface Props {
@@ -65,7 +65,7 @@ export const AnnotationTooltip2 = ({ annoVals, annoIdx, timeZone, onEdit }: Prop
   return (
     <div className={styles.wrapper}>
       <div className={styles.header}>
-        <HorizontalGroup justify={'space-between'} align={'center'} spacing={'md'}>
+        <Stack gap={2} basis="100%" justifyContent="space-between" alignItems="center">
           <div className={styles.meta}>
             <span>
               {avatar}
@@ -93,18 +93,18 @@ export const AnnotationTooltip2 = ({ annoVals, annoIdx, timeZone, onEdit }: Prop
               )}
             </div>
           )}
-        </HorizontalGroup>
+        </Stack>
       </div>
 
       <div className={styles.body}>
         {text && <div className={styles.text} dangerouslySetInnerHTML={{ __html: textUtil.sanitize(text) }} />}
         {alertText}
         <div>
-          <HorizontalGroup spacing="xs" wrap>
+          <Stack gap={0.5} wrap={true}>
             {annoVals.tags?.[annoIdx]?.map((t: string, i: number) => (
               <Tag name={t} key={`${t}-${i}`} />
             ))}
-          </HorizontalGroup>
+          </Stack>
         </div>
       </div>
     </div>
@@ -131,13 +131,11 @@ const getStyles = (theme: GrafanaTheme2) => ({
   }),
   meta: css({
     display: 'flex',
-    justifyContent: 'space-between',
     color: theme.colors.text.primary,
     fontWeight: 400,
   }),
   editControls: css({
     display: 'flex',
-    alignItems: 'center',
     '> :last-child': {
       marginLeft: 0,
     },

From 3dccd29f89962f77bbfc438b9f73e656502da483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 18 Aug 2025 12:02:45 +0200
Subject: [PATCH 217/243] Repeating: Minor refactoring and unification for
 DashboardGridItem and AutoGridItem  (#109723)

* Repeating: Refactoring and unification

* Update

* update

* fix e2e

* fixes

* Update

* adjust e2e test

---------

Co-authored-by: Sergej-Vlasov <sergej.s.vlasov@gmail.com>
---
 .../various-suite/solo-route.spec.ts          |  4 +-
 e2e/old-arch/various-suite/solo-route.spec.ts |  4 +-
 e2e/various-suite/solo-route.spec.ts          |  4 +-
 .../scene/layout-auto-grid/AutoGridItem.tsx   | 42 +++++------
 .../layout-auto-grid/AutoGridItemRenderer.tsx | 11 ++-
 .../layout-default/DashboardGridItem.test.tsx | 55 ++++----------
 .../layout-default/DashboardGridItem.tsx      | 52 ++++++--------
 .../DashboardGridItemRenderer.tsx             | 31 ++++----
 .../layout-default/RowRepeaterBehavior.ts     | 15 +---
 .../scene/layout-rows/RowItemRepeater.tsx     | 22 +-----
 .../scene/layout-tabs/TabItemRepeater.tsx     | 22 +-----
 .../transformSceneToSaveModel.test.ts         |  2 +-
 .../transformSceneToSaveModel.ts              | 72 +++++++++----------
 .../features/dashboard-scene/utils/clone.ts   | 27 ++++++-
 .../dashboard-scene/utils/test-utils.ts       |  1 +
 15 files changed, 148 insertions(+), 216 deletions(-)

diff --git a/e2e-playwright/various-suite/solo-route.spec.ts b/e2e-playwright/various-suite/solo-route.spec.ts
index 81c9e8baf7b..63dd4e6439d 100644
--- a/e2e-playwright/various-suite/solo-route.spec.ts
+++ b/e2e-playwright/various-suite/solo-route.spec.ts
@@ -35,12 +35,12 @@ test.describe(
     test('Can view solo repeated panel in scenes', async ({ page, selectors }) => {
       // open Panel Tests - Graph NG
       const soloPanelUrl = selectors.pages.SoloPanel.url(
-        'templating-repeating-panels/templating-repeating-panels?orgId=1&from=1699934989607&to=1699956589607&panelId=panel-2-clone-0&__feature.dashboardSceneSolo=true'
+        'templating-repeating-panels/templating-repeating-panels?orgId=1&from=1699934989607&to=1699956589607&panelId=panel-2-clone-1&__feature.dashboardSceneSolo=true'
       );
       await page.goto(soloPanelUrl);
 
       // Check that the panel title exists
-      const panelTitle = page.getByTestId(selectors.components.Panels.Panel.title('server=A'));
+      const panelTitle = page.getByTestId(selectors.components.Panels.Panel.title('server=B'));
       await expect(panelTitle).toBeVisible();
 
       // Check that uplot-main-div does not exist
diff --git a/e2e/old-arch/various-suite/solo-route.spec.ts b/e2e/old-arch/various-suite/solo-route.spec.ts
index 415257ead7c..2abd2717d5b 100644
--- a/e2e/old-arch/various-suite/solo-route.spec.ts
+++ b/e2e/old-arch/various-suite/solo-route.spec.ts
@@ -25,10 +25,10 @@ describe('Solo Route', () => {
   it('Can view solo repeated panel in scenes', () => {
     // open Panel Tests - Graph NG
     e2e.pages.SoloPanel.visit(
-      'templating-repeating-panels/templating-repeating-panels?orgId=1&from=1699934989607&to=1699956589607&panelId=panel-2-clone-0&__feature.dashboardSceneSolo=true'
+      'templating-repeating-panels/templating-repeating-panels?orgId=1&from=1699934989607&to=1699956589607&panelId=panel-2-clone-1&__feature.dashboardSceneSolo=true'
     );
 
-    e2e.components.Panels.Panel.title('server=A').should('exist');
+    e2e.components.Panels.Panel.title('server=B').should('exist');
     cy.contains('uplot-main-div').should('not.exist');
   });
 
diff --git a/e2e/various-suite/solo-route.spec.ts b/e2e/various-suite/solo-route.spec.ts
index 415257ead7c..2abd2717d5b 100644
--- a/e2e/various-suite/solo-route.spec.ts
+++ b/e2e/various-suite/solo-route.spec.ts
@@ -25,10 +25,10 @@ describe('Solo Route', () => {
   it('Can view solo repeated panel in scenes', () => {
     // open Panel Tests - Graph NG
     e2e.pages.SoloPanel.visit(
-      'templating-repeating-panels/templating-repeating-panels?orgId=1&from=1699934989607&to=1699956589607&panelId=panel-2-clone-0&__feature.dashboardSceneSolo=true'
+      'templating-repeating-panels/templating-repeating-panels?orgId=1&from=1699934989607&to=1699956589607&panelId=panel-2-clone-1&__feature.dashboardSceneSolo=true'
     );
 
-    e2e.components.Panels.Panel.title('server=A').should('exist');
+    e2e.components.Panels.Panel.title('server=B').should('exist');
     cy.contains('uplot-main-div').should('not.exist');
   });
 
diff --git a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItem.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItem.tsx
index b08387e9b74..99bcff261e6 100644
--- a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItem.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItem.tsx
@@ -3,21 +3,18 @@ import React from 'react';
 
 import {
   CustomVariable,
-  LocalValueVariable,
   MultiValueVariable,
   sceneGraph,
   SceneObjectBase,
   SceneObjectState,
-  SceneVariableSet,
   VariableDependencyConfig,
   VariableValueSingle,
   VizPanel,
-  VizPanelState,
 } from '@grafana/scenes';
 import { OptionsPaneCategoryDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor';
 
 import { ConditionalRendering } from '../../conditional-rendering/ConditionalRendering';
-import { getCloneKey } from '../../utils/clone';
+import { getCloneKey, getLocalVariableValueSet } from '../../utils/clone';
 import { getMultiVariableValues } from '../../utils/utils';
 import { scrollCanvasElementIntoView } from '../layouts-shared/scrollCanvasElementIntoView';
 import { DashboardLayoutItem } from '../types/DashboardLayoutItem';
@@ -113,21 +110,19 @@ export class AutoGridItem extends SceneObjectBase<AutoGridItemState> implements
 
     const variableValues = values.length ? values : emptyVariablePlaceholderOption.values;
     const variableTexts = texts.length ? texts : emptyVariablePlaceholderOption.texts;
+
+    // Loop through variable values and create repeats
     for (let index = 0; index < variableValues.length; index++) {
-      const cloneState: Partial<VizPanelState> = {
-        $variables: new SceneVariableSet({
-          variables: [
-            new LocalValueVariable({
-              name: variable.state.name,
-              value: variableValues[index],
-              text: String(variableTexts[index]),
-            }),
-          ],
-        }),
-        key: getCloneKey(panelToRepeat.state.key!, index),
-      };
-      const clone = panelToRepeat.clone(cloneState);
-      repeatedPanels.push(clone);
+      const isSource = index === 0;
+      const clone = isSource
+        ? panelToRepeat
+        : panelToRepeat.clone({ key: getCloneKey(panelToRepeat.state.key!, index) });
+
+      clone.setState({ $variables: getLocalVariableValueSet(variable, variableValues[index], variableTexts[index]) });
+
+      if (index > 0) {
+        repeatedPanels.push(clone);
+      }
     }
 
     this.setState({ repeatedPanels });
@@ -136,6 +131,10 @@ export class AutoGridItem extends SceneObjectBase<AutoGridItemState> implements
     this.publishEvent(new DashboardRepeatsProcessedEvent({ source: this }), true);
   }
 
+  public getPanelCount() {
+    return (this.state.repeatedPanels?.length ?? 0) + 1;
+  }
+
   public setRepeatByVariable(variableName: string | undefined) {
     const stateUpdate: Partial<AutoGridItemState> = { variableName };
 
@@ -172,13 +171,6 @@ export class AutoGridItem extends SceneObjectBase<AutoGridItemState> implements
     if (!this.state.variableName) {
       return;
     }
-
-    if ((this.state.repeatedPanels?.length ?? 0) > 1) {
-      this.state.body.setState({
-        $variables: this.state.repeatedPanels![0].state.$variables?.clone(),
-        $data: this.state.repeatedPanels![0].state.$data?.clone(),
-      });
-    }
   }
 
   public editingCompleted(withChanges: boolean) {
diff --git a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
index f7abc61955e..26ed6e5da9c 100644
--- a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
@@ -13,7 +13,7 @@ import { AutoGridItem } from './AutoGridItem';
 import { DRAGGED_ITEM_HEIGHT, DRAGGED_ITEM_LEFT, DRAGGED_ITEM_TOP, DRAGGED_ITEM_WIDTH } from './const';
 
 export function AutoGridItemRenderer({ model }: SceneComponentProps<AutoGridItem>) {
-  const { body, repeatedPanels, key } = model.useState();
+  const { body, repeatedPanels = [], key } = model.useState();
   const { draggingKey } = model.getParentGrid().useState();
   const { isEditing, preload } = useDashboardState(model);
   const [isConditionallyHidden, conditionalRenderingClass, conditionalRenderingOverlay] =
@@ -69,20 +69,19 @@ export function AutoGridItemRenderer({ model }: SceneComponentProps<AutoGridItem
   const isDragging = !!draggingKey;
   const isDragged = draggingKey === key;
 
-  return repeatedPanels ? (
+  return (
     <>
-      {repeatedPanels.map((item, index) => (
+      <Wrapper item={body} addDndContainer={true} key={body.state.key!} isDragged={isDragged} isDragging={isDragging} />
+      {repeatedPanels.map((item) => (
         <Wrapper
           item={item}
-          addDndContainer={index === 0}
+          addDndContainer={false}
           key={item.state.key!}
           isDragged={isDragged}
           isDragging={isDragging}
         />
       ))}
     </>
-  ) : (
-    <Wrapper item={body} addDndContainer key={body.state.key!} isDragged={isDragged} isDragging={isDragging} />
   );
 }
 
diff --git a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItem.test.tsx b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItem.test.tsx
index 00458d505a9..2da0727000f 100644
--- a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItem.test.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItem.test.tsx
@@ -32,17 +32,17 @@ describe('PanelRepeaterGridItem', () => {
 
     activateFullSceneTree(scene);
 
-    expect(repeater.state.repeatedPanels?.length).toBe(5);
+    expect(repeater.state.repeatedPanels?.length).toBe(4);
 
-    const panel1 = repeater.state.repeatedPanels![0];
-    const panel2 = repeater.state.repeatedPanels![1];
+    const panel1 = repeater.state.body;
+    const panel2 = repeater.state.repeatedPanels![0];
 
     // Panels should have scoped variables
     expect(panel1.state.$variables?.state.variables[0].getValue()).toBe('1');
     expect(panel1.state.$variables?.state.variables[0].getValueText?.()).toBe('A');
     expect(panel2.state.$variables?.state.variables[0].getValue()).toBe('2');
 
-    expect(isInCloneChain(panel1.state.key!)).toBe(false);
+    expect(panel1.state.key).toBe('panel-1');
     expect(isInCloneChain(panel2.state.key!)).toBe(true);
   });
 
@@ -55,7 +55,7 @@ describe('PanelRepeaterGridItem', () => {
 
     await new Promise((r) => setTimeout(r, 10));
 
-    expect(repeater.state.repeatedPanels?.length).toBe(5);
+    expect(repeater.state.repeatedPanels?.length).toBe(4);
   });
 
   it('Should pass isMulti/includeAll values if variable is multi variable and has them set', async () => {
@@ -67,7 +67,7 @@ describe('PanelRepeaterGridItem', () => {
 
     await new Promise((r) => setTimeout(r, 10));
 
-    expect(repeater.state.repeatedPanels?.length).toBe(5);
+    expect(repeater.state.repeatedPanels?.length).toBe(4);
 
     // LocalValueVariableState is not exposed, so we build this type casting
     const variableState = repeater.state.repeatedPanels![0].state.$variables?.state.variables[0].state as {
@@ -79,18 +79,6 @@ describe('PanelRepeaterGridItem', () => {
     expect(variableState.includeAll).toBe(true);
   });
 
-  it('Should display a panel when there are no options', async () => {
-    const { scene, repeater } = buildPanelRepeaterScene({ variableQueryTime: 1, numberOfOptions: 0 });
-
-    activateFullSceneTree(scene);
-
-    expect(repeater.state.repeatedPanels?.length).toBe(0);
-
-    await new Promise((r) => setTimeout(r, 100));
-
-    expect(repeater.state.repeatedPanels?.length).toBe(1);
-  });
-
   it('Should redo the repeat when editing panel and then returning to dashboard', async () => {
     const panel = new DashboardGridItem({
       variableName: 'server',
@@ -130,7 +118,7 @@ describe('PanelRepeaterGridItem', () => {
 
     await new Promise((r) => setTimeout(r, 10));
 
-    expect(panel.state.repeatedPanels?.length).toBe(5);
+    expect(panel.state.repeatedPanels?.length).toBe(4);
 
     const vizPanel = panel.state.body as VizPanel;
 
@@ -150,7 +138,7 @@ describe('PanelRepeaterGridItem', () => {
 
     await new Promise((r) => setTimeout(r, 10));
 
-    expect(panel.state.repeatedPanels?.length).toBe(5);
+    expect(panel.state.repeatedPanels?.length).toBe(4);
     expect((panel.state.repeatedPanels![0] as VizPanel).state.title).toBe('Changed');
   });
 
@@ -203,7 +191,7 @@ describe('PanelRepeaterGridItem', () => {
 
     await new Promise((r) => setTimeout(r, 10));
 
-    expect(panel.state.repeatedPanels?.length).toBe(5);
+    expect(panel.state.repeatedPanels?.length).toBe(4);
 
     const vizPanel = panel.state.body as VizPanel;
 
@@ -226,27 +214,10 @@ describe('PanelRepeaterGridItem', () => {
     await new Promise((r) => setTimeout(r, 10));
 
     expect(performRepeatMock).toHaveBeenCalledTimes(1); // only for the edited panel
-    expect(panel.state.repeatedPanels?.length).toBe(5);
+    expect(panel.state.repeatedPanels?.length).toBe(4);
     expect((panel.state.repeatedPanels![0] as VizPanel).state.title).toBe('Changed');
   });
 
-  it('Should display a panel when there are variable errors', () => {
-    const { scene, repeater } = buildPanelRepeaterScene({
-      variableQueryTime: 0,
-      numberOfOptions: 0,
-      throwError: 'Error',
-    });
-
-    // we expect console.error when variable encounters an error
-    const origError = console.error;
-    console.error = jest.fn();
-
-    activateFullSceneTree(scene);
-
-    expect(repeater.state.repeatedPanels?.length).toBe(1);
-    console.error = origError;
-  });
-
   it('Should display a panel when there are variable errors async query', async () => {
     const { scene, repeater } = buildPanelRepeaterScene({
       variableQueryTime: 1,
@@ -262,7 +233,7 @@ describe('PanelRepeaterGridItem', () => {
 
     await new Promise((r) => setTimeout(r, 10));
 
-    expect(repeater.state.repeatedPanels?.length).toBe(1);
+    expect(repeater.state.body.state.$variables?.state.variables[0].getValue()).toBe('');
     console.error = origError;
   });
 
@@ -346,14 +317,14 @@ describe('PanelRepeaterGridItem', () => {
 
     variable.changeValueTo(['1', '3'], ['A', 'C']);
 
-    expect(repeater.state.repeatedPanels?.length).toBe(2);
+    expect(repeater.state.repeatedPanels?.length).toBe(1);
   });
 
   it('Should fall back to default variable if specified variable cannot be found', () => {
     const { scene, repeater } = buildPanelRepeaterScene({ variableQueryTime: 0 });
     scene.setState({ $variables: undefined });
     activateFullSceneTree(scene);
-    expect(repeater.state.repeatedPanels?.[0].state.$variables?.state.variables[0].state.name).toBe(
+    expect(repeater.state.body.state.$variables?.state.variables[0].state.name).toBe(
       '_____default_sys_repeat_var_____'
     );
   });
diff --git a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItem.tsx b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItem.tsx
index e19803ed5f9..f228575170b 100644
--- a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItem.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItem.tsx
@@ -6,20 +6,17 @@ import {
   VizPanel,
   SceneObjectBase,
   SceneGridLayout,
-  SceneVariableSet,
   SceneGridItemStateLike,
   SceneGridItemLike,
   sceneGraph,
   MultiValueVariable,
-  LocalValueVariable,
   CustomVariable,
-  VizPanelState,
   VariableValueSingle,
 } from '@grafana/scenes';
 import { GRID_COLUMN_COUNT } from 'app/core/constants';
 import { OptionsPaneCategoryDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor';
 
-import { getCloneKey } from '../../utils/clone';
+import { getCloneKey, getLocalVariableValueSet } from '../../utils/clone';
 import { getMultiVariableValues } from '../../utils/utils';
 import { scrollCanvasElementIntoView, scrollIntoView } from '../layouts-shared/scrollCanvasElementIntoView';
 import { DashboardLayoutItem } from '../types/DashboardLayoutItem';
@@ -86,13 +83,12 @@ export class DashboardGridItem
       return;
     }
 
-    const itemCount = this.state.repeatedPanels?.length ?? 1;
     const stateChange: Partial<DashboardGridItemState> = {};
 
     if (this.getRepeatDirection() === 'v') {
-      stateChange.itemHeight = Math.ceil(newState.height! / itemCount);
+      stateChange.itemHeight = Math.ceil(newState.height! / this.getPanelCount());
     } else {
-      const rowCount = Math.ceil(itemCount / this.getMaxPerRow());
+      const rowCount = Math.ceil(this.getPanelCount() / this.getMaxPerRow());
       stateChange.itemHeight = Math.ceil(newState.height! / rowCount);
     }
 
@@ -101,6 +97,10 @@ export class DashboardGridItem
     }
   }
 
+  public getPanelCount() {
+    return (this.state.repeatedPanels?.length ?? 0) + 1;
+  }
+
   public getClassName(): string {
     return this.state.variableName ? 'panel-repeater-grid-item' : '';
   }
@@ -117,13 +117,6 @@ export class DashboardGridItem
     if (!this.state.variableName) {
       return;
     }
-
-    if (this.state.repeatedPanels?.length ?? 0 > 1) {
-      this.state.body.setState({
-        $variables: this.state.repeatedPanels![0].state.$variables?.clone(),
-        $data: this.state.repeatedPanels![0].state.$data?.clone(),
-      });
-    }
   }
 
   public editingCompleted(withChanges: boolean) {
@@ -177,22 +170,16 @@ export class DashboardGridItem
 
     // Loop through variable values and create repeats
     for (let index = 0; index < variableValues.length; index++) {
-      const cloneState: Partial<VizPanelState> = {
-        $variables: new SceneVariableSet({
-          variables: [
-            new LocalValueVariable({
-              name: variable.state.name,
-              value: variableValues[index],
-              text: String(variableTexts[index]),
-              isMulti: variable.state.isMulti,
-              includeAll: variable.state.includeAll,
-            }),
-          ],
-        }),
-        key: getCloneKey(panelToRepeat.state.key!, index),
-      };
-      const clone = panelToRepeat.clone(cloneState);
-      repeatedPanels.push(clone);
+      const isSource = index === 0;
+      const clone = isSource
+        ? panelToRepeat
+        : panelToRepeat.clone({ key: getCloneKey(panelToRepeat.state.key!, index) });
+
+      clone.setState({ $variables: getLocalVariableValueSet(variable, variableValues[index], variableTexts[index]) });
+
+      if (index > 0) {
+        repeatedPanels.push(clone);
+      }
     }
 
     const direction = this.getRepeatDirection();
@@ -200,12 +187,13 @@ export class DashboardGridItem
     const itemHeight = this.state.itemHeight ?? 10;
     const prevHeight = this.state.height;
     const maxPerRow = this.getMaxPerRow();
+    const panelCount = repeatedPanels.length + 1; // +1 for the source panel
 
     if (direction === 'h') {
-      const rowCount = Math.ceil(repeatedPanels.length / maxPerRow);
+      const rowCount = Math.ceil(panelCount / maxPerRow);
       stateChange.height = rowCount * itemHeight;
     } else {
-      stateChange.height = repeatedPanels.length * itemHeight;
+      stateChange.height = panelCount * itemHeight;
     }
 
     this.setState(stateChange);
diff --git a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemRenderer.tsx
index 5cf4ba99282..ab5f5c071a1 100644
--- a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemRenderer.tsx
@@ -2,32 +2,33 @@ import { css } from '@emotion/css';
 import { useMemo } from 'react';
 
 import { config } from '@grafana/runtime';
-import { SceneComponentProps, VizPanel } from '@grafana/scenes';
+import { SceneComponentProps } from '@grafana/scenes';
 import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN } from 'app/core/constants';
 
 import { DashboardGridItem, RepeatDirection } from './DashboardGridItem';
 
 export function DashboardGridItemRenderer({ model }: SceneComponentProps<DashboardGridItem>) {
-  const { repeatedPanels, itemHeight, variableName, body } = model.useState();
-  const itemCount = repeatedPanels?.length ?? 0;
-  const layoutStyle = useLayoutStyle(model.getRepeatDirection(), itemCount, model.getMaxPerRow(), itemHeight ?? 10);
+  const { repeatedPanels = [], itemHeight, variableName, body } = model.useState();
+  const layoutStyle = useLayoutStyle(
+    model.getRepeatDirection(),
+    model.getPanelCount(),
+    model.getMaxPerRow(),
+    itemHeight ?? 10
+  );
 
   if (!variableName) {
-    if (body instanceof VizPanel) {
-      return (
-        <div className={panelWrapper} ref={model.containerRef}>
-          <body.Component model={body} key={body.state.key} />
-        </div>
-      );
-    }
-  }
-
-  if (!repeatedPanels) {
-    return null;
+    return (
+      <div className={panelWrapper} ref={model.containerRef}>
+        <body.Component model={body} key={body.state.key} />
+      </div>
+    );
   }
 
   return (
     <div className={layoutStyle} ref={model.containerRef}>
+      <div className={panelWrapper} key={body.state.key}>
+        <body.Component model={body} key={body.state.key} />
+      </div>
       {repeatedPanels.map((panel) => (
         <div className={panelWrapper} key={panel.state.key}>
           <panel.Component model={panel} key={panel.state.key} />
diff --git a/public/app/features/dashboard-scene/scene/layout-default/RowRepeaterBehavior.ts b/public/app/features/dashboard-scene/scene/layout-default/RowRepeaterBehavior.ts
index 975a7221119..a9cd9969c94 100644
--- a/public/app/features/dashboard-scene/scene/layout-default/RowRepeaterBehavior.ts
+++ b/public/app/features/dashboard-scene/scene/layout-default/RowRepeaterBehavior.ts
@@ -1,7 +1,6 @@
 import { isEqual } from 'lodash';
 
 import {
-  LocalValueVariable,
   MultiValueVariable,
   sceneGraph,
   SceneGridItemLike,
@@ -9,7 +8,6 @@ import {
   SceneGridRow,
   SceneObjectBase,
   SceneObjectState,
-  SceneVariableSet,
   VariableDependencyConfig,
   VariableValueSingle,
 } from '@grafana/scenes';
@@ -22,6 +20,7 @@ import {
   getCloneKey,
   isClonedKey,
   getOriginalKey,
+  getLocalVariableValueSet,
 } from '../../utils/clone';
 import { getMultiVariableValues } from '../../utils/utils';
 import { DashboardRepeatsProcessedEvent } from '../types/DashboardRepeatsProcessedEvent';
@@ -173,17 +172,7 @@ export class RowRepeaterBehavior extends SceneObjectBase<RowRepeaterBehaviorStat
 
       rowClone.setState({
         key: rowCloneKey,
-        $variables: new SceneVariableSet({
-          variables: [
-            new LocalValueVariable({
-              name: this.state.variableName,
-              value: variableValues[rowIndex],
-              text: String(variableTexts[rowIndex]),
-              isMulti: variable.state.isMulti,
-              includeAll: variable.state.includeAll,
-            }),
-          ],
-        }),
+        $variables: getLocalVariableValueSet(variable, variableValues[rowIndex], variableTexts[rowIndex]),
         children: [],
       });
 
diff --git a/public/app/features/dashboard-scene/scene/layout-rows/RowItemRepeater.tsx b/public/app/features/dashboard-scene/scene/layout-rows/RowItemRepeater.tsx
index 9d1a602fce4..ea606dcaadf 100644
--- a/public/app/features/dashboard-scene/scene/layout-rows/RowItemRepeater.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-rows/RowItemRepeater.tsx
@@ -1,17 +1,11 @@
 import { isEqual } from 'lodash';
 import { useEffect } from 'react';
 
-import {
-  MultiValueVariable,
-  SceneVariableSet,
-  LocalValueVariable,
-  sceneGraph,
-  VariableValueSingle,
-} from '@grafana/scenes';
+import { MultiValueVariable, sceneGraph, VariableValueSingle } from '@grafana/scenes';
 import { Spinner } from '@grafana/ui';
 
 import { DashboardStateChangedEvent } from '../../edit-pane/shared';
-import { getCloneKey } from '../../utils/clone';
+import { getCloneKey, getLocalVariableValueSet } from '../../utils/clone';
 import { dashboardLog, getMultiVariableValues } from '../../utils/utils';
 import { DashboardRepeatsProcessedEvent } from '../types/DashboardRepeatsProcessedEvent';
 
@@ -109,17 +103,7 @@ export function performRowRepeats(variable: MultiValueVariable, row: RowItem, co
 
     rowClone.setState({
       key: rowCloneKey,
-      $variables: new SceneVariableSet({
-        variables: [
-          new LocalValueVariable({
-            name: variable.state.name,
-            value: variableValues[rowIndex],
-            text: String(variableTexts[rowIndex]),
-            isMulti: variable.state.isMulti,
-            includeAll: variable.state.includeAll,
-          }),
-        ],
-      }),
+      $variables: getLocalVariableValueSet(variable, variableValues[rowIndex], variableTexts[rowIndex]),
       layout,
     });
 
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.tsx
index 9c3291b25d2..e8ce39b892c 100644
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRepeater.tsx
@@ -3,17 +3,11 @@ import { isEqual } from 'lodash';
 import { useEffect } from 'react';
 
 import { t } from '@grafana/i18n';
-import {
-  MultiValueVariable,
-  SceneVariableSet,
-  LocalValueVariable,
-  sceneGraph,
-  VariableValueSingle,
-} from '@grafana/scenes';
+import { MultiValueVariable, sceneGraph, VariableValueSingle } from '@grafana/scenes';
 import { Spinner, Tooltip, useStyles2 } from '@grafana/ui';
 
 import { DashboardStateChangedEvent } from '../../edit-pane/shared';
-import { getCloneKey } from '../../utils/clone';
+import { getCloneKey, getLocalVariableValueSet } from '../../utils/clone';
 import { dashboardLog, getMultiVariableValues } from '../../utils/utils';
 import { DashboardRepeatsProcessedEvent } from '../types/DashboardRepeatsProcessedEvent';
 
@@ -164,17 +158,7 @@ export function createTabRepeats({
 
     tabClone.setState({
       key: tabCloneKey,
-      $variables: new SceneVariableSet({
-        variables: [
-          new LocalValueVariable({
-            name: variable.state.name,
-            value: variableValues[tabIndex],
-            text: String(variableTexts[tabIndex]),
-            isMulti: variable.state.isMulti,
-            includeAll: variable.state.includeAll,
-          }),
-        ],
-      }),
+      $variables: getLocalVariableValueSet(variable, variableValues[tabIndex], variableTexts[tabIndex]),
       layout,
     });
 
diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
index b543bdeb10b..5031ac788a2 100644
--- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
@@ -792,7 +792,7 @@ describe('transformSceneToSaveModel', () => {
 
         activateFullSceneTree(scene);
 
-        expect(repeater.state.repeatedPanels?.length).toBe(2);
+        expect(repeater.state.repeatedPanels?.length).toBe(1);
         const result = panelRepeaterToPanels(repeater, true);
 
         expect(result).toHaveLength(2);
diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts
index 68633912597..8704ff7625c 100644
--- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts
@@ -329,48 +329,46 @@ export function panelRepeaterToPanels(repeater: DashboardGridItem, isSnapshot =
       return [vizPanelToPanel(repeater.state.body, { x, y, w, h }, isSnapshot)];
     }
 
-    if (repeater.state.repeatedPanels) {
-      const { h, w, columnCount } = calculateGridItemDimensions(repeater);
-      const panels = repeater.state.repeatedPanels!.map((panel, index) => {
-        let x = 0,
-          y = 0;
-        if (repeater.state.repeatDirection === 'v') {
-          x = repeater.state.x!;
-          y = index * h;
-        } else {
-          x = (index % columnCount) * w;
-          y = repeater.state.y! + Math.floor(index / columnCount) * h;
-        }
+    const vizPanels = [repeater.state.body, ...(repeater.state.repeatedPanels ?? [])];
 
-        const gridPos = { x, y, w, h };
+    const { h, w, columnCount } = calculateGridItemDimensions(repeater);
+    const panels = vizPanels.map((panel, index) => {
+      let x = 0,
+        y = 0;
+      if (repeater.state.repeatDirection === 'v') {
+        x = repeater.state.x!;
+        y = index * h;
+      } else {
+        x = (index % columnCount) * w;
+        y = repeater.state.y! + Math.floor(index / columnCount) * h;
+      }
 
-        const localVariable = panel.state.$variables!.getByName(repeater.state.variableName!) as LocalValueVariable;
+      const gridPos = { x, y, w, h };
 
-        const result: Panel = {
-          id: getPanelIdForVizPanel(panel),
-          type: panel.state.pluginId,
-          title: panel.state.title,
-          gridPos,
-          options: panel.state.options,
-          fieldConfig: (panel.state.fieldConfig as FieldConfigSource) ?? { defaults: {}, overrides: [] },
-          transformations: [],
-          transparent: panel.state.displayMode === 'transparent',
-          // @ts-expect-error scopedVars are runtime only properties, not part of the persisted Dashboardmodel
-          scopedVars: {
-            [repeater.state.variableName!]: {
-              text: localVariable?.state.text,
-              value: localVariable?.state.value,
-            },
+      const localVariable = panel.state.$variables!.getByName(repeater.state.variableName!) as LocalValueVariable;
+
+      const result: Panel = {
+        id: getPanelIdForVizPanel(panel),
+        type: panel.state.pluginId,
+        title: panel.state.title,
+        gridPos,
+        options: panel.state.options,
+        fieldConfig: (panel.state.fieldConfig as FieldConfigSource) ?? { defaults: {}, overrides: [] },
+        transformations: [],
+        transparent: panel.state.displayMode === 'transparent',
+        // @ts-expect-error scopedVars are runtime only properties, not part of the persisted Dashboardmodel
+        scopedVars: {
+          [repeater.state.variableName!]: {
+            text: localVariable?.state.text,
+            value: localVariable?.state.value,
           },
-          ...vizPanelDataToPanel(panel, isSnapshot),
-        };
-        return result;
-      });
+        },
+        ...vizPanelDataToPanel(panel, isSnapshot),
+      };
+      return result;
+    });
 
-      return panels;
-    }
-
-    return [];
+    return panels;
   }
 }
 
diff --git a/public/app/features/dashboard-scene/utils/clone.ts b/public/app/features/dashboard-scene/utils/clone.ts
index 89ee6867d81..2dc9fac27c3 100644
--- a/public/app/features/dashboard-scene/utils/clone.ts
+++ b/public/app/features/dashboard-scene/utils/clone.ts
@@ -1,4 +1,11 @@
-import { SceneObject } from '@grafana/scenes';
+import {
+  LocalValueVariable,
+  MultiValueVariableState,
+  SceneObject,
+  SceneVariable,
+  SceneVariableSet,
+  VariableValueSingle,
+} from '@grafana/scenes';
 
 import { DashboardScene } from '../scene/DashboardScene';
 
@@ -100,3 +107,21 @@ export function useHasClonedParents(scene: SceneObject): boolean {
 
   return useHasClonedParents(scene.parent);
 }
+
+export function getLocalVariableValueSet(
+  variable: SceneVariable<MultiValueVariableState>,
+  value: VariableValueSingle,
+  text: VariableValueSingle
+): SceneVariableSet {
+  return new SceneVariableSet({
+    variables: [
+      new LocalValueVariable({
+        name: variable.state.name,
+        value,
+        text,
+        isMulti: variable.state.isMulti,
+        includeAll: variable.state.includeAll,
+      }),
+    ],
+  });
+}
diff --git a/public/app/features/dashboard-scene/utils/test-utils.ts b/public/app/features/dashboard-scene/utils/test-utils.ts
index 7576d80f18c..e9e83e86792 100644
--- a/public/app/features/dashboard-scene/utils/test-utils.ts
+++ b/public/app/features/dashboard-scene/utils/test-utils.ts
@@ -143,6 +143,7 @@ export function buildPanelRepeaterScene(options: SceneOptions, source?: VizPanel
       new VizPanel({
         title: 'Panel $server',
         pluginId: 'timeseries',
+        key: 'panel-1',
       }),
     x: options.x || 0,
     y: options.y || 0,

From 6fb6cf4f1dc66671f3aca6c774d56f6a917052e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= <hugo.haggmark@gmail.com>
Date: Mon, 18 Aug 2025 13:57:28 +0200
Subject: [PATCH 218/243] Chore: defaults localizationForPlugins behavior
 (#109778)

* Chore: defaults localizationForPlugins behavior

* chore: fixes backend tests

* chore: fix backend tests

* chore: fix some more backend tests
---
 pkg/plugins/manager/loader/loader_test.go     | 35 +++++++-----
 .../manager/pipeline/bootstrap/factory.go     |  6 +-
 .../pluginsintegration/loader/loader_test.go  | 56 ++++++++++++-------
 .../pluginsintegration/pluginconfig/config.go |  1 -
 .../plugins/importer/importPluginModule.ts    |  2 +-
 5 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/pkg/plugins/manager/loader/loader_test.go b/pkg/plugins/manager/loader/loader_test.go
index dcd9a536baa..3cbaf8968da 100644
--- a/pkg/plugins/manager/loader/loader_test.go
+++ b/pkg/plugins/manager/loader/loader_test.go
@@ -122,11 +122,12 @@ func TestLoader_Load(t *testing.T) {
 						Backend:      true,
 						QueryOptions: map[string]bool{"minInterval": true},
 					},
-					Module:    "core:plugin/cloudwatch",
-					BaseURL:   "public/plugins/cloudwatch",
-					FS:        mustNewStaticFSForTests(t, filepath.Join(corePluginDir, "app/plugins/datasource/cloudwatch")),
-					Signature: plugins.SignatureStatusInternal,
-					Class:     plugins.ClassCore,
+					Module:       "core:plugin/cloudwatch",
+					BaseURL:      "public/plugins/cloudwatch",
+					FS:           mustNewStaticFSForTests(t, filepath.Join(corePluginDir, "app/plugins/datasource/cloudwatch")),
+					Signature:    plugins.SignatureStatusInternal,
+					Class:        plugins.ClassCore,
+					Translations: map[string]string{},
 				},
 			},
 		},
@@ -221,6 +222,7 @@ func TestLoader_Load(t *testing.T) {
 					Signature:     "valid",
 					SignatureType: plugins.SignatureTypeGrafana,
 					SignatureOrg:  "Grafana Labs",
+					Translations:  map[string]string{},
 				},
 			},
 		},
@@ -266,11 +268,12 @@ func TestLoader_Load(t *testing.T) {
 						Backend: true,
 						State:   plugins.ReleaseStateAlpha,
 					},
-					Class:     plugins.ClassExternal,
-					Module:    "public/plugins/test-datasource/module.js",
-					BaseURL:   "public/plugins/test-datasource",
-					FS:        mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/unsigned-datasource/plugin")),
-					Signature: "unsigned",
+					Class:        plugins.ClassExternal,
+					Module:       "public/plugins/test-datasource/module.js",
+					BaseURL:      "public/plugins/test-datasource",
+					FS:           mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/unsigned-datasource/plugin")),
+					Signature:    "unsigned",
+					Translations: map[string]string{},
 				},
 			},
 		},
@@ -323,11 +326,12 @@ func TestLoader_Load(t *testing.T) {
 						Backend: true,
 						State:   plugins.ReleaseStateAlpha,
 					},
-					Class:     plugins.ClassExternal,
-					Module:    "public/plugins/test-datasource/module.js",
-					BaseURL:   "public/plugins/test-datasource",
-					FS:        mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/unsigned-datasource/plugin")),
-					Signature: plugins.SignatureStatusUnsigned,
+					Class:        plugins.ClassExternal,
+					Module:       "public/plugins/test-datasource/module.js",
+					BaseURL:      "public/plugins/test-datasource",
+					FS:           mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/unsigned-datasource/plugin")),
+					Signature:    plugins.SignatureStatusUnsigned,
+					Translations: map[string]string{},
 				},
 			},
 		},
@@ -424,6 +428,7 @@ func TestLoader_Load(t *testing.T) {
 					Signature:     plugins.SignatureStatusUnsigned,
 					Module:        "public/plugins/test-app/module.js",
 					BaseURL:       "public/plugins/test-app",
+					Translations:  map[string]string{},
 				},
 			},
 		},
diff --git a/pkg/plugins/manager/pipeline/bootstrap/factory.go b/pkg/plugins/manager/pipeline/bootstrap/factory.go
index e3a31476624..de617075fc0 100644
--- a/pkg/plugins/manager/pipeline/bootstrap/factory.go
+++ b/pkg/plugins/manager/pipeline/bootstrap/factory.go
@@ -78,10 +78,8 @@ func (f *DefaultPluginFactory) newPlugin(p plugins.FoundPlugin, class plugins.Cl
 		return nil, err
 	}
 
-	if f.features.LocalizationForPlugins {
-		if err := setTranslations(plugin, f.assetPath, info); err != nil {
-			return nil, err
-		}
+	if err := setTranslations(plugin, f.assetPath, info); err != nil {
+		return nil, err
 	}
 
 	return plugin, nil
diff --git a/pkg/services/pluginsintegration/loader/loader_test.go b/pkg/services/pluginsintegration/loader/loader_test.go
index 4bf6f9df4c2..d9c102c48b4 100644
--- a/pkg/services/pluginsintegration/loader/loader_test.go
+++ b/pkg/services/pluginsintegration/loader/loader_test.go
@@ -121,11 +121,12 @@ func TestLoader_Load(t *testing.T) {
 						Backend:      true,
 						QueryOptions: map[string]bool{"minInterval": true},
 					},
-					Module:    "core:plugin/cloudwatch",
-					BaseURL:   "public/plugins/cloudwatch",
-					FS:        mustNewStaticFSForTests(t, filepath.Join(corePluginDir(t), "app/plugins/datasource/cloudwatch")),
-					Signature: plugins.SignatureStatusInternal,
-					Class:     plugins.ClassCore,
+					Module:       "core:plugin/cloudwatch",
+					BaseURL:      "public/plugins/cloudwatch",
+					FS:           mustNewStaticFSForTests(t, filepath.Join(corePluginDir(t), "app/plugins/datasource/cloudwatch")),
+					Signature:    plugins.SignatureStatusInternal,
+					Class:        plugins.ClassCore,
+					Translations: map[string]string{},
 				},
 			},
 		},
@@ -220,6 +221,7 @@ func TestLoader_Load(t *testing.T) {
 					Signature:     "valid",
 					SignatureType: plugins.SignatureTypeGrafana,
 					SignatureOrg:  "Grafana Labs",
+					Translations:  map[string]string{},
 				},
 			},
 		},
@@ -265,11 +267,12 @@ func TestLoader_Load(t *testing.T) {
 						Backend: true,
 						State:   plugins.ReleaseStateAlpha,
 					},
-					Class:     plugins.ClassExternal,
-					Module:    "public/plugins/test-datasource/module.js",
-					BaseURL:   "public/plugins/test-datasource",
-					FS:        mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "unsigned-datasource/plugin")),
-					Signature: "unsigned",
+					Class:        plugins.ClassExternal,
+					Module:       "public/plugins/test-datasource/module.js",
+					BaseURL:      "public/plugins/test-datasource",
+					FS:           mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "unsigned-datasource/plugin")),
+					Signature:    "unsigned",
+					Translations: map[string]string{},
 				},
 			},
 		},
@@ -328,11 +331,12 @@ func TestLoader_Load(t *testing.T) {
 						Backend: true,
 						State:   plugins.ReleaseStateAlpha,
 					},
-					Class:     plugins.ClassExternal,
-					Module:    "public/plugins/test-datasource/module.js",
-					BaseURL:   "public/plugins/test-datasource",
-					FS:        mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "unsigned-datasource/plugin")),
-					Signature: plugins.SignatureStatusUnsigned,
+					Class:        plugins.ClassExternal,
+					Module:       "public/plugins/test-datasource/module.js",
+					BaseURL:      "public/plugins/test-datasource",
+					FS:           mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "unsigned-datasource/plugin")),
+					Signature:    plugins.SignatureStatusUnsigned,
+					Translations: map[string]string{},
 				},
 			},
 		},
@@ -453,6 +457,7 @@ func TestLoader_Load(t *testing.T) {
 					Signature:     plugins.SignatureStatusUnsigned,
 					Module:        "public/plugins/test-app/module.js",
 					BaseURL:       "public/plugins/test-app",
+					Translations:  map[string]string{},
 				},
 			},
 		},
@@ -542,6 +547,7 @@ func TestLoader_Load_ExternalRegistration(t *testing.T) {
 					ClientID:     "client-id",
 					ClientSecret: "secretz",
 				},
+				Translations: map[string]string{},
 			},
 		}
 
@@ -636,11 +642,12 @@ func TestLoader_Load_CustomSource(t *testing.T) {
 					ExtensionPoints:   []plugins.ExtensionPoint{},
 				},
 			},
-			FS:        mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "cdn/plugin")),
-			Class:     plugins.ClassExternal,
-			Signature: plugins.SignatureStatusValid,
-			BaseURL:   "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel",
-			Module:    "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/module.js",
+			FS:           mustNewStaticFSForTests(t, filepath.Join(testDataDir(t), "cdn/plugin")),
+			Class:        plugins.ClassExternal,
+			Signature:    plugins.SignatureStatusValid,
+			BaseURL:      "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel",
+			Module:       "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/module.js",
+			Translations: map[string]string{},
 		}}
 
 		l := newLoader(t, cfg, fakes.NewFakePluginRegistry(), fakes.NewFakeProcessManager(), fakes.NewFakeBackendProcessProvider(), newFakeErrorTracker())
@@ -727,6 +734,7 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 						Signature:     "valid",
 						SignatureType: plugins.SignatureTypePrivate,
 						SignatureOrg:  "Will Browne",
+						Translations:  map[string]string{},
 					},
 				},
 				pluginErrors: map[string]*plugins.Error{
@@ -845,6 +853,7 @@ func TestLoader_Load_RBACReady(t *testing.T) {
 					SignatureOrg:  "gabrielmabille",
 					Module:        "public/plugins/test-app/module.js",
 					BaseURL:       "public/plugins/test-app",
+					Translations:  map[string]string{},
 				},
 			},
 		},
@@ -913,6 +922,7 @@ func TestLoader_Load_Signature_RootURL(t *testing.T) {
 				SignatureOrg:  "Will Browne",
 				Module:        "public/plugins/test-datasource/module.js",
 				BaseURL:       "public/plugins/test-datasource",
+				Translations:  map[string]string{},
 			},
 		}
 
@@ -999,6 +1009,7 @@ func TestLoader_Load_DuplicatePlugins(t *testing.T) {
 				SignatureOrg:  "Grafana Labs",
 				Module:        "public/plugins/test-app/module.js",
 				BaseURL:       "public/plugins/test-app",
+				Translations:  map[string]string{},
 			},
 		}
 
@@ -1089,6 +1100,7 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
 				SignatureOrg:  "Grafana Labs",
 				Module:        "public/plugins/test-app/module.js",
 				BaseURL:       "public/plugins/test-app",
+				Translations:  map[string]string{},
 			},
 		}
 
@@ -1290,6 +1302,7 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 		SignatureType: plugins.SignatureTypeGrafana,
 		SignatureOrg:  "Grafana Labs",
 		Class:         plugins.ClassExternal,
+		Translations:  map[string]string{},
 	}
 
 	child := &plugins.Plugin{
@@ -1333,6 +1346,7 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 		SignatureType: plugins.SignatureTypeGrafana,
 		SignatureOrg:  "Grafana Labs",
 		Class:         plugins.ClassExternal,
+		Translations:  map[string]string{},
 	}
 
 	parent.Children = []*plugins.Plugin{child}
@@ -1482,6 +1496,7 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 			SignatureType: plugins.SignatureTypeGrafana,
 			SignatureOrg:  "Grafana Labs",
 			Class:         plugins.ClassExternal,
+			Translations:  map[string]string{},
 		}
 
 		child := &plugins.Plugin{
@@ -1532,6 +1547,7 @@ func TestLoader_Load_NestedPlugins(t *testing.T) {
 			SignatureType:   plugins.SignatureTypeGrafana,
 			SignatureOrg:    "Grafana Labs",
 			Class:           plugins.ClassExternal,
+			Translations:    map[string]string{},
 		}
 
 		parent.Children = []*plugins.Plugin{child}
diff --git a/pkg/services/pluginsintegration/pluginconfig/config.go b/pkg/services/pluginsintegration/pluginconfig/config.go
index ba57d743cfe..08e0fc460c3 100644
--- a/pkg/services/pluginsintegration/pluginconfig/config.go
+++ b/pkg/services/pluginsintegration/pluginconfig/config.go
@@ -32,7 +32,6 @@ func ProvidePluginManagementConfig(cfg *setting.Cfg, settingProvider setting.Pro
 		config.Features{
 			SkipHostEnvVarsEnabled: features.IsEnabledGlobally(featuremgmt.FlagPluginsSkipHostEnvVars),
 			SriChecksEnabled:       features.IsEnabledGlobally(featuremgmt.FlagPluginsSriChecks),
-			LocalizationForPlugins: features.IsEnabledGlobally(featuremgmt.FlagLocalizationForPlugins),
 			TempoAlertingEnabled:   features.IsEnabledGlobally(featuremgmt.FlagTempoAlerting),
 			PluginAssetProvider:    features.IsEnabledGlobally(featuremgmt.FlagPluginAssetProvider),
 		},
diff --git a/public/app/features/plugins/importer/importPluginModule.ts b/public/app/features/plugins/importer/importPluginModule.ts
index 9b220c97d6f..14e54fda24f 100644
--- a/public/app/features/plugins/importer/importPluginModule.ts
+++ b/public/app/features/plugins/importer/importPluginModule.ts
@@ -26,7 +26,7 @@ export async function importPluginModule({
   }
 
   // Add locales to i18n for a plugin if the feature toggle is enabled and the plugin has locales
-  if (config.featureToggles.localizationForPlugins && translations) {
+  if (translations) {
     await addTranslationsToI18n({
       resolvedLanguage: getResolvedLanguage(),
       fallbackLanguage: DEFAULT_LANGUAGE,

From 3857faf7b3eab90206686b9f98f223f01050e8fc Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matias.chomicki@grafana.com>
Date: Mon, 18 Aug 2025 14:26:59 +0200
Subject: [PATCH 219/243] Logs Panel: use provided height for the container
 (#109786)

LogsPanel: use provided height for the container
---
 public/app/plugins/panel/logs/LogsPanel.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/app/plugins/panel/logs/LogsPanel.tsx b/public/app/plugins/panel/logs/LogsPanel.tsx
index 3c80bcacad0..b5405d81bc3 100644
--- a/public/app/plugins/panel/logs/LogsPanel.tsx
+++ b/public/app/plugins/panel/logs/LogsPanel.tsx
@@ -172,6 +172,7 @@ export const LogsPanel = ({
     timestampResolution,
     ...options
   },
+  height,
   id,
 }: LogsPanelProps) => {
   const isAscending = sortOrder === LogsSortOrder.Ascending;
@@ -565,6 +566,7 @@ export const LogsPanel = ({
         <div
           onMouseLeave={onLogContainerMouseLeave}
           className={style.logListContainer}
+          style={height ? { minHeight: height } : undefined}
           ref={(element: HTMLDivElement) => setScrollElement(element)}
         >
           {deduplicatedRows.length > 0 && scrollElement && (

From 10508d0614d7ddb615be1c17d972cff5946bd42b Mon Sep 17 00:00:00 2001
From: Matheus Macabu <macabu@users.noreply.github.com>
Date: Mon, 18 Aug 2025 14:42:55 +0200
Subject: [PATCH 220/243] Secret/Keepers: Return already exists error from DB
 when creating keeper (#109782)

---
 pkg/registry/apis/secret/contracts/keeper.go |  3 ++-
 pkg/storage/secret/metadata/keeper_store.go  | 15 +++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkg/registry/apis/secret/contracts/keeper.go b/pkg/registry/apis/secret/contracts/keeper.go
index 48db9a13dc0..5558a4db3b5 100644
--- a/pkg/registry/apis/secret/contracts/keeper.go
+++ b/pkg/registry/apis/secret/contracts/keeper.go
@@ -10,7 +10,8 @@ import (
 )
 
 var (
-	ErrKeeperNotFound = errors.New("keeper not found")
+	ErrKeeperNotFound      = errors.New("keeper not found")
+	ErrKeeperAlreadyExists = errors.New("keeper already exists")
 )
 
 // KeeperMetadataStorage is the interface for wiring and dependency injection.
diff --git a/pkg/storage/secret/metadata/keeper_store.go b/pkg/storage/secret/metadata/keeper_store.go
index 7c9f12860ea..38c27cd1873 100644
--- a/pkg/storage/secret/metadata/keeper_store.go
+++ b/pkg/storage/secret/metadata/keeper_store.go
@@ -16,6 +16,7 @@ import (
 	"github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
 	"github.com/grafana/grafana/pkg/registry/apis/secret/xkube"
 	"github.com/grafana/grafana/pkg/storage/secret/metadata/metrics"
+	"github.com/grafana/grafana/pkg/storage/unified/sql"
 	"github.com/grafana/grafana/pkg/storage/unified/sql/sqltemplate"
 )
 
@@ -91,13 +92,12 @@ func (s *keeperMetadataStorage) Create(ctx context.Context, keeper *secretv1beta
 			return err
 		}
 
-		// Validate before inserting that any `secureValues` referenced exist and do not reference other third-party keepers.
-		if err := s.validateSecureValueReferences(ctx, keeper); err != nil {
-			return err
-		}
-
 		result, err := s.db.ExecContext(ctx, query, req.GetArgs()...)
 		if err != nil {
+			if sql.IsRowAlreadyExistsError(err) {
+				return fmt.Errorf("namespace=%s name=%s: %w", keeper.Namespace, keeper.Name, contracts.ErrKeeperAlreadyExists)
+			}
+
 			return fmt.Errorf("inserting row: %w", err)
 		}
 
@@ -240,11 +240,6 @@ func (s *keeperMetadataStorage) Update(ctx context.Context, newKeeper *secretv1b
 			return err
 		}
 
-		// Validate before updating that any `secureValues` referenced exists and does not reference other third-party keepers.
-		if err := s.validateSecureValueReferences(ctx, newKeeper); err != nil {
-			return err
-		}
-
 		// Read old value first.
 		oldKeeperRow, err := s.read(ctx, newKeeper.Namespace, newKeeper.Name, contracts.ReadOpts{ForUpdate: true})
 		if err != nil {

From ed2dfd98859d76c2ab5614052196b4fe93798d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Mon, 18 Aug 2025 14:44:50 +0200
Subject: [PATCH 221/243] datasources: querier: better error handling (#109789)

---
 pkg/expr/nodes.go                             |  6 +++++-
 .../mt_datasource_client_builder.go           | 19 +++++++++----------
 pkg/services/query/query.go                   |  6 +++++-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkg/expr/nodes.go b/pkg/expr/nodes.go
index f80ddf77db8..eaaff0f1388 100644
--- a/pkg/expr/nodes.go
+++ b/pkg/expr/nodes.go
@@ -395,7 +395,11 @@ func (dn *DSNode) Execute(ctx context.Context, now time.Time, _ mathexp.Vars, s
 	}()
 
 	var resp *backend.QueryDataResponse
-	mtDSClient, ok := s.mtDatasourceClientBuilder.BuildClient(dn.datasource.Type, dn.datasource.UID)
+	mtDSClient, ok, err := s.mtDatasourceClientBuilder.BuildClient(dn.datasource.Type, dn.datasource.UID)
+	if err != nil {
+		return mathexp.Results{}, MakeQueryError(dn.refID, dn.datasource.UID, err)
+	}
+
 	if !ok { // use single tenant client
 		pCtx, err := s.pCtxProvider.GetWithDataSource(ctx, dn.datasource.Type, dn.request.User, dn.datasource)
 		if err != nil {
diff --git a/pkg/services/mtdsclient/mt_datasource_client_builder.go b/pkg/services/mtdsclient/mt_datasource_client_builder.go
index 5125b975cba..b530a277142 100644
--- a/pkg/services/mtdsclient/mt_datasource_client_builder.go
+++ b/pkg/services/mtdsclient/mt_datasource_client_builder.go
@@ -9,13 +9,13 @@ import (
 )
 
 type MTDatasourceClientBuilder interface {
-	BuildClient(pluginId string, uid string) (clientapi.QueryDataClient, bool)
+	BuildClient(pluginId string, uid string) (clientapi.QueryDataClient, bool, error)
 }
 
 type nullBuilder struct{}
 
-func (m *nullBuilder) BuildClient(pluginId string, uid string) (clientapi.QueryDataClient, bool) {
-	return nil, false
+func (m *nullBuilder) BuildClient(pluginId string, uid string) (clientapi.QueryDataClient, bool, error) {
+	return nil, false, nil
 }
 
 // we use this noop for st flows
@@ -29,7 +29,7 @@ type MtDatasourceClientBuilderWithInstance struct {
 	logger   log.Logger
 }
 
-func (b *MtDatasourceClientBuilderWithInstance) BuildClient(pluginId string, uid string) (clientapi.QueryDataClient, bool) {
+func (b *MtDatasourceClientBuilderWithInstance) BuildClient(pluginId string, uid string) (clientapi.QueryDataClient, bool, error) {
 	dsClient, err := b.instance.GetDataSourceClient(
 		b.ctx,
 		v0alpha1.DataSourceRef{
@@ -38,10 +38,9 @@ func (b *MtDatasourceClientBuilderWithInstance) BuildClient(pluginId string, uid
 		},
 	)
 	if err != nil {
-		b.logger.Debug("failed to get mt ds client", "error", err)
-		return nil, false
+		return nil, true, err
 	}
-	return dsClient, true
+	return dsClient, true, nil
 }
 
 // TODO: I think we might be able to refactor this to just use the instance
@@ -69,10 +68,10 @@ type testBuilder struct {
 	isMultitenant bool
 }
 
-func (b *testBuilder) BuildClient(pluginId string, uid string) (clientapi.QueryDataClient, bool) {
+func (b *testBuilder) BuildClient(pluginId string, uid string) (clientapi.QueryDataClient, bool, error) {
 	if !b.isMultitenant {
-		return nil, false
+		return nil, false, nil
 	}
 
-	return b.mockClient, true
+	return b.mockClient, true, nil
 }
diff --git a/pkg/services/query/query.go b/pkg/services/query/query.go
index 6bbe0252755..0c4dda928b5 100644
--- a/pkg/services/query/query.go
+++ b/pkg/services/query/query.go
@@ -302,7 +302,11 @@ func (s *ServiceImpl) handleQuerySingleDatasource(ctx context.Context, user iden
 		req.Queries = append(req.Queries, q.query)
 	}
 
-	mtDsClient, ok := s.mtDatasourceClientBuilder.BuildClient(ds.Type, ds.UID)
+	mtDsClient, ok, err := s.mtDatasourceClientBuilder.BuildClient(ds.Type, ds.UID)
+	if err != nil {
+		return nil, err
+	}
+
 	if !ok { // single tenant flow
 		pCtx, err := s.pCtxProvider.GetWithDataSource(ctx, ds.Type, user, ds)
 		if err != nil {

From effc887b08f1e3adc3c9687285bdf3233a86e70f Mon Sep 17 00:00:00 2001
From: Moustafa Baiou <moustafa.baiou@grafana.com>
Date: Fri, 15 Aug 2025 08:53:01 -0700
Subject: [PATCH 222/243] Alerting: Use db pagination for prometheus api

This reintroduces database pagination for the Prometheus API for rules.

Follow up for #109558 to use the new pagination format.

Note: This changes the sort-order to use `NamespaceUID` instead of the fully qualified Folder path. This also changes the cursor format to use the `NamespaceUID` instead of the Folder path and to be in a reverisble format.
---
 pkg/services/ngalert/api/prometheus/api_prometheus.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/services/ngalert/api/prometheus/api_prometheus.go b/pkg/services/ngalert/api/prometheus/api_prometheus.go
index ed02dc780c5..2d0b441c9ef 100644
--- a/pkg/services/ngalert/api/prometheus/api_prometheus.go
+++ b/pkg/services/ngalert/api/prometheus/api_prometheus.go
@@ -30,7 +30,7 @@ import (
 
 type RuleStoreReader interface {
 	GetUserVisibleNamespaces(context.Context, int64, identity.Requester) (map[string]*folder.Folder, error)
-	ListAlertRulesStore
+	ListAlertRulesStoreV2
 }
 
 type RuleGroupAccessControlService interface {
@@ -292,7 +292,7 @@ func (srv PrometheusSrv) RouteGetRuleStatuses(c *contextmodel.ReqContext) respon
 		return response.JSON(ruleResponse.HTTPStatusCode(), ruleResponse)
 	}
 
-	ruleResponse = PrepareRuleGroupStatuses(
+	ruleResponse = PrepareRuleGroupStatusesV2(
 		srv.log,
 		srv.store,
 		RuleGroupStatusesOptions{

From 8a9e3ffd318dc304b6c603b6a43a5153b4fc486e Mon Sep 17 00:00:00 2001
From: Tom Ratcliffe <tom.ratcliffe@grafana.com>
Date: Mon, 18 Aug 2025 14:48:18 +0100
Subject: [PATCH 223/243] Folders: Remove OldFolderPicker component (#109791)

---
 .betterer.results                             |   3 +-
 .../Select/OldFolderPicker.test.tsx           | 190 ---------
 .../components/Select/OldFolderPicker.tsx     | 395 ------------------
 .../forms/SaveDashboardAsForm.test.tsx        |   5 -
 .../manage-dashboards/state/actions.ts        |  26 --
 public/locales/en-US/grafana.json             |   5 -
 6 files changed, 1 insertion(+), 623 deletions(-)
 delete mode 100644 public/app/core/components/Select/OldFolderPicker.test.tsx
 delete mode 100644 public/app/core/components/Select/OldFolderPicker.tsx

diff --git a/.betterer.results b/.betterer.results
index a217b42a0a5..695051344fb 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2489,8 +2489,7 @@ 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.", "7"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
     ],
     "public/app/features/manage-dashboards/state/reducers.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
diff --git a/public/app/core/components/Select/OldFolderPicker.test.tsx b/public/app/core/components/Select/OldFolderPicker.test.tsx
deleted file mode 100644
index 69fb67c5c9a..00000000000
--- a/public/app/core/components/Select/OldFolderPicker.test.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import selectEvent from 'react-select-event';
-
-import { selectors } from '@grafana/e2e-selectors';
-import { contextSrv } from 'app/core/core';
-import * as api from 'app/features/manage-dashboards/state/actions';
-
-import { DashboardSearchHit } from '../../../features/search/types';
-
-import { OldFolderPicker, getInitialValues } from './OldFolderPicker';
-
-describe('OldFolderPicker', () => {
-  it('should render', async () => {
-    jest
-      .spyOn(api, 'searchFolders')
-      .mockResolvedValue([
-        { title: 'Dash 1', uid: 'xMsQdBfWz' } as DashboardSearchHit,
-        { title: 'Dash 2', uid: 'wfTJJL5Wz' } as DashboardSearchHit,
-      ]);
-
-    render(<OldFolderPicker onChange={jest.fn()} />);
-    expect(await screen.findByTestId(selectors.components.FolderPicker.containerV2)).toBeInTheDocument();
-  });
-
-  it('Should apply filter to the folders search results', async () => {
-    jest
-      .spyOn(api, 'searchFolders')
-      .mockResolvedValue([
-        { title: 'Dash 1', uid: 'xMsQdBfWz' } as DashboardSearchHit,
-        { title: 'Dash 2', uid: 'wfTJJL5Wz' } as DashboardSearchHit,
-        { title: 'Dash 3', uid: '7MeksYbmk' } as DashboardSearchHit,
-      ]);
-
-    render(<OldFolderPicker onChange={jest.fn()} filter={(hits) => hits.filter((h) => h.uid !== 'wfTJJL5Wz')} />);
-
-    const pickerContainer = screen.getByTestId(selectors.components.FolderPicker.input);
-    selectEvent.openMenu(pickerContainer);
-
-    const pickerOptions = await screen.findAllByTestId(selectors.components.Select.option);
-
-    expect(pickerOptions).toHaveLength(2);
-    expect(pickerOptions[0]).toHaveTextContent('Dash 1');
-    expect(pickerOptions[1]).toHaveTextContent('Dash 3');
-  });
-
-  it('should allow creating a new option', async () => {
-    const newFolder = { title: 'New Folder', uid: '7MeksYbmk' } as DashboardSearchHit;
-
-    jest
-      .spyOn(api, 'searchFolders')
-      .mockResolvedValue([
-        { title: 'Dash 1', uid: 'xMsQdBfWz' } as DashboardSearchHit,
-        { title: 'Dash 2', uid: 'wfTJJL5Wz' } as DashboardSearchHit,
-      ]);
-
-    const onChangeFn = jest.fn();
-
-    const create = jest.spyOn(api, 'createFolder').mockResolvedValue(newFolder);
-
-    render(<OldFolderPicker onChange={onChangeFn} enableCreateNew={true} allowEmpty={true} />);
-    expect(await screen.findByTestId(selectors.components.FolderPicker.containerV2)).toBeInTheDocument();
-
-    await userEvent.type(screen.getByTestId(selectors.components.FolderPicker.input), newFolder.title);
-    const enter = await screen.findByText('Hit enter to add');
-
-    await userEvent.click(enter);
-    await waitFor(() => {
-      expect(create).toHaveBeenCalledWith({ title: newFolder.title });
-    });
-
-    expect(onChangeFn).toHaveBeenCalledWith({ title: newFolder.title, uid: newFolder.uid });
-    await waitFor(() => {
-      expect(screen.getByText(newFolder.title)).toBeInTheDocument();
-    });
-  });
-
-  it('should show the Dashboards root by default for editors', async () => {
-    jest
-      .spyOn(api, 'searchFolders')
-      .mockResolvedValue([
-        { title: 'Dash 1', uid: 'xMsQdBfWz' } as DashboardSearchHit,
-        { title: 'Dash 2', uid: 'wfTJJL5Wz' } as DashboardSearchHit,
-      ]);
-
-    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
-
-    const onChangeFn = jest.fn();
-    render(<OldFolderPicker onChange={onChangeFn} />);
-    expect(await screen.findByTestId(selectors.components.FolderPicker.containerV2)).toBeInTheDocument();
-    const pickerContainer = screen.getByTestId(selectors.components.FolderPicker.input);
-    selectEvent.openMenu(pickerContainer);
-
-    const pickerOptions = await screen.findAllByTestId(selectors.components.Select.option);
-
-    expect(pickerOptions[0]).toHaveTextContent('Dashboards');
-  });
-
-  it('should not show the Dashboards root by default if showRoot is false', async () => {
-    jest
-      .spyOn(api, 'searchFolders')
-      .mockResolvedValue([
-        { title: 'Dash 1', uid: 'xMsQdBfWz' } as DashboardSearchHit,
-        { title: 'Dash 2', uid: 'wfTJJL5Wz' } as DashboardSearchHit,
-      ]);
-
-    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(true);
-
-    const onChangeFn = jest.fn();
-    render(<OldFolderPicker onChange={onChangeFn} showRoot={false} />);
-    expect(await screen.findByTestId(selectors.components.FolderPicker.containerV2)).toBeInTheDocument();
-    const pickerContainer = screen.getByTestId(selectors.components.FolderPicker.input);
-    selectEvent.openMenu(pickerContainer);
-
-    const pickerOptions = await screen.findAllByTestId(selectors.components.Select.option);
-
-    expect(pickerOptions[0]).not.toHaveTextContent('Dashboards');
-  });
-
-  it('should not show the Dashboards root by default for not editors', async () => {
-    jest
-      .spyOn(api, 'searchFolders')
-      .mockResolvedValue([
-        { title: 'Dash 1', uid: 'xMsQdBfWz' } as DashboardSearchHit,
-        { title: 'Dash 2', uid: 'wfTJJL5Wz' } as DashboardSearchHit,
-      ]);
-
-    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(false);
-
-    const onChangeFn = jest.fn();
-    render(<OldFolderPicker onChange={onChangeFn} />);
-    expect(await screen.findByTestId(selectors.components.FolderPicker.containerV2)).toBeInTheDocument();
-    const pickerContainer = screen.getByTestId(selectors.components.FolderPicker.input);
-    selectEvent.openMenu(pickerContainer);
-
-    const pickerOptions = await screen.findAllByTestId(selectors.components.Select.option);
-
-    expect(pickerOptions[0]).not.toHaveTextContent('Dashboards');
-  });
-
-  it('should return the correct search results when typing in the select', async () => {
-    jest.spyOn(api, 'searchFolders').mockImplementation((query: string) => {
-      return Promise.resolve(
-        [
-          { title: 'Dash Test', uid: 'xMsQdBfWz' } as DashboardSearchHit,
-          { title: 'Dash Two', uid: 'wfTJJL5Wz' } as DashboardSearchHit,
-        ].filter((dash) => dash.title.indexOf(query) > -1)
-      );
-    });
-    jest.spyOn(contextSrv, 'hasPermission').mockReturnValue(false);
-    const onChangeFn = jest.fn();
-    render(<OldFolderPicker onChange={onChangeFn} />);
-
-    const pickerContainer = screen.getByTestId(selectors.components.FolderPicker.input);
-    await userEvent.type(pickerContainer, 'Test');
-
-    expect(await screen.findByText('Dash Test')).toBeInTheDocument();
-    expect(screen.queryByText('Dash Two')).not.toBeInTheDocument();
-  });
-});
-
-describe('getInitialValues', () => {
-  describe('when called with folderUid and title', () => {
-    it('then it should return folderUid and title', async () => {
-      const getFolder = jest.fn().mockResolvedValue({});
-      const folder = await getInitialValues({ folderUid: '', folderName: 'Some title', getFolder });
-
-      expect(folder).toEqual({ label: 'Some title', value: '' });
-      expect(getFolder).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('when called with just a folderUid', () => {
-    it('then it should call api to retrieve title', async () => {
-      const getFolder = jest.fn().mockResolvedValue({ uid: '', title: 'Title from api' });
-      const folder = await getInitialValues({ folderUid: '', getFolder });
-
-      expect(folder).toEqual({ label: 'Title from api', value: '' });
-      expect(getFolder).toHaveBeenCalledTimes(1);
-      expect(getFolder).toHaveBeenCalledWith('');
-    });
-  });
-
-  describe('when called without folderUid', () => {
-    it('then it should throw an error', async () => {
-      const getFolder = jest.fn().mockResolvedValue({});
-      await expect(getInitialValues({ getFolder })).rejects.toThrow();
-    });
-  });
-});
diff --git a/public/app/core/components/Select/OldFolderPicker.tsx b/public/app/core/components/Select/OldFolderPicker.tsx
deleted file mode 100644
index 13ddca85986..00000000000
--- a/public/app/core/components/Select/OldFolderPicker.tsx
+++ /dev/null
@@ -1,395 +0,0 @@
-import { css } from '@emotion/css';
-import debounce from 'debounce-promise';
-import { FormEvent, useCallback, useEffect, useMemo, useState } from 'react';
-import * as React from 'react';
-import { useAsync } from 'react-use';
-
-import { AppEvents, GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { Trans, t } from '@grafana/i18n';
-import { reportInteraction } from '@grafana/runtime';
-import { ActionMeta, AsyncVirtualizedSelect, Input, InputActionMeta, useStyles2 } from '@grafana/ui';
-import appEvents from 'app/core/app_events';
-import { contextSrv } from 'app/core/services/context_srv';
-import { createFolder, getFolderByUid, searchFolders } from 'app/features/manage-dashboards/state/actions';
-import { DashboardSearchHit } from 'app/features/search/types';
-import { AccessControlAction } from 'app/types/accessControl';
-import { PermissionLevelString, SearchQueryType } from 'app/types/acl';
-
-export type FolderPickerFilter = (hits: DashboardSearchHit[]) => DashboardSearchHit[];
-
-export const ADD_NEW_FOLER_OPTION = '+ Add new';
-
-export interface FolderWarning {
-  warningCondition: (value: string) => boolean;
-  warningComponent: () => JSX.Element;
-}
-
-export interface CustomAdd {
-  disallowValues: boolean;
-  isAllowedValue?: (value: string) => boolean;
-}
-
-export interface Props {
-  onChange: ($folder: { title: string; uid: string }) => void;
-  enableCreateNew?: boolean;
-  rootName?: string;
-  enableReset?: boolean;
-  dashboardId?: number | string;
-  initialTitle?: string;
-  initialFolderUid?: string;
-  permissionLevel?: Exclude<PermissionLevelString, PermissionLevelString.Admin>;
-  filter?: FolderPickerFilter;
-  allowEmpty?: boolean;
-  showRoot?: boolean;
-  onClear?: () => void;
-  searchQueryType?: SearchQueryType;
-  customAdd?: CustomAdd;
-  folderWarning?: FolderWarning;
-
-  /**
-   * Skips loading all folders in order to find the folder matching
-   * the folder where the dashboard is stored.
-   * Instead initialFolderUid and initialTitle will be used to display the correct folder.
-   * initialFolderUid needs to be a string or an error will be thrown.
-   */
-  skipInitialLoad?: boolean;
-  /** The id of the search input. Use this to set a matching label with htmlFor */
-  inputId?: string;
-  invalid?: boolean;
-}
-
-export type SelectedFolder = SelectableValue<string>;
-const VALUE_FOR_ADD = '-10';
-
-export function OldFolderPicker(props: Props) {
-  const {
-    dashboardId,
-    allowEmpty,
-    onChange,
-    filter,
-    enableCreateNew,
-    inputId,
-    onClear,
-    enableReset,
-    initialFolderUid,
-    initialTitle = '',
-    permissionLevel = PermissionLevelString.Edit,
-    rootName: rootNameProp,
-    showRoot = true,
-    skipInitialLoad,
-    searchQueryType,
-    customAdd,
-    folderWarning,
-    invalid,
-  } = props;
-
-  const rootName = rootNameProp ?? 'Dashboards';
-
-  const [folder, setFolder] = useState<SelectedFolder | null>(null);
-  const [isCreatingNew, setIsCreatingNew] = useState(false);
-  const [inputValue, setInputValue] = useState('');
-  const [newFolderValue, setNewFolderValue] = useState(folder?.title ?? '');
-
-  const styles = useStyles2(getStyles);
-
-  const isClearable = typeof onClear === 'function';
-
-  const getOptions = useCallback(
-    async (query: string) => {
-      const searchHits = await searchFolders(query, permissionLevel, searchQueryType);
-      const resultsAfterMapAndFilter = mapSearchHitsToOptions(searchHits, filter);
-      const options: Array<SelectableValue<string>> = resultsAfterMapAndFilter;
-
-      reportInteraction('grafana_folder_picker_results_loaded', {
-        results: options.length,
-        searchTermLength: query.length,
-        enableCreateNew: Boolean(enableCreateNew),
-      });
-
-      const hasAccess =
-        contextSrv.hasPermission(AccessControlAction.DashboardsWrite) ||
-        contextSrv.hasPermission(AccessControlAction.DashboardsCreate);
-
-      if (hasAccess && rootName?.toLowerCase().startsWith(query.toLowerCase()) && showRoot) {
-        options.unshift({ label: rootName, value: '' });
-      }
-
-      if (
-        enableReset &&
-        query === '' &&
-        initialTitle !== '' &&
-        !options.find((option) => option.label === initialTitle)
-      ) {
-        options.unshift({ label: initialTitle, value: initialFolderUid });
-      }
-      if (enableCreateNew && Boolean(customAdd)) {
-        return [...options, { value: VALUE_FOR_ADD, label: ADD_NEW_FOLER_OPTION, title: query }];
-      } else {
-        return options;
-      }
-    },
-    [
-      enableReset,
-      initialFolderUid,
-      initialTitle,
-      permissionLevel,
-      rootName,
-      showRoot,
-      searchQueryType,
-      filter,
-      enableCreateNew,
-      customAdd,
-    ]
-  );
-
-  const debouncedSearch = useMemo(() => {
-    return debounce(getOptions, 300, { leading: true });
-  }, [getOptions]);
-
-  const loadInitialValue = async () => {
-    const resetFolder: SelectableValue<string> = { label: initialTitle, value: undefined };
-    const rootFolder: SelectableValue<string> = { label: rootName, value: '' };
-
-    const options = await getOptions('');
-
-    let folder: SelectableValue<string> | null = null;
-
-    if (initialFolderUid !== undefined && initialFolderUid !== null) {
-      folder = options.find((option) => option.value === initialFolderUid) || null;
-    } else if (enableReset && initialTitle) {
-      folder = resetFolder;
-    } else if (initialFolderUid) {
-      folder = options.find((option) => option.id === initialFolderUid) || null;
-    }
-
-    if (!folder && !allowEmpty) {
-      if (contextSrv.isEditor) {
-        folder = rootFolder;
-      } else {
-        // We shouldn't assign a random folder without the user actively choosing it on a persisted dashboard
-        const isPersistedDashBoard = !!dashboardId;
-        if (isPersistedDashBoard) {
-          folder = resetFolder;
-        } else {
-          folder = options.length > 0 ? options[0] : resetFolder;
-        }
-      }
-    }
-    !isCreatingNew && setFolder(folder);
-  };
-
-  useEffect(() => {
-    // if this is not the same as our initial value notify parent
-    if (folder && folder.value !== initialFolderUid) {
-      !isCreatingNew && folder.value && folder.label && onChange({ uid: folder.value, title: folder.label });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [folder, initialFolderUid]);
-
-  // initial values for dropdown
-  useAsync(async () => {
-    if (skipInitialLoad) {
-      const folder = await getInitialValues({
-        getFolder: getFolderByUid,
-        folderUid: initialFolderUid,
-        folderName: initialTitle,
-      });
-      setFolder(folder);
-    }
-
-    await loadInitialValue();
-  }, [skipInitialLoad, initialFolderUid, initialTitle]);
-
-  useEffect(() => {
-    if (folder && folder.id === VALUE_FOR_ADD) {
-      setIsCreatingNew(true);
-    }
-  }, [folder]);
-
-  const onFolderChange = useCallback(
-    (newFolder: SelectableValue<string> | null | undefined, actionMeta: ActionMeta) => {
-      if (newFolder?.value === VALUE_FOR_ADD) {
-        setFolder({
-          id: VALUE_FOR_ADD,
-          title: inputValue,
-        });
-        setNewFolderValue(inputValue);
-      } else {
-        if (!newFolder) {
-          newFolder = { value: '', label: rootName };
-        }
-
-        if (actionMeta.action === 'clear' && onClear) {
-          onClear();
-          return;
-        }
-
-        setFolder(newFolder);
-        onChange({ uid: newFolder.value!, title: newFolder.label! });
-      }
-    },
-    [onChange, onClear, rootName, inputValue]
-  );
-
-  const createNewFolder = useCallback(
-    async (folderName: string) => {
-      if (folderWarning?.warningCondition(folderName)) {
-        reportInteraction('grafana_folder_picker_folder_created', { status: 'failed_condition' });
-        return false;
-      }
-
-      const newFolder = await createFolder({ title: folderName });
-      let folder: SelectableValue<string> = { value: '', label: 'Not created' };
-
-      if (newFolder.uid) {
-        reportInteraction('grafana_folder_picker_folder_created', { status: 'success' });
-        appEvents.emit(AppEvents.alertSuccess, ['Folder Created', 'OK']);
-        folder = { value: newFolder.uid, label: newFolder.title };
-
-        setFolder(newFolder);
-        onFolderChange(folder, { action: 'create-option', option: folder });
-      } else {
-        reportInteraction('grafana_folder_picker_folder_created', { status: 'failed' });
-        appEvents.emit(AppEvents.alertError, ['Folder could not be created']);
-      }
-
-      return folder;
-    },
-    [folderWarning, onFolderChange]
-  );
-
-  const onKeyDown = useCallback(
-    (event: React.KeyboardEvent) => {
-      const dissalowValues = Boolean(customAdd?.disallowValues);
-      if (event.key === 'Enter' && dissalowValues && !customAdd?.isAllowedValue!(newFolderValue)) {
-        event.preventDefault();
-        return;
-      }
-
-      switch (event.key) {
-        case 'Enter': {
-          createNewFolder(folder?.title!);
-          setIsCreatingNew(false);
-          break;
-        }
-        case 'Escape': {
-          setFolder({ value: '', label: rootName });
-          setIsCreatingNew(false);
-        }
-      }
-    },
-    [customAdd?.disallowValues, customAdd?.isAllowedValue, newFolderValue, createNewFolder, folder?.title, rootName]
-  );
-
-  const onNewFolderChange = (e: FormEvent<HTMLInputElement>) => {
-    const value = e.currentTarget.value;
-    setNewFolderValue(value);
-    setFolder({ id: undefined, title: value });
-  };
-
-  const onBlur = () => {
-    setFolder({ value: '', label: rootName });
-    setIsCreatingNew(false);
-  };
-
-  const onInputChange = (value: string, { action }: InputActionMeta) => {
-    if (action === 'input-change') {
-      setInputValue((ant) => value);
-    }
-
-    if (action === 'menu-close') {
-      setInputValue((_) => value);
-    }
-    return;
-  };
-
-  const FolderWarningWhenCreating = () => {
-    if (folderWarning?.warningCondition(newFolderValue)) {
-      return <folderWarning.warningComponent />;
-    } else {
-      return null;
-    }
-  };
-
-  const FolderWarningWhenSearching = () => {
-    if (folderWarning?.warningCondition(inputValue)) {
-      return <folderWarning.warningComponent />;
-    } else {
-      return null;
-    }
-  };
-
-  if (isCreatingNew) {
-    return (
-      <>
-        <FolderWarningWhenCreating />
-        <div className={styles.newFolder}>
-          <Trans i18nKey="folder-picker.create-instructions">Press enter to create the new folder.</Trans>
-        </div>
-        <Input
-          width={30}
-          autoFocus={true}
-          value={newFolderValue}
-          onChange={onNewFolderChange}
-          onKeyDown={onKeyDown}
-          placeholder={t('folder-picker.input-placeholder', 'Press enter to confirm new folder')}
-          onBlur={onBlur}
-        />
-      </>
-    );
-  } else {
-    return (
-      <div data-testid={selectors.components.FolderPicker.containerV2}>
-        <FolderWarningWhenSearching />
-        <AsyncVirtualizedSelect
-          inputId={inputId}
-          data-testid={selectors.components.FolderPicker.input}
-          loadingMessage={t('folder-picker.loading', 'Loading folders...')}
-          defaultOptions
-          defaultValue={folder}
-          inputValue={inputValue}
-          onInputChange={onInputChange}
-          value={folder}
-          allowCustomValue={enableCreateNew && !Boolean(customAdd)}
-          loadOptions={debouncedSearch}
-          onChange={onFolderChange}
-          onCreateOption={createNewFolder}
-          invalid={invalid}
-          isClearable={isClearable}
-        />
-      </div>
-    );
-  }
-}
-
-function mapSearchHitsToOptions(hits: DashboardSearchHit[], filter?: FolderPickerFilter) {
-  const filteredHits = filter ? filter(hits) : hits;
-  return filteredHits.map((hit) => ({ label: hit.title, value: hit.uid }));
-}
-interface Args {
-  getFolder: typeof getFolderByUid;
-  folderUid?: string;
-  folderName?: string;
-}
-
-export async function getInitialValues({ folderName, folderUid, getFolder }: Args): Promise<SelectableValue<string>> {
-  if (folderUid === null || folderUid === undefined) {
-    throw new Error('folderUid is not found.');
-  }
-
-  if (folderName) {
-    return { label: folderName, value: folderUid };
-  }
-
-  const folderDto = await getFolder(folderUid);
-  return { label: folderDto.title, value: folderUid };
-}
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  newFolder: css({
-    color: theme.colors.warning.main,
-    fontSize: theme.typography.bodySmall.fontSize,
-    paddingBottom: theme.spacing(1),
-  }),
-});
diff --git a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.test.tsx b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.test.tsx
index de5b14e257c..232e692fc9e 100644
--- a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.test.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.test.tsx
@@ -2,7 +2,6 @@ import userEvent from '@testing-library/user-event';
 import { render, screen } from 'test/test-utils';
 
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
-import * as api from 'app/features/manage-dashboards/state/actions';
 import { SaveDashboardResponseDTO } from 'app/types/dashboard';
 
 import { SaveDashboardAsForm, SaveDashboardAsFormProps } from './SaveDashboardAsForm';
@@ -15,8 +14,6 @@ jest.mock('app/features/manage-dashboards/services/ValidationSrv', () => ({
   },
 }));
 
-jest.spyOn(api, 'searchFolders').mockResolvedValue([]);
-
 const prepareDashboardMock = (panel: object) => {
   const json = {
     title: 'name',
@@ -56,7 +53,6 @@ const renderAndSubmitForm = async (
 describe('SaveDashboardAsForm', () => {
   describe('default values', () => {
     it('applies default dashboard properties', async () => {
-      jest.spyOn(api, 'searchFolders').mockResolvedValue([]);
       const spy = jest.fn();
 
       await renderAndSubmitForm(prepareDashboardMock({}), spy, {
@@ -72,7 +68,6 @@ describe('SaveDashboardAsForm', () => {
     });
 
     it("appends 'Copy' to the name when the dashboard isnt new", async () => {
-      jest.spyOn(api, 'searchFolders').mockResolvedValue([]);
       const spy = jest.fn();
 
       await renderAndSubmitForm(prepareDashboardMock({}), spy, {
diff --git a/public/app/features/manage-dashboards/state/actions.ts b/public/app/features/manage-dashboards/state/actions.ts
index 039c5b5999a..2f3e278ff7a 100644
--- a/public/app/features/manage-dashboards/state/actions.ts
+++ b/public/app/features/manage-dashboards/state/actions.ts
@@ -10,7 +10,6 @@ import { notifyApp } from 'app/core/actions';
 import { createErrorNotification } from 'app/core/copy/appNotification';
 import { browseDashboardsAPI, ImportInputs } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
-import { PermissionLevelString, SearchQueryType } from 'app/types/acl';
 import { ThunkResult } from 'app/types/store';
 
 import {
@@ -21,7 +20,6 @@ import {
 } from '../../dashboard/components/DashExportModal/DashboardExporter';
 import { getLibraryPanel } from '../../library-panels/state/api';
 import { LibraryElementDTO, LibraryElementKind } from '../../library-panels/types';
-import { DashboardSearchHit } from '../../search/types';
 import { DashboardJson } from '../types';
 
 import {
@@ -308,30 +306,6 @@ const getDataSourceDescription = (input: { usage?: InputUsage }): string | undef
   return undefined;
 };
 
-/** @deprecated Use RTK Query methods from features/browse-dashboards/api/browseDashboardsAPI.ts instead */
-export function createFolder(payload: any) {
-  return getBackendSrv().post('/api/folders', payload);
-}
-
-export const SLICE_FOLDER_RESULTS_TO = 1000;
-
-export async function searchFolders(
-  query: string,
-  permission?: PermissionLevelString,
-  type: SearchQueryType = SearchQueryType.Folder
-): Promise<DashboardSearchHit[]> {
-  return getBackendSrv().get('/api/search', {
-    query,
-    type: type,
-    permission,
-    limit: SLICE_FOLDER_RESULTS_TO,
-  });
-}
-
-export function getFolderByUid(uid: string): Promise<{ uid: string; title: string }> {
-  return getBackendSrv().get(`/api/folders/${uid}`);
-}
-
 export async function processV2DatasourceInput(
   spec: PanelQueryKind['spec'] | QueryVariableKind['spec'] | AnnotationQueryKind['spec'],
   inputs: Record<string, DataSourceInput> = {}
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index d39902baac5..d6a38f55e6e 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -7526,11 +7526,6 @@
     "select-aria-label": "Folder filter",
     "select-placeholder": "Filter by folder"
   },
-  "folder-picker": {
-    "create-instructions": "Press enter to create the new folder.",
-    "input-placeholder": "Press enter to confirm new folder",
-    "loading": "Loading folders..."
-  },
   "folder-repo": {
     "provisioned-badge": "Provisioned",
     "read-only-badge": "Read only"

From 29a652db2181202b9ac0d8ca120bbce09b18d184 Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Mon, 18 Aug 2025 09:51:00 -0400
Subject: [PATCH 224/243] NewProvisionedFolderForm: allow empty space,
 uppercase and dash in folder name (#109615)

* NewProvisionedFolderForm: allow empty space, uppercase and dash in folder name

* validate folder name using form validation
---
 .../NewProvisionedFolderForm.test.tsx         |  23 +---
 .../components/NewProvisionedFolderForm.tsx   |  76 ++++-------
 .../components/utils.test.ts                  | 124 ------------------
 .../browse-dashboards/components/utils.ts     |  35 -----
 public/locales/en-US/grafana.json             |   2 +-
 5 files changed, 28 insertions(+), 232 deletions(-)
 delete mode 100644 public/app/features/browse-dashboards/components/utils.test.ts

diff --git a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx
index 9ee6d728426..de712d32b7e 100644
--- a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx
+++ b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx
@@ -222,25 +222,6 @@ describe('NewProvisionedFolderForm', () => {
     expect(screen.getByRole('textbox', { name: /branch/i })).toBeInTheDocument();
   });
 
-  it('should validate folder name', async () => {
-    (validationSrv.validateNewFolderName as jest.Mock).mockRejectedValue(new Error('Folder name already exists'));
-
-    const { user } = setup();
-
-    const folderNameInput = screen.getByRole('textbox', { name: /folder name/i });
-    await user.clear(folderNameInput);
-    await user.type(folderNameInput, 'Existing Folder');
-
-    // Submit the form
-    const submitButton = screen.getByRole('button', { name: /^create$/i });
-    await user.click(submitButton);
-
-    // Wait for validation error to appear
-    await waitFor(() => {
-      expect(screen.getByText('Folder name already exists')).toBeInTheDocument();
-    });
-  });
-
   it('should validate branch name', async () => {
     const { user } = setup();
 
@@ -297,7 +278,7 @@ describe('NewProvisionedFolderForm', () => {
         expect.objectContaining({
           ref: undefined, // write workflow uses undefined ref
           name: 'test-repo',
-          path: '/dashboards/new-test-folder/',
+          path: '/dashboards/New Test Folder/',
           message: 'Creating a new test folder',
           body: {
             title: 'New Test Folder',
@@ -350,7 +331,7 @@ describe('NewProvisionedFolderForm', () => {
         expect.objectContaining({
           ref: 'feature/new-folder',
           name: 'test-repo',
-          path: '/dashboards/branch-folder/',
+          path: '/dashboards/Branch Folder/',
           message: 'Create folder: Branch Folder',
           body: {
             title: 'Branch Folder',
diff --git a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx
index bd452e3ba72..510c506ce75 100644
--- a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx
+++ b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx
@@ -1,11 +1,10 @@
-import { css } from '@emotion/css';
 import { FormProvider, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom-v5-compat';
 
-import { AppEvents, GrafanaTheme2 } from '@grafana/data';
+import { AppEvents } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
 import { getAppEvents } from '@grafana/runtime';
-import { Alert, Text, Button, Field, Icon, Input, Stack, useStyles2 } from '@grafana/ui';
+import { Alert, Button, Field, Input, Stack } from '@grafana/ui';
 import { Folder } from 'app/api/clients/folder/v1beta1';
 import { RepositoryView, useCreateRepositoryFilesWithPathMutation } from 'app/api/clients/provisioning/v0alpha1';
 import { AnnoKeySourcePath, Resource } from 'app/features/apiserver/types';
@@ -23,8 +22,6 @@ import { FolderDTO } from 'app/types/folders';
 import { useProvisionedFolderFormData } from '../hooks/useProvisionedFolderFormData';
 
 import { RepoInvalidStateBanner } from './BulkActions/RepoInvalidStateBanner';
-import { validateFolderName } from './NewFolderForm';
-import { formatFolderName, hasFolderNameCharactersToReplace } from './utils';
 
 interface FormProps extends Props {
   initialValues: BaseProvisionedFormData;
@@ -48,7 +45,7 @@ function FormContent({ initialValues, repository, workflowOptions, folder, onDis
   });
   const { handleSubmit, watch, register, formState } = methods;
 
-  const [workflow, title] = watch(['workflow', 'title']);
+  const [workflow] = watch(['workflow']);
 
   const onBranchSuccess = ({ urls }: { urls?: Record<string, string> }, info: ProvisionedOperationInfo) => {
     const prUrl = urls?.newPullRequestURL;
@@ -109,12 +106,8 @@ function FormContent({ initialValues, repository, workflowOptions, folder, onDis
       return;
     }
     const basePath = folder?.metadata?.annotations?.[AnnoKeySourcePath] ?? '';
-
-    // Convert folder title to filename format (lowercase, replace spaces with hyphens)
-    const titleInFilenameFormat = formatFolderName(title); // TODO: this is currently not working, issue created https://github.com/grafana/git-ui-sync-project/issues/314
-
     const prefix = basePath ? `${basePath}/` : '';
-    const path = `${prefix}${titleInFilenameFormat}/`;
+    const path = `${prefix}${title}/`;
 
     const folderModel = {
       title,
@@ -154,13 +147,13 @@ function FormContent({ initialValues, repository, workflowOptions, folder, onDis
           <Field
             noMargin
             label={t('browse-dashboards.new-provisioned-folder-form.label-folder-name', 'Folder name')}
-            invalid={!!formState.errors.title}
-            error={formState.errors.title?.message}
+            invalid={!!formState?.errors.title}
+            error={formState?.errors.title?.message}
           >
             <Input
               {...register('title', {
                 required: t('browse-dashboards.new-provisioned-folder-form.error-required', 'Folder name is required'),
-                validate: validateFolderName,
+                validate: validateProvisionedFolderName,
               })}
               placeholder={t(
                 'browse-dashboards.new-provisioned-folder-form.folder-name-input-placeholder-enter-folder-name',
@@ -169,7 +162,6 @@ function FormContent({ initialValues, repository, workflowOptions, folder, onDis
               id="folder-name-input"
             />
           </Field>
-          <FolderNamePreviewMessage folderName={title} />
 
           <ResourceEditFormSharedFields
             resourceType="folder"
@@ -198,14 +190,14 @@ function FormContent({ initialValues, repository, workflowOptions, folder, onDis
           )}
 
           <Stack gap={2}>
-            <Button variant="secondary" fill="outline" onClick={onDismiss}>
-              <Trans i18nKey="browse-dashboards.new-provisioned-folder-form.cancel">Cancel</Trans>
-            </Button>
-            <Button type="submit" disabled={request.isLoading}>
+            <Button type="submit" disabled={request.isLoading || !!formState?.errors.title}>
               {request.isLoading
                 ? t('browse-dashboards.new-provisioned-folder-form.button-creating', 'Creating...')
                 : t('browse-dashboards.new-provisioned-folder-form.button-create', 'Create')}
             </Button>
+            <Button variant="secondary" fill="outline" onClick={onDismiss}>
+              <Trans i18nKey="browse-dashboards.new-provisioned-folder-form.cancel">Cancel</Trans>
+            </Button>
           </Stack>
         </Stack>
       </form>
@@ -245,38 +237,20 @@ export function NewProvisionedFolderForm({ parentFolder, onDismiss }: Props) {
   );
 }
 
-function FolderNamePreviewMessage({ folderName }: { folderName: string }) {
-  const styles = useStyles2(getStyles);
-  const isValidFolderName =
-    folderName.length && hasFolderNameCharactersToReplace(folderName) && validateFolderName(folderName);
-
-  if (!isValidFolderName) {
-    return null;
+function validateProvisionedFolderName(folderName: string): string | true {
+  if (!folderName || typeof folderName !== 'string') {
+    return t('browse-dashboards.new-provisioned-folder-form.error-required', 'Folder name is required');
   }
 
-  return (
-    <div className={styles.folderNameMessage}>
-      <Icon name="check-circle" type="solid" />
-      <Text color="success">
-        {t(
-          'browse-dashboards.new-provisioned-folder-form.text-your-folder-will-be-created-as',
-          'Your folder will be created as {{folderName}}',
-          {
-            folderName: formatFolderName(folderName),
-          }
-        )}
-      </Text>
-    </div>
-  );
-}
+  // Backend allows: a-zA-Z0-9 _- (no dots, no forward slash for folder names)
+  const invalidCharRegex = /[^a-zA-Z0-9 _-]/;
 
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    folderNameMessage: css({
-      display: 'flex',
-      alignItems: 'center',
-      fontSize: theme.typography.bodySmall.fontSize,
-      color: theme.colors.success.text,
-    }),
-  };
-};
+  if (invalidCharRegex.test(folderName)) {
+    return t(
+      'browse-dashboards.new-provisioned-folder-form.error-invalid-characters',
+      'Folder name contains invalid characters. Only letters, numbers, spaces, underscores, and hyphens are allowed.'
+    );
+  }
+
+  return true; // Valid
+}
diff --git a/public/app/features/browse-dashboards/components/utils.test.ts b/public/app/features/browse-dashboards/components/utils.test.ts
deleted file mode 100644
index 2bf48e3d329..00000000000
--- a/public/app/features/browse-dashboards/components/utils.test.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import { formatFolderName, hasFolderNameCharactersToReplace } from './utils';
-
-describe('formatFolderName', () => {
-  it('should handle empty string', () => {
-    expect(formatFolderName('')).toBe('');
-  });
-
-  it('should convert uppercase to lowercase', () => {
-    expect(formatFolderName('MyFolder')).toBe('myfolder');
-    expect(formatFolderName('UPPERCASE')).toBe('uppercase');
-    expect(formatFolderName('MiXeD cAsE')).toBe('mixed-case');
-  });
-
-  it('should replace whitespace with hyphens', () => {
-    expect(formatFolderName('folder name')).toBe('folder-name');
-    expect(formatFolderName('folder  name')).toBe('folder-name'); // multiple spaces
-    expect(formatFolderName('folder\tname')).toBe('folder-name'); // tab
-    expect(formatFolderName('folder\nname')).toBe('folder-name'); // newline
-    expect(formatFolderName('  folder name  ')).toBe('folder-name'); // leading/trailing spaces
-  });
-
-  it('should remove special characters', () => {
-    expect(formatFolderName('folder@name')).toBe('foldername');
-    expect(formatFolderName('folder!@#$%^&*()name')).toBe('foldername');
-    expect(formatFolderName('folder_name')).toBe('foldername');
-    expect(formatFolderName('folder.name')).toBe('foldername');
-    expect(formatFolderName('folder/name')).toBe('foldername');
-  });
-
-  it('should preserve numbers and hyphens', () => {
-    expect(formatFolderName('folder-123')).toBe('folder-123');
-    expect(formatFolderName('folder123')).toBe('folder123');
-    expect(formatFolderName('123-folder')).toBe('123-folder');
-    expect(formatFolderName('folder-name-123')).toBe('folder-name-123');
-  });
-
-  it('should handle complex mixed cases', () => {
-    expect(formatFolderName('My Folder @2023!')).toBe('my-folder-2023');
-    expect(formatFolderName('  FOLDER_NAME  with-123  ')).toBe('foldername-with-123');
-    expect(formatFolderName('Test@Folder#Name$123')).toBe('testfoldername123');
-    expect(formatFolderName('Multiple   Spaces   Between')).toBe('multiple-spaces-between');
-  });
-
-  it('should handle strings with only special characters', () => {
-    expect(formatFolderName('!@#$%^&*()')).toBe('');
-    expect(formatFolderName('___')).toBe('');
-    expect(formatFolderName('...')).toBe('');
-  });
-
-  it('should handle strings with only whitespace', () => {
-    expect(formatFolderName('   ')).toBe('');
-    expect(formatFolderName('\t\n\r')).toBe('');
-  });
-
-  it('should handle already formatted names', () => {
-    expect(formatFolderName('already-formatted')).toBe('already-formatted');
-    expect(formatFolderName('folder123')).toBe('folder123');
-    expect(formatFolderName('test-folder-name-123')).toBe('test-folder-name-123');
-  });
-});
-
-describe('hasFolderNameCharactersToReplace', () => {
-  it('should return false for non-string inputs', () => {
-    // @ts-expect-error
-    expect(hasFolderNameCharactersToReplace(null)).toBe(false);
-    // @ts-expect-error
-    expect(hasFolderNameCharactersToReplace(undefined)).toBe(false);
-    // @ts-expect-error
-    expect(hasFolderNameCharactersToReplace(123)).toBe(false);
-    // @ts-expect-error
-    expect(hasFolderNameCharactersToReplace({})).toBe(false);
-    // @ts-expect-error
-    expect(hasFolderNameCharactersToReplace([])).toBe(false);
-  });
-
-  it('should return false for empty string', () => {
-    expect(hasFolderNameCharactersToReplace('')).toBe(false);
-  });
-
-  it('should return false for valid folder names', () => {
-    expect(hasFolderNameCharactersToReplace('validname')).toBe(false);
-    expect(hasFolderNameCharactersToReplace('folder123')).toBe(false);
-    expect(hasFolderNameCharactersToReplace('test-folder-name')).toBe(false);
-    expect(hasFolderNameCharactersToReplace('folder-123')).toBe(false);
-    expect(hasFolderNameCharactersToReplace('123-folder')).toBe(false);
-    expect(hasFolderNameCharactersToReplace('a')).toBe(false);
-    expect(hasFolderNameCharactersToReplace('1')).toBe(false);
-  });
-
-  it('should return true for names with whitespace', () => {
-    expect(hasFolderNameCharactersToReplace('folder name')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('folder  name')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('folder\tname')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('folder\nname')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('  folder')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('folder  ')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('   ')).toBe(true);
-  });
-
-  it('should return true for names with uppercase letters', () => {
-    expect(hasFolderNameCharactersToReplace('FolderName')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('UPPERCASE')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('MiXeD')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('folder-Name')).toBe(true);
-  });
-
-  it('should return true for names with special characters', () => {
-    expect(hasFolderNameCharactersToReplace('folder@name')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('folder!name')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('folder_name')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('folder.name')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('folder/name')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('folder#name')).toBe(true);
-  });
-
-  it('should return true for mixed cases with multiple issues', () => {
-    expect(hasFolderNameCharactersToReplace('Test@Folder#Name$123')).toBe(true);
-    expect(hasFolderNameCharactersToReplace('Multiple   Spaces   Between')).toBe(true);
-  });
-
-  it('should return true for strings with only special characters', () => {
-    expect(hasFolderNameCharactersToReplace('!@#$%^&*()')).toBe(true);
-  });
-});
diff --git a/public/app/features/browse-dashboards/components/utils.ts b/public/app/features/browse-dashboards/components/utils.ts
index ef72de4bbd7..de03451146f 100644
--- a/public/app/features/browse-dashboards/components/utils.ts
+++ b/public/app/features/browse-dashboards/components/utils.ts
@@ -33,41 +33,6 @@ export function getFolderURL(uid: string) {
   return url;
 }
 
-export function hasFolderNameCharactersToReplace(folderName: string): boolean {
-  if (typeof folderName !== 'string') {
-    return false;
-  }
-
-  // whitespace that needs to be replaced with hyphens
-  const hasWhitespace = /\s+/.test(folderName);
-
-  // characters that are not lowercase letters, numbers, or hyphens
-  const hasInvalidCharacters = /[^a-z0-9-]/.test(folderName);
-
-  return hasWhitespace || hasInvalidCharacters;
-}
-
-export function formatFolderName(folderName?: string): string {
-  if (typeof folderName !== 'string') {
-    console.error('Invalid folder name type:', typeof folderName);
-    return '';
-  }
-
-  const result = folderName
-    .trim() // Remove leading/trailing whitespace first
-    .toLowerCase()
-    .replace(/\s+/g, '-')
-    .replace(/[^a-z0-9-]/g, '')
-    .replace(/^-+|-+$/g, ''); // Remove leading/trailing hyphens
-
-  // If the result is empty, return empty string
-  if (result === '') {
-    return '';
-  }
-
-  return result;
-}
-
 // Collect selected dashboard and folder from the DashboardTreeSelection
 // This is used to prepare the items for bulk delete operation.
 export function collectSelectedItems(selectedItems: Omit<DashboardTreeSelection, 'panel' | '$all'>) {
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index d6a38f55e6e..bdc8663bbd9 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -3632,11 +3632,11 @@
       "button-create": "Create",
       "button-creating": "Creating...",
       "cancel": "Cancel",
+      "error-invalid-characters": "Folder name contains invalid characters. Only letters, numbers, spaces, underscores, and hyphens are allowed.",
       "error-required": "Folder name is required",
       "folder-name-input-placeholder-enter-folder-name": "Enter folder name",
       "label-folder-name": "Folder name",
       "text-pull-request-created": "A pull request has been created with changes to this folder:",
-      "text-your-folder-will-be-created-as": "Your folder will be created as {{folderName}}",
       "title-pull-request-created": "Pull request created",
       "title-this-repository-is-read-only": "This repository is read only"
     },

From 4e5a51968fecc958b80c9096b7a1d2698bd73a92 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Mon, 18 Aug 2025 16:02:37 +0200
Subject: [PATCH 225/243] Dashboard Migrations v17: Convert minSpan to
 maxPerRow in panels (#109592)

* Migration to be verified: v17 Convert minSpan to maxPerRow in panels

* Address review comments: use Go idiom for variable naming and sort.Ints for sorting
---
 .../pkg/migration/schemaversion/migrations.go |   3 +-
 .../pkg/migration/schemaversion/v17.go        | 132 ++++++++
 .../pkg/migration/schemaversion/v17_test.go   | 297 ++++++++++++++++
 .../input/v17.minspan_to_maxperrow.json       | 125 +++++++
 .../output/v17.minspan_to_maxperrow.json      | 317 ++++++++++++++++++
 5 files changed, 873 insertions(+), 1 deletion(-)
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v17.go
 create mode 100644 apps/dashboard/pkg/migration/schemaversion/v17_test.go
 create mode 100644 apps/dashboard/pkg/migration/testdata/input/v17.minspan_to_maxperrow.json
 create mode 100644 apps/dashboard/pkg/migration/testdata/output/v17.minspan_to_maxperrow.json

diff --git a/apps/dashboard/pkg/migration/schemaversion/migrations.go b/apps/dashboard/pkg/migration/schemaversion/migrations.go
index 6b9395b2965..e4c2ec13ddc 100644
--- a/apps/dashboard/pkg/migration/schemaversion/migrations.go
+++ b/apps/dashboard/pkg/migration/schemaversion/migrations.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	MIN_VERSION    = 17
+	MIN_VERSION    = 16
 	LATEST_VERSION = 41
 )
 
@@ -38,6 +38,7 @@ type PanelPluginInfoProvider interface {
 
 func GetMigrations(dsInfoProvider DataSourceInfoProvider, panelProvider PanelPluginInfoProvider) map[int]SchemaVersionMigrationFunc {
 	return map[int]SchemaVersionMigrationFunc{
+		17: V17,
 		18: V18,
 		19: V19,
 		20: V20,
diff --git a/apps/dashboard/pkg/migration/schemaversion/v17.go b/apps/dashboard/pkg/migration/schemaversion/v17.go
new file mode 100644
index 00000000000..dc1142ef7e5
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v17.go
@@ -0,0 +1,132 @@
+package schemaversion
+
+import (
+	"math"
+	"sort"
+)
+
+// V17 migrates panel minSpan property to maxPerRow property.
+// This migration converts the deprecated minSpan property to the newer maxPerRow property
+// which controls how many panels can be displayed in a single row.
+//
+// The conversion algorithm:
+// 1. Calculate max = GRID_COLUMN_COUNT / panel.minSpan
+// 2. Get all factors of GRID_COLUMN_COUNT (24): [1, 2, 3, 4, 6, 8, 12, 24]
+// 3. Find the first factor greater than max
+// 4. Use the previous factor as maxPerRow
+//
+// Example before migration:
+//
+//	"panels": [
+//	  {
+//	    "id": 1,
+//	    "type": "graph",
+//	    "minSpan": 8
+//	  }
+//	]
+//
+// Example after migration:
+//
+//	"panels": [
+//	  {
+//	    "id": 1,
+//	    "type": "graph",
+//	    "maxPerRow": 3
+//	  }
+//	]
+//
+// The minSpan property is removed after conversion.
+func V17(dashboard map[string]interface{}) error {
+	dashboard["schemaVersion"] = 17
+
+	panels, ok := dashboard["panels"].([]interface{})
+	if !ok {
+		return nil
+	}
+
+	for _, p := range panels {
+		panel, ok := p.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		migrateMinSpanToMaxPerRow(panel)
+	}
+
+	return nil
+}
+
+// migrateMinSpanToMaxPerRow converts minSpan to maxPerRow using the same algorithm as the frontend.
+func migrateMinSpanToMaxPerRow(panel map[string]interface{}) {
+	minSpanValue, ok := panel["minSpan"]
+	if !ok {
+		return
+	}
+
+	// Convert minSpan to a number (could be int, float64, etc.)
+	var minSpan float64
+	switch v := minSpanValue.(type) {
+	case int:
+		minSpan = float64(v)
+	case float64:
+		minSpan = v
+	case int64:
+		minSpan = float64(v)
+	default:
+		// If we can't convert minSpan to a number, just delete it and return
+		delete(panel, "minSpan")
+		return
+	}
+
+	// Ensure minSpan is positive to avoid division by zero
+	if minSpan <= 0 {
+		delete(panel, "minSpan")
+		return
+	}
+
+	const gridColumnCount = 24
+	max := gridColumnCount / minSpan
+	factors := getFactors(gridColumnCount)
+
+	// Find the first factor greater than max
+	factorIndex := -1
+	for i, factor := range factors {
+		if float64(factor) > max {
+			factorIndex = i
+			break
+		}
+	}
+
+	// Use the previous factor as maxPerRow
+	if factorIndex > 0 {
+		panel["maxPerRow"] = factors[factorIndex-1]
+	} else if factorIndex == 0 {
+		// If the first factor is already greater than max, use 1
+		panel["maxPerRow"] = 1
+	} else {
+		// If no factor is greater than max, use the largest factor
+		panel["maxPerRow"] = factors[len(factors)-1]
+	}
+
+	// Remove the minSpan property
+	delete(panel, "minSpan")
+}
+
+// getFactors returns all factors of a number
+// Example: getFactors(24) returns [1, 2, 3, 4, 6, 8, 12, 24]
+func getFactors(num int) []int {
+	factors := []int{}
+	for i := 1; i <= int(math.Sqrt(float64(num))); i++ {
+		if num%i == 0 {
+			factors = append(factors, i)
+			if i != num/i {
+				factors = append(factors, num/i)
+			}
+		}
+	}
+
+	// Sort factors in ascending order
+	sort.Ints(factors)
+
+	return factors
+}
diff --git a/apps/dashboard/pkg/migration/schemaversion/v17_test.go b/apps/dashboard/pkg/migration/schemaversion/v17_test.go
new file mode 100644
index 00000000000..9339a6b1a1b
--- /dev/null
+++ b/apps/dashboard/pkg/migration/schemaversion/v17_test.go
@@ -0,0 +1,297 @@
+package schemaversion_test
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
+)
+
+func TestV17(t *testing.T) {
+	tests := []migrationTestCase{
+		{
+			name: "panel with minSpan 8 gets converted to maxPerRow 3",
+			input: map[string]interface{}{
+				"title":         "V17 MinSpan to MaxPerRow Migration Test Dashboard",
+				"schemaVersion": 16,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":      1,
+						"type":    "graph",
+						"title":   "Test Panel",
+						"minSpan": 8,
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V17 MinSpan to MaxPerRow Migration Test Dashboard",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":        1,
+						"type":      "graph",
+						"title":     "Test Panel",
+						"maxPerRow": 3,
+					},
+				},
+			},
+		},
+		{
+			name: "panel with minSpan 4 gets converted to maxPerRow 6",
+			input: map[string]interface{}{
+				"title":         "V17 MinSpan Migration Test",
+				"schemaVersion": 16,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":      2,
+						"type":    "singlestat",
+						"title":   "Single Stat Panel",
+						"minSpan": 4,
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V17 MinSpan Migration Test",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":        2,
+						"type":      "singlestat",
+						"title":     "Single Stat Panel",
+						"maxPerRow": 6,
+					},
+				},
+			},
+		},
+		{
+			name: "panel with minSpan 2 gets converted to maxPerRow 12",
+			input: map[string]interface{}{
+				"title":         "V17 MinSpan Migration Test",
+				"schemaVersion": 16,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":      3,
+						"type":    "graph",
+						"title":   "Wide Panel",
+						"minSpan": 2,
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V17 MinSpan Migration Test",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":        3,
+						"type":      "graph",
+						"title":     "Wide Panel",
+						"maxPerRow": 12,
+					},
+				},
+			},
+		},
+		{
+			name: "panel with minSpan 12 gets converted to maxPerRow 2",
+			input: map[string]interface{}{
+				"title":         "V17 MinSpan Migration Test",
+				"schemaVersion": 16,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":      4,
+						"type":    "graph",
+						"title":   "Narrow Panel",
+						"minSpan": 12,
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V17 MinSpan Migration Test",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":        4,
+						"type":      "graph",
+						"title":     "Narrow Panel",
+						"maxPerRow": 2,
+					},
+				},
+			},
+		},
+		{
+			name: "panel with minSpan 24 gets converted to maxPerRow 1",
+			input: map[string]interface{}{
+				"title":         "V17 MinSpan Migration Test",
+				"schemaVersion": 16,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":      5,
+						"type":    "graph",
+						"title":   "Full Width Panel",
+						"minSpan": 24,
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V17 MinSpan Migration Test",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":        5,
+						"type":      "graph",
+						"title":     "Full Width Panel",
+						"maxPerRow": 1,
+					},
+				},
+			},
+		},
+		{
+			name: "panel with minSpan 1 gets converted to maxPerRow 24",
+			input: map[string]interface{}{
+				"title":         "V17 MinSpan Migration Test",
+				"schemaVersion": 16,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":      6,
+						"type":    "graph",
+						"title":   "Tiny Panel",
+						"minSpan": 1,
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V17 MinSpan Migration Test",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":        6,
+						"type":      "graph",
+						"title":     "Tiny Panel",
+						"maxPerRow": 24,
+					},
+				},
+			},
+		},
+		{
+			name: "multiple panels with different minSpan values",
+			input: map[string]interface{}{
+				"title":         "V17 Multiple Panels Migration Test",
+				"schemaVersion": 16,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":      1,
+						"type":    "graph",
+						"title":   "Panel 1",
+						"minSpan": 8,
+					},
+					map[string]interface{}{
+						"id":      2,
+						"type":    "singlestat",
+						"title":   "Panel 2",
+						"minSpan": 4,
+					},
+					map[string]interface{}{
+						"id":    3,
+						"type":  "table",
+						"title": "Panel 3 - No minSpan",
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V17 Multiple Panels Migration Test",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":        1,
+						"type":      "graph",
+						"title":     "Panel 1",
+						"maxPerRow": 3,
+					},
+					map[string]interface{}{
+						"id":        2,
+						"type":      "singlestat",
+						"title":     "Panel 2",
+						"maxPerRow": 6,
+					},
+					map[string]interface{}{
+						"id":    3,
+						"type":  "table",
+						"title": "Panel 3 - No minSpan",
+					},
+				},
+			},
+		},
+		{
+			name: "panel with invalid minSpan gets cleaned up",
+			input: map[string]interface{}{
+				"title":         "V17 Invalid MinSpan Test",
+				"schemaVersion": 16,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":      1,
+						"type":    "graph",
+						"title":   "Invalid MinSpan Panel",
+						"minSpan": "invalid",
+					},
+					map[string]interface{}{
+						"id":      2,
+						"type":    "graph",
+						"title":   "Zero MinSpan Panel",
+						"minSpan": 0,
+					},
+					map[string]interface{}{
+						"id":      3,
+						"type":    "graph",
+						"title":   "Negative MinSpan Panel",
+						"minSpan": -5,
+					},
+				},
+			},
+			expected: map[string]interface{}{
+				"title":         "V17 Invalid MinSpan Test",
+				"schemaVersion": 17,
+				"panels": []interface{}{
+					map[string]interface{}{
+						"id":    1,
+						"type":  "graph",
+						"title": "Invalid MinSpan Panel",
+					},
+					map[string]interface{}{
+						"id":    2,
+						"type":  "graph",
+						"title": "Zero MinSpan Panel",
+					},
+					map[string]interface{}{
+						"id":    3,
+						"type":  "graph",
+						"title": "Negative MinSpan Panel",
+					},
+				},
+			},
+		},
+		{
+			name: "dashboard with no panels",
+			input: map[string]interface{}{
+				"title":         "V17 No Panels Test",
+				"schemaVersion": 16,
+			},
+			expected: map[string]interface{}{
+				"title":         "V17 No Panels Test",
+				"schemaVersion": 17,
+			},
+		},
+		{
+			name: "dashboard with empty panels array",
+			input: map[string]interface{}{
+				"title":         "V17 Empty Panels Test",
+				"schemaVersion": 16,
+				"panels":        []interface{}{},
+			},
+			expected: map[string]interface{}{
+				"title":         "V17 Empty Panels Test",
+				"schemaVersion": 17,
+				"panels":        []interface{}{},
+			},
+		},
+	}
+
+	runMigrationTests(t, tests, schemaversion.V17)
+}
diff --git a/apps/dashboard/pkg/migration/testdata/input/v17.minspan_to_maxperrow.json b/apps/dashboard/pkg/migration/testdata/input/v17.minspan_to_maxperrow.json
new file mode 100644
index 00000000000..278ed37b13f
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/input/v17.minspan_to_maxperrow.json
@@ -0,0 +1,125 @@
+{
+  "title": "V17 MinSpan to MaxPerRow Migration Test Dashboard",
+  "schemaVersion": 16,
+  "panels": [
+    {
+      "id": 1,
+      "type": "graph",
+      "title": "Panel with minSpan 8",
+      "minSpan": 8,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      }
+    },
+    {
+      "id": 2,
+      "type": "singlestat",
+      "title": "Panel with minSpan 4",
+      "minSpan": 4,
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 0,
+        "y": 8
+      }
+    },
+    {
+      "id": 3,
+      "type": "table",
+      "title": "Panel with minSpan 2",
+      "minSpan": 2,
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 12
+      }
+    },
+    {
+      "id": 4,
+      "type": "graph",
+      "title": "Panel with minSpan 12",
+      "minSpan": 12,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      }
+    },
+    {
+      "id": 5,
+      "type": "gauge",
+      "title": "Panel with minSpan 24",
+      "minSpan": 24,
+      "gridPos": {
+        "h": 4,
+        "w": 24,
+        "x": 0,
+        "y": 18
+      }
+    },
+    {
+      "id": 6,
+      "type": "stat",
+      "title": "Panel with minSpan 1",
+      "minSpan": 1,
+      "gridPos": {
+        "h": 3,
+        "w": 4,
+        "x": 6,
+        "y": 8
+      }
+    },
+    {
+      "id": 7,
+      "type": "graph",
+      "title": "Panel without minSpan",
+      "gridPos": {
+        "h": 6,
+        "w": 8,
+        "x": 12,
+        "y": 8
+      }
+    },
+    {
+      "id": 8,
+      "type": "text",
+      "title": "Panel with invalid minSpan",
+      "minSpan": "invalid",
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 18,
+        "y": 8
+      }
+    },
+    {
+      "id": 9,
+      "type": "graph",
+      "title": "Panel with zero minSpan",
+      "minSpan": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 0,
+        "y": 22
+      }
+    },
+    {
+      "id": 10,
+      "type": "graph",
+      "title": "Panel with negative minSpan",
+      "minSpan": -5,
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 6,
+        "y": 22
+      }
+    }
+  ]
+}
diff --git a/apps/dashboard/pkg/migration/testdata/output/v17.minspan_to_maxperrow.json b/apps/dashboard/pkg/migration/testdata/output/v17.minspan_to_maxperrow.json
new file mode 100644
index 00000000000..ce7cb9fc7e9
--- /dev/null
+++ b/apps/dashboard/pkg/migration/testdata/output/v17.minspan_to_maxperrow.json
@@ -0,0 +1,317 @@
+{
+  "panels": [
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "maxPerRow": 3,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with minSpan 8",
+      "type": "graph"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 0,
+        "y": 8
+      },
+      "id": 2,
+      "maxPerRow": 6,
+      "options": {
+        "colorMode": "none",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "1.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with minSpan 4",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 12
+      },
+      "id": 3,
+      "maxPerRow": 12,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with minSpan 2",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "id": 4,
+      "maxPerRow": 2,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with minSpan 12",
+      "type": "graph"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 24,
+        "x": 0,
+        "y": 18
+      },
+      "id": 5,
+      "maxPerRow": 1,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with minSpan 24",
+      "type": "gauge"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 4,
+        "x": 6,
+        "y": 8
+      },
+      "id": 6,
+      "maxPerRow": 24,
+      "options": {
+        "justifyMode": "auto",
+        "percentChangeColorMode": "standard",
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with minSpan 1",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 8,
+        "x": 12,
+        "y": 8
+      },
+      "id": 7,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel without minSpan",
+      "type": "graph"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 18,
+        "y": 8
+      },
+      "id": 8,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with invalid minSpan",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 0,
+        "y": 22
+      },
+      "id": 9,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with zero minSpan",
+      "type": "graph"
+    },
+    {
+      "datasource": {
+        "apiVersion": "v1",
+        "type": "prometheus",
+        "uid": "default-ds-uid"
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 6,
+        "y": 22
+      },
+      "id": 10,
+      "targets": [
+        {
+          "datasource": {
+            "apiVersion": "v1",
+            "type": "prometheus",
+            "uid": "default-ds-uid"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel with negative minSpan",
+      "type": "graph"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 41,
+  "title": "V17 MinSpan to MaxPerRow Migration Test Dashboard"
+}
\ No newline at end of file

From 66eee1cb0809e003ad9f7ddc99649b453afe5cc0 Mon Sep 17 00:00:00 2001
From: Paul Marbach <paul.marbach@grafana.com>
Date: Mon, 18 Aug 2025 10:11:43 -0400
Subject: [PATCH 226/243] Table: Tooltip from Field (#109428)

* Table: Tooltip by Field

* add colorization support

* more progress on customizing the tooltip based on cell customization

* configurable as an option

* tooltip triggered from a chip in the corner, pinning tooltip

* i18n

* use enum where appropriate

* correctly orient the tooltip to the cell - but at what cost

* clean up some console.logs

* e2e test for the tooltip

* fix global click stuff

* remove console.log

* refine the style of the caret

* caret placement on same-side as alignment to avoid collision with inspect hover

* some updates from self-review

* increase hit target of tooltip caret

* fix width and height auto-sizing especially for dynamic height

* reorganize to pre-calc the per-field stuff

* use linear gradient for triangle

* update e2e to reflect current behavior, that clicking caret multiple times doesn't toggle pinning

* clean up event handlers a bit

* restore test for toggle click

* alright, re-remove the toggle case

* cursor pointer

* remove optional root from Popover for now

* remove this ridiculous autogenerated file

* update some of the text

* kill the cellRefMatrix

* remove unused import

* extract a util for the predicateByName part

* skip the intermediary step for getCellColors
---
 .../panel-table/table_kitchen_sink.json       |   8 +
 .../panels-suite/table-kitchenSink.spec.ts    |  63 +++++++
 .../src/selectors/components.ts               |   8 +
 .../grafana-schema/src/common/common.gen.ts   |  21 +++
 packages/grafana-schema/src/common/table.cue  |  13 ++
 .../Table/TableNG/Cells/MarkdownCell.tsx      |  28 +--
 .../Table/TableNG/Cells/renderers.tsx         |  11 +-
 .../src/components/Table/TableNG/TableNG.tsx  | 109 +++++++++---
 .../TableNG/components/TableCellTooltip.tsx   | 159 ++++++++++++++++++
 .../src/components/Table/TableNG/styles.ts    |  35 +++-
 .../src/components/Table/TableNG/types.ts     |  10 +-
 .../components/Table/TableNG/utils.test.ts    |  66 +++++++-
 .../src/components/Table/TableNG/utils.ts     |  36 ++--
 .../src/components/Tooltip/Popover.tsx        |   3 +
 .../plugins/panel/table/table-new/module.tsx  |  48 +++++-
 public/locales/en-US/grafana.json             |  12 +-
 16 files changed, 562 insertions(+), 68 deletions(-)
 create mode 100644 packages/grafana-ui/src/components/Table/TableNG/components/TableCellTooltip.tsx

diff --git a/devenv/dev-dashboards/panel-table/table_kitchen_sink.json b/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
index 2e2fb5ccd8f..6e806785038 100644
--- a/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
+++ b/devenv/dev-dashboards/panel-table/table_kitchen_sink.json
@@ -299,6 +299,14 @@
               {
                 "id": "custom.width",
                 "value": 255
+              },
+              {
+                "id": "custom.tooltip.field",
+                "value": "State"
+              },
+              {
+                "id": "custom.tooltip.placement",
+                "value": "left"
               }
             ]
           },
diff --git a/e2e-playwright/panels-suite/table-kitchenSink.spec.ts b/e2e-playwright/panels-suite/table-kitchenSink.spec.ts
index 237ea5272a9..739646813f8 100644
--- a/e2e-playwright/panels-suite/table-kitchenSink.spec.ts
+++ b/e2e-playwright/panels-suite/table-kitchenSink.spec.ts
@@ -353,6 +353,69 @@ test.describe('Panels test: Table - Kitchen Sink', { tag: ['@panels', '@table']
     // TODO -- saving for another day.
   });
 
+  test('Tests tooltip interactions', async ({ gotoDashboardPage, selectors }) => {
+    const dashboardPage = await gotoDashboardPage({
+      uid: DASHBOARD_UID,
+      queryParams: new URLSearchParams({ editPanel: '1' }),
+    });
+
+    await expect(
+      dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink'))
+    ).toBeVisible();
+
+    const firstCaret = dashboardPage
+      .getByGrafanaSelector(selectors.components.Panels.Visualization.TableNG.Tooltip.Caret)
+      .first();
+
+    // test hovering over and blurring the caret, and whether the tooltip appears and disappears as expected.
+    await firstCaret.hover();
+
+    await expect(
+      dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.TableNG.Tooltip.Wrapper)
+    ).toBeVisible();
+
+    await dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink')).hover();
+
+    await expect(
+      dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.TableNG.Tooltip.Wrapper)
+    ).not.toBeVisible();
+
+    // when a pinned tooltip is open, clicking outside of it should close it.
+    await firstCaret.click();
+
+    await expect(
+      dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.TableNG.Tooltip.Wrapper)
+    ).toBeVisible();
+
+    await dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink')).click();
+
+    await expect(
+      dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.TableNG.Tooltip.Wrapper)
+    ).not.toBeVisible();
+
+    // when a pinned tooltip is open, clicking inside of it should NOT close it.
+    await firstCaret.click();
+
+    await expect(
+      dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.TableNG.Tooltip.Wrapper)
+    ).toBeVisible();
+
+    const tooltip = dashboardPage.getByGrafanaSelector(
+      selectors.components.Panels.Visualization.TableNG.Tooltip.Wrapper
+    );
+    await tooltip.click();
+
+    await expect(
+      dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.TableNG.Tooltip.Wrapper)
+    ).toBeVisible();
+
+    await dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('Table - Kitchen Sink')).click();
+
+    await expect(
+      dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.TableNG.Tooltip.Wrapper)
+    ).not.toBeVisible();
+  });
+
   test('Empty Table panel', async ({ gotoDashboardPage, selectors }) => {
     const dashboardPage = await gotoDashboardPage({
       uid: DASHBOARD_UID,
diff --git a/packages/grafana-e2e-selectors/src/selectors/components.ts b/packages/grafana-e2e-selectors/src/selectors/components.ts
index 9ac23a5b24c..3b3ccab5cf0 100644
--- a/packages/grafana-e2e-selectors/src/selectors/components.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/components.ts
@@ -493,6 +493,14 @@ export const versionedComponents = {
             '12.1.0': 'data-testid tableng filter select-all',
           },
         },
+        Tooltip: {
+          Wrapper: {
+            '12.2.0': 'data-testid tableng tooltip wrapper',
+          },
+          Caret: {
+            '12.2.0': 'data-testid tableng tooltip caret',
+          },
+        },
       },
     },
   },
diff --git a/packages/grafana-schema/src/common/common.gen.ts b/packages/grafana-schema/src/common/common.gen.ts
index 62346b070f6..5be227ba4b9 100644
--- a/packages/grafana-schema/src/common/common.gen.ts
+++ b/packages/grafana-schema/src/common/common.gen.ts
@@ -976,6 +976,14 @@ export type TableCellOptions = (TableAutoCellOptions | TableSparklineCellOptions
     type: TableCellDisplayMode.Geo
   });
 
+export enum TableCellTooltipPlacement {
+  Auto = 'auto',
+  Bottom = 'bottom',
+  Left = 'left',
+  Right = 'right',
+  Top = 'top',
+}
+
 /**
  * Field options for each field within a table (e.g 10, "The String", 64.20, etc.)
  * Generally defines alignment, filtering capabilties, display options, etc.
@@ -995,6 +1003,19 @@ export interface TableFieldOptions {
   hideHeader?: boolean;
   inspect: boolean;
   minWidth?: number;
+  /**
+   * Selecting or hovering this field will show a tooltip containing the content within the target field
+   */
+  tooltip?: {
+    /**
+     * The name of the field to get the tooltip content from
+     */
+    field: string;
+    /**
+     * placement of the tooltip
+     */
+    placement?: TableCellTooltipPlacement;
+  };
   width?: number;
   /**
    * Enables text wrapping for column headers
diff --git a/packages/grafana-schema/src/common/table.cue b/packages/grafana-schema/src/common/table.cue
index 9fe71322a31..27229571a19 100644
--- a/packages/grafana-schema/src/common/table.cue
+++ b/packages/grafana-schema/src/common/table.cue
@@ -107,10 +107,21 @@ TableGeoCellOptions: {
 // Height of a table cell
 TableCellHeight: "sm" | "md" | "lg" | "auto" @cuetsy(kind="enum")
 
+
+
 // Table cell options. Each cell has a display mode
 // and other potential options for that display.
 TableCellOptions: TableAutoCellOptions | TableSparklineCellOptions | TableBarGaugeCellOptions | TableColoredBackgroundCellOptions | TableColorTextCellOptions | TableImageCellOptions | TablePillCellOptions | TableDataLinksCellOptions | TableActionsCellOptions | TableJsonViewCellOptions | TableMarkdownCellOptions | TableGeoCellOptions @cuetsy(kind="type")
 
+TableCellTooltipPlacement: "top" | "bottom" | "left" | "right" | "auto" @cuetsy(kind="enum")
+
+TableCellTooltipOptions: {
+  // The name of the field to get the tooltip content from
+  field: string
+  // placement of the tooltip
+  placement?: TableCellTooltipPlacement & (*"auto" | _)
+}
+
 // Field options for each field within a table (e.g 10, "The String", 64.20, etc.)
 // Generally defines alignment, filtering capabilties, display options, etc.
 TableFieldOptions: {
@@ -127,4 +138,6 @@ TableFieldOptions: {
 	hideHeader?: bool
   // Enables text wrapping for column headers
   wrapHeaderText?: bool
+  // Selecting or hovering this field will show a tooltip containing the content within the target field
+  tooltip?: TableCellTooltipOptions
 } @cuetsy(kind="interface")
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/MarkdownCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/MarkdownCell.tsx
index 4bd252ff9d3..7d3e36e3f65 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/MarkdownCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/MarkdownCell.tsx
@@ -6,12 +6,19 @@ import { MaybeWrapWithLink } from '../MaybeWrapWithLink';
 import { MarkdownCellProps, TableCellStyles } from '../types';
 
 export function MarkdownCell({ field, rowIdx, disableSanitizeHtml }: MarkdownCellProps) {
+  const rawValue = field.values[rowIdx];
+  if (rawValue == null) {
+    return null;
+  }
+
+  const renderValue = field.display!(rawValue);
+
   return (
     <MaybeWrapWithLink field={field} rowIdx={rowIdx}>
       <div
         className="markdown-container"
         dangerouslySetInnerHTML={{
-          __html: renderMarkdown(field.values[rowIdx], { noSanitize: disableSanitizeHtml }).trim(),
+          __html: renderMarkdown(renderValue.text, { noSanitize: disableSanitizeHtml }).trim(),
         }}
       />
     </MaybeWrapWithLink>
@@ -26,20 +33,17 @@ export const getStyles: TableCellStyles = (theme) =>
 
     '.markdown-container': {
       width: '100%',
+      // for elements like `p`, `h*`, etc. which have an inherent margin,
+      // we want to remove the bottom margin for the last one in the container.
+      '> *:last-child': {
+        marginBottom: 0,
+      },
     },
 
-    '& ol, & ul': {
-      paddingLeft: theme.spacing(1.5),
+    'ol, ul': {
+      paddingLeft: theme.spacing(2.5),
     },
-    '& p': {
+    p: {
       whiteSpace: 'pre-line',
     },
-    '& a': {
-      color: theme.colors.primary.text,
-    },
-    // for elements like `p`, `h*`, etc. which have an inherent margin,
-    // we want to remove the bottom margin for the last one in the container.
-    '& > .markdown-container > *:last-child': {
-      marginBottom: 0,
-    },
   });
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx
index 74648953454..c0e2801d7f7 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx
@@ -1,10 +1,10 @@
 import { clsx } from 'clsx';
-import { ReactNode } from 'react';
 
 import { Field, FieldType, GrafanaTheme2, isDataFrame, isTimeSeriesFrame } from '@grafana/data';
 
 import { TableCellDisplayMode, TableCellOptions, TableCustomCellOptions } from '../../types';
-import { TableCellRendererProps, TableCellStyleOptions, TableCellStyles } from '../types';
+import { TableCellRenderer, TableCellStyleOptions, TableCellStyles } from '../types';
+import { getCellOptions } from '../utils';
 
 import { ActionsCell, getStyles as getActionsCellStyles } from './ActionsCell';
 import { AutoCell, getStyles as getAutoCellStyles, getJsonCellStyles } from './AutoCell';
@@ -16,8 +16,6 @@ import { MarkdownCell, getStyles as getMarkdownCellStyles } from './MarkdownCell
 import { PillCell, getStyles as getPillStyles } from './PillCell';
 import { SparklineCell, getStyles as getSparklineCellStyles } from './SparklineCell';
 
-export type TableCellRenderer = (props: TableCellRendererProps) => ReactNode;
-
 const GAUGE_RENDERER: TableCellRenderer = (props) => (
   <BarGaugeCell
     field={props.field}
@@ -141,7 +139,10 @@ const STRING_ONLY_RENDERERS = new Set<TableCellOptions['type']>([
 ]);
 
 /** @internal */
-export function getCellRenderer(field: Field, cellOptions: TableCellOptions): TableCellRenderer {
+export function getCellRenderer(
+  field: Field,
+  cellOptions: TableCellOptions = getCellOptions(field)
+): TableCellRenderer {
   const cellType = cellOptions?.type ?? TableCellDisplayMode.Auto;
   if (cellType === TableCellDisplayMode.Auto) {
     return CELL_RENDERERS[getAutoRendererDisplayMode(field)].renderer;
diff --git a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
index b0f720fbe10..84132fc64cc 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
@@ -24,7 +24,7 @@ import {
   ReducerID,
 } from '@grafana/data';
 import { t, Trans } from '@grafana/i18n';
-import { FieldColorModeId } from '@grafana/schema';
+import { FieldColorModeId, TableCellTooltipPlacement } from '@grafana/schema';
 
 import { useStyles2, useTheme2 } from '../../../themes/ThemeContext';
 import { ContextMenu } from '../../ContextMenu/ContextMenu';
@@ -40,6 +40,7 @@ import { getCellRenderer, getCellSpecificStyles } from './Cells/renderers';
 import { HeaderCell } from './components/HeaderCell';
 import { RowExpander } from './components/RowExpander';
 import { TableCellActions } from './components/TableCellActions';
+import { TableCellTooltip } from './components/TableCellTooltip';
 import { COLUMN, TABLE } from './constants';
 import {
   useColumnResize,
@@ -51,10 +52,18 @@ import {
   useScrollbarWidth,
   useSortedRows,
 } from './hooks';
-import { getDefaultCellStyles, getFooterStyles, getGridStyles, getHeaderCellStyles, getLinkStyles } from './styles';
+import {
+  getDefaultCellStyles,
+  getFooterStyles,
+  getGridStyles,
+  getHeaderCellStyles,
+  getLinkStyles,
+  getTooltipStyles,
+} from './styles';
 import { TableNGProps, TableRow, TableSummaryRow, TableColumn, ContextMenuProps, TableCellStyleOptions } from './types';
 import {
   applySort,
+  canFieldBeColorized,
   computeColWidths,
   createTypographyContext,
   displayJsonValue,
@@ -62,7 +71,7 @@ import {
   frameToRecords,
   getAlignment,
   getApplyToRowBgFn,
-  getCellColors,
+  getCellColorInlineStyles,
   getCellLinks,
   getCellOptions,
   getDefaultRowHeight,
@@ -71,6 +80,7 @@ import {
   getJustifyContent,
   getVisibleFields,
   isCellInspectEnabled,
+  predicateByName,
   shouldTextOverflow,
   shouldTextWrap,
   withDataLinksActionsTooltip,
@@ -379,10 +389,7 @@ export function TableNG(props: TableNGProps) {
         const shouldOverflow = rowHeight !== 'auto' && shouldTextOverflow(field);
         const textWrap = rowHeight === 'auto' || shouldTextWrap(field);
         const withTooltip = withDataLinksActionsTooltip(field, cellType);
-        const canBeColorized =
-          cellType === TableCellDisplayMode.ColorBackground ||
-          cellType === TableCellDisplayMode.ColorText ||
-          Boolean(applyToRowBgFn);
+        const canBeColorized = canFieldBeColorized(cellType, applyToRowBgFn);
         const cellStyleOptions: TableCellStyleOptions = { textAlign, textWrap, shouldOverflow };
 
         result.colsWithTooltip[displayName] = withTooltip;
@@ -406,9 +413,7 @@ export function TableNG(props: TableNGProps) {
 
             // generate shared styles for whole row
             if (applyToRowBgFn != null) {
-              let { textColor, bgColor } = applyToRowBgFn(rowIdx);
-              rowCellStyle.color = textColor;
-              rowCellStyle.background = bgColor;
+              rowCellStyle = { ...rowCellStyle, ...applyToRowBgFn(rowIdx) };
             }
           }
 
@@ -416,16 +421,10 @@ export function TableNG(props: TableNGProps) {
 
           if (rowCellStyle.color != null || rowCellStyle.background != null) {
             style = rowCellStyle;
-          }
-          // apply background for cell types which can have a background and have proper
-          else if (canBeColorized) {
+          } else if (canBeColorized) {
             const value = props.row[props.column.key];
             const displayValue = field.display!(value); // this fires here to get colors, then again to get rendered value?
-            let { textColor, bgColor } = getCellColors(theme, cellOptions, displayValue);
-            style = {
-              color: textColor,
-              background: bgColor,
-            };
+            style = getCellColorInlineStyles(theme, cellOptions, displayValue);
           }
 
           return (
@@ -440,8 +439,7 @@ export function TableNG(props: TableNGProps) {
 
         result.cellRootRenderers[displayName] = renderCellRoot;
 
-        // this fires second
-        const renderCellContent = (props: RenderCellProps<TableRow, TableSummaryRow>): JSX.Element => {
+        const renderBasicCellContent = (props: RenderCellProps<TableRow, TableSummaryRow>): JSX.Element => {
           const rowIdx = props.row.__index;
           const value = props.row[props.column.key];
           // TODO: it would be nice to get rid of passing height down as a prop. but this value
@@ -486,6 +484,77 @@ export function TableNG(props: TableNGProps) {
           );
         };
 
+        // renderCellContent fires second.
+        let renderCellContent = renderBasicCellContent;
+
+        const tooltipFieldName = field.config.custom?.tooltip?.field;
+        if (tooltipFieldName) {
+          const tooltipField = data.fields.find(predicateByName(tooltipFieldName));
+          if (tooltipField) {
+            const tooltipDisplayName = getDisplayName(tooltipField);
+            const tooltipCellOptions = getCellOptions(tooltipField);
+            const tooltipFieldRenderer = getCellRenderer(tooltipField, tooltipCellOptions);
+            const tooltipCellStyleOptions = {
+              textAlign: getAlignment(tooltipField),
+              textWrap: shouldTextWrap(tooltipField),
+              shouldOverflow: false,
+            } satisfies TableCellStyleOptions;
+            const tooltipCanBeColorized = canFieldBeColorized(tooltipCellOptions.type, applyToRowBgFn);
+            const tooltipDefaultStyles = getDefaultCellStyles(theme, tooltipCellStyleOptions);
+            const tooltipSpecificStyles = getCellSpecificStyles(
+              tooltipCellOptions.type,
+              tooltipField,
+              theme,
+              tooltipCellStyleOptions
+            );
+            const tooltipLinkStyles = getLinkStyles(theme, tooltipCanBeColorized);
+            const tooltipClasses = getTooltipStyles(theme, textAlign);
+
+            const placement = field.config.custom?.tooltip?.placement ?? TableCellTooltipPlacement.Auto;
+            const tooltipWidth =
+              placement === TableCellTooltipPlacement.Left || placement === TableCellTooltipPlacement.Right
+                ? tooltipField.config.custom?.width
+                : width;
+
+            const tooltipProps = {
+              cellOptions: tooltipCellOptions,
+              classes: tooltipClasses,
+              className: clsx(
+                tooltipClasses.tooltipContent,
+                tooltipDefaultStyles,
+                tooltipSpecificStyles,
+                tooltipLinkStyles
+              ),
+              data,
+              disableSanitizeHtml,
+              field: tooltipField,
+              getActions: getCellActions,
+              gridRef,
+              placement,
+              renderer: tooltipFieldRenderer,
+              tooltipField,
+              theme,
+              width: tooltipWidth,
+            } satisfies Partial<React.ComponentProps<typeof TableCellTooltip>>;
+
+            renderCellContent = (props: RenderCellProps<TableRow, TableSummaryRow>): JSX.Element => {
+              // cached so we don't care about multiple calls.
+              const height = rowHeightFn(props.row);
+              let tooltipStyle: CSSProperties | undefined;
+              if (tooltipCanBeColorized) {
+                const tooltipDisplayValue = tooltipField.display!(props.row[tooltipDisplayName]); // this is yet another call to field.display() for the tooltip field
+                tooltipStyle = getCellColorInlineStyles(theme, tooltipCellOptions, tooltipDisplayValue);
+              }
+
+              return (
+                <TableCellTooltip {...tooltipProps} height={height} rowIdx={props.rowIdx} style={tooltipStyle}>
+                  {renderBasicCellContent(props)}
+                </TableCellTooltip>
+              );
+            };
+          }
+        }
+
         const column: TableColumn = {
           field,
           key: displayName,
diff --git a/packages/grafana-ui/src/components/Table/TableNG/components/TableCellTooltip.tsx b/packages/grafana-ui/src/components/Table/TableNG/components/TableCellTooltip.tsx
new file mode 100644
index 00000000000..a81f083a2f1
--- /dev/null
+++ b/packages/grafana-ui/src/components/Table/TableNG/components/TableCellTooltip.tsx
@@ -0,0 +1,159 @@
+import { CSSProperties, ReactElement, useMemo, useState, useRef, useEffect, RefObject } from 'react';
+import { DataGridHandle } from 'react-data-grid';
+
+import { ActionModel, DataFrame, Field, GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+import { TableCellTooltipPlacement } from '@grafana/schema';
+
+import { Popover } from '../../../Tooltip/Popover';
+import { TableCellOptions } from '../../types';
+import { getTooltipStyles } from '../styles';
+import { TableCellRenderer, TableCellRendererProps } from '../types';
+
+export interface Props {
+  cellOptions: TableCellOptions;
+  children: ReactElement;
+  classes: ReturnType<typeof getTooltipStyles>;
+  className?: string;
+  data: DataFrame;
+  disableSanitizeHtml?: boolean;
+  field: Field;
+  getActions: (field: Field, rowIdx: number) => ActionModel[];
+  gridRef: RefObject<DataGridHandle>;
+  height: number;
+  placement?: TableCellTooltipPlacement;
+  renderer: TableCellRenderer;
+  rowIdx: number;
+  style?: CSSProperties;
+  tooltipField: Field;
+  theme: GrafanaTheme2;
+  width?: number;
+}
+
+export function TableCellTooltip({
+  cellOptions,
+  children,
+  classes,
+  className,
+  data,
+  disableSanitizeHtml,
+  field,
+  getActions,
+  gridRef,
+  height,
+  placement,
+  renderer,
+  rowIdx,
+  style,
+  theme,
+  tooltipField,
+  width = 300,
+}: Props) {
+  const rawValue = field.values[rowIdx];
+  const tooltipCaretRef = useRef<HTMLDivElement>(null);
+
+  const [hovered, setHovered] = useState(false);
+  const [pinned, setPinned] = useState(false);
+
+  const show = hovered || pinned;
+  const dynamicHeight = tooltipField.config.custom?.cellOptions?.dynamicHeight;
+
+  useEffect(() => {
+    if (pinned) {
+      const gridRoot = gridRef.current?.element;
+
+      const windowListener = (ev: Event) => {
+        if (ev.target === tooltipCaretRef.current) {
+          return;
+        }
+
+        setPinned(false);
+        window.removeEventListener('click', windowListener);
+      };
+
+      window.addEventListener('click', windowListener);
+
+      // right now, we kill the pinned tooltip on any form of scrolling to avoid awkward rendering
+      // where the tooltip bumps up against the edge of the scrollable container. we could try to
+      // kill the tooltip when it hits these boundaries rather than when scrolling starts.
+      const scrollListener = () => {
+        setPinned(false);
+      };
+      gridRoot?.addEventListener('scroll', scrollListener, { once: true });
+
+      return () => {
+        window.removeEventListener('click', windowListener);
+        gridRoot?.removeEventListener('scroll', scrollListener);
+      };
+    }
+
+    return;
+  }, [pinned, gridRef]);
+
+  const rendererProps = useMemo(
+    () =>
+      ({
+        cellInspect: false,
+        cellOptions,
+        disableSanitizeHtml,
+        field,
+        frame: data,
+        getActions,
+        height,
+        rowIdx,
+        showFilters: false,
+        theme,
+        value: rawValue,
+        width,
+      }) satisfies TableCellRendererProps,
+    [cellOptions, data, disableSanitizeHtml, field, getActions, height, rawValue, rowIdx, theme, width]
+  );
+
+  const cellElement = tooltipCaretRef.current?.closest<HTMLElement>('.rdg-cell');
+
+  if (rawValue === null || rawValue === undefined) {
+    return children;
+  }
+
+  const body = <>{renderer(rendererProps)}</>;
+
+  // TODO: perist the hover if you mouse out of the trigger and into the popover
+  const onMouseLeave = () => setHovered(false);
+  const onMouseEnter = () => setHovered(true);
+
+  return (
+    <>
+      {cellElement && (
+        <Popover
+          content={body}
+          show={show}
+          placement={placement}
+          wrapperClassName={classes.tooltipWrapper}
+          className={className}
+          style={{ ...style, minWidth: width, ...(!dynamicHeight && { height }) }}
+          referenceElement={cellElement}
+          onMouseLeave={onMouseLeave}
+          onMouseEnter={onMouseEnter}
+          onClick={(ev) => ev.stopPropagation()} // prevent click from bubbling to the global click listener for un-pinning
+          data-testid={selectors.components.Panels.Visualization.TableNG.Tooltip.Wrapper}
+        />
+      )}
+
+      {/* TODO: figure out an accessible way to trigger the tooltip. */}
+      {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
+      <div
+        className={classes.tooltipCaret}
+        ref={tooltipCaretRef}
+        data-testid={selectors.components.Panels.Visualization.TableNG.Tooltip.Caret}
+        aria-pressed={pinned}
+        onClick={() => setPinned((prev) => !prev)}
+        onMouseLeave={onMouseLeave}
+        onMouseEnter={onMouseEnter}
+        onBlur={onMouseLeave}
+        onFocus={onMouseEnter}
+      />
+
+      {children}
+    </>
+  );
+}
diff --git a/packages/grafana-ui/src/components/Table/TableNG/styles.ts b/packages/grafana-ui/src/components/Table/TableNG/styles.ts
index 983372aeb0b..76de0e3e1bb 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/styles.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/styles.ts
@@ -5,7 +5,7 @@ import { GrafanaTheme2, colorManipulator } from '@grafana/data';
 
 import { COLUMN, TABLE } from './constants';
 import { TableCellStyles } from './types';
-import { getJustifyContent } from './utils';
+import { getJustifyContent, TextAlign } from './utils';
 
 export const getGridStyles = (
   theme: GrafanaTheme2,
@@ -25,6 +25,8 @@ export const getGridStyles = (
       '--rdg-summary-border-color': borderColor,
       '--rdg-summary-border-width': '1px',
 
+      '--rdg-selection-color': theme.colors.info.transparent,
+
       // note: this cannot have any transparency since default cells that
       // overlay/overflow on hover inherit this background and need to occlude cells below
       '--rdg-row-background-color': bgColor,
@@ -174,3 +176,34 @@ export const getLinkStyles = (theme: GrafanaTheme2, canBeColorized: boolean) =>
           }),
     },
   });
+
+const caretTriangle = (direction: 'left' | 'right', bgColor: string) =>
+  `linear-gradient(to top ${direction}, transparent 62.5%, ${bgColor} 50%)`;
+
+export const getTooltipStyles = (theme: GrafanaTheme2, textAlign: TextAlign) => ({
+  tooltipContent: css({
+    height: '100%',
+    width: '100%',
+  }),
+  tooltipWrapper: css({
+    background: theme.colors.background.primary,
+    border: `1px solid ${theme.colors.border.weak}`,
+    borderRadius: theme.shape.radius.default,
+    boxShadow: theme.shadows.z3,
+    overflow: 'hidden',
+    padding: theme.spacing(1),
+    width: 'inherit',
+  }),
+  tooltipCaret: css({
+    cursor: 'pointer',
+    position: 'absolute',
+    top: theme.spacing(0.25),
+    [textAlign === 'right' ? 'right' : 'left']: theme.spacing(0.25),
+    width: theme.spacing(1.75),
+    height: theme.spacing(1.75),
+    background: caretTriangle(textAlign === 'right' ? 'right' : 'left', theme.colors.border.medium),
+    '&:hover, &[aria-pressed=true]': {
+      background: caretTriangle(textAlign === 'right' ? 'right' : 'left', theme.colors.border.strong),
+    },
+  }),
+});
diff --git a/packages/grafana-ui/src/components/Table/TableNG/types.ts b/packages/grafana-ui/src/components/Table/TableNG/types.ts
index 8a2b25bc986..7d61ac6200a 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/types.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/types.ts
@@ -1,4 +1,4 @@
-import { SyntheticEvent } from 'react';
+import { ReactNode, SyntheticEvent } from 'react';
 import { Column } from 'react-data-grid';
 
 import {
@@ -150,6 +150,8 @@ export interface BaseTableProps {
 /* ---------------------------- Table cell props ---------------------------- */
 export interface TableNGProps extends BaseTableProps {}
 
+export type TableCellRenderer = (props: TableCellRendererProps) => ReactNode;
+
 export interface TableCellRendererProps {
   rowIdx: number;
   frame: DataFrame;
@@ -229,12 +231,6 @@ export interface GeoCellProps {
   height: number;
 }
 
-export interface CellColors {
-  textColor?: string;
-  bgColor?: string;
-  bgHoverColor?: string;
-}
-
 export interface AutoCellProps {
   field: Field;
   value: TableCellValue;
diff --git a/packages/grafana-ui/src/components/Table/TableNG/utils.test.ts b/packages/grafana-ui/src/components/Table/TableNG/utils.test.ts
index e159c9933cb..5ebd14336b9 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/utils.test.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/utils.test.ts
@@ -23,7 +23,7 @@ import {
   extractPixelValue,
   frameToRecords,
   getAlignmentFactor,
-  getCellColors,
+  getCellColorInlineStyles,
   getCellLinks,
   getCellOptions,
   getComparator,
@@ -44,6 +44,8 @@ import {
   getDataLinksCounter,
   getPillLineCounter,
   getDefaultRowHeight,
+  getDisplayName,
+  predicateByName,
 } from './utils';
 
 describe('TableNG utils', () => {
@@ -110,9 +112,9 @@ describe('TableNG utils', () => {
 
       const displayValue = { text: '100', numeric: 100, color: '#ff0000' };
 
-      const colors = getCellColors(theme, field, displayValue);
-      expect(colors.bgColor).toBe('rgb(255, 0, 0)');
-      expect(colors.textColor).toBe('rgb(247, 248, 250)');
+      const colors = getCellColorInlineStyles(theme, field, displayValue);
+      expect(colors.background).toBe('rgb(255, 0, 0)');
+      expect(colors.color).toBe('rgb(247, 248, 250)');
     });
 
     it('should handle color background gradient mode', () => {
@@ -123,9 +125,9 @@ describe('TableNG utils', () => {
 
       const displayValue = { text: '100', numeric: 100, color: '#ff0000' };
 
-      const colors = getCellColors(theme, field, displayValue);
-      expect(colors.bgColor).toBe('linear-gradient(120deg, rgb(255, 54, 36), #ff0000)');
-      expect(colors.textColor).toBe('rgb(247, 248, 250)');
+      const colors = getCellColorInlineStyles(theme, field, displayValue);
+      expect(colors.background).toBe('linear-gradient(120deg, rgb(255, 54, 36), #ff0000)');
+      expect(colors.color).toBe('rgb(247, 248, 250)');
     });
   });
 
@@ -1268,4 +1270,54 @@ describe('TableNG utils', () => {
       ]);
     });
   });
+
+  describe('getDisplayName', () => {
+    it('should return the display name if set', () => {
+      const field: Field = {
+        name: 'test',
+        type: FieldType.string,
+        config: {},
+        state: { displayName: 'Test Display Name' },
+        values: [],
+      };
+      expect(getDisplayName(field)).toBe('Test Display Name');
+    });
+
+    it('should return the field name if no display name is set', () => {
+      const field: Field = {
+        name: 'test',
+        type: FieldType.string,
+        state: {},
+        config: {},
+        values: [],
+      };
+      expect(getDisplayName(field)).toBe('test');
+    });
+  });
+
+  describe('predicateByName', () => {
+    it('should return true for matching field names', () => {
+      const field: Field = { name: 'test', type: FieldType.string, config: {}, values: [] };
+      const predicate = predicateByName('test');
+      expect(predicate(field)).toBe(true);
+    });
+
+    it('should return true for a matching display name', () => {
+      const field: Field = {
+        name: 'test',
+        type: FieldType.string,
+        config: {},
+        state: { displayName: 'Test Display Name' },
+        values: [],
+      };
+      const predicate = predicateByName('Test Display Name');
+      expect(predicate(field)).toBe(true);
+    });
+
+    it('should return false for non-matching field names', () => {
+      const field: Field = { name: 'test', type: FieldType.string, config: {}, values: [] };
+      const predicate = predicateByName('other');
+      expect(predicate(field)).toBe(false);
+    });
+  });
 });
diff --git a/packages/grafana-ui/src/components/Table/TableNG/utils.ts b/packages/grafana-ui/src/components/Table/TableNG/utils.ts
index 9ba4a5eddca..3c36e150a3c 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/utils.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/utils.ts
@@ -29,7 +29,6 @@ import { TableCellOptions } from '../types';
 import { inferPills } from './Cells/PillCell';
 import { COLUMN, TABLE } from './constants';
 import {
-  CellColors,
   TableRow,
   ColumnTypes,
   FrameToRowsConverter,
@@ -489,18 +488,17 @@ const CELL_GRADIENT_HUE_ROTATION_DEGREES = 5;
  * @internal
  * Returns the text and background colors for a table cell based on its options and display value.
  */
-export function getCellColors(
+export function getCellColorInlineStyles(
   theme: GrafanaTheme2,
   cellOptions: TableCellOptions,
   displayValue: DisplayValue
-): CellColors {
+): CSSProperties {
   // How much to darken elements depends upon if we're in dark mode
   const darkeningFactor = theme.isDark ? 1 : -0.7;
 
   // Setup color variables
   let textColor: string | undefined = undefined;
   let bgColor: string | undefined = undefined;
-  // let bgHoverColor: string | undefined = undefined;
 
   if (cellOptions.type === TableCellDisplayMode.ColorText) {
     textColor = displayValue.color;
@@ -510,23 +508,16 @@ export function getCellColors(
     if (mode === TableCellBackgroundDisplayMode.Basic) {
       textColor = getTextColorForAlphaBackground(displayValue.color!, theme.isDark);
       bgColor = tinycolor(displayValue.color).toRgbString();
-      // bgHoverColor = tinycolor(displayValue.color)
-      //   .darken(CELL_COLOR_DARKENING_MULTIPLIER * darkeningFactor)
-      //   .toRgbString();
     } else if (mode === TableCellBackgroundDisplayMode.Gradient) {
-      // const hoverColor = tinycolor(displayValue.color)
-      //   .darken(CELL_GRADIENT_DARKENING_MULTIPLIER * darkeningFactor)
-      //   .toRgbString();
       const bgColor2 = tinycolor(displayValue.color)
         .darken(CELL_COLOR_DARKENING_MULTIPLIER * darkeningFactor)
         .spin(CELL_GRADIENT_HUE_ROTATION_DEGREES);
       textColor = getTextColorForAlphaBackground(displayValue.color!, theme.isDark);
       bgColor = `linear-gradient(120deg, ${bgColor2.toRgbString()}, ${displayValue.color})`;
-      // bgHoverColor = `linear-gradient(120deg, ${bgColor2.toRgbString()}, ${hoverColor})`;
     }
   }
 
-  return { textColor, bgColor };
+  return { color: textColor, background: bgColor };
 }
 
 /**
@@ -814,6 +805,11 @@ export const getDisplayName = (field: Field): string => {
   return field.state?.displayName ?? field.name;
 };
 
+/**
+ * @internal given a field name or display name, returns a predicate function that checks if a field matches that name.
+ */
+export const predicateByName = (name: string) => (f: Field) => f.name === name || getDisplayName(f) === name;
+
 /**
  * @internal
  * returns only fields that are not nested tables and not explicitly hidden
@@ -874,7 +870,7 @@ export function computeColWidths(fields: Field[], availWidth: number) {
  * @internal
  * if applyToRow is true in any field, return a function that gets the row background color
  */
-export function getApplyToRowBgFn(fields: Field[], theme: GrafanaTheme2): ((rowIndex: number) => CellColors) | void {
+export function getApplyToRowBgFn(fields: Field[], theme: GrafanaTheme2): ((rowIndex: number) => CSSProperties) | void {
   for (const field of fields) {
     const cellOptions = getCellOptions(field);
     const fieldDisplay = field.display;
@@ -883,7 +879,7 @@ export function getApplyToRowBgFn(fields: Field[], theme: GrafanaTheme2): ((rowI
       cellOptions.type === TableCellDisplayMode.ColorBackground &&
       cellOptions.applyToRow === true
     ) {
-      return (rowIndex: number) => getCellColors(theme, cellOptions, fieldDisplay(field.values[rowIndex]));
+      return (rowIndex: number) => getCellColorInlineStyles(theme, cellOptions, fieldDisplay(field.values[rowIndex]));
     }
   }
 }
@@ -897,6 +893,18 @@ export function withDataLinksActionsTooltip(field: Field, cellType: TableCellDis
   );
 }
 
+/** @internal */
+export function canFieldBeColorized(
+  cellType: TableCellDisplayMode,
+  applyToRowBgFn?: (rowIndex: number) => CSSProperties
+) {
+  return (
+    cellType === TableCellDisplayMode.ColorBackground ||
+    cellType === TableCellDisplayMode.ColorText ||
+    Boolean(applyToRowBgFn)
+  );
+}
+
 export const displayJsonValue: DisplayProcessor = (value: unknown): DisplayValue => {
   let displayValue: string;
 
diff --git a/packages/grafana-ui/src/components/Tooltip/Popover.tsx b/packages/grafana-ui/src/components/Tooltip/Popover.tsx
index cb4b5468707..369f3b46698 100644
--- a/packages/grafana-ui/src/components/Tooltip/Popover.tsx
+++ b/packages/grafana-ui/src/components/Tooltip/Popover.tsx
@@ -25,6 +25,7 @@ interface Props extends Omit<React.HTMLAttributes<HTMLDivElement>, 'content'> {
   wrapperClassName?: string;
   renderArrow?: boolean;
   hidePopper?: () => void;
+  style?: React.CSSProperties;
 }
 
 export function Popover({
@@ -36,6 +37,7 @@ export function Popover({
   referenceElement,
   renderArrow,
   hidePopper,
+  style: styleOverrides,
   ...rest
 }: Props) {
   const theme = useTheme2();
@@ -89,6 +91,7 @@ export function Popover({
         style={{
           ...floatingStyles,
           ...placementStyles,
+          ...styleOverrides,
         }}
         className={wrapperClassName}
         {...rest}
diff --git a/public/app/plugins/panel/table/table-new/module.tsx b/public/app/plugins/panel/table/table-new/module.tsx
index bde9b5c7c40..0e17f6c1072 100644
--- a/public/app/plugins/panel/table/table-new/module.tsx
+++ b/public/app/plugins/panel/table/table-new/module.tsx
@@ -9,7 +9,13 @@ import {
   FieldConfigProperty,
 } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { TableCellOptions, TableCellDisplayMode, defaultTableFieldOptions, TableCellHeight } from '@grafana/schema';
+import {
+  TableCellOptions,
+  TableCellDisplayMode,
+  defaultTableFieldOptions,
+  TableCellHeight,
+  TableCellTooltipPlacement,
+} from '@grafana/schema';
 
 import { PaginationEditor } from './PaginationEditor';
 import { TableCellOptionEditor } from './TableCellOptionEditor';
@@ -115,6 +121,46 @@ export const plugin = new PanelPlugin<Options, FieldConfig>(TablePanel)
           category,
           defaultValue: undefined,
           hideFromDefaults: true,
+        })
+        .addFieldNamePicker({
+          path: 'tooltip.field',
+          name: t('table-new.name-tooltip-from-field', 'Tooltip from field'),
+          description: t(
+            'table-new.description-tooltip-from-field',
+            'Render a cell from a field (hidden or visible) in a tooltip'
+          ),
+          category: cellCategory,
+        })
+        .addSelect({
+          path: 'tooltip.placement',
+          name: t('table-new.name-tooltip-placement', 'Tooltip placement'),
+          category: cellCategory,
+          settings: {
+            options: [
+              {
+                label: t('table-new.tooltip-placement-options.label-auto', 'Auto'),
+                value: TableCellTooltipPlacement.Auto,
+              },
+              {
+                label: t('table-new.tooltip-placement-options.label-top', 'Top'),
+                value: TableCellTooltipPlacement.Top,
+              },
+              {
+                label: t('table-new.tooltip-placement-options.label-right', 'Right'),
+                value: TableCellTooltipPlacement.Right,
+              },
+              {
+                label: t('table-new.tooltip-placement-options.label-bottom', 'Bottom'),
+                value: TableCellTooltipPlacement.Bottom,
+              },
+              {
+                label: t('table-new.tooltip-placement-options.label-left', 'Left'),
+                value: TableCellTooltipPlacement.Left,
+              },
+            ],
+          },
+          defaultValue: 'auto',
+          showIf: (cfg) => cfg.tooltip?.field !== undefined,
         });
     },
   })
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index bdc8663bbd9..b0299f1ee32 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -12790,6 +12790,7 @@
     "description-fields": "Select the fields that should be calculated",
     "description-frozen-columns": "Columns are frozen from the left side of the table",
     "description-min-column-width": "The minimum width for column auto resizing",
+    "description-tooltip-from-field": "Render a cell from a field (hidden or visible) in a tooltip",
     "name-calculation": "Calculation",
     "name-cell-height": "Cell height",
     "name-cell-type": "Cell type",
@@ -12805,8 +12806,17 @@
     "name-min-column-width": "Minimum column width",
     "name-show-table-footer": "Show table footer",
     "name-show-table-header": "Show table header",
+    "name-tooltip-from-field": "Tooltip from field",
+    "name-tooltip-placement": "Tooltip placement",
     "placeholder-column-width": "auto",
-    "placeholder-fields": "All Numeric Fields"
+    "placeholder-fields": "All Numeric Fields",
+    "tooltip-placement-options": {
+      "label-auto": "Auto",
+      "label-bottom": "Bottom",
+      "label-left": "Left",
+      "label-right": "Right",
+      "label-top": "Top"
+    }
   },
   "tag-filter": {
     "clear-button": "Clear tags",

From 87e8c92aa4b82039f240eb76fcd83af9e8e0c5d0 Mon Sep 17 00:00:00 2001
From: Andres Torres <janthoe@users.noreply.github.com>
Date: Mon, 18 Aug 2025 10:12:33 -0400
Subject: [PATCH 227/243] chore(rbac): Register settings resources (#109742)

---
 pkg/services/authz/rbac/mapper.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/services/authz/rbac/mapper.go b/pkg/services/authz/rbac/mapper.go
index 28537ad638d..53b6bb4ef0a 100644
--- a/pkg/services/authz/rbac/mapper.go
+++ b/pkg/services/authz/rbac/mapper.go
@@ -125,6 +125,9 @@ func NewMapperRegistry() MapperRegistry {
 			"securevalues": newResourceTranslation("secret.securevalues", "uid", false),
 			"keepers":      newResourceTranslation("secret.keepers", "uid", false),
 		},
+		"settings.grafana.app": {
+			"settings": newResourceTranslation("settings", "uid", false),
+		},
 		"query.grafana.app": {
 			"query": translation{
 				resource:  "datasources",

From 828c2b661287edd5857946331950a4491040548b Mon Sep 17 00:00:00 2001
From: Collin Fingar <collin.fingar@grafana.com>
Date: Mon, 18 Aug 2025 10:13:04 -0400
Subject: [PATCH 228/243] QueryLibrary: Added new way to trigger events w/
 context (#109637)

---
 .../features/explore/QueryLibrary/QueryLibraryContext.tsx | 8 +++++++-
 public/app/features/explore/QueryLibrary/mocks.tsx        | 1 +
 public/app/features/explore/QueryLibrary/types.ts         | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx b/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx
index 1e0e571f8e4..1ac7ef7cd97 100644
--- a/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx
+++ b/public/app/features/explore/QueryLibrary/QueryLibraryContext.tsx
@@ -3,7 +3,7 @@ import { createContext, ReactNode, useContext } from 'react';
 import { CoreApp } from '@grafana/data';
 import { DataQuery } from '@grafana/schema';
 
-import { OnSelectQueryType, QueryTemplate } from './types';
+import { OnSelectQueryType, QueryTemplate, QueryLibraryEventsPropertyMap } from './types';
 
 export type QueryLibraryDrawerOptions = {
   datasourceFilters?: string[];
@@ -46,6 +46,11 @@ export type QueryLibraryContextType = {
   ) => ReactNode;
   queryLibraryEnabled: boolean;
   context: string;
+  triggerAnalyticsEvent: (
+    handleAnalyticEvent: (properties?: QueryLibraryEventsPropertyMap) => void,
+    properties?: QueryLibraryEventsPropertyMap,
+    contextOverride?: string
+  ) => void;
   setNewQuery: (query?: QueryTemplate) => void;
 };
 
@@ -63,6 +68,7 @@ export const QueryLibraryContext = createContext<QueryLibraryContextType>({
 
   queryLibraryEnabled: false,
   context: 'unknown',
+  triggerAnalyticsEvent: () => {},
 });
 
 export function useQueryLibraryContext() {
diff --git a/public/app/features/explore/QueryLibrary/mocks.tsx b/public/app/features/explore/QueryLibrary/mocks.tsx
index ccb6b1c6b99..2c25a64e0bc 100644
--- a/public/app/features/explore/QueryLibrary/mocks.tsx
+++ b/public/app/features/explore/QueryLibrary/mocks.tsx
@@ -16,6 +16,7 @@ export function QueryLibraryContextProviderMock(props: PropsWithChildren<Props>)
         renderSaveQueryButton: jest.fn(),
         queryLibraryEnabled: Boolean(props.queryLibraryEnabled),
         context: 'explore',
+        triggerAnalyticsEvent: jest.fn(),
         setNewQuery: jest.fn(),
       }}
     >
diff --git a/public/app/features/explore/QueryLibrary/types.ts b/public/app/features/explore/QueryLibrary/types.ts
index 1877b30c3df..e8890c0b778 100644
--- a/public/app/features/explore/QueryLibrary/types.ts
+++ b/public/app/features/explore/QueryLibrary/types.ts
@@ -8,6 +8,8 @@ export type User = {
 
 export type OnSelectQueryType = (query: DataQuery) => void;
 
+export type QueryLibraryEventsPropertyMap = Record<string, string | boolean | undefined>;
+
 export type QueryTemplate = {
   query: DataQuery;
   datasourceName?: string;

From c508b01cc536c163dfa31c1485e81c47b7fe0624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= <pstibrany@gmail.com>
Date: Mon, 18 Aug 2025 16:27:57 +0200
Subject: [PATCH 229/243] chore: Close bleve indexes created in temp dir.
 (#109799)

* Close indexes created in temp dir.
---
 pkg/storage/unified/search/bleve.go           |  2 +-
 .../unified/search/bleve_integration_test.go  |  4 ++
 .../unified/search/bleve_performance_test.go  | 13 ++----
 .../unified/search/bleve_search_test.go       | 42 +++++++------------
 pkg/storage/unified/search/bleve_test.go      | 12 +++---
 .../unified/sql/test/benchmark_test.go        |  2 +
 .../unified/sql/test/integration_test.go      |  2 +
 7 files changed, 33 insertions(+), 44 deletions(-)

diff --git a/pkg/storage/unified/search/bleve.go b/pkg/storage/unified/search/bleve.go
index 01dcc3cabd9..6c0ca8a14ff 100644
--- a/pkg/storage/unified/search/bleve.go
+++ b/pkg/storage/unified/search/bleve.go
@@ -532,7 +532,7 @@ func (b *bleveBackend) findPreviousFileBasedIndex(resourceDir string, resourceVe
 	return idx, indexName
 }
 
-func (b *bleveBackend) closeAllIndexes() {
+func (b *bleveBackend) CloseAllIndexes() {
 	b.cacheMx.Lock()
 	defer b.cacheMx.Unlock()
 
diff --git a/pkg/storage/unified/search/bleve_integration_test.go b/pkg/storage/unified/search/bleve_integration_test.go
index 043b7642dac..7c3ca33f095 100644
--- a/pkg/storage/unified/search/bleve_integration_test.go
+++ b/pkg/storage/unified/search/bleve_integration_test.go
@@ -25,6 +25,8 @@ func TestBleveSearchBackend(t *testing.T) {
 		require.NoError(t, err)
 		require.NotNil(t, backend)
 
+		t.Cleanup(backend.CloseAllIndexes)
+
 		return backend
 	}, &unitest.TestOptions{
 		NSPrefix: "bleve-test",
@@ -48,5 +50,7 @@ func TestSearchBackendBenchmark(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, backend)
 
+	t.Cleanup(backend.CloseAllIndexes)
+
 	unitest.BenchmarkSearchBackend(t, backend, opts)
 }
diff --git a/pkg/storage/unified/search/bleve_performance_test.go b/pkg/storage/unified/search/bleve_performance_test.go
index e1ae015efd2..d6cb840647e 100644
--- a/pkg/storage/unified/search/bleve_performance_test.go
+++ b/pkg/storage/unified/search/bleve_performance_test.go
@@ -3,7 +3,6 @@ package search_test
 import (
 	"context"
 	"fmt"
-	"os"
 	"runtime"
 	"testing"
 	"time"
@@ -14,14 +13,14 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func setupIndex() (resource.ResourceIndex, string) {
+func setupIndex(b testing.TB) resource.ResourceIndex {
 	// size := 1000000  // TODO: 200k documents standard size?
 	size := 200000
 	// batchSize := 1000 slower 8s (for 200k documents) - 34s (for 1M documents)
 	// batchSize := 10000 // faster 5s  (for 200k documents) - 27s (for 1M documents)
 	batchSize := 100000 // fasterer 3.5s  (for 200k documents) - 27s  (for 1M documents)
 	writer := newTestWriter(size, batchSize)
-	return newTestDashboardsIndex(nil, 1, int64(size), int64(batchSize), writer)
+	return newTestDashboardsIndex(b, 1, int64(size), int64(batchSize), writer)
 }
 
 const maxAllowedTime = 20 * time.Millisecond // Reasonable (can vary per env) performance threshold per query (e.g., 20ms)
@@ -37,13 +36,7 @@ func BenchmarkBleveQuery(b *testing.B) {
 	var memStatsAfterIndex runtime.MemStats
 	runtime.ReadMemStats(&memStatsStart)
 
-	testIndex, testIndexDir := setupIndex()
-	defer func() {
-		err := os.RemoveAll(testIndexDir)
-		if err != nil {
-			fmt.Printf("Error removing index directory: %v\n", err)
-		}
-	}()
+	testIndex := setupIndex(b)
 
 	runtime.ReadMemStats(&memStatsAfterIndex)
 
diff --git a/pkg/storage/unified/search/bleve_search_test.go b/pkg/storage/unified/search/bleve_search_test.go
index e5bfc81a338..865f570389a 100644
--- a/pkg/storage/unified/search/bleve_search_test.go
+++ b/pkg/storage/unified/search/bleve_search_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"os"
 	"testing"
 
 	"github.com/blevesearch/bleve/v2"
@@ -30,7 +29,7 @@ func TestCanSearchByTitle(t *testing.T) {
 	}
 
 	t.Run("when query is empty, sort documents by title instead of search score", func(t *testing.T) {
-		index, _ := newTestDashboardsIndex(t, threshold, 2, 2, noop)
+		index := newTestDashboardsIndex(t, threshold, 2, 2, noop)
 		err := index.BulkIndex(&resource.BulkIndexRequest{
 			Items: []*resource.BulkIndexItem{
 				{
@@ -74,7 +73,7 @@ func TestCanSearchByTitle(t *testing.T) {
 	})
 
 	t.Run("will boost phrase match query over match query results", func(t *testing.T) {
-		index, _ := newTestDashboardsIndex(t, threshold, 2, 2, noop)
+		index := newTestDashboardsIndex(t, threshold, 2, 2, noop)
 		err := index.BulkIndex(&resource.BulkIndexRequest{
 			Items: []*resource.BulkIndexItem{
 				{
@@ -118,7 +117,7 @@ func TestCanSearchByTitle(t *testing.T) {
 	})
 
 	t.Run("will prioritize matches", func(t *testing.T) {
-		index, _ := newTestDashboardsIndex(t, threshold, 2, 2, noop)
+		index := newTestDashboardsIndex(t, threshold, 2, 2, noop)
 		err := index.BulkIndex(&resource.BulkIndexRequest{
 			Items: []*resource.BulkIndexItem{
 				{
@@ -161,7 +160,7 @@ func TestCanSearchByTitle(t *testing.T) {
 	})
 
 	t.Run("will boost exact match query over match phrase query results", func(t *testing.T) {
-		index, _ := newTestDashboardsIndex(t, threshold, 2, 2, noop)
+		index := newTestDashboardsIndex(t, threshold, 2, 2, noop)
 		err := index.BulkIndex(&resource.BulkIndexRequest{
 			Items: []*resource.BulkIndexItem{
 				{
@@ -205,7 +204,7 @@ func TestCanSearchByTitle(t *testing.T) {
 	})
 
 	t.Run("title with numbers will match document", func(t *testing.T) {
-		index, _ := newTestDashboardsIndex(t, threshold, 2, 2, noop)
+		index := newTestDashboardsIndex(t, threshold, 2, 2, noop)
 		err := index.BulkIndex(&resource.BulkIndexRequest{
 			Items: []*resource.BulkIndexItem{
 				{
@@ -246,7 +245,7 @@ func TestCanSearchByTitle(t *testing.T) {
 	})
 
 	t.Run("title will match escaped characters", func(t *testing.T) {
-		index, _ := newTestDashboardsIndex(t, threshold, 2, 2, noop)
+		index := newTestDashboardsIndex(t, threshold, 2, 2, noop)
 		err := index.BulkIndex(&resource.BulkIndexRequest{
 			Items: []*resource.BulkIndexItem{
 				{
@@ -293,7 +292,7 @@ func TestCanSearchByTitle(t *testing.T) {
 	})
 
 	t.Run("title search will match document", func(t *testing.T) {
-		index, _ := newTestDashboardsIndex(t, threshold, 2, 2, noop)
+		index := newTestDashboardsIndex(t, threshold, 2, 2, noop)
 		err := index.BulkIndex(&resource.BulkIndexRequest{
 			Items: []*resource.BulkIndexItem{
 				{
@@ -358,7 +357,7 @@ func TestCanSearchByTitle(t *testing.T) {
 	})
 
 	t.Run("title search will NOT match documents", func(t *testing.T) {
-		index, _ := newTestDashboardsIndex(t, threshold, 2, 2, noop)
+		index := newTestDashboardsIndex(t, threshold, 2, 2, noop)
 		err := index.BulkIndex(&resource.BulkIndexRequest{
 			Items: []*resource.BulkIndexItem{
 				{
@@ -427,7 +426,7 @@ func TestCanSearchByTitle(t *testing.T) {
 	})
 
 	t.Run("title search with character will match one document", func(t *testing.T) {
-		index, _ := newTestDashboardsIndex(t, threshold, 2, 2, noop)
+		index := newTestDashboardsIndex(t, threshold, 2, 2, noop)
 		err := index.BulkIndex(&resource.BulkIndexRequest{
 			Items: []*resource.BulkIndexItem{
 				{
@@ -520,22 +519,21 @@ func newQueryByTitle(query string) *resourcepb.ResourceSearchRequest {
 	}
 }
 
-func newTestDashboardsIndex(t TB, threshold int64, size int64, batchSize int64, writer IndexWriter) (resource.ResourceIndex, string) {
+func newTestDashboardsIndex(t testing.TB, threshold int64, size int64, batchSize int64, writer IndexWriter) resource.ResourceIndex {
 	key := &resourcepb.ResourceKey{
 		Namespace: "default",
 		Group:     "dashboard.grafana.app",
 		Resource:  "dashboards",
 	}
-	tmpdir, err := os.MkdirTemp("", "grafana-bleve-test")
-	require.NoError(t, err)
-
 	backend, err := search.NewBleveBackend(search.BleveOptions{
-		Root:          tmpdir,
+		Root:          t.TempDir(),
 		FileThreshold: threshold, // use in-memory for tests
 		BatchSize:     int(batchSize),
 	}, tracing.NewNoopTracerService(), featuremgmt.WithFeatures(), nil)
 	require.NoError(t, err)
 
+	t.Cleanup(backend.CloseAllIndexes)
+
 	rv := int64(10)
 	ctx := identity.WithRequester(context.Background(), &user.SignedInUser{Namespace: "ns"})
 
@@ -556,7 +554,7 @@ func newTestDashboardsIndex(t TB, threshold int64, size int64, batchSize int64,
 	}, size, rv, info.Fields, "test", writer)
 	require.NoError(t, err)
 
-	return index, tmpdir
+	return index
 }
 
 type IndexWriter func(index resource.ResourceIndex) (int64, error)
@@ -603,15 +601,3 @@ func debugIndexedTerms(index bleve.Index, field string) {
 		}
 	}
 }
-
-// TB is an interface that works for both *testing.T and *testing.B
-type TB interface {
-	Log(args ...interface{})
-	Logf(format string, args ...interface{})
-	Error(args ...interface{})
-	Errorf(format string, args ...interface{})
-	Fatal(args ...interface{})
-	Fatalf(format string, args ...interface{})
-	Helper()
-	FailNow()
-}
diff --git a/pkg/storage/unified/search/bleve_test.go b/pkg/storage/unified/search/bleve_test.go
index a5acceaecc8..e28d8a80cb8 100644
--- a/pkg/storage/unified/search/bleve_test.go
+++ b/pkg/storage/unified/search/bleve_test.go
@@ -50,6 +50,8 @@ func TestBleveBackend(t *testing.T) {
 	}, tracing.NewNoopTracerService(), featuremgmt.WithFeatures(), nil)
 	require.NoError(t, err)
 
+	t.Cleanup(backend.CloseAllIndexes)
+
 	rv := int64(10)
 	ctx := identity.WithRequester(context.Background(), &user.SignedInUser{Namespace: "ns"})
 	var dashboardsIndex resource.ResourceIndex
@@ -753,7 +755,7 @@ func setupBleveBackend(t *testing.T, fileThreshold int, cacheTTL time.Duration,
 	}, tracing.NewNoopTracerService(), featuremgmt.WithFeatures(), metrics)
 	require.NoError(t, err)
 	require.NotNil(t, backend)
-	t.Cleanup(backend.closeAllIndexes)
+	t.Cleanup(backend.CloseAllIndexes)
 	return backend, reg
 }
 
@@ -841,9 +843,9 @@ func TestFileIndexIsReusedOnSameSizeAndRV(t *testing.T) {
 		index_server_open_indexes{index_storage="file"} 1
 	`), "index_server_open_indexes"))
 
-	backend1.closeAllIndexes()
+	backend1.CloseAllIndexes()
 
-	// Verify that there are no open indexes after closeAllIndexes call.
+	// Verify that there are no open indexes after CloseAllIndexes call.
 	require.NoError(t, testutil.GatherAndCompare(reg1, bytes.NewBufferString(`
 		# HELP index_server_open_indexes Number of open indexes per storage type. An open index corresponds to single resource group.
 		# TYPE index_server_open_indexes gauge
@@ -881,7 +883,7 @@ func TestFileIndexIsNotReusedOnDifferentSize(t *testing.T) {
 	backend1, _ := setupBleveBackend(t, 5, time.Nanosecond, tmpDir)
 	_, err := backend1.BuildIndex(context.Background(), ns, 10, 100, nil, "test", indexTestDocs(ns, 10))
 	require.NoError(t, err)
-	backend1.closeAllIndexes()
+	backend1.CloseAllIndexes()
 
 	// We open new backend using same directory, but with different size. Index should be rebuilt.
 	backend2, _ := setupBleveBackend(t, 5, time.Nanosecond, tmpDir)
@@ -906,7 +908,7 @@ func TestFileIndexIsNotReusedOnDifferentRV(t *testing.T) {
 	backend1, _ := setupBleveBackend(t, 5, time.Nanosecond, tmpDir)
 	_, err := backend1.BuildIndex(context.Background(), ns, 10, 100, nil, "test", indexTestDocs(ns, 10))
 	require.NoError(t, err)
-	backend1.closeAllIndexes()
+	backend1.CloseAllIndexes()
 
 	// We open new backend using same directory, but with different RV. Index should be rebuilt.
 	backend2, _ := setupBleveBackend(t, 5, time.Nanosecond, tmpDir)
diff --git a/pkg/storage/unified/sql/test/benchmark_test.go b/pkg/storage/unified/sql/test/benchmark_test.go
index fe1b219c751..1fe29d3b594 100644
--- a/pkg/storage/unified/sql/test/benchmark_test.go
+++ b/pkg/storage/unified/sql/test/benchmark_test.go
@@ -77,6 +77,8 @@ func TestIntegrationBenchmarkResourceServer(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, search)
 
+	t.Cleanup(search.CloseAllIndexes)
+
 	// Create a new resource backend
 	dbstore := db.InitTestDB(t)
 	eDB, err := dbimpl.ProvideResourceDB(dbstore, setting.NewCfg(), nil)
diff --git a/pkg/storage/unified/sql/test/integration_test.go b/pkg/storage/unified/sql/test/integration_test.go
index c03915164f8..159f7b97a83 100644
--- a/pkg/storage/unified/sql/test/integration_test.go
+++ b/pkg/storage/unified/sql/test/integration_test.go
@@ -121,6 +121,8 @@ func TestIntegrationSearchAndStorage(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, search)
 
+	t.Cleanup(search.CloseAllIndexes)
+
 	// Create a new resource backend
 	dbstore := db.InitTestDB(t)
 	eDB, err := dbimpl.ProvideResourceDB(dbstore, setting.NewCfg(), nil)

From 9b800d63b1ddc231291f6a564a961751af58d8ad Mon Sep 17 00:00:00 2001
From: Marc Sanmiquel <marcsanmiquel@gmail.com>
Date: Mon, 18 Aug 2025 17:08:34 +0200
Subject: [PATCH 230/243] Datasource/grafana-pyroscope: Add rate aggregation
 for cumulative profiles (#108546)

---
 .../grafana-pyroscope-datasource/instance.go  |  29 ++++
 .../profile-metrics.json                      | 162 ++++++++++++++++++
 .../profile_metadata.go                       |  89 ++++++++++
 .../profile_metadata_test.go                  |  49 ++++++
 .../grafana-pyroscope-datasource/query.go     | 121 +++++++++++--
 .../query_test.go                             | 158 +++++++++++++++--
 6 files changed, 584 insertions(+), 24 deletions(-)
 create mode 100644 pkg/tsdb/grafana-pyroscope-datasource/profile-metrics.json
 create mode 100644 pkg/tsdb/grafana-pyroscope-datasource/profile_metadata.go
 create mode 100644 pkg/tsdb/grafana-pyroscope-datasource/profile_metadata_test.go

diff --git a/pkg/tsdb/grafana-pyroscope-datasource/instance.go b/pkg/tsdb/grafana-pyroscope-datasource/instance.go
index 978b7148bda..7943707b39a 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/instance.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/instance.go
@@ -79,6 +79,9 @@ func (d *PyroscopeDatasource) CallResource(ctx context.Context, req *backend.Cal
 	if req.Path == "labelValues" {
 		return d.labelValues(ctx, req, sender)
 	}
+	if req.Path == "profileMetadata" {
+		return d.profileMetadata(ctx, req, sender)
+	}
 	return sender.Send(&backend.CallResourceResponse{
 		Status: 404,
 	})
@@ -216,6 +219,32 @@ func (d *PyroscopeDatasource) labelValues(ctx context.Context, req *backend.Call
 	return nil
 }
 
+// profileMetadata returns the embedded profile-metrics.json data containing metadata
+// for all known profile types, including their aggregation type (cumulative/instant),
+// units, descriptions, and grouping information.
+func (d *PyroscopeDatasource) profileMetadata(ctx context.Context, _ *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctxLogger := logger.FromContext(ctx)
+
+	registry := GetProfileMetadataRegistry()
+
+	jsonData, err := json.Marshal(registry.profiles)
+	if err != nil {
+		ctxLogger.Error("Failed to marshal profile metadata", "error", err, "function", logEntrypoint())
+		return sender.Send(&backend.CallResourceResponse{
+			Status: 500,
+			Body:   []byte(`{"error": "Failed to marshal profile metadata"}`),
+		})
+	}
+
+	return sender.Send(&backend.CallResourceResponse{
+		Status: 200,
+		Body:   jsonData,
+		Headers: map[string][]string{
+			"Content-Type": {"application/json"},
+		},
+	})
+}
+
 // QueryData handles multiple queries and returns multiple responses.
 // req contains the queries []DataQuery (where each query contains RefID as a unique identifier).
 // The QueryDataResponse contains a map of RefID to the response for each query, and each response
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/profile-metrics.json b/pkg/tsdb/grafana-pyroscope-datasource/profile-metrics.json
new file mode 100644
index 00000000000..5912e37175e
--- /dev/null
+++ b/pkg/tsdb/grafana-pyroscope-datasource/profile-metrics.json
@@ -0,0 +1,162 @@
+{
+  "block:contentions:count:contentions:count": {
+    "id": "block:contentions:count:contentions:count",
+    "description": "Number of blocking contentions",
+    "type": "contentions",
+    "group": "block",
+    "unit": "short",
+    "aggregationType": "cumulative"
+  },
+  "block:delay:nanoseconds:contentions:count": {
+    "id": "block:delay:nanoseconds:contentions:count",
+    "description": "Time spent in blocking delays",
+    "type": "delay",
+    "group": "block",
+    "unit": "ns",
+    "aggregationType": "cumulative"
+  },
+  "goroutine:goroutine:count:goroutine:count": {
+    "id": "goroutine:goroutine:count:goroutine:count",
+    "description": "Number of goroutines",
+    "type": "goroutine",
+    "group": "goroutine",
+    "unit": "short",
+    "aggregationType": "instant"
+  },
+  "goroutines:goroutine:count:goroutine:count": {
+    "id": "goroutines:goroutine:count:goroutine:count",
+    "description": "Number of goroutines",
+    "type": "goroutine",
+    "group": "goroutine",
+    "unit": "short",
+    "aggregationType": "instant"
+  },
+  "memory:alloc_in_new_tlab_bytes:bytes::": {
+    "id": "memory:alloc_in_new_tlab_bytes:bytes::",
+    "description": "Size of memory allocated inside Thread-Local Allocation Buffers (TLAB)",
+    "type": "alloc_in_new_tlab_bytes",
+    "group": "memory",
+    "unit": "bytes",
+    "aggregationType": "cumulative"
+  },
+  "memory:alloc_in_new_tlab_objects:count::": {
+    "id": "memory:alloc_in_new_tlab_objects:count::",
+    "description": "Number of objects allocated inside Thread-Local Allocation Buffers (TLAB)",
+    "type": "alloc_in_new_tlab_objects",
+    "group": "memory",
+    "unit": "short",
+    "aggregationType": "cumulative"
+  },
+  "memory:alloc_objects:count:space:bytes": {
+    "id": "memory:alloc_objects:count:space:bytes",
+    "description": "Number of objects allocated",
+    "type": "alloc_objects",
+    "group": "memory",
+    "unit": "short",
+    "aggregationType": "cumulative"
+  },
+  "memory:alloc_space:bytes:space:bytes": {
+    "id": "memory:alloc_space:bytes:space:bytes",
+    "description": "Size of memory allocated in the heap",
+    "type": "alloc_space",
+    "group": "memory",
+    "unit": "bytes",
+    "aggregationType": "cumulative"
+  },
+  "memory:inuse_objects:count:space:bytes": {
+    "id": "memory:inuse_objects:count:space:bytes",
+    "description": "Number of objects currently in use",
+    "type": "inuse_objects",
+    "group": "memory",
+    "unit": "short",
+    "aggregationType": "instant"
+  },
+  "memory:inuse_space:bytes:space:bytes": {
+    "id": "memory:inuse_space:bytes:space:bytes",
+    "description": "Size of memory currently in use",
+    "type": "inuse_space",
+    "group": "memory",
+    "unit": "bytes",
+    "aggregationType": "instant"
+  },
+  "mutex:contentions:count:contentions:count": {
+    "id": "mutex:contentions:count:contentions:count",
+    "description": "Number of observed mutex contentions",
+    "type": "contentions",
+    "group": "mutex",
+    "unit": "short",
+    "aggregationType": "cumulative"
+  },
+  "mutex:delay:nanoseconds:contentions:count": {
+    "id": "mutex:delay:nanoseconds:contentions:count",
+    "description": "Time spent waiting due to mutex contentions",
+    "type": "delay",
+    "group": "mutex",
+    "unit": "ns",
+    "aggregationType": "cumulative"
+  },
+  "process_cpu:alloc_samples:count:cpu:nanoseconds": {
+    "id": "process_cpu:alloc_samples:count:cpu:nanoseconds",
+    "description": "Number of memory allocation samples during CPU time",
+    "type": "alloc_samples",
+    "group": "memory",
+    "unit": "short",
+    "aggregationType": "cumulative"
+  },
+  "process_cpu:alloc_size:bytes:cpu:nanoseconds": {
+    "id": "process_cpu:alloc_size:bytes:cpu:nanoseconds",
+    "description": "Size of memory allocated during CPU time",
+    "type": "alloc_size",
+    "group": "alloc_size",
+    "unit": "bytes",
+    "aggregationType": "cumulative"
+  },
+  "process_cpu:cpu:nanoseconds:cpu:nanoseconds": {
+    "id": "process_cpu:cpu:nanoseconds:cpu:nanoseconds",
+    "description": "CPU time consumed",
+    "type": "cpu",
+    "group": "process_cpu",
+    "unit": "ns",
+    "aggregationType": "cumulative"
+  },
+  "process_cpu:exception:count:cpu:nanoseconds": {
+    "id": "process_cpu:exception:count:cpu:nanoseconds",
+    "description": "Number of exceptions within the sampled CPU time",
+    "type": "exceptions",
+    "group": "exceptions",
+    "unit": "short",
+    "aggregationType": "cumulative"
+  },
+  "process_cpu:lock_count:count:cpu:nanoseconds": {
+    "id": "process_cpu:lock_count:count:cpu:nanoseconds",
+    "description": "Number of lock acquisitions attempted during CPU time",
+    "type": "lock_count",
+    "group": "locks",
+    "unit": "short",
+    "aggregationType": "instant"
+  },
+  "process_cpu:lock_time:nanoseconds:cpu:nanoseconds": {
+    "id": "process_cpu:lock_time:nanoseconds:cpu:nanoseconds",
+    "description": "Cumulative time spent acquiring locks",
+    "type": "lock_time",
+    "group": "locks",
+    "unit": "ns",
+    "aggregationType": "cumulative"
+  },
+  "process_cpu:samples:count::milliseconds": {
+    "id": "process_cpu:samples:count::milliseconds",
+    "description": "Number of process samples collected",
+    "type": "samples",
+    "group": "process_cpu",
+    "unit": "short",
+    "aggregationType": "cumulative"
+  },
+  "process_cpu:samples:count:cpu:nanoseconds": {
+    "id": "process_cpu:samples:count:cpu:nanoseconds",
+    "description": "Number of samples collected over CPU time",
+    "type": "samples",
+    "group": "process_cpu",
+    "unit": "short",
+    "aggregationType": "instant"
+  }
+}
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/profile_metadata.go b/pkg/tsdb/grafana-pyroscope-datasource/profile_metadata.go
new file mode 100644
index 00000000000..6f778acef49
--- /dev/null
+++ b/pkg/tsdb/grafana-pyroscope-datasource/profile_metadata.go
@@ -0,0 +1,89 @@
+package pyroscope
+
+import (
+	_ "embed"
+	"encoding/json"
+	"sync"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
+)
+
+//go:embed profile-metrics.json
+var profileMetricsJSON []byte
+
+type ProfileMetadata struct {
+	ID              string `json:"id"`
+	Description     string `json:"description"`
+	Type            string `json:"type"`
+	Group           string `json:"group"`
+	Unit            string `json:"unit"`
+	AggregationType string `json:"aggregationType"`
+}
+
+type ProfileMetadataRegistry struct {
+	profiles map[string]*ProfileMetadata
+	mu       sync.RWMutex
+	logger   log.Logger
+}
+
+var (
+	registry     *ProfileMetadataRegistry
+	registryOnce sync.Once
+)
+
+// GetProfileMetadataRegistry returns the singleton instance of the profile metadata registry
+func GetProfileMetadataRegistry() *ProfileMetadataRegistry {
+	registryOnce.Do(func() {
+		registry = &ProfileMetadataRegistry{
+			profiles: make(map[string]*ProfileMetadata),
+			logger:   backend.NewLoggerWith("logger", "tsdb.pyroscope.profile-metadata"),
+		}
+		registry.loadProfileMetadata()
+	})
+	return registry
+}
+
+// loadProfileMetadata loads the profile metadata from the embedded JSON file
+func (r *ProfileMetadataRegistry) loadProfileMetadata() {
+	var profilesMap map[string]*ProfileMetadata
+	err := json.Unmarshal(profileMetricsJSON, &profilesMap)
+	if err != nil {
+		r.logger.Error("Failed to parse embedded profile-metrics.json", "error", err)
+		return
+	}
+
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	r.profiles = profilesMap
+	r.logger.Info("Loaded profile metadata", "count", len(profilesMap))
+}
+
+// GetProfileMetadata returns the metadata for a given profile type ID
+func (r *ProfileMetadataRegistry) GetProfileMetadata(profileTypeID string) *ProfileMetadata {
+	r.mu.RLock()
+	defer r.mu.RUnlock()
+	return r.profiles[profileTypeID]
+}
+
+// IsCumulativeProfile returns true if the profile type requires rate calculation
+func (r *ProfileMetadataRegistry) IsCumulativeProfile(profileTypeID string) bool {
+	metadata := r.GetProfileMetadata(profileTypeID)
+	if metadata == nil {
+		r.logger.Debug("Profile metadata not found, using fallback logic", "profileTypeID", profileTypeID)
+		return isCumulativeProfileUnitFallback(getUnits(profileTypeID))
+	}
+	return metadata.AggregationType == "cumulative"
+}
+
+// isCumulativeProfileUnitFallback is the (old) fallback logic for unknown profile types
+func isCumulativeProfileUnitFallback(unit string) bool {
+	switch unit {
+	case "ns":
+		return true
+	case "bytes":
+		return true
+	default:
+		return false
+	}
+}
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/profile_metadata_test.go b/pkg/tsdb/grafana-pyroscope-datasource/profile_metadata_test.go
new file mode 100644
index 00000000000..8c43884969f
--- /dev/null
+++ b/pkg/tsdb/grafana-pyroscope-datasource/profile_metadata_test.go
@@ -0,0 +1,49 @@
+package pyroscope
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestProfileMetadataRegistry(t *testing.T) {
+	registry := GetProfileMetadataRegistry()
+
+	t.Run("CPU profile is cumulative", func(t *testing.T) {
+		result := registry.IsCumulativeProfile("process_cpu:cpu:nanoseconds:cpu:nanoseconds")
+		require.True(t, result)
+	})
+
+	t.Run("Memory allocation is cumulative", func(t *testing.T) {
+		result := registry.IsCumulativeProfile("memory:alloc_space:bytes:space:bytes")
+		require.True(t, result)
+	})
+
+	t.Run("Goroutines are instant", func(t *testing.T) {
+		result := registry.IsCumulativeProfile("goroutine:goroutine:count:goroutine:count")
+		require.False(t, result)
+	})
+
+	t.Run("Memory in-use is instant", func(t *testing.T) {
+		result := registry.IsCumulativeProfile("memory:inuse_space:bytes:space:bytes")
+		require.False(t, result)
+	})
+
+	t.Run("Edge case: mutex contentions count is cumulative", func(t *testing.T) {
+		result := registry.IsCumulativeProfile("mutex:contentions:count:contentions:count")
+		require.True(t, result)
+	})
+
+	t.Run("Edge case: memory alloc objects count is cumulative", func(t *testing.T) {
+		result := registry.IsCumulativeProfile("memory:alloc_objects:count:space:bytes")
+		require.True(t, result)
+	})
+
+	t.Run("Unknown profile falls back to unit-based logic", func(t *testing.T) {
+		result := registry.IsCumulativeProfile("unknown:profile:nanoseconds:test:test")
+		require.True(t, result) // ns should be treated as cumulative by fallback
+
+		result = registry.IsCumulativeProfile("unknown:profile:count:test:test")
+		require.False(t, result) // count/short should be treated as instant by fallback
+	})
+}
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/query.go b/pkg/tsdb/grafana-pyroscope-datasource/query.go
index c2243c7af05..506f9de33ee 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/query.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/query.go
@@ -76,7 +76,6 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 					logger.Error("Failed to parse the MinStep using default", "MinStep", dsJson.MinStep, "function", logEntrypoint())
 				}
 			}
-			logger.Debug("Sending SelectSeriesRequest", "queryModel", qm, "function", logEntrypoint())
 			seriesResp, err := d.client.GetSeries(
 				gCtx,
 				profileTypeId,
@@ -96,7 +95,8 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 			// add the frames to the response.
 			responseMutex.Lock()
 			withAnnotations := qm.Annotations != nil && *qm.Annotations
-			frames, err := seriesToDataFrames(seriesResp, withAnnotations)
+			stepDuration := math.Max(query.Interval.Seconds(), parsedInterval.Seconds())
+			frames, err := seriesToDataFrames(seriesResp, withAnnotations, stepDuration, profileTypeId)
 			if err != nil {
 				span.RecordError(err)
 				span.SetStatus(codes.Error, err.Error())
@@ -136,7 +136,24 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 
 			var frame *data.Frame
 			if profileResp != nil {
-				frame = responseToDataFrames(profileResp)
+				var dsJson dsJsonModel
+				err := json.Unmarshal(pCtx.DataSourceInstanceSettings.JSONData, &dsJson)
+				if err != nil {
+					span.RecordError(err)
+					span.SetStatus(codes.Error, err.Error())
+					return fmt.Errorf("error unmarshaling datasource json model: %v", err)
+				}
+
+				parsedInterval := time.Second * 15
+				if dsJson.MinStep != "" {
+					parsedInterval, err = gtime.ParseDuration(dsJson.MinStep)
+					if err != nil {
+						parsedInterval = time.Second * 15
+						logger.Error("Failed to parse the MinStep using default", "MinStep", dsJson.MinStep, "function", logEntrypoint())
+					}
+				}
+				stepDuration := math.Max(query.Interval.Seconds(), parsedInterval.Seconds())
+				frame = responseToDataFrames(profileResp, stepDuration, profileTypeId)
 
 				// If query called with streaming on then return a channel
 				// to subscribe on a client-side and consume updates from a plugin.
@@ -173,9 +190,9 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 // responseToDataFrames turns Pyroscope response to data.Frame. We encode the data into a nested set format where we have
 // [level, value, label] columns and by ordering the items in a depth first traversal order we can recreate the whole
 // tree back.
-func responseToDataFrames(resp *ProfileResponse) *data.Frame {
+func responseToDataFrames(resp *ProfileResponse, stepDurationSec float64, profileTypeID string) *data.Frame {
 	tree := levelsToTree(resp.Flamebearer.Levels, resp.Flamebearer.Names)
-	return treeToNestedSetDataFrame(tree, resp.Units)
+	return treeToNestedSetDataFrame(tree, resp.Units, stepDurationSec, profileTypeID)
 }
 
 // START_OFFSET is offset of the bar relative to previous sibling
@@ -337,9 +354,17 @@ type CustomMeta struct {
 // where ordering the items in depth first order and knowing the level/depth of each item we can recreate the
 // parent - child relationship without explicitly needing parent/child column, and we can later just iterate over the
 // dataFrame to again basically walking depth first over the tree/profile.
-func treeToNestedSetDataFrame(tree *ProfileTree, unit string) *data.Frame {
+func treeToNestedSetDataFrame(tree *ProfileTree, unit string, stepDurationSec float64, profileTypeID string) *data.Frame {
 	frame := data.NewFrame("response")
-	frame.Meta = &data.FrameMeta{PreferredVisualization: "flamegraph"}
+	frameMeta := &data.FrameMeta{PreferredVisualization: "flamegraph"}
+
+	// Add metadata when rate calculation is applied
+	if isCumulativeProfile(profileTypeID) && stepDurationSec > 0 {
+		frameMeta.Custom = map[string]interface{}{
+			"rateCalculated": true,
+		}
+	}
+	frame.Meta = frameMeta
 
 	levelField := data.NewField("level", nil, []int64{})
 	valueField := data.NewField("value", nil, []int64{})
@@ -356,8 +381,17 @@ func treeToNestedSetDataFrame(tree *ProfileTree, unit string) *data.Frame {
 	if tree != nil {
 		walkTree(tree, func(tree *ProfileTree) {
 			levelField.Append(int64(tree.Level))
-			valueField.Append(tree.Value)
-			selfField.Append(tree.Self)
+
+			// Apply rate calculation for cumulative profiles
+			value := tree.Value
+			self := tree.Self
+			if isCumulativeProfile(profileTypeID) && stepDurationSec > 0 {
+				value = int64(float64(value) / stepDurationSec)
+				self = int64(float64(self) / stepDurationSec)
+			}
+
+			valueField.Append(value)
+			selfField.Append(self)
 			labelField.Append(tree.Name)
 		})
 	}
@@ -433,14 +467,53 @@ func (ta *TimedAnnotation) getValue() string {
 	return ta.Annotation.Value
 }
 
-func seriesToDataFrames(resp *SeriesResponse, withAnnotations bool) ([]*data.Frame, error) {
+// isCumulativeProfile determines if a profile type requires rate calculation using the metadata registry
+func isCumulativeProfile(profileTypeID string) bool {
+	registry := GetProfileMetadataRegistry()
+	return registry.IsCumulativeProfile(profileTypeID)
+}
+
+// isCPUTimeProfile determines if a profile type represents CPU time in nanoseconds
+func isCPUTimeProfile(profileTypeID string) bool {
+	registry := GetProfileMetadataRegistry()
+	metadata := registry.GetProfileMetadata(profileTypeID)
+	if metadata != nil {
+		// Check if it's CPU time (unit is nanoseconds and type contains cpu)
+		return metadata.Unit == "ns" && (metadata.Type == "cpu" || metadata.Group == "process_cpu")
+	}
+	return false
+}
+
+// convertToRateUnit converts profile units to appropriate rate units when rate calculation is applied
+func convertToRateUnit(originalUnit string) string {
+	switch originalUnit {
+	case "bytes":
+		return "binBps"
+	case "short":
+		return "ops"
+	case "ns":
+		return "ns"
+	default:
+		return originalUnit
+	}
+}
+
+func seriesToDataFrames(resp *SeriesResponse, withAnnotations bool, stepDurationSec float64, profileTypeID string) ([]*data.Frame, error) {
 	frames := make([]*data.Frame, 0, len(resp.Series))
 	annotations := make([]*TimedAnnotation, 0)
 
 	for _, series := range resp.Series {
 		// We create separate data frames as the series may not have the same length
 		frame := data.NewFrame("series")
-		frame.Meta = &data.FrameMeta{PreferredVisualization: "graph"}
+		frameMeta := &data.FrameMeta{PreferredVisualization: "graph"}
+
+		// Add metadata when rate calculation is applied
+		if isCumulativeProfile(profileTypeID) && stepDurationSec > 0 {
+			frameMeta.Custom = map[string]interface{}{
+				"rateCalculated": true,
+			}
+		}
+		frame.Meta = frameMeta
 
 		fields := make(data.Fields, 0, 2)
 		timeField := data.NewField("time", nil, []time.Time{})
@@ -451,13 +524,35 @@ func seriesToDataFrames(resp *SeriesResponse, withAnnotations bool) ([]*data.Fra
 			labels[label.Name] = label.Value
 		}
 
+		// Determine display unit - convert units for rate-calculated cumulative profiles
+		displayUnit := resp.Units
+		if isCumulativeProfile(profileTypeID) && stepDurationSec > 0 {
+			if isCPUTimeProfile(profileTypeID) {
+				displayUnit = "cores"
+			} else {
+				// Convert other cumulative profile units to rate units
+				displayUnit = convertToRateUnit(resp.Units)
+			}
+		}
+
 		valueField := data.NewField(resp.Label, labels, []float64{})
-		valueField.Config = &data.FieldConfig{Unit: resp.Units}
+		valueField.Config = &data.FieldConfig{Unit: displayUnit}
 		fields = append(fields, valueField)
 
 		for _, point := range series.Points {
 			timeField.Append(time.UnixMilli(point.Timestamp))
-			valueField.Append(point.Value)
+
+			// Apply rate calculation for cumulative profiles
+			value := point.Value
+			if isCumulativeProfile(profileTypeID) && stepDurationSec > 0 {
+				value = value / stepDurationSec
+
+				// Convert CPU nanoseconds to cores
+				if isCPUTimeProfile(profileTypeID) {
+					value = value / 1e9
+				}
+			}
+			valueField.Append(value)
 			if withAnnotations {
 				for _, a := range point.Annotations {
 					annotations = append(annotations, &TimedAnnotation{
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/query_test.go b/pkg/tsdb/grafana-pyroscope-datasource/query_test.go
index def783b917f..67addaaedd4 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/query_test.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/query_test.go
@@ -5,10 +5,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
-	"github.com/stretchr/testify/require"
 )
 
 // This is where the tests for the datasource backend live.
@@ -130,7 +131,7 @@ func Test_profileToDataFrame(t *testing.T) {
 		},
 		Units: "short",
 	}
-	frame := responseToDataFrames(profile)
+	frame := responseToDataFrames(profile, 15.0, "goroutine:goroutine:count:goroutine:count")
 	require.Equal(t, 4, len(frame.Fields))
 	require.Equal(t, data.NewField("level", nil, []int64{0, 1, 1}), frame.Fields[0])
 	require.Equal(t, data.NewField("value", nil, []int64{20, 10, 5}).SetConfig(&data.FieldConfig{Unit: "short"}), frame.Fields[1])
@@ -202,7 +203,7 @@ func Test_treeToNestedDataFrame(t *testing.T) {
 			},
 		}
 
-		frame := treeToNestedSetDataFrame(tree, "short")
+		frame := treeToNestedSetDataFrame(tree, "short", 15.0, "goroutine:goroutine:count:goroutine:count")
 
 		labelConfig := &data.FieldConfig{
 			TypeConfig: &data.FieldTypeConfig{
@@ -221,10 +222,52 @@ func Test_treeToNestedDataFrame(t *testing.T) {
 	})
 
 	t.Run("nil profile tree", func(t *testing.T) {
-		frame := treeToNestedSetDataFrame(nil, "short")
+		frame := treeToNestedSetDataFrame(nil, "short", 15.0, "goroutine:goroutine:count:goroutine:count")
 		require.Equal(t, 4, len(frame.Fields))
 		require.Equal(t, 0, frame.Fields[0].Len())
 	})
+
+	t.Run("rateCalculated metadata for cumulative profile", func(t *testing.T) {
+		tree := &ProfileTree{
+			Value: 100, Level: 0, Self: 1, Name: "root",
+		}
+		frame := treeToNestedSetDataFrame(tree, "short", 15.0, "process_cpu:cpu:nanoseconds:cpu:nanoseconds")
+		require.NotNil(t, frame.Meta)
+		require.NotNil(t, frame.Meta.Custom)
+		custom := frame.Meta.Custom.(map[string]interface{})
+		require.Equal(t, true, custom["rateCalculated"])
+	})
+
+	t.Run("no rateCalculated metadata for instant profile", func(t *testing.T) {
+		tree := &ProfileTree{
+			Value: 100, Level: 0, Self: 1, Name: "root",
+		}
+		frame := treeToNestedSetDataFrame(tree, "short", 15.0, "goroutine:goroutine:count:goroutine:count")
+		require.NotNil(t, frame.Meta)
+		require.Nil(t, frame.Meta.Custom)
+	})
+
+	t.Run("CPU time keeps original units for tree data", func(t *testing.T) {
+		tree := &ProfileTree{
+			Value: 3000000000, Level: 0, Self: 1500000000, Name: "root", // 3s total, 1.5s self in nanoseconds
+		}
+		// Test CPU profile (should keep nanoseconds for flamegraph, no unit conversion)
+		frame := treeToNestedSetDataFrame(tree, "ns", 15.0, "process_cpu:cpu:nanoseconds:cpu:nanoseconds")
+
+		// Check unit remains as nanoseconds (no conversion for flamegraphs)
+		require.Equal(t, "ns", frame.Fields[1].Config.Unit)
+		require.Equal(t, "ns", frame.Fields[2].Config.Unit)
+
+		// Check values were rate calculated but not unit converted: 3000000000/15 = 200000000, 1500000000/15 = 100000000
+		require.Equal(t, int64(200000000), frame.Fields[1].At(0))
+		require.Equal(t, int64(100000000), frame.Fields[2].At(0))
+
+		// Check metadata shows rate was calculated
+		require.NotNil(t, frame.Meta)
+		require.NotNil(t, frame.Meta.Custom)
+		custom := frame.Meta.Custom.(map[string]interface{})
+		require.Equal(t, true, custom["rateCalculated"])
+	})
 }
 
 func Test_seriesToDataFrameAnnotations(t *testing.T) {
@@ -253,7 +296,7 @@ func Test_seriesToDataFrameAnnotations(t *testing.T) {
 			Label: "samples",
 		}
 
-		frames, err := seriesToDataFrames(series, true)
+		frames, err := seriesToDataFrames(series, true, 15.0, "goroutine:goroutine:count:goroutine:count")
 		require.NoError(t, err)
 		require.Equal(t, 1, len(frames))
 		require.Equal(t, 2, len(frames[0].Fields))
@@ -278,7 +321,7 @@ func Test_seriesToDataFrameAnnotations(t *testing.T) {
 			},
 		}
 
-		frames, err := seriesToDataFrames(series, false)
+		frames, err := seriesToDataFrames(series, false, 15.0, "goroutine:goroutine:count:goroutine:count")
 		require.NoError(t, err)
 		require.Equal(t, 1, len(frames))
 	})
@@ -302,7 +345,7 @@ func Test_seriesToDataFrameAnnotations(t *testing.T) {
 			},
 		}
 
-		frames, err := seriesToDataFrames(series, true)
+		frames, err := seriesToDataFrames(series, true, 15.0, "goroutine:goroutine:count:goroutine:count")
 		require.NoError(t, err)
 		require.Equal(t, 2, len(frames))
 
@@ -348,7 +391,7 @@ func Test_seriesToDataFrameAnnotations(t *testing.T) {
 			},
 		}
 
-		frames, err := seriesToDataFrames(series, true)
+		frames, err := seriesToDataFrames(series, true, 15.0, "goroutine:goroutine:count:goroutine:count")
 		require.NoError(t, err)
 		require.Equal(t, 2, len(frames))
 
@@ -375,7 +418,7 @@ func Test_seriesToDataFrame(t *testing.T) {
 			Units: "short",
 			Label: "samples",
 		}
-		frames, err := seriesToDataFrames(series, true)
+		frames, err := seriesToDataFrames(series, true, 15.0, "goroutine:goroutine:count:goroutine:count")
 		require.NoError(t, err)
 		require.Equal(t, 2, len(frames[0].Fields))
 		require.Equal(t, data.NewField("time", nil, []time.Time{time.UnixMilli(1000), time.UnixMilli(2000)}), frames[0].Fields[0])
@@ -390,7 +433,7 @@ func Test_seriesToDataFrame(t *testing.T) {
 			Label: "samples",
 		}
 
-		frames, err = seriesToDataFrames(series, true)
+		frames, err = seriesToDataFrames(series, true, 15.0, "goroutine:goroutine:count:goroutine:count")
 		require.NoError(t, err)
 		require.Equal(t, data.NewField("samples", map[string]string{"app": "bar"}, []float64{30, 10}).SetConfig(&data.FieldConfig{Unit: "short"}), frames[0].Fields[1])
 	})
@@ -404,7 +447,7 @@ func Test_seriesToDataFrame(t *testing.T) {
 			Units: "short",
 			Label: "samples",
 		}
-		frames, err := seriesToDataFrames(resp, true)
+		frames, err := seriesToDataFrames(resp, true, 15.0, "goroutine:goroutine:count:goroutine:count")
 		require.NoError(t, err)
 		require.Equal(t, 2, len(frames))
 		require.Equal(t, 2, len(frames[0].Fields))
@@ -412,6 +455,99 @@ func Test_seriesToDataFrame(t *testing.T) {
 		require.Equal(t, data.NewField("samples", map[string]string{"foo": "bar"}, []float64{30, 10}).SetConfig(&data.FieldConfig{Unit: "short"}), frames[0].Fields[1])
 		require.Equal(t, data.NewField("samples", map[string]string{"foo": "baz"}, []float64{30, 10}).SetConfig(&data.FieldConfig{Unit: "short"}), frames[1].Fields[1])
 	})
+
+	t.Run("rateCalculated metadata for cumulative profile", func(t *testing.T) {
+		series := &SeriesResponse{
+			Series: []*Series{
+				{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}}},
+			},
+			Units: "ns",
+			Label: "cpu",
+		}
+		frames, err := seriesToDataFrames(series, false, 15.0, "process_cpu:cpu:nanoseconds:cpu:nanoseconds")
+		require.NoError(t, err)
+		require.Equal(t, 1, len(frames))
+		require.NotNil(t, frames[0].Meta)
+		require.NotNil(t, frames[0].Meta.Custom)
+		custom := frames[0].Meta.Custom.(map[string]interface{})
+		require.Equal(t, true, custom["rateCalculated"])
+	})
+
+	t.Run("no rateCalculated metadata for instant profile", func(t *testing.T) {
+		series := &SeriesResponse{
+			Series: []*Series{
+				{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 30}, {Timestamp: int64(2000), Value: 10}}},
+			},
+			Units: "short",
+			Label: "goroutines",
+		}
+		// Test instant profile (should not have rateCalculated metadata)
+		frames, err := seriesToDataFrames(series, false, 15.0, "goroutine:goroutine:count:goroutine:count")
+		require.NoError(t, err)
+		require.Equal(t, 1, len(frames))
+		require.NotNil(t, frames[0].Meta)
+		require.Nil(t, frames[0].Meta.Custom)
+	})
+
+	t.Run("CPU time conversion to cores", func(t *testing.T) {
+		series := &SeriesResponse{
+			Series: []*Series{
+				{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 3000000000}, {Timestamp: int64(2000), Value: 1500000000}}}, // 3s and 1.5s in nanoseconds
+			},
+			Units: "ns",
+			Label: "cpu",
+		}
+		// should convert nanoseconds to cores and set unit to "cores"
+		frames, err := seriesToDataFrames(series, false, 15.0, "process_cpu:cpu:nanoseconds:cpu:nanoseconds")
+		require.NoError(t, err)
+		require.Equal(t, 1, len(frames))
+
+		require.Equal(t, "cores", frames[0].Fields[1].Config.Unit)
+
+		// Check values were converted: 3000000000/15/1e9 = 0.2 cores/sec, 1500000000/15/1e9 = 0.1 cores/sec
+		values := fieldValues[float64](frames[0].Fields[1])
+		require.Equal(t, []float64{0.2, 0.1}, values)
+	})
+
+	t.Run("Memory allocation unit conversion to bytes/sec", func(t *testing.T) {
+		series := &SeriesResponse{
+			Series: []*Series{
+				{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 150000000}, {Timestamp: int64(2000), Value: 300000000}}}, // 150 MB, 300 MB
+			},
+			Units: "bytes",
+			Label: "memory_alloc",
+		}
+		// should convert bytes to binBps and apply rate calculation
+		frames, err := seriesToDataFrames(series, false, 15.0, "memory:alloc_space:bytes:space:bytes")
+		require.NoError(t, err)
+		require.Equal(t, 1, len(frames))
+
+		require.Equal(t, "binBps", frames[0].Fields[1].Config.Unit)
+
+		// Check values were rate calculated: 150000000/15 = 10000000, 300000000/15 = 20000000
+		values := fieldValues[float64](frames[0].Fields[1])
+		require.Equal(t, []float64{10000000, 20000000}, values)
+	})
+
+	t.Run("Count-based profile unit conversion to ops/sec", func(t *testing.T) {
+		series := &SeriesResponse{
+			Series: []*Series{
+				{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 1500}, {Timestamp: int64(2000), Value: 3000}}}, // 1500, 3000 contentions
+			},
+			Units: "short",
+			Label: "contentions",
+		}
+		// should convert short to ops and apply rate calculation
+		frames, err := seriesToDataFrames(series, false, 15.0, "mutex:contentions:count:contentions:count")
+		require.NoError(t, err)
+		require.Equal(t, 1, len(frames))
+
+		require.Equal(t, "ops", frames[0].Fields[1].Config.Unit)
+
+		// Check values were rate calculated: 1500/15 = 100, 3000/15 = 200
+		values := fieldValues[float64](frames[0].Fields[1])
+		require.Equal(t, []float64{100, 200}, values)
+	})
 }
 
 type FakeClient struct {

From 8283ba94feb93e8299df698d917aec3be80b52b7 Mon Sep 17 00:00:00 2001
From: Sergej-Vlasov <37613182+Sergej-Vlasov@users.noreply.github.com>
Date: Mon, 18 Aug 2025 16:12:00 +0100
Subject: [PATCH 231/243] AutoGridItemRenderer: Hide repeats when dragging to
 fix select bug (#109798)

hide repeated panels when dragging
---
 .../layout-auto-grid/AutoGridItemRenderer.tsx | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
index 26ed6e5da9c..91882937ee2 100644
--- a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx
@@ -30,11 +30,13 @@ export function AutoGridItemRenderer({ model }: SceneComponentProps<AutoGridItem
           addDndContainer,
           isDragged,
           isDragging,
+          isRepeat = false,
         }: {
           item: VizPanel;
           addDndContainer: boolean;
           isDragged: boolean;
           isDragging: boolean;
+          isRepeat?: boolean;
         }) => (
           <div
             {...(addDndContainer
@@ -45,13 +47,25 @@ export function AutoGridItemRenderer({ model }: SceneComponentProps<AutoGridItem
             {isLazy ? (
               <LazyLoader
                 key={item.state.key!}
-                className={cx(conditionalRenderingClass, styles.wrapper, isDragged && styles.draggedWrapper)}
+                className={cx(
+                  conditionalRenderingClass,
+                  styles.wrapper,
+                  isDragged && !isRepeat && styles.draggedWrapper,
+                  isDragged && isRepeat && styles.draggedRepeatWrapper
+                )}
               >
                 <item.Component model={item} />
                 {conditionalRenderingOverlay}
               </LazyLoader>
             ) : (
-              <div className={cx(conditionalRenderingClass, styles.wrapper, isDragged && styles.draggedWrapper)}>
+              <div
+                className={cx(
+                  conditionalRenderingClass,
+                  styles.wrapper,
+                  isDragged && !isRepeat && styles.draggedWrapper,
+                  isDragged && isRepeat && styles.draggedRepeatWrapper
+                )}
+              >
                 <item.Component model={item} />
                 {conditionalRenderingOverlay}
               </div>
@@ -79,6 +93,7 @@ export function AutoGridItemRenderer({ model }: SceneComponentProps<AutoGridItem
           key={item.state.key!}
           isDragged={isDragged}
           isDragging={isDragging}
+          isRepeat={true}
         />
       ))}
     </>
@@ -96,6 +111,9 @@ const getStyles = (theme: GrafanaTheme2) => ({
     height: `var(${DRAGGED_ITEM_HEIGHT})`,
     opacity: 0.8,
   }),
+  draggedRepeatWrapper: css({
+    visibility: 'hidden',
+  }),
   draggedPlaceholder: css({
     width: '100%',
     height: '100%',

From d542f6bcda455825140da6a1ef5106993cebd757 Mon Sep 17 00:00:00 2001
From: Tom Ratcliffe <tom.ratcliffe@grafana.com>
Date: Mon, 18 Aug 2025 17:42:02 +0100
Subject: [PATCH 232/243] Chore: Skip more GHA jobs if backend files are not
 changed (#109803)

---
 .github/workflows/backend-code-checks.yml | 27 +++++++++++++++++++----
 .github/workflows/go-lint.yml             | 20 +++++++++++++++++
 .github/workflows/swagger-gen.yml         | 21 +++++++++++++++++-
 3 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/backend-code-checks.yml b/.github/workflows/backend-code-checks.yml
index 32fd3ed3940..b33e2c259ba 100644
--- a/.github/workflows/backend-code-checks.yml
+++ b/.github/workflows/backend-code-checks.yml
@@ -14,12 +14,31 @@ on:
       - 'docs/**'
       - 'latest.json'
 
-permissions:
-  contents: read
-  id-token: write
-
 jobs:
+  detect-changes:
+    name: Detect whether code changed
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      changed: ${{ steps.detect-changes.outputs.backend }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: true # required to get more history in the changed-files action
+          fetch-depth: 2
+      - name: Detect changes
+        id: detect-changes
+        uses: ./.github/actions/change-detection
+        with:
+          self: .github/workflows/backend-code-checks.yml
+
   validate-configs:
+    permissions:
+      contents: read
+      id-token: write
+    needs: detect-changes
+    if: needs.detect-changes.outputs.changed == 'true'
     name: Validate Backend Configs
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/go-lint.yml b/.github/workflows/go-lint.yml
index f870c16a847..ec9bfc62bec 100644
--- a/.github/workflows/go-lint.yml
+++ b/.github/workflows/go-lint.yml
@@ -13,7 +13,27 @@ permissions:
   contents: read
 
 jobs:
+  detect-changes:
+    name: Detect whether code changed
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      changed: ${{ steps.detect-changes.outputs.backend }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: true # required to get more history in the changed-files action
+          fetch-depth: 2
+      - name: Detect changes
+        id: detect-changes
+        uses: ./.github/actions/change-detection
+        with:
+          self: .github/workflows/go-lint.yml
+
   lint-go:
+    needs: detect-changes
+    if: needs.detect-changes.outputs.changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/swagger-gen.yml b/.github/workflows/swagger-gen.yml
index 0e42e0e7441..9399a366933 100644
--- a/.github/workflows/swagger-gen.yml
+++ b/.github/workflows/swagger-gen.yml
@@ -14,10 +14,29 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  detect-changes:
+    name: Detect whether code changed
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      changed: ${{ steps.detect-changes.outputs.backend }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: true # required to get more history in the changed-files action
+          fetch-depth: 2
+      - name: Detect changes
+        id: detect-changes
+        uses: ./.github/actions/change-detection
+        with:
+          self: .github/workflows/swagger-gen.yml
+
   verify:
     name: Verify committed API specs match
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'grafana/grafana' }}
+    needs: detect-changes
+    if: github.repository == 'grafana/grafana' && needs.detect-changes.outputs.changed == 'true'
     permissions:
       contents: read # clone the repository
       id-token: write # required for Vault access

From bb55972cef208fce084fb35a057c474f5b787e08 Mon Sep 17 00:00:00 2001
From: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date: Mon, 18 Aug 2025 13:44:33 -0400
Subject: [PATCH 233/243] Alerting: Fix fromPrometheusConfig (#109807)

---
 .../ngalert/api/tooling/definitions/alertmanager.go    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
index 7cf30d3b702..580338a4584 100644
--- a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
+++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
@@ -760,10 +760,12 @@ func (c ExtraConfiguration) Validate() error {
 func fromPrometheusConfig(prometheusConfig config.Config) PostableApiAlertingConfig {
 	config := PostableApiAlertingConfig{
 		Config: Config{
-			Global:       prometheusConfig.Global,
-			Route:        AsGrafanaRoute(prometheusConfig.Route),
-			InhibitRules: prometheusConfig.InhibitRules,
-			Templates:    prometheusConfig.Templates,
+			Global:            prometheusConfig.Global,
+			Route:             AsGrafanaRoute(prometheusConfig.Route),
+			InhibitRules:      prometheusConfig.InhibitRules,
+			TimeIntervals:     prometheusConfig.TimeIntervals,
+			MuteTimeIntervals: prometheusConfig.MuteTimeIntervals,
+			Templates:         prometheusConfig.Templates,
 		},
 	}
 

From 9a6b012ea400678eed014b64459285d062d0fd0b Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matias.chomicki@grafana.com>
Date: Mon, 18 Aug 2025 21:06:31 +0200
Subject: [PATCH 234/243] New Logs Panel: Performance and display updates and
 fixes (#109672)

* LogLine: don't run overflow check with unwrapped logs

* InfiniteScroll: don't listen to scroll events without scroll

* InfiniteScroll: minimize use of element.scrollHeight

* LogLineDetails: constrain to 95vw

* LogList: process logs while streaming

* Remove unused prop

* InfiniteScroll: update test

* Update test

* Inline Log Details: read max width from context

* Remove console
---
 .../logs/components/InfiniteScroll.test.tsx   | 15 ++++----
 .../logs/components/InfiniteScroll.tsx        |  7 ++--
 .../components/panel/InfiniteScroll.test.tsx  | 13 +++----
 .../logs/components/panel/InfiniteScroll.tsx  |  8 +++--
 .../logs/components/panel/LogLine.tsx         |  2 +-
 .../logs/components/panel/LogLineDetails.tsx  |  4 +--
 .../logs/components/panel/LogList.tsx         |  8 ++---
 .../logs/components/panel/LogListContext.tsx  | 35 +++++++++++++------
 .../logs/components/panel/virtualization.ts   |  2 ++
 9 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/public/app/features/logs/components/InfiniteScroll.test.tsx b/public/app/features/logs/components/InfiniteScroll.test.tsx
index 249ed391185..cf62687b36d 100644
--- a/public/app/features/logs/components/InfiniteScroll.test.tsx
+++ b/public/app/features/logs/components/InfiniteScroll.test.tsx
@@ -57,10 +57,9 @@ function setup(
   startPosition: number,
   rows: LogRowModel[],
   order: LogsSortOrder,
-  app?: CoreApp
+  app?: CoreApp,
+  { element, events } = getMockElement(startPosition)
 ) {
-  const { element, events } = getMockElement(startPosition);
-
   function scrollTo(position: number, timeStamp?: number) {
     element.scrollTop = position;
 
@@ -69,7 +68,7 @@ function setup(
       if (timeStamp) {
         jest.spyOn(event, 'timeStamp', 'get').mockReturnValue(timeStamp);
       }
-      events['scroll'](event);
+      events['scroll']?.(event);
     });
 
     // When scrolling top, we wait for the user to reach the top, and then for a new scrolling event
@@ -192,12 +191,14 @@ describe('InfiniteScroll', () => {
 
       test('Does not request more logs when there is no scroll', async () => {
         const loadMoreMock = jest.fn();
-        const { scrollTo, element } = setup(loadMoreMock, 0, rows, order);
-
-        expect(await screen.findByTestId('contents')).toBeInTheDocument();
+        const { element, events } = getMockElement(0);
         element.clientHeight = 40;
         element.scrollHeight = element.clientHeight;
 
+        const { scrollTo } = setup(loadMoreMock, 0, rows, order, undefined, { element, events });
+
+        expect(await screen.findByTestId('contents')).toBeInTheDocument();
+
         scrollTo(39, 1);
         scrollTo(40, 600);
 
diff --git a/public/app/features/logs/components/InfiniteScroll.tsx b/public/app/features/logs/components/InfiniteScroll.tsx
index 90f0919ca7d..e21ca4a4447 100644
--- a/public/app/features/logs/components/InfiniteScroll.tsx
+++ b/public/app/features/logs/components/InfiniteScroll.tsx
@@ -81,6 +81,9 @@ export const InfiniteScroll = ({
     if (!scrollElement || !loadMoreLogs) {
       return;
     }
+    if (scrollElement.scrollHeight <= scrollElement.clientHeight) {
+      return;
+    }
 
     function handleScroll(event: Event | WheelEvent) {
       if (!scrollElement || !loadMoreLogs || !rows.length || loading || !config.featureToggles.logsInfiniteScrolling) {
@@ -227,10 +230,6 @@ export function shouldLoadMore(
   element: HTMLDivElement,
   lastScroll: number
 ): ScrollDirection {
-  // Disable behavior if there is no scroll
-  if (element.scrollHeight <= element.clientHeight) {
-    return ScrollDirection.NoScroll;
-  }
   const delta = event instanceof WheelEvent ? event.deltaY : element.scrollTop - lastScroll;
   if (delta === 0) {
     return ScrollDirection.NoScroll;
diff --git a/public/app/features/logs/components/panel/InfiniteScroll.test.tsx b/public/app/features/logs/components/panel/InfiniteScroll.test.tsx
index d981cfa5027..631c2831e9c 100644
--- a/public/app/features/logs/components/panel/InfiniteScroll.test.tsx
+++ b/public/app/features/logs/components/panel/InfiniteScroll.test.tsx
@@ -46,10 +46,9 @@ function setup(
   startPosition: number,
   logs: LogListModel[],
   order: LogsSortOrder,
-  infiniteScrollMode: InfiniteScrollMode = 'interval'
+  infiniteScrollMode: InfiniteScrollMode = 'interval',
+  { element, events } = getMockElement(startPosition)
 ) {
-  const { element, events } = getMockElement(startPosition);
-
   function scrollTo(position: number, timeStamp?: number) {
     element.scrollTop = position;
 
@@ -168,12 +167,14 @@ describe('InfiniteScroll', () => {
 
       test('Does not request more logs when there is no scroll', async () => {
         const loadMoreMock = jest.fn();
-        const { scrollTo, element } = setup(loadMoreMock, 0, logs, order);
-
-        expect(await screen.findByText('log line 1')).toBeInTheDocument();
+        const { element, events } = getMockElement(0);
         element.clientHeight = 40;
         element.scrollHeight = element.clientHeight;
 
+        const { scrollTo } = setup(loadMoreMock, 0, logs, order, undefined, { element, events });
+
+        expect(await screen.findByText('log line 1')).toBeInTheDocument();
+
         scrollTo(39, 1);
         scrollTo(40, 600);
 
diff --git a/public/app/features/logs/components/panel/InfiniteScroll.tsx b/public/app/features/logs/components/panel/InfiniteScroll.tsx
index 6b64bc7e209..6dff87f65e9 100644
--- a/public/app/features/logs/components/panel/InfiniteScroll.tsx
+++ b/public/app/features/logs/components/panel/InfiniteScroll.tsx
@@ -73,6 +73,7 @@ export const InfiniteScroll = ({
   const styles = useStyles2(getStyles, virtualization);
   const resetStateTimeout = useRef<ReturnType<typeof setTimeout> | null>(null);
   const scrollToLogLineRef = useRef<LogListModel | undefined>(undefined);
+  const noScrollRef = useRef(false);
 
   useEffect(() => {
     // Logs have not changed, ignore effect
@@ -237,10 +238,13 @@ export const InfiniteScroll = ({
 
   const onItemsRendered = useCallback(
     (props: ListOnItemsRenderedProps) => {
-      if (!scrollElement || infiniteLoaderState === 'loading' || infiniteLoaderState === 'out-of-bounds') {
+      if (!scrollElement) {
         return;
       }
-      if (scrollElement.scrollHeight <= scrollElement.clientHeight) {
+      if (props.visibleStartIndex === 0) {
+        noScrollRef.current = scrollElement.scrollHeight <= scrollElement.clientHeight;
+      }
+      if (noScrollRef.current || infiniteLoaderState === 'loading' || infiniteLoaderState === 'out-of-bounds') {
         return;
       }
       const lastLogIndex = logs.length - 1;
diff --git a/public/app/features/logs/components/panel/LogLine.tsx b/public/app/features/logs/components/panel/LogLine.tsx
index 72934c8cffd..0fe2865e6c1 100644
--- a/public/app/features/logs/components/panel/LogLine.tsx
+++ b/public/app/features/logs/components/panel/LogLine.tsx
@@ -110,7 +110,7 @@ const LogLineComponent = memo(
     const permalinked = useLogIsPermalinked(log);
 
     useEffect(() => {
-      if (!onOverflow || !logLineRef.current || !virtualization || !height) {
+      if (!onOverflow || !logLineRef.current || !virtualization || !height || !wrapLogMessage) {
         return;
       }
       const calculatedHeight = typeof height === 'number' ? height : undefined;
diff --git a/public/app/features/logs/components/panel/LogLineDetails.tsx b/public/app/features/logs/components/panel/LogLineDetails.tsx
index 3887c9dda4b..b2121c64d55 100644
--- a/public/app/features/logs/components/panel/LogLineDetails.tsx
+++ b/public/app/features/logs/components/panel/LogLineDetails.tsx
@@ -134,7 +134,7 @@ export interface InlineLogLineDetailsProps {
 }
 
 export const InlineLogLineDetails = memo(({ logs, log }: InlineLogLineDetailsProps) => {
-  const { app, noInteractions } = useLogListContext();
+  const { app, detailsWidth, noInteractions } = useLogListContext();
   const styles = useStyles2(getStyles, 'inline');
   const scrollRef = useRef<HTMLDivElement | null>(null);
 
@@ -159,7 +159,7 @@ export const InlineLogLineDetails = memo(({ logs, log }: InlineLogLineDetailsPro
   }, [log]);
 
   return (
-    <div className={`${styles.inlineWrapper} log-line-inline-details`}>
+    <div className={`${styles.inlineWrapper} log-line-inline-details`} style={{ maxWidth: detailsWidth }}>
       <div className={styles.container}>
         <div className={styles.scrollContainer} ref={scrollRef} onScroll={saveScroll}>
           <LogLineDetailsComponent log={log} logs={logs} />
diff --git a/public/app/features/logs/components/panel/LogList.tsx b/public/app/features/logs/components/panel/LogList.tsx
index f3388cdf82f..1fbc0b1fd6e 100644
--- a/public/app/features/logs/components/panel/LogList.tsx
+++ b/public/app/features/logs/components/panel/LogList.tsx
@@ -96,6 +96,7 @@ type LogListComponentProps = Omit<
   | 'dedupStrategy'
   | 'displayedFields'
   | 'enableLogDetails'
+  | 'loading'
   | 'logOptionsStorageKey'
   | 'permalinkedLogId'
   | 'showTime'
@@ -202,7 +203,6 @@ export const LogList = ({
           grammar={grammar}
           initialScrollPosition={initialScrollPosition}
           infiniteScrollMode={infiniteScrollMode}
-          loading={loading}
           loadMore={loadMore}
           logs={logs}
           showControls={showControls}
@@ -221,7 +221,6 @@ const LogListComponent = ({
   grammar,
   initialScrollPosition = 'top',
   infiniteScrollMode = 'interval',
-  loading,
   loadMore,
   logs,
   showControls,
@@ -312,9 +311,6 @@ const LogListComponent = ({
   }, [eventBus, filteredLogs]);
 
   useEffect(() => {
-    if (loading) {
-      return;
-    }
     setProcessedLogs(
       preProcessLogs(
         logs,
@@ -324,7 +320,7 @@ const LogListComponent = ({
     );
     virtualization.resetLogLineSizes();
     listRef.current?.resetAfterIndex(0);
-  }, [forceEscape, getFieldLinks, grammar, loading, logs, sortOrder, timeZone, virtualization, wrapLogMessage]);
+  }, [forceEscape, getFieldLinks, grammar, logs, sortOrder, timeZone, virtualization, wrapLogMessage]);
 
   useEffect(() => {
     listRef.current?.resetAfterIndex(0);
diff --git a/public/app/features/logs/components/panel/LogListContext.tsx b/public/app/features/logs/components/panel/LogListContext.tsx
index c302a510761..711cda9dbe2 100644
--- a/public/app/features/logs/components/panel/LogListContext.tsx
+++ b/public/app/features/logs/components/panel/LogListContext.tsx
@@ -40,7 +40,7 @@ import { LogLineDetailsMode } from './LogLineDetails';
 import { GetRowContextQueryFn, LogLineMenuCustomItem } from './LogLineMenu';
 import { LogListFontSize } from './LogList';
 import { LogListModel } from './processing';
-import { LOG_LIST_MIN_WIDTH } from './virtualization';
+import { getScrollbarWidth, LOG_LIST_CONTROLS_WIDTH, LOG_LIST_MIN_WIDTH } from './virtualization';
 
 export interface LogListContextData extends Omit<Props, 'containerElement' | 'logs' | 'logsMeta' | 'showControls'> {
   closeDetails: () => void;
@@ -259,7 +259,9 @@ export const LogListContextProvider = ({
     wrapLogMessage,
   });
   const [showDetails, setShowDetails] = useState<LogListModel[]>([]);
-  const [detailsWidth, setDetailsWidthState] = useState(getDetailsWidth(containerElement, logOptionsStorageKey));
+  const [detailsWidth, setDetailsWidthState] = useState(
+    getDetailsWidth(containerElement, logOptionsStorageKey, undefined, detailsModeProp, showControls)
+  );
   const [detailsMode, setDetailsMode] = useState<LogLineDetailsMode>(detailsModeProp ?? 'sidebar');
   const [isAssistantAvailable, openAssistant] = useAssistant();
 
@@ -361,17 +363,25 @@ export const LogListContextProvider = ({
     }
   }, [logs, showDetails]);
 
+  // Sync log details inline and sidebar width
+  useEffect(() => {
+    setDetailsWidthState(getDetailsWidth(containerElement, logOptionsStorageKey, undefined, detailsMode, showControls));
+  }, [containerElement, detailsMode, logOptionsStorageKey, showControls]);
+
   // Sync log details width
   useEffect(() => {
+    if (!containerElement) {
+      return;
+    }
     const handleResize = debounce(() => {
-      setDetailsWidthState((detailsWidth) => getDetailsWidth(containerElement, logOptionsStorageKey, detailsWidth));
+      setDetailsWidthState((detailsWidth) =>
+        getDetailsWidth(containerElement, logOptionsStorageKey, detailsWidth, detailsMode, showControls)
+      );
     }, 50);
-    handleResize();
-    window.addEventListener('resize', handleResize);
-    return () => {
-      window.removeEventListener('resize', handleResize);
-    };
-  }, [containerElement, logOptionsStorageKey]);
+    const observer = new ResizeObserver(() => handleResize());
+    observer.observe(containerElement);
+    return () => observer.disconnect();
+  }, [containerElement, detailsMode, logOptionsStorageKey, showControls]);
 
   // Sync timestamp resolution
   useEffect(() => {
@@ -665,11 +675,16 @@ export function isDedupStrategy(value: unknown): value is LogsDedupStrategy {
 function getDetailsWidth(
   containerElement: HTMLDivElement | undefined,
   logOptionsStorageKey?: string,
-  currentWidth?: number
+  currentWidth?: number,
+  detailsMode: LogLineDetailsMode = 'sidebar',
+  showControls?: boolean
 ) {
   if (!containerElement) {
     return 0;
   }
+  if (detailsMode === 'inline') {
+    return containerElement.clientWidth - getScrollbarWidth() - (showControls ? LOG_LIST_CONTROLS_WIDTH : 0);
+  }
   const defaultWidth = containerElement.clientWidth * 0.4;
   const detailsWidth =
     currentWidth ||
diff --git a/public/app/features/logs/components/panel/virtualization.ts b/public/app/features/logs/components/panel/virtualization.ts
index 15889c1c2af..52835fbb8c4 100644
--- a/public/app/features/logs/components/panel/virtualization.ts
+++ b/public/app/features/logs/components/panel/virtualization.ts
@@ -13,6 +13,8 @@ export const FIELD_GAP_MULTIPLIER = 1.5;
 
 export const DEFAULT_LINE_HEIGHT = 22;
 
+export const LOG_LIST_CONTROLS_WIDTH = 32;
+
 export class LogLineVirtualization {
   private ctx: CanvasRenderingContext2D | null = null;
   private gridSize;

From 523758c9b347797a1e4fb9a58cc2b39b19dbf478 Mon Sep 17 00:00:00 2001
From: Paul Marbach <paul.marbach@grafana.com>
Date: Mon, 18 Aug 2025 17:03:11 -0400
Subject: [PATCH 235/243] Table: Get rid of ContextMenu on right click
 (#109825)

* Table: Get rid of ContextMenu on right click

* fix a scroll thing for expanded table, git rid of some conditional accessors

* remove context menu test

* remove context menu test

* i18n

* fix lint issue
---
 .../components/Table/TableNG/TableNG.test.tsx | 81 +------------------
 .../src/components/Table/TableNG/TableNG.tsx  | 79 +++---------------
 .../TableNG/components/TableCellActions.tsx   |  6 +-
 .../src/components/Table/TableNG/styles.ts    |  3 +-
 .../src/components/Table/TableNG/types.ts     |  7 +-
 public/locales/en-US/grafana.json             |  1 -
 6 files changed, 16 insertions(+), 161 deletions(-)

diff --git a/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx b/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx
index 9dfe1a2719b..336f37f01f7 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 import {
@@ -1242,57 +1242,6 @@ describe('TableNG', () => {
     });
   });
 
-  // TODO we need to test this with an e2e rather than a unit test, because the element dimensions calcs
-  // don't work in unit tests (no clientWidth/Height)
-  describe.skip('Resizing', () => {
-    beforeEach(() => {
-      window.HTMLElement.prototype.scrollIntoView = jest.fn();
-      window.HTMLElement.prototype.setPointerCapture = jest.fn();
-      window.HTMLElement.prototype.hasPointerCapture = jest.fn();
-      window.HTMLElement.prototype.releasePointerCapture = jest.fn();
-      window.HTMLElement.prototype.getBoundingClientRect = jest.fn(() => ({
-        width: 100,
-        height: 20,
-        top: 0,
-        left: 0,
-        bottom: 0,
-        right: 0,
-        x: 0,
-        y: 0,
-        toJSON: jest.fn(() => ''),
-      }));
-    });
-
-    it('calls onColumnResize when column is resized', async () => {
-      const onColumnResize = jest.fn();
-
-      const { container } = render(
-        <TableNG
-          enableVirtualization={false}
-          data={createBasicDataFrame()}
-          width={800}
-          height={600}
-          onColumnResize={onColumnResize}
-        />
-      );
-
-      // Find resize handle
-      const resizeHandles = container.querySelectorAll('.rdg-header-row > [role="columnheader"] > div:last-child');
-      const handle = resizeHandles[0];
-
-      if (!handle) {
-        throw new Error('Resize handle not found');
-      }
-
-      // simulate a click, then drag, then release.
-      await userEvent.pointer({ keys: '[MouseLeft>]', coords: { x: 0, y: 0 }, target: handle });
-      await userEvent.pointer({ coords: { x: 250, y: 0 }, target: handle });
-      await userEvent.pointer({ keys: '[/MouseLeft]', coords: { x: 250, y: 0 }, target: handle });
-
-      await waitFor(() => expect(onColumnResize).toHaveBeenCalled());
-    });
-  });
-
   describe('Text wrapping', () => {
     it('defaults to not wrapping text', () => {
       const { container } = render(
@@ -1344,34 +1293,6 @@ describe('TableNG', () => {
     });
   });
 
-  describe('Context menu', () => {
-    it('should show context menu on right-click', async () => {
-      const { container } = render(
-        <TableNG enableVirtualization={false} data={createBasicDataFrame()} width={400} height={400} />
-      );
-
-      const cell = container.querySelector('[role="gridcell"]');
-      expect(cell).toBeInTheDocument();
-
-      // Trigger context menu directly on the cell element
-      if (cell) {
-        fireEvent.contextMenu(cell);
-      }
-
-      // Check that context menu is shown
-      const menu = await screen.findByRole('menu');
-      expect(menu).toBeInTheDocument();
-
-      // Check for the Inspect value menu item
-      const menuItem = await screen.findByText('Inspect value');
-      expect(menuItem).toBeInTheDocument();
-
-      // close the menu
-      await userEvent.click(container);
-      expect(menuItem).not.toBeInTheDocument();
-    });
-  });
-
   describe('Cell inspection', () => {
     it('shows inspect icon when hovering over a cell with inspection enabled', async () => {
       const inspectDataFrame = {
diff --git a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
index 84132fc64cc..c461dd23a33 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
@@ -1,7 +1,7 @@
 import 'react-data-grid/lib/styles.css';
 
 import { clsx } from 'clsx';
-import { CSSProperties, Key, ReactNode, useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { CSSProperties, Key, ReactNode, useCallback, useMemo, useRef, useState } from 'react';
 import {
   Cell,
   CellRendererProps,
@@ -23,12 +23,10 @@ import {
   getDisplayProcessor,
   ReducerID,
 } from '@grafana/data';
-import { t, Trans } from '@grafana/i18n';
+import { Trans } from '@grafana/i18n';
 import { FieldColorModeId, TableCellTooltipPlacement } from '@grafana/schema';
 
 import { useStyles2, useTheme2 } from '../../../themes/ThemeContext';
-import { ContextMenu } from '../../ContextMenu/ContextMenu';
-import { MenuItem } from '../../Menu/MenuItem';
 import { Pagination } from '../../Pagination/Pagination';
 import { PanelContext, usePanelContext } from '../../PanelChrome';
 import { DataLinksActionsTooltip } from '../DataLinksActionsTooltip';
@@ -60,7 +58,7 @@ import {
   getLinkStyles,
   getTooltipStyles,
 } from './styles';
-import { TableNGProps, TableRow, TableSummaryRow, TableColumn, ContextMenuProps, TableCellStyleOptions } from './types';
+import { TableNGProps, TableRow, TableSummaryRow, TableColumn, InspectCellProps, TableCellStyleOptions } from './types';
 import {
   applySort,
   canFieldBeColorized,
@@ -133,27 +131,8 @@ export function TableNG(props: TableNGProps) {
       footerOptions.reducer[0] === ReducerID.count
   );
 
-  const [contextMenuProps, setContextMenuProps] = useState<ContextMenuProps | null>(null);
-  const [isContextMenuOpen, setIsContextMenuOpen] = useState(false);
-
   const resizeHandler = useColumnResize(onColumnResize);
 
-  useLayoutEffect(() => {
-    if (!isContextMenuOpen) {
-      return;
-    }
-
-    function onClick(_event: MouseEvent) {
-      setIsContextMenuOpen(false);
-    }
-
-    window.addEventListener('click', onClick);
-
-    return () => {
-      window.removeEventListener('click', onClick);
-    };
-  }, [isContextMenuOpen]);
-
   const rows = useMemo(() => frameToRecords(data), [data]);
   const hasNestedFrames = useMemo(() => getIsNestedTable(data.fields), [data]);
 
@@ -171,7 +150,7 @@ export function TableNG(props: TableNGProps) {
     setSortColumns,
   } = useSortedRows(filteredRows, data.fields, { hasNestedFrames, initialSortBy });
 
-  const [isInspecting, setIsInspecting] = useState(false);
+  const [inspectCell, setInspectCell] = useState<InspectCellProps | null>(null);
   const [expandedRows, setExpandedRows] = useState(() => new Set<number>());
 
   // vt scrollbar accounting for column auto-sizing
@@ -277,27 +256,6 @@ export function TableNG(props: TableNGProps) {
           sortable: true,
           // draggable: true,
         },
-        onCellContextMenu: ({ row, column }, event) => {
-          // in nested tables, it's possible for this event to trigger in a column header
-          // when holding Ctrl for multi-row sort.
-          if (column.key === 'expanded') {
-            return;
-          }
-
-          event.preventGridDefault();
-          // Do not show the default context menu
-          event.preventDefault();
-
-          const cellValue = row[column.key];
-          setContextMenuProps({
-            // rowIdx: rows.indexOf(row),
-            value: String(cellValue ?? ''),
-            top: event.clientY,
-            left: event.clientX,
-          });
-
-          setIsContextMenuOpen(true);
-        },
         onColumnResize: resizeHandler,
         onSortColumnsChange: (newSortColumns: SortColumn[]) => {
           setSortColumns(newSortColumns);
@@ -475,8 +433,7 @@ export function TableNG(props: TableNGProps) {
                   cellInspect={cellInspect}
                   showFilters={showFilters}
                   className={cellActionClassName}
-                  setIsInspecting={setIsInspecting}
-                  setContextMenuProps={setContextMenuProps}
+                  setInspectCell={setInspectCell}
                   onCellFilterAdded={onCellFilterAdded}
                 />
               )}
@@ -817,29 +774,11 @@ export function TableNG(props: TableNGProps) {
         />
       )}
 
-      {isContextMenuOpen && (
-        <ContextMenu
-          x={contextMenuProps?.left || 0}
-          y={contextMenuProps?.top || 0}
-          renderMenuItems={() => (
-            <MenuItem
-              label={t('grafana-ui.table.inspect-menu-label', 'Inspect value')}
-              onClick={() => setIsInspecting(true)}
-              className={styles.menuItem}
-            />
-          )}
-          focusOnOpen={false}
-        />
-      )}
-
-      {isInspecting && (
+      {inspectCell && (
         <TableCellInspector
-          mode={contextMenuProps?.mode ?? TableCellInspectorMode.text}
-          value={contextMenuProps?.value}
-          onDismiss={() => {
-            setIsInspecting(false);
-            setContextMenuProps(null);
-          }}
+          mode={inspectCell.mode ?? TableCellInspectorMode.text}
+          value={inspectCell.value}
+          onDismiss={() => setInspectCell(null)}
         />
       )}
     </>
diff --git a/packages/grafana-ui/src/components/Table/TableNG/components/TableCellActions.tsx b/packages/grafana-ui/src/components/Table/TableNG/components/TableCellActions.tsx
index 746ca7027d1..cdbcde443c1 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/components/TableCellActions.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/components/TableCellActions.tsx
@@ -15,8 +15,7 @@ export function TableCellActions(props: TableCellActionsProps) {
     value,
     cellOptions,
     displayName,
-    setIsInspecting,
-    setContextMenuProps,
+    setInspectCell,
     onCellFilterAdded,
     className,
     cellInspect,
@@ -47,11 +46,10 @@ export function TableCellActions(props: TableCellActionsProps) {
               mode = TableCellInspectorMode.code;
             }
 
-            setContextMenuProps({
+            setInspectCell({
               value: String(inspectValue ?? ''),
               mode,
             });
-            setIsInspecting(true);
           }}
         />
       )}
diff --git a/packages/grafana-ui/src/components/Table/TableNG/styles.ts b/packages/grafana-ui/src/components/Table/TableNG/styles.ts
index 76de0e3e1bb..ca837f66dbc 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/styles.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/styles.ts
@@ -77,7 +77,8 @@ export const getGridStyles = (
     gridNested: css({
       height: '100%',
       width: `calc(100% - ${COLUMN.EXPANDER_WIDTH - TABLE.CELL_PADDING * 2 - 1}px)`,
-      overflow: 'visible',
+      overflowX: 'scroll',
+      overflowY: 'hidden',
       marginLeft: COLUMN.EXPANDER_WIDTH - TABLE.CELL_PADDING - 1,
       marginBlock: TABLE.CELL_PADDING,
     }),
diff --git a/packages/grafana-ui/src/components/Table/TableNG/types.ts b/packages/grafana-ui/src/components/Table/TableNG/types.ts
index 7d61ac6200a..03705ef669d 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/types.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/types.ts
@@ -169,12 +169,10 @@ export interface TableCellRendererProps {
   disableSanitizeHtml?: boolean;
 }
 
-export type ContextMenuProps = {
+export type InspectCellProps = {
   rowIdx?: number;
   value: string;
   mode?: TableCellInspectorMode.code | TableCellInspectorMode.text;
-  top?: number;
-  left?: number;
 };
 
 export interface TableCellActionsProps {
@@ -184,8 +182,7 @@ export interface TableCellActionsProps {
   displayName: string;
   cellInspect: boolean;
   showFilters: boolean;
-  setIsInspecting: React.Dispatch<React.SetStateAction<boolean>>;
-  setContextMenuProps: React.Dispatch<React.SetStateAction<ContextMenuProps | null>>;
+  setInspectCell: React.Dispatch<React.SetStateAction<InspectCellProps | null>>;
   className?: string;
   onCellFilterAdded?: TableFilterActionCallback;
 }
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index b0299f1ee32..c49a81b5ae7 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -8744,7 +8744,6 @@
       "filter-popup-input-placeholder": "Filter values",
       "filter-popup-match-case": "Match case",
       "inspect-drawer-title": "Inspect value",
-      "inspect-menu-label": "Inspect value",
       "nested-table": {
         "no-data": "No data"
       },

From 32d9126ac6fea0bbade5a6b1c44620c49acfd5be Mon Sep 17 00:00:00 2001
From: "grafana-pr-automation[bot]"
 <140550294+grafana-pr-automation[bot]@users.noreply.github.com>
Date: Tue, 19 Aug 2025 00:40:27 +0000
Subject: [PATCH 236/243] I18n: Download translations from Crowdin (#109834)

New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 public/locales/cs-CZ/grafana.json   | 20 ++++++++++++--------
 public/locales/de-DE/grafana.json   | 20 ++++++++++++--------
 public/locales/es-ES/grafana.json   | 20 ++++++++++++--------
 public/locales/fr-FR/grafana.json   | 20 ++++++++++++--------
 public/locales/hu-HU/grafana.json   | 20 ++++++++++++--------
 public/locales/id-ID/grafana.json   | 20 ++++++++++++--------
 public/locales/it-IT/grafana.json   | 20 ++++++++++++--------
 public/locales/ja-JP/grafana.json   | 20 ++++++++++++--------
 public/locales/ko-KR/grafana.json   | 20 ++++++++++++--------
 public/locales/nl-NL/grafana.json   | 20 ++++++++++++--------
 public/locales/pl-PL/grafana.json   | 20 ++++++++++++--------
 public/locales/pt-BR/grafana.json   | 20 ++++++++++++--------
 public/locales/pt-PT/grafana.json   | 20 ++++++++++++--------
 public/locales/ru-RU/grafana.json   | 20 ++++++++++++--------
 public/locales/sv-SE/grafana.json   | 20 ++++++++++++--------
 public/locales/tr-TR/grafana.json   | 20 ++++++++++++--------
 public/locales/zh-Hans/grafana.json | 20 ++++++++++++--------
 public/locales/zh-Hant/grafana.json | 20 ++++++++++++--------
 18 files changed, 216 insertions(+), 144 deletions(-)

diff --git a/public/locales/cs-CZ/grafana.json b/public/locales/cs-CZ/grafana.json
index 8491d881dec..191e2bc4b3d 100644
--- a/public/locales/cs-CZ/grafana.json
+++ b/public/locales/cs-CZ/grafana.json
@@ -3668,11 +3668,11 @@
       "button-create": "Vytvořit",
       "button-creating": "Vytváření…",
       "cancel": "Zrušit",
+      "error-invalid-characters": "",
       "error-required": "Název složky je povinný",
       "folder-name-input-placeholder-enter-folder-name": "Zadejte název složky",
       "label-folder-name": "Název složky",
       "text-pull-request-created": "Byl vytvořen pull request se změnami v této složce:",
-      "text-your-folder-will-be-created-as": "Vaše složka bude vytvořena pod názvem {{folderName}}",
       "title-pull-request-created": "Pull request byl vytvořen",
       "title-this-repository-is-read-only": "Toto úložiště je jen pro čtení"
     },
@@ -7568,11 +7568,6 @@
     "select-aria-label": "Filtr složky",
     "select-placeholder": "Filtrovat podle složky"
   },
-  "folder-picker": {
-    "create-instructions": "Stisknutím klávesy Enter vytvoříte novou složku.",
-    "input-placeholder": "Stisknutím klávesy Enter potvrdíte novou složku",
-    "loading": "Načítání složek…"
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8791,7 +8786,6 @@
       "filter-popup-input-placeholder": "Filtrovat hodnoty",
       "filter-popup-match-case": "Rozlišovat malá a velká písmena",
       "inspect-drawer-title": "Zkontrolovat hodnotu",
-      "inspect-menu-label": "Zkontrolovat hodnotu",
       "nested-table": {
         "no-data": "Žádná data"
       },
@@ -12877,6 +12871,7 @@
     "description-fields": "Vyberte pole, která by měla být vypočtena",
     "description-frozen-columns": "",
     "description-min-column-width": "Minimální šířka pro automatickou změnu velikosti sloupce",
+    "description-tooltip-from-field": "",
     "name-calculation": "Výpočet",
     "name-cell-height": "Výška buňky",
     "name-cell-type": "Typ buňky",
@@ -12892,8 +12887,17 @@
     "name-min-column-width": "Minimální šířka sloupce",
     "name-show-table-footer": "Zobrazit zápatí tabulky",
     "name-show-table-header": "Zobrazit záhlaví tabulky",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "auto.",
-    "placeholder-fields": "Všechna číselná pole"
+    "placeholder-fields": "Všechna číselná pole",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Vymazat tagy",
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index e9264c7eba0..5bc88e83ba2 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -3632,11 +3632,11 @@
       "button-create": "Erstellen",
       "button-creating": "Wird erstellt ...",
       "cancel": "Abbrechen",
+      "error-invalid-characters": "",
       "error-required": "Ordnername erforderlich",
       "folder-name-input-placeholder-enter-folder-name": "Ordnernamen eingeben",
       "label-folder-name": "Ordnername",
       "text-pull-request-created": "Ein Pull-Request wurde erstellt, mit Änderungen an diesem Ordner:",
-      "text-your-folder-will-be-created-as": "Ihr Ordner wird erstellt als {{folderName}}",
       "title-pull-request-created": "Pull-Request erstellt",
       "title-this-repository-is-read-only": "Dieses Repository ist schreibgeschützt"
     },
@@ -7526,11 +7526,6 @@
     "select-aria-label": "Ordnerfilter",
     "select-placeholder": "Nach Ordner filtern"
   },
-  "folder-picker": {
-    "create-instructions": "Drücken Sie die Eingabetaste, um den neuen Ordner zu erstellen.",
-    "input-placeholder": "Drücken Sie zur Bestätigung des neuen Ordners die Eingabetaste",
-    "loading": "Ordner werden geladen …"
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8749,7 +8744,6 @@
       "filter-popup-input-placeholder": "Filterwerte",
       "filter-popup-match-case": "Groß-/Kleinschreibung beachten",
       "inspect-drawer-title": "Wert prüfen",
-      "inspect-menu-label": "Wert prüfen",
       "nested-table": {
         "no-data": "Keine Daten"
       },
@@ -12795,6 +12789,7 @@
     "description-fields": "Wählen Sie die Felder aus, die berechnet werden sollen",
     "description-frozen-columns": "",
     "description-min-column-width": "Die Mindestbreite für die automatische Größenänderung der Spalte",
+    "description-tooltip-from-field": "",
     "name-calculation": "Berechnung",
     "name-cell-height": "Zellenhöhe",
     "name-cell-type": "Zellentyp",
@@ -12810,8 +12805,17 @@
     "name-min-column-width": "Minimale Spaltenbreite",
     "name-show-table-footer": "Tabellenfußzeile anzeigen",
     "name-show-table-header": "Tabellenüberschirft anzeigen",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "auto",
-    "placeholder-fields": "Alle numerischen Felder"
+    "placeholder-fields": "Alle numerischen Felder",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Tags löschen",
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index 79877c58cd2..db2688eca8b 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -3632,11 +3632,11 @@
       "button-create": "Crear",
       "button-creating": "Creando...",
       "cancel": "Cancelar",
+      "error-invalid-characters": "",
       "error-required": "Nombre de la carpeta obligatorio",
       "folder-name-input-placeholder-enter-folder-name": "Introducir el nombre de la carpeta",
       "label-folder-name": "Nombre de la carpeta",
       "text-pull-request-created": "Se ha creado una solicitud de extracción con cambios en esta carpeta:",
-      "text-your-folder-will-be-created-as": "Tu carpeta se creará con el nombre {{folderName}}",
       "title-pull-request-created": "Solicitud de extracción creada",
       "title-this-repository-is-read-only": "Este repositorio es de solo lectura"
     },
@@ -7526,11 +7526,6 @@
     "select-aria-label": "Filtro de carpeta",
     "select-placeholder": "Filtrar por carpeta"
   },
-  "folder-picker": {
-    "create-instructions": "Pulsa Intro para crear la nueva carpeta.",
-    "input-placeholder": "Pulsa Intro para confirmar la nueva carpeta",
-    "loading": "Cargando carpetas..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8749,7 +8744,6 @@
       "filter-popup-input-placeholder": "Filtrar valores",
       "filter-popup-match-case": "Coincidir mayúsculas/minúsculas",
       "inspect-drawer-title": "Inspeccionar valor",
-      "inspect-menu-label": "Inspeccionar valor",
       "nested-table": {
         "no-data": "Sin datos"
       },
@@ -12795,6 +12789,7 @@
     "description-fields": "Seleccione los campos que deben calcularse",
     "description-frozen-columns": "",
     "description-min-column-width": "El ancho mínimo para el cambio de tamaño automático de las columnas",
+    "description-tooltip-from-field": "",
     "name-calculation": "Cálculo",
     "name-cell-height": "Altura de celda",
     "name-cell-type": "Tipo de celda",
@@ -12810,8 +12805,17 @@
     "name-min-column-width": "Ancho mínimo de columna",
     "name-show-table-footer": "Mostrar pie de tabla",
     "name-show-table-header": "Mostrar encabezado de tabla",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "auto",
-    "placeholder-fields": "Todos los campos numéricos"
+    "placeholder-fields": "Todos los campos numéricos",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Borrar etiquetas",
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 2b1bee06c06..86db61892e7 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -3632,11 +3632,11 @@
       "button-create": "Créer",
       "button-creating": "Création...",
       "cancel": "Annuler",
+      "error-invalid-characters": "",
       "error-required": "Un nom de dossier est obligatoire",
       "folder-name-input-placeholder-enter-folder-name": "Saisir le nom du dossier",
       "label-folder-name": "Nom du dossier",
       "text-pull-request-created": "Une demande de fusion a été créée avec des modifications dans ce dossier :",
-      "text-your-folder-will-be-created-as": "Votre dossier sera créé sous le nom {{folderName}}",
       "title-pull-request-created": "Demande de fusion créée",
       "title-this-repository-is-read-only": "Ce référentiel est en lecture seule"
     },
@@ -7526,11 +7526,6 @@
     "select-aria-label": "Filtre de dossier",
     "select-placeholder": "Filtrer par dossier"
   },
-  "folder-picker": {
-    "create-instructions": "Appuyez sur Entrée pour créer le nouveau dossier.",
-    "input-placeholder": "Appuyer sur Entrée pour confirmer le nouveau dossier",
-    "loading": "Chargement des dossiers..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8749,7 +8744,6 @@
       "filter-popup-input-placeholder": "Filtrer les valeurs",
       "filter-popup-match-case": "Respecter la casse",
       "inspect-drawer-title": "Inspecter la valeur",
-      "inspect-menu-label": "Inspecter la valeur",
       "nested-table": {
         "no-data": "Aucune donnée disponible"
       },
@@ -12795,6 +12789,7 @@
     "description-fields": "Sélectionner les champs à utiliser pour le calcul",
     "description-frozen-columns": "",
     "description-min-column-width": "La largeur minimale pour le redimensionnement automatique des colonnes",
+    "description-tooltip-from-field": "",
     "name-calculation": "Calcul",
     "name-cell-height": "Hauteur de cellule",
     "name-cell-type": "Type de cellule",
@@ -12810,8 +12805,17 @@
     "name-min-column-width": "Largeur minimale de colonne",
     "name-show-table-footer": "Afficher le pied de tableau",
     "name-show-table-header": "Afficher l’en-tête du tableau",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "auto",
-    "placeholder-fields": "Tous les champs numériques"
+    "placeholder-fields": "Tous les champs numériques",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Effacer les balises",
diff --git a/public/locales/hu-HU/grafana.json b/public/locales/hu-HU/grafana.json
index cb747ac51ef..47e53c0d620 100644
--- a/public/locales/hu-HU/grafana.json
+++ b/public/locales/hu-HU/grafana.json
@@ -3632,11 +3632,11 @@
       "button-create": "Létrehozás",
       "button-creating": "Létrehozás…",
       "cancel": "Mégse",
+      "error-invalid-characters": "",
       "error-required": "A mappa nevének megadása kötelező",
       "folder-name-input-placeholder-enter-folder-name": "Mappanév megadása",
       "label-folder-name": "Mappa neve",
       "text-pull-request-created": "A lekérési kérelem ennek a mappának a módosításával lett létrehozva:",
-      "text-your-folder-will-be-created-as": "A mappa neve {{folderName}} lesz",
       "title-pull-request-created": "Lekérési kérelem létrehozva",
       "title-this-repository-is-read-only": "Ez az adattár csak olvasható"
     },
@@ -7526,11 +7526,6 @@
     "select-aria-label": "Mappaszűrő",
     "select-placeholder": "Szűrés mappa alapján"
   },
-  "folder-picker": {
-    "create-instructions": "Nyomja le az ENTER billentyűt az új mappa létrehozásához.",
-    "input-placeholder": "Nyomja le az Enter billentyűt az új mappa megerősítéséhez",
-    "loading": "Mappák betöltése..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8749,7 +8744,6 @@
       "filter-popup-input-placeholder": "Értékek szűrése",
       "filter-popup-match-case": "Nagybetűérzékeny",
       "inspect-drawer-title": "Érték ellenőrzése",
-      "inspect-menu-label": "Érték ellenőrzése",
       "nested-table": {
         "no-data": "Nincs adat"
       },
@@ -12795,6 +12789,7 @@
     "description-fields": "Válassza ki a kiszámítandó mezőket",
     "description-frozen-columns": "",
     "description-min-column-width": "Az oszlop automatikus átméretezésének minimális szélessége",
+    "description-tooltip-from-field": "",
     "name-calculation": "Számítás",
     "name-cell-height": "Cellamagasság",
     "name-cell-type": "Cellatípus",
@@ -12810,8 +12805,17 @@
     "name-min-column-width": "Minimális oszlopszélesség",
     "name-show-table-footer": "Táblázatlábléc megjelenítése",
     "name-show-table-header": "Táblázatfejléc megjelenítése",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "automatikus",
-    "placeholder-fields": "Numerikus mezők"
+    "placeholder-fields": "Numerikus mezők",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Címkék törlése",
diff --git a/public/locales/id-ID/grafana.json b/public/locales/id-ID/grafana.json
index c13df950160..263e9aeacd7 100644
--- a/public/locales/id-ID/grafana.json
+++ b/public/locales/id-ID/grafana.json
@@ -3614,11 +3614,11 @@
       "button-create": "Buat",
       "button-creating": "Membuat...",
       "cancel": "Batalkan",
+      "error-invalid-characters": "",
       "error-required": "Nama folder wajib diisi",
       "folder-name-input-placeholder-enter-folder-name": "Masukkan nama folder",
       "label-folder-name": "Nama folder",
       "text-pull-request-created": "Permintaan pull telah dibuat dengan perubahan pada folder ini:",
-      "text-your-folder-will-be-created-as": "Folder Anda akan dibuat sebagai {{folderName}}",
       "title-pull-request-created": "Permintaan pull dibuat",
       "title-this-repository-is-read-only": "Repositori ini hanya dapat dibaca"
     },
@@ -7505,11 +7505,6 @@
     "select-aria-label": "Filter folder",
     "select-placeholder": "Filter berdasarkan folder"
   },
-  "folder-picker": {
-    "create-instructions": "Tekan enter untuk membuat folder baru.",
-    "input-placeholder": "Tekan enter untuk mengonfirmasi folder baru",
-    "loading": "Memuat folder..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8728,7 +8723,6 @@
       "filter-popup-input-placeholder": "Filter nilai",
       "filter-popup-match-case": "Cocok huruf besar kecil",
       "inspect-drawer-title": "Periksa nilai",
-      "inspect-menu-label": "Periksa nilai",
       "nested-table": {
         "no-data": "Tidak ada data"
       },
@@ -12754,6 +12748,7 @@
     "description-fields": "Pilih bidang yang harus dihitung",
     "description-frozen-columns": "",
     "description-min-column-width": "Lebar minimum untuk perubahan ukuran kolom otomatis",
+    "description-tooltip-from-field": "",
     "name-calculation": "Perhitungan",
     "name-cell-height": "Tinggi sel",
     "name-cell-type": "Jenis sel",
@@ -12769,8 +12764,17 @@
     "name-min-column-width": "Lebar kolom minimum",
     "name-show-table-footer": "Tampilkan footer tabel",
     "name-show-table-header": "Tampilkan header tabel",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "otomatis",
-    "placeholder-fields": "Semua Bidang Numerik"
+    "placeholder-fields": "Semua Bidang Numerik",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Hapus tag",
diff --git a/public/locales/it-IT/grafana.json b/public/locales/it-IT/grafana.json
index 27e3a2b91a8..3fa1b26e232 100644
--- a/public/locales/it-IT/grafana.json
+++ b/public/locales/it-IT/grafana.json
@@ -3632,11 +3632,11 @@
       "button-create": "Crea",
       "button-creating": "Creazione in corso...",
       "cancel": "Annulla",
+      "error-invalid-characters": "",
       "error-required": "Il nome della cartella è obbligatorio",
       "folder-name-input-placeholder-enter-folder-name": "Inserisci nome cartella",
       "label-folder-name": "Nome cartella",
       "text-pull-request-created": "È stata creata una richiesta di pull con modifiche a questa cartella:",
-      "text-your-folder-will-be-created-as": "La tua cartella verrà creata come {{folderName}}",
       "title-pull-request-created": "Richiesta di pull creata",
       "title-this-repository-is-read-only": "Questo repository è di sola lettura"
     },
@@ -7526,11 +7526,6 @@
     "select-aria-label": "Filtro cartelle",
     "select-placeholder": "Filtra per cartella"
   },
-  "folder-picker": {
-    "create-instructions": "Premi Invio per creare la nuova cartella.",
-    "input-placeholder": "Premi Invio per confermare la nuova cartella",
-    "loading": "Caricamento delle cartelle in corso..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8749,7 +8744,6 @@
       "filter-popup-input-placeholder": "Valori filtro",
       "filter-popup-match-case": "Corrispondenza",
       "inspect-drawer-title": "Ispeziona valore",
-      "inspect-menu-label": "Ispeziona valore",
       "nested-table": {
         "no-data": "Nessun dato"
       },
@@ -12795,6 +12789,7 @@
     "description-fields": "Seleziona i campi da calcolare",
     "description-frozen-columns": "",
     "description-min-column-width": "La larghezza minima per il ridimensionamento automatico della colonna",
+    "description-tooltip-from-field": "",
     "name-calculation": "Calcolo",
     "name-cell-height": "Altezza cella",
     "name-cell-type": "Tipo di cella",
@@ -12810,8 +12805,17 @@
     "name-min-column-width": "Larghezza minima colonna",
     "name-show-table-footer": "Mostra piè di pagina tabella",
     "name-show-table-header": "Mostra intestazione tabella",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "automatico",
-    "placeholder-fields": "Tutti i campi numerici"
+    "placeholder-fields": "Tutti i campi numerici",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Cancella tag",
diff --git a/public/locales/ja-JP/grafana.json b/public/locales/ja-JP/grafana.json
index de5e9876d86..32b5d0a9cbf 100644
--- a/public/locales/ja-JP/grafana.json
+++ b/public/locales/ja-JP/grafana.json
@@ -3614,11 +3614,11 @@
       "button-create": "作成",
       "button-creating": "作成中...",
       "cancel": "キャンセル",
+      "error-invalid-characters": "",
       "error-required": "フォルダ名は必須です",
       "folder-name-input-placeholder-enter-folder-name": "フォルダ名を入力してください",
       "label-folder-name": "フォルダ名",
       "text-pull-request-created": "このフォルダへの変更を含むプルリクエストが作成されました。",
-      "text-your-folder-will-be-created-as": "フォルダは{{folderName}}として作成されます",
       "title-pull-request-created": "プルリクエストが作成されました",
       "title-this-repository-is-read-only": "このリポジトリは読み取り専用です"
     },
@@ -7505,11 +7505,6 @@
     "select-aria-label": "フォルダフィルター",
     "select-placeholder": "フォルダでフィルタリング"
   },
-  "folder-picker": {
-    "create-instructions": "Enterキーを押して新しいフォルダを作成します。",
-    "input-placeholder": "Enterキーを押して新しいフォルダを確定",
-    "loading": "フォルダを読み込んでいます..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8728,7 +8723,6 @@
       "filter-popup-input-placeholder": "値をフィルタリング",
       "filter-popup-match-case": "大文字/小文字を区別",
       "inspect-drawer-title": "値を検査",
-      "inspect-menu-label": "値を検査",
       "nested-table": {
         "no-data": "データなし"
       },
@@ -12754,6 +12748,7 @@
     "description-fields": "計算するフィールドを選択",
     "description-frozen-columns": "",
     "description-min-column-width": "列の自動サイズ変更の最小幅",
+    "description-tooltip-from-field": "",
     "name-calculation": "計算",
     "name-cell-height": "セルの高さ",
     "name-cell-type": "セルの種類",
@@ -12769,8 +12764,17 @@
     "name-min-column-width": "最小列幅",
     "name-show-table-footer": "テーブルフッターを表示",
     "name-show-table-header": "テーブルヘッダーを表示",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "自動",
-    "placeholder-fields": "すべての数値フィールド"
+    "placeholder-fields": "すべての数値フィールド",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "タグをクリア",
diff --git a/public/locales/ko-KR/grafana.json b/public/locales/ko-KR/grafana.json
index d4fbcf252d6..8027efb70e9 100644
--- a/public/locales/ko-KR/grafana.json
+++ b/public/locales/ko-KR/grafana.json
@@ -3614,11 +3614,11 @@
       "button-create": "생성",
       "button-creating": "생성 중...",
       "cancel": "취소",
+      "error-invalid-characters": "",
       "error-required": "폴더 이름은 필수 입력 항목입니다",
       "folder-name-input-placeholder-enter-folder-name": "폴더 이름 입력",
       "label-folder-name": "폴더 이름",
       "text-pull-request-created": "이 폴더에 대한 변경 사항을 포함하는 풀 요청이 생성되었습니다.",
-      "text-your-folder-will-be-created-as": "{{folderName}}(이)라는 이름으로 폴더가 생성됩니다",
       "title-pull-request-created": "풀 요청 생성됨",
       "title-this-repository-is-read-only": "이 리포지토리는 읽기 전용입니다."
     },
@@ -7505,11 +7505,6 @@
     "select-aria-label": "폴더 필터",
     "select-placeholder": "폴더별로 필터링"
   },
-  "folder-picker": {
-    "create-instructions": "새 폴더를 만들려면 엔터 키를 누르세요.",
-    "input-placeholder": "새 폴더를 확인하려면 엔터 키를 누르세요",
-    "loading": "폴더 로딩 중..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8728,7 +8723,6 @@
       "filter-popup-input-placeholder": "값 필터링",
       "filter-popup-match-case": "대소문자 일치",
       "inspect-drawer-title": "값 검사",
-      "inspect-menu-label": "값 검사",
       "nested-table": {
         "no-data": "데이터 없음"
       },
@@ -12754,6 +12748,7 @@
     "description-fields": "계산해야 하는 필드 선택",
     "description-frozen-columns": "",
     "description-min-column-width": "열 자동 크기 조정을 위한 최소 너비",
+    "description-tooltip-from-field": "",
     "name-calculation": "계산",
     "name-cell-height": "셀 높이",
     "name-cell-type": "셀 유형",
@@ -12769,8 +12764,17 @@
     "name-min-column-width": "열 최소 너비",
     "name-show-table-footer": "테이블 바닥글 표시",
     "name-show-table-header": "테이블 머리말 표시",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "자동",
-    "placeholder-fields": "모든 숫자 필드"
+    "placeholder-fields": "모든 숫자 필드",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "태그 지우기",
diff --git a/public/locales/nl-NL/grafana.json b/public/locales/nl-NL/grafana.json
index 56d616c084c..ddef727192b 100644
--- a/public/locales/nl-NL/grafana.json
+++ b/public/locales/nl-NL/grafana.json
@@ -3632,11 +3632,11 @@
       "button-create": "Aanmaken",
       "button-creating": "Aanmaken...",
       "cancel": "Annuleren",
+      "error-invalid-characters": "",
       "error-required": "Mapnaam is vereist",
       "folder-name-input-placeholder-enter-folder-name": "Mapnaam invoeren",
       "label-folder-name": "Mapnaam",
       "text-pull-request-created": "Er is een pull request gemaakt met wijzigingen in deze map:",
-      "text-your-folder-will-be-created-as": "Je map wordt gemaakt als {{folderName}} ",
       "title-pull-request-created": "Pull request is aangemaakt",
       "title-this-repository-is-read-only": "Deze repository is alleen-lezen"
     },
@@ -7526,11 +7526,6 @@
     "select-aria-label": "Mapfilter",
     "select-placeholder": "Filteren op map"
   },
-  "folder-picker": {
-    "create-instructions": "Druk op enter om de nieuwe map aan te maken.",
-    "input-placeholder": "Druk op enter om nieuwe map te bevestigen",
-    "loading": "Mappen laden ..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8749,7 +8744,6 @@
       "filter-popup-input-placeholder": "Filter waarden",
       "filter-popup-match-case": "Case matchen",
       "inspect-drawer-title": "Waarde inspecteren",
-      "inspect-menu-label": "Waarde inspecteren",
       "nested-table": {
         "no-data": "Geen gegevens"
       },
@@ -12795,6 +12789,7 @@
     "description-fields": "Selecteer de velden die moeten worden berekend",
     "description-frozen-columns": "",
     "description-min-column-width": "De minimale breedte voor het automatisch aanpassen van de kolomgrootte",
+    "description-tooltip-from-field": "",
     "name-calculation": "Berekening",
     "name-cell-height": "Celhoogte",
     "name-cell-type": "Type cel",
@@ -12810,8 +12805,17 @@
     "name-min-column-width": "Minimale kolombreedte",
     "name-show-table-footer": "Voettekst tabel tonen",
     "name-show-table-header": "Header tabel tonen",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "automatisch",
-    "placeholder-fields": "Alle numerieke velden"
+    "placeholder-fields": "Alle numerieke velden",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Tags wissen",
diff --git a/public/locales/pl-PL/grafana.json b/public/locales/pl-PL/grafana.json
index 1fdcb666770..9ad579318b0 100644
--- a/public/locales/pl-PL/grafana.json
+++ b/public/locales/pl-PL/grafana.json
@@ -3668,11 +3668,11 @@
       "button-create": "Utwórz",
       "button-creating": "Tworzenie…",
       "cancel": "Anuluj",
+      "error-invalid-characters": "",
       "error-required": "Wymagana jest nazwa folderu",
       "folder-name-input-placeholder-enter-folder-name": "Podaj nazwę folderu",
       "label-folder-name": "Nazwa folderu",
       "text-pull-request-created": "Utworzono żądanie pull ze zmianami w tym folderze:",
-      "text-your-folder-will-be-created-as": "Zostanie utworzony folder o nazwie {{folderName}}",
       "title-pull-request-created": "Utworzono żądanie pull",
       "title-this-repository-is-read-only": "To repozytorium jest tylko do odczytu"
     },
@@ -7568,11 +7568,6 @@
     "select-aria-label": "Filtr folderów",
     "select-placeholder": "Filtruj wg folderu"
   },
-  "folder-picker": {
-    "create-instructions": "Naciśnij Enter, aby utworzyć nowy folder.",
-    "input-placeholder": "Naciśnij Enter, aby potwierdzić nowy folder",
-    "loading": "Ładowanie folderów…"
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8791,7 +8786,6 @@
       "filter-popup-input-placeholder": "Wartości filtra",
       "filter-popup-match-case": "Dopasuj wielkość liter",
       "inspect-drawer-title": "Sprawdź wartość",
-      "inspect-menu-label": "Sprawdź wartość",
       "nested-table": {
         "no-data": "Brak danych"
       },
@@ -12877,6 +12871,7 @@
     "description-fields": "Wybierz pola, które powinny być obliczone",
     "description-frozen-columns": "",
     "description-min-column-width": "Minimalna szerokość dla automatycznej zmiany rozmiaru kolumny",
+    "description-tooltip-from-field": "",
     "name-calculation": "Obliczenie",
     "name-cell-height": "Wysokość komórki",
     "name-cell-type": "Typ komórki",
@@ -12892,8 +12887,17 @@
     "name-min-column-width": "Minimalna szerokość kolumny",
     "name-show-table-footer": "Pokaż stopkę tabeli",
     "name-show-table-header": "Pokaż nagłówek tabeli",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "automatycznie",
-    "placeholder-fields": "Wszystkie pola numeryczne"
+    "placeholder-fields": "Wszystkie pola numeryczne",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Wyczyść znaczniki",
diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json
index df790a5f15c..44590492e26 100644
--- a/public/locales/pt-BR/grafana.json
+++ b/public/locales/pt-BR/grafana.json
@@ -3632,11 +3632,11 @@
       "button-create": "Criar",
       "button-creating": "Criando…",
       "cancel": "Cancelar",
+      "error-invalid-characters": "",
       "error-required": "O nome da pasta é obrigatório",
       "folder-name-input-placeholder-enter-folder-name": "Digitar o nome da pasta",
       "label-folder-name": "Nome da pasta",
       "text-pull-request-created": "Uma solicitação de extração foi criada com alterações nesta pasta:",
-      "text-your-folder-will-be-created-as": "Sua pasta será criada como {{folderName}}",
       "title-pull-request-created": "Solicitação de extração criada",
       "title-this-repository-is-read-only": "Este repositório é somente leitura"
     },
@@ -7526,11 +7526,6 @@
     "select-aria-label": "Filtro de pasta",
     "select-placeholder": "Filtrar por pasta"
   },
-  "folder-picker": {
-    "create-instructions": "Pressione Enter para criar a nova pasta.",
-    "input-placeholder": "Pressione Enter para confirmar a nova pasta",
-    "loading": "Carregando pastas..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8749,7 +8744,6 @@
       "filter-popup-input-placeholder": "Filtrar valores",
       "filter-popup-match-case": "Diferenciar maiúsculas/minúsculas",
       "inspect-drawer-title": "Inspecionar valor",
-      "inspect-menu-label": "Inspecionar valor",
       "nested-table": {
         "no-data": "Sem dados"
       },
@@ -12795,6 +12789,7 @@
     "description-fields": "Selecione os campos que devem ser calculados",
     "description-frozen-columns": "",
     "description-min-column-width": "A largura mínima para o redimensionamento automático da coluna",
+    "description-tooltip-from-field": "",
     "name-calculation": "Cálculo",
     "name-cell-height": "Altura da célula",
     "name-cell-type": "Tipo de célula",
@@ -12810,8 +12805,17 @@
     "name-min-column-width": "Largura mínima da coluna",
     "name-show-table-footer": "Mostrar rodapé da tabela",
     "name-show-table-header": "Mostrar cabeçalho da tabela",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "automático",
-    "placeholder-fields": "Todos os campos numéricos"
+    "placeholder-fields": "Todos os campos numéricos",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Limpar etiquetas",
diff --git a/public/locales/pt-PT/grafana.json b/public/locales/pt-PT/grafana.json
index 5e89dd7c9d2..f6580c073ab 100644
--- a/public/locales/pt-PT/grafana.json
+++ b/public/locales/pt-PT/grafana.json
@@ -3632,11 +3632,11 @@
       "button-create": "Criar",
       "button-creating": "A criar...",
       "cancel": "Cancelar",
+      "error-invalid-characters": "",
       "error-required": "O nome da pasta é obrigatório",
       "folder-name-input-placeholder-enter-folder-name": "Introduza o nome da pasta",
       "label-folder-name": "Nome da pasta",
       "text-pull-request-created": "Foi criado um pedido de extração com alterações a esta pasta:",
-      "text-your-folder-will-be-created-as": "A sua pasta será criada como {{folderName}}",
       "title-pull-request-created": "Pedido de extração criado",
       "title-this-repository-is-read-only": "Este repositório é apenas de leitura"
     },
@@ -7526,11 +7526,6 @@
     "select-aria-label": "Filtro de pastas",
     "select-placeholder": "Filtrar por pasta"
   },
-  "folder-picker": {
-    "create-instructions": "Pressionar Enter para criar a nova pasta.",
-    "input-placeholder": "Pressionar Enter para confirmar a nova pasta",
-    "loading": "A carregar pastas..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8749,7 +8744,6 @@
       "filter-popup-input-placeholder": "Filtrar valores",
       "filter-popup-match-case": "Diferenciar maiúsculas de minúsculas",
       "inspect-drawer-title": "Inspecionar valor",
-      "inspect-menu-label": "Inspecionar valor",
       "nested-table": {
         "no-data": "Sem dados"
       },
@@ -12795,6 +12789,7 @@
     "description-fields": "Selecionar os campos que devem ser calculados",
     "description-frozen-columns": "",
     "description-min-column-width": "A largura mínima para o redimensionamento automático da coluna",
+    "description-tooltip-from-field": "",
     "name-calculation": "Cálculo",
     "name-cell-height": "Altura da célula",
     "name-cell-type": "Tipo de célula",
@@ -12810,8 +12805,17 @@
     "name-min-column-width": "Largura mínima da coluna",
     "name-show-table-footer": "Mostrar o rodapé da tabela",
     "name-show-table-header": "Mostrar o cabeçalho da tabela",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "auto",
-    "placeholder-fields": "Todos os campos numéricos"
+    "placeholder-fields": "Todos os campos numéricos",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Limpar etiquetas",
diff --git a/public/locales/ru-RU/grafana.json b/public/locales/ru-RU/grafana.json
index 15055efc1ad..c3c14958ddd 100644
--- a/public/locales/ru-RU/grafana.json
+++ b/public/locales/ru-RU/grafana.json
@@ -3668,11 +3668,11 @@
       "button-create": "Создание",
       "button-creating": "Создание...",
       "cancel": "Отмена",
+      "error-invalid-characters": "",
       "error-required": "Требуется имя папки",
       "folder-name-input-placeholder-enter-folder-name": "Ввести имя папки",
       "label-folder-name": "Имя папки",
       "text-pull-request-created": "Создан запрос на включение изменений в папке:",
-      "text-your-folder-will-be-created-as": "Ваша папка будет создана как {{folderName}}",
       "title-pull-request-created": "Создан запрос на включение изменений",
       "title-this-repository-is-read-only": "Репозиторий предназначен только для чтения"
     },
@@ -7568,11 +7568,6 @@
     "select-aria-label": "Фильтр папок",
     "select-placeholder": "Фильтровать по папкам"
   },
-  "folder-picker": {
-    "create-instructions": "Чтобы создать новую папку, нажмите Enter.",
-    "input-placeholder": "Нажмите Enter, чтобы подтвердить новую папку",
-    "loading": "Загрузка папок..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8791,7 +8786,6 @@
       "filter-popup-input-placeholder": "Значения фильтра",
       "filter-popup-match-case": "С учетом регистра",
       "inspect-drawer-title": "Проверить значение",
-      "inspect-menu-label": "Проверить значение",
       "nested-table": {
         "no-data": "Нет данных"
       },
@@ -12877,6 +12871,7 @@
     "description-fields": "Выбрать поля, которые необходимо рассчитать",
     "description-frozen-columns": "",
     "description-min-column-width": "Минимальная ширина для автоматического изменения размера столбцов",
+    "description-tooltip-from-field": "",
     "name-calculation": "Расчет",
     "name-cell-height": "Высота ячеек",
     "name-cell-type": "Тип ячеек",
@@ -12892,8 +12887,17 @@
     "name-min-column-width": "Минимальная ширина столбца",
     "name-show-table-footer": "Показать футер таблицы",
     "name-show-table-header": "Показать заголовок таблицы",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "авто",
-    "placeholder-fields": "Все числовые поля"
+    "placeholder-fields": "Все числовые поля",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Очистить теги",
diff --git a/public/locales/sv-SE/grafana.json b/public/locales/sv-SE/grafana.json
index bdfd29f12dd..4418ba363fa 100644
--- a/public/locales/sv-SE/grafana.json
+++ b/public/locales/sv-SE/grafana.json
@@ -3632,11 +3632,11 @@
       "button-create": "Skapa",
       "button-creating": "Skapar …",
       "cancel": "Avbryt",
+      "error-invalid-characters": "",
       "error-required": "Mappnamn krävs",
       "folder-name-input-placeholder-enter-folder-name": "Ange mappnamn",
       "label-folder-name": "Mappnamn",
       "text-pull-request-created": "En pull-begäran har skapats med ändringar i den här mappen:",
-      "text-your-folder-will-be-created-as": "Din mapp kommer att skapas som {{folderName}}",
       "title-pull-request-created": "Pull-begäran skapad",
       "title-this-repository-is-read-only": "Den här databasen är skrivskyddad"
     },
@@ -7526,11 +7526,6 @@
     "select-aria-label": "Mappfilter",
     "select-placeholder": "Filtrera efter mapp"
   },
-  "folder-picker": {
-    "create-instructions": "Tryck på ENTER för att skapa den nya mappen.",
-    "input-placeholder": "Tryck på Enter för att bekräfta den nya mappen",
-    "loading": "Laddar mappar…"
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8749,7 +8744,6 @@
       "filter-popup-input-placeholder": "Filtrera värden",
       "filter-popup-match-case": "Matcha gemener/versaler",
       "inspect-drawer-title": "Inspektera värde",
-      "inspect-menu-label": "Inspektera värde",
       "nested-table": {
         "no-data": "Inga data"
       },
@@ -12795,6 +12789,7 @@
     "description-fields": "Välj de fält som ska beräknas",
     "description-frozen-columns": "",
     "description-min-column-width": "Minsta bredd för automatisk storleksändring av kolumn",
+    "description-tooltip-from-field": "",
     "name-calculation": "Beräkning",
     "name-cell-height": "Cellhöjd",
     "name-cell-type": "Celltyp",
@@ -12810,8 +12805,17 @@
     "name-min-column-width": "Minsta kolumnbredd",
     "name-show-table-footer": "Visa tabellsidfot",
     "name-show-table-header": "Visa tabellsidhuvud",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "auto",
-    "placeholder-fields": "Alla numeriska fält"
+    "placeholder-fields": "Alla numeriska fält",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Rensa taggar",
diff --git a/public/locales/tr-TR/grafana.json b/public/locales/tr-TR/grafana.json
index df09e65789d..3f660db45cc 100644
--- a/public/locales/tr-TR/grafana.json
+++ b/public/locales/tr-TR/grafana.json
@@ -3632,11 +3632,11 @@
       "button-create": "Oluştur",
       "button-creating": "Oluşturuluyor...",
       "cancel": "İptal",
+      "error-invalid-characters": "",
       "error-required": "Klasör adı gereklidir",
       "folder-name-input-placeholder-enter-folder-name": "Klasör adını girin",
       "label-folder-name": "Klasör adı",
       "text-pull-request-created": "Bu klasörde yapılan değişikliklerle bir çekme isteği oluşturuldu:",
-      "text-your-folder-will-be-created-as": "Klasörünüz şu şekilde oluşturulacak: {{folderName}}",
       "title-pull-request-created": "Çekme isteği oluşturuldu",
       "title-this-repository-is-read-only": "Bu depo salt okunur"
     },
@@ -7526,11 +7526,6 @@
     "select-aria-label": "Klasör filtresi",
     "select-placeholder": "Klasöre göre filtrele"
   },
-  "folder-picker": {
-    "create-instructions": "Yeni klasörü oluşturmak için enter tuşuna basın.",
-    "input-placeholder": "Yeni klasörü onaylamak için Enter tuşuna basın",
-    "loading": "Klasörler yükleniyor..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8749,7 +8744,6 @@
       "filter-popup-input-placeholder": "Değerleri filtrele",
       "filter-popup-match-case": "Büyük/küçük harf duyarlılığı",
       "inspect-drawer-title": "Değeri incele",
-      "inspect-menu-label": "Değeri incele",
       "nested-table": {
         "no-data": "Veri yok"
       },
@@ -12795,6 +12789,7 @@
     "description-fields": "Hesaplanacak alanları seçin",
     "description-frozen-columns": "",
     "description-min-column-width": "Sütunların otomatik olarak yeniden boyutlandırılması için minimum genişlik",
+    "description-tooltip-from-field": "",
     "name-calculation": "Hesaplama",
     "name-cell-height": "Hücre yüksekliği",
     "name-cell-type": "Hücre tipi",
@@ -12810,8 +12805,17 @@
     "name-min-column-width": "Minimum sütun genişliği",
     "name-show-table-footer": "Tablo alt bilgisini göster",
     "name-show-table-header": "Tablo başlığını göster",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "otomatik",
-    "placeholder-fields": "Tüm Sayısal Alanlar"
+    "placeholder-fields": "Tüm Sayısal Alanlar",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "Etiketleri temizle",
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 331b0caca13..17abd39c60e 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -3614,11 +3614,11 @@
       "button-create": "创建",
       "button-creating": "正在创建...",
       "cancel": "取消",
+      "error-invalid-characters": "",
       "error-required": "文件夹名称为必填项",
       "folder-name-input-placeholder-enter-folder-name": "输入文件夹名称",
       "label-folder-name": "文件夹名称",
       "text-pull-request-created": "已创建拉取请求，对此文件夹进行更改：",
-      "text-your-folder-will-be-created-as": "您的文件夹将创建为 {{folderName}}",
       "title-pull-request-created": "拉取请求已创建",
       "title-this-repository-is-read-only": "此存储库为只读"
     },
@@ -7505,11 +7505,6 @@
     "select-aria-label": "文件夹筛选",
     "select-placeholder": "按文件夹筛选"
   },
-  "folder-picker": {
-    "create-instructions": "按 Enter 键以创建新文件夹。",
-    "input-placeholder": "按 Enter 键以确认新文件夹",
-    "loading": "正在加载文件夹..."
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8728,7 +8723,6 @@
       "filter-popup-input-placeholder": "筛选值",
       "filter-popup-match-case": "区分大小写",
       "inspect-drawer-title": "检查值",
-      "inspect-menu-label": "检查值",
       "nested-table": {
         "no-data": "无数据"
       },
@@ -12754,6 +12748,7 @@
     "description-fields": "选择应计算的字段",
     "description-frozen-columns": "",
     "description-min-column-width": "列自动调整大小的最小宽度",
+    "description-tooltip-from-field": "",
     "name-calculation": "计算",
     "name-cell-height": "单元格高度",
     "name-cell-type": "单元格类型",
@@ -12769,8 +12764,17 @@
     "name-min-column-width": "最小列宽",
     "name-show-table-footer": "显示表格页脚",
     "name-show-table-header": "显示表格表头",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "自动",
-    "placeholder-fields": "所有数字字段"
+    "placeholder-fields": "所有数字字段",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "清除标记",
diff --git a/public/locales/zh-Hant/grafana.json b/public/locales/zh-Hant/grafana.json
index 5dd05e6a466..cc7b70ab485 100644
--- a/public/locales/zh-Hant/grafana.json
+++ b/public/locales/zh-Hant/grafana.json
@@ -3614,11 +3614,11 @@
       "button-create": "建立",
       "button-creating": "正在建立…",
       "cancel": "取消",
+      "error-invalid-characters": "",
       "error-required": "資料夾名稱為必填",
       "folder-name-input-placeholder-enter-folder-name": "輸入資料夾名稱",
       "label-folder-name": "資料夾名稱",
       "text-pull-request-created": "已建立拉取請求，其中包含對此資料夾的變更：",
-      "text-your-folder-will-be-created-as": "您的資料夾將建立為「{{folderName}}」",
       "title-pull-request-created": "已建立拉取請求",
       "title-this-repository-is-read-only": "此存放庫為唯讀"
     },
@@ -7505,11 +7505,6 @@
     "select-aria-label": "資料夾篩選條件",
     "select-placeholder": "按資料夾篩選"
   },
-  "folder-picker": {
-    "create-instructions": "按 Enter 鍵建立新資料夾。",
-    "input-placeholder": "按 Enter 鍵確認新資料夾",
-    "loading": "正在載入資料夾…"
-  },
   "folder-repo": {
     "provisioned-badge": "",
     "read-only-badge": ""
@@ -8728,7 +8723,6 @@
       "filter-popup-input-placeholder": "篩選值",
       "filter-popup-match-case": "區分大小寫",
       "inspect-drawer-title": "檢查值",
-      "inspect-menu-label": "檢查值",
       "nested-table": {
         "no-data": "無資料"
       },
@@ -12754,6 +12748,7 @@
     "description-fields": "選擇應計算的欄位",
     "description-frozen-columns": "",
     "description-min-column-width": "欄自動調整大小的最小寬度",
+    "description-tooltip-from-field": "",
     "name-calculation": "計算",
     "name-cell-height": "儲存格高度",
     "name-cell-type": "儲存格類型",
@@ -12769,8 +12764,17 @@
     "name-min-column-width": "最小欄寬",
     "name-show-table-footer": "顯示表格頁尾",
     "name-show-table-header": "顯示表格頁首",
+    "name-tooltip-from-field": "",
+    "name-tooltip-placement": "",
     "placeholder-column-width": "自動",
-    "placeholder-fields": "所有數值欄位"
+    "placeholder-fields": "所有數值欄位",
+    "tooltip-placement-options": {
+      "label-auto": "",
+      "label-bottom": "",
+      "label-left": "",
+      "label-right": "",
+      "label-top": ""
+    }
   },
   "tag-filter": {
     "clear-button": "清除標籤",

From a54453b94070c4450455f146cb569c047cf828c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= <hugo.haggmark@gmail.com>
Date: Tue, 19 Aug 2025 07:07:49 +0200
Subject: [PATCH 237/243] BackendSrv: incorporates validatePath in existing
 RxJs pipe (#107672)

* backendSrv: incorporates validatePath in existing RxJs pipe

* chore: updates after PR feedback
---
 .betterer.results                         |   3 +-
 public/app/core/services/backend_srv.ts   | 207 ++++++++--------
 public/app/core/specs/backend_srv.test.ts | 274 +++++++++++++++++++++-
 public/app/core/utils/fetch.test.ts       |  25 +-
 public/app/core/utils/fetch.ts            |  23 +-
 5 files changed, 408 insertions(+), 124 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 695051344fb..6aec09ff9c7 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -1063,8 +1063,7 @@ exports[`better eslint`] = {
       [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.", "4"]
     ],
     "public/app/core/utils/object.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index f518dc83df7..193a03a6847 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -1,5 +1,16 @@
 import FingerprintJS from '@fingerprintjs/fingerprintjs';
-import { from, lastValueFrom, MonoTypeOperatorFunction, Observable, Subject, Subscription, throwError } from 'rxjs';
+import {
+  from,
+  lastValueFrom,
+  MonoTypeOperatorFunction,
+  Observable,
+  Observer,
+  OperatorFunction,
+  Subject,
+  Subscriber,
+  Subscription,
+  throwError,
+} from 'rxjs';
 import { fromFetch } from 'rxjs/fetch';
 import {
   catchError,
@@ -149,13 +160,6 @@ export class BackendSrv implements BackendService {
     const requestId = options.requestId ?? `chunked-${this.chunkRequestId++}`;
     const controller = new AbortController();
 
-    let url: string;
-    try {
-      url = parseUrlFromOptions(options);
-    } catch (error) {
-      return throwError(() => error);
-    }
-
     const init = parseInitFromOptions({
       ...options,
       requestId,
@@ -163,62 +167,10 @@ export class BackendSrv implements BackendService {
     });
 
     return new Observable((observer) => {
-      let done = false;
       // Calling fromFetch explicitly avoids the request queue
-      const sub = this.dependencies.fromFetch(url, init).subscribe({
-        next: (response) => {
-          const rsp = {
-            status: response.status,
-            statusText: response.statusText,
-            ok: response.ok,
-            headers: response.headers,
-            url: response.url,
-            type: response.type,
-            redirected: response.redirected,
-            config: options,
-            traceId: response.headers.get(GRAFANA_TRACEID_HEADER) ?? undefined,
-            data: undefined,
-          };
-
-          if (!response.body) {
-            observer.next(rsp);
-            observer.complete();
-            return;
-          }
-
-          const reader = response.body.getReader();
-          async function process() {
-            while (reader && !done) {
-              if (controller.signal.aborted) {
-                reader.cancel(controller.signal.reason);
-                console.log(requestId, 'signal.aborted');
-                return;
-              }
-              const chunk = await reader.read();
-              observer.next({
-                ...rsp,
-                data: chunk.value,
-              });
-              if (chunk.done) {
-                done = true;
-                console.log(requestId, 'done');
-              }
-            }
-          }
-          process()
-            .then(() => {
-              console.log(requestId, 'complete');
-              observer.complete();
-            }) // runs in background
-            .catch((e) => {
-              console.log(requestId, 'catch', e);
-              observer.error(e);
-            }); // from abort
-        },
-        error: (e) => {
-          observer.error(e);
-        },
-      });
+      const sub = parseUrlFromOptions(options)
+        .pipe(mergeMap((url) => this.dependencies.fromFetch(url, init)))
+        .subscribe(this.getChunkedResponseObserver({ controller, observer, options, requestId }));
 
       return function unsubscribe() {
         console.log(requestId, 'unsubscribe');
@@ -228,6 +180,76 @@ export class BackendSrv implements BackendService {
     });
   }
 
+  private getChunkedResponseObserver({
+    controller,
+    observer,
+    options,
+    requestId,
+  }: {
+    controller: AbortController;
+    observer: Subscriber<FetchResponse<Uint8Array<ArrayBufferLike> | undefined>>;
+    options: BackendSrvRequest;
+    requestId: string;
+  }): Partial<Observer<Response>> {
+    let done = false;
+    return {
+      next: (response) => {
+        const rsp = {
+          status: response.status,
+          statusText: response.statusText,
+          ok: response.ok,
+          headers: response.headers,
+          url: response.url,
+          type: response.type,
+          redirected: response.redirected,
+          config: options,
+          traceId: response.headers.get(GRAFANA_TRACEID_HEADER) ?? undefined,
+          data: undefined,
+        };
+
+        if (!response.body) {
+          observer.next(rsp);
+          observer.complete();
+          return;
+        }
+
+        const reader = response.body.getReader();
+
+        // Setup onabort callback so that we can cancel the reader properly
+        controller.signal.onabort = () => {
+          reader.cancel(controller.signal.reason);
+          console.log(requestId, 'signal.aborted');
+        };
+
+        async function process() {
+          while (reader && !done) {
+            const chunk = await reader.read();
+            observer.next({
+              ...rsp,
+              data: chunk.value,
+            });
+            if (chunk.done) {
+              done = true;
+              console.log(requestId, 'done');
+            }
+          }
+        }
+        process()
+          .then(() => {
+            console.log(requestId, 'complete');
+            observer.complete();
+          }) // runs in background
+          .catch((e) => {
+            console.log(requestId, 'catch', e);
+            observer.error(e);
+          }); // from abort
+      },
+      error: (e) => {
+        observer.error(e);
+      },
+    };
+  }
+
   private internalFetch<T>(options: BackendSrvRequest): Observable<FetchResponse<T>> {
     if (options.requestId) {
       this.inFlightRequests.next(options.requestId);
@@ -248,7 +270,8 @@ export class BackendSrv implements BackendService {
       options.headers['X-Grafana-Device-Id'] = `${this.deviceID}`;
     }
 
-    return this.getFromFetchStream<T>(options).pipe(
+    return parseUrlFromOptions(options).pipe(
+      this.getFromFetchStream<T>(options),
       this.handleStreamResponse<T>(options),
       this.handleStreamError(options),
       this.handleStreamCancellation(options)
@@ -302,38 +325,36 @@ export class BackendSrv implements BackendService {
     return options;
   }
 
-  private getFromFetchStream<T>(options: BackendSrvRequest): Observable<FetchResponse<T>> {
-    const init = parseInitFromOptions(options);
+  private getFromFetchStream<T>(options: BackendSrvRequest): OperatorFunction<string, FetchResponse<T>> {
+    return (inputStream) =>
+      inputStream.pipe(
+        mergeMap((url) => {
+          const init = parseInitFromOptions(options);
 
-    let url: string;
-    try {
-      url = parseUrlFromOptions(options);
-    } catch (error) {
-      return throwError(() => error);
-    }
+          return this.dependencies.fromFetch(url, init).pipe(
+            mergeMap(async (response) => {
+              const { status, statusText, ok, headers, url, type, redirected } = response;
 
-    return this.dependencies.fromFetch(url, init).pipe(
-      mergeMap(async (response) => {
-        const { status, statusText, ok, headers, url, type, redirected } = response;
+              const responseType = options.responseType ?? (isContentTypeJson(headers) ? 'json' : undefined);
 
-        const responseType = options.responseType ?? (isContentTypeJson(headers) ? 'json' : undefined);
-
-        const data = await parseResponseBody<T>(response, responseType);
-        const fetchResponse: FetchResponse<T> = {
-          status,
-          statusText,
-          ok,
-          data,
-          headers,
-          url,
-          type,
-          redirected,
-          config: options,
-          traceId: response.headers.get(GRAFANA_TRACEID_HEADER) ?? undefined,
-        };
-        return fetchResponse;
-      })
-    );
+              const data = await parseResponseBody<T>(response, responseType);
+              const fetchResponse: FetchResponse<T> = {
+                status,
+                statusText,
+                ok,
+                data,
+                headers,
+                url,
+                type,
+                redirected,
+                config: options,
+                traceId: response.headers.get(GRAFANA_TRACEID_HEADER) ?? undefined,
+              };
+              return fetchResponse;
+            })
+          );
+        })
+      );
   }
 
   showApplicationErrorAlert(err: FetchError) {}
diff --git a/public/app/core/specs/backend_srv.test.ts b/public/app/core/specs/backend_srv.test.ts
index 097788913d8..9ad572dbac3 100644
--- a/public/app/core/specs/backend_srv.test.ts
+++ b/public/app/core/specs/backend_srv.test.ts
@@ -1,4 +1,4 @@
-import { Observable, of, lastValueFrom } from 'rxjs';
+import { Observable, of, lastValueFrom, throwError } from 'rxjs';
 import { fromFetch } from 'rxjs/fetch';
 import { delay } from 'rxjs/operators';
 
@@ -782,22 +782,19 @@ describe('backendSrv', () => {
         await expect(promise).rejects.toThrow(PathValidationError);
       });
 
-      it('should sanitise paths when calling .fetch', (done) => {
+      it('should sanitise paths when calling .fetch', async () => {
         const { backendSrv } = getTestContext();
         const maliciousUrl = '/api/users/%2e%2e/admin';
 
-        const observable = backendSrv.fetch({ url: maliciousUrl, method: 'GET', validatePath: true });
+        await expect(backendSrv.fetch({ url: maliciousUrl, method: 'GET', validatePath: true })).toEmitValuesWith(
+          (received) => {
+            expect(received.length).toEqual(1);
 
-        observable.subscribe({
-          next: () => {
-            throw new Error('Should not succeed');
-          },
-          error: (err) => {
-            expect(err).toBeInstanceOf(PathValidationError);
-            expect(err.message).toBe('Invalid request path');
-            done();
-          },
-        });
+            const processed: FetchError = received[0];
+            expect(processed).toBeInstanceOf(PathValidationError);
+            expect(processed.message).toBe('Invalid request path');
+          }
+        );
       });
     });
 
@@ -883,4 +880,255 @@ describe('backendSrv', () => {
       });
     });
   });
+
+  describe('chunked', () => {
+    beforeEach(() => {
+      // we do a bunch of console.log in the chunked function
+      jest.spyOn(console, 'log').mockImplementation(() => {});
+    });
+
+    afterEach(() => {
+      jest.resetAllMocks();
+    });
+
+    describe('when making a successful chunked request', () => {
+      it('then it should return chunks of data', async () => {
+        const url = '/api/chunked-data';
+        const { backendSrv, fromFetchMock } = getTestContext({ url });
+
+        // Mock a ReadableStream with chunks
+        const chunks = [new Uint8Array([1, 2, 3]), new Uint8Array([4, 5, 6]), new Uint8Array([7, 8, 9])];
+
+        let chunkIndex = 0;
+        const mockReader = {
+          read: jest.fn().mockImplementation(() => {
+            if (chunkIndex < chunks.length) {
+              return Promise.resolve({
+                done: false,
+                value: chunks[chunkIndex++],
+              });
+            }
+            return Promise.resolve({ done: true, value: undefined });
+          }),
+          cancel: jest.fn(),
+        };
+
+        const mockBody = {
+          getReader: jest.fn().mockReturnValue(mockReader),
+        };
+
+        const mockResponse = {
+          ok: true,
+          status: 200,
+          statusText: 'OK',
+          headers: [],
+          body: mockBody,
+          url,
+          type: 'basic',
+          redirected: false,
+        };
+
+        fromFetchMock.mockReturnValue(of(mockResponse));
+
+        const options = { url, method: 'GET' };
+
+        await expect(backendSrv.chunked(options)).toEmitValuesWith((received) => {
+          const { body, ...rest } = mockResponse;
+          const config = { ...options };
+          const expected = { ...rest, config };
+          expect(received).toHaveLength(4); // 3 chunks + 1 final response
+          expect(received[0]).toEqual({ ...expected, data: new Uint8Array([1, 2, 3]) });
+          expect(received[1]).toEqual({ ...expected, data: new Uint8Array([4, 5, 6]) });
+          expect(received[2]).toEqual({ ...expected, data: new Uint8Array([7, 8, 9]) });
+          expect(received[3]).toEqual({ ...expected, data: undefined });
+          expect(mockReader.read).toHaveBeenCalledTimes(4);
+        });
+      });
+    });
+
+    describe('when request is cancelled', () => {
+      it('then it should abort the request and cancel the reader', async () => {
+        jest.useFakeTimers();
+        const url = '/api/chunked-data';
+        const { backendSrv, fromFetchMock } = getTestContext({ url });
+
+        const mockReader = {
+          read: jest.fn().mockImplementation(() => {
+            return new Promise(() => {}); // Never resolves
+          }),
+          cancel: jest.fn(),
+        };
+
+        const mockBody = {
+          getReader: jest.fn().mockReturnValue(mockReader),
+        };
+
+        const mockResponse = {
+          ok: true,
+          status: 200,
+          statusText: 'OK',
+          headers: [],
+          body: mockBody,
+          url,
+          type: 'basic',
+          redirected: false,
+        };
+
+        fromFetchMock.mockReturnValue(of(mockResponse));
+
+        const options = { url, method: 'GET' };
+
+        const subscription = backendSrv.chunked(options).subscribe();
+
+        // Cancel the request
+        subscription.unsubscribe();
+
+        // Fast-forward until all timers have been executed
+        jest.advanceTimersByTime(100);
+
+        expect(mockReader.cancel).toHaveBeenCalled();
+      });
+    });
+
+    describe('when request throws an error', () => {
+      it('then it should complete immediately', async () => {
+        const url = '/api/chunked-data';
+        const { backendSrv, fromFetchMock } = getTestContext({ url });
+
+        fromFetchMock.mockReturnValue(throwError(() => new Error('Server error')));
+
+        const options = { url, method: 'GET' };
+
+        await expect(backendSrv.chunked(options)).toEmitValuesWith((received) => {
+          expect(received).toHaveLength(1);
+
+          const error: FetchError = received[0];
+
+          expect(error).toBeInstanceOf(Error);
+          expect(error.message).toEqual('Server error');
+        });
+      });
+    });
+
+    describe('when response has no body', () => {
+      it('then it should complete immediately', async () => {
+        const url = '/api/chunked-data';
+        const { backendSrv, fromFetchMock } = getTestContext({ url });
+
+        const mockResponse = {
+          ok: true,
+          status: 200,
+          statusText: 'OK',
+          headers: [],
+          body: null,
+          url,
+          type: 'basic',
+          redirected: false,
+        };
+
+        fromFetchMock.mockReturnValue(of(mockResponse));
+
+        const options = { url, method: 'GET' };
+
+        await expect(backendSrv.chunked(options)).toEmitValuesWith((received) => {
+          const { body, ...rest } = mockResponse;
+          const config = { ...options };
+          const expected = { ...rest, config };
+          expect(received).toHaveLength(1);
+          expect(received[0]).toEqual({ ...expected, data: undefined });
+        });
+      });
+    });
+
+    describe('when validatePath is true and url is malicious', () => {
+      it('then it should throw an PathValidationError', async () => {
+        const url = '/api/users/%2e%2e/admin';
+        const { backendSrv, fromFetchMock } = getTestContext({ url });
+
+        const mockResponse = {
+          ok: true,
+          status: 200,
+          statusText: 'OK',
+          headers: [],
+          body: null,
+          url,
+          type: 'basic',
+          redirected: false,
+        };
+
+        fromFetchMock.mockReturnValue(of(mockResponse));
+
+        const options = { url, method: 'GET', validatePath: true };
+
+        await expect(backendSrv.chunked(options)).toEmitValuesWith((received) => {
+          expect(received).toHaveLength(1);
+
+          const error: FetchError = received[0];
+
+          expect(error).toBeInstanceOf(PathValidationError);
+          expect(error.message).toEqual('Invalid request path');
+        });
+      });
+    });
+
+    describe('when validatePath is true and url is not malicious', () => {
+      it('then it should return correct chunks', async () => {
+        const url = '/api/chunked-data';
+        const { backendSrv, fromFetchMock } = getTestContext({ url });
+
+        const mockResponse = {
+          ok: true,
+          status: 200,
+          statusText: 'OK',
+          headers: [],
+          body: null,
+          url,
+          type: 'basic',
+          redirected: false,
+        };
+
+        fromFetchMock.mockReturnValue(of(mockResponse));
+
+        const options = { url, method: 'GET', validatePath: true };
+
+        await expect(backendSrv.chunked(options)).toEmitValuesWith((received) => {
+          const { body, ...rest } = mockResponse;
+          const config = { ...options };
+          const expected = { ...rest, config };
+          expect(received).toHaveLength(1);
+          expect(received[0]).toEqual({ ...expected, data: undefined });
+        });
+      });
+    });
+
+    describe('when validatePath is false and url is malicious', () => {
+      it('then it should return correct chunks', async () => {
+        const url = '/api/users/%2e%2e/admin';
+        const { backendSrv, fromFetchMock } = getTestContext({ url });
+
+        const mockResponse = {
+          ok: true,
+          status: 200,
+          statusText: 'OK',
+          headers: [],
+          body: null,
+          url,
+          type: 'basic',
+          redirected: false,
+        };
+
+        fromFetchMock.mockReturnValue(of(mockResponse));
+
+        const options = { url, method: 'GET', validatePath: false };
+
+        await expect(backendSrv.chunked(options)).toEmitValuesWith((received) => {
+          const { body, ...rest } = mockResponse;
+          const config = { ...options };
+          const expected = { ...rest, config };
+          expect(received).toHaveLength(1);
+          expect(received[0]).toEqual({ ...expected, data: undefined });
+        });
+      });
+    });
+  });
 });
diff --git a/public/app/core/utils/fetch.test.ts b/public/app/core/utils/fetch.test.ts
index cd613132413..b764f61bb49 100644
--- a/public/app/core/utils/fetch.test.ts
+++ b/public/app/core/utils/fetch.test.ts
@@ -27,20 +27,29 @@ describe('parseUrlFromOptions', () => {
     ${{ id: [] }}                                               | ${'api/dashboard'} | ${'api/dashboard'}
   `(
     "when called with params: '$params' and url: '$url' then result should be '$expected'",
-    ({ params, url, expected }) => {
-      expect(parseUrlFromOptions({ params, url })).toEqual(expected);
+    async ({ params, url, expected }) => {
+      await expect(parseUrlFromOptions({ params, url })).toEmitValuesWith((received) => {
+        expect(received).toHaveLength(1);
+        expect(received[0]).toEqual(expected);
+      });
     }
   );
 
-  it('should validate the path if validatePath is true', () => {
-    expect(() => parseUrlFromOptions({ url: '/api/users/%2e%2e/admin', validatePath: true })).toThrow(
-      PathValidationError
+  it('should validate the path if validatePath is true', async () => {
+    await expect(parseUrlFromOptions({ url: '/api/users/%2e%2e/admin', validatePath: true })).toEmitValuesWith(
+      (received) => {
+        expect(received).toHaveLength(1);
+        expect(received[0]).toBeInstanceOf(PathValidationError);
+      }
     );
   });
 
-  it('should not validate the path if validatePath is false', () => {
-    expect(parseUrlFromOptions({ url: '/api/users/%2e%2e/admin', validatePath: false })).toEqual(
-      '/api/users/%2e%2e/admin'
+  it('should not validate the path if validatePath is false', async () => {
+    await expect(parseUrlFromOptions({ url: '/api/users/%2e%2e/admin', validatePath: false })).toEmitValuesWith(
+      (received) => {
+        expect(received).toHaveLength(1);
+        expect(received[0]).toEqual('/api/users/%2e%2e/admin');
+      }
     );
   });
 });
diff --git a/public/app/core/utils/fetch.ts b/public/app/core/utils/fetch.ts
index a456f35e066..e714e944dc9 100644
--- a/public/app/core/utils/fetch.ts
+++ b/public/app/core/utils/fetch.ts
@@ -1,4 +1,5 @@
 import { omitBy } from 'lodash';
+import { Observable, of, throwError } from 'rxjs';
 
 import { deprecationWarning, validatePath } from '@grafana/data';
 import { BackendSrvRequest } from '@grafana/runtime';
@@ -152,7 +153,7 @@ export async function parseResponseBody<T>(
   return textData as T;
 }
 
-function serializeParams(data: Record<string, any>): string {
+function serializeParams(data: Record<string, string | number | boolean | Array<string | number | boolean>>): string {
   return Object.keys(data)
     .map((key) => {
       const value = data[key];
@@ -167,16 +168,22 @@ function serializeParams(data: Record<string, any>): string {
 /**
  * Formats and validates the URL.
  * If options.validatePath is true, this will throw an exception if the URL fails validation.
+ * @param options - The options to parse.
+ * @returns An observable that emits the parsed URL or an error if the URL fails validation.
  */
-export const parseUrlFromOptions = (options: BackendSrvRequest): string => {
-  const cleanParams = omitBy(options.params, (v) => v === undefined || (v && v.length === 0));
-  const serializedParams = serializeParams(cleanParams);
+export const parseUrlFromOptions = (options: BackendSrvRequest): Observable<string> => {
+  try {
+    const cleanParams = omitBy(options.params, (v) => v === undefined || (v && v.length === 0));
+    const serializedParams = serializeParams(cleanParams);
 
-  const url = options.validatePath //
-    ? validatePath(options.url)
-    : options.url;
+    const url = options.validatePath //
+      ? validatePath(options.url)
+      : options.url;
 
-  return options.params && serializedParams.length ? `${url}?${serializedParams}` : url;
+    return options.params && serializedParams.length ? of(`${url}?${serializedParams}`) : of(url);
+  } catch (error) {
+    return throwError(() => error);
+  }
 };
 
 export const parseCredentials = (options: BackendSrvRequest): RequestCredentials => {

From 2f4166e456b7d2ec99451f8058b90b1c6dc1ad99 Mon Sep 17 00:00:00 2001
From: Alex Khomenko <Clarity-89@users.noreply.github.com>
Date: Tue, 19 Aug 2025 08:22:05 +0300
Subject: [PATCH 238/243] CommandPalette: Use fuzzySearch util from
 grafana/data (#108884)

* CommandPalette: Use fuzzySearch util from grafana/data

* Comment
---
 .../app/features/commandPalette/useMatches.ts | 65 +++----------------
 1 file changed, 10 insertions(+), 55 deletions(-)

diff --git a/public/app/features/commandPalette/useMatches.ts b/public/app/features/commandPalette/useMatches.ts
index 50926b10b80..42a5716bd8d 100644
--- a/public/app/features/commandPalette/useMatches.ts
+++ b/public/app/features/commandPalette/useMatches.ts
@@ -1,10 +1,11 @@
-import uFuzzy from '@leeoniya/ufuzzy';
 import { ActionImpl, Priority, useKBar } from 'kbar';
 import { useThrottledValue } from 'kbar/lib/utils';
 import * as React from 'react';
 
+import { fuzzySearch } from '@grafana/data';
+
 // From https://github.dev/timc1/kbar/blob/main/src/useMatches.tsx
-// TODO: Go back to useMatches from kbar when https://github.com/timc1/kbar/issues/255 is fixed
+// We are using fuzzySearch here instead of kbar's implementation as it's more performant
 
 export const NO_GROUP = {
   name: 'none',
@@ -169,8 +170,6 @@ type Match = {
 };
 
 function useInternalMatches(filtered: ActionImpl[], search: string): Match[] {
-  const ufuzzy = useUfuzzy();
-
   const value = React.useMemo(
     () => ({
       filtered,
@@ -188,58 +187,14 @@ function useInternalMatches(filtered: ActionImpl[], search: string): Match[] {
 
     const haystack = throttledFiltered.map(({ name, keywords }) => `${name} ${keywords ?? ''}`.toLowerCase());
 
-    const results: Match[] = [];
+    const matchingIndices = fuzzySearch(haystack, throttledSearch);
 
-    // If the search term is too long, then just do a simple substring search.
-    // We don't expect users to actually hit this frequently, but want to prevent browser hangs
-    if (throttledSearch.length > FUZZY_SEARCH_LIMIT) {
-      const query = throttledSearch.toLowerCase();
-
-      for (let haystackIndex = 0; haystackIndex < haystack.length; haystackIndex++) {
-        const haystackItem = haystack[haystackIndex];
-
-        // Use the position of the match as a stand-in for score
-        const substringPosition = haystackItem.indexOf(query);
-
-        if (substringPosition > -1) {
-          const score = substringPosition * -1; // lower position of the match should be a higher priority score
-          const action = throttledFiltered[haystackIndex];
-          results.push({ score, action });
-        }
-      }
-    } else {
-      const termCount = ufuzzy.split(throttledSearch).length;
-      const infoThresh = Infinity;
-      const oooLimit = termCount < 5 ? 4 : 0;
-
-      const [, info, order] = ufuzzy.search(haystack, throttledSearch, oooLimit, infoThresh);
-
-      if (info && order) {
-        for (let orderIndex = 0; orderIndex < order.length; orderIndex++) {
-          const actionIndex = order[orderIndex];
-          const score = order.length - orderIndex;
-          const action = throttledFiltered[info.idx[actionIndex]];
-          results.push({ score, action });
-        }
-      }
-    }
+    // Convert indices back to Match objects with proper scoring
+    const results: Match[] = matchingIndices.map((index, order) => ({
+      action: throttledFiltered[index],
+      score: matchingIndices.length - order, // Higher score for better ranked matches
+    }));
 
     return results;
-  }, [throttledFiltered, throttledSearch, ufuzzy]);
-}
-
-const FUZZY_SEARCH_LIMIT = 25;
-
-function useUfuzzy(): uFuzzy {
-  const ref = React.useRef<uFuzzy>();
-
-  if (!ref.current) {
-    ref.current = new uFuzzy({
-      // See https://github.com/leeoniya/uFuzzy#options
-      intraMode: 0, // don't allow for typos/extra letters
-      intraIns: 0, // require each term in the search to appear exactly
-    });
-  }
-
-  return ref.current;
+  }, [throttledFiltered, throttledSearch]);
 }

From dff7050aaac3a7ef502f6e91a6a9a99421e9408a Mon Sep 17 00:00:00 2001
From: Konrad Lalik <konradlalik@gmail.com>
Date: Tue, 19 Aug 2025 09:08:15 +0200
Subject: [PATCH 239/243] Alerting: Add GMA export to the new list page
 (#109784)

* Add GMA export to the More menu action on the list page

* Add Grafana rules export option to the new list page

* Update translations
---
 public/app/features/alerting/unified/mocks.ts |  2 +-
 .../unified/rule-list/RuleList.v2.test.tsx    | 94 ++++++++++++++++++-
 .../unified/rule-list/RuleList.v2.tsx         | 18 +++-
 public/locales/en-US/grafana.json             |  1 +
 4 files changed, 111 insertions(+), 4 deletions(-)

diff --git a/public/app/features/alerting/unified/mocks.ts b/public/app/features/alerting/unified/mocks.ts
index 0202406bf8e..6378aa33ddc 100644
--- a/public/app/features/alerting/unified/mocks.ts
+++ b/public/app/features/alerting/unified/mocks.ts
@@ -645,7 +645,7 @@ export const grantUserPermissions = (permissions: AccessControlAction[]) => {
 };
 
 export const grantUserRole = (role: string) => {
-  jest.spyOn(contextSrv, 'hasRole').mockReturnValue(true);
+  jest.spyOn(contextSrv, 'hasRole').mockImplementation((checkRole) => checkRole === role);
 };
 
 export function mockUnifiedAlertingStore(unifiedAlerting?: Partial<StoreState['unifiedAlerting']>) {
diff --git a/public/app/features/alerting/unified/rule-list/RuleList.v2.test.tsx b/public/app/features/alerting/unified/rule-list/RuleList.v2.test.tsx
index 9417ffa2230..3b150a698df 100644
--- a/public/app/features/alerting/unified/rule-list/RuleList.v2.test.tsx
+++ b/public/app/features/alerting/unified/rule-list/RuleList.v2.test.tsx
@@ -1,11 +1,14 @@
+import { HttpResponse } from 'msw';
 import { render } from 'test/test-utils';
 import { byRole, byTestId } from 'testing-library-selector';
 
+import { OrgRole } from '@grafana/data';
 import { setPluginComponentsHook, setPluginLinksHook } from '@grafana/runtime';
 import { AccessControlAction } from 'app/types/accessControl';
 
 import { setupMswServer } from '../mockApi';
-import { grantUserPermissions } from '../mocks';
+import { grantUserPermissions, grantUserRole } from '../mocks';
+import { setGrafanaRuleGroupExportResolver } from '../mocks/server/configure';
 import { alertingFactory } from '../mocks/server/db';
 import { RulesFilter } from '../search/rulesSearchParser';
 import { testWithFeatureToggles } from '../test/test-utils';
@@ -162,11 +165,16 @@ describe('RuleListActions', () => {
       newAlertRuleForExport: byRole('link', { name: /new alert rule for export/i }),
       newGrafanaRecordingRule: byRole('link', { name: /new grafana recording rule/i }),
       newDataSourceRecordingRule: byRole('link', { name: /new data source recording rule/i }),
+      importAlertRules: byRole('link', { name: /import alert rules/i }),
+      exportAllGrafanaRules: byRole('menuitem', { name: /export all grafana rules/i }),
     },
+    exportDrawer: byRole('dialog', { name: /export/i }),
   };
 
   beforeEach(() => {
     jest.clearAllMocks();
+    // Default to Viewer role (non-admin)
+    grantUserRole(OrgRole.Viewer);
   });
 
   it.each([
@@ -243,6 +251,90 @@ describe('RuleListActions', () => {
     expect(ui.menuOptions.newGrafanaRecordingRule.query(menu)).toBeInTheDocument();
     expect(ui.menuOptions.newDataSourceRecordingRule.query(menu)).toBeInTheDocument();
   });
+
+  describe('Import Alert Rules', () => {
+    testWithFeatureToggles(['alertingMigrationUI']);
+
+    it('should show "Import alert rules" option when user is admin and feature toggle is enabled', async () => {
+      grantUserRole(OrgRole.Admin);
+      grantUserPermissions([AccessControlAction.AlertingRuleRead]);
+
+      const { user } = render(<RuleListActions />);
+
+      await user.click(ui.moreButton.get());
+      const menu = await ui.moreMenu.find();
+
+      expect(ui.menuOptions.importAlertRules.query(menu)).toBeInTheDocument();
+    });
+
+    it('should not show "Import alert rules" option when user is not admin', async () => {
+      // Keep default Viewer role
+      grantUserPermissions([AccessControlAction.AlertingRuleRead]);
+
+      const { user } = render(<RuleListActions />);
+
+      await user.click(ui.moreButton.get());
+      const menu = await ui.moreMenu.find();
+
+      expect(ui.menuOptions.importAlertRules.query(menu)).not.toBeInTheDocument();
+    });
+
+    it('should have correct URL for "Import alert rules" menu item', async () => {
+      grantUserRole(OrgRole.Admin);
+      grantUserPermissions([AccessControlAction.AlertingRuleRead]);
+
+      const { user } = render(<RuleListActions />);
+
+      await user.click(ui.moreButton.get());
+      const menu = await ui.moreMenu.find();
+      const importMenuItem = ui.menuOptions.importAlertRules.get(menu);
+
+      expect(importMenuItem).toHaveAttribute('href', '/alerting/import-datasource-managed-rules');
+    });
+  });
+
+  describe('Export All Grafana Rules', () => {
+    it('should show "Export all Grafana rules" option when user has export permissions', async () => {
+      grantUserPermissions([AccessControlAction.AlertingRuleRead]);
+
+      const { user } = render(<RuleListActions />);
+
+      await user.click(ui.moreButton.get());
+      const menu = await ui.moreMenu.find();
+
+      expect(ui.menuOptions.exportAllGrafanaRules.query(menu)).toBeInTheDocument();
+    });
+
+    it('should not show "Export all Grafana rules" option when user lacks export permissions', async () => {
+      grantUserPermissions([]); // No permissions
+
+      const { user } = render(<RuleListActions />);
+
+      await user.click(ui.moreButton.get());
+      const menu = await ui.moreMenu.find();
+
+      expect(ui.menuOptions.exportAllGrafanaRules.query(menu)).not.toBeInTheDocument();
+    });
+
+    it('should open export drawer when "Export all Grafana rules" is clicked', async () => {
+      // Set up MSW mock for export endpoint
+      setGrafanaRuleGroupExportResolver(() => {
+        return HttpResponse.text('# Mock YAML export content\ngroups: []');
+      });
+
+      grantUserPermissions([AccessControlAction.AlertingRuleRead]);
+
+      const { user } = render(<RuleListActions />);
+
+      await user.click(ui.moreButton.get());
+      const menu = await ui.moreMenu.find();
+      const exportMenuItem = ui.menuOptions.exportAllGrafanaRules.get(menu);
+
+      await user.click(exportMenuItem);
+
+      expect(ui.exportDrawer.query()).toBeInTheDocument();
+    });
+  });
 });
 
 describe('RuleList v2 - View switching', () => {
diff --git a/public/app/features/alerting/unified/rule-list/RuleList.v2.tsx b/public/app/features/alerting/unified/rule-list/RuleList.v2.tsx
index a677cb1d248..7f0ae393755 100644
--- a/public/app/features/alerting/unified/rule-list/RuleList.v2.tsx
+++ b/public/app/features/alerting/unified/rule-list/RuleList.v2.tsx
@@ -1,10 +1,12 @@
 import { useMemo } from 'react';
+import { useToggle } from 'react-use';
 
 import { Trans, t } from '@grafana/i18n';
 import { config } from '@grafana/runtime';
 import { Button, Dropdown, Icon, LinkButton, Menu, Stack } from '@grafana/ui';
 
 import { AlertingPageWrapper } from '../components/AlertingPageWrapper';
+import { GrafanaRulesExporter } from '../components/export/GrafanaRulesExporter';
 import RulesFilter from '../components/rules/Filter/RulesFilter';
 import { useListViewMode } from '../components/rules/Filter/RulesViewModeSelector';
 import { AIAlertRuleButtonComponent } from '../enterprise-components/AI/AIGenAlertRuleButton/addAIAlertRuleButton';
@@ -35,13 +37,17 @@ function RuleList() {
 export function RuleListActions() {
   const [createGrafanaRuleSupported, createGrafanaRuleAllowed] = useAlertingAbility(AlertingAction.CreateAlertRule);
   const [createCloudRuleSupported, createCloudRuleAllowed] = useAlertingAbility(AlertingAction.CreateExternalAlertRule);
+  const [exportRulesSupported, exportRulesAllowed] = useAlertingAbility(AlertingAction.ExportGrafanaManagedRules);
 
   const canCreateGrafanaRules = createGrafanaRuleSupported && createGrafanaRuleAllowed;
   const canCreateCloudRules = createCloudRuleSupported && createCloudRuleAllowed;
+  const canExportRules = exportRulesSupported && exportRulesAllowed;
 
   const canCreateRules = canCreateGrafanaRules || canCreateCloudRules;
   const canImportRulesToGMA = isAdmin() && config.featureToggles.alertingMigrationUI;
 
+  const [showExportDrawer, toggleShowExportDrawer] = useToggle(false);
+
   const moreActionsMenu = useMemo(
     () => (
       <Menu>
@@ -51,10 +57,17 @@ export function RuleListActions() {
             icon="file-export"
             url="/alerting/export-new-rule"
           />
+          {canExportRules && (
+            <Menu.Item
+              label={t('alerting.rule-list.export-all-grafana-rules', 'Export all Grafana rules')}
+              icon="download-alt"
+              onClick={toggleShowExportDrawer}
+            />
+          )}
           {canImportRulesToGMA && (
             <Menu.Item
               label={t('alerting.rule-list-v2.import-to-gma', 'Import alert rules')}
-              icon="import"
+              icon="upload"
               url="/alerting/import-datasource-managed-rules"
             />
           )}
@@ -77,7 +90,7 @@ export function RuleListActions() {
         </Menu.Group>
       </Menu>
     ),
-    [canCreateGrafanaRules, canCreateCloudRules, canImportRulesToGMA]
+    [canCreateGrafanaRules, canCreateCloudRules, canImportRulesToGMA, canExportRules, toggleShowExportDrawer]
   );
 
   return (
@@ -93,6 +106,7 @@ export function RuleListActions() {
           <Trans i18nKey="alerting.rule-list.more">More</Trans> <Icon name="angle-down" />
         </Button>
       </Dropdown>
+      {canExportRules && showExportDrawer && <GrafanaRulesExporter onClose={toggleShowExportDrawer} />}
     </Stack>
   );
 }
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index c49a81b5ae7..7ca4d97c8e3 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -2467,6 +2467,7 @@
       },
       "empty-data-source": "No rules found",
       "error-button": "Error",
+      "export-all-grafana-rules": "Export all Grafana rules",
       "filter-view": {
         "cancel-search": "Cancel search",
         "no-more-results": "No more results – found {{numberOfRules}} rules",

From bdd5bf03975e1bf6b11bf4f871956b14d92808ef Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Tue, 19 Aug 2025 09:32:10 +0200
Subject: [PATCH 240/243] Alerting: Configurable queue and batch size in
 external alert manager notifier (#109831)

---
 pkg/services/ngalert/sender/notifier.go      |  24 ++--
 pkg/services/ngalert/sender/notifier_ext.go  |   9 ++
 pkg/services/ngalert/sender/notifier_test.go |  31 ++---
 pkg/services/ngalert/sender/sender.go        |  65 +++++++---
 pkg/services/ngalert/sender/sender_test.go   | 119 +++++++++++++++++++
 5 files changed, 205 insertions(+), 43 deletions(-)

diff --git a/pkg/services/ngalert/sender/notifier.go b/pkg/services/ngalert/sender/notifier.go
index ef1022921e2..2ba819a8c41 100644
--- a/pkg/services/ngalert/sender/notifier.go
+++ b/pkg/services/ngalert/sender/notifier.go
@@ -1,6 +1,6 @@
 // THIS FILE IS COPIED FROM UPSTREAM
 //
-// https://github.com/prometheus/prometheus/blob/293f0c9185260165fd7dabbf8a9e8758b32abeae/notifier/notifier.go
+// https://github.com/prometheus/prometheus/blob/bd5b2ea95ce14fba11db871b4068313408465207/notifier/notifier.go
 //
 // Copyright 2013 The Prometheus Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +31,6 @@ import (
 	"time"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/grafana/grafana/pkg/util/httpclient"
 	"github.com/prometheus/alertmanager/api/v2/models"
 	"github.com/prometheus/client_golang/prometheus"
 	config_util "github.com/prometheus/common/config"
@@ -48,6 +47,9 @@ import (
 )
 
 const (
+	// DefaultMaxBatchSize is the default maximum number of alerts to send in a single request to the alertmanager.
+	DefaultMaxBatchSize = 256
+
 	contentTypeJSON = "application/json"
 )
 
@@ -135,6 +137,9 @@ type Options struct {
 	Do func(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error)
 
 	Registerer prometheus.Registerer
+
+	// MaxBatchSize determines the maximum number of alerts to send in a single request to the alertmanager.
+	MaxBatchSize int
 }
 
 type alertMetrics struct {
@@ -215,18 +220,15 @@ func newAlertMetrics(r prometheus.Registerer, queueCap int, queueLen, alertmanag
 	return m
 }
 
-func do(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) {
-	if client == nil {
-		client = httpclient.New()
-	}
-	return client.Do(req.WithContext(ctx))
-}
-
 // NewManager is the manager constructor.
 func NewManager(o *Options, logger *slog.Logger) *Manager {
 	if o.Do == nil {
 		o.Do = do
 	}
+	// Set default MaxBatchSize if not provided.
+	if o.MaxBatchSize <= 0 {
+		o.MaxBatchSize = DefaultMaxBatchSize
+	}
 	if logger == nil {
 		logger = promslog.NewNopLogger()
 	}
@@ -253,8 +255,6 @@ func NewManager(o *Options, logger *slog.Logger) *Manager {
 	return n
 }
 
-const maxBatchSize = 64
-
 func (n *Manager) queueLen() int {
 	n.mtx.RLock()
 	defer n.mtx.RUnlock()
@@ -268,7 +268,7 @@ func (n *Manager) nextBatch() []*Alert {
 
 	var alerts []*Alert
 
-	if len(n.queue) > maxBatchSize {
+	if maxBatchSize := n.opts.MaxBatchSize; len(n.queue) > maxBatchSize {
 		alerts = append(make([]*Alert, 0, maxBatchSize), n.queue[:maxBatchSize]...)
 		n.queue = n.queue[maxBatchSize:]
 	} else {
diff --git a/pkg/services/ngalert/sender/notifier_ext.go b/pkg/services/ngalert/sender/notifier_ext.go
index 348189eaf34..e57a85f5a4c 100644
--- a/pkg/services/ngalert/sender/notifier_ext.go
+++ b/pkg/services/ngalert/sender/notifier_ext.go
@@ -19,8 +19,17 @@ import (
 
 	"github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/model/labels"
+
+	"github.com/grafana/grafana/pkg/util/httpclient"
 )
 
+func do(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) {
+	if client == nil {
+		client = httpclient.New()
+	}
+	return client.Do(req.WithContext(ctx))
+}
+
 // ApplyConfig updates the status state as the new config requires.
 // Extension: add new parameter headers.
 func (n *Manager) ApplyConfig(conf *config.Config, headers map[string]http.Header) error {
diff --git a/pkg/services/ngalert/sender/notifier_test.go b/pkg/services/ngalert/sender/notifier_test.go
index d1aec6068ab..20caf7e9aea 100644
--- a/pkg/services/ngalert/sender/notifier_test.go
+++ b/pkg/services/ngalert/sender/notifier_test.go
@@ -1,6 +1,6 @@
 // THIS FILE IS COPIED FROM UPSTREAM
 //
-// https://github.com/prometheus/prometheus/blob/293f0c9185260165fd7dabbf8a9e8758b32abeae/notifier/notifier_test.go
+// https://github.com/prometheus/prometheus/blob/bd5b2ea95ce14fba11db871b4068313408465207/notifier/notifier_test.go
 //
 // Copyright 2013 The Prometheus Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,15 +40,16 @@ import (
 	"go.uber.org/atomic"
 	"gopkg.in/yaml.v2"
 
-	"github.com/prometheus/prometheus/discovery"
-
 	"github.com/prometheus/prometheus/config"
+	"github.com/prometheus/prometheus/discovery"
 	_ "github.com/prometheus/prometheus/discovery/file"
 	"github.com/prometheus/prometheus/discovery/targetgroup"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/relabel"
 )
 
+const maxBatchSize = 256
+
 func TestPostPath(t *testing.T) {
 	cases := []struct {
 		in, out string
@@ -411,7 +412,7 @@ func TestCustomDo(t *testing.T) {
 		},
 	}, nil)
 
-	h.sendOne(context.Background(), nil, testURL, []byte(testBody), http.Header{})
+	h.sendOne(context.Background(), nil, testURL, []byte(testBody), nil)
 
 	require.True(t, received, "Expected to receive an alert, but didn't")
 }
@@ -419,6 +420,7 @@ func TestCustomDo(t *testing.T) {
 func TestExternalLabels(t *testing.T) {
 	h := NewManager(&Options{
 		QueueCapacity:  3 * maxBatchSize,
+		MaxBatchSize:   maxBatchSize,
 		ExternalLabels: labels.FromStrings("a", "b"),
 		RelabelConfigs: []*relabel.Config{
 			{
@@ -453,6 +455,7 @@ func TestExternalLabels(t *testing.T) {
 func TestHandlerRelabel(t *testing.T) {
 	h := NewManager(&Options{
 		QueueCapacity: 3 * maxBatchSize,
+		MaxBatchSize:  maxBatchSize,
 		RelabelConfigs: []*relabel.Config{
 			{
 				SourceLabels: model.LabelNames{"alertname"},
@@ -531,6 +534,7 @@ func TestHandlerQueuing(t *testing.T) {
 	h := NewManager(
 		&Options{
 			QueueCapacity: 3 * maxBatchSize,
+			MaxBatchSize:  maxBatchSize,
 		},
 		nil,
 	)
@@ -660,7 +664,7 @@ alerting:
 	require.NoError(t, err, "Unable to load YAML config.")
 	require.Len(t, cfg.AlertingConfig.AlertmanagerConfigs, 1)
 
-	err = n.ApplyConfig(cfg, map[string]http.Header{})
+	err = n.ApplyConfig(cfg, nil)
 	require.NoError(t, err, "Error applying the config.")
 
 	tgs := make(map[string][]*targetgroup.Group)
@@ -711,7 +715,7 @@ alerting:
 	require.NoError(t, err, "Unable to load YAML config.")
 	require.Len(t, cfg.AlertingConfig.AlertmanagerConfigs, 1)
 
-	err = n.ApplyConfig(cfg, map[string]http.Header{})
+	err = n.ApplyConfig(cfg, nil)
 	require.NoError(t, err, "Error applying the config.")
 
 	tgs := make(map[string][]*targetgroup.Group)
@@ -1066,10 +1070,7 @@ func TestStop_DrainingEnabled(t *testing.T) {
 	require.Equal(t, int64(2), alertsReceived.Load())
 }
 
-func TestIntegrationApplyConfig(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
+func TestApplyConfig(t *testing.T) {
 	targetURL := "alertmanager:9093"
 	targetGroup := &targetgroup.Group{
 		Targets: []model.LabelSet{
@@ -1094,14 +1095,14 @@ alerting:
 	require.Len(t, cfg.AlertingConfig.AlertmanagerConfigs, 1)
 
 	// First, apply the config and reload.
-	require.NoError(t, n.ApplyConfig(cfg, map[string]http.Header{}))
+	require.NoError(t, n.ApplyConfig(cfg, nil))
 	tgs := map[string][]*targetgroup.Group{"config-0": {targetGroup}}
 	n.reload(tgs)
 	require.Len(t, n.Alertmanagers(), 1)
 	require.Equal(t, alertmanagerURL, n.Alertmanagers()[0].String())
 
 	// Reapply the config.
-	require.NoError(t, n.ApplyConfig(cfg, map[string]http.Header{}))
+	require.NoError(t, n.ApplyConfig(cfg, nil))
 	// Ensure the known alertmanagers are not dropped.
 	require.Len(t, n.Alertmanagers(), 1)
 	require.Equal(t, alertmanagerURL, n.Alertmanagers()[0].String())
@@ -1119,7 +1120,7 @@ alerting:
 	require.NoError(t, yaml.UnmarshalStrict([]byte(s), cfg))
 	require.Len(t, cfg.AlertingConfig.AlertmanagerConfigs, 2)
 
-	require.NoError(t, n.ApplyConfig(cfg, map[string]http.Header{}))
+	require.NoError(t, n.ApplyConfig(cfg, nil))
 	require.Len(t, n.Alertmanagers(), 1)
 	// Ensure no unnecessary alertmanagers are injected.
 	require.Empty(t, n.alertmanagers["config-0"].ams)
@@ -1142,7 +1143,7 @@ alerting:
 	require.NoError(t, yaml.UnmarshalStrict([]byte(s), cfg))
 	require.Len(t, cfg.AlertingConfig.AlertmanagerConfigs, 2)
 
-	require.NoError(t, n.ApplyConfig(cfg, map[string]http.Header{}))
+	require.NoError(t, n.ApplyConfig(cfg, nil))
 	require.Len(t, n.Alertmanagers(), 2)
 	for cfgIdx := range 2 {
 		ams := n.alertmanagers[fmt.Sprintf("config-%d", cfgIdx)].ams
@@ -1169,6 +1170,6 @@ alerting:
 	require.NoError(t, yaml.UnmarshalStrict([]byte(s), cfg))
 	require.Len(t, cfg.AlertingConfig.AlertmanagerConfigs, 2)
 
-	require.NoError(t, n.ApplyConfig(cfg, map[string]http.Header{}))
+	require.NoError(t, n.ApplyConfig(cfg, nil))
 	require.Empty(t, n.Alertmanagers())
 }
diff --git a/pkg/services/ngalert/sender/sender.go b/pkg/services/ngalert/sender/sender.go
index e4bb96146ff..eb708a5d810 100644
--- a/pkg/services/ngalert/sender/sender.go
+++ b/pkg/services/ngalert/sender/sender.go
@@ -38,9 +38,9 @@ type ExternalAlertmanager struct {
 
 	manager *Manager
 
-	sanitizeLabelSetFn func(lbls models.LabelSet) labels.Labels
-	sdCancel           context.CancelFunc
-	sdManager          *discovery.Manager
+	sdCancel  context.CancelFunc
+	sdManager *discovery.Manager
+	options   *ExternalAMOptions
 }
 
 type ExternalAMcfg struct {
@@ -49,22 +49,27 @@ type ExternalAMcfg struct {
 	Timeout time.Duration
 }
 
-type Option func(*ExternalAlertmanager)
+type ExternalAMOptions struct {
+	Options
+	sanitizeLabelSetFn func(lbls models.LabelSet) labels.Labels
+}
+
+type Option func(*ExternalAMOptions)
 
 type doFunc func(context.Context, *http.Client, *http.Request) (*http.Response, error)
 
 // WithDoFunc receives a function to use when making HTTP requests from the Manager.
 func WithDoFunc(doFunc doFunc) Option {
-	return func(s *ExternalAlertmanager) {
-		s.manager.opts.Do = doFunc
+	return func(opts *ExternalAMOptions) {
+		opts.Do = doFunc
 	}
 }
 
 // WithUTF8Labels skips sanitizing labels and annotations before sending alerts to the external Alertmanager(s).
 // It assumes UTF-8 label names are supported by the Alertmanager(s).
 func WithUTF8Labels() Option {
-	return func(s *ExternalAlertmanager) {
-		s.sanitizeLabelSetFn = func(lbls models.LabelSet) labels.Labels {
+	return func(opts *ExternalAMOptions) {
+		opts.sanitizeLabelSetFn = func(lbls models.LabelSet) labels.Labels {
 			ls := make(labels.Labels, 0, len(lbls))
 			for k, v := range lbls {
 				ls = append(ls, labels.Label{Name: k, Value: v})
@@ -74,6 +79,20 @@ func WithUTF8Labels() Option {
 	}
 }
 
+// WithMaxQueueCapacity sets the maximum capacity of the queue used by the sender.
+func WithMaxQueueCapacity(capacity int) Option {
+	return func(opts *ExternalAMOptions) {
+		opts.QueueCapacity = capacity
+	}
+}
+
+// WithMaxBatchSize sets the maximum batch size for sending alerts to the external Alertmanager(s).
+func WithMaxBatchSize(size int) Option {
+	return func(opts *ExternalAMOptions) {
+		opts.MaxBatchSize = size
+	}
+}
+
 func (cfg *ExternalAMcfg) SHA256() string {
 	return asSHA256([]string{cfg.headerString(), cfg.URL})
 }
@@ -99,16 +118,34 @@ func (cfg *ExternalAMcfg) headerString() string {
 
 func NewExternalAlertmanagerSender(l log.Logger, reg prometheus.Registerer, opts ...Option) (*ExternalAlertmanager, error) {
 	sdCtx, sdCancel := context.WithCancel(context.Background())
+
+	options := &ExternalAMOptions{
+		Options: Options{
+			QueueCapacity:   defaultMaxQueueCapacity,
+			MaxBatchSize:    DefaultMaxBatchSize,
+			Registerer:      reg,
+			DrainOnShutdown: defaultDrainOnShutdown,
+		},
+	}
+
+	for _, opt := range opts {
+		opt(options)
+	}
+
 	s := &ExternalAlertmanager{
 		logger:   l,
 		sdCancel: sdCancel,
+		options:  options,
+	}
+
+	if options.sanitizeLabelSetFn == nil {
+		options.sanitizeLabelSetFn = s.sanitizeLabelSet
 	}
 
-	s.sanitizeLabelSetFn = s.sanitizeLabelSet
 	s.manager = NewManager(
 		// Injecting a new registry here means these metrics are not exported.
 		// Once we fix the individual Alertmanager metrics we should fix this scenario too.
-		&Options{QueueCapacity: defaultMaxQueueCapacity, Registerer: reg, DrainOnShutdown: defaultDrainOnShutdown},
+		&options.Options,
 		toSlogLogger(s.logger),
 	)
 	sdMetrics, err := discovery.CreateAndRegisterSDMetrics(prometheus.NewRegistry())
@@ -124,10 +161,6 @@ func NewExternalAlertmanagerSender(l log.Logger, reg prometheus.Registerer, opts
 		return nil, errors.New("failed to create new discovery manager")
 	}
 
-	for _, opt := range opts {
-		opt(s)
-	}
-
 	return s, nil
 }
 
@@ -274,8 +307,8 @@ func buildNotifierConfig(alertmanagers []ExternalAMcfg) (*config.Config, map[str
 func (s *ExternalAlertmanager) alertToNotifierAlert(alert models.PostableAlert) *Alert {
 	// Prometheus alertmanager has stricter rules for annotations/labels than grafana's internal alertmanager, so we sanitize invalid keys.
 	return &Alert{
-		Labels:       s.sanitizeLabelSetFn(alert.Labels),
-		Annotations:  s.sanitizeLabelSetFn(alert.Annotations),
+		Labels:       s.options.sanitizeLabelSetFn(alert.Labels),
+		Annotations:  s.options.sanitizeLabelSetFn(alert.Annotations),
 		StartsAt:     time.Time(alert.StartsAt),
 		EndsAt:       time.Time(alert.EndsAt),
 		GeneratorURL: alert.GeneratorURL.String(),
diff --git a/pkg/services/ngalert/sender/sender_test.go b/pkg/services/ngalert/sender/sender_test.go
index b3a22bf51fc..1f51aeaf857 100644
--- a/pkg/services/ngalert/sender/sender_test.go
+++ b/pkg/services/ngalert/sender/sender_test.go
@@ -1,6 +1,7 @@
 package sender
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/prometheus/alertmanager/api/v2/models"
@@ -108,3 +109,121 @@ func TestSanitizeLabelSet(t *testing.T) {
 		})
 	}
 }
+
+func TestWithMaxQueueCapacity(t *testing.T) {
+	logger := log.NewNopLogger()
+
+	t.Run("WithMaxQueueCapacity sets custom capacity", func(t *testing.T) {
+		customCapacity := 123
+		am, err := NewExternalAlertmanagerSender(logger, prometheus.NewRegistry(), WithMaxQueueCapacity(customCapacity))
+		require.NoError(t, err)
+		require.Equal(t, customCapacity, am.options.QueueCapacity)
+	})
+
+	t.Run("default capacity when option is not used", func(t *testing.T) {
+		am, err := NewExternalAlertmanagerSender(logger, prometheus.NewRegistry())
+		require.NoError(t, err)
+		require.Equal(t, defaultMaxQueueCapacity, am.options.QueueCapacity)
+	})
+
+	t.Run("custom queue capacity is enforced", func(t *testing.T) {
+		customCapacity := 5
+		am, err := NewExternalAlertmanagerSender(logger, prometheus.NewRegistry(), WithMaxQueueCapacity(customCapacity))
+		require.NoError(t, err)
+
+		totalAlerts := customCapacity + 3
+		alerts := make([]*Alert, totalAlerts)
+		for i := range alerts {
+			alerts[i] = &Alert{
+				Labels: labels.FromStrings("alertname", fmt.Sprintf("alert_%d", i)),
+			}
+		}
+
+		am.manager.Send(alerts...)
+
+		require.Equal(t, customCapacity, len(am.manager.queue))
+
+		for i, alert := range am.manager.queue {
+			expectedLabel := fmt.Sprintf("alert_%d", i+3)
+			require.Equal(t, expectedLabel, alert.Labels.Get("alertname"))
+		}
+	})
+}
+
+func TestWithMaxBatchSize(t *testing.T) {
+	logger := log.NewNopLogger()
+
+	t.Run("WithMaxBatchSize sets custom batch size", func(t *testing.T) {
+		customBatchSize := 5
+		am, err := NewExternalAlertmanagerSender(logger, prometheus.NewRegistry(), WithMaxBatchSize(customBatchSize))
+		require.NoError(t, err)
+		require.Equal(t, customBatchSize, am.options.MaxBatchSize)
+		require.Equal(t, customBatchSize, am.manager.opts.MaxBatchSize)
+	})
+
+	t.Run("default batch size when option is not used", func(t *testing.T) {
+		am, err := NewExternalAlertmanagerSender(logger, prometheus.NewRegistry())
+		require.NoError(t, err)
+		require.Equal(t, DefaultMaxBatchSize, am.options.MaxBatchSize)
+		require.Equal(t, DefaultMaxBatchSize, am.manager.opts.MaxBatchSize)
+	})
+
+	t.Run("custom batch size is enforced", func(t *testing.T) {
+		customBatchSize := 3
+		am, err := NewExternalAlertmanagerSender(logger, prometheus.NewRegistry(), WithMaxBatchSize(customBatchSize))
+		require.NoError(t, err)
+
+		totalAlerts := customBatchSize * 2
+		alerts := make([]*Alert, totalAlerts)
+		for i := range alerts {
+			alerts[i] = &Alert{
+				Labels: labels.FromStrings("alertname", fmt.Sprintf("alert_%d", i)),
+			}
+		}
+
+		am.manager.Send(alerts...)
+		require.Equal(t, totalAlerts, len(am.manager.queue))
+
+		firstBatch := am.manager.nextBatch()
+		require.Equal(t, customBatchSize, len(firstBatch))
+
+		secondBatch := am.manager.nextBatch()
+		require.Equal(t, customBatchSize, len(secondBatch))
+
+		emptyBatch := am.manager.nextBatch()
+		require.Equal(t, 0, len(emptyBatch), "No more alerts should remain")
+	})
+}
+
+func TestWithUTF8Labels(t *testing.T) {
+	logger := log.NewNopLogger()
+
+	alert := models.PostableAlert{
+		Annotations: models.LabelSet{
+			"some-name": "test",
+		},
+		Alert: models.Alert{
+			Labels: models.LabelSet{
+				"🔥": "fire",
+			},
+		},
+	}
+
+	t.Run("WithUTF8Labels preserves UTF-8 characters", func(t *testing.T) {
+		am, err := NewExternalAlertmanagerSender(logger, prometheus.NewRegistry(), WithUTF8Labels())
+		require.NoError(t, err)
+
+		result := am.alertToNotifierAlert(alert)
+		require.Equal(t, "test", result.Annotations.Get("some-name"))
+		require.Equal(t, "fire", result.Labels.Get("🔥"))
+	})
+
+	t.Run("default sanitizes UTF-8 characters", func(t *testing.T) {
+		am, err := NewExternalAlertmanagerSender(logger, prometheus.NewRegistry())
+		require.NoError(t, err)
+
+		result := am.alertToNotifierAlert(alert)
+		require.Equal(t, "test", result.Annotations.Get("some_name"))
+		require.Equal(t, "fire", result.Labels.Get("_0x1f525"))
+	})
+}

From ea833ddf1f1526dd3078a764533998bdd4bda27c Mon Sep 17 00:00:00 2001
From: Matheus Macabu <macabu@users.noreply.github.com>
Date: Tue, 19 Aug 2025 09:49:44 +0200
Subject: [PATCH 241/243] Unified/APIStore: Fix flaky tests on secure value
 support inline (#109806)

---
 pkg/storage/unified/apistore/secure_test.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/storage/unified/apistore/secure_test.go b/pkg/storage/unified/apistore/secure_test.go
index d9df5de79ca..fb36d2910bb 100644
--- a/pkg/storage/unified/apistore/secure_test.go
+++ b/pkg/storage/unified/apistore/secure_test.go
@@ -70,7 +70,10 @@ func TestSecureLifecycle(t *testing.T) {
 		expectError := fmt.Errorf("expected error")
 		secureStore := secret.NewMockInlineSecureValueSupport(t)
 		secureStore.On("CreateInline", mock.Anything, mock.Anything, common.RawSecureValue("SecretAAA")).
-			Return("", expectError).Once()
+			Return("", expectError).Maybe()
+		secureStore.On("CreateInline", mock.Anything, mock.Anything, common.RawSecureValue("SecretBBB")).
+			Return("", expectError).Maybe()
+
 		err := prepareSecureValues(context.Background(), secureStore, obj, nil, info)
 		require.Error(t, err, "should error when secure value creation fails")
 		require.Equal(t, expectError, err, "error should be propagated")

From bbf01a638345e42c0f48dfcc743efbfbb7fedaeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= <pm.jamroz@gmail.com>
Date: Tue, 19 Aug 2025 09:54:00 +0200
Subject: [PATCH 242/243] Flame Graph: Analyze with Grafana Assistant (#108684)

* Bare-bones mocked integration

* Create correct context based on the query

* Add data source name

* Do not bundle grafana/assistant with flame graph

* Rename component

* Add tests

* Mock grafana/assistant

* Update feature toggle and allow hiding the button

* Update deps

* Update types

* Update yarn.lock

* Fix typo in feature toggle description

* Enable grafanaAssistantInProfilesDrilldown by default

* Enable grafanaAssistantInProfilesDrilldown by default

* Show Analyze Flame Graph button only if there's context for the assistant
---
 .../feature-toggles/index.md                  |   1 +
 .../src/types/featureToggles.gen.ts           |   5 +
 packages/grafana-flamegraph/package.json      |   1 +
 .../src/AnalyzeFlameGraphButton.tsx           |  34 ++
 .../src/FlameGraphContainer.test.tsx          |   5 +
 .../src/FlameGraphContainer.tsx               |  11 +
 .../src/FlameGraphHeader.test.tsx             |   5 +
 .../src/FlameGraphHeader.tsx                  |   8 +
 packages/grafana-flamegraph/src/utils.ts      |   6 +
 pkg/services/featuremgmt/registry.go          |   8 +
 pkg/services/featuremgmt/toggles_gen.csv      |   1 +
 pkg/services/featuremgmt/toggles_gen.go       |   4 +
 pkg/services/featuremgmt/toggles_gen.json     |  31 ++
 .../datasource.ts                             |  20 +-
 .../grafana-pyroscope-datasource/package.json |   1 +
 .../utils.test.ts                             | 342 ++++++++++++++++++
 .../grafana-pyroscope-datasource/utils.ts     |  56 ++-
 .../webpack.config.ts                         |   6 +-
 yarn.lock                                     |   2 +
 19 files changed, 539 insertions(+), 8 deletions(-)
 create mode 100644 packages/grafana-flamegraph/src/AnalyzeFlameGraphButton.tsx
 create mode 100644 packages/grafana-flamegraph/src/utils.ts
 create mode 100644 public/app/plugins/datasource/grafana-pyroscope-datasource/utils.test.ts

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index c5b1d0d05d1..c7ec80a9662 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -76,6 +76,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `alertingMigrationUI`                  | Enables the alerting migration UI, to migrate data source-managed rules to Grafana-managed rules                                                              | Yes                |
 | `alertingImportYAMLUI`                 | Enables a UI feature for importing rules from a Prometheus file to Grafana-managed rules                                                                      | Yes                |
 | `unifiedNavbars`                       | Enables unified navbars                                                                                                                                       |                    |
+| `grafanaAssistantInProfilesDrilldown`  | Enables integration with Grafana Assistant in Profiles Drilldown                                                                                              | Yes                |
 | `tabularNumbers`                       | Use fixed-width numbers globally in the UI                                                                                                                    |                    |
 
 ## Public preview feature toggles
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index a8d6dd05efc..cc2d2b8b63b 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -950,6 +950,11 @@ export interface FeatureToggles {
   */
   metricsFromProfiles?: boolean;
   /**
+  * Enables integration with Grafana Assistant in Profiles Drilldown
+  * @default true
+  */
+  grafanaAssistantInProfilesDrilldown?: boolean;
+  /**
   * Enables using PGX instead of libpq for PostgreSQL datasource
   */
   postgresDSUsePGX?: boolean;
diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json
index 06914eb8915..fb5b0fa7939 100644
--- a/packages/grafana-flamegraph/package.json
+++ b/packages/grafana-flamegraph/package.json
@@ -83,6 +83,7 @@
     "typescript": "5.9.2"
   },
   "peerDependencies": {
+    "@grafana/assistant": "^0.0.12",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   }
diff --git a/packages/grafana-flamegraph/src/AnalyzeFlameGraphButton.tsx b/packages/grafana-flamegraph/src/AnalyzeFlameGraphButton.tsx
new file mode 100644
index 00000000000..005e1d9b21a
--- /dev/null
+++ b/packages/grafana-flamegraph/src/AnalyzeFlameGraphButton.tsx
@@ -0,0 +1,34 @@
+import { ChatContextItem, useAssistant } from '@grafana/assistant';
+import { Button } from '@grafana/ui';
+
+type Props = {
+  assistantContext: ChatContextItem[];
+  className?: string;
+};
+
+export function AnalyzeFlameGraphButton(props: Props) {
+  const { assistantContext, className } = props;
+  const [isAvailable, openAssistant] = useAssistant();
+
+  if (!isAvailable || !openAssistant || assistantContext.length === 0) {
+    return null;
+  }
+
+  return (
+    <Button
+      className={className}
+      onClick={() =>
+        openAssistant({
+          prompt: 'Analyze Flame Graph',
+          context: assistantContext,
+        })
+      }
+      variant="secondary"
+      fill="outline"
+      icon="ai-sparkle"
+      size="sm"
+    >
+      Analyze Flame Graph
+    </Button>
+  );
+}
diff --git a/packages/grafana-flamegraph/src/FlameGraphContainer.test.tsx b/packages/grafana-flamegraph/src/FlameGraphContainer.test.tsx
index 5be3bb3c3db..85ce8dd3470 100644
--- a/packages/grafana-flamegraph/src/FlameGraphContainer.test.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraphContainer.test.tsx
@@ -9,6 +9,11 @@ import { data } from './FlameGraph/testData/dataNestedSet';
 import FlameGraphContainer, { labelSearch } from './FlameGraphContainer';
 import { MIN_WIDTH_TO_SHOW_BOTH_TOPTABLE_AND_FLAMEGRAPH } from './constants';
 
+jest.mock('@grafana/assistant', () => ({
+  useAssistant: jest.fn(() => [false, null]), // [isAvailable, openAssistant]
+  createContext: jest.fn(),
+}));
+
 jest.mock('react-use', () => ({
   ...jest.requireActual('react-use'),
   useMeasure: () => {
diff --git a/packages/grafana-flamegraph/src/FlameGraphContainer.tsx b/packages/grafana-flamegraph/src/FlameGraphContainer.tsx
index 706702142db..da09ea26739 100644
--- a/packages/grafana-flamegraph/src/FlameGraphContainer.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraphContainer.tsx
@@ -14,6 +14,7 @@ import FlameGraphHeader from './FlameGraphHeader';
 import FlameGraphTopTableContainer from './TopTable/FlameGraphTopTableContainer';
 import { MIN_WIDTH_TO_SHOW_BOTH_TOPTABLE_AND_FLAMEGRAPH } from './constants';
 import { ClickedItemData, ColorScheme, ColorSchemeDiff, SelectedView, TextAlign } from './types';
+import { getAssistantContextFromDataFrame } from './utils';
 
 const ufuzzy = new uFuzzy();
 
@@ -77,6 +78,14 @@ export type Props = {
    * Whether or not to keep any focused item when the profile data changes.
    */
   keepFocusOnDataChange?: boolean;
+
+  /**
+   * If true, the assistant button will be shown in the header if available.
+   * This is needed mainly for Profiles Drilldown where in some cases we need to hide the button to show alternative
+   * option to use AI.
+   * @default true
+   */
+  showAnalyzeWithAssistant?: boolean;
 };
 
 const FlameGraphContainer = ({
@@ -93,6 +102,7 @@ const FlameGraphContainer = ({
   disableCollapsing,
   keepFocusOnDataChange,
   getExtraContextMenuButtons,
+  showAnalyzeWithAssistant = true,
 }: Props) => {
   const [focusedItemData, setFocusedItemData] = useState<ClickedItemData>();
 
@@ -293,6 +303,7 @@ const FlameGraphContainer = ({
             isDiffMode={dataContainer.isDiffFlamegraph()}
             setCollapsedMap={setCollapsedMap}
             collapsedMap={collapsedMap}
+            assistantContext={data && showAnalyzeWithAssistant ? getAssistantContextFromDataFrame(data) : undefined}
           />
         )}
 
diff --git a/packages/grafana-flamegraph/src/FlameGraphHeader.test.tsx b/packages/grafana-flamegraph/src/FlameGraphHeader.test.tsx
index 546450dad2b..0ca621d9f64 100644
--- a/packages/grafana-flamegraph/src/FlameGraphHeader.test.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraphHeader.test.tsx
@@ -7,6 +7,11 @@ import { CollapsedMap } from './FlameGraph/dataTransform';
 import FlameGraphHeader from './FlameGraphHeader';
 import { ColorScheme, SelectedView } from './types';
 
+jest.mock('@grafana/assistant', () => ({
+  useAssistant: jest.fn(() => [false, null]), // [isAvailable, openAssistant]
+  createContext: jest.fn(),
+}));
+
 describe('FlameGraphHeader', () => {
   function setup(props: Partial<React.ComponentProps<typeof FlameGraphHeader>> = {}) {
     const setSearch = jest.fn();
diff --git a/packages/grafana-flamegraph/src/FlameGraphHeader.tsx b/packages/grafana-flamegraph/src/FlameGraphHeader.tsx
index 91541f216b7..e51dd78b051 100644
--- a/packages/grafana-flamegraph/src/FlameGraphHeader.tsx
+++ b/packages/grafana-flamegraph/src/FlameGraphHeader.tsx
@@ -3,9 +3,11 @@ import { useEffect, useState } from 'react';
 import * as React from 'react';
 import { useDebounce, usePrevious } from 'react-use';
 
+import { ChatContextItem } from '@grafana/assistant';
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { Button, ButtonGroup, Dropdown, Input, Menu, RadioButtonGroup, useStyles2 } from '@grafana/ui';
 
+import { AnalyzeFlameGraphButton } from './AnalyzeFlameGraphButton';
 import { byPackageGradient, byValueGradient, diffColorBlindGradient, diffDefaultGradient } from './FlameGraph/colors';
 import { CollapsedMap } from './FlameGraph/dataTransform';
 import { MIN_WIDTH_TO_SHOW_BOTH_TOPTABLE_AND_FLAMEGRAPH } from './constants';
@@ -30,6 +32,8 @@ type Props = {
   collapsedMap: CollapsedMap;
 
   extraHeaderElements?: React.ReactNode;
+
+  assistantContext?: ChatContextItem[];
 };
 
 const FlameGraphHeader = ({
@@ -50,6 +54,7 @@ const FlameGraphHeader = ({
   isDiffMode,
   setCollapsedMap,
   collapsedMap,
+  assistantContext,
 }: Props) => {
   const styles = useStyles2(getStyles);
   const [localSearch, setLocalSearch] = useSearchInput(search, setSearch);
@@ -84,6 +89,9 @@ const FlameGraphHeader = ({
       </div>
 
       <div className={styles.rightContainer}>
+        {assistantContext && (
+          <AnalyzeFlameGraphButton className={styles.buttonSpacing} assistantContext={assistantContext} />
+        )}
         {showResetButton && (
           <Button
             variant={'secondary'}
diff --git a/packages/grafana-flamegraph/src/utils.ts b/packages/grafana-flamegraph/src/utils.ts
new file mode 100644
index 00000000000..e15f2ef16e1
--- /dev/null
+++ b/packages/grafana-flamegraph/src/utils.ts
@@ -0,0 +1,6 @@
+import { ChatContextItem } from '@grafana/assistant';
+import { DataFrame } from '@grafana/data';
+
+export function getAssistantContextFromDataFrame(data: DataFrame): ChatContextItem[] {
+  return data.meta?.custom?.assistantContext || [];
+}
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 638579dfed8..009f7052d18 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -1638,6 +1638,14 @@ var (
 			Owner:        grafanaObservabilityTracesAndProfilingSquad,
 			FrontendOnly: true,
 		},
+		{
+			Name:         "grafanaAssistantInProfilesDrilldown",
+			Description:  "Enables integration with Grafana Assistant in Profiles Drilldown",
+			Stage:        FeatureStageGeneralAvailability,
+			Owner:        grafanaObservabilityTracesAndProfilingSquad,
+			FrontendOnly: true,
+			Expression:   "true",
+		},
 		{
 			Name:        "postgresDSUsePGX",
 			Description: "Enables using PGX instead of libpq for PostgreSQL datasource",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 7764d1c9227..88ad21535ac 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -213,6 +213,7 @@ localizationForPlugins,experimental,@grafana/plugins-platform-backend,false,fals
 unifiedNavbars,GA,@grafana/plugins-platform-backend,false,false,true
 logsPanelControls,preview,@grafana/observability-logs,false,false,true
 metricsFromProfiles,experimental,@grafana/observability-traces-and-profiling,false,false,true
+grafanaAssistantInProfilesDrilldown,GA,@grafana/observability-traces-and-profiling,false,false,true
 postgresDSUsePGX,experimental,@grafana/oss-big-tent,false,false,false
 tempoAlerting,experimental,@grafana/observability-traces-and-profiling,false,false,true
 pluginsAutoUpdate,experimental,@grafana/plugins-platform-backend,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index e50d2bb29f8..8f8db49668d 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -863,6 +863,10 @@ const (
 	// Enables creating metrics from profiles and storing them as recording rules
 	FlagMetricsFromProfiles = "metricsFromProfiles"
 
+	// FlagGrafanaAssistantInProfilesDrilldown
+	// Enables integration with Grafana Assistant in Profiles Drilldown
+	FlagGrafanaAssistantInProfilesDrilldown = "grafanaAssistantInProfilesDrilldown"
+
 	// FlagPostgresDSUsePGX
 	// Enables using PGX instead of libpq for PostgreSQL datasource
 	FlagPostgresDSUsePGX = "postgresDSUsePGX"
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 71d0603f154..d117e50380a 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -1472,6 +1472,37 @@
         "codeowner": "@grafana/plugins-platform-backend"
       }
     },
+    {
+      "metadata": {
+        "name": "grafanaAssistantInProfilesDrilldown",
+        "resourceVersion": "1754572610001",
+        "creationTimestamp": "2025-08-01T07:43:17Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2025-08-07 13:16:50.001205 +0000 UTC"
+        }
+      },
+      "spec": {
+        "description": "Enables integration with Grafana Assistant in Profiles Drilldown",
+        "stage": "GA",
+        "codeowner": "@grafana/observability-traces-and-profiling",
+        "frontend": true,
+        "expression": "true"
+      }
+    },
+    {
+      "metadata": {
+        "name": "grafanaAssistantInProfilesDrillfown",
+        "resourceVersion": "1754034112469",
+        "creationTimestamp": "2025-08-01T07:41:52Z",
+        "deletionTimestamp": "2025-08-01T07:43:17Z"
+      },
+      "spec": {
+        "description": "Enables interation with Grafana Assitant in Profiles Drilldown",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-traces-and-profiling",
+        "frontend": true
+      }
+    },
     {
       "metadata": {
         "name": "grafanaManagedRecordingRules",
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts
index a748d560269..eed703d2b03 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts
@@ -1,5 +1,5 @@
 import Prism from 'prismjs';
-import { Observable, of } from 'rxjs';
+import { map, Observable, of } from 'rxjs';
 
 import {
   AbstractQuery,
@@ -18,7 +18,13 @@ import { DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/run
 import { VariableSupport } from './VariableSupport';
 import { defaultGrafanaPyroscopeDataQuery, defaultPyroscopeQueryType } from './dataquery.gen';
 import { PyroscopeDataSourceOptions, Query, ProfileTypeMessage } from './types';
-import { addLabelToQuery, extractLabelMatchers, grammar, toPromLikeExpr } from './utils';
+import {
+  addLabelToQuery,
+  extractLabelMatchers,
+  grammar,
+  toPromLikeExpr,
+  enrichDataFrameWithAssistantContentMapper,
+} from './utils';
 
 export class PyroscopeDataSource extends DataSourceWithBackend<Query, PyroscopeDataSourceOptions> {
   constructor(
@@ -45,10 +51,12 @@ export class PyroscopeDataSource extends DataSourceWithBackend<Query, PyroscopeD
     if (!validTargets.length) {
       return of({ data: [] });
     }
-    return super.query({
-      ...request,
-      targets: validTargets,
-    });
+    return super
+      .query({
+        ...request,
+        targets: validTargets,
+      })
+      .pipe(map(enrichDataFrameWithAssistantContentMapper(request, this.name)));
   }
 
   async getProfileTypes(start: number, end: number): Promise<ProfileTypeMessage[]> {
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
index b97b9af0c3e..1276e101247 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
@@ -39,6 +39,7 @@
     "webpack": "5.101.0"
   },
   "peerDependencies": {
+    "@grafana/assistant": "^0.0.12",
     "@grafana/runtime": "*"
   },
   "scripts": {
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/utils.test.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/utils.test.ts
new file mode 100644
index 00000000000..e8c17b0fac1
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/utils.test.ts
@@ -0,0 +1,342 @@
+import { createContext, ItemDataType } from '@grafana/assistant';
+import {
+  DataFrame,
+  DataQueryResponse,
+  DataQueryRequest,
+  FieldType,
+  MutableDataFrame,
+  dateTime,
+  PreferredVisualisationType,
+} from '@grafana/data';
+
+import { GrafanaPyroscopeDataQuery } from './dataquery.gen';
+import { enrichDataFrameWithAssistantContentMapper } from './utils';
+
+// Mock the createContext function
+jest.mock('@grafana/assistant', () => ({
+  createContext: jest.fn(),
+  ItemDataType: {
+    Datasource: 'datasource',
+    Structured: 'structured',
+  },
+}));
+
+const mockCreateContext = createContext as jest.MockedFunction<typeof createContext>;
+
+describe('enrichDataFrameWithAssistantContentMapper', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockCreateContext.mockImplementation((type, data) => ({
+      type,
+      data,
+      node: { id: 'test-id', type: 'test', name: 'test-node', navigable: true },
+      occurrences: [],
+    }));
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  const createMockRequest = (
+    targets: Array<Partial<GrafanaPyroscopeDataQuery>> = []
+  ): DataQueryRequest<GrafanaPyroscopeDataQuery> => ({
+    requestId: 'test-request',
+    interval: '1s',
+    intervalMs: 1000,
+    maxDataPoints: 1000,
+    range: {
+      from: dateTime('2023-01-01T00:00:00Z'),
+      to: dateTime('2023-01-01T01:00:00Z'),
+      raw: {
+        from: 'now-1h',
+        to: 'now',
+      },
+    },
+    scopedVars: {},
+    timezone: 'UTC',
+    app: 'explore',
+    startTime: Date.now(),
+    targets: targets.map((target, index) => ({
+      refId: `A${index}`,
+      profileTypeId: 'cpu',
+      labelSelector: '{service="test"}',
+      groupBy: [],
+      queryType: 'profile' as const,
+      datasource: {
+        uid: 'test-uid',
+        type: 'grafana-pyroscope-datasource',
+      },
+      ...target,
+    })) as GrafanaPyroscopeDataQuery[],
+  });
+
+  const createMockDataFrame = (refId: string, preferredVisualisationType?: PreferredVisualisationType): DataFrame => {
+    const frame = new MutableDataFrame({
+      refId,
+      fields: [
+        { name: 'time', type: FieldType.time, values: [1672531200000] },
+        { name: 'value', type: FieldType.number, values: [100] },
+      ],
+    });
+
+    if (preferredVisualisationType) {
+      frame.meta = {
+        preferredVisualisationType,
+      };
+    }
+
+    return frame;
+  };
+
+  const createMockResponse = (dataFrames: DataFrame[]): DataQueryResponse => ({
+    data: dataFrames,
+  });
+
+  describe('when processing flamegraph data frames', () => {
+    it('should enrich flamegraph data frame with assistant context', () => {
+      const request = createMockRequest([
+        {
+          refId: 'A0',
+          profileTypeId: 'cpu',
+          labelSelector: '{service="test"}',
+        },
+      ]);
+      const dataFrame = createMockDataFrame('A0', 'flamegraph');
+      const response = createMockResponse([dataFrame]);
+
+      const mapper = enrichDataFrameWithAssistantContentMapper(request, 'PyroscopeDatasource');
+      const result = mapper(response);
+
+      expect(result.data).toHaveLength(1);
+      expect(result.data[0].meta?.custom?.assistantContext).toBeDefined();
+      expect(mockCreateContext).toHaveBeenCalledTimes(2);
+
+      // Verify datasource context
+      expect(mockCreateContext).toHaveBeenCalledWith(ItemDataType.Datasource, {
+        datasourceName: 'PyroscopeDatasource',
+        datasourceUid: 'test-uid',
+        datasourceType: 'grafana-pyroscope-datasource',
+      });
+
+      // Verify structured context
+      expect(mockCreateContext).toHaveBeenCalledWith(ItemDataType.Structured, {
+        title: 'Analyze Flame Graph',
+        data: {
+          start: request.range.from.valueOf(),
+          end: request.range.to.valueOf(),
+          profile_type_id: 'cpu',
+          label_selector: '{service="test"}',
+          operation: 'execute',
+        },
+      });
+    });
+
+    it('should preserve existing meta.custom properties', () => {
+      const request = createMockRequest([
+        {
+          refId: 'A0',
+          profileTypeId: 'memory',
+          labelSelector: '{app="backend"}',
+        },
+      ]);
+      const dataFrame = createMockDataFrame('A0', 'flamegraph');
+      dataFrame.meta = {
+        preferredVisualisationType: 'flamegraph',
+        custom: {
+          existingProperty: 'value',
+        },
+      };
+
+      const response = createMockResponse([dataFrame]);
+      const mapper = enrichDataFrameWithAssistantContentMapper(request, 'TestDatasource');
+      const result = mapper(response);
+
+      expect(result.data[0].meta?.custom?.existingProperty).toBe('value');
+      expect(result.data[0].meta?.custom?.assistantContext).toBeDefined();
+    });
+
+    it('should handle multiple flamegraph data frames', () => {
+      const request = createMockRequest([
+        {
+          refId: 'A0',
+          profileTypeId: 'cpu',
+          labelSelector: '{service="test1"}',
+        },
+        {
+          refId: 'A1',
+          profileTypeId: 'memory',
+          labelSelector: '{service="test2"}',
+        },
+      ]);
+
+      const dataFrames = [createMockDataFrame('A0', 'flamegraph'), createMockDataFrame('A1', 'flamegraph')];
+      const response = createMockResponse(dataFrames);
+
+      const mapper = enrichDataFrameWithAssistantContentMapper(request, 'TestDatasource');
+      const result = mapper(response);
+
+      expect(result.data).toHaveLength(2);
+      expect(result.data[0].meta?.custom?.assistantContext).toBeDefined();
+      expect(result.data[1].meta?.custom?.assistantContext).toBeDefined();
+      expect(mockCreateContext).toHaveBeenCalledTimes(4); // 2 contexts per frame
+    });
+  });
+
+  describe('when processing non-flamegraph data frames', () => {
+    it('should not modify data frames without flamegraph visualization type', () => {
+      const request = createMockRequest([
+        {
+          refId: 'A0',
+          profileTypeId: 'cpu',
+          labelSelector: '{service="test"}',
+        },
+      ]);
+      const dataFrame = createMockDataFrame('A0', 'table');
+      const response = createMockResponse([dataFrame]);
+
+      const mapper = enrichDataFrameWithAssistantContentMapper(request, 'TestDatasource');
+      const result = mapper(response);
+
+      expect(result.data[0].meta?.custom?.assistantContext).toBeUndefined();
+      expect(mockCreateContext).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when handling edge cases', () => {
+    it('should not add context data frame without matching query target', () => {
+      const request = createMockRequest([
+        {
+          refId: 'A0',
+          profileTypeId: 'cpu',
+          labelSelector: '{service="test"}',
+        },
+      ]);
+      const dataFrame = createMockDataFrame('B0', 'flamegraph'); // Different refId
+      const response = createMockResponse([dataFrame]);
+
+      const mapper = enrichDataFrameWithAssistantContentMapper(request, 'TestDatasource');
+      const result = mapper(response);
+
+      expect(result.data[0]).toBe(dataFrame); // Should remain unchanged
+      expect(mockCreateContext).not.toHaveBeenCalled();
+    });
+
+    it('should not add context when query has no datasource information', () => {
+      const request = createMockRequest([
+        {
+          refId: 'A0',
+          profileTypeId: 'cpu',
+          labelSelector: '{service="test"}',
+          datasource: undefined,
+        },
+      ]);
+      const dataFrame = createMockDataFrame('A0', 'flamegraph');
+      const response = createMockResponse([dataFrame]);
+
+      const mapper = enrichDataFrameWithAssistantContentMapper(request, 'TestDatasource');
+      const result = mapper(response);
+
+      expect(result.data[0]).toBe(dataFrame); // Should remain unchanged
+      expect(mockCreateContext).not.toHaveBeenCalled();
+    });
+
+    it('should not add context if query has incomplete datasource information', () => {
+      const request = createMockRequest([
+        {
+          refId: 'A0',
+          profileTypeId: 'cpu',
+          labelSelector: '{service="test"}',
+          datasource: {
+            uid: 'test-uid',
+            // Missing type
+          },
+        },
+      ]);
+      const dataFrame = createMockDataFrame('A0', 'flamegraph');
+      const response = createMockResponse([dataFrame]);
+
+      const mapper = enrichDataFrameWithAssistantContentMapper(request, 'TestDatasource');
+      const result = mapper(response);
+
+      expect(result.data[0]).toBe(dataFrame); // Should remain unchanged
+      expect(mockCreateContext).not.toHaveBeenCalled();
+    });
+
+    it('should not add context with empty response data', () => {
+      const request = createMockRequest([]);
+      const response = createMockResponse([]);
+
+      const mapper = enrichDataFrameWithAssistantContentMapper(request, 'TestDatasource');
+      const result = mapper(response);
+
+      expect(result.data).toHaveLength(0);
+      expect(mockCreateContext).not.toHaveBeenCalled();
+    });
+
+    it('should handle mixed data frame types', () => {
+      const request = createMockRequest([
+        {
+          refId: 'A0',
+          profileTypeId: 'cpu',
+          labelSelector: '{service="test"}',
+        },
+        {
+          refId: 'A1',
+          profileTypeId: 'memory',
+          labelSelector: '{service="test2"}',
+        },
+      ]);
+
+      const dataFrames = [
+        createMockDataFrame('A0', 'flamegraph'),
+        createMockDataFrame('A1', 'table'),
+        createMockDataFrame('A0', 'flamegraph'), // Another flamegraph with same refId
+      ];
+      const response = createMockResponse(dataFrames);
+
+      const mapper = enrichDataFrameWithAssistantContentMapper(request, 'TestDatasource');
+      const result = mapper(response);
+
+      expect(result.data).toHaveLength(3);
+      expect(result.data[0].meta?.custom?.assistantContext).toBeDefined(); // Flamegraph
+      expect(result.data[1].meta?.custom?.assistantContext).toBeUndefined(); // Table
+      expect(result.data[2].meta?.custom?.assistantContext).toBeDefined(); // Flamegraph
+      expect(mockCreateContext).toHaveBeenCalledTimes(4); // 2 contexts for each flamegraph
+    });
+  });
+
+  describe('context creation', () => {
+    it('should create context with correct time range values', () => {
+      const fromTime = dateTime('2023-06-15T10:00:00Z');
+      const toTime = dateTime('2023-06-15T11:00:00Z');
+
+      const request = createMockRequest([
+        {
+          refId: 'A0',
+          profileTypeId: 'cpu',
+          labelSelector: '{service="test"}',
+        },
+      ]);
+      request.range.from = fromTime;
+      request.range.to = toTime;
+
+      const dataFrame = createMockDataFrame('A0', 'flamegraph');
+      const response = createMockResponse([dataFrame]);
+
+      const mapper = enrichDataFrameWithAssistantContentMapper(request, 'TestDatasource');
+      mapper(response);
+
+      expect(mockCreateContext).toHaveBeenCalledWith(ItemDataType.Structured, {
+        title: 'Analyze Flame Graph',
+        data: {
+          start: fromTime.valueOf(),
+          end: toTime.valueOf(),
+          profile_type_id: 'cpu',
+          label_selector: '{service="test"}',
+          operation: 'execute',
+        },
+      });
+    });
+  });
+});
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/utils.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/utils.ts
index dc63683a40b..3440d29d584 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/utils.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/utils.ts
@@ -1,7 +1,16 @@
 import { invert } from 'lodash';
 import Prism, { Grammar, Token } from 'prismjs';
 
-import { AbstractLabelMatcher, AbstractLabelOperator } from '@grafana/data';
+import { createContext, ItemDataType } from '@grafana/assistant';
+import {
+  AbstractLabelMatcher,
+  AbstractLabelOperator,
+  DataFrame,
+  DataQueryResponse,
+  DataQueryRequest,
+} from '@grafana/data';
+
+import { GrafanaPyroscopeDataQuery } from './dataquery.gen';
 
 export function extractLabelMatchers(tokens: Array<string | Token>): AbstractLabelMatcher[] {
   const labelMatchers: AbstractLabelMatcher[] = [];
@@ -131,3 +140,48 @@ export const grammar: Grammar = {
   },
   punctuation: /[{}(),.]/,
 };
+
+export function enrichDataFrameWithAssistantContentMapper(
+  request: DataQueryRequest<GrafanaPyroscopeDataQuery>,
+  datasourceName: string
+) {
+  const validTargets = request.targets;
+  return (response: DataQueryResponse) => {
+    response.data = response.data.map((data: DataFrame) => {
+      if (data.meta?.preferredVisualisationType !== 'flamegraph') {
+        return data;
+      }
+
+      const query = validTargets.find((target) => target.refId === data.refId);
+      if (!query || !query.datasource?.uid || !query.datasource?.type) {
+        return data;
+      }
+
+      const context = [
+        createContext(ItemDataType.Datasource, {
+          datasourceName: datasourceName,
+          datasourceUid: query.datasource.uid,
+          datasourceType: query.datasource.type,
+        }),
+        createContext(ItemDataType.Structured, {
+          title: 'Analyze Flame Graph',
+          data: {
+            start: request.range.from.valueOf(),
+            end: request.range.to.valueOf(),
+            profile_type_id: query.profileTypeId,
+            label_selector: query.labelSelector,
+            operation: 'execute',
+          },
+        }),
+      ];
+
+      data.meta = data.meta || {};
+      data.meta.custom = {
+        ...data.meta.custom,
+        assistantContext: context,
+      };
+      return data;
+    });
+    return response;
+  };
+}
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts
index f48f8b1a693..5c3d1f2339d 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts
@@ -1,3 +1,5 @@
+import { merge } from 'webpack-merge';
+
 import config, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
 
 const configWithFallback = async (env: Env) => {
@@ -9,7 +11,9 @@ const configWithFallback = async (env: Env) => {
       string_decoder: false,
     };
   }
-  return response;
+  return merge(response, {
+    externals: ['grafana/assistant'],
+  });
 };
 
 export default configWithFallback;
diff --git a/yarn.lock b/yarn.lock
index bb7ae5d1078..a27155c3ac9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2648,6 +2648,7 @@ __metadata:
     typescript: "npm:5.9.2"
     webpack: "npm:5.101.0"
   peerDependencies:
+    "@grafana/assistant": ^0.0.12
     "@grafana/runtime": "*"
   languageName: unknown
   linkType: soft
@@ -3285,6 +3286,7 @@ __metadata:
     tslib: "npm:2.8.1"
     typescript: "npm:5.9.2"
   peerDependencies:
+    "@grafana/assistant": ^0.0.12
     react: ^18.0.0
     react-dom: ^18.0.0
   languageName: unknown

From 1e6719f5716562b395fd7567a52aa2bbe35c00bf Mon Sep 17 00:00:00 2001
From: Alexander Akhmetov <me@alx.cx>
Date: Tue, 19 Aug 2025 10:04:05 +0200
Subject: [PATCH 243/243] Alerting: Show converted alertmanager configurations
 in the UI (#109027)

---
 .../alerting/unified/NewSilencePage.tsx       |  4 +-
 .../unified/NotificationPoliciesPage.tsx      |  4 +-
 .../alerting/unified/api/alertmanager.ts      |  1 +
 .../alerting/unified/api/alertmanagerApi.ts   |  3 +
 .../unified/components/AlertManagerPicker.tsx | 79 ++++++++++++++++---
 ...sx => GrafanaAlertmanagerWarning.test.tsx} | 16 ++--
 ...ing.tsx => GrafanaAlertmanagerWarning.tsx} | 31 +++++++-
 .../contact-points/ContactPoints.tsx          | 11 ++-
 .../components/silences/SilencesEditor.tsx    |  4 +-
 .../components/silences/SilencesTable.tsx     |  4 +-
 .../state/AlertmanagerContext.test.tsx        | 35 ++++----
 .../unified/state/AlertmanagerContext.tsx     | 59 ++++++++++++--
 .../utils/alertmanager/extraConfigs.test.ts   | 24 ++++++
 .../utils/alertmanager/extraConfigs.ts        | 15 ++++
 .../alerting/unified/utils/datasource.ts      |  7 ++
 .../plugins/datasource/alertmanager/types.ts  |  2 +
 public/locales/en-US/grafana.json             |  5 ++
 17 files changed, 246 insertions(+), 58 deletions(-)
 rename public/app/features/alerting/unified/components/{GrafanaAlertmanagerDeliveryWarning.test.tsx => GrafanaAlertmanagerWarning.test.tsx} (75%)
 rename public/app/features/alerting/unified/components/{GrafanaAlertmanagerDeliveryWarning.tsx => GrafanaAlertmanagerWarning.tsx} (75%)
 create mode 100644 public/app/features/alerting/unified/utils/alertmanager/extraConfigs.test.ts
 create mode 100644 public/app/features/alerting/unified/utils/alertmanager/extraConfigs.ts

diff --git a/public/app/features/alerting/unified/NewSilencePage.tsx b/public/app/features/alerting/unified/NewSilencePage.tsx
index 81d2793eb6a..7961a6c6a13 100644
--- a/public/app/features/alerting/unified/NewSilencePage.tsx
+++ b/public/app/features/alerting/unified/NewSilencePage.tsx
@@ -9,7 +9,7 @@ import { MATCHER_ALERT_RULE_UID } from 'app/features/alerting/unified/utils/cons
 import { parseQueryParamMatchers } from 'app/features/alerting/unified/utils/matchers';
 
 import { AlertmanagerPageWrapper } from './components/AlertingPageWrapper';
-import { GrafanaAlertmanagerDeliveryWarning } from './components/GrafanaAlertmanagerDeliveryWarning';
+import { GrafanaAlertmanagerWarning } from './components/GrafanaAlertmanagerWarning';
 import { SilencesEditor } from './components/silences/SilencesEditor';
 import { useAlertmanager } from './state/AlertmanagerContext';
 import { withPageErrorBoundary } from './withPageErrorBoundary';
@@ -27,7 +27,7 @@ const SilencesEditorComponent = () => {
 
   return (
     <>
-      <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={selectedAlertmanager} />
+      <GrafanaAlertmanagerWarning currentAlertmanager={selectedAlertmanager} />
       <SilencesEditor
         formValues={formValues}
         alertManagerSourceName={selectedAlertmanager}
diff --git a/public/app/features/alerting/unified/NotificationPoliciesPage.tsx b/public/app/features/alerting/unified/NotificationPoliciesPage.tsx
index 1349a65b242..07d036fb341 100644
--- a/public/app/features/alerting/unified/NotificationPoliciesPage.tsx
+++ b/public/app/features/alerting/unified/NotificationPoliciesPage.tsx
@@ -10,7 +10,7 @@ import { NotificationPoliciesList } from 'app/features/alerting/unified/componen
 import { AlertmanagerAction, useAlertmanagerAbility } from 'app/features/alerting/unified/hooks/useAbilities';
 
 import { AlertmanagerPageWrapper } from './components/AlertingPageWrapper';
-import { GrafanaAlertmanagerDeliveryWarning } from './components/GrafanaAlertmanagerDeliveryWarning';
+import { GrafanaAlertmanagerWarning } from './components/GrafanaAlertmanagerWarning';
 import { TimeIntervalsTable } from './components/mute-timings/MuteTimingsTable';
 import { useAlertmanager } from './state/AlertmanagerContext';
 import { withPageErrorBoundary } from './withPageErrorBoundary';
@@ -48,7 +48,7 @@ const NotificationPoliciesTabs = () => {
 
   return (
     <>
-      <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={selectedAlertmanager} />
+      <GrafanaAlertmanagerWarning currentAlertmanager={selectedAlertmanager} />
       <TabsBar>
         {policiesSupported && canSeePoliciesTab && (
           <Tab
diff --git a/public/app/features/alerting/unified/api/alertmanager.ts b/public/app/features/alerting/unified/api/alertmanager.ts
index ac178ba22ac..e0ad02ce32b 100644
--- a/public/app/features/alerting/unified/api/alertmanager.ts
+++ b/public/app/features/alerting/unified/api/alertmanager.ts
@@ -30,6 +30,7 @@ export async function fetchAlertManagerConfig(alertManagerSourceName: string): P
       alertmanager_config: result.data.alertmanager_config ?? {},
       last_applied: result.data.last_applied,
       id: result.data.id,
+      extra_config: result.data.extra_config,
     };
   } catch (e) {
     // if no config has been uploaded to grafana, it returns error instead of latest config
diff --git a/public/app/features/alerting/unified/api/alertmanagerApi.ts b/public/app/features/alerting/unified/api/alertmanagerApi.ts
index 1fefcce17ea..0c8940725fa 100644
--- a/public/app/features/alerting/unified/api/alertmanagerApi.ts
+++ b/public/app/features/alerting/unified/api/alertmanagerApi.ts
@@ -191,6 +191,7 @@ export const alertmanagerApi = alertingApi.injectEndpoints({
               data: {
                 alertmanager_config: status.config,
                 template_files: {},
+                extra_config: undefined,
               },
             }))
           );
@@ -207,6 +208,7 @@ export const alertmanagerApi = alertingApi.injectEndpoints({
           alertmanager_config: {},
           template_files: {},
           template_file_provenances: {},
+          extra_config: undefined,
         };
 
         const lazyConfigInitSupported = alertmanagerFeatures?.lazyConfigInit ?? false;
@@ -244,6 +246,7 @@ export const alertmanagerApi = alertingApi.injectEndpoints({
                 template_file_provenances: result.template_file_provenances,
                 last_applied: result.last_applied,
                 id: result.id,
+                extra_config: result.extra_config,
               }));
             }
 
diff --git a/public/app/features/alerting/unified/components/AlertManagerPicker.tsx b/public/app/features/alerting/unified/components/AlertManagerPicker.tsx
index 5a2a7ddc83e..6f2b830b9d8 100644
--- a/public/app/features/alerting/unified/components/AlertManagerPicker.tsx
+++ b/public/app/features/alerting/unified/components/AlertManagerPicker.tsx
@@ -6,6 +6,7 @@ import { t } from '@grafana/i18n';
 import { InlineField, Select, SelectMenuOptions, useStyles2 } from '@grafana/ui';
 
 import { useAlertmanager } from '../state/AlertmanagerContext';
+import { isExtraConfig } from '../utils/alertmanager/extraConfigs';
 import { AlertManagerDataSource, GRAFANA_RULES_SOURCE_NAME } from '../utils/datasource';
 
 interface Props {
@@ -13,7 +14,11 @@ interface Props {
 }
 
 function getAlertManagerLabel(alertManager: AlertManagerDataSource) {
-  return alertManager.name === GRAFANA_RULES_SOURCE_NAME ? 'Grafana' : alertManager.name;
+  if (alertManager.name === GRAFANA_RULES_SOURCE_NAME) {
+    return 'Grafana';
+  }
+
+  return alertManager.displayName || alertManager.name;
 }
 
 export const AlertManagerPicker = ({ disabled = false }: Props) => {
@@ -21,12 +26,50 @@ export const AlertManagerPicker = ({ disabled = false }: Props) => {
   const { selectedAlertmanager, availableAlertManagers, setSelectedAlertmanager } = useAlertmanager();
 
   const options = useMemo(() => {
-    return availableAlertManagers.map<SelectableValue<string>>((ds) => ({
-      label: getAlertManagerLabel(ds),
-      value: ds.name,
-      imgUrl: ds.imgUrl,
-      meta: ds.meta,
-    }));
+    // Group alertmanagers
+    const grafanaAM = availableAlertManagers.find((am) => am.name === GRAFANA_RULES_SOURCE_NAME);
+    const extraConfig = availableAlertManagers.find((am) => isExtraConfig(am.name));
+    const datasourceAMs = availableAlertManagers.filter(
+      (am) => am.name !== GRAFANA_RULES_SOURCE_NAME && !isExtraConfig(am.name)
+    );
+
+    const groupedOptions: Array<SelectableValue<string> | { label: string; options: Array<SelectableValue<string>> }> =
+      [];
+
+    // Add Grafana alertmanager first
+    if (grafanaAM) {
+      groupedOptions.push({
+        label: getAlertManagerLabel(grafanaAM),
+        value: grafanaAM.name,
+        imgUrl: grafanaAM.imgUrl,
+        meta: grafanaAM.meta,
+      });
+    }
+
+    // Add extra config (single merged configuration)
+    if (extraConfig) {
+      groupedOptions.push({
+        label: getAlertManagerLabel(extraConfig),
+        value: extraConfig.name,
+        imgUrl: extraConfig.imgUrl,
+        meta: extraConfig.meta,
+      });
+    }
+
+    // Add external alertmanagers
+    if (datasourceAMs.length > 0) {
+      groupedOptions.push({
+        label: t('alerting.alert-manager-picker.external-alertmanagers-group', 'External Alertmanagers'),
+        options: datasourceAMs.map((ds) => ({
+          label: getAlertManagerLabel(ds),
+          value: ds.name,
+          imgUrl: ds.imgUrl,
+          meta: ds.meta,
+        })),
+      });
+    }
+
+    return groupedOptions;
   }, [availableAlertManagers]);
 
   const isDisabled = disabled || options.length === 1;
@@ -61,12 +104,22 @@ const getStyles = (theme: GrafanaTheme2) => ({
   field: css({
     margin: 0,
   }),
+  optionContent: css({
+    display: 'flex',
+    alignItems: 'center',
+    gap: theme.spacing(1),
+    whiteSpace: 'pre-line',
+  }),
 });
 
 // custom option that overwrites the default "white-space: nowrap" for Alertmanager names that are really long
-const CustomOption = (props: ComponentProps<typeof SelectMenuOptions>) => (
-  <SelectMenuOptions
-    {...props}
-    renderOptionLabel={({ label }) => <div style={{ whiteSpace: 'pre-line' }}>{label}</div>}
-  />
-);
+const CustomOption = (props: ComponentProps<typeof SelectMenuOptions>) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <SelectMenuOptions
+      {...props}
+      renderOptionLabel={({ label }) => <div className={styles.optionContent}>{label}</div>}
+    />
+  );
+};
diff --git a/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.test.tsx b/public/app/features/alerting/unified/components/GrafanaAlertmanagerWarning.test.tsx
similarity index 75%
rename from public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.test.tsx
rename to public/app/features/alerting/unified/components/GrafanaAlertmanagerWarning.test.tsx
index 6ed7a2a7aab..52c87f5f41c 100644
--- a/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.test.tsx
+++ b/public/app/features/alerting/unified/components/GrafanaAlertmanagerWarning.test.tsx
@@ -10,10 +10,10 @@ import { AlertmanagerChoice } from '../../../../plugins/datasource/alertmanager/
 import { grantUserPermissions } from '../mocks';
 import { GRAFANA_RULES_SOURCE_NAME } from '../utils/datasource';
 
-import { GrafanaAlertmanagerDeliveryWarning } from './GrafanaAlertmanagerDeliveryWarning';
+import { GrafanaAlertmanagerWarning } from './GrafanaAlertmanagerWarning';
 setupMswServer();
 
-describe('GrafanaAlertmanagerDeliveryWarning', () => {
+describe('GrafanaAlertmanagerWarning', () => {
   beforeEach(() => {
     grantUserPermissions([AccessControlAction.AlertingNotificationsRead]);
   });
@@ -21,9 +21,7 @@ describe('GrafanaAlertmanagerDeliveryWarning', () => {
   it('Should not render when the datasource is not Grafana', () => {
     setAlertmanagerChoices(AlertmanagerChoice.External, 0);
 
-    const { container } = renderWithStore(
-      <GrafanaAlertmanagerDeliveryWarning currentAlertmanager="custom-alertmanager" />
-    );
+    const { container } = renderWithStore(<GrafanaAlertmanagerWarning currentAlertmanager="custom-alertmanager" />);
 
     expect(container).toBeEmptyDOMElement();
   });
@@ -31,7 +29,7 @@ describe('GrafanaAlertmanagerDeliveryWarning', () => {
   it('Should render warning when the datasource is Grafana and using external AM', async () => {
     setAlertmanagerChoices(AlertmanagerChoice.External, 1);
 
-    renderWithStore(<GrafanaAlertmanagerDeliveryWarning currentAlertmanager={GRAFANA_RULES_SOURCE_NAME} />);
+    renderWithStore(<GrafanaAlertmanagerWarning currentAlertmanager={GRAFANA_RULES_SOURCE_NAME} />);
 
     expect(await screen.findByText('Grafana alerts are not delivered to Grafana Alertmanager')).toBeVisible();
   });
@@ -39,7 +37,7 @@ describe('GrafanaAlertmanagerDeliveryWarning', () => {
   it('Should render warning when the datasource is Grafana and using All AM', async () => {
     setAlertmanagerChoices(AlertmanagerChoice.All, 1);
 
-    renderWithStore(<GrafanaAlertmanagerDeliveryWarning currentAlertmanager={GRAFANA_RULES_SOURCE_NAME} />);
+    renderWithStore(<GrafanaAlertmanagerWarning currentAlertmanager={GRAFANA_RULES_SOURCE_NAME} />);
 
     expect(await screen.findByText('You have additional Alertmanagers to configure')).toBeVisible();
   });
@@ -48,7 +46,7 @@ describe('GrafanaAlertmanagerDeliveryWarning', () => {
     setAlertmanagerChoices(AlertmanagerChoice.Internal, 1);
 
     const { container } = renderWithStore(
-      <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={GRAFANA_RULES_SOURCE_NAME} />
+      <GrafanaAlertmanagerWarning currentAlertmanager={GRAFANA_RULES_SOURCE_NAME} />
     );
 
     await waitFor(() => {
@@ -60,7 +58,7 @@ describe('GrafanaAlertmanagerDeliveryWarning', () => {
     setAlertmanagerChoices(AlertmanagerChoice.All, 0);
 
     const { container } = renderWithStore(
-      <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={GRAFANA_RULES_SOURCE_NAME} />
+      <GrafanaAlertmanagerWarning currentAlertmanager={GRAFANA_RULES_SOURCE_NAME} />
     );
 
     await waitFor(() => {
diff --git a/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.tsx b/public/app/features/alerting/unified/components/GrafanaAlertmanagerWarning.tsx
similarity index 75%
rename from public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.tsx
rename to public/app/features/alerting/unified/components/GrafanaAlertmanagerWarning.tsx
index c147cb7ada2..cf2afa30e6b 100644
--- a/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.tsx
+++ b/public/app/features/alerting/unified/components/GrafanaAlertmanagerWarning.tsx
@@ -7,13 +7,23 @@ import { Alert, useStyles2 } from '@grafana/ui';
 import { AlertmanagerChoice } from '../../../../plugins/datasource/alertmanager/types';
 import { alertmanagerApi } from '../api/alertmanagerApi';
 import { AlertingAction, useAlertingAbility } from '../hooks/useAbilities';
+import { isExtraConfig } from '../utils/alertmanager/extraConfigs';
 import { GRAFANA_RULES_SOURCE_NAME } from '../utils/datasource';
 
-interface GrafanaAlertmanagerDeliveryWarningProps {
+interface GrafanaAlertmanagerWarningProps {
   currentAlertmanager: string;
 }
 
-export function GrafanaAlertmanagerDeliveryWarning({ currentAlertmanager }: GrafanaAlertmanagerDeliveryWarningProps) {
+export function GrafanaAlertmanagerWarning({ currentAlertmanager }: GrafanaAlertmanagerWarningProps) {
+  return (
+    <>
+      <GrafanaExternalAlertmanagerConfigWarning currentAlertmanager={currentAlertmanager} />
+      <GrafanaExtraConfigWarning currentAlertmanager={currentAlertmanager} />
+    </>
+  );
+}
+
+function GrafanaExternalAlertmanagerConfigWarning({ currentAlertmanager }: GrafanaAlertmanagerWarningProps) {
   const styles = useStyles2(getStyles);
   const externalAlertmanager = currentAlertmanager !== GRAFANA_RULES_SOURCE_NAME;
 
@@ -87,6 +97,23 @@ export function GrafanaAlertmanagerDeliveryWarning({ currentAlertmanager }: Graf
   return null;
 }
 
+function GrafanaExtraConfigWarning({ currentAlertmanager }: GrafanaAlertmanagerWarningProps) {
+  const isSelectedExtraConfig = currentAlertmanager && isExtraConfig(currentAlertmanager);
+
+  if (!isSelectedExtraConfig) {
+    return null;
+  }
+
+  return (
+    <Alert title={t('alerting.alert-manager-picker.extra-config-warning.title', 'Imported configuration')}>
+      <Trans i18nKey="alerting.alert-manager-picker.extra-config-warning.content">
+        This shows the merged configuration of Grafana alertmanager with imported configurations. This merged view is
+        read-only in the UI.
+      </Trans>
+    </Alert>
+  );
+}
+
 const getStyles = (theme: GrafanaTheme2) => ({
   adminHint: css({
     fontSize: theme.typography.bodySmall.fontSize,
diff --git a/public/app/features/alerting/unified/components/contact-points/ContactPoints.tsx b/public/app/features/alerting/unified/components/contact-points/ContactPoints.tsx
index 6f2423e424d..729644b8209 100644
--- a/public/app/features/alerting/unified/components/contact-points/ContactPoints.tsx
+++ b/public/app/features/alerting/unified/components/contact-points/ContactPoints.tsx
@@ -23,10 +23,11 @@ import { AlertmanagerAction, useAlertmanagerAbility } from '../../hooks/useAbili
 import { usePagination } from '../../hooks/usePagination';
 import { useURLSearchParams } from '../../hooks/useURLSearchParams';
 import { useAlertmanager } from '../../state/AlertmanagerContext';
+import { isExtraConfig } from '../../utils/alertmanager/extraConfigs';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 import { withPageErrorBoundary } from '../../withPageErrorBoundary';
 import { AlertmanagerPageWrapper } from '../AlertingPageWrapper';
-import { GrafanaAlertmanagerDeliveryWarning } from '../GrafanaAlertmanagerDeliveryWarning';
+import { GrafanaAlertmanagerWarning } from '../GrafanaAlertmanagerWarning';
 
 import { ContactPoint } from './ContactPoint';
 import { NotificationTemplates } from './NotificationTemplates';
@@ -140,8 +141,12 @@ const ContactPointsTab = () => {
       ) : (
         <ContactPointsList contactPoints={contactPoints} search={search} pageSize={DEFAULT_PAGE_SIZE} />
       )}
+
       {/* Grafana manager Alertmanager does not support global config, Mimir and Cortex do */}
-      {!isGrafanaManagedAlertmanager && <GlobalConfigAlert alertManagerName={selectedAlertmanager!} />}
+      {/* Extra configs also don't support global config */}
+      {!isGrafanaManagedAlertmanager && !isExtraConfig(selectedAlertmanager!) && (
+        <GlobalConfigAlert alertManagerName={selectedAlertmanager!} />
+      )}
       {ExportDrawer}
     </>
   );
@@ -220,7 +225,7 @@ export const ContactPointsPageContents = () => {
 
   return (
     <>
-      <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={selectedAlertmanager!} />
+      <GrafanaAlertmanagerWarning currentAlertmanager={selectedAlertmanager!} />
       <Stack direction="column">
         <TabsBar>
           {showContactPointsTab && (
diff --git a/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx b/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx
index 94ccf10db46..30154485057 100644
--- a/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx
+++ b/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx
@@ -39,7 +39,7 @@ import { matcherFieldToMatcher } from '../../utils/alertmanager';
 import { makeAMLink } from '../../utils/misc';
 import { withPageErrorBoundary } from '../../withPageErrorBoundary';
 import { AlertmanagerPageWrapper } from '../AlertingPageWrapper';
-import { GrafanaAlertmanagerDeliveryWarning } from '../GrafanaAlertmanagerDeliveryWarning';
+import { GrafanaAlertmanagerWarning } from '../GrafanaAlertmanagerWarning';
 
 import MatchersField from './MatchersField';
 import { SilencePeriod } from './SilencePeriod';
@@ -118,7 +118,7 @@ const ExistingSilenceEditor = () => {
 
   return (
     <>
-      <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={alertManagerSourceName} />
+      <GrafanaAlertmanagerWarning currentAlertmanager={alertManagerSourceName} />
       <SilencesEditor ruleUid={ruleUid} formValues={defaultValues} alertManagerSourceName={alertManagerSourceName} />
     </>
   );
diff --git a/public/app/features/alerting/unified/components/silences/SilencesTable.tsx b/public/app/features/alerting/unified/components/silences/SilencesTable.tsx
index 314dcf26586..8d3c80acad1 100644
--- a/public/app/features/alerting/unified/components/silences/SilencesTable.tsx
+++ b/public/app/features/alerting/unified/components/silences/SilencesTable.tsx
@@ -30,7 +30,7 @@ import { withPageErrorBoundary } from '../../withPageErrorBoundary';
 import { AlertmanagerPageWrapper } from '../AlertingPageWrapper';
 import { Authorize } from '../Authorize';
 import { DynamicTable, DynamicTableColumnProps, DynamicTableItemProps } from '../DynamicTable';
-import { GrafanaAlertmanagerDeliveryWarning } from '../GrafanaAlertmanagerDeliveryWarning';
+import { GrafanaAlertmanagerWarning } from '../GrafanaAlertmanagerWarning';
 
 import { Matchers } from './Matchers';
 import { NoSilencesSplash } from './NoSilencesCTA';
@@ -146,7 +146,7 @@ const SilencesTable = () => {
 
   return (
     <div data-testid="silences-table">
-      <GrafanaAlertmanagerDeliveryWarning currentAlertmanager={alertManagerSourceName} />
+      <GrafanaAlertmanagerWarning currentAlertmanager={alertManagerSourceName} />
       {!!silences.length && (
         <Stack direction="column">
           <SilencesFilter />
diff --git a/public/app/features/alerting/unified/state/AlertmanagerContext.test.tsx b/public/app/features/alerting/unified/state/AlertmanagerContext.test.tsx
index 49d0b8c5d79..26bd108bdd4 100644
--- a/public/app/features/alerting/unified/state/AlertmanagerContext.test.tsx
+++ b/public/app/features/alerting/unified/state/AlertmanagerContext.test.tsx
@@ -1,9 +1,11 @@
 import { renderHook } from '@testing-library/react';
 import * as React from 'react';
+import { Provider } from 'react-redux';
 
 import { locationService } from '@grafana/runtime';
 import store from 'app/core/store';
 import { AlertManagerImplementation } from 'app/plugins/datasource/alertmanager/types';
+import { configureStore } from 'app/store/configureStore';
 
 import * as useAlertManagerSources from '../hooks/useAlertManagerSources';
 import { ALERTMANAGER_NAME_LOCAL_STORAGE_KEY } from '../utils/constants';
@@ -21,14 +23,21 @@ const externalAmMimir: AlertManagerDataSource = {
   imgUrl: '',
 };
 
+function getProviderWrapper() {
+  const reduxStore = configureStore();
+  return ({ children }: React.PropsWithChildren) => (
+    <Provider store={reduxStore}>
+      <AlertmanagerProvider accessType="instance">{children}</AlertmanagerProvider>
+    </Provider>
+  );
+}
+
 describe('useAlertmanager', () => {
   it('Should return undefined alert manager name when there are no available alert managers', () => {
     jest
       .spyOn(useAlertManagerSources, 'useAlertManagersByPermission')
       .mockReturnValueOnce({ availableExternalDataSources: [], availableInternalDataSources: [] });
-    const wrapper = ({ children }: React.PropsWithChildren) => (
-      <AlertmanagerProvider accessType="instance">{children}</AlertmanagerProvider>
-    );
+    const wrapper = getProviderWrapper();
 
     const { result } = renderHook(() => useAlertmanager(), { wrapper });
     expect(result.current.selectedAlertmanager).toBe(undefined);
@@ -40,9 +49,7 @@ describe('useAlertmanager', () => {
       availableInternalDataSources: [{ name: GRAFANA_RULES_SOURCE_NAME, imgUrl: '', hasConfigurationAPI: true }],
     });
 
-    const wrapper = ({ children }: React.PropsWithChildren) => (
-      <AlertmanagerProvider accessType="instance">{children}</AlertmanagerProvider>
-    );
+    const wrapper = getProviderWrapper();
 
     const { result } = renderHook(() => useAlertmanager(), { wrapper });
     expect(result.current.selectedAlertmanager).toBe(GRAFANA_RULES_SOURCE_NAME);
@@ -55,9 +62,7 @@ describe('useAlertmanager', () => {
 
     locationService.push({ search: `alertmanager=${externalAmProm.name}` });
 
-    const wrapper = ({ children }: React.PropsWithChildren) => (
-      <AlertmanagerProvider accessType="instance">{children}</AlertmanagerProvider>
-    );
+    const wrapper = getProviderWrapper();
 
     const { result } = renderHook(() => useAlertmanager(), { wrapper });
     expect(result.current.selectedAlertmanager).toBe(externalAmProm.name);
@@ -70,9 +75,7 @@ describe('useAlertmanager', () => {
 
     locationService.push({ search: `alertmanager=Not available external AM` });
 
-    const wrapper = ({ children }: React.PropsWithChildren) => (
-      <AlertmanagerProvider accessType="instance">{children}</AlertmanagerProvider>
-    );
+    const wrapper = getProviderWrapper();
 
     const { result } = renderHook(() => useAlertmanager(), { wrapper });
     expect(result.current.selectedAlertmanager).toBe(undefined);
@@ -83,9 +86,7 @@ describe('useAlertmanager', () => {
       .spyOn(useAlertManagerSources, 'useAlertManagersByPermission')
       .mockReturnValueOnce({ availableExternalDataSources: [externalAmProm], availableInternalDataSources: [] });
 
-    const wrapper = ({ children }: React.PropsWithChildren) => (
-      <AlertmanagerProvider accessType="instance">{children}</AlertmanagerProvider>
-    );
+    const wrapper = getProviderWrapper();
 
     store.set(ALERTMANAGER_NAME_LOCAL_STORAGE_KEY, externalAmProm.name);
     locationService.push({ search: '' });
@@ -101,9 +102,7 @@ describe('useAlertmanager', () => {
 
     locationService.push({ search: `alertmanager=${externalAmProm.name}` });
 
-    const wrapper = ({ children }: React.PropsWithChildren) => (
-      <AlertmanagerProvider accessType="instance">{children}</AlertmanagerProvider>
-    );
+    const wrapper = getProviderWrapper();
 
     store.set(ALERTMANAGER_NAME_LOCAL_STORAGE_KEY, externalAmMimir.name);
 
diff --git a/public/app/features/alerting/unified/state/AlertmanagerContext.tsx b/public/app/features/alerting/unified/state/AlertmanagerContext.tsx
index d196dd7b565..22846f18352 100644
--- a/public/app/features/alerting/unified/state/AlertmanagerContext.tsx
+++ b/public/app/features/alerting/unified/state/AlertmanagerContext.tsx
@@ -1,10 +1,13 @@
 import * as React from 'react';
 
-import { locationService } from '@grafana/runtime';
+import { config, locationService } from '@grafana/runtime';
 import store from 'app/core/store';
 import { AlertManagerDataSourceJsonData, AlertManagerImplementation } from 'app/plugins/datasource/alertmanager/types';
+import grafanaIconSvg from 'img/grafana_icon.svg';
 
 import { useAlertManagersByPermission } from '../hooks/useAlertManagerSources';
+import { useAlertmanagerConfig } from '../hooks/useAlertmanagerConfig';
+import { EXTRA_CONFIG_UID, isExtraConfig } from '../utils/alertmanager/extraConfigs';
 import { ALERTMANAGER_NAME_LOCAL_STORAGE_KEY, ALERTMANAGER_NAME_QUERY_KEY } from '../utils/constants';
 import {
   AlertManagerDataSource,
@@ -33,9 +36,46 @@ const AlertmanagerProvider = ({ children, accessType, alertmanagerSourceName }:
   const queryParams = locationService.getSearch();
   const updateQueryParams = locationService.partial;
   const allAvailableAlertManagers = useAlertManagersByPermission(accessType);
-  const availableAlertManagers = allAvailableAlertManagers.availableInternalDataSources.concat(
-    allAvailableAlertManagers.availableExternalDataSources
-  );
+  const isExtraConfigEnabled = config.featureToggles.alertingImportAlertmanagerUI ?? false;
+
+  const { data: grafanaConfig } = useAlertmanagerConfig(isExtraConfigEnabled ? GRAFANA_RULES_SOURCE_NAME : undefined, {
+    refetchOnFocus: false,
+    refetchOnReconnect: false,
+  });
+  const hasExtraConfigs = Boolean(grafanaConfig?.extra_config && grafanaConfig.extra_config.length > 0);
+
+  const availableAlertManagers = React.useMemo(() => {
+    const regularAlertManagers = allAvailableAlertManagers.availableInternalDataSources.concat(
+      allAvailableAlertManagers.availableExternalDataSources
+    );
+
+    const extraConfigDataSource: AlertManagerDataSource[] =
+      isExtraConfigEnabled && hasExtraConfigs
+        ? [
+            {
+              name: EXTRA_CONFIG_UID,
+              displayName: 'Grafana (imported)',
+              imgUrl: grafanaIconSvg,
+              hasConfigurationAPI: false,
+              handleGrafanaManagedAlerts: true,
+            },
+          ]
+        : [];
+
+    // list in order: Grafana -> Extra Config -> Extra Alertmanagers
+    const grafanaAlertmanager = regularAlertManagers.find((am) => am.name === GRAFANA_RULES_SOURCE_NAME);
+    const datasourceAlertmanagers = regularAlertManagers.filter((am) => am.name !== GRAFANA_RULES_SOURCE_NAME);
+    const orderedAlertManagers: AlertManagerDataSource[] = [];
+
+    if (grafanaAlertmanager) {
+      orderedAlertManagers.push(grafanaAlertmanager);
+    }
+
+    orderedAlertManagers.push(...extraConfigDataSource);
+    orderedAlertManagers.push(...datasourceAlertmanagers);
+
+    return orderedAlertManagers;
+  }, [allAvailableAlertManagers, isExtraConfigEnabled, hasExtraConfigs]);
 
   const updateSelectedAlertmanager = React.useCallback(
     (selectedAlertManager: string) => {
@@ -73,7 +113,16 @@ const AlertmanagerProvider = ({ children, accessType, alertmanagerSourceName }:
     ? desiredAlertmanager
     : undefined;
 
-  const selectedAlertmanagerConfig = getAlertmanagerDataSourceByName(selectedAlertmanager)?.jsonData;
+  const selectedAlertmanagerConfig = React.useMemo(() => {
+    if (selectedAlertmanager && isExtraConfig(selectedAlertmanager)) {
+      const config: AlertManagerDataSourceJsonData = {
+        implementation: AlertManagerImplementation.prometheus,
+        handleGrafanaManagedAlerts: true,
+      };
+      return config;
+    }
+    return getAlertmanagerDataSourceByName(selectedAlertmanager)?.jsonData;
+  }, [selectedAlertmanager]);
 
   // determine if we're dealing with an Alertmanager data source that supports the ruler API
   const isGrafanaAlertmanager = selectedAlertmanager === GRAFANA_RULES_SOURCE_NAME;
diff --git a/public/app/features/alerting/unified/utils/alertmanager/extraConfigs.test.ts b/public/app/features/alerting/unified/utils/alertmanager/extraConfigs.test.ts
new file mode 100644
index 00000000000..ca16e7a4baf
--- /dev/null
+++ b/public/app/features/alerting/unified/utils/alertmanager/extraConfigs.test.ts
@@ -0,0 +1,24 @@
+import { EXTRA_CONFIG_UID, isExtraConfig } from './extraConfigs';
+
+describe('extraConfigs utilities', () => {
+  describe('isExtraConfig', () => {
+    it('should return true for the exact extra config UID', () => {
+      expect(isExtraConfig(EXTRA_CONFIG_UID)).toBe(true);
+    });
+
+    it('should return false for non-extra config names', () => {
+      expect(isExtraConfig('grafana')).toBe(false);
+      expect(isExtraConfig('prometheus-am')).toBe(false);
+      expect(isExtraConfig('regular-alertmanager')).toBe(false);
+      expect(isExtraConfig('')).toBe(false);
+      expect(isExtraConfig('~grafana-converted-extra-config-test')).toBe(false); // old pattern
+      expect(isExtraConfig('~grafana-with-extra-config-suffix')).toBe(false); // with suffix
+    });
+  });
+
+  describe('EXTRA_CONFIG_UID constant', () => {
+    it('should have the correct UID value', () => {
+      expect(EXTRA_CONFIG_UID).toBe('~grafana-with-extra-config');
+    });
+  });
+});
diff --git a/public/app/features/alerting/unified/utils/alertmanager/extraConfigs.ts b/public/app/features/alerting/unified/utils/alertmanager/extraConfigs.ts
new file mode 100644
index 00000000000..6fe8ac88ee6
--- /dev/null
+++ b/public/app/features/alerting/unified/utils/alertmanager/extraConfigs.ts
@@ -0,0 +1,15 @@
+export const EXTRA_CONFIG_UID = '~grafana-with-extra-config';
+
+export interface ExtraConfiguration {
+  identifier: string;
+  source?: string;
+  createdAt?: string;
+}
+
+export interface AlertingConfigResponse {
+  extra_config?: ExtraConfiguration[];
+}
+
+export function isExtraConfig(name: string): boolean {
+  return name === EXTRA_CONFIG_UID;
+}
diff --git a/public/app/features/alerting/unified/utils/datasource.ts b/public/app/features/alerting/unified/utils/datasource.ts
index 4bcf3757d2c..545e2b1ab6d 100644
--- a/public/app/features/alerting/unified/utils/datasource.ts
+++ b/public/app/features/alerting/unified/utils/datasource.ts
@@ -27,6 +27,7 @@ import { useAlertManagersByPermission } from '../hooks/useAlertManagerSources';
 import { isAlertManagerWithConfigAPI } from '../state/AlertmanagerContext';
 
 import { instancesPermissions, notificationsPermissions, silencesPermissions } from './access-control';
+import { isExtraConfig } from './alertmanager/extraConfigs';
 import { getAllDataSources } from './config';
 import { isGrafanaRuleIdentifier } from './rules';
 
@@ -52,6 +53,7 @@ export enum DataSourceType {
 
 export interface AlertManagerDataSource {
   name: string;
+  displayName?: string;
   imgUrl: string;
   meta?: DataSourceInstanceSettings['meta'];
   hasConfigurationAPI?: boolean;
@@ -300,6 +302,11 @@ export function getDatasourceAPIUid(dataSourceName: string) {
   if (dataSourceName === GRAFANA_RULES_SOURCE_NAME) {
     return GRAFANA_RULES_SOURCE_NAME;
   }
+
+  if (isExtraConfig(dataSourceName)) {
+    return dataSourceName;
+  }
+
   const ds = getDataSourceByName(dataSourceName);
   if (!ds) {
     throw new Error(`Datasource "${dataSourceName}" not found`);
diff --git a/public/app/plugins/datasource/alertmanager/types.ts b/public/app/plugins/datasource/alertmanager/types.ts
index 9a16da6d743..ef56b44c767 100644
--- a/public/app/plugins/datasource/alertmanager/types.ts
+++ b/public/app/plugins/datasource/alertmanager/types.ts
@@ -1,6 +1,7 @@
 //DOCS: https://prometheus.io/docs/alerting/latest/configuration/
 import { DataSourceJsonData, WithAccessControlMetadata } from '@grafana/data';
 import { IoK8SApimachineryPkgApisMetaV1ObjectMeta } from 'app/features/alerting/unified/openapi/receiversApi.gen';
+import { ExtraConfiguration } from 'app/features/alerting/unified/utils/alertmanager/extraConfigs';
 
 export const ROUTES_META_SYMBOL = Symbol('routes_metadata');
 
@@ -11,6 +12,7 @@ export type AlertManagerCortexConfig = {
   template_file_provenances?: Record<string, string>;
   last_applied?: string;
   id?: number;
+  extra_config?: ExtraConfiguration[];
 };
 
 export type TLSConfig = {
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 7ca4d97c8e3..ba574221f71 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -493,6 +493,11 @@
       "title-muting-grouping-and-timings": "Muting, grouping, and timings"
     },
     "alert-manager-picker": {
+      "external-alertmanagers-group": "External Alertmanagers",
+      "extra-config-warning": {
+        "content": "This shows the merged configuration of Grafana alertmanager with imported configurations. This merged view is read-only in the UI.",
+        "title": "Imported configuration"
+      },
       "noOptionsMessage-no-datasources-found": "No datasources found"
     },
     "alert-menu": {